From 1d432db7d623da66101a9380a0476a710e796df7 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Mon, 16 Oct 2023 18:19:34 -0600 Subject: [PATCH 01/68] turn excess ice and meier roughness on by default, add LND_TUNING_MODE for clm5_1_cam6.0, fix a syntax issue from the earlier merge (cherry picked from commit 2746a0d21289dd2a0226ff9727f8c5441f0fe7ee) Conflicts: bld/namelist_files/namelist_defaults_ctsm.xml --- bld/namelist_files/namelist_defaults_ctsm.xml | 4 ++-- bld/namelist_files/namelist_definition_ctsm.xml | 2 +- cime_config/config_component.xml | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml index 0516ecbc22..a3b8c093c6 100644 --- a/bld/namelist_files/namelist_defaults_ctsm.xml +++ b/bld/namelist_files/namelist_defaults_ctsm.xml @@ -502,7 +502,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case). Meier2022 .true. -.false. +.true. @@ -2763,7 +2763,7 @@ use_crop=".true.">lnd/clm2/surfdata_map/ctsm5.1.dev052/landuse.timeseries_mpasa1 -.false. +.true. lnd/clm2/paramdata/exice_init_0.125x0.125_c20220516.nc lnd/clm2/paramdata/exice_init_0.125x0.125_ESMFmesh_cdf5_c20220802.nc diff --git a/bld/namelist_files/namelist_definition_ctsm.xml b/bld/namelist_files/namelist_definition_ctsm.xml index 2cb95d5c68..97310ebe80 100644 --- a/bld/namelist_files/namelist_definition_ctsm.xml +++ b/bld/namelist_files/namelist_definition_ctsm.xml @@ -2156,7 +2156,7 @@ Land mask description + valid_values="clm4_5_CRUv7,clm4_5_GSWP3v1,clm4_5_cam6.0,clm5_0_cam6.0,clm5_0_CRUv7,clm5_0_GSWP3v1,clm5_1_GSWP3v1,clm5_1_cam6.0"> General configuration of model version and atmospheric forcing to tune the model to run under. This sets the model to run with constants and initial conditions that were set to run well under the configuration of model version and atmospheric forcing. To run well constants would need to be changed diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml index 743e9229b9..281a94a0b2 100644 --- a/cime_config/config_component.xml +++ b/cime_config/config_component.xml @@ -63,7 +63,7 @@ Tuning parameters and initial conditions should be optimized for what CLM model version and what meteorlogical forcing combination? UNSET - clm5_0_cam6.0,clm5_0_GSWP3v1,clm5_0_CRUv7,clm4_5_CRUv7,clm4_5_GSWP3v1,clm4_5_cam6.0,clm5_1_GSWP3v1 + clm5_0_cam6.0,clm5_0_GSWP3v1,clm5_0_CRUv7,clm4_5_CRUv7,clm4_5_GSWP3v1,clm4_5_cam6.0,clm5_1_GSWP3v1,clm5_1_cam6.0 clm4_5_CRUv7 clm4_5_CRUv7 @@ -76,6 +76,7 @@ clm5_0_cam6.0 clm5_0_cam6.0 clm5_1_GSWP3v1 + clm5_1_cam6.0 From 34368e0c3d03eeac7e002f1656aa6055996dae02 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Thu, 19 Oct 2023 00:51:09 -0600 Subject: [PATCH 02/68] Update externals to cesm2_3_beta16 (cherry picked from commit aba49b6f5373d998c1821bb101707d4d31a9ed27) --- Externals.cfg | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index e683f199ac..9e7b4acc31 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -8,7 +8,7 @@ required = True local_path = components/cism protocol = git repo_url = https://github.com/ESCOMP/CISM-wrapper -tag = cismwrap_2_1_95 +tag = cismwrap_2_1_96 externals = Externals_CISM.cfg required = True @@ -34,7 +34,7 @@ hash = 34723c2 required = True [ccs_config] -tag = ccs_config_cesm0.0.65 +tag = ccs_config_cesm0.0.82 protocol = git repo_url = https://github.com/ESMCI/ccs_config_cesm.git local_path = ccs_config @@ -44,18 +44,18 @@ required = True local_path = cime protocol = git repo_url = https://github.com/ESMCI/cime -tag = cime6.0.125 +tag = cime6.0.175 required = True [cmeps] -tag = cmeps0.14.21 +tag = cmeps0.14.43 protocol = git repo_url = https://github.com/ESCOMP/CMEPS.git local_path = components/cmeps required = True [cdeps] -tag = cdeps1.0.13 +tag = cdeps1.0.23 protocol = git repo_url = https://github.com/ESCOMP/CDEPS.git local_path = components/cdeps @@ -63,7 +63,7 @@ externals = Externals_CDEPS.cfg required = True [cpl7] -tag = cpl77.0.5 +tag = cpl77.0.7 protocol = git repo_url = https://github.com/ESCOMP/CESM_CPL7andDataComps local_path = components/cpl7 @@ -84,7 +84,7 @@ local_path = libraries/mct required = True [parallelio] -tag = pio2_5_10 +tag = pio2_6_2 protocol = git repo_url = https://github.com/NCAR/ParallelIO local_path = libraries/parallelio From 53524623e4d114af4f4bc42fea4599a42e23ddc4 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Thu, 19 Oct 2023 00:56:14 -0600 Subject: [PATCH 03/68] Add finidat for ne30np4.pg3 from @olyson /glade/p/cgd/tss/people/oleson/CLM5_restarts/ctsm51_cesm23a14a_ne30pg3ne30pg3mg17_CPLHIST_1850pAD.clm2.r.0561-01-01-00000.nc (cherry picked from commit b80808fc123ac5d623db0d4288f40e2aa0c46df8) --- bld/namelist_files/namelist_defaults_ctsm.xml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml index a3b8c093c6..d1ab3fe8dc 100644 --- a/bld/namelist_files/namelist_defaults_ctsm.xml +++ b/bld/namelist_files/namelist_defaults_ctsm.xml @@ -678,6 +678,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case). set up. If more finidat files are added you may need to add more of these. Or one specific file will be chosen over another. --> + hgrid=0.9x1.25 maxpft=17 mask=gx1v7 use_cn=.true. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false. @@ -722,6 +723,12 @@ attributes from the config_cache.xml file (with keys converted to upper-case). >hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.false. glc_nec=10 do_transient_pfts=.false. + +hgrid=ne30np4.pg3 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.false. glc_nec=10 do_transient_pfts=.false. + + hgrid=1.9x2.5 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. @@ -878,7 +885,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case). hgrid="ne0np4.ARCTICGRIS.ne30x8" use_cn=".false." maxpft="17" >hgrid=ne0np4.ARCTICGRIS.ne30x8 maxpft=17 mask=tx0.1v2 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false. -p + lnd/clm2/initdata_map/clmi.I1850Clm50BgcCrop-ciso.1366-01-01.0.9x1.25_gx1v7_simyr1850_c200428.nc + +lnd/clm2/initdata_map/clmi.I1850Clm51CplhistBgcCrop-ciso.0561-01-01.ne30np4.pg3_gx1v7_simyr1850_c230717.nc + + hgrid=ne30np4.pg3 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.false. glc_nec=10 do_transient_pfts=.false. @@ -1283,6 +1282,8 @@ lnd/clm2/surfdata_map/ctsm5.1.dev120/surfdata_ne16np4.pg3_hist_78pfts_CMIP6_simy lnd/clm2/surfdata_map/release-clm5.0.30/surfdata_ne30np4_hist_78pfts_CMIP6_simyr1850_c200426.nc lnd/clm2/surfdata_map/release-clm5.0.30/surfdata_ne30np4.pg2_hist_78pfts_CMIP6_simyr1850_c200426.nc + +lnd/clm2/surfdata_map/release-clm5.0.30/surfdata_ne30np4.pg3_hist_78pfts_CMIP6_simyr1850_c200426.nc lnd/clm2/surfdata_map/release-clm5.0.30/surfdata_ne30np4.pg3_hist_78pfts_CMIP6_simyr1850_c200426.nc From e40ca1c4d4b6708389eb5a0753e0782f67f58cf1 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Fri, 20 Oct 2023 17:48:08 -0600 Subject: [PATCH 14/68] Add PE layout for ne30 on Cheyenne (cherry picked from commit da5beb8003c72eed6684edfaf1f783f2d8cadd15) --- cime_config/config_pes.xml | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/cime_config/config_pes.xml b/cime_config/config_pes.xml index 03cea52e7b..90b3fe9efe 100644 --- a/cime_config/config_pes.xml +++ b/cime_config/config_pes.xml @@ -631,6 +631,43 @@ + + + + none + + -1 + -20 + -20 + -20 + -20 + -20 + -20 + -20 + + + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + + + 0 + -1 + -1 + -1 + -1 + -1 + -1 + -1 + + + + From 01abaeea43313fd33ea5e73cc71f8658f26c2eba Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Sat, 21 Oct 2023 15:01:31 -0600 Subject: [PATCH 15/68] Add more tests to deal with issue #2219, add a test that turns excess ice off, add tests to expected fails (cherry picked from commit c1cadb377c0458350691eba1426a3a56ae13aed6) --- cime_config/testdefs/ExpectedTestFails.xml | 15 +++++++++++ cime_config/testdefs/testlist_clm.xml | 27 +++++++++++++++++++ .../include_user_mods | 1 + .../clm51cam6LndTuningModeNoExIce/user_nl_clm | 3 +++ 4 files changed, 46 insertions(+) create mode 100644 cime_config/testdefs/testmods_dirs/clm/clm51cam6LndTuningModeNoExIce/include_user_mods create mode 100644 cime_config/testdefs/testmods_dirs/clm/clm51cam6LndTuningModeNoExIce/user_nl_clm diff --git a/cime_config/testdefs/ExpectedTestFails.xml b/cime_config/testdefs/ExpectedTestFails.xml index 0f8062da0a..47c6ade336 100644 --- a/cime_config/testdefs/ExpectedTestFails.xml +++ b/cime_config/testdefs/ExpectedTestFails.xml @@ -28,6 +28,21 @@ --> + + + + FAIL + #2210 + + + + + FAIL + #2210 + + + + diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml index f2a95596c3..5db428361a 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -53,6 +53,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cime_config/testdefs/testmods_dirs/clm/clm51cam6LndTuningModeNoExIce/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/clm51cam6LndTuningModeNoExIce/include_user_mods new file mode 100644 index 0000000000..a102434d88 --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/clm/clm51cam6LndTuningModeNoExIce/include_user_mods @@ -0,0 +1 @@ +../clm51cam6LndTuningMode/ diff --git a/cime_config/testdefs/testmods_dirs/clm/clm51cam6LndTuningModeNoExIce/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/clm51cam6LndTuningModeNoExIce/user_nl_clm new file mode 100644 index 0000000000..918670a060 --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/clm/clm51cam6LndTuningModeNoExIce/user_nl_clm @@ -0,0 +1,3 @@ +! Turn off excess ice +use_exice = .true. +use_exice_streams = .true. From 071cf722585be6a8e9989171b206316dfa2cc977 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Sun, 5 Nov 2023 01:48:13 -0600 Subject: [PATCH 16/68] Add an LII test using the spunup 1850 ne30pg3_g17 file (cherry picked from commit d6994f733f0bfe004e50a45e9d25ff7cb9a1b15e) --- cime_config/testdefs/testlist_clm.xml | 10 ++++++++++ .../clm/clm51cam6LndTuningModeCiso/include_user_mods | 1 + .../clm/clm51cam6LndTuningModeCiso/user_nl_clm | 5 +++++ 3 files changed, 16 insertions(+) create mode 100644 cime_config/testdefs/testmods_dirs/clm/clm51cam6LndTuningModeCiso/include_user_mods create mode 100644 cime_config/testdefs/testmods_dirs/clm/clm51cam6LndTuningModeCiso/user_nl_clm diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml index 5db428361a..984a439dd3 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -1265,6 +1265,16 @@ + + + + + + + + + + diff --git a/cime_config/testdefs/testmods_dirs/clm/clm51cam6LndTuningModeCiso/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/clm51cam6LndTuningModeCiso/include_user_mods new file mode 100644 index 0000000000..aa76c52034 --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/clm/clm51cam6LndTuningModeCiso/include_user_mods @@ -0,0 +1 @@ +../clm51cam6LndTuningMode diff --git a/cime_config/testdefs/testmods_dirs/clm/clm51cam6LndTuningModeCiso/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/clm51cam6LndTuningModeCiso/user_nl_clm new file mode 100644 index 0000000000..e7627dea50 --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/clm/clm51cam6LndTuningModeCiso/user_nl_clm @@ -0,0 +1,5 @@ +! Turn on Carbon isotopes +use_c13 = .true. +use_c14 = .true. +use_c13_timeseries = .true. +use_c14_bombspike = .true. From ab597dd271ca1d99ce3860c9899458043177ae76 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Tue, 7 Nov 2023 02:47:16 -0700 Subject: [PATCH 17/68] Adjust tests with tests expected to pass (cherry picked from commit 9882289b28b3876d96d826989e09c9e31b8aa4fa) --- cime_config/testdefs/testlist_clm.xml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml index 984a439dd3..9d958d0d76 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -524,6 +524,15 @@ + + + + + + + + + @@ -1265,7 +1274,7 @@ - + @@ -1275,7 +1284,7 @@ - + From 16ba2019d8003b21a26d22e544d008eb4dad5485 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Thu, 9 Nov 2023 00:47:31 -0700 Subject: [PATCH 18/68] Fix some of the filepaths (cherry picked from commit a4eff78bd07be1895176d13efecc99ff23a6624d) Conflicts: bld/namelist_files/namelist_defaults_ctsm.xml --- bld/namelist_files/namelist_defaults_ctsm.xml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml index 2893784dac..67d934345d 100644 --- a/bld/namelist_files/namelist_defaults_ctsm.xml +++ b/bld/namelist_files/namelist_defaults_ctsm.xml @@ -1282,8 +1282,6 @@ lnd/clm2/surfdata_map/ctsm5.1.dev120/surfdata_ne16np4.pg3_hist_78pfts_CMIP6_simy lnd/clm2/surfdata_map/release-clm5.0.30/surfdata_ne30np4_hist_78pfts_CMIP6_simyr1850_c200426.nc lnd/clm2/surfdata_map/release-clm5.0.30/surfdata_ne30np4.pg2_hist_78pfts_CMIP6_simyr1850_c200426.nc - -lnd/clm2/surfdata_map/release-clm5.0.30/surfdata_ne30np4.pg3_hist_78pfts_CMIP6_simyr1850_c200426.nc lnd/clm2/surfdata_map/release-clm5.0.30/surfdata_ne30np4.pg3_hist_78pfts_CMIP6_simyr1850_c200426.nc @@ -1431,9 +1429,9 @@ use_crop=".true.">lnd/clm2/surfdata_map/ctsm5.1.dev052/landuse.timeseries_mpasa1 lnd/clm2/surfdata_map/release-clm5.0.30/landuse.timeseries_ne30np4.pg2_SSP5-8.5_78pfts_CMIP6_simyr1850-2100_c200426.nc lnd/clm2/surfdata_map/release-clm5.0.30/landuse.timeseries_ne30np4.pg3_SSP5-8.5_78pfts_CMIP6_simyr1850-2100_c200426.nc + >lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_ne30np4_SSP5-8.5_78_CMIP6_1850-2100_c230530.nc lnd/clm2/surfdata_map/release-clm5.0.30/landuse.timeseries_ne0np4.ARCTICGRIS.ne30x8_SSP5-8.5_78pfts_CMIP6_simyr1850-2100_c200426.nc + >lnd/clm2/surfdata_map/release-clm5.0.30/landuse.timeseries_ne0np4.ARCTICGRIS.ne30x8_SSP5-8.5_78_CMIP6_1850-2100_c230530.nc lnd/clm2/surfdata_map/release-clm5.0.30/landuse.timeseries_ne0np4.ARCTIC.ne30x4_SSP5-8.5_78pfts_CMIP6_simyr1850-2100_c200426.nc Date: Thu, 9 Nov 2023 00:49:15 -0700 Subject: [PATCH 19/68] Add issue number to expected fails (cherry picked from commit 4e091304e60250c8f9415619cbb04797162df2c0) Conflicts: cime_config/testdefs/ExpectedTestFails.xml --- cime_config/testdefs/ExpectedTestFails.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cime_config/testdefs/ExpectedTestFails.xml b/cime_config/testdefs/ExpectedTestFails.xml index 47c6ade336..d30088c125 100644 --- a/cime_config/testdefs/ExpectedTestFails.xml +++ b/cime_config/testdefs/ExpectedTestFails.xml @@ -38,11 +38,10 @@ FAIL - #2210 + #2234 - From c48a334b7f6f63fca05062ce94f33402bb88cd87 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Thu, 9 Nov 2023 15:16:29 -0700 Subject: [PATCH 20/68] Update baseline directory for Derecho (cherry picked from commit b916d3875da71ca48b8099133dbdfe358eec67d6) --- python/ctsm/machine_defaults.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/ctsm/machine_defaults.py b/python/ctsm/machine_defaults.py index 305c86e03c..ea1a4db45b 100644 --- a/python/ctsm/machine_defaults.py +++ b/python/ctsm/machine_defaults.py @@ -69,7 +69,7 @@ "derecho": MachineDefaults( job_launcher_type=JOB_LAUNCHER_QSUB, scratch_dir=os.path.join(os.path.sep, "glade", "derecho", "scratch", get_user()), - baseline_dir=os.path.join(os.path.sep, "glade", "p", "cgd", "tss", "ctsm_baselines"), + baseline_dir=os.path.join(os.path.sep, "glade", "campaign", "cgd", "tss", "ctsm_baselines"), account_required=True, create_test_retry=0, create_test_queue="regular", From 79f64df1f02cf5f5aeb8562269799e8f68e80325 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Thu, 9 Nov 2023 17:31:18 -0700 Subject: [PATCH 21/68] Change queue and wallclock limit for Derecho (cherry picked from commit 863ed22b5a490bc63b83adf03b8f5bb788fa0e76) --- python/ctsm/machine_defaults.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python/ctsm/machine_defaults.py b/python/ctsm/machine_defaults.py index ea1a4db45b..18f4ff4752 100644 --- a/python/ctsm/machine_defaults.py +++ b/python/ctsm/machine_defaults.py @@ -75,8 +75,8 @@ create_test_queue="regular", job_launcher_defaults={ JOB_LAUNCHER_QSUB: QsubDefaults( - queue="regular", - walltime="11:50:00", + queue="main", + walltime="03:50:00", extra_args="", # The following assumes a single node, with a single mpi proc; we may want # to add more flexibility in the future, making the node / proc counts From 0e8caee16565eaf2d4e610b65a582ed0b79ddeec Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Thu, 9 Nov 2023 21:19:22 -0700 Subject: [PATCH 22/68] Add 2000 and HIST tests for ne30np4.pg3 to cesm3_dev testlist, remove the PEM test that is no longer needed and doesn't have a testmod for it (cherry picked from commit 04853a83c55ec77d954149555923a3c0dd5dcd77) --- cime_config/testdefs/testlist_clm.xml | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml index 9d958d0d76..876c834d1e 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -53,22 +53,22 @@ - + - + - + - + @@ -98,6 +98,15 @@ + + + + + + + + + From 0fa6ebcb150bec66464e7100bf3c85c7583508a9 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Thu, 9 Nov 2023 23:30:28 -0700 Subject: [PATCH 23/68] Get finidat file working for 2000 ne30np4.pg3 clm5_1_cam6.0 working (cherry picked from commit 88ac3ae9a7e01515bc202b9efc91ed7e6d515df8) --- bld/namelist_files/namelist_defaults_ctsm.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml index 67d934345d..a8e1f20221 100644 --- a/bld/namelist_files/namelist_defaults_ctsm.xml +++ b/bld/namelist_files/namelist_defaults_ctsm.xml @@ -826,6 +826,12 @@ attributes from the config_cache.xml file (with keys converted to upper-case). >hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. + +hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. + + lnd/clm2/initdata_map/clmi.BHIST.2000-01-01.0.9x1.25_gx1v7_simyr2000_c200728.nc +lnd/clm2/initdata_map/clmi.BHIST.2000-01-01.0.9x1.25_gx1v7_simyr2000_c200728.nc + + Date: Fri, 10 Nov 2023 00:20:22 -0700 Subject: [PATCH 24/68] Update ne30np4.pg3 1850 finidat file so LII tests work, and add in ne30np4.pg3 landuse.timeseries file (cherry picked from commit d3a82a568dded619a2ed2012a33048fbbe7372df) Conflicts: bld/namelist_files/namelist_defaults_ctsm.xml --- bld/namelist_files/namelist_defaults_ctsm.xml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml index a8e1f20221..ac80b1b336 100644 --- a/bld/namelist_files/namelist_defaults_ctsm.xml +++ b/bld/namelist_files/namelist_defaults_ctsm.xml @@ -988,7 +988,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case). ic_ymd="18500101" sim_year="1850" do_transient_pfts=".false." ic_tod="0" glc_nec="10" use_crop=".true." irrigate=".false." lnd_tuning_mode="clm5_1_cam6.0" ->lnd/clm2/initdata_map/clmi.I1850Clm51CplhistBgcCrop-ciso.0561-01-01.ne30np4.pg3_gx1v7_simyr1850_c230717.nc +>lnd/clm2/initdata_map/clmi.I1850Clm51CplhistBgcCrop-ciso.0561-01-01.ne30np4.pg3_gx1v7_simyr1850_c231109.nc @@ -1442,7 +1444,7 @@ use_crop=".true.">lnd/clm2/surfdata_map/ctsm5.1.dev052/landuse.timeseries_mpasa1 lnd/clm2/surfdata_map/release-clm5.0.30/landuse.timeseries_ne30np4.pg2_SSP5-8.5_78pfts_CMIP6_simyr1850-2100_c200426.nc lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_ne30np4_SSP5-8.5_78_CMIP6_1850-2100_c230530.nc + >lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_ne30np4.pg3_SSP2-4.5_1850-2100_78pft_c231026.nc lnd/clm2/surfdata_map/release-clm5.0.30/landuse.timeseries_ne0np4.ARCTICGRIS.ne30x8_SSP5-8.5_78_CMIP6_1850-2100_c230530.nc Date: Fri, 10 Nov 2023 09:29:42 -0700 Subject: [PATCH 25/68] Actually turn Meier off (cherry picked from commit 1a09d07801e05c48aab90a30b1b1fe679fad8184) Conflicts: cime_config/testdefs/testmods_dirs/clm/ciso_decStartNoMeier/user_nl_clm --- cime_config/testdefs/testlist_clm.xml | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml index 876c834d1e..03a4d0c91b 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -533,7 +533,7 @@ - + @@ -1283,17 +1283,25 @@ - + - - + - + + + + + + + + + + From 82800f05e04b8e61722fd7b3eb728a2b65019c54 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Tue, 28 Nov 2023 09:15:54 -0700 Subject: [PATCH 26/68] Correct some namelist settings --- bld/namelist_files/namelist_defaults_ctsm.xml | 8 ++++---- .../clm/clm51cam6LndTuningModeNoExIce/include_user_mods | 1 - .../clm/clm51cam6LndTuningModeNoExIce/user_nl_clm | 3 --- 3 files changed, 4 insertions(+), 8 deletions(-) delete mode 100644 cime_config/testdefs/testmods_dirs/clm/clm51cam6LndTuningModeNoExIce/include_user_mods delete mode 100644 cime_config/testdefs/testmods_dirs/clm/clm51cam6LndTuningModeNoExIce/user_nl_clm diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml index ac80b1b336..7c5d19eeaa 100644 --- a/bld/namelist_files/namelist_defaults_ctsm.xml +++ b/bld/namelist_files/namelist_defaults_ctsm.xml @@ -502,7 +502,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case). Meier2022 .true. -.true. +.false. @@ -1444,9 +1444,9 @@ use_crop=".true.">lnd/clm2/surfdata_map/ctsm5.1.dev052/landuse.timeseries_mpasa1 lnd/clm2/surfdata_map/release-clm5.0.30/landuse.timeseries_ne30np4.pg2_SSP5-8.5_78pfts_CMIP6_simyr1850-2100_c200426.nc lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_ne30np4.pg3_SSP2-4.5_1850-2100_78pft_c231026.nc + >lnd/clm2/surfdata_map/release-clm5.0.30/landuse.timeseries_ne30np4.pg3_SSP5-8.5_78pfts_CMIP6_simyr1850-2100_c200426.nc lnd/clm2/surfdata_map/release-clm5.0.30/landuse.timeseries_ne0np4.ARCTICGRIS.ne30x8_SSP5-8.5_78_CMIP6_1850-2100_c230530.nc + >lnd/clm2/surfdata_map/release-clm5.0.30/landuse.timeseries_ne0np4.ARCTICGRIS.ne30x8_SSP5-8.5_78pfts_CMIP6_simyr1850-2100_c200426.nc lnd/clm2/surfdata_map/release-clm5.0.30/landuse.timeseries_ne0np4.ARCTIC.ne30x4_SSP5-8.5_78pfts_CMIP6_simyr1850-2100_c200426.nc lnd/clm2/surfdata_map/ctsm5.1.dev052/landuse.timeseries_mpasa1 -.true. +.false. lnd/clm2/paramdata/exice_init_0.125x0.125_c20220516.nc lnd/clm2/paramdata/exice_init_0.125x0.125_ESMFmesh_cdf5_c20220802.nc diff --git a/cime_config/testdefs/testmods_dirs/clm/clm51cam6LndTuningModeNoExIce/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/clm51cam6LndTuningModeNoExIce/include_user_mods deleted file mode 100644 index a102434d88..0000000000 --- a/cime_config/testdefs/testmods_dirs/clm/clm51cam6LndTuningModeNoExIce/include_user_mods +++ /dev/null @@ -1 +0,0 @@ -../clm51cam6LndTuningMode/ diff --git a/cime_config/testdefs/testmods_dirs/clm/clm51cam6LndTuningModeNoExIce/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/clm51cam6LndTuningModeNoExIce/user_nl_clm deleted file mode 100644 index 918670a060..0000000000 --- a/cime_config/testdefs/testmods_dirs/clm/clm51cam6LndTuningModeNoExIce/user_nl_clm +++ /dev/null @@ -1,3 +0,0 @@ -! Turn off excess ice -use_exice = .true. -use_exice_streams = .true. From 8f3327cd5bc1c3d8a05d30c6477c9d8bf3ceb2db Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Tue, 28 Nov 2023 10:20:15 -0700 Subject: [PATCH 27/68] The ne30pg3 finidat file needs to do interpolation to get started since it was created with ctsm5.2 datasets --- bld/namelist_files/namelist_defaults_ctsm.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml index 7c5d19eeaa..60366149c0 100644 --- a/bld/namelist_files/namelist_defaults_ctsm.xml +++ b/bld/namelist_files/namelist_defaults_ctsm.xml @@ -987,7 +987,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case). lnd/clm2/initdata_map/clmi.I1850Clm51CplhistBgcCrop-ciso.0561-01-01.ne30np4.pg3_gx1v7_simyr1850_c231109.nc From 30361835aaed1d6c6a828797d42f8b55af9efc1d Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Tue, 28 Nov 2023 11:54:16 -0700 Subject: [PATCH 28/68] Remove the ne30pg3 LII tests because they will fail as use_init_interp is required because the finidat file is based on ctsm5.2 datasets --- cime_config/testdefs/testlist_clm.xml | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml index 03a4d0c91b..cbef667b93 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -1283,15 +1283,6 @@ - - - - - - - - - @@ -1301,15 +1292,6 @@ - - - - - - - - - From ebb3e64e389c2d407147034070b7456879d327b2 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Tue, 28 Nov 2023 11:55:08 -0700 Subject: [PATCH 29/68] Add use_init_interp to the ne30pg3 finidat file, because it's needed for non ctsm5.2 surface datasets --- bld/namelist_files/namelist_defaults_ctsm.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml index 60366149c0..7c5d19eeaa 100644 --- a/bld/namelist_files/namelist_defaults_ctsm.xml +++ b/bld/namelist_files/namelist_defaults_ctsm.xml @@ -987,7 +987,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case). lnd/clm2/initdata_map/clmi.I1850Clm51CplhistBgcCrop-ciso.0561-01-01.ne30np4.pg3_gx1v7_simyr1850_c231109.nc From 98cb379df0d6bb53f41455f11a74ee7ce70fb86c Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Tue, 28 Nov 2023 12:33:15 -0700 Subject: [PATCH 30/68] Set init_interp_fill_missing_with_natveg for the ne30np4.pg3 grid --- bld/CLMBuildNamelist.pm | 5 +++++ bld/namelist_files/namelist_defaults_ctsm.xml | 2 ++ 2 files changed, 7 insertions(+) diff --git a/bld/CLMBuildNamelist.pm b/bld/CLMBuildNamelist.pm index 17d64cd59f..9a4dadfd6c 100755 --- a/bld/CLMBuildNamelist.pm +++ b/bld/CLMBuildNamelist.pm @@ -4356,6 +4356,11 @@ sub setup_logic_initinterp { $log->fatal_error("$var can only be set if use_init_interp is true"); } } + # This only seems to be important for this one grid... + if ( $nl_flags->{'res'} eq "ne30np4.pg3" ) { + add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, "init_interp_fill_missing_with_natveg", + 'hgrid'=>$nl_flags->{'res'} ); + } } #------------------------------------------------------------------------------- diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml index 7c5d19eeaa..e6b35380f9 100644 --- a/bld/namelist_files/namelist_defaults_ctsm.xml +++ b/bld/namelist_files/namelist_defaults_ctsm.xml @@ -903,6 +903,8 @@ attributes from the config_cache.xml file (with keys converted to upper-case). >hgrid=ne0np4CONUS.ne30x8 maxpft=17 mask=tx0.1v2 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false. + +.true. - - - FAIL - #2210 - - - - + + FAIL - #2234 + #2268 From 9f457dbadc6a01d6b8ee98c9fa7c995941ad0585 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Tue, 28 Nov 2023 16:10:31 -0700 Subject: [PATCH 32/68] Add a couple cesm3_dev tests to aux_clm --- cime_config/testdefs/testlist_clm.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml index cbef667b93..8ffae44d6d 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -47,6 +47,7 @@ + @@ -77,12 +78,13 @@ - + + From 3a3a97eec36cd82d7b30c0e1ea17e35a8d69beb8 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Tue, 28 Nov 2023 16:27:15 -0700 Subject: [PATCH 33/68] PE layouts for f45 and f10 for Derecho --- cime_config/config_pes.xml | 75 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/cime_config/config_pes.xml b/cime_config/config_pes.xml index 90b3fe9efe..60c7355825 100644 --- a/cime_config/config_pes.xml +++ b/cime_config/config_pes.xml @@ -113,6 +113,43 @@ + + + + none + + -1 + -1 + -1 + -1 + -1 + -1 + -1 + -1 + + + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + + + 0 + -1 + -1 + -1 + -1 + -1 + -1 + -1 + + + + @@ -1336,6 +1373,44 @@ + + + + none + + -1 + -1 + -1 + -1 + -1 + -1 + -1 + -1 + -1 + + + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + + From 651ff5c7b3c5426bb3cc2fc3b14445ef606c0463 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Tue, 28 Nov 2023 19:14:57 -0700 Subject: [PATCH 34/68] Lengthen test time --- cime_config/testdefs/testlist_clm.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml index 8ffae44d6d..bb073be374 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -2032,7 +2032,7 @@ - + From a8c535a976daf87832ba4b72b91f0f67deea9ba5 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Tue, 28 Nov 2023 19:28:24 -0700 Subject: [PATCH 35/68] Remove the nvhpc tests that are now passing --- cime_config/testdefs/ExpectedTestFails.xml | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/cime_config/testdefs/ExpectedTestFails.xml b/cime_config/testdefs/ExpectedTestFails.xml index 067f54b8c0..f4b4ff6f5d 100644 --- a/cime_config/testdefs/ExpectedTestFails.xml +++ b/cime_config/testdefs/ExpectedTestFails.xml @@ -50,24 +50,9 @@ #1733 - - - - FAIL - #1733 - - - - - - FAIL - #1733 - - - + - FAIL From f85fea88f5ee68cf628640ad37592f472206e9bc Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Thu, 30 Nov 2023 00:22:59 -0700 Subject: [PATCH 36/68] First pass at adding derecho tests, also change the syntax for ones with options per machine to options after machine lists, and add intel-oneapi and nvhpc tests to test lists with clm_short --- cime_config/testdefs/testlist_clm.xml | 931 ++++++++++++++++++++++---- 1 file changed, 807 insertions(+), 124 deletions(-) diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml index bb073be374..33e1f000fa 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -3,6 +3,7 @@ + @@ -12,14 +13,18 @@ + + + + @@ -29,6 +34,7 @@ + @@ -39,6 +45,8 @@ + + @@ -112,6 +120,7 @@ + @@ -121,6 +130,7 @@ + @@ -130,6 +140,7 @@ + @@ -146,6 +157,7 @@ + @@ -155,6 +167,7 @@ + @@ -164,6 +177,7 @@ + @@ -173,6 +187,7 @@ + @@ -182,6 +197,7 @@ + @@ -192,6 +208,8 @@ + + @@ -235,6 +253,7 @@ + @@ -250,6 +269,15 @@ + + + + + + + + + @@ -259,6 +287,15 @@ + + + + + + + + + @@ -267,6 +304,14 @@ + + + + + + + + @@ -275,9 +320,18 @@ + + + + + + + + + @@ -287,6 +341,8 @@ + + @@ -295,6 +351,7 @@ + @@ -303,6 +360,7 @@ + @@ -312,6 +370,7 @@ + @@ -320,6 +379,7 @@ + @@ -328,6 +388,7 @@ + @@ -337,6 +398,8 @@ + + @@ -351,9 +414,19 @@ + + + + + + + + + + @@ -363,6 +436,7 @@ + @@ -372,6 +446,7 @@ + @@ -395,9 +470,19 @@ + + + + + + + + + + @@ -407,6 +492,7 @@ + @@ -416,6 +502,7 @@ + @@ -425,6 +512,7 @@ + @@ -434,6 +522,7 @@ + @@ -443,6 +532,8 @@ + + @@ -451,6 +542,7 @@ + @@ -461,6 +553,8 @@ + + @@ -469,6 +563,7 @@ + @@ -477,6 +572,7 @@ + @@ -486,6 +582,8 @@ + + @@ -494,6 +592,7 @@ + @@ -503,6 +602,7 @@ + @@ -512,6 +612,7 @@ + @@ -535,6 +636,15 @@ + + + + + + + + + @@ -544,9 +654,19 @@ + + + + + + + + + + @@ -573,6 +693,8 @@ + + @@ -580,6 +702,19 @@ + + + + + + + + + + + + + @@ -588,6 +723,14 @@ + + + + + + + + @@ -597,6 +740,15 @@ + + + + + + + + + @@ -623,6 +775,14 @@ + + + + + + + + @@ -631,6 +791,14 @@ + + + + + + + + @@ -639,6 +807,14 @@ + + + + + + + + @@ -648,6 +824,15 @@ + + + + + + + + + @@ -657,6 +842,15 @@ + + + + + + + + + @@ -666,6 +860,15 @@ + + + + + + + + + @@ -675,10 +878,21 @@ + + + + + + + + + + + @@ -697,6 +911,7 @@ + @@ -706,6 +921,8 @@ + + @@ -714,6 +931,7 @@ + @@ -722,6 +940,7 @@ + @@ -738,6 +957,7 @@ + @@ -747,6 +967,7 @@ + @@ -786,9 +1007,19 @@ + + + + + + + + + + @@ -798,6 +1029,7 @@ + @@ -807,6 +1039,7 @@ + @@ -822,6 +1055,15 @@ + + + + + + + + + @@ -830,6 +1072,14 @@ + + + + + + + + @@ -839,6 +1089,15 @@ + + + + + + + + + @@ -848,9 +1107,19 @@ + + + + + + + + + + @@ -860,6 +1129,7 @@ + @@ -869,6 +1139,7 @@ + @@ -878,6 +1149,7 @@ + @@ -887,6 +1159,7 @@ + @@ -895,6 +1168,7 @@ + @@ -904,6 +1178,7 @@ + @@ -920,6 +1195,16 @@ + + + + + + + + + + @@ -930,6 +1215,16 @@ + + + + + + + + + + @@ -940,6 +1235,16 @@ + + + + + + + + + + @@ -949,6 +1254,15 @@ + + + + + + + + + @@ -957,6 +1271,14 @@ + + + + + + + + @@ -966,6 +1288,15 @@ + + + + + + + + + @@ -976,6 +1307,16 @@ + + + + + + + + + + @@ -984,6 +1325,14 @@ + + + + + + + + @@ -993,6 +1342,15 @@ + + + + + + + + + @@ -1003,6 +1361,16 @@ + + + + + + + + + + @@ -1013,9 +1381,20 @@ + + + + + + + + + + + @@ -1030,9 +1409,19 @@ + + + + + + + + + + @@ -1042,6 +1431,7 @@ + @@ -1051,6 +1441,7 @@ + @@ -1060,6 +1451,7 @@ + @@ -1075,12 +1467,27 @@ + + + + + + + + + + + + + + + @@ -1089,6 +1496,7 @@ + @@ -1098,6 +1506,7 @@ + @@ -1106,6 +1515,7 @@ + @@ -1115,6 +1525,8 @@ + + @@ -1132,6 +1544,7 @@ + @@ -1186,6 +1599,7 @@ + @@ -1210,6 +1624,15 @@ + + + + + + + + + @@ -1219,6 +1642,15 @@ + + + + + + + + + @@ -1228,9 +1660,19 @@ + + + + + + + + + + @@ -1241,6 +1683,8 @@ + + @@ -1250,6 +1694,7 @@ + @@ -1279,6 +1724,7 @@ + @@ -1294,9 +1740,19 @@ + + + + + + + + + + @@ -1307,6 +1763,8 @@ + + @@ -1317,6 +1775,8 @@ + + @@ -1326,6 +1786,8 @@ + + @@ -1350,10 +1812,21 @@ + + + + + + + + + + + @@ -1363,6 +1836,7 @@ + @@ -1373,6 +1847,8 @@ + + @@ -1381,6 +1857,7 @@ + @@ -1389,6 +1866,7 @@ + @@ -1399,6 +1877,7 @@ + @@ -1408,6 +1887,7 @@ + @@ -1417,6 +1897,7 @@ + @@ -1426,6 +1907,7 @@ + @@ -1435,6 +1917,7 @@ + @@ -1444,6 +1927,7 @@ + @@ -1453,6 +1937,7 @@ + @@ -1462,6 +1947,7 @@ + @@ -1471,6 +1957,7 @@ + @@ -1481,6 +1968,8 @@ + + @@ -1501,9 +1990,13 @@ + + + + @@ -1519,9 +2012,19 @@ - + + + + + + + + + + + - + @@ -1543,6 +2046,12 @@ + + + + + + @@ -1553,6 +2062,9 @@ + + + @@ -1561,6 +2073,7 @@ + @@ -1570,6 +2083,8 @@ + + @@ -1588,11 +2103,13 @@ + + - + @@ -1637,6 +2154,17 @@ + + + + + + + + + + + @@ -1663,6 +2191,7 @@ + @@ -1673,6 +2202,7 @@ + @@ -1690,23 +2220,23 @@ - - - - - - + + + + + + - - - - - - + + + + + + @@ -1721,6 +2251,7 @@ + @@ -1729,9 +2260,11 @@ + + @@ -1746,6 +2279,8 @@ + + @@ -1755,6 +2290,7 @@ + @@ -1781,6 +2317,8 @@ + + @@ -1790,6 +2328,7 @@ + @@ -1799,6 +2338,7 @@ + @@ -1808,6 +2348,7 @@ + @@ -1827,6 +2368,7 @@ + @@ -1837,6 +2379,8 @@ + + @@ -1863,6 +2407,7 @@ + @@ -1872,6 +2417,7 @@ + @@ -1880,6 +2426,7 @@ + @@ -1889,6 +2436,8 @@ + + @@ -1897,6 +2446,7 @@ + @@ -1906,6 +2456,7 @@ + @@ -1914,6 +2465,7 @@ + @@ -1923,6 +2475,7 @@ + @@ -1932,6 +2485,7 @@ + @@ -1941,6 +2495,7 @@ + @@ -1960,6 +2515,8 @@ + + @@ -1969,6 +2526,7 @@ + @@ -1977,6 +2535,7 @@ + @@ -1986,6 +2545,7 @@ + @@ -1995,6 +2555,8 @@ + + @@ -2012,6 +2574,7 @@ + @@ -2022,6 +2585,8 @@ + + @@ -2035,12 +2600,23 @@ + + + + + + + + + + + @@ -2049,6 +2625,7 @@ + @@ -2057,6 +2634,7 @@ + @@ -2066,6 +2644,7 @@ + @@ -2076,6 +2655,7 @@ + @@ -2086,6 +2666,7 @@ + @@ -2096,6 +2677,7 @@ + @@ -2112,6 +2694,16 @@ + + + + + + + + + + @@ -2146,15 +2738,24 @@ + + + + + + + + + - - - - - - + + + + + + @@ -2168,33 +2769,40 @@ - + + + + + + + - - - - - - - + + + + + + + + + - - - - - - - - + + + + + + + @@ -2210,9 +2818,19 @@ + + + + + + + + + + @@ -2223,6 +2841,7 @@ + @@ -2233,6 +2852,7 @@ + @@ -2244,6 +2864,7 @@ + @@ -2255,6 +2876,8 @@ + + @@ -2265,6 +2888,7 @@ + @@ -2275,6 +2899,7 @@ + @@ -2286,8 +2911,10 @@ + + @@ -2298,6 +2925,7 @@ + @@ -2308,6 +2936,7 @@ + @@ -2319,6 +2948,7 @@ + @@ -2329,6 +2959,7 @@ + @@ -2339,6 +2970,7 @@ + @@ -2349,6 +2981,7 @@ + @@ -2359,6 +2992,7 @@ + @@ -2368,6 +3002,7 @@ + @@ -2377,6 +3012,7 @@ + @@ -2386,6 +3022,7 @@ + @@ -2394,6 +3031,7 @@ + @@ -2403,6 +3041,7 @@ + @@ -2412,6 +3051,7 @@ + @@ -2422,6 +3062,7 @@ + @@ -2431,6 +3072,7 @@ + @@ -2440,6 +3082,7 @@ + @@ -2457,9 +3100,20 @@ + + + + + + + + + + + @@ -2469,6 +3123,7 @@ + @@ -2479,6 +3134,7 @@ + @@ -2490,6 +3146,8 @@ + + @@ -2499,6 +3157,7 @@ + @@ -2510,6 +3169,9 @@ + + + @@ -2519,6 +3181,7 @@ + @@ -2528,97 +3191,82 @@ - - - - - - + + + + + + - - - - - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - + + + + + + + - - - - - - - - - - - - + + + + + + + + + - - - - - - - - + + + + + @@ -2631,6 +3279,15 @@ + + + + + + + + + @@ -2641,6 +3298,15 @@ + + + + + + + + + @@ -2651,47 +3317,64 @@ + + + + + + + + + - - - - - - + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + From 5c8f17b1a3badc4699882cae3c408c100a0e6a3f Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Thu, 30 Nov 2023 00:29:36 -0700 Subject: [PATCH 37/68] Work on f09 f19 and nldas pe-layouts for Derecho --- cime_config/config_pes.xml | 233 +++++++++++++++++++++++++++++++++---- 1 file changed, 209 insertions(+), 24 deletions(-) diff --git a/cime_config/config_pes.xml b/cime_config/config_pes.xml index 60c7355825..34fd593425 100644 --- a/cime_config/config_pes.xml +++ b/cime_config/config_pes.xml @@ -298,6 +298,80 @@ + + + + none + + -1 + -12 + -12 + -12 + -12 + -12 + -12 + -12 + + + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + + + 0 + -1 + -1 + -1 + -1 + -1 + -1 + -1 + + + + + + + + Much lower core count f19 layout, mainly for testing + + -1 + -1 + -1 + -1 + -1 + -1 + -1 + -1 + + + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + + @@ -340,34 +414,34 @@ none - -4 - -4 - -4 - -4 - -4 - -4 - -4 - -4 + -4 + -4 + -4 + -4 + -4 + -4 + -4 + -4 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 @@ -413,6 +487,43 @@ none + + -1 + -14 + -14 + -14 + -14 + -14 + -14 + -14 + + + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + + + 0 + -1 + -1 + -1 + -1 + -1 + -1 + -1 + + + + + + + + Much lower core count f09 layout, mainly for testing -1 -5 @@ -1560,5 +1671,79 @@ + + + + none + + -1 + -14 + -14 + -14 + -14 + -14 + -14 + -14 + + + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + + + 0 + -1 + -1 + -1 + -1 + -1 + -1 + -1 + + + + + + + + Much lower core count nldas2 layout, mainly for testing + + -1 + -1 + -1 + -1 + -1 + -1 + -1 + -1 + + + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + + From f65c99ca079726e62c84ca040f0f38f25228ab2a Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Fri, 1 Dec 2023 00:14:00 -0700 Subject: [PATCH 38/68] Update externals for ccs_config which is needed for mpi-serial tests --- Externals.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Externals.cfg b/Externals.cfg index 9e7b4acc31..cf2ff73498 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -34,7 +34,7 @@ hash = 34723c2 required = True [ccs_config] -tag = ccs_config_cesm0.0.82 +tag = ccs_config_cesm0.0.84 protocol = git repo_url = https://github.com/ESMCI/ccs_config_cesm.git local_path = ccs_config From 4ce2a9d98fccbe38664659a026c5c1a64194429a Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Fri, 1 Dec 2023 00:15:29 -0700 Subject: [PATCH 39/68] The same intel tests are failing on Derecho as were on Cheyenne --- cime_config/testdefs/ExpectedTestFails.xml | 29 +++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/cime_config/testdefs/ExpectedTestFails.xml b/cime_config/testdefs/ExpectedTestFails.xml index f4b4ff6f5d..55b47dc4c9 100644 --- a/cime_config/testdefs/ExpectedTestFails.xml +++ b/cime_config/testdefs/ExpectedTestFails.xml @@ -50,10 +50,17 @@ #1733 + + + + FAIL + #1733 + + - + FAIL FATES#701 @@ -67,6 +74,13 @@ + + + FAIL + FATES#701 + + + PEND @@ -74,6 +88,13 @@ + + + PEND + #1045 + + + PEND @@ -89,5 +110,11 @@ + + + FAIL + FATES#1089 + + From 14d666e4b8120c4491ca19ac3d8f67f8fdbc4f45 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Fri, 1 Dec 2023 00:34:46 -0700 Subject: [PATCH 40/68] Fix pe-layouts for Derecho, remove new nvhpc tests on Derecho that weren't in Cheyenne, and remove the intel-oneapi tests since they fail --- cime_config/testdefs/testlist_clm.xml | 94 ++++++++++++--------------- 1 file changed, 43 insertions(+), 51 deletions(-) diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml index 33e1f000fa..1a1bfed7e3 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -304,7 +304,7 @@ - + @@ -320,7 +320,7 @@ - + @@ -414,7 +414,7 @@ - + @@ -636,7 +636,7 @@ - + @@ -654,7 +654,7 @@ - + @@ -693,7 +693,6 @@ - @@ -702,11 +701,10 @@ - + - @@ -723,7 +721,7 @@ - + @@ -740,7 +738,7 @@ - + @@ -775,7 +773,7 @@ - + @@ -791,7 +789,7 @@ - + @@ -807,7 +805,7 @@ - + @@ -824,7 +822,7 @@ - + @@ -842,7 +840,7 @@ - + @@ -860,7 +858,7 @@ - + @@ -878,7 +876,7 @@ - + @@ -1007,7 +1005,7 @@ - + @@ -1055,7 +1053,7 @@ - + @@ -1072,7 +1070,7 @@ - + @@ -1089,7 +1087,7 @@ - + @@ -1107,7 +1105,7 @@ - + @@ -1195,7 +1193,7 @@ - + @@ -1215,7 +1213,7 @@ - + @@ -1254,7 +1252,7 @@ - + @@ -1288,7 +1286,7 @@ - + @@ -1307,7 +1305,7 @@ - + @@ -1325,7 +1323,7 @@ - + @@ -1342,7 +1340,7 @@ - + @@ -1361,7 +1359,7 @@ - + @@ -1381,7 +1379,7 @@ - + @@ -1409,7 +1407,7 @@ - + @@ -1467,7 +1465,7 @@ - + @@ -1483,8 +1481,6 @@ - - @@ -1624,7 +1620,7 @@ - + @@ -1642,7 +1638,7 @@ - + @@ -1660,7 +1656,7 @@ - + @@ -1812,7 +1808,7 @@ - + @@ -1991,8 +1987,6 @@ - - @@ -2022,7 +2016,7 @@ - + @@ -2047,8 +2041,6 @@ - - @@ -2154,7 +2146,7 @@ - + @@ -2162,7 +2154,7 @@ - + @@ -2738,7 +2730,7 @@ - + @@ -2769,7 +2761,7 @@ - + @@ -3279,7 +3271,7 @@ - + @@ -3298,7 +3290,7 @@ - + @@ -3317,7 +3309,7 @@ - + From 84bab54dcd6d7e93fc0323cd5b48c7f5b824a7bf Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Fri, 1 Dec 2023 09:25:59 -0700 Subject: [PATCH 41/68] Correct expected fail --- cime_config/testdefs/ExpectedTestFails.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/testdefs/ExpectedTestFails.xml b/cime_config/testdefs/ExpectedTestFails.xml index 55b47dc4c9..9a14b7e8da 100644 --- a/cime_config/testdefs/ExpectedTestFails.xml +++ b/cime_config/testdefs/ExpectedTestFails.xml @@ -88,7 +88,7 @@ - + PEND #1045 From 15c9527f5ab79acdfc41606a59c8d293b483feac Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Fri, 1 Dec 2023 09:55:41 -0700 Subject: [PATCH 42/68] Add two expected fails because of a build issue presumably in ccs_config --- cime_config/testdefs/ExpectedTestFails.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/cime_config/testdefs/ExpectedTestFails.xml b/cime_config/testdefs/ExpectedTestFails.xml index 9a14b7e8da..1d83bb2e7a 100644 --- a/cime_config/testdefs/ExpectedTestFails.xml +++ b/cime_config/testdefs/ExpectedTestFails.xml @@ -95,6 +95,20 @@ + + + FAIL + ESMCI/ccs_config_cesm#130 + + + + + + FAIL + ESMCI/ccs_config_cesm#130 + + + PEND From 11e706cc617750609b06759f9fd19aaabf649294 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Fri, 1 Dec 2023 10:04:40 -0700 Subject: [PATCH 43/68] Add more mpi-serial intel debug failed tests --- cime_config/testdefs/ExpectedTestFails.xml | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/cime_config/testdefs/ExpectedTestFails.xml b/cime_config/testdefs/ExpectedTestFails.xml index 1d83bb2e7a..bfd87c2fd9 100644 --- a/cime_config/testdefs/ExpectedTestFails.xml +++ b/cime_config/testdefs/ExpectedTestFails.xml @@ -57,6 +57,34 @@ #1733 + + + + FAIL + ESMCI/ccs_config_cesm#130 + + + + + + FAIL + ESMCI/ccs_config_cesm#130 + + + + + + FAIL + ESMCI/ccs_config_cesm#130 + + + + + + FAIL + ESMCI/ccs_config_cesm#130 + + From 24c088c8e9103bd639d0fece4674c4ea44b03393 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Fri, 1 Dec 2023 10:38:31 -0700 Subject: [PATCH 44/68] Remove two nvhpc tests that fail, one from Cheyenne that wasn't there before and the other from Derecho --- cime_config/testdefs/testlist_clm.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml index 1a1bfed7e3..86dde5bebd 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -693,7 +693,6 @@ - @@ -705,7 +704,6 @@ - From 6c5c24d193f714321a02e8296b563dbef6652442 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Fri, 1 Dec 2023 14:11:35 -0700 Subject: [PATCH 45/68] Add NEON tests to Derecho --- cime_config/testdefs/testlist_clm.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml index 86dde5bebd..8247236db2 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -2104,6 +2104,7 @@ + @@ -2115,6 +2116,7 @@ + @@ -2125,6 +2127,7 @@ + @@ -2158,6 +2161,8 @@ + + @@ -2171,6 +2176,8 @@ + + From 7ccd479e9f89b9dd755448037fa77b7c5db68c13 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Fri, 1 Dec 2023 14:12:25 -0700 Subject: [PATCH 46/68] Change some of the comments about Cheyenne to also include Derecho --- python/conda_env_ctsm_py.txt | 5 +++-- python/conda_env_ctsm_py_cgd.txt | 1 - python/ctsm/test/testinputs/README.md | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/python/conda_env_ctsm_py.txt b/python/conda_env_ctsm_py.txt index 0ac4656e73..0306a9ca06 100644 --- a/python/conda_env_ctsm_py.txt +++ b/python/conda_env_ctsm_py.txt @@ -1,7 +1,8 @@ # -# NOTE: Changes here should be coordinated with the cgd python environment file +# NOTE: Changes here should be coordinated with the cgd python environment file +# +# NOTE: Derecho already has conda installed for you, so you just need to do the following... # -# To install this on cheyenne with conda loaded in modules # use the top level bash script: # ../py_env_create # Do this each time you update your CTSM Version # conda activate ctsm_pylib # Do this anytime you want to run a CTSM python script diff --git a/python/conda_env_ctsm_py_cgd.txt b/python/conda_env_ctsm_py_cgd.txt index 8312dc328a..3afcf4bba2 100644 --- a/python/conda_env_ctsm_py_cgd.txt +++ b/python/conda_env_ctsm_py_cgd.txt @@ -3,7 +3,6 @@ # # This should be coordinated with the main python environment file! # -# To install this on cheyenne with conda loaded in modules # use the top level bash script: # ../py_env_create # Do this each time you update your CTSM Version # conda activate ctsm_pylib # Do this anytime you want to run a CTSM python script diff --git a/python/ctsm/test/testinputs/README.md b/python/ctsm/test/testinputs/README.md index 1775de48b7..ef8953d20e 100644 --- a/python/ctsm/test/testinputs/README.md +++ b/python/ctsm/test/testinputs/README.md @@ -6,6 +6,7 @@ Installing Git LFS on your machine is a two-step process; step (1) needs to be done once per machine, and step (2) needs to be done once per user: 1. Install the Git LFS tool: Follow the instructions on the [Git LFS page](https://git-lfs.github.com/) for installing Git LFS on your platform. + - On derecho the system default version of git already has Git LFS installed. - On cheyenne and casper, Git LFS is already available as long as you are using a git module rather than the default system-level git. So just make sure that you are always using git via a git module (`module load git`). From 1a2f5e8a1a20796953fa4b16d348fd4c25d28e0f Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Sat, 2 Dec 2023 19:49:20 -0700 Subject: [PATCH 47/68] Move the Derecho intel/DEBUG tests to gnu keeping only one that's expected to fail --- cime_config/testdefs/testlist_clm.xml | 40 ++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml index 8247236db2..2e76ca5d66 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -1984,11 +1984,15 @@ + + + - @@ -2104,7 +2108,10 @@ + + @@ -2116,7 +2123,10 @@ + + @@ -2127,7 +2137,10 @@ + + @@ -2161,8 +2174,12 @@ + + + @@ -2176,8 +2193,12 @@ + + + @@ -2188,7 +2209,10 @@ + + + @@ -2552,8 +2576,12 @@ + + + @@ -2571,7 +2599,10 @@ + + @@ -2896,7 +2927,10 @@ + + @@ -2922,7 +2956,10 @@ + + @@ -3201,6 +3238,7 @@ + From a6e3db81f791e99a95e6c3793c2e9fbaa9ca6f4c Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Sat, 2 Dec 2023 22:46:04 -0700 Subject: [PATCH 48/68] Add FUNITCTSM to the list of expected fails --- cime_config/testdefs/ExpectedTestFails.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/cime_config/testdefs/ExpectedTestFails.xml b/cime_config/testdefs/ExpectedTestFails.xml index bfd87c2fd9..f5053a7843 100644 --- a/cime_config/testdefs/ExpectedTestFails.xml +++ b/cime_config/testdefs/ExpectedTestFails.xml @@ -58,6 +58,13 @@ + + + FAIL + ESMCI/ccs_config_cesm#131 + + + FAIL From ad5c0768be91778b8298f30fa602bd7eabcb8f45 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Sun, 3 Dec 2023 17:52:34 -0700 Subject: [PATCH 49/68] Remove references to Cheyenne and make it more explicit what to do on different systems, as well as adding Derecho --- tools/modify_input_files/README.fsurdat_modifier | 9 ++++++++- tools/modify_input_files/README.mesh_mask_modifier | 9 ++++++++- tools/site_and_regional/README | 4 ++-- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/tools/modify_input_files/README.fsurdat_modifier b/tools/modify_input_files/README.fsurdat_modifier index 58dbadb902..885227c928 100644 --- a/tools/modify_input_files/README.fsurdat_modifier +++ b/tools/modify_input_files/README.fsurdat_modifier @@ -27,10 +27,17 @@ tools/modify_input_files/modify_fsurdat_template.cfg Instructions ------------ -To run on Cheyenne/Casper/Izumi +To run on various machines: 1) (Un)load, execute, and activate the following: +1a) First step to activate conda on your system +1a) Casper: module unload python module load conda +1a) Izumi: +module load python +1a) Derecho (nothing needs to be done for this step) +1a) Elsewhere (do what's needed to activate conda) +1b) On all systems ./py_env_create conda activate ctsm_pylib (Use "deactivate" to reverse the latter.) diff --git a/tools/modify_input_files/README.mesh_mask_modifier b/tools/modify_input_files/README.mesh_mask_modifier index 13d98b9e7f..9484058ffd 100644 --- a/tools/modify_input_files/README.mesh_mask_modifier +++ b/tools/modify_input_files/README.mesh_mask_modifier @@ -10,10 +10,17 @@ tools/modify_input_files/modify_mesh_template.cfg Instructions ------------ -To run on Cheyenne/Casper/Izumi +To run on various machines: 1) (Un)load, execute, and activate the following: +1a) First step to activate conda on your system +1a) Casper: module unload python module load conda +1a) Izumi: +module load python +1a) Derecho (nothing needs to be done +1a) Elsewhere (do what's needed to activate conda) +1b) On all systems ./py_env_create conda activate ctsm_py (Use "deactivate" to reverse the latter.) diff --git a/tools/site_and_regional/README b/tools/site_and_regional/README index 723ddb4a97..7b36b7d2b9 100644 --- a/tools/site_and_regional/README +++ b/tools/site_and_regional/README @@ -3,9 +3,9 @@ $CTSMROOT/tools/site_and_regional/README The purpose of this directory is to contain all of the scripts that involve creating CTSM input data files for single site as well as regional cases. -The python scripts require the following settings before running on cheyenne: +The python scripts require the following settings before running: -module load conda +(Do what's needed to make conda available on your system) ../../py_env_create conda activate ctsm_pylib From 9c4d186b0fd666c79112b17ba352aee6a8563235 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Mon, 4 Dec 2023 01:47:47 -0700 Subject: [PATCH 50/68] Update /glade/p references --- bld/namelist_files/createMapEntry.pl | 2 +- bld/unit_testers/build-namelist_test.pl | 2 +- bld/unit_testers/xFail/expectedClmTestFails.xml | 13 ------------- 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/bld/namelist_files/createMapEntry.pl b/bld/namelist_files/createMapEntry.pl index 561683bb05..f9009ba86f 100755 --- a/bld/namelist_files/createMapEntry.pl +++ b/bld/namelist_files/createMapEntry.pl @@ -23,7 +23,7 @@ my $scriptName; ($scriptName = $0) =~ s!(.*)/!!; # get name of script my $cwd = getcwd(); - my $CSMDATA = "/glade/p/cesm/cseg/inputdata"; + my $CSMDATA = "/glade/campaign/cesm/cesmdata/cseg/inputdata"; if ($#ARGV != 0 ) { usage(); diff --git a/bld/unit_testers/build-namelist_test.pl b/bld/unit_testers/build-namelist_test.pl index 4c717a58bf..4d03124116 100755 --- a/bld/unit_testers/build-namelist_test.pl +++ b/bld/unit_testers/build-namelist_test.pl @@ -139,7 +139,7 @@ sub cat_and_create_namelistinfile { $inputdata_rootdir = $ENV{'CSMDATA'}; } else { # use yellowstone location as default - $inputdata_rootdir="/glade/p/cesm/cseg/inputdata"; + $inputdata_rootdir="/glade/campaign/cesm/cesmdata/cseg/inputdata"; print("WARNING: -csmdata nor CSMDATA are set, using default yellowstone location: $inputdata_rootdir\n"); } diff --git a/bld/unit_testers/xFail/expectedClmTestFails.xml b/bld/unit_testers/xFail/expectedClmTestFails.xml index 12c954d38b..c7cbfee488 100644 --- a/bld/unit_testers/xFail/expectedClmTestFails.xml +++ b/bld/unit_testers/xFail/expectedClmTestFails.xml @@ -34,19 +34,6 @@ - - - - Doesn't check for valid values - - - - - - - - From fe97097f561b2dfb8cb9c47e5b1a5142ffe6f5d7 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Mon, 4 Dec 2023 01:48:21 -0700 Subject: [PATCH 51/68] Update /glade/p path references --- tools/modify_input_files/README.mesh_mask_modifier | 2 +- tools/site_and_regional/default_data.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/modify_input_files/README.mesh_mask_modifier b/tools/modify_input_files/README.mesh_mask_modifier index 9484058ffd..4e25e73826 100644 --- a/tools/modify_input_files/README.mesh_mask_modifier +++ b/tools/modify_input_files/README.mesh_mask_modifier @@ -56,7 +56,7 @@ In your copy of the CTSM (say, ~user/ctsm), go to the appropriate tool: Enter the following (or similar) selections in modify_fill_indianocean.cfg: -mesh_mask_in = /glade/p/cesmdata/cseg/inputdata/share/meshes/fv0.9x1.25_141008_polemod_ESMFmesh.nc +mesh_mask_in = /glade/campaign/cesm/cesmdata/cseg/inputdata/share/meshes/fv0.9x1.25_141008_polemod_ESMFmesh.nc mesh_mask_out = fv0.9x1.25_141008_polemod_ESMFmesh_modified.nc landmask_file = .../path_to_your_copy_of/fill_indianocean.nc diff --git a/tools/site_and_regional/default_data.cfg b/tools/site_and_regional/default_data.cfg index 7e841dca54..0425aba133 100644 --- a/tools/site_and_regional/default_data.cfg +++ b/tools/site_and_regional/default_data.cfg @@ -1,5 +1,5 @@ [main] -clmforcingindir = /glade/p/cesmdata/inputdata +clmforcingindir = /glade/campaign/cesm/cesmdata/cseg/inputdata [datm_gswp3] dir = atm/datm7/atm_forcing.datm7.GSWP3.0.5d.v1.c170516 From 12057ea300fe7590ecd96ec8669df22377356dbf Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Mon, 4 Dec 2023 02:08:16 -0700 Subject: [PATCH 52/68] Update /glade/p paths --- python/ctsm/crop_calendars/generate_gdds.py | 2 +- python/ctsm/machine_defaults.py | 2 +- python/ctsm/test/test_unit_subset_data.py | 2 +- python/ctsm/test/testinputs/default_data.cfg | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/python/ctsm/crop_calendars/generate_gdds.py b/python/ctsm/crop_calendars/generate_gdds.py index b54e7df40f..16e3e130da 100644 --- a/python/ctsm/crop_calendars/generate_gdds.py +++ b/python/ctsm/crop_calendars/generate_gdds.py @@ -1,4 +1,4 @@ -paramfile_dir = "/glade/p/cesmdata/cseg/inputdata/lnd/clm2/paramdata" +paramfile_dir = "/glade/campaign/cesm/cesmdata/cseg/inputdata/lnd/clm2/paramdata" # Import other shared functions import os diff --git a/python/ctsm/machine_defaults.py b/python/ctsm/machine_defaults.py index 18f4ff4752..e30881c474 100644 --- a/python/ctsm/machine_defaults.py +++ b/python/ctsm/machine_defaults.py @@ -47,7 +47,7 @@ "cheyenne": MachineDefaults( job_launcher_type=JOB_LAUNCHER_QSUB, scratch_dir=os.path.join(os.path.sep, "glade", "scratch", get_user()), - baseline_dir=os.path.join(os.path.sep, "glade", "p", "cgd", "tss", "ctsm_baselines"), + baseline_dir=os.path.join(os.path.sep, "glade", "p", "cgd", "tss", "To_Be_Safely_Deleted", "ctsm_baselines"), account_required=True, create_test_retry=0, # NOTE(wjs, 2022-02-23) By default, use the regular queue, even for diff --git a/python/ctsm/test/test_unit_subset_data.py b/python/ctsm/test/test_unit_subset_data.py index fd9aef631d..b8ea5b06f2 100755 --- a/python/ctsm/test/test_unit_subset_data.py +++ b/python/ctsm/test/test_unit_subset_data.py @@ -56,7 +56,7 @@ def test_inputdata_setup_files_basic(self): ) self.assertEqual( files["main_dir"], - "/glade/p/cesmdata/inputdata", + "/glade/campaign/cesm/cesmdata/cseg/inputdata", "main_dir directory not whats expected", ) diff --git a/python/ctsm/test/testinputs/default_data.cfg b/python/ctsm/test/testinputs/default_data.cfg index 7e841dca54..0425aba133 100644 --- a/python/ctsm/test/testinputs/default_data.cfg +++ b/python/ctsm/test/testinputs/default_data.cfg @@ -1,5 +1,5 @@ [main] -clmforcingindir = /glade/p/cesmdata/inputdata +clmforcingindir = /glade/campaign/cesm/cesmdata/cseg/inputdata [datm_gswp3] dir = atm/datm7/atm_forcing.datm7.GSWP3.0.5d.v1.c170516 From 8b249d532f7dd39c56867ea93a92fbf6dad6fac1 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Mon, 4 Dec 2023 02:47:08 -0700 Subject: [PATCH 53/68] First stab at getting the test/tools framework to work on Derecho, isn't working as conda and module is not available in my default shell --- test/tools/README | 4 +- test/tools/test_driver.sh | 71 ++++++++++++++++++++++++--- test/tools/tests_pretag_derecho_nompi | 9 ++++ 3 files changed, 76 insertions(+), 8 deletions(-) create mode 100644 test/tools/tests_pretag_derecho_nompi diff --git a/test/tools/README b/test/tools/README index a2acbcae40..c545f625b8 100644 --- a/test/tools/README +++ b/test/tools/README @@ -11,7 +11,7 @@ To use... ./test_driver.sh -i -on cheyenne +on Derecho qcmd -l walltime=08:00:00 -- ./test_driver.sh -i >& run.out & @@ -33,7 +33,7 @@ To run neon-specific tests, please use login nodes: env CLM_INPUT_TESTS=`pwd`/tests_pretag_nompi_neon ./test_driver.sh -i > & run_neon.out & -Intended for use on NCAR machines cheyenne, geyser (DAV) and hobart. +Intended for use on NCAR machines Derecho, Casper (DAV) and izumi. II. RUNNING test_driver.sh TOOLS TESTING: diff --git a/test/tools/test_driver.sh b/test/tools/test_driver.sh index d4676cca69..6b1811c8ab 100755 --- a/test/tools/test_driver.sh +++ b/test/tools/test_driver.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh # # test_driver.sh: driver script for the offline testing of CLM of tools # @@ -26,15 +26,74 @@ hostname=`hostname` echo $hostname case $hostname in - ##cheyenne - cheyenne* | r*i*n*) - submit_script="test_driver_cheyenne${cur_time}.sh" + ##Derecho + derecho* | dec*) + submit_script="test_driver_derecho${cur_time}.sh" ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv writing to batch script vvvvvvvvvvvvvvvvvvv cat > ./${submit_script} << EOF #!/bin/sh # +interactive="YES" +input_file="tests_pretag_derecho_nompi" +c_threads=128 + +export INITMODULES="/glade/u/apps/derecho/23.06/spack/opt/spack/lmod/8.7.20/gcc/7.5.0/pdxb/lmod/lmod/init/sh" +. \$INITMODULES + +module --force purge +module load ncarenv +module load craype +module load intel +module load mkl +module load ncarcompilers +module load netcdf +module load nco +module load ncl + +#omp threads +if [ -z "\$CLM_THREADS" ]; then #threads NOT set on command line + export CLM_THREADS=\$c_threads +fi + +# Stop on first failed test +if [ -z "\$CLM_SOFF" ]; then #CLM_SOFF NOT set + export CLM_SOFF=FALSE +fi + +export CESM_MACH="derecho" +export CESM_COMP="intel" + +export NETCDF_DIR=\$NETCDF +export INC_NETCDF=\$NETCDF/include +export LIB_NETCDF=\$NETCDF/lib +export MAKE_CMD="gmake -j " +export CFG_STRING="" +export TOOLS_MAKE_STRING="USER_FC=ifort USER_LINKER=ifort USER_CPPDEFS=-DLINUX" +export MACH_WORKSPACE=\$SCRATCH +export CPRNC_EXE="$CESMDATAROOT/cprnc/cprnc" +dataroot="$CESMDATAROOT/inputdata" +export TOOLSLIBS="" +export REGRID_PROC=1 +export TOOLS_CONF_STRING="--mpilib mpi-serial" + + +echo_arg="" + +EOF +#^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ writing to batch script ^^^^^^^^^^^^^^^^^^^ + ;; + + ##cheyenne + cheyenne* | r*i*n*) + submit_script="test_driver_cheyenne${cur_time}.sh" + +#vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv writing to batch script vvvvvvvvvvvvvvvvvvv +at > ./${submit_script} << EOF +!/bin/sh + + interactive="YES" input_file="tests_pretag_cheyenne_nompi" c_threads=36 @@ -314,7 +373,7 @@ EOF ;; * ) - echo "Only setup to work on: cheyenne, hobart and izumi" + echo "Only setup to work on: derecho, cheyenne, hobart and izumi" exit @@ -633,7 +692,7 @@ case $arg1 in * ) echo "" echo "**********************" - echo "usage on cheyenne, hobart, and izumi: " + echo "usage on derecho, cheyenne, hobart, and izumi: " echo "./test_driver.sh -i" echo "" echo "valid arguments: " diff --git a/test/tools/tests_pretag_derecho_nompi b/test/tools/tests_pretag_derecho_nompi new file mode 100644 index 0000000000..5fdaf335ae --- /dev/null +++ b/test/tools/tests_pretag_derecho_nompi @@ -0,0 +1,9 @@ +smba1 blba1 +smbd1 blbd1 +sm0a1 bl0a1 +sm0c1 bl0c1 +smaa2 blaa2 +smba1 blba1 +smb81 blb81 +smbc1 blbc1 +smbd1 blbd1 From 8085fa344c0119e2eeb299b521082a0e74636158 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Mon, 4 Dec 2023 03:10:02 -0700 Subject: [PATCH 54/68] Update paths to use /glade/campaign/cesm/cesmdata/cseg/inputdata resolving most of #2196 --- .../testmods_dirs/clm/DA_multidrv/user_nl_clm_0001 | 1 + .../testmods_dirs/clm/DA_multidrv/user_nl_clm_0002 | 1 + .../testdefs/testmods_dirs/clm/USUMB_mct/shell_commands | 7 +++---- .../testdefs/testmods_dirs/clm/USUMB_mct/user_nl_clm | 5 ++--- .../testdefs/testmods_dirs/clm/USUMB_nuopc/shell_commands | 3 +-- .../testdefs/testmods_dirs/clm/USUMB_nuopc/user_nl_clm | 5 ++--- .../testdefs/testmods_dirs/clm/ciso_cwd_hr/user_nl_clm | 2 +- .../clm/collapse_pfts_78_to_16_decStart_f10/README | 4 ++-- .../clm/collapse_pfts_78_to_16_decStart_f10/user_nl_clm | 4 ++-- .../testdefs/testmods_dirs/clm/cplhist/shell_commands | 2 +- .../modify_smallville_with_dynurban.ncl | 1 + .../testdefs/testmods_dirs/clm/sowingWindows/user_nl_clm | 6 +++--- 12 files changed, 20 insertions(+), 21 deletions(-) diff --git a/cime_config/testdefs/testmods_dirs/clm/DA_multidrv/user_nl_clm_0001 b/cime_config/testdefs/testmods_dirs/clm/DA_multidrv/user_nl_clm_0001 index 719785e25d..96b8d387db 100644 --- a/cime_config/testdefs/testmods_dirs/clm/DA_multidrv/user_nl_clm_0001 +++ b/cime_config/testdefs/testmods_dirs/clm/DA_multidrv/user_nl_clm_0001 @@ -10,4 +10,5 @@ hist_type1d_pertape = ' ',' ',' ' use_init_interp = .true. + ! IMPORTANT: The path for this file NEEDS to be updated for the removal of Cheyenne and /glade/p finidat = '/glade/p/cisl/dares/RDA_strawman/CESM_ensembles/CLM/CLM5BGC-Crop/ctsm_2001-01-01-00000/clm5_f09_spinup80.clm2_0001.r.2001-01-01-00000.nc' diff --git a/cime_config/testdefs/testmods_dirs/clm/DA_multidrv/user_nl_clm_0002 b/cime_config/testdefs/testmods_dirs/clm/DA_multidrv/user_nl_clm_0002 index 37d5b2b24e..6a606720d5 100644 --- a/cime_config/testdefs/testmods_dirs/clm/DA_multidrv/user_nl_clm_0002 +++ b/cime_config/testdefs/testmods_dirs/clm/DA_multidrv/user_nl_clm_0002 @@ -10,4 +10,5 @@ hist_type1d_pertape = ' ',' ',' ' use_init_interp = .true. + ! IMPORTANT: The path for this file NEEDS to be updated for the removal of Cheyenne and /glade/p finidat = '/glade/p/cisl/dares/RDA_strawman/CESM_ensembles/CLM/CLM5BGC-Crop/ctsm_2001-01-01-00000/clm5_f09_spinup80.clm2_0002.r.2001-01-01-00000.nc' diff --git a/cime_config/testdefs/testmods_dirs/clm/USUMB_mct/shell_commands b/cime_config/testdefs/testmods_dirs/clm/USUMB_mct/shell_commands index 446125abf9..4fb282d511 100755 --- a/cime_config/testdefs/testmods_dirs/clm/USUMB_mct/shell_commands +++ b/cime_config/testdefs/testmods_dirs/clm/USUMB_mct/shell_commands @@ -5,8 +5,8 @@ ./xmlchange DATM_CLMNCEP_YR_END=2006 # Comment this out if NINST_LND is greater than 1 (see: http://bugs.cgd.ucar.edu/show_bug.cgi?id=2521) ./xmlchange MPILIB=mpi-serial -./xmlchange ATM_DOMAIN_PATH=/glade/p/cesm/cseg/inputdata/lnd/clm2/PTCLMmydatafiles.c171024/1x1pt_US-UMB -./xmlchange LND_DOMAIN_PATH=/glade/p/cesm/cseg/inputdata/lnd/clm2/PTCLMmydatafiles.c171024/1x1pt_US-UMB +./xmlchange ATM_DOMAIN_PATH='$DIN_LOC_ROOT/lnd/clm2/PTCLMmydatafiles.c171024/1x1pt_US-UMB' +./xmlchange LND_DOMAIN_PATH='$DIN_LOC_ROOT/lnd/clm2/PTCLMmydatafiles.c171024/1x1pt_US-UMB' ./xmlchange ATM_DOMAIN_FILE=domain.lnd.1x1pt_US-UMB_navy.171024.nc ./xmlchange LND_DOMAIN_FILE=domain.lnd.1x1pt_US-UMB_navy.171024.nc ./xmlchange --append CLM_BLDNML_OPTS='-mask navy -no-crop' @@ -15,5 +15,4 @@ ./xmlchange ATM_NCPL=24 ./xmlchange RUN_STARTDATE=1999-01-01 ./xmlchange DATM_CLMNCEP_YR_ALIGN=1999 -./xmlchange DIN_LOC_ROOT=/glade/p/cesm/cseg/inputdata -./xmlchange DIN_LOC_ROOT_CLMFORC=/glade/p/cesm/cseg/inputdata/lnd/clm2/PTCLMmydatafiles.c171024 +./xmlchange DIN_LOC_ROOT_CLMFORC='$DIN_LOC_ROOT/lnd/clm2/PTCLMmydatafiles.c171024' diff --git a/cime_config/testdefs/testmods_dirs/clm/USUMB_mct/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/USUMB_mct/user_nl_clm index 38ce400297..8bb7848d49 100644 --- a/cime_config/testdefs/testmods_dirs/clm/USUMB_mct/user_nl_clm +++ b/cime_config/testdefs/testmods_dirs/clm/USUMB_mct/user_nl_clm @@ -1,5 +1,4 @@ -! user_nl_clm namelist options written by PTCLMmkdata: -! ./PTCLMmkdata --cesm_root ../../../.. -s US-UMB -d /glade/p/cesm/cseg/inputdata --mydatadir=/glade/p/cesm/cseg/inputdata/lnd/clm2/PTCLMmydatafiles.c171024 - fsurdat = '/glade/p/cesm/cseg/inputdata/lnd/clm2/PTCLMmydatafiles.c171024/1x1pt_US-UMB/surfdata_1x1pt_US-UMB_16pfts_Irrig_CMIP6_simyr2000_c171024.nc' +! user_nl_clm namelist options written by PTCLMmkdata, which is no longer available + fsurdat = '$DIN_LOC_ROOT/lnd/clm2/PTCLMmydatafiles.c171024/1x1pt_US-UMB/surfdata_1x1pt_US-UMB_16pfts_Irrig_CMIP6_simyr2000_c171024.nc' hist_nhtfrq = 0 hist_mfilt = 1200 diff --git a/cime_config/testdefs/testmods_dirs/clm/USUMB_nuopc/shell_commands b/cime_config/testdefs/testmods_dirs/clm/USUMB_nuopc/shell_commands index 08a9014abe..ec6eb898d7 100755 --- a/cime_config/testdefs/testmods_dirs/clm/USUMB_nuopc/shell_commands +++ b/cime_config/testdefs/testmods_dirs/clm/USUMB_nuopc/shell_commands @@ -11,7 +11,6 @@ ./xmlchange ATM_NCPL=24 ./xmlchange RUN_STARTDATE=1999-01-01 ./xmlchange DATM_YR_ALIGN=1999 -./xmlchange DIN_LOC_ROOT=/glade/p/cesm/cseg/inputdata -./xmlchange DIN_LOC_ROOT_CLMFORC=/glade/p/cesm/cseg/inputdata/lnd/clm2/PTCLMmydatafiles.c171024 +./xmlchange DIN_LOC_ROOT_CLMFORC='$DIN_LOC_ROOT/lnd/clm2/PTCLMmydatafiles.c171024' ./xmlchange PTS_LON=275.2862 ./xmlchange PTS_LAT=45.5598 diff --git a/cime_config/testdefs/testmods_dirs/clm/USUMB_nuopc/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/USUMB_nuopc/user_nl_clm index 38ce400297..8bb7848d49 100644 --- a/cime_config/testdefs/testmods_dirs/clm/USUMB_nuopc/user_nl_clm +++ b/cime_config/testdefs/testmods_dirs/clm/USUMB_nuopc/user_nl_clm @@ -1,5 +1,4 @@ -! user_nl_clm namelist options written by PTCLMmkdata: -! ./PTCLMmkdata --cesm_root ../../../.. -s US-UMB -d /glade/p/cesm/cseg/inputdata --mydatadir=/glade/p/cesm/cseg/inputdata/lnd/clm2/PTCLMmydatafiles.c171024 - fsurdat = '/glade/p/cesm/cseg/inputdata/lnd/clm2/PTCLMmydatafiles.c171024/1x1pt_US-UMB/surfdata_1x1pt_US-UMB_16pfts_Irrig_CMIP6_simyr2000_c171024.nc' +! user_nl_clm namelist options written by PTCLMmkdata, which is no longer available + fsurdat = '$DIN_LOC_ROOT/lnd/clm2/PTCLMmydatafiles.c171024/1x1pt_US-UMB/surfdata_1x1pt_US-UMB_16pfts_Irrig_CMIP6_simyr2000_c171024.nc' hist_nhtfrq = 0 hist_mfilt = 1200 diff --git a/cime_config/testdefs/testmods_dirs/clm/ciso_cwd_hr/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/ciso_cwd_hr/user_nl_clm index 57ac8a6461..534cbb84b8 100644 --- a/cime_config/testdefs/testmods_dirs/clm/ciso_cwd_hr/user_nl_clm +++ b/cime_config/testdefs/testmods_dirs/clm/ciso_cwd_hr/user_nl_clm @@ -1,2 +1,2 @@ -paramfile = '/glade/p/cesm/cseg/inputdata/lnd/clm2/paramdata/ctsm51_ciso_cwd_hr_params.c231117.nc' +paramfile = '$DIN_LOC_ROOT/lnd/clm2/paramdata/ctsm51_ciso_cwd_hr_params.c231117.nc' hist_fincl1 = 'CWDC_HR','C13_CWDC_HR','C14_CWDC_HR','CWD_HR_L2','CWD_HR_L2_vr','CWD_HR_L3','CWD_HR_L3_vr' diff --git a/cime_config/testdefs/testmods_dirs/clm/collapse_pfts_78_to_16_decStart_f10/README b/cime_config/testdefs/testmods_dirs/clm/collapse_pfts_78_to_16_decStart_f10/README index 81fb991ed0..af5d819ffc 100644 --- a/cime_config/testdefs/testmods_dirs/clm/collapse_pfts_78_to_16_decStart_f10/README +++ b/cime_config/testdefs/testmods_dirs/clm/collapse_pfts_78_to_16_decStart_f10/README @@ -9,10 +9,10 @@ According to the file the following two files used in this test are default files for the following options: -fsurdat = '/glade/p/cesmdata/cseg/inputdata/lnd/clm2/surfdata_map/surfdata_10x15_78pfts_CMIP6_simyr1850_c170824.nc' +fsurdat = '$DIN_LOC_ROOT/lnd/clm2/surfdata_map/surfdata_10x15_78pfts_CMIP6_simyr1850_c170824.nc' hgrid="10x15" sim_year="1850" use_crop=".true." -flanduse_timeseries = '/glade/p/cesmdata/cseg/inputdata/lnd/clm2/surfdata_map/landuse.timeseries_10x15_hist_78pfts_CMIP6_simyr1850-2015_c170824.nc' +flanduse_timeseries = '$DIN_LOC_ROOT/lnd/clm2/surfdata_map/landuse.timeseries_10x15_hist_78pfts_CMIP6_simyr1850-2015_c170824.nc' hgrid="10x15" sim_year_range="1850-2000" use_crop=".true." hgrid="10x15" rcp="8.5" sim_year_range="1850-2100" use_crop=".true." hgrid="10x15" rcp="6" sim_year_range="1850-2100" use_crop=".true." diff --git a/cime_config/testdefs/testmods_dirs/clm/collapse_pfts_78_to_16_decStart_f10/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/collapse_pfts_78_to_16_decStart_f10/user_nl_clm index ff78e0122c..8c4fed6873 100644 --- a/cime_config/testdefs/testmods_dirs/clm/collapse_pfts_78_to_16_decStart_f10/user_nl_clm +++ b/cime_config/testdefs/testmods_dirs/clm/collapse_pfts_78_to_16_decStart_f10/user_nl_clm @@ -1,2 +1,2 @@ -fsurdat = '/glade/p/cesmdata/cseg/inputdata/lnd/clm2/surfdata_map/surfdata_10x15_78pfts_CMIP6_simyr1850_c170824.nc' -flanduse_timeseries = '/glade/p/cesmdata/cseg/inputdata/lnd/clm2/surfdata_map/landuse.timeseries_10x15_hist_78pfts_CMIP6_simyr1850-2015_c170824.nc' +fsurdat = '$DIN_LOC_ROOT/lnd/clm2/surfdata_map/surfdata_10x15_78pfts_CMIP6_simyr1850_c170824.nc' +flanduse_timeseries = '$DIN_LOC_ROOT/lnd/clm2/surfdata_map/landuse.timeseries_10x15_hist_78pfts_CMIP6_simyr1850-2015_c170824.nc' diff --git a/cime_config/testdefs/testmods_dirs/clm/cplhist/shell_commands b/cime_config/testdefs/testmods_dirs/clm/cplhist/shell_commands index a284aefcb9..f0eb85010b 100755 --- a/cime_config/testdefs/testmods_dirs/clm/cplhist/shell_commands +++ b/cime_config/testdefs/testmods_dirs/clm/cplhist/shell_commands @@ -1,5 +1,5 @@ ./xmlchange DATM_CPLHIST_CASE=cam6ctsm51_cesm23a12c_ne30pg3g17_CPLHIST_1850 -./xmlchange DATM_CPLHIST_DIR=/glade/p/cgd/tss/CTSM_datm_forcing_data/atm_forcing.cdeps_datm.CPLHIST_cam6ctsm51_cesm23a12c_ne30pg3g17_1850 +./xmlchange DATM_CPLHIST_DIR='$DIN_LOC_ROOT/atm/datm7/atm_forcing.cdeps_datm.CPLHIST_cam6ctsm51_cesm23a12c_ne30pg3g17_1850' ./xmlchange DATM_YR_START=1 ./xmlchange DATM_YR_END=1 ./xmlchange DATM_YR_ALIGN=1 diff --git a/cime_config/testdefs/testmods_dirs/clm/smallville_dynurban_monthly/modify_smallville_with_dynurban.ncl b/cime_config/testdefs/testmods_dirs/clm/smallville_dynurban_monthly/modify_smallville_with_dynurban.ncl index 15ec0469be..30e73535a4 100644 --- a/cime_config/testdefs/testmods_dirs/clm/smallville_dynurban_monthly/modify_smallville_with_dynurban.ncl +++ b/cime_config/testdefs/testmods_dirs/clm/smallville_dynurban_monthly/modify_smallville_with_dynurban.ncl @@ -18,6 +18,7 @@ begin print ("Start Time: "+systemfunc("date") ) print ("=========================================") + ; IMPORTANT NOTE: The path for these files needs to be updated with the removal of Cheyenne and /glade/p (See history note below as well) infile = "/glade/p/cgd/tss/people/oleson/modify_surfdata/landuse.timeseries_1x1_smallvilleIA_hist_78pfts_simyr1850-1855_c160127.nc" outfile = "/glade/p/cgd/tss/people/oleson/modify_surfdata/landuse.timeseries_1x1_smallvilleIA_hist_78pfts_simyr1850-1855_dynUrban_c220223.nc" diff --git a/cime_config/testdefs/testmods_dirs/clm/sowingWindows/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/sowingWindows/user_nl_clm index d3d922f721..03165bb306 100644 --- a/cime_config/testdefs/testmods_dirs/clm/sowingWindows/user_nl_clm +++ b/cime_config/testdefs/testmods_dirs/clm/sowingWindows/user_nl_clm @@ -1,5 +1,5 @@ -stream_fldFileName_swindow_start = '/glade/p/cesmdata/cseg/inputdata/lnd/clm2/cropdata/calendars/processed/swindow_starts_ggcmi_crop_calendar_phase3_v1.01.2000-2000.20231005_145103.nc' -stream_fldFileName_swindow_end = '/glade/p/cesmdata/cseg/inputdata/lnd/clm2/cropdata/calendars/processed/swindow_ends_ggcmi_crop_calendar_phase3_v1.01.2000-2000.20231005_145103.nc' -stream_meshfile_cropcal = '/glade/p/cesmdata/cseg/inputdata/share/meshes/360x720_120830_ESMFmesh_c20210507_cdf5.nc' +stream_fldFileName_swindow_start = '$DIN_LOC_ROOT/lnd/clm2/cropdata/calendars/processed/swindow_starts_ggcmi_crop_calendar_phase3_v1.01.2000-2000.20231005_145103.nc' +stream_fldFileName_swindow_end = '$DIN_LOC_ROOT/lnd/clm2/cropdata/calendars/processed/swindow_ends_ggcmi_crop_calendar_phase3_v1.01.2000-2000.20231005_145103.nc' +stream_meshfile_cropcal = '$DIN_LOC_ROOT/share/meshes/360x720_120830_ESMFmesh_c20210507_cdf5.nc' stream_year_first_cropcal = 2000 stream_year_last_cropcal = 2000 From 7efee20795948f3474ed3e8b813f1859bb099284 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Wed, 6 Dec 2023 00:07:41 -0700 Subject: [PATCH 55/68] Update cdeps version to fix #2280 so NAG compiler can run --- Externals.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Externals.cfg b/Externals.cfg index cf2ff73498..a17f8e2ec6 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -55,7 +55,7 @@ local_path = components/cmeps required = True [cdeps] -tag = cdeps1.0.23 +tag = cdeps1.0.24 protocol = git repo_url = https://github.com/ESCOMP/CDEPS.git local_path = components/cdeps From 6fccf682eaf718615407d9bacdd3903b8786a03d Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Wed, 6 Dec 2023 09:42:56 -0700 Subject: [PATCH 56/68] Run through black --- python/ctsm/machine_defaults.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/python/ctsm/machine_defaults.py b/python/ctsm/machine_defaults.py index e30881c474..0f3900c152 100644 --- a/python/ctsm/machine_defaults.py +++ b/python/ctsm/machine_defaults.py @@ -47,7 +47,9 @@ "cheyenne": MachineDefaults( job_launcher_type=JOB_LAUNCHER_QSUB, scratch_dir=os.path.join(os.path.sep, "glade", "scratch", get_user()), - baseline_dir=os.path.join(os.path.sep, "glade", "p", "cgd", "tss", "To_Be_Safely_Deleted", "ctsm_baselines"), + baseline_dir=os.path.join( + os.path.sep, "glade", "p", "cgd", "tss", "To_Be_Safely_Deleted", "ctsm_baselines" + ), account_required=True, create_test_retry=0, # NOTE(wjs, 2022-02-23) By default, use the regular queue, even for From 90541f66ec23ec7e8de9db8e7bbd167fa22b1afb Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Wed, 6 Dec 2023 09:44:06 -0700 Subject: [PATCH 57/68] ignore black format --- .git-blame-ignore-revs | 1 + 1 file changed, 1 insertion(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index b093c298e9..f2a9d2da8d 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -23,3 +23,4 @@ e4d38681df23ccca0ae29581a45f8362574e0630 0bc3f00115d86d026a977918661c93779b3b19f9 540b256d1f3382f4619d7b0877c32d54ce5c40b6 8a168bb0895f4f2421608dd2589398e13a6663e6 +6fccf682eaf718615407d9bacdd3903b8786a03d From d7cd648a620d3d874dfc757365bf6747d818a4ed Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Wed, 6 Dec 2023 09:52:02 -0700 Subject: [PATCH 58/68] Remove new ne30np4.pg3 finidat file from CTSM5.2 as incompatible with CTSM5.1 --- bld/namelist_files/namelist_defaults_ctsm.xml | 22 ------------------- 1 file changed, 22 deletions(-) diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml index e9b9b7c54d..e03ad755ae 100644 --- a/bld/namelist_files/namelist_defaults_ctsm.xml +++ b/bld/namelist_files/namelist_defaults_ctsm.xml @@ -722,11 +722,6 @@ attributes from the config_cache.xml file (with keys converted to upper-case). >hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.false. glc_nec=10 do_transient_pfts=.false. - -hgrid=ne30np4.pg3 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.false. glc_nec=10 do_transient_pfts=.false. - - hgrid=1.9x2.5 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. @@ -825,12 +820,6 @@ attributes from the config_cache.xml file (with keys converted to upper-case). >hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. - -hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. - - hgrid=ne0np4CONUS.ne30x8 maxpft=17 mask=tx0.1v2 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false. - -.true. - -lnd/clm2/initdata_map/clmi.I1850Clm51CplhistBgcCrop-ciso.0561-01-01.ne30np4.pg3_gx1v7_simyr1850_c231109.nc - - - + From 7be29765f622ddfbe20aff6f8b5a655cd3155177 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Thu, 7 Dec 2023 12:24:41 -0700 Subject: [PATCH 65/68] Correct the finidat file settings for clm5_1_cam6 to point to the clm5_0_cam6 f09 files --- bld/namelist_files/namelist_defaults_ctsm.xml | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml index e03ad755ae..b5ae57e5ae 100644 --- a/bld/namelist_files/namelist_defaults_ctsm.xml +++ b/bld/namelist_files/namelist_defaults_ctsm.xml @@ -722,6 +722,11 @@ attributes from the config_cache.xml file (with keys converted to upper-case). >hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.false. glc_nec=10 do_transient_pfts=.false. + +hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.false. glc_nec=10 do_transient_pfts=.false. + + hgrid=1.9x2.5 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. @@ -820,6 +825,12 @@ attributes from the config_cache.xml file (with keys converted to upper-case). >hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. + +hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. + + lnd/clm2/initdata_map/clmi.I1850Clm50BgcCrop-ciso.1366-01-01.0.9x1.25_gx1v7_simyr1850_c200428.nc +>lnd/clm2/initdata_map/clmi.B1850Clm50BgcCrop.0161-01-01.0.9x1.25_gx1v7_simyr1850_c200729.nc + + + +lnd/clm2/initdata_map/clmi.B1850Clm50BgcCrop.0161-01-01.0.9x1.25_gx1v7_simyr1850_c200729.nc From aaf740cdfcba1fe884107794d8244fc74d0f9384 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Thu, 7 Dec 2023 22:16:13 -0700 Subject: [PATCH 67/68] Update Change files --- doc/.ChangeLog_template | 10 ++-- doc/ChangeLog | 107 ++++++++++++++++++++++++++++++++++++++++ doc/ChangeSum | 1 + 3 files changed, 113 insertions(+), 5 deletions(-) diff --git a/doc/.ChangeLog_template b/doc/.ChangeLog_template index 9f4f64c587..bbd65c8c83 100644 --- a/doc/.ChangeLog_template +++ b/doc/.ChangeLog_template @@ -96,11 +96,11 @@ infrastructure should be run when appropriate, as described below. build-namelist tests (if CLMBuildNamelist.pm has changed): - cheyenne - + derecho - tools-tests (test/tools) (if tools have been changed): - cheyenne - + derecho - python testing (if python code has changed; see instructions in python/README.md; document testing done): @@ -114,15 +114,15 @@ infrastructure should be run when appropriate, as described below. doing their own baseline generation. If you are already running the full aux_clm then you do NOT need to separately run the clm_pymods test suite, and you can remove the following line.] - clm_pymods test suite on cheyenne - + clm_pymods test suite on derecho - regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing): - cheyenne ---- + derecho ----- izumi ------- fates tests: (give name of baseline if different from CTSM tagname, normally fates baselines are fates--) - cheyenne ---- + derecho ----- izumi ------- any other testing (give details below): diff --git a/doc/ChangeLog b/doc/ChangeLog index 168183cee7..961ccab675 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,4 +1,111 @@ =============================================================== +Tag name: ctsm5.1.dev158 +Originator(s): erik (Erik Kluzek,UCAR/TSS,303-497-1326) +Date: Thu 07 Dec 2023 10:15:56 PM MST +One-line Summary: First tag with testing moved to Derecho and working PE-layouts for Derecho + +Purpose and description of changes +---------------------------------- + +First tag for CTSM working and tested on Derecho. Update CDEPS so that we can run with the NAG compiler. +Working PE layouts. Changes from CESM3_dev over to main-dev. Testing added for Derecho. +Do some work to get tools testing working on Derecho, not completed. +Add Derecho to the README files under tools/modify_input_files and tools/site_and_regional +Make sure there are no /glade/p references in the code (other than in the doc directory). + + +Significant changes to scientifically-supported configurations +-------------------------------------------------------------- + +Does this tag change answers significantly for any of the following physics configurations? +(Details of any changes will be given in the "Answer changes" section below.) + + [Put an [X] in the box for any configuration with significant answer changes.] + +[ ] clm5_1 + +[ ] clm5_0 + +[ ] ctsm5_0-nwp + +[ ] clm4_5 + + +Bugs fixed or introduced +------------------------ + +CTSM issues fixed (include CTSM Issue #): + Resolves Derecho transition: Tests and test infrastructure #1995 + Resolves Updating Externals for Derecho causes Izumi nag tests to fail #2280 + Resolves Transient simulation with ne30np4.pg3 fails due to floating point error #2268 + Resolves Need to move location of DA_multidrv finidat files from /glade/p to /glade/campaign #2282 + Works on Add support to test/tools/test_driver.sh for Derecho for NEON tools #2276 + +Notes of particular relevance for users +--------------------------------------- + +Changes to CTSM's user interface (e.g., new/renamed XML or namelist variables): + Added clm5_1_cam6 option to LND_TUNING_MODE + This is important in order to enable using latest clm5_1 physics with fully coupled cases + +Changes made to namelist defaults (e.g., changed parameter values): + Make sure there are finidat files for clm5_1 with CAM6 for 1850 and 2000 (from clm5_0 version at f09 + Make sure ne30np4.pg3 is setup + Some adjustments for ne30np4 and ne30np4.pg3 to make sure landuse.timeseries files are correct + +Notes of particular relevance for developers: +--------------------------------------------- + +Changes to tests or testing: + Add cesm3_dev test list from the CESM3_dev branch + Make sure ne30np4.pg3 + + Unit tests fail on Derecho because of ESMCI/ccs_config_cesm#131 + Derecho tests with DEBUG=T, intel compiler, and mpi-serial fail because of ESMCI/ccs_config_cesm#130 + + +Testing summary: regular + fates + ctsm_sci + cesm3_dev +---------------- + [PASS means all tests PASS; OK means tests PASS other than expected fails.] + + build-namelist tests (if CLMBuildNamelist.pm has changed): + + derecho - PASS + + python testing (if python code has changed; see instructions in python/README.md; document testing done): + + derecho - PASS + + regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing): + + cheyenne ---- OK + derecho ----- OK + izumi ------- OK + + fates tests: (give name of baseline if different from CTSM tagname, normally fates baselines are fates--) + derecho ----- OK + izumi ------- OK + + + +Answer changes +-------------- + +Changes answers relative to baseline: No, bit-for-bit + +Other details +------------- +[Remove any lines that don't apply. Remove entire section if nothing applies.] + +List any externals directories updated (cime, rtm, mosart, cism, fates, etc.): cdeps + cdeps -> cdeps1.0.24 (allows to run with NAG compiler) + +Pull Requests that document the changes (include PR ids): + #2269 -- First tag with testing moved to Derecho and working PE layouts +(https://github.com/ESCOMP/ctsm/pull) + +=============================================================== +=============================================================== Tag name: ctsm5.1.dev157 Originator(s): samrabin (Sam Rabin, UCAR/TSS, samrabin@ucar.edu) Date: Tue Dec 5 09:48:26 MST 2023 diff --git a/doc/ChangeSum b/doc/ChangeSum index 4c8c356a41..abf4401013 100644 --- a/doc/ChangeSum +++ b/doc/ChangeSum @@ -1,5 +1,6 @@ Tag Who Date Summary ============================================================================================================================ + ctsm5.1.dev158 erik 12/07/2023 First tag with testing moved to Derecho and working PE-layouts for Derecho ctsm5.1.dev157 samrabin 12/05/2023 Update Externals to work on Derecho ctsm5.1.dev156 samrabin 11/30/2023 Do not use Meier roughness by default. ctsm5.1.dev155 samrabin 11/27/2023 Use baset_latvary parameters From 10d05382fb8e43fc1527d692e26a596f418cbfb3 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Thu, 7 Dec 2023 22:22:58 -0700 Subject: [PATCH 68/68] Update changelog --- doc/ChangeLog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index 961ccab675..04694b5c07 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,7 +1,7 @@ =============================================================== Tag name: ctsm5.1.dev158 Originator(s): erik (Erik Kluzek,UCAR/TSS,303-497-1326) -Date: Thu 07 Dec 2023 10:15:56 PM MST +Date: Thu 07 Dec 2023 10:22:46 PM MST One-line Summary: First tag with testing moved to Derecho and working PE-layouts for Derecho Purpose and description of changes @@ -11,7 +11,8 @@ First tag for CTSM working and tested on Derecho. Update CDEPS so that we can r Working PE layouts. Changes from CESM3_dev over to main-dev. Testing added for Derecho. Do some work to get tools testing working on Derecho, not completed. Add Derecho to the README files under tools/modify_input_files and tools/site_and_regional -Make sure there are no /glade/p references in the code (other than in the doc directory). +Remove some /glade/p references in the code. This is still an issue in the: doc, lilac, tools/mksurfdata_map, +tools/contrib, tools/mkmapdata directories, and the namelist_defaults_ctsm_tools file. Significant changes to scientifically-supported configurations