diff --git a/.gitmodules b/.gitmodules
index 4e9f5b51fb..7274b9acd2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -28,7 +28,7 @@
 [submodule "fates"]
 path = src/fates
 url = https://github.com/NGEET/fates
-fxtag = sci.1.77.2_api.36.0.0
+fxtag = sci.1.78.2_api.36.0.0
 fxrequired = AlwaysRequired
 # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
 fxDONOTUSEurl = https://github.com/NCAR/fates-release
@@ -92,7 +92,7 @@ fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git
 [submodule "cdeps"]
 path = components/cdeps
 url = https://github.com/ESCOMP/CDEPS.git
-fxtag = cdeps1.0.34
+fxtag = cdeps1.0.48
 fxrequired = ToplevelRequired
 # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
 fxDONOTUSEurl = https://github.com/ESCOMP/CDEPS.git
diff --git a/bld/CLMBuildNamelist.pm b/bld/CLMBuildNamelist.pm
index bd710066b6..a5b19dd62b 100755
--- a/bld/CLMBuildNamelist.pm
+++ b/bld/CLMBuildNamelist.pm
@@ -159,16 +159,20 @@ OPTIONS
                               This turns on the namelist variable: use_crop
      -csmdata "dir"           Root directory of CESM input data.
                               Can also be set by using the CSMDATA environment variable.
-     -drydep                  Produce a drydep_inparm namelist that will go into the
+     -drydep                  Produce a drydep_inparm namelist for testing that will go into the
                               "drv_flds_in" file for the driver to pass dry-deposition to the atm.
+                              This populates the namelist with valid drydep settings for testing.
                               Default: -no-drydep
+                              Note: Can always add drydep fields to user_nl_clm even with --no-drydep
                               (Note: buildnml copies the file for use by the driver)
      -dynamic_vegetation      Toggle for dynamic vegetation model. (default is off)
                               (can ONLY be turned on when BGC type is 'bgc')
                               This turns on the namelist variable: use_cndv
                               (Deprecated, this will be removed)
-     -fire_emis               Produce a fire_emis_nl namelist that will go into the
+     -fire_emis               Produce a fire_emis_nl namelist for testing that will go into the
                               "drv_flds_in" file for the driver to pass fire emissions to the atm.
+                              This populates the namelist with valid fire-emiss settings for testing.
+                              Note: Can always add fire_emis fields to user_nl_clm even with --no-fire_emis
                               (Note: buildnml copies the file for use by the driver)
      -glc_nec <name>          Glacier number of elevation classes [0 | 3 | 5 | 10 | 36]
                               (default is 0) (standard option with land-ice model is 10)
@@ -204,9 +208,11 @@ OPTIONS
      -namelist "namelist"     Specify namelist settings directly on the commandline by supplying
                               a string containing FORTRAN namelist syntax, e.g.,
                                  -namelist "&clm_inparm dt=1800 /"
-     -no-megan                DO NOT PRODUCE a megan_emis_nl namelist that will go into the
+     -no-megan                DO NOT PRODUCE a megan_emis_nl namelist for testing that will go into the
                               "drv_flds_in" file for the driver to pass VOCs to the atm.
                               MEGAN (Model of Emissions of Gases and Aerosols from Nature)
+                              This removes setting default values for testing MEGAN fields
+                              Note: Can always add megan fields to user_nl_clm even with --no-megan
                               (Note: buildnml copies the file for use by the driver)
      -[no-]note               Add note to output namelist  [do NOT add note] about the
                               arguments to build-namelist.
