From 3c3d65574783e1ac9dc87514247327331e1ea804 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 22 Dec 2023 10:30:59 -0700 Subject: [PATCH 01/11] Update .gitmodules and submodule pointer for ccpp-framework for code review and testing --- .gitmodules | 6 ++++-- ccpp/framework | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 22c723ac1..8fe5bd4fc 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,8 +4,10 @@ branch = dev/emc [submodule "ccpp/framework"] path = ccpp/framework - url = https://github.com/NCAR/ccpp-framework - branch = main + #url = https://github.com/NCAR/ccpp-framework + #branch = main + url = https://github.com/climbfuji/ccpp-framework + branch = feature/ccpp_prebuild_chunked_array_support [submodule "ccpp/physics"] path = ccpp/physics url = https://github.com/ufs-community/ccpp-physics diff --git a/ccpp/framework b/ccpp/framework index 219f2e9c8..0eca5c2c8 160000 --- a/ccpp/framework +++ b/ccpp/framework @@ -1 +1 @@ -Subproject commit 219f2e9c88b7b774becac2bd1453696e105af1c4 +Subproject commit 0eca5c2c8885f3acadfed1f4945d19d1e97bb25f From 593a9e009a092281342d684acad4f828c71d413a Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 26 Dec 2023 14:05:09 -0700 Subject: [PATCH 02/11] Update submodule pointer for ccpp-framework --- ccpp/framework | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/framework b/ccpp/framework index 0eca5c2c8..75ea5d578 160000 --- a/ccpp/framework +++ b/ccpp/framework @@ -1 +1 @@ -Subproject commit 0eca5c2c8885f3acadfed1f4945d19d1e97bb25f +Subproject commit 75ea5d578b5966ca4da00a9c1f8b629292bbf137 From e74e5a4aed45e3a78359a1cdb3c4d2aa2a9dc108 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 26 Dec 2023 20:53:39 -0700 Subject: [PATCH 03/11] Update .gitmodules and submodule pointers for ccpp-framework and ccpp-physics --- .gitmodules | 6 ++++-- ccpp/framework | 2 +- ccpp/physics | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index 8fe5bd4fc..5a267bf32 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,8 +10,10 @@ branch = feature/ccpp_prebuild_chunked_array_support [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/ufs-community/ccpp-physics - branch = ufs/dev + #url = https://github.com/ufs-community/ccpp-physics + #branch = ufs/dev + url = https://github.com/cimbfuji/ccpp-physics + branch = bugfix/ozphys_ccpp_compliant [submodule "upp"] path = upp url = https://github.com/NOAA-EMC/UPP diff --git a/ccpp/framework b/ccpp/framework index 75ea5d578..d094d3f0a 160000 --- a/ccpp/framework +++ b/ccpp/framework @@ -1 +1 @@ -Subproject commit 75ea5d578b5966ca4da00a9c1f8b629292bbf137 +Subproject commit d094d3f0ab48dbaa69128d4a9484152c863a272d diff --git a/ccpp/physics b/ccpp/physics index 0cdfc9d74..790960e3f 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 0cdfc9d7465358debb4de292861fef970b44874a +Subproject commit 790960e3ff3203c69420282e87f7c164776c4e36 From ffc54e60ba9a24882b047d98bee090e0c8666e0c Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 26 Dec 2023 20:53:58 -0700 Subject: [PATCH 04/11] Bug fix in io/module_wrt_grid_comp.F90 to compile on macOS with apple-clang --- io/module_wrt_grid_comp.F90 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/io/module_wrt_grid_comp.F90 b/io/module_wrt_grid_comp.F90 index e409788ab..946c97818 100644 --- a/io/module_wrt_grid_comp.F90 +++ b/io/module_wrt_grid_comp.F90 @@ -28,8 +28,9 @@ module module_wrt_grid_comp ! use mpi use esmf + use fms_mod, only : uppercase ! needed for fms 2023.04 use fms - use mpp_mod, only : mpp_init ! needed for fms 2023.02 + use mpp_mod, only : mpp_init,mpp_error ! needed for fms 2023.02 use write_internal_state use module_fv3_io_def, only : num_pes_fcst, & From db829309141373ac585ede55459f36ddd8a64a89 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 27 Dec 2023 09:47:51 -0700 Subject: [PATCH 05/11] Fix typo in .gitmodules --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 5a267bf32..9e53c7052 100644 --- a/.gitmodules +++ b/.gitmodules @@ -12,7 +12,7 @@ path = ccpp/physics #url = https://github.com/ufs-community/ccpp-physics #branch = ufs/dev - url = https://github.com/cimbfuji/ccpp-physics + url = https://github.com/climbfuji/ccpp-physics branch = bugfix/ozphys_ccpp_compliant [submodule "upp"] path = upp From 537468478efdd1d4615577b7b1692167e45466fe Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 27 Dec 2023 10:01:13 -0700 Subject: [PATCH 06/11] Update submodule pointer for ccpp-framework --- ccpp/framework | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/framework b/ccpp/framework index d094d3f0a..3d69bb9eb 160000 --- a/ccpp/framework +++ b/ccpp/framework @@ -1 +1 @@ -Subproject commit d094d3f0ab48dbaa69128d4a9484152c863a272d +Subproject commit 3d69bb9eba43805ecd68e59cdec3345008e1cad5 From 88fac19a9620dac99a83e1cd235c904d03d87600 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 28 Dec 2023 15:29:56 -0700 Subject: [PATCH 07/11] Update submodule pointer for ccpp-framework --- ccpp/framework | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/framework b/ccpp/framework index 3d69bb9eb..2c89204f9 160000 --- a/ccpp/framework +++ b/ccpp/framework @@ -1 +1 @@ -Subproject commit 3d69bb9eba43805ecd68e59cdec3345008e1cad5 +Subproject commit 2c89204f924166fe5fc33743f118054f8b9df209 From ee91285818bc2bf0f6af4c41805302eda1997107 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 28 Dec 2023 15:35:03 -0700 Subject: [PATCH 08/11] Clean up comments in io/module_wrt_grid_comp.F90 --- io/module_wrt_grid_comp.F90 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/io/module_wrt_grid_comp.F90 b/io/module_wrt_grid_comp.F90 index 946c97818..c5737a7dd 100644 --- a/io/module_wrt_grid_comp.F90 +++ b/io/module_wrt_grid_comp.F90 @@ -28,9 +28,9 @@ module module_wrt_grid_comp ! use mpi use esmf - use fms_mod, only : uppercase ! needed for fms 2023.04 + use fms_mod, only : uppercase use fms - use mpp_mod, only : mpp_init,mpp_error ! needed for fms 2023.02 + use mpp_mod, only : mpp_init, mpp_error use write_internal_state use module_fv3_io_def, only : num_pes_fcst, & From 713ba7d2fe387837c61969ebf411d6d43b469076 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 10 Jan 2024 15:12:48 -0700 Subject: [PATCH 09/11] Update submodule pointer for ccpp-framework --- ccpp/framework | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/framework b/ccpp/framework index 2c89204f9..f31533929 160000 --- a/ccpp/framework +++ b/ccpp/framework @@ -1 +1 @@ -Subproject commit 2c89204f924166fe5fc33743f118054f8b9df209 +Subproject commit f3153392917c54ffc5fa4e5edef3d9e060129c05 From 8e642bba26de02bbd28b8f18f5ea25f9de6e84b4 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 20 Feb 2024 20:39:41 -0700 Subject: [PATCH 10/11] Update submodule pointer for ccpp-physics --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 877bb1f0c..c468c667d 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 877bb1f0ca1255a7093ae2cfd4948cb38c934d10 +Subproject commit c468c667db34312f008f17185c29414122ce913f From b0ec5a5d151bd38c61728bf4fa7cb60417775b62 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 23 Feb 2024 10:09:41 -0700 Subject: [PATCH 11/11] Revert .gitmodules and update submodule pointers for ccpp-framework and ccpp-physics --- .gitmodules | 12 ++++-------- ccpp/framework | 2 +- ccpp/physics | 2 +- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.gitmodules b/.gitmodules index 9e53c7052..22c723ac1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,16 +4,12 @@ branch = dev/emc [submodule "ccpp/framework"] path = ccpp/framework - #url = https://github.com/NCAR/ccpp-framework - #branch = main - url = https://github.com/climbfuji/ccpp-framework - branch = feature/ccpp_prebuild_chunked_array_support + url = https://github.com/NCAR/ccpp-framework + branch = main [submodule "ccpp/physics"] path = ccpp/physics - #url = https://github.com/ufs-community/ccpp-physics - #branch = ufs/dev - url = https://github.com/climbfuji/ccpp-physics - branch = bugfix/ozphys_ccpp_compliant + url = https://github.com/ufs-community/ccpp-physics + branch = ufs/dev [submodule "upp"] path = upp url = https://github.com/NOAA-EMC/UPP diff --git a/ccpp/framework b/ccpp/framework index da3869662..f0b9a18b0 160000 --- a/ccpp/framework +++ b/ccpp/framework @@ -1 +1 @@ -Subproject commit da3869662d22b2a532be1be86f40c4e1b03412c7 +Subproject commit f0b9a18b005d950cb9b0038fbc827b6b37500f43 diff --git a/ccpp/physics b/ccpp/physics index c468c667d..4ac3009e5 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit c468c667db34312f008f17185c29414122ce913f +Subproject commit 4ac3009e5181756a02acf95b5305ba016cd9a9cd