diff --git a/.gitmodules b/.gitmodules
index b5156d3190..86c89a23d8 100644
--- 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.96
+fxtag = cdeps1.0.103
 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/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml
index 90f6ca000b..bcebb61387 100644
--- a/cime_config/testdefs/testlist_clm.xml
+++ b/cime_config/testdefs/testlist_clm.xml
@@ -3055,6 +3055,71 @@
     </options>
   </test>
 
+  <test name="SMS_Ly2_D_Mmpi-serial" grid="CLM_USRDAT" compset="I1PtClm60Bgc" testmods="clm/default--clm/PLUMBER2/ARSLu--clm/ADspinup_PLUMBER2">
+    <machines>
+      <machine name="derecho" compiler="gnu" category="aux_clm"/>
+      <machine name="derecho" compiler="gnu" category="aux_clm_mpi_serial"/>
+      <machine name="izumi" compiler="nag" category="aux_clm"/>
+      <machine name="izumi" compiler="nag" category="aux_clm_mpi_serial"/>
+      <machine name="izumi" compiler="nag" category="prealpha"/>
+      <machine name="izumi" compiler="nag" category="aux_cime_baselines"/>
+    </machines>
+    <options>
+      <option name="wallclock">00:20:00</option>
+      <option name="tput_tolerance">0.5</option>
+      <option name="comment">Test of PLUMBER2 site in AD mode that has one year of atm forcing (loop over twice). Note that the site usermods_dirs (AR-SLu) has been linked to ARSLu for the purpose of this test.</option>
+    </options>
+  </test>
+
+  <test name="SMS_Ly1_D_Mmpi-serial" grid="CLM_USRDAT" compset="IHist1PtClm60Bgc" testmods="clm/default--clm/PLUMBER2/ARSLu">
+    <machines>
+      <machine name="derecho" compiler="gnu" category="aux_clm"/>
+      <machine name="derecho" compiler="gnu" category="aux_clm_mpi_serial"/>
+      <machine name="izumi" compiler="nag" category="aux_clm"/>
+      <machine name="izumi" compiler="nag" category="aux_clm_mpi_serial"/>
+      <machine name="izumi" compiler="nag" category="prealpha"/>
+      <machine name="izumi" compiler="nag" category="aux_cime_baselines"/>
+    </machines>
+    <options>
+      <option name="wallclock">00:20:00</option>
+      <option name="tput_tolerance">0.5</option>
+      <option name="comment">Test of PLUMBER2 site in transient mode that has one year of atm forcing. Note that the site usermods_dirs (AR-SLu) has been linked to ARSLu for the purpose of this test.</option>
+    </options>
+  </test>
+
+  <test name="SMS_Ly1_D_Mmpi-serial" grid="CLM_USRDAT" compset="I1PtClm60Bgc" testmods="clm/default--clm/PLUMBER2/ESLgS--clm/ADspinup_PLUMBER2">
+    <machines>
+      <machine name="derecho" compiler="gnu" category="aux_clm"/>
+      <machine name="derecho" compiler="gnu" category="aux_clm_mpi_serial"/>
+      <machine name="izumi" compiler="nag" category="aux_clm"/>
+      <machine name="izumi" compiler="nag" category="aux_clm_mpi_serial"/>
+      <machine name="izumi" compiler="nag" category="prealpha"/>
+      <machine name="izumi" compiler="nag" category="aux_cime_baselines"/>
+    </machines>
+    <options>
+      <option name="wallclock">00:20:00</option>
+      <option name="tput_tolerance">0.5</option>
+      <option name="comment">Test of PLUMBER2 site in AD mode that had previously failed due to negative humidity passed to HumanIndexMod.  HumanIndexMod is now off for PLUMBER2 sites. Note that the site usermods_dirs (ES-LgS) has been linked to ESLgS for the purpose of this test.</option>
+    </options>
+  </test>
+
+
+  <test name="SMS_Ly1_D_Mmpi-serial" grid="CLM_USRDAT" compset="IHist1PtClm60Bgc" testmods="clm/default--clm/PLUMBER2/ARSLu">
+    <machines>
+      <machine name="derecho" compiler="gnu" category="aux_clm"/>
+      <machine name="derecho" compiler="gnu" category="aux_clm_mpi_serial"/>
+      <machine name="izumi" compiler="nag" category="aux_clm"/>
+      <machine name="izumi" compiler="nag" category="aux_clm_mpi_serial"/>
+      <machine name="izumi" compiler="nag" category="prealpha"/>
+      <machine name="izumi" compiler="nag" category="aux_cime_baselines"/>
+    </machines>
+    <options>
+      <option name="wallclock">00:20:00</option>
+      <option name="tput_tolerance">0.5</option>
+      <option name="comment">Test of PLUMBER2 site in transient mode that has one year of atm forcing. Note that the site usermods_dirs (AR-SLu) has been linked to ARSLu for the purpose of this test.</option>
+    </options>
+  </test>
+
   <test name="ERS_P128x1_Ld765" grid="f10_f10_mg37" compset="I2000Clm60Fates" testmods="clm/FatesColdNoComp">
     <machines>
       <!-- no izumi tests since this has a pe layout specific for derecho -->
diff --git a/cime_config/testdefs/testmods_dirs/clm/ADspinup_PLUMBER2/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/ADspinup_PLUMBER2/include_user_mods
new file mode 100644
index 0000000000..fe0e18cf88
--- /dev/null
+++ b/cime_config/testdefs/testmods_dirs/clm/ADspinup_PLUMBER2/include_user_mods
@@ -0,0 +1 @@
+../default
diff --git a/cime_config/testdefs/testmods_dirs/clm/ADspinup_PLUMBER2/shell_commands b/cime_config/testdefs/testmods_dirs/clm/ADspinup_PLUMBER2/shell_commands
new file mode 100644
index 0000000000..6cdc31648d
--- /dev/null
+++ b/cime_config/testdefs/testmods_dirs/clm/ADspinup_PLUMBER2/shell_commands
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+./xmlchange CLM_ACCELERATED_SPINUP="on"
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/AR-SLu/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/AR-SLu/shell_commands
index f297937768..89685d99bd 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/AR-SLu/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/AR-SLu/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=-33.464802
 ./xmlchange DATM_YR_END=2010
 ./xmlchange DATM_YR_START_FILENAME=2010
+./xmlchange DATM_YR_END_FILENAME=2010
 ./xmlchange START_TOD=10800
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange CALENDAR=NO_LEAP
   ./xmlchange DATM_YR_START=2010
+  ./xmlchange DATM_YR_END=2010
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange START_TOD=10800
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/ARSLu b/cime_config/usermods_dirs/clm/PLUMBER2/ARSLu
new file mode 120000
index 0000000000..165892dfa3
--- /dev/null
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/ARSLu
@@ -0,0 +1 @@
+AR-SLu
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/AT-Neu/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/AT-Neu/shell_commands
index 319c52a95d..6c4f9f2476 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/AT-Neu/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/AT-Neu/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=47.116669
 ./xmlchange DATM_YR_END=2012
 ./xmlchange DATM_YR_START_FILENAME=2002
+./xmlchange DATM_YR_END_FILENAME=2012
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=2001
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2002
+  ./xmlchange RUN_STARTDATE=2003-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2003
+  ./xmlchange DATM_YR_END=2010
+  ./xmlchange DATM_YR_ALIGN=2003
+  ./xmlchange START_TOD=82800
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/AU-ASM/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/AU-ASM/shell_commands
index afadee1c1e..29d5dcbe36 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/AU-ASM/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/AU-ASM/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=-22.283001
 ./xmlchange DATM_YR_END=2017
 ./xmlchange DATM_YR_START_FILENAME=2011
+./xmlchange DATM_YR_END_FILENAME=2017
 ./xmlchange START_TOD=54000
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=2010
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2011
+  ./xmlchange RUN_STARTDATE=2012-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2012
+  ./xmlchange DATM_YR_END=2015
+  ./xmlchange DATM_YR_ALIGN=2012
+  ./xmlchange START_TOD=54000
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/AU-Cow/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/AU-Cow/shell_commands
index 40187f1b46..bc2e6b6e86 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/AU-Cow/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/AU-Cow/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=-16.23819
 ./xmlchange DATM_YR_END=2015
 ./xmlchange DATM_YR_START_FILENAME=2010
+./xmlchange DATM_YR_END_FILENAME=2015
 ./xmlchange START_TOD=50400
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=2009
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2010
+  ./xmlchange RUN_STARTDATE=2011-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2011
+  ./xmlchange DATM_YR_END=2014
+  ./xmlchange DATM_YR_ALIGN=2011
+  ./xmlchange START_TOD=50400
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/AU-Cpr/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/AU-Cpr/shell_commands
index fc3b037ecc..a6ddfed27e 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/AU-Cpr/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/AU-Cpr/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=-34.00206
 ./xmlchange DATM_YR_END=2017
 ./xmlchange DATM_YR_START_FILENAME=2011
+./xmlchange DATM_YR_END_FILENAME=2017
 ./xmlchange START_TOD=46800
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=2010
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2011
+  ./xmlchange RUN_STARTDATE=2012-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2012
+  ./xmlchange DATM_YR_END=2015
+  ./xmlchange DATM_YR_ALIGN=2012
+  ./xmlchange START_TOD=46800
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/AU-Ctr/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/AU-Ctr/shell_commands
index 6710134c78..a501f3b3c9 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/AU-Ctr/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/AU-Ctr/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=-16.103279
 ./xmlchange DATM_YR_END=2017
 ./xmlchange DATM_YR_START_FILENAME=2010
+./xmlchange DATM_YR_END_FILENAME=2017
 ./xmlchange START_TOD=50400
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=2009
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2010
+  ./xmlchange RUN_STARTDATE=2011-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2011
+  ./xmlchange DATM_YR_END=2014
+  ./xmlchange DATM_YR_ALIGN=2011
+  ./xmlchange START_TOD=50400
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/AU-Cum/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/AU-Cum/shell_commands
index a2022818c6..f99776ff48 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/AU-Cum/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/AU-Cum/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=-33.613297
 ./xmlchange DATM_YR_END=2018
 ./xmlchange DATM_YR_START_FILENAME=2013
+./xmlchange DATM_YR_END_FILENAME=2018
 ./xmlchange START_TOD=46800
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=2012
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2013
+  ./xmlchange RUN_STARTDATE=2014-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2014
+  ./xmlchange DATM_YR_END=2017
+  ./xmlchange DATM_YR_ALIGN=2014
+  ./xmlchange START_TOD=46800
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/AU-DaP/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/AU-DaP/shell_commands
index 28b5b4b446..fdce886253 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/AU-DaP/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/AU-DaP/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=-14.0633
 ./xmlchange DATM_YR_END=2012
 ./xmlchange DATM_YR_START_FILENAME=2009
+./xmlchange DATM_YR_END_FILENAME=2012
 ./xmlchange START_TOD=54000
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange CALENDAR=NO_LEAP
   ./xmlchange DATM_YR_START=2009
+  ./xmlchange DATM_YR_END=2009
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange START_TOD=0
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/AU-DaS/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/AU-DaS/shell_commands
index 96acb7b7cf..f63ed33351 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/AU-DaS/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/AU-DaS/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=-14.159283
 ./xmlchange DATM_YR_END=2017
 ./xmlchange DATM_YR_START_FILENAME=2010
+./xmlchange DATM_YR_END_FILENAME=2017
 ./xmlchange START_TOD=54000
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=2009
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2010
+  ./xmlchange RUN_STARTDATE=2011-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2011
+  ./xmlchange DATM_YR_END=2014
+  ./xmlchange DATM_YR_ALIGN=2011
+  ./xmlchange START_TOD=54000
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/AU-Dry/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/AU-Dry/shell_commands
index da520bb88e..e620ea7883 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/AU-Dry/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/AU-Dry/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=-15.2588
 ./xmlchange DATM_YR_END=2015
 ./xmlchange DATM_YR_START_FILENAME=2011
+./xmlchange DATM_YR_END_FILENAME=2015
 ./xmlchange START_TOD=54000
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange CALENDAR=NO_LEAP
   ./xmlchange DATM_YR_START=2011
+  ./xmlchange DATM_YR_END=2011
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange START_TOD=0
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/AU-Emr/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/AU-Emr/shell_commands
index a5ccf45884..6a6c4b99e1 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/AU-Emr/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/AU-Emr/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=-23.8587
 ./xmlchange DATM_YR_END=2013
 ./xmlchange DATM_YR_START_FILENAME=2012
+./xmlchange DATM_YR_END_FILENAME=2013
 ./xmlchange START_TOD=50400
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange CALENDAR=NO_LEAP
   ./xmlchange DATM_YR_START=2012
+  ./xmlchange DATM_YR_END=2012
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange START_TOD=0
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/AU-GWW/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/AU-GWW/shell_commands
index 637c921fae..cea21efbf6 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/AU-GWW/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/AU-GWW/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=-30.191299
 ./xmlchange DATM_YR_END=2017
 ./xmlchange DATM_YR_START_FILENAME=2013
+./xmlchange DATM_YR_END_FILENAME=2017
 ./xmlchange START_TOD=57600
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange CALENDAR=NO_LEAP
   ./xmlchange DATM_YR_START=2013
+  ./xmlchange DATM_YR_END=2013
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange START_TOD=0
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/AU-Gin/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/AU-Gin/shell_commands
index e02f3482ed..a497309c86 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/AU-Gin/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/AU-Gin/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=-31.375
 ./xmlchange DATM_YR_END=2017
 ./xmlchange DATM_YR_START_FILENAME=2012
+./xmlchange DATM_YR_END_FILENAME=2017
 ./xmlchange START_TOD=57600
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=2011
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2012
+  ./xmlchange RUN_STARTDATE=2013-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2013
+  ./xmlchange DATM_YR_END=2016
+  ./xmlchange DATM_YR_ALIGN=2013
+  ./xmlchange START_TOD=57600
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/AU-How/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/AU-How/shell_commands
index 448f24cc4f..01297be00f 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/AU-How/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/AU-How/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=-12.4952
 ./xmlchange DATM_YR_END=2017
 ./xmlchange DATM_YR_START_FILENAME=2003
+./xmlchange DATM_YR_END_FILENAME=2017
 ./xmlchange START_TOD=54000
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=2002
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2003
+  ./xmlchange RUN_STARTDATE=2004-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2004
+  ./xmlchange DATM_YR_END=2015
+  ./xmlchange DATM_YR_ALIGN=2004
+  ./xmlchange START_TOD=54000
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/AU-Lit/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/AU-Lit/shell_commands
index 6e69bbc5d2..e2765f284c 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/AU-Lit/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/AU-Lit/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=-13.17904
 ./xmlchange DATM_YR_END=2017
 ./xmlchange DATM_YR_START_FILENAME=2016
+./xmlchange DATM_YR_END_FILENAME=2017
 ./xmlchange START_TOD=54000
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange CALENDAR=NO_LEAP
   ./xmlchange DATM_YR_START=2016
+  ./xmlchange DATM_YR_END=2016
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange START_TOD=0
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/AU-Otw/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/AU-Otw/shell_commands
index c3962c1b33..6a09237f5e 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/AU-Otw/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/AU-Otw/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=-38.532341
 ./xmlchange DATM_YR_END=2010
 ./xmlchange DATM_YR_START_FILENAME=2009
+./xmlchange DATM_YR_END_FILENAME=2010
 ./xmlchange START_TOD=46800
 ./xmlchange ATM_NCPL=24
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange CALENDAR=NO_LEAP
   ./xmlchange DATM_YR_START=2009
+  ./xmlchange DATM_YR_END=2009
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange START_TOD=0
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/AU-Rig/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/AU-Rig/shell_commands
index fc5ecba950..eb528c850d 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/AU-Rig/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/AU-Rig/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=-36.649899
 ./xmlchange DATM_YR_END=2016
 ./xmlchange DATM_YR_START_FILENAME=2011
+./xmlchange DATM_YR_END_FILENAME=2016
 ./xmlchange START_TOD=46800
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=2010
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2011
+  ./xmlchange RUN_STARTDATE=2012-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2012
+  ./xmlchange DATM_YR_END=2015
+  ./xmlchange DATM_YR_ALIGN=2012
+  ./xmlchange START_TOD=46800
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/AU-Rob/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/AU-Rob/shell_commands
index 6e640a50fa..2fa6e43915 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/AU-Rob/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/AU-Rob/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=-17.1175
 ./xmlchange DATM_YR_END=2017
 ./xmlchange DATM_YR_START_FILENAME=2014
+./xmlchange DATM_YR_END_FILENAME=2017
 ./xmlchange START_TOD=50400
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange CALENDAR=NO_LEAP
   ./xmlchange DATM_YR_START=2014
+  ./xmlchange DATM_YR_END=2014
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange START_TOD=0
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/AU-Sam/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/AU-Sam/shell_commands
index 1f48d3060f..de3565defc 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/AU-Sam/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/AU-Sam/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=-27.3881
 ./xmlchange DATM_YR_END=2017
 ./xmlchange DATM_YR_START_FILENAME=2011
+./xmlchange DATM_YR_END_FILENAME=2017
 ./xmlchange START_TOD=50400
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=2010
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2011
+  ./xmlchange RUN_STARTDATE=2012-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2012
+  ./xmlchange DATM_YR_END=2015
+  ./xmlchange DATM_YR_ALIGN=2012
+  ./xmlchange START_TOD=50400
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/AU-Stp/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/AU-Stp/shell_commands
index 949257e09f..9c14247a6e 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/AU-Stp/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/AU-Stp/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=-17.1507
 ./xmlchange DATM_YR_END=2017
 ./xmlchange DATM_YR_START_FILENAME=2010
+./xmlchange DATM_YR_END_FILENAME=2017
 ./xmlchange START_TOD=54000
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=2009
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2010
+  ./xmlchange RUN_STARTDATE=2011-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2011
+  ./xmlchange DATM_YR_END=2014
+  ./xmlchange DATM_YR_ALIGN=2011
+  ./xmlchange START_TOD=54000
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/AU-TTE/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/AU-TTE/shell_commands
index ca7b84c598..67b076a154 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/AU-TTE/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/AU-TTE/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=-22.287001
 ./xmlchange DATM_YR_END=2017
 ./xmlchange DATM_YR_START_FILENAME=2013
+./xmlchange DATM_YR_END_FILENAME=2017
 ./xmlchange START_TOD=54000
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange CALENDAR=NO_LEAP
   ./xmlchange DATM_YR_START=2013
+  ./xmlchange DATM_YR_END=2013
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange START_TOD=0
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/AU-Tum/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/AU-Tum/shell_commands
index 5ad2d9dce2..0970349851 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/AU-Tum/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/AU-Tum/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=-35.656601
 ./xmlchange DATM_YR_END=2017
 ./xmlchange DATM_YR_START_FILENAME=2002
+./xmlchange DATM_YR_END_FILENAME=2017
 ./xmlchange START_TOD=46800
 ./xmlchange ATM_NCPL=24
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=2001
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2002
+  ./xmlchange RUN_STARTDATE=2003-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2003
+  ./xmlchange DATM_YR_END=2014
+  ./xmlchange DATM_YR_ALIGN=2003
+  ./xmlchange START_TOD=46800
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/AU-Whr/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/AU-Whr/shell_commands
index 250e8f049e..0358b99264 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/AU-Whr/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/AU-Whr/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=-36.673199
 ./xmlchange DATM_YR_END=2016
 ./xmlchange DATM_YR_START_FILENAME=2015
+./xmlchange DATM_YR_END_FILENAME=2016
 ./xmlchange START_TOD=46800
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange CALENDAR=NO_LEAP
   ./xmlchange DATM_YR_START=2015
+  ./xmlchange DATM_YR_END=2015
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange START_TOD=0
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/AU-Wrr/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/AU-Wrr/shell_commands
index c96c57a93f..918b69ef36 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/AU-Wrr/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/AU-Wrr/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=-43.09502
 ./xmlchange DATM_YR_END=2017
 ./xmlchange DATM_YR_START_FILENAME=2016
+./xmlchange DATM_YR_END_FILENAME=2017
 ./xmlchange START_TOD=46800
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange CALENDAR=NO_LEAP
   ./xmlchange DATM_YR_START=2016
+  ./xmlchange DATM_YR_END=2016
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange START_TOD=0
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/AU-Ync/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/AU-Ync/shell_commands
index cc5b8909d7..f181c484e2 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/AU-Ync/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/AU-Ync/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=-34.9893
 ./xmlchange DATM_YR_END=2017
 ./xmlchange DATM_YR_START_FILENAME=2011
+./xmlchange DATM_YR_END_FILENAME=2017
 ./xmlchange START_TOD=46800
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=2010
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2011
+  ./xmlchange RUN_STARTDATE=2012-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2012
+  ./xmlchange DATM_YR_END=2015
+  ./xmlchange DATM_YR_ALIGN=2012
+  ./xmlchange START_TOD=46800
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/BE-Bra/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/BE-Bra/shell_commands
index 93bf56051e..4a8bca7a84 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/BE-Bra/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/BE-Bra/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=51.309166
 ./xmlchange DATM_YR_END=2014
 ./xmlchange DATM_YR_START_FILENAME=2004
+./xmlchange DATM_YR_END_FILENAME=2014
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=2003
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2004
+  ./xmlchange RUN_STARTDATE=2005-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2005
+  ./xmlchange DATM_YR_END=2012
+  ./xmlchange DATM_YR_ALIGN=2005
+  ./xmlchange START_TOD=82800
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/BE-Lon/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/BE-Lon/shell_commands
index 597961e426..7a667f0177 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/BE-Lon/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/BE-Lon/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=50.55159
 ./xmlchange DATM_YR_END=2014
 ./xmlchange DATM_YR_START_FILENAME=2005
+./xmlchange DATM_YR_END_FILENAME=2014
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=2004
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2005
+  ./xmlchange RUN_STARTDATE=2006-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2006
+  ./xmlchange DATM_YR_END=2013
+  ./xmlchange DATM_YR_ALIGN=2006
+  ./xmlchange START_TOD=82800
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/BE-Vie/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/BE-Vie/shell_commands
index 2a97262b87..4dff721e77 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/BE-Vie/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/BE-Vie/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=50.305069
 ./xmlchange DATM_YR_END=2014
 ./xmlchange DATM_YR_START_FILENAME=1997
+./xmlchange DATM_YR_END_FILENAME=2014
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=1996
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=1997
+  ./xmlchange RUN_STARTDATE=1998-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=1998
+  ./xmlchange DATM_YR_END=2013
+  ./xmlchange DATM_YR_ALIGN=1998
+  ./xmlchange START_TOD=82800
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/BR-Sa3/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/BR-Sa3/shell_commands
index ec8d9bc33a..531183cb64 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/BR-Sa3/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/BR-Sa3/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=-3.018029
 ./xmlchange DATM_YR_END=2003
 ./xmlchange DATM_YR_START_FILENAME=2001
+./xmlchange DATM_YR_END_FILENAME=2003
 ./xmlchange START_TOD=14400
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2002
+  ./xmlchange DATM_YR_END=2002
   ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2001
+  ./xmlchange START_TOD=14400
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/BW-Ma1/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/BW-Ma1/shell_commands
index 64af7dc90f..1e46436c9a 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/BW-Ma1/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/BW-Ma1/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=-19.9165
 ./xmlchange DATM_YR_END=2000
 ./xmlchange DATM_YR_START_FILENAME=2000
+./xmlchange DATM_YR_END_FILENAME=2000
 ./xmlchange START_TOD=79200
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange CALENDAR=NO_LEAP
   ./xmlchange DATM_YR_START=2000
+  ./xmlchange DATM_YR_END=2000
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange START_TOD=79200
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/CA-NS1/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/CA-NS1/shell_commands
index 9b4f8d74ec..7acbf1384b 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/CA-NS1/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/CA-NS1/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=55.8792
 ./xmlchange DATM_YR_END=2003
 ./xmlchange DATM_YR_START_FILENAME=2003
+./xmlchange DATM_YR_END_FILENAME=2003
 ./xmlchange START_TOD=21600
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange CALENDAR=NO_LEAP
   ./xmlchange DATM_YR_START=2003
+  ./xmlchange DATM_YR_END=2003
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange START_TOD=21600
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/CA-NS2/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/CA-NS2/shell_commands
index 5563971afc..83469efd18 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/CA-NS2/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/CA-NS2/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=55.9058
 ./xmlchange DATM_YR_END=2004
 ./xmlchange DATM_YR_START_FILENAME=2002
+./xmlchange DATM_YR_END_FILENAME=2004
 ./xmlchange START_TOD=21600
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2003
+  ./xmlchange DATM_YR_END=2003
   ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2002
+  ./xmlchange START_TOD=21600
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/CA-NS4/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/CA-NS4/shell_commands
index d6ddd551af..29ee996466 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/CA-NS4/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/CA-NS4/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=55.914398
 ./xmlchange DATM_YR_END=2004
 ./xmlchange DATM_YR_START_FILENAME=2003
+./xmlchange DATM_YR_END_FILENAME=2004
 ./xmlchange START_TOD=21600
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2004
+  ./xmlchange DATM_YR_END=2004
   ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2003
+  ./xmlchange START_TOD=21600
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/CA-NS5/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/CA-NS5/shell_commands
index 49a320a37d..ee81db97b8 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/CA-NS5/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/CA-NS5/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=55.863098
 ./xmlchange DATM_YR_END=2004
 ./xmlchange DATM_YR_START_FILENAME=2003
+./xmlchange DATM_YR_END_FILENAME=2004
 ./xmlchange START_TOD=21600
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2004
+  ./xmlchange DATM_YR_END=2004
   ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2003
+  ./xmlchange START_TOD=21600
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/CA-NS6/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/CA-NS6/shell_commands
index c5097e87ec..7e55e3dba7 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/CA-NS6/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/CA-NS6/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=55.916698
 ./xmlchange DATM_YR_END=2004
 ./xmlchange DATM_YR_START_FILENAME=2002
