From 9a646d480bab62086f580ede2ca408294886dc22 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Tue, 29 Sep 2026 17:44:05 -0600 Subject: [PATCH 01/40] Change tests from g17 to t233 grid except when unavailable --- cime_config/testdefs/testlist_clm.xml | 178 +++++++++++++------------- 1 file changed, 89 insertions(+), 89 deletions(-) diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml index 345eedc3d3..09a1077a1a 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -98,7 +98,7 @@ - + @@ -122,7 +122,7 @@ - + @@ -134,7 +134,7 @@ - + @@ -188,7 +188,7 @@ - + @@ -548,7 +548,7 @@ - + @@ -570,7 +570,7 @@ - + @@ -580,7 +580,7 @@ - + @@ -591,7 +591,7 @@ - + @@ -611,7 +611,7 @@ - + @@ -621,7 +621,7 @@ - + @@ -631,7 +631,7 @@ - + @@ -651,7 +651,7 @@ - + @@ -661,7 +661,7 @@ - + @@ -671,7 +671,7 @@ - + @@ -741,7 +741,7 @@ - + @@ -761,7 +761,7 @@ - + @@ -771,7 +771,7 @@ - + @@ -844,7 +844,7 @@ - + @@ -983,7 +983,7 @@ - + @@ -994,7 +994,7 @@ - + @@ -1004,7 +1004,7 @@ - + @@ -1015,7 +1015,7 @@ - + @@ -1025,7 +1025,7 @@ - + @@ -1035,7 +1035,7 @@ - + @@ -1124,7 +1124,7 @@ - + @@ -1134,7 +1134,7 @@ - + @@ -1144,7 +1144,7 @@ - + @@ -1154,7 +1154,7 @@ - + @@ -1164,7 +1164,7 @@ - + @@ -1174,7 +1174,7 @@ - + @@ -1204,7 +1204,7 @@ - + @@ -1214,7 +1214,7 @@ - + @@ -1224,7 +1224,7 @@ - + @@ -1234,7 +1234,7 @@ - + @@ -1244,7 +1244,7 @@ - + @@ -1254,7 +1254,7 @@ - + @@ -1264,7 +1264,7 @@ - + @@ -1274,7 +1274,7 @@ - + @@ -1325,7 +1325,7 @@ - + @@ -1335,7 +1335,7 @@ - + @@ -1346,7 +1346,7 @@ - + @@ -1366,7 +1366,7 @@ - + @@ -1376,7 +1376,7 @@ - + @@ -1493,7 +1493,7 @@ - + @@ -1600,7 +1600,7 @@ - + @@ -1610,7 +1610,7 @@ - + @@ -1685,7 +1685,7 @@ - + @@ -1695,7 +1695,7 @@ - + @@ -1974,7 +1974,7 @@ - + @@ -1984,7 +1984,7 @@ - + @@ -2170,7 +2170,7 @@ - + @@ -2613,7 +2613,7 @@ - + @@ -2623,7 +2623,7 @@ - + @@ -2798,7 +2798,7 @@ - + @@ -2808,7 +2808,7 @@ - + @@ -2999,7 +2999,7 @@ - + @@ -3009,7 +3009,7 @@ - + @@ -3020,7 +3020,7 @@ - + @@ -3040,7 +3040,7 @@ - + @@ -3050,7 +3050,7 @@ - + @@ -3060,7 +3060,7 @@ - + @@ -3070,7 +3070,7 @@ - + @@ -3451,7 +3451,7 @@ - + @@ -3483,7 +3483,7 @@ - + @@ -3511,7 +3511,7 @@ - + @@ -3542,7 +3542,7 @@ - + @@ -3562,7 +3562,7 @@ - + @@ -3582,7 +3582,7 @@ - + @@ -3626,7 +3626,7 @@ - + @@ -3637,7 +3637,7 @@ - + @@ -3671,7 +3671,7 @@ - + @@ -3764,7 +3764,7 @@ - + @@ -3869,7 +3869,7 @@ - + @@ -4060,7 +4060,7 @@ - + @@ -4185,34 +4185,34 @@ - + - + - + - + - + - + @@ -4321,7 +4321,7 @@ - + @@ -4330,10 +4330,10 @@ - + - + @@ -4514,7 +4514,7 @@ --> - + @@ -4619,7 +4619,7 @@ - + @@ -4679,7 +4679,7 @@ - + @@ -4691,7 +4691,7 @@ - + @@ -4820,7 +4820,7 @@ - + @@ -4830,7 +4830,7 @@ - + From a93976aa868839c1776240a388038c1e02218d34 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Tue, 29 Sep 2026 17:55:18 -0600 Subject: [PATCH 02/40] Change tests from g37 to t233 grid except when unavailable --- cime_config/testdefs/testlist_clm.xml | 388 +++++++++++++------------- 1 file changed, 194 insertions(+), 194 deletions(-) diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml index 09a1077a1a..d46a6320dc 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -66,7 +66,7 @@ --> - + @@ -76,7 +76,7 @@ - + @@ -87,7 +87,7 @@ - + @@ -164,7 +164,7 @@ - + @@ -176,7 +176,7 @@ - + @@ -200,7 +200,7 @@ - + @@ -222,7 +222,7 @@ - + @@ -317,7 +317,7 @@ - + @@ -682,7 +682,7 @@ - + @@ -693,7 +693,7 @@ - + @@ -702,7 +702,7 @@ - + @@ -711,7 +711,7 @@ - + @@ -721,7 +721,7 @@ - + @@ -731,7 +731,7 @@ - + @@ -781,7 +781,7 @@ - + @@ -791,7 +791,7 @@ - + @@ -801,7 +801,7 @@ - + @@ -811,7 +811,7 @@ - + @@ -864,7 +864,7 @@ - + @@ -874,7 +874,7 @@ - + @@ -884,7 +884,7 @@ - + @@ -895,7 +895,7 @@ - + @@ -927,7 +927,7 @@ - + @@ -938,7 +938,7 @@ - + @@ -949,7 +949,7 @@ - + @@ -961,7 +961,7 @@ - + @@ -973,7 +973,7 @@ - + @@ -1064,7 +1064,7 @@ - + @@ -1074,7 +1074,7 @@ - + @@ -1084,7 +1084,7 @@ - + @@ -1094,7 +1094,7 @@ - + @@ -1386,7 +1386,7 @@ - + @@ -1396,7 +1396,7 @@ - + @@ -1407,7 +1407,7 @@ - + @@ -1417,7 +1417,7 @@ - + @@ -1428,7 +1428,7 @@ - + @@ -1438,7 +1438,7 @@ - + @@ -1449,7 +1449,7 @@ - + @@ -1463,7 +1463,7 @@ - + @@ -1473,7 +1473,7 @@ - + @@ -1483,7 +1483,7 @@ - + @@ -1504,7 +1504,7 @@ - + @@ -1527,7 +1527,7 @@ - + @@ -1538,7 +1538,7 @@ - + @@ -1548,7 +1548,7 @@ - + @@ -1558,7 +1558,7 @@ - + @@ -1569,7 +1569,7 @@ - + @@ -1580,7 +1580,7 @@ - + @@ -1620,7 +1620,7 @@ - + @@ -1630,7 +1630,7 @@ - + @@ -1641,7 +1641,7 @@ - + @@ -1652,7 +1652,7 @@ - + @@ -1663,7 +1663,7 @@ - + @@ -1674,7 +1674,7 @@ - + @@ -1706,7 +1706,7 @@ - + @@ -1716,7 +1716,7 @@ - + @@ -1725,7 +1725,7 @@ - + @@ -1741,7 +1741,7 @@ - + @@ -1753,7 +1753,7 @@ - + @@ -1762,7 +1762,7 @@ - + @@ -1784,7 +1784,7 @@ - + @@ -1817,7 +1817,7 @@ - + @@ -1827,7 +1827,7 @@ - + @@ -1838,7 +1838,7 @@ - + @@ -1848,7 +1848,7 @@ - + @@ -1859,7 +1859,7 @@ - + @@ -1869,7 +1869,7 @@ - + @@ -1881,7 +1881,7 @@ - + @@ -1891,7 +1891,7 @@ - + @@ -1903,7 +1903,7 @@ - + @@ -1913,7 +1913,7 @@ - + @@ -1924,7 +1924,7 @@ - + @@ -1934,7 +1934,7 @@ - + @@ -1945,7 +1945,7 @@ - + @@ -1954,7 +1954,7 @@ - + @@ -1965,7 +1965,7 @@ - + @@ -1994,7 +1994,7 @@ - + @@ -2004,7 +2004,7 @@ - + @@ -2015,7 +2015,7 @@ - + @@ -2025,7 +2025,7 @@ - + @@ -2036,7 +2036,7 @@ - + @@ -2046,7 +2046,7 @@ - + @@ -2056,7 +2056,7 @@ - + @@ -2067,7 +2067,7 @@ - + @@ -2076,7 +2076,7 @@ - + @@ -2087,7 +2087,7 @@ - + @@ -2101,7 +2101,7 @@ - + @@ -2113,7 +2113,7 @@ - + @@ -2125,7 +2125,7 @@ - + @@ -2137,7 +2137,7 @@ - + @@ -2159,7 +2159,7 @@ - + @@ -2181,7 +2181,7 @@ - + @@ -2192,7 +2192,7 @@ - + @@ -2203,7 +2203,7 @@ - + @@ -2213,7 +2213,7 @@ - + @@ -2223,7 +2223,7 @@ - + @@ -2233,7 +2233,7 @@ - + @@ -2243,7 +2243,7 @@ - + @@ -2253,7 +2253,7 @@ - + @@ -2263,7 +2263,7 @@ - + @@ -2272,7 +2272,7 @@ - + @@ -2283,7 +2283,7 @@ - + @@ -2313,7 +2313,7 @@ - + @@ -2323,7 +2323,7 @@ - + @@ -2333,7 +2333,7 @@ - + @@ -2343,7 +2343,7 @@ - + @@ -2365,7 +2365,7 @@ - + @@ -2378,7 +2378,7 @@ - + @@ -2388,7 +2388,7 @@ - + @@ -2490,7 +2490,7 @@ - + @@ -2511,7 +2511,7 @@ - + @@ -2521,7 +2521,7 @@ - + @@ -2531,7 +2531,7 @@ - + @@ -2542,7 +2542,7 @@ - + @@ -2552,7 +2552,7 @@ - + @@ -2564,7 +2564,7 @@ - + @@ -2655,7 +2655,7 @@ - + @@ -2665,7 +2665,7 @@ - + @@ -2676,7 +2676,7 @@ - + @@ -2688,7 +2688,7 @@ - + @@ -2709,7 +2709,7 @@ - + @@ -2718,7 +2718,7 @@ - + @@ -2729,7 +2729,7 @@ - + @@ -2740,7 +2740,7 @@ - + @@ -2752,7 +2752,7 @@ - + @@ -3102,7 +3102,7 @@ - + @@ -3127,7 +3127,7 @@ - + @@ -3147,7 +3147,7 @@ - + @@ -3157,7 +3157,7 @@ - + @@ -3167,7 +3167,7 @@ - + @@ -3179,7 +3179,7 @@ - + @@ -3191,7 +3191,7 @@ - + @@ -3200,7 +3200,7 @@ - + @@ -3340,7 +3340,7 @@ - + @@ -3388,7 +3388,7 @@ - + @@ -3398,7 +3398,7 @@ - + @@ -3440,7 +3440,7 @@ - + @@ -3463,7 +3463,7 @@ - + @@ -3473,7 +3473,7 @@ - + @@ -3493,7 +3493,7 @@ - + @@ -3502,7 +3502,7 @@ - + @@ -3531,7 +3531,7 @@ - + @@ -3593,7 +3593,7 @@ - + @@ -3604,7 +3604,7 @@ - + @@ -3615,7 +3615,7 @@ - + @@ -3650,7 +3650,7 @@ - + @@ -3660,7 +3660,7 @@ - + @@ -3681,7 +3681,7 @@ - + @@ -3726,7 +3726,7 @@ - + @@ -3736,7 +3736,7 @@ - + @@ -3746,7 +3746,7 @@ - + @@ -3755,7 +3755,7 @@ - + @@ -3889,7 +3889,7 @@ - + @@ -3901,7 +3901,7 @@ - + @@ -3913,7 +3913,7 @@ - + @@ -4046,7 +4046,7 @@ - + @@ -4090,7 +4090,7 @@ - + @@ -4121,7 +4121,7 @@ - + @@ -4131,7 +4131,7 @@ - + @@ -4141,7 +4141,7 @@ - + @@ -4151,7 +4151,7 @@ - + @@ -4355,7 +4355,7 @@ - + @@ -4608,7 +4608,7 @@ - + @@ -4630,7 +4630,7 @@ 2-degree since that resolution turns off Carbon isotopes. (This is in the ctsm_sci test list despite not being a scientifically-supported compset because this needs to be run at 2-degree resolution, which is higher than our standard testing. Also note that the purpose of this is to support scientifically-supported coupled configurations.) - + @@ -4705,7 +4705,7 @@ - + @@ -4759,7 +4759,7 @@ - + @@ -4772,7 +4772,7 @@ - + @@ -4990,7 +4990,7 @@ - + @@ -5000,7 +5000,7 @@ - + @@ -5011,7 +5011,7 @@ - + @@ -5022,7 +5022,7 @@ - + @@ -5049,7 +5049,7 @@ - + @@ -5062,7 +5062,7 @@ - + @@ -5075,7 +5075,7 @@ - + @@ -5086,7 +5086,7 @@ - + @@ -5122,7 +5122,7 @@ - + @@ -5133,7 +5133,7 @@ - + @@ -5144,7 +5144,7 @@ - + @@ -5155,7 +5155,7 @@ - + @@ -5166,7 +5166,7 @@ - + @@ -5177,7 +5177,7 @@ - + @@ -5188,7 +5188,7 @@ - + @@ -5199,7 +5199,7 @@ - + @@ -5211,7 +5211,7 @@ - + @@ -5222,7 +5222,7 @@ - + @@ -5233,7 +5233,7 @@ - + @@ -5244,7 +5244,7 @@ - + @@ -5255,7 +5255,7 @@ - + @@ -5266,7 +5266,7 @@ - + @@ -5278,7 +5278,7 @@ - + @@ -5290,7 +5290,7 @@ - + @@ -5302,7 +5302,7 @@ - + @@ -5314,7 +5314,7 @@ - + @@ -5326,7 +5326,7 @@ - + From 12e9f683306bf790545bade80239db41b3adf2a0 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Wed, 30 Sep 2026 17:51:52 -0600 Subject: [PATCH 03/40] Replace g17 and g37 grids with t233 in ExpectedTestFails.xml --- cime_config/testdefs/ExpectedTestFails.xml | 36 +++++++++++----------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/cime_config/testdefs/ExpectedTestFails.xml b/cime_config/testdefs/ExpectedTestFails.xml index f7fcde5c91..681ee65336 100644 --- a/cime_config/testdefs/ExpectedTestFails.xml +++ b/cime_config/testdefs/ExpectedTestFails.xml @@ -36,7 +36,7 @@ - + FAIL #4165 @@ -51,7 +51,7 @@ - + FAIL #4169 @@ -82,7 +82,7 @@ - + FAIL #2619 @@ -94,14 +94,14 @@ This failure relates to the following REP failure. - + FAIL #2619 This failure relates to the preceding ERP failure. - + FAIL #2619 @@ -109,14 +109,14 @@ - + FAIL #3182 - + FAIL #3788 @@ -128,56 +128,56 @@ - + FAIL #4160 - + FAIL #4160 - + FAIL #4160 - + FAIL #4160 - + FAIL #4160 - + FAIL #4160 - + FAIL #4160 - + FAIL #4160 @@ -332,7 +332,7 @@ - + FAIL #2321 @@ -341,7 +341,7 @@ - + FAIL MOSART#91 @@ -365,7 +365,7 @@ - + FAIL #3494 From 29335e3e6fc6852c86dff186bf03d91cf7bb256c Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Wed, 30 Sep 2026 17:56:11 -0600 Subject: [PATCH 04/40] Change g37 to t233 grid in test_rxcropmaturity_python.sh --- tools/unsupported/test_rxcropmaturity_python.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/unsupported/test_rxcropmaturity_python.sh b/tools/unsupported/test_rxcropmaturity_python.sh index 69e9b00a04..bc4df43602 100755 --- a/tools/unsupported/test_rxcropmaturity_python.sh +++ b/tools/unsupported/test_rxcropmaturity_python.sh @@ -16,15 +16,15 @@ set -e # # Output will look something like this (✅ for success, 🔴 for failure): # ctsm_pylib -# RXCROPMATURITYINST_Lm61.f10_f10_mg37.IHist check_rxboth_run ✅ -# RXCROPMATURITY_Lm61.f10_f10_mg37.IHist generate_gdds 🔴 -# RXCROPMATURITYSKIPGENINST_Ld1097.f10_f10_mg37.IHist check_rxboth_run ✅ -# RXCROPMATURITYSKIPGEN_Ld1097.f10_f10_mg37.IHist check_rxboth_run 🔴 +# RXCROPMATURITYINST_Lm61.f10_f10_mt233.IHist check_rxboth_run ✅ +# RXCROPMATURITY_Lm61.f10_f10_mt233.IHist generate_gdds 🔴 +# RXCROPMATURITYSKIPGENINST_Ld1097.f10_f10_mt233.IHist check_rxboth_run ✅ +# RXCROPMATURITYSKIPGEN_Ld1097.f10_f10_mt233.IHist check_rxboth_run 🔴 # npl -# RXCROPMATURITYINST_Lm61.f10_f10_mg37.IHist check_rxboth_run ✅ -# RXCROPMATURITY_Lm61.f10_f10_mg37.IHist generate_gdds ✅ -# RXCROPMATURITYSKIPGENINST_Ld1097.f10_f10_mg37.IHist check_rxboth_run ✅ -# RXCROPMATURITYSKIPGEN_Ld1097.f10_f10_mg37.IHist check_rxboth_run ✅ +# RXCROPMATURITYINST_Lm61.f10_f10_mt233.IHist check_rxboth_run ✅ +# RXCROPMATURITY_Lm61.f10_f10_mt233.IHist generate_gdds ✅ +# RXCROPMATURITYSKIPGENINST_Ld1097.f10_f10_mt233.IHist check_rxboth_run ✅ +# RXCROPMATURITYSKIPGEN_Ld1097.f10_f10_mt233.IHist check_rxboth_run ✅ # # Log files for each will be saved as TEST_SHORTNAME.CONDA_ENV.log. From c99aab1c83fa3806ff1f94c00f7e7d3edfd8523c Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Wed, 30 Sep 2026 17:57:27 -0600 Subject: [PATCH 05/40] Change g37 to t233 grid in lilac_build_ctsm.py --- python/ctsm/lilac_build_ctsm.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/ctsm/lilac_build_ctsm.py b/python/ctsm/lilac_build_ctsm.py index 93c403e507..718f5e67ac 100644 --- a/python/ctsm/lilac_build_ctsm.py +++ b/python/ctsm/lilac_build_ctsm.py @@ -27,7 +27,7 @@ # these are arbitrary, since we only use the case for its build, not any of the runtime # settings; they just need to be valid _COMPSET = "I2000Ctsm50NwpSpAsRsGs" -_RES = "f10_f10_mg37" +_RES = "f10_f10_mt233" _PATH_TO_TEMPLATES = os.path.join(path_to_ctsm_root(), "lilac", "bld_templates") From bffdfe5dc9ca08b6405ca0ecf2ae08ef33325c2a Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Wed, 30 Sep 2026 17:58:58 -0600 Subject: [PATCH 06/40] Replace g17/g37 grids with t233 in .rst files where seemed appropriate --- .../Running-with-custom-crop-calendars.rst | 2 +- .../running-special-cases/Running-with-tillage.rst | 2 +- .../Spinning-up-the-biogeochemistry-Bgc-spinup.rst | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/source/users_guide/running-special-cases/Running-with-custom-crop-calendars.rst b/doc/source/users_guide/running-special-cases/Running-with-custom-crop-calendars.rst index 5e2b1998cc..4fa716fe66 100644 --- a/doc/source/users_guide/running-special-cases/Running-with-custom-crop-calendars.rst +++ b/doc/source/users_guide/running-special-cases/Running-with-custom-crop-calendars.rst @@ -93,4 +93,4 @@ The entire process can be illustrated with the RXCROPMATURITY system test. E.g.: :: - run_sys_tests -t RXCROPMATURITY_Lm61.f10_f10_mg37.IHistClm60BgcCrop.derecho_intel.clm-cropMonthOutput --skip-generate --skip-compare + run_sys_tests -t RXCROPMATURITY_Lm61.f10_f10_mt233.IHistClm60BgcCrop.derecho_intel.clm-cropMonthOutput --skip-generate --skip-compare diff --git a/doc/source/users_guide/running-special-cases/Running-with-tillage.rst b/doc/source/users_guide/running-special-cases/Running-with-tillage.rst index d38cbe1fb9..e3ad1c7e74 100644 --- a/doc/source/users_guide/running-special-cases/Running-with-tillage.rst +++ b/doc/source/users_guide/running-special-cases/Running-with-tillage.rst @@ -18,7 +18,7 @@ Example: Crop simulation with no tillage ---------------------------------------- :: - > cime/scripts/create_newcase -case IHistClm60BgcCrop_notill -res f19_g17_gl4 -compset IHistClm60BgcCrop + > cime/scripts/create_newcase -case IHistClm60BgcCrop_notill -res f19_t233 -compset IHistClm60BgcCrop > cd IHistClm60BgcCrop_notill diff --git a/doc/source/users_guide/running-special-cases/Spinning-up-the-biogeochemistry-Bgc-spinup.rst b/doc/source/users_guide/running-special-cases/Spinning-up-the-biogeochemistry-Bgc-spinup.rst index a51652c9ab..6aa05730a2 100644 --- a/doc/source/users_guide/running-special-cases/Spinning-up-the-biogeochemistry-Bgc-spinup.rst +++ b/doc/source/users_guide/running-special-cases/Spinning-up-the-biogeochemistry-Bgc-spinup.rst @@ -39,7 +39,7 @@ For the first step of running in ``CLM_ACCELERATED_SPINUP on`` mode, you will se :: > cd cime/scripts - > ./create_newcase -case AD_spinup -res f19_g17 -compset I1850Clm60BgcCrop --run-unsupported + > ./create_newcase -case AD_spinup -res f19_t233 -compset I1850Clm60BgcCrop --run-unsupported > cd AD_spinup # Change accelerated spinup mode > ./xmlchange CLM_ACCELERATED_SPINUP="on" @@ -76,7 +76,7 @@ Example: SASU_spinup Simulation for ClmBgcCrop :: > cd cime/scripts - > ./create_newcase -case SASU_spinup -res f19_g17 -compset I1850Clm60BgcCrop --run-unsupported + > ./create_newcase -case SASU_spinup -res f19_t233 -compset I1850Clm60BgcCrop --run-unsupported > cd SASU_spinup # Change accelerated spinup mode, turn off coldstart, and change runtype to hybrid to allow use of a finidat > ./xmlchange CLM_ACCELERATED_SPINUP="sasu",CLM_FORCE_COLDSTART=off,RUN_TYPE=hybrid @@ -104,7 +104,7 @@ Example: Normal mode simulation for ClmBgcCrop :: > cd cime/scripts - > ./create_newcase -case pSASU_spinup -res f19_g17 -compset I1850Clm60BgcCrop --run-unsupported + > ./create_newcase -case pSASU_spinup -res f19_t233 -compset I1850Clm60BgcCrop --run-unsupported > cd pSASU_spinup # Change accelerated spinup mode, turn off coldstart, and change runtype to hybrid to allow use of a finidat > ./xmlchange CLM_ACCELERATED_SPINUP="off",CLM_FORCE_COLDSTART=off,RUN_TYPE=hybrid From 1e98a68cf06535fd198cd8ae7002c66cd0d2a7fb Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Fri, 2 Oct 2026 08:58:46 -0600 Subject: [PATCH 07/40] Corrections to conflict resolution of the last commit --- cime_config/testdefs/testlist_clm.xml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml index 7c1e9fecf3..758ea75ffc 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -317,7 +317,6 @@ - @@ -328,7 +327,7 @@ - + @@ -2235,7 +2234,6 @@ - @@ -2256,7 +2254,6 @@ - @@ -2277,7 +2274,6 @@ - From 7f91c76ea9bfd6f584f9e91b84fecfb4db53fccc Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Tue, 6 Oct 2026 12:37:26 -0600 Subject: [PATCH 08/40] Correct my f10_f10_mg37 changes from f10_f10_mt233 to f10_f10_mt201 --- cime_config/testdefs/ExpectedTestFails.xml | 16 +- cime_config/testdefs/testlist_clm.xml | 378 +++++++++--------- .../Running-with-custom-crop-calendars.rst | 2 +- python/ctsm/lilac_build_ctsm.py | 2 +- .../unsupported/test_rxcropmaturity_python.sh | 16 +- 5 files changed, 207 insertions(+), 207 deletions(-) diff --git a/cime_config/testdefs/ExpectedTestFails.xml b/cime_config/testdefs/ExpectedTestFails.xml index df0993789f..77b094990e 100644 --- a/cime_config/testdefs/ExpectedTestFails.xml +++ b/cime_config/testdefs/ExpectedTestFails.xml @@ -51,7 +51,7 @@ - + FAIL #4169 @@ -82,7 +82,7 @@ - + FAIL #2619 @@ -94,14 +94,14 @@ This failure relates to the following REP failure. - + FAIL #2619 This failure relates to the preceding ERP failure. - + FAIL #2619 @@ -109,14 +109,14 @@ - + FAIL #3182 - + FAIL #3788 @@ -284,7 +284,7 @@ - + FAIL MOSART#91 @@ -308,7 +308,7 @@ - + FAIL #3494 diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml index cb5dd15e24..08483cdd8a 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -66,7 +66,7 @@ --> - + @@ -76,7 +76,7 @@ - + @@ -87,7 +87,7 @@ - + @@ -164,7 +164,7 @@ - + @@ -176,7 +176,7 @@ - + @@ -200,7 +200,7 @@ - + @@ -222,7 +222,7 @@ - + @@ -232,7 +232,7 @@ - + @@ -275,7 +275,7 @@ - + @@ -285,7 +285,7 @@ - + @@ -682,7 +682,7 @@ - + @@ -693,7 +693,7 @@ - + @@ -702,7 +702,7 @@ - + @@ -711,7 +711,7 @@ - + @@ -721,7 +721,7 @@ - + @@ -731,7 +731,7 @@ - + @@ -781,7 +781,7 @@ - + @@ -791,7 +791,7 @@ - + @@ -801,7 +801,7 @@ - + @@ -811,7 +811,7 @@ - + @@ -864,7 +864,7 @@ - + @@ -874,7 +874,7 @@ - + @@ -884,7 +884,7 @@ - + @@ -895,7 +895,7 @@ - + @@ -927,7 +927,7 @@ - + @@ -938,7 +938,7 @@ - + @@ -949,7 +949,7 @@ - + @@ -961,7 +961,7 @@ - + @@ -973,7 +973,7 @@ - + @@ -1386,7 +1386,7 @@ - + @@ -1396,7 +1396,7 @@ - + @@ -1407,7 +1407,7 @@ - + @@ -1417,7 +1417,7 @@ - + @@ -1428,7 +1428,7 @@ - + @@ -1438,7 +1438,7 @@ - + @@ -1449,7 +1449,7 @@ - + @@ -1463,7 +1463,7 @@ - + @@ -1473,7 +1473,7 @@ - + @@ -1483,7 +1483,7 @@ - + @@ -1504,7 +1504,7 @@ - + @@ -1527,7 +1527,7 @@ - + @@ -1538,7 +1538,7 @@ - + @@ -1548,7 +1548,7 @@ - + @@ -1558,7 +1558,7 @@ - + @@ -1569,7 +1569,7 @@ - + @@ -1580,7 +1580,7 @@ - + @@ -1620,7 +1620,7 @@ - + @@ -1630,7 +1630,7 @@ - + @@ -1641,7 +1641,7 @@ - + @@ -1652,7 +1652,7 @@ - + @@ -1663,7 +1663,7 @@ - + @@ -1674,7 +1674,7 @@ - + @@ -1706,7 +1706,7 @@ - + @@ -1716,7 +1716,7 @@ - + @@ -1725,7 +1725,7 @@ - + @@ -1741,7 +1741,7 @@ - + @@ -1753,7 +1753,7 @@ - + @@ -1762,7 +1762,7 @@ - + @@ -1784,7 +1784,7 @@ - + @@ -1817,7 +1817,7 @@ - + @@ -1827,7 +1827,7 @@ - + @@ -1838,7 +1838,7 @@ - + @@ -1848,7 +1848,7 @@ - + @@ -1859,7 +1859,7 @@ - + @@ -1869,7 +1869,7 @@ - + @@ -1881,7 +1881,7 @@ - + @@ -1891,7 +1891,7 @@ - + @@ -1903,7 +1903,7 @@ - + @@ -1913,7 +1913,7 @@ - + @@ -1924,7 +1924,7 @@ - + @@ -1934,7 +1934,7 @@ - + @@ -1945,7 +1945,7 @@ - + @@ -1954,7 +1954,7 @@ - + @@ -1965,7 +1965,7 @@ - + @@ -1994,7 +1994,7 @@ - + @@ -2004,7 +2004,7 @@ - + @@ -2015,7 +2015,7 @@ - + @@ -2025,7 +2025,7 @@ - + @@ -2036,7 +2036,7 @@ - + @@ -2046,7 +2046,7 @@ - + @@ -2056,7 +2056,7 @@ - + @@ -2067,7 +2067,7 @@ - + @@ -2076,7 +2076,7 @@ - + @@ -2087,7 +2087,7 @@ - + @@ -2101,7 +2101,7 @@ - + @@ -2113,7 +2113,7 @@ - + @@ -2125,7 +2125,7 @@ - + @@ -2137,7 +2137,7 @@ - + @@ -2159,7 +2159,7 @@ - + @@ -2181,7 +2181,7 @@ - + @@ -2192,7 +2192,7 @@ - + @@ -2203,7 +2203,7 @@ - + @@ -2213,7 +2213,7 @@ - + @@ -2223,7 +2223,7 @@ - + @@ -2233,7 +2233,7 @@ - + @@ -2242,7 +2242,7 @@ - + @@ -2253,7 +2253,7 @@ - + @@ -2283,7 +2283,7 @@ - + @@ -2293,7 +2293,7 @@ - + @@ -2303,7 +2303,7 @@ - + @@ -2313,7 +2313,7 @@ - + @@ -2323,7 +2323,7 @@ - + @@ -2335,7 +2335,7 @@ - + @@ -2348,7 +2348,7 @@ - + @@ -2358,7 +2358,7 @@ - + @@ -2460,7 +2460,7 @@ - + @@ -2481,7 +2481,7 @@ - + @@ -2491,7 +2491,7 @@ - + @@ -2501,7 +2501,7 @@ - + @@ -2512,7 +2512,7 @@ - + @@ -2522,7 +2522,7 @@ - + @@ -2534,7 +2534,7 @@ - + @@ -2625,7 +2625,7 @@ - + @@ -2635,7 +2635,7 @@ - + @@ -2646,7 +2646,7 @@ - + @@ -2658,7 +2658,7 @@ - + @@ -2679,7 +2679,7 @@ - + @@ -2688,7 +2688,7 @@ - + @@ -2699,7 +2699,7 @@ - + @@ -2710,7 +2710,7 @@ - + @@ -2722,7 +2722,7 @@ - + @@ -3072,7 +3072,7 @@ - + @@ -3117,7 +3117,7 @@ - + @@ -3127,7 +3127,7 @@ - + @@ -3137,7 +3137,7 @@ - + @@ -3149,7 +3149,7 @@ - + @@ -3161,7 +3161,7 @@ - + @@ -3170,7 +3170,7 @@ - + @@ -3310,7 +3310,7 @@ - + @@ -3358,7 +3358,7 @@ - + @@ -3368,7 +3368,7 @@ - + @@ -3410,7 +3410,7 @@ - + @@ -3443,7 +3443,7 @@ - + @@ -3463,7 +3463,7 @@ - + @@ -3472,7 +3472,7 @@ - + @@ -3501,7 +3501,7 @@ - + @@ -3563,7 +3563,7 @@ - + @@ -3574,7 +3574,7 @@ - + @@ -3585,7 +3585,7 @@ - + @@ -3620,7 +3620,7 @@ - + @@ -3630,7 +3630,7 @@ - + @@ -3651,7 +3651,7 @@ - + @@ -3696,7 +3696,7 @@ - + @@ -3706,7 +3706,7 @@ - + @@ -3716,7 +3716,7 @@ - + @@ -3725,7 +3725,7 @@ - + @@ -3859,7 +3859,7 @@ - + @@ -3871,7 +3871,7 @@ - + @@ -3883,7 +3883,7 @@ - + @@ -4016,7 +4016,7 @@ - + @@ -4060,7 +4060,7 @@ - + @@ -4091,7 +4091,7 @@ - + @@ -4101,7 +4101,7 @@ - + @@ -4111,7 +4111,7 @@ - + @@ -4121,7 +4121,7 @@ - + @@ -4325,7 +4325,7 @@ - + @@ -4578,7 +4578,7 @@ - + @@ -4600,7 +4600,7 @@ 2-degree since that resolution turns off Carbon isotopes. (This is in the ctsm_sci test list despite not being a scientifically-supported compset because this needs to be run at 2-degree resolution, which is higher than our standard testing. Also note that the purpose of this is to support scientifically-supported coupled configurations.) - + @@ -4675,7 +4675,7 @@ - + @@ -4729,7 +4729,7 @@ - + @@ -4742,7 +4742,7 @@ - + @@ -4864,7 +4864,7 @@ - + @@ -4960,7 +4960,7 @@ - + @@ -4970,7 +4970,7 @@ - + @@ -4981,7 +4981,7 @@ - + @@ -4992,7 +4992,7 @@ - + @@ -5019,7 +5019,7 @@ - + @@ -5032,7 +5032,7 @@ - + @@ -5045,7 +5045,7 @@ - + @@ -5056,7 +5056,7 @@ - + @@ -5092,7 +5092,7 @@ - + @@ -5103,7 +5103,7 @@ - + @@ -5114,7 +5114,7 @@ - + @@ -5125,7 +5125,7 @@ - + @@ -5136,7 +5136,7 @@ - + @@ -5147,7 +5147,7 @@ - + @@ -5158,7 +5158,7 @@ - + @@ -5169,7 +5169,7 @@ - + @@ -5181,7 +5181,7 @@ - + @@ -5192,7 +5192,7 @@ - + @@ -5203,7 +5203,7 @@ - + @@ -5214,7 +5214,7 @@ - + @@ -5225,7 +5225,7 @@ - + @@ -5236,7 +5236,7 @@ - + @@ -5248,7 +5248,7 @@ - + @@ -5260,7 +5260,7 @@ - + @@ -5272,7 +5272,7 @@ - + @@ -5284,7 +5284,7 @@ - + @@ -5296,7 +5296,7 @@ - + diff --git a/doc/source/users_guide/running-special-cases/Running-with-custom-crop-calendars.rst b/doc/source/users_guide/running-special-cases/Running-with-custom-crop-calendars.rst index 4fa716fe66..e6af2b232f 100644 --- a/doc/source/users_guide/running-special-cases/Running-with-custom-crop-calendars.rst +++ b/doc/source/users_guide/running-special-cases/Running-with-custom-crop-calendars.rst @@ -93,4 +93,4 @@ The entire process can be illustrated with the RXCROPMATURITY system test. E.g.: :: - run_sys_tests -t RXCROPMATURITY_Lm61.f10_f10_mt233.IHistClm60BgcCrop.derecho_intel.clm-cropMonthOutput --skip-generate --skip-compare + run_sys_tests -t RXCROPMATURITY_Lm61.f10_f10_mt201.IHistClm60BgcCrop.derecho_intel.clm-cropMonthOutput --skip-generate --skip-compare diff --git a/python/ctsm/lilac_build_ctsm.py b/python/ctsm/lilac_build_ctsm.py index 718f5e67ac..ef886464cb 100644 --- a/python/ctsm/lilac_build_ctsm.py +++ b/python/ctsm/lilac_build_ctsm.py @@ -27,7 +27,7 @@ # these are arbitrary, since we only use the case for its build, not any of the runtime # settings; they just need to be valid _COMPSET = "I2000Ctsm50NwpSpAsRsGs" -_RES = "f10_f10_mt233" +_RES = "f10_f10_mt201" _PATH_TO_TEMPLATES = os.path.join(path_to_ctsm_root(), "lilac", "bld_templates") diff --git a/tools/unsupported/test_rxcropmaturity_python.sh b/tools/unsupported/test_rxcropmaturity_python.sh index bc4df43602..683165b59c 100755 --- a/tools/unsupported/test_rxcropmaturity_python.sh +++ b/tools/unsupported/test_rxcropmaturity_python.sh @@ -16,15 +16,15 @@ set -e # # Output will look something like this (✅ for success, 🔴 for failure): # ctsm_pylib -# RXCROPMATURITYINST_Lm61.f10_f10_mt233.IHist check_rxboth_run ✅ -# RXCROPMATURITY_Lm61.f10_f10_mt233.IHist generate_gdds 🔴 -# RXCROPMATURITYSKIPGENINST_Ld1097.f10_f10_mt233.IHist check_rxboth_run ✅ -# RXCROPMATURITYSKIPGEN_Ld1097.f10_f10_mt233.IHist check_rxboth_run 🔴 +# RXCROPMATURITYINST_Lm61.f10_f10_mt201.IHist check_rxboth_run ✅ +# RXCROPMATURITY_Lm61.f10_f10_mt201.IHist generate_gdds 🔴 +# RXCROPMATURITYSKIPGENINST_Ld1097.f10_f10_mt201.IHist check_rxboth_run ✅ +# RXCROPMATURITYSKIPGEN_Ld1097.f10_f10_mt201.IHist check_rxboth_run 🔴 # npl -# RXCROPMATURITYINST_Lm61.f10_f10_mt233.IHist check_rxboth_run ✅ -# RXCROPMATURITY_Lm61.f10_f10_mt233.IHist generate_gdds ✅ -# RXCROPMATURITYSKIPGENINST_Ld1097.f10_f10_mt233.IHist check_rxboth_run ✅ -# RXCROPMATURITYSKIPGEN_Ld1097.f10_f10_mt233.IHist check_rxboth_run ✅ +# RXCROPMATURITYINST_Lm61.f10_f10_mt201.IHist check_rxboth_run ✅ +# RXCROPMATURITY_Lm61.f10_f10_mt201.IHist generate_gdds ✅ +# RXCROPMATURITYSKIPGENINST_Ld1097.f10_f10_mt201.IHist check_rxboth_run ✅ +# RXCROPMATURITYSKIPGEN_Ld1097.f10_f10_mt201.IHist check_rxboth_run ✅ # # Log files for each will be saved as TEST_SHORTNAME.CONDA_ENV.log. From ff5c1e65158305ac6b5163f67ecfbcfeddf88de5 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Tue, 6 Oct 2026 14:53:05 -0600 Subject: [PATCH 09/40] Update to f19_t233_gris4 and ne30_t233 from g17 grids --- cime_config/testdefs/testlist_clm.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml index 08483cdd8a..892bf7c844 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -527,7 +527,7 @@ - + @@ -537,7 +537,7 @@ - + @@ -1055,7 +1055,7 @@ - + @@ -1184,7 +1184,7 @@ - + @@ -1194,7 +1194,7 @@ - + @@ -2148,7 +2148,7 @@ - + @@ -2668,7 +2668,7 @@ - + From cf8cd35151c129933e14a578fdf04b03c2cf71cc Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Tue, 6 Oct 2026 14:57:45 -0600 Subject: [PATCH 10/40] Update f45 grids from g37 to t201 --- cime_config/testdefs/ExpectedTestFails.xml | 16 ++-- cime_config/testdefs/testlist_clm.xml | 94 +++++++++++----------- 2 files changed, 55 insertions(+), 55 deletions(-) diff --git a/cime_config/testdefs/ExpectedTestFails.xml b/cime_config/testdefs/ExpectedTestFails.xml index 77b094990e..9a76bc0de8 100644 --- a/cime_config/testdefs/ExpectedTestFails.xml +++ b/cime_config/testdefs/ExpectedTestFails.xml @@ -165,7 +165,7 @@ - + FAIL #2261 @@ -208,7 +208,7 @@ - + FAIL #3660 @@ -217,7 +217,7 @@ - + FAIL #4174 - + PEND FATES#983 @@ -254,21 +254,21 @@ - + FAIL #2919 - + FAIL FATES#1534 - + FAIL #2653 diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml index 892bf7c844..fe136f2c8c 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -823,7 +823,7 @@ - + @@ -833,7 +833,7 @@ - + @@ -906,7 +906,7 @@ - + @@ -916,7 +916,7 @@ - + @@ -2735,7 +2735,7 @@ - + @@ -3795,7 +3795,7 @@ - + @@ -3805,7 +3805,7 @@ - + @@ -3815,7 +3815,7 @@ - + @@ -3828,7 +3828,7 @@ - + @@ -3849,7 +3849,7 @@ - + @@ -3893,7 +3893,7 @@ - + @@ -3927,7 +3927,7 @@ - + @@ -3939,7 +3939,7 @@ - + @@ -3951,7 +3951,7 @@ - + @@ -3963,7 +3963,7 @@ - + @@ -3973,7 +3973,7 @@ - + @@ -3983,7 +3983,7 @@ - + @@ -4007,7 +4007,7 @@ - + @@ -4039,7 +4039,7 @@ - + @@ -4050,7 +4050,7 @@ - + @@ -4070,7 +4070,7 @@ - + @@ -4080,7 +4080,7 @@ - + @@ -4185,7 +4185,7 @@ - + @@ -4195,7 +4195,7 @@ - + @@ -4205,7 +4205,7 @@ - + @@ -4217,7 +4217,7 @@ - + @@ -4227,7 +4227,7 @@ - + @@ -4237,7 +4237,7 @@ - + @@ -4248,7 +4248,7 @@ - + @@ -4260,7 +4260,7 @@ - + @@ -4270,7 +4270,7 @@ - + @@ -4280,7 +4280,7 @@ - + @@ -4362,7 +4362,7 @@ - + @@ -4372,7 +4372,7 @@ - + @@ -4382,7 +4382,7 @@ - + @@ -4392,7 +4392,7 @@ - + @@ -4402,7 +4402,7 @@ - + @@ -4412,7 +4412,7 @@ - + @@ -4421,7 +4421,7 @@ - + @@ -4430,7 +4430,7 @@ - + @@ -4439,7 +4439,7 @@ - + @@ -4494,7 +4494,7 @@ - + @@ -4504,7 +4504,7 @@ - + @@ -4514,7 +4514,7 @@ - + @@ -4526,7 +4526,7 @@ - + @@ -4536,7 +4536,7 @@ - + @@ -4546,7 +4546,7 @@ - + From 79bdacf332a9a9b9b3a9ef72df5ff7f81155e03b Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Tue, 6 Oct 2026 15:58:26 -0600 Subject: [PATCH 11/40] Change grids to t233 or t201 as needed --- cime_config/testdefs/testlist_clm.xml | 24 ++++++++++----------- python/ctsm/test/test_unit_run_sys_tests.py | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml index fe136f2c8c..c0998509aa 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -232,7 +232,7 @@ - + @@ -275,7 +275,7 @@ - + @@ -285,7 +285,7 @@ - + @@ -317,7 +317,7 @@ - + @@ -1064,7 +1064,7 @@ - + @@ -1074,7 +1074,7 @@ - + @@ -1084,7 +1084,7 @@ - + @@ -1094,7 +1094,7 @@ - + @@ -2323,7 +2323,7 @@ - + @@ -3097,7 +3097,7 @@ - + @@ -3433,7 +3433,7 @@ - + @@ -4864,7 +4864,7 @@ - + diff --git a/python/ctsm/test/test_unit_run_sys_tests.py b/python/ctsm/test/test_unit_run_sys_tests.py index 0f454e5666..77f405667c 100755 --- a/python/ctsm/test/test_unit_run_sys_tests.py +++ b/python/ctsm/test/test_unit_run_sys_tests.py @@ -302,8 +302,8 @@ def test_getTestmodList_suite_unique(self): def test_getTestmodList_testname(self): """Ensure that _get_testmod_list() works correctly with full test name(s) specified""" testmod_list_input = [ - "ERS_D_Ld15.f45_f45_mg37.I2000Clm60FatesRsGs.izumi_nag.clm-crop", - "ERS_D_Ld15.f45_f45_mg37.I2000Clm60FatesRsGs.izumi_nag.clm-default", + "ERS_D_Ld15.f45_f45_mt201.I2000Clm60FatesRsGs.izumi_nag.clm-crop", + "ERS_D_Ld15.f45_f45_mt201.I2000Clm60FatesRsGs.izumi_nag.clm-default", ] target = ["clm-crop", "clm-default"] output = _get_testmod_list(testmod_list_input) @@ -315,7 +315,7 @@ def test_getTestmodList_twomods(self): mods in one test """ testmod_list_input = [ - "ERS_D_Ld15.f45_f45_mg37.I2000Clm50FatesRs.izumi_nag.clm-default--clm-crop" + "ERS_D_Ld15.f45_f45_mt201.I2000Clm50FatesRs.izumi_nag.clm-default--clm-crop" ] target = ["clm-default", "clm-crop"] output = _get_testmod_list(testmod_list_input) From 1b460aee1565b8081370d69099b4ca4ee9cf7e47 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Tue, 6 Oct 2026 17:51:17 -0600 Subject: [PATCH 12/40] Add tx2_0v1 and tx2_3v3 to valid_values in namelist_definition_ctsm.xml --- bld/namelist_files/namelist_definition_ctsm.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bld/namelist_files/namelist_definition_ctsm.xml b/bld/namelist_files/namelist_definition_ctsm.xml index daa0ab8ba4..1e1fe5b670 100644 --- a/bld/namelist_files/namelist_definition_ctsm.xml +++ b/bld/namelist_files/namelist_definition_ctsm.xml @@ -2406,7 +2406,7 @@ hist means do NOT use a future scenario, just use historical data. + valid_values="USGS,gx3v7,gx1v6,gx1v7,navy,test,tx0.1v2,tx0.1v3,tx1v1,tx2_0v1,tx2_3v3,T62,cruncep,nldas2"> Land mask description From 646074e4492e34eae79bc47492afe79795fda7d4 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Tue, 6 Oct 2026 17:54:05 -0600 Subject: [PATCH 13/40] Add tx2_0v1 and tx2_3v3 to namelist_defaults_overall.xml for some grids --- bld/namelist_files/namelist_defaults_overall.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/bld/namelist_files/namelist_defaults_overall.xml b/bld/namelist_files/namelist_defaults_overall.xml index 577f9bce61..d4b58dc2a0 100644 --- a/bld/namelist_files/namelist_defaults_overall.xml +++ b/bld/namelist_files/namelist_defaults_overall.xml @@ -81,11 +81,11 @@ determine default values for namelists. gx1v6 gx1v6 -gx1v7 -gx1v7 +tx2_3v3 +tx2_3v3 gx3v7 -gx3v7 -gx3v7 +tx2_0v1 +tx2_0v1 cruncep gx1v7 @@ -96,9 +96,9 @@ determine default values for namelists. T62 -gx1v6 +tx2_3v3 gx1v6 -gx1v6 +tx2_3v3 nldas2 navy @@ -110,7 +110,7 @@ determine default values for namelists. navy test test -gx1v7 +tx2_3v3 From 054c6bdd00466260256174744bd39545c55c95de Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Tue, 6 Oct 2026 17:55:32 -0600 Subject: [PATCH 14/40] Replace tx2_3v2 with v3 when setting init_interp_attributes and finidat I think I should have done this for ctsm5.4.063, but I missed it --- bld/namelist_files/namelist_defaults_ctsm.xml | 60 +++++++++---------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml index 82dced7cf1..6cf75482ef 100644 --- a/bld/namelist_files/namelist_defaults_ctsm.xml +++ b/bld/namelist_files/namelist_defaults_ctsm.xml @@ -934,19 +934,19 @@ attributes from the config_cache.xml file (with keys converted to upper-case). hgrid=0.9x1.25 maxpft=17 mask=tx2_3v2 use_cn=.false. use_crop=.false. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.true. +>hgrid=0.9x1.25 maxpft=17 mask=tx2_3v3 use_cn=.false. use_crop=.false. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.true. hgrid=0.9x1.25 maxpft=17 mask=tx2_3v2 use_cn=.false. use_crop=.false. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.true. +>hgrid=0.9x1.25 maxpft=17 mask=tx2_3v3 use_cn=.false. use_crop=.false. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.true. hgrid=ne30np4.pg3 maxpft=17 mask=tx2_3v2 use_cn=.false. use_crop=.false. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.true. +>hgrid=ne30np4.pg3 maxpft=17 mask=tx2_3v3 use_cn=.false. use_crop=.false. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.true. @@ -976,19 +976,19 @@ attributes from the config_cache.xml file (with keys converted to upper-case). hgrid=0.9x1.25 maxpft=79 mask=tx2_3v2 use_cn=.true. use_crop=.true. irrigate=.false. glc_nex=10 do_transient_pfts=.false. phys=clm6_0 use_excess_ice=.true. +>hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.false. glc_nex=10 do_transient_pfts=.false. phys=clm6_0 use_excess_ice=.true. hgrid=0.9x1.25 maxpft=79 mask=tx2_3v2 use_cn=.true. use_crop=.true. irrigate=.false. glc_nex=10 do_transient_pfts=.false. lnd_tuning_mode=clm6_0_CRUJRA2024 use_excess_ice=.true. +>hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.false. glc_nex=10 do_transient_pfts=.false. lnd_tuning_mode=clm6_0_CRUJRA2024 use_excess_ice=.true. mask=tx2_3v2 use_cn=.true. do_transient_pfts=.false. use_excess_ice=.true. use_crop=.false. irrigate=.false. +>mask=tx2_3v3 use_cn=.true. do_transient_pfts=.false. use_excess_ice=.true. use_crop=.false. irrigate=.false. mask=tx2_3v2 use_cn=.true. do_transient_pfts=.false. use_excess_ice=.true. use_crop=.true. irrigate=.false. +>mask=tx2_3v3 use_cn=.true. do_transient_pfts=.false. use_excess_ice=.true. use_crop=.true. irrigate=.false. @@ -1012,11 +1012,11 @@ attributes from the config_cache.xml file (with keys converted to upper-case). >hgrid=1.9x2.5 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=tx2_3v2 use_cn=.true. use_crop=.true. irrigate=.true. glc_nex=10 do_transient_pfts=.false. use_excess_ice=.true. +>hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nex=10 do_transient_pfts=.false. use_excess_ice=.true. hgrid=ne30np4.pg3 maxpft=79 mask=tx2_3v2 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.true. +>hgrid=ne30np4.pg3 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.true. maxpft=79 mask=tx2_3v2 use_cn=.true. use_crop=.true. glc_nec=10 use_excess_ice=.true. +>maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. glc_nec=10 use_excess_ice=.true. maxpft=79 mask=tx2_3v2 use_cn=.true. use_crop=.true. glc_nec=10 use_excess_ice=.true. +>maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. glc_nec=10 use_excess_ice=.true. maxpft=79 mask=tx2_3v2 use_cn=.true. use_crop=.true. glc_nec=10 use_excess_ice=.true. +>maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. glc_nec=10 use_excess_ice=.true. hgrid=0.9x1.25 maxpft=79 mask=tx2_3v2 use_cn=.true. use_crop=.true. glc_nec=10 use_excess_ice=.true. +>hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. glc_nec=10 use_excess_ice=.true. maxpft=79 mask=tx2_3v2 use_cn=.true. use_crop=.true. glc_nec=10 use_excess_ice=.true. +>maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. glc_nec=10 use_excess_ice=.true. lnd/clm2/initdata_esmf/ctsm5.3/clmi.interp_from.I1850Clm50BgcCrop-ciso.1366-01-01.0.9x1.25_gx1v7_simyr1850_c240223.nc - -lnd/clm2/initdata_esmf/ctsm5.4/ctsm5.4.CMIP7_ciso_ctsm5.3.075_SP_f09_127_1850.clm2.r.0102-01-01-00000.nc -lnd/clm2/initdata_esmf/ctsm5.4/ctsm5.4.CMIP7_ciso_ctsm5.3.075_SP_f09_127_HIST.clm2.r.2000-01-01-00000.nc - -lnd/clm2/initdata_esmf/ctsm5.4/ctsm5.4.CMIP7_ciso_ctsm5.3.075_f09_124_pSASU.clm2.r.0161-01-01-00000.nc -lnd/clm2/initdata_esmf/ctsm5.4/ctsm5.4.015_BGCcrop_ne30_144_pSASU.clm2.r.0181-01-01-00000.nc -lnd/clm2/initdata_esmf/ctsm5.4/clmi.f19_twiceinterp_from.I1850Clm50BgcCrop-ciso.1366-01-01.0.9x1.25_gx1v7_simyr1850_c251030.nc - -lnd/clm2/initdata_esmf/ctsm5.4/ctsm5.4.CMIP7_ciso_ctsm5.3.075_f09_124_HIST.clm2.r.2000-01-01-00000.nc - -lnd/clm2/initdata_esmf/ctsm5.4/ctsm5.4.CMIP7_ciso_ctsm5.3.075_f09_124_HIST.clm2.r.2010-01-01-00000.nc - -lnd/clm2/initdata_esmf/ctsm5.4/ctsm5.4.CMIP7_ciso_ctsm5.3.075_f09_124_HIST.clm2.r.1979-01-01-00000.nc - Date: Tue, 6 Oct 2026 18:04:24 -0600 Subject: [PATCH 15/40] Replace gx1v7 with tx2_3v3 in build-namelist_test.pl --- bld/unit_testers/build-namelist_test.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bld/unit_testers/build-namelist_test.pl b/bld/unit_testers/build-namelist_test.pl index e28aac880a..59b972a5f8 100755 --- a/bld/unit_testers/build-namelist_test.pl +++ b/bld/unit_testers/build-namelist_test.pl @@ -2127,7 +2127,7 @@ sub cat_and_create_namelistinfile { # Run over the different lnd_tuning modes # my $res = "0.9x1.25"; -my $mask = "gx1v7"; +my $mask = "tx2_3v3"; my $simyr = "1850"; foreach my $phys ( "clm4_5", "clm5_0", "clm6_0" ) { my $mode = "-phys $phys"; From a12c4ef59f33b76fc8497c6d06f73f0ee6cddc55 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Tue, 6 Oct 2026 18:12:18 -0600 Subject: [PATCH 16/40] Update gx1v7 to tx2_3v3 in README_on_CTSM.md --- README_on_CTSM.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README_on_CTSM.md b/README_on_CTSM.md index 941f9f5a6e..6218b48016 100644 --- a/README_on_CTSM.md +++ b/README_on_CTSM.md @@ -148,7 +148,7 @@ QUICKSTART: using the NUOPC driver scripts cd $CIMEROOT/scripts ./create_newcase # get help on how to run create_newcase ./create_newcase --case testI --res f09_t233 --compset I2000Clm60BgcCrop - # create new "I" case for default machine at 1.9x2.5_gx1v7 + # create new "I" case for default machine at 1.9x2.5_tx2_3v3 # "I2000Clm60BgcCrop" case is clm6_0 physics, CDEPS, and inactive ice/ocn/glc # and MOSART for river-routing cd testI From 678c4882ba321d5e19229974c9acf08d3f8bec0a Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Thu, 8 Oct 2026 17:40:51 -0600 Subject: [PATCH 17/40] Replace gx1v7 mask with tx2_3v3 in namelist_defaults_ctsm.xml --- bld/namelist_files/namelist_defaults_ctsm.xml | 172 +++++++++--------- 1 file changed, 86 insertions(+), 86 deletions(-) diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml index 6cf75482ef..e42d7781a7 100644 --- a/bld/namelist_files/namelist_defaults_ctsm.xml +++ b/bld/namelist_files/namelist_defaults_ctsm.xml @@ -917,19 +917,19 @@ attributes from the config_cache.xml file (with keys converted to upper-case). --> hgrid=0.9x1.25 maxpft=17 mask=gx1v7 use_cn=.true. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=17 mask=tx2_3v3 use_cn=.true. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=17 mask=gx1v7 use_cn=.true. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=17 mask=tx2_3v3 use_cn=.true. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.false. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.false. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.false. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.false. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. @@ -951,27 +951,27 @@ attributes from the config_cache.xml file (with keys converted to upper-case). hgrid=0.9x1.25 maxpft=17 mask=gx1v7 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=17 mask=tx2_3v3 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.false. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.false. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.false. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.false. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=17 mask=gx1v7 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=17 mask=tx2_3v3 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.false. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.false. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.false. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.false. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. @@ -993,23 +993,23 @@ attributes from the config_cache.xml file (with keys converted to upper-case). hgrid=1.9x2.5 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=1.9x2.5 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=1.9x2.5 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=1.9x2.5 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=17 mask=gx1v7 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=17 mask=tx2_3v3 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=17 mask=gx1v7 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=17 mask=tx2_3v3 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=1.9x2.5 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=1.9x2.5 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nex=10 do_transient_pfts=.false. use_excess_ice=.true. @@ -1020,104 +1020,104 @@ attributes from the config_cache.xml file (with keys converted to upper-case). hgrid=1.9x2.5 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=1.9x2.5 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. @@ -1130,12 +1130,12 @@ attributes from the config_cache.xml file (with keys converted to upper-case). hgrid=0.9x1.25 maxpft=17 mask=gx1v7 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=17 mask=tx2_3v3 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=1.9x2.5 maxpft=17 mask=gx1v7 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=1.9x2.5 maxpft=17 mask=tx2_3v3 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=1.9x2.5 maxpft=17 mask=gx1v7 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.true. use_excess_ice=.false. lnd_tuning_mode=clm5_0_cam6.0 +>hgrid=1.9x2.5 maxpft=17 mask=tx2_3v3 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.true. use_excess_ice=.false. lnd_tuning_mode=clm5_0_cam6.0 hgrid=1.9x2.5 maxpft=17 mask=gx1v7 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.true. use_excess_ice=.false. lnd_tuning_mode=clm5_0_cam6.0 +>hgrid=1.9x2.5 maxpft=17 mask=tx2_3v3 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.true. use_excess_ice=.false. lnd_tuning_mode=clm5_0_cam6.0 hgrid=1.9x2.5 maxpft=17 mask=gx1v7 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.true. use_excess_ice=.false. lnd_tuning_mode=clm5_0_cam6.0 +>hgrid=1.9x2.5 maxpft=17 mask=tx2_3v3 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.true. use_excess_ice=.false. lnd_tuning_mode=clm5_0_cam6.0 hgrid=1.9x2.5 maxpft=17 mask=gx1v7 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.true. use_excess_ice=.false. lnd_tuning_mode=clm5_0_cam6.0 +>hgrid=1.9x2.5 maxpft=17 mask=tx2_3v3 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.true. use_excess_ice=.false. lnd_tuning_mode=clm5_0_cam6.0 @@ -1175,82 +1175,82 @@ attributes from the config_cache.xml file (with keys converted to upper-case). hgrid=0.9x1.25 maxpft=78 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. use_excess_ice=.false. glc_nec=10 do_transient_pfts=.true. lnd_tuning_mode=clm5_0_cam6.0 +>hgrid=0.9x1.25 maxpft=78 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. use_excess_ice=.false. glc_nec=10 do_transient_pfts=.true. lnd_tuning_mode=clm5_0_cam6.0 hgrid=0.9x1.25 maxpft=78 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. use_excess_ice=.false. glc_nec=10 do_transient_pfts=.true. lnd_tuning_mode=clm5_0_cam6.0 +>hgrid=0.9x1.25 maxpft=78 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. use_excess_ice=.false. glc_nec=10 do_transient_pfts=.true. lnd_tuning_mode=clm5_0_cam6.0 hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=17 mask=gx1v7 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=17 mask=tx2_3v3 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=1.9x2.5 maxpft=17 mask=gx1v7 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=1.9x2.5 maxpft=17 mask=tx2_3v3 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. @@ -1366,28 +1366,28 @@ attributes from the config_cache.xml file (with keys converted to upper-case). (if it will work on an exact match, leave use_init_interp off) --> -lnd/clm2/initdata_map/clmi.I1850Clm45BgcGs.0901-01-01.0.9x1.25_gx1v7_simyr1850_c200806.nc -lnd/clm2/initdata_map/clmi.I1850Clm45BgcCruGs.1101-01-01.0.9x1.25_gx1v7_simyr1850_c200806.nc -lnd/clm2/initdata_map/clmi.B1850Clm45BgcGs.0161-01-01.0.9x1.25_gx1v7_simyr1850_c200806.nc - - - -lnd/clm2/initdata_esmf/ctsm5.2/clmi.I1850Clm50BgcCropCru-ciso.1526-01-01.0.9x1.25_gx1v7_simyr1850_c240223.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 - - - - - - - - - - - - - - - Date: Mon, 12 Oct 2026 18:08:22 -0600 Subject: [PATCH 18/40] Update rtm1_0_89 to 90 and mosart1.1.13 to 14 --- .gitmodules | 4 ++-- components/mosart | 2 +- components/rtm | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index 6ff4b67f13..9eb32b9fc1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -44,7 +44,7 @@ fxDONOTUSEurl = https://github.com/ESCOMP/CISM-wrapper [submodule "rtm"] path = components/rtm url = https://github.com/ESCOMP/RTM -fxtag = rtm1_0_89 +fxtag = rtm1_0_90 fxrequired = ToplevelRequired # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed fxDONOTUSEurl = https://github.com/ESCOMP/RTM @@ -52,7 +52,7 @@ fxDONOTUSEurl = https://github.com/ESCOMP/RTM [submodule "mosart"] path = components/mosart url = https://github.com/ESCOMP/MOSART -fxtag = mosart1.1.13 +fxtag = mosart1.1.14 fxrequired = ToplevelRequired # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed fxDONOTUSEurl = https://github.com/ESCOMP/MOSART diff --git a/components/mosart b/components/mosart index a6f6e90606..f0aae61731 160000 --- a/components/mosart +++ b/components/mosart @@ -1 +1 @@ -Subproject commit a6f6e90606e362aa6367f7003cb4c130c4664bc6 +Subproject commit f0aae61731412c8be89ffbc398f92c705e77ee84 diff --git a/components/rtm b/components/rtm index 1165b4ff0c..0fcf0df127 160000 --- a/components/rtm +++ b/components/rtm @@ -1 +1 @@ -Subproject commit 1165b4ff0c015369d350478c5833cf366acada9f +Subproject commit 0fcf0df1271ce17277cae08add974d54a6bfa9ff From be2c45b98aa713fbe26cf526b920a280f3c6f998 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Tue, 13 Oct 2026 10:50:35 -0600 Subject: [PATCH 19/40] Remove test from expected fails because it passes consistently --- cime_config/testdefs/ExpectedTestFails.xml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/cime_config/testdefs/ExpectedTestFails.xml b/cime_config/testdefs/ExpectedTestFails.xml index 9a76bc0de8..087933e7f1 100644 --- a/cime_config/testdefs/ExpectedTestFails.xml +++ b/cime_config/testdefs/ExpectedTestFails.xml @@ -82,18 +82,6 @@ - - - FAIL - #2619 - This failure relates to the following REP failure. - - - FAIL - #2619 - This failure relates to the following REP failure. - - FAIL From 0dd52772cf342cb8efd6ec7cf10c729365f2b841 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Tue, 13 Oct 2026 17:31:09 -0600 Subject: [PATCH 20/40] Put LII_ tests back to f19_g17 grid until we have approp. IC (#4245) --- bld/namelist_files/namelist_defaults_ctsm.xml | 7 +++++++ cime_config/testdefs/testlist_clm.xml | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml index e42d7781a7..36eb4477f8 100644 --- a/bld/namelist_files/namelist_defaults_ctsm.xml +++ b/bld/namelist_files/namelist_defaults_ctsm.xml @@ -1524,6 +1524,13 @@ attributes from the config_cache.xml file (with keys converted to upper-case). lnd_tuning_mode="clm5_0_GSWP3v1" >lnd/clm2/initdata_esmf/ctsm5.4/clmi.f19_twiceinterp_from.I1850Clm50BgcCrop-ciso.1366-01-01.0.9x1.25_gx1v7_simyr1850_c251030.nc + +lnd/clm2/initdata_esmf/ctsm5.4/clmi.f19_twiceinterp_from.I1850Clm50BgcCrop-ciso.1366-01-01.0.9x1.25_gx1v7_simyr1850_c251030.nc + 0.5 - + @@ -2593,7 +2593,7 @@ - + From eb2d9b8feecff42d714391a3f729cec22d99bff3 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Tue, 13 Oct 2026 18:09:47 -0600 Subject: [PATCH 21/40] Put PFS tests back to f19_g17 grid until we have approp. IC --- cime_config/testdefs/testlist_clm.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml index 39987c8fc9..7a6c9f6155 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -4649,7 +4649,7 @@ - + @@ -4661,7 +4661,7 @@ - + From ac854d3b37392459325bceb326d9e86eb6140308 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Fri, 16 Oct 2026 16:36:26 -0600 Subject: [PATCH 22/40] Determining namelist defaults, remove gx-grid lines that we do not need --- bld/namelist_files/namelist_defaults_overall.xml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/bld/namelist_files/namelist_defaults_overall.xml b/bld/namelist_files/namelist_defaults_overall.xml index d4b58dc2a0..18616414b4 100644 --- a/bld/namelist_files/namelist_defaults_overall.xml +++ b/bld/namelist_files/namelist_defaults_overall.xml @@ -79,25 +79,16 @@ determine default values for namelists. hist -gx1v6 -gx1v6 tx2_3v3 tx2_3v3 -gx3v7 tx2_0v1 tx2_0v1 cruncep -gx1v7 -gx1v7 -gx3v7 -gx3v7 -gx3v7 T62 tx2_3v3 -gx1v6 tx2_3v3 nldas2 From 6c2e9ce72d429446797371a9010846685df2803e Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Fri, 16 Oct 2026 16:54:55 -0600 Subject: [PATCH 23/40] Update I1850Clm60BgcNoAnthroRtm test to not use matrixcn --- cime_config/testdefs/testlist_clm.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml index 7a6c9f6155..17f3412c74 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -122,7 +122,7 @@ - + @@ -131,7 +131,7 @@ - + From cd1e1a07b9fb52b303948357a48869a681a4fefe Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Mon, 19 Oct 2026 13:05:01 -0600 Subject: [PATCH 24/40] Add hist_fexcl1 = 'PCT_GLC_MEC' to lvg.py for LVG test to pass --- cime_config/SystemTests/lvg.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/cime_config/SystemTests/lvg.py b/cime_config/SystemTests/lvg.py index d73f4e707b..e0cf8419a5 100644 --- a/cime_config/SystemTests/lvg.py +++ b/cime_config/SystemTests/lvg.py @@ -8,6 +8,8 @@ This will only pass if there are no column or patch-level outputs in CLM's history files. + +In PR #4234, which updated from gx (POP) to tx (MOM) grids, this test failed in COMPARE_base_more_virtual until we added the fexcl statement below for PCT_GLC_MEC in both case1 and case2. Bill Sacks posted in this PR that the MOM grid had a grid cell on the south tip of South America with 0% glacier that likely was newly present in the land mask, and with extra virtual glacier (case2) it was given non-zero percentages in each glacier column due to falling within the Antarctica mask. The PCT_GLC_MEC difference was valid and as such could be excluded from the test. """ from CIME.SystemTests.system_tests_compare_two import SystemTestsCompareTwo @@ -34,6 +36,11 @@ def _case_one_setup(self): component="clm", contents="glacier_region_behavior = 'single_at_atm_topo', 'UNSET', 'virtual', 'multiple'", ) + append_to_user_nl_files( + caseroot=self._get_caseroot(), + component="clm", + contents="hist_fexcl1 = 'PCT_GLC_MEC'", + ) def _case_two_setup(self): append_to_user_nl_files( @@ -41,3 +48,8 @@ def _case_two_setup(self): component="clm", contents="glacier_region_behavior = 'single_at_atm_topo', 'UNSET', 'virtual', 'virtual'", ) + append_to_user_nl_files( + caseroot=self._get_caseroot(), + component="clm", + contents="hist_fexcl1 = 'PCT_GLC_MEC'", + ) From 79d01558f62cd11f7ca77f2ff54c73044a47212d Mon Sep 17 00:00:00 2001 From: Sam Rabin Date: Tue, 20 Oct 2026 10:36:49 -0600 Subject: [PATCH 25/40] Update ChangeLog/Sum for ctsm5.4.065. --- doc/ChangeLog | 33 +++++++++++++++++++++++++++++++++ doc/ChangeSum | 1 + 2 files changed, 34 insertions(+) diff --git a/doc/ChangeLog b/doc/ChangeLog index 6c5126866d..1cdbeb3c7a 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,4 +1,37 @@ =============================================================== +Tag name: ctsm5.4.065 +Originator(s): samrabin (Sam Rabin, UCAR/TSS) +Date: Tue Oct 20 10:30:51 MDT 2026 +One-line Summary: Fix scheduled docs-update-ctsm_pylib workflow + +Purpose and description of changes +---------------------------------- + +Fix scheduled docs-update-ctsm_pylib workflow so that it (1) posts an issue as it's supposed to when failing and (b) emails Sam Rabin about it instead of Sam Levis. + +Notes of particular relevance for developers: +--------------------------------------------- + +Caveats for developers (e.g., code that is duplicated that requires double maintenance): +- Note that this ONLY fixes the workflow so that it behaves as expected. The Are both methods identical?" job will still fail. However, it shouldn't trigger on anyone else's PR unless they're working on one of the following (or the `docs-update-ctsm_pylib.yml` file itself): +- `python/conda_env_ctsm_py.yml` +- `doc/ctsm-docs_container/requirements.txt` +- `.github/workflows/docs-common.yml` +- `.github/workflows/docs-update-dependency-common.yml` + +Testing summary: +---------------- + +No testing was performed on Derecho or Izumi. The ctsm5.4.065 baselines are just softlinks to the ctsm5.4.064 ones. + +Other details +------------- + +Pull Requests that document the changes (include PR ids): +- [ESCOMP/CTSM Pull Request #4266: ctsm5.4.065: Fix scheduled docs-update-ctsm_pylib workflow by samsrabin](https://github.com/ESCOMP/CTSM/pull/4266) + +=============================================================== +=============================================================== Tag name: ctsm5.4.063 Originator(s): slevis (Samuel Levis,UCAR/TSS, slevis@ucar.edu) Date: Tue Oct 6 09:32:15 MDT 2026 diff --git a/doc/ChangeSum b/doc/ChangeSum index 6bffb1442f..4037db6674 100644 --- a/doc/ChangeSum +++ b/doc/ChangeSum @@ -1,5 +1,6 @@ Tag Who Date Summary ============================================================================================================================ + ctsm5.4.065 samrabin 10/20/2026 Fix scheduled docs-update-ctsm_pylib workflow ctsm5.4.063 slevis 10/06/2026 Move CTSM tests from t232 to t233 ctsm5.4.062 slevis 10/02/2026 Merge b4b-dev to master ctsm5.4.061 erik 09/30/2026 Update to cesm3_0_beta10 externals cime/ccs_config, including more ccs_config grid aliases with MOM grids From 0b28ededb6be974bde1a6d58b7d1e79e1f8cba85 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Tue, 20 Oct 2026 18:16:42 -0600 Subject: [PATCH 26/40] Draft ChangeLog/Sum --- doc/ChangeLog | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++ doc/ChangeSum | 1 + 2 files changed, 82 insertions(+) diff --git a/doc/ChangeLog b/doc/ChangeLog index 6341d433c2..0ff55b8932 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,4 +1,85 @@ =============================================================== +Tag name: ctsm5.4.066 +Originator(s): slevis (Samuel Levis,UCAR/TSS, slevis@ucar.edu) +Date: Tue Oct 20 05:30:13 PM MDT 2026 +One-line Summary: Move CTSM tests from gx (POP) grids to tx (MOM) grids + +Purpose and description of changes +---------------------------------- + + Recent PR #4223 moved CTSM tests from the t232 to the t233 grid. Now I'm moving CTSM, RTM, and MOSART tests from the gx grids (g16, g17, g37) to the tx grids (t233 and t201). + + Includes submodule updates to + - rtm and mosart (updated grids in the tests) + - ccs_config (3 grids that got missed in an earlier ccs_config tag) + +Bugs fixed +---------- +List of CTSM issues fixed (include CTSM Issue # and description) [one per line]: + Resolves #2540 + +Notes of particular relevance for users +--------------------------------------- +Changes to documentation: Minor updates to replace references to gx grids to the tx grids + +Notes of particular relevance for developers: +--------------------------------------------- +Caveats for developers (e.g., code that is duplicated that requires double maintenance): + Kept a small set of tests (LII_* and PFS) with the gx grids until we generate final initial condition files for them. This is documented in issue #4245. + +Changes to tests or testing: + - Removed PCT_GLC_MEC from history in the LVG test because it showed a valid difference causing the test to fail in the COMPARE_base_more_virtual phase. + - Removed matrixcnOn from a I1850Clm60BgcNoAnthroRtm test as unnecessary because we use matrixcn in SASU mode when we prefer to keep rivers off. I documented the failure in an issue in case paleo users accidentally encounter it. I also opened an issue recommending the development of a specialized SSP matrixcn test that checks that cpl_hist works with NoAnthro with/without rtm. + +Testing summary: +---------------- + + [PASS means all tests PASS; OK means tests PASS other than expected fails.] + + build-namelist tests (if CLMBuildNamelist.pm has changed): + + derecho - + + regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing): + + derecho ----- + izumi ------- + + any other testing (give details below): + + ctsm_sci + derecho ---- + + rtm + derecho ---- + izumi ------ + + mosart + derecho ---- + izumi ------ + +Answer changes +-------------- +Changes answers relative to baseline: Yes + Summarize any changes to answers, i.e., + - what code configurations: Only cases with grids that changed from a gx to a tx grid + - what platforms/compilers: All + - nature of change: Only due to the grid update + + Two tests that had already changed to t233 previously, now find a t233 finidat and do not require interpolation, so answers change for them. + +Other details +------------- +List any git submodules updated (cime, rtm, mosart, cism, fates, etc.): + Updating from - ccs_config_cesm1.0.92 to 93 + - rtm1_0_89 to 90 + - mosart1.1.13 to mosart1.1.14 + +Pull Requests that document the changes (include PR ids): + https://github.com/ESCOMP/ctsm/pull/4234 + +=============================================================== +=============================================================== Tag name: ctsm5.4.065 Originator(s): samrabin (Sam Rabin, UCAR/TSS) Date: Tue Oct 20 10:30:51 MDT 2026 diff --git a/doc/ChangeSum b/doc/ChangeSum index 5ca6691f9f..9ab722e065 100644 --- a/doc/ChangeSum +++ b/doc/ChangeSum @@ -1,5 +1,6 @@ Tag Who Date Summary ============================================================================================================================ + ctsm5.4.066 slevis 10/21/2026 Move CTSM tests from gx (POP) grids to tx (MOM) grids ctsm5.4.065 samrabin 10/20/2026 Fix scheduled docs-update-ctsm_pylib workflow ctsm5.4.064 samrabin 10/16/2026 b4b-dev merge 2026-10-15 ctsm5.4.063 slevis 10/06/2026 Move CTSM tests from t232 to t233 From 19c0225468a0f1f78450b4ce55072d099bb8aa7c Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Wed, 21 Oct 2026 12:19:26 -0600 Subject: [PATCH 27/40] Update LII2 tests from the t232 to the t233 grid --- cime_config/testdefs/testlist_clm.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml index 76d6639cd2..6b768a6f47 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -2604,7 +2604,7 @@ - + @@ -2614,7 +2614,7 @@ - + From 75c69995c5cef83ff8b76025d36d1252bd34a0aa Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Wed, 21 Oct 2026 15:53:40 -0600 Subject: [PATCH 28/40] Reorder f10_f10_ais8gris4_mt201 to f10_f10_mt201_ais8gris4 in aux_clm --- 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 6b768a6f47..594e8cda19 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -317,7 +317,7 @@ - + From dbb2384d3f49880791d41c0eb8d99295385c555e Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Mon, 26 Oct 2026 15:01:06 -0600 Subject: [PATCH 29/40] Remove failing ERP IHist test as irrelevant because using matrixcn --- cime_config/testdefs/testlist_clm.xml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml index 594e8cda19..cce220aec8 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -2101,18 +2101,6 @@ - - - - - - - - - - - - From 1d4d1b39bdb43f1f759032cb6087b1bf630118c4 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Tue, 27 Oct 2026 14:29:08 -0600 Subject: [PATCH 30/40] Revert 75c69995c5cef83ff8b76025d36d1252bd34a0aa --- 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 cce220aec8..e83b5b7776 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -317,7 +317,7 @@ - + From bf58b69917be968e182e7ac9949dd879f2934079 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Wed, 28 Oct 2026 11:44:46 -0600 Subject: [PATCH 31/40] Update from ccs_config_cesm1.0.92 to ccs_config_cesm1.0.97 --- .gitmodules | 2 +- ccs_config | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 45c0548422..ebf688c296 100644 --- a/.gitmodules +++ b/.gitmodules @@ -68,7 +68,7 @@ fxDONOTUSEurl = https://github.com/ESCOMP/mizuRoute [submodule "ccs_config"] path = ccs_config url = https://github.com/ESMCI/ccs_config_cesm.git -fxtag = ccs_config_cesm1.0.92 +fxtag = ccs_config_cesm1.0.97 fxrequired = ToplevelRequired # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git diff --git a/ccs_config b/ccs_config index c71cdfba50..33bbdd887d 160000 --- a/ccs_config +++ b/ccs_config @@ -1 +1 @@ -Subproject commit c71cdfba50aedc452a96fe3dd033f8bfdcf7c0fb +Subproject commit 33bbdd887dc83fa8e0e2166ad790daf6dca64fba From 22f2933a4b91b3a004f9ec8faee810d4f8a6110f Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Wed, 28 Oct 2026 11:57:12 -0600 Subject: [PATCH 32/40] Remove three passing tests from clm's expected failures --- cime_config/testdefs/ExpectedTestFails.xml | 23 +--------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/cime_config/testdefs/ExpectedTestFails.xml b/cime_config/testdefs/ExpectedTestFails.xml index 087933e7f1..001590c317 100644 --- a/cime_config/testdefs/ExpectedTestFails.xml +++ b/cime_config/testdefs/ExpectedTestFails.xml @@ -165,20 +165,6 @@ - - - FAIL - ESMCI/cime#4966 - - - - - - FAIL - ESMCI/cime#4966 - - - FAIL @@ -195,14 +181,7 @@ - - - - FAIL - #3660 - Restart issues with default "inactive" fields added to history by hist_all_fields. - - + hgrid=0.9x1.25 maxpft=17 mask=tx2_3v3 use_cn=.true. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=17 mask=gx1v7 use_cn=.true. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=17 mask=tx2_3v3 use_cn=.true. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=17 mask=gx1v7 use_cn=.true. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.false. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.false. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.false. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.false. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=17 mask=tx2_3v3 use_cn=.false. use_crop=.false. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.true. +>hgrid=0.9x1.25 maxpft=17 mask=tx2_3v2 use_cn=.false. use_crop=.false. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.true. hgrid=0.9x1.25 maxpft=17 mask=tx2_3v3 use_cn=.false. use_crop=.false. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.true. +>hgrid=0.9x1.25 maxpft=17 mask=tx2_3v2 use_cn=.false. use_crop=.false. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.true. hgrid=ne30np4.pg3 maxpft=17 mask=tx2_3v3 use_cn=.false. use_crop=.false. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.true. +>hgrid=ne30np4.pg3 maxpft=17 mask=tx2_3v2 use_cn=.false. use_crop=.false. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.true. hgrid=0.9x1.25 maxpft=17 mask=tx2_3v3 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=17 mask=gx1v7 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.false. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.false. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.false. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.false. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=17 mask=tx2_3v3 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=17 mask=gx1v7 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.false. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.false. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.false. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.false. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.false. glc_nex=10 do_transient_pfts=.false. phys=clm6_0 use_excess_ice=.true. +>hgrid=0.9x1.25 maxpft=79 mask=tx2_3v2 use_cn=.true. use_crop=.true. irrigate=.false. glc_nex=10 do_transient_pfts=.false. phys=clm6_0 use_excess_ice=.true. hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.false. glc_nex=10 do_transient_pfts=.false. lnd_tuning_mode=clm6_0_CRUJRA2024 use_excess_ice=.true. +>hgrid=0.9x1.25 maxpft=79 mask=tx2_3v2 use_cn=.true. use_crop=.true. irrigate=.false. glc_nex=10 do_transient_pfts=.false. lnd_tuning_mode=clm6_0_CRUJRA2024 use_excess_ice=.true. mask=tx2_3v3 use_cn=.true. do_transient_pfts=.false. use_excess_ice=.true. use_crop=.false. irrigate=.false. +>mask=tx2_3v2 use_cn=.true. do_transient_pfts=.false. use_excess_ice=.true. use_crop=.false. irrigate=.false. mask=tx2_3v3 use_cn=.true. do_transient_pfts=.false. use_excess_ice=.true. use_crop=.true. irrigate=.false. +>mask=tx2_3v2 use_cn=.true. do_transient_pfts=.false. use_excess_ice=.true. use_crop=.true. irrigate=.false. hgrid=1.9x2.5 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=1.9x2.5 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=1.9x2.5 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=1.9x2.5 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=17 mask=tx2_3v3 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=17 mask=gx1v7 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=17 mask=tx2_3v3 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=17 mask=gx1v7 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=1.9x2.5 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=1.9x2.5 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nex=10 do_transient_pfts=.false. use_excess_ice=.true. +>hgrid=0.9x1.25 maxpft=79 mask=tx2_3v2 use_cn=.true. use_crop=.true. irrigate=.true. glc_nex=10 do_transient_pfts=.false. use_excess_ice=.true. hgrid=ne30np4.pg3 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.true. +>hgrid=ne30np4.pg3 maxpft=79 mask=tx2_3v2 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.true. hgrid=1.9x2.5 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=1.9x2.5 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. @@ -1130,12 +1130,12 @@ attributes from the config_cache.xml file (with keys converted to upper-case). hgrid=0.9x1.25 maxpft=17 mask=tx2_3v3 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=17 mask=gx1v7 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=1.9x2.5 maxpft=17 mask=tx2_3v3 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=1.9x2.5 maxpft=17 mask=gx1v7 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=1.9x2.5 maxpft=17 mask=tx2_3v3 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.true. use_excess_ice=.false. lnd_tuning_mode=clm5_0_cam6.0 +>hgrid=1.9x2.5 maxpft=17 mask=gx1v7 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.true. use_excess_ice=.false. lnd_tuning_mode=clm5_0_cam6.0 hgrid=1.9x2.5 maxpft=17 mask=tx2_3v3 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.true. use_excess_ice=.false. lnd_tuning_mode=clm5_0_cam6.0 +>hgrid=1.9x2.5 maxpft=17 mask=gx1v7 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.true. use_excess_ice=.false. lnd_tuning_mode=clm5_0_cam6.0 hgrid=1.9x2.5 maxpft=17 mask=tx2_3v3 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.true. use_excess_ice=.false. lnd_tuning_mode=clm5_0_cam6.0 +>hgrid=1.9x2.5 maxpft=17 mask=gx1v7 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.true. use_excess_ice=.false. lnd_tuning_mode=clm5_0_cam6.0 hgrid=1.9x2.5 maxpft=17 mask=tx2_3v3 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.true. use_excess_ice=.false. lnd_tuning_mode=clm5_0_cam6.0 +>hgrid=1.9x2.5 maxpft=17 mask=gx1v7 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.true. use_excess_ice=.false. lnd_tuning_mode=clm5_0_cam6.0 @@ -1175,82 +1175,82 @@ attributes from the config_cache.xml file (with keys converted to upper-case). hgrid=0.9x1.25 maxpft=78 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. use_excess_ice=.false. glc_nec=10 do_transient_pfts=.true. lnd_tuning_mode=clm5_0_cam6.0 +>hgrid=0.9x1.25 maxpft=78 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. use_excess_ice=.false. glc_nec=10 do_transient_pfts=.true. lnd_tuning_mode=clm5_0_cam6.0 hgrid=0.9x1.25 maxpft=78 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. use_excess_ice=.false. glc_nec=10 do_transient_pfts=.true. lnd_tuning_mode=clm5_0_cam6.0 +>hgrid=0.9x1.25 maxpft=78 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. use_excess_ice=.false. glc_nec=10 do_transient_pfts=.true. lnd_tuning_mode=clm5_0_cam6.0 hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=17 mask=tx2_3v3 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=17 mask=gx1v7 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=1.9x2.5 maxpft=17 mask=tx2_3v3 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=1.9x2.5 maxpft=17 mask=gx1v7 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. +>hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. @@ -1311,22 +1311,22 @@ attributes from the config_cache.xml file (with keys converted to upper-case). maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. glc_nec=10 use_excess_ice=.true. +>maxpft=79 mask=tx2_3v2 use_cn=.true. use_crop=.true. glc_nec=10 use_excess_ice=.true. maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. glc_nec=10 use_excess_ice=.true. +>maxpft=79 mask=tx2_3v2 use_cn=.true. use_crop=.true. glc_nec=10 use_excess_ice=.true. maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. glc_nec=10 use_excess_ice=.true. +>maxpft=79 mask=tx2_3v2 use_cn=.true. use_crop=.true. glc_nec=10 use_excess_ice=.true. hgrid=0.9x1.25 maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. glc_nec=10 use_excess_ice=.true. +>hgrid=0.9x1.25 maxpft=79 mask=tx2_3v2 use_cn=.true. use_crop=.true. glc_nec=10 use_excess_ice=.true. maxpft=79 mask=tx2_3v3 use_cn=.true. use_crop=.true. glc_nec=10 use_excess_ice=.true. +>maxpft=79 mask=tx2_3v2 use_cn=.true. use_crop=.true. glc_nec=10 use_excess_ice=.true. -lnd/clm2/initdata_map/clmi.I1850Clm45BgcGs.0901-01-01.0.9x1.25_gx1v7_simyr1850_c200806.nc -lnd/clm2/initdata_map/clmi.I1850Clm45BgcCruGs.1101-01-01.0.9x1.25_gx1v7_simyr1850_c200806.nc -lnd/clm2/initdata_map/clmi.B1850Clm45BgcGs.0161-01-01.0.9x1.25_gx1v7_simyr1850_c200806.nc - - -lnd/clm2/initdata_esmf/ctsm5.3/clmi.interp_from.I1850Clm50BgcCrop-ciso.1366-01-01.0.9x1.25_gx1v7_simyr1850_c240223.nc - -lnd/clm2/initdata_esmf/ctsm5.2/clmi.I1850Clm50BgcCropCru-ciso.1526-01-01.0.9x1.25_gx1v7_simyr1850_c240223.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 - -lnd/clm2/initdata_esmf/ctsm5.4/ctsm5.4.CMIP7_ciso_ctsm5.3.075_SP_f09_127_1850.clm2.r.0102-01-01-00000.nc -lnd/clm2/initdata_esmf/ctsm5.4/ctsm5.4.CMIP7_ciso_ctsm5.3.075_SP_f09_127_HIST.clm2.r.2000-01-01-00000.nc - -lnd/clm2/initdata_esmf/ctsm5.4/ctsm5.4.CMIP7_ciso_ctsm5.3.075_f09_124_pSASU.clm2.r.0161-01-01-00000.nc -lnd/clm2/initdata_esmf/ctsm5.4/ctsm5.4.015_BGCcrop_ne30_144_pSASU.clm2.r.0181-01-01-00000.nc - - - -lnd/clm2/initdata_esmf/ctsm5.4/clmi.f19_twiceinterp_from.I1850Clm50BgcCrop-ciso.1366-01-01.0.9x1.25_gx1v7_simyr1850_c251030.nc - - lnd/clm2/initdata_esmf/ctsm5.4/clmi.f19_twiceinterp_from.I1850Clm50BgcCrop-ciso.1366-01-01.0.9x1.25_gx1v7_simyr1850_c251030.nc - - - - - - - -lnd/clm2/initdata_esmf/ctsm5.4/ctsm5.4.CMIP7_ciso_ctsm5.3.075_f09_124_HIST.clm2.r.2000-01-01-00000.nc - -lnd/clm2/initdata_esmf/ctsm5.4/ctsm5.4.CMIP7_ciso_ctsm5.3.075_f09_124_HIST.clm2.r.2010-01-01-00000.nc - - -lnd/clm2/initdata_esmf/ctsm5.4/ctsm5.4.CMIP7_ciso_ctsm5.3.075_f09_124_HIST.clm2.r.1979-01-01-00000.nc - - - - - Date: Fri, 30 Oct 2026 14:47:36 -0600 Subject: [PATCH 36/40] Two finidat settings where mask should have been gx1v7 --- bld/namelist_files/namelist_defaults_ctsm.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml index 45f88bd64f..f91139708a 100644 --- a/bld/namelist_files/namelist_defaults_ctsm.xml +++ b/bld/namelist_files/namelist_defaults_ctsm.xml @@ -1489,7 +1489,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case). >lnd/clm2/initdata_esmf/ctsm5.4/ctsm5.4.015_BGCcrop_ne30_144_pSASU.clm2.r.0181-01-01-00000.nc -lnd/clm2/initdata_esmf/ctsm5.4/clmi.f19_twiceinterp_from.I1850Clm50BgcCrop-ciso.1366-01-01.0.9x1.25_gx1v7_simyr1850_c251030.nc - Date: Fri, 30 Oct 2026 13:50:28 -0700 Subject: [PATCH 37/40] Update README_on_CTSM.md Co-authored-by: Erik Kluzek --- README_on_CTSM.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README_on_CTSM.md b/README_on_CTSM.md index 6218b48016..6f4c393a3d 100644 --- a/README_on_CTSM.md +++ b/README_on_CTSM.md @@ -148,7 +148,7 @@ QUICKSTART: using the NUOPC driver scripts cd $CIMEROOT/scripts ./create_newcase # get help on how to run create_newcase ./create_newcase --case testI --res f09_t233 --compset I2000Clm60BgcCrop - # create new "I" case for default machine at 1.9x2.5_tx2_3v3 + # create new "I" case for default machine at 1.9x2.5 (roughly 2 degree resolution) with a tx2_3v3 land/ocean mask (2/3rds degree ocean mask for MOM6) # "I2000Clm60BgcCrop" case is clm6_0 physics, CDEPS, and inactive ice/ocn/glc # and MOSART for river-routing cd testI From 04d6c22de1796c3897529790e2dacb0c38a02f73 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Fri, 30 Oct 2026 15:26:56 -0600 Subject: [PATCH 38/40] One init_interp_attributes setting where mask should have been gx1v7 --- 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 f91139708a..4f66734b7c 100644 --- a/bld/namelist_files/namelist_defaults_ctsm.xml +++ b/bld/namelist_files/namelist_defaults_ctsm.xml @@ -984,7 +984,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case). mask=tx2_3v2 use_cn=.true. do_transient_pfts=.false. use_excess_ice=.true. use_crop=.false. irrigate=.false. +>mask=gx1v7 use_cn=.true. do_transient_pfts=.false. use_excess_ice=.true. use_crop=.false. irrigate=.false. Date: Fri, 30 Oct 2026 17:41:05 -0600 Subject: [PATCH 39/40] Second init_interp_attributes where I'm reverting mask to gx1v7 --- bld/namelist_files/namelist_defaults_ctsm.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml index 4f66734b7c..4e568f2840 100644 --- a/bld/namelist_files/namelist_defaults_ctsm.xml +++ b/bld/namelist_files/namelist_defaults_ctsm.xml @@ -1325,10 +1325,13 @@ attributes from the config_cache.xml file (with keys converted to upper-case). hgrid=0.9x1.25 maxpft=79 mask=tx2_3v2 use_cn=.true. use_crop=.true. glc_nec=10 use_excess_ice=.true. +hgrid=1.9x2.5 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. glc_nec=10 use_excess_ice=.true. + + hgrid=ne0np4.ARCTIC.ne30x4 maxpft=17 mask=tx0.1v2 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false. From fb242037c4d10b976d8e373445ee63e202458d95 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Fri, 30 Oct 2026 17:55:35 -0600 Subject: [PATCH 40/40] Revert LII2 tests back to t232 --- cime_config/testdefs/testlist_clm.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml index e83b5b7776..e97458c114 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -2592,7 +2592,7 @@ - + @@ -2602,7 +2602,7 @@ - +