Remove Clm51 references throughout or change to Clm60

bld/CLMBuildNamelist.pm

@@ -2113,7 +2113,7 @@ sub setup_logic_roughness_methods {
   my $phys = $physv->as_string();
   if ( $phys eq "clm4_5" || $phys eq "clm5_0" ) {
     if ( $var eq "Meier2022" ) {
-      $log->fatal_error("z0param_method = $var and phys = $phys, but this method has been tested only with clm5_1 and later versions; to use with earlier versions, disable this error, and add Meier2022 parameters to the corresponding params file");
+      $log->fatal_error("z0param_method = $var and phys = $phys, but this method has been tested only with clm6_0 and later versions; to use with earlier versions, disable this error, and add Meier2022 parameters to the corresponding params file");
     }
   }
 }

bld/config_files/clm_phys_vers.pm

@@ -28,7 +28,7 @@ use bigint;
 #use warnings;
 #use diagnostics;
 
-my @version_strings = ("clm4_5", "clm5_0", "clm5_1", "clm6_0");
+my @version_strings = ("clm4_5", "clm5_0", "clm6_0");
 
 #-------------------------------------------------------------------------------
 
@@ -88,7 +88,7 @@ if ( ! defined(caller) && $#ARGV == -1 ) {
    sub testit {
       print "unit tester\n";
       my %lastv;
-      my @vers_list = ( "clm4_5", "clm5_0", "clm5_1", "clm6_0" );
+      my @vers_list = ( "clm4_5", "clm5_0", "clm6_0" );
       foreach my $vers ( @vers_list ) {
          my $phys = config_files::clm_phys_vers->new($vers);
          isa_ok($phys, "config_files::clm_phys_vers", "created clm_phys_vers object");

bld/config_files/config_definition_ctsm.xml

@@ -5,10 +5,10 @@
 <config_definition>
 
 <entry id="phys" 
-       valid_values="clm4_5,clm5_0,clm5_1,clm6_0"
+       valid_values="clm4_5,clm5_0,clm6_0"
        value="clm4_5"
        category="physics">
-Specifies either clm4_5, clm5_0, clm5_1 (deprecated), or clm6_0 physics
+Specifies either clm4_5, clm5_0, or clm6_0 physics
 </entry>
 
 <entry id="clm_root" 

bld/namelist_files/namelist_defaults_drydep.xml

@@ -26,7 +26,6 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
 <megan_specifier>'ISOP = isoprene', 'C10H16 = pinene_a + carene_3 + thujene_a', 'CH3OH = methanol', 'C2H5OH = ethanol', 'CH2O = formaldehyde', 'CH3CHO = acetaldehyde', 'CH3COOH = acetic_acid', 'CH3COCH3 = acetone'</megan_specifier>
 
 <megan_factors_file phys="clm6_0" >atm/cam/chem/trop_mozart/emis/megan21_emis_factors_78pft_c20161108.nc</megan_factors_file>
-<megan_factors_file phys="clm5_1" >atm/cam/chem/trop_mozart/emis/megan21_emis_factors_78pft_c20161108.nc</megan_factors_file>
 <megan_factors_file phys="clm5_0" >atm/cam/chem/trop_mozart/emis/megan21_emis_factors_78pft_c20161108.nc</megan_factors_file>
 <megan_factors_file phys="clm4_5" >atm/cam/chem/trop_mozart/emis/megan21_emis_factors_78pft_c20161108.nc</megan_factors_file>
 

bld/namelist_files/namelist_defaults_overall.xml

@@ -34,8 +34,6 @@ determine default values for namelists.
 <clm_start_type phys="clm4_5" lnd_tuning_mode="clm4_5_cam4.0" >cold</clm_start_type>
 <clm_start_type phys="clm5_0" lnd_tuning_mode="clm5_0_cam5.0" >cold</clm_start_type>
 <clm_start_type phys="clm5_0" lnd_tuning_mode="clm5_0_cam4.0" >cold</clm_start_type>
-<clm_start_type phys="clm5_1" lnd_tuning_mode="clm5_1_cam5.0" >cold</clm_start_type>
-<clm_start_type phys="clm5_1" lnd_tuning_mode="clm5_1_cam4.0" >cold</clm_start_type>
 <clm_start_type phys="clm6_0" lnd_tuning_mode="clm6_0_cam5.0" >cold</clm_start_type>
 <clm_start_type phys="clm6_0" lnd_tuning_mode="clm6_0_cam4.0" >cold</clm_start_type>
 

bld/namelist_files/namelist_definition_ctsm.xml

@@ -171,7 +171,7 @@ dust optics type for SNICAR snow albedo calculation
 <entry id="snicar_snw_shape" type="char*25" category="clm_physics"
        group="clm_inparm" valid_values="sphere,spheroid,hexagonal_plate,koch_snowflake" value="hexagonal_plate" >
 snow grain shape used in SNICAR snow albedo calculation
-(snicar_snw_shape='hexagonal_plate' is supported in ctsm5.1 and 'sphere' in older model versions; others are EXPERIMENTAL, UNSUPPORTED, and UNTESTED!)
+(snicar_snw_shape='sphere' is supported in pre-ctsm5.1 model versions and 'hexagonal place' is supported in newer versions; others are EXPERIMENTAL, UNSUPPORTED, and UNTESTED!)
 </entry>
 
 <entry id="snicar_use_aerosol" type="logical" category="clm_physics"
@@ -2228,7 +2228,7 @@ Land mask description
 <!-- lnd_tuning_mode, there needs to be a setting for: CRUv7, GSWP3v1, cam6.0, and cam7.0 for each valid physics option -->
 <entry id="lnd_tuning_mode" type="char*20" category="default_settings"
        group="default_settings"
-       valid_values="clm4_5_CRUv7,clm4_5_GSWP3v1,clm4_5_cam7.0,clm4_5_cam6.0,clm4_5_cam5.0,clm4_5_cam4.0,clm5_0_cam7.0,clm5_0_cam6.0,clm5_0_cam5.0,clm5_0_cam4.0,clm5_0_CRUv7,clm5_0_GSWP3v1,clm5_1_GSWP3v1,clm5_1_CRUv7,clm5_1_cam7.0,clm5_1_cam6.0,clm5_1_cam5.0,clm5_1_cam4.0,clm6_0_GSWP3v1,clm6_0_cam7.0,clm6_0_cam6.0,clm6_0_cam5.0,clm6_0_cam4.0">
+       valid_values="clm4_5_CRUv7,clm4_5_GSWP3v1,clm4_5_cam7.0,clm4_5_cam6.0,clm4_5_cam5.0,clm4_5_cam4.0,clm5_0_cam7.0,clm5_0_cam6.0,clm5_0_cam5.0,clm5_0_cam4.0,clm5_0_CRUv7,clm5_0_GSWP3v1,clm6_0_GSWP3v1,clm6_0_cam7.0,clm6_0_cam6.0,clm6_0_cam5.0,clm6_0_cam4.0">
 General configuration of model version and atmospheric forcing to tune the model to run under.
 This sets the model to run with constants and initial conditions that were set to run well under 
 the configuration of model version and atmospheric forcing. To run well constants would need to be changed

bld/unit_testers/build-namelist_test.pl

@@ -78,7 +78,7 @@ sub make_config_cache {
 <?xml version="1.0"?>
 <config_definition>
 <commandline></commandline>
-<entry id="phys" value="$phys" list="" valid_values="clm4_5,clm5_0,clm5_1,clm6_0">Specifies clm physics</entry>
+<entry id="phys" value="$phys" list="" valid_values="clm4_5,clm5_0,clm6_0">Specifies clm physics</entry>
 </config_definition>
 EOF
    $fh->close();
@@ -163,7 +163,7 @@ sub cat_and_create_namelistinfile {
 #
 # Figure out number of tests that will run
 #
-my $ntests = 3997;
+my $ntests = 3196;
 
 if ( defined($opts{'compare'}) ) {
    $ntests += 2437;
@@ -600,10 +600,6 @@ sub cat_and_create_namelistinfile {
                                      namelst=>"use_crop=.true.",
                                      phys=>"clm4_5",
                                    },
-     "LeungDust_WO_Prigent"      =>{ options=>" -envxml_dir . -bgc sp",
-                                     namelst=>"use_prigent_roughness=.true.",
-                                     phys=>"clm5_1",
-                                   },
      "soilm_stream off w file"      =>{ options=>"-res 0.9x1.25 -envxml_dir .",
                                      namelst=>"use_soil_moisture_streams = .false.,stream_fldfilename_soilm='file_provided_when_off'",
                                      phys=>"clm5_0",
@@ -966,16 +962,6 @@ sub cat_and_create_namelistinfile {
                                      GLC_TWO_WAY_COUPLING=>"TRUE",
                                      phys=>"clm5_0",
                                    },
-     "sasuspinupWOsoilmatx"      =>{ options=>"-envxml_dir . -bgc bgc -clm_accelerated_spinup sasu",
-                                     namelst=>"use_soil_matrixcn=.false.,use_matrixcn=.false.",
-                                     GLC_TWO_WAY_COUPLING=>"TRUE",
-                                     phys=>"clm5_1",
-                                   },
-     "sasuspinupWOCN"            =>{ options=>"-envxml_dir . -bgc sp  -clm_accelerated_spinup sasu",
-                                     namelst=>"",
-                                     GLC_TWO_WAY_COUPLING=>"TRUE",
-                                     phys=>"clm5_1",
-                                   },
      "nyrforceWOspinup"          =>{ options=>"-envxml_dir . -bgc bgc -clm_accelerated_spinup sasu",
                                      namelst=>"use_matrixcn=.false.,spinup_matrixcn=F,nyr_forcing=20",
                                      GLC_TWO_WAY_COUPLING=>"TRUE",
@@ -1405,7 +1391,7 @@ sub cat_and_create_namelistinfile {
 #
 # Loop over all physics versions
 #
-foreach my $phys ( "clm4_5", "clm5_0", "clm5_1", "clm6_0" ) {
+foreach my $phys ( "clm4_5", "clm5_0", "clm6_0" ) {
 $mode = "-phys $phys";
 &make_config_cache($phys);
 
@@ -1496,7 +1482,7 @@ sub cat_and_create_namelistinfile {
 }
 my @expect_fails = ( "1850-2100_SSP5-3.4_transient", "1850-2100_SSP4-3.4_transient", "2018-PD_transient", "1850-2100_SSP1-1.9_transient",
                       "1850-2100_SSP4-6.0_transient", "2018_control" );
-foreach my $phys ( "clm4_5", "clm5_0", "clm5_1", "clm6_0" ) {
+foreach my $phys ( "clm4_5", "clm5_0", "clm6_0" ) {
    print "physics = $phys\n";
    &make_config_cache($phys);
    foreach my $usecase ( @usecases ) {
@@ -1793,10 +1779,10 @@ sub cat_and_create_namelistinfile {
 #
 
 print "\n==================================================\n";
-print "Test clm4.5/clm5.0/clm5_1/clm6_0 resolutions \n";
+print "Test clm4.5/clm5.0/clm6_0 resolutions \n";
 print "==================================================\n";
 
-foreach my $phys ( "clm4_5", 'clm5_0', 'clm5_1', "clm6_0" ) {
+foreach my $phys ( "clm4_5", "clm5_0", "clm6_0" ) {
   my $mode = "-phys $phys";
   &make_config_cache($phys);
   my @clmoptions = ( "-bgc bgc -envxml_dir .", "-bgc bgc -envxml_dir . -clm_accelerated_spinup=on", "-bgc bgc -envxml_dir . -light_res 360x720",
@@ -1896,17 +1882,14 @@ sub cat_and_create_namelistinfile {
 my $res = "0.9x1.25";
 my $mask = "gx1v7";
 my $simyr = "1850";
-foreach my $phys ( "clm4_5", 'clm5_0', 'clm5_1', 'clm6_0' ) {
+foreach my $phys ( "clm4_5", "clm5_0", "clm6_0" ) {
   my $mode = "-phys $phys";
   &make_config_cache($phys);
   my @forclist = ();
   @forclist = ( "CRUv7", "GSWP3v1", "cam7.0", "cam6.0", "cam5.0", "cam4.0" );
   foreach my $forc ( @forclist ) {
      foreach my $bgc ( "sp", "bgc" ) {
         my $lndtuningmode = "${phys}_${forc}";
-        if ( $lndtuningmode eq "clm5_1_CRUv7" ) {
-           next;
-        }
         if ( $lndtuningmode eq "clm6_0_CRUv7" ) {
            next;
         }

cime_config/buildnml

@@ -23,7 +23,7 @@ _config_cache_template = """
 <?xml version="1.0"?>
 <config_definition>
 <commandline></commandline>
-<entry id="phys" value="{clm_phys}" list="" valid_values="clm4_5,clm5_0,clm5_1,clm6_0">Specifies CTSM physics</entry>
+<entry id="phys" value="{clm_phys}" list="" valid_values="clm4_5,clm5_0,clm6_0">Specifies CTSM physics</entry>
 </config_definition>
 """
 
@@ -113,11 +113,6 @@ def buildnml(case, caseroot, compname):
         "clm5_0_QIAN": "clm5_0_GSWP3v1",
         "clm5_0_NLDAS2": "clm5_0_GSWP3v1",
         "clm5_0_ERA5": "clm5_0_GSWP3v1",
-        "clm5_1_1PT": "clm5_1_GSWP3v1",
-        "clm5_1_QIAN": "clm5_1_GSWP3v1",
-        "clm5_1_NLDAS2": "clm5_1_GSWP3v1",
-        "clm5_1_ERA5": "clm5_1_GSWP3v1",
-        "clm5_1_CRUv7": "clm5_1_GSWP3v1",
         "clm6_0_1PT": "clm6_0_GSWP3v1",
         "clm6_0_QIAN": "clm6_0_GSWP3v1",
         "clm6_0_NLDAS2": "clm6_0_GSWP3v1",
@@ -144,13 +139,9 @@ def buildnml(case, caseroot, compname):
     #  to the CAM version)
     tuning_based_on = {
         "clm6_0_GSWP3v1": "clm5_0_GSWP3v1",
-        "clm5_1_GSWP3v1": "clm5_0_GSWP3v1",
         "clm6_0_cam6.0": "clm5_0_cam6.0",
         "clm6_0_cam5.0": "clm5_0_cam6.0",
         "clm6_0_cam4.0": "clm5_0_cam6.0",
-        "clm5_1_cam6.0": "clm5_0_cam6.0",
-        "clm5_1_cam5.0": "clm5_0_cam6.0",
-        "clm5_1_cam4.0": "clm5_0_cam6.0",
         "clm5_0_cam5.0": "clm5_0_cam6.0",
         "clm5_0_cam4.0": "clm5_0_cam6.0",
         "clm4_5_cam6.0": "clm5_0_cam6.0",

cime_config/config_component.xml

@@ -15,7 +15,6 @@
   <description modifier_mode="1">
     <desc lnd="CLM45[%SP][%SP-VIC][%BGC][%BGC-CROP][%FATES][%BGCDV][%BGCDV-CROP]"                  >clm4.5:</desc>
     <desc lnd="CLM50[%SP][%SP-VIC][%SP-NOANTHRO][%BGC-NOANTHRO][%BGC][%BGC-CROP][%FATES][%BGCDV][%BGCDV-CROP][%BGC-CROP-CMIP6DECK][%BGC-CROP-CMIP6WACCMDECK][%NWP-SP][%NWP-BGC-CROP]">clm5.0:</desc>
-    <desc lnd="CLM51[%SP][%SP-NOANTHRO][%BGC-NOANTHRO][%BGC][%BGC-CROP][%FATES][%FATES-SP][%NWP-SP][%NWP-BGC-CROP]">clm5.1:</desc>
     <desc lnd="CLM60[%SP][%SP-NOANTHRO][%BGC-NOANTHRO][%BGC][%BGC-CROP][%FATES][%FATES-SP][%BGC-CROP-CMIP6DECK][%BGC-CROP-CMIP6WACCMDECK][%NWP-SP][%NWP-BGC-CROP]">clm6.0:</desc>
     <desc option="SP"              >Satellite phenology:</desc>
 
@@ -78,7 +77,7 @@
     </desc>
     <default_value>UNSET</default_value>
     <!-- 10 forcing options for each CLM physics option: CRUv7, GSWP3, cam7.0, cam6.0, cam5.0, cam4.0, QIAN, 1PT, NLDAS2, ERA5 -->
-    <valid_values>clm5_0_cam6.0,clm5_0_cam7.0,clm5_0_cam5.0,clm5_0_cam4.0,clm5_0_GSWP3v1,clm5_0_CRUv7,clm5_0_QIAN,clm5_0_1PT,clm5_0_NLDAS2,clm5_0_ERA5,clm4_5_CRUv7,clm4_5_GSWP3v1,clm4_5_QIAN,clm4_5_cam6.0,clm4_5_cam7.0,clm4_5_cam5.0,clm4_5_cam4.0,clm4_5_1PT,clm4_5_NLDAS2,clm4_5_ERA5,clm5_1_CRUv7,clm5_1_GSWP3v1,clm5_1_cam6.0,clm5_1_QIAN,clm5_1_1PT,clm5_1_NLDAS2,clm5_1_ERA5,clm6_0_CRUv7,clm6_0_GSWP3v1,clm6_0_cam6.0,clm6_0_cam7.0,clm6_0_cam5.0,clm6_0_cam4.0,clm6_0_QIAN,clm6_0_1PT,clm6_0_NLDAS2,clm6_0_ERA5</valid_values>
+    <valid_values>clm5_0_cam6.0,clm5_0_cam7.0,clm5_0_cam5.0,clm5_0_cam4.0,clm5_0_GSWP3v1,clm5_0_CRUv7,clm5_0_QIAN,clm5_0_1PT,clm5_0_NLDAS2,clm5_0_ERA5,clm4_5_CRUv7,clm4_5_GSWP3v1,clm4_5_QIAN,clm4_5_cam6.0,clm4_5_cam7.0,clm4_5_cam5.0,clm4_5_cam4.0,clm4_5_1PT,clm4_5_NLDAS2,clm4_5_ERA5,clm6_0_CRUv7,clm6_0_GSWP3v1,clm6_0_cam6.0,clm6_0_cam7.0,clm6_0_cam5.0,clm6_0_cam4.0,clm6_0_QIAN,clm6_0_1PT,clm6_0_NLDAS2,clm6_0_ERA5</valid_values>
     <values match="last">
       <!-- Options for atm forcing are: CRU, CRUv7, GSWP3, cam6.0 (also used for DATM%CPLHIST), cam5.0, cam4.0, QIAN, WISOQIA, 1PT, NLDAS2, and ERA5) -->
       <!-- All the clm4_5 physics options -->
@@ -113,14 +112,6 @@
       <value compset="DATM%1PT_CLM50"    >clm5_0_1PT</value>
       <value compset="DATM%NLDAS2_CLM50" >clm5_0_NLDAS2</value>
       <value compset="DATM%ERA5_CLM50"   >clm5_0_ERA5</value>
-      <!-- All the clm5_1 physics options -->
-      <value compset="DATM%GSWP3v1_CLM51">clm5_1_GSWP3v1</value>
-      <value compset="CAM[^_]*_CLM51"    >INVALID_USE_CLM60_NOT_CLM51</value>
-      <value compset="CAM40[^_]*_CLM51"  >clm5_1_cam4.0</value>
-      <value compset="CAM50[^_]*_CLM51"  >clm5_1_cam5.0</value>
-      <value compset="CAM60[^_]*_CLM51"  >clm5_1_cam6.0</value>
-      <value compset="CAM70[^_]*_CLM51"  >INVALID_USE_CLM60_NOT_CLM51_FOR_CAM70</value>
-      <value compset="DATM%CPLHIST_CLM51">INVALID_USE_CLM60_NOT_CLM51_FOR_CPLHIST</value>
       <!-- All the clm6_0 physics options -->
       <value compset="DATM%CRUv7_CLM60"  >clm6_0_CRUv7</value>
       <value compset="DATM%CRU_CLM60"    >clm6_0_CRUv7</value>
@@ -147,7 +138,7 @@
 
   <entry id="CLM_PHYSICS_VERSION" >
     <type>char</type>
-    <valid_values>clm4_5,clm5_0,clm5_1,clm6_0</valid_values>
+    <valid_values>clm4_5,clm5_0,clm6_0</valid_values>
     <!-- By setting the default_value to UNSET (or some other non-empty
          string that doesn't appear in the list of valid_values), the
          scripts will ensure that one of the below values is picked up
@@ -156,7 +147,6 @@
     <values>
       <value compset="_CLM45" >clm4_5</value>
       <value compset="_CLM50" >clm5_0</value>
-      <value compset="_CLM51" >clm5_1</value>
       <value compset="_CLM60" >clm6_0</value>
     </values>
     <group>run_component_ctsm</group>
@@ -366,7 +356,6 @@
     <default_value></default_value>
     <values match="last">
       <value                  compset="_CLM60%[^_]*FATES-SP[%_]"      >$COMP_ROOT_DIR_LND/cime_config/usermods_dirs/fates_sp</value>
-      <value                  compset="_CLM51%[^_]*FATES-SP[%_]"      >$COMP_ROOT_DIR_LND/cime_config/usermods_dirs/fates_sp</value>
       <value                  compset="_CLM50%[^_]*CMIP6DECK[%_]"     >$COMP_ROOT_DIR_LND/cime_config/usermods_dirs/cmip6_deck</value>
       <value grid="l%1.9x2.5" compset="_CLM50%[^_]*CMIP6DECK[%_]"     >$COMP_ROOT_DIR_LND/cime_config/usermods_dirs/cmip6_nociso_deck</value>
       <value                  compset="_CLM50%[^_]*CMIP6WACCMDECK[%_]">$COMP_ROOT_DIR_LND/cime_config/usermods_dirs/cmip6_waccm_deck</value>

cime_config/config_compsets.xml

@@ -14,7 +14,7 @@
     Where for the CAM specific compsets below the following is supported
     TIME = Time period (e.g. 2000, HIST, SSP585...)
     ATM  = [CAM40, CAM50, CAM60]
-    LND  = [CLM45, CLM50, CLM51, CLM60, SLND]
+    LND  = [CLM45, CLM50, CLM60, SLND]
     ICE  = [CICE, DICE, SICE]
     OCN  = [DOCN, ,AQUAP, SOCN]
     ROF  = [RTM, SROF]
@@ -344,12 +344,6 @@
     <science_support grid="f19_g17"/>
   </compset>
 
-  <!-- Needed for testing until CAM removes used of CLM51 in compsets-->
-  <compset>
-    <alias>IHistClm51Sp</alias>
-    <lname>HIST_DATM%GSWP3v1_CLM51%SP_SICE_SOCN_MOSART_SGLC_SWAV</lname>
-  </compset>
-
   <compset>
     <alias>IHistClm60SpRs</alias>
     <lname>HIST_DATM%GSWP3v1_CLM60%SP_SICE_SOCN_SROF_SGLC_SWAV</lname>
@@ -660,12 +654,6 @@
     <science_support grid="f19_g17"/>
     <science_support grid="ne30pg3_t232"/>
   </compset>
-  <!-- Needed for testing until removed by CESM -->
-  <compset>
-    <alias>I1850Clm51BgcCropG</alias>
-    <lname>1850_DATM%GSWP3v1_CLM51%BGC-CROP_SICE_SOCN_MOSART_CISM2%GRIS-EVOLVE_SWAV</lname>
-  </compset>
-
 
   <!-- Primarily for testing: same as I1850Clm50SpGag but with SROF -->
   <compset>

cime_config/testdefs/ExpectedTestFails.xml

@@ -245,7 +245,7 @@
     </phase>
   </test>
 
-  <test name="SMS_D_Ld5.5x5_amazon.I1850Clm51Bgc.derecho_gnu.clm-HillslopeC">
+  <test name="SMS_D_Ld5.5x5_amazon.I1850Clm60Bgc.derecho_gnu.clm-HillslopeC">
     <phase name="RUN">
       <status>FAIL</status>
       <issue>#2423</issue>
@@ -282,7 +282,7 @@
 
   <!-- Other submodule test list failures (MOSART, RTM, etc. -->
 
-  <test name="SMS_Lh3.f10_f10_mg37.I2000Clm51Sp.derecho_intel.mosart-clmAccelSpinupIgnoreWarn">
+  <test name="SMS_Lh3.f10_f10_mg37.I2000Clm60Sp.derecho_intel.mosart-clmAccelSpinupIgnoreWarn">
     <phase name="CREATE_NEWCASE">
       <status>FAIL</status>
       <issue>MOSART#91</issue>

cime_config/testdefs/testlist_clm.xml

@@ -120,14 +120,13 @@
       <option name="comment">CESM3 development Exact restart test with change in the processor count at f10, for izumi nag</option>
     </options>
   </test>
-  <!-- this will be removed when CESM no longer needs it-->
-  <test name="ERP_D_Ld9" grid="ne30pg3_t232" compset="I1850Clm51BgcCropG" testmods="clm/clm51cam6LndTuningMode">
+  <!-- Remove when CESM no longer needs it-->
+  <test name="ERP_D_Ld9" grid="ne30pg3_t232" compset="I1850Clm60BgcCropG" testmods="clm/clm60cam6LndTuningMode">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
     </machines>
     <options>
       <option name="wallclock">00:20:00</option>
-      <option name="comment">Remove this when Clm51 compset use is removed from CESM</option>
       <option name="comment">CESM3 development Exact restart test with change in the processor count at the standard coupled resolution</option>
     </options>
   </test>
@@ -946,14 +945,13 @@
     </options>
   </test>
   <!-- Remove this when CAM removes the use of CLM60 in their testing and compsets -->
-  <test name="ERP_D_Ld5" grid="ne30pg3_t232" compset="IHistClm51Sp" testmods="clm/default">
+  <test name="ERP_D_Ld5" grid="ne30pg3_t232" compset="IHistClm60Sp" testmods="clm/default">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
     </machines>
     <options>
       <option name="wallclock">00:20:00</option>
-      <option name="comment">Remove this when Clm51 compset use is removed from CAM</option>
-      <option name="comment">Test Hist compset with Sp for CLM5.1</option>
+      <option name="comment">Test Hist compset with Sp for CLM6.0</option>
     </options>
   </test>
   <test name="SMS_Ld5" grid="f09_g17" compset="IHistClm50SpCru" testmods="clm/default">

cime_config/testdefs/testmods_dirs/clm/ciso_cwd_hr/user_nl_clm

@@ -1,2 +1,2 @@
-paramfile = '$DIN_LOC_ROOT/lnd/clm2/paramdata/ctsm51_ciso_cwd_hr_params.c240814.nc'
+paramfile = '$DIN_LOC_ROOT/lnd/clm2/paramdata/ctsm60_ciso_cwd_hr_params.c240814.nc'
 hist_fincl1 = 'CWDC_HR','C13_CWDC_HR','C14_CWDC_HR','CWD_HR_L2','CWD_HR_L2_vr','CWD_HR_L3','CWD_HR_L3_vr'

cime_config/testdefs/testmods_dirs/clm/clm60cam6LndTuningModeZDustSoilErod/include_user_mods

@@ -0,0 +1 @@
+../clm60cam6LndTuningMode

cime_config/usermods_dirs/NEON/FATES/README.md

@@ -2,7 +2,7 @@
 
 Use these user mods as you would any other user_mods, e.g.:
 
-`./create_newcase --case FATES_ABBY_test --res CLM_USRDAT --compset I1PtClm51Fates --run-unsupported --user-mods-dir /glade/work/$user/CTSM/cime_config/usermods_dirs/NEON/FATES/ABBY`
+`./create_newcase --case FATES_ABBY_test --res CLM_USRDAT --compset I1PtClm60Fates --run-unsupported --user-mods-dir /glade/work/$user/CTSM/cime_config/usermods_dirs/NEON/FATES/ABBY`
 
 ## Note on crop sites KONA and STER