Merge pull request #5 from wwieder/PLUMBERcsv

updates for usermods
glemieux · Apr 1, 2024 · d2fa030 · d2fa030
2 parents 3b09746 + 394b0ba
commit d2fa030
Show file tree

Hide file tree

Showing 174 changed files with 519 additions and 865 deletions.
diff --git a/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands
@@ -1,4 +1,3 @@
-./xmlchange PLUMBER2SITE=AR-SLu
 ./xmlchange PTS_LON=-66.459808
 ./xmlchange PTS_LAT=-33.464802
 ./xmlchange RUN_STARTDATE=2010-01-01
@@ -8,7 +7,8 @@
 ./xmlchange START_TOD=10800
 ./xmlchange ATM_NCPL=48
 
-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 "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 
@@ -35,7 +35,7 @@ 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/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2010.nc'" >> user_nl_clm 
+  echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2010.nc" >> user_nl_clm 
   echo "model_year_align_lai=2010" >> user_nl_clm 
   echo "stream_year_first_lai=2010" >> user_nl_clm 
   echo "stream_year_last_lai=2010" >> user_nl_clm 

diff --git a/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands
@@ -1,4 +1,3 @@
-./xmlchange PLUMBER2SITE=AT-Neu
 ./xmlchange PTS_LON=11.3175
 ./xmlchange PTS_LAT=47.116669
 ./xmlchange RUN_STARTDATE=2001-12-31
@@ -8,7 +7,8 @@
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
-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 "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 
@@ -35,7 +35,7 @@ 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/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2012.nc'" >> user_nl_clm 
+  echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2012.nc" >> user_nl_clm 
   echo "model_year_align_lai=2002" >> user_nl_clm 
   echo "stream_year_first_lai=2002" >> user_nl_clm 
   echo "stream_year_last_lai=2012" >> user_nl_clm 

diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands
@@ -1,4 +1,3 @@
-./xmlchange PLUMBER2SITE=AU-ASM
 ./xmlchange PTS_LON=133.24899299999998
 ./xmlchange PTS_LAT=-22.283001000000002
 ./xmlchange RUN_STARTDATE=2010-12-31
@@ -8,7 +7,8 @@
 ./xmlchange START_TOD=54000
 ./xmlchange ATM_NCPL=48
 
-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 "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 
@@ -35,7 +35,7 @@ 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/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2017.nc'" >> user_nl_clm 
+  echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2017.nc" >> user_nl_clm 
   echo "model_year_align_lai=2011" >> user_nl_clm 
   echo "stream_year_first_lai=2011" >> user_nl_clm 
   echo "stream_year_last_lai=2017" >> user_nl_clm 

diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands
@@ -1,4 +1,3 @@
-./xmlchange PLUMBER2SITE=AU-Cow
 ./xmlchange PTS_LON=145.427155
 ./xmlchange PTS_LAT=-16.23819
 ./xmlchange RUN_STARTDATE=2009-12-31
@@ -8,7 +7,8 @@
 ./xmlchange START_TOD=50400
 ./xmlchange ATM_NCPL=48
 
-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 "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 
@@ -35,7 +35,7 @@ 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/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2015.nc'" >> user_nl_clm 
+  echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2015.nc" >> user_nl_clm 
   echo "model_year_align_lai=2010" >> user_nl_clm 
   echo "stream_year_first_lai=2010" >> user_nl_clm 
   echo "stream_year_last_lai=2015" >> user_nl_clm 

diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands
@@ -1,4 +1,3 @@
-./xmlchange PLUMBER2SITE=AU-Cpr
 ./xmlchange PTS_LON=140.589127
 ./xmlchange PTS_LAT=-34.00206
 ./xmlchange RUN_STARTDATE=2010-12-31
@@ -8,7 +7,8 @@
 ./xmlchange START_TOD=46800
 ./xmlchange ATM_NCPL=48
 
-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 "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 
@@ -35,7 +35,7 @@ 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/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2017.nc'" >> user_nl_clm 
+  echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2017.nc" >> user_nl_clm 
   echo "model_year_align_lai=2011" >> user_nl_clm 
   echo "stream_year_first_lai=2011" >> user_nl_clm 
   echo "stream_year_last_lai=2017" >> user_nl_clm 

diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands
@@ -1,4 +1,3 @@
-./xmlchange PLUMBER2SITE=AU-Ctr
 ./xmlchange PTS_LON=145.446854
 ./xmlchange PTS_LAT=-16.103279
 ./xmlchange RUN_STARTDATE=2009-12-31
@@ -8,7 +7,8 @@
 ./xmlchange START_TOD=50400
 ./xmlchange ATM_NCPL=48
 
-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 "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 
@@ -35,7 +35,7 @@ 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/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2017.nc'" >> user_nl_clm 
+  echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2017.nc" >> user_nl_clm 
   echo "model_year_align_lai=2010" >> user_nl_clm 
   echo "stream_year_first_lai=2010" >> user_nl_clm 
   echo "stream_year_last_lai=2017" >> user_nl_clm 

diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands
@@ -1,4 +1,3 @@
-./xmlchange PLUMBER2SITE=AU-Cum
 ./xmlchange PTS_LON=150.722473
 ./xmlchange PTS_LAT=-33.613296999999996
 ./xmlchange RUN_STARTDATE=2012-12-31
