From 7b826d43b71a9daa74598f65399f7f23b85151ee Mon Sep 17 00:00:00 2001 From: "denise.worthen" Date: Sat, 27 Mar 2021 12:30:58 +0000 Subject: [PATCH 1/9] 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/9] 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/9] 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/9] 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 9f4cbbf30c77a314cc667362940d63d8f0e7eeea Mon Sep 17 00:00:00 2001 From: "denise.worthen" Date: Sun, 24 Apr 2022 11:02:27 +0000 Subject: [PATCH 5/9] update CMEPS --- .gitmodules | 6 ++++-- CMEPS-interface/CMEPS | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 5ece87098e..add9eb498b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -16,8 +16,10 @@ branch = develop [submodule "CMEPS"] path = CMEPS-interface/CMEPS - url = https://github.com/NOAA-EMC/CMEPS - branch = emc/develop + #url = https://github.com/NOAA-EMC/CMEPS + #branch = emc/develop + url = https://github.com/DeniseWorthen/CMEPS + branch = feature/updcmeps [submodule "HYCOM"] path = HYCOM-interface/HYCOM url = https://github.com/NOAA-EMC/HYCOM-src diff --git a/CMEPS-interface/CMEPS b/CMEPS-interface/CMEPS index df272f1430..70d3f16d7d 160000 --- a/CMEPS-interface/CMEPS +++ b/CMEPS-interface/CMEPS @@ -1 +1 @@ -Subproject commit df272f1430c05236843b983b1b0cf760c29d5397 +Subproject commit 70d3f16d7de4587af372dce2aa1f49ba4b543a7c From 2391e4b81af999828c2429851a1a64927aacee29 Mon Sep 17 00:00:00 2001 From: Denise Worthen Date: Mon, 25 Apr 2022 17:19:52 -0400 Subject: [PATCH 6/9] Revert "update CMEPS" * mistakenly committed to develop branch This reverts commit 9f4cbbf30c77a314cc667362940d63d8f0e7eeea. --- .gitmodules | 6 ++---- CMEPS-interface/CMEPS | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index add9eb498b..5ece87098e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -16,10 +16,8 @@ branch = develop [submodule "CMEPS"] path = CMEPS-interface/CMEPS - #url = https://github.com/NOAA-EMC/CMEPS - #branch = emc/develop - url = https://github.com/DeniseWorthen/CMEPS - branch = feature/updcmeps + url = https://github.com/NOAA-EMC/CMEPS + branch = emc/develop [submodule "HYCOM"] path = HYCOM-interface/HYCOM url = https://github.com/NOAA-EMC/HYCOM-src diff --git a/CMEPS-interface/CMEPS b/CMEPS-interface/CMEPS index 70d3f16d7d..df272f1430 160000 --- a/CMEPS-interface/CMEPS +++ b/CMEPS-interface/CMEPS @@ -1 +1 @@ -Subproject commit 70d3f16d7de4587af372dce2aa1f49ba4b543a7c +Subproject commit df272f1430c05236843b983b1b0cf760c29d5397 From 53e642282a9367577fcce43a9d6c0f7ceed65983 Mon Sep 17 00:00:00 2001 From: "denise.worthen" Date: Wed, 15 Jun 2022 15:42:10 -0600 Subject: [PATCH 7/9] point to mapwav branch for CMEPS --- .gitmodules | 6 ++++-- CMEPS-interface/CMEPS | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 5ece87098e..c47e1ad6ee 100644 --- a/.gitmodules +++ b/.gitmodules @@ -16,8 +16,10 @@ branch = develop [submodule "CMEPS"] path = CMEPS-interface/CMEPS - url = https://github.com/NOAA-EMC/CMEPS - branch = emc/develop + #url = https://github.com/NOAA-EMC/CMEPS + #branch = emc/develop + url = https://github.com/DeniseWorthen/CMEPS + branch = feature/mapwav [submodule "HYCOM"] path = HYCOM-interface/HYCOM url = https://github.com/NOAA-EMC/HYCOM-src diff --git a/CMEPS-interface/CMEPS b/CMEPS-interface/CMEPS index 424a08638d..11d06d37ba 160000 --- a/CMEPS-interface/CMEPS +++ b/CMEPS-interface/CMEPS @@ -1 +1 @@ -Subproject commit 424a08638dc34828b2aa64fbb75e7f368f52bf3d +Subproject commit 11d06d37baeadb4cddd8cb26b91846a70361d04b From 77b4eed65e9448129bad8e6c8ee1a62898df0f61 Mon Sep 17 00:00:00 2001 From: "denise.worthen" Date: Wed, 15 Jun 2022 16:11:45 -0600 Subject: [PATCH 8/9] all s2swa tests pass on cheyenne.intel From fb5b54baeb40bf3c55f9023699a31fdd15b4320f Mon Sep 17 00:00:00 2001 From: "denise.worthen" Date: Thu, 16 Jun 2022 15:11:23 -0600 Subject: [PATCH 9/9] update CMEPS w/ fix for hafs failure * all tests using cmeps (s2s, hafs, cdeps) pass on cheyenne.intel --- CMEPS-interface/CMEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMEPS-interface/CMEPS b/CMEPS-interface/CMEPS index 11d06d37ba..48e9bca9e3 160000 --- a/CMEPS-interface/CMEPS +++ b/CMEPS-interface/CMEPS @@ -1 +1 @@ -Subproject commit 11d06d37baeadb4cddd8cb26b91846a70361d04b +Subproject commit 48e9bca9e3800decec9d53e99d57626774ab011e