From 7b826d43b71a9daa74598f65399f7f23b85151ee Mon Sep 17 00:00:00 2001 From: "denise.worthen" Date: Sat, 27 Mar 2021 12:30:58 +0000 Subject: [PATCH 1/5] update FV3 --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index 0e05075456..3f5b8d4914 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 0e05075456800f0c5abd7bfb1ce6f89b26dd7989 +Subproject commit 3f5b8d4914e5bb4e87e0a5f56d95db5cd5fc0bf5 From cea6fc69411248b50142291191fcfc9f0bd04d94 Mon Sep 17 00:00:00 2001 From: "denise.worthen" Date: Sat, 27 Mar 2021 12:34:38 +0000 Subject: [PATCH 2/5] update hera.intel modulefiles for testing --- modulefiles/hera.intel/fv3 | 2 +- modulefiles/hera.intel/fv3_debug | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modulefiles/hera.intel/fv3 b/modulefiles/hera.intel/fv3 index 7b20135794..c9f5e76e7f 100644 --- a/modulefiles/hera.intel/fv3 +++ b/modulefiles/hera.intel/fv3 @@ -28,7 +28,7 @@ module load png/1.6.35 module load hdf5/1.10.6 module load netcdf/4.7.4 module load pio/2.5.1 -module load esmf/8_1_0_beta_snapshot_27 +module load esmf/8_1_0_beta_snapshot_47 module load bacio/2.4.1 module load crtm/2.3.0 diff --git a/modulefiles/hera.intel/fv3_debug b/modulefiles/hera.intel/fv3_debug index dd65fa1b95..8ee2ef433c 100644 --- a/modulefiles/hera.intel/fv3_debug +++ b/modulefiles/hera.intel/fv3_debug @@ -28,7 +28,7 @@ module load png/1.6.35 module load hdf5/1.10.6 module load netcdf/4.7.4 module load pio/2.5.1 -module load esmf/8_1_0_beta_snapshot_27-debug +module load esmf/8_1_0_beta_snapshot_47-debug module load bacio/2.4.1 module load crtm/2.3.0 From 071275bcdb6e2d376aad395266803c10f6ab287e Mon Sep 17 00:00:00 2001 From: "denise.worthen" Date: Sat, 27 Mar 2021 12:37:54 +0000 Subject: [PATCH 3/5] Revert "update hera.intel modulefiles for testing" This reverts commit cea6fc69411248b50142291191fcfc9f0bd04d94. --- modulefiles/hera.intel/fv3 | 2 +- modulefiles/hera.intel/fv3_debug | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modulefiles/hera.intel/fv3 b/modulefiles/hera.intel/fv3 index c9f5e76e7f..7b20135794 100644 --- a/modulefiles/hera.intel/fv3 +++ b/modulefiles/hera.intel/fv3 @@ -28,7 +28,7 @@ module load png/1.6.35 module load hdf5/1.10.6 module load netcdf/4.7.4 module load pio/2.5.1 -module load esmf/8_1_0_beta_snapshot_47 +module load esmf/8_1_0_beta_snapshot_27 module load bacio/2.4.1 module load crtm/2.3.0 diff --git a/modulefiles/hera.intel/fv3_debug b/modulefiles/hera.intel/fv3_debug index 8ee2ef433c..dd65fa1b95 100644 --- a/modulefiles/hera.intel/fv3_debug +++ b/modulefiles/hera.intel/fv3_debug @@ -28,7 +28,7 @@ module load png/1.6.35 module load hdf5/1.10.6 module load netcdf/4.7.4 module load pio/2.5.1 -module load esmf/8_1_0_beta_snapshot_47-debug +module load esmf/8_1_0_beta_snapshot_27-debug module load bacio/2.4.1 module load crtm/2.3.0 From 4db2ff2378ab69fb71b7c91ca6490c8c960b1c75 Mon Sep 17 00:00:00 2001 From: "denise.worthen" Date: Sat, 27 Mar 2021 12:38:33 +0000 Subject: [PATCH 4/5] Revert "update FV3" This reverts commit 7b826d43b71a9daa74598f65399f7f23b85151ee. --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index 3f5b8d4914..0e05075456 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 3f5b8d4914e5bb4e87e0a5f56d95db5cd5fc0bf5 +Subproject commit 0e05075456800f0c5abd7bfb1ce6f89b26dd7989 From 78b409e419042b85e2a773216773fc1f7792c794 Mon Sep 17 00:00:00 2001 From: "denise.worthen" Date: Wed, 26 May 2021 09:10:38 -0400 Subject: [PATCH 5/5] gnu fixes for coupled model * add fix for gnu compile in CMEPS * add fix for coupled input.nmls with quotes on CCPP_SUITE --- .gitmodules | 6 ++++-- CMEPS-interface/CMEPS | 2 +- tests/parm/input.benchmark_ccpp.nml.IN | 2 +- tests/parm/input.benchmark_v16.nml.IN | 2 +- tests/parm/input.mom6_ccpp.nml.IN | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.gitmodules b/.gitmodules index 128615c511..29c99cb5c0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -20,8 +20,10 @@ branch = develop [submodule "CMEPS"] path = CMEPS-interface/CMEPS - url = https://github.com/NOAA-EMC/CMEPS.git - branch = emc/develop + #url = https://github.com/NOAA-EMC/CMEPS.git + #branch = emc/develop + url = https://github.com/DeniseWorthen/CMEPS.git + branch = bugfix/gnu_compile [submodule "MOM6"] path = MOM6-interface/MOM6 url = https://github.com/NOAA-EMC/MOM6 diff --git a/CMEPS-interface/CMEPS b/CMEPS-interface/CMEPS index abe90361a6..d182a54f0b 160000 --- a/CMEPS-interface/CMEPS +++ b/CMEPS-interface/CMEPS @@ -1 +1 @@ -Subproject commit abe90361a6fc48b6b1513253a2eb0e8baab5b294 +Subproject commit d182a54f0b63f374ac8bf0f9752f9f0001cdd971 diff --git a/tests/parm/input.benchmark_ccpp.nml.IN b/tests/parm/input.benchmark_ccpp.nml.IN index 4ffdde1ffd..d87c8f44c5 100644 --- a/tests/parm/input.benchmark_ccpp.nml.IN +++ b/tests/parm/input.benchmark_ccpp.nml.IN @@ -17,7 +17,7 @@ fhout = @[NFHOUT] fhmaxhf = @[NFHMAX_HF] fhouthf = @[NFHOUT_HF] - ccpp_suite = @[CCPP_SUITE] + ccpp_suite = '@[CCPP_SUITE]' / diff --git a/tests/parm/input.benchmark_v16.nml.IN b/tests/parm/input.benchmark_v16.nml.IN index 1f38e9e8e3..421b546eb7 100644 --- a/tests/parm/input.benchmark_v16.nml.IN +++ b/tests/parm/input.benchmark_v16.nml.IN @@ -17,7 +17,7 @@ fhout = @[NFHOUT] fhmaxhf = @[NFHMAX_HF] fhouthf = @[NFHOUT_HF] - ccpp_suite = @[CCPP_SUITE] + ccpp_suite = '@[CCPP_SUITE]' / diff --git a/tests/parm/input.mom6_ccpp.nml.IN b/tests/parm/input.mom6_ccpp.nml.IN index ec4acdd704..009a21d619 100644 --- a/tests/parm/input.mom6_ccpp.nml.IN +++ b/tests/parm/input.mom6_ccpp.nml.IN @@ -16,7 +16,7 @@ fhout = @[NFHOUT] fhmaxhf = @[NFHMAX_HF] fhouthf = @[NFHOUT_HF] - ccpp_suite = @[CCPP_SUITE] + ccpp_suite = '@[CCPP_SUITE]' / &diag_manager_nml