@@ -1449,7 +1455,7 @@ sub setup_cmdl_vichydro {
 
 sub process_namelist_commandline_namelist {
   # Process the commandline '-namelist' arg.
-  my ($opts, $definition, $nl, $envxml_ref) = @_;
+  my ($opts, $definition, $nl, $envxml_ref, %settings) = @_;
 
   if (defined $opts->{'namelist'}) {
     # Parse commandline namelist
@@ -1470,6 +1476,32 @@ sub process_namelist_commandline_namelist {
   }
 }
 
+sub process_namelist_infile {
+   my ($definition, $nl, $envxml_ref, $infile, %settings) = @_;
+
+   # Make sure a valid file was found
+   if (    -f "$infile" ) {
+      # Otherwise abort as a valid file doesn't exist
+   } else {
+      $log->fatal_error("input namelist file does NOT exist $infile.\n $@");
+   }
+   # Parse namelist input from the next file
+   my $nl_infile = Build::Namelist->new($infile);
+
+   # Validate input namelist -- trap exceptions
+   my $nl_infile_valid;
+   eval { $nl_infile_valid = $definition->validate($nl_infile); };
+   if ($@) {
+      $log->fatal_error("Invalid namelist variable in '-infile' $infile.\n $@");
+   }
+   # Go through all variables and expand any XML env settings in them
+   expand_xml_variables_in_namelist( $nl_infile_valid, $envxml_ref );
+
+   # Merge input values into namelist.  Previously specified values have higher precedence
+   # and are not overwritten.
+   $nl->merge_nl($nl_infile_valid, %settings);
+}
+
 #-------------------------------------------------------------------------------
 
 sub process_namelist_commandline_infile {
@@ -1479,27 +1511,7 @@ sub process_namelist_commandline_infile {
   if (defined $opts->{'infile'}) {
     my @infiles = split( /,/, $opts->{'infile'} );
     foreach my $infile ( @infiles ) {
-      # Make sure a valid file was found
-      if (    -f "$infile" ) {
-        # Otherwise abort as a valid file doesn't exist
-      } else {
-        $log->fatal_error("input namelist file does NOT exist $infile.\n $@");
-      }
-      # Parse namelist input from the next file
-      my $nl_infile = Build::Namelist->new($infile);
-
-      # Validate input namelist -- trap exceptions
-      my $nl_infile_valid;
-      eval { $nl_infile_valid = $definition->validate($nl_infile); };
-      if ($@) {
-        $log->fatal_error("Invalid namelist variable in '-infile' $infile.\n $@");
-      }
-      # Go through all variables and expand any XML env settings in them
-      expand_xml_variables_in_namelist( $nl_infile_valid, $envxml_ref );
-
-      # Merge input values into namelist.  Previously specified values have higher precedence
-      # and are not overwritten.
-      $nl->merge_nl($nl_infile_valid);
+      process_namelist_infile( $definition, $nl, $envxml_ref, $infile );
     }
   }
 }
@@ -1750,25 +1762,29 @@ sub process_namelist_inline_logic {
   ##################################
   setup_logic_lightning_streams($opts,  $nl_flags, $definition, $defaults, $nl);
 
-  #################################
-  # namelist group: drydep_inparm #
-  #################################
-  setup_logic_dry_deposition($opts, $nl_flags, $definition, $defaults, $nl);
-
-  #################################
-  # namelist group: fire_emis_nl  #
-  #################################
-  setup_logic_fire_emis($opts, $nl_flags, $definition, $defaults, $nl);
-
-  ######################################
+  ############################################################################################
   # namelist options for dust emissions
-  ######################################
+  # NOTE: This MUST be done before other drv_flds_in settings (megan, drydep, fire_emis etc.)
+  ############################################################################################
   setup_logic_dust_emis($opts, $nl_flags, $definition, $defaults, $nl, $envxml_ref);
   setup_logic_prigent_roughness($opts, $nl_flags, $definition, $defaults, $nl);
 
-  #################################
-  # namelist group: megan_emis_nl #
-  #################################
+  #####################################
+  # namelist group: drydep_inparm     #
+  # NOTE: After setup_logic_dust_emis #
+  #####################################
+  setup_logic_dry_deposition($opts, $nl_flags, $definition, $defaults, $nl);
+
+  #####################################
+  # namelist group: fire_emis_nl      #
+  # NOTE: After setup_logic_dust_emis #
+  #####################################
+  setup_logic_fire_emis($opts, $nl_flags, $definition, $defaults, $nl);
+
+  #####################################
+  # namelist group: megan_emis_nl     #
+  # NOTE: After setup_logic_dust_emis #
+  #####################################
   setup_logic_megan($opts, $nl_flags, $definition, $defaults, $nl);
 
   ##################################
@@ -3994,17 +4010,18 @@ sub setup_logic_lightning_streams {
 sub setup_logic_dry_deposition {
   my ($opts, $nl_flags, $definition, $defaults, $nl) = @_;
 
+  my @list = ( "drydep_list", "dep_data_file");
   if ($opts->{'drydep'} ) {
-    if ( &value_is_true( $nl_flags->{'use_fates'}) && not &value_is_true( $nl_flags->{'use_fates_sp'}) ) {
-       $log->warning("DryDeposition can NOT be on when FATES is also on unless FATES-SP mode is on.\n" .
-                     "   Use the '--no-drydep' option when '-bgc fates' is activated");
-    }
     add_default($opts,  $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'drydep_list');
     add_default($opts,  $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'dep_data_file');
-  } else {
-    if ( defined($nl->get_value('drydep_list')) ) {
-      $log->fatal_error("drydep_list defined, but drydep option NOT set");
-    }
+  }
+  if ( &value_is_true( $nl_flags->{'use_fates'}) && not &value_is_true( $nl_flags->{'use_fates_sp'}) ) {
+     foreach my $var ( @list ) {
+        if ( defined($nl->get_value($var)) ) {
+           $log->warning("DryDeposition $var is being set and can NOT be on when FATES is also on unless FATES-SP mode is on.\n" .
+                         "   Use the '--no-drydep' option when '-bgc fates' is activated");
+        }
+     }
   }
 }
 
@@ -4013,20 +4030,20 @@ sub setup_logic_dry_deposition {
 sub setup_logic_fire_emis {
   my ($opts, $nl_flags, $definition, $defaults, $nl) = @_;
 
+  my @list = ( "fire_emis_eleveated", "fire_emis_factors_file", "fire_emis_specifier");
+
   if ($opts->{'fire_emis'} ) {
-     if ( &value_is_true( $nl_flags->{'use_fates'} ) ) {
-       $log->warning("Fire emission can NOT be on when FATES is also on.\n" .
-                   "  DON'T use the '-fire_emis' option when '-bgc fates' is activated");
-    }
     add_default($opts,  $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'fire_emis_factors_file');
     add_default($opts,  $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'fire_emis_specifier');
-  } else {
-    if ( defined($nl->get_value('fire_emis_elevated'))     ||
-         defined($nl->get_value('fire_emis_factors_file')) ||
-         defined($nl->get_value('fire_emis_specifier')) ) {
-      $log->fatal_error("fire_emission setting defined: fire_emis_elevated, fire_emis_factors_file, or fire_emis_specifier, but fire_emis option NOT set");
-    }
   }
+  foreach my $var ( @list ) {
+     if ( defined($nl->get_value($var)) ) {
+        if ( &value_is_true( $nl_flags->{'use_fates'} ) ) {
+          $log->warning("Fire emission option $var can NOT be on when FATES is also on.\n" .
+                      "  DON'T use the '--fire_emis' option when '--bgc fates' is activated");
+       }
+     }
+   }
 }
 
 #-------------------------------------------------------------------------------
@@ -4036,6 +4053,8 @@ sub setup_logic_dust_emis {
   my ($opts, $nl_flags, $definition, $defaults, $nl, $envxml_ref) = @_;
 
   # Only set dust emission settings -- if not connected to CAM
+  # Longer term plan is to remove this logic and have CTSM just set it and for CAM to use what CLM decides
+  # See: https://github.com/ESCOMP/CTSM/issues/2713
   my $lnd_sets_dust = logical_to_fortran($envxml_ref->{'LND_SETS_DUST_EMIS_DRV_FLDS'});
   if ( &value_is_true( $lnd_sets_dust)) {
 
@@ -4088,6 +4107,14 @@ sub setup_logic_dust_emis {
                               " connected to CAM as CAM should set them");
          }
       }
+      # Now process the CAM drv_flds_in to get the dust settings
+      # This requires that the CAM drv_flds_in namelist be created BEFORE CLM
+      # and that the path below NOT be changed. Hence, there's some fragility here
+      # to future changes.
+      my $infile = $opts->{'envxml_dir'} . "/Buildconf/camconf/drv_flds_in";
+      $log->verbose_message("Read in the drv_flds_in file generated by CAM's build-namelist");
+      # When merging the CAM namelist in -- die with an error if there's a conflict between CAM and CLM
+      process_namelist_infile( $definition, $nl, $envxml_ref, $infile, 'die_on_conflict'=>1 );
   }
 }
 
@@ -4108,17 +4135,15 @@ sub setup_logic_megan {
   }
 
   if ($nl_flags->{'megan'} ) {
-    if ( &value_is_true( $nl_flags->{'use_fates'} ) ) {
-       $log->warning("MEGAN can NOT be on when FATES is also on.\n" .
-                   "   Use the '-no-megan' option when '-bgc fates' is activated");
-    }
     add_default($opts,  $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'megan_specifier');
-    check_megan_spec( $opts, $nl, $definition );
     add_default($opts,  $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'megan_factors_file');
-  } else {
-    if ( defined($nl->get_value('megan_specifier')) ||
+  }
+  if ( defined($nl->get_value('megan_specifier')) ||
          defined($nl->get_value('megan_factors_file')) ) {
-      $log->fatal_error("megan_specifier or megan_factors_file defined, but megan option NOT set");
+    check_megan_spec( $opts, $nl, $definition );
+    if ( &value_is_true( $nl_flags->{'use_fates'} ) ) {
+      $log->warning("MEGAN can NOT be on when FATES is also on.\n" .
+                    "   Use the '-no-megan' option when '-bgc fates' is activated");
     }
   }
 }
@@ -5645,27 +5670,11 @@ sub check_megan_spec {
 
     my $megan_spec      = $nl->get_value('megan_specifier');
     my @megan_spec_list = split( /\s*,\s*/, $megan_spec );
-    foreach $megan_spec ( @megan_spec_list ) {
-       if ( $megan_spec =~ /^['"]+[A-Za-z0-9]+\s*\=\s*([\sA-Za-z0-9+_-]+)["']+$/ ) {
-          my $megan_list = $1;
-          my @megan_cmpds = split( /\s*\+\s*/, $megan_list );
-          my $var = "megan_cmpds";
-          my $warn = 0;
-          foreach my $megan_cmpd ( @megan_cmpds ) {
-             if (  ! $definition->is_valid_value( $var, $megan_cmpd, 'noquotes'=>1 ) ) {
-                $log->warning("megan_compound $megan_cmpd NOT found in list" );
-                $warn++;
-             }
-          }
-          if ( $warn > 0 ) {
-             my @valid_values   = $definition->get_valid_values( $var, 'noquotes'=>1 );
-             $log->warning("list of megan compounds includes:\n" .
-                     "@valid_values\n" .
-                     "Does your megan_factors_file include more compounds?\n" .
-                     "If NOT your simulation will fail." );
-          }
-       } else {
-          $log->fatal_error("Bad format for megan_specifier = $megan_spec");
+    foreach my $spec ( @megan_spec_list ) {
+       $megan_spec = remove_leading_and_trailing_quotes($spec);
+       # Do simple validation of the expressions to just check for valid characters
+       if ( $megan_spec !~ /^([\s=A-Za-z0-9_\+\.\*\(\)-]+)$/ ) {
+          $log->warning("Bad format for megan_specifier = $megan_spec");
        }
     }
 }
diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml
index 1cc58a30b6..ffc9843cf7 100644
--- a/bld/namelist_files/namelist_defaults_ctsm.xml
+++ b/bld/namelist_files/namelist_defaults_ctsm.xml
@@ -1092,12 +1092,12 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
 >hgrid=1.9x2.5 maxpft=17 mask=gx1v7 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false.
 </init_interp_attributes>
 
-<init_interp_attributes sim_year="1979" use_cndv=".false." use_fates=".false." lnd_tuning_mode="clm6_0_cam7.0"
+<init_interp_attributes sim_year="1979" use_cndv=".false." use_fates=".false." lnd_tuning_mode="clm5_0_cam7.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.
 </init_interp_attributes>
 
-<init_interp_attributes sim_year="1979" use_cndv=".false." use_fates=".false." lnd_tuning_mode="clm6_0_cam7.0"
+<init_interp_attributes sim_year="1979" use_cndv=".false." use_fates=".false." lnd_tuning_mode="clm5_0_cam7.0"
                         hgrid="ne0np4.ARCTICGRIS.ne30x8" use_cn=".false." maxpft="17"
 >hgrid=ne0np4.ARCTICGRIS.ne30x8 maxpft=17 mask=tx0.1v2 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false.
 </init_interp_attributes>
@@ -1177,6 +1177,26 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
 >hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false.
 </init_interp_attributes>
 
+<init_interp_attributes sim_year="1979" use_cndv=".false." use_fates=".false." lnd_tuning_mode="clm5_0_cam6.0"
+                        hgrid="0.9x1.25" use_cn=".false." maxpft="17"
+>hgrid=0.9x1.25 maxpft=17 mask=gx1v7 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false.
+</init_interp_attributes>
+
+<init_interp_attributes sim_year="1979" use_cndv=".false." use_fates=".false." lnd_tuning_mode="clm5_0_cam6.0"
+                        hgrid="1.9x2.5" use_cn=".false." maxpft="17"
+>hgrid=1.9x2.5 maxpft=17 mask=gx1v7 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false.
+</init_interp_attributes>
+
+<init_interp_attributes sim_year="1979" use_cndv=".false." use_fates=".false." lnd_tuning_mode="clm5_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.
+</init_interp_attributes>
+
+<init_interp_attributes sim_year="1979" use_cndv=".false." use_fates=".false." lnd_tuning_mode="clm5_0_cam6.0"
+                        hgrid="ne0np4.ARCTICGRIS.ne30x8" use_cn=".false." maxpft="17"
+>hgrid=ne0np4.ARCTICGRIS.ne30x8 maxpft=17 mask=tx0.1v2 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false.
+</init_interp_attributes>
+
 <!-- clm5_1 physics -->
 <init_interp_attributes sim_year="2000" use_cndv=".false." use_fates=".false." lnd_tuning_mode="clm5_1_cam6.0"
 >hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false.
@@ -1226,12 +1246,12 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
 
 
 <!-- If an exact match for these grids and start years -->
-<init_interp_attributes sim_year="1979" use_cndv=".false." use_fates=".false." lnd_tuning_mode="clm5_0_cam6.0"
+<init_interp_attributes sim_year="1979" use_cndv=".false." use_fates=".false." lnd_tuning_mode="clm6_0_cam6.0"
                         hgrid="0.9x1.25" use_cn=".false." maxpft="17"
 >hgrid=0.9x1.25 maxpft=17 mask=gx1v7 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false.
 </init_interp_attributes>
 
-<init_interp_attributes sim_year="1979" use_cndv=".false." use_fates=".false." lnd_tuning_mode="clm5_0_cam6.0"
+<init_interp_attributes sim_year="1979" use_cndv=".false." use_fates=".false." lnd_tuning_mode="clm6_0_cam6.0"
                         hgrid="1.9x2.5" use_cn=".false." maxpft="17"
 >hgrid=1.9x2.5 maxpft=17 mask=gx1v7 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false.
 </init_interp_attributes>
@@ -1246,6 +1266,26 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
 >hgrid=ne0np4.ARCTICGRIS.ne30x8 maxpft=17 mask=tx0.1v2 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false.
 </init_interp_attributes>
 
+<init_interp_attributes sim_year="1979" use_cndv=".false." use_fates=".false." lnd_tuning_mode="clm6_0_cam7.0"
+                        hgrid="0.9x1.25" use_cn=".false." maxpft="17"
+>hgrid=0.9x1.25 maxpft=17 mask=gx1v7 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false.
+</init_interp_attributes>
+
+<init_interp_attributes sim_year="1979" use_cndv=".false." use_fates=".false." lnd_tuning_mode="clm6_0_cam7.0"
+                        hgrid="1.9x2.5" use_cn=".false." maxpft="17"
+>hgrid=1.9x2.5 maxpft=17 mask=gx1v7 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false.
+</init_interp_attributes>
+
+<init_interp_attributes sim_year="1979" use_cndv=".false." use_fates=".false." lnd_tuning_mode="clm6_0_cam7.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.
+</init_interp_attributes>
+
+<init_interp_attributes sim_year="1979" use_cndv=".false." use_fates=".false." lnd_tuning_mode="clm6_0_cam7.0"
+                        hgrid="ne0np4.ARCTICGRIS.ne30x8" use_cn=".false." maxpft="17"
+>hgrid=ne0np4.ARCTICGRIS.ne30x8 maxpft=17 mask=tx0.1v2 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false.
+</init_interp_attributes>
+
 <!-- 2003 -->
 <init_interp_attributes sim_year="2003" use_cndv=".false." use_fates=".false." lnd_tuning_mode="clm5_0_cam6.0"
                         hgrid="1.9x2.5" use_cn=".false." maxpft="17"
diff --git a/bld/namelist_files/namelist_defaults_drydep.xml b/bld/namelist_files/namelist_defaults_drydep.xml
index 08bb5adaef..fb73ab6646 100644
--- a/bld/namelist_files/namelist_defaults_drydep.xml
+++ b/bld/namelist_files/namelist_defaults_drydep.xml
@@ -5,7 +5,7 @@
 <namelist_defaults>
 
 <!--
-Values to use by default for creation of CLM model driver namelists.
+Values to use by default for creation of CLM model driver testing namelists.
 The element names are the same as the corresponding namelist
 variables.  Values that depend on the model configuration use
 attributes to express the dependency.  The recognized attributes
@@ -13,7 +13,7 @@ are: RESOLUTION, defaults, mask, ic_ymd, ic_tod, sim_year and all configuration
 attributes from the config_cache.xml file (with keys converted to upper-case).
 -->
 
-<!-- Defaults for drydep_inparm namelist  -->
+<!-- Defaults for drydep_inparm namelist namelists to test standalone CTSM with  -->
 
 <drydep_list>'O3','NO2','HNO3','NO','HO2NO2','CH3OOH','CH2O','CO','H2O2','CH3COOOH','PAN','MPAN','C2H5OOH','ONIT','POOH','C3H7OOH','ROOH','CH3COCHO','CH3COCH3','Pb','ONITR','MACROOH','XOOH','ISOPOOH','CH3OH','C2H5OH','CH3CHO','GLYALD','HYAC','HYDRALD','ALKOOH','MEKOOH','TOLOOH','TERPOOH','CH3COOH','CB1','CB2','OC1','OC2','SOA','SO2','SO4','NH3','NH4NO3'
 </drydep_list>
@@ -21,7 +21,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
 <!-- effective Henry's coef data for wet and dry deposition -->
 <dep_data_file>atm/cam/chem/trop_mozart/dvel/dep_data_c201019.nc</dep_data_file>
 
-<!-- Defaults for megan_emis_nl -->
+<!-- Defaults for megan_emis_nl namelists to test standalone CTSM with -->
 
 <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>
 
diff --git a/bld/namelist_files/namelist_defaults_fire_emis.xml b/bld/namelist_files/namelist_defaults_fire_emis.xml
index b7536ba66b..54e67424d5 100644
--- a/bld/namelist_files/namelist_defaults_fire_emis.xml
+++ b/bld/namelist_files/namelist_defaults_fire_emis.xml
@@ -5,7 +5,7 @@
 <namelist_defaults>
 
 <!--
-Values to use by default for creation of CLM model driver namelists.
+Values to use by default for creation of CLM model driver testing namelists.
 The element names are the same as the corresponding namelist
 variables.  Values that depend on the model configuration use
 attributes to express the dependency.  The recognized attributes
@@ -13,7 +13,7 @@ are: RESOLUTION, defaults, mask, ic_ymd, ic_tod, sim_year and all configuration
 attributes from the config_cache.xml file (with keys converted to upper-case).
 -->
 
-<!-- Defaults for fire_emis_nl namelist  -->
+<!-- Defaults for fire_emis_nl namelists for testing -->
 
 <fire_emis_specifier>'bc_a1 = BC','pom_a1 = 1.4*OC','SO2 = SO2'</fire_emis_specifier>
 
diff --git a/bld/namelist_files/namelist_definition_drv_flds.xml b/bld/namelist_files/namelist_definition_drv_flds.xml
index 89bab07f4f..f440a9a678 100644
--- a/bld/namelist_files/namelist_definition_drv_flds.xml
+++ b/bld/namelist_files/namelist_definition_drv_flds.xml
@@ -35,10 +35,14 @@
 	 group="megan_emis_nl"
 	 valid_values="" >
     MEGAN specifier. This is in the form of: Chem-compound = megan_compound(s)
-    where megan_compound(s) can be the sum of megan compounds with a "+" between them.
+    where megan_compound(s) can be an equation with megan compounds added or subtracted together with multiplication
     In each equation, the item to the left of the equal sign is a CAM chemistry compound, the
     items to the right are compounds known to the MEGAN model (single or combinations).
+    Long lines for equations can be split into multiple specifiers
     For example: megan_specifier = 'ISOP = isoprene', 'C10H16 = pinene_a + carene_3 + thujene_a'
+    or...        megan_specifier = 'SOAE = 0.5954*isoprene + 5.1004*(carene_3 + pinene_a + thujene_a + bornene +',
+                                   ' terpineol_4 + terpineol_a + terpinyl_ACT_a + myrtenal + sabinene + pinene_b + camphene +',
+    and etcetera...
   </entry>
 
   <entry id="megan_mapped_emisfctrs"
@@ -123,6 +127,10 @@
     List of fluxes needed by the CARMA model, from CLM to CAM.
   </entry>
 
+  <!-- ========================================================================================  -->
+  <!-- DUST Emission fields                                                                      -->
+  <!-- ========================================================================================  -->
+
   <entry id="dust_emis_method" type="char*80" category="dust_emissions"
     group="dust_emis_inparm" valid_values="Zender_2003,Leung_2023" >
      Which dust emission method is going to be used. Either the Zender 2003 scheme or the Leung 2023 scheme.
@@ -136,4 +144,27 @@
      (only used when dust_emis_method is Zender_2003)
   </entry>
 
+  <!-- ========================================================================================  -->
+  <!-- Ozone to surface                                                                          -->
+  <!-- ========================================================================================  -->
+
+  <entry id="atm_ozone_frequency" type="char*64" category="ozone_coupling"
+         group="ozone_coupling_nl" valid_values="subdaily,multiday_average">
+         Frequency of surface ozone field passed from CAM to surface components.
+         Surface ozone is passed every coupling interval, but this namelist flag
+         indicates whether the timestep-level values are interpolated from a
+         coarser temporal resolution.
+         Default: set by CAM
+  </entry>
+
+  <!-- ========================================================================================  -->
+  <!-- Lightning                                                                                 -->
+  <!-- ========================================================================================  -->
+
+  <entry id="atm_provides_lightning" type="logical" category="lightning_coupling"
+         group="lightning_coupling_nl" valid_values="">
+         If TRUE atmosphere model will provide prognosed lightning flash frequency.
+         (NOTE: NOT CONNECTED INTO CTSM YET)
+  </entry>
+
 </namelist_definition>
diff --git a/bld/unit_testers/Buildconf/camconf/drv_flds_in b/bld/unit_testers/Buildconf/camconf/drv_flds_in
new file mode 100644
index 0000000000..c551ccacf5
--- /dev/null
+++ b/bld/unit_testers/Buildconf/camconf/drv_flds_in
@@ -0,0 +1,24 @@
+&drydep_inparm
+ dep_data_file		= '/glade/campaign/cesm/cesmdata/inputdata/atm/cam/chem/trop_mozart/dvel/dep_data_c20221208.nc'
+ drydep_list		= 'DMS','H2O2','H2SO4','SO2','SOAG'
+/
+&megan_emis_nl
+ megan_factors_file		= '/glade/campaign/cesm/cesmdata/inputdata/atm/cam/chem/trop_mozart/emis/megan21_emis_factors_78pft_c20161108.nc'
+ megan_mapped_emisfctrs		= .false.
+ megan_specifier		= 'SOAE = 0.5954*isoprene + 5.1004*(carene_3 + pinene_a + thujene_a + bornene +', ' terpineol_4 + terpineol_a + terpinyl_ACT_a + myrtenal + sabinene + pinene_b + camphene +',
+         ' fenchene_a + limonene + phellandrene_a + terpinene_a + terpinene_g + terpinolene +', ' phellandrene_b + linalool + ionone_b + geranyl_acetone + neryl_acetone + jasmone +',
+         ' verbenene + ipsenol + myrcene + ocimene_t_b + ocimene_al + ocimene_c_b + 2met_nonatriene) + ', ' 12.3942*(farnescene_a + caryophyllene_b + acoradiene + aromadendrene + bergamotene_a +',
+         ' bergamotene_b + bisabolene_a + bisabolene_b + bourbonene_b + cadinene_d + cadinene_g +', ' cedrene_a + copaene_a + cubebene_a + cubebene_b + elemene_b + farnescene_b +',
+         ' germacrene_B + germacrene_D + gurjunene_b + humulene_a + humulene_g + isolongifolene +', ' longifolene + longipinene + muurolene_a + muurolene_g + selinene_b + selinene_d +',
+         ' nerolidol_c + nerolidol_t)'
+/
+&dust_emis_inparm
+  dust_emis_method = 'Zender_2003'
+  zender_soil_erod_source = 'atm'
+/
+&lightning_coupling_nl
+  atm_provides_lightning = .true.
+/
+&ozone_coupling_nl
+  atm_ozone_frequency = 'multiday_average'
+/
diff --git a/bld/unit_testers/build-namelist_test.pl b/bld/unit_testers/build-namelist_test.pl
index c51b0b0cb3..8b2827b069 100755
--- a/bld/unit_testers/build-namelist_test.pl
+++ b/bld/unit_testers/build-namelist_test.pl
@@ -163,10 +163,10 @@ sub cat_and_create_namelistinfile {
 #
 # Figure out number of tests that will run
 #
-my $ntests = 3339;
+my $ntests = 3349;
 
 if ( defined($opts{'compare'}) ) {
-   $ntests += 1999;
+   $ntests += 2007;
 }
 plan( tests=>$ntests );
 
@@ -447,7 +447,32 @@ sub cat_and_create_namelistinfile {
       &cleanup();
    }
 }
-
+print "\n===============================================================================\n";
+print "Test setting drv_flds_in fields in CAM";
+print "=================================================================================\n";
+foreach my $phys ( "clm5_0", "clm6_0" ) {
+   $mode = "-phys $phys CAM_SETS_DRV_FLDS";
+   &make_config_cache($phys);
+   foreach my $options (
+                      "--res 1.9x2.5 --mask gx1v7 --bgc sp --use_case 20thC_transient --namelist '&a start_ymd=19790101/' --lnd_tuning_mode ${phys}_cam6.0 --infile empty_user_nl_clm",
+                      "--res 1.9x2.5 --mask gx1v7 --bgc sp --use_case 20thC_transient --namelist '&a start_ymd=19790101/' --lnd_tuning_mode ${phys}_cam7.0 --infile empty_user_nl_clm",
+                     ) {
+      &make_env_run( 'LND_SETS_DUST_EMIS_DRV_FLDS'=>"FALSE" );
+      eval{ system( "$bldnml --envxml_dir . $options > $tempfile 2>&1 " ); };
+      is( $@, '', "options: $options" );
+      $cfiles->checkfilesexist( "$options", $mode );
+      $cfiles->shownmldiff( "default", $mode );
+      if ( defined($opts{'compare'}) ) {
+         $cfiles->doNOTdodiffonfile( "$tempfile", "$options", $mode );
+         $cfiles->dodiffonfile(      "lnd_in",    "$options", $mode );
+         $cfiles->comparefiles( "$options", $mode, $opts{'compare'} );
+      }
+      if ( defined($opts{'generate'}) ) {
+         $cfiles->copyfiles( "$options", $mode );
+      }
+      &cleanup();
+   }
+}
 print "\n==============================================================\n";
 print "Test several use_cases and specific configurations for clm5_0\n";
 print "==============================================================\n";
@@ -518,7 +543,7 @@ sub cat_and_create_namelistinfile {
                                      phys=>"clm4_5",
                                    },
      "LeungDust_WO_Prigent"      =>{ options=>" -envxml_dir . -bgc sp",
-                                     namelst=>"use_prigent_roughness=.false.",
+                                     namelst=>"use_prigent_roughness=.true.",
                                      phys=>"clm5_1",
                                    },
      "soilm_stream off w file"      =>{ options=>"-res 0.9x1.25 -envxml_dir .",
@@ -1068,14 +1093,6 @@ sub cat_and_create_namelistinfile {
                                      namelst=>"use_hydrstress=.true.",
                                      phys=>"clm5_0",
                                    },
-     "specWOfireemis"            =>{ options=>"-envxml_dir . -no-fire_emis",
-                                     namelst=>"fire_emis_specifier='bc_a1 = BC'",
-                                     phys=>"clm5_0",
-                                   },
-     "elevWOfireemis"            =>{ options=>"-envxml_dir . -no-fire_emis",
-                                     namelst=>"fire_emis_elevated=.false.",
-                                     phys=>"clm5_0",
-                                   },
      "noanthro_w_crop"            =>{ options=>"-envxml_dir . -res 0.9x1.25 -bgc bgc -crop -use_case 1850_noanthro_control",
                                      namelst=>"",
                                      phys=>"clm5_0",
@@ -1261,7 +1278,7 @@ sub cat_and_create_namelistinfile {
                                      phys=>"clm5_0",
                                    },
      "bad_megan_spec"            =>{ options=>"-envxml_dir . -bgc bgc -megan",
-                                     namelst=>"megan_specifier='ZZTOP=zztop'",
+                                     namelst=>"megan_specifier='ZZTOP=zztop%'",
                                      phys=>"clm4_5",
                                    },
      "FUN_wo_flexCN"             =>{ options=>"-envxml_dir . -bgc bgc",
diff --git a/bld/unit_testers/empty_user_nl_clm b/bld/unit_testers/empty_user_nl_clm
new file mode 100644
index 0000000000..45fda13d2c
--- /dev/null
+++ b/bld/unit_testers/empty_user_nl_clm
@@ -0,0 +1 @@
+! empty user_nl_clm file
diff --git a/cime_config/buildnml b/cime_config/buildnml
old mode 100755
new mode 100644
index 3eb45dff31..e9b7a610cd
--- a/cime_config/buildnml
+++ b/cime_config/buildnml
@@ -71,6 +71,7 @@ def buildnml(case, caseroot, compname):
     yr_start = int(yr_start)
     yr_end = int(yr_end)
 
+    clm_usrdat_name = case.get_value("CLM_USRDAT_NAME")
     comp_atm = case.get_value("COMP_ATM")
     lnd_grid = case.get_value("LND_GRID")
     ninst_lnd = case.get_value("NINST_LND")
@@ -80,6 +81,7 @@ def buildnml(case, caseroot, compname):
     run_refcase = case.get_value("RUN_REFCASE")
     run_refdate = case.get_value("RUN_REFDATE")
     run_reftod = case.get_value("RUN_REFTOD")
+    start_tod = case.get_value("START_TOD")
     glc_nec = case.get_value("GLC_NEC")
     glc_use_antarctica = case.get_value("GLC_USE_ANTARCTICA")
     mask = case.get_value("MASK_GRID")
@@ -224,11 +226,24 @@ def buildnml(case, caseroot, compname):
         clm_usrdat_name = case.get_value("CLM_USRDAT_NAME")
         clmusr = " -clm_usr_name %s " % clm_usrdat_name
         # Write warning about initial condition data
-        if "NEON" in clm_usrdat_name and clm_force_coldstart == "off":
-            if ("_transient" in clm_nml_use_case) and (
-                re.fullmatch(r"\w\w\w\w\.transient", casename) is None
-                or clm_usrdat_name is "NEON.PRISM"
-            ):
+        if (
+            "NEON" in clm_usrdat_name
+            or "PLUMBER2" in clm_usrdat_name
+            and clm_force_coldstart == "off"
+        ):
+            warning_init_conditions = False
+            if "NEON" in clm_usrdat_name:
+                if ("_transient" in clm_nml_use_case) and (
+                    re.fullmatch(r"\w\w\w\w\.transient", casename) is None
+                    or clm_usrdat_name is "NEON.PRISM"
+                ):
+                    warning_init_conditions = True
+            if "PLUMBER2" in clm_usrdat_name:
+                if ("_transient" in clm_nml_use_case) and (
+                    re.fullmatch(r"\w\w-\w\w\w\.transient", casename) is None
+                ):
+                    warning_init_conditions = True
+            if warning_init_conditions == True:
                 logger.warning(
                     "WARNING: Do you have appropriate initial conditions for this simulation?"
                     + " Check that the finidat file used in the lnd_in namelist is appropriately spunup for your case"
@@ -340,12 +355,19 @@ def buildnml(case, caseroot, compname):
         if run_type == "hybrid" or run_type == "branch":
             compnames = ["clm4", "clm5", "clm2"]
             for comp in compnames:
+                if "PLUMBER2" in clm_usrdat_name:
+                    # start_tod is supplied for PLUMBER cases
+                    tod = start_tod
+                else:
+                    # run_reftod is supplied for other cases
+                    tod = run_reftod
+
                 clm_startfile = "%s.%s%s.r.%s-%s.nc" % (
                     run_refcase,
                     comp,
                     inst_string,
                     run_refdate,
-                    run_reftod,
+                    tod,
                 )
                 if os.path.exists(os.path.join(rundir, clm_startfile)):
                     break
@@ -364,7 +386,7 @@ def buildnml(case, caseroot, compname):
                         break
 
             if not os.path.exists(os.path.join(rundir, clm_startfile)):
-                logger.warning("WARNING: Could NOT find a start file to use using" + clm_startfile)
+                logger.warning("WARNING: Could NOT find a start file named " + clm_startfile)
             clm_icfile = "%s = '%s'" % (startfile_type, clm_startfile)
         else:
             clm_icfile = ""
diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml
index 3c48e16651..3fb682ccf0 100644
--- a/cime_config/config_component.xml
+++ b/cime_config/config_component.xml
@@ -167,6 +167,7 @@
   </entry>
 
   <entry id="LND_SETS_DUST_EMIS_DRV_FLDS">
+    <!-- See https://github.com/ESCOMP/CTSM/issues/2713 we plan to phase this out -->
     <type>logical</type>
     <valid_values>TRUE,FALSE</valid_values>
     <default_value>TRUE</default_value>
@@ -330,7 +331,8 @@
       to create_newcase.  The default value is UNSET.
       For NEON cases, this can be set to either NEON or NEON.PRISM, the latter of which would
       use PRISM precipitation instead of the default NEON precipitation. NEON cases then also
-      use the variable NEONSITE to specify the exact site.</desc>
+      use the variable NEONSITE to specify the exact site. PLUMBER cases use the variable 
+      PLUMBER2SITE to specify the exact site.</desc>
   </entry>
 
   <entry id="CLM_USRDAT_DIR">
@@ -355,7 +357,7 @@
       cold start (finidat will be set to blanks).
       A value of on forces the model to spin up from a cold-start
       (arbitrary initial conditions). Setting this value in the xml file will take
-      precedence over any settings for finidat in the $CASEROOT/user_nl_ctsm file.</desc>
+      precedence over any settings for finidat in the $CASEROOT/user_nl_clm file.</desc>
   </entry>
 
   <entry id="CLM_USER_MODS">
@@ -418,6 +420,28 @@
     <desc>Version id of Neon data</desc>
   </entry>
 
+  <entry id="PLUMBER2SITE">
+    <type>char</type>
+    <!-- NOTE: Be sure to have a comma at the last site-name - otherwise there will be issues see CTSM github issue #1901 -->
+    <valid_values>
+      AR-SLu,AT-Neu,AU-ASM,AU-Cow,AU-Cpr,AU-Ctr,AU-Cum,AU-DaP,AU-DaS,AU-Dry,AU-Emr,AU-Gin,AU-GWW,AU-How,AU-Lit,
+      AU-Otw,AU-Rig,AU-Rob,AU-Sam,AU-Stp,AU-TTE,AU-Tum,AU-Whr,AU-Wrr,AU-Ync,BE-Bra,BE-Lon,BE-Vie,BR-Sa3,BW-Ma1,CA-NS1,
+      CA-NS2,CA-NS4,CA-NS5,CA-NS6,CA-NS7,CA-Qcu,CA-Qfo,CA-SF1,CA-SF2,CA-SF3,CH-Cha,CH-Dav,CH-Fru,CH-Oe1,CN-Cha,CN-Cng,
+      CN-Dan,CN-Din,CN-Du2,CN-HaM,CN-Qia,CZ-wet,DE-Bay,DE-Geb,DE-Gri,DE-Hai,DE-Kli,DE-Meh,DE-Obe,DE-Seh,DE-SfN,DE-Tha,
+      DE-Wet,DK-Fou,DK-Lva,DK-Ris,DK-Sor,DK-ZaH,ES-ES1,ES-ES2,ES-LgS,ES-LMa,ES-VDA,FI-Hyy,FI-Kaa,FI-Lom,FI-Sod,FR-Fon,
+      FR-Gri,FR-Hes,FR-LBr,FR-Lq1,FR-Lq2,FR-Pue,GF-Guy,HU-Bug,ID-Pag,IE-Ca1,IE-Dri,IT-Amp,IT-BCi,IT-CA1,IT-CA2,IT-CA3,
+      IT-Col,IT-Cpz,IT-Isp,IT-Lav,IT-LMa,IT-Mal,IT-MBo,IT-Noe,IT-Non,IT-PT1,IT-Ren,IT-Ro1,IT-Ro2,IT-SR2,IT-SRo,JP-SMF,
+      NL-Ca1,NL-Hor,NL-Loo,PL-wet,PT-Esp,PT-Mi1,PT-Mi2,RU-Che,RU-Fyo,RU-Zot,SD-Dem,SE-Deg,UK-Gri,UK-Ham,UK-PL3,US-AR1,
+      US-AR2,US-ARM,US-Aud,US-Bar,US-Bkg,US-Blo,US-Bo1,US-Cop,US-FPe,US-GLE,US-Goo,US-Ha1,US-Ho1,US-KS2,US-Los,US-Me2,
+      US-Me4,US-Me6,US-MMS,US-MOz,US-Myb,US-Ne1,US-Ne2,US-Ne3,US-NR1,US-PFa,US-Prr,US-SP1,US-SP2,US-SP3,US-SRG,US-SRM,
+      US-Syv,US-Ton,US-Tw4,US-Twt,US-UMB,US-Var,US-WCr,US-Whs,US-Wkg,ZA-Kru,ZM-Mon,
+    </valid_values>
+    <default_value/>
+    <group>run_component_ctsm</group>
+    <file>env_run.xml</file>
+    <desc>Name of site for PLUMBER tower data</desc>
+  </entry>
+
 <help>
     =========================================
     CLM naming conventions
diff --git a/cime_config/testdefs/ExpectedTestFails.xml b/cime_config/testdefs/ExpectedTestFails.xml
index d1e0a1a8b8..e18b15a26e 100644
--- a/cime_config/testdefs/ExpectedTestFails.xml
+++ b/cime_config/testdefs/ExpectedTestFails.xml
@@ -52,13 +52,6 @@
     </phase>
   </test>
 
-  <test name="SMS_D_Ld10.f10_f10_mg37.I2000Clm50BgcCrop.izumi_intel.clm-tracer_consistency">
-    <phase name="RUN">
-      <status>FAIL</status>
-      <issue>#2444</issue>
-    </phase>
-  </test>
-
   <test name="PEM_D_Ld9.ne30pg3_t232.I1850Clm60BgcCropG.derecho_intel.clm-clm60cam7LndTuningMode">
     <phase name="COMPARE_base_modpes">
       <status>FAIL</status>
@@ -113,20 +106,6 @@
     </phase>
   </test>
 
-  <test name="SMS_Lm3_D_Mmpi-serial.1x1_brazil.I2000Clm50FatesCruRsGs.izumi_intel.clm-FatesColdHydro">
-    <phase name="RUN">
-      <status>FAIL</status>
-      <issue>#2373</issue>
-    </phase>
-  </test>
-
-  <test name="SMS_Lm3_D_Mmpi-serial.1x1_brazil.I2000Clm50FatesCruRsGs.izumi_nag.clm-FatesColdHydro">
-    <phase name="RUN">
-      <status>FAIL</status>
-      <issue>#2373</issue>
-    </phase>
-  </test>
-
   <test name="FUNITCTSM_P1x1.f10_f10_mg37.I2000Clm50Sp.izumi_intel">
     <phase name="RUN">
       <status>FAIL</status>
@@ -186,17 +165,6 @@
     </phase>
   </test>
       
-  <test name="ERS_D_Ld5.1x1_brazil.I2000Clm50FatesCruRsGs.izumi_nag.clm-FatesColdHydro">
-    <phase name="RUN">
-      <status>FAIL</status>
-      <issue>#2373</issue>
-    </phase>
-    <phase name="COMPARE_base_rest">
-      <status>FAIL</status>
-      <issue>FATES#701</issue>
-    </phase>
-  </test>
-
   <test name="ERP_P256x2_Ld30.f45_f45_mg37.I2000Clm60FatesRs.derecho_intel.clm-mimicsFatesCold">
     <phase name="RUN">
       <status>FAIL</status>
diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml
index de9cd0b1be..425fdaaf34 100644
--- a/cime_config/testdefs/testlist_clm.xml
+++ b/cime_config/testdefs/testlist_clm.xml
@@ -152,7 +152,7 @@
       <machine name="derecho" compiler="intel" category="aux_clm"/>
     </machines>
     <options>
-      <option name="wallclock">00:20:00</option>
+      <option name="wallclock">00:40:00</option>
       <option name="comment">CESM3 development Exact restart test for all startup types at the standard coupled resolution</option>
     </options>
   </test>
@@ -1998,6 +1998,7 @@
   <test name="SMS" grid="f45_f45_mg37" compset="I2000Clm60FatesSpRsGs" testmods="clm/FatesColdSatPhen">
     <machines>
       <machine name="derecho" compiler="nvhpc" category="aux_clm"/>
+      <machine name="derecho" compiler="nvhpc" category="fates"/>
     </machines>
     <options>
       <option name="wallclock">00:20:00</option>
@@ -3169,7 +3170,7 @@
   <test name="SMS_D" grid="1x1_brazil" compset="I2000Clm60FatesSpCruRsGs" testmods="clm/FatesColdSatPhen">
     <machines>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
-      <machine name="derecho" compiler="intel" category="fates"/>
+      <machine name="derecho" compiler="gnu" category="fates"/>
     </machines>
     <options>
       <option name="wallclock">00:20:00</option>
diff --git a/cime_config/testdefs/testmods_dirs/clm/Fates/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/Fates/user_nl_clm
index 91df3e2e61..8bd9f01335 100644
--- a/cime_config/testdefs/testmods_dirs/clm/Fates/user_nl_clm
+++ b/cime_config/testdefs/testmods_dirs/clm/Fates/user_nl_clm
@@ -26,5 +26,4 @@ hist_fincl1       = 'FATES_NCOHORTS', 'FATES_TRIMMING', 'FATES_AREA_PLANTS',
 'FATES_NEP', 'FATES_HET_RESP', 'FATES_FIRE_CLOSS', 'FATES_FIRE_FLUX_EL',
 'FATES_CBALANCE_ERROR', 'FATES_ERROR_EL', 'FATES_LEAF_ALLOC',
 'FATES_SEED_ALLOC', 'FATES_STEM_ALLOC', 'FATES_FROOT_ALLOC',
-'FATES_CROOT_ALLOC', 'FATES_STORE_ALLOC',
-'FATES_PATCHAREA_LU', 'FATES_DISTURBANCE_RATE_MATRIX_LULU'
+'FATES_CROOT_ALLOC', 'FATES_STORE_ALLOC'
diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdAllVars/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/FatesColdAllVars/user_nl_clm
index a426c775b0..92434df000 100644
--- a/cime_config/testdefs/testmods_dirs/clm/FatesColdAllVars/user_nl_clm
+++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdAllVars/user_nl_clm
@@ -26,7 +26,7 @@ hist_fincl1       = 'FATES_TLONGTERM',
 'FATES_MORTALITY_CROWNSCORCH_SZPF','FATES_MORTALITY_CAMBIALBURN_SZPF','FATES_MORTALITY_TERMINATION_SZPF',
 'FATES_MORTALITY_LOGGING_SZPF','FATES_MORTALITY_FREEZING_SZPF','FATES_MORTALITY_SENESCENCE_SZPF',
 'FATES_MORTALITY_AGESCEN_SZPF','FATES_MORTALITY_AGESCEN_ACPF','FATES_MORTALITY_CANOPY_SZPF',
-'FATES_M3_MORTALITY_CANOPY_SZPF','FATES_M3_MORTALITY_USTORY_SZPF','FATES_C13DISC_SZPF',
+'FATES_M3_MORTALITY_CANOPY_SZPF','FATES_M3_MORTALITY_USTORY_SZPF',
 'FATES_STOREC_CANOPY_SZPF','FATES_LEAFC_CANOPY_SZPF','FATES_LAI_CANOPY_SZPF','FATES_CROWNAREA_CANOPY_SZPF',
 'FATES_CROWNAREA_USTORY_SZPF','FATES_NPLANT_CANOPY_SZPF','FATES_MORTALITY_USTORY_SZPF','FATES_STOREC_USTORY_SZPF',
 'FATES_LEAFC_USTORY_SZPF','FATES_LAI_USTORY_SZPF','FATES_NPLANT_USTORY_SZPF','FATES_CWD_ABOVEGROUND_DC',
diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdLUH2/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/FatesColdLUH2/user_nl_clm
index e25490ffbb..55650230a4 100644
--- a/cime_config/testdefs/testmods_dirs/clm/FatesColdLUH2/user_nl_clm
+++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdLUH2/user_nl_clm
@@ -7,3 +7,5 @@ use_fates_nocomp = .true.
 use_fates_fixed_biogeog = .true.
 use_fates_sp = .false.
 use_fates_potentialveg = .false.
+hist_fincl1 = 'FATES_PATCHAREA_LU', 'FATES_DISTURBANCE_RATE_MATRIX_LULU',
+'FATES_TRANSITION_MATRIX_LULU'
diff --git a/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands
index f64d8759a2..f297937768 100644
--- a/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=AR-SLu
 ./xmlchange PTS_LON=-66.459808
 ./xmlchange PTS_LAT=-33.464802
 ./xmlchange DATM_YR_END=2010
+./xmlchange DATM_YR_START_FILENAME=2010
 ./xmlchange START_TOD=10800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AR-SLu_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AR-SLu/CLM1PT_data/CTSM_DATM_AR-SLu_2010-2010.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2010" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands
index b8a54e5644..319c52a95d 100644
--- a/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=AT-Neu
 ./xmlchange PTS_LON=11.3175
 ./xmlchange PTS_LAT=47.116669
 ./xmlchange DATM_YR_END=2012
+./xmlchange DATM_YR_START_FILENAME=2002
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AT-Neu_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AT-Neu/CLM1PT_data/CTSM_DATM_AT-Neu_2002-2012.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands
index 2d5e0d85fd..afadee1c1e 100644
--- a/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands
@@ -1,11 +1,11 @@
-./xmlchange PTS_LON=133.24899299999998
-./xmlchange PTS_LAT=-22.283001000000002
+./xmlchange PLUMBER2SITE=AU-ASM
+./xmlchange PTS_LON=133.248993
+./xmlchange PTS_LAT=-22.283001
 ./xmlchange DATM_YR_END=2017
+./xmlchange DATM_YR_START_FILENAME=2011
 ./xmlchange START_TOD=54000
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-ASM_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-ASM/CLM1PT_data/CTSM_DATM_AU-ASM_2011-2017.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands
index fe84b1e129..40187f1b46 100644
--- a/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=AU-Cow
 ./xmlchange PTS_LON=145.427155
 ./xmlchange PTS_LAT=-16.23819
 ./xmlchange DATM_YR_END=2015
+./xmlchange DATM_YR_START_FILENAME=2010
 ./xmlchange START_TOD=50400
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Cow_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Cow/CLM1PT_data/CTSM_DATM_AU-Cow_2010-2015.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2015" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands
index fcb7375d71..fc3b037ecc 100644
--- a/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=AU-Cpr
 ./xmlchange PTS_LON=140.589127
 ./xmlchange PTS_LAT=-34.00206
 ./xmlchange DATM_YR_END=2017
+./xmlchange DATM_YR_START_FILENAME=2011
 ./xmlchange START_TOD=46800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Cpr_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Cpr/CLM1PT_data/CTSM_DATM_AU-Cpr_2011-2017.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands
index 8d42bed60a..6710134c78 100644
--- a/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=AU-Ctr
 ./xmlchange PTS_LON=145.446854
 ./xmlchange PTS_LAT=-16.103279
 ./xmlchange DATM_YR_END=2017
+./xmlchange DATM_YR_START_FILENAME=2010
 ./xmlchange START_TOD=50400
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Ctr_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Ctr/CLM1PT_data/CTSM_DATM_AU-Ctr_2010-2017.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands
index 17aed3a1dd..a2022818c6 100644
--- a/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=AU-Cum
 ./xmlchange PTS_LON=150.722473
-./xmlchange PTS_LAT=-33.613296999999996
+./xmlchange PTS_LAT=-33.613297
 ./xmlchange DATM_YR_END=2018
+./xmlchange DATM_YR_START_FILENAME=2013
 ./xmlchange START_TOD=46800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Cum_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Cum/CLM1PT_data/CTSM_DATM_AU-Cum_2013-2018.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2018" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2013" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands
index 816e4c78dc..28b5b4b446 100644
--- a/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=AU-DaP
 ./xmlchange PTS_LON=131.3181
 ./xmlchange PTS_LAT=-14.0633
 ./xmlchange DATM_YR_END=2012
+./xmlchange DATM_YR_START_FILENAME=2009
 ./xmlchange START_TOD=54000
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-DaP_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-DaP/CLM1PT_data/CTSM_DATM_AU-DaP_2009-2012.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2009" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2009" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands
index 0ea37fd95a..96acb7b7cf 100644
--- a/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=AU-DaS
 ./xmlchange PTS_LON=131.388
-./xmlchange PTS_LAT=-14.159282999999999
+./xmlchange PTS_LAT=-14.159283
 ./xmlchange DATM_YR_END=2017
+./xmlchange DATM_YR_START_FILENAME=2010
 ./xmlchange START_TOD=54000
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-DaS_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-DaS/CLM1PT_data/CTSM_DATM_AU-DaS_2010-2017.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands
index 3cd8faecd9..da520bb88e 100644
--- a/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=AU-Dry
 ./xmlchange PTS_LON=132.370605
 ./xmlchange PTS_LAT=-15.2588
 ./xmlchange DATM_YR_END=2015
+./xmlchange DATM_YR_START_FILENAME=2011
 ./xmlchange START_TOD=54000
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Dry_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Dry/CLM1PT_data/CTSM_DATM_AU-Dry_2011-2015.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2015" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands
index 7822948582..a5ccf45884 100644
--- a/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=AU-Emr
 ./xmlchange PTS_LON=148.474594
 ./xmlchange PTS_LAT=-23.8587
 ./xmlchange DATM_YR_END=2013
+./xmlchange DATM_YR_START_FILENAME=2012
 ./xmlchange START_TOD=50400
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Emr_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Emr/CLM1PT_data/CTSM_DATM_AU-Emr_2012-2013.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2012" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands
index 258ee5f12a..637c921fae 100644
--- a/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=AU-GWW
 ./xmlchange PTS_LON=120.654099
 ./xmlchange PTS_LAT=-30.191299
 ./xmlchange DATM_YR_END=2017
+./xmlchange DATM_YR_START_FILENAME=2013
 ./xmlchange START_TOD=57600
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-GWW_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-GWW/CLM1PT_data/CTSM_DATM_AU-GWW_2013-2017.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2013" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands
index 31071a2ebb..e02f3482ed 100644
--- a/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=AU-Gin
 ./xmlchange PTS_LON=115.650002
 ./xmlchange PTS_LAT=-31.375
 ./xmlchange DATM_YR_END=2017
+./xmlchange DATM_YR_START_FILENAME=2012
 ./xmlchange START_TOD=57600
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Gin_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Gin/CLM1PT_data/CTSM_DATM_AU-Gin_2012-2017.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2012" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands
index 411cec6d9c..448f24cc4f 100644
--- a/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=AU-How
 ./xmlchange PTS_LON=131.149994
 ./xmlchange PTS_LAT=-12.4952
 ./xmlchange DATM_YR_END=2017
+./xmlchange DATM_YR_START_FILENAME=2003
 ./xmlchange START_TOD=54000
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-How_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-How/CLM1PT_data/CTSM_DATM_AU-How_2003-2017.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands
index 7fc59ce824..6e69bbc5d2 100644
--- a/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands
@@ -1,11 +1,11 @@
-./xmlchange PTS_LON=130.79449499999998
-./xmlchange PTS_LAT=-13.179039999999999
+./xmlchange PLUMBER2SITE=AU-Lit
+./xmlchange PTS_LON=130.794495
+./xmlchange PTS_LAT=-13.17904
 ./xmlchange DATM_YR_END=2017
+./xmlchange DATM_YR_START_FILENAME=2016
 ./xmlchange START_TOD=54000
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Lit_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Lit/CLM1PT_data/CTSM_DATM_AU-Lit_2016-2017.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2016" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2016" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands
index 6671c26040..c3962c1b33 100644
--- a/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=AU-Otw
 ./xmlchange PTS_LON=142.816803
-./xmlchange PTS_LAT=-38.532340999999995
+./xmlchange PTS_LAT=-38.532341
 ./xmlchange DATM_YR_END=2010
+./xmlchange DATM_YR_START_FILENAME=2009
 ./xmlchange START_TOD=46800
 ./xmlchange ATM_NCPL=24
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Otw_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Otw/CLM1PT_data/CTSM_DATM_AU-Otw_2009-2010.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2009" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2010" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2009" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands
index db70e72c89..fc5ecba950 100644
--- a/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=AU-Rig
 ./xmlchange PTS_LON=145.575897
 ./xmlchange PTS_LAT=-36.649899
 ./xmlchange DATM_YR_END=2016
+./xmlchange DATM_YR_START_FILENAME=2011
 ./xmlchange START_TOD=46800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Rig_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Rig/CLM1PT_data/CTSM_DATM_AU-Rig_2011-2016.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2016" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands
index 33e2084f14..6e640a50fa 100644
--- a/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=AU-Rob
 ./xmlchange PTS_LON=145.630096
 ./xmlchange PTS_LAT=-17.1175
 ./xmlchange DATM_YR_END=2017
+./xmlchange DATM_YR_START_FILENAME=2014
 ./xmlchange START_TOD=50400
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Rob_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Rob/CLM1PT_data/CTSM_DATM_AU-Rob_2014-2017.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2014" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2014" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands
index 561ba257fa..1f48d3060f 100644
--- a/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands
@@ -1,11 +1,11 @@
-./xmlchange PTS_LON=152.87780800000002
+./xmlchange PLUMBER2SITE=AU-Sam
+./xmlchange PTS_LON=152.877808
 ./xmlchange PTS_LAT=-27.3881
 ./xmlchange DATM_YR_END=2017
+./xmlchange DATM_YR_START_FILENAME=2011
 ./xmlchange START_TOD=50400
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Sam_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Sam/CLM1PT_data/CTSM_DATM_AU-Sam_2011-2017.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands
index 97db87c821..949257e09f 100644
--- a/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=AU-Stp
 ./xmlchange PTS_LON=133.350204
 ./xmlchange PTS_LAT=-17.1507
 ./xmlchange DATM_YR_END=2017
+./xmlchange DATM_YR_START_FILENAME=2010
 ./xmlchange START_TOD=54000
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Stp_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Stp/CLM1PT_data/CTSM_DATM_AU-Stp_2010-2017.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands
index dee6244ef7..ca7b84c598 100644
--- a/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=AU-TTE
 ./xmlchange PTS_LON=133.639999
 ./xmlchange PTS_LAT=-22.287001
 ./xmlchange DATM_YR_END=2017
+./xmlchange DATM_YR_START_FILENAME=2013
 ./xmlchange START_TOD=54000
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-TTE_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-TTE/CLM1PT_data/CTSM_DATM_AU-TTE_2013-2017.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2013" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands
index 36cd89bc73..5ad2d9dce2 100644
--- a/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=AU-Tum
 ./xmlchange PTS_LON=148.151703
 ./xmlchange PTS_LAT=-35.656601
 ./xmlchange DATM_YR_END=2017
+./xmlchange DATM_YR_START_FILENAME=2002
 ./xmlchange START_TOD=46800
 ./xmlchange ATM_NCPL=24
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Tum_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Tum/CLM1PT_data/CTSM_DATM_AU-Tum_2002-2017.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands
index 6b5d9415fe..250e8f049e 100644
--- a/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=AU-Whr
 ./xmlchange PTS_LON=145.029404
 ./xmlchange PTS_LAT=-36.673199
 ./xmlchange DATM_YR_END=2016
+./xmlchange DATM_YR_START_FILENAME=2015
 ./xmlchange START_TOD=46800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Whr_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Whr/CLM1PT_data/CTSM_DATM_AU-Whr_2015-2016.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2015" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2016" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2015" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands
index e1751b8439..c96c57a93f 100644
--- a/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=AU-Wrr
 ./xmlchange PTS_LON=146.654495
 ./xmlchange PTS_LAT=-43.09502
 ./xmlchange DATM_YR_END=2017
+./xmlchange DATM_YR_START_FILENAME=2016
 ./xmlchange START_TOD=46800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Wrr_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Wrr/CLM1PT_data/CTSM_DATM_AU-Wrr_2016-2017.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2016" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2016" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands
index 861c844b14..cc5b8909d7 100644
--- a/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=AU-Ync
 ./xmlchange PTS_LON=146.290695
 ./xmlchange PTS_LAT=-34.9893
 ./xmlchange DATM_YR_END=2017
+./xmlchange DATM_YR_START_FILENAME=2011
 ./xmlchange START_TOD=46800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Ync_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Ync/CLM1PT_data/CTSM_DATM_AU-Ync_2011-2017.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands
index 5aeefbc792..93bf56051e 100644
--- a/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=BE-Bra
 ./xmlchange PTS_LON=4.52056
 ./xmlchange PTS_LAT=51.309166
 ./xmlchange DATM_YR_END=2014
+./xmlchange DATM_YR_START_FILENAME=2004
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_BE-Bra_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/BE-Bra/CLM1PT_data/CTSM_DATM_BE-Bra_2004-2014.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands
index 959a9e88fa..597961e426 100644
--- a/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=BE-Lon
 ./xmlchange PTS_LON=4.74613
-./xmlchange PTS_LAT=50.551590000000004
+./xmlchange PTS_LAT=50.55159
 ./xmlchange DATM_YR_END=2014
+./xmlchange DATM_YR_START_FILENAME=2005
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_BE-Lon_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/BE-Lon/CLM1PT_data/CTSM_DATM_BE-Lon_2005-2014.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands
index 008d71407c..2a97262b87 100644
--- a/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=BE-Vie
 ./xmlchange PTS_LON=5.99805
 ./xmlchange PTS_LAT=50.305069
 ./xmlchange DATM_YR_END=2014
+./xmlchange DATM_YR_START_FILENAME=1997
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_BE-Vie_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/BE-Vie/CLM1PT_data/CTSM_DATM_BE-Vie_1997-2014.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=1997" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands
index c1277c1198..ec8d9bc33a 100644
--- a/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=BR-Sa3
 ./xmlchange PTS_LON=-54.971436
-./xmlchange PTS_LAT=-3.0180290000000003
+./xmlchange PTS_LAT=-3.018029
 ./xmlchange DATM_YR_END=2003
+./xmlchange DATM_YR_START_FILENAME=2001
 ./xmlchange START_TOD=14400
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_BR-Sa3_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/BR-Sa3/CLM1PT_data/CTSM_DATM_BR-Sa3_2001-2003.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2001" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands
index b2e5f88222..64af7dc90f 100644
--- a/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=BW-Ma1
 ./xmlchange PTS_LON=23.560329
 ./xmlchange PTS_LAT=-19.9165
 ./xmlchange DATM_YR_END=2000
+./xmlchange DATM_YR_START_FILENAME=2000
 ./xmlchange START_TOD=79200
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_BW-Ma1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/BW-Ma1/CLM1PT_data/CTSM_DATM_BW-Ma1_2000-2000.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2000" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands
index adb752cea8..9b4f8d74ec 100644
--- a/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=CA-NS1
 ./xmlchange PTS_LON=-98.483887
 ./xmlchange PTS_LAT=55.8792
 ./xmlchange DATM_YR_END=2003
+./xmlchange DATM_YR_START_FILENAME=2003
 ./xmlchange START_TOD=21600
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CA-NS1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-NS1/CLM1PT_data/CTSM_DATM_CA-NS1_2003-2003.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands
index bb25a4ad93..5563971afc 100644
--- a/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=CA-NS2
 ./xmlchange PTS_LON=-98.524689
 ./xmlchange PTS_LAT=55.9058
 ./xmlchange DATM_YR_END=2004
+./xmlchange DATM_YR_START_FILENAME=2002
 ./xmlchange START_TOD=21600
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CA-NS2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-NS2/CLM1PT_data/CTSM_DATM_CA-NS2_2002-2004.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands
index 733537f009..d6ddd551af 100644
--- a/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=CA-NS4
 ./xmlchange PTS_LON=-98.380615
 ./xmlchange PTS_LAT=55.914398
 ./xmlchange DATM_YR_END=2004
+./xmlchange DATM_YR_START_FILENAME=2003
 ./xmlchange START_TOD=21600
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CA-NS4_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-NS4/CLM1PT_data/CTSM_DATM_CA-NS4_2003-2004.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands
index 491bc27b99..49a320a37d 100644
--- a/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=CA-NS5
 ./xmlchange PTS_LON=-98.484985
 ./xmlchange PTS_LAT=55.863098
 ./xmlchange DATM_YR_END=2004
+./xmlchange DATM_YR_START_FILENAME=2003
 ./xmlchange START_TOD=21600
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CA-NS5_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-NS5/CLM1PT_data/CTSM_DATM_CA-NS5_2003-2004.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands
index 3a1b6a7b0f..c5097e87ec 100644
--- a/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=CA-NS6
 ./xmlchange PTS_LON=-98.964417
 ./xmlchange PTS_LAT=55.916698
 ./xmlchange DATM_YR_END=2004
+./xmlchange DATM_YR_START_FILENAME=2002
 ./xmlchange START_TOD=21600
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CA-NS6_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-NS6/CLM1PT_data/CTSM_DATM_CA-NS6_2002-2004.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands
index 735c947bfe..583c102ae0 100644
--- a/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands
@@ -1,11 +1,11 @@
-./xmlchange PTS_LON=-99.94830300000001
+./xmlchange PLUMBER2SITE=CA-NS7
+./xmlchange PTS_LON=-99.948303
 ./xmlchange PTS_LAT=56.635799
 ./xmlchange DATM_YR_END=2004
+./xmlchange DATM_YR_START_FILENAME=2003
 ./xmlchange START_TOD=21600
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CA-NS7_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-NS7/CLM1PT_data/CTSM_DATM_CA-NS7_2003-2004.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands
index c7123ae573..892029da56 100644
--- a/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=CA-Qcu
 ./xmlchange PTS_LON=-74.03653
-./xmlchange PTS_LAT=49.267078000000005
+./xmlchange PTS_LAT=49.267078
 ./xmlchange DATM_YR_END=2006
+./xmlchange DATM_YR_START_FILENAME=2002
 ./xmlchange START_TOD=18000
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CA-Qcu_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-Qcu/CLM1PT_data/CTSM_DATM_CA-Qcu_2002-2006.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands
index fb7fc215c9..3f61fbd901 100644
--- a/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=CA-Qfo
 ./xmlchange PTS_LON=-74.342102
 ./xmlchange PTS_LAT=49.692501
 ./xmlchange DATM_YR_END=2010
+./xmlchange DATM_YR_START_FILENAME=2004
 ./xmlchange START_TOD=18000
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CA-Qfo_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-Qfo/CLM1PT_data/CTSM_DATM_CA-Qfo_2004-2010.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2010" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands
index ed6c584b7c..49de04986c 100644
--- a/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=CA-SF1
 ./xmlchange PTS_LON=-105.817596
-./xmlchange PTS_LAT=54.485001000000004
+./xmlchange PTS_LAT=54.485001
 ./xmlchange DATM_YR_END=2006
+./xmlchange DATM_YR_START_FILENAME=2004
 ./xmlchange START_TOD=21600
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CA-SF1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-SF1/CLM1PT_data/CTSM_DATM_CA-SF1_2004-2006.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands
index 1fffcfdac9..5cc0da8be1 100644
--- a/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=CA-SF2
 ./xmlchange PTS_LON=-105.877502
 ./xmlchange PTS_LAT=54.253899
 ./xmlchange DATM_YR_END=2005
+./xmlchange DATM_YR_START_FILENAME=2003
 ./xmlchange START_TOD=21600
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CA-SF2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-SF2/CLM1PT_data/CTSM_DATM_CA-SF2_2003-2005.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands
index 03096c96fa..3f94c02ca9 100644
--- a/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands
@@ -1,11 +1,11 @@
-./xmlchange PTS_LON=-106.00531000000001
+./xmlchange PLUMBER2SITE=CA-SF3
+./xmlchange PTS_LON=-106.00531
 ./xmlchange PTS_LAT=54.091599
 ./xmlchange DATM_YR_END=2005
+./xmlchange DATM_YR_START_FILENAME=2003
 ./xmlchange START_TOD=21600
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CA-SF3_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-SF3/CLM1PT_data/CTSM_DATM_CA-SF3_2003-2005.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands
index 1e2590a7ae..ca0ad87518 100644
--- a/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=CH-Cha
 ./xmlchange PTS_LON=8.41044
 ./xmlchange PTS_LAT=47.21022
 ./xmlchange DATM_YR_END=2014
+./xmlchange DATM_YR_START_FILENAME=2006
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CH-Cha_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CH-Cha/CLM1PT_data/CTSM_DATM_CH-Cha_2006-2014.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2006" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2006" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands
index c170c8b840..254c30865a 100644
--- a/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=CH-Dav
 ./xmlchange PTS_LON=9.85592
 ./xmlchange PTS_LAT=46.815334
 ./xmlchange DATM_YR_END=2014
+./xmlchange DATM_YR_START_FILENAME=1997
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CH-Dav_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CH-Dav/CLM1PT_data/CTSM_DATM_CH-Dav_1997-2014.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=1997" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands
index 31e5163045..617ed84d7c 100644
--- a/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=CH-Fru
 ./xmlchange PTS_LON=8.53778
 ./xmlchange PTS_LAT=47.115833
 ./xmlchange DATM_YR_END=2014
+./xmlchange DATM_YR_START_FILENAME=2007
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CH-Fru_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CH-Fru/CLM1PT_data/CTSM_DATM_CH-Fru_2007-2014.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2007" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands
index ee091e134e..6fb4f3a844 100644
--- a/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=CH-Oe1
 ./xmlchange PTS_LON=7.73194
 ./xmlchange PTS_LAT=47.285831
 ./xmlchange DATM_YR_END=2008
+./xmlchange DATM_YR_START_FILENAME=2002
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CH-Oe1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CH-Oe1/CLM1PT_data/CTSM_DATM_CH-Oe1_2002-2008.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands
index cde3fed3be..f6da50bde1 100644
--- a/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands
@@ -1,11 +1,11 @@
-./xmlchange PTS_LON=128.09579499999998
+./xmlchange PLUMBER2SITE=CN-Cha
+./xmlchange PTS_LON=128.095795
 ./xmlchange PTS_LAT=42.4025
 ./xmlchange DATM_YR_END=2005
+./xmlchange DATM_YR_START_FILENAME=2003
 ./xmlchange START_TOD=57600
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CN-Cha_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-Cha/CLM1PT_data/CTSM_DATM_CN-Cha_2003-2005.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands
index d5ec208a05..648c844408 100644
--- a/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=CN-Cng
 ./xmlchange PTS_LON=123.509201
 ./xmlchange PTS_LAT=44.593399
 ./xmlchange DATM_YR_END=2009
+./xmlchange DATM_YR_START_FILENAME=2008
 ./xmlchange START_TOD=57600
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CN-Cng_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-Cng/CLM1PT_data/CTSM_DATM_CN-Cng_2008-2009.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2009" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2008" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands
index 674ce4dda4..9616c9d792 100644
--- a/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=CN-Dan
 ./xmlchange PTS_LON=91.066399
-./xmlchange PTS_LAT=30.497801000000003
+./xmlchange PTS_LAT=30.497801
 ./xmlchange DATM_YR_END=2005
+./xmlchange DATM_YR_START_FILENAME=2004
 ./xmlchange START_TOD=57600
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CN-Dan_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-Dan/CLM1PT_data/CTSM_DATM_CN-Dan_2004-2005.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands
index b9149c7d8a..c30e651178 100644
--- a/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=CN-Din
 ./xmlchange PTS_LON=112.536102
 ./xmlchange PTS_LAT=23.1733
 ./xmlchange DATM_YR_END=2005
+./xmlchange DATM_YR_START_FILENAME=2003
 ./xmlchange START_TOD=57600
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CN-Din_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-Din/CLM1PT_data/CTSM_DATM_CN-Din_2003-2005.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands
index 42502b41ce..d46dec7f7d 100644
--- a/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=CN-Du2
 ./xmlchange PTS_LON=116.2836
 ./xmlchange PTS_LAT=42.0467
 ./xmlchange DATM_YR_END=2008
+./xmlchange DATM_YR_START_FILENAME=2007
 ./xmlchange START_TOD=57600
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CN-Du2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-Du2/CLM1PT_data/CTSM_DATM_CN-Du2_2007-2008.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2007" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands
index 95c4167bf0..91d489b75b 100644
--- a/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=CN-HaM
 ./xmlchange PTS_LON=101.18
 ./xmlchange PTS_LAT=37.369999
 ./xmlchange DATM_YR_END=2003
+./xmlchange DATM_YR_START_FILENAME=2002
 ./xmlchange START_TOD=57600
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CN-HaM_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-HaM/CLM1PT_data/CTSM_DATM_CN-HaM_2002-2003.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands
index 401534e487..484175aa93 100644
--- a/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=CN-Qia
 ./xmlchange PTS_LON=115.058098
 ./xmlchange PTS_LAT=26.7414
 ./xmlchange DATM_YR_END=2005
+./xmlchange DATM_YR_START_FILENAME=2003
 ./xmlchange START_TOD=57600
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CN-Qia_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-Qia/CLM1PT_data/CTSM_DATM_CN-Qia_2003-2005.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands
index 20309cdcb3..7c753c4183 100644
--- a/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=CZ-wet
 ./xmlchange PTS_LON=14.77035
 ./xmlchange PTS_LAT=49.024651
 ./xmlchange DATM_YR_END=2014
+./xmlchange DATM_YR_START_FILENAME=2007
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CZ-wet_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CZ-wet/CLM1PT_data/CTSM_DATM_CZ-wet_2007-2014.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2007" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands
index 6495d46b57..55c14aac5f 100644
--- a/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=DE-Bay
 ./xmlchange PTS_LON=11.86694
-./xmlchange PTS_LAT=50.141940999999996
+./xmlchange PTS_LAT=50.141941
 ./xmlchange DATM_YR_END=1999
+./xmlchange DATM_YR_START_FILENAME=1997
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DE-Bay_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Bay/CLM1PT_data/CTSM_DATM_DE-Bay_1997-1999.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=1999" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=1997" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands
index d43c3bd94d..d57138be71 100644
--- a/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=DE-Geb
 ./xmlchange PTS_LON=10.9143
 ./xmlchange PTS_LAT=51.100101
 ./xmlchange DATM_YR_END=2014
+./xmlchange DATM_YR_START_FILENAME=2001
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DE-Geb_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Geb/CLM1PT_data/CTSM_DATM_DE-Geb_2001-2014.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2001" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands
index fe165d2bf3..5a27ee5e20 100644
--- a/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands
@@ -1,11 +1,11 @@
-./xmlchange PTS_LON=13.512529999999998
+./xmlchange PLUMBER2SITE=DE-Gri
+./xmlchange PTS_LON=13.51253
 ./xmlchange PTS_LAT=50.949471
 ./xmlchange DATM_YR_END=2014
+./xmlchange DATM_YR_START_FILENAME=2004
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DE-Gri_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Gri/CLM1PT_data/CTSM_DATM_DE-Gri_2004-2014.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands
index fa5671c663..55124b7900 100644
--- a/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=DE-Hai
 ./xmlchange PTS_LON=10.453
 ./xmlchange PTS_LAT=51.079166
 ./xmlchange DATM_YR_END=2012
+./xmlchange DATM_YR_START_FILENAME=2000
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DE-Hai_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Hai/CLM1PT_data/CTSM_DATM_DE-Hai_2000-2012.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands
index 28fb89a2d0..860b100586 100644
--- a/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands
@@ -1,11 +1,11 @@
-./xmlchange PTS_LON=13.522379999999998
+./xmlchange PLUMBER2SITE=DE-Kli
+./xmlchange PTS_LON=13.52238
 ./xmlchange PTS_LAT=50.893059
 ./xmlchange DATM_YR_END=2014
+./xmlchange DATM_YR_START_FILENAME=2005
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DE-Kli_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Kli/CLM1PT_data/CTSM_DATM_DE-Kli_2005-2014.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands
index 250432bd9f..b94a90e206 100644
--- a/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=DE-Meh
 ./xmlchange PTS_LON=10.65547
 ./xmlchange PTS_LAT=51.275311
 ./xmlchange DATM_YR_END=2006
+./xmlchange DATM_YR_START_FILENAME=2004
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DE-Meh_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Meh/CLM1PT_data/CTSM_DATM_DE-Meh_2004-2006.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands
index ef17febde0..e633f65987 100644
--- a/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=DE-Obe
 ./xmlchange PTS_LON=13.72129
 ./xmlchange PTS_LAT=50.786659
 ./xmlchange DATM_YR_END=2014
+./xmlchange DATM_YR_START_FILENAME=2008
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DE-Obe_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Obe/CLM1PT_data/CTSM_DATM_DE-Obe_2008-2014.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2008" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands
index db837ac070..c6808b0bf1 100644
--- a/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=DE-Seh
 ./xmlchange PTS_LON=6.44965
 ./xmlchange PTS_LAT=50.870625
 ./xmlchange DATM_YR_END=2010
+./xmlchange DATM_YR_START_FILENAME=2008
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DE-Seh_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Seh/CLM1PT_data/CTSM_DATM_DE-Seh_2008-2010.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2010" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2008" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands
index bcff32c36a..639a2c5195 100644
--- a/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=DE-SfN
 ./xmlchange PTS_LON=11.3275
 ./xmlchange PTS_LAT=47.806389
 ./xmlchange DATM_YR_END=2014
+./xmlchange DATM_YR_START_FILENAME=2013
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DE-SfN_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-SfN/CLM1PT_data/CTSM_DATM_DE-SfN_2013-2014.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2013" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands
index aa6beb5913..66055b2ee2 100644
--- a/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands
@@ -1,11 +1,11 @@
-./xmlchange PTS_LON=13.566939999999999
+./xmlchange PLUMBER2SITE=DE-Tha
+./xmlchange PTS_LON=13.56694
 ./xmlchange PTS_LAT=50.963612
 ./xmlchange DATM_YR_END=2014
+./xmlchange DATM_YR_START_FILENAME=1998
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DE-Tha_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Tha/CLM1PT_data/CTSM_DATM_DE-Tha_1998-2014.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=1998" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=1998" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands
index 12d6f2024d..de0ad17a95 100644
--- a/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=DE-Wet
 ./xmlchange PTS_LON=11.45753
 ./xmlchange PTS_LAT=50.453499
 ./xmlchange DATM_YR_END=2006
+./xmlchange DATM_YR_START_FILENAME=2002
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DE-Wet_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Wet/CLM1PT_data/CTSM_DATM_DE-Wet_2002-2006.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands
index a4a472424e..581fd31324 100644
--- a/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=DK-Fou
 ./xmlchange PTS_LON=9.58722
 ./xmlchange PTS_LAT=56.4842
 ./xmlchange DATM_YR_END=2005
+./xmlchange DATM_YR_START_FILENAME=2005
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DK-Fou_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DK-Fou/CLM1PT_data/CTSM_DATM_DK-Fou_2005-2005.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands
index 962775613e..b1a1955519 100644
--- a/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=DK-Lva
 ./xmlchange PTS_LON=12.0833
 ./xmlchange PTS_LAT=55.6833
 ./xmlchange DATM_YR_END=2006
+./xmlchange DATM_YR_START_FILENAME=2005
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DK-Lva_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DK-Lva/CLM1PT_data/CTSM_DATM_DK-Lva_2005-2006.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands
index 4c806cea45..86fcb0ba10 100644
--- a/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=DK-Ris
 ./xmlchange PTS_LON=12.09722
 ./xmlchange PTS_LAT=55.530281
 ./xmlchange DATM_YR_END=2005
+./xmlchange DATM_YR_START_FILENAME=2004
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DK-Ris_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DK-Ris/CLM1PT_data/CTSM_DATM_DK-Ris_2004-2005.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands
index 1748d52204..046e9559d2 100644
--- a/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands
@@ -1,11 +1,11 @@
-./xmlchange PTS_LON=11.644639999999999
+./xmlchange PLUMBER2SITE=DK-Sor
+./xmlchange PTS_LON=11.64464
 ./xmlchange PTS_LAT=55.48587
 ./xmlchange DATM_YR_END=2014
+./xmlchange DATM_YR_START_FILENAME=1997
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DK-Sor_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DK-Sor/CLM1PT_data/CTSM_DATM_DK-Sor_1997-2014.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=1997" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands
index ea72cc14c4..234c5e8ba7 100644
--- a/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=DK-ZaH
 ./xmlchange PTS_LON=-20.550293
 ./xmlchange PTS_LAT=74.473282
 ./xmlchange DATM_YR_END=2013
+./xmlchange DATM_YR_START_FILENAME=2000
 ./xmlchange START_TOD=0
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DK-ZaH_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DK-ZaH/CLM1PT_data/CTSM_DATM_DK-ZaH_2000-2013.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands
index 38e841b51c..9947bb0014 100644
--- a/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=ES-ES1
 ./xmlchange PTS_LON=-0.318817
 ./xmlchange PTS_LAT=39.34597
 ./xmlchange DATM_YR_END=2006
+./xmlchange DATM_YR_START_FILENAME=1999
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_ES-ES1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ES-ES1/CLM1PT_data/CTSM_DATM_ES-ES1_1999-2006.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=1999" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=1999" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands
index 47fae079e6..235ddfbb32 100644
--- a/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=ES-ES2
 ./xmlchange PTS_LON=-0.315277
-./xmlchange PTS_LAT=39.275558000000004
+./xmlchange PTS_LAT=39.275558
 ./xmlchange DATM_YR_END=2006
+./xmlchange DATM_YR_START_FILENAME=2005
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_ES-ES2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ES-ES2/CLM1PT_data/CTSM_DATM_ES-ES2_2005-2006.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands
index f8a0283232..c0c83dbbd2 100644
--- a/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=ES-LMa
 ./xmlchange PTS_LON=-5.773346
 ./xmlchange PTS_LAT=39.941502
 ./xmlchange DATM_YR_END=2006
+./xmlchange DATM_YR_START_FILENAME=2004
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_ES-LMa_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ES-LMa/CLM1PT_data/CTSM_DATM_ES-LMa_2004-2006.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands
index 8590e61f79..454de1a378 100644
--- a/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=ES-LgS
 ./xmlchange PTS_LON=-2.96582
 ./xmlchange PTS_LAT=37.097935
 ./xmlchange DATM_YR_END=2007
+./xmlchange DATM_YR_START_FILENAME=2007
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_ES-LgS_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ES-LgS/CLM1PT_data/CTSM_DATM_ES-LgS_2007-2007.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2007" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2007" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands
index bec50968d6..0de3a761a7 100644
--- a/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=ES-VDA
 ./xmlchange PTS_LON=1.4485
 ./xmlchange PTS_LAT=42.15218
 ./xmlchange DATM_YR_END=2004
+./xmlchange DATM_YR_START_FILENAME=2004
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_ES-VDA_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ES-VDA/CLM1PT_data/CTSM_DATM_ES-VDA_2004-2004.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands
index 46cd461773..1861c4a0b6 100644
--- a/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=FI-Hyy
 ./xmlchange PTS_LON=24.295
 ./xmlchange PTS_LAT=61.8475
 ./xmlchange DATM_YR_END=2014
+./xmlchange DATM_YR_START_FILENAME=1996
 ./xmlchange START_TOD=79200
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_FI-Hyy_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FI-Hyy/CLM1PT_data/CTSM_DATM_FI-Hyy_1996-2014.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=1996" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=1996" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands
index db4e320ca0..9f7b8a0763 100644
--- a/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands
@@ -1,11 +1,11 @@
-./xmlchange PTS_LON=27.295030999999998
+./xmlchange PLUMBER2SITE=FI-Kaa
+./xmlchange PTS_LON=27.295031
 ./xmlchange PTS_LAT=69.140694
 ./xmlchange DATM_YR_END=2002
+./xmlchange DATM_YR_START_FILENAME=2000
 ./xmlchange START_TOD=79200
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_FI-Kaa_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FI-Kaa/CLM1PT_data/CTSM_DATM_FI-Kaa_2000-2002.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2002" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands
index 844403dfc4..14c28c1475 100644
--- a/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=FI-Lom
 ./xmlchange PTS_LON=24.209181
 ./xmlchange PTS_LAT=67.9972
 ./xmlchange DATM_YR_END=2009
+./xmlchange DATM_YR_START_FILENAME=2007
 ./xmlchange START_TOD=79200
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_FI-Lom_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FI-Lom/CLM1PT_data/CTSM_DATM_FI-Lom_2007-2009.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2009" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2007" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands
index be6e3a2eba..7eccb754fb 100644
--- a/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=FI-Sod
 ./xmlchange PTS_LON=26.637831
 ./xmlchange PTS_LAT=67.361862
 ./xmlchange DATM_YR_END=2014
+./xmlchange DATM_YR_START_FILENAME=2008
 ./xmlchange START_TOD=79200
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_FI-Sod_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FI-Sod/CLM1PT_data/CTSM_DATM_FI-Sod_2008-2014.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2008" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands
index 946c9b84fc..76a71ab3b2 100644
--- a/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands
@@ -1,11 +1,11 @@
-./xmlchange PTS_LON=2.7801400000000003
-./xmlchange PTS_LAT=48.476397999999996
+./xmlchange PLUMBER2SITE=FR-Fon
+./xmlchange PTS_LON=2.78014
+./xmlchange PTS_LAT=48.476398
 ./xmlchange DATM_YR_END=2013
+./xmlchange DATM_YR_START_FILENAME=2005
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_FR-Fon_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-Fon/CLM1PT_data/CTSM_DATM_FR-Fon_2005-2013.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands
index fd29463244..5c575b0e97 100644
--- a/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands
@@ -1,11 +1,11 @@
-./xmlchange PTS_LON=1.9519099999999998
+./xmlchange PLUMBER2SITE=FR-Gri
+./xmlchange PTS_LON=1.95191
 ./xmlchange PTS_LAT=48.844219
 ./xmlchange DATM_YR_END=2013
+./xmlchange DATM_YR_START_FILENAME=2005
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_FR-Gri_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-Gri/CLM1PT_data/CTSM_DATM_FR-Gri_2005-2013.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands
index 88900143b1..1d8ab25532 100644
--- a/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands
@@ -1,11 +1,11 @@
-./xmlchange PTS_LON=7.0655600000000005
+./xmlchange PLUMBER2SITE=FR-Hes
+./xmlchange PTS_LON=7.06556
 ./xmlchange PTS_LAT=48.67416
 ./xmlchange DATM_YR_END=2006
+./xmlchange DATM_YR_START_FILENAME=1997
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_FR-Hes_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-Hes/CLM1PT_data/CTSM_DATM_FR-Hes_1997-2006.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=1997" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands
index 29c9c95ab7..6b9eb48062 100644
--- a/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands
@@ -1,11 +1,11 @@
-./xmlchange PTS_LON=-0.7692869999999999
+./xmlchange PLUMBER2SITE=FR-LBr
+./xmlchange PTS_LON=-0.769287
 ./xmlchange PTS_LAT=44.71711
 ./xmlchange DATM_YR_END=2008
+./xmlchange DATM_YR_START_FILENAME=2003
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_FR-LBr_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-LBr/CLM1PT_data/CTSM_DATM_FR-LBr_2003-2008.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands
index 676f8af611..000fc6d746 100644
--- a/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=FR-Lq1
 ./xmlchange PTS_LON=2.73583
 ./xmlchange PTS_LAT=45.643059
 ./xmlchange DATM_YR_END=2006
+./xmlchange DATM_YR_START_FILENAME=2004
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_FR-Lq1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-Lq1/CLM1PT_data/CTSM_DATM_FR-Lq1_2004-2006.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands
index b407160bb9..a851919f73 100644
--- a/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=FR-Lq2
 ./xmlchange PTS_LON=2.73703
 ./xmlchange PTS_LAT=45.639191
 ./xmlchange DATM_YR_END=2006
+./xmlchange DATM_YR_START_FILENAME=2004
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_FR-Lq2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-Lq2/CLM1PT_data/CTSM_DATM_FR-Lq2_2004-2006.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands
index b226175943..1981d675fc 100644
--- a/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands
@@ -1,11 +1,11 @@
-./xmlchange PTS_LON=3.5958300000000003
+./xmlchange PLUMBER2SITE=FR-Pue
+./xmlchange PTS_LON=3.59583
 ./xmlchange PTS_LAT=43.74139
 ./xmlchange DATM_YR_END=2014
+./xmlchange DATM_YR_START_FILENAME=2000
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_FR-Pue_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-Pue/CLM1PT_data/CTSM_DATM_FR-Pue_2000-2014.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands b/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands
index 1fef6cf769..1f10f4a2e1 100644
--- a/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=GF-Guy
 ./xmlchange PTS_LON=-52.924866
 ./xmlchange PTS_LAT=5.278772
 ./xmlchange DATM_YR_END=2014
+./xmlchange DATM_YR_START_FILENAME=2004
 ./xmlchange START_TOD=10800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_GF-Guy_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/GF-Guy/CLM1PT_data/CTSM_DATM_GF-Guy_2004-2014.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands b/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands
index a4cf969235..54b635a2a2 100644
--- a/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands
@@ -1,11 +1,11 @@
-./xmlchange PTS_LON=19.601298999999997
+./xmlchange PLUMBER2SITE=HU-Bug
+./xmlchange PTS_LON=19.601299
 ./xmlchange PTS_LAT=46.691101
 ./xmlchange DATM_YR_END=2006
+./xmlchange DATM_YR_START_FILENAME=2003
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_HU-Bug_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/HU-Bug/CLM1PT_data/CTSM_DATM_HU-Bug_2003-2006.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands
index 794fdabba3..13ac0e386f 100644
--- a/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands
@@ -1,11 +1,11 @@
-./xmlchange PTS_LON=114.03639199999999
+./xmlchange PLUMBER2SITE=ID-Pag
+./xmlchange PTS_LON=114.036392
 ./xmlchange PTS_LAT=-2.345
 ./xmlchange DATM_YR_END=2003
+./xmlchange DATM_YR_START_FILENAME=2002
 ./xmlchange START_TOD=61200
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_ID-Pag_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ID-Pag/CLM1PT_data/CTSM_DATM_ID-Pag_2002-2003.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands
index 376f21bf88..2bd80343c3 100644
--- a/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=IE-Ca1
 ./xmlchange PTS_LON=-6.918152
-./xmlchange PTS_LAT=52.858791000000004
+./xmlchange PTS_LAT=52.858791
 ./xmlchange DATM_YR_END=2006
+./xmlchange DATM_YR_START_FILENAME=2004
 ./xmlchange START_TOD=0
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IE-Ca1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IE-Ca1/CLM1PT_data/CTSM_DATM_IE-Ca1_2004-2006.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands
index 34bf806e19..4f27411509 100644
--- a/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands
@@ -1,11 +1,11 @@
-./xmlchange PTS_LON=-8.751800999999999
+./xmlchange PLUMBER2SITE=IE-Dri
+./xmlchange PTS_LON=-8.751801
 ./xmlchange PTS_LAT=51.986691
 ./xmlchange DATM_YR_END=2005
+./xmlchange DATM_YR_START_FILENAME=2003
 ./xmlchange START_TOD=0
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IE-Dri_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IE-Dri/CLM1PT_data/CTSM_DATM_IE-Dri_2003-2005.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands
index d0f80bd240..aa7fef51ae 100644
--- a/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=IT-Amp
 ./xmlchange PTS_LON=13.60516
 ./xmlchange PTS_LAT=41.904099
 ./xmlchange DATM_YR_END=2006
+./xmlchange DATM_YR_START_FILENAME=2003
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-Amp_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Amp/CLM1PT_data/CTSM_DATM_IT-Amp_2003-2006.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands
index 5c95ebd5cb..0c620a348c 100644
--- a/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=IT-BCi
 ./xmlchange PTS_LON=14.95744
 ./xmlchange PTS_LAT=40.5238
 ./xmlchange DATM_YR_END=2010
+./xmlchange DATM_YR_START_FILENAME=2005
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-BCi_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-BCi/CLM1PT_data/CTSM_DATM_IT-BCi_2005-2010.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2010" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands
index 4218939b8e..831b7897c0 100644
--- a/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=IT-CA1
 ./xmlchange PTS_LON=12.02656
 ./xmlchange PTS_LAT=42.380409
 ./xmlchange DATM_YR_END=2013
+./xmlchange DATM_YR_START_FILENAME=2012
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-CA1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-CA1/CLM1PT_data/CTSM_DATM_IT-CA1_2012-2013.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2012" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands
index f3e82597af..dfae27f215 100644
--- a/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=IT-CA2
 ./xmlchange PTS_LON=12.02604
 ./xmlchange PTS_LAT=42.37722
 ./xmlchange DATM_YR_END=2013
+./xmlchange DATM_YR_START_FILENAME=2012
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-CA2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-CA2/CLM1PT_data/CTSM_DATM_IT-CA2_2012-2013.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2012" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands
index de8970f1e3..a3a2ab6c25 100644
--- a/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=IT-CA3
 ./xmlchange PTS_LON=12.0222
 ./xmlchange PTS_LAT=42.380001
 ./xmlchange DATM_YR_END=2013
+./xmlchange DATM_YR_START_FILENAME=2012
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-CA3_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-CA3/CLM1PT_data/CTSM_DATM_IT-CA3_2012-2013.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2012" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands
index 37ab868476..eb817ab43c 100644
--- a/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=IT-Col
 ./xmlchange PTS_LON=13.58814
 ./xmlchange PTS_LAT=41.849361
 ./xmlchange DATM_YR_END=2014
+./xmlchange DATM_YR_START_FILENAME=2007
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-Col_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Col/CLM1PT_data/CTSM_DATM_IT-Col_2007-2014.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2007" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands
index e7bc47b3b0..cfad8adb35 100644
--- a/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=IT-Cpz
 ./xmlchange PTS_LON=12.37611
 ./xmlchange PTS_LAT=41.70525
 ./xmlchange DATM_YR_END=2008
+./xmlchange DATM_YR_START_FILENAME=2001
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-Cpz_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Cpz/CLM1PT_data/CTSM_DATM_IT-Cpz_2001-2008.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2001" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands
index 6cf225d172..125257acd7 100644
--- a/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=IT-Isp
 ./xmlchange PTS_LON=8.63358
 ./xmlchange PTS_LAT=45.812641
 ./xmlchange DATM_YR_END=2014
+./xmlchange DATM_YR_START_FILENAME=2013
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-Isp_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Isp/CLM1PT_data/CTSM_DATM_IT-Isp_2013-2014.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2013" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands
index 8b388aedb4..bca26018b9 100644
--- a/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=IT-LMa
 ./xmlchange PTS_LON=7.58259
 ./xmlchange PTS_LAT=45.15258
 ./xmlchange DATM_YR_END=2004
+./xmlchange DATM_YR_START_FILENAME=2003
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-LMa_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-LMa/CLM1PT_data/CTSM_DATM_IT-LMa_2003-2004.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands
index 1f7f728803..87f8e9d947 100644
--- a/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=IT-Lav
 ./xmlchange PTS_LON=11.28132
 ./xmlchange PTS_LAT=45.9562
 ./xmlchange DATM_YR_END=2014
+./xmlchange DATM_YR_START_FILENAME=2005
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-Lav_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Lav/CLM1PT_data/CTSM_DATM_IT-Lav_2005-2014.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands
index 26ffc80458..ab42d7a3d8 100644
--- a/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=IT-MBo
 ./xmlchange PTS_LON=11.04583
 ./xmlchange PTS_LAT=46.014679
 ./xmlchange DATM_YR_END=2012
+./xmlchange DATM_YR_START_FILENAME=2003
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-MBo_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-MBo/CLM1PT_data/CTSM_DATM_IT-MBo_2003-2012.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands
index 6559976180..8cf5fdd6d0 100644
--- a/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands
@@ -1,11 +1,11 @@
-./xmlchange PTS_LON=11.703339999999999
+./xmlchange PLUMBER2SITE=IT-Mal
+./xmlchange PTS_LON=11.70334
 ./xmlchange PTS_LAT=46.114021
 ./xmlchange DATM_YR_END=2003
+./xmlchange DATM_YR_START_FILENAME=2003
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-Mal_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Mal/CLM1PT_data/CTSM_DATM_IT-Mal_2003-2003.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands
index 58be23bcd1..8b12cb84db 100644
--- a/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=IT-Noe
 ./xmlchange PTS_LON=8.15117
 ./xmlchange PTS_LAT=40.606178
 ./xmlchange DATM_YR_END=2014
+./xmlchange DATM_YR_START_FILENAME=2004
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-Noe_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Noe/CLM1PT_data/CTSM_DATM_IT-Noe_2004-2014.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands
index 785443e0f1..c8b4f77f4d 100644
--- a/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=IT-Non
 ./xmlchange PTS_LON=11.09109
-./xmlchange PTS_LAT=44.690189000000004
+./xmlchange PTS_LAT=44.690189
 ./xmlchange DATM_YR_END=2002
+./xmlchange DATM_YR_START_FILENAME=2002
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-Non_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Non/CLM1PT_data/CTSM_DATM_IT-Non_2002-2002.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2002" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands
index e7c30a4e36..629382cea8 100644
--- a/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=IT-PT1
 ./xmlchange PTS_LON=9.06104
 ./xmlchange PTS_LAT=45.200871
 ./xmlchange DATM_YR_END=2004
+./xmlchange DATM_YR_START_FILENAME=2003
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-PT1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-PT1/CLM1PT_data/CTSM_DATM_IT-PT1_2003-2004.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands
index dc1b5630d0..ebf7cdb500 100644
--- a/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands
@@ -1,11 +1,11 @@
-./xmlchange PTS_LON=11.433689999999999
+./xmlchange PLUMBER2SITE=IT-Ren
+./xmlchange PTS_LON=11.43369
 ./xmlchange PTS_LAT=46.586861
 ./xmlchange DATM_YR_END=2013
+./xmlchange DATM_YR_START_FILENAME=2010
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-Ren_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Ren/CLM1PT_data/CTSM_DATM_IT-Ren_2010-2013.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands
index 865f76ae9b..b400216f9b 100644
--- a/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands
@@ -1,11 +1,11 @@
-./xmlchange PTS_LON=11.930010000000001
+./xmlchange PLUMBER2SITE=IT-Ro1
+./xmlchange PTS_LON=11.93001
 ./xmlchange PTS_LAT=42.408119
 ./xmlchange DATM_YR_END=2006
+./xmlchange DATM_YR_START_FILENAME=2002
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-Ro1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Ro1/CLM1PT_data/CTSM_DATM_IT-Ro1_2002-2006.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands
index 401cfcf30b..195c0fdbc9 100644
--- a/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=IT-Ro2
 ./xmlchange PTS_LON=11.92093
 ./xmlchange PTS_LAT=42.390259
 ./xmlchange DATM_YR_END=2008
+./xmlchange DATM_YR_START_FILENAME=2002
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-Ro2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Ro2/CLM1PT_data/CTSM_DATM_IT-Ro2_2002-2008.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands
index 7926235386..d981029a77 100644
--- a/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=IT-SR2
 ./xmlchange PTS_LON=10.29095
 ./xmlchange PTS_LAT=43.732029
 ./xmlchange DATM_YR_END=2014
+./xmlchange DATM_YR_START_FILENAME=2013
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-SR2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-SR2/CLM1PT_data/CTSM_DATM_IT-SR2_2013-2014.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2013" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands
index 8dbeedc751..c40b2d8f71 100644
--- a/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=IT-SRo
 ./xmlchange PTS_LON=10.28444
 ./xmlchange PTS_LAT=43.727859
 ./xmlchange DATM_YR_END=2012
+./xmlchange DATM_YR_START_FILENAME=2003
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-SRo_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-SRo/CLM1PT_data/CTSM_DATM_IT-SRo_2003-2012.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands b/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands
index 6af519cf5d..c93dfef557 100644
--- a/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands
@@ -1,11 +1,11 @@
-./xmlchange PTS_LON=137.07879599999998
+./xmlchange PLUMBER2SITE=JP-SMF
+./xmlchange PTS_LON=137.078796
 ./xmlchange PTS_LAT=35.2617
 ./xmlchange DATM_YR_END=2006
+./xmlchange DATM_YR_START_FILENAME=2003
 ./xmlchange START_TOD=54000
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_JP-SMF_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/JP-SMF/CLM1PT_data/CTSM_DATM_JP-SMF_2003-2006.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands
index 26b6fda5a4..ccb1290e78 100644
--- a/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=NL-Ca1
 ./xmlchange PTS_LON=4.927
 ./xmlchange PTS_LAT=51.971001
 ./xmlchange DATM_YR_END=2006
+./xmlchange DATM_YR_START_FILENAME=2003
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_NL-Ca1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/NL-Ca1/CLM1PT_data/CTSM_DATM_NL-Ca1_2003-2006.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands b/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands
index ec509840af..08eb58d8a1 100644
--- a/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=NL-Hor
 ./xmlchange PTS_LON=5.0713
 ./xmlchange PTS_LAT=52.240349
 ./xmlchange DATM_YR_END=2011
+./xmlchange DATM_YR_START_FILENAME=2008
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_NL-Hor_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/NL-Hor/CLM1PT_data/CTSM_DATM_NL-Hor_2008-2011.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2011" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2008" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands
index 3bcbfbbc35..a09cf39408 100644
--- a/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands
@@ -1,11 +1,11 @@
-./xmlchange PTS_LON=5.7435599999999996
-./xmlchange PTS_LAT=52.166579999999996
+./xmlchange PLUMBER2SITE=NL-Loo
+./xmlchange PTS_LON=5.74356
+./xmlchange PTS_LAT=52.16658
 ./xmlchange DATM_YR_END=2013
+./xmlchange DATM_YR_START_FILENAME=1997
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_NL-Loo_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/NL-Loo/CLM1PT_data/CTSM_DATM_NL-Loo_1997-2013.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=1997" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands
index 4eb88c995a..eb79334eeb 100644
--- a/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=PL-wet
 ./xmlchange PTS_LON=16.309401
 ./xmlchange PTS_LAT=52.762199
 ./xmlchange DATM_YR_END=2005
+./xmlchange DATM_YR_START_FILENAME=2004
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_PL-wet_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/PL-wet/CLM1PT_data/CTSM_DATM_PL-wet_2004-2005.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands
index 224920cbf7..4186dea491 100644
--- a/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=PT-Esp
 ./xmlchange PTS_LON=-8.601807
 ./xmlchange PTS_LAT=38.6394
 ./xmlchange DATM_YR_END=2004
+./xmlchange DATM_YR_START_FILENAME=2002
 ./xmlchange START_TOD=0
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_PT-Esp_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/PT-Esp/CLM1PT_data/CTSM_DATM_PT-Esp_2002-2004.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands
index 74413f5f5e..36a1899bfc 100644
--- a/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=PT-Mi1
 ./xmlchange PTS_LON=-8.000061
 ./xmlchange PTS_LAT=38.540642
 ./xmlchange DATM_YR_END=2005
+./xmlchange DATM_YR_START_FILENAME=2005
 ./xmlchange START_TOD=0
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_PT-Mi1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/PT-Mi1/CLM1PT_data/CTSM_DATM_PT-Mi1_2005-2005.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands
index f9aa12224c..e2986dfac8 100644
--- a/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=PT-Mi2
 ./xmlchange PTS_LON=-8.024536
 ./xmlchange PTS_LAT=38.476501
 ./xmlchange DATM_YR_END=2006
+./xmlchange DATM_YR_START_FILENAME=2005
 ./xmlchange START_TOD=0
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_PT-Mi2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/PT-Mi2/CLM1PT_data/CTSM_DATM_PT-Mi2_2005-2006.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands b/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands
index 4abca52cae..f5172ddb53 100644
--- a/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=RU-Che
 ./xmlchange PTS_LON=161.341431
 ./xmlchange PTS_LAT=68.613037
 ./xmlchange DATM_YR_END=2004
+./xmlchange DATM_YR_START_FILENAME=2003
 ./xmlchange START_TOD=46800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_RU-Che_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/RU-Che/CLM1PT_data/CTSM_DATM_RU-Che_2003-2004.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands
index 74c3693f71..69bab319bc 100644
--- a/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=RU-Fyo
 ./xmlchange PTS_LON=32.922081
-./xmlchange PTS_LAT=56.461529000000006
+./xmlchange PTS_LAT=56.461529
 ./xmlchange DATM_YR_END=2014
+./xmlchange DATM_YR_START_FILENAME=2003
 ./xmlchange START_TOD=75600
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_RU-Fyo_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/RU-Fyo/CLM1PT_data/CTSM_DATM_RU-Fyo_2003-2014.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands b/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands
index b68d328625..27144db3cb 100644
--- a/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=RU-Zot
 ./xmlchange PTS_LON=89.3508
 ./xmlchange PTS_LAT=60.8008
 ./xmlchange DATM_YR_END=2003
+./xmlchange DATM_YR_START_FILENAME=2003
 ./xmlchange START_TOD=61200
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_RU-Zot_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/RU-Zot/CLM1PT_data/CTSM_DATM_RU-Zot_2003-2003.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands b/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands
index b2e63de838..6d245703d6 100644
--- a/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=SD-Dem
 ./xmlchange PTS_LON=30.4783
 ./xmlchange PTS_LAT=13.2829
 ./xmlchange DATM_YR_END=2009
+./xmlchange DATM_YR_START_FILENAME=2005
 ./xmlchange START_TOD=75600
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_SD-Dem_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/SD-Dem/CLM1PT_data/CTSM_DATM_SD-Dem_2005-2009.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2009" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands b/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands
index dfc8e4b83f..0a426dee38 100644
--- a/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=SE-Deg
 ./xmlchange PTS_LON=19.55669
 ./xmlchange PTS_LAT=64.181969
 ./xmlchange DATM_YR_END=2005
+./xmlchange DATM_YR_START_FILENAME=2002
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_SE-Deg_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/SE-Deg/CLM1PT_data/CTSM_DATM_SE-Deg_2002-2005.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands
index efa3a6f1ae..c016bf89a7 100644
--- a/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands
@@ -1,11 +1,11 @@
-./xmlchange PTS_LON=-3.7980650000000002
+./xmlchange PLUMBER2SITE=UK-Gri
+./xmlchange PTS_LON=-3.798065
 ./xmlchange PTS_LAT=56.60722
 ./xmlchange DATM_YR_END=2001
+./xmlchange DATM_YR_START_FILENAME=2000
 ./xmlchange START_TOD=0
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_UK-Gri_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/UK-Gri/CLM1PT_data/CTSM_DATM_UK-Gri_2000-2001.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2001" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands b/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands
index 47143973d4..f92b9a6d69 100644
--- a/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands
@@ -1,11 +1,11 @@
-./xmlchange PTS_LON=-0.8583069999999999
-./xmlchange PTS_LAT=51.153529999999996
+./xmlchange PLUMBER2SITE=UK-Ham
+./xmlchange PTS_LON=-0.858307
+./xmlchange PTS_LAT=51.15353
 ./xmlchange DATM_YR_END=2004
+./xmlchange DATM_YR_START_FILENAME=2004
 ./xmlchange START_TOD=0
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_UK-Ham_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/UK-Ham/CLM1PT_data/CTSM_DATM_UK-Ham_2004-2004.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands
index 161de2a08e..10b82dee40 100644
--- a/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands
@@ -1,11 +1,11 @@
-./xmlchange PTS_LON=-1.2666629999999999
+./xmlchange PLUMBER2SITE=UK-PL3
+./xmlchange PTS_LON=-1.266663
 ./xmlchange PTS_LAT=51.450001
 ./xmlchange DATM_YR_END=2006
+./xmlchange DATM_YR_START_FILENAME=2005
 ./xmlchange START_TOD=0
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_UK-PL3_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/UK-PL3/CLM1PT_data/CTSM_DATM_UK-PL3_2005-2006.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands
index 727e21a389..8b3bb18871 100644
--- a/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=US-AR1
 ./xmlchange PTS_LON=-99.419983
 ./xmlchange PTS_LAT=36.426701
 ./xmlchange DATM_YR_END=2012
+./xmlchange DATM_YR_START_FILENAME=2010
 ./xmlchange START_TOD=21600
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-AR1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-AR1/CLM1PT_data/CTSM_DATM_US-AR1_2010-2012.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands
index 5de187cd7a..0eeaef4fe2 100644
--- a/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=US-AR2
 ./xmlchange PTS_LON=-99.597504
 ./xmlchange PTS_LAT=36.635799
 ./xmlchange DATM_YR_END=2011
+./xmlchange DATM_YR_START_FILENAME=2010
 ./xmlchange START_TOD=21600
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-AR2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-AR2/CLM1PT_data/CTSM_DATM_US-AR2_2010-2011.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2011" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands
index da1de52a6e..4045912f3c 100644
--- a/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=US-ARM
 ./xmlchange PTS_LON=-97.4888
 ./xmlchange PTS_LAT=36.605801
 ./xmlchange DATM_YR_END=2012
+./xmlchange DATM_YR_START_FILENAME=2003
 ./xmlchange START_TOD=21600
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-ARM_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-ARM/CLM1PT_data/CTSM_DATM_US-ARM_2003-2012.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands
index 47ae3dd4d9..043730b19e 100644
--- a/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=US-Aud
 ./xmlchange PTS_LON=-110.509201
 ./xmlchange PTS_LAT=31.5907
 ./xmlchange DATM_YR_END=2005
+./xmlchange DATM_YR_START_FILENAME=2003
 ./xmlchange START_TOD=25200
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Aud_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Aud/CLM1PT_data/CTSM_DATM_US-Aud_2003-2005.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands
index 2d24f07e53..4fb0562433 100644
--- a/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands
@@ -1,11 +1,11 @@
-./xmlchange PTS_LON=-71.28808599999999
-./xmlchange PTS_LAT=44.064640000000004
+./xmlchange PLUMBER2SITE=US-Bar
+./xmlchange PTS_LON=-71.288086
+./xmlchange PTS_LAT=44.06464
 ./xmlchange DATM_YR_END=2005
+./xmlchange DATM_YR_START_FILENAME=2005
 ./xmlchange START_TOD=18000
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Bar_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Bar/CLM1PT_data/CTSM_DATM_US-Bar_2005-2005.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands
index 9fb49876da..a05f46e871 100644
--- a/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=US-Bkg
 ./xmlchange PTS_LON=-96.836182
-./xmlchange PTS_LAT=44.345290999999996
+./xmlchange PTS_LAT=44.345291
 ./xmlchange DATM_YR_END=2006
+./xmlchange DATM_YR_START_FILENAME=2005
 ./xmlchange START_TOD=21600
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Bkg_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Bkg/CLM1PT_data/CTSM_DATM_US-Bkg_2005-2006.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands
index c208c920f7..fb79abb36e 100644
--- a/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=US-Blo
 ./xmlchange PTS_LON=-120.632751
 ./xmlchange PTS_LAT=38.895302
 ./xmlchange DATM_YR_END=2006
+./xmlchange DATM_YR_START_FILENAME=2000
 ./xmlchange START_TOD=28800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Blo_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Blo/CLM1PT_data/CTSM_DATM_US-Blo_2000-2006.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands
index c802acf23c..b6e243115f 100644
--- a/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=US-Bo1
 ./xmlchange PTS_LON=-88.290405
 ./xmlchange PTS_LAT=40.006199
 ./xmlchange DATM_YR_END=2006
+./xmlchange DATM_YR_START_FILENAME=1997
 ./xmlchange START_TOD=21600
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Bo1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Bo1/CLM1PT_data/CTSM_DATM_US-Bo1_1997-2006.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=1997" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands
index d66d11a697..0957a02037 100644
--- a/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=US-Cop
 ./xmlchange PTS_LON=-109.389999
 ./xmlchange PTS_LAT=38.09
 ./xmlchange DATM_YR_END=2003
+./xmlchange DATM_YR_START_FILENAME=2002
 ./xmlchange START_TOD=25200
 ./xmlchange ATM_NCPL=24
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Cop_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Cop/CLM1PT_data/CTSM_DATM_US-Cop_2002-2003.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands
index 621e4156ed..bd5760bfc0 100644
--- a/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands
@@ -1,11 +1,11 @@
-./xmlchange PTS_LON=-105.10189799999999
+./xmlchange PLUMBER2SITE=US-FPe
+./xmlchange PTS_LON=-105.101898
 ./xmlchange PTS_LAT=48.307701
 ./xmlchange DATM_YR_END=2006
+./xmlchange DATM_YR_START_FILENAME=2000
 ./xmlchange START_TOD=25200
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-FPe_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-FPe/CLM1PT_data/CTSM_DATM_US-FPe_2000-2006.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands
index a7548fbb53..fc1b2c4fba 100644
--- a/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=US-GLE
 ./xmlchange PTS_LON=-106.239899
 ./xmlchange PTS_LAT=41.366501
 ./xmlchange DATM_YR_END=2014
+./xmlchange DATM_YR_START_FILENAME=2009
 ./xmlchange START_TOD=25200
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-GLE_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-GLE/CLM1PT_data/CTSM_DATM_US-GLE_2009-2014.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2009" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2009" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands
index ee1cf13767..be9ff715aa 100644
--- a/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands
@@ -1,11 +1,11 @@
-./xmlchange PTS_LON=-89.87350500000001
+./xmlchange PLUMBER2SITE=US-Goo
+./xmlchange PTS_LON=-89.873505
 ./xmlchange PTS_LAT=34.2547
 ./xmlchange DATM_YR_END=2006
+./xmlchange DATM_YR_START_FILENAME=2004
 ./xmlchange START_TOD=21600
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Goo_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Goo/CLM1PT_data/CTSM_DATM_US-Goo_2004-2006.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands
index 43d55bdbd1..bb97980e53 100644
--- a/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=US-Ha1
 ./xmlchange PTS_LON=-72.171509
 ./xmlchange PTS_LAT=42.5378
 ./xmlchange DATM_YR_END=2012
+./xmlchange DATM_YR_START_FILENAME=1992
 ./xmlchange START_TOD=18000
 ./xmlchange ATM_NCPL=24
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Ha1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Ha1/CLM1PT_data/CTSM_DATM_US-Ha1_1992-2012.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=1992" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=1992" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands
index 7e9bda46b2..803711f8af 100644
--- a/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=US-Ho1
 ./xmlchange PTS_LON=-68.740204
 ./xmlchange PTS_LAT=45.204102
 ./xmlchange DATM_YR_END=2004
+./xmlchange DATM_YR_START_FILENAME=1996
 ./xmlchange START_TOD=18000
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Ho1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Ho1/CLM1PT_data/CTSM_DATM_US-Ho1_1996-2004.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=1996" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=1996" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands
index 161a377821..74ad2113d9 100644
--- a/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=US-KS2
 ./xmlchange PTS_LON=-80.671539
 ./xmlchange PTS_LAT=28.608578
 ./xmlchange DATM_YR_END=2006
+./xmlchange DATM_YR_START_FILENAME=2003
 ./xmlchange START_TOD=18000
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-KS2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-KS2/CLM1PT_data/CTSM_DATM_US-KS2_2003-2006.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands
index b606ac7e9e..dbc8d3b004 100644
--- a/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=US-Los
 ./xmlchange PTS_LON=-89.979187
 ./xmlchange PTS_LAT=46.082699
 ./xmlchange DATM_YR_END=2008
+./xmlchange DATM_YR_START_FILENAME=2000
 ./xmlchange START_TOD=21600
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Los_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Los/CLM1PT_data/CTSM_DATM_US-Los_2000-2008.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands
index b817bac303..8e8804a887 100644
--- a/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands
@@ -1,11 +1,11 @@
-./xmlchange PTS_LON=-86.41308599999999
+./xmlchange PLUMBER2SITE=US-MMS
+./xmlchange PTS_LON=-86.413086
 ./xmlchange PTS_LAT=39.3232
 ./xmlchange DATM_YR_END=2014
+./xmlchange DATM_YR_START_FILENAME=1999
 ./xmlchange START_TOD=18000
 ./xmlchange ATM_NCPL=24
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-MMS_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-MMS/CLM1PT_data/CTSM_DATM_US-MMS_1999-2014.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=1999" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=1999" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands
index a666ccbaf0..223e43a3d6 100644
--- a/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=US-MOz
 ./xmlchange PTS_LON=-92.200012
 ./xmlchange PTS_LAT=38.74411
 ./xmlchange DATM_YR_END=2006
+./xmlchange DATM_YR_START_FILENAME=2005
 ./xmlchange START_TOD=21600
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-MOz_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-MOz/CLM1PT_data/CTSM_DATM_US-MOz_2005-2006.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands
index e07240f14f..8555ceb993 100644
--- a/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=US-Me2
 ./xmlchange PTS_LON=-121.557404
 ./xmlchange PTS_LAT=44.452301
 ./xmlchange DATM_YR_END=2014
+./xmlchange DATM_YR_START_FILENAME=2002
 ./xmlchange START_TOD=28800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Me2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Me2/CLM1PT_data/CTSM_DATM_US-Me2_2002-2014.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands
index 6b26c589d9..b191f984a5 100644
--- a/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands
@@ -1,11 +1,11 @@
-./xmlchange PTS_LON=-121.62240600000001
+./xmlchange PLUMBER2SITE=US-Me4
+./xmlchange PTS_LON=-121.622406
 ./xmlchange PTS_LAT=44.499199
 ./xmlchange DATM_YR_END=2000
+./xmlchange DATM_YR_START_FILENAME=1996
 ./xmlchange START_TOD=28800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Me4_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Me4/CLM1PT_data/CTSM_DATM_US-Me4_1996-2000.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=1996" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2000" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=1996" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands
index 6056ec6552..8ffbbe4855 100644
--- a/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=US-Me6
 ./xmlchange PTS_LON=-121.607803
 ./xmlchange PTS_LAT=44.323299
 ./xmlchange DATM_YR_END=2014
+./xmlchange DATM_YR_START_FILENAME=2011
 ./xmlchange START_TOD=28800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Me6_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Me6/CLM1PT_data/CTSM_DATM_US-Me6_2011-2014.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands
index 89c79b88bc..2d3103546a 100644
--- a/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=US-Myb
 ./xmlchange PTS_LON=-121.765106
 ./xmlchange PTS_LAT=38.049801
 ./xmlchange DATM_YR_END=2014
+./xmlchange DATM_YR_START_FILENAME=2011
 ./xmlchange START_TOD=28800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Myb_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Myb/CLM1PT_data/CTSM_DATM_US-Myb_2011-2014.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands
index 7185333ba0..cd795160d0 100644
--- a/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=US-NR1
 ./xmlchange PTS_LON=-105.546402
 ./xmlchange PTS_LAT=40.032902
 ./xmlchange DATM_YR_END=2014
+./xmlchange DATM_YR_START_FILENAME=1999
 ./xmlchange START_TOD=25200
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-NR1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-NR1/CLM1PT_data/CTSM_DATM_US-NR1_1999-2014.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=1999" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=1999" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands
index 5ec7590921..4b205b471d 100644
--- a/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands
@@ -1,11 +1,11 @@
-./xmlchange PTS_LON=-96.47659300000001
+./xmlchange PLUMBER2SITE=US-Ne1
+./xmlchange PTS_LON=-96.476593
 ./xmlchange PTS_LAT=41.1651
 ./xmlchange DATM_YR_END=2012
+./xmlchange DATM_YR_START_FILENAME=2002
 ./xmlchange START_TOD=21600
 ./xmlchange ATM_NCPL=24
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Ne1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Ne1/CLM1PT_data/CTSM_DATM_US-Ne1_2002-2012.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands
index 75d2215e6c..beca45f248 100644
--- a/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=US-Ne2
 ./xmlchange PTS_LON=-96.470093
-./xmlchange PTS_LAT=41.164902000000005
+./xmlchange PTS_LAT=41.164902
 ./xmlchange DATM_YR_END=2012
+./xmlchange DATM_YR_START_FILENAME=2002
 ./xmlchange START_TOD=21600
 ./xmlchange ATM_NCPL=24
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Ne2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Ne2/CLM1PT_data/CTSM_DATM_US-Ne2_2002-2012.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands
index ceb48a35c0..59644ec285 100644
--- a/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=US-Ne3
 ./xmlchange PTS_LON=-96.439697
 ./xmlchange PTS_LAT=41.179699
 ./xmlchange DATM_YR_END=2012
+./xmlchange DATM_YR_START_FILENAME=2002
 ./xmlchange START_TOD=21600
 ./xmlchange ATM_NCPL=24
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Ne3_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Ne3/CLM1PT_data/CTSM_DATM_US-Ne3_2002-2012.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands
index e214fa5d26..979dd2adbe 100644
--- a/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=US-PFa
 ./xmlchange PTS_LON=-90.272308
 ./xmlchange PTS_LAT=45.9459
 ./xmlchange DATM_YR_END=2014
+./xmlchange DATM_YR_START_FILENAME=1995
 ./xmlchange START_TOD=21600
 ./xmlchange ATM_NCPL=24
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-PFa_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-PFa/CLM1PT_data/CTSM_DATM_US-PFa_1995-2014.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=1995" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=1995" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands
index 0be161a3f5..34949905d4 100644
--- a/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=US-Prr
 ./xmlchange PTS_LON=-147.487595
 ./xmlchange PTS_LAT=65.123703
 ./xmlchange DATM_YR_END=2013
+./xmlchange DATM_YR_START_FILENAME=2011
 ./xmlchange START_TOD=32400
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Prr_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Prr/CLM1PT_data/CTSM_DATM_US-Prr_2011-2013.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands
index b1944933fe..07c1611661 100644
--- a/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=US-SP1
 ./xmlchange PTS_LON=-82.218781
 ./xmlchange PTS_LAT=29.73807
 ./xmlchange DATM_YR_END=2005
+./xmlchange DATM_YR_START_FILENAME=2005
 ./xmlchange START_TOD=18000
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-SP1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-SP1/CLM1PT_data/CTSM_DATM_US-SP1_2005-2005.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands
index 9ec9b25681..0640843357 100644
--- a/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=US-SP2
 ./xmlchange PTS_LON=-82.244812
 ./xmlchange PTS_LAT=29.764799
 ./xmlchange DATM_YR_END=2004
+./xmlchange DATM_YR_START_FILENAME=2000
 ./xmlchange START_TOD=18000
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-SP2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-SP2/CLM1PT_data/CTSM_DATM_US-SP2_2000-2004.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands
index 72c94ad6a5..559f2e9282 100644
--- a/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=US-SP3
 ./xmlchange PTS_LON=-82.163269
 ./xmlchange PTS_LAT=29.75477
 ./xmlchange DATM_YR_END=2004
+./xmlchange DATM_YR_START_FILENAME=1999
 ./xmlchange START_TOD=18000
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-SP3_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-SP3/CLM1PT_data/CTSM_DATM_US-SP3_1999-2004.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=1999" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=1999" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands
index 53c07383d3..25269ecc91 100644
--- a/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=US-SRG
 ./xmlchange PTS_LON=-110.827698
 ./xmlchange PTS_LAT=31.7894
 ./xmlchange DATM_YR_END=2014
+./xmlchange DATM_YR_START_FILENAME=2009
 ./xmlchange START_TOD=25200
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-SRG_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-SRG/CLM1PT_data/CTSM_DATM_US-SRG_2009-2014.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2009" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2009" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands
index f8ab5b5b89..97c155f639 100644
--- a/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=US-SRM
 ./xmlchange PTS_LON=-110.865997
 ./xmlchange PTS_LAT=31.8214
 ./xmlchange DATM_YR_END=2014
+./xmlchange DATM_YR_START_FILENAME=2004
 ./xmlchange START_TOD=25200
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-SRM_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-SRM/CLM1PT_data/CTSM_DATM_US-SRM_2004-2014.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands
index 7bd8324a6d..f78805c4d8 100644
--- a/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=US-Syv
 ./xmlchange PTS_LON=-89.347717
 ./xmlchange PTS_LAT=46.242001
 ./xmlchange DATM_YR_END=2008
+./xmlchange DATM_YR_START_FILENAME=2002
 ./xmlchange START_TOD=21600
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Syv_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Syv/CLM1PT_data/CTSM_DATM_US-Syv_2002-2008.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands
index 2ac988eb2f..81a47579f4 100644
--- a/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=US-Ton
 ./xmlchange PTS_LON=-120.966003
 ./xmlchange PTS_LAT=38.431599
 ./xmlchange DATM_YR_END=2014
+./xmlchange DATM_YR_START_FILENAME=2001
 ./xmlchange START_TOD=28800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Ton_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Ton/CLM1PT_data/CTSM_DATM_US-Ton_2001-2014.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2001" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands
index 0895943d1c..6a76794659 100644
--- a/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=US-Tw4
 ./xmlchange PTS_LON=-121.641403
 ./xmlchange PTS_LAT=38.103001
 ./xmlchange DATM_YR_END=2014
+./xmlchange DATM_YR_START_FILENAME=2014
 ./xmlchange START_TOD=28800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Tw4_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Tw4/CLM1PT_data/CTSM_DATM_US-Tw4_2014-2014.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2014" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2014" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands
index 77649de143..0a36252097 100644
--- a/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=US-Twt
 ./xmlchange PTS_LON=-121.653107
 ./xmlchange PTS_LAT=38.1087
 ./xmlchange DATM_YR_END=2014
+./xmlchange DATM_YR_START_FILENAME=2010
 ./xmlchange START_TOD=28800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Twt_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Twt/CLM1PT_data/CTSM_DATM_US-Twt_2010-2014.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands
index 511e7e05c3..6587b7967c 100644
--- a/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=US-UMB
 ./xmlchange PTS_LON=-84.713806
 ./xmlchange PTS_LAT=45.559799
 ./xmlchange DATM_YR_END=2014
+./xmlchange DATM_YR_START_FILENAME=2000
 ./xmlchange START_TOD=18000
 ./xmlchange ATM_NCPL=24
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-UMB_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-UMB/CLM1PT_data/CTSM_DATM_US-UMB_2000-2014.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands
index 8cbb483737..ecdf5c95e3 100644
--- a/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands
@@ -1,11 +1,11 @@
-./xmlchange PTS_LON=-120.95072900000001
+./xmlchange PLUMBER2SITE=US-Var
+./xmlchange PTS_LON=-120.950729
 ./xmlchange PTS_LAT=38.4133
 ./xmlchange DATM_YR_END=2014
+./xmlchange DATM_YR_START_FILENAME=2001
 ./xmlchange START_TOD=28800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Var_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Var/CLM1PT_data/CTSM_DATM_US-Var_2001-2014.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2001" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands
index adcfb2eec4..4f2ca3a65e 100644
--- a/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=US-WCr
 ./xmlchange PTS_LON=-90.079895
 ./xmlchange PTS_LAT=45.805901
 ./xmlchange DATM_YR_END=2006
+./xmlchange DATM_YR_START_FILENAME=1999
 ./xmlchange START_TOD=21600
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-WCr_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-WCr/CLM1PT_data/CTSM_DATM_US-WCr_1999-2006.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=1999" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=1999" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands
index 0f091925f1..458db116f3 100644
--- a/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=US-Whs
 ./xmlchange PTS_LON=-110.0522
 ./xmlchange PTS_LAT=31.743799
 ./xmlchange DATM_YR_END=2014
+./xmlchange DATM_YR_START_FILENAME=2008
 ./xmlchange START_TOD=25200
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Whs_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Whs/CLM1PT_data/CTSM_DATM_US-Whs_2008-2014.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2008" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands
index da4a18b3f9..0870b9233d 100644
--- a/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=US-Wkg
 ./xmlchange PTS_LON=-109.941895
 ./xmlchange PTS_LAT=31.7365
 ./xmlchange DATM_YR_END=2014
+./xmlchange DATM_YR_START_FILENAME=2005
 ./xmlchange START_TOD=25200
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Wkg_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Wkg/CLM1PT_data/CTSM_DATM_US-Wkg_2005-2014.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands
index 016f4e4038..8c3463a936 100644
--- a/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=ZA-Kru
 ./xmlchange PTS_LON=31.496901
 ./xmlchange PTS_LAT=-25.019699
 ./xmlchange DATM_YR_END=2002
+./xmlchange DATM_YR_START_FILENAME=2000
 ./xmlchange START_TOD=79200
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_ZA-Kru_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ZA-Kru/CLM1PT_data/CTSM_DATM_ZA-Kru_2000-2002.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2002" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams 
diff --git a/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands
index 2729227ecc..448a26c040 100644
--- a/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands
+++ b/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands
@@ -1,11 +1,11 @@
+./xmlchange PLUMBER2SITE=ZM-Mon
 ./xmlchange PTS_LON=23.252781
 ./xmlchange PTS_LAT=-15.437778
 ./xmlchange DATM_YR_END=2008
+./xmlchange DATM_YR_START_FILENAME=2008
 ./xmlchange START_TOD=79200
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_ZM-Mon_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
-echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ZM-Mon/CLM1PT_data/CTSM_DATM_ZM-Mon_2008-2008.nc " >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams 
 echo "presaero.SSP3-7.0:year_align=2008" >> user_nl_datm_streams 
diff --git a/components/cdeps b/components/cdeps
index 7476950699..7b0b3a8272 160000
--- a/components/cdeps
+++ b/components/cdeps
@@ -1 +1 @@
-Subproject commit 7476950699909813d1938a34bd8d71bf5bfbf1e9
+Subproject commit 7b0b3a827241c53d296ec877cb1f59966bf5e5bf
diff --git a/doc/.ChangeLog_template b/doc/.ChangeLog_template
index 60a7f49288..c95ea482e3 100644
--- a/doc/.ChangeLog_template
+++ b/doc/.ChangeLog_template
@@ -98,7 +98,7 @@ infrastructure should be run when appropriate, as described below.
 
   python testing (if python code has changed; see instructions in python/README.md; document testing done):
 
-    (any machine) -
+    derecho -
 
     [If python code has changed and you are NOT running aux_clm (e.g., because the only changes are in python
      code) then also run the clm_pymods test suite; this is a small subset of aux_clm that runs the system
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 96c0d6735b..e553a59730 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,4 +1,214 @@
 ===============================================================
+Tag name: ctsm5.2.028
+Originator(s): rgknox (Ryan Knox, LBNL, rgknox@lbl.gov)
+               glemieux (Gregory Lemieux, LBNL, glemieux@lbl.gov)
+Date: Thu 05 Sep 2024 02:47:14 PM MDT
+One-line Summary: FATES history flushing update
+
+Purpose and description of changes
+----------------------------------
+
+This updates the way in which FATES history output is flushed during model initialization
+utilizing a new FATES-side subroutine, flush_all_hvars.  This update also makes corrections
+to a subset of FATES testmods as well as expands the FATES test list by duplicating two
+existing tests to run on different compilers for better coverage.  The FATES submodule tag
+has been updated to the latest scientific tag as well.
+
+
+Significant changes to scientifically-supported configurations
+--------------------------------------------------------------
+
+Does this tag change answers significantly for any of the following physics configurations?
+(Details of any changes will be given in the "Answer changes" section below.)
+
+    [Put an [X] in the box for any configuration with significant answer changes.]
+
+[ ] clm6_0
+
+[ ] clm5_1
+
+[ ] clm5_0
+
+[ ] ctsm5_0-nwp
+
+[ ] clm4_5
+
+
+Bugs fixed
+----------
+List of CTSM issues fixed (include CTSM Issue # and description) [one per line]:
+Fixes #2657 Add FATES_TRANSITIONS_MATRIX_LULU to FatesColdLUH2 testmods
+
+Notes of particular relevance for developers:
+---------------------------------------------
+Changes to tests or testing:
+
+Adds nvhpc and gnu FatesSatColdPhen smoke tests to the fates list to expand compiler
+coverage.
+
+Testing summary:
+----------------
+
+ [PASS means all tests PASS; OK means tests PASS other than expected fails.]
+
+  regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing):
+
+    derecho ----- OK
+    izumi ------- OK
+
+  fates tests: (give name of baseline if different from CTSM tagname, normally fates baselines are fates-<FATES TAG>-<CTSM TAG>)
+    derecho ----- OK
+    izumi ------- OK
+
+Answer changes
+--------------
+
+Changes answers relative to baseline: Yes, for FATES tests only
+
+Changes are consistent with differences in FATES_EFFECT_WSPEED due to NGEET/fates#1215
+
+Other details
+-------------
+List any git submodules updated (cime, rtm, mosart, cism, fates, etc.):
+
+   FATES: sci.1.77.2_api.36.0.0 -> sci.1.78.2_api.36.0.0
+
+Pull Requests that document the changes (include PR ids):
+ https://github.com/ESCOMP/ctsm/pull/2594
+
+===============================================================
+===============================================================
+Tag name: ctsm5.2.027
+Originator(s): erik (Erik Kluzek,UCAR/TSS,303-497-1326)
+Date: Wed 28 Aug 2024 09:13:22 PM MDT
+One-line Summary: Merge b4b-dev
+
+Purpose and description of changes
+----------------------------------
+
+Bring b4b-dev branch to main CTSM development.
+
+- PLUMBER2 for ctsm5.2 datasets
+- Last bit of PPE changes for namelist and parameter file settings
+- Update run_sys_tests on Derecho for compiler jobs to run using 16 tasks
+- Bring in a fix for dust emissions for coupling with CAM
+
+Update cs.status parsing script to make expected BASELINE fails more obvious
+
+Fix some issues with finding IC files for certain lnd_tuning_modes: all for cam7, 
+   clm5_0_cam6.0, and clm6_0_cam6.0
+
+Significant changes to scientifically-supported configurations
+--------------------------------------------------------------
+
+Does this tag change answers significantly for any of the following physics configurations?
+(Details of any changes will be given in the "Answer changes" section below.)
+
+    [Put an [X] in the box for any configuration with significant answer changes.]
+
+[ ] clm6_0
+
+[ ] clm5_1
+
+[ ] clm5_0
+
+[ ] ctsm5_0-nwp
+
+[ ] clm4_5
+
+
+Bugs fixed
+----------
+
+List of CTSM issues fixed (include CTSM Issue # and description) [one per line]:
+   Fixes #2687 -- Error in Prigent streams setting when coupled to CAM
+   Fixes #2709 -- Problem in megan_specifier checking in namelist due to update in CMEPS
+   Fixes #2712 -- Allow user to change drydep, fire_emiss, megan namelists in user_nl_clm
+     even when those CLM_BLDNML_OPTS are off
+   Fixes #2567 -- PPE prep work
+   Fixes #1652 -- c3psn is wrong for some PFT's not currently used
+   Fixes #2484 -- update PLUMBER2 user-mods to ctsm5.2 surface datasets
+
+Notes of particular relevance for users
+---------------------------------------
+
+Caveats for users (e.g., need to interpolate initial conditions):
+   atm_provides_lightning can be set in drv_flds_in now, but doesn't do anything
+
+   When LND_SETS_DUST_EMIS_DRV_FLD==FALSE and you are coupled to CAM
+   and there is a conflict between CAM and CTSM settings, a message like this happens:
+
+   Using clm5_0_cam6.0 for lnd_tuning_mode
+Read in the drv_flds_in file generated by CAM's build-namelist
+Build::Namelist::_merge_nl:ERROR: A variable was already set, so we are terminating on the conflict variable name is =dep_data_file 
+
+Changes to CTSM's user interface (e.g., new/renamed XML or namelist variables):
+   Changed behavior for CLM_BLDNML_OPTS command line options: -drydep, -megan, and -fire_emis
+   Turning them on now only adds test namelists to use, you can add custom settings for them 
+   in user_nl_clm with or without them on
+
+   atm_provides_lightning and atm_ozone_frequency can be set in user_nl_clm for drv_flds_in
+      The first is not active, and the second you should probably have CAM set
+
+   New XML variable: PLUMBER2SITE to set the site name for PLUMBER2 cases
+
+Changes made to namelist defaults (e.g., changed parameter values): PLUMBER2 datasets
+
+   Using PLUMBER2 user-mods now gives you ctsm5.2 surface datasets
+
+Changes to the datasets (e.g., parameter, surface or initial files): parameter files
+   New parameter file with c3psn corrected and ndays_on changed to PFT
+   new parameters: crit_onset_gdd_sf, zbedrock, zbedrock_sf
+
+Changes to documentation: Yes regarding build-namelist command line options listed above
+
+Notes of particular relevance for developers:
+---------------------------------------------
+
+Caveats for developers (e.g., code that is duplicated that requires double maintenance):
+   When LND_SETS_DUST_EMIS_DRV_FLD==FALSE (so coupled to CAM) -- The CAM $CASEDIR/Buildconf/camconf/drv_flds_in namelist is read in to get the CAM drv_flds_in settings. For this to work correctly
+   the drydep, and fire-emiss subroutines need to be after the dust_emis subroutine which reads in
+   the CAM drv_flds_in.
+      See plan to phase out LND_SETS_DUST_EMIS_DRV_FLD here:
+      https://github.com/ESCOMP/CTSM/issues/2713
+
+Changes to tests or testing:
+  Updated parameter files for some specific test mods
+
+Testing summary: regular
+----------------
+ [PASS means all tests PASS; OK means tests PASS other than expected fails.]
+
+  build-namelist tests (if CLMBuildNamelist.pm has changed):
+
+    derecho - PASS (1005 different because of new parameter files)
+
+  python testing (if python code has changed; see instructions in python/README.md; document testing done):
+
+    derecho - PASS
+
+  regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing):
+
+    derecho ----- OK
+    izumi ------- OK
+
+Answer changes
+--------------
+
+Changes answers relative to baseline: No bit-for-bit
+
+Other details
+-------------
+
+List any git submodules updated (cime, rtm, mosart, cism, fates, etc.): cdeps
+   cdeps to cdeps1.0.47
+
+Pull Requests that document the changes (include PR ids):
+(https://github.com/ESCOMP/ctsm/pull)
+   https://github.com/ESCOMP/CTSM/pull/2731 -- merge b4b-dev
+
+===============================================================
+===============================================================
 Tag name: ctsm5.2.026
 Originator(s): slevis (Samuel Levis,UCAR/TSS,303-665-1310)
 Date: Fri 23 Aug 2024 05:17:56 PM MDT
diff --git a/doc/ChangeSum b/doc/ChangeSum
index 6071278954..45bab07440 100644
--- a/doc/ChangeSum
+++ b/doc/ChangeSum
@@ -1,5 +1,7 @@
 Tag                   Who      Date  Summary
 ============================================================================================================================
+       ctsm5.2.028   rgknox 09/05/2024 FATES history flushing update
+       ctsm5.2.027     erik 08/28/2024 Merge b4b-dev
        ctsm5.2.026   slevis 08/23/2024 Turn on excess ice, explicit AC, Leung_2023 for clm6
        ctsm5.2.025 samrabin 08/23/2024 Minor fixes to li2024 fire methods
        ctsm5.2.024 samrabin 08/22/2024 Improve li2024 fire methods
diff --git a/doc/source/users_guide/setting-up-and-running-a-case/customizing-the-clm-configuration.rst b/doc/source/users_guide/setting-up-and-running-a-case/customizing-the-clm-configuration.rst
index e76a9cc6f0..a1efac897e 100644
--- a/doc/source/users_guide/setting-up-and-running-a-case/customizing-the-clm-configuration.rst
+++ b/doc/source/users_guide/setting-up-and-running-a-case/customizing-the-clm-configuration.rst
@@ -140,10 +140,17 @@ CLM_BLDNML_OPTS
                               Can also be set by using the CSMDATA environment variable.
      -d "directory"           Directory where output namelist file will be written
                               Default: current working directory.
-     -drydep                  Produce a drydep_inparm namelist that will go into the
+     -drydep                  Produce a drydep_inparm namelist for testing that will go into the
                               "drv_flds_in" file for the driver to pass dry-deposition to the atm.
+                              This populates the namelist with valid drydep settings for testing.
                               Default: -no-drydep
-                              (Note: buildnml.csh copies the file for use by the driver)
+                              Note: Can always add drydep fields to user_nl_clm even with --no-drydep
+                              (Note: buildnml copies the file for use by the driver)
+     -fire_emis               Produce a fire_emis_nl namelist for testing that will go into the
+                              "drv_flds_in" file for the driver to pass fire emissions to the atm.
+                              This populates the namelist with valid fire-emiss settings for testing.
+                              Note: Can always add fire_emis fields to user_nl_clm even with --no-fire_emis
+                              (Note: buildnml copies the file for use by the driver)
      -glc_grid "grid"         Glacier model grid and resolution when glacier model,
                               Only used if glc_nec > 0 for determining fglcmask
                               Default:  gland5UM
@@ -185,10 +192,12 @@ CLM_BLDNML_OPTS
      -namelist "namelist"     Specify namelist settings directly on the commandline by supplying
                               a string containing FORTRAN namelist syntax, e.g.,
                                  -namelist "&clm_inparm dt=1800 /"
-     -no-megan                DO NOT PRODUCE a megan_emis_nl namelist that will go into the
+     -no-megan                DO NOT PRODUCE a megan_emis_nl namelist for testing that will go into the
                               "drv_flds_in" file for the driver to pass VOCs to the atm.
                               MEGAN (Model of Emissions of Gases and Aerosols from Nature)
-                              (Note: buildnml.csh copies the file for use by the driver)
+                              This removes setting default values for testing MEGAN fields
+                              Note: Can always add megan fields to user_nl_clm even with --no-megan
+                              (Note: buildnml copies the file for use by the driver)
      -[no-]note               Add note to output namelist  [do NOT add note] about the
                               arguments to build-namelist.
      -rcp "value"             Representative concentration pathway (rcp) to use for
@@ -258,6 +267,8 @@ The **$CTSMROOT/cime_config/buildnml** script already sets the resolution and ma
 
 #. -drydep
 
+#. -fire_emis
+
 #. -ignore_ic_date
 
 #. -ignore_ic_year
@@ -291,7 +302,7 @@ To see a list of valid variables that you could set do this:
 
 .. note:: Using a 20th-Century transient compset or the ``20thC_transient`` use-case using ``CLM_NML_USE_CASE`` would set this as well, but would also use dynamic nitrogen and aerosol deposition files, so using ``-clm_demand`` would be a way to get *just* dynamic vegetation types and NOT the other files as well.
 
-"-drydep" adds the dry-deposition namelist to the driver. This is a driver namelist, but adding the option here has CLM **build-namelist** create the ``drv_flds_in`` file that the driver will copy over and use. Invoking this option does have an impact on performance even for I compsets and will slow the model down. It's also only useful when running with an active atmosphere model that makes use of this information.
+"-drydep" adds a dry-deposition namelist for testing to the driver. This is a driver namelist, but adding the option here has CLM **build-namelist** create the ``drv_flds_in`` file that the driver will copy over and use. Invoking this option does have an impact on performance even for I compsets and will slow the model down. It's also only useful when running with an active atmosphere model that makes use of this information.
 
 "-ignore_ic_date" ignores the Initial Conditions (IC) date completely for finding initial condition files to startup from. Without this option or the "-ignore_ic_year" option below, the date of the file comes into play.
 
@@ -299,7 +310,7 @@ To see a list of valid variables that you could set do this:
 
 When "-irrig on" is used **build-namelist** will try to find surface datasets that have the irrigation model enabled (when running with Sattellitte Phenology). When running with the prognostic crop model on, "-irrig on" will turn irrigate crops on, while "-irrig off" will manage all crop areas as rain-fed without irrigation.
 
-"no-megan" means do NOT add the MEGAN model Biogenic Volatile Organic Compounds (BVOC) namelist to the driver. This namelist is created by default, so normally this WILL be done. This is a driver namelist, so unless "no-megan" is specified the CLM **build-namelist** will create the ``drv_flds_in`` file that the driver will copy over and use (if you are running with CAM and CAM produces this file as well, it's file will have precedence).
+"no-megan" means do NOT add a MEGAN model Biogenic Volatile Organic Compounds (BVOC) testing namelist to the driver. This namelist is created by default, so normally this WILL be done. This is a driver namelist, so unless "no-megan" is specified the CLM **build-namelist** will create the ``drv_flds_in`` file that the driver will copy over and use (if you are running with CAM and CAM produces this file as well, it's file will have precedence).
 
 "-note" adds a note to the bottom of the namelist file, that gives the details of how **build-namelist** was called, giving the specific command-line options given to it.
 
@@ -363,18 +374,20 @@ Example: user_nl_clm namelist file
    ! Users should add all user specific namelist changes below in the form of
    ! namelist_var = new_namelist_value
    !
-   ! Include namelist variables for drv_flds_in ONLY if -megan and/or -drydep options
-   ! are set in the CLM_NAMELIST_OPTS env variable.
-   !
    ! EXCEPTIONS:
+   ! Set use_cndv           by the compset you use and the CLM_BLDNML_OPTS -dynamic_vegetation setting
+   ! Set use_vichydro       by the compset you use and the CLM_BLDNML_OPTS -vichydro           setting
+   ! Set use_cn             by the compset you use and CLM_BLDNML_OPTS -bgc  setting
+   ! Set use_crop           by the compset you use and CLM_BLDNML_OPTS -crop setting
+   ! Set spinup_state       by the CLM_BLDNML_OPTS -bgc_spinup      setting
    ! Set co2_ppmv           with CCSM_CO2_PPMV                      option
-   ! Set dtime              with L_NCPL                             option
    ! Set fatmlndfrc         with LND_DOMAIN_PATH/LND_DOMAIN_FILE    options
    ! Set finidat            with RUN_REFCASE/RUN_REFDATE/RUN_REFTOD options for hybrid or branch cases
    !                        (includes $inst_string for multi-ensemble cases)
-   ! Set glc_grid           with GLC_GRID                           option
-   ! Set glc_smb            with GLC_SMB                            option
-   ! Set maxpatch_glc    with GLC_NEC                            option
+   !                        or with CLM_FORCE_COLDSTART to do a cold start
+   !                        or set it with an explicit filename here.
+   ! Set maxpatch_glc       with GLC_NEC                            option
+   ! Set glc_do_dynglacier  with GLC_TWO_WAY_COUPLING               env variable
    !----------------------------------------------------------------------------------
    hist_fincl2    = 'TG','TBOT','FIRE','FIRA','FLDS','FSDS',
                     'FSR','FSA','FGEV','FSH','FGR','TSOI',
diff --git a/parse_cime.cs.status b/parse_cime.cs.status
index 08bb1bfc86..264ba0708f 100755
--- a/parse_cime.cs.status
+++ b/parse_cime.cs.status
@@ -204,7 +204,11 @@ sub run_csstatus {
          do {
             $newline = shift(@lines);
             if (       $newline =~ /FAIL[ ]+$test ([^ ]+)/ ) {
-               $fails .= " $1";
+               if ( $fails eq "" ) {
+                  $fails = $1;
+               } else {
+                  $fails .= " $1";
+               }
                chomp( $fails );
                if ( $1 eq "BASELINE" ) {
                  if ( $newline =~ /ERROR BFAIL baseline directory/ ) {
@@ -290,7 +294,33 @@ sub print_sumperline {
    }
 }
 
-
+sub expectedFails {
+   # Query expected fail file for the input testname key
+   my ($key, $message, @failfiles) = @_;
+   my $expect = "";
+   my $expectedfails = "";
+   foreach my $expectedfailfile ( @failfiles ) {
+      my $fh = IO::File->new($expectedfailfile, '<') or die "ERROR:: failure opening $expectedfailfile\n";
+      while( my $line = <$fh> ) {
+         if ( $line =~ /$key/ ) {
+            $expect = $message;
+            # Read past the testname until the test end is found...
+            # Keep track of all of the expected fails and return it at the end
+            while( my $testline = <$fh> ) {
+               if ( $testline =~ /phase\s+name\s*=\s*\"([a-zA-Z0-9_]+)/ ) {
+                  if ( $expectedfails eq "" ) {
+                    $expectedfails = $1;
+                  } else {
+                    $expectedfails = "$expectedfails $1";
+                  }
+               }
+               if ( $testline =~ /\<\/test\>/ ) { last; }
+            }
+         }
+      }
+   }
+   return( $expect, $expectedfails );
+}
 
 sub print_categories {
    # Seperate tests into categories
@@ -302,6 +332,7 @@ sub print_categories {
    if ( ! -f $expectedfailfile ) {
       $expectedfailfile = "$scrdir/cime_config/testdefs/ExpectedTestFails.xml";
    }
+   my @failfiles = (  $expectedfailfile, "$scrdir/components/mizuRoute/cime_config/testdefs/ExpectedTestFails.xml" );
    my @passes;
    my @fails;
    my @pendings;
@@ -340,9 +371,9 @@ sub print_categories {
       print( "These tests passed\n" );
       print( "================================================================================\n" );
       foreach my $key ( @passes ) {
-         my $expect = ""; 
-         `grep $key $expectedfailfile > /dev/null`;
-         if ( $? == 0 ) { $expect = "FAILED PREVIOUSLY"; }
+         my ($expect, $expectFails) = &expectedFails( $key, "FAILED PREVIOUSLY", @failfiles );
+         if ( $expect ne "" ) { $expect = "$expect ($expectFails)"; }
+         if ($expectFails =~ /BASELINE/ ) { $expect = ""; }
          print( "$key\t\t\t$expect\n" );
       }
    }
@@ -351,7 +382,9 @@ sub print_categories {
       print( "These tests compare different to the baseline\n" );
       print( "================================================================================\n" );
       foreach my $key ( @compares_diff ) {
-         print( "$key\n" );
+         my ($expect, $expectFails) = &expectedFails( $key, "EXPECTED POSSIBILITY", @failfiles );
+         if ($expectFails !~ /BASELINE/ ) { $expect = ""; }
+         print( "$key\t\t$expect\n" );
       }
    }
    if ( $#compares_diff_nobase >= 0 ) {
@@ -367,21 +400,21 @@ sub print_categories {
       print( "These tests are pending (some tests may fail in the pending state)\n" );
       print( "================================================================================\n" );
       foreach my $key ( @pendings ) {
-         my $expect = ""; 
-         `grep $key $expectedfailfile > /dev/null`;
-         if ( $? == 0 ) { $expect = "EXPECTED"; }
+         my ($expect, $expectFails) = &expectedFails( $key, "EXPECTED", @failfiles );
+         if ( $expect ne "" ) { $expect = "$expect ($expectFails)"; }
          print( "$key\t\t$expect\n" );
       }
    }
    if ( $#fails >= 0 ) {
       print( "================================================================================\n" );
       print( "These tests failed\n" );
+      print( "Test (what Failed) EXPECTED (what expected to fail)\n" );
       print( "================================================================================\n" );
       foreach my $key ( @fails ) {
-         my $expect = ""; 
-         `grep $key $expectedfailfile > /dev/null`;
-         if ( $? == 0 ) { $expect = "EXPECTED"; }
-         print( "$key\t\t$expect\n" );
+         my ($expect, $expectFails) = &expectedFails( $key, "EXPECTED", @failfiles );
+         if ( $expect ne "" ) { $expect = "$expect ($expectFails)"; }
+         my $fails = $csstatus{$key}{'FAIL'};
+         print( "$key\t($fails)\t\t$expect\n" );
       }
    }
 }
diff --git a/python/ctsm/machine_defaults.py b/python/ctsm/machine_defaults.py
index a17f063a4b..16742da47e 100644
--- a/python/ctsm/machine_defaults.py
+++ b/python/ctsm/machine_defaults.py
@@ -77,13 +77,13 @@
         create_test_queue=CREATE_TEST_QUEUE_UNSPECIFIED,
         job_launcher_defaults={
             JOB_LAUNCHER_QSUB: QsubDefaults(
-                queue="main",
+                queue="develop",
                 walltime="03:50:00",
                 extra_args="",
                 # The following assumes a single node, with a single mpi proc; we may want
                 # to add more flexibility in the future, making the node / proc counts
                 # individually selectable
-                required_args="-l select=1:ncpus=128:mpiprocs=1 -V -r n -k oed",
+                required_args="-l select=1:ncpus=16:mpiprocs=1 -V -r n -k oed",
             )
         },
     ),
diff --git a/python/ctsm/site_and_regional/plumber2_usermods.py b/python/ctsm/site_and_regional/plumber2_usermods.py
index 2fe183fb77..d98899771b 100644
--- a/python/ctsm/site_and_regional/plumber2_usermods.py
+++ b/python/ctsm/site_and_regional/plumber2_usermods.py
@@ -56,24 +56,10 @@ def write_usermods(
         "./xmlchange PTS_LON=" + str(lon) + "\n"
         "./xmlchange PTS_LAT=" + str(lat) + "\n"
         "./xmlchange DATM_YR_END=" + str(end_year) + "\n"
+        "./xmlchange DATM_YR_START_FILENAME=" + str(start_year) + "\n"
         "./xmlchange START_TOD=" + str(start_tod) + "\n"
         "./xmlchange ATM_NCPL=" + str(atm_ncpl) + "\n"
-        "\n"  # TODO, get working for CTSM5.1:
-        # remove the above line as it's redundant after PLUMBER2SITE is added
-        # Alternatively, we can take this out of default/user_nl_clm
-        # since doing it this way is works fine TODO for 5.2
-        "echo \"fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_"
-        + site
-        + "_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' \" >> user_nl_clm \n"
-        'echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/'
-        + site
-        + "/CLM1PT_data/CTSM_DATM_"
-        + site
-        + "_"
-        + str(start_year)
-        + "-"
-        + str(end_year)
-        + '.nc " >> user_nl_datm_streams \n'
+        "\n"
         'echo "presaero.SSP3-7.0:year_first=' + str(start_year) + '" >> user_nl_datm_streams \n'
         'echo "presaero.SSP3-7.0:year_last=' + str(end_year) + '" >> user_nl_datm_streams \n'
         'echo "presaero.SSP3-7.0:year_align=' + str(start_year) + '" >> user_nl_datm_streams \n'
diff --git a/src/fates b/src/fates
index e372f0b6cd..e06e0dfcaf 160000
--- a/src/fates
+++ b/src/fates
@@ -1 +1 @@
-Subproject commit e372f0b6cdf46f76f888ee6ac92d9a3572464e8b
+Subproject commit e06e0dfcaf6347993d47dc29944e952d3e4412f7
diff --git a/src/utils/clmfates_interfaceMod.F90 b/src/utils/clmfates_interfaceMod.F90
index e3e7644b90..cff7679e9d 100644
--- a/src/utils/clmfates_interfaceMod.F90
+++ b/src/utils/clmfates_interfaceMod.F90
@@ -137,7 +137,6 @@ module CLMFatesInterfaceMod
    use FatesParametersInterface, only : fates_parameters_type
 
    use FatesInterfaceMod     , only : DetermineGridCellNeighbors
-   use FatesIOVariableKindMod, only : group_dyna_simple, group_dyna_complx
    use FatesHistoryInterfaceMod, only : fates_hist
    use FatesRestartInterfaceMod, only : fates_restart_interface_type
 
@@ -1241,14 +1240,6 @@ subroutine dynamics_driv(this, nc, bounds_clump,      &
          call this%WrapUpdateFatesSeedInOut(bounds_clump)
       end if
 
-      ! ---------------------------------------------------------------------------------
-      ! Flush arrays to values defined by %flushval (see registry entry in
-      ! subroutine define_history_vars()
-      ! ---------------------------------------------------------------------------------
-      call fates_hist%flush_hvars(nc,upfreq_in=group_dyna_simple)
-
-      call fates_hist%flush_hvars(nc,upfreq_in=group_dyna_complx)
-
       ! ---------------------------------------------------------------------------------
       ! Part II: Call the FATES model now that input boundary conditions have been
       ! provided.
@@ -2019,23 +2010,16 @@ subroutine restart( this, bounds_proc, ncid, flag, waterdiagnosticbulk_inst, &
                                                                 this%fates(nc)%sites, &
                                                                 this%fates(nc)%bc_out)
 
+
                ! ------------------------------------------------------------------------
-               ! Update history IO fields that depend on ecosystem dynamics
+               ! Flush FATES history variables.
+               ! The flushing process sets all columns outside of FATES perview to
+               ! the ignore value. This only needs to be done once, because FATES will
+               ! not overwright values outside the columns that it is in charge of.
                ! ------------------------------------------------------------------------
-               if(fates_history_dimlevel(2)>0) then
-                  call fates_hist%flush_hvars(nc,upfreq_in=group_dyna_simple)
-                  do s = 1,this%fates(nc)%nsites
-                     call fates_hist%zero_site_hvars(this%fates(nc)%sites(s), &
-                          upfreq_in=group_dyna_simple)
-                  end do
-                  if(fates_history_dimlevel(2)>1) then
-                     call fates_hist%flush_hvars(nc,upfreq_in=group_dyna_complx)
-                     do s = 1,this%fates(nc)%nsites
-                        call fates_hist%zero_site_hvars(this%fates(nc)%sites(s), &
-                             upfreq_in=group_dyna_complx)
-                     end do
-                  end if
-               end if
+
+               call fates_hist%flush_all_hvars(nc)    
+               
                call fates_hist%update_history_dyn( nc,                     &
                                                    this%fates(nc)%nsites,  &
                                                    this%fates(nc)%sites,   &
@@ -2220,22 +2204,15 @@ subroutine init_coldstart(this, waterstatebulk_inst, waterdiagnosticbulk_inst, &
                 soilbiogeochem_carbonflux_inst, .false.)
 
            ! ------------------------------------------------------------------------
-           ! Update history IO fields that depend on ecosystem dynamics
+           ! Flush and zero FATES history variables.
+           ! The flushing process sets all columns outside of FATES perview to
+           ! the ignore value. This only needs to be done once, because FATES will
+           ! not overwright values outside the columns that it is in charge of.
+           ! We also start off by setting all values on FATES columns to zero.
            ! ------------------------------------------------------------------------
-           if(fates_history_dimlevel(2)>0) then
-              call fates_hist%flush_hvars(nc,upfreq_in=group_dyna_simple)
-              do s = 1,this%fates(nc)%nsites
-                 call fates_hist%zero_site_hvars(this%fates(nc)%sites(s), &
-                      upfreq_in=group_dyna_simple)
-              end do
-              if(fates_history_dimlevel(2)>1) then
-                 call fates_hist%flush_hvars(nc,upfreq_in=group_dyna_complx)
-                 do s = 1,this%fates(nc)%nsites
-                    call fates_hist%zero_site_hvars(this%fates(nc)%sites(s), &
-                         upfreq_in=group_dyna_complx)
-                 end do
-              end if
-           end if
+
+           call fates_hist%flush_all_hvars(nc)
+           
            call fates_hist%update_history_dyn( nc,                     &
                 this%fates(nc)%nsites,                                  &
                 this%fates(nc)%sites,                                   &
@@ -3626,9 +3603,6 @@ subroutine wrap_hydraulics_drive(this, bounds_clump, nc, &
             this%fates(nc)%bc_out(s)%plant_stored_h2o_si
    end do
 
-
-   ! Update History Buffers that need to be updated after hydraulics calls
-
    call fates_hist%update_history_hydraulics(nc, &
          this%fates(nc)%nsites, &
          this%fates(nc)%sites, &
diff --git a/tools/site_and_regional/create_PLUMBER2_sites_csv.ncl b/tools/site_and_regional/create_PLUMBER2_sites_csv.ncl
index 2bcf9915ca..b83e3ef3a7 100644
--- a/tools/site_and_regional/create_PLUMBER2_sites_csv.ncl
+++ b/tools/site_and_regional/create_PLUMBER2_sites_csv.ncl
@@ -163,7 +163,7 @@ begin
 
   fname = "/glade/work/oleson/ctsm_PLUMBERcsv/tools/site_and_regional/PLUMBER2_sites.csv"
   header = (/"#pftX-cth and pftX-cbh are the site=specific canopy top and bottom heights", \
-             "#start_year and end_year will be used to define DATM_YR_ALIGH, DATM_YR_START and DATM_YR_END, and STOP_N in units of nyears.", \
+             "#start_year and end_year will be used to define DATM_YR_ALIGN, DATM_YR_START and DATM_YR_END, and STOP_N in units of nyears.", \
              "#RUN_STARTDATE and START_TOD are specified because we are starting at GMT corresponding to local midnight.", \
              "#ATM_NCPL is specified so that the time step of the model matches the time interval specified by the atm forcing data.", \
              ",Site,Lat,Lon,pft1,pft1-%,pft1-cth,pft1-cbh,pft2,pft2-%,pft2-cth,pft2-cbh,start_year,end_year,RUN_STARTDATE,START_TOD,ATM_NCPL"/)