+./xmlchange DATM_YR_END_FILENAME=2004
 ./xmlchange START_TOD=21600
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2003
+  ./xmlchange DATM_YR_END=2003
   ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2002
+  ./xmlchange START_TOD=21600
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/CA-NS7/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/CA-NS7/shell_commands
index 583c102ae0..50bcaba014 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/CA-NS7/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/CA-NS7/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=56.635799
 ./xmlchange DATM_YR_END=2004
 ./xmlchange DATM_YR_START_FILENAME=2003
+./xmlchange DATM_YR_END_FILENAME=2004
 ./xmlchange START_TOD=21600
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2004
+  ./xmlchange DATM_YR_END=2004
   ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2003
+  ./xmlchange START_TOD=21600
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/CA-Qcu/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/CA-Qcu/shell_commands
index 892029da56..e392e8cb41 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/CA-Qcu/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/CA-Qcu/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=49.267078
 ./xmlchange DATM_YR_END=2006
 ./xmlchange DATM_YR_START_FILENAME=2002
+./xmlchange DATM_YR_END_FILENAME=2006
 ./xmlchange START_TOD=18000
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2003
+  ./xmlchange DATM_YR_END=2003
   ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2002
+  ./xmlchange START_TOD=18000
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/CA-Qfo/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/CA-Qfo/shell_commands
index 3f61fbd901..93651aec5c 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/CA-Qfo/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/CA-Qfo/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=49.692501
 ./xmlchange DATM_YR_END=2010
 ./xmlchange DATM_YR_START_FILENAME=2004
+./xmlchange DATM_YR_END_FILENAME=2010
 ./xmlchange START_TOD=18000
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=2004
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2004
+  ./xmlchange RUN_STARTDATE=2005-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2005
+  ./xmlchange DATM_YR_END=2008
+  ./xmlchange DATM_YR_ALIGN=2005
+  ./xmlchange START_TOD=18000
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/CA-SF1/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/CA-SF1/shell_commands
index 49de04986c..fda2a41f39 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/CA-SF1/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/CA-SF1/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=54.485001
 ./xmlchange DATM_YR_END=2006
 ./xmlchange DATM_YR_START_FILENAME=2004
+./xmlchange DATM_YR_END_FILENAME=2006
 ./xmlchange START_TOD=21600
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2005
+  ./xmlchange DATM_YR_END=2005
   ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2004
+  ./xmlchange START_TOD=21600
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/CA-SF2/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/CA-SF2/shell_commands
index 5cc0da8be1..bb54085168 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/CA-SF2/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/CA-SF2/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=54.253899
 ./xmlchange DATM_YR_END=2005
 ./xmlchange DATM_YR_START_FILENAME=2003
+./xmlchange DATM_YR_END_FILENAME=2005
 ./xmlchange START_TOD=21600
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2004
+  ./xmlchange DATM_YR_END=2004
   ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2003
+  ./xmlchange START_TOD=21600
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/CA-SF3/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/CA-SF3/shell_commands
index 3f94c02ca9..4209da06ab 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/CA-SF3/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/CA-SF3/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=54.091599
 ./xmlchange DATM_YR_END=2005
 ./xmlchange DATM_YR_START_FILENAME=2003
+./xmlchange DATM_YR_END_FILENAME=2005
 ./xmlchange START_TOD=21600
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2004
+  ./xmlchange DATM_YR_END=2004
   ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2003
+  ./xmlchange START_TOD=21600
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/CH-Cha/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/CH-Cha/shell_commands
index ca0ad87518..157130c294 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/CH-Cha/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/CH-Cha/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=47.21022
 ./xmlchange DATM_YR_END=2014
 ./xmlchange DATM_YR_START_FILENAME=2006
+./xmlchange DATM_YR_END_FILENAME=2014
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=2005
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2006
+  ./xmlchange RUN_STARTDATE=2007-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2007
+  ./xmlchange DATM_YR_END=2010
+  ./xmlchange DATM_YR_ALIGN=2007
+  ./xmlchange START_TOD=82800
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/CH-Dav/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/CH-Dav/shell_commands
index 254c30865a..032655e226 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/CH-Dav/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/CH-Dav/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=46.815334
 ./xmlchange DATM_YR_END=2014
 ./xmlchange DATM_YR_START_FILENAME=1997
+./xmlchange DATM_YR_END_FILENAME=2014
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=1996
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=1997
+  ./xmlchange RUN_STARTDATE=1998-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=1998
+  ./xmlchange DATM_YR_END=2013
+  ./xmlchange DATM_YR_ALIGN=1998
+  ./xmlchange START_TOD=82800
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/CH-Fru/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/CH-Fru/shell_commands
index 617ed84d7c..468b920aac 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/CH-Fru/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/CH-Fru/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=47.115833
 ./xmlchange DATM_YR_END=2014
 ./xmlchange DATM_YR_START_FILENAME=2007
+./xmlchange DATM_YR_END_FILENAME=2014
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=2006
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2007
+  ./xmlchange RUN_STARTDATE=2008-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2008
+  ./xmlchange DATM_YR_END=2011
+  ./xmlchange DATM_YR_ALIGN=2008
+  ./xmlchange START_TOD=82800
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/CH-Oe1/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/CH-Oe1/shell_commands
index 6fb4f3a844..ca8fbc9dc8 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/CH-Oe1/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/CH-Oe1/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=47.285831
 ./xmlchange DATM_YR_END=2008
 ./xmlchange DATM_YR_START_FILENAME=2002
+./xmlchange DATM_YR_END_FILENAME=2008
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=2001
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2002
+  ./xmlchange RUN_STARTDATE=2003-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2003
+  ./xmlchange DATM_YR_END=2006
+  ./xmlchange DATM_YR_ALIGN=2003
+  ./xmlchange START_TOD=82800
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/CN-Cha/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/CN-Cha/shell_commands
index f6da50bde1..220b6780de 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/CN-Cha/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/CN-Cha/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=42.4025
 ./xmlchange DATM_YR_END=2005
 ./xmlchange DATM_YR_START_FILENAME=2003
+./xmlchange DATM_YR_END_FILENAME=2005
 ./xmlchange START_TOD=57600
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange CALENDAR=NO_LEAP
   ./xmlchange DATM_YR_START=2003
+  ./xmlchange DATM_YR_END=2003
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange START_TOD=0
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/CN-Cng/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/CN-Cng/shell_commands
index 648c844408..f77049a329 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/CN-Cng/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/CN-Cng/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=44.593399
 ./xmlchange DATM_YR_END=2009
 ./xmlchange DATM_YR_START_FILENAME=2008
+./xmlchange DATM_YR_END_FILENAME=2009
 ./xmlchange START_TOD=57600
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange CALENDAR=NO_LEAP
   ./xmlchange DATM_YR_START=2008
+  ./xmlchange DATM_YR_END=2008
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange START_TOD=0
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/CN-Dan/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/CN-Dan/shell_commands
index 9616c9d792..3a812514fb 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/CN-Dan/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/CN-Dan/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=30.497801
 ./xmlchange DATM_YR_END=2005
 ./xmlchange DATM_YR_START_FILENAME=2004
+./xmlchange DATM_YR_END_FILENAME=2005
 ./xmlchange START_TOD=57600
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange CALENDAR=NO_LEAP
   ./xmlchange DATM_YR_START=2004
+  ./xmlchange DATM_YR_END=2004
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange START_TOD=0
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/CN-Din/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/CN-Din/shell_commands
index c30e651178..7143a2c974 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/CN-Din/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/CN-Din/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=23.1733
 ./xmlchange DATM_YR_END=2005
 ./xmlchange DATM_YR_START_FILENAME=2003
+./xmlchange DATM_YR_END_FILENAME=2005
 ./xmlchange START_TOD=57600
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange CALENDAR=NO_LEAP
   ./xmlchange DATM_YR_START=2003
+  ./xmlchange DATM_YR_END=2003
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange START_TOD=0
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/CN-Du2/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/CN-Du2/shell_commands
index d46dec7f7d..1efb348d74 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/CN-Du2/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/CN-Du2/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=42.0467
 ./xmlchange DATM_YR_END=2008
 ./xmlchange DATM_YR_START_FILENAME=2007
+./xmlchange DATM_YR_END_FILENAME=2008
 ./xmlchange START_TOD=57600
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange CALENDAR=NO_LEAP
   ./xmlchange DATM_YR_START=2007
+  ./xmlchange DATM_YR_END=2007
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange START_TOD=0
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/CN-HaM/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/CN-HaM/shell_commands
index 91d489b75b..1aef4f257f 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/CN-HaM/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/CN-HaM/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=37.369999
 ./xmlchange DATM_YR_END=2003
 ./xmlchange DATM_YR_START_FILENAME=2002
+./xmlchange DATM_YR_END_FILENAME=2003
 ./xmlchange START_TOD=57600
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange CALENDAR=NO_LEAP
   ./xmlchange DATM_YR_START=2002
+  ./xmlchange DATM_YR_END=2002
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange START_TOD=0
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/CN-Qia/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/CN-Qia/shell_commands
index 484175aa93..81363ba509 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/CN-Qia/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/CN-Qia/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=26.7414
 ./xmlchange DATM_YR_END=2005
 ./xmlchange DATM_YR_START_FILENAME=2003
+./xmlchange DATM_YR_END_FILENAME=2005
 ./xmlchange START_TOD=57600
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange CALENDAR=NO_LEAP
   ./xmlchange DATM_YR_START=2003
+  ./xmlchange DATM_YR_END=2003
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange START_TOD=0
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/CZ-wet/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/CZ-wet/shell_commands
index 7c753c4183..4c11c50303 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/CZ-wet/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/CZ-wet/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=49.024651
 ./xmlchange DATM_YR_END=2014
 ./xmlchange DATM_YR_START_FILENAME=2007
+./xmlchange DATM_YR_END_FILENAME=2014
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=2006
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2007
+  ./xmlchange RUN_STARTDATE=2008-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2008
+  ./xmlchange DATM_YR_END=2011
+  ./xmlchange DATM_YR_ALIGN=2008
+  ./xmlchange START_TOD=82800
 fi 
 
 # Turn on LAI streams for a SP case 
@@ -54,6 +58,3 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
   fi 
 fi 
 
-
-# set baseflow scalar to zero for wetland site 
-echo "baseflow_scalar = 0" >> user_nl_clm
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/DE-Bay/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/DE-Bay/shell_commands
index 55c14aac5f..1b1e4c7262 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/DE-Bay/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/DE-Bay/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=50.141941
 ./xmlchange DATM_YR_END=1999
 ./xmlchange DATM_YR_START_FILENAME=1997
+./xmlchange DATM_YR_END_FILENAME=1999
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange CALENDAR=NO_LEAP
   ./xmlchange DATM_YR_START=1997
+  ./xmlchange DATM_YR_END=1997
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange START_TOD=0
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/DE-Geb/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/DE-Geb/shell_commands
index d57138be71..9cd66f1c4e 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/DE-Geb/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/DE-Geb/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=51.100101
 ./xmlchange DATM_YR_END=2014
 ./xmlchange DATM_YR_START_FILENAME=2001
+./xmlchange DATM_YR_END_FILENAME=2014
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=2000
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2001
+  ./xmlchange RUN_STARTDATE=2002-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2002
+  ./xmlchange DATM_YR_END=2013
+  ./xmlchange DATM_YR_ALIGN=2002
+  ./xmlchange START_TOD=82800
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/DE-Gri/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/DE-Gri/shell_commands
index 5a27ee5e20..aadd653bc3 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/DE-Gri/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/DE-Gri/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=50.949471
 ./xmlchange DATM_YR_END=2014
 ./xmlchange DATM_YR_START_FILENAME=2004
+./xmlchange DATM_YR_END_FILENAME=2014
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=2003
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2004
+  ./xmlchange RUN_STARTDATE=2005-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2005
+  ./xmlchange DATM_YR_END=2012
+  ./xmlchange DATM_YR_ALIGN=2005
+  ./xmlchange START_TOD=82800
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/DE-Hai/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/DE-Hai/shell_commands
index 55124b7900..1e09e267ce 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/DE-Hai/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/DE-Hai/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=51.079166
 ./xmlchange DATM_YR_END=2012
 ./xmlchange DATM_YR_START_FILENAME=2000
+./xmlchange DATM_YR_END_FILENAME=2012
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=1999
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2000
+  ./xmlchange RUN_STARTDATE=2001-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2001
+  ./xmlchange DATM_YR_END=2008
+  ./xmlchange DATM_YR_ALIGN=2001
+  ./xmlchange START_TOD=82800
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/DE-Kli/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/DE-Kli/shell_commands
index 860b100586..08c2e5fe04 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/DE-Kli/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/DE-Kli/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=50.893059
 ./xmlchange DATM_YR_END=2014
 ./xmlchange DATM_YR_START_FILENAME=2005
+./xmlchange DATM_YR_END_FILENAME=2014
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=2004
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2005
+  ./xmlchange RUN_STARTDATE=2006-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2006
+  ./xmlchange DATM_YR_END=2013
+  ./xmlchange DATM_YR_ALIGN=2006
+  ./xmlchange START_TOD=82800
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/DE-Meh/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/DE-Meh/shell_commands
index b94a90e206..a74715dc77 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/DE-Meh/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/DE-Meh/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=51.275311
 ./xmlchange DATM_YR_END=2006
 ./xmlchange DATM_YR_START_FILENAME=2004
+./xmlchange DATM_YR_END_FILENAME=2006
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange CALENDAR=NO_LEAP
   ./xmlchange DATM_YR_START=2004
+  ./xmlchange DATM_YR_END=2004
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange START_TOD=0
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/DE-Obe/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/DE-Obe/shell_commands
index e633f65987..09a79e81e3 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/DE-Obe/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/DE-Obe/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=50.786659
 ./xmlchange DATM_YR_END=2014
 ./xmlchange DATM_YR_START_FILENAME=2008
+./xmlchange DATM_YR_END_FILENAME=2014
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=2007
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2008
+  ./xmlchange RUN_STARTDATE=2009-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2009
+  ./xmlchange DATM_YR_END=2012
+  ./xmlchange DATM_YR_ALIGN=2009
+  ./xmlchange START_TOD=82800
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/DE-Seh/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/DE-Seh/shell_commands
index c6808b0bf1..e8c366cc92 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/DE-Seh/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/DE-Seh/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=50.870625
 ./xmlchange DATM_YR_END=2010
 ./xmlchange DATM_YR_START_FILENAME=2008
+./xmlchange DATM_YR_END_FILENAME=2010
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange CALENDAR=NO_LEAP
   ./xmlchange DATM_YR_START=2008
+  ./xmlchange DATM_YR_END=2008
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange START_TOD=0
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/DE-SfN/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/DE-SfN/shell_commands
index 639a2c5195..126911dfdb 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/DE-SfN/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/DE-SfN/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=47.806389
 ./xmlchange DATM_YR_END=2014
 ./xmlchange DATM_YR_START_FILENAME=2013
+./xmlchange DATM_YR_END_FILENAME=2014
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange CALENDAR=NO_LEAP
   ./xmlchange DATM_YR_START=2013
+  ./xmlchange DATM_YR_END=2013
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange START_TOD=0
 fi 
 
 # Turn on LAI streams for a SP case 
@@ -54,6 +58,3 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
   fi 
 fi 
 
-
-# set baseflow scalar to zero for wetland site 
-echo "baseflow_scalar = 0" >> user_nl_clm
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/DE-Tha/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/DE-Tha/shell_commands
index 66055b2ee2..a8d05118df 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/DE-Tha/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/DE-Tha/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=50.963612
 ./xmlchange DATM_YR_END=2014
 ./xmlchange DATM_YR_START_FILENAME=1998
+./xmlchange DATM_YR_END_FILENAME=2014
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=1997
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=1998
+  ./xmlchange RUN_STARTDATE=1999-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=1999
+  ./xmlchange DATM_YR_END=2010
+  ./xmlchange DATM_YR_ALIGN=1999
+  ./xmlchange START_TOD=82800
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/DE-Wet/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/DE-Wet/shell_commands
index de0ad17a95..addf0ac3b8 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/DE-Wet/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/DE-Wet/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=50.453499
 ./xmlchange DATM_YR_END=2006
 ./xmlchange DATM_YR_START_FILENAME=2002
+./xmlchange DATM_YR_END_FILENAME=2006
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange CALENDAR=NO_LEAP
   ./xmlchange DATM_YR_START=2002
+  ./xmlchange DATM_YR_END=2002
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange START_TOD=0
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/DK-Fou/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/DK-Fou/shell_commands
index 581fd31324..c839dc9490 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/DK-Fou/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/DK-Fou/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=56.4842
 ./xmlchange DATM_YR_END=2005
 ./xmlchange DATM_YR_START_FILENAME=2005
+./xmlchange DATM_YR_END_FILENAME=2005
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange CALENDAR=NO_LEAP
   ./xmlchange DATM_YR_START=2005
+  ./xmlchange DATM_YR_END=2005
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange START_TOD=82800
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/DK-Lva/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/DK-Lva/shell_commands
index b1a1955519..ee2ad29fed 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/DK-Lva/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/DK-Lva/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=55.6833
 ./xmlchange DATM_YR_END=2006
 ./xmlchange DATM_YR_START_FILENAME=2005
+./xmlchange DATM_YR_END_FILENAME=2006
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange CALENDAR=NO_LEAP
   ./xmlchange DATM_YR_START=2005
+  ./xmlchange DATM_YR_END=2005
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange START_TOD=0
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/DK-Ris/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/DK-Ris/shell_commands
index 86fcb0ba10..43d210f5cd 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/DK-Ris/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/DK-Ris/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=55.530281
 ./xmlchange DATM_YR_END=2005
 ./xmlchange DATM_YR_START_FILENAME=2004
+./xmlchange DATM_YR_END_FILENAME=2005
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange CALENDAR=NO_LEAP
   ./xmlchange DATM_YR_START=2004
+  ./xmlchange DATM_YR_END=2004
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange START_TOD=0
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/DK-Sor/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/DK-Sor/shell_commands
index 046e9559d2..a0859ac670 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/DK-Sor/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/DK-Sor/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=55.48587
 ./xmlchange DATM_YR_END=2014
 ./xmlchange DATM_YR_START_FILENAME=1997
+./xmlchange DATM_YR_END_FILENAME=2014
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=1996
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=1997
+  ./xmlchange RUN_STARTDATE=1998-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=1998
+  ./xmlchange DATM_YR_END=2013
+  ./xmlchange DATM_YR_ALIGN=1998
+  ./xmlchange START_TOD=82800
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/DK-ZaH/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/DK-ZaH/shell_commands
index 234c5e8ba7..64cf9e7c6c 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/DK-ZaH/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/DK-ZaH/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=74.473282
 ./xmlchange DATM_YR_END=2013
 ./xmlchange DATM_YR_START_FILENAME=2000
+./xmlchange DATM_YR_END_FILENAME=2013
 ./xmlchange START_TOD=0
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=2000
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2000
+  ./xmlchange RUN_STARTDATE=2001-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2001
+  ./xmlchange DATM_YR_END=2012
+  ./xmlchange DATM_YR_ALIGN=2001
+  ./xmlchange START_TOD=0
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/ES-ES1/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/ES-ES1/shell_commands
index 9947bb0014..e31c5c1d46 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/ES-ES1/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/ES-ES1/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=39.34597
 ./xmlchange DATM_YR_END=2006
 ./xmlchange DATM_YR_START_FILENAME=1999
+./xmlchange DATM_YR_END_FILENAME=2006
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=1998
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=1999
+  ./xmlchange RUN_STARTDATE=2000-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2000
+  ./xmlchange DATM_YR_END=2003
+  ./xmlchange DATM_YR_ALIGN=2000
+  ./xmlchange START_TOD=82800
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/ES-ES2/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/ES-ES2/shell_commands
index 235ddfbb32..d9c204d54f 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/ES-ES2/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/ES-ES2/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=39.275558
 ./xmlchange DATM_YR_END=2006
 ./xmlchange DATM_YR_START_FILENAME=2005
+./xmlchange DATM_YR_END_FILENAME=2006
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange CALENDAR=NO_LEAP
   ./xmlchange DATM_YR_START=2005
+  ./xmlchange DATM_YR_END=2005
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange START_TOD=0
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/ES-LMa/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/ES-LMa/shell_commands
index c0c83dbbd2..6df022b041 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/ES-LMa/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/ES-LMa/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=39.941502
 ./xmlchange DATM_YR_END=2006
 ./xmlchange DATM_YR_START_FILENAME=2004
+./xmlchange DATM_YR_END_FILENAME=2006
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange CALENDAR=NO_LEAP
   ./xmlchange DATM_YR_START=2004
+  ./xmlchange DATM_YR_END=2004
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange START_TOD=0
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/ES-LgS/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/ES-LgS/shell_commands
index 454de1a378..6694d56784 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/ES-LgS/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/ES-LgS/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=37.097935
 ./xmlchange DATM_YR_END=2007
 ./xmlchange DATM_YR_START_FILENAME=2007
+./xmlchange DATM_YR_END_FILENAME=2007
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange CALENDAR=NO_LEAP
   ./xmlchange DATM_YR_START=2007
+  ./xmlchange DATM_YR_END=2007
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange START_TOD=82800
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/ES-VDA/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/ES-VDA/shell_commands
index 0de3a761a7..c438e3930b 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/ES-VDA/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/ES-VDA/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=42.15218
 ./xmlchange DATM_YR_END=2004
 ./xmlchange DATM_YR_START_FILENAME=2004
+./xmlchange DATM_YR_END_FILENAME=2004
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange CALENDAR=NO_LEAP
   ./xmlchange DATM_YR_START=2004
+  ./xmlchange DATM_YR_END=2004
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange START_TOD=82800
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/ESLgS b/cime_config/usermods_dirs/clm/PLUMBER2/ESLgS
new file mode 120000
index 0000000000..12ddb7200f
--- /dev/null
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/ESLgS
@@ -0,0 +1 @@
+ES-LgS
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/FI-Hyy/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/FI-Hyy/shell_commands
index 1861c4a0b6..0e5814c88e 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/FI-Hyy/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/FI-Hyy/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=61.8475
 ./xmlchange DATM_YR_END=2014
 ./xmlchange DATM_YR_START_FILENAME=1996
+./xmlchange DATM_YR_END_FILENAME=2014
 ./xmlchange START_TOD=79200
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=1995
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=1996
+  ./xmlchange RUN_STARTDATE=1997-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=1997
+  ./xmlchange DATM_YR_END=2012
+  ./xmlchange DATM_YR_ALIGN=1997
+  ./xmlchange START_TOD=79200
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/FI-Kaa/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/FI-Kaa/shell_commands
index 9f7b8a0763..f7339e319d 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/FI-Kaa/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/FI-Kaa/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=69.140694
 ./xmlchange DATM_YR_END=2002
 ./xmlchange DATM_YR_START_FILENAME=2000
+./xmlchange DATM_YR_END_FILENAME=2002
 ./xmlchange START_TOD=79200
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange CALENDAR=NO_LEAP
   ./xmlchange DATM_YR_START=2000
+  ./xmlchange DATM_YR_END=2000
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange START_TOD=0
 fi 
 
 # Turn on LAI streams for a SP case 
@@ -54,6 +58,3 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
   fi 
 fi 
 
-
-# set baseflow scalar to zero for wetland site 
-echo "baseflow_scalar = 0" >> user_nl_clm
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/FI-Lom/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/FI-Lom/shell_commands
index 14c28c1475..3563a801ea 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/FI-Lom/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/FI-Lom/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=67.9972
 ./xmlchange DATM_YR_END=2009
 ./xmlchange DATM_YR_START_FILENAME=2007
+./xmlchange DATM_YR_END_FILENAME=2009
 ./xmlchange START_TOD=79200
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange CALENDAR=NO_LEAP
   ./xmlchange DATM_YR_START=2007
+  ./xmlchange DATM_YR_END=2007
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange START_TOD=0
 fi 
 
 # Turn on LAI streams for a SP case 
@@ -54,6 +58,3 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
   fi 
 fi 
 
-
-# set baseflow scalar to zero for wetland site 
-echo "baseflow_scalar = 0" >> user_nl_clm
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/FI-Sod/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/FI-Sod/shell_commands
index 7eccb754fb..bd64e4fef4 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/FI-Sod/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/FI-Sod/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=67.361862
 ./xmlchange DATM_YR_END=2014
 ./xmlchange DATM_YR_START_FILENAME=2008
+./xmlchange DATM_YR_END_FILENAME=2014
 ./xmlchange START_TOD=79200
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=2007
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2008
+  ./xmlchange RUN_STARTDATE=2009-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2009
+  ./xmlchange DATM_YR_END=2012
+  ./xmlchange DATM_YR_ALIGN=2009
+  ./xmlchange START_TOD=79200
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/FR-Fon/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/FR-Fon/shell_commands
index 76a71ab3b2..bed8a1a5c6 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/FR-Fon/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/FR-Fon/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=48.476398
 ./xmlchange DATM_YR_END=2013
 ./xmlchange DATM_YR_START_FILENAME=2005
+./xmlchange DATM_YR_END_FILENAME=2013
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=2004
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2005
+  ./xmlchange RUN_STARTDATE=2006-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2006
+  ./xmlchange DATM_YR_END=2009
+  ./xmlchange DATM_YR_ALIGN=2006
+  ./xmlchange START_TOD=82800
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/FR-Gri/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/FR-Gri/shell_commands
index 5c575b0e97..9290d280d0 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/FR-Gri/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/FR-Gri/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=48.844219
 ./xmlchange DATM_YR_END=2013
 ./xmlchange DATM_YR_START_FILENAME=2005
