From 3d04ab928479bc9c39903e9eeeb7e3243bcd65d9 Mon Sep 17 00:00:00 2001 From: dazlich Date: Mon, 26 Feb 2024 13:06:52 -0700 Subject: [PATCH 01/35] use mpas-* framework-ext-refs branches This file will checkout the framework-ext-refs branches of mpas-framework, mpas-ocean, and mpas-seaice. Those branches eliminate the conflicting external references. --- Externals.cfg | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index da75c26..6d90b40 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -95,21 +95,24 @@ externals = Externals_CLM.cfg required = True [mpas-ocean] -tag = mpaso-ew2.1.000 +#tag = mpaso-ew2.1.000 +branch = framework-ext-refs protocol = git repo_url = https://github.com/EarthWorksOrg/mpas-ocean.git local_path = components/mpas-ocean required = True [mpas-seaice] -tag = mpassi-ew2.1.001 +#tag = mpaso-ew2.1.001 +branch = framework-ext-refs protocol = git repo_url = https://github.com/EarthWorksOrg/mpas-seaice.git local_path = components/mpas-seaice required = True [mpas-framework] -tag = mpasfrwk-ew2.1.001 +#tag = mpaso-ew2.1.001 +branch = framework-ext-refs protocol = git repo_url = https://github.com/EarthWorksOrg/mpas-framework.git local_path = components/mpas-framework From 24948add9992ac1bb3c1c8880faf2ab9002cdb7a Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Fri, 29 Mar 2024 12:12:16 -0600 Subject: [PATCH 02/35] Switch from branches to tags of the merged PRs Fixes #36 by addressing the "Multiple definition" errors that would occur in OpenACC builds of the FullyCoupled compset --- Externals.cfg | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index 6d90b40..a6a27d7 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -95,24 +95,21 @@ externals = Externals_CLM.cfg required = True [mpas-ocean] -#tag = mpaso-ew2.1.000 -branch = framework-ext-refs +tag = mpaso-ew2.1.001 protocol = git repo_url = https://github.com/EarthWorksOrg/mpas-ocean.git local_path = components/mpas-ocean required = True [mpas-seaice] -#tag = mpaso-ew2.1.001 -branch = framework-ext-refs +tag = mpassi-ew2.1.002 protocol = git repo_url = https://github.com/EarthWorksOrg/mpas-seaice.git local_path = components/mpas-seaice required = True [mpas-framework] -#tag = mpaso-ew2.1.001 -branch = framework-ext-refs +tag = mpasfrwk-ew2.1.002 protocol = git repo_url = https://github.com/EarthWorksOrg/mpas-framework.git local_path = components/mpas-framework From 55172dd86d818621dfc4ea0ff3bb6a18e14323d7 Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Tue, 16 Apr 2024 11:47:11 -0600 Subject: [PATCH 03/35] ccs_configs and cime changes to get nvhpc/24.3 on Derecho --- Externals.cfg | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index a6a27d7..90dfafe 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -1,5 +1,6 @@ [ccs_config] -tag = ccs_config-ew2.1.000 +# tag = ccs_config-ew2.1.000 +branch = update/upstream_derecho_nvhpc24.3 protocol = git repo_url = https://github.com/EarthWorksOrg/ccs_config_cesm.git local_path = ccs_config @@ -72,7 +73,8 @@ local_path = libraries/parallelio required = True [cime] -tag = cime-ew2.1.000 +# tag = cime-ew2.1.000 +branch = update/upstream_derecho_nvhpc24.3 protocol = git repo_url = https://github.com/EarthWorksOrg/cime local_path = cime From fd2bda811c2bfdeb50465dd252c0de7df9db4e1d Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Fri, 19 Apr 2024 12:48:34 -0600 Subject: [PATCH 04/35] Change branches for ccs_configs and cime to tags Set ccs_configs to use 'ccs_config-ew2.1.002' and cime to use 'cime-ew2.1.001'. --- Externals.cfg | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index 90dfafe..3e4ee16 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -1,6 +1,5 @@ [ccs_config] -# tag = ccs_config-ew2.1.000 -branch = update/upstream_derecho_nvhpc24.3 +tag = ccs_config-ew2.1.002 protocol = git repo_url = https://github.com/EarthWorksOrg/ccs_config_cesm.git local_path = ccs_config @@ -73,8 +72,7 @@ local_path = libraries/parallelio required = True [cime] -# tag = cime-ew2.1.000 -branch = update/upstream_derecho_nvhpc24.3 +tag = cime-ew2.1.001 protocol = git repo_url = https://github.com/EarthWorksOrg/cime local_path = cime From 09aab57fb655708f569ed6e1402b1de6a5b59be4 Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Fri, 3 May 2024 11:09:43 -0600 Subject: [PATCH 05/35] Test mpasfrwk and mpassi changes These are related to EWOrg/mpas-framework PR#8 and EWOrg/mpas-seaice PR#10 --- Externals.cfg | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index 3e4ee16..27ffe39 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -102,14 +102,16 @@ local_path = components/mpas-ocean required = True [mpas-seaice] -tag = mpassi-ew2.1.002 +branch = gnu_prescribed_ice +# tag = mpassi-ew2.1.002 protocol = git repo_url = https://github.com/EarthWorksOrg/mpas-seaice.git local_path = components/mpas-seaice required = True [mpas-framework] -tag = mpasfrwk-ew2.1.002 +branch = fix_framework_conflicts +# tag = mpasfrwk-ew2.1.002 protocol = git repo_url = https://github.com/EarthWorksOrg/mpas-framework.git local_path = components/mpas-framework From 3f2a14dd5af4857705cca964c9a8956d7f652861 Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Fri, 3 May 2024 11:22:31 -0600 Subject: [PATCH 06/35] Switch mpas-{frwk,si} to use tags of merged changes --- Externals.cfg | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index 27ffe39..c8c5ad0 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -102,16 +102,14 @@ local_path = components/mpas-ocean required = True [mpas-seaice] -branch = gnu_prescribed_ice -# tag = mpassi-ew2.1.002 +tag = mpassi-ew2.1.003 protocol = git repo_url = https://github.com/EarthWorksOrg/mpas-seaice.git local_path = components/mpas-seaice required = True [mpas-framework] -branch = fix_framework_conflicts -# tag = mpasfrwk-ew2.1.002 +tag = mpasfrwk-ew2.1.003 protocol = git repo_url = https://github.com/EarthWorksOrg/mpas-framework.git local_path = components/mpas-framework From b56dd0e5dbb26d3d246b4d1c228db8b9fb443fa2 Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Thu, 9 May 2024 09:40:26 -0600 Subject: [PATCH 07/35] Add 'FullyCoupled-EW' entry to config_compsets.xml This begins steps to use the workflow in CIME. A section now exists for EarthWorks specific tests and such compsets should include the '-EW' postfix. --- cime_config/config_compsets.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml index 25463d6..5d1f7f8 100644 --- a/cime_config/config_compsets.xml +++ b/cime_config/config_compsets.xml @@ -36,6 +36,14 @@ - grid (optional regular expression match for grid to work with the compset) + + + FullyCoupled-EW + 2000_CAM60_CLM50%SP_MPASSI_MPASO_SROF_SGLC_SWAV + + + + From c275d1f66ffbefceb07a3eb1459989d03061018b Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Fri, 10 May 2024 12:01:08 -0600 Subject: [PATCH 08/35] Make first attempt at adding test for FullyCoupled compset This first test is a 5 day (default length) "smoke-test", using 1 Derecho node, nuopc coupled, on the 480km grid. --- cime_config/testlist_earthworks.xml | 12 ++++++++++++ .../earthworks/fullycoupled/user_nl_mpaso | 2 ++ 2 files changed, 14 insertions(+) create mode 100644 cime_config/testlist_earthworks.xml create mode 100644 cime_config/testmods_dirs/earthworks/fullycoupled/user_nl_mpaso diff --git a/cime_config/testlist_earthworks.xml b/cime_config/testlist_earthworks.xml new file mode 100644 index 0000000..a7be0b9 --- /dev/null +++ b/cime_config/testlist_earthworks.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/cime_config/testmods_dirs/earthworks/fullycoupled/user_nl_mpaso b/cime_config/testmods_dirs/earthworks/fullycoupled/user_nl_mpaso new file mode 100644 index 0000000..60bd4cc --- /dev/null +++ b/cime_config/testmods_dirs/earthworks/fullycoupled/user_nl_mpaso @@ -0,0 +1,2 @@ + +config_cvmix_kpp_use_theory_wave = .true. From 6cfd51cd94204e758bbd0f47334fa53ffa30cff4 Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Fri, 10 May 2024 12:15:44 -0600 Subject: [PATCH 09/35] Change grid to 120km for SMS FullyCoupled test --- cime_config/testlist_earthworks.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/testlist_earthworks.xml b/cime_config/testlist_earthworks.xml index a7be0b9..ea95b8d 100644 --- a/cime_config/testlist_earthworks.xml +++ b/cime_config/testlist_earthworks.xml @@ -1,6 +1,6 @@ - + From c38de6a82e6c9caf80aeab25a0f61b102aca76bb Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Fri, 10 May 2024 12:23:47 -0600 Subject: [PATCH 10/35] Incorporate changes from Externals for cime testing --- Externals.cfg | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index c8c5ad0..b605506 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -1,7 +1,9 @@ [ccs_config] -tag = ccs_config-ew2.1.002 +# tag = ccs_config-ew2.1.002 +branch = fix_lowres_oQU protocol = git -repo_url = https://github.com/EarthWorksOrg/ccs_config_cesm.git +repo_url = https://github.com/gdicker1/ccs_config_cesm.git +# repo_url = https://github.com/EarthWorksOrg/ccs_config_cesm.git local_path = ccs_config required = True @@ -102,9 +104,11 @@ local_path = components/mpas-ocean required = True [mpas-seaice] -tag = mpassi-ew2.1.003 +branch = configdt_highresgrids +# tag = mpassi-ew2.1.003 protocol = git -repo_url = https://github.com/EarthWorksOrg/mpas-seaice.git +repo_url = https://github.com/gdicker1/mpas-seaice.git +# repo_url = https://github.com/EarthWorksOrg/mpas-seaice.git local_path = components/mpas-seaice required = True From f59be4f30880cbf7126e0a6a243a91a7c2e2025f Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Tue, 14 May 2024 14:18:47 -0600 Subject: [PATCH 11/35] Expand 'ew-pr' tests to all EW compsets These tests ensure that the other EarthWorks compsets aren't affected by a PR including FHS94, FKESSLER, QPC6, F2000climo at 120km. A few compilers are checked for compatability. Checking smoke tests of these runs should help catch many reversions or issues. --- cime_config/testlist_earthworks.xml | 42 +++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/cime_config/testlist_earthworks.xml b/cime_config/testlist_earthworks.xml index ea95b8d..ead29dd 100644 --- a/cime_config/testlist_earthworks.xml +++ b/cime_config/testlist_earthworks.xml @@ -1,8 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From a6b2901f192a482719b5f538815c0962875622ed Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Tue, 14 May 2024 14:25:20 -0600 Subject: [PATCH 12/35] Add z32 to grid for FHS94 and FKESSLER tests This makes use of some syntatic sugar to make sure the FHS94 and FKESSLER don't try to use 'vcoords' files for ncdata. Asking for 'mpasa120z32_mpasa120' sets 'nlev' to 32 (instead of 30 which is the default). --- cime_config/testlist_earthworks.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cime_config/testlist_earthworks.xml b/cime_config/testlist_earthworks.xml index ead29dd..53f9817 100644 --- a/cime_config/testlist_earthworks.xml +++ b/cime_config/testlist_earthworks.xml @@ -1,6 +1,6 @@ - + @@ -10,7 +10,7 @@ - + From 85239389b22b2c81d7fb60c07548d4eceb3327df Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Wed, 15 May 2024 11:53:17 -0600 Subject: [PATCH 13/35] Reduce wallclock requested for ew-pr tests All 120km runs came in under these new limits. This change should help ew-pr tests get through the Derecho queue more quickly. --- cime_config/testlist_earthworks.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cime_config/testlist_earthworks.xml b/cime_config/testlist_earthworks.xml index 53f9817..9ab0747 100644 --- a/cime_config/testlist_earthworks.xml +++ b/cime_config/testlist_earthworks.xml @@ -7,7 +7,7 @@ - + @@ -17,7 +17,7 @@ - + @@ -27,7 +27,7 @@ - + @@ -37,7 +37,7 @@ - + @@ -47,7 +47,7 @@ - + From c3b7fbc33be067ea6b9bdf736a95f65ae748f5f1 Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Wed, 15 May 2024 11:58:37 -0600 Subject: [PATCH 14/35] Reduce compilers requested in ew-pr tests This change should reduce the overall cost of running the ew-pr test category by doing wide testing for the least and most complicated compsets. The NVHPC compilers are used for every compset since EarthWorks depends on it and NVHPC testing of these compsets isn't commonly done. --- cime_config/testlist_earthworks.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/cime_config/testlist_earthworks.xml b/cime_config/testlist_earthworks.xml index 9ab0747..277027e 100644 --- a/cime_config/testlist_earthworks.xml +++ b/cime_config/testlist_earthworks.xml @@ -13,8 +13,6 @@ - - @@ -23,8 +21,6 @@ - - @@ -33,8 +29,6 @@ - - From 46275642be3dbe2ee4f62f4e103003fe90e3b771 Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Thu, 16 May 2024 16:23:37 -0600 Subject: [PATCH 15/35] Update externals with dt and cpl interval changes --- Externals.cfg | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index b605506..f475761 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -8,9 +8,11 @@ local_path = ccs_config required = True [cam] -tag = cam-ew2.1.002 +branch = update/ew_mpasa_timesteps +# tag = cam-ew2.1.002 protocol = git -repo_url = https://github.com/EarthWorksOrg/CAM +repo_url = https://github.com/gdicker1/CAM +# repo_url = https://github.com/EarthWorksOrg/CAM local_path = components/cam externals = Externals_CAM.cfg required = True @@ -31,9 +33,11 @@ externals = Externals.cfg required = True [cmeps] -tag = cmeps-ew2.1.000 +branch = ew_atmcpl_intervals +# tag = cmeps-ew2.1.000 protocol = git -repo_url = https://github.com/EarthWorksOrg/CMEPS.git +repo_url = https://github.com/gdicker1/CMEPS.git +# repo_url = https://github.com/EarthWorksOrg/CMEPS.git local_path = components/cmeps required = True @@ -97,9 +101,11 @@ externals = Externals_CLM.cfg required = True [mpas-ocean] -tag = mpaso-ew2.1.001 +branch = configdt_highresgrids +# tag = mpaso-ew2.1.001 protocol = git -repo_url = https://github.com/EarthWorksOrg/mpas-ocean.git +repo_url = https://github.com/gdicker1/mpas-ocean.git +# repo_url = https://github.com/EarthWorksOrg/mpas-ocean.git local_path = components/mpas-ocean required = True From 6efecc420571243179c265dcdfcb8a0d8bde77bc Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Thu, 16 May 2024 16:38:35 -0600 Subject: [PATCH 16/35] Add aliases for other custom EW compsets Add EarthWorks equivalents of the B2000 and F2000climo compsets that use MPAS-O and MPAS-SI instead. --- cime_config/config_compsets.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml index 5d1f7f8..ff5d319 100644 --- a/cime_config/config_compsets.xml +++ b/cime_config/config_compsets.xml @@ -42,6 +42,18 @@ 2000_CAM60_CLM50%SP_MPASSI_MPASO_SROF_SGLC_SWAV + + + F2000climo-EW + 2000_CAM60_CLM50%SP_MPASSI%PRES_DOCN%DOM_MOSART_CISM2%NOEVOLVE_SWAV + + + + + B2000-EW + 2000_CAM60_CLM50%SP_MPASSI_MPASO_MOSART_SGLC_SWAV + + @@ -123,3 +135,8 @@ + + + + + From 2060d139fa20202009f40ef529492446e02d157c Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Thu, 16 May 2024 17:10:34 -0600 Subject: [PATCH 17/35] Add placeholders for ew-ver and ew-rel categories These are initial tests that serve as a starting point. More should be added in the future. The 'ew-ver' test added should work for what is described on the CESM website for held-suarez. This is a 1200 day forward run of the FHS94 compset with the 120km 32 level MPAS-A grid. See "https://www.cesm.ucar.edu/models/simple/held-suarez" The 'ew-rel' tests are starting with FullyCoupled-EW runs on 120, 60, 30, and 15km grids. These tests are "exact restart" tests that run forward for 11 days, write a restart on day 6, and then restarts with half the number of tasks to reach the same 11 day mark. --- cime_config/testlist_earthworks.xml | 61 +++++++++++++++++++ .../earthworks/fullycoupled/user_nl_mpaso | 2 - 2 files changed, 61 insertions(+), 2 deletions(-) delete mode 100644 cime_config/testmods_dirs/earthworks/fullycoupled/user_nl_mpaso diff --git a/cime_config/testlist_earthworks.xml b/cime_config/testlist_earthworks.xml index 277027e..010333e 100644 --- a/cime_config/testlist_earthworks.xml +++ b/cime_config/testlist_earthworks.xml @@ -1,5 +1,7 @@ + + @@ -45,4 +47,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cime_config/testmods_dirs/earthworks/fullycoupled/user_nl_mpaso b/cime_config/testmods_dirs/earthworks/fullycoupled/user_nl_mpaso deleted file mode 100644 index 60bd4cc..0000000 --- a/cime_config/testmods_dirs/earthworks/fullycoupled/user_nl_mpaso +++ /dev/null @@ -1,2 +0,0 @@ - -config_cvmix_kpp_use_theory_wave = .true. From f8589b9c46f5b1faf8f90e7a99b2c9517df1389f Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Fri, 17 May 2024 13:52:50 -0600 Subject: [PATCH 18/35] Remove FullyCoupled-EW testmods, already in mpas-ocean --- cime_config/testlist_earthworks.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/testlist_earthworks.xml b/cime_config/testlist_earthworks.xml index 010333e..14b46e2 100644 --- a/cime_config/testlist_earthworks.xml +++ b/cime_config/testlist_earthworks.xml @@ -36,7 +36,7 @@ - + From f42ef24064630fe85d860fb736b24c60ea647b6a Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Mon, 20 May 2024 17:50:53 -0600 Subject: [PATCH 19/35] Increase walltime req for FullyCoupled test --- cime_config/testlist_earthworks.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/testlist_earthworks.xml b/cime_config/testlist_earthworks.xml index 14b46e2..01c850f 100644 --- a/cime_config/testlist_earthworks.xml +++ b/cime_config/testlist_earthworks.xml @@ -43,7 +43,7 @@ - + From d089a019b12ef2fba9156af5e5aafe483ccf8d86 Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Mon, 20 May 2024 17:56:40 -0600 Subject: [PATCH 20/35] Rename EW specific compsets Remove the hyphen characters from the names (because test names will be confusing enough, already). Also, since there is no B2000 compset, rename to the Coupled, Hexagonal, Atmosphere, Ocean, and Seaice 2000 (CHAOS2000) compset. --- cime_config/config_compsets.xml | 40 ++++++++++++++--------------- cime_config/testlist_earthworks.xml | 12 ++++----- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml index ff5d319..d8be629 100644 --- a/cime_config/config_compsets.xml +++ b/cime_config/config_compsets.xml @@ -36,26 +36,6 @@ - grid (optional regular expression match for grid to work with the compset) - - - FullyCoupled-EW - 2000_CAM60_CLM50%SP_MPASSI_MPASO_SROF_SGLC_SWAV - - - - - F2000climo-EW - 2000_CAM60_CLM50%SP_MPASSI%PRES_DOCN%DOM_MOSART_CISM2%NOEVOLVE_SWAV - - - - - B2000-EW - 2000_CAM60_CLM50%SP_MPASSI_MPASO_MOSART_SGLC_SWAV - - - - @@ -121,6 +101,26 @@ 1850_DATM%CRUv7_CLM50%BGC-CROP_CICE_POP2_MOSART_CISM2%GRIS-EVOLVE_SWAV + + + + + F2000climoEW + 2000_CAM60_CLM50%SP_MPASSI%PRES_DOCN%DOM_MOSART_CISM2%NOEVOLVE_SWAV + + + + FullyCoupledEW + 2000_CAM60_CLM50%SP_MPASSI_MPASO_SROF_SGLC_SWAV + + + + + CHAOS2000 + 2000_CAM60_CLM50%SP_MPASSI_MPASO_MOSART_SGLC_SWAV + + diff --git a/cime_config/testlist_earthworks.xml b/cime_config/testlist_earthworks.xml index 01c850f..8517a10 100644 --- a/cime_config/testlist_earthworks.xml +++ b/cime_config/testlist_earthworks.xml @@ -36,7 +36,7 @@ - + @@ -61,7 +61,7 @@ - + @@ -70,7 +70,7 @@ - + @@ -79,7 +79,7 @@ - + @@ -88,7 +88,7 @@ - + @@ -97,7 +97,7 @@ - + From cc211430bd1767784d9a1466e34ced89276f4e3e Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Tue, 21 May 2024 09:22:09 -0600 Subject: [PATCH 21/35] Update Externals.cfg with new tags from sub-PRs --- Externals.cfg | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index f475761..aa5a84c 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -1,18 +1,14 @@ [ccs_config] -# tag = ccs_config-ew2.1.002 -branch = fix_lowres_oQU +tag = ccs_config-ew2.1.003 protocol = git -repo_url = https://github.com/gdicker1/ccs_config_cesm.git -# repo_url = https://github.com/EarthWorksOrg/ccs_config_cesm.git +repo_url = https://github.com/EarthWorksOrg/ccs_config_cesm.git local_path = ccs_config required = True [cam] -branch = update/ew_mpasa_timesteps -# tag = cam-ew2.1.002 +tag = cam-ew2.1.003 protocol = git -repo_url = https://github.com/gdicker1/CAM -# repo_url = https://github.com/EarthWorksOrg/CAM +repo_url = https://github.com/EarthWorksOrg/CAM local_path = components/cam externals = Externals_CAM.cfg required = True @@ -33,11 +29,9 @@ externals = Externals.cfg required = True [cmeps] -branch = ew_atmcpl_intervals -# tag = cmeps-ew2.1.000 +tag = cmeps-ew2.1.001 protocol = git -repo_url = https://github.com/gdicker1/CMEPS.git -# repo_url = https://github.com/EarthWorksOrg/CMEPS.git +repo_url = https://github.com/EarthWorksOrg/CMEPS.git local_path = components/cmeps required = True @@ -101,20 +95,16 @@ externals = Externals_CLM.cfg required = True [mpas-ocean] -branch = configdt_highresgrids -# tag = mpaso-ew2.1.001 +tag = mpaso-ew2.1.002 protocol = git -repo_url = https://github.com/gdicker1/mpas-ocean.git -# repo_url = https://github.com/EarthWorksOrg/mpas-ocean.git +repo_url = https://github.com/EarthWorksOrg/mpas-ocean.git local_path = components/mpas-ocean required = True [mpas-seaice] -branch = configdt_highresgrids -# tag = mpassi-ew2.1.003 +tag = mpassi-ew2.1.004 protocol = git -repo_url = https://github.com/gdicker1/mpas-seaice.git -# repo_url = https://github.com/EarthWorksOrg/mpas-seaice.git +repo_url = https://github.com/EarthWorksOrg/mpas-seaice.git local_path = components/mpas-seaice required = True From ad360221094a30e724703c04833eb495cf3e46c0 Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Wed, 22 May 2024 17:22:20 -0600 Subject: [PATCH 22/35] Bring in changes to EWOrg/CAM for cam_dev physics --- Externals.cfg | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index aa5a84c..84a9235 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -6,9 +6,11 @@ local_path = ccs_config required = True [cam] -tag = cam-ew2.1.003 +branch = add_v8mpasfiles_eworg +# tag = cam-ew2.1.003 protocol = git -repo_url = https://github.com/EarthWorksOrg/CAM +repo_url = https://github.com/gdicker1/CAM +# repo_url = https://github.com/EarthWorksOrg/CAM local_path = components/cam externals = Externals_CAM.cfg required = True From 2ccd9c3e4778dea8681f91acec6f0a318b6f7fb6 Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Thu, 23 May 2024 10:09:44 -0600 Subject: [PATCH 23/35] Incorporate gh1 changes to ccs_configs --- Externals.cfg | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index 84a9235..c744eb3 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -1,7 +1,9 @@ [ccs_config] -tag = ccs_config-ew2.1.003 +branch = add_machine_gh1 +# tag = ccs_config-ew2.1.003 protocol = git -repo_url = https://github.com/EarthWorksOrg/ccs_config_cesm.git +repo_url = https://github.com/gdicker1/ccs_config_cesm.git +# repo_url = https://github.com/EarthWorksOrg/ccs_config_cesm.git local_path = ccs_config required = True From e51366d4c8e1b49320d6ab1d005dd55d5c5a5a71 Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Tue, 28 May 2024 14:55:40 -0600 Subject: [PATCH 24/35] Include EWOrg/CAM PR #16 changes, use new tag --- Externals.cfg | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index c744eb3..dc48998 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -8,11 +8,9 @@ local_path = ccs_config required = True [cam] -branch = add_v8mpasfiles_eworg -# tag = cam-ew2.1.003 +tag = cam-ew2.1.004 protocol = git -repo_url = https://github.com/gdicker1/CAM -# repo_url = https://github.com/EarthWorksOrg/CAM +repo_url = https://github.com/EarthWorksOrg/CAM local_path = components/cam externals = Externals_CAM.cfg required = True From a6378a4cfdf866a0ba95036c8542c6ec0883325c Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Thu, 30 May 2024 14:03:53 -0600 Subject: [PATCH 25/35] Include EWOrg/ccs_config #20 changes, use tag --- Externals.cfg | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index dc48998..7365806 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -1,9 +1,7 @@ [ccs_config] -branch = add_machine_gh1 -# tag = ccs_config-ew2.1.003 +tag = ccs_config-ew2.1.004 protocol = git -repo_url = https://github.com/gdicker1/ccs_config_cesm.git -# repo_url = https://github.com/EarthWorksOrg/ccs_config_cesm.git +repo_url = https://github.com/EarthWorksOrg/ccs_config_cesm.git local_path = ccs_config required = True From 74aa29b14dcbf471718d30998499f5725c54efc8 Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Thu, 30 May 2024 00:05:12 -0600 Subject: [PATCH 26/35] Add 2 new compsets that use cam_dev physics F2000devEW copies F2000dev from CAM, but uses the mpas-seaice prescribed mode instead of CICE. CHAOS2000dev uses the cam_dev physics instead of CAM6. These compsets should allow CPU+GPU runs of MPAS-A dycore, PUMAS, and RRTMPG. --- cime_config/config_compsets.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml index d8be629..a1e6e90 100644 --- a/cime_config/config_compsets.xml +++ b/cime_config/config_compsets.xml @@ -110,6 +110,12 @@ 2000_CAM60_CLM50%SP_MPASSI%PRES_DOCN%DOM_MOSART_CISM2%NOEVOLVE_SWAV + + + F2000devEW + 2000_CAM%DEV_CLM50%SP_MPASSI%PRES_DOCN%DOM_MOSART_SGLC_SWAV + + FullyCoupledEW 2000_CAM60_CLM50%SP_MPASSI_MPASO_SROF_SGLC_SWAV @@ -121,6 +127,12 @@ 2000_CAM60_CLM50%SP_MPASSI_MPASO_MOSART_SGLC_SWAV + + + CHAOS2000dev + 2000_CAM%DEV_CLM50%SP_MPASSI_MPASO_MOSART_SGLC_SWAV + + From a1f7b92ce67ebf99175f39d55aab4e1c357d6480 Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Thu, 30 May 2024 00:20:01 -0600 Subject: [PATCH 27/35] Use CAM branch with EWOrg/rrtmgp external --- Externals.cfg | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Externals.cfg b/Externals.cfg index 7365806..1fbbf8e 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -6,7 +6,8 @@ local_path = ccs_config required = True [cam] -tag = cam-ew2.1.004 +branch = ew-develop-rrtmgp2.2 +# tag = cam-ew2.1.004 protocol = git repo_url = https://github.com/EarthWorksOrg/CAM local_path = components/cam From 07126b51641c39ed98e0c398c9132d303e5a000e Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Thu, 30 May 2024 10:06:26 -0600 Subject: [PATCH 28/35] Make F2000climoEW consistent with F2000devEW To match F2000climo from CAM and the new F2000devEW compset, F2000climoEW should use SGLC instead of CISM2%NO_EVOLVE. --- cime_config/config_compsets.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml index a1e6e90..115204c 100644 --- a/cime_config/config_compsets.xml +++ b/cime_config/config_compsets.xml @@ -107,7 +107,7 @@ F2000climoEW - 2000_CAM60_CLM50%SP_MPASSI%PRES_DOCN%DOM_MOSART_CISM2%NOEVOLVE_SWAV + 2000_CAM60_CLM50%SP_MPASSI%PRES_DOCN%DOM_MOSART_SGLC_SWAV From cf1238edc49f71983ad371bc3e96829bdb08a5ee Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Thu, 30 May 2024 14:07:15 -0600 Subject: [PATCH 29/35] Include EWOrg/CAM #18 changes, use tag --- Externals.cfg | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index 1fbbf8e..53f68a9 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -6,8 +6,7 @@ local_path = ccs_config required = True [cam] -branch = ew-develop-rrtmgp2.2 -# tag = cam-ew2.1.004 +tag = cam-ew2.1.005 protocol = git repo_url = https://github.com/EarthWorksOrg/CAM local_path = components/cam From 232c54aec4b10fd0a02df6fe6924addabaef5646 Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Fri, 31 May 2024 16:36:18 -0600 Subject: [PATCH 30/35] Reorder ew-rel tests --- cime_config/testlist_earthworks.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cime_config/testlist_earthworks.xml b/cime_config/testlist_earthworks.xml index 8517a10..5141849 100644 --- a/cime_config/testlist_earthworks.xml +++ b/cime_config/testlist_earthworks.xml @@ -70,25 +70,25 @@ - + - + - + - + - + @@ -97,7 +97,7 @@ - + From b0f80aed7d62a476db71b7032686233018d90a36 Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Fri, 31 May 2024 16:39:53 -0600 Subject: [PATCH 31/35] Add CHAOS2000dev and F2000climoEW to ew-pr tests --- cime_config/testlist_earthworks.xml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/cime_config/testlist_earthworks.xml b/cime_config/testlist_earthworks.xml index 5141849..39f2b26 100644 --- a/cime_config/testlist_earthworks.xml +++ b/cime_config/testlist_earthworks.xml @@ -28,7 +28,7 @@ - + @@ -37,6 +37,15 @@ + + + + + + + + + @@ -44,7 +53,7 @@ - + From ab44a8505cd4f5134744b65f4ce45ed9db90bf96 Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Fri, 31 May 2024 16:43:46 -0600 Subject: [PATCH 32/35] Set ew-rel to CHAOS2000dev exact restart tests Add task counts for each ew-rel test and increase wallclock requested to ensure tests complete. --- cime_config/testlist_earthworks.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/cime_config/testlist_earthworks.xml b/cime_config/testlist_earthworks.xml index 39f2b26..f020d50 100644 --- a/cime_config/testlist_earthworks.xml +++ b/cime_config/testlist_earthworks.xml @@ -70,7 +70,7 @@ - + @@ -79,40 +79,40 @@ - + - + - + - + - + - + - + - + From d61ee1c630eb6645a05a66f5728f1549e00bb632 Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Mon, 3 Jun 2024 08:28:06 -0600 Subject: [PATCH 33/35] Bring in CAM fixes to EW-specific files See EWOrg/CAM PR #20 for more info --- Externals.cfg | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Externals.cfg b/Externals.cfg index 53f68a9..f34da03 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -6,7 +6,8 @@ local_path = ccs_config required = True [cam] -tag = cam-ew2.1.005 +branch = update_v8mpasfiles_eworg +# tag = cam-ew2.1.006 protocol = git repo_url = https://github.com/EarthWorksOrg/CAM local_path = components/cam From 99c4a8c6c0a7962e29168641aa80d546a491b3f5 Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Mon, 3 Jun 2024 10:43:13 -0600 Subject: [PATCH 34/35] Switch CAM to tag for merged EWOrg/CAM #20 --- Externals.cfg | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index f34da03..7a86877 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -6,8 +6,7 @@ local_path = ccs_config required = True [cam] -branch = update_v8mpasfiles_eworg -# tag = cam-ew2.1.006 +tag = cam-ew2.1.006 protocol = git repo_url = https://github.com/EarthWorksOrg/CAM local_path = components/cam From 84613c1a7ff15574d38573abae32e3745a97c024 Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Mon, 3 Jun 2024 11:55:54 -0600 Subject: [PATCH 35/35] Change EarthWorksOrg repos to release tags for v2.2 --- Externals.cfg | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index 7a86877..f82e62b 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -1,12 +1,12 @@ [ccs_config] -tag = ccs_config-ew2.1.004 +tag = release-ccs_config-ew2.2 protocol = git repo_url = https://github.com/EarthWorksOrg/ccs_config_cesm.git local_path = ccs_config required = True [cam] -tag = cam-ew2.1.006 +tag = release-cam-ew2.2 protocol = git repo_url = https://github.com/EarthWorksOrg/CAM local_path = components/cam @@ -29,7 +29,7 @@ externals = Externals.cfg required = True [cmeps] -tag = cmeps-ew2.1.001 +tag = release-cmeps-ew2.2 protocol = git repo_url = https://github.com/EarthWorksOrg/CMEPS.git local_path = components/cmeps @@ -72,7 +72,7 @@ local_path = libraries/parallelio required = True [cime] -tag = cime-ew2.1.001 +tag = release-cime-ew2.2 protocol = git repo_url = https://github.com/EarthWorksOrg/cime local_path = cime @@ -95,21 +95,21 @@ externals = Externals_CLM.cfg required = True [mpas-ocean] -tag = mpaso-ew2.1.002 +tag = release-mpaso-ew2.2 protocol = git repo_url = https://github.com/EarthWorksOrg/mpas-ocean.git local_path = components/mpas-ocean required = True [mpas-seaice] -tag = mpassi-ew2.1.004 +tag = release-mpassi-ew2.2 protocol = git repo_url = https://github.com/EarthWorksOrg/mpas-seaice.git local_path = components/mpas-seaice required = True [mpas-framework] -tag = mpasfrwk-ew2.1.003 +tag = release-mpasfrwk-ew2.2 protocol = git repo_url = https://github.com/EarthWorksOrg/mpas-framework.git local_path = components/mpas-framework