diff --git a/.gitmodules b/.gitmodules
index 9d66f4c1c6..ebf688c296 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
@@ -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/README_on_CTSM.md b/README_on_CTSM.md
index 941f9f5a6e..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_gx1v7 
+                                     # 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
diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml
index 45f88bd64f..4e568f2840 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).
 
 <init_interp_attributes sim_year="1850" use_cndv=".false." use_fates=".false." phys="clm6_0"
 			hgrid="1.9x2.5"
->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.
 </init_interp_attributes>
 <init_interp_attributes sim_year="1850" use_cndv=".false." use_fates=".false." phys="clm6_0"
 			hgrid="ne30np4.pg3"
@@ -1325,10 +1325,13 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
 </init_interp_attributes>
 
 <init_interp_attributes sim_year="1979" use_cndv=".false." use_fates=".false." phys="clm6_0"
-                        hgrid="1.9x2.5"
 >hgrid=0.9x1.25 maxpft=79 mask=tx2_3v2 use_cn=.true. use_crop=.true. glc_nec=10 use_excess_ice=.true.
 </init_interp_attributes>
 
+<init_interp_attributes sim_year="1979" use_cndv=".false." use_fates=".false." phys="clm6_0"
+>hgrid=1.9x2.5 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. glc_nec=10 use_excess_ice=.true.
+</init_interp_attributes>
+
 <init_interp_attributes sim_year="1979" use_cndv=".false." use_fates=".false." lnd_tuning_mode="clm6_0_cam6.0"
                         hgrid="ne0np4.ARCTIC.ne30x4" use_cn=".false." maxpft="17"
 >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.
@@ -1489,7 +1492,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
 </finidat>
 <!-- Corresponding f19 -->
-<finidat hgrid="1.9x2.5" mask="tx2_3v2" use_cn=".true." use_cndv=".false." use_fates=".false."
+<finidat hgrid="1.9x2.5" mask="gx1v7" use_cn=".true." use_cndv=".false." use_fates=".false."
          sim_year="1850" do_transient_pfts=".false." use_excess_ice=".true."
          use_crop=".false."
          phys="clm6_0"
@@ -1525,7 +1528,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
 >lnd/clm2/initdata_esmf/ctsm5.4/clmi.f19_twiceinterp_from.I1850Clm50BgcCrop-ciso.1366-01-01.0.9x1.25_gx1v7_simyr1850_c251030.nc
 </finidat>
 <!-- NB: This f19 2000 finidat comes from a spin-up with use_crop=".false." -->
-<finidat hgrid="1.9x2.5"    maxpft="79"  mask="tx2_3v2" use_cn=".true." use_cndv=".false." use_fates=".false."
+<finidat hgrid="1.9x2.5"    maxpft="79"  mask="gx1v7" use_cn=".true." use_cndv=".false." use_fates=".false."
          ic_ymd="20000101" sim_year="2000" do_transient_pfts=".false." use_excess_ice=".true."
          ic_tod="0" glc_nec="10" use_crop=".true."
          phys="clm6_0" use_init_interp=".true."
diff --git a/bld/namelist_files/namelist_defaults_overall.xml b/bld/namelist_files/namelist_defaults_overall.xml
index 577f9bce61..18616414b4 100644
--- a/bld/namelist_files/namelist_defaults_overall.xml
+++ b/bld/namelist_files/namelist_defaults_overall.xml
@@ -79,26 +79,17 @@ determine default values for namelists.
 <ssp_rcp>hist</ssp_rcp>
 
 <!-- Default land/ocean mask type -->
-<mask hgrid="0.23x0.31"           >gx1v6</mask>
-<mask hgrid="0.47x0.63"           >gx1v6</mask>
-<mask hgrid="0.9x1.25"            >gx1v7</mask>
-<mask hgrid="1.9x2.5"             >gx1v7</mask>
-<mask hgrid="2.5x3.33"            >gx3v7</mask>
-<mask hgrid="4x5"                 >gx3v7</mask>
-<mask hgrid="10x15"               >gx3v7</mask>
+<mask hgrid="0.9x1.25"            >tx2_3v3</mask>
+<mask hgrid="1.9x2.5"             >tx2_3v3</mask>
+<mask hgrid="4x5"                 >tx2_0v1</mask>
+<mask hgrid="10x15"               >tx2_0v1</mask>
 
 <mask hgrid="360x720cru"          >cruncep</mask>
-<mask hgrid="128x256"             >gx1v7</mask>
-<mask hgrid="64x128"              >gx1v7</mask>
-<mask hgrid="48x96"               >gx3v7</mask>
-<mask hgrid="32x64"               >gx3v7</mask>
-<mask hgrid="8x16"                >gx3v7</mask>
 
 <mask hgrid="94x192"              >T62</mask>
 
-<mask hgrid="ne120"               >gx1v6</mask>
-<mask hgrid="ne240"               >gx1v6</mask>
-<mask hgrid="ne30"                >gx1v6</mask>
+<mask hgrid="ne120"               >tx2_3v3</mask>
+<mask hgrid="ne30"                >tx2_3v3</mask>
 
 <mask hgrid="0.125nldas2"         >nldas2</mask>
 <mask hgrid="5x5_amazon"          >navy</mask>
@@ -110,7 +101,7 @@ determine default values for namelists.
 <mask hgrid="1x1_numaIA"          >navy</mask>
 <mask hgrid="1x1_smallvilleIA"    >test</mask>
 <mask hgrid="1x1_cidadinhoBR"     >test</mask>
-<mask                             >gx1v7</mask>
+<mask                             >tx2_3v3</mask>
 
 <!-- Default glacier model options -->
 
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.
 
 <entry id="mask" type="char*10" category="default_settings"
        group="default_settings"
-       valid_values="USGS,gx3v7,gx1v6,gx1v7,navy,test,tx0.1v2,tx0.1v3,tx1v1,T62,cruncep,nldas2">
+       valid_values="USGS,gx3v7,gx1v6,gx1v7,navy,test,tx0.1v2,tx0.1v3,tx1v1,tx2_0v1,tx2_3v3,T62,cruncep,nldas2">
 Land mask description
 </entry>
 
diff --git a/bld/unit_testers/build-namelist_test.pl b/bld/unit_testers/build-namelist_test.pl
index b30c20785a..1f3e21d2e6 100755
--- a/bld/unit_testers/build-namelist_test.pl
+++ b/bld/unit_testers/build-namelist_test.pl
@@ -2145,7 +2145,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";
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
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'",
+        )
diff --git a/cime_config/testdefs/ExpectedTestFails.xml b/cime_config/testdefs/ExpectedTestFails.xml
index 839f375a07..001590c317 100644
--- a/cime_config/testdefs/ExpectedTestFails.xml
+++ b/cime_config/testdefs/ExpectedTestFails.xml
@@ -36,7 +36,7 @@
     </phase>
   </test>
 
-  <test name="SMS_Ld5.f09_g17.ISSP245Clm50BgcCrop.derecho_intel.clm-ciso_dec2050Start">
+  <test name="SMS_Ld5.f09_t233.ISSP245Clm50BgcCrop.derecho_intel.clm-ciso_dec2050Start">
     <phase name="RUN">
       <status>FAIL</status>
       <issue>#4165</issue>
@@ -51,7 +51,7 @@
   </test>
 
   <!-- Hillslope test suite fails -->
-  <test name="SMS_D_Ld3.f10_f10_mg37.I1850Clm60Bgc.derecho_intel.clm-HillslopeFromFile">
+  <test name="SMS_D_Ld3.f10_f10_mt201.I1850Clm60Bgc.derecho_intel.clm-HillslopeFromFile">
     <phase name="RUN">
       <status>FAIL</status>
       <issue>#4169</issue>
@@ -82,21 +82,14 @@
     </phase>
   </test>
 
-  <test name="ERP_P64x2_Ld396.f10_f10_mg37.IHistClm60Bgc.derecho_intel.clm-monthly--clm-matrixcnOn_ignore_warnings">
-    <phase name="BASELINE">
-      <status>FAIL</status>
-      <issue>#2619</issue>
-      <comment>This failure relates to the following REP failure.</comment>
-    </phase>
-  </test>
-  <test name="REP_P64x2_Ld396.f10_f10_mg37.IHistClm60Bgc.derecho_intel.clm-monthly--clm-matrixcnOn_ignore_warnings">
+  <test name="REP_P64x2_Ld396.f10_f10_mt201.IHistClm60Bgc.derecho_intel.clm-monthly--clm-matrixcnOn_ignore_warnings">
     <phase name="COMPARE_base_rep2">
       <status>FAIL</status>
       <issue>#2619</issue>
       <comment>This failure relates to the preceding ERP failure.</comment>
     </phase>
   </test>
-  <test name="REP_P64x2_Ld396.f10_f10_mg37.IHistClm60Bgc.derecho_intel.clm-monthly--clm-matrixcnOn_ignore_warnings">
+  <test name="REP_P64x2_Ld396.f10_f10_mt201.IHistClm60Bgc.derecho_intel.clm-monthly--clm-matrixcnOn_ignore_warnings">
     <phase name="BASELINE">
       <status>FAIL</status>
       <issue>#2619</issue>
@@ -104,14 +97,14 @@
     </phase>
   </test>
 
-  <test name="FUNITCTSM_P1x1.f10_f10_mg37.I2000Clm50Sp.izumi_intel">
+  <test name="FUNITCTSM_P1x1.f10_f10_mt201.I2000Clm50Sp.izumi_intel">
     <phase name="RUN">
       <status>FAIL</status>
       <issue>#3182</issue>
     </phase>
   </test>
 
-  <test name="ERP_D_P64x2_Ld10.f10_f10_mg37.I2000Clm60Bgc.derecho_intel.clm-Hillslope">
+  <test name="ERP_D_P64x2_Ld10.f10_f10_mt201.I2000Clm60Bgc.derecho_intel.clm-Hillslope">
     <phase name="RUN">
       <status>FAIL</status>
       <issue>#3788</issue>
@@ -160,7 +153,7 @@
     </phase>
   </test>
 
-  <test name="ERP_P256x2_Ld30.f45_f45_mg37.I2000Clm60Fates.derecho_intel.clm-mimicsFatesCold">
+  <test name="ERP_P256x2_Ld30.f45_f45_mt201.I2000Clm60Fates.derecho_intel.clm-mimicsFatesCold">
     <phase name="RUN">
       <status>FAIL</status>
       <issue>#2261</issue>
@@ -172,20 +165,6 @@
     </phase>
   </test>
 
-  <test name="SMS_D_Ld5.5x5_amazon_rHDMA.I2000Clm60SpMizGs.derecho_gnu.mizuroute-default">
-    <phase name="NLCOMP">
-      <status>FAIL</status>
-      <issue>ESMCI/cime#4966</issue>
-    </phase>
-  </test>
-  
-  <test name="SMS_D_Ld5.5x5_amazon_rHDMA.I2000Clm60SpMizGs.derecho_intel.mizuroute-default">
-    <phase name="NLCOMP">
-      <status>FAIL</status>
-      <issue>ESMCI/cime#4966</issue>
-    </phase>
-  </test>
-
   <test name="SMS_D_Ld5.5x5_amazon_rHDMA.I2000Clm60SpMizGs.izumi_nag.mizuroute-default">
     <phase name="RUN">
       <status>FAIL</status>
@@ -202,10 +181,10 @@
 
   <!-- fates test suite failures -->
 
-  <!--- NOTE: This test is also in aux_clm, but just including it here so it's not duplicated -->
+  <!--- NOTE: Tests also in aux_clm can be included under this comment to avoid duplication -->
 
   <!-- This is commented out because cime currently does NOT allow longnames in the XML in the XSD for this file
-  <test name="ERS_D_Ld30.f45_f45_mg37.HIST_DATM%CRUv7_CLM50%FATES_SICE_SOCN_SROF_SGLC_SWAV_SESP.izumi_nag.clm-FatesColdLandUse">
+  <test name="ERS_D_Ld30.f45_f45_mt201.HIST_DATM%CRUv7_CLM50%FATES_SICE_SOCN_SROF_SGLC_SWAV_SESP.izumi_nag.clm-FatesColdLandUse">
     <phase name="RUN">
       <status>FAIL</status>
       <issue>#3500</issue>
@@ -213,14 +192,14 @@
   </test>
   -->
 
-  <test name="ERP_D_Ld90.f45_f45_mg37.I2000Clm60Fates.izumi_nag.clm-FatesColdCStarvationExp">
+  <test name="ERP_D_Ld90.f45_f45_mt201.I2000Clm60Fates.izumi_nag.clm-FatesColdCStarvationExp">
     <phase name="MEMLEAK">
       <status>FAIL</status>
       <issue>#4174</issue>
     </phase>
   </test>
 
-  <test name="ERS_D_Ld30.f45_f45_mg37.I2000Clm50Fates.izumi_nag.clm-FatesColdPRT2">
+  <test name="ERS_D_Ld30.f45_f45_mt201.I2000Clm50Fates.izumi_nag.clm-FatesColdPRT2">
     <phase name="RUN">
       <status>PEND</status>
       <issue>FATES#983</issue>
@@ -242,28 +221,28 @@
     </phase>
   </test>
 
-  <test name="PVT_Lm3.f45_f45_mg37.I2000Clm50Fates.derecho_intel.clm-FatesLUPFT">
+  <test name="PVT_Lm3.f45_f45_mt201.I2000Clm50Fates.derecho_intel.clm-FatesLUPFT">
     <phase name="RUN">
       <status>FAIL</status>
       <issue>#2919</issue>
     </phase>
   </test>
 
-  <test name="SMS_D_Ld180.f45_f45_mg37.I2000Clm60Fates.derecho_intel.clm-FatesColdTRS">
+  <test name="SMS_D_Ld180.f45_f45_mt201.I2000Clm60Fates.derecho_intel.clm-FatesColdTRS">
     <phase name="RUN">
       <status>FAIL</status>
       <issue>FATES#1534</issue>
     </phase>
   </test>
 
-  <test name="ERS_D_Ld30.f45_f45_mg37.I2000Clm50Fates.izumi_nag.clm-FatesColdLUH2">
+  <test name="ERS_D_Ld30.f45_f45_mt201.I2000Clm50Fates.izumi_nag.clm-FatesColdLUH2">
     <phase name="RUN">
       <status>FAIL</status>
       <issue>#2653</issue>
     </phase>
   </test>
 
-  <test name="SMS_D_Ld3.f09_g17.I2000Clm60FatesSpCrujra.derecho_gnu.clm-FatesColdSatPhen_prescribed">
+  <test name="SMS_D_Ld3.f09_t233.I2000Clm60FatesSpCrujra.derecho_gnu.clm-FatesColdSatPhen_prescribed">
     <phase name="RUN">
       <status>FAIL</status>
       <issue>#2321</issue>