+./xmlchange DATM_YR_END_FILENAME=2013
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=2004
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2005
+  ./xmlchange RUN_STARTDATE=2006-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2006
+  ./xmlchange DATM_YR_END=2009
+  ./xmlchange DATM_YR_ALIGN=2006
+  ./xmlchange START_TOD=82800
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/FR-Hes/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/FR-Hes/shell_commands
index 1d8ab25532..d85fc837ec 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/FR-Hes/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/FR-Hes/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=48.67416
 ./xmlchange DATM_YR_END=2006
 ./xmlchange DATM_YR_START_FILENAME=1997
+./xmlchange DATM_YR_END_FILENAME=2006
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=1996
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=1997
+  ./xmlchange RUN_STARTDATE=1998-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=1998
+  ./xmlchange DATM_YR_END=2005
+  ./xmlchange DATM_YR_ALIGN=1998
+  ./xmlchange START_TOD=82800
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/FR-LBr/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/FR-LBr/shell_commands
index 6b9eb48062..3d8139f7cb 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/FR-LBr/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/FR-LBr/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=44.71711
 ./xmlchange DATM_YR_END=2008
 ./xmlchange DATM_YR_START_FILENAME=2003
+./xmlchange DATM_YR_END_FILENAME=2008
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=2002
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2003
+  ./xmlchange RUN_STARTDATE=2004-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2004
+  ./xmlchange DATM_YR_END=2007
+  ./xmlchange DATM_YR_ALIGN=2004
+  ./xmlchange START_TOD=82800
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/FR-Lq1/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/FR-Lq1/shell_commands
index 000fc6d746..6e02d43ff8 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/FR-Lq1/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/FR-Lq1/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=45.643059
 ./xmlchange DATM_YR_END=2006
 ./xmlchange DATM_YR_START_FILENAME=2004
+./xmlchange DATM_YR_END_FILENAME=2006
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange CALENDAR=NO_LEAP
   ./xmlchange DATM_YR_START=2004
+  ./xmlchange DATM_YR_END=2004
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange START_TOD=0
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/FR-Lq2/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/FR-Lq2/shell_commands
index a851919f73..0f0588a5d4 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/FR-Lq2/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/FR-Lq2/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=45.639191
 ./xmlchange DATM_YR_END=2006
 ./xmlchange DATM_YR_START_FILENAME=2004
+./xmlchange DATM_YR_END_FILENAME=2006
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange CALENDAR=NO_LEAP
   ./xmlchange DATM_YR_START=2004
+  ./xmlchange DATM_YR_END=2004
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange START_TOD=0
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/FR-Pue/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/FR-Pue/shell_commands
index 1981d675fc..06a38a959d 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/FR-Pue/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/FR-Pue/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=43.74139
 ./xmlchange DATM_YR_END=2014
 ./xmlchange DATM_YR_START_FILENAME=2000
+./xmlchange DATM_YR_END_FILENAME=2014
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=1999
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2000
+  ./xmlchange RUN_STARTDATE=2001-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2001
+  ./xmlchange DATM_YR_END=2012
+  ./xmlchange DATM_YR_ALIGN=2001
+  ./xmlchange START_TOD=82800
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/GF-Guy/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/GF-Guy/shell_commands
index 1f10f4a2e1..b0fa51806e 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/GF-Guy/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/GF-Guy/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=5.278772
 ./xmlchange DATM_YR_END=2014
 ./xmlchange DATM_YR_START_FILENAME=2004
+./xmlchange DATM_YR_END_FILENAME=2014
 ./xmlchange START_TOD=10800
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=2004
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2004
+  ./xmlchange RUN_STARTDATE=2005-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2005
+  ./xmlchange DATM_YR_END=2012
+  ./xmlchange DATM_YR_ALIGN=2005
+  ./xmlchange START_TOD=10800
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/HU-Bug/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/HU-Bug/shell_commands
index 54b635a2a2..e729095c55 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/HU-Bug/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/HU-Bug/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=46.691101
 ./xmlchange DATM_YR_END=2006
 ./xmlchange DATM_YR_START_FILENAME=2003
+./xmlchange DATM_YR_END_FILENAME=2006
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange CALENDAR=NO_LEAP
   ./xmlchange DATM_YR_START=2003
+  ./xmlchange DATM_YR_END=2003
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange START_TOD=0
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/ID-Pag/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/ID-Pag/shell_commands
index 13ac0e386f..9a2abc0a14 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/ID-Pag/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/ID-Pag/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=-2.345
 ./xmlchange DATM_YR_END=2003
 ./xmlchange DATM_YR_START_FILENAME=2002
+./xmlchange DATM_YR_END_FILENAME=2003
 ./xmlchange START_TOD=61200
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange CALENDAR=NO_LEAP
   ./xmlchange DATM_YR_START=2002
+  ./xmlchange DATM_YR_END=2002
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange START_TOD=0
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/IE-Ca1/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/IE-Ca1/shell_commands
index 2bd80343c3..93c67de5b5 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/IE-Ca1/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/IE-Ca1/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=52.858791
 ./xmlchange DATM_YR_END=2006
 ./xmlchange DATM_YR_START_FILENAME=2004
+./xmlchange DATM_YR_END_FILENAME=2006
 ./xmlchange START_TOD=0
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2005
+  ./xmlchange DATM_YR_END=2005
   ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2004
+  ./xmlchange START_TOD=0
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/IE-Dri/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/IE-Dri/shell_commands
index 4f27411509..a2960d77d3 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/IE-Dri/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/IE-Dri/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=51.986691
 ./xmlchange DATM_YR_END=2005
 ./xmlchange DATM_YR_START_FILENAME=2003
+./xmlchange DATM_YR_END_FILENAME=2005
 ./xmlchange START_TOD=0
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2004
+  ./xmlchange DATM_YR_END=2004
   ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2003
+  ./xmlchange START_TOD=0
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/IT-Amp/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/IT-Amp/shell_commands
index aa7fef51ae..d748355f08 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/IT-Amp/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/IT-Amp/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=41.904099
 ./xmlchange DATM_YR_END=2006
 ./xmlchange DATM_YR_START_FILENAME=2003
+./xmlchange DATM_YR_END_FILENAME=2006
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange CALENDAR=NO_LEAP
   ./xmlchange DATM_YR_START=2003
+  ./xmlchange DATM_YR_END=2003
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange START_TOD=0
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/IT-BCi/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/IT-BCi/shell_commands
index 0c620a348c..848a163786 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/IT-BCi/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/IT-BCi/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=40.5238
 ./xmlchange DATM_YR_END=2010
 ./xmlchange DATM_YR_START_FILENAME=2005
+./xmlchange DATM_YR_END_FILENAME=2010
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=2004
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2005
+  ./xmlchange RUN_STARTDATE=2006-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2006
+  ./xmlchange DATM_YR_END=2009
+  ./xmlchange DATM_YR_ALIGN=2006
+  ./xmlchange START_TOD=82800
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/IT-CA1/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/IT-CA1/shell_commands
index 831b7897c0..665ee25f40 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/IT-CA1/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/IT-CA1/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=42.380409
 ./xmlchange DATM_YR_END=2013
 ./xmlchange DATM_YR_START_FILENAME=2012
+./xmlchange DATM_YR_END_FILENAME=2013
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange CALENDAR=NO_LEAP
   ./xmlchange DATM_YR_START=2012
+  ./xmlchange DATM_YR_END=2012
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange START_TOD=0
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/IT-CA2/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/IT-CA2/shell_commands
index dfae27f215..dd9c052864 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/IT-CA2/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/IT-CA2/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=42.37722
 ./xmlchange DATM_YR_END=2013
 ./xmlchange DATM_YR_START_FILENAME=2012
+./xmlchange DATM_YR_END_FILENAME=2013
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange CALENDAR=NO_LEAP
   ./xmlchange DATM_YR_START=2012
+  ./xmlchange DATM_YR_END=2012
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange START_TOD=0
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/IT-CA3/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/IT-CA3/shell_commands
index a3a2ab6c25..d39b5fb5fd 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/IT-CA3/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/IT-CA3/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=42.380001
 ./xmlchange DATM_YR_END=2013
 ./xmlchange DATM_YR_START_FILENAME=2012
+./xmlchange DATM_YR_END_FILENAME=2013
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange CALENDAR=NO_LEAP
   ./xmlchange DATM_YR_START=2012
+  ./xmlchange DATM_YR_END=2012
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange START_TOD=0
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/IT-Col/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/IT-Col/shell_commands
index eb817ab43c..705ca7ed46 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/IT-Col/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/IT-Col/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=41.849361
 ./xmlchange DATM_YR_END=2014
 ./xmlchange DATM_YR_START_FILENAME=2007
+./xmlchange DATM_YR_END_FILENAME=2014
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=2006
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2007
+  ./xmlchange RUN_STARTDATE=2008-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2008
+  ./xmlchange DATM_YR_END=2011
+  ./xmlchange DATM_YR_ALIGN=2008
+  ./xmlchange START_TOD=82800
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/IT-Cpz/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/IT-Cpz/shell_commands
index cfad8adb35..30130d8ee0 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/IT-Cpz/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/IT-Cpz/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=41.70525
 ./xmlchange DATM_YR_END=2008
 ./xmlchange DATM_YR_START_FILENAME=2001
+./xmlchange DATM_YR_END_FILENAME=2008
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=2000
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2001
+  ./xmlchange RUN_STARTDATE=2002-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2002
+  ./xmlchange DATM_YR_END=2005
+  ./xmlchange DATM_YR_ALIGN=2002
+  ./xmlchange START_TOD=82800
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/IT-Isp/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/IT-Isp/shell_commands
index 125257acd7..1b5c04ed7a 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/IT-Isp/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/IT-Isp/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=45.812641
 ./xmlchange DATM_YR_END=2014
 ./xmlchange DATM_YR_START_FILENAME=2013
+./xmlchange DATM_YR_END_FILENAME=2014
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange CALENDAR=NO_LEAP
   ./xmlchange DATM_YR_START=2013
+  ./xmlchange DATM_YR_END=2013
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange START_TOD=0
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/IT-LMa/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/IT-LMa/shell_commands
index bca26018b9..fe40323298 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/IT-LMa/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/IT-LMa/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=45.15258
 ./xmlchange DATM_YR_END=2004
 ./xmlchange DATM_YR_START_FILENAME=2003
+./xmlchange DATM_YR_END_FILENAME=2004
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange CALENDAR=NO_LEAP
   ./xmlchange DATM_YR_START=2003
+  ./xmlchange DATM_YR_END=2003
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange START_TOD=0
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/IT-Lav/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/IT-Lav/shell_commands
index 87f8e9d947..a740a982f2 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/IT-Lav/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/IT-Lav/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=45.9562
 ./xmlchange DATM_YR_END=2014
 ./xmlchange DATM_YR_START_FILENAME=2005
+./xmlchange DATM_YR_END_FILENAME=2014
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=2004
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2005
+  ./xmlchange RUN_STARTDATE=2006-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2006
+  ./xmlchange DATM_YR_END=2013
+  ./xmlchange DATM_YR_ALIGN=2006
+  ./xmlchange START_TOD=82800
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/IT-MBo/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/IT-MBo/shell_commands
index ab42d7a3d8..94d22840f3 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/IT-MBo/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/IT-MBo/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=46.014679
 ./xmlchange DATM_YR_END=2012
 ./xmlchange DATM_YR_START_FILENAME=2003
+./xmlchange DATM_YR_END_FILENAME=2012
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=2002
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2003
+  ./xmlchange RUN_STARTDATE=2004-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2004
+  ./xmlchange DATM_YR_END=2011
+  ./xmlchange DATM_YR_ALIGN=2004
+  ./xmlchange START_TOD=82800
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/IT-Mal/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/IT-Mal/shell_commands
index 8cf5fdd6d0..63a5710627 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/IT-Mal/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/IT-Mal/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=46.114021
 ./xmlchange DATM_YR_END=2003
 ./xmlchange DATM_YR_START_FILENAME=2003
+./xmlchange DATM_YR_END_FILENAME=2003
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange CALENDAR=NO_LEAP
   ./xmlchange DATM_YR_START=2003
+  ./xmlchange DATM_YR_END=2003
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange START_TOD=82800
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/IT-Noe/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/IT-Noe/shell_commands
index 8b12cb84db..f64eb7be42 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/IT-Noe/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/IT-Noe/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=40.606178
 ./xmlchange DATM_YR_END=2014
 ./xmlchange DATM_YR_START_FILENAME=2004
+./xmlchange DATM_YR_END_FILENAME=2014
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=2003
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2004
+  ./xmlchange RUN_STARTDATE=2005-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2005
+  ./xmlchange DATM_YR_END=2012
+  ./xmlchange DATM_YR_ALIGN=2005
+  ./xmlchange START_TOD=82800
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/IT-Non/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/IT-Non/shell_commands
index c8b4f77f4d..835dcf18ae 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/IT-Non/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/IT-Non/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=44.690189
 ./xmlchange DATM_YR_END=2002
 ./xmlchange DATM_YR_START_FILENAME=2002
+./xmlchange DATM_YR_END_FILENAME=2002
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange CALENDAR=NO_LEAP
   ./xmlchange DATM_YR_START=2002
+  ./xmlchange DATM_YR_END=2002
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange START_TOD=82800
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/IT-PT1/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/IT-PT1/shell_commands
index 629382cea8..988847d357 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/IT-PT1/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/IT-PT1/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=45.200871
 ./xmlchange DATM_YR_END=2004
 ./xmlchange DATM_YR_START_FILENAME=2003
+./xmlchange DATM_YR_END_FILENAME=2004
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange CALENDAR=NO_LEAP
   ./xmlchange DATM_YR_START=2003
+  ./xmlchange DATM_YR_END=2003
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange START_TOD=0
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/IT-Ren/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/IT-Ren/shell_commands
index ebf7cdb500..d5a0a85266 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/IT-Ren/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/IT-Ren/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=46.586861
 ./xmlchange DATM_YR_END=2013
 ./xmlchange DATM_YR_START_FILENAME=2010
+./xmlchange DATM_YR_END_FILENAME=2013
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange CALENDAR=NO_LEAP
   ./xmlchange DATM_YR_START=2010
+  ./xmlchange DATM_YR_END=2010
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange START_TOD=0
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/IT-Ro1/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/IT-Ro1/shell_commands
index b400216f9b..f2164aa296 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/IT-Ro1/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/IT-Ro1/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=42.408119
 ./xmlchange DATM_YR_END=2006
 ./xmlchange DATM_YR_START_FILENAME=2002
+./xmlchange DATM_YR_END_FILENAME=2006
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange CALENDAR=NO_LEAP
   ./xmlchange DATM_YR_START=2002
+  ./xmlchange DATM_YR_END=2002
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange START_TOD=0
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/IT-Ro2/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/IT-Ro2/shell_commands
index 195c0fdbc9..ef51f91353 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/IT-Ro2/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/IT-Ro2/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=42.390259
 ./xmlchange DATM_YR_END=2008
 ./xmlchange DATM_YR_START_FILENAME=2002
+./xmlchange DATM_YR_END_FILENAME=2008
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=2001
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2002
+  ./xmlchange RUN_STARTDATE=2003-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2003
+  ./xmlchange DATM_YR_END=2006
+  ./xmlchange DATM_YR_ALIGN=2003
+  ./xmlchange START_TOD=82800
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/IT-SR2/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/IT-SR2/shell_commands
index d981029a77..236fece8ad 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/IT-SR2/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/IT-SR2/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=43.732029
 ./xmlchange DATM_YR_END=2014
 ./xmlchange DATM_YR_START_FILENAME=2013
+./xmlchange DATM_YR_END_FILENAME=2014
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange CALENDAR=NO_LEAP
   ./xmlchange DATM_YR_START=2013
+  ./xmlchange DATM_YR_END=2013
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange START_TOD=0
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/IT-SRo/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/IT-SRo/shell_commands
index c40b2d8f71..ce6e1b2052 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/IT-SRo/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/IT-SRo/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=43.727859
 ./xmlchange DATM_YR_END=2012
 ./xmlchange DATM_YR_START_FILENAME=2003
+./xmlchange DATM_YR_END_FILENAME=2012
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=2002
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2003
+  ./xmlchange RUN_STARTDATE=2004-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2004
+  ./xmlchange DATM_YR_END=2011
+  ./xmlchange DATM_YR_ALIGN=2004
+  ./xmlchange START_TOD=82800
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/JP-SMF/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/JP-SMF/shell_commands
index c93dfef557..2a1353f3cf 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/JP-SMF/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/JP-SMF/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=35.2617
 ./xmlchange DATM_YR_END=2006
 ./xmlchange DATM_YR_START_FILENAME=2003
+./xmlchange DATM_YR_END_FILENAME=2006
 ./xmlchange START_TOD=54000
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange CALENDAR=NO_LEAP
   ./xmlchange DATM_YR_START=2003
+  ./xmlchange DATM_YR_END=2003
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange START_TOD=0
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/NL-Ca1/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/NL-Ca1/shell_commands
index ccb1290e78..1be8a7c93f 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/NL-Ca1/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/NL-Ca1/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=51.971001
 ./xmlchange DATM_YR_END=2006
 ./xmlchange DATM_YR_START_FILENAME=2003
+./xmlchange DATM_YR_END_FILENAME=2006
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange CALENDAR=NO_LEAP
   ./xmlchange DATM_YR_START=2003
+  ./xmlchange DATM_YR_END=2003
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange START_TOD=0
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/NL-Hor/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/NL-Hor/shell_commands
index 08eb58d8a1..81ffc31d0e 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/NL-Hor/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/NL-Hor/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=52.240349
 ./xmlchange DATM_YR_END=2011
 ./xmlchange DATM_YR_START_FILENAME=2008
+./xmlchange DATM_YR_END_FILENAME=2011
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange CALENDAR=NO_LEAP
   ./xmlchange DATM_YR_START=2008
+  ./xmlchange DATM_YR_END=2008
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange START_TOD=0
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/NL-Loo/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/NL-Loo/shell_commands
index a09cf39408..4d4503525e 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/NL-Loo/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/NL-Loo/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=52.16658
 ./xmlchange DATM_YR_END=2013
 ./xmlchange DATM_YR_START_FILENAME=1997
+./xmlchange DATM_YR_END_FILENAME=2013
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=1996
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=1997
+  ./xmlchange RUN_STARTDATE=1998-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=1998
+  ./xmlchange DATM_YR_END=2009
+  ./xmlchange DATM_YR_ALIGN=1998
+  ./xmlchange START_TOD=82800
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/PL-wet/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/PL-wet/shell_commands
index eb79334eeb..0f4ef8172c 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/PL-wet/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/PL-wet/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=52.762199
 ./xmlchange DATM_YR_END=2005
 ./xmlchange DATM_YR_START_FILENAME=2004
+./xmlchange DATM_YR_END_FILENAME=2005
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange CALENDAR=NO_LEAP
   ./xmlchange DATM_YR_START=2004
+  ./xmlchange DATM_YR_END=2004
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange START_TOD=0
 fi 
 
 # Turn on LAI streams for a SP case 
@@ -54,6 +58,3 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
   fi 
 fi 
 
-
-# set baseflow scalar to zero for wetland site 
-echo "baseflow_scalar = 0" >> user_nl_clm
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/PT-Esp/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/PT-Esp/shell_commands
index 4186dea491..28ad183958 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/PT-Esp/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/PT-Esp/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=38.6394
 ./xmlchange DATM_YR_END=2004
 ./xmlchange DATM_YR_START_FILENAME=2002
+./xmlchange DATM_YR_END_FILENAME=2004
 ./xmlchange START_TOD=0
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2003
+  ./xmlchange DATM_YR_END=2003
   ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2002
+  ./xmlchange START_TOD=0
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/PT-Mi1/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/PT-Mi1/shell_commands
index 36a1899bfc..0c1e08787b 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/PT-Mi1/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/PT-Mi1/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=38.540642
 ./xmlchange DATM_YR_END=2005
 ./xmlchange DATM_YR_START_FILENAME=2005
+./xmlchange DATM_YR_END_FILENAME=2005
 ./xmlchange START_TOD=0
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange CALENDAR=NO_LEAP
   ./xmlchange DATM_YR_START=2005
+  ./xmlchange DATM_YR_END=2005
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange START_TOD=0
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/PT-Mi2/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/PT-Mi2/shell_commands
index e2986dfac8..29acc4cc87 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/PT-Mi2/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/PT-Mi2/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=38.476501
 ./xmlchange DATM_YR_END=2006
 ./xmlchange DATM_YR_START_FILENAME=2005
+./xmlchange DATM_YR_END_FILENAME=2006
 ./xmlchange START_TOD=0
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2006
+  ./xmlchange DATM_YR_END=2006
   ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2005
+  ./xmlchange START_TOD=0
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/RU-Che/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/RU-Che/shell_commands
index f5172ddb53..0372ad7f29 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/RU-Che/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/RU-Che/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=68.613037
 ./xmlchange DATM_YR_END=2004
 ./xmlchange DATM_YR_START_FILENAME=2003
+./xmlchange DATM_YR_END_FILENAME=2004
 ./xmlchange START_TOD=46800
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange CALENDAR=NO_LEAP
   ./xmlchange DATM_YR_START=2003
+  ./xmlchange DATM_YR_END=2003
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange START_TOD=0
 fi 
 
 # Turn on LAI streams for a SP case 
@@ -54,6 +58,3 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
   fi 
 fi 
 
-
-# set baseflow scalar to zero for wetland site 
-echo "baseflow_scalar = 0" >> user_nl_clm
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/RU-Fyo/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/RU-Fyo/shell_commands
index 69bab319bc..54a36cc3cb 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/RU-Fyo/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/RU-Fyo/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=56.461529
 ./xmlchange DATM_YR_END=2014
 ./xmlchange DATM_YR_START_FILENAME=2003
+./xmlchange DATM_YR_END_FILENAME=2014
 ./xmlchange START_TOD=75600
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=2002
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2003
+  ./xmlchange RUN_STARTDATE=2004-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2004
+  ./xmlchange DATM_YR_END=2011
+  ./xmlchange DATM_YR_ALIGN=2004
+  ./xmlchange START_TOD=75600
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/RU-Zot/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/RU-Zot/shell_commands
index 27144db3cb..3dc3b7c0d5 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/RU-Zot/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/RU-Zot/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=60.8008
 ./xmlchange DATM_YR_END=2003
 ./xmlchange DATM_YR_START_FILENAME=2003
+./xmlchange DATM_YR_END_FILENAME=2003
 ./xmlchange START_TOD=61200
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange CALENDAR=NO_LEAP
   ./xmlchange DATM_YR_START=2003
+  ./xmlchange DATM_YR_END=2003
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange START_TOD=61200
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/SD-Dem/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/SD-Dem/shell_commands
index 6d245703d6..de76fbf3f9 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/SD-Dem/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/SD-Dem/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=13.2829
 ./xmlchange DATM_YR_END=2009
 ./xmlchange DATM_YR_START_FILENAME=2005
+./xmlchange DATM_YR_END_FILENAME=2009
 ./xmlchange START_TOD=75600
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange CALENDAR=NO_LEAP
   ./xmlchange DATM_YR_START=2005
+  ./xmlchange DATM_YR_END=2005
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange START_TOD=0
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/SE-Deg/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/SE-Deg/shell_commands
index 0a426dee38..e8fca26d99 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/SE-Deg/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/SE-Deg/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=64.181969
 ./xmlchange DATM_YR_END=2005
 ./xmlchange DATM_YR_START_FILENAME=2002
+./xmlchange DATM_YR_END_FILENAME=2005
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange CALENDAR=NO_LEAP
   ./xmlchange DATM_YR_START=2002
+  ./xmlchange DATM_YR_END=2002
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange START_TOD=0
 fi 
 
 # Turn on LAI streams for a SP case 
@@ -54,6 +58,3 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
   fi 
 fi 
 
-
-# set baseflow scalar to zero for wetland site 
-echo "baseflow_scalar = 0" >> user_nl_clm
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/UK-Gri/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/UK-Gri/shell_commands
index c016bf89a7..eafe5cbe51 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/UK-Gri/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/UK-Gri/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=56.60722
 ./xmlchange DATM_YR_END=2001
 ./xmlchange DATM_YR_START_FILENAME=2000
+./xmlchange DATM_YR_END_FILENAME=2001
 ./xmlchange START_TOD=0
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2001
+  ./xmlchange DATM_YR_END=2001
   ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2000
+  ./xmlchange START_TOD=0
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/UK-Ham/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/UK-Ham/shell_commands
index f92b9a6d69..d88159d3db 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/UK-Ham/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/UK-Ham/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=51.15353
 ./xmlchange DATM_YR_END=2004
 ./xmlchange DATM_YR_START_FILENAME=2004
+./xmlchange DATM_YR_END_FILENAME=2004
 ./xmlchange START_TOD=0
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange CALENDAR=NO_LEAP
   ./xmlchange DATM_YR_START=2004
+  ./xmlchange DATM_YR_END=2004
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange START_TOD=0
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/UK-PL3/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/UK-PL3/shell_commands
index 10b82dee40..1525c1ad95 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/UK-PL3/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/UK-PL3/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=51.450001
 ./xmlchange DATM_YR_END=2006
 ./xmlchange DATM_YR_START_FILENAME=2005
+./xmlchange DATM_YR_END_FILENAME=2006
 ./xmlchange START_TOD=0
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2006
+  ./xmlchange DATM_YR_END=2006
   ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2005
+  ./xmlchange START_TOD=0
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/US-AR1/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/US-AR1/shell_commands
index 8b3bb18871..41a03787e0 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/US-AR1/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/US-AR1/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=36.426701
 ./xmlchange DATM_YR_END=2012
 ./xmlchange DATM_YR_START_FILENAME=2010