@@ -8,7 +7,8 @@
 ./xmlchange START_TOD=46800
 ./xmlchange ATM_NCPL=48
 
-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 "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 
@@ -35,7 +35,7 @@ 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/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2013-2018.nc'" >> user_nl_clm 
+  echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2013-2018.nc" >> user_nl_clm 
   echo "model_year_align_lai=2013" >> user_nl_clm 
   echo "stream_year_first_lai=2013" >> user_nl_clm 
   echo "stream_year_last_lai=2018" >> user_nl_clm 

diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands
@@ -1,4 +1,3 @@
-./xmlchange PLUMBER2SITE=AU-DaP
 ./xmlchange PTS_LON=131.3181
 ./xmlchange PTS_LAT=-14.0633
 ./xmlchange RUN_STARTDATE=2008-12-31
@@ -8,7 +7,8 @@
 ./xmlchange START_TOD=54000
 ./xmlchange ATM_NCPL=48
 
-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 "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 
@@ -35,7 +35,7 @@ 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/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2009-2012.nc'" >> user_nl_clm 
+  echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2009-2012.nc" >> user_nl_clm 
   echo "model_year_align_lai=2009" >> user_nl_clm 
   echo "stream_year_first_lai=2009" >> user_nl_clm 
   echo "stream_year_last_lai=2012" >> user_nl_clm 

diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands
@@ -1,4 +1,3 @@
-./xmlchange PLUMBER2SITE=AU-DaS
 ./xmlchange PTS_LON=131.388
 ./xmlchange PTS_LAT=-14.159282999999999
 ./xmlchange RUN_STARTDATE=2009-12-31
@@ -8,7 +7,8 @@
 ./xmlchange START_TOD=54000
 ./xmlchange ATM_NCPL=48
 
-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 "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 
@@ -35,7 +35,7 @@ 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/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2017.nc'" >> user_nl_clm 
+  echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2017.nc" >> user_nl_clm 
   echo "model_year_align_lai=2010" >> user_nl_clm 
   echo "stream_year_first_lai=2010" >> user_nl_clm 
   echo "stream_year_last_lai=2017" >> user_nl_clm 

diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands
@@ -1,4 +1,3 @@
-./xmlchange PLUMBER2SITE=AU-Dry
 ./xmlchange PTS_LON=132.370605
 ./xmlchange PTS_LAT=-15.2588
 ./xmlchange RUN_STARTDATE=2010-12-31
@@ -8,7 +7,8 @@
 ./xmlchange START_TOD=54000
 ./xmlchange ATM_NCPL=48
 
-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 "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 
@@ -35,7 +35,7 @@ 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/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2015.nc'" >> user_nl_clm 
+  echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2015.nc" >> user_nl_clm 
   echo "model_year_align_lai=2011" >> user_nl_clm 
   echo "stream_year_first_lai=2011" >> user_nl_clm 
   echo "stream_year_last_lai=2015" >> user_nl_clm 

diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands
@@ -1,4 +1,3 @@
-./xmlchange PLUMBER2SITE=AU-Emr
 ./xmlchange PTS_LON=148.474594
 ./xmlchange PTS_LAT=-23.8587
 ./xmlchange RUN_STARTDATE=2011-12-31
@@ -8,7 +7,8 @@
 ./xmlchange START_TOD=50400
 ./xmlchange ATM_NCPL=48
 
-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 "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 
@@ -35,7 +35,7 @@ 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/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2012-2013.nc'" >> user_nl_clm 
+  echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2012-2013.nc" >> user_nl_clm 
   echo "model_year_align_lai=2012" >> user_nl_clm 
   echo "stream_year_first_lai=2012" >> user_nl_clm 
   echo "stream_year_last_lai=2013" >> user_nl_clm 

diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands
@@ -1,4 +1,3 @@
-./xmlchange PLUMBER2SITE=AU-GWW
 ./xmlchange PTS_LON=120.654099
 ./xmlchange PTS_LAT=-30.191299
 ./xmlchange RUN_STARTDATE=2012-12-31
@@ -8,7 +7,8 @@
 ./xmlchange START_TOD=57600
 ./xmlchange ATM_NCPL=48
 
-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 "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 
@@ -35,7 +35,7 @@ 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/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2013-2017.nc'" >> user_nl_clm 
+  echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2013-2017.nc" >> user_nl_clm 
   echo "model_year_align_lai=2013" >> user_nl_clm 
   echo "stream_year_first_lai=2013" >> user_nl_clm 
   echo "stream_year_last_lai=2017" >> user_nl_clm 

diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands
@@ -1,4 +1,3 @@
-./xmlchange PLUMBER2SITE=AU-Gin
 ./xmlchange PTS_LON=115.650002
 ./xmlchange PTS_LAT=-31.375
 ./xmlchange RUN_STARTDATE=2011-12-31
@@ -8,7 +7,8 @@
 ./xmlchange START_TOD=57600
 ./xmlchange ATM_NCPL=48
 
-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 "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 
@@ -35,7 +35,7 @@ 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/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2012-2017.nc'" >> user_nl_clm 
+  echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2012-2017.nc" >> user_nl_clm 
   echo "model_year_align_lai=2012" >> user_nl_clm 
   echo "stream_year_first_lai=2012" >> user_nl_clm 
   echo "stream_year_last_lai=2017" >> user_nl_clm