ESCOMP · TeaganKing · Aug 22, 2024 · Apr 22, 2024 · Apr 22, 2024 · Apr 23, 2024
diff --git a/.gitmodules b/.gitmodules
@@ -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.47
 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/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
@@ -330,7 +330,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 +356,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 +419,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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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