+./xmlchange DATM_YR_END_FILENAME=2012
 ./xmlchange START_TOD=21600
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2011
+  ./xmlchange DATM_YR_END=2011
   ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2010
+  ./xmlchange START_TOD=21600
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/US-AR2/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/US-AR2/shell_commands
index 0eeaef4fe2..cbaf614733 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/US-AR2/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/US-AR2/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=36.635799
 ./xmlchange DATM_YR_END=2011
 ./xmlchange DATM_YR_START_FILENAME=2010
+./xmlchange DATM_YR_END_FILENAME=2011
 ./xmlchange START_TOD=21600
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2011
+  ./xmlchange DATM_YR_END=2011
   ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2010
+  ./xmlchange START_TOD=21600
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/US-ARM/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/US-ARM/shell_commands
index 4045912f3c..1b400c5e32 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/US-ARM/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/US-ARM/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=36.605801
 ./xmlchange DATM_YR_END=2012
 ./xmlchange DATM_YR_START_FILENAME=2003
+./xmlchange DATM_YR_END_FILENAME=2012
 ./xmlchange START_TOD=21600
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=2003
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2003
+  ./xmlchange RUN_STARTDATE=2004-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2004
+  ./xmlchange DATM_YR_END=2011
+  ./xmlchange DATM_YR_ALIGN=2004
+  ./xmlchange START_TOD=21600
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/US-Aud/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/US-Aud/shell_commands
index 043730b19e..69aa55c93e 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/US-Aud/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/US-Aud/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=31.5907
 ./xmlchange DATM_YR_END=2005
 ./xmlchange DATM_YR_START_FILENAME=2003
+./xmlchange DATM_YR_END_FILENAME=2005
 ./xmlchange START_TOD=25200
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2004
+  ./xmlchange DATM_YR_END=2004
   ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2003
+  ./xmlchange START_TOD=25200
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/US-Bar/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/US-Bar/shell_commands
index 4fb0562433..5c87c90ae1 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/US-Bar/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/US-Bar/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=44.06464
 ./xmlchange DATM_YR_END=2005
 ./xmlchange DATM_YR_START_FILENAME=2005
+./xmlchange DATM_YR_END_FILENAME=2005
 ./xmlchange START_TOD=18000
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange CALENDAR=NO_LEAP
   ./xmlchange DATM_YR_START=2005
+  ./xmlchange DATM_YR_END=2005
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange START_TOD=18000
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/US-Bkg/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/US-Bkg/shell_commands
index a05f46e871..a8a59831bc 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/US-Bkg/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/US-Bkg/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=44.345291
 ./xmlchange DATM_YR_END=2006
 ./xmlchange DATM_YR_START_FILENAME=2005
+./xmlchange DATM_YR_END_FILENAME=2006
 ./xmlchange START_TOD=21600
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2006
+  ./xmlchange DATM_YR_END=2006
   ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2005
+  ./xmlchange START_TOD=21600
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/US-Blo/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/US-Blo/shell_commands
index fb79abb36e..932a4a0fbc 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/US-Blo/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/US-Blo/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=38.895302
 ./xmlchange DATM_YR_END=2006
 ./xmlchange DATM_YR_START_FILENAME=2000
+./xmlchange DATM_YR_END_FILENAME=2006
 ./xmlchange START_TOD=28800
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=2000
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2000
+  ./xmlchange RUN_STARTDATE=2001-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2001
+  ./xmlchange DATM_YR_END=2004
+  ./xmlchange DATM_YR_ALIGN=2001
+  ./xmlchange START_TOD=28800
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/US-Bo1/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/US-Bo1/shell_commands
index b6e243115f..e035dc4bc7 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/US-Bo1/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/US-Bo1/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=40.006199
 ./xmlchange DATM_YR_END=2006
 ./xmlchange DATM_YR_START_FILENAME=1997
+./xmlchange DATM_YR_END_FILENAME=2006
 ./xmlchange START_TOD=21600
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=1997
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=1997
+  ./xmlchange RUN_STARTDATE=1998-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=1998
+  ./xmlchange DATM_YR_END=2005
+  ./xmlchange DATM_YR_ALIGN=1998
+  ./xmlchange START_TOD=21600
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/US-Cop/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/US-Cop/shell_commands
index 0957a02037..0ba5d14b2e 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/US-Cop/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/US-Cop/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=38.09
 ./xmlchange DATM_YR_END=2003
 ./xmlchange DATM_YR_START_FILENAME=2002
+./xmlchange DATM_YR_END_FILENAME=2003
 ./xmlchange START_TOD=25200
 ./xmlchange ATM_NCPL=24
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2003
+  ./xmlchange DATM_YR_END=2003
   ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2002
+  ./xmlchange START_TOD=25200
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/US-FPe/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/US-FPe/shell_commands
index bd5760bfc0..4c7c0ba07b 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/US-FPe/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/US-FPe/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=48.307701
 ./xmlchange DATM_YR_END=2006
 ./xmlchange DATM_YR_START_FILENAME=2000
+./xmlchange DATM_YR_END_FILENAME=2006
 ./xmlchange START_TOD=25200
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=2000
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2000
+  ./xmlchange RUN_STARTDATE=2001-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2001
+  ./xmlchange DATM_YR_END=2004
+  ./xmlchange DATM_YR_ALIGN=2001
+  ./xmlchange START_TOD=25200
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/US-GLE/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/US-GLE/shell_commands
index fc1b2c4fba..70ef40e2f0 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/US-GLE/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/US-GLE/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=41.366501
 ./xmlchange DATM_YR_END=2014
 ./xmlchange DATM_YR_START_FILENAME=2009
+./xmlchange DATM_YR_END_FILENAME=2014
 ./xmlchange START_TOD=25200
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=2009
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2009
+  ./xmlchange RUN_STARTDATE=2010-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2010
+  ./xmlchange DATM_YR_END=2013
+  ./xmlchange DATM_YR_ALIGN=2010
+  ./xmlchange START_TOD=25200
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/US-Goo/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/US-Goo/shell_commands
index be9ff715aa..e8841f9d9f 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/US-Goo/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/US-Goo/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=34.2547
 ./xmlchange DATM_YR_END=2006
 ./xmlchange DATM_YR_START_FILENAME=2004
+./xmlchange DATM_YR_END_FILENAME=2006
 ./xmlchange START_TOD=21600
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2005
+  ./xmlchange DATM_YR_END=2005
   ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2004
+  ./xmlchange START_TOD=21600
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/US-Ha1/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/US-Ha1/shell_commands
index bb97980e53..bb14daf6e3 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/US-Ha1/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/US-Ha1/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=42.5378
 ./xmlchange DATM_YR_END=2012
 ./xmlchange DATM_YR_START_FILENAME=1992
+./xmlchange DATM_YR_END_FILENAME=2012
 ./xmlchange START_TOD=18000
 ./xmlchange ATM_NCPL=24
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=1992
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=1992
+  ./xmlchange RUN_STARTDATE=1993-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=1993
+  ./xmlchange DATM_YR_END=2008
+  ./xmlchange DATM_YR_ALIGN=1993
+  ./xmlchange START_TOD=18000
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/US-Ho1/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/US-Ho1/shell_commands
index 803711f8af..7714d3e608 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/US-Ho1/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/US-Ho1/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=45.204102
 ./xmlchange DATM_YR_END=2004
 ./xmlchange DATM_YR_START_FILENAME=1996
+./xmlchange DATM_YR_END_FILENAME=2004
 ./xmlchange START_TOD=18000
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=1996
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=1996
+  ./xmlchange RUN_STARTDATE=1997-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=1997
+  ./xmlchange DATM_YR_END=2000
+  ./xmlchange DATM_YR_ALIGN=1997
+  ./xmlchange START_TOD=18000
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/US-KS2/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/US-KS2/shell_commands
index 74ad2113d9..62eb5ff3b9 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/US-KS2/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/US-KS2/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=28.608578
 ./xmlchange DATM_YR_END=2006
 ./xmlchange DATM_YR_START_FILENAME=2003
+./xmlchange DATM_YR_END_FILENAME=2006
 ./xmlchange START_TOD=18000
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2004
+  ./xmlchange DATM_YR_END=2004
   ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2003
+  ./xmlchange START_TOD=18000
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/US-Los/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/US-Los/shell_commands
index dbc8d3b004..7430fb1d5a 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/US-Los/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/US-Los/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=46.082699
 ./xmlchange DATM_YR_END=2008
 ./xmlchange DATM_YR_START_FILENAME=2000
+./xmlchange DATM_YR_END_FILENAME=2008
 ./xmlchange START_TOD=21600
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=2000
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2000
+  ./xmlchange RUN_STARTDATE=2001-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2001
+  ./xmlchange DATM_YR_END=2004
+  ./xmlchange DATM_YR_ALIGN=2001
+  ./xmlchange START_TOD=21600
 fi 
 
 # Turn on LAI streams for a SP case 
@@ -54,6 +58,3 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
   fi 
 fi 
 
-
-# set baseflow scalar to zero for wetland site 
-echo "baseflow_scalar = 0" >> user_nl_clm
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/US-MMS/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/US-MMS/shell_commands
index 8e8804a887..4fd67a24b5 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/US-MMS/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/US-MMS/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=39.3232
 ./xmlchange DATM_YR_END=2014
 ./xmlchange DATM_YR_START_FILENAME=1999
+./xmlchange DATM_YR_END_FILENAME=2014
 ./xmlchange START_TOD=18000
 ./xmlchange ATM_NCPL=24
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=1999
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=1999
+  ./xmlchange RUN_STARTDATE=2000-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2000
+  ./xmlchange DATM_YR_END=2011
+  ./xmlchange DATM_YR_ALIGN=2000
+  ./xmlchange START_TOD=18000
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/US-MOz/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/US-MOz/shell_commands
index 223e43a3d6..ec6c8abc71 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/US-MOz/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/US-MOz/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=38.74411
 ./xmlchange DATM_YR_END=2006
 ./xmlchange DATM_YR_START_FILENAME=2005
+./xmlchange DATM_YR_END_FILENAME=2006
 ./xmlchange START_TOD=21600
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2006
+  ./xmlchange DATM_YR_END=2006
   ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2005
+  ./xmlchange START_TOD=21600
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/US-Me2/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/US-Me2/shell_commands
index 8555ceb993..6f7e760d8c 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/US-Me2/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/US-Me2/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=44.452301
 ./xmlchange DATM_YR_END=2014
 ./xmlchange DATM_YR_START_FILENAME=2002
+./xmlchange DATM_YR_END_FILENAME=2014
 ./xmlchange START_TOD=28800
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=2002
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2002
+  ./xmlchange RUN_STARTDATE=2003-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2003
+  ./xmlchange DATM_YR_END=2010
+  ./xmlchange DATM_YR_ALIGN=2003
+  ./xmlchange START_TOD=28800
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/US-Me4/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/US-Me4/shell_commands
index b191f984a5..1f0271630f 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/US-Me4/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/US-Me4/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=44.499199
 ./xmlchange DATM_YR_END=2000
 ./xmlchange DATM_YR_START_FILENAME=1996
+./xmlchange DATM_YR_END_FILENAME=2000
 ./xmlchange START_TOD=28800
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=1997
+  ./xmlchange DATM_YR_END=1997
   ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=1996
+  ./xmlchange START_TOD=28800
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/US-Me6/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/US-Me6/shell_commands
index 8ffbbe4855..f64ccbb568 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/US-Me6/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/US-Me6/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=44.323299
 ./xmlchange DATM_YR_END=2014
 ./xmlchange DATM_YR_START_FILENAME=2011
+./xmlchange DATM_YR_END_FILENAME=2014
 ./xmlchange START_TOD=28800
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2012
+  ./xmlchange DATM_YR_END=2012
   ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2011
+  ./xmlchange START_TOD=28800
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/US-Myb/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/US-Myb/shell_commands
index 2d3103546a..04f4f6504e 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/US-Myb/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/US-Myb/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=38.049801
 ./xmlchange DATM_YR_END=2014
 ./xmlchange DATM_YR_START_FILENAME=2011
+./xmlchange DATM_YR_END_FILENAME=2014
 ./xmlchange START_TOD=28800
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2012
+  ./xmlchange DATM_YR_END=2012
   ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2011
+  ./xmlchange START_TOD=28800
 fi 
 
 # Turn on LAI streams for a SP case 
@@ -54,6 +58,3 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
   fi 
 fi 
 
-
-# set baseflow scalar to zero for wetland site 
-echo "baseflow_scalar = 0" >> user_nl_clm
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/US-NR1/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/US-NR1/shell_commands
index cd795160d0..1121d3a1e8 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/US-NR1/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/US-NR1/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=40.032902
 ./xmlchange DATM_YR_END=2014
 ./xmlchange DATM_YR_START_FILENAME=1999
+./xmlchange DATM_YR_END_FILENAME=2014
 ./xmlchange START_TOD=25200
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=1999
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=1999
+  ./xmlchange RUN_STARTDATE=2000-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2000
+  ./xmlchange DATM_YR_END=2011
+  ./xmlchange DATM_YR_ALIGN=2000
+  ./xmlchange START_TOD=25200
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/US-Ne1/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/US-Ne1/shell_commands
index 4b205b471d..3427860610 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/US-Ne1/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/US-Ne1/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=41.1651
 ./xmlchange DATM_YR_END=2012
 ./xmlchange DATM_YR_START_FILENAME=2002
+./xmlchange DATM_YR_END_FILENAME=2012
 ./xmlchange START_TOD=21600
 ./xmlchange ATM_NCPL=24
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=2002
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2002
+  ./xmlchange RUN_STARTDATE=2003-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2003
+  ./xmlchange DATM_YR_END=2010
+  ./xmlchange DATM_YR_ALIGN=2003
+  ./xmlchange START_TOD=21600
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/US-Ne2/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/US-Ne2/shell_commands
index beca45f248..1d7fbcb323 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/US-Ne2/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/US-Ne2/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=41.164902
 ./xmlchange DATM_YR_END=2012
 ./xmlchange DATM_YR_START_FILENAME=2002
+./xmlchange DATM_YR_END_FILENAME=2012
 ./xmlchange START_TOD=21600
 ./xmlchange ATM_NCPL=24
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=2002
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2002
+  ./xmlchange RUN_STARTDATE=2003-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2003
+  ./xmlchange DATM_YR_END=2010
+  ./xmlchange DATM_YR_ALIGN=2003
+  ./xmlchange START_TOD=21600
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/US-Ne3/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/US-Ne3/shell_commands
index 59644ec285..35d7943b28 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/US-Ne3/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/US-Ne3/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=41.179699
 ./xmlchange DATM_YR_END=2012
 ./xmlchange DATM_YR_START_FILENAME=2002
+./xmlchange DATM_YR_END_FILENAME=2012
 ./xmlchange START_TOD=21600
 ./xmlchange ATM_NCPL=24
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=2002
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2002
+  ./xmlchange RUN_STARTDATE=2003-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2003
+  ./xmlchange DATM_YR_END=2010
+  ./xmlchange DATM_YR_ALIGN=2003
+  ./xmlchange START_TOD=21600
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/US-PFa/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/US-PFa/shell_commands
index 979dd2adbe..0d6207ed28 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/US-PFa/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/US-PFa/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=45.9459
 ./xmlchange DATM_YR_END=2014
 ./xmlchange DATM_YR_START_FILENAME=1995
+./xmlchange DATM_YR_END_FILENAME=2014
 ./xmlchange START_TOD=21600
 ./xmlchange ATM_NCPL=24
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=1995
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=1995
+  ./xmlchange RUN_STARTDATE=1996-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=1996
+  ./xmlchange DATM_YR_END=2011
+  ./xmlchange DATM_YR_ALIGN=1996
+  ./xmlchange START_TOD=21600
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/US-Prr/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/US-Prr/shell_commands
index 34949905d4..d761aab310 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/US-Prr/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/US-Prr/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=65.123703
 ./xmlchange DATM_YR_END=2013
 ./xmlchange DATM_YR_START_FILENAME=2011
+./xmlchange DATM_YR_END_FILENAME=2013
 ./xmlchange START_TOD=32400
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2012
+  ./xmlchange DATM_YR_END=2012
   ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2011
+  ./xmlchange START_TOD=32400
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/US-SP1/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/US-SP1/shell_commands
index 07c1611661..510dec8781 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/US-SP1/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/US-SP1/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=29.73807
 ./xmlchange DATM_YR_END=2005
 ./xmlchange DATM_YR_START_FILENAME=2005
+./xmlchange DATM_YR_END_FILENAME=2005
 ./xmlchange START_TOD=18000
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange CALENDAR=NO_LEAP
   ./xmlchange DATM_YR_START=2005
+  ./xmlchange DATM_YR_END=2005
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange START_TOD=18000
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/US-SP2/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/US-SP2/shell_commands
index 0640843357..128d242e93 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/US-SP2/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/US-SP2/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=29.764799
 ./xmlchange DATM_YR_END=2004
 ./xmlchange DATM_YR_START_FILENAME=2000
+./xmlchange DATM_YR_END_FILENAME=2004
 ./xmlchange START_TOD=18000
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2001
+  ./xmlchange DATM_YR_END=2001
   ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2000
+  ./xmlchange START_TOD=18000
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/US-SP3/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/US-SP3/shell_commands
index 559f2e9282..fb2f4294f4 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/US-SP3/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/US-SP3/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=29.75477
 ./xmlchange DATM_YR_END=2004
 ./xmlchange DATM_YR_START_FILENAME=1999
+./xmlchange DATM_YR_END_FILENAME=2004
 ./xmlchange START_TOD=18000
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=1999
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=1999
+  ./xmlchange RUN_STARTDATE=2000-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2000
+  ./xmlchange DATM_YR_END=2003
+  ./xmlchange DATM_YR_ALIGN=2000
+  ./xmlchange START_TOD=18000
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/US-SRG/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/US-SRG/shell_commands
index 25269ecc91..89661cb74b 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/US-SRG/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/US-SRG/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=31.7894
 ./xmlchange DATM_YR_END=2014
 ./xmlchange DATM_YR_START_FILENAME=2009
+./xmlchange DATM_YR_END_FILENAME=2014
 ./xmlchange START_TOD=25200
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=2009
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2009
+  ./xmlchange RUN_STARTDATE=2010-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2010
+  ./xmlchange DATM_YR_END=2013
+  ./xmlchange DATM_YR_ALIGN=2010
+  ./xmlchange START_TOD=25200
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/US-SRM/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/US-SRM/shell_commands
index 97c155f639..fcd841013f 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/US-SRM/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/US-SRM/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=31.8214
 ./xmlchange DATM_YR_END=2014
 ./xmlchange DATM_YR_START_FILENAME=2004
+./xmlchange DATM_YR_END_FILENAME=2014
 ./xmlchange START_TOD=25200
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=2004
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2004
+  ./xmlchange RUN_STARTDATE=2005-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2005
+  ./xmlchange DATM_YR_END=2012
+  ./xmlchange DATM_YR_ALIGN=2005
+  ./xmlchange START_TOD=25200
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/US-Syv/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/US-Syv/shell_commands
index f78805c4d8..e4300efe36 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/US-Syv/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/US-Syv/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=46.242001
 ./xmlchange DATM_YR_END=2008
 ./xmlchange DATM_YR_START_FILENAME=2002
+./xmlchange DATM_YR_END_FILENAME=2008
 ./xmlchange START_TOD=21600
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=2002
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2002
+  ./xmlchange RUN_STARTDATE=2003-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2003
+  ./xmlchange DATM_YR_END=2006
+  ./xmlchange DATM_YR_ALIGN=2003
+  ./xmlchange START_TOD=21600
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/US-Ton/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/US-Ton/shell_commands
index 81a47579f4..f6b8634532 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/US-Ton/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/US-Ton/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=38.431599
 ./xmlchange DATM_YR_END=2014
 ./xmlchange DATM_YR_START_FILENAME=2001
+./xmlchange DATM_YR_END_FILENAME=2014
 ./xmlchange START_TOD=28800
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=2001
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2001
+  ./xmlchange RUN_STARTDATE=2002-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2002
+  ./xmlchange DATM_YR_END=2013
+  ./xmlchange DATM_YR_ALIGN=2002
+  ./xmlchange START_TOD=28800
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/US-Tw4/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/US-Tw4/shell_commands
index 6a76794659..a7e7adaf94 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/US-Tw4/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/US-Tw4/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=38.103001
 ./xmlchange DATM_YR_END=2014
 ./xmlchange DATM_YR_START_FILENAME=2014
+./xmlchange DATM_YR_END_FILENAME=2014
 ./xmlchange START_TOD=28800
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange CALENDAR=NO_LEAP
   ./xmlchange DATM_YR_START=2014
+  ./xmlchange DATM_YR_END=2014
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange START_TOD=28800
 fi 
 
 # Turn on LAI streams for a SP case 
@@ -54,6 +58,3 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
   fi 
 fi 
 
-
-# set baseflow scalar to zero for wetland site 
-echo "baseflow_scalar = 0" >> user_nl_clm
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/US-Twt/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/US-Twt/shell_commands
index 0a36252097..3cb8d9e0ad 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/US-Twt/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/US-Twt/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=38.1087
 ./xmlchange DATM_YR_END=2014
 ./xmlchange DATM_YR_START_FILENAME=2010
+./xmlchange DATM_YR_END_FILENAME=2014
 ./xmlchange START_TOD=28800
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2011
+  ./xmlchange DATM_YR_END=2011
   ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2010
+  ./xmlchange START_TOD=28800
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/US-UMB/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/US-UMB/shell_commands
index 6587b7967c..d2704f06cf 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/US-UMB/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/US-UMB/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=45.559799
 ./xmlchange DATM_YR_END=2014
 ./xmlchange DATM_YR_START_FILENAME=2000
+./xmlchange DATM_YR_END_FILENAME=2014
 ./xmlchange START_TOD=18000
 ./xmlchange ATM_NCPL=24
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=2000
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2000
+  ./xmlchange RUN_STARTDATE=2001-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2001
+  ./xmlchange DATM_YR_END=2012
+  ./xmlchange DATM_YR_ALIGN=2001
+  ./xmlchange START_TOD=18000
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/US-Var/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/US-Var/shell_commands
index ecdf5c95e3..b5d9072f4d 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/US-Var/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/US-Var/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=38.4133
 ./xmlchange DATM_YR_END=2014
 ./xmlchange DATM_YR_START_FILENAME=2001
+./xmlchange DATM_YR_END_FILENAME=2014
 ./xmlchange START_TOD=28800
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=2001
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2001
+  ./xmlchange RUN_STARTDATE=2002-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2002
+  ./xmlchange DATM_YR_END=2013
+  ./xmlchange DATM_YR_ALIGN=2002
+  ./xmlchange START_TOD=28800
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/US-WCr/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/US-WCr/shell_commands
index 4f2ca3a65e..2bf7fe6399 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/US-WCr/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/US-WCr/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=45.805901
 ./xmlchange DATM_YR_END=2006
 ./xmlchange DATM_YR_START_FILENAME=1999
+./xmlchange DATM_YR_END_FILENAME=2006
 ./xmlchange START_TOD=21600
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=1999
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=1999
+  ./xmlchange RUN_STARTDATE=2000-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2000
+  ./xmlchange DATM_YR_END=2003
+  ./xmlchange DATM_YR_ALIGN=2000
+  ./xmlchange START_TOD=21600
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/US-Whs/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/US-Whs/shell_commands
index 458db116f3..9a4d53c39e 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/US-Whs/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/US-Whs/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=31.743799
 ./xmlchange DATM_YR_END=2014
 ./xmlchange DATM_YR_START_FILENAME=2008
+./xmlchange DATM_YR_END_FILENAME=2014
 ./xmlchange START_TOD=25200
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=2008
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2008
+  ./xmlchange RUN_STARTDATE=2009-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2009
+  ./xmlchange DATM_YR_END=2012
+  ./xmlchange DATM_YR_ALIGN=2009
+  ./xmlchange START_TOD=25200
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/US-Wkg/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/US-Wkg/shell_commands
index 0870b9233d..e308897bff 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/US-Wkg/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/US-Wkg/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=31.7365
 ./xmlchange DATM_YR_END=2014
 ./xmlchange DATM_YR_START_FILENAME=2005
+./xmlchange DATM_YR_END_FILENAME=2014
 ./xmlchange START_TOD=25200
 ./xmlchange ATM_NCPL=48
 
@@ -34,9 +35,12 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange DATM_YR_START=2005
 else 
   # for spinup case with I2000 compset 
-  ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
-  ./xmlchange DATM_YR_START=2005
+  ./xmlchange RUN_STARTDATE=2006-01-01
+  ./xmlchange CALENDAR=NO_LEAP
+  ./xmlchange DATM_YR_START=2006
+  ./xmlchange DATM_YR_END=2013
+  ./xmlchange DATM_YR_ALIGN=2006
+  ./xmlchange START_TOD=25200
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/ZA-Kru/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/ZA-Kru/shell_commands
index 8c3463a936..33aed7cc38 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/ZA-Kru/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/ZA-Kru/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=-25.019699
 ./xmlchange DATM_YR_END=2002
 ./xmlchange DATM_YR_START_FILENAME=2000
+./xmlchange DATM_YR_END_FILENAME=2002
 ./xmlchange START_TOD=79200
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange CALENDAR=NO_LEAP
   ./xmlchange DATM_YR_START=2000
+  ./xmlchange DATM_YR_END=2000
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange START_TOD=0
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/ZM-Mon/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/ZM-Mon/shell_commands
index 448a26c040..8b6dcf8f6e 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/ZM-Mon/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/ZM-Mon/shell_commands
@@ -3,6 +3,7 @@
 ./xmlchange PTS_LAT=-15.437778
 ./xmlchange DATM_YR_END=2008
 ./xmlchange DATM_YR_START_FILENAME=2008
+./xmlchange DATM_YR_END_FILENAME=2008
 ./xmlchange START_TOD=79200
 ./xmlchange ATM_NCPL=48
 