@@ -272,7 +251,7 @@
 
   <!-- Other submodule test list failures (MOSART, RTM, etc. -->
 
-  <test name="SMS_Lh3.f10_f10_mg37.I2000Clm60Sp.derecho_intel.mosart-clmAccelSpinupIgnoreWarn">
+  <test name="SMS_Lh3.f10_f10_mt201.I2000Clm60Sp.derecho_intel.mosart-clmAccelSpinupIgnoreWarn">
     <phase name="CREATE_NEWCASE">
       <status>FAIL</status>
       <issue>MOSART#91</issue>
@@ -296,7 +275,7 @@
 
   <!-- interim_restart (and aux_clm) test list-->
 
-  <test name="ERI_Ld41.f10_f10_mg37.I2000Clm60BgcCrop.derecho_gnu.clm-default">
+  <test name="ERI_Ld41.f10_f10_mt201.I2000Clm60BgcCrop.derecho_gnu.clm-default">
     <phase name="COMPARE_branch_hybrid">
      <status>FAIL</status>
      <issue>#3494</issue>
diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml
index 4d379aa664..e97458c114 100644
--- a/cime_config/testdefs/testlist_clm.xml
+++ b/cime_config/testdefs/testlist_clm.xml
@@ -66,7 +66,7 @@
 
 -->
 <testlist version="2.0">
-  <test name="ERI_D_Ld9" grid="f10_f10_mg37" compset="I1850Clm60Bgc" testmods="clm/default">
+  <test name="ERI_D_Ld9" grid="f10_f10_mt201" compset="I1850Clm60Bgc" testmods="clm/default">
     <machines>
       <machine name="derecho" compiler="gnu" category="aux_clm"/>
       <machine name="derecho" compiler="gnu" category="ctsm_sci"/>
@@ -76,7 +76,7 @@
       <option name="wallclock">00:40:00</option>
     </options>
   </test>
-  <test name="ERI_D_Ld9" grid="f10_f10_mg37" compset="I1850Clm60BgcCrujra" testmods="clm/default">
+  <test name="ERI_D_Ld9" grid="f10_f10_mt201" compset="I1850Clm60BgcCrujra" testmods="clm/default">
     <machines>
       <machine name="derecho" compiler="gnu" category="aux_clm"/>
       <machine name="derecho" compiler="gnu" category="ctsm_sci"/>
@@ -87,7 +87,7 @@
       <option name="comment">Repeat last ERI_D_Ld9...default test with Crujra while Gswp is still the default</option>
     </options>
   </test>
-  <test name="ERI_D_Ld9" grid="f10_f10_mg37" compset="I1850Clm60Bgc" testmods="clm/default--clm/matrixcnOn">
+  <test name="ERI_D_Ld9" grid="f10_f10_mt201" compset="I1850Clm60Bgc" testmods="clm/default--clm/matrixcnOn">
     <machines>
       <machine name="derecho" compiler="gnu" category="aux_clm"/>
       <machine name="derecho" compiler="gnu" category="matrixcn"/>
@@ -98,7 +98,7 @@
       <option name="comment">Repeat last ERI_D_Ld9...default test with matrixcnOn</option>
     </options>
   </test>
-  <test name="SMS_D_Ld3_PS" grid="f09_g17" compset="I1850Clm60SpNoAnthroRtm" testmods="clm/decStart1851_noinitial--clm/nofireemis">
+  <test name="SMS_D_Ld3_PS" grid="f09_t233" compset="I1850Clm60SpNoAnthroRtm" testmods="clm/decStart1851_noinitial--clm/nofireemis">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
@@ -122,7 +122,7 @@
       <option name="comment">Repeat no anthropogenic compset with t233 and Crujra while the defaults have not changed</option>
     </options>
   </test>
-  <test name="SMS_D_Ld3_PS" grid="f09_g17" compset="I1850Clm60BgcNoAnthroRtm" testmods="clm/decStart1851_noinitial--clm/matrixcnOn">
+  <test name="SMS_D_Ld3_PS" grid="f09_t233" compset="I1850Clm60BgcNoAnthroRtm" testmods="clm/decStart1851_noinitial">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="prealpha"/>
@@ -131,10 +131,10 @@
     </machines>
     <options>
       <option name="wallclock">00:20:00</option>
-      <option name="comment">No anthropogenic compset, repeated with matrixcnOn (combines Bgc from next one and _D_ from previous one)</option>
+      <option name="comment">No anthropogenic compset, repeated with Bgc as in the next one and with _D_ as in the previous one</option>
     </options>
   </test>
-  <test name="SMS_Ld3_PS" grid="f09_g17" compset="I1850Clm60BgcNoAnthroRtm" testmods="clm/decStart1851_noinitial">
+  <test name="SMS_Ld3_PS" grid="f09_t233" compset="I1850Clm60BgcNoAnthroRtm" testmods="clm/decStart1851_noinitial">
     <machines>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -164,7 +164,7 @@
       <option name="comment">Simple test to make sure adding obscure stream options works</option>
     </options>
   </test>
-  <test name="ERI_D_Ld9" grid="f10_f10_mg37" compset="I2000Clm50Bgc" testmods="clm/default">
+  <test name="ERI_D_Ld9" grid="f10_f10_mt201" compset="I2000Clm50Bgc" testmods="clm/default">
     <machines>
       <machine name="derecho" compiler="gnu" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
@@ -176,7 +176,7 @@
       <option name="comment">ERI basic test with DEBUG on</option>
     </options>
   </test>
-  <test name="SMS_Ln9" grid="f10_f10_mg37" compset="I1850Clm50Bgc" testmods="clm/clm50cam4LndTuningModeZDustSoilErod">
+  <test name="SMS_Ln9" grid="f10_f10_mt201" compset="I1850Clm50Bgc" testmods="clm/clm50cam4LndTuningModeZDustSoilErod">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="gnu" category="aux_clm"/>
@@ -188,7 +188,7 @@
       <option name="comment">Simple test use soil eroditability in CTSM for CAM4 tuning</option>
     </options>
   </test>
-  <test name="SMS_Ln9" grid="f09_f09_mg17" compset="I1850Clm50Bgc" testmods="clm/clm50cam4LndTuningModeZDustSoilErod">
+  <test name="SMS_Ln9" grid="f09_f09_mt233" compset="I1850Clm50Bgc" testmods="clm/clm50cam4LndTuningModeZDustSoilErod">
     <machines>
 
       <machine name="derecho" compiler="intel" category="aux_clm"/>
@@ -200,7 +200,7 @@
       <option name="comment">Simple test use soil eroditability in CTSM for CAM4 tuning, at 1-degree</option>
     </options>
   </test>
-  <test name="SMS_Ln9" grid="f10_f10_mg37" compset="I2000Clm50Sp" testmods="clm/clm50cam5LndTuningModeZDustSoilErod--clm/nofireemis">
+  <test name="SMS_Ln9" grid="f10_f10_mt201" compset="I2000Clm50Sp" testmods="clm/clm50cam5LndTuningModeZDustSoilErod--clm/nofireemis">
     <machines>
       <machine name="derecho" compiler="gnu" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
@@ -222,7 +222,7 @@
       <option name="comment">CESM3 development Exact restart test with change in the processor count at the standard coupled resolution</option>
     </options>
   </test>
-    <test name="ERP_D_Ld9" grid="f10_f10_mg37" compset="I1850Clm60BgcCrop" testmods="clm/clm60cam7LndTuningModeLDust">
+    <test name="ERP_D_Ld9" grid="f10_f10_mt201" compset="I1850Clm60BgcCrop" testmods="clm/clm60cam7LndTuningModeLDust">
     <machines>
       <machine name="izumi" compiler="nag" category="aux_clm"/>
       <machine name="izumi" compiler="nag" category="ctsm_release"/>
@@ -317,7 +317,7 @@
       <option name="comment">CESM3 development test at the standard coupled resolution for a month</option>
     </options>
   </test>
-  <test name="ERS_Ly3" grid="f10_f10_ais8gris4_mg37" compset="I1850Clm60SpGag">
+  <test name="ERS_Ly3" grid="f10_f10_ais8gris4_mt201" compset="I1850Clm60SpGag">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -527,7 +527,7 @@
       <option name="comment">mpasa test with Crujra while Gswp is still the default, also nofireemis for Sp</option>
     </options>
   </test>
-  <test name="ERI_D_Ld9" grid="ne30_g17" compset="I2000Clm50BgcCru" testmods="clm/vrtlay">
+  <test name="ERI_D_Ld9" grid="ne30_t233" compset="I2000Clm50BgcCru" testmods="clm/vrtlay">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -537,7 +537,7 @@
       <option name="comment">ERI basic test with DEBUG on for plain ne30 for Clm50 and CRUv7 forcing</option>
     </options>
   </test>
-  <test name="ERI_D_Ld9" grid="ne30_g17" compset="I2000Clm50BgcCru" testmods="clm/vrtlay--clm/matrixcnOn">
+  <test name="ERI_D_Ld9" grid="ne30_t233" compset="I2000Clm50BgcCru" testmods="clm/vrtlay--clm/matrixcnOn">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="matrixcn"/>
@@ -548,7 +548,7 @@
       <option name="comment">Repeat last ERI_D_Ld9...vrtlay test with matrixcnOn (NOTE: It's good to test matrixcn for different datm forcing datasets)</option>
     </options>
   </test>
-  <test name="SMS_D_Ld1_PS" grid="f09_g17" compset="I1850Clm50Sp" testmods="clm/default--clm/nofireemis">
+  <test name="SMS_D_Ld1_PS" grid="f09_t233" compset="I1850Clm50Sp" testmods="clm/default--clm/nofireemis">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -570,7 +570,7 @@
     </options>
   </test>
   <!-- science support for workhorse resolutions with CLM5_0 physics -->
-  <test name="SMS_Ld1" grid="f09_g17" compset="I1850Clm50Sp" testmods="clm/default--clm/nofireemis">
+  <test name="SMS_Ld1" grid="f09_t233" compset="I1850Clm50Sp" testmods="clm/default--clm/nofireemis">
     <machines>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -580,7 +580,7 @@
       <option name="comment">Science support for I1850Clm50Sp at f09</option>
     </options>
   </test>
-  <test name="SMS_Ld1" grid="f19_g17" compset="I1850Clm50Sp" testmods="clm/default--clm/nofireemis">
+  <test name="SMS_Ld1" grid="f19_t233" compset="I1850Clm50Sp" testmods="clm/default--clm/nofireemis">
     <machines>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -591,7 +591,7 @@
     </options>
   </test>
   <!-- science support for workhorse resolutions with CLM6_0 physics -->
-  <test name="SMS_Ld1" grid="f09_g17" compset="I1850Clm60Sp" testmods="clm/default--clm/nofireemis">
+  <test name="SMS_Ld1" grid="f09_t233" compset="I1850Clm60Sp" testmods="clm/default--clm/nofireemis">
     <machines>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -611,7 +611,7 @@
       <option name="comment">Repeat this science support test with t233 and Crujra while the defaults have not changed</option>
     </options>
   </test>
-  <test name="SMS_Ld1" grid="f19_g17" compset="I1850Clm60Sp" testmods="clm/default--clm/nofireemis">
+  <test name="SMS_Ld1" grid="f19_t233" compset="I1850Clm60Sp" testmods="clm/default--clm/nofireemis">
     <machines>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -621,7 +621,7 @@
       <option name="comment">Science support for 1850 with clm6_0 for Sp mode at f19</option>
     </options>
   </test>
-  <test name="SMS_Ld1" grid="f19_g17" compset="I1850Clm60SpCrujra" testmods="clm/default--clm/nofireemis">
+  <test name="SMS_Ld1" grid="f19_t233" compset="I1850Clm60SpCrujra" testmods="clm/default--clm/nofireemis">
     <machines>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -631,7 +631,7 @@
       <option name="comment">Repeat this science support test with Crujra while Gswp is still the default</option>
     </options>
   </test>
-  <test name="SMS_Ld1" grid="f09_g17" compset="I1850Clm60Sp" testmods="clm/clm60cam7LndTuningMode--clm/nofireemis">
+  <test name="SMS_Ld1" grid="f09_t233" compset="I1850Clm60Sp" testmods="clm/clm60cam7LndTuningMode--clm/nofireemis">
     <machines>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -651,7 +651,7 @@
       <option name="comment">Repeat this science support test with t233 and Crujra while the defaults have not changed</option>
     </options>
   </test>
-  <test name="SMS_Ld1" grid="f19_g17" compset="I1850Clm60Sp" testmods="clm/clm60cam7LndTuningMode--clm/nofireemis">
+  <test name="SMS_Ld1" grid="f19_t233" compset="I1850Clm60Sp" testmods="clm/clm60cam7LndTuningMode--clm/nofireemis">
     <machines>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -661,7 +661,7 @@
       <option name="comment">Science support for 1850 with clm6_0 for Sp mode at f19 with CAM7. Also --nofireemis because this is a Sp compset</option>
     </options>
   </test>
-  <test name="SMS_Ld1" grid="f19_g17" compset="I1850Clm60SpCrujra" testmods="clm/clm60cam7LndTuningMode--clm/nofireemis">
+  <test name="SMS_Ld1" grid="f19_t233" compset="I1850Clm60SpCrujra" testmods="clm/clm60cam7LndTuningMode--clm/nofireemis">
     <machines>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -671,7 +671,7 @@
       <option name="comment">Repeat this science support test with Crujra while Gswp is still the default</option>
     </options>
   </test>
-  <test name="ERP_D_Ld3_PS" grid="f09_g17" compset="I2000Clm50Sp" testmods="clm/prescribed">
+  <test name="ERP_D_Ld3_PS" grid="f09_t233" compset="I2000Clm50Sp" testmods="clm/prescribed">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="prealpha"/>
@@ -682,7 +682,7 @@
       <option name="comment">Include a test of prescribed soil-moisture, has to be at f09, should be 2000 and for Sp</option>
     </options>
   </test>
-  <test name="ERI_D_Ld9_P48x1" grid="f10_f10_mg37" compset="I2000Clm50Bgc" testmods="clm/reduceOutput">
+  <test name="ERI_D_Ld9_P48x1" grid="f10_f10_mt201" compset="I2000Clm50Bgc" testmods="clm/reduceOutput">
     <machines>
       <machine name="izumi" compiler="nag" category="aux_clm"/>
       <machine name="izumi" compiler="nag" category="prebeta"/>
@@ -693,7 +693,7 @@
       <option name="comment">ERI basic test with DEBUG for Clm50 on Izumi</option>
     </options>
   </test>
-  <test name="ERI_D_Ld9_P48x1" grid="f10_f10_mg37" compset="I2000Clm50Sp" testmods="clm/reduceOutput--clm/nofireemis">
+  <test name="ERI_D_Ld9_P48x1" grid="f10_f10_mt201" compset="I2000Clm50Sp" testmods="clm/reduceOutput--clm/nofireemis">
     <machines>
       <machine name="izumi" compiler="nag" category="aux_clm"/>
       <machine name="izumi" compiler="nag" category="ctsm_release"/>
@@ -702,7 +702,7 @@
       <option name="wallclock">00:50:00</option>
     </options>
   </test>
-  <test name="ERI_D_Ld9_P48x1" grid="f10_f10_mg37" compset="I2000Clm50Sp" testmods="clm/SNICARFRC">
+  <test name="ERI_D_Ld9_P48x1" grid="f10_f10_mt201" compset="I2000Clm50Sp" testmods="clm/SNICARFRC">
     <machines>
       <machine name="izumi" compiler="nag" category="aux_clm"/>
       <machine name="izumi" compiler="nag" category="ctsm_release"/>
@@ -711,7 +711,7 @@
       <option name="wallclock">00:50:00</option>
     </options>
   </test>
-  <test name="ERP_D_Ld5" grid="f10_f10_mg37" compset="IHistClm60Bgc" testmods="clm/decStart--clm/nvmovement">
+  <test name="ERP_D_Ld5" grid="f10_f10_mt201" compset="IHistClm60Bgc" testmods="clm/decStart--clm/nvmovement">
     <machines>
       <machine name="izumi" compiler="nag" category="aux_clm"/>
       <machine name="izumi" compiler="nag" category="ctsm_release"/>
@@ -721,7 +721,7 @@
       <option name="comment">Confirms that use_nvmovement = .true. works with bit-for-bit restarts in IHist</option>
     </options>
   </test>
-  <test name="ERP_D_Ld5" grid="f10_f10_mg37" compset="I1850Clm60BgcCrop" testmods="clm/nvmovement--clm/matrixcnOn">
+  <test name="ERP_D_Ld5" grid="f10_f10_mt201" compset="I1850Clm60BgcCrop" testmods="clm/nvmovement--clm/matrixcnOn">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -731,7 +731,7 @@
       <option name="comment">Confirms that use_nvmovement = .true. works with bit-for-bit restarts when matrixcnOn</option>
     </options>
   </test>
-  <test name="ERS_D" grid="f10_f10_mg37" compset="I1850Clm60Sp" testmods="clm/ExcessIceStreams">
+  <test name="ERS_D" grid="f10_f10_mt201" compset="I1850Clm60Sp" testmods="clm/ExcessIceStreams">
     <machines>
       <machine name="izumi" compiler="nag" category="aux_clm"/>
       <machine name="izumi" compiler="nag" category="ctsm_release"/>
@@ -741,7 +741,7 @@
       <option name="comment">Include an excess ice test starting up from streams</option>
     </options>
   </test>
-  <test name="SMS_Lm12" grid="f09_f09_mg17" compset="I1850Clm60Sp" testmods="clm/ExcessIceStartup_output_sp_exice">
+  <test name="SMS_Lm12" grid="f09_f09_mt233" compset="I1850Clm60Sp" testmods="clm/ExcessIceStartup_output_sp_exice">
     <machines>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -761,7 +761,7 @@
       <option name="comment">Repeat excess ice test with t233 and Crujra while the defaults have not changed</option>
     </options>
   </test>
-  <test name="SMS_Ln9_P256x3" grid="f19_g17" compset="IHistClm50Sp" testmods="clm/waccmx_offline2005Start">
+  <test name="SMS_Ln9_P256x3" grid="f19_t233" compset="IHistClm50Sp" testmods="clm/waccmx_offline2005Start">
     <machines>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -771,7 +771,7 @@
       <option name="comment">Do a test similar to FXHIST starting at a 2005 start date, will interpoalte from the 2003 IC file</option>
     </options>
   </test>
-  <test name="SMS_D_Ln9_P128x3" grid="f19_g17" compset="IHistClm50Sp" testmods="clm/waccmx_offline">
+  <test name="SMS_D_Ln9_P128x3" grid="f19_t233" compset="IHistClm50Sp" testmods="clm/waccmx_offline">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -781,7 +781,7 @@
       <option name="comment">Run a transient case with standalone settings similar to the FXHIST waccm test</option>
     </options>
   </test>
-  <test name="ERP_D_P64x2_Ld3" grid="f10_f10_mg37" compset="I2000Clm50Bgc" testmods="clm/cn_conly">
+  <test name="ERP_D_P64x2_Ld3" grid="f10_f10_mt201" compset="I2000Clm50Bgc" testmods="clm/cn_conly">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -791,7 +791,7 @@
       <option name="comment">ERP threading test with DEBUG for Clm50 for carbon only testmod</option>
     </options>
   </test>
-  <test name="ERP_D_P64x2_Ld3" grid="f10_f10_mg37" compset="I2000Clm50Bgc" testmods="clm/snowveg_norad">
+  <test name="ERP_D_P64x2_Ld3" grid="f10_f10_mt201" compset="I2000Clm50Bgc" testmods="clm/snowveg_norad">
     <machines>
       <machine name="derecho" compiler="gnu" category="aux_clm"/>
       <machine name="derecho" compiler="gnu" category="ctsm_release"/>
@@ -801,7 +801,7 @@
       <option name="comment">ERP threading test with DEBUG for Clm50 for snowveg_norad testmod where snow on vegetation doesn't effect radiation</option>
     </options>
   </test>
-  <test name="ERI_Ld9" grid="f10_f10_mg37" compset="I2000Clm50Bgc" testmods="clm/drydepnomegan">
+  <test name="ERI_Ld9" grid="f10_f10_mt201" compset="I2000Clm50Bgc" testmods="clm/drydepnomegan">
     <machines>
       <machine name="derecho" compiler="gnu" category="aux_clm"/>
       <machine name="derecho" compiler="gnu" category="ctsm_release"/>
@@ -811,7 +811,7 @@
       <option name="comment">ERI production test for Clm50 with drydeposition but not megan</option>
     </options>
   </test>
-  <test name="ERI_Ld9" grid="f10_f10_mg37" compset="I2000Clm50Bgc" testmods="clm/default">
+  <test name="ERI_Ld9" grid="f10_f10_mt201" compset="I2000Clm50Bgc" testmods="clm/default">
     <machines>
       <machine name="derecho" compiler="gnu" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
@@ -823,7 +823,7 @@
       <option name="comment">simple ERI production test for Clm50</option>
     </options>
   </test>
-  <test name="ERI_Ld9" grid="f45_g37" compset="I2000Clm50BgcCru" testmods="clm/nofire">
+  <test name="ERI_Ld9" grid="f45_t201" compset="I2000Clm50BgcCru" testmods="clm/nofire">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -833,7 +833,7 @@
       <option name="comment">Basic ERI production test with nofire with Cruv7 forcing</option>
     </options>
   </test>
-  <test name="ERI_Ld9" grid="f45_g37" compset="I2000Clm50BgcCru" testmods="clm/nofire--clm/matrixcnOn">
+  <test name="ERI_Ld9" grid="f45_t201" compset="I2000Clm50BgcCru" testmods="clm/nofire--clm/matrixcnOn">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="matrixcn"/>
@@ -844,7 +844,7 @@
       <option name="comment">Repeat last ERI_Ld9...nofire test with matrixcnOn</option>
     </options>
   </test>
-  <test name="ERI_Ld9" grid="f09_g17" compset="I2000Clm60BgcCrop" testmods="clm/default">
+  <test name="ERI_Ld9" grid="f09_t233" compset="I2000Clm60BgcCrop" testmods="clm/default">
     <machines>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -864,7 +864,7 @@
       <option name="comment">Repeat this ERI test with t233 and Crujra while the defaults have not changed</option>
     </options>
   </test>
-  <test name="ERI_C2_Ld9" grid="f10_f10_mg37" compset="I2000Clm60BgcCrop" testmods="clm/default">
+  <test name="ERI_C2_Ld9" grid="f10_f10_mt201" compset="I2000Clm60BgcCrop" testmods="clm/default">
     <machines>
       <machine name="derecho" compiler="gnu" category="aux_clm"/>
       <machine name="derecho" compiler="gnu" category="prebeta"/>
@@ -874,7 +874,7 @@
       <option name="wallclock">00:20:00</option>
     </options>
   </test>
-  <test name="ERS_Ld3" grid="f10_f10_mg37" compset="I2000Clm60Bgc" testmods="clm/ciso_cwd_hr">
+  <test name="ERS_Ld3" grid="f10_f10_mt201" compset="I2000Clm60Bgc" testmods="clm/ciso_cwd_hr">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
@@ -884,7 +884,7 @@
       <option name="wallclock">00:20:00</option>
     </options>
   </test>
-  <test name="ERS_Ld3" grid="f10_f10_mg37" compset="I2000Clm60BgcCrujra" testmods="clm/ciso_cwd_hr">
+  <test name="ERS_Ld3" grid="f10_f10_mt201" compset="I2000Clm60BgcCrujra" testmods="clm/ciso_cwd_hr">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
@@ -895,7 +895,7 @@
       <option name="comment">Repeat this ERS test with Crujra while Gswp is stil the default</option>
     </options>
   </test>
-  <test name="ERS_Ld3" grid="f10_f10_mg37" compset="I2000Clm60Bgc" testmods="clm/ciso_cwd_hr--clm/matrixcnOn">
+  <test name="ERS_Ld3" grid="f10_f10_mt201" compset="I2000Clm60Bgc" testmods="clm/ciso_cwd_hr--clm/matrixcnOn">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="matrixcn"/>
@@ -906,7 +906,7 @@
       <option name="comment">Repeat last ERS_Ld3...ciso_cwd_hr test with matrixcnOn</option>
     </options>
   </test>
-  <test name="ERP_Ld9" grid="f45_g37" compset="I2000Clm60Bgc" testmods="clm/default">
+  <test name="ERP_Ld9" grid="f45_t201" compset="I2000Clm60Bgc" testmods="clm/default">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
@@ -916,7 +916,7 @@
       <option name="wallclock">00:20:00</option>
     </options>
   </test>
-  <test name="ERP_Ld9" grid="f45_g37" compset="I2000Clm60BgcCrujra" testmods="clm/default">
+  <test name="ERP_Ld9" grid="f45_t201" compset="I2000Clm60BgcCrujra" testmods="clm/default">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
@@ -927,7 +927,7 @@
       <option name="comment">Repeat this ERP test with Crujra while Gswp is stil the default</option>
     </options>
   </test>
-  <test name="ERP_D" grid="f10_f10_mg37" compset="IHistClm60Bgc" testmods="clm/decStart">
+  <test name="ERP_D" grid="f10_f10_mt201" compset="IHistClm60Bgc" testmods="clm/decStart">
     <machines>
       <machine name="derecho" compiler="gnu" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
@@ -938,7 +938,7 @@
       <option name="wallclock">00:20:00</option>
     </options>
   </test>
-  <test name="ERP_D" grid="f10_f10_mg37" compset="IHistClm60Bgc" testmods="clm/decStart--clm/matrixcnOn_ignore_warnings">
+  <test name="ERP_D" grid="f10_f10_mt201" compset="IHistClm60Bgc" testmods="clm/decStart--clm/matrixcnOn_ignore_warnings">
     <machines>
       <machine name="derecho" compiler="gnu" category="aux_clm"/>
       <machine name="derecho" compiler="gnu" category="matrixcn"/>
@@ -949,7 +949,7 @@
       <option name="comment">Repeat last ERP_D...decStart test with matrixcnOn</option>
     </options>
   </test>
-  <test name="ERI_D_Ld20" grid="f10_f10_mg37" compset="IHistClm60Bgc" testmods="clm-default--clm/midDecStart--clm-allowTransientYearJump">
+  <test name="ERI_D_Ld20" grid="f10_f10_mt201" compset="IHistClm60Bgc" testmods="clm-default--clm/midDecStart--clm-allowTransientYearJump">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="izumi" compiler="nag" category="aux_clm"/>
@@ -961,7 +961,7 @@
       <option name="comment">ERI test for a transient case across the year boundary, with the restart on the first year side (DEBUG to work on izumi_nag)</option>
     </options>
   </test>
-  <test name="ERP_D_Ld3_P64x2" grid="f10_f10_mg37" compset="I2000Clm50Bgc" testmods="clm/default">
+  <test name="ERP_D_Ld3_P64x2" grid="f10_f10_mt201" compset="I2000Clm50Bgc" testmods="clm/default">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="gnu" category="aux_clm"/>
@@ -973,7 +973,7 @@
       <option name="comment">ERP DEBUG threading test</option>
     </options>
   </test>
-  <test name="ERP_D_Ld5" grid="f10_f10_mg37" compset="I1850Clm50BgcCropG" testmods="clm/glcMEC_changeFlags">
+  <test name="ERP_D_Ld5" grid="f10_f10_mt201" compset="I1850Clm50BgcCropG" testmods="clm/glcMEC_changeFlags">
     <machines>
       <machine name="derecho" compiler="gnu" category="aux_clm"/>
       <machine name="derecho" compiler="gnu" category="ctsm_release"/>
@@ -983,7 +983,7 @@
       <option name="comment">cism is not answer preserving across processor changes, but short test length should be ok.</option>
     </options>
   </test>
-  <test name="SMS" grid="f09_g17" compset="I1850Clm50BgcCropG" testmods="clm/default">
+  <test name="SMS" grid="f09_t233" compset="I1850Clm50BgcCropG" testmods="clm/default">
     <machines>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -994,7 +994,7 @@
     </options>
   </test>
   <!-- clm5_0 physics workhorse resolution BGC science test list -->
-  <test name="SMS_Ld5" grid="f19_g17" compset="I1850Clm50Bgc" testmods="clm/default">
+  <test name="SMS_Ld5" grid="f19_t233" compset="I1850Clm50Bgc" testmods="clm/default">
     <machines>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -1004,7 +1004,7 @@
       <option name="comment">Science support for 1850 clm5_0 physics for Bgc at f19</option>
     </options>
   </test>
-  <test name="SMS_Ld5" grid="f09_g17" compset="I1850Clm50Bgc" testmods="clm/default">
+  <test name="SMS_Ld5" grid="f09_t233" compset="I1850Clm50Bgc" testmods="clm/default">
     <machines>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -1015,7 +1015,7 @@
     </options>
   </test>
   <!-- clm6_0 physics workhorse resolution BGC science test list -->
-  <test name="SMS_Ld5" grid="f19_g17" compset="I1850Clm60Bgc" testmods="clm/default">
+  <test name="SMS_Ld5" grid="f19_t233" compset="I1850Clm60Bgc" testmods="clm/default">
     <machines>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -1025,7 +1025,7 @@
       <option name="comment">Science support for 1850 Clm6_0 physics for Bgc at f19</option>
     </options>
   </test>
-  <test name="SMS_Ld5" grid="f19_g17" compset="I1850Clm60BgcCrujra" testmods="clm/default">
+  <test name="SMS_Ld5" grid="f19_t233" compset="I1850Clm60BgcCrujra" testmods="clm/default">
     <machines>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -1035,7 +1035,7 @@
       <option name="comment">Repeat this science support test with Crujra while Gswp is still the default</option>
     </options>
   </test>
-  <test name="SMS_Ld5" grid="f09_g17" compset="I1850Clm60Bgc" testmods="clm/default">
+  <test name="SMS_Ld5" grid="f09_t233" compset="I1850Clm60Bgc" testmods="clm/default">
     <machines>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -1055,7 +1055,7 @@
       <option name="comment">Repeat this science support test with t233 and Crujra while the defaults have not changed</option>
     </options>
   </test>
-  <test name="ERP_D_Ld5" grid="ne30_g17" compset="I1850Clm50BgcCrop" testmods="clm/default">
+  <test name="ERP_D_Ld5" grid="ne30_t233" compset="I1850Clm50BgcCrop" testmods="clm/default">
     <machines>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -1064,7 +1064,7 @@
       <option name="wallclock">00:60:00</option>
     </options>
   </test>
-  <test name="SMS" grid="ne3pg3_ne3pg3_mg37" compset="IHistClm60Sp" testmods="clm/clm60cam7LndTuningMode--clm/nofireemis">
+  <test name="SMS" grid="ne3pg3_ne3pg3_mt201" compset="IHistClm60Sp" testmods="clm/clm60cam7LndTuningMode--clm/nofireemis">
     <machines>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -1074,7 +1074,7 @@
       <option name="comment">Low resolution SE grid for running with CAM with latest CLM version in the CTSM science test list, tested in CAM, so test all of Hist, SSP5-8.5 and 2000. Also --nofireemis because this is a Sp compset</option>
     </options>
   </test>
-  <test name="SMS" grid="ne3pg3_ne3pg3_mg37" compset="IHistClm60SpCrujra" testmods="clm/clm60cam7LndTuningMode--clm/nofireemis">
+  <test name="SMS" grid="ne3pg3_ne3pg3_mt201" compset="IHistClm60SpCrujra" testmods="clm/clm60cam7LndTuningMode--clm/nofireemis">
     <machines>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -1084,7 +1084,7 @@
       <option name="comment">Repeat this low res SE grid test with Crujra while Gswp is still the default</option>
     </options>
   </test>
-  <test name="SMS" grid="ne3pg3_ne3pg3_mg37" compset="I2000Clm60Sp" testmods="clm/clm60cam7LndTuningMode--clm/nofireemis">
+  <test name="SMS" grid="ne3pg3_ne3pg3_mt201" compset="I2000Clm60Sp" testmods="clm/clm60cam7LndTuningMode--clm/nofireemis">
     <machines>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -1094,7 +1094,7 @@
       <option name="comment">Low resolution SE grid for running with CAM with latest CLM version in the CTSM science test list, tested in CAM, so test all of Hist, SSP5-8.5 and 2000. Also --nofireemis because this is a Sp compset</option>
     </options>
   </test>
-  <test name="SMS" grid="ne3pg3_ne3pg3_mg37" compset="I2000Clm60SpCrujra" testmods="clm/clm60cam7LndTuningMode--clm/nofireemis">
+  <test name="SMS" grid="ne3pg3_ne3pg3_mt201" compset="I2000Clm60SpCrujra" testmods="clm/clm60cam7LndTuningMode--clm/nofireemis">
     <machines>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -1124,7 +1124,7 @@
       <option name="comment">ne3pg2 test with IHist compset, also nofireemis for Sp</option>
     </options>
   </test>
-  <test name="SMS" grid="ne16pg3_ne16pg3_mg17" compset="I1850Clm60Sp" testmods="clm/clm60cam7LndTuningMode--clm/nofireemis">
+  <test name="SMS" grid="ne16pg3_ne16pg3_mt233" compset="I1850Clm60Sp" testmods="clm/clm60cam7LndTuningMode--clm/nofireemis">
     <machines>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -1134,7 +1134,7 @@
       <option name="comment">Medium resolution SE grid for running with CAM with latest CLM version in the CTSM science test list, test both 1850 and 2000. Also --nofireemis because this is a Sp compset</option>
     </options>
   </test>
-  <test name="SMS" grid="ne16pg3_ne16pg3_mg17" compset="I1850Clm60SpCrujra" testmods="clm/clm60cam7LndTuningMode--clm/nofireemis">
+  <test name="SMS" grid="ne16pg3_ne16pg3_mt233" compset="I1850Clm60SpCrujra" testmods="clm/clm60cam7LndTuningMode--clm/nofireemis">
     <machines>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -1144,7 +1144,7 @@
       <option name="comment">Repeat this medium res SE grid test with Crujra while Gswp is still the default</option>
     </options>
   </test>
-  <test name="SMS" grid="ne16pg3_ne16pg3_mg17" compset="I2000Clm60Sp" testmods="clm/clm60cam7LndTuningMode--clm/nofireemis">
+  <test name="SMS" grid="ne16pg3_ne16pg3_mt233" compset="I2000Clm60Sp" testmods="clm/clm60cam7LndTuningMode--clm/nofireemis">
     <machines>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -1154,7 +1154,7 @@
       <option name="comment">Medium resolution SE grid for running with CAM with latest CLM version in the CTSM science test list, test both 1850 and 2000. Also --nofireemis because this is a Sp compset</option>
     </options>
   </test>
-  <test name="SMS" grid="ne16pg3_ne16pg3_mg17" compset="I2000Clm60SpCrujra" testmods="clm/clm60cam7LndTuningMode--clm/nofireemis">
+  <test name="SMS" grid="ne16pg3_ne16pg3_mt233" compset="I2000Clm60SpCrujra" testmods="clm/clm60cam7LndTuningMode--clm/nofireemis">
     <machines>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -1164,7 +1164,7 @@
       <option name="comment">Repeat this medium res SE grid test with Crujra while Gswp is still the default</option>
     </options>
   </test>
-  <test name="SMS" grid="ne16pg3_ne16pg3_mg17" compset="IHistClm60Sp" testmods="clm/clm60cam7LndTuningMode--clm/nofireemis">
+  <test name="SMS" grid="ne16pg3_ne16pg3_mt233" compset="IHistClm60Sp" testmods="clm/clm60cam7LndTuningMode--clm/nofireemis">
     <machines>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -1174,7 +1174,7 @@
       <option name="comment">Medium resolution SE grid for running with CAM with latest CLM version in the CTSM science test list, test IHist. Also --nofireemis because this is a Sp compset</option>
     </options>
   </test>
-  <test name="SMS" grid="ne16pg3_ne16pg3_mg17" compset="IHistClm60SpCrujra" testmods="clm/clm60cam7LndTuningMode--clm/nofireemis">
+  <test name="SMS" grid="ne16pg3_ne16pg3_mt233" compset="IHistClm60SpCrujra" testmods="clm/clm60cam7LndTuningMode--clm/nofireemis">
     <machines>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -1184,7 +1184,7 @@
       <option name="comment">Repeat this medium res SE grid test with Crujra while Gswp is still the default</option>
     </options>
   </test>
-  <test name="SMS" grid="ne30_g17" compset="I2000Clm60Sp" testmods="clm/clm60cam7LndTuningMode--clm/nofireemis">
+  <test name="SMS" grid="ne30_t233" compset="I2000Clm60Sp" testmods="clm/clm60cam7LndTuningMode--clm/nofireemis">
     <machines>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -1194,7 +1194,7 @@
       <option name="comment">Workhorse SE grid for running with CAM with the latest CLM version in the CTSM science test list, tested in CAM, so test all of Hist, SSP5-8.5 and 2000. Also --nofireemis because this is a Sp compset</option>
     </options>
   </test>
-  <test name="SMS" grid="ne30_g17" compset="I2000Clm60SpCrujra" testmods="clm/clm60cam7LndTuningMode--clm/nofireemis">
+  <test name="SMS" grid="ne30_t233" compset="I2000Clm60SpCrujra" testmods="clm/clm60cam7LndTuningMode--clm/nofireemis">
     <machines>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -1204,7 +1204,7 @@
       <option name="comment">Repeat this SE grid test with Crujra while Gswp is still the default</option>
     </options>
   </test>
-  <test name="SMS" grid="ne30pg2_ne30pg2_mg17" compset="I1850Clm60Sp" testmods="clm/clm60cam7LndTuningMode--clm/nofireemis">
+  <test name="SMS" grid="ne30pg2_ne30pg2_mt233" compset="I1850Clm60Sp" testmods="clm/clm60cam7LndTuningMode--clm/nofireemis">
     <machines>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -1214,7 +1214,7 @@
       <option name="comment">Workhorse SE grid for running with CAM with the latest CLM version in the CTSM science test list, tested in CAM, so test all of Hist, SSP5-8.5 and 2000. Also --nofireemis because this is a Sp compset</option>
     </options>
   </test>
-  <test name="SMS" grid="ne30pg2_ne30pg2_mg17" compset="I1850Clm60SpCrujra" testmods="clm/clm60cam7LndTuningMode--clm/nofireemis">
+  <test name="SMS" grid="ne30pg2_ne30pg2_mt233" compset="I1850Clm60SpCrujra" testmods="clm/clm60cam7LndTuningMode--clm/nofireemis">
     <machines>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -1224,7 +1224,7 @@
       <option name="comment">Repeat this SE grid test with Crujra while Gswp is still the default</option>
     </options>
   </test>
-  <test name="SMS" grid="ne30pg2_ne30pg2_mg17" compset="I2000Clm60Sp" testmods="clm/clm60cam7LndTuningMode--clm/nofireemis">
+  <test name="SMS" grid="ne30pg2_ne30pg2_mt233" compset="I2000Clm60Sp" testmods="clm/clm60cam7LndTuningMode--clm/nofireemis">
     <machines>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -1234,7 +1234,7 @@
       <option name="comment">Workhorse SE grid for running with CAM with the latest CLM version in the CTSM science test list, tested in CAM, so test all of Hist, SSP5-8.5 and 2000. Also --nofireemis because this is a Sp compset</option>
     </options>
   </test>
-  <test name="SMS" grid="ne30pg2_ne30pg2_mg17" compset="I2000Clm60SpCrujra" testmods="clm/clm60cam7LndTuningMode--clm/nofireemis">
+  <test name="SMS" grid="ne30pg2_ne30pg2_mt233" compset="I2000Clm60SpCrujra" testmods="clm/clm60cam7LndTuningMode--clm/nofireemis">
     <machines>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -1244,7 +1244,7 @@
       <option name="comment">Repeat this SE grid test with Crujra while Gswp is still the default</option>
     </options>
   </test>
-   <test name="SMS" grid="ne30pg3_ne30pg3_mg17" compset="IHistClm60Sp" testmods="clm/clm60cam7LndTuningMode--clm/nofireemis">
+   <test name="SMS" grid="ne30pg3_ne30pg3_mt233" compset="IHistClm60Sp" testmods="clm/clm60cam7LndTuningMode--clm/nofireemis">
     <machines>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -1254,7 +1254,7 @@
       <option name="comment">Workhorse SE grid for running with CAM with the latest CLM version in the CTSM science test list, tested in CAM, so test all of Hist, SSP5-8.5 and 2000. Also --nofireemis because this is a Sp compset</option>
     </options>
   </test>
-   <test name="SMS" grid="ne30pg3_ne30pg3_mg17" compset="IHistClm60SpCrujra" testmods="clm/clm60cam7LndTuningMode--clm/nofireemis">
+   <test name="SMS" grid="ne30pg3_ne30pg3_mt233" compset="IHistClm60SpCrujra" testmods="clm/clm60cam7LndTuningMode--clm/nofireemis">
     <machines>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -1264,7 +1264,7 @@
       <option name="comment">Repeat this SE grid test with Crujra while Gswp is still the default</option>
     </options>
   </test>
-  <test name="SMS" grid="ne30pg3_ne30pg3_mg17" compset="I2000Clm60Sp" testmods="clm/clm60cam7LndTuningMode--clm/nofireemis">
+  <test name="SMS" grid="ne30pg3_ne30pg3_mt233" compset="I2000Clm60Sp" testmods="clm/clm60cam7LndTuningMode--clm/nofireemis">
     <machines>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -1274,7 +1274,7 @@
       <option name="comment">Workhorse SE grid for running with CAM and with the latest CLM version in the CTSM science test list, tested in CAM, so test all of Hist, SSP5-8.5 and 2000. Also --nofireemis because this is a Sp compset</option>
     </options>
   </test>
-  <test name="SMS" grid="ne30pg3_ne30pg3_mg17" compset="I2000Clm60SpCrujra" testmods="clm/clm60cam7LndTuningMode--clm/nofireemis">
+  <test name="SMS" grid="ne30pg3_ne30pg3_mt233" compset="I2000Clm60SpCrujra" testmods="clm/clm60cam7LndTuningMode--clm/nofireemis">
     <machines>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -1325,7 +1325,7 @@
       <option name="comment">Want one C96 test in the aux_clm test suite; just a short smoke test to make sure it can get off the ground. Use a PE layout that (1) has threading, because CAM uses threading at this resolution; and (2) has a smaller-than-standard task count in order to get through the queue faster.</option>
     </options>
   </test>
-  <test name="SMS_Ld5" grid="f09_g17" compset="IHistClm50BgcCrop" testmods="clm/default">
+  <test name="SMS_Ld5" grid="f09_t233" compset="IHistClm50BgcCrop" testmods="clm/default">
     <machines>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -1335,7 +1335,7 @@
       <option name="comment">Science support for Historical clm5_0 physics with BgcCrop at f09</option>
     </options>
   </test>
-  <test name="SMS_Ld5" grid="f19_g17" compset="IHistClm50BgcCrop" testmods="clm/default">
+  <test name="SMS_Ld5" grid="f19_t233" compset="IHistClm50BgcCrop" testmods="clm/default">
     <machines>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -1346,7 +1346,7 @@
     </options>
   </test>
   <!-- Historical clm6_0 physics BgcCrop science support -->
-  <test name="SMS_Ld5" grid="f09_g17" compset="IHistClm60BgcCrop" testmods="clm/default">
+  <test name="SMS_Ld5" grid="f09_t233" compset="IHistClm60BgcCrop" testmods="clm/default">
     <machines>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -1366,7 +1366,7 @@
       <option name="comment">Repeat this science support test with t233 and Crujra while the default have not changed</option>
     </options>
   </test>
-  <test name="SMS_Ld5" grid="f19_g17" compset="IHistClm60BgcCrop" testmods="clm/default">
+  <test name="SMS_Ld5" grid="f19_t233" compset="IHistClm60BgcCrop" testmods="clm/default">
     <machines>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -1376,7 +1376,7 @@
       <option name="comment">Science support for Historical clm6_0 physics with BgcCrop at f19</option>
     </options>
   </test>
-  <test name="SMS_Ld5" grid="f19_g17" compset="IHistClm60BgcCropCrujra" testmods="clm/default">
+  <test name="SMS_Ld5" grid="f19_t233" compset="IHistClm60BgcCropCrujra" testmods="clm/default">
     <machines>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -1386,7 +1386,7 @@
       <option name="comment">Repeat this science support test with Crujra while Gswp is still the default</option>
     </options>
   </test>
-  <test name="ERP_D_Ld5" grid="f10_f10_mg37" compset="IHistClm50BgcCrop" testmods="clm/allActive">
+  <test name="ERP_D_Ld5" grid="f10_f10_mt201" compset="IHistClm50BgcCrop" testmods="clm/allActive">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -1396,7 +1396,7 @@
       <option name="comment">Use a transient compset so we allocate and run all PFTs (non-transient cases only allocate memory for non-zero-weight PFTs)</option>
     </options>
   </test>
-  <test name="ERP_D_Ld5" grid="f10_f10_mg37" compset="IHistClm50BgcCrop" testmods="clm/allActive--clm/matrixcnOn_ignore_warnings">
+  <test name="ERP_D_Ld5" grid="f10_f10_mt201" compset="IHistClm50BgcCrop" testmods="clm/allActive--clm/matrixcnOn_ignore_warnings">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="matrixcn"/>
@@ -1407,7 +1407,7 @@
       <option name="comment">Repeat ERP_D_Ld5_allActive test with matrixcnOn</option>
     </options>
   </test>
-  <test name="ERP_D_Ld5" grid="f10_f10_mg37" compset="I2000Clm50BgcCru" testmods="clm/anoxia">
+  <test name="ERP_D_Ld5" grid="f10_f10_mt201" compset="I2000Clm50BgcCru" testmods="clm/anoxia">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -1417,7 +1417,7 @@
       <option name="comment">Run a test with anoxia turned on and Cruv7 forcing</option>
     </options>
   </test>
-  <test name="ERP_D_Ld5" grid="f10_f10_mg37" compset="I2000Clm50BgcCru" testmods="clm/anoxia--clm/matrixcnOn">
+  <test name="ERP_D_Ld5" grid="f10_f10_mt201" compset="I2000Clm50BgcCru" testmods="clm/anoxia--clm/matrixcnOn">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="matrixcn"/>
@@ -1428,7 +1428,7 @@
       <option name="comment">Repeat anoxia test with matrixcnOn</option>
     </options>
   </test>
-  <test name="ERP_D_Ld5" grid="f10_f10_mg37" compset="I2000Clm50BgcCru" testmods="clm/ciso_flexCN_FUN">
+  <test name="ERP_D_Ld5" grid="f10_f10_mt201" compset="I2000Clm50BgcCru" testmods="clm/ciso_flexCN_FUN">
     <machines>
       <machine name="derecho" compiler="gnu" category="aux_clm"/>
       <machine name="derecho" compiler="gnu" category="ctsm_release"/>
@@ -1438,7 +1438,7 @@
       <option name="comment">ERP DEBUG tests with Carbon isotopes flexible CN and FUN on for Clm50 with Cruv7 forcing</option>
     </options>
   </test>
-  <test name="ERP_D_Ld5" grid="f10_f10_mg37" compset="I2000Clm50BgcCru" testmods="clm/ciso_flexCN_FUN--clm/matrixcnOn">
+  <test name="ERP_D_Ld5" grid="f10_f10_mt201" compset="I2000Clm50BgcCru" testmods="clm/ciso_flexCN_FUN--clm/matrixcnOn">
     <machines>
       <machine name="derecho" compiler="gnu" category="aux_clm"/>
       <machine name="derecho" compiler="gnu" category="matrixcn"/>
@@ -1449,7 +1449,7 @@
       <option name="comment">Repeat ERP_D_Ld5...ciso_flexCN_FUN test with matrixcnOn</option>
     </options>
   </test>
-  <test name="SMS_D" grid="f10_f10_mg37" compset="I1850Clm60BgcCrop" testmods="clm/ciso_soil_matrixcn_only">
+  <test name="SMS_D" grid="f10_f10_mt201" compset="I1850Clm60BgcCrop" testmods="clm/ciso_soil_matrixcn_only">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="matrixcn"/>
@@ -1463,7 +1463,7 @@
       <option name="comment">Run soil matrix solution without CN matrix with debug on and the extra options that it interacts with (isotopes and crop)</option>
     </options>
   </test>
-  <test name="ERS_Ld396" grid="f10_f10_mg37" compset="I1850Clm60Bgc" testmods="clm/monthly_matrixcn_fast_spinup">
+  <test name="ERS_Ld396" grid="f10_f10_mt201" compset="I1850Clm60Bgc" testmods="clm/monthly_matrixcn_fast_spinup">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -1473,7 +1473,7 @@
       <option name="comment">Run matrix solution fast spinup for restart beyond a year (to trigger next year logic) turning off extra options to make faster (so without crop or isotopes). This test would've caught a previous bug.</option>
     </options>
   </test>
-  <test name="SMS_Lm1" grid="f10_f10_mg37" compset="I1850Clm60Bgc" testmods="clm/clm60_monthly_matrixcn_soilCN30">
+  <test name="SMS_Lm1" grid="f10_f10_mt201" compset="I1850Clm60Bgc" testmods="clm/clm60_monthly_matrixcn_soilCN30">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -1483,7 +1483,7 @@
       <option name="comment">Smoke test of soil CN-matrix on with soil CN ratio set to 30</option>
     </options>
   </test>
-  <test name="SMS_Lm1" grid="f10_f10_mg37" compset="IHistClm60Bgc" testmods="clm/leafcn_t_evolving">
+  <test name="SMS_Lm1" grid="f10_f10_mt201" compset="IHistClm60Bgc" testmods="clm/leafcn_t_evolving">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -1493,7 +1493,7 @@
       <option name="comment">Smoke test using custom paramfile with leafcn_co2_slope set to 30 (default = 0). This confirms that the calculation of leafcn_t_evolving does not fail.</option>
     </options>
   </test>
-  <test name="ERS_D" grid="f19_g17" compset="I1850Clm50BgcCrop" testmods="clm/ciso_monthly_matrixcn_spinup">
+  <test name="ERS_D" grid="f19_t233" compset="I1850Clm50BgcCrop" testmods="clm/ciso_monthly_matrixcn_spinup">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="matrixcn"/>
@@ -1504,7 +1504,7 @@
       <option name="comment">Run in DEBUG with the matrix solution on for spinup with all options it interacts with (requires Bgc, but also turn on Crop and Carbon isotopes)</option>
     </options>
   </test>
-  <test name="ERS_D" grid="f10_f10_mg37" compset="I1850Clm50BgcCrop" testmods="clm/ciso_monthly_matrixcn_spinup">
+  <test name="ERS_D" grid="f10_f10_mt201" compset="I1850Clm50BgcCrop" testmods="clm/ciso_monthly_matrixcn_spinup">
     <machines>
       <machine name="izumi" compiler="nag" category="aux_clm"/>
       <machine name="izumi" compiler="nag" category="matrixcn"/>
@@ -1527,7 +1527,7 @@
       <option name="comment">Run without DEBUG for a long period for a single-point case with the matrix solution on for spinup with all options it interacts with (requires Bgc, but also turn on Crop and Carbon isotopes)</option>
     </options>
   </test>
-  <test name="LCISO_Ld396" grid="f10_f10_mg37" compset="I1850Clm50BgcCrop" testmods="clm/ciso_monthly_matrixcn_spinup">
+  <test name="LCISO_Ld396" grid="f10_f10_mt201" compset="I1850Clm50BgcCrop" testmods="clm/ciso_monthly_matrixcn_spinup">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="matrixcn"/>
@@ -1538,7 +1538,7 @@
       <option name="comment">Run without DEBUG for a long period for a low resolution case with the matrix solution on for spinup with all options it interacts with (requires Bgc, but also turn on Crop and Carbon isotopes)</option>
     </options>
   </test>
-  <test name="ERP_D_Ld5" grid="f10_f10_mg37" compset="I2000Clm50Bgc" testmods="clm/fire_emis">
+  <test name="ERP_D_Ld5" grid="f10_f10_mt201" compset="I2000Clm50Bgc" testmods="clm/fire_emis">
     <machines>
       <machine name="derecho" compiler="gnu" category="aux_clm"/>
       <machine name="derecho" compiler="gnu" category="ctsm_release"/>
@@ -1548,7 +1548,7 @@
       <option name="comment">ERP DEBUG tests for Clm50 with fire emissions on</option>
     </options>
   </test>
-  <test name="ERP_D_Ld5" grid="f10_f10_mg37" compset="I2000Clm60Sp" testmods="clm/decStart--clm/nofireemis">
+  <test name="ERP_D_Ld5" grid="f10_f10_mt201" compset="I2000Clm60Sp" testmods="clm/decStart--clm/nofireemis">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -1558,7 +1558,7 @@
       <option name="comment">2000 Sp test for CLM60</option>
     </options>
   </test>
-  <test name="ERP_D_Ld5" grid="f10_f10_mg37" compset="I2000Clm50Sp" testmods="clm/reduceOutput">
+  <test name="ERP_D_Ld5" grid="f10_f10_mt201" compset="I2000Clm50Sp" testmods="clm/reduceOutput">
     <machines>
       <machine name="derecho" compiler="gnu" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
@@ -1569,7 +1569,7 @@
       <option name="wallclock">00:20:00</option>
     </options>
   </test>
-  <test name="ERP_D_Ld5" grid="f10_f10_mg37" compset="IHistClm50Sp" testmods="clm/drydepnomegan--clm/nofireemis">
+  <test name="ERP_D_Ld5" grid="f10_f10_mt201" compset="IHistClm50Sp" testmods="clm/drydepnomegan--clm/nofireemis">
     <machines>
       <machine name="derecho" compiler="gnu" category="aux_clm"/>
       <machine name="derecho" compiler="gnu" category="prebeta"/>
@@ -1580,7 +1580,7 @@
       <option name="comment">ERP DEBUG historical Clm50Sp case with drydeposition but without MEGAN Also --nofireemis because this is a Sp compset</option>
     </options>
   </test>
-  <test name="ERP_D_Ld5" grid="f10_f10_mg37" compset="IHistClm60Sp" testmods="clm/default--clm/nofireemis">
+  <test name="ERP_D_Ld5" grid="f10_f10_mt201" compset="IHistClm60Sp" testmods="clm/default--clm/nofireemis">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -1600,7 +1600,7 @@
       <option name="comment">Test Hist compset with Sp for CLM6.0</option>
     </options>
   </test>
-  <test name="SMS_Ld5" grid="f09_g17" compset="IHistClm50Sp" testmods="clm/default--clm/nofireemis">
+  <test name="SMS_Ld5" grid="f09_t233" compset="IHistClm50Sp" testmods="clm/default--clm/nofireemis">
     <machines>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -1610,7 +1610,7 @@
       <option name="comment">Science support for IHistClm50SpCru at f09</option>
     </options>
   </test>
-  <test name="SMS_Ld5" grid="f19_g17" compset="IHistClm50Sp" testmods="clm/default--clm/nofireemis">
+  <test name="SMS_Ld5" grid="f19_t233" compset="IHistClm50Sp" testmods="clm/default--clm/nofireemis">
     <machines>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -1620,7 +1620,7 @@
       <option name="comment">Science support for IHistClm50SpCru at f19</option>
     </options>
   </test>
-  <test name="ERP_D_Ld5_P48x1" grid="f10_f10_mg37" compset="I1850Clm60Bgc" testmods="clm/ciso">
+  <test name="ERP_D_Ld5_P48x1" grid="f10_f10_mt201" compset="I1850Clm60Bgc" testmods="clm/ciso">
     <machines>
       <machine name="izumi" compiler="nag" category="aux_clm"/>
       <machine name="izumi" compiler="nag" category="prealpha"/>
@@ -1630,7 +1630,7 @@
       <option name="wallclock">00:30:00</option>
     </options>
   </test>
-  <test name="ERP_D_Ld5_P48x1" grid="f10_f10_mg37" compset="I1850Clm60Bgc" testmods="clm/ciso--clm/matrixcnOn">
+  <test name="ERP_D_Ld5_P48x1" grid="f10_f10_mt201" compset="I1850Clm60Bgc" testmods="clm/ciso--clm/matrixcnOn">
     <machines>
       <machine name="izumi" compiler="nag" category="aux_clm"/>
       <machine name="izumi" compiler="nag" category="matrixcn"/>
@@ -1641,7 +1641,7 @@
       <option name="comment">Repeat last ERP_D_Ld5_P48x1...ciso test with matrixcnOn</option>
     </options>
   </test>
-  <test name="ERP_D_Ld10_P64x2" grid="f10_f10_mg37" compset="IHistClm60BgcCrop" testmods="clm/ciso_decStart">
+  <test name="ERP_D_Ld10_P64x2" grid="f10_f10_mt201" compset="IHistClm60BgcCrop" testmods="clm/ciso_decStart">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="prebeta"/>
@@ -1652,7 +1652,7 @@
       <option name="comment">Transient case with isotopes with a December start</option>
     </options>
   </test>
-  <test name="ERP_D_Ld10_P64x2" grid="f10_f10_mg37" compset="IHistClm60BgcCrop" testmods="clm/ciso_decStart--clm/matrixcnOn_ignore_warnings">
+  <test name="ERP_D_Ld10_P64x2" grid="f10_f10_mt201" compset="IHistClm60BgcCrop" testmods="clm/ciso_decStart--clm/matrixcnOn_ignore_warnings">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="matrixcn"/>
@@ -1663,7 +1663,7 @@
       <option name="comment">Repeat ERP_D_Ld10_P64x2...ciso_decStart test with matrixcnOn</option>
     </options>
   </test>
-  <test name="ERP_D_Ld10_P64x2" grid="f10_f10_mg37" compset="IHistClm60BgcCrop" testmods="clm/default">
+  <test name="ERP_D_Ld10_P64x2" grid="f10_f10_mt201" compset="IHistClm60BgcCrop" testmods="clm/default">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="crop_calendars"/>
@@ -1674,7 +1674,7 @@
       <option name="comment">Transient case with isotopes with a December start, without Meier roughness</option>
     </options>
   </test>
-  <test name="ERP_D_Ld10_P64x2" grid="f10_f10_mg37" compset="IHistClm60BgcCrop" testmods="clm/default--clm/matrixcnOn_ignore_warnings">
+  <test name="ERP_D_Ld10_P64x2" grid="f10_f10_mt201" compset="IHistClm60BgcCrop" testmods="clm/default--clm/matrixcnOn_ignore_warnings">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="matrixcn"/>
@@ -1685,7 +1685,7 @@
       <option name="comment">Repeat ERP_D_Ld10_P64x2...default test with matrixcnOn</option>
     </options>
   </test>
-  <test name="SMS_Ld3_PS" grid="f09_g17" compset="IHistClm50BgcCrop" testmods="clm/f09_dec1990Start_GU_LULCC">
+  <test name="SMS_Ld3_PS" grid="f09_t233" compset="IHistClm50BgcCrop" testmods="clm/f09_dec1990Start_GU_LULCC">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -1695,7 +1695,7 @@
       <option name="comment">Transient case with a December 1990 start, and Gross Unrepresented Land Use and Land Cover change on, with f09 datasets with non-zero GU_LULCC values</option>
     </options>
   </test>
-  <test name="SMS_Ld3_PS" grid="f09_g17" compset="IHistClm50BgcCrop" testmods="clm/f09_dec1990Start_GU_LULCC--clm/matrixcnOn_ignore_warnings">
+  <test name="SMS_Ld3_PS" grid="f09_t233" compset="IHistClm50BgcCrop" testmods="clm/f09_dec1990Start_GU_LULCC--clm/matrixcnOn_ignore_warnings">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="matrixcn"/>
@@ -1706,7 +1706,7 @@
       <option name="comment">Repeat SMS_Ld3_PS...GU_LULCC test with matrixcnOn</option>
     </options>
   </test>
-  <test name="ERP_D_Ld5_P48x1" grid="f10_f10_mg37" compset="I2000Clm50Bgc" testmods="clm/reduceOutput">
+  <test name="ERP_D_Ld5_P48x1" grid="f10_f10_mt201" compset="I2000Clm50Bgc" testmods="clm/reduceOutput">
     <machines>
       <machine name="izumi" compiler="nag" category="aux_clm"/>
       <machine name="izumi" compiler="nag" category="ctsm_release"/>
@@ -1716,7 +1716,7 @@
       <option name="comment">ERP DEBUG tests for Clm50 with reduced output</option>
     </options>
   </test>
-  <test name="ERP_D_Ld5_P48x1" grid="f10_f10_mg37" compset="I2000Clm50Sp" testmods="clm/o3lombardozzi2015">
+  <test name="ERP_D_Ld5_P48x1" grid="f10_f10_mt201" compset="I2000Clm50Sp" testmods="clm/o3lombardozzi2015">
     <machines>
       <machine name="izumi" compiler="nag" category="aux_clm"/>
       <machine name="izumi" compiler="nag" category="ctsm_release"/>
@@ -1725,7 +1725,7 @@
       <option name="wallclock">00:20:00</option>
     </options>
   </test>
-  <test name="ERP_D_P64x2_Ld3" grid="f10_f10_mg37" compset="I1850Clm50BgcCrop" testmods="clm/default">
+  <test name="ERP_D_P64x2_Ld3" grid="f10_f10_mt201" compset="I1850Clm50BgcCrop" testmods="clm/default">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="gnu" category="aux_clm"/>
@@ -1741,7 +1741,7 @@
       <option name="comment">A standard DEBUG exact restart test with threading on and ensuring answers don't change on restarts with a processor count change (ERP)</option>
     </options>
   </test>
-  <test name="ERP_D_P64x2_Ld3" grid="f10_f10_mg37" compset="I1850Clm50BgcCrop" testmods="clm/default--clm/matrixcnOn_ignore_warnings">
+  <test name="ERP_D_P64x2_Ld3" grid="f10_f10_mt201" compset="I1850Clm50BgcCrop" testmods="clm/default--clm/matrixcnOn_ignore_warnings">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="clm_short"/>
@@ -1753,7 +1753,7 @@
       <option name="comment">Repeat last ERP_D_P64x2_Ld3...default test with matrixcnOn</option>
     </options>
   </test>
-  <test name="ERP_D_P64x2_Ld3" grid="f10_f10_mg37" compset="I2000Clm60BgcCrop" testmods="clm/coldStart">
+  <test name="ERP_D_P64x2_Ld3" grid="f10_f10_mt201" compset="I2000Clm60BgcCrop" testmods="clm/coldStart">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -1762,7 +1762,7 @@
       <option name="wallclock">00:20:00</option>
     </options>
   </test>
-  <test name="ERP_D_P64x2_Ld3" grid="f10_f10_mg37" compset="I2000Clm60BgcCrop" testmods="clm/coldStart--clm/matrixcnOn_ignore_warnings">
+  <test name="ERP_D_P64x2_Ld3" grid="f10_f10_mt201" compset="I2000Clm60BgcCrop" testmods="clm/coldStart--clm/matrixcnOn_ignore_warnings">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="matrixcn"/>
@@ -1784,7 +1784,7 @@
       <option name="comment">Test soil_decomp_method = 'MIMICSWieder2015' with CN matrix on but soil matrixcn off</option>
     </options>
   </test>
-  <test name="ERP_D_P64x2_Ld3" grid="f10_f10_mg37" compset="I1850Clm60BgcCrop" testmods="clm/mimics">
+  <test name="ERP_D_P64x2_Ld3" grid="f10_f10_mt201" compset="I1850Clm60BgcCrop" testmods="clm/mimics">
     <machines>
       <machine name="derecho" compiler="gnu" category="aux_clm"/>
       <machine name="derecho" compiler="gnu" category="prebeta"/>
@@ -1817,7 +1817,7 @@
       <option name="comment">Test soil_decomp_method = 'MIMICSWieder2015' with Newton-Krylov spinup variables on</option>
     </options>
   </test>
-  <test name="ERP_D_P64x2_Ld3" grid="f10_f10_mg37" compset="I2000Clm50BgcCru" testmods="clm/flexCN_FUN">
+  <test name="ERP_D_P64x2_Ld3" grid="f10_f10_mt201" compset="I2000Clm50BgcCru" testmods="clm/flexCN_FUN">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -1827,7 +1827,7 @@
       <option name="comment">ERP DEBUG threading tests for Clm50 with flexible CN and FUN on and Cruv7 forcing</option>
     </options>
   </test>
-  <test name="ERP_D_P64x2_Ld3" grid="f10_f10_mg37" compset="I2000Clm50BgcCru" testmods="clm/flexCN_FUN--clm/matrixcnOn_ignore_warnings">
+  <test name="ERP_D_P64x2_Ld3" grid="f10_f10_mt201" compset="I2000Clm50BgcCru" testmods="clm/flexCN_FUN--clm/matrixcnOn_ignore_warnings">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="matrixcn"/>
@@ -1838,7 +1838,7 @@
       <option name="comment">Repeat last ERP_D_P64x2_Ld3...flexCN_FUN test with matrixcnOn</option>
     </options>
   </test>
-  <test name="ERP_D_P64x2_Ld3" grid="f10_f10_mg37" compset="I2000Clm50BgcCru" testmods="clm/noFUN_flexCN">
+  <test name="ERP_D_P64x2_Ld3" grid="f10_f10_mt201" compset="I2000Clm50BgcCru" testmods="clm/noFUN_flexCN">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -1848,7 +1848,7 @@
       <option name="comment">ERP DEBUG threading tests for Clm50 without FUN/LUNA but with flexible CN on with Cruv7 forcing</option>
     </options>
   </test>
-  <test name="ERP_D_P64x2_Ld3" grid="f10_f10_mg37" compset="I2000Clm50BgcCru" testmods="clm/noFUN_flexCN--clm/matrixcnOn_ignore_warnings">
+  <test name="ERP_D_P64x2_Ld3" grid="f10_f10_mt201" compset="I2000Clm50BgcCru" testmods="clm/noFUN_flexCN--clm/matrixcnOn_ignore_warnings">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="matrixcn"/>
@@ -1859,7 +1859,7 @@
       <option name="comment">Repeat last ERP_D_P64x2_Ld3...noFUN_flexCN test with matrixcnOn</option>
     </options>
   </test>
-  <test name="ERP_D_P64x2_Ld3" grid="f10_f10_mg37" compset="I2000Clm50Bgc" testmods="clm/luna">
+  <test name="ERP_D_P64x2_Ld3" grid="f10_f10_mt201" compset="I2000Clm50Bgc" testmods="clm/luna">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -1869,7 +1869,7 @@
       <option name="comment">ERP DEBUG threading tests for Clm50 with LUNA on</option>
     </options>
   </test>
-  <test name="ERP_D_P64x2_Ld3" grid="f10_f10_mg37" compset="I2000Clm50Bgc" testmods="clm/default">
+  <test name="ERP_D_P64x2_Ld3" grid="f10_f10_mt201" compset="I2000Clm50Bgc" testmods="clm/default">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="gnu" category="aux_clm"/>
@@ -1881,7 +1881,7 @@
       <option name="comment">Simple default ERP DEBUG threading tests for Clm50</option>
     </options>
   </test>
-  <test name="ERP_D_P64x2_Ld30" grid="f10_f10_mg37" compset="I2000Clm50Bgc" testmods="clm/default">
+  <test name="ERP_D_P64x2_Ld30" grid="f10_f10_mt201" compset="I2000Clm50Bgc" testmods="clm/default">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -1891,7 +1891,7 @@
       <option name="comment">NOTE(bja, 201509) constrain_stress_deciduous_onset is on by default for clm50, but functionality is not exercised by nine day tests, Sean Swenson verified that it is active during 30 day tests.</option>
     </options>
   </test>
-  <test name="ERP_D_P64x2_Ld5" grid="f10_f10_mg37" compset="I2000Clm60BgcCrop" testmods="clm/irrig_spunup">
+  <test name="ERP_D_P64x2_Ld5" grid="f10_f10_mt201" compset="I2000Clm60BgcCrop" testmods="clm/irrig_spunup">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="prealpha"/>
@@ -1903,7 +1903,7 @@
       <option name="comment">Want ERP _D test with irrigation on</option>
     </options>
   </test>
-  <test name="ERP_D_P64x2_Ld5" grid="f10_f10_mg37" compset="I2000Clm50BgcCropRtm" testmods="clm/irrig_spunup">
+  <test name="ERP_D_P64x2_Ld5" grid="f10_f10_mt201" compset="I2000Clm50BgcCropRtm" testmods="clm/irrig_spunup">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -1913,7 +1913,7 @@
       <option name="comment">Include an irrigation test with RTM to test irrigation-river feedbacks with that component</option>
     </options>
   </test>
-  <test name="ERS_D_Ld5" grid="f10_f10_mg37" compset="I2000Clm50BgcCropRtm" testmods="rtm/rtmOnFloodOnEffvelOn">
+  <test name="ERS_D_Ld5" grid="f10_f10_mt201" compset="I2000Clm50BgcCropRtm" testmods="rtm/rtmOnFloodOnEffvelOn">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="prebeta"/>
@@ -1924,7 +1924,7 @@
       <option name="comment">Do a test with RTM and flooding on as that also impacts CLM code</option>
     </options>
   </test>
-  <test name="ERP_D_P48x1" grid="f10_f10_mg37" compset="IHistClm60Bgc" testmods="clm/decStart">
+  <test name="ERP_D_P48x1" grid="f10_f10_mt201" compset="IHistClm60Bgc" testmods="clm/decStart">
     <machines>
       <machine name="izumi" compiler="nag" category="aux_clm"/>
       <machine name="izumi" compiler="nag" category="prealpha"/>
@@ -1934,7 +1934,7 @@
       <option name="wallclock">00:30:00</option>
     </options>
   </test>
-  <test name="ERP_D_P48x1" grid="f10_f10_mg37" compset="IHistClm60Bgc" testmods="clm/decStart--clm/matrixcnOn_ignore_warnings">
+  <test name="ERP_D_P48x1" grid="f10_f10_mt201" compset="IHistClm60Bgc" testmods="clm/decStart--clm/matrixcnOn_ignore_warnings">
     <machines>
       <machine name="izumi" compiler="nag" category="aux_clm"/>
       <machine name="izumi" compiler="nag" category="matrixcn"/>
@@ -1945,7 +1945,7 @@
       <option name="comment">Repeat ERP_D_P48x1...decStart test with matrixcnOn</option>
     </options>
   </test>
-  <test name="ERP_D_Ld5" grid="f10_f10_mg37" compset="I1850Clm50Bgc" testmods="clm/drydepnomegan">
+  <test name="ERP_D_Ld5" grid="f10_f10_mt201" compset="I1850Clm50Bgc" testmods="clm/drydepnomegan">
     <machines>
       <machine name="derecho" compiler="gnu" category="aux_clm"/>
       <machine name="derecho" compiler="gnu" category="ctsm_release"/>
@@ -1954,7 +1954,7 @@
       <option name="wallclock">00:20:00</option>
     </options>
   </test>
-  <test name="ERP_Ld5" grid="f10_f10_mg37" compset="I1850Clm50Bgc" testmods="clm/default">
+  <test name="ERP_Ld5" grid="f10_f10_mt201" compset="I1850Clm50Bgc" testmods="clm/default">
     <machines>
       <machine name="derecho" compiler="gnu" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
@@ -1965,7 +1965,7 @@
       <option name="wallclock">00:20:00</option>
     </options>
   </test>
-  <test name="ERP_D_Ld5_P48x1" grid="f10_f10_mg37" compset="I1850Clm50Bgc" testmods="clm/ciso">
+  <test name="ERP_D_Ld5_P48x1" grid="f10_f10_mt201" compset="I1850Clm50Bgc" testmods="clm/ciso">
     <machines>
       <machine name="izumi" compiler="nag" category="aux_clm"/>
       <machine name="izumi" compiler="nag" category="ctsm_release"/>
@@ -1974,7 +1974,7 @@
       <option name="wallclock">00:20:00</option>
     </options>
   </test>
-  <test name="SMS_Ld3" grid="f09_g17" compset="I1850Clm50BgcCrop" testmods="clm/default">
+  <test name="SMS_Ld3" grid="f09_t233" compset="I1850Clm50BgcCrop" testmods="clm/default">
     <machines>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -1984,7 +1984,7 @@
       <option name="comment">Science support for I1850Clm50BgcCropCru at f09</option>
     </options>
   </test>
-  <test name="SMS_Ld3" grid="f19_g17" compset="I1850Clm50BgcCrop" testmods="clm/default">
+  <test name="SMS_Ld3" grid="f19_t233" compset="I1850Clm50BgcCrop" testmods="clm/default">
     <machines>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -1994,7 +1994,7 @@
       <option name="comment">Science support for I1850Clm50BgcCropCru at f19</option>
     </options>
   </test>
-  <test name="ERP_D_Ld5_P48x1" grid="f10_f10_mg37" compset="I2000Clm50BgcCru" testmods="clm/flexCN_FUN">
+  <test name="ERP_D_Ld5_P48x1" grid="f10_f10_mt201" compset="I2000Clm50BgcCru" testmods="clm/flexCN_FUN">
     <machines>
       <machine name="izumi" compiler="nag" category="aux_clm"/>
       <machine name="izumi" compiler="nag" category="ctsm_release"/>
@@ -2004,7 +2004,7 @@
       <option name="comment">ERP DEBUG test on Izumi for I2000Clm50BgcCru with flexCN, and FUN on and LUNA off, and Cruv7 forcing</option>
     </options>
   </test>
-  <test name="ERP_D_Ld5_P48x1" grid="f10_f10_mg37" compset="I2000Clm50BgcCru" testmods="clm/flexCN_FUN--clm/matrixcnOn">
+  <test name="ERP_D_Ld5_P48x1" grid="f10_f10_mt201" compset="I2000Clm50BgcCru" testmods="clm/flexCN_FUN--clm/matrixcnOn">
     <machines>
       <machine name="izumi" compiler="nag" category="aux_clm"/>
       <machine name="izumi" compiler="nag" category="matrixcn"/>
@@ -2015,7 +2015,7 @@
       <option name="comment">Repeat ERP_D_Ld5_P48x1...flexCN_FUN test with matrixcnOn</option>
     </options>
   </test>
-  <test name="ERP_D_Ld5_P48x1" grid="f10_f10_mg37" compset="I2000Clm50BgcCru" testmods="clm/noFUN_flexCN">
+  <test name="ERP_D_Ld5_P48x1" grid="f10_f10_mt201" compset="I2000Clm50BgcCru" testmods="clm/noFUN_flexCN">
     <machines>
       <machine name="izumi" compiler="nag" category="aux_clm"/>
       <machine name="izumi" compiler="nag" category="ctsm_release"/>
@@ -2025,7 +2025,7 @@
       <option name="comment">ERP DEBUG test on Izumi for I2000Clm50BgcCru with flexCN, and FUN on and LUNA off, and Cruv7 forcing</option>
     </options>
   </test>
-  <test name="ERP_D_Ld5_P48x1" grid="f10_f10_mg37" compset="I2000Clm50BgcCru" testmods="clm/noFUN_flexCN--clm/matrixcnOn">
+  <test name="ERP_D_Ld5_P48x1" grid="f10_f10_mt201" compset="I2000Clm50BgcCru" testmods="clm/noFUN_flexCN--clm/matrixcnOn">
     <machines>
       <machine name="izumi" compiler="nag" category="aux_clm"/>
       <machine name="izumi" compiler="nag" category="matrixcn"/>
@@ -2036,7 +2036,7 @@
       <option name="comment">Repeat ERP_D_Ld5_P48x1...noFUN_flexCN test with matrixcnOn</option>
     </options>
   </test>
-  <test name="ERP_D_Ld5_P48x1" grid="f10_f10_mg37" compset="I2000Clm50Bgc" testmods="clm/luna">
+  <test name="ERP_D_Ld5_P48x1" grid="f10_f10_mt201" compset="I2000Clm50Bgc" testmods="clm/luna">
     <machines>
       <machine name="izumi" compiler="nag" category="aux_clm"/>
       <machine name="izumi" compiler="nag" category="ctsm_release"/>
@@ -2046,7 +2046,7 @@
       <option name="comment">ERP DEBUG test on Izumi for I2000Clm50BgcCru with LUNA on</option>
     </options>
   </test>
-  <test name="ERP_Ly3_P64x2" grid="f10_f10_mg37" compset="IHistClm50BgcCrop" testmods="clm/cropMonthOutput">
+  <test name="ERP_Ly3_P64x2" grid="f10_f10_mt201" compset="IHistClm50BgcCrop" testmods="clm/cropMonthOutput">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -2056,7 +2056,7 @@
       <option name="comment">Multi-year global test of transient crops together with transient glaciers. Use no-evolve glaciers with ERP test</option>
     </options>
   </test>
-  <test name="ERP_Ly3_P64x2" grid="f10_f10_mg37" compset="IHistClm60BgcCrop" testmods="clm/cropMonthOutput--clm/matrixcnOn_ignore_warnings">
+  <test name="ERP_Ly3_P64x2" grid="f10_f10_mt201" compset="IHistClm60BgcCrop" testmods="clm/cropMonthOutput--clm/matrixcnOn_ignore_warnings">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="matrixcn"/>
@@ -2067,7 +2067,7 @@
       <option name="comment">Repeat ERP_Ly3_P64x2...cropMonthOutput test with matrixcnOn</option>
     </options>
   </test>
-  <test name="ERP_P64x2_D_Ld5" grid="f10_f10_mg37" compset="I1850Clm50Bgc" testmods="clm/ciso">
+  <test name="ERP_P64x2_D_Ld5" grid="f10_f10_mt201" compset="I1850Clm50Bgc" testmods="clm/ciso">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -2076,7 +2076,7 @@
       <option name="wallclock">00:20:00</option>
     </options>
   </test>
-  <test name="ERP_P64x2_D_Ld5" grid="f10_f10_mg37" compset="I1850Clm50Bgc" testmods="clm/ciso--clm/matrixcnOn_ignore_warnings">
+  <test name="ERP_P64x2_D_Ld5" grid="f10_f10_mt201" compset="I1850Clm50Bgc" testmods="clm/ciso--clm/matrixcnOn_ignore_warnings">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="matrixcn"/>
@@ -2087,7 +2087,7 @@
       <option name="comment">Repeat ERP_P64x2_D_Ld5...ciso test with matrixcnOn</option>
     </options>
   </test>
-  <test name="ERP_P64x2_Ld396" grid="f10_f10_mg37" compset="IHistClm60Bgc" testmods="clm/monthly">
+  <test name="ERP_P64x2_Ld396" grid="f10_f10_mt201" compset="IHistClm60Bgc" testmods="clm/monthly">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="gnu" category="aux_clm"/>
@@ -2101,19 +2101,7 @@
       <option name="comment">Threaded 13 month production transient test, triggering yearly transient updates. Add to prebeta to cover threaded production derecho_gnu build with full MPI</option>
     </options>
   </test>
-  <test name="ERP_P64x2_Ld396" grid="f10_f10_mg37" compset="IHistClm60Bgc" testmods="clm/monthly--clm/matrixcnOn_ignore_warnings">
-    <machines>
-      <machine name="derecho" compiler="intel" category="aux_clm"/>
-      <machine name="derecho" compiler="intel" category="matrixcn"/>
-      <machine name="derecho" compiler="intel" category="ctsm_release"/>
-    </machines>
-    <options>
-      <option name="wallclock">02:00:00</option>
-      <option name="tput_tolerance">0.5</option>
-      <option name="comment">Repeat ERP_P64x2_Ld396...13 month test with matrixcnOn</option>
-    </options>
-  </test>
-  <test name="REP_P64x2_Ld396" grid="f10_f10_mg37" compset="IHistClm60Bgc" testmods="clm/monthly--clm/matrixcnOn_ignore_warnings">
+  <test name="REP_P64x2_Ld396" grid="f10_f10_mt201" compset="IHistClm60Bgc" testmods="clm/monthly--clm/matrixcnOn_ignore_warnings">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="matrixcn"/>
@@ -2125,7 +2113,7 @@
       <option name="comment">Repeat ERP_P64x2_Ld396...13 month test with matrixcnOn as REP test because both tests fail as reported in #2619</option>
     </options>
   </test>
-  <test name="REP_P64x2_Ld13" grid="f10_f10_mg37" compset="IHistClm60Bgc" testmods="clm/monthly--clm/matrixcnOn_ignore_warnings">
+  <test name="REP_P64x2_Ld13" grid="f10_f10_mt201" compset="IHistClm60Bgc" testmods="clm/monthly--clm/matrixcnOn_ignore_warnings">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="matrixcn"/>
@@ -2137,7 +2125,7 @@
       <option name="comment">Repeat REP_P64x2_Ld396...13 month test with matrixcnOn as shorter REP_P64x2_Ld13 because the longer one fails as reported in issue #2619</option>
     </options>
   </test>
-  <test name="ERP_P64x2_D" grid="f10_f10_mg37" compset="I2000Clm50SpRtmFl" testmods="clm/default--clm/nofireemis">
+  <test name="ERP_P64x2_D" grid="f10_f10_mt201" compset="I2000Clm50SpRtmFl" testmods="clm/default--clm/nofireemis">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="prealpha"/>
@@ -2148,7 +2136,7 @@
       <option name="comment">include a debug test with flooding on</option>
     </options>
   </test>
-  <test name="ERP_P256x2_D_Ld5" grid="f19_g17_gris4" compset="I1850Clm50BgcCropG" testmods="clm/glcMEC_increase">
+  <test name="ERP_P256x2_D_Ld5" grid="f19_t233_gris4" compset="I1850Clm50BgcCropG" testmods="clm/glcMEC_increase">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="prealpha"/>
@@ -2159,7 +2147,7 @@
       <option name="comment">cism is not answer preserving across processor changes, but short test length should be ok.</option>
     </options>
   </test>
-  <test name="ERP_P64x2_D_Ld5" grid="f10_f10_mg37" compset="I2000Clm50Sp" testmods="clm/default--clm/nofireemis">
+  <test name="ERP_P64x2_D_Ld5" grid="f10_f10_mt201" compset="I2000Clm50Sp" testmods="clm/default--clm/nofireemis">
     <machines>
       <machine name="derecho" compiler="gnu" category="aux_clm"/>
       <machine name="derecho" compiler="gnu" category="prealpha"/>
@@ -2170,7 +2158,7 @@
       <option name="comment">The aux_cime_baselines equivalent of this is below as an f19 test</option>
     </options>
   </test>
-  <test name="SMS_P384x2_D_Ld5" grid="f19_g17" compset="I2000Clm50Sp" testmods="clm/default--clm/nofireemis">
+  <test name="SMS_P384x2_D_Ld5" grid="f19_t233" compset="I2000Clm50Sp" testmods="clm/default--clm/nofireemis">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="aux_cime_baselines"/>
@@ -2181,7 +2169,7 @@
       <option name="comment">The prealpha equivalent of this is above as an f10 test</option>
     </options>
   </test>
-  <test name="ERP_P64x2_Ld765" grid="f10_f10_mg37" compset="I2000Clm60BgcCrop" testmods="clm/monthly">
+  <test name="ERP_P64x2_Ld765" grid="f10_f10_mt201" compset="I2000Clm60BgcCrop" testmods="clm/monthly">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="prebeta"/>
@@ -2192,7 +2180,7 @@
       <option name="comment">threaded ERP test for crop for 25 months</option>
     </options>
   </test>
-  <test name="ERP_P64x2_D_Ld5" grid="f10_f10_mg37" compset="I1850Clm50BgcCrop" testmods="clm-crop--clm-bgcCropSimplePhysics">
+  <test name="ERP_P64x2_D_Ld5" grid="f10_f10_mt201" compset="I1850Clm50BgcCrop" testmods="clm-crop--clm-bgcCropSimplePhysics">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -2203,7 +2191,7 @@
       <option name="tput_tolerance">0.5</option>
     </options>
   </test>
-  <test name="ERP_P64x2_Ld1096" grid="f10_f10_mg37" compset="I2000Clm50BgcCrop" testmods="clm/irrig_o3falk_reduceOutput">
+  <test name="ERP_P64x2_Ld1096" grid="f10_f10_mt201" compset="I2000Clm50BgcCrop" testmods="clm/irrig_o3falk_reduceOutput">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -2213,7 +2201,7 @@
       <option name="comment">Want a multi-year global crop restart test; this was 5 years when we were doing cold start, but 3 years is probably sufficient given that we have spun-up crop initial conditions</option>
     </options>
   </test>
-  <test name="ERP_P64x2_Ld1096" grid="f10_f10_mg37" compset="I2000Clm50BgcCrop" testmods="clm/clm50cropIrrigMonth_interp">
+  <test name="ERP_P64x2_Ld1096" grid="f10_f10_mt201" compset="I2000Clm50BgcCrop" testmods="clm/clm50cropIrrigMonth_interp">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -2223,7 +2211,7 @@
       <option name="comment">Want a multi-year global crop restart test; this was 5 years when we were doing cold start, but 3 years is probably sufficient given that we have spun-up crop initial conditions</option>
     </options>
   </test>
-  <test name="ERP_P64x2_Ld366" grid="f10_f10_mg37" compset="I2000Clm50BgcCrop" testmods="clm/irrig_alternate_monthly">
+  <test name="ERP_P64x2_Ld366" grid="f10_f10_mt201" compset="I2000Clm50BgcCrop" testmods="clm/irrig_alternate_monthly">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -2233,7 +2221,7 @@
        <option name="comment">Want an ERP test covering some non-default irrigation options. Long enough so that we're likely to exercise the various groundwater irrigation code.</option>
     </options>
   </test>
-  <test name="ERS_D" grid="f10_f10_mg37" compset="I1850Clm50BgcCrop" testmods="clm/reseedresetsnow">
+  <test name="ERS_D" grid="f10_f10_mt201" compset="I1850Clm50BgcCrop" testmods="clm/reseedresetsnow">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -2242,7 +2230,7 @@
       <option name="wallclock">00:20:00</option>
     </options>
   </test>
-  <test name="ERS_D" grid="f10_f10_mg37" compset="I1850Clm50BgcCrop" testmods="clm/reseedresetsnow--clm/matrixcnOn">
+  <test name="ERS_D" grid="f10_f10_mt201" compset="I1850Clm50BgcCrop" testmods="clm/reseedresetsnow--clm/matrixcnOn">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="matrixcn"/>
@@ -2253,7 +2241,7 @@
       <option name="comment">Repeat ERS_D...reseedresetsnow test with matrixcnOn</option>
     </options>
   </test>
-  <test name="ERP_P64x2_D_Ld10" grid="f10_f10_mg37" compset="IHistClm50SpG" testmods="clm/glcMEC_decrease--clm/nofireemis">
+  <test name="ERP_P64x2_D_Ld10" grid="f10_f10_mt201" compset="IHistClm50SpG" testmods="clm/glcMEC_decrease--clm/nofireemis">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -2283,7 +2271,7 @@
       <option name="comment">Repeat this C96 test with Crujra while Gswp is still the default</option>
     </options>
   </test>
-  <test name="ERS_D_Ld10" grid="f10_f10_mg37" compset="IHistClm50Sp" testmods="clm/collapse_pfts_78_to_16_decStart_f10">
+  <test name="ERS_D_Ld10" grid="f10_f10_mt201" compset="IHistClm50Sp" testmods="clm/collapse_pfts_78_to_16_decStart_f10">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -2293,7 +2281,7 @@
       <option name="comment">test transient PFTs (via HIST) with a December start, reading 78-pft data and running with 16 pfts</option>
     </options>
   </test>
-  <test name="SOILSTRUCTUD_Ld5" grid="f10_f10_mg37" compset="I2000Clm50BgcCrop" testmods="clm/default">
+  <test name="SOILSTRUCTUD_Ld5" grid="f10_f10_mt201" compset="I2000Clm50BgcCrop" testmods="clm/default">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -2303,7 +2291,7 @@
       <option name="comment">test soil_layerstruct_userdefined set to the same dzsoi values as in the predefined case 4SL_2m and expect bfb same answers</option>
     </options>
   </test>
-  <test name="ERS_D_Ld12" grid="f10_f10_mg37" compset="I1850Clm50BgcCropG" testmods="clm/glcMEC_spunup_inc_dec_bgc">
+  <test name="ERS_D_Ld12" grid="f10_f10_mt201" compset="I1850Clm50BgcCropG" testmods="clm/glcMEC_spunup_inc_dec_bgc">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -2313,7 +2301,7 @@
       <option name="comment">Tests updates of BGC variables with increasing and decreasing glacier areas</option>
     </options>
   </test>
-  <test name="ERP_P64x2_D_Ld3" grid="f10_f10_mg37" compset="I1850Clm50BgcCrop" testmods="clm/extra_outputs">
+  <test name="ERP_P64x2_D_Ld3" grid="f10_f10_mt201" compset="I1850Clm50BgcCrop" testmods="clm/extra_outputs">
     <machines>
       <machine name="derecho" compiler="gnu" category="aux_clm"/>
       <machine name="derecho" compiler="gnu" category="ctsm_release"/>
@@ -2335,7 +2323,7 @@
       <option name="comment"  >Test writing all history fields</option>
     </options>
   </test>
-  <test name="ERS_D_Ld3" grid="f10_f10_mg37" compset="I1850Clm50BgcCrop" testmods="clm/default">
+  <test name="ERS_D_Ld3" grid="f10_f10_mt201" compset="I1850Clm50BgcCrop" testmods="clm/default">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="gnu" category="aux_clm"/>
@@ -2348,7 +2336,7 @@
       <option name="wallclock">00:20:00</option>
     </options>
   </test>
-  <test name="ERS_D_Ld3" grid="f10_f10_mg37" compset="I2000Clm50Bgc" testmods="clm/deepsoil_bedrock">
+  <test name="ERS_D_Ld3" grid="f10_f10_mt201" compset="I2000Clm50Bgc" testmods="clm/deepsoil_bedrock">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -2358,7 +2346,7 @@
       <option name="comment">Exact restart DEBUG test with deepsoil and bedrock options on for Clm50</option>
     </options>
   </test>
-  <test name="ERS_D_Ld5" grid="f10_f10_mg37" compset="I2000Clm50Bgc" testmods="clm/default">
+  <test name="ERS_D_Ld5" grid="f10_f10_mt201" compset="I2000Clm50Bgc" testmods="clm/default">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -2460,7 +2448,7 @@
       <option name="comment">Repeat ERS_Ly20_Mmpi-serial...cropMonthlyNoinitial test with matrixcnOn</option>
     </options>
   </test>
-  <test name="ERS_Ly3" grid="f10_f10_mg37" compset="I1850Clm60BgcCropCmip6" testmods="clm/basic">
+  <test name="ERS_Ly3" grid="f10_f10_mt201" compset="I1850Clm60BgcCropCmip6" testmods="clm/basic">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -2481,7 +2469,7 @@
       <option name="comment">restart is right before the transition from 100% nat veg to 100% crop</option>
     </options>
   </test>
-  <test name="ERS_Ly3_P64x2" grid="f10_f10_mg37" compset="IHistClm50BgcCropG" testmods="clm/cropMonthOutput">
+  <test name="ERS_Ly3_P64x2" grid="f10_f10_mt201" compset="IHistClm50BgcCropG" testmods="clm/cropMonthOutput">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -2491,7 +2479,7 @@
       <option name="comment">Multi-year global test of transient crops together with transient glaciers. Use glacier evolution with ERS test</option>
     </options>
   </test>
-  <test name="ERS_Ly5_P128x1" grid="f10_f10_mg37" compset="IHistClm60BgcCrop" testmods="clm/cropMonthOutput">
+  <test name="ERS_Ly5_P128x1" grid="f10_f10_mt201" compset="IHistClm60BgcCrop" testmods="clm/cropMonthOutput">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -2501,7 +2489,7 @@
       <option name="comment">Want a multi-year global test of transient crops; also want a multi-year transient restart test.  Using P60x1 and ERS rather than ERP to get faster turnaround of this long-running test</option>
     </options>
   </test>
-  <test name="ERS_Ly5_P128x1" grid="f10_f10_mg37" compset="IHistClm60BgcCrop" testmods="clm/cropMonthOutput--clm/matrixcnOn_ignore_warnings">
+  <test name="ERS_Ly5_P128x1" grid="f10_f10_mt201" compset="IHistClm60BgcCrop" testmods="clm/cropMonthOutput--clm/matrixcnOn_ignore_warnings">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="matrixcn"/>
@@ -2512,7 +2500,7 @@
       <option name="comment">Repeat ERS_Ly5_P128x1...cropMonthOutput test with matrixcnOn</option>
     </options>
   </test>
-  <test name="ERS_Ly3" grid="f10_f10_mg37" compset="I2000Clm60BgcCrop">
+  <test name="ERS_Ly3" grid="f10_f10_mt201" compset="I2000Clm60BgcCrop">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -2522,7 +2510,7 @@
       <option name="comment">include a long exact restart test with clm60</option>
     </options>
   </test>
-  <test name="SMS_D" grid="f10_f10_mg37" compset="I2000Clm60Bgc">
+  <test name="SMS_D" grid="f10_f10_mt201" compset="I2000Clm60Bgc">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="gnu" category="aux_clm"/>
@@ -2534,7 +2522,7 @@
       <option name="comment">include a short DEBUG test with clm60 without crop</option>
     </options>
   </test>
-  <test name="ERS_D" grid="f10_f10_mg37" compset="I1850Clm60Sp">
+  <test name="ERS_D" grid="f10_f10_mt201" compset="I1850Clm60Sp">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -2625,7 +2613,7 @@
       <option name="comment">Repeat LII2... test with matrixcnOn</option>
     </options>
   </test>
-  <test name="LVG_Ld5_D" grid="f10_f10_mg37" compset="I1850Clm60Bgc" testmods="clm/no_vector_output">
+  <test name="LVG_Ld5_D" grid="f10_f10_mt201" compset="I1850Clm60Bgc" testmods="clm/no_vector_output">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -2635,7 +2623,7 @@
       <option name="comment">Include one LVG debug test (exact configuration is not very important). Note that the LVG test will fail if there is any 1-d output, or output separated by glacier elevation classes (e.g., the various *_FORC fields), so this includes a testmod that turns off any 1-d output.</option>
     </options>
   </test>
-  <test name="LCISO_Ld396" grid="f10_f10_mg37" compset="IHistClm60BgcCrop" testmods="clm/ciso_monthly">
+  <test name="LCISO_Ld396" grid="f10_f10_mt201" compset="IHistClm60BgcCrop" testmods="clm/ciso_monthly">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="prebeta"/>
@@ -2646,7 +2634,7 @@
       <option name="comment">Make sure Carbon isotopes on and off with land-use change, does NOT change answers. To verify for landuse change must go beyond a year boundary, because of #404 we can't use a December start, so need to run for beyond the year boundary.</option>
     </options>
   </test>
-  <test name="LCISO_Ld396" grid="f10_f10_mg37" compset="IHistClm60BgcCrop" testmods="clm/ciso_monthly--clm/matrixcnOn_ignore_warnings">
+  <test name="LCISO_Ld396" grid="f10_f10_mt201" compset="IHistClm60BgcCrop" testmods="clm/ciso_monthly--clm/matrixcnOn_ignore_warnings">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="prebeta"/>
@@ -2658,7 +2646,7 @@
       <option name="comment">Repeat LCISO_Ld396...ciso_monthly test with matrixcnOn</option>
     </options>
   </test>
-  <test name="NCK_Ld1" grid="f10_f10_mg37" compset="I2000Clm50Sp" testmods="clm/default--clm/nofireemis">
+  <test name="NCK_Ld1" grid="f10_f10_mt201" compset="I2000Clm50Sp" testmods="clm/default--clm/nofireemis">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="prealpha"/>
@@ -2668,7 +2656,7 @@
       <option name="wallclock">00:20:00</option>
     </options>
   </test>
-  <test name="PEM_D_Ld5" grid="ne30_g17" compset="I2000Clm50Bgc" testmods="clm/default">
+  <test name="PEM_D_Ld5" grid="ne30_t233" compset="I2000Clm50Bgc" testmods="clm/default">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
@@ -2679,7 +2667,7 @@
       <option name="comment">Default PEM DEBUG test for Clm50</option>
     </options>
   </test>
-  <test name="PEM_Ld1" grid="f10_f10_mg37" compset="I2000Clm60BgcCrop" testmods="clm/till">
+  <test name="PEM_Ld1" grid="f10_f10_mt201" compset="I2000Clm60BgcCrop" testmods="clm/till">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -2688,7 +2676,7 @@
       <option name="wallclock">00:20:00</option>
     </options>
   </test>
-  <test name="PEM_Ld1" grid="f10_f10_mg37" compset="I2000Clm60BgcCrop" testmods="clm/till--clm/matrixcnOn">
+  <test name="PEM_Ld1" grid="f10_f10_mt201" compset="I2000Clm60BgcCrop" testmods="clm/till--clm/matrixcnOn">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="matrixcn"/>
@@ -2699,7 +2687,7 @@
       <option name="comment">Repeat PEM_Ld1...till test with matrixcnOn</option>
     </options>
   </test>
-  <test name="PET_P64x2_D" grid="f10_f10_mg37" compset="I1850Clm50BgcCrop" testmods="clm/default">
+  <test name="PET_P64x2_D" grid="f10_f10_mt201" compset="I1850Clm50BgcCrop" testmods="clm/default">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -2710,7 +2698,7 @@
       <option name="tput_tolerance">0.5</option>
     </options>
   </test>
-  <test name="PET_P64x2_D" grid="f10_f10_mg37" compset="I1850Clm50BgcCrop" testmods="clm/default--clm/matrixcnOn_ignore_warnings">
+  <test name="PET_P64x2_D" grid="f10_f10_mt201" compset="I1850Clm50BgcCrop" testmods="clm/default--clm/matrixcnOn_ignore_warnings">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="matrixcn"/>
@@ -2722,7 +2710,7 @@
       <option name="tput_tolerance">0.5</option>
     </options>
   </test>
-  <test name="SMS" grid="f10_f10_mg37" compset="I2000Clm50BgcCrop" testmods="clm/crop">
+  <test name="SMS" grid="f10_f10_mt201" compset="I2000Clm50BgcCrop" testmods="clm/crop">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="nvhpc" category="aux_clm"/>
@@ -2735,7 +2723,7 @@
       <option name="wallclock">00:20:00</option>
     </options>
   </test>
-  <test name="SMS" grid="f45_f45_mg37" compset="I2000Clm60FatesSpCrujra" testmods="clm/FatesColdDailyHist">
+  <test name="SMS" grid="f45_f45_mt201" compset="I2000Clm60FatesSpCrujra" testmods="clm/FatesColdDailyHist">
     <machines>
       <machine name="derecho" compiler="nvhpc" category="aux_clm"/>
       <machine name="derecho" compiler="nvhpc" category="fates"/>
@@ -2768,7 +2756,7 @@
       <option name="comment">Repeat last SMS_D_Ld1...cplhist test with matrixcnOn"</option>
     </options>
   </test>
-  <test name="SMS_D_Ld1_PS" grid="f19_f19_mg17" compset="I2010Clm50Sp" testmods="clm/clm50cam6LndTuningMode--clm/nofireemis">
+  <test name="SMS_D_Ld1_PS" grid="f19_f19_mt233" compset="I2010Clm50Sp" testmods="clm/clm50cam6LndTuningMode--clm/nofireemis">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -2778,7 +2766,7 @@
       <option name="comment">Also --nofireemis because this is a Sp compset</option>
     </options>
   </test>
-  <test name="SMS_Ln9" grid="f19_f19_mg17" compset="IHistClm50Sp" testmods="clm/clm50cam7LndTuningMode_1979Start--clm/nofireemis">
+  <test name="SMS_Ln9" grid="f19_f19_mt233" compset="IHistClm50Sp" testmods="clm/clm50cam7LndTuningMode_1979Start--clm/nofireemis">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -2969,7 +2957,7 @@
     </options>
   </test>
   <!-- Historical science support for clm5_0 workhorse resolutions -->
-  <test name="SMS_Ld5" grid="f09_g17" compset="IHistClm50Sp" testmods="clm/nofireemis">
+  <test name="SMS_Ld5" grid="f09_t233" compset="IHistClm50Sp" testmods="clm/nofireemis">
     <machines>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -2979,7 +2967,7 @@
       <option name="comment">Science support for historical clm5_0 physics with Sp mode at f09</option>
     </options>
   </test>
-  <test name="SMS_Ld5" grid="f19_g17" compset="IHistClm50Sp" testmods="clm/default--clm/nofireemis">
+  <test name="SMS_Ld5" grid="f19_t233" compset="IHistClm50Sp" testmods="clm/default--clm/nofireemis">
     <machines>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -2990,7 +2978,7 @@
     </options>
   </test>
   <!-- Historical science support for clm6_0 workhorse resolutions -->
-  <test name="SMS_Ld5" grid="f09_g17" compset="IHistClm60Sp" testmods="clm/default--clm/nofireemis">
+  <test name="SMS_Ld5" grid="f09_t233" compset="IHistClm60Sp" testmods="clm/default--clm/nofireemis">
     <machines>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -3010,7 +2998,7 @@
       <option name="comment">Repeat this science support test with t233 and Crujra while the defaults have not changed</option>
     </options>
   </test>
-  <test name="SMS_Ld5" grid="f19_g17" compset="IHistClm60Sp" testmods="clm/default--clm/nofireemis">
+  <test name="SMS_Ld5" grid="f19_t233" compset="IHistClm60Sp" testmods="clm/default--clm/nofireemis">
     <machines>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -3020,7 +3008,7 @@
       <option name="comment">Science support for historical clm6_0 physics with Sp mode at f19. Also --nofireemis because this is a Sp compset</option>
     </options>
   </test>
-  <test name="SMS_Ld5" grid="f19_g17" compset="IHistClm60SpCrujra" testmods="clm/default--clm/nofireemis">
+  <test name="SMS_Ld5" grid="f19_t233" compset="IHistClm60SpCrujra" testmods="clm/default--clm/nofireemis">
     <machines>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -3030,7 +3018,7 @@
       <option name="comment">Repeat this science support test with Crujra while Gswp is still the default</option>
     </options>
   </test>
-  <test name="SMS_Ln9" grid="ne30pg2_ne30pg2_mg17" compset="I1850Clm50Sp" testmods="clm/clm50cam6LndTuningMode--clm/nofireemis">
+  <test name="SMS_Ln9" grid="ne30pg2_ne30pg2_mt233" compset="I1850Clm50Sp" testmods="clm/clm50cam6LndTuningMode--clm/nofireemis">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -3040,7 +3028,7 @@
       <option name="comment">Run ne30np4.pg2 to make sure will work for CAM. Also --nofireemis because this is a Sp compset</option>
     </options>
   </test>
-  <test name="SMS_Ln9" grid="ne30pg2_ne30pg2_mg17" compset="I2000Clm50BgcCrop" testmods="clm/clm50cam6LndTuningMode">
+  <test name="SMS_Ln9" grid="ne30pg2_ne30pg2_mt233" compset="I2000Clm50BgcCrop" testmods="clm/clm50cam6LndTuningMode">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -3072,7 +3060,7 @@
       <option name="comment">Run coarse resolution ne3pg3_ne3pg3_mt233 to make sure will work for CAM. Also --nofireemis because this is a Sp compset</option>
     </options>
   </test>
-  <test name="SMS_D" grid="f10_f10_mg37" compset="I2000Clm60BgcCrop" testmods="clm/crop">
+  <test name="SMS_D" grid="f10_f10_mt201" compset="I2000Clm60BgcCrop" testmods="clm/crop">
     <machines>
       <machine name="derecho" compiler="nvhpc" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
@@ -3097,7 +3085,7 @@
       <option name="wallclock">00:20:00</option>
     </options>
   </test>
-  <test name="SMS_D_Ld1_Mmpi-serial" grid="ne3_ne3_mg37" compset="I2000Clm50SpRsGs" testmods="clm/ptsRLA">
+  <test name="SMS_D_Ld1_Mmpi-serial" grid="ne3_ne3_mt201" compset="I2000Clm50SpRsGs" testmods="clm/ptsRLA">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="aux_clm_mpi_serial"/>
@@ -3117,7 +3105,7 @@
       <option name="wallclock">00:20:00</option>
     </options>
   </test>
-  <test name="SMS_D_Ld1_P48x1" grid="f10_f10_mg37" compset="I2000Clm50BgcCru" testmods="clm/datm_bias_correct_cruv7">
+  <test name="SMS_D_Ld1_P48x1" grid="f10_f10_mt201" compset="I2000Clm50BgcCru" testmods="clm/datm_bias_correct_cruv7">
     <machines>
       <machine name="izumi" compiler="nag" category="aux_clm"/>
       <machine name="izumi" compiler="nag" category="ctsm_release"/>
@@ -3127,7 +3115,7 @@
       <option name="comment">Default Izumi DEBUG test for Clm50 with bias correction on for CRUv7 forcing</option>
     </options>
   </test>
-  <test name="SMS_D_Ld3" grid="f10_f10_mg37" compset="I1850Clm50BgcCrop" testmods="clm/default">
+  <test name="SMS_D_Ld3" grid="f10_f10_mt201" compset="I1850Clm50BgcCrop" testmods="clm/default">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="clm_short"/>
@@ -3137,7 +3125,7 @@
       <option name="wallclock">00:20:00</option>
     </options>
   </test>
-  <test name="SMS_D_Ld3" grid="f10_f10_mg37" compset="I1850Clm50BgcCrop" testmods="clm/default--clm/matrixcnOn">
+  <test name="SMS_D_Ld3" grid="f10_f10_mt201" compset="I1850Clm50BgcCrop" testmods="clm/default--clm/matrixcnOn">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="clm_short"/>
@@ -3149,7 +3137,7 @@
       <option name="comment">Repeat last SMS_D_Ld3...default test with matrixcnOn"</option>
     </options>
   </test>
-  <test name="SMS_D_Ld3" grid="f10_f10_mg37" compset="I2000Clm50Bgc" testmods="clm/default">
+  <test name="SMS_D_Ld3" grid="f10_f10_mt201" compset="I2000Clm50Bgc" testmods="clm/default">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="gnu" category="aux_clm"/>
@@ -3161,7 +3149,7 @@
       <option name="comment">Default DEBUG test for Clm50</option>
     </options>
   </test>
-  <test name="SMS_C2_D_Lh12" grid="f10_f10_mg37" compset="I2000Clm50Sp" testmods="clm/pauseResume">
+  <test name="SMS_C2_D_Lh12" grid="f10_f10_mt201" compset="I2000Clm50Sp" testmods="clm/pauseResume">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -3170,7 +3158,7 @@
       <option name="wallclock">00:20:00</option>
     </options>
   </test>
-  <test name="DAE_C2_D_Lh12" grid="f10_f10_mg37" compset="I2000Clm50BgcCrop" testmods="clm/DA_multidrv">
+  <test name="DAE_C2_D_Lh12" grid="f10_f10_mt201" compset="I2000Clm50BgcCrop" testmods="clm/DA_multidrv">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="prealpha"/>
@@ -3310,7 +3298,7 @@
     </options>
   </test>
 
-  <test name="ERS_P128x1_Ld765" grid="f10_f10_mg37" compset="I2000Clm60Fates" testmods="clm/FatesColdNoComp">
+  <test name="ERS_P128x1_Ld765" grid="f10_f10_mt201" compset="I2000Clm60Fates" testmods="clm/FatesColdNoComp">
     <machines>
       <!-- no izumi tests since this has a pe layout specific for derecho -->
       <machine name="derecho" compiler="intel" category="aux_clm"/>
@@ -3358,7 +3346,7 @@
       <option name="comment">Add at least one test of a FATES NEON site with PRISM precipitation</option>
     </options>
   </test>
-  <test name="ERS_D_Ld5" grid="f10_f10_mg37" compset="IHistClm50BgcQian" testmods="clm/ciso_bombspike1963DecStart">
+  <test name="ERS_D_Ld5" grid="f10_f10_mt201" compset="IHistClm50BgcQian" testmods="clm/ciso_bombspike1963DecStart">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -3368,7 +3356,7 @@
       <option name="comment">Want a test of the c13 and c14 timeseries that crosses the year boundary. Ideally this test would include crops (in order to cover as much code as possible combined with the c13/c14 timeseries, even though there are no direct interactions between these timeseries and crops), but crop DecStart tests currently fail because of https://github.com/ESCOMP/ctsm/issues/404 and I didn't want to add another long test just to test these options, so for now using a compset without crops. Using a compset with SGLC to avoid problems with CISM in DecStart tests; the only IHistClm50Bgc compset we have with SGLC is this Qian compset, so I'm using this one.</option>
     </options>
   </test>
-  <test name="ERS_D_Ld5" grid="f10_f10_mg37" compset="IHistClm50BgcQian" testmods="clm/ciso_bombspike1963DecStart--clm/matrixcnOn_ignore_warnings">
+  <test name="ERS_D_Ld5" grid="f10_f10_mt201" compset="IHistClm50BgcQian" testmods="clm/ciso_bombspike1963DecStart--clm/matrixcnOn_ignore_warnings">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="matrixcn"/>
@@ -3410,7 +3398,7 @@
       <option name="comment">Include a test that compares mpi-serial to full mpi and ensure identical answers</option>
     </options>
   </test>
-  <test name="SMS_D_P48x1_Ld5" grid="f10_f10_mg37" compset="I2000Clm50BgcCrop" testmods="clm/irrig_spunup">
+  <test name="SMS_D_P48x1_Ld5" grid="f10_f10_mt201" compset="I2000Clm50BgcCrop" testmods="clm/irrig_spunup">
     <machines>
       <machine name="izumi" compiler="nag" category="aux_clm"/>
       <machine name="izumi" compiler="nag" category="prebeta"/>
@@ -3421,7 +3409,7 @@
       <option name="comment">Want nag _D test with irrigation on</option>
     </options>
   </test>
-  <test name="SMS_Ld1_PS" grid="f09_g17" compset="I2000Clm50BgcCru" testmods="clm/datm_bias_correct_cruv7">
+  <test name="SMS_Ld1_PS" grid="f09_t233" compset="I2000Clm50BgcCru" testmods="clm/datm_bias_correct_cruv7">
     <machines>
       <machine name="derecho" compiler="gnu" category="aux_clm"/>
       <machine name="derecho" compiler="gnu" category="prealpha"/>
@@ -3433,7 +3421,7 @@
       <option name="comment">Since bias correction is in CDEPS we want to make sure CESM testing exercises this, in case a CDEPS change causes problems</option>
     </options>
   </test>
-  <test name="SMS_D_Ld1_Mmpi-serial" grid="ne3_ne3_mg37" compset="I2000Clm50SpRsGs" testmods="clm/ptsROA">
+  <test name="SMS_D_Ld1_Mmpi-serial" grid="ne3_ne3_mt201" compset="I2000Clm50SpRsGs" testmods="clm/ptsROA">
     <machines>
       <machine name="derecho" compiler="gnu" category="aux_clm"/>
       <machine name="derecho" compiler="gnu" category="aux_clm_mpi_serial"/>
@@ -3443,7 +3431,7 @@
       <option name="wallclock">00:20:00</option>
     </options>
   </test>
-  <test name="SMS_Ld5" grid="f10_f10_mg37" compset="I1850Clm60BgcCrop" testmods="clm/till--clm/remove_residues">
+  <test name="SMS_Ld5" grid="f10_f10_mt201" compset="I1850Clm60BgcCrop" testmods="clm/till--clm/remove_residues">
     <machines>
       <machine name="derecho" compiler="gnu" category="aux_clm"/>
       <machine name="derecho" compiler="gnu" category="ctsm_release"/>
@@ -3453,7 +3441,7 @@
       <option name="comment">include a production gnu test of Clm60 and tillage including residue removal</option>
     </options>
   </test>
-  <test name="SMS_Ld2_D_PS" grid="f09_g17" compset="I1850Clm60BgcCropCmip6" testmods="clm/basic_interp">
+  <test name="SMS_Ld2_D_PS" grid="f09_t233" compset="I1850Clm60BgcCropCmip6" testmods="clm/basic_interp">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -3463,7 +3451,7 @@
       <option name="comment">This gives a short debug test of the cmip6 configuration as well as a test of the cmip6 configuration at the production resolution, both of which we want. This test needs to use init_interp to work, because of adding virtual Antarctica columns.</option>
     </options>
   </test>
-  <test name="SMS_Ld5_D_P48x1" grid="f10_f10_mg37" compset="IHistClm50Bgc" testmods="clm/monthly">
+  <test name="SMS_Ld5_D_P48x1" grid="f10_f10_mt201" compset="IHistClm50Bgc" testmods="clm/monthly">
     <machines>
       <machine name="izumi" compiler="nag" category="aux_clm"/>
       <machine name="izumi" compiler="nag" category="ctsm_release"/>
@@ -3472,7 +3460,7 @@
       <option name="wallclock">00:30:00</option>
     </options>
   </test>
-  <test name="SMS_Ld5_D_P48x1" grid="f10_f10_mg37" compset="IHistClm60Bgc" testmods="clm/decStart">
+  <test name="SMS_Ld5_D_P48x1" grid="f10_f10_mt201" compset="IHistClm60Bgc" testmods="clm/decStart">
     <machines>
       <machine name="izumi" compiler="nag" category="aux_clm"/>
       <machine name="izumi" compiler="nag" category="ctsm_release"/>
@@ -3481,7 +3469,7 @@
       <option name="wallclock">00:20:00</option>
     </options>
   </test>
-  <test name="SMS_Ld5" grid="f09_g17" compset="ISSP585Clm50BgcCrop" testmods="clm/ciso_dec2050Start">
+  <test name="SMS_Ld5" grid="f09_t233" compset="ISSP585Clm50BgcCrop" testmods="clm/ciso_dec2050Start">
     <machines>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -3501,7 +3489,7 @@
       <option name="comment">Transient production test with clm6, t233, and Crujra while the defaults have not changed</option>
     </options>
   </test>
-  <test name="SMS_Ld5" grid="f10_f10_mg37" compset="ISSP245Clm60BgcCropCrujra" testmods="clm/ciso_dec2050Start">
+  <test name="SMS_Ld5" grid="f10_f10_mt201" compset="ISSP245Clm60BgcCropCrujra" testmods="clm/ciso_dec2050Start">
     <machines>
       <machine name="derecho" compiler="gnu" category="aux_clm"/>
       <machine name="derecho" compiler="gnu" category="prebeta"/>
@@ -3512,7 +3500,7 @@
       <option name="comment">Transient production low res future scenario SSP3-7.0 case with isotopes with a december 2050 start, use gnu to move off of intel</option>
     </options>
   </test>
-  <test name="SMS_Ld5" grid="f09_g17" compset="ISSP245Clm50BgcCrop" testmods="clm/ciso_dec2050Start">
+  <test name="SMS_Ld5" grid="f09_t233" compset="ISSP245Clm50BgcCrop" testmods="clm/ciso_dec2050Start">
     <machines>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -3532,7 +3520,7 @@
       <option name="comment">Transient production test with clm6, t233, and Crujra while the defaults have not changed</option>
     </options>
   </test>
-  <test name="SMS_Ld5" grid="f09_g17" compset="ISSP370Clm50BgcCrop" testmods="clm/ciso_dec2050Start">
+  <test name="SMS_Ld5" grid="f09_t233" compset="ISSP370Clm50BgcCrop" testmods="clm/ciso_dec2050Start">
     <machines>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -3552,7 +3540,7 @@
       <option name="comment">Transient production test with clm6, t233, and Crujra while the defaults have not changed</option>
     </options>
   </test>
-  <test name="SMS_D_Ld5" grid="f09_g17" compset="ISSP245Clm60BgcCropCrujra" testmods="clm/default">
+  <test name="SMS_D_Ld5" grid="f09_t233" compset="ISSP245Clm60BgcCropCrujra" testmods="clm/default">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ssp"/>
@@ -3563,7 +3551,7 @@
       <option name="comment">Transient production with anomaly forcing future scenario SSP1-2.6 case</option>
     </options>
   </test>
-  <test name="SMS_D_Ld5" grid="f10_f10_mg37" compset="ISSP245Clm60BgcCropCrujra" testmods="clm/default">
+  <test name="SMS_D_Ld5" grid="f10_f10_mt201" compset="ISSP245Clm60BgcCropCrujra" testmods="clm/default">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ssp"/>
@@ -3574,7 +3562,7 @@
       <option name="comment"  >Transient production with anomaly forcing future scenario SSP5-8.5 case</option>
     </options>
   </test>
-  <test name="SMS_D_Ld5" grid="f10_f10_mg37" compset="ISSP245Clm50BgcCrop" testmods="clm/default--clm/noAnomalyForcing">
+  <test name="SMS_D_Ld5" grid="f10_f10_mt201" compset="ISSP245Clm50BgcCrop" testmods="clm/default--clm/noAnomalyForcing">
     <machines>
       <machine name="derecho" compiler="intel" category="ssp"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -3585,7 +3573,7 @@
       <option name="comment"  >Transient production with future scenario SSP2-4.5 but NO anomaly forcing</option>
     </options>
   </test>
-  <test name="SMS_D_Ld5" grid="f10_f10_mg37" compset="ISSP245Clm60BgcCropCrujra" testmods="clm/datm_rcp45_anom_forc">
+  <test name="SMS_D_Ld5" grid="f10_f10_mt201" compset="ISSP245Clm60BgcCropCrujra" testmods="clm/datm_rcp45_anom_forc">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ssp"/>
@@ -3596,7 +3584,7 @@
       <option name="comment"  >Transient production with anomaly forcing future scenario RCP4.5 (CMIP5) case</option>
     </options>
   </test>
-  <test name="SMS_D_Ld5" grid="f09_g17" compset="ISSP370Clm50BgcCrop" testmods="clm/default">
+  <test name="SMS_D_Ld5" grid="f09_t233" compset="ISSP370Clm50BgcCrop" testmods="clm/default">
     <machines>
       <machine name="derecho" compiler="intel" category="ssp"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -3607,7 +3595,7 @@
       <option name="comment"  >Transient production with anomaly forcing future scenario SSP3-7.0 case</option>
     </options>
   </test>
-  <test name="SMS_D_Ld5" grid="f09_g17" compset="ISSP585Clm50BgcCrop" testmods="clm/default">
+  <test name="SMS_D_Ld5" grid="f09_t233" compset="ISSP585Clm50BgcCrop" testmods="clm/default">
     <machines>
       <machine name="derecho" compiler="intel" category="ssp"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -3620,7 +3608,7 @@
   </test>
 
 
-  <test name="ERP_D_Ld5" grid="f10_f10_mg37" compset="I1850Clm50Bgc" testmods="clm/nlevgrnd_small">
+  <test name="ERP_D_Ld5" grid="f10_f10_mt201" compset="I1850Clm50Bgc" testmods="clm/nlevgrnd_small">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -3630,7 +3618,7 @@
       <option name="comment">The main point of this test is to exercise the case where nlevgrnd is less than nlevurb. See the README file in its testmod directory for details.</option>
     </options>
   </test>
-  <test name="ERP_D_Ld5" grid="f10_f10_mg37" compset="I1850Clm50Bgc" testmods="clm/nlevgrnd_small--clm/matrixcnOn">
+  <test name="ERP_D_Ld5" grid="f10_f10_mt201" compset="I1850Clm50Bgc" testmods="clm/nlevgrnd_small--clm/matrixcnOn">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="matrixcn"/>
@@ -3641,7 +3629,7 @@
       <option name="comment">Repeat nlevgrnd_small test with matrixcnOn</option>
     </options>
   </test>
-  <test name="SMS_Ly2_PS" grid="f19_g17" compset="I2000Clm60BgcCrop" testmods="clm/cropMonthOutput">
+  <test name="SMS_Ly2_PS" grid="f19_t233" compset="I2000Clm60BgcCrop" testmods="clm/cropMonthOutput">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -3651,7 +3639,7 @@
       <option name="comment">include a relatively long crop test at relatively high resolution</option>
     </options>
   </test>
-  <test name="SMS_Ly3" grid="f10_f10_mg37" compset="I1850Clm50SpG" testmods="clm/glcMEC_long--clm/nofireemis">
+  <test name="SMS_Ly3" grid="f10_f10_mt201" compset="I1850Clm50SpG" testmods="clm/glcMEC_long--clm/nofireemis">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="prebeta"/>
@@ -3696,7 +3684,7 @@
       <option name="comment">Add a matrix spinup test for the default resolution</option>
     </options>
   </test>
-  <test name="ERP_D_Ld10" grid="f10_f10_mg37" compset="I1850Clm60BgcCrop" testmods="clm/ADspinup">
+  <test name="ERP_D_Ld10" grid="f10_f10_mt201" compset="I1850Clm60BgcCrop" testmods="clm/ADspinup">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -3706,7 +3694,7 @@
       <option name="comment">Include a restart test for AD spinup mode because of specific logic for spinup_state. Lack of this test did cause a problem.</option>
     </options>
   </test>
-  <test name="SSP_D_Ld10" grid="f10_f10_mg37" compset="I1850Clm60Bgc" testmods="clm/default">
+  <test name="SSP_D_Ld10" grid="f10_f10_mt201" compset="I1850Clm60Bgc" testmods="clm/default">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="prebeta"/>
@@ -3716,7 +3704,7 @@
       <option name="wallclock">00:20:00</option>
     </options>
   </test>
-  <test name="SSP_D_Ld4" grid="f10_f10_mg37" compset="I1850Clm50BgcCrop" testmods="clm/ciso">
+  <test name="SSP_D_Ld4" grid="f10_f10_mt201" compset="I1850Clm50BgcCrop" testmods="clm/ciso">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -3725,7 +3713,7 @@
       <option name="wallclock">00:20:00</option>
     </options>
   </test>
-  <test name="SSP_Ld10" grid="f10_f10_mg37" compset="I1850Clm50Bgc" testmods="clm/default">
+  <test name="SSP_Ld10" grid="f10_f10_mt201" compset="I1850Clm50Bgc" testmods="clm/default">
     <machines>
       <machine name="derecho" compiler="gnu" category="aux_clm"/>
       <machine name="derecho" compiler="gnu" category="ctsm_release"/>
@@ -3734,7 +3722,7 @@
       <option name="wallclock">00:20:00</option>
     </options>
   </test>
-  <test name="SSP_Ld4" grid="f09_g17" compset="I1850Clm60BgcCrop" testmods="clm/ciso">
+  <test name="SSP_Ld4" grid="f09_t233" compset="I1850Clm60BgcCrop" testmods="clm/ciso">
     <machines>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -3795,7 +3783,7 @@
       <option name="comment">This checks that the FATES seed dispersal MPI communication is consistent when the PE layout changes. Could convert to 5x5_amazon as above</option>
     </options>
   </test>
-  <test name="ERS_D_Ld20" grid="f45_f45_mg37" compset="I2000Clm50FatesRsGs" testmods="clm/FatesColdTreeDamage">
+  <test name="ERS_D_Ld20" grid="f45_f45_mt201" compset="I2000Clm50FatesRsGs" testmods="clm/FatesColdTreeDamage">
     <machines>
       <machine name="derecho" compiler="intel" category="fates"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -3805,7 +3793,7 @@
       <option name="comment">Ensure functionality of the tree damage option in FATES</option>
     </options>
   </test>
-  <test name="ERS_D_Ld20" grid="f45_f45_mg37" compset="I2000Clm60Fates" testmods="clm/FatesColdElecTransJB">
+  <test name="ERS_D_Ld20" grid="f45_f45_mt201" compset="I2000Clm60Fates" testmods="clm/FatesColdElecTransJB">
     <machines>
       <machine name="derecho" compiler="gnu" category="fates"/>
       <machine name="derecho" compiler="gnu" category="ctsm_release"/>
@@ -3815,7 +3803,7 @@
       <option name="comment">Ensure functionality of the JohnsonBerry2021 option in FATES</option>
     </options>
   </test>
-  <test name="ERI_D_Ld20" grid="f45_f45_mg37" compset="I2000Clm50FatesRsGs" testmods="clm/FatesColdTwoStream">
+  <test name="ERI_D_Ld20" grid="f45_f45_mt201" compset="I2000Clm50FatesRsGs" testmods="clm/FatesColdTwoStream">
     <machines>
       <machine name="derecho" compiler="intel" category="fates"/>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
@@ -3828,7 +3816,7 @@
       <option name="comment">Ensure functionality of two-stream radiation option in FATES</option>
     </options>
   </test>
-  <test name="ERS_D_Ld20" grid="f45_f45_mg37" compset="I2000Clm50FatesRsGs" testmods="clm/FatesColdTwoStreamNoCompFixedBioGeo">
+  <test name="ERS_D_Ld20" grid="f45_f45_mt201" compset="I2000Clm50FatesRsGs" testmods="clm/FatesColdTwoStreamNoCompFixedBioGeo">
     <machines>
       <machine name="derecho" compiler="gnu" category="fates"/>
       <machine name="derecho" compiler="gnu" category="aux_clm"/>
@@ -3839,7 +3827,7 @@
       <option name="comment">Ensure functionality of two-stream radiation option with nocomp-fixedbiogeo in FATES</option>
     </options>
   </test>
-  <test name="ERS_D_Ld3_PS" grid="f09_g17" compset="I2000Clm50FatesRsGs" testmods="clm/FatesCold">
+  <test name="ERS_D_Ld3_PS" grid="f09_t233" compset="I2000Clm50FatesRsGs" testmods="clm/FatesCold">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -3849,7 +3837,7 @@
       <option name="comment">Want one fates test on a large grid: Since FATES has cohorts, it has potential to be a massive memory consumer and netcdf array size maker, so the large grid test will help smoke out these types of issues (and it's a restart test to cover possible memory/netcdf size issues with the restart file).</option>
     </options>
   </test>
-  <test name="ERS_D_Ld5" grid="f45_f45_mg37" compset="I2000Clm50FatesRsGs" testmods="clm/FatesCold">
+  <test name="ERS_D_Ld5" grid="f45_f45_mt201" compset="I2000Clm50FatesRsGs" testmods="clm/FatesCold">
     <machines>
       <machine name="izumi" compiler="nag" category="fates"/>
       <machine name="izumi" compiler="nag" category="ctsm_release"/>
@@ -3859,7 +3847,7 @@
       <option name="comment">Want one simple FatesCold gridded test on a izumi using nag compiler.</option>
     </options>
   </test>
-  <test name="ERS_D_Ld5" grid="f10_f10_mg37" compset="I2000Clm50Fates" testmods="clm/FatesCold">
+  <test name="ERS_D_Ld5" grid="f10_f10_mt201" compset="I2000Clm50Fates" testmods="clm/FatesCold">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="fates"/>
@@ -3871,7 +3859,7 @@
       <option name="wallclock">00:40:00</option>
     </options>
   </test>
-  <test name="ERI_D_Ld20" grid="f10_f10_mg37" compset="I2000Clm50Fates" testmods="clm/FatesCold">
+  <test name="ERI_D_Ld20" grid="f10_f10_mt201" compset="I2000Clm50Fates" testmods="clm/FatesCold">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="fates"/>
@@ -3883,7 +3871,7 @@
       <option name="wallclock">00:50:00</option>
     </options>
   </test>
-  <test name="ERS_Ld397" grid="f10_f10_mg37" compset="I2000Clm50Fates" testmods="clm/FatesCold">
+  <test name="ERS_Ld397" grid="f10_f10_mt201" compset="I2000Clm50Fates" testmods="clm/FatesCold">
     <machines>
       <machine name="derecho" compiler="gnu" category="fates"/>
       <machine name="derecho" compiler="gnu" category="ctsm_release"/>
@@ -3893,7 +3881,7 @@
       <option name="comment">Present day restart test, 397 days in case year is Gregorian.</option>
     </options>
   </test>
-  <test name="ERS_Ld397" grid="f45_f45_mg37" compset="I2000Clm50Fates" testmods="clm/FatesColdNoComp">
+  <test name="ERS_Ld397" grid="f45_f45_mt201" compset="I2000Clm50Fates" testmods="clm/FatesColdNoComp">
     <machines>
       <machine name="derecho" compiler="intel" category="fates"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -3927,7 +3915,7 @@
       <option name="wallclock">00:20:00</option>
     </options>
   </test>
-  <test name="ERI_D_Ld9" grid="f45_f45_mg37" compset="I2000Clm60FatesSpCrujra" testmods="clm/FatesColdSatPhenCamLndTuningMode">
+  <test name="ERI_D_Ld9" grid="f45_f45_mt201" compset="I2000Clm60FatesSpCrujra" testmods="clm/FatesColdSatPhenCamLndTuningMode">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="gnu" category="fates"/>
@@ -3939,7 +3927,7 @@
       <option name="comment">No comment at this time</option>
     </options>
   </test>
-  <test name="ERS_D_Ld5" grid="f45_f45_mg37" compset="I2000Clm60Fates" testmods="clm/FatesColdCamLndTuningMode">
+  <test name="ERS_D_Ld5" grid="f45_f45_mt201" compset="I2000Clm60Fates" testmods="clm/FatesColdCamLndTuningMode">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="gnu" category="fates"/>
@@ -3951,7 +3939,7 @@
       <option name="comment">No comment at this time</option>
     </options>
   </test>
-  <test name="ERI_D_Ld9" grid="f45_f45_mg37" compset="I2000Clm60Fates" testmods="clm/FatesColdCamLndTuningMode">
+  <test name="ERI_D_Ld9" grid="f45_f45_mt201" compset="I2000Clm60Fates" testmods="clm/FatesColdCamLndTuningMode">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="gnu" category="fates"/>
@@ -3963,7 +3951,7 @@
       <option name="comment">No comment at this time</option>
     </options>
   </test>
-  <test name="SMS_D_Ld180" grid="f45_f45_mg37" compset="I2000Clm60Fates" testmods="clm/FatesColdTRS">
+  <test name="SMS_D_Ld180" grid="f45_f45_mt201" compset="I2000Clm60Fates" testmods="clm/FatesColdTRS">
     <machines>
       <machine name="derecho" compiler="intel" category="fates"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -3973,7 +3961,7 @@
       <option name="comment">FATES tree recruitment scheme smoke test</option>
     </options>
   </test>
-  <test name="ERS_Ld90" grid="f45_f45_mg37" compset="I2000Clm50FatesRsGs" testmods="clm/FatesColdTRSNoSeedDynamics">
+  <test name="ERS_Ld90" grid="f45_f45_mt201" compset="I2000Clm50FatesRsGs" testmods="clm/FatesColdTRSNoSeedDynamics">
     <machines>
       <machine name="derecho" compiler="gnu" category="fates"/>
       <machine name="derecho" compiler="gnu" category="ctsm_release"/>
@@ -3983,7 +3971,7 @@
       <option name="comment">ERS FATES test covering the Tree Recruitment Scheme without seed dynamics.</option>
     </options>
   </test>
-  <test name="SMS_D_Ld5" grid="f45_f45_mg37" compset="I2000Clm60Fates" testmods="clm/FatesADspinup--clm/nofireemis">
+  <test name="SMS_D_Ld5" grid="f45_f45_mt201" compset="I2000Clm60Fates" testmods="clm/FatesADspinup--clm/nofireemis">
     <machines>
       <machine name="izumi" compiler="nag" category="fates"/>
       <machine name="izumi" compiler="nag" category="ctsm_release"/>
@@ -3993,7 +3981,7 @@
       <option name="comment">Clm60Fates with ADspinup; nofireemis because Fates</option>
     </options>
   </test>
-  <test name="SMS_D_Ld5" grid="f45_f45_mg37" compset="I2000Clm60Fates" testmods="clm/FatesCold">
+  <test name="SMS_D_Ld5" grid="f45_f45_mt201" compset="I2000Clm60Fates" testmods="clm/FatesCold">
     <machines>
       <machine name="izumi" compiler="nag" category="aux_clm"/>
       <machine name="izumi" compiler="nag" category="prebeta"/>
@@ -4017,7 +4005,7 @@
       <option name="comment">Run a Fates test with latest Clm6_0</option>
     </options>
   </test>
-  <test name="SMS_D_Lm6_P256x1" grid="f45_f45_mg37" compset="I2000Clm50Fates" testmods="clm/FatesCold">
+  <test name="SMS_D_Lm6_P256x1" grid="f45_f45_mt201" compset="I2000Clm50Fates" testmods="clm/FatesCold">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -4026,7 +4014,7 @@
       <option name="wallclock">00:40:00</option>
     </options>
   </test>
-  <test name="SMS_D_Ld5" grid="f10_f10_mg37" compset="I2000Clm50Fates" testmods="clm/FatesCold">
+  <test name="SMS_D_Ld5" grid="f10_f10_mt201" compset="I2000Clm50Fates" testmods="clm/FatesCold">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="gnu" category="aux_clm"/>
@@ -4040,7 +4028,7 @@
       <option name="wallclock">00:20:00</option>
     </options>
   </test>
-  <test name="SMS_Ld5_PS" grid="f19_g17" compset="I2000Clm50Fates" testmods="clm/FatesCold">
+  <test name="SMS_Ld5_PS" grid="f19_t233" compset="I2000Clm50Fates" testmods="clm/FatesCold">
     <machines>
       <machine name="derecho" compiler="gnu" category="aux_clm"/>
       <machine name="derecho" compiler="gnu" category="ctsm_release"/>
@@ -4049,7 +4037,7 @@
       <option name="wallclock">00:40:00</option>
     </options>
   </test>
-  <test name="ERP_Ld9" grid="f45_f45_mg37" compset="I2000Clm50Fates" testmods="clm/FatesColdAllVars">
+  <test name="ERP_Ld9" grid="f45_f45_mt201" compset="I2000Clm50Fates" testmods="clm/FatesColdAllVars">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="fates"/>
@@ -4060,7 +4048,7 @@
       <option name="comment">ERP FATES test covering all standard FATES history variables.</option>
     </options>
   </test>
-  <test name="ERS_Ld30" grid="f45_f45_mg37" compset="I2000Clm50Fates" testmods="clm/FatesColdFixedBiogeo">
+  <test name="ERS_Ld30" grid="f45_f45_mt201" compset="I2000Clm50Fates" testmods="clm/FatesColdFixedBiogeo">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -4070,7 +4058,7 @@
       <option name="comment">30 day exact restart test for FATES fixed biogeography reduced complexity mode on an f45 grid.</option>
     </options>
   </test>
-  <test name="SMS_Ld5" grid="f10_f10_mg37" compset="I2000Clm50Fates" testmods="clm/FatesCold">
+  <test name="SMS_Ld5" grid="f10_f10_mt201" compset="I2000Clm50Fates" testmods="clm/FatesCold">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -4080,7 +4068,7 @@
       <option name="comment">60 day exact restart test providing coverage for the FATES logging mode on an f45 grid.</option>
     </options>
   </test>
-  <test name="ERS_Ld30" grid="f45_f45_mg37" compset="I2000Clm50Fates" testmods="clm/FatesColdSizeAgeMort">
+  <test name="ERS_Ld30" grid="f45_f45_mt201" compset="I2000Clm50Fates" testmods="clm/FatesColdSizeAgeMort">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -4090,7 +4078,7 @@
       <option name="comment">30 day exact restart test activating FATES size and age mortality mode on an f45 grid.</option>
     </options>
   </test>
-  <test name="ERP_P256x2_Ld30" grid="f45_f45_mg37" compset="I2000Clm60Fates" testmods="clm/mimicsFatesCold">
+  <test name="ERP_P256x2_Ld30" grid="f45_f45_mt201" compset="I2000Clm60Fates" testmods="clm/mimicsFatesCold">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="fates"/>
@@ -4101,7 +4089,7 @@
       <option name="comment">30 day exact restart test with threading, running FATES-MIMICS on an f45 grid.</option>
     </options>
   </test>
-  <test name="SMS_D_Ld5" grid="f10_f10_mg37" compset="I2000Clm50BgcCrop" testmods="clm/irrig_alternate">
+  <test name="SMS_D_Ld5" grid="f10_f10_mt201" compset="I2000Clm50BgcCrop" testmods="clm/irrig_alternate">
     <machines>
       <machine name="izumi" compiler="nag" category="aux_clm"/>
       <machine name="izumi" compiler="nag" category="ctsm_release"/>
@@ -4111,7 +4099,7 @@
       <option name="comment">Debug test covering some non-default irrigation options.</option>
     </options>
   </test>
-  <test name="SMS_D_Ld10" grid="f10_f10_mg37" compset="I2000Clm50BgcCrop" testmods="clm/tracer_consistency">
+  <test name="SMS_D_Ld10" grid="f10_f10_mt201" compset="I2000Clm50BgcCrop" testmods="clm/tracer_consistency">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -4121,7 +4109,7 @@
       <option name="comment">Include a tracer consistency check in debug mode.</option>
     </options>
   </test>
-  <test name="LWISO_Ld10" grid="f10_f10_mg37" compset="I2000Clm50BgcCrop" testmods="clm/coldStart">
+  <test name="LWISO_Ld10" grid="f10_f10_mt201" compset="I2000Clm50BgcCrop" testmods="clm/coldStart">
     <machines>
       <machine name="derecho" compiler="gnu" category="aux_clm"/>
       <machine name="derecho" compiler="gnu" category="ctsm_release"/>
@@ -4131,7 +4119,7 @@
       <option name="comment">Ensure that turning on water tracers doesn't change answers. Cold start for now, until we can use initial conditions from a non-isotope case in an isotope case; once we can do that, this should be changed to not be cold start (e.g., 5-day decStart transient test: see also https://github.com/ESCOMP/ctsm/issues/495#issuecomment-516619853).</option>
     </options>
   </test>
-  <test name="ERP_P64x2_D_Ld5" grid="f10_f10_mg37" compset="I2000Ctsm50NwpSpGswpGs" testmods="clm/default--clm/nofireemis">
+  <test name="ERP_P64x2_D_Ld5" grid="f10_f10_mt201" compset="I2000Ctsm50NwpSpGswpGs" testmods="clm/default--clm/nofireemis">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -4165,37 +4153,37 @@
       <option name="comment">Include a short smoke test covering the nldas2 grid and the I2000Ctsm50NwpSpNldasRsGs compset, which uses NLDAS datm forcing.</option>
     </options>
   </test>
-  <test name="ERP_D_Ld3" grid="f19_g17" compset="I2000Clm50FatesRsGs" testmods="clm/FatesCold">
+  <test name="ERP_D_Ld3" grid="f19_t233" compset="I2000Clm50FatesRsGs" testmods="clm/FatesCold">
     <machines>
       <machine name="derecho" compiler="intel" category="fates"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
     </machines>
     <options>
       <option name="wallclock">00:20:00</option>
-      <option name="comment">Short ERP debug FATES test for f19_g17 grid.</option>
+      <option name="comment">Short ERP debug FATES test for f19_t233 grid.</option>
     </options>
   </test>
-  <test name="ERP_D_P128x2_Ld3" grid="f19_g17" compset="I2000Clm50Fates" testmods="clm/FatesCold">
+  <test name="ERP_D_P128x2_Ld3" grid="f19_t233" compset="I2000Clm50Fates" testmods="clm/FatesCold">
     <machines>
       <machine name="derecho" compiler="intel" category="fates"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
     </machines>
     <options>
       <option name="wallclock">00:20:00</option>
-      <option name="comment">Short ERP debug threading FATES test for f19_g17 grid with modified task layout.</option>
+      <option name="comment">Short ERP debug threading FATES test for f19_t233 grid with modified task layout.</option>
     </options>
   </test>
-  <test name="ERP_Ld3" grid="f09_g17" compset="I2000Clm50Fates" testmods="clm/FatesCold">
+  <test name="ERP_Ld3" grid="f09_t233" compset="I2000Clm50Fates" testmods="clm/FatesCold">
     <machines>
       <machine name="derecho" compiler="intel" category="fates"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
     </machines>
     <options>
       <option name="wallclock">00:20:00</option>
-      <option name="comment">Short ERP FATES test for f09_g17 grid.</option>
+      <option name="comment">Short ERP FATES test for f09_t233 grid.</option>
     </options>
   </test>
-  <test name="ERP_Ld90" grid="f45_f45_mg37" compset="I2000Clm60Fates" testmods="clm/FatesColdCStarvationExp">
+  <test name="ERP_Ld90" grid="f45_f45_mt201" compset="I2000Clm60Fates" testmods="clm/FatesColdCStarvationExp">
     <machines>
       <machine name="derecho" compiler="intel" category="fates"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -4205,7 +4193,7 @@
       <option name="comment">ERP FATES test covering FATES exponential carbon starvation (non-default)</option>
     </options>
   </test>
-  <test name="ERP_D_Ld90" grid="f45_f45_mg37" compset="I2000Clm60Fates" testmods="clm/FatesColdCStarvationExp">
+  <test name="ERP_D_Ld90" grid="f45_f45_mt201" compset="I2000Clm60Fates" testmods="clm/FatesColdCStarvationExp">
     <machines>
       <machine name="izumi" compiler="nag" category="fates"/>
       <machine name="izumi" compiler="nag" category="ctsm_release"/>
@@ -4215,7 +4203,7 @@
       <option name="comment">ERP_D FATES test covering FATES exponential carbon starvation (non-default), where the debug option _D allows the test to pass on izumi_nag</option>
     </options>
   </test>
-  <test name="ERS_D_Ld30" grid="f45_f45_mg37" compset="I2000Clm50Fates" testmods="clm/FatesColdPRT2">
+  <test name="ERS_D_Ld30" grid="f45_f45_mt201" compset="I2000Clm50Fates" testmods="clm/FatesColdPRT2">
     <machines>
       <machine name="derecho" compiler="intel" category="fates"/>
       <machine name="izumi" compiler="nag" category="fates"/>
@@ -4227,7 +4215,7 @@
       <option name="comment">Exact restart debug test covering Fates CNP nutrients mode (P still prescribed in clm).</option>
     </options>
   </test>
-  <test name="ERS_D_Ld30" grid="f45_f45_mg37" compset="I2000Clm60Fates" testmods="clm/FatesColdPRT2_suplnAll">
+  <test name="ERS_D_Ld30" grid="f45_f45_mt201" compset="I2000Clm60Fates" testmods="clm/FatesColdPRT2_suplnAll">
     <machines>
       <machine name="derecho" compiler="intel" category="fates"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -4237,7 +4225,7 @@
       <option name="comment">Exact restart debug test covering Fates CNP nutrients mode with suplnitro set to ALL.</option>
     </options>
   </test>
-  <test name="ERS_D_Ld30" grid="f45_f45_mg37" compset="I2000Clm60Fates" testmods="clm/FatesColdPRT2_synthN">
+  <test name="ERS_D_Ld30" grid="f45_f45_mt201" compset="I2000Clm60Fates" testmods="clm/FatesColdPRT2_synthN">
     <machines>
       <machine name="derecho" compiler="intel" category="fates"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -4247,7 +4235,7 @@
       <option name="comment">Exact restart debug test covering Fates CNP nutrients mode with both P and N prescribed to replicate what happened before the CLM-FATES-CN coupling.</option>
     </options>
   </test>
-  <test name="ERS_D_Ld30" grid="f45_f45_mg37" compset="HIST_DATM%CRUv7_CLM50%FATES_SICE_SOCN_SROF_SGLC_SWAV_SESP" testmods="clm/FatesColdLandUse">
+  <test name="ERS_D_Ld30" grid="f45_f45_mt201" compset="HIST_DATM%CRUv7_CLM50%FATES_SICE_SOCN_SROF_SGLC_SWAV_SESP" testmods="clm/FatesColdLandUse">
     <machines>
       <machine name="derecho" compiler="intel" category="fates"/>
       <machine name="izumi" compiler="nag" category="fates"/>
@@ -4258,7 +4246,7 @@
       <option name="wallclock">00:40:00</option>
     </options>
   </test>
-  <test name="ERS_D_Ld30" grid="f45_f45_mg37" compset="I2000Clm50Fates" testmods="clm/FatesColdLUH2">
+  <test name="ERS_D_Ld30" grid="f45_f45_mt201" compset="I2000Clm50Fates" testmods="clm/FatesColdLUH2">
     <machines>
       <machine name="derecho" compiler="intel" category="fates"/>
       <machine name="derecho" compiler="intel" category="fates-landuse"/>
@@ -4270,7 +4258,7 @@
       <option name="wallclock">00:40:00</option>
     </options>
   </test>
-  <test name="ERS_D_Ld30" grid="f45_f45_mg37" compset="I2000Clm50FatesRsGs" testmods="clm/FatesColdLUH2HarvestArea">
+  <test name="ERS_D_Ld30" grid="f45_f45_mt201" compset="I2000Clm50FatesRsGs" testmods="clm/FatesColdLUH2HarvestArea">
     <machines>
       <machine name="derecho" compiler="intel" category="fates"/>
       <machine name="derecho" compiler="intel" category="fates-landuse"/>
@@ -4280,7 +4268,7 @@
       <option name="wallclock">00:40:00</option>
     </options>
   </test>
-  <test name="ERS_D_Ld30" grid="f45_f45_mg37" compset="I2000Clm50FatesRsGs" testmods="clm/FatesColdLUH2HarvestMass">
+  <test name="ERS_D_Ld30" grid="f45_f45_mt201" compset="I2000Clm50FatesRsGs" testmods="clm/FatesColdLUH2HarvestMass">
     <machines>
       <machine name="derecho" compiler="intel" category="fates"/>
       <machine name="derecho" compiler="intel" category="fates-landuse"/>
@@ -4290,7 +4278,7 @@
       <option name="wallclock">00:40:00</option>
     </options>
   </test>
-  <test name="PVT_Lm3" grid="f45_f45_mg37" compset="I2000Clm50Fates" testmods="clm/FatesLUPFT">
+  <test name="PVT_Lm3" grid="f45_f45_mt201" compset="I2000Clm50Fates" testmods="clm/FatesLUPFT">
     <machines>
       <machine name="derecho" compiler="intel" category="fates"/>
       <machine name="derecho" compiler="intel" category="fates-landuse"/>
@@ -4301,7 +4289,7 @@
       <option name="comment">FATES land use potential vegetation spin-up to transient run mode test</option>
     </options>
   </test>
-  <test name="ERS_D_Ld3" grid="f19_g17" compset="I2000Clm50FatesRsGs" testmods="clm/FatesCold">
+  <test name="ERS_D_Ld3" grid="f19_t233" compset="I2000Clm50FatesRsGs" testmods="clm/FatesCold">
     <machines>
       <machine name="derecho" compiler="intel" category="fates"/>
       <machine name="derecho" compiler="gnu" category="fates"/>
@@ -4310,10 +4298,10 @@
     </machines>
     <options>
       <option name="wallclock">00:40:00</option>
-      <option name="comment">Exact restart debug FATES test covering for the f19_g17 grid resolution.</option>
+      <option name="comment">Exact restart debug FATES test covering for the f19_t233 grid resolution.</option>
     </options>
   </test>
-  <test name="ERS_D_Ld5" grid="f19_g17" compset="I2000Clm50Bgc" testmods="clm/default">
+  <test name="ERS_D_Ld5" grid="f19_t233" compset="I2000Clm50Bgc" testmods="clm/default">
     <machines>
       <machine name="derecho" compiler="intel" category="fates"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -4335,7 +4323,7 @@
       <option name="comment">Short ERP debug FATES test for single site grid with serial mpi.</option>
     </options>
   </test>
-  <test name="ERS_Ld9" grid="f10_f10_mg37" compset="I2000Clm50FatesRsGs" testmods="clm/FatesColdCH4Off">
+  <test name="ERS_Ld9" grid="f10_f10_mt201" compset="I2000Clm50FatesRsGs" testmods="clm/FatesColdCH4Off">
     <machines>
       <machine name="derecho" compiler="intel" category="fates"/>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
@@ -4372,7 +4360,7 @@
       <option name="comment">Short exact restart debug test for single site grid with coverage for FATES Hydro. Bypasses grid level mass checks.</option>
     </options>
   </test>
-  <test name="ERI_Ld60" grid="f45_f45_mg37" compset="I2000Clm50FatesRsGs" testmods="clm/Fates">
+  <test name="ERI_Ld60" grid="f45_f45_mt201" compset="I2000Clm50FatesRsGs" testmods="clm/Fates">
     <machines>
       <machine name="derecho" compiler="intel" category="fates"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -4382,7 +4370,7 @@
       <option name="comment">60 day exact restart FATES test on f45 grid.</option>
     </options>
   </test>
-  <test name="ERS_Ld60" grid="f45_f45_mg37" compset="I2000Clm50FatesRsGs" testmods="clm/FatesColdNoFire">
+  <test name="ERS_Ld60" grid="f45_f45_mt201" compset="I2000Clm50FatesRsGs" testmods="clm/FatesColdNoFire">
     <machines>
       <machine name="derecho" compiler="intel" category="fates"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -4392,7 +4380,7 @@
       <option name="comment">60 day exact restart test that turns off all fire (both FATES and CLM) on an f45 grid.</option>
     </options>
   </test>
-  <test name="ERS_Ld60" grid="f45_f45_mg37" compset="I2000Clm60Fates" testmods="clm/FatesColdManagedFire">
+  <test name="ERS_Ld60" grid="f45_f45_mt201" compset="I2000Clm60Fates" testmods="clm/FatesColdManagedFire">
     <machines>
       <machine name="derecho" compiler="intel" category="fates"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -4402,7 +4390,7 @@
       <option name="comment">60 day exact restart test that turns on FATES managed fire on an f45 grid.</option>
     </options>
   </test>
-  <test name="ERS_Ld60" grid="f45_f45_mg37" compset="I2000Clm50FatesRsGs" testmods="clm/FatesColdST3">
+  <test name="ERS_Ld60" grid="f45_f45_mt201" compset="I2000Clm50FatesRsGs" testmods="clm/FatesColdST3">
     <machines>
       <machine name="derecho" compiler="intel" category="fates"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -4412,7 +4400,7 @@
       <option name="comment">60 day exact restart test activating FATES static stand structure on an f45 grid.</option>
     </options>
   </test>
-  <test name="ERS_Ld60" grid="f45_f45_mg37" compset="I2000Clm50FatesRsGs" testmods="clm/FatesColdPPhys">
+  <test name="ERS_Ld60" grid="f45_f45_mt201" compset="I2000Clm50FatesRsGs" testmods="clm/FatesColdPPhys">
     <machines>
       <machine name="derecho" compiler="intel" category="fates"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -4422,7 +4410,7 @@
       <option name="comment">60 day exact restart test activating FATES prescribed physiology mode on an f45 grid.</option>
     </options>
   </test>
-  <test name="ERS_Ld30" grid="f45_f45_mg37" compset="I2000Clm50FatesRsGs" testmods="clm/FatesColdFixedBiogeo">
+  <test name="ERS_Ld30" grid="f45_f45_mt201" compset="I2000Clm50FatesRsGs" testmods="clm/FatesColdFixedBiogeo">
     <machines>
       <machine name="derecho" compiler="intel" category="fates"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -4431,7 +4419,7 @@
       <option name="wallclock">00:40:00</option>
     </options>
   </test>
-  <test name="ERS_Ld30" grid="f45_f45_mg37" compset="I2000Clm50FatesRsGs" testmods="clm/FatesColdNoComp">
+  <test name="ERS_Ld30" grid="f45_f45_mt201" compset="I2000Clm50FatesRsGs" testmods="clm/FatesColdNoComp">
     <machines>
       <machine name="derecho" compiler="intel" category="fates"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -4440,7 +4428,7 @@
       <option name="wallclock">00:40:00</option>
     </options>
   </test>
-  <test name="ERS_Ld30" grid="f45_f45_mg37" compset="I2000Clm50FatesRsGs" testmods="clm/FatesColdNoCompFixedBioGeo">
+  <test name="ERS_Ld30" grid="f45_f45_mt201" compset="I2000Clm50FatesRsGs" testmods="clm/FatesColdNoCompFixedBioGeo">
     <machines>
       <machine name="derecho" compiler="intel" category="fates"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -4449,7 +4437,7 @@
       <option name="wallclock">00:40:00</option>
     </options>
   </test>
-  <test name="ERS_D_Ld10" grid="f45_f45_mg37" compset="I2000Clm50FatesRsGs" testmods="clm/FatesColdNoCompInitDbh">
+  <test name="ERS_D_Ld10" grid="f45_f45_mt201" compset="I2000Clm50FatesRsGs" testmods="clm/FatesColdNoCompInitDbh">
     <machines>
       <machine name="derecho" compiler="intel" category="fates"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -4494,7 +4482,7 @@
        </options>
        </test> -->
 
-  <test name="SMS_D_Ld3" grid="f09_g17" compset="I2000Clm60FatesSpCrujra" testmods="clm/FatesColdSatPhen_prescribed">
+  <test name="SMS_D_Ld3" grid="f09_t233" compset="I2000Clm60FatesSpCrujra" testmods="clm/FatesColdSatPhen_prescribed">
     <machines>
       <machine name="derecho" compiler="gnu" category="fates"/>
       <machine name="derecho" compiler="gnu" category="ctsm_release"/>
@@ -4504,7 +4492,7 @@
       <option name="comment">Test with prescribed LAI and soil moisture with FatesSp mode</option>
     </options>
   </test>
-  <test name="SMS_Lm1" grid="f45_f45_mg37" compset="I2000Clm60FatesSpCrujra" testmods="clm/FatesColdDailyHist">
+  <test name="SMS_Lm1" grid="f45_f45_mt201" compset="I2000Clm60FatesSpCrujra" testmods="clm/FatesColdDailyHist">
     <machines>
       <machine name="derecho" compiler="intel" category="fates"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -4514,7 +4502,7 @@
       <option name="comment">Smoke test that uses just the FatesSp compset.</option>
     </options>
   </test>
-  <test name="ERS_Ld30" grid="f45_f45_mg37" compset="I2000Clm60FatesSpCrujra" testmods="clm/FatesColdDailyHist">
+  <test name="ERS_Ld30" grid="f45_f45_mt201" compset="I2000Clm60FatesSpCrujra" testmods="clm/FatesColdDailyHist">
     <machines>
       <machine name="derecho" compiler="intel" category="fates"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -4524,7 +4512,7 @@
       <option name="comment">30 day exact restart test for FATES fixed biogeography reduced complexity mode on an f45 grid.</option>
     </options>
   </test>
-  <test name="ERP_P128x2_Ld30" grid="f45_f45_mg37" compset="I2000Clm60FatesSpCrujraRsGs" testmods="clm/FatesColdDailyHist">
+  <test name="ERP_P128x2_Ld30" grid="f45_f45_mt201" compset="I2000Clm60FatesSpCrujraRsGs" testmods="clm/FatesColdDailyHist">
     <machines>
       <machine name="derecho" compiler="intel" category="fates"/>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
@@ -4536,7 +4524,7 @@
       <option name="comment">30 day exact restart test with threading for FATES fixed biogeography reduced complexity mode on an f45 grid.</option>
     </options>
   </test>
-  <test name="ERS_Ld60" grid="f45_f45_mg37" compset="I2000Clm50FatesRsGs" testmods="clm/FatesColdLogging">
+  <test name="ERS_Ld60" grid="f45_f45_mt201" compset="I2000Clm50FatesRsGs" testmods="clm/FatesColdLogging">
     <machines>
       <machine name="derecho" compiler="intel" category="fates"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -4546,7 +4534,7 @@
       <option name="comment">60 day exact restart test providing coverage for the FATES logging mode on an f45 grid.</option>
     </options>
   </test>
-  <test name="ERS_Ld30" grid="f45_f45_mg37" compset="I2000Clm50FatesRsGs" testmods="clm/FatesColdSizeAgeMort">
+  <test name="ERS_Ld30" grid="f45_f45_mt201" compset="I2000Clm50FatesRsGs" testmods="clm/FatesColdSizeAgeMort">
     <machines>
       <machine name="derecho" compiler="intel" category="fates"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -4556,7 +4544,7 @@
       <option name="comment">30 day exact restart test activating FATES size and age mortality mode on an f45 grid.</option>
     </options>
   </test>
-  <test name="SMS_Lm6" grid="f45_f45_mg37" compset="I2000Clm50FatesRsGs" testmods="clm/Fates">
+  <test name="SMS_Lm6" grid="f45_f45_mt201" compset="I2000Clm50FatesRsGs" testmods="clm/Fates">
     <machines>
       <machine name="derecho" compiler="intel" category="fates"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -4588,7 +4576,7 @@
       <option name="comment">12 month exact restart FATES single site debug test covering anthropogenic fire ignition mode.</option>
     </options>
   </test>
-  <test name="SMS_Lm1" grid="f10_f10_mg37" compset="I1850Clm60BgcCropCmip6waccm" testmods="clm/basic">
+  <test name="SMS_Lm1" grid="f10_f10_mt201" compset="I1850Clm60BgcCropCmip6waccm" testmods="clm/basic">
     <machines>
       <machine name="derecho" compiler="gnu" category="aux_clm"/>
       <machine name="derecho" compiler="gnu" category="prebeta"/>
@@ -4599,7 +4587,7 @@
       <option name="comment">The main point of this test is simply to make sure that the CMIP6WACCMDECK modifier works. (This configuration is basically the same as I1850Clm60BgcCropCmip6, but without cmip6_glaciers_virtual_antarctica - so we don't need huge coverage of this.) Month-long so that we actually get some history output (because this test exercises a usermods directory with only monthly and yearly output).</option>
     </options>
   </test>
-  <test name="SMS_Lm1" grid="f19_g17" compset="I1850Clm60BgcCropCmip6waccm" testmods="clm/basic">
+  <test name="SMS_Lm1" grid="f19_t233" compset="I1850Clm60BgcCropCmip6waccm" testmods="clm/basic">
     <machines>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -4610,7 +4598,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.)</option>
     </options>
   </test>
-  <test name="SMS_Lm1_D" grid="f10_f10_mg37" compset="I1850Clm50BgcCrop" testmods="clm/output_crop_highfreq">
+  <test name="SMS_Lm1_D" grid="f10_f10_mt201" compset="I1850Clm50BgcCrop" testmods="clm/output_crop_highfreq">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -4685,7 +4673,7 @@
     </options>
   </test>
 
-  <test name="MKSURFDATAESMF_P128x1" grid="f10_f10_mg37" compset="I1850Clm50BgcCrop">
+  <test name="MKSURFDATAESMF_P128x1" grid="f10_f10_mt201" compset="I1850Clm50BgcCrop">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="clm_pymods"/>
@@ -4739,7 +4727,7 @@
     </options>
   </test>
 
-  <test name="LILACSMOKE_D_Ld2" grid="f10_f10_mg37" compset="I2000Ctsm50NwpSpAsRsGs" testmods="clm-lilac">
+  <test name="LILACSMOKE_D_Ld2" grid="f10_f10_mt201" compset="I2000Ctsm50NwpSpAsRsGs" testmods="clm-lilac">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="prealpha"/>
@@ -4752,7 +4740,7 @@
     </options>
   </test>
 
-  <test name="SMS_D_Ln1" grid="f10_f10_mg37" compset="I2000Clm50BgcCropQianRsGs" testmods="clm-run_self_tests">
+  <test name="SMS_D_Ln1" grid="f10_f10_mt201" compset="I2000Clm50BgcCropQianRsGs" testmods="clm-run_self_tests">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -4800,7 +4788,7 @@
       <option name="comment">Science test of mizuRoute for the USGS grid over the NLDAS contenential US region, for longer 5 months</option>
     </options>
   </test>
-  <test name="PET_Ld10_P256x8" grid="f19_f19_mg17" compset="I2000Clm60SpMiz" testmods="mizuroute-default">
+  <test name="PET_Ld10_P256x8" grid="f19_f19_mt233" compset="I2000Clm60SpMiz" testmods="mizuroute-default">
     <machines>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -4810,7 +4798,7 @@
       <option name="comment">Science test of mizuRoute at 2 degree with the r05 grid, changing processors with threading on</option>
     </options>
   </test>
-  <test name="ERS_Ld10" grid="f09_f09_mg17" compset="I2000Clm60SpMiz" testmods="mizuroute-default">
+  <test name="ERS_Ld10" grid="f09_f09_mt233" compset="I2000Clm60SpMiz" testmods="mizuroute-default">
     <machines>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -4970,7 +4958,7 @@
     </options>
   </test>
 
-  <test name="LGRAIN2_Ly1_P128x1" grid="f10_f10_mg37" compset="I1850Clm50BgcCrop" testmods="clm/ciso--clm/cropMonthOutput">
+  <test name="LGRAIN2_Ly1_P128x1" grid="f10_f10_mt201" compset="I1850Clm50BgcCrop" testmods="clm/ciso--clm/cropMonthOutput">
     <machines>
       <machine name="derecho" compiler="gnu" category="aux_clm"/>
       <machine name="derecho" compiler="gnu" category="ctsm_release"/>
@@ -4980,7 +4968,7 @@
       <option name="comment">Ensure that it works to have a second grain pool, and that we can get bit-for-bit identical answers with a standard run with just one grain pool. This tests infrastructure that will be needed when incorporating AgSys. This test can be dropped once we have some tests exercising AgSys (which will exercise this code).</option>
     </options>
   </test>
-  <test name="LREPRSTRUCT_Ly1_P128x1" grid="f10_f10_mg37" compset="I1850Clm50BgcCrop" testmods="clm/ciso--clm/cropMonthOutput">
+  <test name="LREPRSTRUCT_Ly1_P128x1" grid="f10_f10_mt201" compset="I1850Clm50BgcCrop" testmods="clm/ciso--clm/cropMonthOutput">
     <machines>
       <machine name="derecho" compiler="gnu" category="aux_clm"/>
       <machine name="derecho" compiler="gnu" category="ctsm_release"/>
@@ -4991,7 +4979,7 @@
     </options>
   </test>
 
-  <test name="REUSEINITFILES_D_Ld1" grid="f10_f10_mg37" compset="I1850Clm50BgcCrop" testmods="clm/default">
+  <test name="REUSEINITFILES_D_Ld1" grid="f10_f10_mt201" compset="I1850Clm50BgcCrop" testmods="clm/default">
     <machines>
       <machine name="derecho" compiler="gnu" category="aux_clm"/>
       <machine name="derecho" compiler="gnu" category="ctsm_release"/>
@@ -5002,7 +4990,7 @@
     </options>
   </test>
 
-  <test name="FUNITCTSM_P1x1" grid="f10_f10_mg37" compset="I2000Clm50Sp">
+  <test name="FUNITCTSM_P1x1" grid="f10_f10_mt201" compset="I2000Clm50Sp">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="prealpha"/>
@@ -5029,7 +5017,7 @@
     </options>
   </test>
 
-  <test name="RXCROPMATURITY_Lm61" grid="f10_f10_mg37" compset="IHistClm60BgcCrop" testmods="clm/cropMonthOutput">
+  <test name="RXCROPMATURITY_Lm61" grid="f10_f10_mt201" compset="IHistClm60BgcCrop" testmods="clm/cropMonthOutput">
     <machines>
       <machine name="derecho" compiler="intel" category="rxcropmaturity"/>
       <machine name="derecho" compiler="intel" category="crop_calendars"/>
@@ -5042,7 +5030,7 @@
     </options>
   </test>
 
-  <test name="RXCROPMATURITYSKIPGEN_Ld1097" grid="f10_f10_mg37" compset="IHistClm60BgcCrop" testmods="clm/cropMonthOutput">
+  <test name="RXCROPMATURITYSKIPGEN_Ld1097" grid="f10_f10_mt201" compset="IHistClm60BgcCrop" testmods="clm/cropMonthOutput">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="rxcropmaturity"/>
@@ -5055,7 +5043,7 @@
     </options>
   </test>
 
-  <test name="ERP_D_P64x2_Ld10" grid="f10_f10_mg37" compset="I2000Clm60Bgc" testmods="clm/Hillslope">
+  <test name="ERP_D_P64x2_Ld10" grid="f10_f10_mt201" compset="I2000Clm60Bgc" testmods="clm/Hillslope">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="hillslope"/>
@@ -5066,7 +5054,7 @@
     </options>
   </test>
 
-  <test name="SMS_D_Ld3" grid="f10_f10_mg37" compset="I1850Clm60Bgc" testmods="clm/HillslopeFromFile">
+  <test name="SMS_D_Ld3" grid="f10_f10_mt201" compset="I1850Clm60Bgc" testmods="clm/HillslopeFromFile">
     <machines>
       <machine name="derecho" compiler="intel" category="hillslope"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -5102,7 +5090,7 @@
     </options>
   </test>
 
-  <test name="SMS_D_Ld3" grid="f10_f10_mg37" compset="I2000Clm60Bgc" testmods="clm/HillslopeD">
+  <test name="SMS_D_Ld3" grid="f10_f10_mt201" compset="I2000Clm60Bgc" testmods="clm/HillslopeD">
     <machines>
       <machine name="izumi" compiler="nag" category="aux_clm"/>
       <machine name="izumi" compiler="nag" category="hillslope"/>
@@ -5113,7 +5101,7 @@
     </options>
   </test>
 
-  <test name="SMS_D_Ld65" grid="f10_f10_mg37" compset="I2000Clm50BgcCrop" testmods="clm/FireLi2021GSWP">
+  <test name="SMS_D_Ld65" grid="f10_f10_mt201" compset="I2000Clm50BgcCrop" testmods="clm/FireLi2021GSWP">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="fire"/>
@@ -5124,7 +5112,7 @@
     </options>
   </test>
 
-  <test name="SMS_D_Ld65" grid="f10_f10_mg37" compset="I2000Clm60BgcCrop" testmods="clm/FireLi2024GSWP">
+  <test name="SMS_D_Ld65" grid="f10_f10_mt201" compset="I2000Clm60BgcCrop" testmods="clm/FireLi2024GSWP">
     <machines>
       <machine name="izumi" compiler="nag" category="aux_clm"/>
       <machine name="izumi" compiler="nag" category="fire"/>
@@ -5135,7 +5123,7 @@
     </options>
   </test>
 
-  <test name="SMS_Ld733" grid="f10_f10_mg37" compset="IHistClm60BgcCrop" testmods="clm/cropMonthOutput--clm/RxCropCalsNoAdapt">
+  <test name="SMS_Ld733" grid="f10_f10_mt201" compset="IHistClm60BgcCrop" testmods="clm/cropMonthOutput--clm/RxCropCalsNoAdapt">
     <machines>
       <machine name="derecho" compiler="intel" category="crop_calendars"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -5146,7 +5134,7 @@
     </options>
   </test>
 
-  <test name="SMS_D_Ld733" grid="f10_f10_mg37" compset="IHistClm60BgcCrop" testmods="clm/cropMonthOutput--clm/RxCropCalsAdaptGGCMI">
+  <test name="SMS_D_Ld733" grid="f10_f10_mt201" compset="IHistClm60BgcCrop" testmods="clm/cropMonthOutput--clm/RxCropCalsAdaptGGCMI">
     <machines>
       <machine name="derecho" compiler="intel" category="crop_calendars"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -5157,7 +5145,7 @@
     </options>
   </test>
 
-  <test name="SMS_D_Ld65" grid="f10_f10_mg37" compset="IHistClm60BgcCrop" testmods="clm/cropMonthOutput--clm/RxCropCalsAdaptGGCMI">
+  <test name="SMS_D_Ld65" grid="f10_f10_mt201" compset="IHistClm60BgcCrop" testmods="clm/cropMonthOutput--clm/RxCropCalsAdaptGGCMI">
     <machines>
       <machine name="izumi" compiler="nag" category="crop_calendars"/>
       <machine name="izumi" compiler="nag" category="aux_clm"/>
@@ -5168,7 +5156,7 @@
     </options>
   </test>
 
-  <test name="ERP_D_P128x1_Ld26" grid="f10_f10_mg37" compset="IHistClm60BgcCrop" testmods="clm/crop--clm/midDecStart--clm/RxCropCalsAdaptGGCMI">
+  <test name="ERP_D_P128x1_Ld26" grid="f10_f10_mt201" compset="IHistClm60BgcCrop" testmods="clm/crop--clm/midDecStart--clm/RxCropCalsAdaptGGCMI">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="crop_calendars"/>
@@ -5179,7 +5167,7 @@
     </options>
   </test>
 
-  <test name="PEM_D_P128x1_Ld26" grid="f10_f10_mg37" compset="IHistClm60BgcCrop" testmods="clm/crop--clm/midDecStart--clm/RxCropCalsAdaptGGCMI">
+  <test name="PEM_D_P128x1_Ld26" grid="f10_f10_mt201" compset="IHistClm60BgcCrop" testmods="clm/crop--clm/midDecStart--clm/RxCropCalsAdaptGGCMI">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="crop_calendars"/>
@@ -5191,7 +5179,7 @@
     </options>
   </test>
 
-  <test name="SMS_Ld65" grid="f10_f10_mg37" compset="IHistClm60BgcCrop" testmods="clm/GddGen">
+  <test name="SMS_Ld65" grid="f10_f10_mt201" compset="IHistClm60BgcCrop" testmods="clm/GddGen">
     <machines>
       <machine name="derecho" compiler="intel" category="crop_calendars"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -5202,7 +5190,7 @@
     </options>
   </test>
 
-  <test name="SMS_Ld65" grid="f10_f10_mg37" compset="IHistClm60BgcCrop" testmods="clm/GddGen--clm/StreamGdd20Seasons">
+  <test name="SMS_Ld65" grid="f10_f10_mt201" compset="IHistClm60BgcCrop" testmods="clm/GddGen--clm/StreamGdd20Seasons">
     <machines>
       <machine name="derecho" compiler="intel" category="crop_calendars"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -5213,7 +5201,7 @@
     </options>
   </test>
 
-  <test name="SMS_Lm37" grid="f10_f10_mg37" compset="IHistClm50BgcCrop" testmods="clm/cropMonthOutput--clm/oldCropCals">
+  <test name="SMS_Lm37" grid="f10_f10_mt201" compset="IHistClm50BgcCrop" testmods="clm/cropMonthOutput--clm/oldCropCals">
     <machines>
       <machine name="derecho" compiler="intel" category="crop_calendars"/>
       <machine name="derecho" compiler="intel" category="ctsm_release"/>
@@ -5224,7 +5212,7 @@
     </options>
   </test>
 
-  <test name="SMS_Ld32" grid="f10_f10_mg37" compset="IHistClm50BgcCrop" testmods="clm/crop--clm/oldCropCals">
+  <test name="SMS_Ld32" grid="f10_f10_mt201" compset="IHistClm50BgcCrop" testmods="clm/crop--clm/oldCropCals">
     <machines>
       <machine name="derecho" compiler="gnu" category="crop_calendars"/>
       <machine name="derecho" compiler="gnu" category="ctsm_release"/>
@@ -5235,7 +5223,7 @@
     </options>
   </test>
 
-  <test name="SETPARAMFILE_Ld5" grid="f10_f10_mg37" compset="I1850Clm60BgcCrujra" testmods="clm/default">
+  <test name="SETPARAMFILE_Ld5" grid="f10_f10_mt201" compset="I1850Clm60BgcCrujra" testmods="clm/default">
     <machines>
       <machine name="derecho" compiler="gnu" category="aux_clm"/>
       <machine name="derecho" compiler="gnu" category="clm_pymods"/>
@@ -5246,7 +5234,7 @@
     </options>
   </test>
 
-  <test name="SMS_Ld5" grid="f10_f10_mg37" compset="IHistClm60BgcCrop" testmods="clm/default">
+  <test name="SMS_Ld5" grid="f10_f10_mt201" compset="IHistClm60BgcCrop" testmods="clm/default">
     <machines>
       <machine name="derecho" compiler="gnu" category="interim_restart"/>
       <machine name="derecho" compiler="gnu" category="ctsm_release"/>
@@ -5258,7 +5246,7 @@
     </options>
   </test>
 
-  <test name="ERR_Ld7" grid="f10_f10_mg37" compset="IHistClm60BgcCrop" testmods="clm/default">
+  <test name="ERR_Ld7" grid="f10_f10_mt201" compset="IHistClm60BgcCrop" testmods="clm/default">
     <machines>
       <machine name="derecho" compiler="gnu" category="aux_clm"/>
       <machine name="derecho" compiler="gnu" category="interim_restart"/>
@@ -5270,7 +5258,7 @@
     </options>
   </test>
 
-  <test name="ERR_Ld7" grid="f10_f10_mg37" compset="I2000Clm50BgcCropRtm" testmods="clm/default">
+  <test name="ERR_Ld7" grid="f10_f10_mt201" compset="I2000Clm50BgcCropRtm" testmods="clm/default">
     <machines>
       <machine name="derecho" compiler="gnu" category="ctsm_sci"/>
       <machine name="derecho" compiler="gnu" category="interim_restart"/>
@@ -5282,7 +5270,7 @@
     </options>
   </test>
 
-  <test name="ERR_Ld7" grid="f10_f10_mg37" compset="IHistClm60BgcCrop" testmods="drv/interim_restart">
+  <test name="ERR_Ld7" grid="f10_f10_mt201" compset="IHistClm60BgcCrop" testmods="drv/interim_restart">
     <machines>
       <machine name="derecho" compiler="gnu" category="aux_clm"/>
       <machine name="derecho" compiler="gnu" category="interim_restart"/>
@@ -5294,7 +5282,7 @@
     </options>
   </test>
 
-  <test name="IRT_Ld11" grid="f10_f10_mg37" compset="IHistClm60BgcCrop" testmods="clm/default">
+  <test name="IRT_Ld11" grid="f10_f10_mt201" compset="IHistClm60BgcCrop" testmods="clm/default">
     <machines>
       <machine name="derecho" compiler="gnu" category="aux_clm"/>
       <machine name="derecho" compiler="gnu" category="interim_restart"/>
@@ -5306,7 +5294,7 @@
     </options>
   </test>
 
-  <test name="ERI_Ld41" grid="f10_f10_mg37" compset="I2000Clm60BgcCrop" testmods="clm/default">
+  <test name="ERI_Ld41" grid="f10_f10_mt201" compset="I2000Clm60BgcCrop" testmods="clm/default">
     <machines>
       <machine name="derecho" compiler="gnu" category="aux_clm"/>
       <machine name="derecho" compiler="gnu" category="prebeta"/>
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
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 83de73209b..a9c2ddb888 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,4 +1,80 @@
 ===============================================================
+Tag name: ctsm5.4.068
+Originator(s): slevis (Samuel Levis,UCAR/TSS, slevis@ucar.edu)
+Date: Fri Oct 30 13:49:29 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, plus grid alias clean-up for CISM/DGLC grids
+
+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.
+ - Removed from expected failures: passing Fates test (expected) and two mizuroute NLCOMP failures now passing (unexpected, see issue https://github.com/ESMCI/cime/issues/4966)
+
+Testing summary:
+----------------
+
+ [PASS means all tests PASS; OK means tests PASS other than expected fails.]
+
+  build-namelist tests (if CLMBuildNamelist.pm has changed):
+
+    derecho - PASS
+
+  python testing (if python or CIME code has changed; see instructions in python/README.md; document testing done):
+
+    derecho - PASS
+
+  regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing):
+
+    derecho ----- OK versus interim baseline aux_clm-ctsm5.4.067-ccs_config_cesm1.0.94 to confirm b4b
+    izumi ------- OK versus interim baseline aux_clm-ctsm5.4.067-ccs_config_cesm1.0.94 to confirm b4b
+
+Answer changes
+--------------
+Changes answers relative to baseline: Yes
+  Summarize any changes to answers, i.e.,
+    - what code configurations: Cases with grids that changed from a gx to a tx grid; also two tests that had already changed to t233 previously, but now find a t233 finidat and so do not require interpolation (previously did)
+    - what platforms/compilers: All
+    - nature of change: Only due to the grid updates, except due to new finidat for the two tests that had already changed to t233 previously
+
+Other details
+-------------
+List any git submodules updated (cime, rtm, mosart, cism, fates, etc.):
+ Updating from  - ccs_config_cesm1.0.92 to 97
+                - 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
+ https://github.com/ESMCI/ccs_config_cesm/pull/307
+ https://github.com/ESMCI/ccs_config_cesm/pull/313
+ https://github.com/ESCOMP/RTM/pull/69
+ https://github.com/ESCOMP/MOSART/pull/131
+
+===============================================================
+===============================================================
 Tag name: ctsm5.4.067
 Originator(s): slevis (Samuel Levis,UCAR/TSS,+1 303 665 1310)
 Date: Fri Oct 30 10:29:41 AM MDT 2026
diff --git a/doc/ChangeSum b/doc/ChangeSum
index 68cb97a3cf..590c7605a2 100644
--- a/doc/ChangeSum
+++ b/doc/ChangeSum
@@ -1,5 +1,6 @@
 Tag                   Who      Date  Summary
 ============================================================================================================================
+       ctsm5.4.068   slevis 11/02/2026 Move CTSM tests from gx (POP) grids to tx (MOM) grids
        ctsm5.4.067   slevis 10/30/2026 Merge b4b-dev to master
        ctsm5.4.066   rgknox 10/24/2026 Add bc_out to FATES restart and remove litter flux recalculations
        ctsm5.4.065 samrabin 10/20/2026 Fix scheduled docs-update-ctsm_pylib workflow
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..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_mg37.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/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
diff --git a/python/ctsm/lilac_build_ctsm.py b/python/ctsm/lilac_build_ctsm.py
index 93c403e507..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_mg37"
+_RES = "f10_f10_mt201"
 
 _PATH_TO_TEMPLATES = os.path.join(path_to_ctsm_root(), "lilac", "bld_templates")
 
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)
diff --git a/tools/unsupported/test_rxcropmaturity_python.sh b/tools/unsupported/test_rxcropmaturity_python.sh
index 69e9b00a04..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_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_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_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_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.