Merge pull request ESCOMP#3 from wwieder/PLUMBERcsv

updating input data file paths
wwieder · Mar 29, 2024 · 51879ca · 51879ca
2 parents 83df995 + a7d26c0
commit 51879ca
Show file tree

Hide file tree

Showing 172 changed files with 398 additions and 400 deletions.
diff --git a/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands
@@ -8,7 +8,7 @@
 ./xmlchange START_TOD=10800
 ./xmlchange ATM_NCPL=48
 
-echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AR-SLu/CLM1PT_data/CTSM_DATM_AR-SLu_2010-2010.nc '" >> user_nl_datm_streams 
+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='/glade/work/oleson/PLUMBER2/input_files/${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
@@ -8,7 +8,7 @@
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
-echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AT-Neu/CLM1PT_data/CTSM_DATM_AT-Neu_2002-2012.nc '" >> user_nl_datm_streams 
+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='/glade/work/oleson/PLUMBER2/input_files/${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,14 +1,14 @@
 ./xmlchange PLUMBER2SITE=AU-ASM
-./xmlchange PTS_LON=133.248993
-./xmlchange PTS_LAT=-22.283001
+./xmlchange PTS_LON=133.24899299999998
+./xmlchange PTS_LAT=-22.283001000000002
 ./xmlchange RUN_STARTDATE=2010-12-31
 ./xmlchange DATM_YR_ALIGN=2011
 ./xmlchange DATM_YR_START=2011
 ./xmlchange DATM_YR_END=2017
 ./xmlchange START_TOD=54000
 ./xmlchange ATM_NCPL=48
 
-echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-ASM/CLM1PT_data/CTSM_DATM_AU-ASM_2011-2017.nc '" >> user_nl_datm_streams 
+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='/glade/work/oleson/PLUMBER2/input_files/${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
@@ -8,7 +8,7 @@
 ./xmlchange START_TOD=50400
 ./xmlchange ATM_NCPL=48
 
-echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-Cow/CLM1PT_data/CTSM_DATM_AU-Cow_2010-2015.nc '" >> user_nl_datm_streams 
+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='/glade/work/oleson/PLUMBER2/input_files/${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
@@ -8,7 +8,7 @@
 ./xmlchange START_TOD=46800
 ./xmlchange ATM_NCPL=48
 
-echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-Cpr/CLM1PT_data/CTSM_DATM_AU-Cpr_2011-2017.nc '" >> user_nl_datm_streams 
+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='/glade/work/oleson/PLUMBER2/input_files/${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
@@ -8,7 +8,7 @@
 ./xmlchange START_TOD=50400
 ./xmlchange ATM_NCPL=48
 
-echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-Ctr/CLM1PT_data/CTSM_DATM_AU-Ctr_2010-2017.nc '" >> user_nl_datm_streams 
+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='/glade/work/oleson/PLUMBER2/input_files/${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,14 +1,14 @@
 ./xmlchange PLUMBER2SITE=AU-Cum
 ./xmlchange PTS_LON=150.722473
-./xmlchange PTS_LAT=-33.613297
+./xmlchange PTS_LAT=-33.613296999999996
 ./xmlchange RUN_STARTDATE=2012-12-31
 ./xmlchange DATM_YR_ALIGN=2013
 ./xmlchange DATM_YR_START=2013
 ./xmlchange DATM_YR_END=2018
 ./xmlchange START_TOD=46800
 ./xmlchange ATM_NCPL=48
 
-echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-Cum/CLM1PT_data/CTSM_DATM_AU-Cum_2013-2018.nc '" >> user_nl_datm_streams 
+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='/glade/work/oleson/PLUMBER2/input_files/${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
@@ -8,7 +8,7 @@
 ./xmlchange START_TOD=54000
 ./xmlchange ATM_NCPL=48
 
-echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-DaP/CLM1PT_data/CTSM_DATM_AU-DaP_2009-2012.nc '" >> user_nl_datm_streams 
+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='/glade/work/oleson/PLUMBER2/input_files/${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,14 +1,14 @@
 ./xmlchange PLUMBER2SITE=AU-DaS
 ./xmlchange PTS_LON=131.388
-./xmlchange PTS_LAT=-14.159283
+./xmlchange PTS_LAT=-14.159282999999999
 ./xmlchange RUN_STARTDATE=2009-12-31
 ./xmlchange DATM_YR_ALIGN=2010
 ./xmlchange DATM_YR_START=2010
 ./xmlchange DATM_YR_END=2017
 ./xmlchange START_TOD=54000
 ./xmlchange ATM_NCPL=48
 
-echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-DaS/CLM1PT_data/CTSM_DATM_AU-DaS_2010-2017.nc '" >> user_nl_datm_streams 
+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='/glade/work/oleson/PLUMBER2/input_files/${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
@@ -8,7 +8,7 @@
 ./xmlchange START_TOD=54000
 ./xmlchange ATM_NCPL=48
 
-echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-Dry/CLM1PT_data/CTSM_DATM_AU-Dry_2011-2015.nc '" >> user_nl_datm_streams 
+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='/glade/work/oleson/PLUMBER2/input_files/${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
@@ -8,7 +8,7 @@
 ./xmlchange START_TOD=50400
 ./xmlchange ATM_NCPL=48
 
-echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-Emr/CLM1PT_data/CTSM_DATM_AU-Emr_2012-2013.nc '" >> user_nl_datm_streams 
+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='/glade/work/oleson/PLUMBER2/input_files/${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
@@ -8,7 +8,7 @@
 ./xmlchange START_TOD=57600
 ./xmlchange ATM_NCPL=48
 
-echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-GWW/CLM1PT_data/CTSM_DATM_AU-GWW_2013-2017.nc '" >> user_nl_datm_streams 
+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='/glade/work/oleson/PLUMBER2/input_files/${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
@@ -8,7 +8,7 @@
 ./xmlchange START_TOD=57600
 ./xmlchange ATM_NCPL=48
 
-echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-Gin/CLM1PT_data/CTSM_DATM_AU-Gin_2012-2017.nc '" >> user_nl_datm_streams 
+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='/glade/work/oleson/PLUMBER2/input_files/${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 

diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands
@@ -8,7 +8,7 @@
 ./xmlchange START_TOD=54000
 ./xmlchange ATM_NCPL=48
 
-echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-How/CLM1PT_data/CTSM_DATM_AU-How_2003-2017.nc '" >> user_nl_datm_streams 
+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 
@@ -35,7 +35,7 @@ fi
 
 # Turn on LAI streams for a SP case 
 if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then 
-  echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2017.nc'" >> user_nl_clm 
+  echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2017.nc'" >> user_nl_clm 
   echo "model_year_align_lai=2003" >> user_nl_clm 
   echo "stream_year_first_lai=2003" >> user_nl_clm 
   echo "stream_year_last_lai=2017" >> user_nl_clm 

diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands
@@ -1,14 +1,14 @@
 ./xmlchange PLUMBER2SITE=AU-Lit
-./xmlchange PTS_LON=130.794495
-./xmlchange PTS_LAT=-13.17904
+./xmlchange PTS_LON=130.79449499999998
+./xmlchange PTS_LAT=-13.179039999999999
 ./xmlchange RUN_STARTDATE=2015-12-31
 ./xmlchange DATM_YR_ALIGN=2016
 ./xmlchange DATM_YR_START=2016
 ./xmlchange DATM_YR_END=2017
 ./xmlchange START_TOD=54000
 ./xmlchange ATM_NCPL=48
 
-echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-Lit/CLM1PT_data/CTSM_DATM_AU-Lit_2016-2017.nc '" >> user_nl_datm_streams 
+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 
@@ -35,7 +35,7 @@ fi
 
 # Turn on LAI streams for a SP case 
 if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then 
-  echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2016-2017.nc'" >> user_nl_clm 
+  echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2016-2017.nc'" >> user_nl_clm 
   echo "model_year_align_lai=2016" >> user_nl_clm 
   echo "stream_year_first_lai=2016" >> user_nl_clm 
   echo "stream_year_last_lai=2017" >> user_nl_clm 

diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands
@@ -1,14 +1,14 @@
 ./xmlchange PLUMBER2SITE=AU-Otw
 ./xmlchange PTS_LON=142.816803
-./xmlchange PTS_LAT=-38.532341
+./xmlchange PTS_LAT=-38.532340999999995
 ./xmlchange RUN_STARTDATE=2008-12-31
 ./xmlchange DATM_YR_ALIGN=2009
 ./xmlchange DATM_YR_START=2009
 ./xmlchange DATM_YR_END=2010
 ./xmlchange START_TOD=46800
 ./xmlchange ATM_NCPL=24
 
-echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-Otw/CLM1PT_data/CTSM_DATM_AU-Otw_2009-2010.nc '" >> user_nl_datm_streams 
+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 
@@ -35,7 +35,7 @@ fi
 
 # Turn on LAI streams for a SP case 
 if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then 
-  echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2009-2010.nc'" >> user_nl_clm 
+  echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2009-2010.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=2010" >> user_nl_clm