From 33413eec9b5fae4e57ac044cae3b398a928eba83 Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Fri, 30 Aug 2024 17:43:16 -0600 Subject: [PATCH 01/11] Incorporate MPAS-O and MPAS-SI perf timer PRs Use tags from the merged EarthWorksOrg/mpas-ocean #13 and EarthWorksOrg/mpas-seaice #16 --- .gitmodules | 4 ++-- components/mpas-ocean | 2 +- components/mpas-seaice | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index 8a6e8f7..e51e2d0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -164,14 +164,14 @@ url = https://github.com/EarthWorksOrg/mpas-ocean.git fxDONOTUSEurl = https://github.com/EarthWorksOrg/mpas-ocean.git fxrequired = ToplevelRequired - fxtag = mpaso-ew2.3.000 + fxtag = mpaso-ew2.3.001 [submodule "mpas-seaice"] path = components/mpas-seaice url = https://github.com/EarthWorksOrg/mpas-seaice.git fxDONOTUSEurl = https://github.com/EarthWorksOrg/mpas-seaice.git fxrequired = ToplevelRequired - fxtag = mpassi-ew2.3.000 + fxtag = mpassi-ew2.3.001 [submodule "mpas-framework"] path = components/mpas-framework diff --git a/components/mpas-ocean b/components/mpas-ocean index 642b868..3c4502b 160000 --- a/components/mpas-ocean +++ b/components/mpas-ocean @@ -1 +1 @@ -Subproject commit 642b8685198ed94977ea4766a83de175e3169135 +Subproject commit 3c4502b7e06effe8da0040f4c896c1f3a6f23c96 diff --git a/components/mpas-seaice b/components/mpas-seaice index 3d844b3..f99c44d 160000 --- a/components/mpas-seaice +++ b/components/mpas-seaice @@ -1 +1 @@ -Subproject commit 3d844b31ca12691e87734e97bb9e5aa5bc8df1d1 +Subproject commit f99c44dddc4673d61cb3d152b0af38b11e480cd1 From 73d9b36f1a621ac7310e8cc74164219d0b0f32cf Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Thu, 5 Sep 2024 10:31:55 -0600 Subject: [PATCH 02/11] Include another mpas-ocean change --- .gitmodules | 2 +- components/mpas-ocean | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index e51e2d0..4a17ddf 100644 --- a/.gitmodules +++ b/.gitmodules @@ -164,7 +164,7 @@ url = https://github.com/EarthWorksOrg/mpas-ocean.git fxDONOTUSEurl = https://github.com/EarthWorksOrg/mpas-ocean.git fxrequired = ToplevelRequired - fxtag = mpaso-ew2.3.001 + fxtag = mpaso-ew2.3.002 [submodule "mpas-seaice"] path = components/mpas-seaice diff --git a/components/mpas-ocean b/components/mpas-ocean index 3c4502b..8a10da3 160000 --- a/components/mpas-ocean +++ b/components/mpas-ocean @@ -1 +1 @@ -Subproject commit 3c4502b7e06effe8da0040f4c896c1f3a6f23c96 +Subproject commit 8a10da3c25f6275d9bb7cf74a9292111c4a4e5a5 From 461a8d11d51c0c768f495622cd65088aa5593da9 Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Tue, 10 Sep 2024 15:45:18 -0600 Subject: [PATCH 03/11] Incorpoate EarthWorksOrg/CAM perf timer PR Use PR branch from EarthWorksOrg/CAM #32 to use more descriptive ESMF timers within parts of the CAM code. --- .gitmodules | 2 +- components/cam | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 4a17ddf..da0f130 100644 --- a/.gitmodules +++ b/.gitmodules @@ -59,7 +59,7 @@ path = components/cam url = https://www.github.com/EarthWorksOrg/CAM fxDONOTUSEurl = https://www.github.com/ESCOMP/CAM - fxtag = cam-ew2.3.004 + fxtag = ew-develop-timersB fxrequired = ToplevelRequired [submodule "clm"] diff --git a/components/cam b/components/cam index ddee772..4396829 160000 --- a/components/cam +++ b/components/cam @@ -1 +1 @@ -Subproject commit ddee772d1a9e831958060b5916d41a563bbcf10d +Subproject commit 43968298437d470603cfa4b09d744614314f8d6d From eb2a96559f889c39a44364abe97aee46b5adafec Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Thu, 12 Sep 2024 19:42:01 -0600 Subject: [PATCH 04/11] Use merged tag of EarthWorksOrg/CAM PR#32 --- .gitmodules | 2 +- components/cam | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index da0f130..c9e0fe3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -59,7 +59,7 @@ path = components/cam url = https://www.github.com/EarthWorksOrg/CAM fxDONOTUSEurl = https://www.github.com/ESCOMP/CAM - fxtag = ew-develop-timersB + fxtag = cam-ew2.3.005 fxrequired = ToplevelRequired [submodule "clm"] diff --git a/components/cam b/components/cam index 4396829..d559861 160000 --- a/components/cam +++ b/components/cam @@ -1 +1 @@ -Subproject commit 43968298437d470603cfa4b09d744614314f8d6d +Subproject commit d55986162cb9fd4ad4cd156caffb3acc8dd18901 From 9f943e2a2b41842f9e812a73116a2a8fbc23277c Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Fri, 13 Sep 2024 19:22:29 -0600 Subject: [PATCH 05/11] Bring in PR branch for EWOrg/CTSM to add fsurdat files --- .gitmodules | 4 ++-- components/clm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index c9e0fe3..a350bd5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -64,10 +64,10 @@ [submodule "clm"] path = components/clm - url = https://github.com/EarthWorksOrg/CTSM + url = https://github.com/gdicker1/CTSM fxDONOTUSEurl = https://github.com/ESCOMP/CTSM fxrequired = ToplevelRequired - fxtag = ctsm-ew2.3.003 + fxtag = ew_mpasa_fsurdat_ctsm5.3 [submodule "cice"] path = components/cice diff --git a/components/clm b/components/clm index 72e4235..6188169 160000 --- a/components/clm +++ b/components/clm @@ -1 +1 @@ -Subproject commit 72e4235075e1b5c98d5cfe68173ac35f2edf93f6 +Subproject commit 61881693f7e14f515c494f24c41abe07a0ff5185 From 87f1864d8168a89c05c0092652bec92afc98fe94 Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Fri, 13 Sep 2024 19:23:03 -0600 Subject: [PATCH 06/11] Bring in PR branch for EWOrg/CAM to add ncdata and bnd_topo --- .gitmodules | 4 ++-- components/cam | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index a350bd5..664559c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -57,9 +57,9 @@ [submodule "cam"] path = components/cam - url = https://www.github.com/EarthWorksOrg/CAM + url = https://www.github.com/gdicker1/CAM fxDONOTUSEurl = https://www.github.com/ESCOMP/CAM - fxtag = cam-ew2.3.005 + fxtag = add_v8mpasfiles_eworg2 fxrequired = ToplevelRequired [submodule "clm"] diff --git a/components/cam b/components/cam index d559861..440e40d 160000 --- a/components/cam +++ b/components/cam @@ -1 +1 @@ -Subproject commit d55986162cb9fd4ad4cd156caffb3acc8dd18901 +Subproject commit 440e40de23c593463c6cc345ce9250692d8fef0c From d0bd09bd9715ed27e80bb49991abc661e8a3660f Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Sun, 15 Sep 2024 15:49:59 -0600 Subject: [PATCH 07/11] Modifications to EWOrg/CAM feature branch: add_v8mpasfiles_eworg2 --- components/cam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/cam b/components/cam index 440e40d..1409359 160000 --- a/components/cam +++ b/components/cam @@ -1 +1 @@ -Subproject commit 440e40de23c593463c6cc345ce9250692d8fef0c +Subproject commit 1409359c423b30cfaed56250aa658175dfcd63ae From 3bd4b65a434d1219a4048c1266521a96b2937647 Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Sun, 15 Sep 2024 15:44:15 -0600 Subject: [PATCH 08/11] Add a testmod_dir to enable some simple data check tests Tests that will use the ew-data_check testmod should be run with '--no-setup' to keep the impact as light as possible. Since failure of shell_commands during the CREATE_NEWCASE step are ignored, the success of './check_input_data' is recorded in the ew_check_data.txt file. A supplemental script is recommended to further automate this test. --- .../testmods_dirs/ew/data_check/shell_commands | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100755 cime_config/testmods_dirs/ew/data_check/shell_commands diff --git a/cime_config/testmods_dirs/ew/data_check/shell_commands b/cime_config/testmods_dirs/ew/data_check/shell_commands new file mode 100755 index 0000000..2751abb --- /dev/null +++ b/cime_config/testmods_dirs/ew/data_check/shell_commands @@ -0,0 +1,12 @@ +./case.setup +./preview_namelists +# Have to run the previous two steps for next command to succeed +./check_input_data +# Since cime will continue even if the above commands fail +# output success or fail to a special file +if [[ "0" == "$?" ]]; then + echo "EW INPUT DATA CHECK: SUCCESS" | tee ew_data_check.txt +else + echo "EW INPUT DATA CHECK: FAIL" | tee ew_data_check.txt + echo "It may be necessary to run ./check_input_data --download" | tee ew_data_check.txt +fi From 091ec568ceb7d8f1694d0e9ecf43531c4064106f Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Thu, 19 Sep 2024 10:34:39 -0600 Subject: [PATCH 09/11] Duplicate tests that use no_gw_front testmod The duplicates don't use the no_gw_front test mod. They are duplicated so that comparisons against a previous tag can still be performed, and future tags can compare against the new tests. --- cime_config/testlist_earthworks.xml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/cime_config/testlist_earthworks.xml b/cime_config/testlist_earthworks.xml index e45d818..a30f3a7 100644 --- a/cime_config/testlist_earthworks.xml +++ b/cime_config/testlist_earthworks.xml @@ -56,6 +56,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 9a6e013fbc805d92236a82a1ac179be23c62a0f9 Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Thu, 19 Sep 2024 13:59:42 -0600 Subject: [PATCH 10/11] Remove no_gw_front testmods and duplicate tests Since the MPAS-A input data has been updated, there's no longer a need to turn of gravity wave frontogenesis with use_gw_front=.false. in the atm namelist. --- cime_config/testlist_earthworks.xml | 28 ------------------- .../testmods_dirs/ew/no_gw_front/user_nl_cam | 1 - 2 files changed, 29 deletions(-) delete mode 100644 cime_config/testmods_dirs/ew/no_gw_front/user_nl_cam diff --git a/cime_config/testlist_earthworks.xml b/cime_config/testlist_earthworks.xml index a30f3a7..8b39a39 100644 --- a/cime_config/testlist_earthworks.xml +++ b/cime_config/testlist_earthworks.xml @@ -28,34 +28,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cime_config/testmods_dirs/ew/no_gw_front/user_nl_cam b/cime_config/testmods_dirs/ew/no_gw_front/user_nl_cam deleted file mode 100644 index 649521a..0000000 --- a/cime_config/testmods_dirs/ew/no_gw_front/user_nl_cam +++ /dev/null @@ -1 +0,0 @@ -use_gw_front=.false. From 0aa15308ab2e6f9da0a2811cdb26e8180606d87a Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Fri, 20 Sep 2024 11:05:20 -0600 Subject: [PATCH 11/11] Use tags for recently merged CAM and CTSM Use tags for EarthWorksOrg/CAM #33 and EarthWorksOrg/CTSM #12 --- .gitmodules | 8 ++++---- components/cam | 2 +- components/clm | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitmodules b/.gitmodules index 664559c..c0abe1e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -57,17 +57,17 @@ [submodule "cam"] path = components/cam - url = https://www.github.com/gdicker1/CAM + url = https://www.github.com/EarthWorksOrg/CAM fxDONOTUSEurl = https://www.github.com/ESCOMP/CAM - fxtag = add_v8mpasfiles_eworg2 + fxtag = cam-ew2.3.006 fxrequired = ToplevelRequired [submodule "clm"] path = components/clm - url = https://github.com/gdicker1/CTSM + url = https://github.com/EarthWorksOrg/CTSM fxDONOTUSEurl = https://github.com/ESCOMP/CTSM fxrequired = ToplevelRequired - fxtag = ew_mpasa_fsurdat_ctsm5.3 + fxtag = ctsm-ew2.3.004 [submodule "cice"] path = components/cice diff --git a/components/cam b/components/cam index 1409359..6344fe3 160000 --- a/components/cam +++ b/components/cam @@ -1 +1 @@ -Subproject commit 1409359c423b30cfaed56250aa658175dfcd63ae +Subproject commit 6344fe3cdb9a2c936bc7fe3146b0b45964ccccaa diff --git a/components/clm b/components/clm index 6188169..34c1461 160000 --- a/components/clm +++ b/components/clm @@ -1 +1 @@ -Subproject commit 61881693f7e14f515c494f24c41abe07a0ff5185 +Subproject commit 34c1461cd6127e4eba2ca0712bfeab0a5143271b