update usermods script and shell commands for fsurdat

wwieder · Jun 28, 2024 · 5abdf59 · 5abdf59
1 parent 0706e79
commit 5abdf59
Show file tree

Hide file tree

Showing 171 changed files with 391 additions and 332 deletions.
diff --git a/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands
@@ -1,10 +1,10 @@
+./xmlchange PLUMBER2SITE=AR-SLu
 ./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='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AR-SLu_hist_2000_16pfts_c240326.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 

diff --git a/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands
@@ -1,10 +1,10 @@
+./xmlchange PLUMBER2SITE=AT-Neu
 ./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='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AT-Neu_hist_2000_16pfts_c240326.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 

diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands
@@ -1,10 +1,10 @@
-./xmlchange PTS_LON=133.24899299999998
-./xmlchange PTS_LAT=-22.283001000000002
+./xmlchange PLUMBER2SITE=AU-ASM
+./xmlchange PTS_LON=133.248993
+./xmlchange PTS_LAT=-22.283001
 ./xmlchange DATM_YR_END=2017
 ./xmlchange START_TOD=54000
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-ASM_hist_2000_16pfts_c240326.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 

diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands
@@ -1,10 +1,10 @@
+./xmlchange PLUMBER2SITE=AU-Cow
 ./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='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-Cow_hist_2000_16pfts_c240326.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 

diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands
@@ -1,10 +1,10 @@
+./xmlchange PLUMBER2SITE=AU-Cpr
 ./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='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-Cpr_hist_2000_16pfts_c240326.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 

diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands
@@ -1,10 +1,10 @@
+./xmlchange PLUMBER2SITE=AU-Ctr
 ./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='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-Ctr_hist_2000_16pfts_c240326.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 

diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands
@@ -1,10 +1,10 @@
+./xmlchange PLUMBER2SITE=AU-Cum
 ./xmlchange PTS_LON=150.722473
-./xmlchange PTS_LAT=-33.613296999999996
+./xmlchange PTS_LAT=-33.613297
 ./xmlchange DATM_YR_END=2018
 ./xmlchange START_TOD=46800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-Cum_hist_2000_16pfts_c240326.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 

diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands
@@ -1,10 +1,10 @@
+./xmlchange PLUMBER2SITE=AU-DaP
 ./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='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-DaP_hist_2000_16pfts_c240326.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 

diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands
@@ -1,10 +1,10 @@
+./xmlchange PLUMBER2SITE=AU-DaS
 ./xmlchange PTS_LON=131.388
-./xmlchange PTS_LAT=-14.159282999999999
+./xmlchange PTS_LAT=-14.159283
 ./xmlchange DATM_YR_END=2017
 ./xmlchange START_TOD=54000
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-DaS_hist_2000_16pfts_c240326.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 

diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands
@@ -1,10 +1,10 @@
+./xmlchange PLUMBER2SITE=AU-Dry
 ./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='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-Dry_hist_2000_16pfts_c240326.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 

diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands
@@ -1,10 +1,10 @@
+./xmlchange PLUMBER2SITE=AU-Emr
 ./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='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-Emr_hist_2000_16pfts_c240326.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 

diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands
@@ -1,10 +1,10 @@
+./xmlchange PLUMBER2SITE=AU-GWW
 ./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='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-GWW_hist_2000_16pfts_c240326.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 

diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands
@@ -1,10 +1,10 @@
+./xmlchange PLUMBER2SITE=AU-Gin
 ./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='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-Gin_hist_2000_16pfts_c240326.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 

diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands
@@ -1,10 +1,10 @@
+./xmlchange PLUMBER2SITE=AU-How
 ./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='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-How_hist_2000_16pfts_c240326.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 

diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands
@@ -1,10 +1,10 @@
-./xmlchange PTS_LON=130.79449499999998
-./xmlchange PTS_LAT=-13.179039999999999
+./xmlchange PLUMBER2SITE=AU-Lit
+./xmlchange PTS_LON=130.794495
+./xmlchange PTS_LAT=-13.17904
 ./xmlchange DATM_YR_END=2017
 ./xmlchange START_TOD=54000
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-Lit_hist_2000_16pfts_c240326.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 

diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands
@@ -1,10 +1,10 @@
+./xmlchange PLUMBER2SITE=AU-Otw
 ./xmlchange PTS_LON=142.816803
-./xmlchange PTS_LAT=-38.532340999999995
+./xmlchange PTS_LAT=-38.532341
 ./xmlchange DATM_YR_END=2010
 ./xmlchange START_TOD=46800
 ./xmlchange ATM_NCPL=24
 
-echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-Otw_hist_2000_16pfts_c240326.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 

diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands
@@ -1,10 +1,10 @@
+./xmlchange PLUMBER2SITE=AU-Rig
 ./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='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-Rig_hist_2000_16pfts_c240326.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 

diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands
@@ -1,10 +1,10 @@
+./xmlchange PLUMBER2SITE=AU-Rob
 ./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='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-Rob_hist_2000_16pfts_c240326.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 

diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands
@@ -1,10 +1,10 @@
-./xmlchange PTS_LON=152.87780800000002
+./xmlchange PLUMBER2SITE=AU-Sam
+./xmlchange PTS_LON=152.877808
 ./xmlchange PTS_LAT=-27.3881
 ./xmlchange DATM_YR_END=2017
 ./xmlchange START_TOD=50400
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-Sam_hist_2000_16pfts_c240326.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 

diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands
@@ -1,10 +1,10 @@
+./xmlchange PLUMBER2SITE=AU-Stp
 ./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='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-Stp_hist_2000_16pfts_c240326.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 

diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands
@@ -1,10 +1,10 @@
+./xmlchange PLUMBER2SITE=AU-TTE
 ./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='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-TTE_hist_2000_16pfts_c240326.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 

diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands
@@ -1,10 +1,10 @@
+./xmlchange PLUMBER2SITE=AU-Tum
 ./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='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-Tum_hist_2000_16pfts_c240326.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 

diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands
@@ -1,10 +1,10 @@
+./xmlchange PLUMBER2SITE=AU-Whr
 ./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='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-Whr_hist_2000_16pfts_c240326.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 

diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands
@@ -1,10 +1,10 @@
+./xmlchange PLUMBER2SITE=AU-Wrr
 ./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='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-Wrr_hist_2000_16pfts_c240326.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 

diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands
@@ -1,10 +1,10 @@
+./xmlchange PLUMBER2SITE=AU-Ync
 ./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='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-Ync_hist_2000_16pfts_c240326.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 

diff --git a/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands
@@ -1,10 +1,10 @@
+./xmlchange PLUMBER2SITE=BE-Bra
 ./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='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_BE-Bra_hist_2000_16pfts_c240326.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 

diff --git a/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands
@@ -1,10 +1,10 @@
+./xmlchange PLUMBER2SITE=BE-Lon
 ./xmlchange PTS_LON=4.74613
-./xmlchange PTS_LAT=50.551590000000004
+./xmlchange PTS_LAT=50.55159
 ./xmlchange DATM_YR_END=2014
 ./xmlchange START_TOD=82800
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_BE-Lon_hist_2000_16pfts_c240326.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 

diff --git a/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands
@@ -1,10 +1,10 @@
+./xmlchange PLUMBER2SITE=BE-Vie
 ./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='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_BE-Vie_hist_2000_16pfts_c240326.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 

diff --git a/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands
@@ -1,10 +1,10 @@
+./xmlchange PLUMBER2SITE=BR-Sa3
 ./xmlchange PTS_LON=-54.971436
-./xmlchange PTS_LAT=-3.0180290000000003
+./xmlchange PTS_LAT=-3.018029
 ./xmlchange DATM_YR_END=2003
 ./xmlchange START_TOD=14400
 ./xmlchange ATM_NCPL=48
 
-echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_BR-Sa3_hist_2000_16pfts_c240326.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 

diff --git a/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands
@@ -1,10 +1,10 @@
+./xmlchange PLUMBER2SITE=BW-Ma1
 ./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='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_BW-Ma1_hist_2000_16pfts_c240326.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 

diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands
@@ -1,10 +1,10 @@
+./xmlchange PLUMBER2SITE=CA-NS1
 ./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='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_CA-NS1_hist_2000_16pfts_c240326.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