diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 4798c37853..9393919e95 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -1,4 +1,5 @@
# Ran python directory through black python formatter
+b429b63824e09f82e95d2982f14311cbbd8e4a37
d229b5c6689efc4c2a6cef077515c4ccd5c18ff6
4cd83cb3ee6d85eb909403487abf5eeaf4d98911
0aa2957c1f8603c63fa30b11295c06cfddff44a5
diff --git a/bld/namelist_files/namelist_definition_ctsm.xml b/bld/namelist_files/namelist_definition_ctsm.xml
index a2e9fb86da..b326ca5276 100644
--- a/bld/namelist_files/namelist_definition_ctsm.xml
+++ b/bld/namelist_files/namelist_definition_ctsm.xml
@@ -1971,6 +1971,12 @@ Filename of input stream data for LAI
Filename of input stream data for LAI
+
+dtlimit (ratio of max/min stream delta times) for LAI streams, which allows for cycling over a year of data
+
+
+
Time interpolation method to use with LAI streams
diff --git a/cime_config/usermods_dirs/PLUMBER2/AR-SLu/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/AR-SLu/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/AR-SLu/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands
new file mode 100644
index 0000000000..f64d8759a2
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-66.459808
+./xmlchange PTS_LAT=-33.464802
+./xmlchange DATM_YR_END=2010
+./xmlchange START_TOD=10800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AR-SLu_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AR-SLu/CLM1PT_data/CTSM_DATM_AR-SLu_2010-2010.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2010" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2010" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2010" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2010" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2010" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2010" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2010" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=1
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2010-01-01
+ ./xmlchange DATM_YR_ALIGN=2010
+ ./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=2010
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AR-SLu/LAI_stream_AR-SLu_2010-2010.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2010" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2010" >> user_nl_clm
+ echo "stream_year_first_lai=2010" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2010" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/AT-Neu/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/AT-Neu/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/AT-Neu/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands
new file mode 100644
index 0000000000..b8a54e5644
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=11.3175
+./xmlchange PTS_LAT=47.116669
+./xmlchange DATM_YR_END=2012
+./xmlchange START_TOD=82800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AT-Neu_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AT-Neu/CLM1PT_data/CTSM_DATM_AT-Neu_2002-2012.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2012" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2012" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=11
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2001-12-31
+ ./xmlchange DATM_YR_ALIGN=2001
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AT-Neu/LAI_stream_AT-Neu_2002-2012.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2012" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2001" >> user_nl_clm
+ echo "stream_year_first_lai=2001" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2002" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-ASM/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/AU-ASM/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-ASM/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands
new file mode 100644
index 0000000000..2d5e0d85fd
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=133.24899299999998
+./xmlchange PTS_LAT=-22.283001000000002
+./xmlchange DATM_YR_END=2017
+./xmlchange START_TOD=54000
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-ASM_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-ASM/CLM1PT_data/CTSM_DATM_AU-ASM_2011-2017.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2011" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2011" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2011" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2011" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=7
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2010-12-31
+ ./xmlchange DATM_YR_ALIGN=2010
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-ASM/LAI_stream_AU-ASM_2011-2017.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2017" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2010" >> user_nl_clm
+ echo "stream_year_first_lai=2010" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2011" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cow/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/AU-Cow/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-Cow/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands
new file mode 100644
index 0000000000..fe84b1e129
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=145.427155
+./xmlchange PTS_LAT=-16.23819
+./xmlchange DATM_YR_END=2015
+./xmlchange START_TOD=50400
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Cow_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Cow/CLM1PT_data/CTSM_DATM_AU-Cow_2010-2015.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2015" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2010" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2015" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2010" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2010" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2015" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2010" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=6
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2009-12-31
+ ./xmlchange DATM_YR_ALIGN=2009
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Cow/LAI_stream_AU-Cow_2010-2015.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2015" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2009" >> user_nl_clm
+ echo "stream_year_first_lai=2009" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2010" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands
new file mode 100644
index 0000000000..fcb7375d71
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=140.589127
+./xmlchange PTS_LAT=-34.00206
+./xmlchange DATM_YR_END=2017
+./xmlchange START_TOD=46800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Cpr_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Cpr/CLM1PT_data/CTSM_DATM_AU-Cpr_2011-2017.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2011" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2011" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2011" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2011" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=7
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2010-12-31
+ ./xmlchange DATM_YR_ALIGN=2010
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Cpr/LAI_stream_AU-Cpr_2011-2017.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2017" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2010" >> user_nl_clm
+ echo "stream_year_first_lai=2010" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2011" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands
new file mode 100644
index 0000000000..8d42bed60a
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=145.446854
+./xmlchange PTS_LAT=-16.103279
+./xmlchange DATM_YR_END=2017
+./xmlchange START_TOD=50400
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Ctr_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Ctr/CLM1PT_data/CTSM_DATM_AU-Ctr_2010-2017.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2010" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2010" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2010" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2010" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=8
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2009-12-31
+ ./xmlchange DATM_YR_ALIGN=2009
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Ctr/LAI_stream_AU-Ctr_2010-2017.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2017" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2009" >> user_nl_clm
+ echo "stream_year_first_lai=2009" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2010" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cum/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/AU-Cum/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-Cum/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands
new file mode 100644
index 0000000000..17aed3a1dd
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=150.722473
+./xmlchange PTS_LAT=-33.613296999999996
+./xmlchange DATM_YR_END=2018
+./xmlchange START_TOD=46800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Cum_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Cum/CLM1PT_data/CTSM_DATM_AU-Cum_2013-2018.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2018" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2013" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2013" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2018" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2013" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2013" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2018" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2013" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=6
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2012-12-31
+ ./xmlchange DATM_YR_ALIGN=2012
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Cum/LAI_stream_AU-Cum_2013-2018.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2018" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2012" >> user_nl_clm
+ echo "stream_year_first_lai=2012" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2013" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-DaP/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/AU-DaP/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-DaP/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands
new file mode 100644
index 0000000000..816e4c78dc
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=131.3181
+./xmlchange PTS_LAT=-14.0633
+./xmlchange DATM_YR_END=2012
+./xmlchange START_TOD=54000
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-DaP_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-DaP/CLM1PT_data/CTSM_DATM_AU-DaP_2009-2012.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2009" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2009" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2009" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2012" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2009" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2009" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2012" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2009" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=4
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2008-12-31
+ ./xmlchange DATM_YR_ALIGN=2008
+ ./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=2009
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-DaP/LAI_stream_AU-DaP_2009-2012.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2012" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2008" >> user_nl_clm
+ echo "stream_year_first_lai=2008" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2009" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-DaS/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/AU-DaS/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-DaS/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands
new file mode 100644
index 0000000000..0ea37fd95a
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=131.388
+./xmlchange PTS_LAT=-14.159282999999999
+./xmlchange DATM_YR_END=2017
+./xmlchange START_TOD=54000
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-DaS_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-DaS/CLM1PT_data/CTSM_DATM_AU-DaS_2010-2017.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2010" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2010" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2010" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2010" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=8
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2009-12-31
+ ./xmlchange DATM_YR_ALIGN=2009
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-DaS/LAI_stream_AU-DaS_2010-2017.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2017" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2009" >> user_nl_clm
+ echo "stream_year_first_lai=2009" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2010" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Dry/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/AU-Dry/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-Dry/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands
new file mode 100644
index 0000000000..3cd8faecd9
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=132.370605
+./xmlchange PTS_LAT=-15.2588
+./xmlchange DATM_YR_END=2015
+./xmlchange START_TOD=54000
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Dry_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Dry/CLM1PT_data/CTSM_DATM_AU-Dry_2011-2015.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2015" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2011" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2015" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2011" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2011" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2015" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2011" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=5
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2010-12-31
+ ./xmlchange DATM_YR_ALIGN=2010
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Dry/LAI_stream_AU-Dry_2011-2015.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2015" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2010" >> user_nl_clm
+ echo "stream_year_first_lai=2010" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2011" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Emr/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/AU-Emr/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-Emr/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands
new file mode 100644
index 0000000000..7822948582
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=148.474594
+./xmlchange PTS_LAT=-23.8587
+./xmlchange DATM_YR_END=2013
+./xmlchange START_TOD=50400
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Emr_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Emr/CLM1PT_data/CTSM_DATM_AU-Emr_2012-2013.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2012" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2012" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2013" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2012" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2012" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2013" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2012" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=2
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2011-12-31
+ ./xmlchange DATM_YR_ALIGN=2011
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Emr/LAI_stream_AU-Emr_2012-2013.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2013" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2011" >> user_nl_clm
+ echo "stream_year_first_lai=2011" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2012" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-GWW/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/AU-GWW/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-GWW/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands
new file mode 100644
index 0000000000..258ee5f12a
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=120.654099
+./xmlchange PTS_LAT=-30.191299
+./xmlchange DATM_YR_END=2017
+./xmlchange START_TOD=57600
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-GWW_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-GWW/CLM1PT_data/CTSM_DATM_AU-GWW_2013-2017.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2013" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2013" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2013" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2013" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2013" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=5
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2012-12-31
+ ./xmlchange DATM_YR_ALIGN=2012
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-GWW/LAI_stream_AU-GWW_2013-2017.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2017" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2012" >> user_nl_clm
+ echo "stream_year_first_lai=2012" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2013" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Gin/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/AU-Gin/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-Gin/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands
new file mode 100644
index 0000000000..31071a2ebb
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=115.650002
+./xmlchange PTS_LAT=-31.375
+./xmlchange DATM_YR_END=2017
+./xmlchange START_TOD=57600
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Gin_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Gin/CLM1PT_data/CTSM_DATM_AU-Gin_2012-2017.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2012" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2012" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2012" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2012" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2012" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=6
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2011-12-31
+ ./xmlchange DATM_YR_ALIGN=2011
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Gin/LAI_stream_AU-Gin_2012-2017.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2017" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2011" >> user_nl_clm
+ echo "stream_year_first_lai=2011" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2012" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-How/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/AU-How/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-How/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands
new file mode 100644
index 0000000000..411cec6d9c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=131.149994
+./xmlchange PTS_LAT=-12.4952
+./xmlchange DATM_YR_END=2017
+./xmlchange START_TOD=54000
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-How_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-How/CLM1PT_data/CTSM_DATM_AU-How_2003-2017.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=15
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2002-12-31
+ ./xmlchange DATM_YR_ALIGN=2002
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-How/LAI_stream_AU-How_2003-2017.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2017" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2002" >> user_nl_clm
+ echo "stream_year_first_lai=2002" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2003" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Lit/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/AU-Lit/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-Lit/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands
new file mode 100644
index 0000000000..7fc59ce824
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=130.79449499999998
+./xmlchange PTS_LAT=-13.179039999999999
+./xmlchange DATM_YR_END=2017
+./xmlchange START_TOD=54000
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Lit_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Lit/CLM1PT_data/CTSM_DATM_AU-Lit_2016-2017.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2016" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2016" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2016" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2016" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2016" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2016" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=2
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2015-12-31
+ ./xmlchange DATM_YR_ALIGN=2015
+ ./xmlchange DATM_YR_START=2015
+else
+ # for spinup case with I2000 compset
+ ./xmlchange RUN_STARTDATE=0001-01-01
+ ./xmlchange DATM_YR_ALIGN=1
+ ./xmlchange DATM_YR_START=2016
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Lit/LAI_stream_AU-Lit_2016-2017.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2017" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2015" >> user_nl_clm
+ echo "stream_year_first_lai=2015" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2016" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Otw/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/AU-Otw/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-Otw/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands
new file mode 100644
index 0000000000..6671c26040
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=142.816803
+./xmlchange PTS_LAT=-38.532340999999995
+./xmlchange DATM_YR_END=2010
+./xmlchange START_TOD=46800
+./xmlchange ATM_NCPL=24
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Otw_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Otw/CLM1PT_data/CTSM_DATM_AU-Otw_2009-2010.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2009" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2010" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2009" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2009" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2010" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2009" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2009" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2010" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2009" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=2
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2008-12-31
+ ./xmlchange DATM_YR_ALIGN=2008
+ ./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=2009
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Otw/LAI_stream_AU-Otw_2009-2010.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2010" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2008" >> user_nl_clm
+ echo "stream_year_first_lai=2008" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2009" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Rig/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/AU-Rig/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-Rig/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands
new file mode 100644
index 0000000000..db70e72c89
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=145.575897
+./xmlchange PTS_LAT=-36.649899
+./xmlchange DATM_YR_END=2016
+./xmlchange START_TOD=46800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Rig_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Rig/CLM1PT_data/CTSM_DATM_AU-Rig_2011-2016.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2016" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2011" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2016" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2011" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2011" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2016" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2011" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=6
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2010-12-31
+ ./xmlchange DATM_YR_ALIGN=2010
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Rig/LAI_stream_AU-Rig_2011-2016.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2016" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2010" >> user_nl_clm
+ echo "stream_year_first_lai=2010" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2011" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Rob/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/AU-Rob/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-Rob/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands
new file mode 100644
index 0000000000..33e2084f14
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=145.630096
+./xmlchange PTS_LAT=-17.1175
+./xmlchange DATM_YR_END=2017
+./xmlchange START_TOD=50400
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Rob_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Rob/CLM1PT_data/CTSM_DATM_AU-Rob_2014-2017.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2014" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2014" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2014" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2014" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2014" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2014" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=4
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2013-12-31
+ ./xmlchange DATM_YR_ALIGN=2013
+ ./xmlchange DATM_YR_START=2013
+else
+ # for spinup case with I2000 compset
+ ./xmlchange RUN_STARTDATE=0001-01-01
+ ./xmlchange DATM_YR_ALIGN=1
+ ./xmlchange DATM_YR_START=2014
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Rob/LAI_stream_AU-Rob_2014-2017.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2017" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2013" >> user_nl_clm
+ echo "stream_year_first_lai=2013" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2014" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Sam/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/AU-Sam/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-Sam/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands
new file mode 100644
index 0000000000..561ba257fa
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=152.87780800000002
+./xmlchange PTS_LAT=-27.3881
+./xmlchange DATM_YR_END=2017
+./xmlchange START_TOD=50400
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Sam_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Sam/CLM1PT_data/CTSM_DATM_AU-Sam_2011-2017.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2011" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2011" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2011" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2011" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=7
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2010-12-31
+ ./xmlchange DATM_YR_ALIGN=2010
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Sam/LAI_stream_AU-Sam_2011-2017.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2017" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2010" >> user_nl_clm
+ echo "stream_year_first_lai=2010" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2011" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Stp/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/AU-Stp/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-Stp/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands
new file mode 100644
index 0000000000..97db87c821
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=133.350204
+./xmlchange PTS_LAT=-17.1507
+./xmlchange DATM_YR_END=2017
+./xmlchange START_TOD=54000
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Stp_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Stp/CLM1PT_data/CTSM_DATM_AU-Stp_2010-2017.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2010" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2010" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2010" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2010" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=8
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2009-12-31
+ ./xmlchange DATM_YR_ALIGN=2009
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Stp/LAI_stream_AU-Stp_2010-2017.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2017" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2009" >> user_nl_clm
+ echo "stream_year_first_lai=2009" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2010" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-TTE/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/AU-TTE/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-TTE/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands
new file mode 100644
index 0000000000..dee6244ef7
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=133.639999
+./xmlchange PTS_LAT=-22.287001
+./xmlchange DATM_YR_END=2017
+./xmlchange START_TOD=54000
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-TTE_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-TTE/CLM1PT_data/CTSM_DATM_AU-TTE_2013-2017.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2013" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2013" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2013" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2013" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2013" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=5
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2012-12-31
+ ./xmlchange DATM_YR_ALIGN=2012
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-TTE/LAI_stream_AU-TTE_2013-2017.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2017" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2012" >> user_nl_clm
+ echo "stream_year_first_lai=2012" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2013" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Tum/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/AU-Tum/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-Tum/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands
new file mode 100644
index 0000000000..36cd89bc73
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=148.151703
+./xmlchange PTS_LAT=-35.656601
+./xmlchange DATM_YR_END=2017
+./xmlchange START_TOD=46800
+./xmlchange ATM_NCPL=24
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Tum_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Tum/CLM1PT_data/CTSM_DATM_AU-Tum_2002-2017.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=16
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2001-12-31
+ ./xmlchange DATM_YR_ALIGN=2001
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Tum/LAI_stream_AU-Tum_2002-2017.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2017" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2001" >> user_nl_clm
+ echo "stream_year_first_lai=2001" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2002" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Whr/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/AU-Whr/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-Whr/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands
new file mode 100644
index 0000000000..6b5d9415fe
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=145.029404
+./xmlchange PTS_LAT=-36.673199
+./xmlchange DATM_YR_END=2016
+./xmlchange START_TOD=46800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Whr_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Whr/CLM1PT_data/CTSM_DATM_AU-Whr_2015-2016.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2015" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2016" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2015" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2015" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2016" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2015" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2015" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2016" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2015" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=2
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2014-12-31
+ ./xmlchange DATM_YR_ALIGN=2014
+ ./xmlchange DATM_YR_START=2014
+else
+ # for spinup case with I2000 compset
+ ./xmlchange RUN_STARTDATE=0001-01-01
+ ./xmlchange DATM_YR_ALIGN=1
+ ./xmlchange DATM_YR_START=2015
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Whr/LAI_stream_AU-Whr_2015-2016.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2016" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2014" >> user_nl_clm
+ echo "stream_year_first_lai=2014" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2015" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands
new file mode 100644
index 0000000000..e1751b8439
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=146.654495
+./xmlchange PTS_LAT=-43.09502
+./xmlchange DATM_YR_END=2017
+./xmlchange START_TOD=46800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Wrr_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Wrr/CLM1PT_data/CTSM_DATM_AU-Wrr_2016-2017.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2016" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2016" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2016" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2016" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2016" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2016" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=2
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2015-12-31
+ ./xmlchange DATM_YR_ALIGN=2015
+ ./xmlchange DATM_YR_START=2015
+else
+ # for spinup case with I2000 compset
+ ./xmlchange RUN_STARTDATE=0001-01-01
+ ./xmlchange DATM_YR_ALIGN=1
+ ./xmlchange DATM_YR_START=2016
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Wrr/LAI_stream_AU-Wrr_2016-2017.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2017" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2015" >> user_nl_clm
+ echo "stream_year_first_lai=2015" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2016" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Ync/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/AU-Ync/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-Ync/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands
new file mode 100644
index 0000000000..861c844b14
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=146.290695
+./xmlchange PTS_LAT=-34.9893
+./xmlchange DATM_YR_END=2017
+./xmlchange START_TOD=46800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Ync_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Ync/CLM1PT_data/CTSM_DATM_AU-Ync_2011-2017.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2011" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2011" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2011" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2011" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=7
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2010-12-31
+ ./xmlchange DATM_YR_ALIGN=2010
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Ync/LAI_stream_AU-Ync_2011-2017.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2017" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2010" >> user_nl_clm
+ echo "stream_year_first_lai=2010" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2011" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/BE-Bra/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/BE-Bra/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/BE-Bra/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands
new file mode 100644
index 0000000000..5aeefbc792
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=4.52056
+./xmlchange PTS_LAT=51.309166
+./xmlchange DATM_YR_END=2014
+./xmlchange START_TOD=82800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_BE-Bra_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/BE-Bra/CLM1PT_data/CTSM_DATM_BE-Bra_2004-2014.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=11
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2003-12-31
+ ./xmlchange DATM_YR_ALIGN=2003
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/BE-Bra/LAI_stream_BE-Bra_2004-2014.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2014" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2003" >> user_nl_clm
+ echo "stream_year_first_lai=2003" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2004" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/BE-Lon/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/BE-Lon/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/BE-Lon/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands
new file mode 100644
index 0000000000..959a9e88fa
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=4.74613
+./xmlchange PTS_LAT=50.551590000000004
+./xmlchange DATM_YR_END=2014
+./xmlchange START_TOD=82800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_BE-Lon_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/BE-Lon/CLM1PT_data/CTSM_DATM_BE-Lon_2005-2014.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=10
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2004-12-31
+ ./xmlchange DATM_YR_ALIGN=2004
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/BE-Lon/LAI_stream_BE-Lon_2005-2014.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2014" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2004" >> user_nl_clm
+ echo "stream_year_first_lai=2004" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2005" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/BE-Vie/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/BE-Vie/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/BE-Vie/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands
new file mode 100644
index 0000000000..008d71407c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=5.99805
+./xmlchange PTS_LAT=50.305069
+./xmlchange DATM_YR_END=2014
+./xmlchange START_TOD=82800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_BE-Vie_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/BE-Vie/CLM1PT_data/CTSM_DATM_BE-Vie_1997-2014.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=1997" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=1997" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=1997" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=1997" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=1997" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=18
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=1996-12-31
+ ./xmlchange DATM_YR_ALIGN=1996
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/BE-Vie/LAI_stream_BE-Vie_1997-2014.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2014" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=1996" >> user_nl_clm
+ echo "stream_year_first_lai=1996" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=1997" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands
new file mode 100644
index 0000000000..c1277c1198
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-54.971436
+./xmlchange PTS_LAT=-3.0180290000000003
+./xmlchange DATM_YR_END=2003
+./xmlchange START_TOD=14400
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_BR-Sa3_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/BR-Sa3/CLM1PT_data/CTSM_DATM_BR-Sa3_2001-2003.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2001" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2001" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2003" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2001" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2001" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2003" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2001" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=3
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2001-01-01
+ ./xmlchange DATM_YR_ALIGN=2001
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/BR-Sa3/LAI_stream_BR-Sa3_2001-2003.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2003" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2001" >> user_nl_clm
+ echo "stream_year_first_lai=2001" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2001" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands
new file mode 100644
index 0000000000..b2e5f88222
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=23.560329
+./xmlchange PTS_LAT=-19.9165
+./xmlchange DATM_YR_END=2000
+./xmlchange START_TOD=79200
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_BW-Ma1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/BW-Ma1/CLM1PT_data/CTSM_DATM_BW-Ma1_2000-2000.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2000" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2000" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2000" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2000" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2000" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2000" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2000" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=1
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=1999-12-31
+ ./xmlchange DATM_YR_ALIGN=1999
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/BW-Ma1/LAI_stream_BW-Ma1_2000-2000.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2000" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=1999" >> user_nl_clm
+ echo "stream_year_first_lai=1999" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2000" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS1/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/CA-NS1/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS1/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands
new file mode 100644
index 0000000000..adb752cea8
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-98.483887
+./xmlchange PTS_LAT=55.8792
+./xmlchange DATM_YR_END=2003
+./xmlchange START_TOD=21600
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CA-NS1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-NS1/CLM1PT_data/CTSM_DATM_CA-NS1_2003-2003.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2003" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2003" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=1
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2003-01-01
+ ./xmlchange DATM_YR_ALIGN=2003
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CA-NS1/LAI_stream_CA-NS1_2003-2003.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2003" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2003" >> user_nl_clm
+ echo "stream_year_first_lai=2003" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2003" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS2/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/CA-NS2/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS2/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands
new file mode 100644
index 0000000000..bb25a4ad93
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-98.524689
+./xmlchange PTS_LAT=55.9058
+./xmlchange DATM_YR_END=2004
+./xmlchange START_TOD=21600
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CA-NS2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-NS2/CLM1PT_data/CTSM_DATM_CA-NS2_2002-2004.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2004" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2004" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=3
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2002-01-01
+ ./xmlchange DATM_YR_ALIGN=2002
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CA-NS2/LAI_stream_CA-NS2_2002-2004.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2004" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2002" >> user_nl_clm
+ echo "stream_year_first_lai=2002" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2002" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS4/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/CA-NS4/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS4/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands
new file mode 100644
index 0000000000..733537f009
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-98.380615
+./xmlchange PTS_LAT=55.914398
+./xmlchange DATM_YR_END=2004
+./xmlchange START_TOD=21600
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CA-NS4_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-NS4/CLM1PT_data/CTSM_DATM_CA-NS4_2003-2004.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2004" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2004" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=2
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2003-01-01
+ ./xmlchange DATM_YR_ALIGN=2003
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CA-NS4/LAI_stream_CA-NS4_2003-2004.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2004" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2003" >> user_nl_clm
+ echo "stream_year_first_lai=2003" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2003" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS5/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/CA-NS5/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS5/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands
new file mode 100644
index 0000000000..491bc27b99
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-98.484985
+./xmlchange PTS_LAT=55.863098
+./xmlchange DATM_YR_END=2004
+./xmlchange START_TOD=21600
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CA-NS5_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-NS5/CLM1PT_data/CTSM_DATM_CA-NS5_2003-2004.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2004" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2004" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=2
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2003-01-01
+ ./xmlchange DATM_YR_ALIGN=2003
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CA-NS5/LAI_stream_CA-NS5_2003-2004.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2004" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2003" >> user_nl_clm
+ echo "stream_year_first_lai=2003" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2003" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS6/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/CA-NS6/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS6/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands
new file mode 100644
index 0000000000..3a1b6a7b0f
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-98.964417
+./xmlchange PTS_LAT=55.916698
+./xmlchange DATM_YR_END=2004
+./xmlchange START_TOD=21600
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CA-NS6_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-NS6/CLM1PT_data/CTSM_DATM_CA-NS6_2002-2004.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2004" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2004" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=3
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2002-01-01
+ ./xmlchange DATM_YR_ALIGN=2002
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CA-NS6/LAI_stream_CA-NS6_2002-2004.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2004" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2002" >> user_nl_clm
+ echo "stream_year_first_lai=2002" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2002" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS7/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/CA-NS7/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS7/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands
new file mode 100644
index 0000000000..735c947bfe
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-99.94830300000001
+./xmlchange PTS_LAT=56.635799
+./xmlchange DATM_YR_END=2004
+./xmlchange START_TOD=21600
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CA-NS7_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-NS7/CLM1PT_data/CTSM_DATM_CA-NS7_2003-2004.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2004" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2004" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=2
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2003-01-01
+ ./xmlchange DATM_YR_ALIGN=2003
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CA-NS7/LAI_stream_CA-NS7_2003-2004.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2004" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2003" >> user_nl_clm
+ echo "stream_year_first_lai=2003" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2003" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands
new file mode 100644
index 0000000000..c7123ae573
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-74.03653
+./xmlchange PTS_LAT=49.267078000000005
+./xmlchange DATM_YR_END=2006
+./xmlchange START_TOD=18000
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CA-Qcu_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-Qcu/CLM1PT_data/CTSM_DATM_CA-Qcu_2002-2006.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=5
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2002-01-01
+ ./xmlchange DATM_YR_ALIGN=2002
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CA-Qcu/LAI_stream_CA-Qcu_2002-2006.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2006" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2002" >> user_nl_clm
+ echo "stream_year_first_lai=2002" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2002" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands
new file mode 100644
index 0000000000..fb7fc215c9
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-74.342102
+./xmlchange PTS_LAT=49.692501
+./xmlchange DATM_YR_END=2010
+./xmlchange START_TOD=18000
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CA-Qfo_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-Qfo/CLM1PT_data/CTSM_DATM_CA-Qfo_2004-2010.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2010" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2010" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2010" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=7
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2004-01-01
+ ./xmlchange DATM_YR_ALIGN=2004
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CA-Qfo/LAI_stream_CA-Qfo_2004-2010.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2010" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2004" >> user_nl_clm
+ echo "stream_year_first_lai=2004" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2004" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-SF1/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/CA-SF1/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/CA-SF1/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands
new file mode 100644
index 0000000000..ed6c584b7c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-105.817596
+./xmlchange PTS_LAT=54.485001000000004
+./xmlchange DATM_YR_END=2006
+./xmlchange START_TOD=21600
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CA-SF1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-SF1/CLM1PT_data/CTSM_DATM_CA-SF1_2004-2006.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=3
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2004-01-01
+ ./xmlchange DATM_YR_ALIGN=2004
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CA-SF1/LAI_stream_CA-SF1_2004-2006.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2006" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2004" >> user_nl_clm
+ echo "stream_year_first_lai=2004" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2004" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-SF2/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/CA-SF2/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/CA-SF2/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands
new file mode 100644
index 0000000000..1fffcfdac9
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-105.877502
+./xmlchange PTS_LAT=54.253899
+./xmlchange DATM_YR_END=2005
+./xmlchange START_TOD=21600
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CA-SF2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-SF2/CLM1PT_data/CTSM_DATM_CA-SF2_2003-2005.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2005" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2005" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=3
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2003-01-01
+ ./xmlchange DATM_YR_ALIGN=2003
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CA-SF2/LAI_stream_CA-SF2_2003-2005.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2005" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2003" >> user_nl_clm
+ echo "stream_year_first_lai=2003" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2003" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-SF3/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/CA-SF3/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/CA-SF3/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands
new file mode 100644
index 0000000000..03096c96fa
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-106.00531000000001
+./xmlchange PTS_LAT=54.091599
+./xmlchange DATM_YR_END=2005
+./xmlchange START_TOD=21600
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CA-SF3_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-SF3/CLM1PT_data/CTSM_DATM_CA-SF3_2003-2005.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2005" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2005" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=3
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2003-01-01
+ ./xmlchange DATM_YR_ALIGN=2003
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CA-SF3/LAI_stream_CA-SF3_2003-2005.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2005" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2003" >> user_nl_clm
+ echo "stream_year_first_lai=2003" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2003" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Cha/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/CH-Cha/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/CH-Cha/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands
new file mode 100644
index 0000000000..1e2590a7ae
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=8.41044
+./xmlchange PTS_LAT=47.21022
+./xmlchange DATM_YR_END=2014
+./xmlchange START_TOD=82800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CH-Cha_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CH-Cha/CLM1PT_data/CTSM_DATM_CH-Cha_2006-2014.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2006" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2006" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2006" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2006" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2006" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2006" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=9
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2005-12-31
+ ./xmlchange DATM_YR_ALIGN=2005
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CH-Cha/LAI_stream_CH-Cha_2006-2014.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2014" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2005" >> user_nl_clm
+ echo "stream_year_first_lai=2005" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2006" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Dav/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/CH-Dav/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/CH-Dav/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands
new file mode 100644
index 0000000000..c170c8b840
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=9.85592
+./xmlchange PTS_LAT=46.815334
+./xmlchange DATM_YR_END=2014
+./xmlchange START_TOD=82800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CH-Dav_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CH-Dav/CLM1PT_data/CTSM_DATM_CH-Dav_1997-2014.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=1997" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=1997" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=1997" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=1997" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=1997" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=18
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=1996-12-31
+ ./xmlchange DATM_YR_ALIGN=1996
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CH-Dav/LAI_stream_CH-Dav_1997-2014.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2014" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=1996" >> user_nl_clm
+ echo "stream_year_first_lai=1996" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=1997" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Fru/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/CH-Fru/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/CH-Fru/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands
new file mode 100644
index 0000000000..31e5163045
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=8.53778
+./xmlchange PTS_LAT=47.115833
+./xmlchange DATM_YR_END=2014
+./xmlchange START_TOD=82800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CH-Fru_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CH-Fru/CLM1PT_data/CTSM_DATM_CH-Fru_2007-2014.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2007" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2007" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2007" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2007" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2007" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=8
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2006-12-31
+ ./xmlchange DATM_YR_ALIGN=2006
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CH-Fru/LAI_stream_CH-Fru_2007-2014.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2014" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2006" >> user_nl_clm
+ echo "stream_year_first_lai=2006" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2007" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands
new file mode 100644
index 0000000000..ee091e134e
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=7.73194
+./xmlchange PTS_LAT=47.285831
+./xmlchange DATM_YR_END=2008
+./xmlchange START_TOD=82800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CH-Oe1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CH-Oe1/CLM1PT_data/CTSM_DATM_CH-Oe1_2002-2008.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2008" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2008" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=7
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2001-12-31
+ ./xmlchange DATM_YR_ALIGN=2001
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CH-Oe1/LAI_stream_CH-Oe1_2002-2008.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2008" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2001" >> user_nl_clm
+ echo "stream_year_first_lai=2001" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2002" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Cha/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/CN-Cha/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/CN-Cha/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands
new file mode 100644
index 0000000000..cde3fed3be
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=128.09579499999998
+./xmlchange PTS_LAT=42.4025
+./xmlchange DATM_YR_END=2005
+./xmlchange START_TOD=57600
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CN-Cha_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-Cha/CLM1PT_data/CTSM_DATM_CN-Cha_2003-2005.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2005" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2005" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=3
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2002-12-31
+ ./xmlchange DATM_YR_ALIGN=2002
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CN-Cha/LAI_stream_CN-Cha_2003-2005.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2005" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2002" >> user_nl_clm
+ echo "stream_year_first_lai=2002" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2003" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Cng/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/CN-Cng/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/CN-Cng/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands
new file mode 100644
index 0000000000..d5ec208a05
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=123.509201
+./xmlchange PTS_LAT=44.593399
+./xmlchange DATM_YR_END=2009
+./xmlchange START_TOD=57600
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CN-Cng_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-Cng/CLM1PT_data/CTSM_DATM_CN-Cng_2008-2009.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2009" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2008" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2008" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2009" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2008" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2008" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2009" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2008" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=2
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2007-12-31
+ ./xmlchange DATM_YR_ALIGN=2007
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CN-Cng/LAI_stream_CN-Cng_2008-2009.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2009" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2007" >> user_nl_clm
+ echo "stream_year_first_lai=2007" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2008" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Dan/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/CN-Dan/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/CN-Dan/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands
new file mode 100644
index 0000000000..674ce4dda4
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=91.066399
+./xmlchange PTS_LAT=30.497801000000003
+./xmlchange DATM_YR_END=2005
+./xmlchange START_TOD=57600
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CN-Dan_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-Dan/CLM1PT_data/CTSM_DATM_CN-Dan_2004-2005.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2005" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2005" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=2
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2003-12-31
+ ./xmlchange DATM_YR_ALIGN=2003
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CN-Dan/LAI_stream_CN-Dan_2004-2005.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2005" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2003" >> user_nl_clm
+ echo "stream_year_first_lai=2003" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2004" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Din/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/CN-Din/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/CN-Din/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands
new file mode 100644
index 0000000000..b9149c7d8a
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=112.536102
+./xmlchange PTS_LAT=23.1733
+./xmlchange DATM_YR_END=2005
+./xmlchange START_TOD=57600
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CN-Din_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-Din/CLM1PT_data/CTSM_DATM_CN-Din_2003-2005.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2005" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2005" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=3
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2002-12-31
+ ./xmlchange DATM_YR_ALIGN=2002
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CN-Din/LAI_stream_CN-Din_2003-2005.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2005" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2002" >> user_nl_clm
+ echo "stream_year_first_lai=2002" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2003" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Du2/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/CN-Du2/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/CN-Du2/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands
new file mode 100644
index 0000000000..42502b41ce
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=116.2836
+./xmlchange PTS_LAT=42.0467
+./xmlchange DATM_YR_END=2008
+./xmlchange START_TOD=57600
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CN-Du2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-Du2/CLM1PT_data/CTSM_DATM_CN-Du2_2007-2008.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2007" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2007" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2008" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2007" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2007" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2008" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2007" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=2
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2006-12-31
+ ./xmlchange DATM_YR_ALIGN=2006
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CN-Du2/LAI_stream_CN-Du2_2007-2008.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2008" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2006" >> user_nl_clm
+ echo "stream_year_first_lai=2006" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2007" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-HaM/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/CN-HaM/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/CN-HaM/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands
new file mode 100644
index 0000000000..95c4167bf0
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=101.18
+./xmlchange PTS_LAT=37.369999
+./xmlchange DATM_YR_END=2003
+./xmlchange START_TOD=57600
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CN-HaM_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-HaM/CLM1PT_data/CTSM_DATM_CN-HaM_2002-2003.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2003" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2003" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=2
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2001-12-31
+ ./xmlchange DATM_YR_ALIGN=2001
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CN-HaM/LAI_stream_CN-HaM_2002-2003.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2003" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2001" >> user_nl_clm
+ echo "stream_year_first_lai=2001" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2002" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Qia/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/CN-Qia/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/CN-Qia/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands
new file mode 100644
index 0000000000..401534e487
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=115.058098
+./xmlchange PTS_LAT=26.7414
+./xmlchange DATM_YR_END=2005
+./xmlchange START_TOD=57600
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CN-Qia_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-Qia/CLM1PT_data/CTSM_DATM_CN-Qia_2003-2005.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2005" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2005" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=3
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2002-12-31
+ ./xmlchange DATM_YR_ALIGN=2002
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CN-Qia/LAI_stream_CN-Qia_2003-2005.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2005" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2002" >> user_nl_clm
+ echo "stream_year_first_lai=2002" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2003" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/CZ-wet/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/CZ-wet/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/CZ-wet/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands
new file mode 100644
index 0000000000..20309cdcb3
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands
@@ -0,0 +1,59 @@
+./xmlchange PTS_LON=14.77035
+./xmlchange PTS_LAT=49.024651
+./xmlchange DATM_YR_END=2014
+./xmlchange START_TOD=82800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CZ-wet_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CZ-wet/CLM1PT_data/CTSM_DATM_CZ-wet_2007-2014.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2007" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2007" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2007" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2007" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2007" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=8
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2006-12-31
+ ./xmlchange DATM_YR_ALIGN=2006
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CZ-wet/LAI_stream_CZ-wet_2007-2014.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2014" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2006" >> user_nl_clm
+ echo "stream_year_first_lai=2006" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2007" >> user_nl_clm
+ 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/PLUMBER2/DE-Bay/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/DE-Bay/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/DE-Bay/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands
new file mode 100644
index 0000000000..6495d46b57
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=11.86694
+./xmlchange PTS_LAT=50.141940999999996
+./xmlchange DATM_YR_END=1999
+./xmlchange START_TOD=82800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DE-Bay_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Bay/CLM1PT_data/CTSM_DATM_DE-Bay_1997-1999.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=1999" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=1997" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=1997" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=1999" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=1997" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=1997" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=1999" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=1997" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=3
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=1996-12-31
+ ./xmlchange DATM_YR_ALIGN=1996
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DE-Bay/LAI_stream_DE-Bay_1997-1999.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=1999" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=1996" >> user_nl_clm
+ echo "stream_year_first_lai=1996" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=1997" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Geb/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/DE-Geb/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/DE-Geb/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands
new file mode 100644
index 0000000000..d43c3bd94d
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=10.9143
+./xmlchange PTS_LAT=51.100101
+./xmlchange DATM_YR_END=2014
+./xmlchange START_TOD=82800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DE-Geb_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Geb/CLM1PT_data/CTSM_DATM_DE-Geb_2001-2014.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2001" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2001" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2001" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2001" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2001" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=14
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2000-12-31
+ ./xmlchange DATM_YR_ALIGN=2000
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DE-Geb/LAI_stream_DE-Geb_2001-2014.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2014" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2000" >> user_nl_clm
+ echo "stream_year_first_lai=2000" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2001" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Gri/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/DE-Gri/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/DE-Gri/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands
new file mode 100644
index 0000000000..fe165d2bf3
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=13.512529999999998
+./xmlchange PTS_LAT=50.949471
+./xmlchange DATM_YR_END=2014
+./xmlchange START_TOD=82800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DE-Gri_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Gri/CLM1PT_data/CTSM_DATM_DE-Gri_2004-2014.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=11
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2003-12-31
+ ./xmlchange DATM_YR_ALIGN=2003
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DE-Gri/LAI_stream_DE-Gri_2004-2014.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2014" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2003" >> user_nl_clm
+ echo "stream_year_first_lai=2003" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2004" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Hai/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/DE-Hai/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/DE-Hai/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands
new file mode 100644
index 0000000000..fa5671c663
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=10.453
+./xmlchange PTS_LAT=51.079166
+./xmlchange DATM_YR_END=2012
+./xmlchange START_TOD=82800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DE-Hai_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Hai/CLM1PT_data/CTSM_DATM_DE-Hai_2000-2012.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2000" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2012" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2000" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2000" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2012" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2000" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=13
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=1999-12-31
+ ./xmlchange DATM_YR_ALIGN=1999
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DE-Hai/LAI_stream_DE-Hai_2000-2012.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2012" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=1999" >> user_nl_clm
+ echo "stream_year_first_lai=1999" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2000" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Kli/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/DE-Kli/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/DE-Kli/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands
new file mode 100644
index 0000000000..28fb89a2d0
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=13.522379999999998
+./xmlchange PTS_LAT=50.893059
+./xmlchange DATM_YR_END=2014
+./xmlchange START_TOD=82800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DE-Kli_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Kli/CLM1PT_data/CTSM_DATM_DE-Kli_2005-2014.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=10
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2004-12-31
+ ./xmlchange DATM_YR_ALIGN=2004
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DE-Kli/LAI_stream_DE-Kli_2005-2014.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2014" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2004" >> user_nl_clm
+ echo "stream_year_first_lai=2004" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2005" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Meh/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/DE-Meh/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/DE-Meh/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands
new file mode 100644
index 0000000000..250432bd9f
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=10.65547
+./xmlchange PTS_LAT=51.275311
+./xmlchange DATM_YR_END=2006
+./xmlchange START_TOD=82800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DE-Meh_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Meh/CLM1PT_data/CTSM_DATM_DE-Meh_2004-2006.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=3
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2003-12-31
+ ./xmlchange DATM_YR_ALIGN=2003
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DE-Meh/LAI_stream_DE-Meh_2004-2006.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2006" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2003" >> user_nl_clm
+ echo "stream_year_first_lai=2003" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2004" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Obe/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/DE-Obe/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/DE-Obe/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands
new file mode 100644
index 0000000000..ef17febde0
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=13.72129
+./xmlchange PTS_LAT=50.786659
+./xmlchange DATM_YR_END=2014
+./xmlchange START_TOD=82800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DE-Obe_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Obe/CLM1PT_data/CTSM_DATM_DE-Obe_2008-2014.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2008" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2008" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2008" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2008" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2008" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=7
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2007-12-31
+ ./xmlchange DATM_YR_ALIGN=2007
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DE-Obe/LAI_stream_DE-Obe_2008-2014.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2014" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2007" >> user_nl_clm
+ echo "stream_year_first_lai=2007" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2008" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Seh/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/DE-Seh/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/DE-Seh/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands
new file mode 100644
index 0000000000..db837ac070
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=6.44965
+./xmlchange PTS_LAT=50.870625
+./xmlchange DATM_YR_END=2010
+./xmlchange START_TOD=82800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DE-Seh_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Seh/CLM1PT_data/CTSM_DATM_DE-Seh_2008-2010.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2010" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2008" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2008" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2010" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2008" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2008" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2010" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2008" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=3
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2007-12-31
+ ./xmlchange DATM_YR_ALIGN=2007
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DE-Seh/LAI_stream_DE-Seh_2008-2010.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2010" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2007" >> user_nl_clm
+ echo "stream_year_first_lai=2007" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2008" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-SfN/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/DE-SfN/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/DE-SfN/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands
new file mode 100644
index 0000000000..bcff32c36a
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands
@@ -0,0 +1,59 @@
+./xmlchange PTS_LON=11.3275
+./xmlchange PTS_LAT=47.806389
+./xmlchange DATM_YR_END=2014
+./xmlchange START_TOD=82800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DE-SfN_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-SfN/CLM1PT_data/CTSM_DATM_DE-SfN_2013-2014.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2013" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2013" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2013" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2013" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2013" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=2
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2012-12-31
+ ./xmlchange DATM_YR_ALIGN=2012
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DE-SfN/LAI_stream_DE-SfN_2013-2014.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2014" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2012" >> user_nl_clm
+ echo "stream_year_first_lai=2012" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2013" >> user_nl_clm
+ 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/PLUMBER2/DE-Tha/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/DE-Tha/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/DE-Tha/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands
new file mode 100644
index 0000000000..aa6beb5913
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=13.566939999999999
+./xmlchange PTS_LAT=50.963612
+./xmlchange DATM_YR_END=2014
+./xmlchange START_TOD=82800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DE-Tha_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Tha/CLM1PT_data/CTSM_DATM_DE-Tha_1998-2014.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=1998" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=1998" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=1998" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=1998" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=1998" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=1998" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=17
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=1997-12-31
+ ./xmlchange DATM_YR_ALIGN=1997
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DE-Tha/LAI_stream_DE-Tha_1998-2014.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2014" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=1997" >> user_nl_clm
+ echo "stream_year_first_lai=1997" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=1998" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Wet/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/DE-Wet/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/DE-Wet/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands
new file mode 100644
index 0000000000..12d6f2024d
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=11.45753
+./xmlchange PTS_LAT=50.453499
+./xmlchange DATM_YR_END=2006
+./xmlchange START_TOD=82800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DE-Wet_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Wet/CLM1PT_data/CTSM_DATM_DE-Wet_2002-2006.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=5
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2001-12-31
+ ./xmlchange DATM_YR_ALIGN=2001
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DE-Wet/LAI_stream_DE-Wet_2002-2006.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2006" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2001" >> user_nl_clm
+ echo "stream_year_first_lai=2001" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2002" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Fou/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/DK-Fou/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/DK-Fou/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands
new file mode 100644
index 0000000000..a4a472424e
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=9.58722
+./xmlchange PTS_LAT=56.4842
+./xmlchange DATM_YR_END=2005
+./xmlchange START_TOD=82800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DK-Fou_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DK-Fou/CLM1PT_data/CTSM_DATM_DK-Fou_2005-2005.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2005" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2005" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=1
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2004-12-31
+ ./xmlchange DATM_YR_ALIGN=2004
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DK-Fou/LAI_stream_DK-Fou_2005-2005.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2005" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2004" >> user_nl_clm
+ echo "stream_year_first_lai=2004" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2005" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Lva/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/DK-Lva/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/DK-Lva/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands
new file mode 100644
index 0000000000..962775613e
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=12.0833
+./xmlchange PTS_LAT=55.6833
+./xmlchange DATM_YR_END=2006
+./xmlchange START_TOD=82800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DK-Lva_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DK-Lva/CLM1PT_data/CTSM_DATM_DK-Lva_2005-2006.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=2
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2004-12-31
+ ./xmlchange DATM_YR_ALIGN=2004
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DK-Lva/LAI_stream_DK-Lva_2005-2006.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2006" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2004" >> user_nl_clm
+ echo "stream_year_first_lai=2004" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2005" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Ris/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/DK-Ris/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/DK-Ris/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands
new file mode 100644
index 0000000000..4c806cea45
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=12.09722
+./xmlchange PTS_LAT=55.530281
+./xmlchange DATM_YR_END=2005
+./xmlchange START_TOD=82800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DK-Ris_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DK-Ris/CLM1PT_data/CTSM_DATM_DK-Ris_2004-2005.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2005" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2005" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=2
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2003-12-31
+ ./xmlchange DATM_YR_ALIGN=2003
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DK-Ris/LAI_stream_DK-Ris_2004-2005.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2005" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2003" >> user_nl_clm
+ echo "stream_year_first_lai=2003" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2004" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Sor/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/DK-Sor/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/DK-Sor/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands
new file mode 100644
index 0000000000..1748d52204
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=11.644639999999999
+./xmlchange PTS_LAT=55.48587
+./xmlchange DATM_YR_END=2014
+./xmlchange START_TOD=82800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DK-Sor_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DK-Sor/CLM1PT_data/CTSM_DATM_DK-Sor_1997-2014.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=1997" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=1997" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=1997" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=1997" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=1997" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=18
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=1996-12-31
+ ./xmlchange DATM_YR_ALIGN=1996
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DK-Sor/LAI_stream_DK-Sor_1997-2014.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2014" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=1996" >> user_nl_clm
+ echo "stream_year_first_lai=1996" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=1997" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands
new file mode 100644
index 0000000000..ea72cc14c4
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-20.550293
+./xmlchange PTS_LAT=74.473282
+./xmlchange DATM_YR_END=2013
+./xmlchange START_TOD=0
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DK-ZaH_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DK-ZaH/CLM1PT_data/CTSM_DATM_DK-ZaH_2000-2013.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2000" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2013" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2000" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2000" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2013" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2000" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=14
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2000-01-01
+ ./xmlchange DATM_YR_ALIGN=2000
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DK-ZaH/LAI_stream_DK-ZaH_2000-2013.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2013" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2000" >> user_nl_clm
+ echo "stream_year_first_lai=2000" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2000" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-ES1/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/ES-ES1/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/ES-ES1/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands
new file mode 100644
index 0000000000..38e841b51c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-0.318817
+./xmlchange PTS_LAT=39.34597
+./xmlchange DATM_YR_END=2006
+./xmlchange START_TOD=82800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_ES-ES1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ES-ES1/CLM1PT_data/CTSM_DATM_ES-ES1_1999-2006.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=1999" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=1999" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=1999" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=1999" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=1999" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=1999" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=8
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=1998-12-31
+ ./xmlchange DATM_YR_ALIGN=1998
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/ES-ES1/LAI_stream_ES-ES1_1999-2006.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2006" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=1998" >> user_nl_clm
+ echo "stream_year_first_lai=1998" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=1999" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-ES2/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/ES-ES2/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/ES-ES2/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands
new file mode 100644
index 0000000000..47fae079e6
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-0.315277
+./xmlchange PTS_LAT=39.275558000000004
+./xmlchange DATM_YR_END=2006
+./xmlchange START_TOD=82800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_ES-ES2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ES-ES2/CLM1PT_data/CTSM_DATM_ES-ES2_2005-2006.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=2
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2004-12-31
+ ./xmlchange DATM_YR_ALIGN=2004
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/ES-ES2/LAI_stream_ES-ES2_2005-2006.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2006" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2004" >> user_nl_clm
+ echo "stream_year_first_lai=2004" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2005" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-LMa/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/ES-LMa/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/ES-LMa/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands
new file mode 100644
index 0000000000..f8a0283232
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-5.773346
+./xmlchange PTS_LAT=39.941502
+./xmlchange DATM_YR_END=2006
+./xmlchange START_TOD=82800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_ES-LMa_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ES-LMa/CLM1PT_data/CTSM_DATM_ES-LMa_2004-2006.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=3
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2003-12-31
+ ./xmlchange DATM_YR_ALIGN=2003
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/ES-LMa/LAI_stream_ES-LMa_2004-2006.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2006" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2003" >> user_nl_clm
+ echo "stream_year_first_lai=2003" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2004" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-LgS/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/ES-LgS/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/ES-LgS/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands
new file mode 100644
index 0000000000..8590e61f79
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-2.96582
+./xmlchange PTS_LAT=37.097935
+./xmlchange DATM_YR_END=2007
+./xmlchange START_TOD=82800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_ES-LgS_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ES-LgS/CLM1PT_data/CTSM_DATM_ES-LgS_2007-2007.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2007" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2007" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2007" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2007" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2007" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2007" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2007" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2007" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=1
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2006-12-31
+ ./xmlchange DATM_YR_ALIGN=2006
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/ES-LgS/LAI_stream_ES-LgS_2007-2007.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2007" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2006" >> user_nl_clm
+ echo "stream_year_first_lai=2006" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2007" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-VDA/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/ES-VDA/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/ES-VDA/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands
new file mode 100644
index 0000000000..bec50968d6
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=1.4485
+./xmlchange PTS_LAT=42.15218
+./xmlchange DATM_YR_END=2004
+./xmlchange START_TOD=82800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_ES-VDA_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ES-VDA/CLM1PT_data/CTSM_DATM_ES-VDA_2004-2004.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2004" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2004" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=1
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2003-12-31
+ ./xmlchange DATM_YR_ALIGN=2003
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/ES-VDA/LAI_stream_ES-VDA_2004-2004.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2004" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2003" >> user_nl_clm
+ echo "stream_year_first_lai=2003" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2004" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands
new file mode 100644
index 0000000000..46cd461773
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=24.295
+./xmlchange PTS_LAT=61.8475
+./xmlchange DATM_YR_END=2014
+./xmlchange START_TOD=79200
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_FI-Hyy_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FI-Hyy/CLM1PT_data/CTSM_DATM_FI-Hyy_1996-2014.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=1996" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=1996" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=1996" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=1996" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=1996" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=1996" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=19
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=1995-12-31
+ ./xmlchange DATM_YR_ALIGN=1995
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/FI-Hyy/LAI_stream_FI-Hyy_1996-2014.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2014" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=1995" >> user_nl_clm
+ echo "stream_year_first_lai=1995" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=1996" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands
new file mode 100644
index 0000000000..db4e320ca0
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands
@@ -0,0 +1,59 @@
+./xmlchange PTS_LON=27.295030999999998
+./xmlchange PTS_LAT=69.140694
+./xmlchange DATM_YR_END=2002
+./xmlchange START_TOD=79200
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_FI-Kaa_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FI-Kaa/CLM1PT_data/CTSM_DATM_FI-Kaa_2000-2002.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2002" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2000" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2002" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2000" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2000" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2002" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2000" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=3
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=1999-12-31
+ ./xmlchange DATM_YR_ALIGN=1999
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/FI-Kaa/LAI_stream_FI-Kaa_2000-2002.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2002" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=1999" >> user_nl_clm
+ echo "stream_year_first_lai=1999" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2000" >> user_nl_clm
+ 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/PLUMBER2/FI-Lom/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/FI-Lom/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/FI-Lom/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands
new file mode 100644
index 0000000000..844403dfc4
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands
@@ -0,0 +1,59 @@
+./xmlchange PTS_LON=24.209181
+./xmlchange PTS_LAT=67.9972
+./xmlchange DATM_YR_END=2009
+./xmlchange START_TOD=79200
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_FI-Lom_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FI-Lom/CLM1PT_data/CTSM_DATM_FI-Lom_2007-2009.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2009" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2007" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2007" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2009" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2007" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2007" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2009" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2007" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=3
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2006-12-31
+ ./xmlchange DATM_YR_ALIGN=2006
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/FI-Lom/LAI_stream_FI-Lom_2007-2009.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2009" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2006" >> user_nl_clm
+ echo "stream_year_first_lai=2006" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2007" >> user_nl_clm
+ 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/PLUMBER2/FI-Sod/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/FI-Sod/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/FI-Sod/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands
new file mode 100644
index 0000000000..be6e3a2eba
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=26.637831
+./xmlchange PTS_LAT=67.361862
+./xmlchange DATM_YR_END=2014
+./xmlchange START_TOD=79200
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_FI-Sod_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FI-Sod/CLM1PT_data/CTSM_DATM_FI-Sod_2008-2014.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2008" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2008" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2008" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2008" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2008" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=7
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2007-12-31
+ ./xmlchange DATM_YR_ALIGN=2007
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/FI-Sod/LAI_stream_FI-Sod_2008-2014.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2014" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2007" >> user_nl_clm
+ echo "stream_year_first_lai=2007" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2008" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Fon/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/FR-Fon/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/FR-Fon/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands
new file mode 100644
index 0000000000..946c9b84fc
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=2.7801400000000003
+./xmlchange PTS_LAT=48.476397999999996
+./xmlchange DATM_YR_END=2013
+./xmlchange START_TOD=82800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_FR-Fon_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-Fon/CLM1PT_data/CTSM_DATM_FR-Fon_2005-2013.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2013" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2013" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=9
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2004-12-31
+ ./xmlchange DATM_YR_ALIGN=2004
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/FR-Fon/LAI_stream_FR-Fon_2005-2013.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2013" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2004" >> user_nl_clm
+ echo "stream_year_first_lai=2004" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2005" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Gri/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/FR-Gri/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/FR-Gri/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands
new file mode 100644
index 0000000000..fd29463244
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=1.9519099999999998
+./xmlchange PTS_LAT=48.844219
+./xmlchange DATM_YR_END=2013
+./xmlchange START_TOD=82800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_FR-Gri_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-Gri/CLM1PT_data/CTSM_DATM_FR-Gri_2005-2013.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2013" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2013" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=9
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2004-12-31
+ ./xmlchange DATM_YR_ALIGN=2004
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/FR-Gri/LAI_stream_FR-Gri_2005-2013.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2013" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2004" >> user_nl_clm
+ echo "stream_year_first_lai=2004" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2005" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Hes/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/FR-Hes/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/FR-Hes/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands
new file mode 100644
index 0000000000..88900143b1
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=7.0655600000000005
+./xmlchange PTS_LAT=48.67416
+./xmlchange DATM_YR_END=2006
+./xmlchange START_TOD=82800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_FR-Hes_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-Hes/CLM1PT_data/CTSM_DATM_FR-Hes_1997-2006.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=1997" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=1997" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=1997" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=1997" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=1997" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=10
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=1996-12-31
+ ./xmlchange DATM_YR_ALIGN=1996
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/FR-Hes/LAI_stream_FR-Hes_1997-2006.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2006" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=1996" >> user_nl_clm
+ echo "stream_year_first_lai=1996" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=1997" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-LBr/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/FR-LBr/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/FR-LBr/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands
new file mode 100644
index 0000000000..29c9c95ab7
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-0.7692869999999999
+./xmlchange PTS_LAT=44.71711
+./xmlchange DATM_YR_END=2008
+./xmlchange START_TOD=82800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_FR-LBr_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-LBr/CLM1PT_data/CTSM_DATM_FR-LBr_2003-2008.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2008" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2008" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=6
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2002-12-31
+ ./xmlchange DATM_YR_ALIGN=2002
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/FR-LBr/LAI_stream_FR-LBr_2003-2008.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2008" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2002" >> user_nl_clm
+ echo "stream_year_first_lai=2002" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2003" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands
new file mode 100644
index 0000000000..676f8af611
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=2.73583
+./xmlchange PTS_LAT=45.643059
+./xmlchange DATM_YR_END=2006
+./xmlchange START_TOD=82800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_FR-Lq1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-Lq1/CLM1PT_data/CTSM_DATM_FR-Lq1_2004-2006.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=3
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2003-12-31
+ ./xmlchange DATM_YR_ALIGN=2003
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/FR-Lq1/LAI_stream_FR-Lq1_2004-2006.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2006" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2003" >> user_nl_clm
+ echo "stream_year_first_lai=2003" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2004" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands
new file mode 100644
index 0000000000..b407160bb9
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=2.73703
+./xmlchange PTS_LAT=45.639191
+./xmlchange DATM_YR_END=2006
+./xmlchange START_TOD=82800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_FR-Lq2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-Lq2/CLM1PT_data/CTSM_DATM_FR-Lq2_2004-2006.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=3
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2003-12-31
+ ./xmlchange DATM_YR_ALIGN=2003
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/FR-Lq2/LAI_stream_FR-Lq2_2004-2006.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2006" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2003" >> user_nl_clm
+ echo "stream_year_first_lai=2003" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2004" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Pue/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/FR-Pue/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/FR-Pue/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands
new file mode 100644
index 0000000000..b226175943
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=3.5958300000000003
+./xmlchange PTS_LAT=43.74139
+./xmlchange DATM_YR_END=2014
+./xmlchange START_TOD=82800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_FR-Pue_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-Pue/CLM1PT_data/CTSM_DATM_FR-Pue_2000-2014.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2000" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2000" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2000" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2000" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=15
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=1999-12-31
+ ./xmlchange DATM_YR_ALIGN=1999
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/FR-Pue/LAI_stream_FR-Pue_2000-2014.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2014" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=1999" >> user_nl_clm
+ echo "stream_year_first_lai=1999" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2000" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/GF-Guy/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/GF-Guy/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/GF-Guy/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands b/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands
new file mode 100644
index 0000000000..1fef6cf769
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-52.924866
+./xmlchange PTS_LAT=5.278772
+./xmlchange DATM_YR_END=2014
+./xmlchange START_TOD=10800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_GF-Guy_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/GF-Guy/CLM1PT_data/CTSM_DATM_GF-Guy_2004-2014.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=11
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2004-01-01
+ ./xmlchange DATM_YR_ALIGN=2004
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/GF-Guy/LAI_stream_GF-Guy_2004-2014.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2014" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2004" >> user_nl_clm
+ echo "stream_year_first_lai=2004" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2004" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/HU-Bug/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/HU-Bug/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/HU-Bug/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands b/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands
new file mode 100644
index 0000000000..a4cf969235
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=19.601298999999997
+./xmlchange PTS_LAT=46.691101
+./xmlchange DATM_YR_END=2006
+./xmlchange START_TOD=82800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_HU-Bug_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/HU-Bug/CLM1PT_data/CTSM_DATM_HU-Bug_2003-2006.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=4
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2002-12-31
+ ./xmlchange DATM_YR_ALIGN=2002
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/HU-Bug/LAI_stream_HU-Bug_2003-2006.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2006" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2002" >> user_nl_clm
+ echo "stream_year_first_lai=2002" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2003" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/ID-Pag/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/ID-Pag/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/ID-Pag/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands
new file mode 100644
index 0000000000..794fdabba3
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=114.03639199999999
+./xmlchange PTS_LAT=-2.345
+./xmlchange DATM_YR_END=2003
+./xmlchange START_TOD=61200
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_ID-Pag_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ID-Pag/CLM1PT_data/CTSM_DATM_ID-Pag_2002-2003.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2003" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2003" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=2
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2001-12-31
+ ./xmlchange DATM_YR_ALIGN=2001
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/ID-Pag/LAI_stream_ID-Pag_2002-2003.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2003" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2001" >> user_nl_clm
+ echo "stream_year_first_lai=2001" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2002" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands
new file mode 100644
index 0000000000..376f21bf88
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-6.918152
+./xmlchange PTS_LAT=52.858791000000004
+./xmlchange DATM_YR_END=2006
+./xmlchange START_TOD=0
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IE-Ca1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IE-Ca1/CLM1PT_data/CTSM_DATM_IE-Ca1_2004-2006.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=3
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2004-01-01
+ ./xmlchange DATM_YR_ALIGN=2004
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IE-Ca1/LAI_stream_IE-Ca1_2004-2006.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2006" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2004" >> user_nl_clm
+ echo "stream_year_first_lai=2004" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2004" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/IE-Dri/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/IE-Dri/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/IE-Dri/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands
new file mode 100644
index 0000000000..34bf806e19
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-8.751800999999999
+./xmlchange PTS_LAT=51.986691
+./xmlchange DATM_YR_END=2005
+./xmlchange START_TOD=0
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IE-Dri_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IE-Dri/CLM1PT_data/CTSM_DATM_IE-Dri_2003-2005.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2005" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2005" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=3
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2003-01-01
+ ./xmlchange DATM_YR_ALIGN=2003
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IE-Dri/LAI_stream_IE-Dri_2003-2005.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2005" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2003" >> user_nl_clm
+ echo "stream_year_first_lai=2003" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2003" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Amp/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/IT-Amp/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/IT-Amp/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands
new file mode 100644
index 0000000000..d0f80bd240
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=13.60516
+./xmlchange PTS_LAT=41.904099
+./xmlchange DATM_YR_END=2006
+./xmlchange START_TOD=82800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-Amp_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Amp/CLM1PT_data/CTSM_DATM_IT-Amp_2003-2006.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=4
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2002-12-31
+ ./xmlchange DATM_YR_ALIGN=2002
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-Amp/LAI_stream_IT-Amp_2003-2006.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2006" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2002" >> user_nl_clm
+ echo "stream_year_first_lai=2002" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2003" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-BCi/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/IT-BCi/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/IT-BCi/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands
new file mode 100644
index 0000000000..5c95ebd5cb
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=14.95744
+./xmlchange PTS_LAT=40.5238
+./xmlchange DATM_YR_END=2010
+./xmlchange START_TOD=82800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-BCi_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-BCi/CLM1PT_data/CTSM_DATM_IT-BCi_2005-2010.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2010" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2010" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2010" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=6
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2004-12-31
+ ./xmlchange DATM_YR_ALIGN=2004
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-BCi/LAI_stream_IT-BCi_2005-2010.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2010" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2004" >> user_nl_clm
+ echo "stream_year_first_lai=2004" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2005" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-CA1/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/IT-CA1/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/IT-CA1/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands
new file mode 100644
index 0000000000..4218939b8e
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=12.02656
+./xmlchange PTS_LAT=42.380409
+./xmlchange DATM_YR_END=2013
+./xmlchange START_TOD=82800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-CA1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-CA1/CLM1PT_data/CTSM_DATM_IT-CA1_2012-2013.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2012" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2012" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2013" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2012" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2012" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2013" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2012" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=2
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2011-12-31
+ ./xmlchange DATM_YR_ALIGN=2011
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-CA1/LAI_stream_IT-CA1_2012-2013.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2013" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2011" >> user_nl_clm
+ echo "stream_year_first_lai=2011" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2012" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-CA2/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/IT-CA2/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/IT-CA2/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands
new file mode 100644
index 0000000000..f3e82597af
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=12.02604
+./xmlchange PTS_LAT=42.37722
+./xmlchange DATM_YR_END=2013
+./xmlchange START_TOD=82800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-CA2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-CA2/CLM1PT_data/CTSM_DATM_IT-CA2_2012-2013.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2012" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2012" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2013" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2012" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2012" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2013" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2012" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=2
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2011-12-31
+ ./xmlchange DATM_YR_ALIGN=2011
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-CA2/LAI_stream_IT-CA2_2012-2013.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2013" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2011" >> user_nl_clm
+ echo "stream_year_first_lai=2011" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2012" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-CA3/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/IT-CA3/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/IT-CA3/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands
new file mode 100644
index 0000000000..de8970f1e3
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=12.0222
+./xmlchange PTS_LAT=42.380001
+./xmlchange DATM_YR_END=2013
+./xmlchange START_TOD=82800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-CA3_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-CA3/CLM1PT_data/CTSM_DATM_IT-CA3_2012-2013.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2012" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2012" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2013" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2012" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2012" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2013" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2012" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=2
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2011-12-31
+ ./xmlchange DATM_YR_ALIGN=2011
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-CA3/LAI_stream_IT-CA3_2012-2013.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2013" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2011" >> user_nl_clm
+ echo "stream_year_first_lai=2011" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2012" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Col/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/IT-Col/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/IT-Col/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands
new file mode 100644
index 0000000000..37ab868476
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=13.58814
+./xmlchange PTS_LAT=41.849361
+./xmlchange DATM_YR_END=2014
+./xmlchange START_TOD=82800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-Col_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Col/CLM1PT_data/CTSM_DATM_IT-Col_2007-2014.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2007" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2007" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2007" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2007" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2007" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=8
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2006-12-31
+ ./xmlchange DATM_YR_ALIGN=2006
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-Col/LAI_stream_IT-Col_2007-2014.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2014" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2006" >> user_nl_clm
+ echo "stream_year_first_lai=2006" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2007" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands
new file mode 100644
index 0000000000..e7bc47b3b0
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=12.37611
+./xmlchange PTS_LAT=41.70525
+./xmlchange DATM_YR_END=2008
+./xmlchange START_TOD=82800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-Cpz_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Cpz/CLM1PT_data/CTSM_DATM_IT-Cpz_2001-2008.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2001" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2001" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2008" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2001" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2001" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2008" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2001" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=8
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2000-12-31
+ ./xmlchange DATM_YR_ALIGN=2000
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-Cpz/LAI_stream_IT-Cpz_2001-2008.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2008" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2000" >> user_nl_clm
+ echo "stream_year_first_lai=2000" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2001" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Isp/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/IT-Isp/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/IT-Isp/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands
new file mode 100644
index 0000000000..6cf225d172
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=8.63358
+./xmlchange PTS_LAT=45.812641
+./xmlchange DATM_YR_END=2014
+./xmlchange START_TOD=82800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-Isp_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Isp/CLM1PT_data/CTSM_DATM_IT-Isp_2013-2014.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2013" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2013" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2013" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2013" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2013" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=2
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2012-12-31
+ ./xmlchange DATM_YR_ALIGN=2012
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-Isp/LAI_stream_IT-Isp_2013-2014.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2014" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2012" >> user_nl_clm
+ echo "stream_year_first_lai=2012" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2013" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-LMa/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/IT-LMa/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/IT-LMa/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands
new file mode 100644
index 0000000000..8b388aedb4
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=7.58259
+./xmlchange PTS_LAT=45.15258
+./xmlchange DATM_YR_END=2004
+./xmlchange START_TOD=82800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-LMa_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-LMa/CLM1PT_data/CTSM_DATM_IT-LMa_2003-2004.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2004" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2004" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=2
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2002-12-31
+ ./xmlchange DATM_YR_ALIGN=2002
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-LMa/LAI_stream_IT-LMa_2003-2004.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2004" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2002" >> user_nl_clm
+ echo "stream_year_first_lai=2002" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2003" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Lav/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/IT-Lav/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/IT-Lav/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands
new file mode 100644
index 0000000000..1f7f728803
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=11.28132
+./xmlchange PTS_LAT=45.9562
+./xmlchange DATM_YR_END=2014
+./xmlchange START_TOD=82800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-Lav_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Lav/CLM1PT_data/CTSM_DATM_IT-Lav_2005-2014.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=10
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2004-12-31
+ ./xmlchange DATM_YR_ALIGN=2004
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-Lav/LAI_stream_IT-Lav_2005-2014.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2014" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2004" >> user_nl_clm
+ echo "stream_year_first_lai=2004" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2005" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-MBo/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/IT-MBo/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/IT-MBo/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands
new file mode 100644
index 0000000000..26ffc80458
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=11.04583
+./xmlchange PTS_LAT=46.014679
+./xmlchange DATM_YR_END=2012
+./xmlchange START_TOD=82800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-MBo_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-MBo/CLM1PT_data/CTSM_DATM_IT-MBo_2003-2012.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2012" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2012" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=10
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2002-12-31
+ ./xmlchange DATM_YR_ALIGN=2002
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-MBo/LAI_stream_IT-MBo_2003-2012.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2012" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2002" >> user_nl_clm
+ echo "stream_year_first_lai=2002" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2003" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Mal/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/IT-Mal/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/IT-Mal/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands
new file mode 100644
index 0000000000..6559976180
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=11.703339999999999
+./xmlchange PTS_LAT=46.114021
+./xmlchange DATM_YR_END=2003
+./xmlchange START_TOD=82800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-Mal_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Mal/CLM1PT_data/CTSM_DATM_IT-Mal_2003-2003.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2003" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2003" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=1
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2002-12-31
+ ./xmlchange DATM_YR_ALIGN=2002
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-Mal/LAI_stream_IT-Mal_2003-2003.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2003" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2002" >> user_nl_clm
+ echo "stream_year_first_lai=2002" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2003" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Noe/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/IT-Noe/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/IT-Noe/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands
new file mode 100644
index 0000000000..58be23bcd1
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=8.15117
+./xmlchange PTS_LAT=40.606178
+./xmlchange DATM_YR_END=2014
+./xmlchange START_TOD=82800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-Noe_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Noe/CLM1PT_data/CTSM_DATM_IT-Noe_2004-2014.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=11
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2003-12-31
+ ./xmlchange DATM_YR_ALIGN=2003
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-Noe/LAI_stream_IT-Noe_2004-2014.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2014" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2003" >> user_nl_clm
+ echo "stream_year_first_lai=2003" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2004" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Non/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/IT-Non/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/IT-Non/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands
new file mode 100644
index 0000000000..785443e0f1
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=11.09109
+./xmlchange PTS_LAT=44.690189000000004
+./xmlchange DATM_YR_END=2002
+./xmlchange START_TOD=82800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-Non_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Non/CLM1PT_data/CTSM_DATM_IT-Non_2002-2002.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2002" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2002" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2002" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=1
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2001-12-31
+ ./xmlchange DATM_YR_ALIGN=2001
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-Non/LAI_stream_IT-Non_2002-2002.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2002" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2001" >> user_nl_clm
+ echo "stream_year_first_lai=2001" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2002" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-PT1/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/IT-PT1/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/IT-PT1/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands
new file mode 100644
index 0000000000..e7c30a4e36
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=9.06104
+./xmlchange PTS_LAT=45.200871
+./xmlchange DATM_YR_END=2004
+./xmlchange START_TOD=82800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-PT1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-PT1/CLM1PT_data/CTSM_DATM_IT-PT1_2003-2004.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2004" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2004" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=2
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2002-12-31
+ ./xmlchange DATM_YR_ALIGN=2002
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-PT1/LAI_stream_IT-PT1_2003-2004.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2004" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2002" >> user_nl_clm
+ echo "stream_year_first_lai=2002" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2003" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Ren/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/IT-Ren/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/IT-Ren/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands
new file mode 100644
index 0000000000..dc1b5630d0
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=11.433689999999999
+./xmlchange PTS_LAT=46.586861
+./xmlchange DATM_YR_END=2013
+./xmlchange START_TOD=82800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-Ren_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Ren/CLM1PT_data/CTSM_DATM_IT-Ren_2010-2013.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2010" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2013" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2010" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2010" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2013" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2010" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=4
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2009-12-31
+ ./xmlchange DATM_YR_ALIGN=2009
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-Ren/LAI_stream_IT-Ren_2010-2013.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2013" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2009" >> user_nl_clm
+ echo "stream_year_first_lai=2009" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2010" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands
new file mode 100644
index 0000000000..865f76ae9b
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=11.930010000000001
+./xmlchange PTS_LAT=42.408119
+./xmlchange DATM_YR_END=2006
+./xmlchange START_TOD=82800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-Ro1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Ro1/CLM1PT_data/CTSM_DATM_IT-Ro1_2002-2006.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=5
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2001-12-31
+ ./xmlchange DATM_YR_ALIGN=2001
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-Ro1/LAI_stream_IT-Ro1_2002-2006.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2006" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2001" >> user_nl_clm
+ echo "stream_year_first_lai=2001" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2002" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands
new file mode 100644
index 0000000000..401cfcf30b
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=11.92093
+./xmlchange PTS_LAT=42.390259
+./xmlchange DATM_YR_END=2008
+./xmlchange START_TOD=82800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-Ro2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Ro2/CLM1PT_data/CTSM_DATM_IT-Ro2_2002-2008.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2008" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2008" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=7
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2001-12-31
+ ./xmlchange DATM_YR_ALIGN=2001
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-Ro2/LAI_stream_IT-Ro2_2002-2008.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2008" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2001" >> user_nl_clm
+ echo "stream_year_first_lai=2001" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2002" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-SR2/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/IT-SR2/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/IT-SR2/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands
new file mode 100644
index 0000000000..7926235386
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=10.29095
+./xmlchange PTS_LAT=43.732029
+./xmlchange DATM_YR_END=2014
+./xmlchange START_TOD=82800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-SR2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-SR2/CLM1PT_data/CTSM_DATM_IT-SR2_2013-2014.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2013" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2013" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2013" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2013" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2013" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=2
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2012-12-31
+ ./xmlchange DATM_YR_ALIGN=2012
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-SR2/LAI_stream_IT-SR2_2013-2014.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2014" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2012" >> user_nl_clm
+ echo "stream_year_first_lai=2012" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2013" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-SRo/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/IT-SRo/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/IT-SRo/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands
new file mode 100644
index 0000000000..8dbeedc751
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=10.28444
+./xmlchange PTS_LAT=43.727859
+./xmlchange DATM_YR_END=2012
+./xmlchange START_TOD=82800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-SRo_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-SRo/CLM1PT_data/CTSM_DATM_IT-SRo_2003-2012.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2012" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2012" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=10
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2002-12-31
+ ./xmlchange DATM_YR_ALIGN=2002
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-SRo/LAI_stream_IT-SRo_2003-2012.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2012" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2002" >> user_nl_clm
+ echo "stream_year_first_lai=2002" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2003" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/JP-SMF/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/JP-SMF/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/JP-SMF/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands b/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands
new file mode 100644
index 0000000000..6af519cf5d
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=137.07879599999998
+./xmlchange PTS_LAT=35.2617
+./xmlchange DATM_YR_END=2006
+./xmlchange START_TOD=54000
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_JP-SMF_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/JP-SMF/CLM1PT_data/CTSM_DATM_JP-SMF_2003-2006.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=4
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2002-12-31
+ ./xmlchange DATM_YR_ALIGN=2002
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/JP-SMF/LAI_stream_JP-SMF_2003-2006.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2006" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2002" >> user_nl_clm
+ echo "stream_year_first_lai=2002" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2003" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands
new file mode 100644
index 0000000000..26b6fda5a4
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=4.927
+./xmlchange PTS_LAT=51.971001
+./xmlchange DATM_YR_END=2006
+./xmlchange START_TOD=82800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_NL-Ca1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/NL-Ca1/CLM1PT_data/CTSM_DATM_NL-Ca1_2003-2006.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=4
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2002-12-31
+ ./xmlchange DATM_YR_ALIGN=2002
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/NL-Ca1/LAI_stream_NL-Ca1_2003-2006.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2006" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2002" >> user_nl_clm
+ echo "stream_year_first_lai=2002" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2003" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/NL-Hor/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/NL-Hor/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/NL-Hor/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands b/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands
new file mode 100644
index 0000000000..ec509840af
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=5.0713
+./xmlchange PTS_LAT=52.240349
+./xmlchange DATM_YR_END=2011
+./xmlchange START_TOD=82800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_NL-Hor_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/NL-Hor/CLM1PT_data/CTSM_DATM_NL-Hor_2008-2011.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2011" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2008" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2008" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2011" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2008" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2008" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2011" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2008" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=4
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2007-12-31
+ ./xmlchange DATM_YR_ALIGN=2007
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/NL-Hor/LAI_stream_NL-Hor_2008-2011.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2011" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2007" >> user_nl_clm
+ echo "stream_year_first_lai=2007" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2008" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/NL-Loo/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/NL-Loo/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/NL-Loo/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands
new file mode 100644
index 0000000000..3bcbfbbc35
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=5.7435599999999996
+./xmlchange PTS_LAT=52.166579999999996
+./xmlchange DATM_YR_END=2013
+./xmlchange START_TOD=82800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_NL-Loo_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/NL-Loo/CLM1PT_data/CTSM_DATM_NL-Loo_1997-2013.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=1997" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=1997" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2013" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=1997" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=1997" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2013" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=1997" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=17
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=1996-12-31
+ ./xmlchange DATM_YR_ALIGN=1996
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/NL-Loo/LAI_stream_NL-Loo_1997-2013.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2013" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=1996" >> user_nl_clm
+ echo "stream_year_first_lai=1996" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=1997" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/PL-wet/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/PL-wet/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/PL-wet/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands
new file mode 100644
index 0000000000..4eb88c995a
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands
@@ -0,0 +1,59 @@
+./xmlchange PTS_LON=16.309401
+./xmlchange PTS_LAT=52.762199
+./xmlchange DATM_YR_END=2005
+./xmlchange START_TOD=82800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_PL-wet_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/PL-wet/CLM1PT_data/CTSM_DATM_PL-wet_2004-2005.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2005" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2005" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=2
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2003-12-31
+ ./xmlchange DATM_YR_ALIGN=2003
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/PL-wet/LAI_stream_PL-wet_2004-2005.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2005" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2003" >> user_nl_clm
+ echo "stream_year_first_lai=2003" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2004" >> user_nl_clm
+ 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/PLUMBER2/PT-Esp/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/PT-Esp/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/PT-Esp/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands
new file mode 100644
index 0000000000..224920cbf7
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-8.601807
+./xmlchange PTS_LAT=38.6394
+./xmlchange DATM_YR_END=2004
+./xmlchange START_TOD=0
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_PT-Esp_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/PT-Esp/CLM1PT_data/CTSM_DATM_PT-Esp_2002-2004.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2004" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2004" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=3
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2002-01-01
+ ./xmlchange DATM_YR_ALIGN=2002
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/PT-Esp/LAI_stream_PT-Esp_2002-2004.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2004" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2002" >> user_nl_clm
+ echo "stream_year_first_lai=2002" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2002" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands
new file mode 100644
index 0000000000..74413f5f5e
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-8.000061
+./xmlchange PTS_LAT=38.540642
+./xmlchange DATM_YR_END=2005
+./xmlchange START_TOD=0
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_PT-Mi1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/PT-Mi1/CLM1PT_data/CTSM_DATM_PT-Mi1_2005-2005.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2005" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2005" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=1
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2005-01-01
+ ./xmlchange DATM_YR_ALIGN=2005
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/PT-Mi1/LAI_stream_PT-Mi1_2005-2005.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2005" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2005" >> user_nl_clm
+ echo "stream_year_first_lai=2005" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2005" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands
new file mode 100644
index 0000000000..f9aa12224c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-8.024536
+./xmlchange PTS_LAT=38.476501
+./xmlchange DATM_YR_END=2006
+./xmlchange START_TOD=0
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_PT-Mi2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/PT-Mi2/CLM1PT_data/CTSM_DATM_PT-Mi2_2005-2006.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=2
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2005-01-01
+ ./xmlchange DATM_YR_ALIGN=2005
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/PT-Mi2/LAI_stream_PT-Mi2_2005-2006.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2006" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2005" >> user_nl_clm
+ echo "stream_year_first_lai=2005" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2005" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/RU-Che/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/RU-Che/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/RU-Che/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands b/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands
new file mode 100644
index 0000000000..4abca52cae
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands
@@ -0,0 +1,59 @@
+./xmlchange PTS_LON=161.341431
+./xmlchange PTS_LAT=68.613037
+./xmlchange DATM_YR_END=2004
+./xmlchange START_TOD=46800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_RU-Che_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/RU-Che/CLM1PT_data/CTSM_DATM_RU-Che_2003-2004.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2004" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2004" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=2
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2002-12-31
+ ./xmlchange DATM_YR_ALIGN=2002
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/RU-Che/LAI_stream_RU-Che_2003-2004.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2004" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2002" >> user_nl_clm
+ echo "stream_year_first_lai=2002" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2003" >> user_nl_clm
+ 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/PLUMBER2/RU-Fyo/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands
new file mode 100644
index 0000000000..74c3693f71
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=32.922081
+./xmlchange PTS_LAT=56.461529000000006
+./xmlchange DATM_YR_END=2014
+./xmlchange START_TOD=75600
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_RU-Fyo_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/RU-Fyo/CLM1PT_data/CTSM_DATM_RU-Fyo_2003-2014.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=12
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2002-12-31
+ ./xmlchange DATM_YR_ALIGN=2002
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/RU-Fyo/LAI_stream_RU-Fyo_2003-2014.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2014" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2002" >> user_nl_clm
+ echo "stream_year_first_lai=2002" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2003" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/RU-Zot/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/RU-Zot/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/RU-Zot/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands b/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands
new file mode 100644
index 0000000000..b68d328625
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=89.3508
+./xmlchange PTS_LAT=60.8008
+./xmlchange DATM_YR_END=2003
+./xmlchange START_TOD=61200
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_RU-Zot_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/RU-Zot/CLM1PT_data/CTSM_DATM_RU-Zot_2003-2003.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2003" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2003" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=1
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2002-12-31
+ ./xmlchange DATM_YR_ALIGN=2002
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/RU-Zot/LAI_stream_RU-Zot_2003-2003.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2003" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2002" >> user_nl_clm
+ echo "stream_year_first_lai=2002" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2003" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/SD-Dem/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/SD-Dem/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/SD-Dem/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands b/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands
new file mode 100644
index 0000000000..b2e63de838
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=30.4783
+./xmlchange PTS_LAT=13.2829
+./xmlchange DATM_YR_END=2009
+./xmlchange START_TOD=75600
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_SD-Dem_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/SD-Dem/CLM1PT_data/CTSM_DATM_SD-Dem_2005-2009.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2009" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2009" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2009" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=5
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2004-12-31
+ ./xmlchange DATM_YR_ALIGN=2004
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/SD-Dem/LAI_stream_SD-Dem_2005-2009.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2009" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2004" >> user_nl_clm
+ echo "stream_year_first_lai=2004" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2005" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/SE-Deg/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/SE-Deg/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/SE-Deg/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands b/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands
new file mode 100644
index 0000000000..dfc8e4b83f
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands
@@ -0,0 +1,59 @@
+./xmlchange PTS_LON=19.55669
+./xmlchange PTS_LAT=64.181969
+./xmlchange DATM_YR_END=2005
+./xmlchange START_TOD=82800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_SE-Deg_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/SE-Deg/CLM1PT_data/CTSM_DATM_SE-Deg_2002-2005.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2005" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2005" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=4
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2001-12-31
+ ./xmlchange DATM_YR_ALIGN=2001
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/SE-Deg/LAI_stream_SE-Deg_2002-2005.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2005" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2001" >> user_nl_clm
+ echo "stream_year_first_lai=2001" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2002" >> user_nl_clm
+ 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/PLUMBER2/UK-Gri/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/UK-Gri/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/UK-Gri/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands
new file mode 100644
index 0000000000..efa3a6f1ae
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-3.7980650000000002
+./xmlchange PTS_LAT=56.60722
+./xmlchange DATM_YR_END=2001
+./xmlchange START_TOD=0
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_UK-Gri_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/UK-Gri/CLM1PT_data/CTSM_DATM_UK-Gri_2000-2001.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2001" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2000" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2001" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2000" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2000" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2001" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2000" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=2
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2000-01-01
+ ./xmlchange DATM_YR_ALIGN=2000
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/UK-Gri/LAI_stream_UK-Gri_2000-2001.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2001" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2000" >> user_nl_clm
+ echo "stream_year_first_lai=2000" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2000" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/UK-Ham/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/UK-Ham/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/UK-Ham/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands b/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands
new file mode 100644
index 0000000000..47143973d4
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-0.8583069999999999
+./xmlchange PTS_LAT=51.153529999999996
+./xmlchange DATM_YR_END=2004
+./xmlchange START_TOD=0
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_UK-Ham_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/UK-Ham/CLM1PT_data/CTSM_DATM_UK-Ham_2004-2004.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2004" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2004" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=1
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2004-01-01
+ ./xmlchange DATM_YR_ALIGN=2004
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/UK-Ham/LAI_stream_UK-Ham_2004-2004.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2004" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2004" >> user_nl_clm
+ echo "stream_year_first_lai=2004" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2004" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/UK-PL3/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/UK-PL3/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/UK-PL3/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands
new file mode 100644
index 0000000000..161de2a08e
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-1.2666629999999999
+./xmlchange PTS_LAT=51.450001
+./xmlchange DATM_YR_END=2006
+./xmlchange START_TOD=0
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_UK-PL3_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/UK-PL3/CLM1PT_data/CTSM_DATM_UK-PL3_2005-2006.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=2
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2005-01-01
+ ./xmlchange DATM_YR_ALIGN=2005
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/UK-PL3/LAI_stream_UK-PL3_2005-2006.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2006" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2005" >> user_nl_clm
+ echo "stream_year_first_lai=2005" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2005" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-AR1/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-AR1/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-AR1/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands
new file mode 100644
index 0000000000..727e21a389
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-99.419983
+./xmlchange PTS_LAT=36.426701
+./xmlchange DATM_YR_END=2012
+./xmlchange START_TOD=21600
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-AR1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-AR1/CLM1PT_data/CTSM_DATM_US-AR1_2010-2012.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2010" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2012" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2010" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2010" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2012" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2010" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=3
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2010-01-01
+ ./xmlchange DATM_YR_ALIGN=2010
+ ./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=2010
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-AR1/LAI_stream_US-AR1_2010-2012.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2012" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2010" >> user_nl_clm
+ echo "stream_year_first_lai=2010" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2010" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-AR2/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-AR2/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-AR2/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands
new file mode 100644
index 0000000000..5de187cd7a
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-99.597504
+./xmlchange PTS_LAT=36.635799
+./xmlchange DATM_YR_END=2011
+./xmlchange START_TOD=21600
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-AR2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-AR2/CLM1PT_data/CTSM_DATM_US-AR2_2010-2011.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2011" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2010" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2011" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2010" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2010" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2011" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2010" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=2
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2010-01-01
+ ./xmlchange DATM_YR_ALIGN=2010
+ ./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=2010
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-AR2/LAI_stream_US-AR2_2010-2011.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2011" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2010" >> user_nl_clm
+ echo "stream_year_first_lai=2010" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2010" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-ARM/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-ARM/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-ARM/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands
new file mode 100644
index 0000000000..da1de52a6e
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-97.4888
+./xmlchange PTS_LAT=36.605801
+./xmlchange DATM_YR_END=2012
+./xmlchange START_TOD=21600
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-ARM_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-ARM/CLM1PT_data/CTSM_DATM_US-ARM_2003-2012.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2012" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2012" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=10
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2003-01-01
+ ./xmlchange DATM_YR_ALIGN=2003
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-ARM/LAI_stream_US-ARM_2003-2012.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2012" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2003" >> user_nl_clm
+ echo "stream_year_first_lai=2003" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2003" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Aud/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-Aud/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Aud/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands
new file mode 100644
index 0000000000..47ae3dd4d9
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-110.509201
+./xmlchange PTS_LAT=31.5907
+./xmlchange DATM_YR_END=2005
+./xmlchange START_TOD=25200
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Aud_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Aud/CLM1PT_data/CTSM_DATM_US-Aud_2003-2005.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2005" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2005" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=3
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2003-01-01
+ ./xmlchange DATM_YR_ALIGN=2003
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Aud/LAI_stream_US-Aud_2003-2005.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2005" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2003" >> user_nl_clm
+ echo "stream_year_first_lai=2003" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2003" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Bar/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-Bar/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Bar/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands
new file mode 100644
index 0000000000..2d24f07e53
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-71.28808599999999
+./xmlchange PTS_LAT=44.064640000000004
+./xmlchange DATM_YR_END=2005
+./xmlchange START_TOD=18000
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Bar_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Bar/CLM1PT_data/CTSM_DATM_US-Bar_2005-2005.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2005" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2005" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=1
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2005-01-01
+ ./xmlchange DATM_YR_ALIGN=2005
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Bar/LAI_stream_US-Bar_2005-2005.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2005" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2005" >> user_nl_clm
+ echo "stream_year_first_lai=2005" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2005" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Bkg/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-Bkg/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Bkg/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands
new file mode 100644
index 0000000000..9fb49876da
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-96.836182
+./xmlchange PTS_LAT=44.345290999999996
+./xmlchange DATM_YR_END=2006
+./xmlchange START_TOD=21600
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Bkg_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Bkg/CLM1PT_data/CTSM_DATM_US-Bkg_2005-2006.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=2
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2005-01-01
+ ./xmlchange DATM_YR_ALIGN=2005
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Bkg/LAI_stream_US-Bkg_2005-2006.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2006" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2005" >> user_nl_clm
+ echo "stream_year_first_lai=2005" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2005" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Blo/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-Blo/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Blo/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands
new file mode 100644
index 0000000000..c208c920f7
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-120.632751
+./xmlchange PTS_LAT=38.895302
+./xmlchange DATM_YR_END=2006
+./xmlchange START_TOD=28800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Blo_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Blo/CLM1PT_data/CTSM_DATM_US-Blo_2000-2006.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2000" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2000" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2000" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2000" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=7
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2000-01-01
+ ./xmlchange DATM_YR_ALIGN=2000
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Blo/LAI_stream_US-Blo_2000-2006.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2006" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2000" >> user_nl_clm
+ echo "stream_year_first_lai=2000" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2000" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Bo1/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-Bo1/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Bo1/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands
new file mode 100644
index 0000000000..c802acf23c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-88.290405
+./xmlchange PTS_LAT=40.006199
+./xmlchange DATM_YR_END=2006
+./xmlchange START_TOD=21600
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Bo1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Bo1/CLM1PT_data/CTSM_DATM_US-Bo1_1997-2006.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=1997" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=1997" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=1997" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=1997" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=1997" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=10
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=1997-01-01
+ ./xmlchange DATM_YR_ALIGN=1997
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Bo1/LAI_stream_US-Bo1_1997-2006.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2006" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=1997" >> user_nl_clm
+ echo "stream_year_first_lai=1997" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=1997" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Cop/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-Cop/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Cop/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands
new file mode 100644
index 0000000000..d66d11a697
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-109.389999
+./xmlchange PTS_LAT=38.09
+./xmlchange DATM_YR_END=2003
+./xmlchange START_TOD=25200
+./xmlchange ATM_NCPL=24
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Cop_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Cop/CLM1PT_data/CTSM_DATM_US-Cop_2002-2003.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2003" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2003" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=2
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2002-01-01
+ ./xmlchange DATM_YR_ALIGN=2002
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Cop/LAI_stream_US-Cop_2002-2003.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2003" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2002" >> user_nl_clm
+ echo "stream_year_first_lai=2002" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2002" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-FPe/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-FPe/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-FPe/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands
new file mode 100644
index 0000000000..621e4156ed
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-105.10189799999999
+./xmlchange PTS_LAT=48.307701
+./xmlchange DATM_YR_END=2006
+./xmlchange START_TOD=25200
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-FPe_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-FPe/CLM1PT_data/CTSM_DATM_US-FPe_2000-2006.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2000" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2000" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2000" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2000" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=7
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2000-01-01
+ ./xmlchange DATM_YR_ALIGN=2000
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-FPe/LAI_stream_US-FPe_2000-2006.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2006" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2000" >> user_nl_clm
+ echo "stream_year_first_lai=2000" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2000" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-GLE/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-GLE/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-GLE/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands
new file mode 100644
index 0000000000..a7548fbb53
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-106.239899
+./xmlchange PTS_LAT=41.366501
+./xmlchange DATM_YR_END=2014
+./xmlchange START_TOD=25200
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-GLE_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-GLE/CLM1PT_data/CTSM_DATM_US-GLE_2009-2014.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2009" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2009" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2009" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2009" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2009" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2009" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=6
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2009-01-01
+ ./xmlchange DATM_YR_ALIGN=2009
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-GLE/LAI_stream_US-GLE_2009-2014.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2014" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2009" >> user_nl_clm
+ echo "stream_year_first_lai=2009" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2009" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Goo/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-Goo/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Goo/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands
new file mode 100644
index 0000000000..ee1cf13767
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-89.87350500000001
+./xmlchange PTS_LAT=34.2547
+./xmlchange DATM_YR_END=2006
+./xmlchange START_TOD=21600
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Goo_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Goo/CLM1PT_data/CTSM_DATM_US-Goo_2004-2006.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=3
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2004-01-01
+ ./xmlchange DATM_YR_ALIGN=2004
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Goo/LAI_stream_US-Goo_2004-2006.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2006" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2004" >> user_nl_clm
+ echo "stream_year_first_lai=2004" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2004" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ha1/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-Ha1/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Ha1/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands
new file mode 100644
index 0000000000..43d55bdbd1
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-72.171509
+./xmlchange PTS_LAT=42.5378
+./xmlchange DATM_YR_END=2012
+./xmlchange START_TOD=18000
+./xmlchange ATM_NCPL=24
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Ha1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Ha1/CLM1PT_data/CTSM_DATM_US-Ha1_1992-2012.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=1992" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=1992" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=1992" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2012" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=1992" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=1992" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2012" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=1992" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=21
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=1992-01-01
+ ./xmlchange DATM_YR_ALIGN=1992
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Ha1/LAI_stream_US-Ha1_1992-2012.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2012" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=1992" >> user_nl_clm
+ echo "stream_year_first_lai=1992" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=1992" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ho1/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-Ho1/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Ho1/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands
new file mode 100644
index 0000000000..7e9bda46b2
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-68.740204
+./xmlchange PTS_LAT=45.204102
+./xmlchange DATM_YR_END=2004
+./xmlchange START_TOD=18000
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Ho1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Ho1/CLM1PT_data/CTSM_DATM_US-Ho1_1996-2004.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=1996" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=1996" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=1996" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2004" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=1996" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=1996" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2004" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=1996" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=9
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=1996-01-01
+ ./xmlchange DATM_YR_ALIGN=1996
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Ho1/LAI_stream_US-Ho1_1996-2004.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2004" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=1996" >> user_nl_clm
+ echo "stream_year_first_lai=1996" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=1996" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-KS2/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-KS2/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-KS2/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands
new file mode 100644
index 0000000000..161a377821
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-80.671539
+./xmlchange PTS_LAT=28.608578
+./xmlchange DATM_YR_END=2006
+./xmlchange START_TOD=18000
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-KS2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-KS2/CLM1PT_data/CTSM_DATM_US-KS2_2003-2006.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=4
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2003-01-01
+ ./xmlchange DATM_YR_ALIGN=2003
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-KS2/LAI_stream_US-KS2_2003-2006.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2006" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2003" >> user_nl_clm
+ echo "stream_year_first_lai=2003" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2003" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Los/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-Los/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Los/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands
new file mode 100644
index 0000000000..b606ac7e9e
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands
@@ -0,0 +1,59 @@
+./xmlchange PTS_LON=-89.979187
+./xmlchange PTS_LAT=46.082699
+./xmlchange DATM_YR_END=2008
+./xmlchange START_TOD=21600
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Los_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Los/CLM1PT_data/CTSM_DATM_US-Los_2000-2008.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2000" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2008" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2000" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2000" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2008" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2000" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=9
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2000-01-01
+ ./xmlchange DATM_YR_ALIGN=2000
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Los/LAI_stream_US-Los_2000-2008.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2008" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2000" >> user_nl_clm
+ echo "stream_year_first_lai=2000" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2000" >> user_nl_clm
+ 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/PLUMBER2/US-MMS/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-MMS/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-MMS/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands
new file mode 100644
index 0000000000..b817bac303
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-86.41308599999999
+./xmlchange PTS_LAT=39.3232
+./xmlchange DATM_YR_END=2014
+./xmlchange START_TOD=18000
+./xmlchange ATM_NCPL=24
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-MMS_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-MMS/CLM1PT_data/CTSM_DATM_US-MMS_1999-2014.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=1999" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=1999" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=1999" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=1999" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=1999" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=1999" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=16
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=1999-01-01
+ ./xmlchange DATM_YR_ALIGN=1999
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-MMS/LAI_stream_US-MMS_1999-2014.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2014" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=1999" >> user_nl_clm
+ echo "stream_year_first_lai=1999" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=1999" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-MOz/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-MOz/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-MOz/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands
new file mode 100644
index 0000000000..a666ccbaf0
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-92.200012
+./xmlchange PTS_LAT=38.74411
+./xmlchange DATM_YR_END=2006
+./xmlchange START_TOD=21600
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-MOz_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-MOz/CLM1PT_data/CTSM_DATM_US-MOz_2005-2006.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=2
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2005-01-01
+ ./xmlchange DATM_YR_ALIGN=2005
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-MOz/LAI_stream_US-MOz_2005-2006.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2006" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2005" >> user_nl_clm
+ echo "stream_year_first_lai=2005" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2005" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Me2/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-Me2/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Me2/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands
new file mode 100644
index 0000000000..e07240f14f
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-121.557404
+./xmlchange PTS_LAT=44.452301
+./xmlchange DATM_YR_END=2014
+./xmlchange START_TOD=28800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Me2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Me2/CLM1PT_data/CTSM_DATM_US-Me2_2002-2014.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=13
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2002-01-01
+ ./xmlchange DATM_YR_ALIGN=2002
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Me2/LAI_stream_US-Me2_2002-2014.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2014" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2002" >> user_nl_clm
+ echo "stream_year_first_lai=2002" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2002" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Me4/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-Me4/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Me4/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands
new file mode 100644
index 0000000000..6b26c589d9
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-121.62240600000001
+./xmlchange PTS_LAT=44.499199
+./xmlchange DATM_YR_END=2000
+./xmlchange START_TOD=28800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Me4_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Me4/CLM1PT_data/CTSM_DATM_US-Me4_1996-2000.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=1996" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2000" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=1996" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=1996" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2000" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=1996" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=1996" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2000" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=1996" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=5
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=1996-01-01
+ ./xmlchange DATM_YR_ALIGN=1996
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Me4/LAI_stream_US-Me4_1996-2000.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2000" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=1996" >> user_nl_clm
+ echo "stream_year_first_lai=1996" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=1996" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Me6/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-Me6/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Me6/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands
new file mode 100644
index 0000000000..6056ec6552
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-121.607803
+./xmlchange PTS_LAT=44.323299
+./xmlchange DATM_YR_END=2014
+./xmlchange START_TOD=28800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Me6_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Me6/CLM1PT_data/CTSM_DATM_US-Me6_2011-2014.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2011" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2011" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2011" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2011" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=4
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2011-01-01
+ ./xmlchange DATM_YR_ALIGN=2011
+ ./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=2011
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Me6/LAI_stream_US-Me6_2011-2014.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2014" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2011" >> user_nl_clm
+ echo "stream_year_first_lai=2011" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2011" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Myb/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-Myb/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Myb/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands
new file mode 100644
index 0000000000..89c79b88bc
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands
@@ -0,0 +1,59 @@
+./xmlchange PTS_LON=-121.765106
+./xmlchange PTS_LAT=38.049801
+./xmlchange DATM_YR_END=2014
+./xmlchange START_TOD=28800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Myb_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Myb/CLM1PT_data/CTSM_DATM_US-Myb_2011-2014.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2011" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2011" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2011" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2011" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=4
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2011-01-01
+ ./xmlchange DATM_YR_ALIGN=2011
+ ./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=2011
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Myb/LAI_stream_US-Myb_2011-2014.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2014" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2011" >> user_nl_clm
+ echo "stream_year_first_lai=2011" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2011" >> user_nl_clm
+ 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/PLUMBER2/US-NR1/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-NR1/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-NR1/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands
new file mode 100644
index 0000000000..7185333ba0
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-105.546402
+./xmlchange PTS_LAT=40.032902
+./xmlchange DATM_YR_END=2014
+./xmlchange START_TOD=25200
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-NR1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-NR1/CLM1PT_data/CTSM_DATM_US-NR1_1999-2014.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=1999" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=1999" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=1999" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=1999" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=1999" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=1999" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=16
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=1999-01-01
+ ./xmlchange DATM_YR_ALIGN=1999
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-NR1/LAI_stream_US-NR1_1999-2014.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2014" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=1999" >> user_nl_clm
+ echo "stream_year_first_lai=1999" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=1999" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ne1/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-Ne1/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Ne1/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands
new file mode 100644
index 0000000000..5ec7590921
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-96.47659300000001
+./xmlchange PTS_LAT=41.1651
+./xmlchange DATM_YR_END=2012
+./xmlchange START_TOD=21600
+./xmlchange ATM_NCPL=24
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Ne1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Ne1/CLM1PT_data/CTSM_DATM_US-Ne1_2002-2012.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2012" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2012" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=11
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2002-01-01
+ ./xmlchange DATM_YR_ALIGN=2002
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Ne1/LAI_stream_US-Ne1_2002-2012.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2012" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2002" >> user_nl_clm
+ echo "stream_year_first_lai=2002" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2002" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ne2/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-Ne2/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Ne2/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands
new file mode 100644
index 0000000000..75d2215e6c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-96.470093
+./xmlchange PTS_LAT=41.164902000000005
+./xmlchange DATM_YR_END=2012
+./xmlchange START_TOD=21600
+./xmlchange ATM_NCPL=24
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Ne2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Ne2/CLM1PT_data/CTSM_DATM_US-Ne2_2002-2012.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2012" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2012" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=11
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2002-01-01
+ ./xmlchange DATM_YR_ALIGN=2002
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Ne2/LAI_stream_US-Ne2_2002-2012.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2012" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2002" >> user_nl_clm
+ echo "stream_year_first_lai=2002" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2002" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ne3/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-Ne3/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Ne3/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands
new file mode 100644
index 0000000000..ceb48a35c0
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-96.439697
+./xmlchange PTS_LAT=41.179699
+./xmlchange DATM_YR_END=2012
+./xmlchange START_TOD=21600
+./xmlchange ATM_NCPL=24
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Ne3_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Ne3/CLM1PT_data/CTSM_DATM_US-Ne3_2002-2012.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2012" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2012" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=11
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2002-01-01
+ ./xmlchange DATM_YR_ALIGN=2002
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Ne3/LAI_stream_US-Ne3_2002-2012.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2012" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2002" >> user_nl_clm
+ echo "stream_year_first_lai=2002" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2002" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-PFa/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-PFa/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-PFa/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands
new file mode 100644
index 0000000000..e214fa5d26
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-90.272308
+./xmlchange PTS_LAT=45.9459
+./xmlchange DATM_YR_END=2014
+./xmlchange START_TOD=21600
+./xmlchange ATM_NCPL=24
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-PFa_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-PFa/CLM1PT_data/CTSM_DATM_US-PFa_1995-2014.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=1995" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=1995" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=1995" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=1995" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=1995" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=1995" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=20
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=1995-01-01
+ ./xmlchange DATM_YR_ALIGN=1995
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-PFa/LAI_stream_US-PFa_1995-2014.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2014" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=1995" >> user_nl_clm
+ echo "stream_year_first_lai=1995" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=1995" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Prr/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-Prr/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Prr/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands
new file mode 100644
index 0000000000..0be161a3f5
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-147.487595
+./xmlchange PTS_LAT=65.123703
+./xmlchange DATM_YR_END=2013
+./xmlchange START_TOD=32400
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Prr_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Prr/CLM1PT_data/CTSM_DATM_US-Prr_2011-2013.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2011" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2013" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2011" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2011" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2013" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2011" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=3
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2011-01-01
+ ./xmlchange DATM_YR_ALIGN=2011
+ ./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=2011
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Prr/LAI_stream_US-Prr_2011-2013.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2013" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2011" >> user_nl_clm
+ echo "stream_year_first_lai=2011" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2011" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SP1/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-SP1/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-SP1/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands
new file mode 100644
index 0000000000..b1944933fe
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-82.218781
+./xmlchange PTS_LAT=29.73807
+./xmlchange DATM_YR_END=2005
+./xmlchange START_TOD=18000
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-SP1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-SP1/CLM1PT_data/CTSM_DATM_US-SP1_2005-2005.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2005" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2005" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=1
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2005-01-01
+ ./xmlchange DATM_YR_ALIGN=2005
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-SP1/LAI_stream_US-SP1_2005-2005.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2005" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2005" >> user_nl_clm
+ echo "stream_year_first_lai=2005" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2005" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SP2/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-SP2/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-SP2/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands
new file mode 100644
index 0000000000..9ec9b25681
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-82.244812
+./xmlchange PTS_LAT=29.764799
+./xmlchange DATM_YR_END=2004
+./xmlchange START_TOD=18000
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-SP2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-SP2/CLM1PT_data/CTSM_DATM_US-SP2_2000-2004.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2000" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2004" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2000" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2000" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2004" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2000" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=5
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2000-01-01
+ ./xmlchange DATM_YR_ALIGN=2000
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-SP2/LAI_stream_US-SP2_2000-2004.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2004" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2000" >> user_nl_clm
+ echo "stream_year_first_lai=2000" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2000" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SP3/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-SP3/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-SP3/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands
new file mode 100644
index 0000000000..72c94ad6a5
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-82.163269
+./xmlchange PTS_LAT=29.75477
+./xmlchange DATM_YR_END=2004
+./xmlchange START_TOD=18000
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-SP3_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-SP3/CLM1PT_data/CTSM_DATM_US-SP3_1999-2004.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=1999" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=1999" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=1999" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2004" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=1999" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=1999" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2004" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=1999" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=6
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=1999-01-01
+ ./xmlchange DATM_YR_ALIGN=1999
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-SP3/LAI_stream_US-SP3_1999-2004.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2004" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=1999" >> user_nl_clm
+ echo "stream_year_first_lai=1999" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=1999" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SRG/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-SRG/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-SRG/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands
new file mode 100644
index 0000000000..53c07383d3
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-110.827698
+./xmlchange PTS_LAT=31.7894
+./xmlchange DATM_YR_END=2014
+./xmlchange START_TOD=25200
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-SRG_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-SRG/CLM1PT_data/CTSM_DATM_US-SRG_2009-2014.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2009" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2009" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2009" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2009" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2009" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2009" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=6
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2009-01-01
+ ./xmlchange DATM_YR_ALIGN=2009
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-SRG/LAI_stream_US-SRG_2009-2014.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2014" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2009" >> user_nl_clm
+ echo "stream_year_first_lai=2009" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2009" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SRM/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-SRM/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-SRM/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands
new file mode 100644
index 0000000000..f8ab5b5b89
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-110.865997
+./xmlchange PTS_LAT=31.8214
+./xmlchange DATM_YR_END=2014
+./xmlchange START_TOD=25200
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-SRM_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-SRM/CLM1PT_data/CTSM_DATM_US-SRM_2004-2014.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=11
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2004-01-01
+ ./xmlchange DATM_YR_ALIGN=2004
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-SRM/LAI_stream_US-SRM_2004-2014.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2014" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2004" >> user_nl_clm
+ echo "stream_year_first_lai=2004" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2004" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Syv/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-Syv/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Syv/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands
new file mode 100644
index 0000000000..7bd8324a6d
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-89.347717
+./xmlchange PTS_LAT=46.242001
+./xmlchange DATM_YR_END=2008
+./xmlchange START_TOD=21600
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Syv_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Syv/CLM1PT_data/CTSM_DATM_US-Syv_2002-2008.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2008" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2008" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=7
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2002-01-01
+ ./xmlchange DATM_YR_ALIGN=2002
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Syv/LAI_stream_US-Syv_2002-2008.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2008" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2002" >> user_nl_clm
+ echo "stream_year_first_lai=2002" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2002" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ton/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-Ton/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Ton/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands
new file mode 100644
index 0000000000..2ac988eb2f
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-120.966003
+./xmlchange PTS_LAT=38.431599
+./xmlchange DATM_YR_END=2014
+./xmlchange START_TOD=28800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Ton_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Ton/CLM1PT_data/CTSM_DATM_US-Ton_2001-2014.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2001" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2001" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2001" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2001" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2001" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=14
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2001-01-01
+ ./xmlchange DATM_YR_ALIGN=2001
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Ton/LAI_stream_US-Ton_2001-2014.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2014" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2001" >> user_nl_clm
+ echo "stream_year_first_lai=2001" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2001" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Tw4/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-Tw4/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Tw4/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands
new file mode 100644
index 0000000000..0895943d1c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands
@@ -0,0 +1,59 @@
+./xmlchange PTS_LON=-121.641403
+./xmlchange PTS_LAT=38.103001
+./xmlchange DATM_YR_END=2014
+./xmlchange START_TOD=28800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Tw4_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Tw4/CLM1PT_data/CTSM_DATM_US-Tw4_2014-2014.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2014" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2014" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2014" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2014" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2014" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2014" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=1
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2014-01-01
+ ./xmlchange DATM_YR_ALIGN=2014
+ ./xmlchange DATM_YR_START=2014
+else
+ # for spinup case with I2000 compset
+ ./xmlchange RUN_STARTDATE=0001-01-01
+ ./xmlchange DATM_YR_ALIGN=1
+ ./xmlchange DATM_YR_START=2014
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Tw4/LAI_stream_US-Tw4_2014-2014.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2014" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2014" >> user_nl_clm
+ echo "stream_year_first_lai=2014" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2014" >> user_nl_clm
+ 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/PLUMBER2/US-Twt/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-Twt/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Twt/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands
new file mode 100644
index 0000000000..77649de143
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-121.653107
+./xmlchange PTS_LAT=38.1087
+./xmlchange DATM_YR_END=2014
+./xmlchange START_TOD=28800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Twt_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Twt/CLM1PT_data/CTSM_DATM_US-Twt_2010-2014.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2010" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2010" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2010" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2010" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=5
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2010-01-01
+ ./xmlchange DATM_YR_ALIGN=2010
+ ./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=2010
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Twt/LAI_stream_US-Twt_2010-2014.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2014" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2010" >> user_nl_clm
+ echo "stream_year_first_lai=2010" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2010" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-UMB/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-UMB/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-UMB/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands
new file mode 100644
index 0000000000..511e7e05c3
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-84.713806
+./xmlchange PTS_LAT=45.559799
+./xmlchange DATM_YR_END=2014
+./xmlchange START_TOD=18000
+./xmlchange ATM_NCPL=24
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-UMB_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-UMB/CLM1PT_data/CTSM_DATM_US-UMB_2000-2014.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2000" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2000" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2000" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2000" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=15
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2000-01-01
+ ./xmlchange DATM_YR_ALIGN=2000
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-UMB/LAI_stream_US-UMB_2000-2014.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2014" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2000" >> user_nl_clm
+ echo "stream_year_first_lai=2000" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2000" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Var/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-Var/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Var/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands
new file mode 100644
index 0000000000..8cbb483737
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-120.95072900000001
+./xmlchange PTS_LAT=38.4133
+./xmlchange DATM_YR_END=2014
+./xmlchange START_TOD=28800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Var_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Var/CLM1PT_data/CTSM_DATM_US-Var_2001-2014.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2001" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2001" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2001" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2001" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2001" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=14
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2001-01-01
+ ./xmlchange DATM_YR_ALIGN=2001
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Var/LAI_stream_US-Var_2001-2014.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2014" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2001" >> user_nl_clm
+ echo "stream_year_first_lai=2001" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2001" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-WCr/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-WCr/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-WCr/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands
new file mode 100644
index 0000000000..adcfb2eec4
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-90.079895
+./xmlchange PTS_LAT=45.805901
+./xmlchange DATM_YR_END=2006
+./xmlchange START_TOD=21600
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-WCr_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-WCr/CLM1PT_data/CTSM_DATM_US-WCr_1999-2006.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=1999" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=1999" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=1999" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=1999" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=1999" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=1999" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=8
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=1999-01-01
+ ./xmlchange DATM_YR_ALIGN=1999
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-WCr/LAI_stream_US-WCr_1999-2006.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2006" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=1999" >> user_nl_clm
+ echo "stream_year_first_lai=1999" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=1999" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Whs/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-Whs/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Whs/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands
new file mode 100644
index 0000000000..0f091925f1
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-110.0522
+./xmlchange PTS_LAT=31.743799
+./xmlchange DATM_YR_END=2014
+./xmlchange START_TOD=25200
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Whs_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Whs/CLM1PT_data/CTSM_DATM_US-Whs_2008-2014.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2008" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2008" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2008" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2008" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2008" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=7
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2008-01-01
+ ./xmlchange DATM_YR_ALIGN=2008
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Whs/LAI_stream_US-Whs_2008-2014.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2014" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2008" >> user_nl_clm
+ echo "stream_year_first_lai=2008" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2008" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Wkg/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-Wkg/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Wkg/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands
new file mode 100644
index 0000000000..da4a18b3f9
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-109.941895
+./xmlchange PTS_LAT=31.7365
+./xmlchange DATM_YR_END=2014
+./xmlchange START_TOD=25200
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Wkg_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Wkg/CLM1PT_data/CTSM_DATM_US-Wkg_2005-2014.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=10
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2005-01-01
+ ./xmlchange DATM_YR_ALIGN=2005
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Wkg/LAI_stream_US-Wkg_2005-2014.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2014" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2005" >> user_nl_clm
+ echo "stream_year_first_lai=2005" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2005" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands
new file mode 100644
index 0000000000..016f4e4038
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=31.496901
+./xmlchange PTS_LAT=-25.019699
+./xmlchange DATM_YR_END=2002
+./xmlchange START_TOD=79200
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_ZA-Kru_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ZA-Kru/CLM1PT_data/CTSM_DATM_ZA-Kru_2000-2002.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2002" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2000" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2002" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2000" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2000" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2002" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2000" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=3
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=1999-12-31
+ ./xmlchange DATM_YR_ALIGN=1999
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/ZA-Kru/LAI_stream_ZA-Kru_2000-2002.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2002" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=1999" >> user_nl_clm
+ echo "stream_year_first_lai=1999" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2000" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/include_user_mods
new file mode 100644
index 0000000000..37aebd7a8c
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/include_user_mods
@@ -0,0 +1 @@
+../defaults
\ No newline at end of file
diff --git a/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands
new file mode 100644
index 0000000000..2729227ecc
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands
@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=23.252781
+./xmlchange PTS_LAT=-15.437778
+./xmlchange DATM_YR_END=2008
+./xmlchange START_TOD=79200
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_ZM-Mon_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ZM-Mon/CLM1PT_data/CTSM_DATM_ZM-Mon_2008-2008.nc " >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams
+echo "presaero.SSP3-7.0:year_align=2008" >> user_nl_datm_streams
+
+echo "presndep.SSP3-7.0:year_first=2008" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_last=2008" >> user_nl_datm_streams
+echo "presndep.SSP3-7.0:year_align=2008" >> user_nl_datm_streams
+
+echo "co2tseries.SSP3-7.0:year_first=2008" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_last=2008" >> user_nl_datm_streams
+echo "co2tseries.SSP3-7.0:year_align=2008" >> user_nl_datm_streams
+
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and do not cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of years that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_N=1
+ fi
+ # set start date for transient case with historical compset
+ ./xmlchange RUN_STARTDATE=2007-12-31
+ ./xmlchange DATM_YR_ALIGN=2007
+ ./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
+fi
+
+# Turn on LAI streams for a SP case
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/ZM-Mon/LAI_stream_ZM-Mon_2008-2008.nc'" >> user_nl_clm
+ echo "stream_year_last_lai=2008" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ # for transient case with a historical compset
+ echo "model_year_align_lai=2007" >> user_nl_clm
+ echo "stream_year_first_lai=2007" >> user_nl_clm
+ else
+ # for a spinup case with a i2000 compset
+ echo "model_year_align_lai=1" >> user_nl_clm
+ echo "stream_year_first_lai=2008" >> user_nl_clm
+ fi
+fi
+
diff --git a/cime_config/usermods_dirs/PLUMBER2/defaults/shell_commands b/cime_config/usermods_dirs/PLUMBER2/defaults/shell_commands
new file mode 100644
index 0000000000..abc9e44127
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/defaults/shell_commands
@@ -0,0 +1,89 @@
+#!/bin/bash
+./xmlchange CLM_USRDAT_NAME=PLUMBER2
+./xmlchange DATM_MODE=1PT
+# Set data forcing data to future scenario so will have data from 2018 to present-day
+./xmlchange DATM_PRESAERO=SSP3-7.0
+./xmlchange DATM_CO2_TSERIES=SSP3-7.0
+./xmlchange DATM_PRESNDEP=SSP3-7.0
+
+# Explicitly set the MPI library to mpi-serial so won't have the build/run complexity of a full MPI library
+./xmlchange MPILIB=mpi-serial
+# Explicitly set PIO Type to NETCDF since this is a single processor case (should already be set this way)
+./xmlchange PIO_TYPENAME=netcdf
+
+#
+compset=`./xmlquery COMPSET --value`
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
+TEST=`./xmlquery TEST --value`
+
+# For a transient case run the whole length and don't cycle
+if [[ $compset =~ ^HIST ]]; then
+ # Number of months that can be run for the full transient case
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_OPTION="nyears"
+ fi
+ # TODO, makde this accurate for plumber2
+ ./xmlchange CLM_NML_USE_CASE="2018-PD_transient"
+ # TODO, modify for postAD runs in tower script? Remove from usermods?
+ ./xmlchange CLM_FORCE_COLDSTART=off
+ ./xmlchange CALENDAR=GREGORIAN
+ echo "! this allows for large h1 data files, regardless or run length " >> user_nl_clm
+ 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
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
+ echo "! using LAI streams for SP cases" >> user_nl_clm
+ echo "use_lai_streams = .true." >> user_nl_clm
+ echo "lai_mapalgo = 'nn'" >> user_nl_clm
+ echo "stream_meshfile_lai='none'" >> user_nl_clm
+ if [[ $TEST != "TRUE" ]]; then
+ ./xmlchange STOP_OPTION=nyears
+ fi
+ echo "! h1 output stream for SP case" >> user_nl_clm
+ if [[ $compset =~ ^HIST ]]; then
+ echo "lai_dtlimit=1e30" >> user_nl_clm
+ echo "" >> user_nl_clm
+ echo "! h1 output stream for transient SP case" >> user_nl_clm
+ echo "hist_fincl2 = 'FSA','FIRA','EFLX_LH_TOT','FSH','FGR12','FGR','TSKIN','FSR','FSDS',
+ 'SNOFSRVD','SNOFSRND','SNOFSRVI','SNOFSRNI','FSNO','TSOI','SNO_T','RAIN','SNOW',
+ 'QVEGT','QVEGE','QSOIL','QRUNOFF','QOVER','QH2OSFC','QDRAI','QDRAI_PERCH',
+ 'SNO_EXISTENCE','QSNOMELT','H2OCAN','H2OSNO','SNOCAN','SOILICE','SOILLIQ',
+ 'SOILWATER_10CM','TWS','SNOWLIQ','SNOWDP','RH2M','TSA','FLDS','Q2M','PBOT','TLAI',
+ 'WIND','FIRE','FCTR','FCEV','FGEV','FSM','COSZEN','H2OSOI','BTRANMN','TV','RSSUN',
+ 'RSSHA','FSH_G','RHAF','RH_LEAF','RH','T10','TG','SABG','SABV','FPSN','TBOT','TAUX',
+ 'TAUY','QSNOEVAP','QFLX_SOLIDEVAP_FROM_TOP_LAYER','QFLX_SNOW_DRAIN','H2OSFC','FPSN'" >> user_nl_clm
+ else
+ echo "lai_dtlimit=30." >> user_nl_clm
+ echo "" >> user_nl_clm
+ fi
+ echo " " >> user_nl_clm
+else # for BGC cases
+ if [[ $compset =~ ^HIST ]]; then
+ echo "! h1 output stream for transient BGC case" >> user_nl_clm
+ echo "hist_fincl2 = 'AR','ELAI','FCEV','FCTR','FGEV','FIRA','FSA','FSH','GPP','H2OSOI',
+ 'HR','SNOW_DEPTH','TBOT','TSOI','SOILC_vr','FV','NET_NMIN_vr','EFLX_LH_TOT',
+ 'FGR12','FGR','TSKIN','FSR','FSDS','SNOFSRVD','SNOFSRND','SNOFSRVI','SNOFSRNI',
+ 'FSNO','SNO_T','RAIN','SNOW','QVEGT','QVEGE','QSOIL','QRUNOFF','QOVER','QH2OSFC',
+ 'QDRAI','QDRAI_PERCH','SNO_EXISTENCE','QSNOMELT','H2OCAN','H2OSNO','SNOCAN','SOILICE',
+ 'SOILLIQ','SOILWATER_10CM','TWS','SNOWLIQ','SNOWDP','RH2M','TSA','FLDS','Q2M','PBOT',
+ 'TLAI','WIND','FIRE','FSM','COSZEN','BTRANMN','TV','RSSUN','RSSHA','FSH_G','RHAF',
+ 'RH_LEAF','RH','T10','TG','SABG','SABV','TBOT','TAUX','TAUY','QSNOEVAP','H2OSFC'" >> user_nl_clm
+ echo "" >> user_nl_clm
+ fi
+fi
diff --git a/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_clm b/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_clm
new file mode 100644
index 0000000000..fe23065798
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_clm
@@ -0,0 +1,24 @@
+!----------------------------------------------------------------------------------
+! Users should add all user specific namelist changes below in the form of
+! namelist_var = new_namelist_value
+!
+! EXCEPTIONS:
+! Set use_cndv by the compset you use and the CLM_BLDNML_OPTS -dynamic_vegetation setting
+! Set use_vichydro by the compset you use and the CLM_BLDNML_OPTS -vichydro setting
+! Set use_cn by the compset you use and CLM_BLDNML_OPTS -bgc setting
+! Set use_crop by the compset you use and CLM_BLDNML_OPTS -crop setting
+! Set spinup_state by the CLM_BLDNML_OPTS -bgc_spinup setting
+! Set co2_ppmv with CCSM_CO2_PPMV option
+! Set fatmlndfrc with LND_DOMAIN_PATH/LND_DOMAIN_FILE options
+! Set finidat with RUN_REFCASE/RUN_REFDATE/RUN_REFTOD options for hybrid or branch cases
+! (includes $inst_string for multi-ensemble cases)
+! or with CLM_FORCE_COLDSTART to do a cold start
+! or set it with an explicit filename here.
+! Set maxpatch_glcmec with GLC_NEC option
+! Set glc_do_dynglacier with GLC_TWO_WAY_COUPLING env variable
+!----------------------------------------------------------------------------------
+
+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/surfdata_1x1_PLUMBER2_${PLUMBER2SITE}_hist_2000_16pfts_c240326.nc"
+
+! custom namelist changes for each site / case
diff --git a/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_cpl b/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_cpl
new file mode 100644
index 0000000000..b848027087
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_cpl
@@ -0,0 +1,21 @@
+!------------------------------------------------------------------------
+! Users should ONLY USE user_nl_cpl to change namelists variables
+! for namelist variables in drv_in (except for the ones below) and
+! any keyword/values in seq_maps.rc
+! Users should add ALL user specific namelist and seq_maps.rc changes below
+! using the following syntax
+! namelist_var = new_namelist_value
+! or
+! mapname = new_map_name
+! For example to change the default value of ocn2atm_fmapname to 'foo' use
+! ocn2atm_fmapname = 'foo'
+!
+! Note that some namelist variables MAY NOT be changed in user_nl_cpl -
+! they are defined in a $CASEROOT xml file and must be changed with
+! xmlchange.
+!
+! For example, rather than set username to 'foo' in user_nl_cpl, call
+! ./xmlchange USER=foo
+!------------------------------------------------------------------------
+! average year of all PLUMBER2 170 sites is 2007
+orb_iyear = 2007
diff --git a/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_datm_streams b/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_datm_streams
new file mode 100644
index 0000000000..35071ff415
--- /dev/null
+++ b/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_datm_streams
@@ -0,0 +1,41 @@
+!------------------------------------------------------------------------
+! This file is used to modify datm.streams.xml generated in $RUNDIR
+! Entries should have the form
+! :<= new stream_value>
+! The following are accepted values for an assume streamname of foo
+! foo:meshfile = character string
+! foo:datafiles = comma separated string of full pathnames (e.g. file1,file2,file3...)
+! foo:datavars = comma separated string of field pairs (e.g. foo foobar,foo2 foobar2...)
+! foo:taxmode = one of [cycle, extend, limit]
+! foo:tintalgo = one of [lower,upper,nearest,linear,coszen]
+! foo:readmode = single (only suported mode right now)
+! foo:mapalgo = one of [bilinear,redist,nn,consf,consd,none]
+! foo:dtlimit = real (1.5 is default)
+! foo:year_first = integer
+! foo:year_last = integer
+! foo:year_align = integer
+! foo:vectors = one of [none,u:v]
+! foo:lev_dimname: = one of [null,name of level dimenion name]
+! foo:offset = integer
+! As an example:
+! foo:year_first = 1950
+! would change the stream year_first stream_entry to 1950 for the foo stream block
+!------------------------------------------------------------------------
+! This will come out when cdeps externals 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
+
+presndep.SSP3-7.0:datafiles = $DIN_LOC_ROOT/lnd/clm2/ndepdata/fndep_clm_SSP370_b.e21.BWSSP370cmip6.f09_g17.CMIP6-SSP3-7.0-WACCM.002_1849-2101_monthly_0.9x1.25_c211216.nc
+presndep.SSP3-7.0:dtlimit=30
+
+co2tseries.SSP3-7.0:datafiles = $DIN_LOC_ROOT/atm/datm7/CO2/fco2_datm_globalSSP3-7.0_simyr_1750-2501_CMIP6_c201101.nc
+
diff --git a/python/ctsm/site_and_regional/single_point_case.py b/python/ctsm/site_and_regional/single_point_case.py
index 456bebee91..fd7e20a4f2 100644
--- a/python/ctsm/site_and_regional/single_point_case.py
+++ b/python/ctsm/site_and_regional/single_point_case.py
@@ -18,8 +18,9 @@
logger = logging.getLogger(__name__)
-NAT_PFT = 15
-MAX_PFT = 78
+NAT_PFT = 15 # natural pfts
+NUM_PFT = 17 # for runs with generic crops
+MAX_PFT = 78 # for runs with explicit crops
# -- constants to represent months of year
FIRST_MONTH = 1
@@ -56,6 +57,10 @@ class SinglePointCase(BaseCase):
flag for splitting cropland evenly among all crop types
pct_pft : list
weight or percentage of each pft.
+ cth : list
+ canopy top height (m)
+ cbh : list
+ canopy bottom height (m)
num_pft : list
total number of pfts for surface dataset (if crop 78 pft, else 16 pft)
uni_snow : bool
@@ -110,6 +115,8 @@ def __init__(
evenly_split_cropland,
pct_pft,
num_pft,
+ cth,
+ cbh,
include_nonveg,
uni_snow,
cap_saturation,
@@ -131,6 +138,8 @@ def __init__(
self.evenly_split_cropland = evenly_split_cropland
self.pct_pft = pct_pft
self.num_pft = num_pft
+ self.cth = cth
+ self.cbh = cbh
self.include_nonveg = include_nonveg
self.uni_snow = uni_snow
self.cap_saturation = cap_saturation
@@ -166,7 +175,7 @@ def check_dom_pft(self):
- 0 - NAT_PFT-1 range
or
- NAT_PFT - MAX_PFT range
- - give an error : mixed land units not possible.
+ - give an error: mixed land units not possible
-------------
Raises:
@@ -196,21 +205,21 @@ def check_dom_pft(self):
raise argparse.ArgumentTypeError(err_msg)
# -- check dom_pft vs num_pft
- if self.num_pft - 1 < max_dom_pft < MAX_PFT:
- err_msg = "Please use --crop flag when --dompft is above 15."
+ if max_dom_pft > self.num_pft:
+ err_msg = "Please use --crop flag when --dompft is above 16."
raise argparse.ArgumentTypeError(err_msg)
+ # -- check dom_pft vs MAX_pft
+ if self.num_pft - 1 < max_dom_pft < NUM_PFT:
+ logger.info(
+ "WARNING, you trying to run with generic crops (16 PFT surface dataset)"
+ )
+
# -- check if all dom_pft are in the same range:
if min_dom_pft < NAT_PFT <= max_dom_pft:
- err_msg = """
- \n
- Subsetting using mixed land units is not possible.
- Please make sure all --dompft values are in only
- one of these ranges:
- - 0-{} natural pfts
- - {}-{} crop pfts (cfts)
- """.format(
- NAT_PFT - 1, NAT_PFT, MAX_PFT
+ err_msg = (
+ "You are subsetting using mixed land units that have both "
+ "natural pfts and crop cfts. Check your surface dataset. "
)
raise argparse.ArgumentTypeError(err_msg)
@@ -406,8 +415,11 @@ def modify_surfdata_atpoint(self, f_orig):
# f_mod["PCT_CROP"][:, :] = 0
# -- loop over all dom_pft and pct_pft
- zip_pfts = zip(self.dom_pft, self.pct_pft)
- for dom_pft, pct_pft in zip_pfts:
+ zip_pfts = zip(self.dom_pft, self.pct_pft, self.cth, self.cbh)
+ for dom_pft, pct_pft, cth, cbh in zip_pfts:
+ if cth is not None:
+ f_mod["MONTHLY_HEIGHT_TOP"][:, :, :, dom_pft] = cth
+ f_mod["MONTHLY_HEIGHT_BOT"][:, :, :, dom_pft] = cbh
if dom_pft < NAT_PFT:
f_mod["PCT_NAT_PFT"][:, :, dom_pft] = pct_pft
else:
diff --git a/python/ctsm/subset_data.py b/python/ctsm/subset_data.py
index 030cea2247..c5c685de05 100644
--- a/python/ctsm/subset_data.py
+++ b/python/ctsm/subset_data.py
@@ -175,6 +175,25 @@ def get_parser():
default=None,
nargs="*",
)
+ pt_parser.add_argument(
+ "--cth",
+ help="canopy top height for pft",
+ action="store",
+ dest="cth",
+ type=float,
+ default=None,
+ nargs="*",
+ )
+ pt_parser.add_argument(
+ "--cbh",
+ help="canopy bottom height for pft",
+ action="store",
+ dest="cbh",
+ type=float,
+ default=None,
+ nargs="*",
+ )
+
# -- region-specific parser options
rg_parser.add_argument(
"--lat1",
@@ -561,6 +580,8 @@ def subset_point(args, file_dict: dict):
evenly_split_cropland=args.evenly_split_cropland,
pct_pft=args.pct_pft,
num_pft=num_pft,
+ cth=args.cth,
+ cbh=args.cbh,
include_nonveg=args.include_nonveg,
uni_snow=args.uni_snow,
cap_saturation=args.cap_saturation,
diff --git a/python/ctsm/test/test_unit_singlept_data.py b/python/ctsm/test/test_unit_singlept_data.py
index 6fdc3109d9..644af82588 100755
--- a/python/ctsm/test/test_unit_singlept_data.py
+++ b/python/ctsm/test/test_unit_singlept_data.py
@@ -39,6 +39,8 @@ class TestSinglePointCase(unittest.TestCase):
evenly_split_cropland = False
pct_pft = None
num_pft = 16
+ cth = [0.9, 0.9, 0.9, 0.9, 0.9, 0.9, 0.9, 0.9, 0.9, 0.9, 0.9, 0.9]
+ cbh = [0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1]
include_nonveg = False
uni_snow = True
cap_saturation = True
@@ -62,6 +64,8 @@ def test_create_tag_noname(self):
evenly_split_cropland=self.evenly_split_cropland,
pct_pft=self.pct_pft,
num_pft=self.num_pft,
+ cth=self.cth,
+ cbh=self.cbh,
include_nonveg=self.include_nonveg,
uni_snow=self.uni_snow,
cap_saturation=self.cap_saturation,
@@ -89,6 +93,8 @@ def test_create_tag_name(self):
evenly_split_cropland=self.evenly_split_cropland,
pct_pft=self.pct_pft,
num_pft=self.num_pft,
+ cth=self.cth,
+ cbh=self.cbh,
include_nonveg=self.include_nonveg,
uni_snow=self.uni_snow,
cap_saturation=self.cap_saturation,
@@ -117,6 +123,8 @@ def test_check_dom_pft_too_big(self):
evenly_split_cropland=self.evenly_split_cropland,
pct_pft=self.pct_pft,
num_pft=self.num_pft,
+ cth=self.cth,
+ cbh=self.cbh,
include_nonveg=self.include_nonveg,
uni_snow=self.uni_snow,
cap_saturation=self.cap_saturation,
@@ -145,6 +153,8 @@ def test_check_dom_pft_too_small(self):
evenly_split_cropland=self.evenly_split_cropland,
pct_pft=self.pct_pft,
num_pft=self.num_pft,
+ cth=self.cth,
+ cbh=self.cbh,
include_nonveg=self.include_nonveg,
uni_snow=self.uni_snow,
cap_saturation=self.cap_saturation,
@@ -173,6 +183,8 @@ def test_check_dom_pft_numpft(self):
evenly_split_cropland=self.evenly_split_cropland,
pct_pft=self.pct_pft,
num_pft=self.num_pft,
+ cth=self.cth,
+ cbh=self.cbh,
include_nonveg=self.include_nonveg,
uni_snow=self.uni_snow,
cap_saturation=self.cap_saturation,
@@ -202,6 +214,8 @@ def test_check_dom_pft_mixed_range(self):
evenly_split_cropland=self.evenly_split_cropland,
pct_pft=self.pct_pft,
num_pft=self.num_pft,
+ cth=self.cth,
+ cbh=self.cbh,
include_nonveg=self.include_nonveg,
uni_snow=self.uni_snow,
cap_saturation=self.cap_saturation,
@@ -211,7 +225,7 @@ def test_check_dom_pft_mixed_range(self):
single_point.dom_pft = [1, 5, 15]
single_point.num_pft = 78
with self.assertRaisesRegex(
- argparse.ArgumentTypeError, "mixed land units is not possible*"
+ argparse.ArgumentTypeError, "You are subsetting using mixed land*"
):
single_point.check_dom_pft()
@@ -233,6 +247,8 @@ def test_check_nonveg_nodompft(self):
evenly_split_cropland=self.evenly_split_cropland,
pct_pft=self.pct_pft,
num_pft=self.num_pft,
+ cth=self.cth,
+ cbh=self.cbh,
include_nonveg=self.include_nonveg,
uni_snow=self.uni_snow,
cap_saturation=self.cap_saturation,
@@ -265,6 +281,8 @@ def test_check_pct_pft_notsamenumbers(self):
evenly_split_cropland=self.evenly_split_cropland,
pct_pft=self.pct_pft,
num_pft=self.num_pft,
+ cth=self.cth,
+ cbh=self.cbh,
include_nonveg=self.include_nonveg,
uni_snow=self.uni_snow,
cap_saturation=self.cap_saturation,
@@ -296,6 +314,8 @@ def test_check_pct_pft_sum_not1(self):
evenly_split_cropland=self.evenly_split_cropland,
pct_pft=self.pct_pft,
num_pft=self.num_pft,
+ cth=self.cth,
+ cbh=self.cbh,
include_nonveg=self.include_nonveg,
uni_snow=self.uni_snow,
cap_saturation=self.cap_saturation,
@@ -327,6 +347,8 @@ def test_check_pct_pft_fraction_topct(self):
evenly_split_cropland=self.evenly_split_cropland,
pct_pft=self.pct_pft,
num_pft=self.num_pft,
+ cth=self.cth,
+ cbh=self.cbh,
include_nonveg=self.include_nonveg,
uni_snow=self.uni_snow,
cap_saturation=self.cap_saturation,
diff --git a/python/ctsm/test/test_unit_singlept_data_surfdata.py b/python/ctsm/test/test_unit_singlept_data_surfdata.py
index 0052e796d1..05198ab350 100755
--- a/python/ctsm/test/test_unit_singlept_data_surfdata.py
+++ b/python/ctsm/test/test_unit_singlept_data_surfdata.py
@@ -47,6 +47,8 @@ class TestSinglePointCaseSurfaceNoCrop(unittest.TestCase):
evenly_split_cropland = False
pct_pft = None
num_pft = 16
+ cth = [0.9, 0.9, 0.9, 0.9, 0.9, 0.9, 0.9, 0.9, 0.9, 0.9, 0.9, 0.9]
+ cbh = [0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1]
include_nonveg = False
uni_snow = True
cap_saturation = True
@@ -56,6 +58,8 @@ class TestSinglePointCaseSurfaceNoCrop(unittest.TestCase):
# -- dimensions of xarray dataset
lsmlat = [plat]
lsmlon = [plon]
+ months = np.arange(1, 13, 1, dtype=int)
+ lsmpft = np.arange(0, 79, 1, dtype=int)
natpft = np.arange(0, 15, 1, dtype=int)
cft = np.arange(15, 17, 1, dtype=int)
numurbl = np.arange(0, 3, 1, dtype=int)
@@ -137,6 +141,24 @@ class TestSinglePointCaseSurfaceNoCrop(unittest.TestCase):
"units": "unitless",
},
),
+ "MONTHLY_HEIGHT_TOP": xr.DataArray(
+ data=np.random.rand(1, 1, months[-1], lsmpft[-1] + 1),
+ dims=["lsmlat", "lsmlon", "time", "lsmpft"],
+ coords={"lsmlat": lsmlat, "lsmlon": lsmlon, "time": months, "lsmpft": lsmpft},
+ attrs={
+ "long_name": "monthly height top by pft and month",
+ "units": "m",
+ },
+ ),
+ "MONTHLY_HEIGHT_BOT": xr.DataArray(
+ data=np.random.rand(1, 1, months[-1], lsmpft[-1] + 1),
+ dims=["lsmlat", "lsmlon", "time", "lsmpft"],
+ coords={"lsmlat": lsmlat, "lsmlon": lsmlon, "time": months, "lsmpft": lsmpft},
+ attrs={
+ "long_name": "monthly height bottom by pft and month",
+ "units": "m",
+ },
+ ),
},
attrs={"Conventions": "test data only"},
)
@@ -159,6 +181,8 @@ def test_modify_surfdata_atpoint_nocrop_1pft_pctnatpft(self):
evenly_split_cropland=self.evenly_split_cropland,
pct_pft=self.pct_pft,
num_pft=self.num_pft,
+ cth=self.cth,
+ cbh=self.cbh,
include_nonveg=self.include_nonveg,
uni_snow=self.uni_snow,
cap_saturation=self.cap_saturation,
@@ -192,6 +216,8 @@ def test_modify_surfdata_atpoint_nocrop_1pft_pctnatveg(self):
evenly_split_cropland=self.evenly_split_cropland,
pct_pft=self.pct_pft,
num_pft=self.num_pft,
+ cth=self.cth,
+ cbh=self.cbh,
include_nonveg=self.include_nonveg,
uni_snow=self.uni_snow,
cap_saturation=self.cap_saturation,
@@ -221,6 +247,8 @@ def test_modify_surfdata_atpoint_nocrop_1pft_pctcrop(self):
evenly_split_cropland=self.evenly_split_cropland,
pct_pft=self.pct_pft,
num_pft=self.num_pft,
+ cth=self.cth,
+ cbh=self.cbh,
include_nonveg=self.include_nonveg,
uni_snow=self.uni_snow,
cap_saturation=self.cap_saturation,
@@ -250,6 +278,8 @@ def test_modify_surfdata_atpoint_nocrop_1pft_glacier(self):
evenly_split_cropland=self.evenly_split_cropland,
pct_pft=self.pct_pft,
num_pft=self.num_pft,
+ cth=self.cth,
+ cbh=self.cbh,
include_nonveg=self.include_nonveg,
uni_snow=self.uni_snow,
cap_saturation=self.cap_saturation,
@@ -280,6 +310,8 @@ def test_modify_surfdata_atpoint_nocrop_1pft_wetland(self):
evenly_split_cropland=self.evenly_split_cropland,
pct_pft=self.pct_pft,
num_pft=self.num_pft,
+ cth=self.cth,
+ cbh=self.cbh,
include_nonveg=self.include_nonveg,
uni_snow=self.uni_snow,
cap_saturation=self.cap_saturation,
@@ -310,6 +342,8 @@ def test_modify_surfdata_atpoint_nocrop_1pft_lake(self):
evenly_split_cropland=self.evenly_split_cropland,
pct_pft=self.pct_pft,
num_pft=self.num_pft,
+ cth=self.cth,
+ cbh=self.cbh,
include_nonveg=self.include_nonveg,
uni_snow=self.uni_snow,
cap_saturation=self.cap_saturation,
@@ -340,6 +374,8 @@ def test_modify_surfdata_atpoint_nocrop_1pft_unisnow(self):
evenly_split_cropland=self.evenly_split_cropland,
pct_pft=self.pct_pft,
num_pft=self.num_pft,
+ cth=self.cth,
+ cbh=self.cbh,
include_nonveg=self.include_nonveg,
uni_snow=self.uni_snow,
cap_saturation=self.cap_saturation,
@@ -371,6 +407,8 @@ def test_modify_surfdata_atpoint_nocrop_1pft_capsat(self):
evenly_split_cropland=self.evenly_split_cropland,
pct_pft=self.pct_pft,
num_pft=self.num_pft,
+ cth=self.cth,
+ cbh=self.cbh,
include_nonveg=self.include_nonveg,
uni_snow=self.uni_snow,
cap_saturation=self.cap_saturation,
@@ -402,6 +440,8 @@ def test_modify_surfdata_atpoint_nocrop_multipft(self):
evenly_split_cropland=self.evenly_split_cropland,
pct_pft=self.pct_pft,
num_pft=self.num_pft,
+ cth=self.cth,
+ cbh=self.cbh,
include_nonveg=self.include_nonveg,
uni_snow=self.uni_snow,
cap_saturation=self.cap_saturation,
@@ -439,6 +479,8 @@ def test_modify_surfdata_atpoint_nocrop_urban_nononveg(self):
evenly_split_cropland=self.evenly_split_cropland,
pct_pft=self.pct_pft,
num_pft=self.num_pft,
+ cth=self.cth,
+ cbh=self.cbh,
include_nonveg=self.include_nonveg,
uni_snow=self.uni_snow,
cap_saturation=self.cap_saturation,
@@ -474,6 +516,8 @@ def test_modify_surfdata_atpoint_nocrop_urban_include_nonveg(self):
evenly_split_cropland=self.evenly_split_cropland,
pct_pft=self.pct_pft,
num_pft=self.num_pft,
+ cth=self.cth,
+ cbh=self.cbh,
include_nonveg=self.include_nonveg,
uni_snow=self.uni_snow,
cap_saturation=self.cap_saturation,
@@ -512,6 +556,8 @@ def test_modify_surfdata_atpoint_nocrop_wetland_include_nonveg(self):
evenly_split_cropland=self.evenly_split_cropland,
pct_pft=self.pct_pft,
num_pft=self.num_pft,
+ cth=self.cth,
+ cbh=self.cbh,
include_nonveg=self.include_nonveg,
uni_snow=self.uni_snow,
cap_saturation=self.cap_saturation,
@@ -543,6 +589,8 @@ def test_modify_surfdata_atpoint_nocrop_nopft_zero_nonveg(self):
evenly_split_cropland=self.evenly_split_cropland,
pct_pft=self.pct_pft,
num_pft=self.num_pft,
+ cth=self.cth,
+ cbh=self.cbh,
include_nonveg=self.include_nonveg,
uni_snow=self.uni_snow,
cap_saturation=self.cap_saturation,
@@ -577,6 +625,8 @@ def test_modify_surfdata_atpoint_nocrop_nopft_include_nonveg(self):
evenly_split_cropland=self.evenly_split_cropland,
pct_pft=self.pct_pft,
num_pft=self.num_pft,
+ cth=self.cth,
+ cbh=self.cbh,
include_nonveg=self.include_nonveg,
uni_snow=self.uni_snow,
cap_saturation=self.cap_saturation,
@@ -612,6 +662,8 @@ class TestSinglePointCaseSurfaceCrop(unittest.TestCase):
evenly_split_cropland = False
pct_pft = None
num_pft = 78
+ cth = [0.9, 0.9, 0.9, 0.9, 0.9, 0.9, 0.9, 0.9, 0.9, 0.9, 0.9, 0.9]
+ cbh = [0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1]
include_nonveg = False
uni_snow = False
cap_saturation = False
@@ -621,6 +673,8 @@ class TestSinglePointCaseSurfaceCrop(unittest.TestCase):
# -- dimensions of xarray dataset
lsmlat = [plat]
lsmlon = [plon]
+ months = np.arange(1, 12, 1, dtype=int)
+ lsmpft = np.arange(0, 79, 1, dtype=int)
natpft = np.arange(0, 15, 1, dtype=int)
cft = np.arange(15, 79, 1, dtype=int)
numurbl = np.arange(0, 3, 1, dtype=int)
@@ -702,6 +756,24 @@ class TestSinglePointCaseSurfaceCrop(unittest.TestCase):
"units": "unitless",
},
),
+ "MONTHLY_HEIGHT_TOP": xr.DataArray(
+ data=np.random.rand(1, 1, months[-1], lsmpft[-1] + 1),
+ dims=["lsmlat", "lsmlon", "time", "lsmpft"],
+ coords={"lsmlat": lsmlat, "lsmlon": lsmlon, "time": months, "lsmpft": lsmpft},
+ attrs={
+ "long_name": "monthly height top by pft and month",
+ "units": "m",
+ },
+ ),
+ "MONTHLY_HEIGHT_BOT": xr.DataArray(
+ data=np.random.rand(1, 1, months[-1], lsmpft[-1] + 1),
+ dims=["lsmlat", "lsmlon", "time", "lsmpft"],
+ coords={"lsmlat": lsmlat, "lsmlon": lsmlon, "time": months, "lsmpft": lsmpft},
+ attrs={
+ "long_name": "monthly height bottom by pft and month",
+ "units": "m",
+ },
+ ),
},
attrs={"Conventions": "test data only"},
)
@@ -724,6 +796,8 @@ def test_modify_surfdata_atpoint_crop_1pft_pctnatpft(self):
evenly_split_cropland=self.evenly_split_cropland,
pct_pft=self.pct_pft,
num_pft=self.num_pft,
+ cth=self.cth,
+ cbh=self.cbh,
include_nonveg=self.include_nonveg,
uni_snow=self.uni_snow,
cap_saturation=self.cap_saturation,
@@ -757,6 +831,8 @@ def test_modify_surfdata_atpoint_crop_1pft_pctnatveg(self):
evenly_split_cropland=self.evenly_split_cropland,
pct_pft=self.pct_pft,
num_pft=self.num_pft,
+ cth=self.cth,
+ cbh=self.cbh,
include_nonveg=self.include_nonveg,
uni_snow=self.uni_snow,
cap_saturation=self.cap_saturation,
@@ -786,6 +862,8 @@ def test_modify_surfdata_atpoint_crop_1pft_pctcrop(self):
evenly_split_cropland=self.evenly_split_cropland,
pct_pft=self.pct_pft,
num_pft=self.num_pft,
+ cth=self.cth,
+ cbh=self.cbh,
include_nonveg=self.include_nonveg,
uni_snow=self.uni_snow,
cap_saturation=self.cap_saturation,
@@ -815,6 +893,8 @@ def test_modify_surfdata_atpoint_crop_1pft_glacier(self):
evenly_split_cropland=self.evenly_split_cropland,
pct_pft=self.pct_pft,
num_pft=self.num_pft,
+ cth=self.cth,
+ cbh=self.cbh,
include_nonveg=self.include_nonveg,
uni_snow=self.uni_snow,
cap_saturation=self.cap_saturation,
@@ -845,6 +925,8 @@ def test_modify_surfdata_atpoint_crop_1pft_wetland(self):
evenly_split_cropland=self.evenly_split_cropland,
pct_pft=self.pct_pft,
num_pft=self.num_pft,
+ cth=self.cth,
+ cbh=self.cbh,
include_nonveg=self.include_nonveg,
uni_snow=self.uni_snow,
cap_saturation=self.cap_saturation,
@@ -875,6 +957,8 @@ def test_modify_surfdata_atpoint_crop_1pft_lake(self):
evenly_split_cropland=self.evenly_split_cropland,
pct_pft=self.pct_pft,
num_pft=self.num_pft,
+ cth=self.cth,
+ cbh=self.cbh,
include_nonveg=self.include_nonveg,
uni_snow=self.uni_snow,
cap_saturation=self.cap_saturation,
@@ -905,6 +989,8 @@ def test_modify_surfdata_atpoint_crop_1pft_unisnow(self):
evenly_split_cropland=self.evenly_split_cropland,
pct_pft=self.pct_pft,
num_pft=self.num_pft,
+ cth=self.cth,
+ cbh=self.cbh,
include_nonveg=self.include_nonveg,
uni_snow=self.uni_snow,
cap_saturation=self.cap_saturation,
@@ -935,6 +1021,8 @@ def test_modify_surfdata_atpoint_crop_1pft_capsat(self):
evenly_split_cropland=self.evenly_split_cropland,
pct_pft=self.pct_pft,
num_pft=self.num_pft,
+ cth=self.cth,
+ cbh=self.cbh,
include_nonveg=self.include_nonveg,
uni_snow=self.uni_snow,
cap_saturation=self.cap_saturation,
@@ -966,6 +1054,8 @@ def test_modify_surfdata_atpoint_crop_multipft(self):
evenly_split_cropland=self.evenly_split_cropland,
pct_pft=self.pct_pft,
num_pft=self.num_pft,
+ cth=self.cth,
+ cbh=self.cbh,
include_nonveg=self.include_nonveg,
uni_snow=self.uni_snow,
cap_saturation=self.cap_saturation,
@@ -1001,6 +1091,8 @@ def test_modify_surfdata_atpoint_crop_urban_nononveg(self):
evenly_split_cropland=self.evenly_split_cropland,
pct_pft=self.pct_pft,
num_pft=self.num_pft,
+ cth=self.cth,
+ cbh=self.cbh,
include_nonveg=self.include_nonveg,
uni_snow=self.uni_snow,
cap_saturation=self.cap_saturation,
@@ -1036,6 +1128,8 @@ def test_modify_surfdata_atpoint_crop_urban_include_nonveg(self):
evenly_split_cropland=self.evenly_split_cropland,
pct_pft=self.pct_pft,
num_pft=self.num_pft,
+ cth=self.cth,
+ cbh=self.cbh,
include_nonveg=self.include_nonveg,
uni_snow=self.uni_snow,
cap_saturation=self.cap_saturation,
@@ -1074,6 +1168,8 @@ def test_modify_surfdata_atpoint_crop_lake_include_nonveg(self):
evenly_split_cropland=self.evenly_split_cropland,
pct_pft=self.pct_pft,
num_pft=self.num_pft,
+ cth=self.cth,
+ cbh=self.cbh,
include_nonveg=self.include_nonveg,
uni_snow=self.uni_snow,
cap_saturation=self.cap_saturation,
@@ -1105,6 +1201,8 @@ def test_modify_surfdata_atpoint_crop_nopft_zero_nonveg(self):
evenly_split_cropland=self.evenly_split_cropland,
pct_pft=self.pct_pft,
num_pft=self.num_pft,
+ cth=self.cth,
+ cbh=self.cbh,
include_nonveg=self.include_nonveg,
uni_snow=self.uni_snow,
cap_saturation=self.cap_saturation,
@@ -1139,6 +1237,8 @@ def test_modify_surfdata_atpoint_crop_nopft_include_nonveg(self):
evenly_split_cropland=self.evenly_split_cropland,
pct_pft=self.pct_pft,
num_pft=self.num_pft,
+ cth=self.cth,
+ cbh=self.cbh,
include_nonveg=self.include_nonveg,
uni_snow=self.uni_snow,
cap_saturation=self.cap_saturation,
diff --git a/src/cpl/share_esmf/laiStreamMod.F90 b/src/cpl/share_esmf/laiStreamMod.F90
index 3e4074fbde..d471481c6f 100644
--- a/src/cpl/share_esmf/laiStreamMod.F90
+++ b/src/cpl/share_esmf/laiStreamMod.F90
@@ -62,6 +62,7 @@ subroutine lai_init(bounds)
integer :: nml_error ! namelist i/o error flag
character(len=CL) :: stream_fldFileName_lai ! lai stream filename to read
character(len=CL) :: stream_meshfile_lai ! lai stream meshfile
+ real(r8) :: lai_dtlimit = 1.5_r8 ! dlimit for lai stream to use
character(len=CL) :: lai_mapalgo = 'bilinear' ! Mapping alogrithm
character(len=CL) :: lai_tintalgo = 'linear' ! Time interpolation alogrithm
integer :: lai_offset = 0 ! Offset in time for dataset (sec)
@@ -75,6 +76,7 @@ subroutine lai_init(bounds)
stream_year_first_lai, &
stream_year_last_lai, &
model_year_align_lai, &
+ lai_dtlimit, &
lai_mapalgo, &
stream_fldFileName_lai, &
stream_meshfile_lai, &
@@ -110,6 +112,8 @@ subroutine lai_init(bounds)
call shr_mpi_bcast(stream_fldFileName_lai , mpicom)
call shr_mpi_bcast(stream_meshfile_lai , mpicom)
call shr_mpi_bcast(lai_tintalgo , mpicom)
+ call shr_mpi_bcast(lai_dtlimit , mpicom)
+ call shr_mpi_bcast(lai_mapalgo , mpicom)
if (masterproc) then
write(iulog,*)
@@ -120,6 +124,9 @@ subroutine lai_init(bounds)
write(iulog,'(a,a)' ) ' stream_fldFileName_lai = ',trim(stream_fldFileName_lai)
write(iulog,'(a,a)' ) ' stream_meshfile_lai = ',trim(stream_meshfile_lai)
write(iulog,'(a,a)' ) ' lai_tintalgo = ',trim(lai_tintalgo)
+ write(iulog,'(a,a)' ) ' lai_mapalgo = ',trim(lai_mapalgo)
+ write(iulog,'(a,a)' ) ' lai_dtlimit = ', lai_dtlimit
+
do n = 1,numLaiFields
write(iulog,'(a,a)' ) ' stream_varname = ',trim(stream_varnames(n))
end do
@@ -144,7 +151,7 @@ subroutine lai_init(bounds)
stream_yearAlign = model_year_align_lai, &
stream_offset = lai_offset, &
stream_taxmode = 'cycle', &
- stream_dtlimit = 1.5_r8, &
+ stream_dtlimit = lai_dtlimit, &
stream_tintalgo = lai_tintalgo, &
stream_name = 'LAI data', &
rc = rc)
diff --git a/tools/site_and_regional/PLUMBER2_sites.csv b/tools/site_and_regional/PLUMBER2_sites.csv
new file mode 100644
index 0000000000..f252fa1d61
--- /dev/null
+++ b/tools/site_and_regional/PLUMBER2_sites.csv
@@ -0,0 +1,175 @@
+#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.
+#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
+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,-999,-999.00,-999.00,-999.00,16,100.00, 0.50, 0.01,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,-999,-999.00,-999.00,-999.00,16,100.00, 0.50, 0.01,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,-999,-999.00,-999.00,-999.00,16,100.00, 0.50, 0.01,2002,2012,2002-01-01,21600,24
+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
+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,-999,-999.00,-999.00,-999.00,16,100.00, 0.50, 0.01,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
diff --git a/tools/site_and_regional/create_PLUMBER2_sites_csv.ncl b/tools/site_and_regional/create_PLUMBER2_sites_csv.ncl
new file mode 100644
index 0000000000..2bcf9915ca
--- /dev/null
+++ b/tools/site_and_regional/create_PLUMBER2_sites_csv.ncl
@@ -0,0 +1,182 @@
+; NCL script
+; create_PLUMBER2_sites_csv.ncl ; Keith Oleson, Sep 2023
+; This script generates a csv file for the NEON site_and_regional infrastructure
+; PLUMBER2_sites.csv
+;**************************************
+
+load "$NCARG_ROOT/lib/ncarg/nclscripts/csm/shea_util.ncl"
+
+begin
+
+ print ("=========================================")
+ print ("Start Time: "+systemfunc("date") )
+ print ("=========================================")
+
+
+; Sites (170 sites)
+ sim = systemfunc("ls -1 " + "/glade/work/oleson/PLUMBER2/datm_files/")
+
+ 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")
+
+ npfts_ch = 17 ; Number of pfts for canopy top/bottom height
+
+ pfttype = new((/nsim,2/),"integer") ; pft type
+ pftperc = new((/nsim,2/),"double") ; pft %
+ pftcth = new((/nsim,2/),"double") ; pft canopy top height
+ pftcbh = new((/nsim,2/),"double") ; pft canopy bottom height
+ pctwet = new(nsim,"double")
+
+ 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.
+ 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.
+ 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
+ print((/"PCT_NATVEG, PCT_WETLAND, PCT_CROP are all zero"/))
+ end if
+ end if
+ end if
+
+ end do
+
+ print((/"Done with Loop"/))
+
+ fname = "/glade/work/oleson/ctsm_PLUMBERcsv/tools/site_and_regional/PLUMBER2_sites.csv"
+ header = (/"#pftX-cth and pftX-cbh are the site=specific canopy top and bottom heights", \
+ "#start_year and end_year will be used to define DATM_YR_ALIGH, DATM_YR_START and DATM_YR_END, and STOP_N in units of nyears.", \
+ "#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"/)
+ 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/]
+ 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")
+
+ print ("=========================================")
+ print ("Finish Time: "+systemfunc("date") )
+ print ("=========================================")
+
+ end
+
diff --git a/tools/site_and_regional/plumber2_surf_wrapper.py b/tools/site_and_regional/plumber2_surf_wrapper.py
new file mode 100755
index 0000000000..d68875ce6a
--- /dev/null
+++ b/tools/site_and_regional/plumber2_surf_wrapper.py
@@ -0,0 +1,143 @@
+#! /usr/bin/env python3
+"""
+|------------------------------------------------------------------|
+|--------------------- Instructions -----------------------------|
+|------------------------------------------------------------------|
+This script is a simple wrapper for neon sites that performs the
+following:
+ 1) For neon sites, subset surface dataset from global dataset
+ (i.e. ./subset_data.py )
+ 2) Download neon and update the created surface dataset
+ based on the downloaded neon data.
+ (i.e. modify_singlept_site_neon.py)
+
+Instructions for running using conda python environments:
+
+../../py_env_create
+conda activate ctsm_py
+
+"""
+# Import libraries
+from __future__ import print_function
+
+import os
+import sys
+import tqdm
+import logging
+import argparse
+import subprocess
+
+import pandas as pd
+
+
+
+
+def get_parser():
+ """
+ Get parser object for this script.
+ """
+ parser = argparse.ArgumentParser(description=__doc__,
+ formatter_class=argparse.RawDescriptionHelpFormatter)
+
+ parser.print_usage = parser.print_help
+
+ parser.add_argument('-v','--verbose',
+ help='Verbose mode will print more information. ',
+ action="store_true",
+ dest="verbose",
+ default=False)
+
+ parser.add_argument('--16pft',
+ help='Create and/or modify 16-PFT surface datasets (e.g. for a FATES run) ',
+ action="store_true",
+ dest="pft_16",
+ default=True)
+
+ return parser
+
+
+def execute(command):
+ """
+ Function for running a command on shell.
+ Args:
+ command (str):
+ command that we want to run.
+ Raises:
+ Error with the return code from shell.
+ """
+ print ('\n',' >> ',*command,'\n')
+
+ try:
+ subprocess.check_call(command, stdout=open(os.devnull, "w"), stderr=subprocess.STDOUT)
+
+ except subprocess.CalledProcessError as e:
+ #raise RuntimeError("command '{}' return with error (code {}): {}".format(e.cmd, e.returncode, e.output))
+ #print (e.ouput)
+ print (e)
+
+
+
+
+
+
+def main():
+
+ args = get_parser().parse_args()
+
+ if args.verbose:
+ logging.basicConfig(level=logging.DEBUG)
+
+
+ plumber2_sites = pd.read_csv('PLUMBER2_sites.csv', skiprows=4)
+
+ for i, row in tqdm.tqdm(plumber2_sites.iterrows()):
+ lat = row['Lat']
+ lon = row['Lon']
+ site = row['Site']
+ pft1 = row['pft1']
+ pctpft1 = row['pft1-%']
+ cth1=row['pft1-cth']
+ cbh1=row['pft1-cbh']
+ pft2 = row['pft2']
+ pctpft2 = row['pft2-%']
+ cth2=row['pft2-cth']
+ cbh2=row['pft2-cbh']
+ # overwrite missing values from .csv file
+ if pft1 == -999:
+ pft1 = 0
+ pctpft1 = 0
+ cth1 = 0
+ cbh1 = 0
+ if pft2 == -999:
+ pft2 = 0
+ pctpft2 = 0
+ cth2 = 0
+ cbh2 = 0
+ clmsite = "1x1_PLUMBER2_"+site
+ print ("Now processing site :", site)
+
+ if args.pft_16:
+ # use surface dataset with 16 pfts, but overwrite to 100% 1 dominant PFT
+ # don't set crop flag
+ # set dominant pft
+ subset_command = ['./subset_data','point','--lat',str(lat),'--lon',str(lon),
+ '--site',clmsite,'--dompft',str(pft1),str(pft2),
+ '--pctpft', str(pctpft1),str(pctpft2),
+ '--cth', str(cth1),str(cth2),
+ '--cbh', str(cbh1),str(cbh2),
+ '--create-surface',
+ '--uniform-snowpack','--cap-saturation','--verbose','--overwrite']
+ else:
+ # use surface dataset with 78 pfts, and overwrite to 100% 1 dominant PFT
+ # NOTE: FATES will currently not run with a 78-PFT surface dataset
+ # set crop flag
+ # set dominant pft
+ subset_command = ['./subset_data', 'point', '--lat', str(lat), '--lon', str(lon),
+ '--site', clmsite,'--crop', '--dompft', str(pft1),str(pft2),
+ '--pctpft', str(pctpft1),str(pctpft2), '--create-surface',
+ '--uniform-snowpack', '--cap-saturation', '--verbose', '--overwrite']
+ execute(subset_command)
+
+if __name__ == "__main__":
+ main()
+
diff --git a/tools/site_and_regional/plumber2_usermods.py b/tools/site_and_regional/plumber2_usermods.py
new file mode 100644
index 0000000000..c12e539c31
--- /dev/null
+++ b/tools/site_and_regional/plumber2_usermods.py
@@ -0,0 +1,149 @@
+#! /usr/bin/env python3
+
+"""
+
+Reads in .csv files with PLUMBER2 site information
+Creates individual usermod_dirs for each PLUMBER2 site with shell_commands
+
+"""
+
+# Import libraries
+from __future__ import print_function
+
+import os
+import sys
+import tqdm
+import logging
+import subprocess
+
+import pandas as pd
+
+
+# Big ugly function to create usermod_dirs for each site
+def write_usermods(lat,lon,site,start_year,end_year,
+ start_date,start_year_actual,start_tod,atm_ncpl,stop_n):
+
+ site_dir = os.path.join('../../cime_config/usermods_dirs/PLUMBER2/',site)
+
+ if not os.path.isdir(site_dir):
+ os.makedirs(site_dir, exist_ok=True)
+
+ # create files in each directory
+ include = os.path.join(site_dir,'include_user_mods')
+ iFile = open(include, 'w') # or 'a' to add text instead of truncate
+ iFile.write('../defaults')
+ iFile.close()
+
+ LAIstream = '\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/'+site+'/LAI_stream_'+site+'_'+ \
+ str(start_year)+'-'+str(end_year)+'.nc'
+ shell = os.path.join(site_dir,'shell_commands')
+ sFile = open(shell, 'w') # or 'a' to add text instead of truncate
+ sFile.write(
+ #TODO turn on following line after cdeps changes are added
+ #'./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 START_TOD='+str(start_tod) + '\n' \
+ './xmlchange ATM_NCPL='+str(atm_ncpl) + '\n' \
+ '\n' \
+ # TODO, get working for CTSM5.1, remove this line as it's redundant after PLUMBER2SITE is added
+ # Alternatively, we can take this out of default/user_nl_clm since doing it this way is works fine TODO for 5.2
+ 'echo "fsurdat=\'/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_'+site+'_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc \' " >> user_nl_clm \n' \
+
+ 'echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/'+site+'/CLM1PT_data/CTSM_DATM_'+site+'_'+str(start_year)+'-'+str(end_year)+'.nc " >> user_nl_datm_streams \n' \
+
+ 'echo "presaero.SSP3-7.0:year_first='+str(start_year) + '" >> user_nl_datm_streams \n' \
+ 'echo "presaero.SSP3-7.0:year_last='+str(end_year) + '" >> user_nl_datm_streams \n' \
+ 'echo "presaero.SSP3-7.0:year_align='+str(start_year) + '" >> user_nl_datm_streams \n' \
+ '\n' \
+
+ 'echo "presndep.SSP3-7.0:year_first='+str(start_year) + '" >> user_nl_datm_streams \n' \
+ 'echo "presndep.SSP3-7.0:year_last='+str(end_year) + '" >> user_nl_datm_streams \n' \
+ 'echo "presndep.SSP3-7.0:year_align='+str(start_year) + '" >> user_nl_datm_streams \n' \
+ '\n' \
+
+ 'echo "co2tseries.SSP3-7.0:year_first='+str(start_year) + '" >> user_nl_datm_streams \n' \
+ 'echo "co2tseries.SSP3-7.0:year_last='+str(end_year) + '" >> user_nl_datm_streams \n' \
+ 'echo "co2tseries.SSP3-7.0:year_align='+str(start_year) + '" >> user_nl_datm_streams \n' \
+ '\n' \
+
+ 'compset=`./xmlquery COMPSET --value` \n' \
+ 'CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` \n' \
+ 'TEST=`./xmlquery TEST --value` \n' \
+ '\n' \
+
+ '# For a transient case run the whole length and do not cycle \n' \
+ 'if [[ $compset =~ ^HIST ]]; then \n' \
+ ' # Number of years that can be run for the full transient case \n' \
+ ' if [[ $TEST != "TRUE" ]]; then \n' \
+ ' ./xmlchange STOP_N='+str(stop_n) + '\n' \
+ ' fi \n' \
+ ' # set start date for transient case with historical compset \n' \
+ ' ./xmlchange RUN_STARTDATE='+str(start_date) + '\n' \
+ ' ./xmlchange DATM_YR_ALIGN='+str(start_year_actual) + '\n' \
+ ' ./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' \
+ 'fi \n' \
+ '\n' \
+
+ '# Turn on LAI streams for a SP case \n' \
+ 'if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then \n' \
+ ' echo "stream_fldfilename_lai=\''+LAIstream+'\'" >> user_nl_clm \n' \
+ ' echo "stream_year_last_lai='+str(end_year) + '" >> user_nl_clm \n' \
+ ' if [[ $compset =~ ^HIST ]]; then \n' \
+ ' # for transient case with a historical compset \n' \
+ ' echo "model_year_align_lai='+str(start_year_actual) + '" >> user_nl_clm \n' \
+ ' echo "stream_year_first_lai='+str(start_year_actual) + '" >> user_nl_clm \n' \
+ ' else \n' \
+ ' # for a spinup case with a i2000 compset \n' \
+ ' echo "model_year_align_lai=1" >> user_nl_clm \n' \
+ ' echo "stream_year_first_lai='+str(start_year) + '" >> user_nl_clm \n' \
+ ' fi \n' \
+ 'fi \n'
+ '\n' \
+
+ )
+
+ sFile.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):
+ sFile = open(shell, 'a') # or 'a' to add text instead of truncate
+ sFile.write(
+ '\n' \
+ '# set baseflow scalar to zero for wetland site \n' \
+ 'echo "baseflow_scalar = 0" >> user_nl_clm'
+ )
+ sFile.close()
+
+# End write_usermods function
+
+def main():
+ # For now we can just run the 'main' program as a loop
+ plumber2_sites = pd.read_csv('PLUMBER2_sites.csv', skiprows=4)
+
+ for i, row in tqdm.tqdm(plumber2_sites.iterrows()):
+ lat = row['Lat']
+ lon = row['Lon']
+ site = row['Site']
+ start_year = row['start_year']
+ end_year = row['end_year']
+ start_date = row['RUN_STARTDATE']
+ start_year_actual = start_date[:4]
+ start_tod = row['START_TOD']
+ atm_ncpl = row['ATM_NCPL']
+ stop_n = 1+end_year-start_year
+
+ write_usermods(lat,lon,site,start_year,end_year,
+ start_date,start_year_actual,start_tod,atm_ncpl,stop_n)
+
+if __name__ == "__main__":
+ main()
+