@@ -35,8 +36,11 @@ if  [[ $compset =~ ^HIST ]]; then
 else 
   # for spinup case with I2000 compset 
   ./xmlchange RUN_STARTDATE=0001-01-01
-  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange CALENDAR=NO_LEAP
   ./xmlchange DATM_YR_START=2008
+  ./xmlchange DATM_YR_END=2008
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange START_TOD=79200
 fi 
 
 # Turn on LAI streams for a SP case 
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/defaults/shell_commands b/cime_config/usermods_dirs/clm/PLUMBER2/defaults/shell_commands
index abc9e44127..4e32f903a3 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/defaults/shell_commands
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/defaults/shell_commands
@@ -31,19 +31,12 @@ if  [[ $compset =~ ^HIST ]]; then
   echo "hist_nhtfrq = 0,1" >> user_nl_clm
   echo "hist_mfilt  = 1,438000" >> user_nl_clm
   echo " " >> user_nl_clm
-  echo "CLM_USRDAT.PLUMBER2:taxmode=extend" >> user_nl_datm_streams
-  echo "CLM_USRDAT.PLUMBER2:dtlimit=1e30" >> user_nl_datm_streams
-
 else
   # TODO, set this for spinup in BGC and SP cases
   ./xmlchange STOP_OPTION="nyears"  
   ./xmlchange STOP_N=5
   ./xmlchange CLM_NML_USE_CASE="2000_control"
   ./xmlchange CLM_FORCE_COLDSTART=on
-  ./xmlchange CALENDAR=NO_LEAP
-  echo "CLM_USRDAT.PLUMBER2:taxmode=cycle" >> user_nl_datm_streams
-  echo "CLM_USRDAT.PLUMBER2:dtlimit=30" >> user_nl_datm_streams
-
 fi
 
 # If needed for SP simulations: & set history file variables
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/defaults/user_nl_clm b/cime_config/usermods_dirs/clm/PLUMBER2/defaults/user_nl_clm
index 179184cd4f..babb52c347 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/defaults/user_nl_clm
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/defaults/user_nl_clm
@@ -21,4 +21,11 @@
 flanduse_timeseries = ' '   ! This isn't needed for a non transient case, but will be once we start using transient compsets
 fsurdat = "$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/ctsm5.4.0/surfdata_1x1_PLUMBER2_${PLUMBER2SITE}_hist_2000_16pfts_c251023.no_nan_fill.nc"
 
+! Turn off HumanIndexMod calculations for all sites.  This avoids an error triggered by passing negative
+! 2-m relative humidity into HumanIndexMod. The error occurs only for these sites but we turn this off for all
+! sites for convenience:
+! ES-ES2, ES-LgS, ES-VDA, SE-Deg, US-Cop
+! See https://github.com/ESCOMP/CTSM/issues/4081 for discussion about this error.
+calc_human_stress_indices = 'NONE'
+
 ! custom namelist changes for each site / case
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/defaults/user_nl_datm_streams b/cime_config/usermods_dirs/clm/PLUMBER2/defaults/user_nl_datm_streams
index cacc92f688..19a6abfb5f 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/defaults/user_nl_datm_streams
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/defaults/user_nl_datm_streams
@@ -21,16 +21,6 @@
 !   foo:year_first = 1950
 ! would change the stream year_first stream_entry to 1950 for the foo stream block
 !------------------------------------------------------------------------
-! This will come out when the cdeps submodule are updated
-CLM_USRDAT.PLUMBER2:datavars = ZBOT     Sa_z, \
-        TBOT     Sa_tbot, \
-        QBOT     Sa_shum, \
-        WIND     Sa_wind, \
-        PRECTmms Faxa_precn, \
-        FSDS     Faxa_swdn, \
-        PSRF     Sa_pbot, \
-        FLDS     Faxa_lwdn
-
 presaero.SSP3-7.0:datafiles = $DIN_LOC_ROOT/atm/cam/chem/trop_mozart_aero/aero/aerodep_clm_SSP370_b.e21.BWSSP370cmip6.f09_g17.CMIP6-SSP3-7.0-WACCM.001_1849-2101_monthly_0.9x1.25_c201103.nc
 presaero.SSP3-7.0:dtlimit=30
 
diff --git a/components/cdeps b/components/cdeps
index 259be816da..49aa7a7971 160000
--- a/components/cdeps
+++ b/components/cdeps
@@ -1 +1 @@
-Subproject commit 259be816daf8bf1eb051a018d525cac94c5bf87f
+Subproject commit 49aa7a79710ddbc9ae3fd225cddf21c29a76da7c
diff --git a/python/ctsm/site_and_regional/neon_site.py b/python/ctsm/site_and_regional/neon_site.py
index da979e0be3..0140591779 100755
--- a/python/ctsm/site_and_regional/neon_site.py
+++ b/python/ctsm/site_and_regional/neon_site.py
@@ -37,11 +37,12 @@ class NeonSite(TowerSite):
     def __init__(self, *args, **kwargs):
         super().__init__("NEON", *args, **kwargs)
 
-    def modify_user_nl(self, case_root, run_type, rundir, site_lines=None):
+    # pylint: disable=too-many-positional-arguments
+    def modify_user_nl(self, base_case_root, case_root, run_type, rundir, site_lines=None):
         # TODO: include neon-specific user namelist lines, using this as just an example currently
         if site_lines is None:
             site_lines = [
                 """hist_fincl1 = 'TOTECOSYSC', 'TOTECOSYSN', 'TOTSOMC', 'TOTSOMN', 'TOTVEGC',
                                  'TOTVEGN', 'TLAI', 'GPP', 'CPOOL', 'NPP', 'TWS', 'H2OSNO',"""
             ]
-        super().modify_user_nl(case_root, run_type, rundir, site_lines)
+        super().modify_user_nl(base_case_root, case_root, run_type, rundir, site_lines)
diff --git a/python/ctsm/site_and_regional/plumber2_usermods.py b/python/ctsm/site_and_regional/plumber2_usermods.py
index 7c8f37b1b5..45ab8ce029 100644
--- a/python/ctsm/site_and_regional/plumber2_usermods.py
+++ b/python/ctsm/site_and_regional/plumber2_usermods.py
@@ -30,6 +30,12 @@ def write_usermods(
     start_tod,
     atm_ncpl,
     stop_n,
+    run_startdate_spin,
+    calendar_spin,
+    datm_yr_start_spin,
+    datm_yr_end_spin,
+    datm_yr_align_spin,
+    start_tod_spin,
 ):
     """
     Write information to be added to user mods
@@ -62,12 +68,12 @@ def write_usermods(
     s_file = open(shell, "w")  # or 'a' to add text instead of truncate
     # pylint: disable=line-too-long
     s_file.write(
-        # TODO turn on following line after cdeps changes are added
-        #'./xmlchange PLUMBER2SITE='+site + '\n' \
+        "./xmlchange PLUMBER2SITE=" + site + "\n"
         "./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 DATM_YR_END_FILENAME=" + str(end_year) + "\n"
         "./xmlchange START_TOD=" + str(start_tod) + "\n"
         "./xmlchange ATM_NCPL=" + str(atm_ncpl) + "\n"
         "\n"
@@ -99,9 +105,12 @@ def write_usermods(
         "  ./xmlchange DATM_YR_START=" + str(start_year_actual) + "\n"
         "else \n"
         "  # for spinup case with I2000 compset \n"
-        "  ./xmlchange RUN_STARTDATE=0001-01-01" + "\n"
-        "  ./xmlchange DATM_YR_ALIGN=" + str(1) + "\n"
-        "  ./xmlchange DATM_YR_START=" + str(start_year) + "\n"
+        "  ./xmlchange RUN_STARTDATE=" + str(run_startdate_spin) + "\n"
+        "  ./xmlchange CALENDAR=" + str(calendar_spin) + "\n"
+        "  ./xmlchange DATM_YR_START=" + str(datm_yr_start_spin) + "\n"
+        "  ./xmlchange DATM_YR_END=" + str(datm_yr_end_spin) + "\n"
+        "  ./xmlchange DATM_YR_ALIGN=" + str(datm_yr_align_spin) + "\n"
+        "  ./xmlchange START_TOD=" + str(start_tod_spin) + "\n"
         "fi \n"
         "\n"
         "# Turn on LAI streams for a SP case \n"
@@ -124,28 +133,6 @@ def write_usermods(
 
     s_file.close()
 
-    # add baseflow_scalar = 0 to user_nl_clm for wetland sites
-    wetland = [
-        "CZ-wet",
-        "DE-SfN",
-        "FI-Kaa",
-        "FI-Lom",
-        "RU-Che",
-        "SE-Deg",
-        "US-Los",
-        "US-Myb",
-        "US-Tw4",
-        "PL-wet",
-    ]
-    if any(x == site for x in wetland):
-        s_file = open(shell, "a")  # or 'a' to add text instead of truncate
-        s_file.write(
-            "\n"
-            "# set baseflow scalar to zero for wetland site \n"
-            'echo "baseflow_scalar = 0" >> user_nl_clm'
-        )
-        s_file.close()
-
 
 # End write_usermods function
 
@@ -169,6 +156,12 @@ def main():
         start_tod = row["START_TOD"]
         atm_ncpl = row["ATM_NCPL"]
         stop_n = 1 + end_year - start_year
+        run_startdate_spin = row["RUN_STARTDATE_SPIN"]
+        calendar_spin = row["CALENDAR_SPIN"]
+        datm_yr_start_spin = row["DATM_YR_START_SPIN"]
+        datm_yr_end_spin = row["DATM_YR_END_SPIN"]
+        datm_yr_align_spin = row["DATM_YR_ALIGN_SPIN"]
+        start_tod_spin = row["START_TOD_SPIN"]
 
         write_usermods(
             lat=lat,
@@ -181,6 +174,12 @@ def main():
             start_tod=start_tod,
             atm_ncpl=atm_ncpl,
             stop_n=stop_n,
+            run_startdate_spin=run_startdate_spin,
+            calendar_spin=calendar_spin,
+            datm_yr_start_spin=datm_yr_start_spin,
+            datm_yr_end_spin=datm_yr_end_spin,
+            datm_yr_align_spin=datm_yr_align_spin,
+            start_tod_spin=start_tod_spin,
         )
 
 
diff --git a/python/ctsm/site_and_regional/tower_site.py b/python/ctsm/site_and_regional/tower_site.py
index bc1e7d5088..1010d8eb90 100644
--- a/python/ctsm/site_and_regional/tower_site.py
+++ b/python/ctsm/site_and_regional/tower_site.py
@@ -14,6 +14,7 @@
 import shutil
 import sys
 import time
+import subprocess
 
 # Get the ctsm util tools and then the cime tools.
 _CTSM_PYTHON = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..", "python"))
@@ -214,6 +215,9 @@ def build_base_case(
             case_path = case.get_value("CASEROOT")
 
             if setup_only:
+                # Required because we need to query the lnd_in for the base case in order
+                # to provide a modified parameter file for wetland sites
+                case.create_namelists()
                 return case_path
 
             print("---- base case build ------")
@@ -240,7 +244,8 @@ def get_batch_query(self, case):
             return "none"
         return case.get_value("batch_query")
 
-    def modify_user_nl(self, case_root, run_type, rundir, site_lines=None):
+    # pylint: disable=too-many-positional-arguments
+    def modify_user_nl(self, base_case_root, case_root, run_type, rundir, site_lines=None):
         """
         Modify user namelist. If transient, include finidat in user_nl;
         Otherwise, adjust user_nl to include different mfilt, nhtfrq, and variables in hist_fincl1.
@@ -255,13 +260,83 @@ def modify_user_nl(self, case_root, run_type, rundir, site_lines=None):
         else:
             if not site_lines:
                 site_lines = []
+            user_nl_lines = (
+                [
+                    "hist_fincl2 = ''",
+                    """hist_fincl1 = 'TOTECOSYSC', 'TOTECOSYSN', 'TOTSOMC', 'TOTSOMN', 'TOTVEGC',
+                                     'TOTVEGN', 'TLAI', 'GPP', 'CPOOL', 'NPP', 'TWS', 'H2OSNO'""",
+                    "hist_mfilt = 20",
+                    "hist_nhtfrq = -8760",
+                    "hist_empty_htapes = .true.",
+                ]
+                + site_lines
+            )
+
+        if user_nl_lines:
+            with open(user_nl_fname, "a") as nl_file:
+                for line in user_nl_lines:
+                    nl_file.write("{}\n".format(line))
+
+        # Change baseflow_scalar to 0 in parameter file for PLUMBER2 wetland sites
+        self._set_wetland_baseflow_scalar(base_case_root, case_root, user_nl_fname)
+
+    def _set_wetland_baseflow_scalar(self, base_case_root, case_root, user_nl_fname):
+        """
+        Change baseflow_scalar to 0 in parameter file for PLUMBER2 wetland sites.
+        We need to grep the lnd_in file for the parameter file so that we can modify it
+        to set baseflow_scalar = 0 for wetland sites.  We need to grep the base case
+        since at this point the current site simulation, e.g., AD, has not yet had
+        a namelist generated.
+        """
+        # pylint: disable=too-many-locals
+        wetland = [
+            "CZ-wet",
+            "DE-SfN",
+            "FI-Kaa",
+            "FI-Lom",
+            "RU-Che",
+            "SE-Deg",
+            "US-Los",
+            "US-Myb",
+            "US-Tw4",
+            "PL-wet",
+        ]
+
+        site = self.name
+        user_nl_lines = None
+        if site in wetland:
+
+            # Get the base case path of the lnd_in
+            src_paramfile = os.path.join(base_case_root, "CaseDocs/lnd_in")
+
+            # Create a grep command to query the parameter file from the base case
+            command = "grep paramfile" + " " + src_paramfile
+
+            # Grep for the parameter file string, get just the location of the parameter file
+            # and strip the apostrophes from the string
+            paramfile = subprocess.run(
+                command, shell=True, capture_output=True, text=True, check=True
+            )
+            output_paramfile = paramfile.stdout.strip()
+            split_output_paramfile = output_paramfile.split("=")
+            clean_paramfile = split_output_paramfile[1].replace("'", "")
+
+            # Define a new parameter file that will go in the run directory
+            modified_paramfile = os.path.join(case_root, "run/modified_paramfile.nc")
+
+            # Set baseflow_scalar = 0 in the modified parameter file
+            os.system(
+                "ncap2 -s 'baseflow_scalar=0'" + " " + clean_paramfile + " " + modified_paramfile
+            )
+
+            # Create a string with the modified parameter file for user_nl_clm
+            modified_paramfile_user_nl_line = "paramfile = " + "'" + modified_paramfile + "'"
+
             user_nl_lines = [
-                "hist_fincl2 = ''",
-                "hist_mfilt = 20",
-                "hist_nhtfrq = -8760",
-                "hist_empty_htapes = .true.",
-            ] + site_lines
+                modified_paramfile_user_nl_line,
+            ]
 
+        # Append the user_nl_clm
         if user_nl_lines:
             with open(user_nl_fname, "a") as nl_file:
                 for line in user_nl_lines:
@@ -446,11 +521,14 @@ def run_case(
             if run_type == "ad":
                 case.set_value("CLM_FORCE_COLDSTART", "on")
                 case.set_value("CLM_ACCELERATED_SPINUP", "on")
-                # This was originally set to 18 for NEON cases, which typically start in 2018.
+                # RUN_STARTDATE was originally set to 18 for NEON cases, which typically
+                # start in 2018.
                 # AD cases, would start in 0018, followed by postAD in 1018.
-                # PLUMBER cases all start in different years, but not expected to cause issues.
-                case.set_value("RUN_REFDATE", "0018-01-01")
-                case.set_value("RUN_STARTDATE", "0018-01-01")
+                # PLUMBER cases have specific start dates for each site that are set in
+                # shell_commands
+                if self.tower_type == "NEON":
+                    case.set_value("RUN_STARTDATE", "0018-01-01")
+
                 case.set_value("RESUBMIT", 1)
                 # this case.setup() is necessary to create the case.run batch job
                 case.case_setup()
@@ -474,7 +552,8 @@ def run_case(
                         return
                 case.set_value("CALENDAR", "GREGORIAN")
                 case.set_value("RESUBMIT", 0)
-                case.set_value("STOP_OPTION", "nmonths")
+                if self.tower_type == "NEON":
+                    case.set_value("STOP_OPTION", "nmonths")
             if not rundir:
                 rundir = case.get_value("RUNDIR")
 
@@ -484,7 +563,7 @@ def run_case(
                     setting_split = setting.split("=")
                     case.set_value(*setting_split)
 
-            self.modify_user_nl(case_root, run_type, rundir)
+            self.modify_user_nl(base_case_root, case_root, run_type, rundir)
 
             case.create_namelists()
 
diff --git a/python/ctsm/test/test_unit_neon_site.py b/python/ctsm/test/test_unit_neon_site.py
index 6d8ca69377..b596cb27c2 100755
--- a/python/ctsm/test/test_unit_neon_site.py
+++ b/python/ctsm/test/test_unit_neon_site.py
@@ -31,17 +31,19 @@ class TestNeonSite(unittest.TestCase):
 
     def setUp(self):
         """
-        Make /_tempdir for use by these tests.
+        Make /_tempdir and /_tempdir_base for use by these tests.
         """
         self._previous_dir = os.getcwd()
         self._tempdir = tempfile.mkdtemp()
+        self._tempdir_base = tempfile.mkdtemp()
 
     def tearDown(self):
         """
-        Remove temporary directory
+        Remove temporary directories
         """
         os.chdir(self._previous_dir)
         shutil.rmtree(self._tempdir, ignore_errors=True)
+        shutil.rmtree(self._tempdir_base, ignore_errors=True)
 
     def test_modify_user_nl_transient(self):
         """
@@ -58,6 +60,7 @@ def test_modify_user_nl_transient(self):
 
         # modify_user_nl parameters:
         case_root = self._tempdir
+        base_case_root = self._tempdir_base
         run_type = "transient"
         rundir = ""
 
@@ -69,7 +72,7 @@ def test_modify_user_nl_transient(self):
             start_month=start_month,
             end_month=end_month,
             finidat=finidat,
-        ).modify_user_nl(case_root, run_type, rundir)
+        ).modify_user_nl(base_case_root, case_root, run_type, rundir)
 
         # gather file contents for test
         new_nl_file = open(glob.glob(case_root + "/*")[0], "r")
@@ -98,6 +101,7 @@ def test_modify_user_nl_ad(self):
 
         # modify_user_nl parameters:
         case_root = self._tempdir
+        base_case_root = self._tempdir_base
         run_type = "ad"
         rundir = ""
 
@@ -109,7 +113,7 @@ def test_modify_user_nl_ad(self):
             start_month=start_month,
             end_month=end_month,
             finidat=finidat,
-        ).modify_user_nl(case_root, run_type, rundir)
+        ).modify_user_nl(base_case_root, case_root, run_type, rundir)
 
         # gather file contents for test
         new_nl_file = open(glob.glob(case_root + "/*")[0], "r")
diff --git a/tools/site_and_regional/PLUMBER2_sites.csv b/tools/site_and_regional/PLUMBER2_sites.csv
index 1097568051..e10289159f 100644
--- a/tools/site_and_regional/PLUMBER2_sites.csv
+++ b/tools/site_and_regional/PLUMBER2_sites.csv
@@ -1,176 +1,176 @@
 #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.
-#longitudes must be in the range [-180,180]
-,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
-1,AR-SLu,-33.464802,-66.459808,5,50.00, 4.50, 0.13,7,50.00, 4.50, 2.59,2010,2010,2010-01-01,10800,48 
-2,AT-Neu,47.116669,11.317500,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2002,2012,2001-12-31,82800,48 
-3,AU-ASM,-22.283001,133.248993,1,100.00, 6.50, 3.25,-999,-999.00,-999.00,-999.00,2011,2017,2010-12-31,54000,48 
-4,AU-Cow,-16.238190,145.427155,4,100.00,22.00, 0.63,-999,-999.00,-999.00,-999.00,2010,2015,2009-12-31,50400,48 
-5,AU-Cpr,-34.002060,140.589127,7,30.00, 4.00, 2.30,14,70.00, 0.50, 0.01,2011,2017,2010-12-31,46800,48 
-6,AU-Ctr,-16.103279,145.446854,4,100.00,25.00, 0.71,-999,-999.00,-999.00,-999.00,2010,2017,2009-12-31,50400,48 
-7,AU-Cum,-33.613297,150.722473,5,100.00,23.00, 0.66,-999,-999.00,-999.00,-999.00,2013,2018,2012-12-31,46800,48 
-8,AU-DaP,-14.063300,131.318100,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2009,2012,2008-12-31,54000,48 
-9,AU-DaS,-14.159283,131.388000,6,30.00,16.40, 9.11,14,70.00, 0.50, 0.01,2010,2017,2009-12-31,54000,48 
-10,AU-Dry,-15.258800,132.370605,6,30.00,12.30, 6.83,14,70.00, 0.50, 0.01,2011,2015,2010-12-31,54000,48 
-11,AU-Emr,-23.858700,148.474594,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2012,2013,2011-12-31,50400,48 
-12,AU-Gin,-31.375000,115.650002,7,70.00, 7.00, 4.02,14,30.00, 0.50, 0.01,2012,2017,2011-12-31,57600,48 
-13,AU-GWW,-30.191299,120.654099,7,30.00,18.00,10.35,14,70.00, 0.50, 0.01,2013,2017,2012-12-31,57600,48 
-14,AU-How,-12.495200,131.149994,6,70.00,16.00, 8.89,14,30.00, 0.50, 0.01,2003,2017,2002-12-31,54000,48 
-15,AU-Lit,-13.179040,130.794495,6,70.00,20.00,11.11,14,30.00, 0.50, 0.01,2016,2017,2015-12-31,54000,48 
-16,AU-Otw,-38.532341,142.816803,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2009,2010,2008-12-31,46800,24 
-17,AU-Rig,-36.649899,145.575897,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2011,2016,2010-12-31,46800,48 
-18,AU-Rob,-17.117500,145.630096,4,100.00,44.00, 1.26,-999,-999.00,-999.00,-999.00,2014,2017,2013-12-31,50400,48 
-19,AU-Sam,-27.388100,152.877808,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2011,2017,2010-12-31,50400,48 
-20,AU-Stp,-17.150700,133.350204,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2010,2017,2009-12-31,54000,48 
-21,AU-TTE,-22.287001,133.639999,10,30.00, 4.85, 0.97,14,70.00, 0.50, 0.01,2013,2017,2012-12-31,54000,48 
-22,AU-Tum,-35.656601,148.151703,5,100.00,40.00, 1.14,-999,-999.00,-999.00,-999.00,2002,2017,2001-12-31,46800,24 
-23,AU-Whr,-36.673199,145.029404,5,100.00,28.00, 0.80,-999,-999.00,-999.00,-999.00,2015,2016,2014-12-31,46800,48 
-24,AU-Wrr,-43.095020,146.654495,5,100.00,90.00, 2.57,-999,-999.00,-999.00,-999.00,2016,2017,2015-12-31,46800,48 
-25,AU-Ync,-34.989300,146.290695,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2011,2017,2010-12-31,46800,48 
-26,BE-Bra,51.309166, 4.520560,1,19.22,21.00,10.50,7,80.78,21.00,12.08,2004,2014,2003-12-31,82800,48 
-27,BE-Lon,50.551590, 4.746130,15,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2005,2014,2004-12-31,82800,48 
-28,BE-Vie,50.305069, 5.998050,1,25.93,35.00,17.50,7,74.07,35.00,20.13,1997,2014,1996-12-31,82800,48 
-29,BR-Sa3,-3.018029,-54.971436,4,100.00,40.00, 1.14,-999,-999.00,-999.00,-999.00,2001,2003,2001-01-01,14400,48 
-30,BW-Ma1,-19.916500,23.560329,6,30.00, 8.00, 4.44,14,70.00, 0.50, 0.01,2000,2000,1999-12-31,79200,48 
-31,CA-NS1,55.879200,-98.483887,2,100.00,20.00,10.00,-999,-999.00,-999.00,-999.00,2003,2003,2003-01-01,21600,48 
-32,CA-NS2,55.905800,-98.524689,2,100.00,20.00,10.00,-999,-999.00,-999.00,-999.00,2002,2004,2002-01-01,21600,48 
-33,CA-NS4,55.914398,-98.380615,2,100.00, 7.00, 3.50,-999,-999.00,-999.00,-999.00,2003,2004,2003-01-01,21600,48 
-34,CA-NS5,55.863098,-98.484985,2,100.00, 5.00, 2.50,-999,-999.00,-999.00,-999.00,2003,2004,2003-01-01,21600,48 
-35,CA-NS6,55.916698,-98.964417,10,30.00, 4.00, 0.80,13,70.00, 0.50, 0.01,2002,2004,2002-01-01,21600,48 
-36,CA-NS7,56.635799,-99.948303,10,30.00, 0.25, 0.05,13,70.00, 0.50, 0.01,2003,2004,2003-01-01,21600,48 
-37,CA-Qcu,49.267078,-74.036530,1,100.00, 5.50, 2.75,-999,-999.00,-999.00,-999.00,2002,2006,2002-01-01,18000,48 
-38,CA-Qfo,49.692501,-74.342102,1,100.00,14.00, 7.00,-999,-999.00,-999.00,-999.00,2004,2010,2004-01-01,18000,48 
-39,CA-SF1,54.485001,-105.817596,1,100.00, 6.00, 3.00,-999,-999.00,-999.00,-999.00,2004,2006,2004-01-01,21600,48 
-40,CA-SF2,54.253899,-105.877502,2,100.00, 4.00, 2.00,-999,-999.00,-999.00,-999.00,2003,2005,2003-01-01,21600,48 
-41,CA-SF3,54.091599,-106.005310,10,30.00, 1.00, 0.20,13,70.00, 0.50, 0.01,2003,2005,2003-01-01,21600,48 
-42,CH-Cha,47.210220, 8.410440,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2006,2014,2005-12-31,82800,48 
-43,CH-Dav,46.815334, 9.855920,1,100.00,25.00,12.50,-999,-999.00,-999.00,-999.00,1997,2014,1996-12-31,82800,48 
-44,CH-Fru,47.115833, 8.537780,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2007,2014,2006-12-31,82800,48 
-45,CH-Oe1,47.285831, 7.731940,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2002,2008,2001-12-31,82800,48 
-46,CN-Cha,42.402500,128.095795,1, 8.79,28.00,14.00,7,91.21,28.00,16.10,2003,2005,2002-12-31,57600,48 
-47,CN-Cng,44.593399,123.509201,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2008,2009,2007-12-31,57600,48 
-48,CN-Dan,30.497801,91.066399,12,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2004,2005,2003-12-31,57600,48 
-49,CN-Din,23.173300,112.536102,5,100.00,30.00, 0.86,-999,-999.00,-999.00,-999.00,2003,2005,2002-12-31,57600,48 
-50,CN-Du2,42.046700,116.283600,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2007,2008,2006-12-31,57600,48 
-51,CN-HaM,37.369999,101.180000,12,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2002,2003,2001-12-31,57600,48 
-52,CN-Qia,26.741400,115.058098,1,100.00,13.00, 6.50,-999,-999.00,-999.00,-999.00,2003,2005,2002-12-31,57600,48 
-53,CZ-wet,49.024651,14.770350,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2007,2014,2006-12-31,82800,48 
-54,DE-Bay,50.141941,11.866940,1,100.00,25.00,12.50,-999,-999.00,-999.00,-999.00,1997,1999,1996-12-31,82800,48 
-55,DE-Geb,51.100101,10.914300,15,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2001,2014,2000-12-31,82800,48 
-56,DE-Gri,50.949471,13.512530,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2004,2014,2003-12-31,82800,48 
-57,DE-Hai,51.079166,10.453000,7,100.00,33.00,18.97,-999,-999.00,-999.00,-999.00,2000,2012,1999-12-31,82800,48 
-58,DE-Kli,50.893059,13.522380,15,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2005,2014,2004-12-31,82800,48 
-59,DE-Meh,51.275311,10.655470,1, 1.27, 1.00, 0.50,7,98.73, 1.00, 0.58,2004,2006,2003-12-31,82800,48 
-60,DE-Obe,50.786659,13.721290,1,100.00,19.00, 9.50,-999,-999.00,-999.00,-999.00,2008,2014,2007-12-31,82800,48 
-61,DE-Seh,50.870625, 6.449650,15,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2008,2010,2007-12-31,82800,48 
-62,DE-SfN,47.806389,11.327500,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2013,2014,2012-12-31,82800,48 
-63,DE-Tha,50.963612,13.566940,1,100.00,26.50,13.25,-999,-999.00,-999.00,-999.00,1998,2014,1997-12-31,82800,48 
-64,DE-Wet,50.453499,11.457530,1,100.00,22.00,11.00,-999,-999.00,-999.00,-999.00,2002,2006,2001-12-31,82800,48 
-65,DK-Fou,56.484200, 9.587220,15,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2005,2005,2004-12-31,82800,48 
-66,DK-Lva,55.683300,12.083300,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2005,2006,2004-12-31,82800,48 
-67,DK-Ris,55.530281,12.097220,15,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2004,2005,2003-12-31,82800,48 
-68,DK-Sor,55.485870,11.644640,7,100.00,25.00,14.37,-999,-999.00,-999.00,-999.00,1997,2014,1996-12-31,82800,48 
-69,DK-ZaH,74.473282,-20.550293,12,100.00, 0.47, 0.01,-999,-999.00,-999.00,-999.00,2000,2013,2000-01-01,0,48 
-70,ES-ES1,39.345970,-0.318817,1,100.00, 7.50, 3.75,-999,-999.00,-999.00,-999.00,1999,2006,1998-12-31,82800,48 
-71,ES-ES2,39.275558,-0.315277,16,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2005,2006,2004-12-31,82800,48 
-72,ES-LgS,37.097935,-2.965820,10,30.00, 0.20, 0.04,13,70.00, 0.50, 0.01,2007,2007,2006-12-31,82800,48 
-73,ES-LMa,39.941502,-5.773346,7,30.00, 8.00, 4.60,14,70.00, 0.50, 0.01,2004,2006,2003-12-31,82800,48 
-74,ES-VDA,42.152180, 1.448500,7,30.00, 0.50, 0.29,13,70.00, 0.50, 0.01,2004,2004,2003-12-31,82800,48 
-75,FI-Hyy,61.847500,24.295000,1,100.00,14.00, 7.00,-999,-999.00,-999.00,-999.00,1996,2014,1995-12-31,79200,48 
-76,FI-Kaa,69.140694,27.295031,12,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2000,2002,1999-12-31,79200,48 
-77,FI-Lom,67.997200,24.209181,12,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2007,2009,2006-12-31,79200,48 
-78,FI-Sod,67.361862,26.637831,1,100.00,12.70, 6.35,-999,-999.00,-999.00,-999.00,2008,2014,2007-12-31,79200,48 
-79,FR-Fon,48.476398, 2.780140,7,100.00,24.00,13.80,-999,-999.00,-999.00,-999.00,2005,2013,2004-12-31,82800,48 
-80,FR-Gri,48.844219, 1.951910,15,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2005,2013,2004-12-31,82800,48 
-81,FR-Hes,48.674160, 7.065560,7,100.00,13.00, 7.47,-999,-999.00,-999.00,-999.00,1997,2006,1996-12-31,82800,48 
-82,FR-LBr,44.717110,-0.769287,1,100.00,20.00,10.00,-999,-999.00,-999.00,-999.00,2003,2008,2002-12-31,82800,48 
-83,FR-Lq1,45.643059, 2.735830,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2004,2006,2003-12-31,82800,48 
-84,FR-Lq2,45.639191, 2.737030,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2004,2006,2003-12-31,82800,48 
-85,FR-Pue,43.741390, 3.595830,5,100.00, 6.50, 0.19,-999,-999.00,-999.00,-999.00,2000,2014,1999-12-31,82800,48 
-86,GF-Guy, 5.278772,-52.924866,4,100.00,35.00, 1.00,-999,-999.00,-999.00,-999.00,2004,2014,2004-01-01,10800,48 
-87,HU-Bug,46.691101,19.601299,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2003,2006,2002-12-31,82800,48 
-88,ID-Pag,-2.345000,114.036392,4,100.00,26.00, 0.74,-999,-999.00,-999.00,-999.00,2002,2003,2001-12-31,61200,48 
-89,IE-Ca1,52.858791,-6.918152,15,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2004,2006,2004-01-01,0,48 
-90,IE-Dri,51.986691,-8.751801,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2003,2005,2003-01-01,0,48 
-91,IT-Amp,41.904099,13.605160,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2003,2006,2002-12-31,82800,48 
-92,IT-BCi,40.523800,14.957440,16,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2005,2010,2004-12-31,82800,48 
-93,IT-CA1,42.380409,12.026560,7,100.00, 5.50, 3.16,-999,-999.00,-999.00,-999.00,2012,2013,2011-12-31,82800,48 
-94,IT-CA2,42.377220,12.026040,15,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2012,2013,2011-12-31,82800,48 
-95,IT-CA3,42.380001,12.022200,7,100.00, 3.50, 2.01,-999,-999.00,-999.00,-999.00,2012,2013,2011-12-31,82800,48 
-96,IT-Col,41.849361,13.588140,7,100.00,13.00, 7.47,-999,-999.00,-999.00,-999.00,2007,2014,2006-12-31,82800,48 
-97,IT-Cpz,41.705250,12.376110,5,100.00,13.00, 0.37,-999,-999.00,-999.00,-999.00,2001,2008,2000-12-31,82800,48 
-98,IT-Isp,45.812641, 8.633580,7,100.00,19.00,10.93,-999,-999.00,-999.00,-999.00,2013,2014,2012-12-31,82800,48 
-99,IT-Lav,45.956200,11.281320,1,100.00,28.00,14.00,-999,-999.00,-999.00,-999.00,2005,2014,2004-12-31,82800,48 
-100,IT-LMa,45.152580, 7.582590,7,100.00,25.00,14.37,-999,-999.00,-999.00,-999.00,2003,2004,2002-12-31,82800,48 
-101,IT-Mal,46.114021,11.703340,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2003,2003,2002-12-31,82800,48 
-102,IT-MBo,46.014679,11.045830,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2003,2012,2002-12-31,82800,48 
-103,IT-Noe,40.606178, 8.151170,10,70.00, 1.20, 0.24,14,30.00, 0.50, 0.01,2004,2014,2003-12-31,82800,48 
-104,IT-Non,44.690189,11.091090,7,100.00, 7.00, 4.03,-999,-999.00,-999.00,-999.00,2002,2002,2001-12-31,82800,48 
-105,IT-PT1,45.200871, 9.061040,7,100.00,26.00,14.95,-999,-999.00,-999.00,-999.00,2003,2004,2002-12-31,82800,48 
-106,IT-Ren,46.586861,11.433690,1,100.00,28.00,14.00,-999,-999.00,-999.00,-999.00,2010,2013,2009-12-31,82800,48 
-107,IT-Ro1,42.408119,11.930010,7,100.00,15.00, 8.62,-999,-999.00,-999.00,-999.00,2002,2006,2001-12-31,82800,48 
-108,IT-Ro2,42.390259,11.920930,7,100.00,15.00, 8.62,-999,-999.00,-999.00,-999.00,2002,2008,2001-12-31,82800,48 
-109,IT-SR2,43.732029,10.290950,1,100.00,19.00, 9.50,-999,-999.00,-999.00,-999.00,2013,2014,2012-12-31,82800,48 
-110,IT-SRo,43.727859,10.284440,1,100.00,16.00, 8.00,-999,-999.00,-999.00,-999.00,2003,2012,2002-12-31,82800,48 
-111,JP-SMF,35.261700,137.078796,1,29.81, 8.10, 4.05,7,70.19, 8.10, 4.66,2003,2006,2002-12-31,54000,48 
-112,NL-Ca1,51.971001, 4.927000,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2003,2006,2002-12-31,82800,48 
-113,NL-Hor,52.240349, 5.071300,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2008,2011,2007-12-31,82800,48 
-114,NL-Loo,52.166580, 5.743560,1,100.00,15.50, 7.75,-999,-999.00,-999.00,-999.00,1997,2013,1996-12-31,82800,48 
-115,PL-wet,52.762199,16.309401,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2004,2005,2003-12-31,82800,48 
-116,PT-Esp,38.639400,-8.601807,5,100.00,20.00, 0.57,-999,-999.00,-999.00,-999.00,2002,2004,2002-01-01,0,48 
-117,PT-Mi1,38.540642,-8.000061,5,100.00, 7.30, 0.21,-999,-999.00,-999.00,-999.00,2005,2005,2005-01-01,0,48 
-118,PT-Mi2,38.476501,-8.024536,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2005,2006,2005-01-01,0,48 
-119,RU-Che,68.613037,161.341431,12,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2003,2004,2002-12-31,46800,48 
-120,RU-Fyo,56.461529,32.922081,1,100.00,21.00,10.50,-999,-999.00,-999.00,-999.00,2003,2014,2002-12-31,75600,48 
-121,RU-Zot,60.800800,89.350800,2,70.00,12.00, 6.00,13,30.00, 0.50, 0.01,2003,2003,2002-12-31,61200,48 
-122,SD-Dem,13.282900,30.478300,6,30.00, 1.50, 0.83,14,70.00, 0.50, 0.01,2005,2009,2004-12-31,75600,48 
-123,SE-Deg,64.181969,19.556690,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2002,2005,2001-12-31,82800,48 
-124,UK-Gri,56.607220,-3.798065,1,100.00,10.00, 5.00,-999,-999.00,-999.00,-999.00,2000,2001,2000-01-01,0,48 
-125,UK-Ham,51.153530,-0.858307,7,100.00,22.00,12.65,-999,-999.00,-999.00,-999.00,2004,2004,2004-01-01,0,48 
-126,UK-PL3,51.450001,-1.266663,1, 8.33,22.00,11.00,7,91.67,22.00,12.65,2005,2006,2005-01-01,0,48 
-127,US-AR1,36.426701,-99.419983,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2010,2012,2010-01-01,21600,48 
-128,US-AR2,36.635799,-99.597504,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2010,2011,2010-01-01,21600,48 
-129,US-ARM,36.605801,-97.488800,15,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2003,2012,2003-01-01,21600,48 
-130,US-Aud,31.590700,-110.509201,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2003,2005,2003-01-01,25200,48 
-131,US-Bar,44.064640,-71.288086,1, 8.43,21.00,10.50,7,91.57,21.00,12.07,2005,2005,2005-01-01,18000,48 
-132,US-Bkg,44.345291,-96.836182,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2005,2006,2005-01-01,21600,48 
-133,US-Blo,38.895302,-120.632751,1,100.00, 4.70, 2.35,-999,-999.00,-999.00,-999.00,2000,2006,2000-01-01,28800,48 
-134,US-Bo1,40.006199,-88.290405,15,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,1997,2006,1997-01-01,21600,48 
-135,US-Cop,38.090000,-109.389999,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2002,2003,2002-01-01,25200,24 
-136,US-FPe,48.307701,-105.101898,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2000,2006,2000-01-01,25200,48 
-137,US-GLE,41.366501,-106.239899,1,100.00,10.00, 5.00,-999,-999.00,-999.00,-999.00,2009,2014,2009-01-01,25200,48 
-138,US-Goo,34.254700,-89.873505,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2004,2006,2004-01-01,21600,48 
-139,US-Ha1,42.537800,-72.171509,7,100.00,25.00,14.37,-999,-999.00,-999.00,-999.00,1992,2012,1992-01-01,18000,24 
-140,US-Ho1,45.204102,-68.740204,1,100.00,20.00,10.00,-999,-999.00,-999.00,-999.00,1996,2004,1996-01-01,18000,48 
-141,US-KS2,28.608578,-80.671539,10,70.00, 2.00, 0.40,14,30.00, 0.50, 0.01,2003,2006,2003-01-01,18000,48 
-142,US-Los,46.082699,-89.979187,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2000,2008,2000-01-01,21600,48 
-143,US-Me2,44.452301,-121.557404,1,100.00,16.00, 8.00,-999,-999.00,-999.00,-999.00,2002,2014,2002-01-01,28800,48 
-144,US-Me4,44.499199,-121.622406,1,100.00,20.00,10.00,-999,-999.00,-999.00,-999.00,1996,2000,1996-01-01,28800,48 
-145,US-Me6,44.323299,-121.607803,1,100.00, 5.20, 2.60,-999,-999.00,-999.00,-999.00,2011,2014,2011-01-01,28800,48 
-146,US-MMS,39.323200,-86.413086,7,100.00,27.00,15.52,-999,-999.00,-999.00,-999.00,1999,2014,1999-01-01,18000,24 
-147,US-MOz,38.744110,-92.200012,7,100.00,24.00,13.80,-999,-999.00,-999.00,-999.00,2005,2006,2005-01-01,21600,48 
-148,US-Myb,38.049801,-121.765106,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2011,2014,2011-01-01,28800,48 
-149,US-Ne1,41.165100,-96.476593,16,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2002,2012,2002-01-01,21600,24 
-150,US-Ne2,41.164902,-96.470093,16,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2002,2012,2002-01-01,21600,24 
-151,US-Ne3,41.179699,-96.439697,15,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2002,2012,2002-01-01,21600,24 
-152,US-NR1,40.032902,-105.546402,1,100.00,12.00, 6.00,-999,-999.00,-999.00,-999.00,1999,2014,1999-01-01,25200,48 
-153,US-PFa,45.945900,-90.272308,1, 8.18,30.00,15.00,7,91.82,30.00,17.25,1995,2014,1995-01-01,21600,24 
-154,US-Prr,65.123703,-147.487595,2,100.00, 7.00, 3.50,-999,-999.00,-999.00,-999.00,2011,2013,2011-01-01,32400,48 
-155,US-SP1,29.738070,-82.218781,1,100.00,22.00,11.00,-999,-999.00,-999.00,-999.00,2005,2005,2005-01-01,18000,48 
-156,US-SP2,29.764799,-82.244812,1,100.00, 1.00, 0.50,-999,-999.00,-999.00,-999.00,2000,2004,2000-01-01,18000,48 
-157,US-SP3,29.754770,-82.163269,5,100.00,10.00, 0.29,-999,-999.00,-999.00,-999.00,1999,2004,1999-01-01,18000,48 
-158,US-SRG,31.789400,-110.827698,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2009,2014,2009-01-01,25200,48 
-159,US-SRM,31.821400,-110.865997,7,70.00, 2.50, 1.44,14,30.00, 0.50, 0.01,2004,2014,2004-01-01,25200,48 
-160,US-Syv,46.242001,-89.347717,1, 4.91,27.00,13.50,7,95.09,27.00,15.53,2002,2008,2002-01-01,21600,48 
-161,US-Ton,38.431599,-120.966003,7,70.00, 7.10, 4.08,14,30.00, 0.50, 0.01,2001,2014,2001-01-01,28800,48 
-162,US-Tw4,38.103001,-121.641403,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2014,2014,2014-01-01,28800,48 
-163,US-Twt,38.108700,-121.653107,16,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2010,2014,2010-01-01,28800,48 
-164,US-UMB,45.559799,-84.713806,7,100.00,20.00,11.50,-999,-999.00,-999.00,-999.00,2000,2014,2000-01-01,18000,24 
-165,US-Var,38.413300,-120.950729,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2001,2014,2001-01-01,28800,48 
-166,US-WCr,45.805901,-90.079895,7,100.00,24.00,13.80,-999,-999.00,-999.00,-999.00,1999,2006,1999-01-01,21600,48 
-167,US-Whs,31.743799,-110.052200,10,30.00, 0.50, 0.10,14,70.00, 0.50, 0.01,2008,2014,2008-01-01,25200,48 
-168,US-Wkg,31.736500,-109.941895,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2005,2014,2005-01-01,25200,48 
-169,ZA-Kru,-25.019699,31.496901,6,30.00,12.00, 6.67,14,70.00, 0.50, 0.01,2000,2002,1999-12-31,79200,48 
-170,ZM-Mon,-15.437778,23.252781,6,100.00,12.00, 6.67,-999,-999.00,-999.00,-999.00,2008,2008,2007-12-31,79200,48 
+#The *_SPIN variables are those that need to be set explicitly for spinup because they can be different for each site
+,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,RUN_STARTDATE_SPIN,CALENDAR_SPIN,DATM_YR_START_SPIN,DATM_YR_END_SPIN,DATM_YR_ALIGN_SPIN,START_TOD_SPIN
+1,AR-SLu,-33.464802,-66.459808,5,50.00, 4.50, 0.13,7,50.00, 4.50, 2.59,2010,2010,2010-01-01,10800,48 ,0001-01-01,NO_LEAP,2010,2010,1,10800
+2,AT-Neu,47.116669,11.317500,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2002,2012,2001-12-31,82800,48 ,2003-01-01,NO_LEAP,2003,2010,2003,82800
+3,AU-ASM,-22.283001,133.248993,1,100.00, 6.50, 3.25,-999,-999.00,-999.00,-999.00,2011,2017,2010-12-31,54000,48 ,2012-01-01,NO_LEAP,2012,2015,2012,54000
+4,AU-Cow,-16.238190,145.427155,4,100.00,22.00, 0.63,-999,-999.00,-999.00,-999.00,2010,2015,2009-12-31,50400,48 ,2011-01-01,NO_LEAP,2011,2014,2011,50400
+5,AU-Cpr,-34.002060,140.589127,7,30.00, 4.00, 2.30,14,70.00, 0.50, 0.01,2011,2017,2010-12-31,46800,48 ,2012-01-01,NO_LEAP,2012,2015,2012,46800
+6,AU-Ctr,-16.103279,145.446854,4,100.00,25.00, 0.71,-999,-999.00,-999.00,-999.00,2010,2017,2009-12-31,50400,48 ,2011-01-01,NO_LEAP,2011,2014,2011,50400
+7,AU-Cum,-33.613297,150.722473,5,100.00,23.00, 0.66,-999,-999.00,-999.00,-999.00,2013,2018,2012-12-31,46800,48 ,2014-01-01,NO_LEAP,2014,2017,2014,46800
+8,AU-DaP,-14.063300,131.318100,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2009,2012,2008-12-31,54000,48 ,0001-01-01,NO_LEAP,2009,2009,1,0
+9,AU-DaS,-14.159283,131.388000,6,30.00,16.40, 9.11,14,70.00, 0.50, 0.01,2010,2017,2009-12-31,54000,48 ,2011-01-01,NO_LEAP,2011,2014,2011,54000
+10,AU-Dry,-15.258800,132.370605,6,30.00,12.30, 6.83,14,70.00, 0.50, 0.01,2011,2015,2010-12-31,54000,48 ,0001-01-01,NO_LEAP,2011,2011,1,0
+11,AU-Emr,-23.858700,148.474594,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2012,2013,2011-12-31,50400,48 ,0001-01-01,NO_LEAP,2012,2012,1,0
+12,AU-Gin,-31.375000,115.650002,7,70.00, 7.00, 4.02,14,30.00, 0.50, 0.01,2012,2017,2011-12-31,57600,48 ,2013-01-01,NO_LEAP,2013,2016,2013,57600
+13,AU-GWW,-30.191299,120.654099,7,30.00,18.00,10.35,14,70.00, 0.50, 0.01,2013,2017,2012-12-31,57600,48 ,0001-01-01,NO_LEAP,2013,2013,1,0
+14,AU-How,-12.495200,131.149994,6,70.00,16.00, 8.89,14,30.00, 0.50, 0.01,2003,2017,2002-12-31,54000,48 ,2004-01-01,NO_LEAP,2004,2015,2004,54000
+15,AU-Lit,-13.179040,130.794495,6,70.00,20.00,11.11,14,30.00, 0.50, 0.01,2016,2017,2015-12-31,54000,48 ,0001-01-01,NO_LEAP,2016,2016,1,0
+16,AU-Otw,-38.532341,142.816803,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2009,2010,2008-12-31,46800,24 ,0001-01-01,NO_LEAP,2009,2009,1,0
+17,AU-Rig,-36.649899,145.575897,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2011,2016,2010-12-31,46800,48 ,2012-01-01,NO_LEAP,2012,2015,2012,46800
+18,AU-Rob,-17.117500,145.630096,4,100.00,44.00, 1.26,-999,-999.00,-999.00,-999.00,2014,2017,2013-12-31,50400,48 ,0001-01-01,NO_LEAP,2014,2014,1,0
+19,AU-Sam,-27.388100,152.877808,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2011,2017,2010-12-31,50400,48 ,2012-01-01,NO_LEAP,2012,2015,2012,50400
+20,AU-Stp,-17.150700,133.350204,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2010,2017,2009-12-31,54000,48 ,2011-01-01,NO_LEAP,2011,2014,2011,54000
+21,AU-TTE,-22.287001,133.639999,10,30.00, 4.85, 0.97,14,70.00, 0.50, 0.01,2013,2017,2012-12-31,54000,48 ,0001-01-01,NO_LEAP,2013,2013,1,0
+22,AU-Tum,-35.656601,148.151703,5,100.00,40.00, 1.14,-999,-999.00,-999.00,-999.00,2002,2017,2001-12-31,46800,24 ,2003-01-01,NO_LEAP,2003,2014,2003,46800
+23,AU-Whr,-36.673199,145.029404,5,100.00,28.00, 0.80,-999,-999.00,-999.00,-999.00,2015,2016,2014-12-31,46800,48 ,0001-01-01,NO_LEAP,2015,2015,1,0
+24,AU-Wrr,-43.095020,146.654495,5,100.00,90.00, 2.57,-999,-999.00,-999.00,-999.00,2016,2017,2015-12-31,46800,48 ,0001-01-01,NO_LEAP,2016,2016,1,0
+25,AU-Ync,-34.989300,146.290695,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2011,2017,2010-12-31,46800,48 ,2012-01-01,NO_LEAP,2012,2015,2012,46800
+26,BE-Bra,51.309166, 4.520560,1,19.22,21.00,10.50,7,80.78,21.00,12.08,2004,2014,2003-12-31,82800,48 ,2005-01-01,NO_LEAP,2005,2012,2005,82800
+27,BE-Lon,50.551590, 4.746130,15,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2005,2014,2004-12-31,82800,48 ,2006-01-01,NO_LEAP,2006,2013,2006,82800
+28,BE-Vie,50.305069, 5.998050,1,25.93,35.00,17.50,7,74.07,35.00,20.13,1997,2014,1996-12-31,82800,48 ,1998-01-01,NO_LEAP,1998,2013,1998,82800
+29,BR-Sa3,-3.018029,-54.971436,4,100.00,40.00, 1.14,-999,-999.00,-999.00,-999.00,2001,2003,2001-01-01,14400,48 ,0001-01-01,NO_LEAP,2002,2002,1,14400
+30,BW-Ma1,-19.916500,23.560329,6,30.00, 8.00, 4.44,14,70.00, 0.50, 0.01,2000,2000,1999-12-31,79200,48 ,0001-01-01,NO_LEAP,2000,2000,1,79200
+31,CA-NS1,55.879200,-98.483887,2,100.00,20.00,10.00,-999,-999.00,-999.00,-999.00,2003,2003,2003-01-01,21600,48 ,0001-01-01,NO_LEAP,2003,2003,1,21600
+32,CA-NS2,55.905800,-98.524689,2,100.00,20.00,10.00,-999,-999.00,-999.00,-999.00,2002,2004,2002-01-01,21600,48 ,0001-01-01,NO_LEAP,2003,2003,1,21600
+33,CA-NS4,55.914398,-98.380615,2,100.00, 7.00, 3.50,-999,-999.00,-999.00,-999.00,2003,2004,2003-01-01,21600,48 ,0001-01-01,NO_LEAP,2004,2004,1,21600
+34,CA-NS5,55.863098,-98.484985,2,100.00, 5.00, 2.50,-999,-999.00,-999.00,-999.00,2003,2004,2003-01-01,21600,48 ,0001-01-01,NO_LEAP,2004,2004,1,21600
+35,CA-NS6,55.916698,-98.964417,10,30.00, 4.00, 0.80,13,70.00, 0.50, 0.01,2002,2004,2002-01-01,21600,48 ,0001-01-01,NO_LEAP,2003,2003,1,21600
+36,CA-NS7,56.635799,-99.948303,10,30.00, 0.25, 0.05,13,70.00, 0.50, 0.01,2003,2004,2003-01-01,21600,48 ,0001-01-01,NO_LEAP,2004,2004,1,21600
+37,CA-Qcu,49.267078,-74.036530,1,100.00, 5.50, 2.75,-999,-999.00,-999.00,-999.00,2002,2006,2002-01-01,18000,48 ,0001-01-01,NO_LEAP,2003,2003,1,18000
+38,CA-Qfo,49.692501,-74.342102,1,100.00,14.00, 7.00,-999,-999.00,-999.00,-999.00,2004,2010,2004-01-01,18000,48 ,2005-01-01,NO_LEAP,2005,2008,2005,18000
+39,CA-SF1,54.485001,-105.817596,1,100.00, 6.00, 3.00,-999,-999.00,-999.00,-999.00,2004,2006,2004-01-01,21600,48 ,0001-01-01,NO_LEAP,2005,2005,1,21600
+40,CA-SF2,54.253899,-105.877502,2,100.00, 4.00, 2.00,-999,-999.00,-999.00,-999.00,2003,2005,2003-01-01,21600,48 ,0001-01-01,NO_LEAP,2004,2004,1,21600
+41,CA-SF3,54.091599,-106.005310,10,30.00, 1.00, 0.20,13,70.00, 0.50, 0.01,2003,2005,2003-01-01,21600,48 ,0001-01-01,NO_LEAP,2004,2004,1,21600
+42,CH-Cha,47.210220, 8.410440,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2006,2014,2005-12-31,82800,48 ,2007-01-01,NO_LEAP,2007,2010,2007,82800
+43,CH-Dav,46.815334, 9.855920,1,100.00,25.00,12.50,-999,-999.00,-999.00,-999.00,1997,2014,1996-12-31,82800,48 ,1998-01-01,NO_LEAP,1998,2013,1998,82800
+44,CH-Fru,47.115833, 8.537780,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2007,2014,2006-12-31,82800,48 ,2008-01-01,NO_LEAP,2008,2011,2008,82800
+45,CH-Oe1,47.285831, 7.731940,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2002,2008,2001-12-31,82800,48 ,2003-01-01,NO_LEAP,2003,2006,2003,82800
+46,CN-Cha,42.402500,128.095795,1, 8.79,28.00,14.00,7,91.21,28.00,16.10,2003,2005,2002-12-31,57600,48 ,0001-01-01,NO_LEAP,2003,2003,1,0
+47,CN-Cng,44.593399,123.509201,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2008,2009,2007-12-31,57600,48 ,0001-01-01,NO_LEAP,2008,2008,1,0
+48,CN-Dan,30.497801,91.066399,12,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2004,2005,2003-12-31,57600,48 ,0001-01-01,NO_LEAP,2004,2004,1,0
+49,CN-Din,23.173300,112.536102,5,100.00,30.00, 0.86,-999,-999.00,-999.00,-999.00,2003,2005,2002-12-31,57600,48 ,0001-01-01,NO_LEAP,2003,2003,1,0
+50,CN-Du2,42.046700,116.283600,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2007,2008,2006-12-31,57600,48 ,0001-01-01,NO_LEAP,2007,2007,1,0
+51,CN-HaM,37.369999,101.180000,12,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2002,2003,2001-12-31,57600,48 ,0001-01-01,NO_LEAP,2002,2002,1,0
+52,CN-Qia,26.741400,115.058098,1,100.00,13.00, 6.50,-999,-999.00,-999.00,-999.00,2003,2005,2002-12-31,57600,48 ,0001-01-01,NO_LEAP,2003,2003,1,0
+53,CZ-wet,49.024651,14.770350,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2007,2014,2006-12-31,82800,48 ,2008-01-01,NO_LEAP,2008,2011,2008,82800
+54,DE-Bay,50.141941,11.866940,1,100.00,25.00,12.50,-999,-999.00,-999.00,-999.00,1997,1999,1996-12-31,82800,48 ,0001-01-01,NO_LEAP,1997,1997,1,0
+55,DE-Geb,51.100101,10.914300,15,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2001,2014,2000-12-31,82800,48 ,2002-01-01,NO_LEAP,2002,2013,2002,82800
+56,DE-Gri,50.949471,13.512530,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2004,2014,2003-12-31,82800,48 ,2005-01-01,NO_LEAP,2005,2012,2005,82800
+57,DE-Hai,51.079166,10.453000,7,100.00,33.00,18.97,-999,-999.00,-999.00,-999.00,2000,2012,1999-12-31,82800,48 ,2001-01-01,NO_LEAP,2001,2008,2001,82800
+58,DE-Kli,50.893059,13.522380,15,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2005,2014,2004-12-31,82800,48 ,2006-01-01,NO_LEAP,2006,2013,2006,82800
+59,DE-Meh,51.275311,10.655470,1, 1.27, 1.00, 0.50,7,98.73, 1.00, 0.58,2004,2006,2003-12-31,82800,48 ,0001-01-01,NO_LEAP,2004,2004,1,0
+60,DE-Obe,50.786659,13.721290,1,100.00,19.00, 9.50,-999,-999.00,-999.00,-999.00,2008,2014,2007-12-31,82800,48 ,2009-01-01,NO_LEAP,2009,2012,2009,82800
+61,DE-Seh,50.870625, 6.449650,15,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2008,2010,2007-12-31,82800,48 ,0001-01-01,NO_LEAP,2008,2008,1,0
+62,DE-SfN,47.806389,11.327500,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2013,2014,2012-12-31,82800,48 ,0001-01-01,NO_LEAP,2013,2013,1,0
+63,DE-Tha,50.963612,13.566940,1,100.00,26.50,13.25,-999,-999.00,-999.00,-999.00,1998,2014,1997-12-31,82800,48 ,1999-01-01,NO_LEAP,1999,2010,1999,82800
+64,DE-Wet,50.453499,11.457530,1,100.00,22.00,11.00,-999,-999.00,-999.00,-999.00,2002,2006,2001-12-31,82800,48 ,0001-01-01,NO_LEAP,2002,2002,1,0
+65,DK-Fou,56.484200, 9.587220,15,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2005,2005,2004-12-31,82800,48 ,0001-01-01,NO_LEAP,2005,2005,1,82800
+66,DK-Lva,55.683300,12.083300,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2005,2006,2004-12-31,82800,48 ,0001-01-01,NO_LEAP,2005,2005,1,0
+67,DK-Ris,55.530281,12.097220,15,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2004,2005,2003-12-31,82800,48 ,0001-01-01,NO_LEAP,2004,2004,1,0
+68,DK-Sor,55.485870,11.644640,7,100.00,25.00,14.37,-999,-999.00,-999.00,-999.00,1997,2014,1996-12-31,82800,48 ,1998-01-01,NO_LEAP,1998,2013,1998,82800
+69,DK-ZaH,74.473282,-20.550293,12,100.00, 0.47, 0.01,-999,-999.00,-999.00,-999.00,2000,2013,2000-01-01,0,48 ,2001-01-01,NO_LEAP,2001,2012,2001,0
+70,ES-ES1,39.345970,-0.318817,1,100.00, 7.50, 3.75,-999,-999.00,-999.00,-999.00,1999,2006,1998-12-31,82800,48 ,2000-01-01,NO_LEAP,2000,2003,2000,82800
+71,ES-ES2,39.275558,-0.315277,-999,-999.00,-999.00,-999.00,16,100.00, 0.50, 0.01,2005,2006,2004-12-31,82800,48 ,0001-01-01,NO_LEAP,2005,2005,1,0
+72,ES-LgS,37.097935,-2.965820,10,30.00, 0.20, 0.04,13,70.00, 0.50, 0.01,2007,2007,2006-12-31,82800,48 ,0001-01-01,NO_LEAP,2007,2007,1,82800
+73,ES-LMa,39.941502,-5.773346,7,30.00, 8.00, 4.60,14,70.00, 0.50, 0.01,2004,2006,2003-12-31,82800,48 ,0001-01-01,NO_LEAP,2004,2004,1,0
+74,ES-VDA,42.152180, 1.448500,7,30.00, 0.50, 0.29,13,70.00, 0.50, 0.01,2004,2004,2003-12-31,82800,48 ,0001-01-01,NO_LEAP,2004,2004,1,82800
+75,FI-Hyy,61.847500,24.295000,1,100.00,14.00, 7.00,-999,-999.00,-999.00,-999.00,1996,2014,1995-12-31,79200,48 ,1997-01-01,NO_LEAP,1997,2012,1997,79200
+76,FI-Kaa,69.140694,27.295031,12,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2000,2002,1999-12-31,79200,48 ,0001-01-01,NO_LEAP,2000,2000,1,0
+77,FI-Lom,67.997200,24.209181,12,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2007,2009,2006-12-31,79200,48 ,0001-01-01,NO_LEAP,2007,2007,1,0
+78,FI-Sod,67.361862,26.637831,1,100.00,12.70, 6.35,-999,-999.00,-999.00,-999.00,2008,2014,2007-12-31,79200,48 ,2009-01-01,NO_LEAP,2009,2012,2009,79200
+79,FR-Fon,48.476398, 2.780140,7,100.00,24.00,13.80,-999,-999.00,-999.00,-999.00,2005,2013,2004-12-31,82800,48 ,2006-01-01,NO_LEAP,2006,2009,2006,82800
+80,FR-Gri,48.844219, 1.951910,15,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2005,2013,2004-12-31,82800,48 ,2006-01-01,NO_LEAP,2006,2009,2006,82800
+81,FR-Hes,48.674160, 7.065560,7,100.00,13.00, 7.47,-999,-999.00,-999.00,-999.00,1997,2006,1996-12-31,82800,48 ,1998-01-01,NO_LEAP,1998,2005,1998,82800
+82,FR-LBr,44.717110,-0.769287,1,100.00,20.00,10.00,-999,-999.00,-999.00,-999.00,2003,2008,2002-12-31,82800,48 ,2004-01-01,NO_LEAP,2004,2007,2004,82800
+83,FR-Lq1,45.643059, 2.735830,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2004,2006,2003-12-31,82800,48 ,0001-01-01,NO_LEAP,2004,2004,1,0
+84,FR-Lq2,45.639191, 2.737030,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2004,2006,2003-12-31,82800,48 ,0001-01-01,NO_LEAP,2004,2004,1,0
+85,FR-Pue,43.741390, 3.595830,5,100.00, 6.50, 0.19,-999,-999.00,-999.00,-999.00,2000,2014,1999-12-31,82800,48 ,2001-01-01,NO_LEAP,2001,2012,2001,82800
+86,GF-Guy, 5.278772,-52.924866,4,100.00,35.00, 1.00,-999,-999.00,-999.00,-999.00,2004,2014,2004-01-01,10800,48 ,2005-01-01,NO_LEAP,2005,2012,2005,10800
+87,HU-Bug,46.691101,19.601299,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2003,2006,2002-12-31,82800,48 ,0001-01-01,NO_LEAP,2003,2003,1,0
+88,ID-Pag,-2.345000,114.036392,4,100.00,26.00, 0.74,-999,-999.00,-999.00,-999.00,2002,2003,2001-12-31,61200,48 ,0001-01-01,NO_LEAP,2002,2002,1,0
+89,IE-Ca1,52.858791,-6.918152,15,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2004,2006,2004-01-01,0,48 ,0001-01-01,NO_LEAP,2005,2005,1,0
+90,IE-Dri,51.986691,-8.751801,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2003,2005,2003-01-01,0,48 ,0001-01-01,NO_LEAP,2004,2004,1,0
+91,IT-Amp,41.904099,13.605160,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2003,2006,2002-12-31,82800,48 ,0001-01-01,NO_LEAP,2003,2003,1,0
+92,IT-BCi,40.523800,14.957440,-999,-999.00,-999.00,-999.00,16,100.00, 0.50, 0.01,2005,2010,2004-12-31,82800,48 ,2006-01-01,NO_LEAP,2006,2009,2006,82800
+93,IT-CA1,42.380409,12.026560,7,100.00, 5.50, 3.16,-999,-999.00,-999.00,-999.00,2012,2013,2011-12-31,82800,48 ,0001-01-01,NO_LEAP,2012,2012,1,0
+94,IT-CA2,42.377220,12.026040,15,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2012,2013,2011-12-31,82800,48 ,0001-01-01,NO_LEAP,2012,2012,1,0
+95,IT-CA3,42.380001,12.022200,7,100.00, 3.50, 2.01,-999,-999.00,-999.00,-999.00,2012,2013,2011-12-31,82800,48 ,0001-01-01,NO_LEAP,2012,2012,1,0
+96,IT-Col,41.849361,13.588140,7,100.00,13.00, 7.47,-999,-999.00,-999.00,-999.00,2007,2014,2006-12-31,82800,48 ,2008-01-01,NO_LEAP,2008,2011,2008,82800
+97,IT-Cpz,41.705250,12.376110,5,100.00,13.00, 0.37,-999,-999.00,-999.00,-999.00,2001,2008,2000-12-31,82800,48 ,2002-01-01,NO_LEAP,2002,2005,2002,82800
+98,IT-Isp,45.812641, 8.633580,7,100.00,19.00,10.93,-999,-999.00,-999.00,-999.00,2013,2014,2012-12-31,82800,48 ,0001-01-01,NO_LEAP,2013,2013,1,0
+99,IT-Lav,45.956200,11.281320,1,100.00,28.00,14.00,-999,-999.00,-999.00,-999.00,2005,2014,2004-12-31,82800,48 ,2006-01-01,NO_LEAP,2006,2013,2006,82800
+100,IT-LMa,45.152580, 7.582590,7,100.00,25.00,14.37,-999,-999.00,-999.00,-999.00,2003,2004,2002-12-31,82800,48 ,0001-01-01,NO_LEAP,2003,2003,1,0
+101,IT-Mal,46.114021,11.703340,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2003,2003,2002-12-31,82800,48 ,0001-01-01,NO_LEAP,2003,2003,1,82800
+102,IT-MBo,46.014679,11.045830,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2003,2012,2002-12-31,82800,48 ,2004-01-01,NO_LEAP,2004,2011,2004,82800
+103,IT-Noe,40.606178, 8.151170,10,70.00, 1.20, 0.24,14,30.00, 0.50, 0.01,2004,2014,2003-12-31,82800,48 ,2005-01-01,NO_LEAP,2005,2012,2005,82800
+104,IT-Non,44.690189,11.091090,7,100.00, 7.00, 4.03,-999,-999.00,-999.00,-999.00,2002,2002,2001-12-31,82800,48 ,0001-01-01,NO_LEAP,2002,2002,1,82800
+105,IT-PT1,45.200871, 9.061040,7,100.00,26.00,14.95,-999,-999.00,-999.00,-999.00,2003,2004,2002-12-31,82800,48 ,0001-01-01,NO_LEAP,2003,2003,1,0
+106,IT-Ren,46.586861,11.433690,1,100.00,28.00,14.00,-999,-999.00,-999.00,-999.00,2010,2013,2009-12-31,82800,48 ,0001-01-01,NO_LEAP,2010,2010,1,0
+107,IT-Ro1,42.408119,11.930010,7,100.00,15.00, 8.62,-999,-999.00,-999.00,-999.00,2002,2006,2001-12-31,82800,48 ,0001-01-01,NO_LEAP,2002,2002,1,0
+108,IT-Ro2,42.390259,11.920930,7,100.00,15.00, 8.62,-999,-999.00,-999.00,-999.00,2002,2008,2001-12-31,82800,48 ,2003-01-01,NO_LEAP,2003,2006,2003,82800
+109,IT-SR2,43.732029,10.290950,1,100.00,19.00, 9.50,-999,-999.00,-999.00,-999.00,2013,2014,2012-12-31,82800,48 ,0001-01-01,NO_LEAP,2013,2013,1,0
+110,IT-SRo,43.727859,10.284440,1,100.00,16.00, 8.00,-999,-999.00,-999.00,-999.00,2003,2012,2002-12-31,82800,48 ,2004-01-01,NO_LEAP,2004,2011,2004,82800
+111,JP-SMF,35.261700,137.078796,1,29.81, 8.10, 4.05,7,70.19, 8.10, 4.66,2003,2006,2002-12-31,54000,48 ,0001-01-01,NO_LEAP,2003,2003,1,0
+112,NL-Ca1,51.971001, 4.927000,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2003,2006,2002-12-31,82800,48 ,0001-01-01,NO_LEAP,2003,2003,1,0
+113,NL-Hor,52.240349, 5.071300,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2008,2011,2007-12-31,82800,48 ,0001-01-01,NO_LEAP,2008,2008,1,0
+114,NL-Loo,52.166580, 5.743560,1,100.00,15.50, 7.75,-999,-999.00,-999.00,-999.00,1997,2013,1996-12-31,82800,48 ,1998-01-01,NO_LEAP,1998,2009,1998,82800
+115,PL-wet,52.762199,16.309401,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2004,2005,2003-12-31,82800,48 ,0001-01-01,NO_LEAP,2004,2004,1,0
+116,PT-Esp,38.639400,-8.601807,5,100.00,20.00, 0.57,-999,-999.00,-999.00,-999.00,2002,2004,2002-01-01,0,48 ,0001-01-01,NO_LEAP,2003,2003,1,0
+117,PT-Mi1,38.540642,-8.000061,5,100.00, 7.30, 0.21,-999,-999.00,-999.00,-999.00,2005,2005,2005-01-01,0,48 ,0001-01-01,NO_LEAP,2005,2005,1,0
+118,PT-Mi2,38.476501,-8.024536,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2005,2006,2005-01-01,0,48 ,0001-01-01,NO_LEAP,2006,2006,1,0
+119,RU-Che,68.613037,161.341431,12,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2003,2004,2002-12-31,46800,48 ,0001-01-01,NO_LEAP,2003,2003,1,0
+120,RU-Fyo,56.461529,32.922081,1,100.00,21.00,10.50,-999,-999.00,-999.00,-999.00,2003,2014,2002-12-31,75600,48 ,2004-01-01,NO_LEAP,2004,2011,2004,75600
+121,RU-Zot,60.800800,89.350800,2,70.00,12.00, 6.00,13,30.00, 0.50, 0.01,2003,2003,2002-12-31,61200,48 ,0001-01-01,NO_LEAP,2003,2003,1,61200
+122,SD-Dem,13.282900,30.478300,6,30.00, 1.50, 0.83,14,70.00, 0.50, 0.01,2005,2009,2004-12-31,75600,48 ,0001-01-01,NO_LEAP,2005,2005,1,0
+123,SE-Deg,64.181969,19.556690,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2002,2005,2001-12-31,82800,48 ,0001-01-01,NO_LEAP,2002,2002,1,0
+124,UK-Gri,56.607220,-3.798065,1,100.00,10.00, 5.00,-999,-999.00,-999.00,-999.00,2000,2001,2000-01-01,0,48 ,0001-01-01,NO_LEAP,2001,2001,1,0
+125,UK-Ham,51.153530,-0.858307,7,100.00,22.00,12.65,-999,-999.00,-999.00,-999.00,2004,2004,2004-01-01,0,48 ,0001-01-01,NO_LEAP,2004,2004,1,0
+126,UK-PL3,51.450001,-1.266663,1, 8.33,22.00,11.00,7,91.67,22.00,12.65,2005,2006,2005-01-01,0,48 ,0001-01-01,NO_LEAP,2006,2006,1,0
+127,US-AR1,36.426701,-99.419983,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2010,2012,2010-01-01,21600,48 ,0001-01-01,NO_LEAP,2011,2011,1,21600
+128,US-AR2,36.635799,-99.597504,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2010,2011,2010-01-01,21600,48 ,0001-01-01,NO_LEAP,2011,2011,1,21600
+129,US-ARM,36.605801,-97.488800,15,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2003,2012,2003-01-01,21600,48 ,2004-01-01,NO_LEAP,2004,2011,2004,21600
+130,US-Aud,31.590700,-110.509201,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2003,2005,2003-01-01,25200,48 ,0001-01-01,NO_LEAP,2004,2004,1,25200
+131,US-Bar,44.064640,-71.288086,1, 8.43,21.00,10.50,7,91.57,21.00,12.07,2005,2005,2005-01-01,18000,48 ,0001-01-01,NO_LEAP,2005,2005,1,18000
+132,US-Bkg,44.345291,-96.836182,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2005,2006,2005-01-01,21600,48 ,0001-01-01,NO_LEAP,2006,2006,1,21600
+133,US-Blo,38.895302,-120.632751,1,100.00, 4.70, 2.35,-999,-999.00,-999.00,-999.00,2000,2006,2000-01-01,28800,48 ,2001-01-01,NO_LEAP,2001,2004,2001,28800
+134,US-Bo1,40.006199,-88.290405,15,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,1997,2006,1997-01-01,21600,48 ,1998-01-01,NO_LEAP,1998,2005,1998,21600
+135,US-Cop,38.090000,-109.389999,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2002,2003,2002-01-01,25200,24 ,0001-01-01,NO_LEAP,2003,2003,1,25200
+136,US-FPe,48.307701,-105.101898,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2000,2006,2000-01-01,25200,48 ,2001-01-01,NO_LEAP,2001,2004,2001,25200
+137,US-GLE,41.366501,-106.239899,1,100.00,10.00, 5.00,-999,-999.00,-999.00,-999.00,2009,2014,2009-01-01,25200,48 ,2010-01-01,NO_LEAP,2010,2013,2010,25200
+138,US-Goo,34.254700,-89.873505,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2004,2006,2004-01-01,21600,48 ,0001-01-01,NO_LEAP,2005,2005,1,21600
+139,US-Ha1,42.537800,-72.171509,7,100.00,25.00,14.37,-999,-999.00,-999.00,-999.00,1992,2012,1992-01-01,18000,24 ,1993-01-01,NO_LEAP,1993,2008,1993,18000
+140,US-Ho1,45.204102,-68.740204,1,100.00,20.00,10.00,-999,-999.00,-999.00,-999.00,1996,2004,1996-01-01,18000,48 ,1997-01-01,NO_LEAP,1997,2000,1997,18000
+141,US-KS2,28.608578,-80.671539,10,70.00, 2.00, 0.40,14,30.00, 0.50, 0.01,2003,2006,2003-01-01,18000,48 ,0001-01-01,NO_LEAP,2004,2004,1,18000
+142,US-Los,46.082699,-89.979187,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2000,2008,2000-01-01,21600,48 ,2001-01-01,NO_LEAP,2001,2004,2001,21600
+143,US-Me2,44.452301,-121.557404,1,100.00,16.00, 8.00,-999,-999.00,-999.00,-999.00,2002,2014,2002-01-01,28800,48 ,2003-01-01,NO_LEAP,2003,2010,2003,28800
+144,US-Me4,44.499199,-121.622406,1,100.00,20.00,10.00,-999,-999.00,-999.00,-999.00,1996,2000,1996-01-01,28800,48 ,0001-01-01,NO_LEAP,1997,1997,1,28800
+145,US-Me6,44.323299,-121.607803,1,100.00, 5.20, 2.60,-999,-999.00,-999.00,-999.00,2011,2014,2011-01-01,28800,48 ,0001-01-01,NO_LEAP,2012,2012,1,28800
+146,US-MMS,39.323200,-86.413086,7,100.00,27.00,15.52,-999,-999.00,-999.00,-999.00,1999,2014,1999-01-01,18000,24 ,2000-01-01,NO_LEAP,2000,2011,2000,18000
+147,US-MOz,38.744110,-92.200012,7,100.00,24.00,13.80,-999,-999.00,-999.00,-999.00,2005,2006,2005-01-01,21600,48 ,0001-01-01,NO_LEAP,2006,2006,1,21600
+148,US-Myb,38.049801,-121.765106,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2011,2014,2011-01-01,28800,48 ,0001-01-01,NO_LEAP,2012,2012,1,28800
+149,US-Ne1,41.165100,-96.476593,-999,-999.00,-999.00,-999.00,16,100.00, 0.50, 0.01,2002,2012,2002-01-01,21600,24 ,2003-01-01,NO_LEAP,2003,2010,2003,21600
+150,US-Ne2,41.164902,-96.470093,-999,-999.00,-999.00,-999.00,16,100.00, 0.50, 0.01,2002,2012,2002-01-01,21600,24 ,2003-01-01,NO_LEAP,2003,2010,2003,21600
+151,US-Ne3,41.179699,-96.439697,15,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2002,2012,2002-01-01,21600,24 ,2003-01-01,NO_LEAP,2003,2010,2003,21600
+152,US-NR1,40.032902,-105.546402,1,100.00,12.00, 6.00,-999,-999.00,-999.00,-999.00,1999,2014,1999-01-01,25200,48 ,2000-01-01,NO_LEAP,2000,2011,2000,25200
+153,US-PFa,45.945900,-90.272308,1, 8.18,30.00,15.00,7,91.82,30.00,17.25,1995,2014,1995-01-01,21600,24 ,1996-01-01,NO_LEAP,1996,2011,1996,21600
+154,US-Prr,65.123703,-147.487595,2,100.00, 7.00, 3.50,-999,-999.00,-999.00,-999.00,2011,2013,2011-01-01,32400,48 ,0001-01-01,NO_LEAP,2012,2012,1,32400
+155,US-SP1,29.738070,-82.218781,1,100.00,22.00,11.00,-999,-999.00,-999.00,-999.00,2005,2005,2005-01-01,18000,48 ,0001-01-01,NO_LEAP,2005,2005,1,18000
+156,US-SP2,29.764799,-82.244812,1,100.00, 1.00, 0.50,-999,-999.00,-999.00,-999.00,2000,2004,2000-01-01,18000,48 ,0001-01-01,NO_LEAP,2001,2001,1,18000
+157,US-SP3,29.754770,-82.163269,5,100.00,10.00, 0.29,-999,-999.00,-999.00,-999.00,1999,2004,1999-01-01,18000,48 ,2000-01-01,NO_LEAP,2000,2003,2000,18000
+158,US-SRG,31.789400,-110.827698,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2009,2014,2009-01-01,25200,48 ,2010-01-01,NO_LEAP,2010,2013,2010,25200
+159,US-SRM,31.821400,-110.865997,7,70.00, 2.50, 1.44,14,30.00, 0.50, 0.01,2004,2014,2004-01-01,25200,48 ,2005-01-01,NO_LEAP,2005,2012,2005,25200
+160,US-Syv,46.242001,-89.347717,1, 4.91,27.00,13.50,7,95.09,27.00,15.53,2002,2008,2002-01-01,21600,48 ,2003-01-01,NO_LEAP,2003,2006,2003,21600
+161,US-Ton,38.431599,-120.966003,7,70.00, 7.10, 4.08,14,30.00, 0.50, 0.01,2001,2014,2001-01-01,28800,48 ,2002-01-01,NO_LEAP,2002,2013,2002,28800
+162,US-Tw4,38.103001,-121.641403,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2014,2014,2014-01-01,28800,48 ,0001-01-01,NO_LEAP,2014,2014,1,28800
+163,US-Twt,38.108700,-121.653107,-999,-999.00,-999.00,-999.00,16,100.00, 0.50, 0.01,2010,2014,2010-01-01,28800,48 ,0001-01-01,NO_LEAP,2011,2011,1,28800
+164,US-UMB,45.559799,-84.713806,7,100.00,20.00,11.50,-999,-999.00,-999.00,-999.00,2000,2014,2000-01-01,18000,24 ,2001-01-01,NO_LEAP,2001,2012,2001,18000
+165,US-Var,38.413300,-120.950729,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2001,2014,2001-01-01,28800,48 ,2002-01-01,NO_LEAP,2002,2013,2002,28800
+166,US-WCr,45.805901,-90.079895,7,100.00,24.00,13.80,-999,-999.00,-999.00,-999.00,1999,2006,1999-01-01,21600,48 ,2000-01-01,NO_LEAP,2000,2003,2000,21600
+167,US-Whs,31.743799,-110.052200,10,30.00, 0.50, 0.10,14,70.00, 0.50, 0.01,2008,2014,2008-01-01,25200,48 ,2009-01-01,NO_LEAP,2009,2012,2009,25200
+168,US-Wkg,31.736500,-109.941895,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2005,2014,2005-01-01,25200,48 ,2006-01-01,NO_LEAP,2006,2013,2006,25200
+169,ZA-Kru,-25.019699,31.496901,6,30.00,12.00, 6.67,14,70.00, 0.50, 0.01,2000,2002,1999-12-31,79200,48 ,0001-01-01,NO_LEAP,2000,2000,1,0
+170,ZM-Mon,-15.437778,23.252781,6,100.00,12.00, 6.67,-999,-999.00,-999.00,-999.00,2008,2008,2007-12-31,79200,48 ,0001-01-01,NO_LEAP,2008,2008,1,79200
diff --git a/tools/site_and_regional/create_PLUMBER2_sites_csv.ncl b/tools/site_and_regional/create_PLUMBER2_sites_csv.ncl
index b83e3ef3a7..1017634a7e 100644
--- a/tools/site_and_regional/create_PLUMBER2_sites_csv.ncl
+++ b/tools/site_and_regional/create_PLUMBER2_sites_csv.ncl
@@ -1,7 +1,55 @@
 ; NCL script
 ; create_PLUMBER2_sites_csv.ncl ; Keith Oleson, Sep 2023
-; This script generates a csv file for the NEON site_and_regional infrastructure
+; This script generates a PLUMBER2 csv file for the run_tower infrastructure.
 ; PLUMBER2_sites.csv
+; Modified Jun 2026 by Keith Oleson to add output for spinup
+; For spinup, we go into each case directory for the set of simulations that were run for this article:
+; Abramowitz, G., Ukkola, A., Hobeichi, S., Cranko Page, J., Lipson, M., De Kauwe, M. G., Green, S., Brenner, C.,
+; Frame, J., Nearing, G., Clark, M., Best, M., Anthoni, P., Arduini, G., Boussetta, S., Caldararu, S., Cho, K.,
+; Cuntz, M., Fairbairn, D., Ferguson, C. R., Kim, H., Kim, Y., Knauer, J., Lawrence, D., Luo, X., Malyshev, S.,
+; Nitta, T., Ogee, J., Oleson, K., Ottlé, C., Peylin, P., de Rosnay, P., Rumbold, H., Su, B., Vuichard, N., Walker, A. P.,
+; Wang-Faivre, X., Wang, Y., and Zeng, Y.: On the predictability of turbulent fluxes from land: PLUMBER2 MIP
+; experimental description and preliminary results, Biogeosciences, 21, 5517–5538, 
+; https://doi.org/10.5194/bg-21-5517-2024, 2024, and xmlquery the following variables so that they can be 
+; added to the csv file:
+; RUN_STARTDATE
+; CALENDAR
+; DATM_YR_START
+; DATM_YR_END
+; DATM_YR_ALIGN
+; START_TOD
+
+; The rationale for how these are set for spinup is as follows:
+; To avoid dtlimit errors during spinup as much as possible, we do not use the first year or the last year of forcing and
+; start at GMT=local midnight. So we need at least six years to loop over 4 year blocks in gregorian mode.
+; dtlimit errors occur in cases when we try to start at GMT 0 of the first year and there is no data at GMT=0 (e.g., US-Ha1),
+; or when we try to start at GMT \= 0 of the first year (to start at local time midnight) and loop back around, because model
+; may not have data at the end of that year of forcing. The forcing for the last time step of the year is then repeated for
+; the number of time steps that local time is different from GMT.  The dtlimit errors vary in size depending on the local
+; time/GMT offset.
+; If we have at least four years even when skipping first and last year of forcing, then we use available multiples 
+; of four years. The CALENDAR is set to GREGORIAN. There shouldn't be any dlimit errors for these cases when using the 
+; default setting of 1.5.
+
+; Special cases where there are less than four years of forcing are handled as follows:
+
+; If have only one year then we must obviously use that year of forcing. We start at GMT=local midnight and set 
+; dtlimit to 50. The consequence is that the forcing for the last time step of the year is repeated for the
+; number of time steps that local time is different from GMT (unavoidable in this case).
+; We use an alignyear of 1 and set the CALENDAR to NO_LEAP (because otherwise model expects leap day avery fourth year and
+; it may not be available).
+
+; If we have two years or three years, repeat first year of forcing and start at GMT=0 (for cases where
+; starting month is December), or repeat second year of forcing and start at GMT=local midnight (for cases 
+; where the starting month is January).
+; We use an alignyear of 1 and set the CALENDAR to NO_LEAP (because otherwise model expects leap day avery fourth year and it
+; may not be available. There shouldn't be any dlimit errors for these cases when using the defaut setting of 1.5.
+
+; Note that although setting dtlimit to 50 for spinup is not strictly required for all sites as noted above, it is set to 
+; 50 by CDEPS nonetheless rather than implementing special handling in CDEPS for all 170 PLUMBER2 sites.
+
+; All of the csv fields are then read in using plumber2_usermods to generate a set of shell commands found at 
+; cime_config/usermods_dirs/clm/PLUMBER2
 ;**************************************
 
 load "$NCARG_ROOT/lib/ncarg/nclscripts/csm/shea_util.ncl"
@@ -12,23 +60,30 @@ begin
   print ("Start Time: "+systemfunc("date") )
   print ("=========================================")
 
-
 ; Sites (170 sites)
-  sim = systemfunc("ls -1 " + "/glade/work/oleson/PLUMBER2/datm_files/")
+  sim = systemfunc("ls -1 " + "/glade/campaign/cesm/cesmdata/cseg/inputdata/atm/datm7/CLM1PT_data/PLUMBER2/")
 
   nsim = dimsizes(sim)
-  site_num       = new(nsim,"integer")
-  atm_ncpl       = new(nsim,"string")
-  startyear      = new(nsim,"string")
-  endyear        = new(nsim,"string")
-  localstartyear = new(nsim,"string")
-  startmonth     = new(nsim,"string")
-  startday       = new(nsim,"string")
-  run_startdate  = new(nsim,"string")
-  starttod       = new(nsim,"string")
-  nsteps         = new(nsim,"string")
-  latitude       = new(nsim,"double")
-  longitude      = new(nsim,"double")
+  site_num           = new(nsim,"integer")
+  atm_ncpl           = new(nsim,"string")
+  startyear          = new(nsim,"string")
+  endyear            = new(nsim,"string")
+  localstartyear     = new(nsim,"string")
+  startmonth         = new(nsim,"string")
+  startday           = new(nsim,"string")
+  run_startdate      = new(nsim,"string")
+  starttod           = new(nsim,"string")
+  nsteps             = new(nsim,"string")
+  latitude           = new(nsim,"double")
+  longitude          = new(nsim,"double")
+  run_startdate_spin = new(nsim,"string")
+  calendar_spin      = new(nsim,"string")
+  datm_yr_start_spin = new(nsim,"string")
+  datm_yr_end_spin   = new(nsim,"string")
+  datm_yr_align_spin = new(nsim,"string")
+  start_tod_spin     = new(nsim,"string")
+
+  delim = " "
 
   npfts_ch = 17  ; Number of pfts for canopy top/bottom height
 
@@ -40,139 +95,181 @@ begin
 
   do sel = 0,nsim - 1
 
-  site_num(sel) = sel+1
-
-; Specify input directory
-  f_in_dir  = "/glade/work/oleson/PLUMBER2/datm_files/"+sim(sel)+"/CLM1PT_data/"
-  fls = systemfunc("ls " + f_in_dir + "CTSM_DATM_" + sim(sel) + "_*-*"+".nc")
-  command = "echo " + f_in_dir + "CTSM_DATM_" + sim(sel) + "_*.nc" + " | cut -c76-79"
-  startyear(sel) = systemfunc(command)
-  command = "echo " + f_in_dir + "CTSM_DATM_" + sim(sel) + "_*.nc" + " | cut -c81-84"
-  endyear(sel) = systemfunc(command)
-  datmfile = addfile(fls,"r")
-  time = datmfile->time
-  atm_ncpl(sel) = tostring(sprinti("%0.2i ",tointeger(86400./(time(1)-time(0)))))
-  if (isint64(time)) then
-    tmp = toint(time)
-    copy_VarCoords(time,tmp)
-    copy_VarAtts(time,tmp)
-  else
-    tmp  = time
-    copy_VarCoords(time,tmp)
-    copy_VarAtts(time,tmp)
-  end if
-  utc_date = cd_calendar(tmp(0),0)
-  localstartyear(sel) = tostring(tointeger(utc_date(0,0)))
-  startmonth(sel) = tostring(sprinti("%0.2i ",tointeger(utc_date(0,1))))
-  startday(sel) = tostring(sprinti("%0.2i ",tointeger(utc_date(0,2))))
-  starttod(sel) = tostring(tointeger(utc_date(0,3)/24 * 86400))
-  nsteps(sel) = dimsizes(tmp)
-
-  latitude(sel) = datmfile->LATIXY(0,0)
-  longitude(sel) = datmfile->LONGXY(0,0)
-
-  if (longitude(sel) .gt. 180.d) then
-    longitude(sel) = longitude(sel) - 360.d
-  end if
-
-  delete(time)
-  delete(tmp)
-  delete(utc_date)
-
-  run_startdate(sel) = tostring(sprinti("%0.4i",tointeger(localstartyear(sel))))+"-"+tostring(sprinti("%0.2i",tointeger(startmonth(sel))))+"-"+tostring(sprinti("%0.2i",tointeger(startday(sel))))
-
-  f_in_dir  = "/glade/work/oleson/PLUMBER2/input_files/"+sim(sel)+"/"
-  fls = systemfunc("ls " + f_in_dir + "surfdata_0.9x1.25_16pfts_" + sim(sel) + ".nc")
-  surfdatafile = addfile(fls,"r")
-  pct_natveg = surfdatafile->PCT_NATVEG(0,0)
-  monthly_height_top = surfdatafile->MONTHLY_HEIGHT_TOP(0,:,0,0)  ; For SP, all months have the same height
-  monthly_height_bot = surfdatafile->MONTHLY_HEIGHT_BOT(0,:,0,0)  ; For SP, all months have the same height
-  if (pct_natveg .gt. 0.) then
-    pct_nat_pft = surfdatafile->PCT_NAT_PFT(:,0,0)
-    indx = ind(pct_nat_pft(:) .gt. 0)
-    npfts = dimsizes(indx)
-    if (npfts .gt. 2) then
-      print((/"Number of pfts is > 2"/))
-      pfttype(sel,:) = -999
-      pftperc(sel,:) = -999.
-      pftcth(sel,:)  = -999.
-      pftcbh(sel,:)  = -999.
+    site_num(sel) = sel+1
+
+    print((/sim(sel)/))
+    ; Specify input directory
+    f_in_dir  = "/glade/campaign/cesm/cesmdata/cseg/inputdata/atm/datm7/CLM1PT_data/PLUMBER2/"+sim(sel)+"/CLM1PT_data/"
+    fls = systemfunc("ls " + f_in_dir + "CTSM_DATM_" + sim(sel) + "_*-*"+".nc")
+    command = "echo " + f_in_dir + "CTSM_DATM_" + sim(sel) + "_*.nc" + " | cut -c113-116"
+    startyear(sel) = systemfunc(command)
+    command = "echo " + f_in_dir + "CTSM_DATM_" + sim(sel) + "_*.nc" + " | cut -c118-121"
+    endyear(sel) = systemfunc(command)
+    datmfile = addfile(fls,"r")
+    time = datmfile->time
+    atm_ncpl(sel) = tostring(sprinti("%0.2i ",tointeger(86400./(time(1)-time(0)))))
+    if (isint64(time)) then
+      tmp = toint(time)
+      copy_VarCoords(time,tmp)
+      copy_VarAtts(time,tmp)
+    else
+      tmp  = time
+      copy_VarCoords(time,tmp)
+      copy_VarAtts(time,tmp)
+    end if
+    utc_date = cd_calendar(tmp(0),0)
+    localstartyear(sel) = tostring(tointeger(utc_date(0,0)))
+    startmonth(sel) = tostring(sprinti("%0.2i ",tointeger(utc_date(0,1))))
+    startday(sel) = tostring(sprinti("%0.2i ",tointeger(utc_date(0,2))))
+    starttod(sel) = tostring(tointeger(utc_date(0,3)/24 * 86400))
+    nsteps(sel) = dimsizes(tmp)
+
+    latitude(sel) = datmfile->LATIXY(0,0)
+    longitude(sel) = datmfile->LONGXY(0,0)
+
+    if (longitude(sel) .gt. 180.d) then
+      longitude(sel) = longitude(sel) - 360.d
+    end if
+
+    delete(time)
+    delete(tmp)
+    delete(utc_date)
+
+    run_startdate(sel) = tostring(sprinti("%0.4i",tointeger(localstartyear(sel))))+"-"+tostring(sprinti("%0.2i",tointeger(startmonth(sel))))+"-"+tostring(sprinti("%0.2i",tointeger(startday(sel))))
+
+    f_in_dir  = "/glade/campaign/cgd/tss/projects/PLUMBER2/input_files/"+sim(sel)+"/"
+    fls = systemfunc("ls " + f_in_dir + "surfdata_0.9x1.25_16pfts_" + sim(sel) + ".nc")
+    surfdatafile = addfile(fls,"r")
+    pct_natveg = surfdatafile->PCT_NATVEG(0,0)
+    monthly_height_top = surfdatafile->MONTHLY_HEIGHT_TOP(0,:,0,0)  ; For SP, all months have the same height
+    monthly_height_bot = surfdatafile->MONTHLY_HEIGHT_BOT(0,:,0,0)  ; For SP, all months have the same height
+    if (pct_natveg .gt. 0.) then
+      pct_nat_pft = surfdatafile->PCT_NAT_PFT(:,0,0)
+      indx = ind(pct_nat_pft(:) .gt. 0)
+      npfts = dimsizes(indx)
+      if (npfts .gt. 2) then
+        print((/"Number of pfts is > 2"/))
+        pfttype(sel,:) = -999
+        pftperc(sel,:) = -999.
+        pftcth(sel,:)  = -999.
+        pftcbh(sel,:)  = -999.
+      else
+        pfttype(sel,:) = -999
+        pftperc(sel,:) = -999.
+        pftcth(sel,:)  = -999.
+        pftcbh(sel,:)  = -999.
+        do p = 0,npfts-1
+          pfttype(sel,p) = indx(p)
+          pftperc(sel,p) = pct_nat_pft(indx(p))
+          pftcth(sel,p)  = monthly_height_top(indx(p))
+          pftcbh(sel,p)  = monthly_height_bot(indx(p))
+        end do
+      end if
+      pctwet(sel) = 0.
+      delete(pct_nat_pft)
+      delete(indx)
     else
+      print((/"PCT_NATVEG is zero"/))
       pfttype(sel,:) = -999
       pftperc(sel,:) = -999.
       pftcth(sel,:)  = -999.
       pftcbh(sel,:)  = -999.
-      do p = 0,npfts-1
-         pfttype(sel,p) = indx(p)
-         pftperc(sel,p) = pct_nat_pft(indx(p))
-         pftcth(sel,p)  = monthly_height_top(indx(p))
-         pftcbh(sel,p)  = monthly_height_bot(indx(p))
-      end do
-    end if
-    pctwet(sel) = 0.
-    delete(pct_nat_pft)
-    delete(indx)
-  else
-    print((/"PCT_NATVEG is zero"/))
-    pfttype(sel,:) = -999
-    pftperc(sel,:) = -999.
-    pftcth(sel,:)  = -999.
-    pftcbh(sel,:)  = -999.
-    pct_wetland = surfdatafile->PCT_WETLAND(0,0)
-    if (pct_wetland .gt. 0.) then
-      print((/"Wetland Site"/))
-      pctwet(sel) = pct_wetland
-    else
-      print((/"PCT_NATVEG and PCT_WETLAND are both zero"/))
-      pctwet(sel) = 0.
-      pct_crop = surfdatafile->PCT_CROP(0,0)
-      if (pct_crop .gt. 0.) then
-        print((/"Crop Site"/))
-        pct_cft = surfdatafile->PCT_CFT(:,0,0)
-        if (pct_cft(0) .gt. 0.) then
-          pfttype(sel,0) = 15
-          pftperc(sel,0) = (/pct_cft(0)/)
-          pftcth(sel,0)  = monthly_height_top(15)
-          pftcbh(sel,0)  = monthly_height_bot(15)
-        else
-          pfttype(sel,0) = -999
-          pftperc(sel,0) = -999.
-          pftcth(sel,0)  = -999.
-          pftcbh(sel,0)  = -999.
-        end if
-        if (pct_cft(1) .gt. 0.) then
-          pfttype(sel,1) = 16
-          pftperc(sel,1) = (/pct_cft(1)/)
-          pftcth(sel,1)  = monthly_height_top(16)
-          pftcbh(sel,1)  = monthly_height_bot(16)
+      pct_wetland = surfdatafile->PCT_WETLAND(0,0)
+      if (pct_wetland .gt. 0.) then
+        print((/"Wetland Site"/))
+        pctwet(sel) = pct_wetland
+      else
+        print((/"PCT_NATVEG and PCT_WETLAND are both zero"/))
+        pctwet(sel) = 0.
+        pct_crop = surfdatafile->PCT_CROP(0,0)
+        if (pct_crop .gt. 0.) then
+          print((/"Crop Site"/))
+          pct_cft = surfdatafile->PCT_CFT(:,0,0)
+          if (pct_cft(0) .gt. 0.) then
+            pfttype(sel,0) = 15
+            pftperc(sel,0) = (/pct_cft(0)/)
+            pftcth(sel,0)  = monthly_height_top(15)
+            pftcbh(sel,0)  = monthly_height_bot(15)
+          else
+            pfttype(sel,0) = -999
+            pftperc(sel,0) = -999.
+            pftcth(sel,0)  = -999.
+            pftcbh(sel,0)  = -999.
+          end if
+          if (pct_cft(1) .gt. 0.) then
+            pfttype(sel,1) = 16
+            pftperc(sel,1) = (/pct_cft(1)/)
+            pftcth(sel,1)  = monthly_height_top(16)
+            pftcbh(sel,1)  = monthly_height_bot(16)
+          else
+            pfttype(sel,1) = -999
+            pftperc(sel,1) = -999.
+            pftcth(sel,1)  = -999.
+            pftcbh(sel,1)  = -999.
+          end if
         else
-          pfttype(sel,1) = -999
-          pftperc(sel,1) = -999.
-          pftcth(sel,1)  = -999.
-          pftcbh(sel,1)  = -999.
+          print((/"PCT_NATVEG, PCT_WETLAND, PCT_CROP are all zero"/))
         end if
-      else
-        print((/"PCT_NATVEG, PCT_WETLAND, PCT_CROP are all zero"/))
       end if
     end if
-  end if
+
+    ; Specify case directory to get spinup variables
+    case_pref = "spinclm50conr34sp_"
+    case_suff = "_I1PtClm50SpGs"
+    f_in_dir  = "/glade/campaign/cgd/tss/projects/PLUMBER2/Case_Directories/"+case_pref+sim(sel)+case_suff+"/"
+
+    strs = systemfunc("cd " + f_in_dir +" ; python ./xmlquery RUN_STARTDATE")
+    print((/strs/))
+    run_startdate_spin(sel) = str_get_field(strs, 2, delim)
+    print((/run_startdate_spin(sel)/))
+
+    strs = systemfunc("cd " + f_in_dir +" ; python ./xmlquery CALENDAR")
+    print((/strs/))
+    calendar_spin(sel) = str_get_field(strs, 2, delim)
+    ; KWO This is a workaround for CTSM Issue #
+    ; Currently, we can't change the CALENDAR in env_build.xml in a case
+    ; that was cloned from a base case and uses the base case executable.
+    calendar_spin(sel) = "NO_LEAP"
+    print((/calendar_spin(sel)/))
+
+    strs = systemfunc("cd " + f_in_dir +" ; python ./xmlquery DATM_CLMNCEP_YR_START")
+    print((/strs/))
+    datm_yr_start_spin(sel) = str_get_field(strs, 2, delim)
+    print((/datm_yr_start_spin(sel)/))
+
+    strs = systemfunc("cd " + f_in_dir +" ; python ./xmlquery DATM_CLMNCEP_YR_END")
+    print((/strs/))
+    datm_yr_end_spin(sel) = str_get_field(strs, 2, delim)
+    print((/datm_yr_end_spin(sel)/))
+
+    strs = systemfunc("cd " + f_in_dir +" ; python ./xmlquery DATM_CLMNCEP_YR_ALIGN")
+    print((/strs/))
+    datm_yr_align_spin(sel) = str_get_field(strs, 2, delim)
+    print((/datm_yr_align_spin(sel)/))
+
+    strs = systemfunc("cd " + f_in_dir +" ; python ./xmlquery START_TOD")
+    print((/strs/))
+    start_tod_spin(sel) = str_get_field(strs, 2, delim)
+    print((/start_tod_spin(sel)/))
 
   end do
 
   print((/"Done with Loop"/))
 
-  fname = "/glade/work/oleson/ctsm_PLUMBERcsv/tools/site_and_regional/PLUMBER2_sites.csv"
+  fname = systemfunc("pwd") + "/PLUMBER2_sites.csv"
+  print(fname)
   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_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"/)
+             "#The *_SPIN variables are those that need to be set explicitly for spinup because they can be different for each site", \
+             ",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,RUN_STARTDATE_SPIN,CALENDAR_SPIN,DATM_YR_START_SPIN,DATM_YR_END_SPIN,DATM_YR_ALIGN_SPIN,START_TOD_SPIN"/)
   hlist = [/header/]
-  alist = [/site_num, sim, latitude, longitude, pfttype(:,0), pftperc(:,0), pftcth(:,0), pftcbh(:,0), pfttype(:,1), pftperc(:,1), pftcth(:,1), pftcbh(:,1),startyear, endyear, run_startdate, starttod, atm_ncpl/]
+  alist = [/site_num, sim, latitude, longitude, pfttype(:,0), pftperc(:,0), pftcth(:,0), pftcbh(:,0), pfttype(:,1), pftperc(:,1), pftcth(:,1), pftcbh(:,1),startyear, endyear, run_startdate, starttod, atm_ncpl, run_startdate_spin, calendar_spin, datm_yr_start_spin, datm_yr_end_spin, datm_yr_align_spin, start_tod_spin/]
   print((/"Done defining hlist and alist"/))
   write_table(fname, "w", hlist, "%s")
   print((/"Done with header"/))
-  write_table(fname, "a", alist, "%d,%s,%9.6f,%9.6f,%d,%5.2f,%5.2f,%5.2f,%d,%5.2f,%5.2f,%5.2f,%s,%s,%s,%s,%s")
+  write_table(fname, "a", alist, "%d,%s,%9.6f,%9.6f,%d,%5.2f,%5.2f,%5.2f,%d,%5.2f,%5.2f,%5.2f,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s")
 
   print ("=========================================")
   print ("Finish Time: "+systemfunc("date") )