diff --git a/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands index c8149c40ba..a538f058cd 100644 --- 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 index 4057faccc9..88d40403f8 100644 --- 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 index c73fc9a3d4..56432acf68 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands @@ -1,6 +1,6 @@ ./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 @@ -8,7 +8,7 @@ ./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 index 1ca3a72d46..3dda10b9ef 100644 --- 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 index 5bf1fac506..83815c6cd5 100644 --- 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 index be97e3f98f..51737de584 100644 --- 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 index 3318b17118..17ed842530 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands @@ -1,6 +1,6 @@ ./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 @@ -8,7 +8,7 @@ ./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 index bf1005d0af..c127f295da 100644 --- 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 index 0f16c04e2e..7b5971f8ca 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands @@ -1,6 +1,6 @@ ./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 @@ -8,7 +8,7 @@ ./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 index 7e578480f6..088f1e08e5 100644 --- 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 index c167e3cd0d..6f4709721d 100644 --- 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 index 6b549dfb3e..f5af778c2d 100644 --- 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 index 7cc734d989..f136ea73b3 100644 --- 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 index d9b45e17b6..08d67f0c85 100644 --- 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 index 3526398434..8dd5e3f13b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands @@ -1,6 +1,6 @@ ./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 @@ -8,7 +8,7 @@ ./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 index 8de2f71ac4..cc37e5d7c0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands @@ -1,6 +1,6 @@ ./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 @@ -8,7 +8,7 @@ ./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 diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands index d45ae0caa8..0ca68f8974 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Rig/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-Rig/CLM1PT_data/CTSM_DATM_AU-Rig_2011-2016.nc '" >> user_nl_datm_streams +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 @@ -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-2016.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2016.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=2016" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands index a0d01e9cad..9798f74f76 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Rob/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-Rob/CLM1PT_data/CTSM_DATM_AU-Rob_2014-2017.nc '" >> user_nl_datm_streams +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 @@ -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}_2014-2017.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2014-2017.nc'" >> user_nl_clm echo "model_year_align_lai=2014" >> user_nl_clm echo "stream_year_first_lai=2014" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands index 86faa98575..c40544f097 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=AU-Sam -./xmlchange PTS_LON=152.877808 +./xmlchange PTS_LON=152.87780800000002 ./xmlchange PTS_LAT=-27.3881 ./xmlchange RUN_STARTDATE=2010-12-31 ./xmlchange DATM_YR_ALIGN=2011 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=50400 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-Sam/CLM1PT_data/CTSM_DATM_AU-Sam_2011-2017.nc '" >> user_nl_datm_streams +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 @@ -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-Stp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands index b6d7b5bc0b..d3cf872947 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Stp/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-Stp/CLM1PT_data/CTSM_DATM_AU-Stp_2010-2017.nc '" >> user_nl_datm_streams +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 @@ -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-TTE/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands index 09e5c055f7..1e5bec79ab 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-TTE/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-TTE/CLM1PT_data/CTSM_DATM_AU-TTE_2013-2017.nc '" >> user_nl_datm_streams +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 @@ -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-Tum/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands index b3c826dc61..2fdf74f22a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=24 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-Tum/CLM1PT_data/CTSM_DATM_AU-Tum_2002-2017.nc '" >> user_nl_datm_streams +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 @@ -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-2017.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2017.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=2017" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands index de23c7622d..9b0f911bde 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Whr/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-Whr/CLM1PT_data/CTSM_DATM_AU-Whr_2015-2016.nc '" >> user_nl_datm_streams +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 @@ -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}_2015-2016.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2015-2016.nc'" >> user_nl_clm echo "model_year_align_lai=2015" >> user_nl_clm echo "stream_year_first_lai=2015" >> user_nl_clm echo "stream_year_last_lai=2016" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands index b088bbe390..6cedc17140 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/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-Wrr/CLM1PT_data/CTSM_DATM_AU-Wrr_2016-2017.nc '" >> user_nl_datm_streams +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 @@ -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-Ync/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands index 20e4f5f213..930e223804 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Ync/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-Ync/CLM1PT_data/CTSM_DATM_AU-Ync_2011-2017.nc '" >> user_nl_datm_streams +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 @@ -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/BE-Bra/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands index e1722c0da5..ee1e69ad38 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BE-Bra/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/BE-Bra/CLM1PT_data/CTSM_DATM_BE-Bra_2004-2014.nc '" >> user_nl_datm_streams +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 @@ -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}_2004-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands index 1e577cbc61..c21d421826 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=BE-Lon ./xmlchange PTS_LON=4.74613 -./xmlchange PTS_LAT=50.55159 +./xmlchange PTS_LAT=50.551590000000004 ./xmlchange RUN_STARTDATE=2004-12-31 ./xmlchange DATM_YR_ALIGN=2005 ./xmlchange DATM_YR_START=2005 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/BE-Lon/CLM1PT_data/CTSM_DATM_BE-Lon_2005-2014.nc '" >> user_nl_datm_streams +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 @@ -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}_2005-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands index d44eb675d0..53f433305f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BE-Vie/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/BE-Vie/CLM1PT_data/CTSM_DATM_BE-Vie_1997-2014.nc '" >> user_nl_datm_streams +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 @@ -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}_1997-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1997-2014.nc'" >> user_nl_clm echo "model_year_align_lai=1997" >> user_nl_clm echo "stream_year_first_lai=1997" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands index 8f00769d4c..42a1877630 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=BR-Sa3 ./xmlchange PTS_LON=-54.971436 -./xmlchange PTS_LAT=-3.018029 +./xmlchange PTS_LAT=-3.0180290000000003 ./xmlchange RUN_STARTDATE=2001-01-01 ./xmlchange DATM_YR_ALIGN=2001 ./xmlchange DATM_YR_START=2001 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=14400 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/BR-Sa3/CLM1PT_data/CTSM_DATM_BR-Sa3_2001-2003.nc '" >> user_nl_datm_streams +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 @@ -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}_2001-2003.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2001-2003.nc'" >> user_nl_clm echo "model_year_align_lai=2001" >> user_nl_clm echo "stream_year_first_lai=2001" >> user_nl_clm echo "stream_year_last_lai=2003" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands index 969338841c..cb39fd0bbe 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/BW-Ma1/CLM1PT_data/CTSM_DATM_BW-Ma1_2000-2000.nc '" >> user_nl_datm_streams +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 @@ -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}_2000-2000.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2000.nc'" >> user_nl_clm echo "model_year_align_lai=2000" >> user_nl_clm echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2000" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands index e0d7e7062a..3ade0068e5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/CA-NS1/CLM1PT_data/CTSM_DATM_CA-NS1_2003-2003.nc '" >> user_nl_datm_streams +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 @@ -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-2003.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2003.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=2003" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands index fae7791d8a..5853371998 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/CA-NS2/CLM1PT_data/CTSM_DATM_CA-NS2_2002-2004.nc '" >> user_nl_datm_streams +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 @@ -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-2004.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2004.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=2004" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands index eaddfaf01e..356a4e85cd 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/CA-NS4/CLM1PT_data/CTSM_DATM_CA-NS4_2003-2004.nc '" >> user_nl_datm_streams +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 @@ -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-2004.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2004.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=2004" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands index 7f11504753..39b43fed1e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/CA-NS5/CLM1PT_data/CTSM_DATM_CA-NS5_2003-2004.nc '" >> user_nl_datm_streams +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 @@ -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-2004.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2004.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=2004" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands index 9106153825..f17abef471 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/CA-NS6/CLM1PT_data/CTSM_DATM_CA-NS6_2002-2004.nc '" >> user_nl_datm_streams +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 @@ -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-2004.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2004.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=2004" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands index 55fbccde92..8aa99c9b37 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=CA-NS7 -./xmlchange PTS_LON=-99.948303 +./xmlchange PTS_LON=-99.94830300000001 ./xmlchange PTS_LAT=56.635799 ./xmlchange RUN_STARTDATE=2003-01-01 ./xmlchange DATM_YR_ALIGN=2003 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/CA-NS7/CLM1PT_data/CTSM_DATM_CA-NS7_2003-2004.nc '" >> user_nl_datm_streams +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 @@ -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-2004.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2004.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=2004" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands index 347d961a19..8249be354a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=CA-Qcu ./xmlchange PTS_LON=-74.03653 -./xmlchange PTS_LAT=49.267078 +./xmlchange PTS_LAT=49.267078000000005 ./xmlchange RUN_STARTDATE=2002-01-01 ./xmlchange DATM_YR_ALIGN=2002 ./xmlchange DATM_YR_START=2002 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/CA-Qcu/CLM1PT_data/CTSM_DATM_CA-Qcu_2002-2006.nc '" >> user_nl_datm_streams +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 @@ -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-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2006.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=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands index dc7bfb6be7..c830ed4390 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/CA-Qfo/CLM1PT_data/CTSM_DATM_CA-Qfo_2004-2010.nc '" >> user_nl_datm_streams +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 @@ -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}_2004-2010.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2010.nc'" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2010" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands index a6179258ee..c1330be7d4 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=CA-SF1 ./xmlchange PTS_LON=-105.817596 -./xmlchange PTS_LAT=54.485001 +./xmlchange PTS_LAT=54.485001000000004 ./xmlchange RUN_STARTDATE=2004-01-01 ./xmlchange DATM_YR_ALIGN=2004 ./xmlchange DATM_YR_START=2004 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/CA-SF1/CLM1PT_data/CTSM_DATM_CA-SF1_2004-2006.nc '" >> user_nl_datm_streams +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 @@ -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}_2004-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2006.nc'" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands index 17207f65d5..6269a21d83 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/CA-SF2/CLM1PT_data/CTSM_DATM_CA-SF2_2003-2005.nc '" >> user_nl_datm_streams +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 @@ -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-2005.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2005.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=2005" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands index ddc8913b6a..a55def664a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=CA-SF3 -./xmlchange PTS_LON=-106.00531 +./xmlchange PTS_LON=-106.00531000000001 ./xmlchange PTS_LAT=54.091599 ./xmlchange RUN_STARTDATE=2003-01-01 ./xmlchange DATM_YR_ALIGN=2003 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/CA-SF3/CLM1PT_data/CTSM_DATM_CA-SF3_2003-2005.nc '" >> user_nl_datm_streams +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 @@ -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-2005.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2005.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=2005" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands index a20cda2ac5..e2bb2112bd 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Cha/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/CH-Cha/CLM1PT_data/CTSM_DATM_CH-Cha_2006-2014.nc '" >> user_nl_datm_streams +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 @@ -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}_2006-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2006-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2006" >> user_nl_clm echo "stream_year_first_lai=2006" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands index 9b9eaea39b..9885677dde 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Dav/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/CH-Dav/CLM1PT_data/CTSM_DATM_CH-Dav_1997-2014.nc '" >> user_nl_datm_streams +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 @@ -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}_1997-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1997-2014.nc'" >> user_nl_clm echo "model_year_align_lai=1997" >> user_nl_clm echo "stream_year_first_lai=1997" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands index ca52eea93d..77430f0145 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Fru/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/CH-Fru/CLM1PT_data/CTSM_DATM_CH-Fru_2007-2014.nc '" >> user_nl_datm_streams +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 @@ -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}_2007-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2007-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2007" >> user_nl_clm echo "stream_year_first_lai=2007" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands index f6a74e6fdf..eeed032971 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/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/CH-Oe1/CLM1PT_data/CTSM_DATM_CH-Oe1_2002-2008.nc '" >> user_nl_datm_streams +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 @@ -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-2008.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2008.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=2008" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands index d5f8f38236..b39a67b961 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=CN-Cha -./xmlchange PTS_LON=128.095795 +./xmlchange PTS_LON=128.09579499999998 ./xmlchange PTS_LAT=42.4025 ./xmlchange RUN_STARTDATE=2002-12-31 ./xmlchange DATM_YR_ALIGN=2003 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/CN-Cha/CLM1PT_data/CTSM_DATM_CN-Cha_2003-2005.nc '" >> user_nl_datm_streams +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 @@ -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-2005.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2005.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=2005" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands index 51d1556261..02170eec27 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Cng/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/CN-Cng/CLM1PT_data/CTSM_DATM_CN-Cng_2008-2009.nc '" >> user_nl_datm_streams +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 @@ -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}_2008-2009.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2008-2009.nc'" >> user_nl_clm echo "model_year_align_lai=2008" >> user_nl_clm echo "stream_year_first_lai=2008" >> user_nl_clm echo "stream_year_last_lai=2009" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands index 771e29a5e4..0b96abd5f2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=CN-Dan ./xmlchange PTS_LON=91.066399 -./xmlchange PTS_LAT=30.497801 +./xmlchange PTS_LAT=30.497801000000003 ./xmlchange RUN_STARTDATE=2003-12-31 ./xmlchange DATM_YR_ALIGN=2004 ./xmlchange DATM_YR_START=2004 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/CN-Dan/CLM1PT_data/CTSM_DATM_CN-Dan_2004-2005.nc '" >> user_nl_datm_streams +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 @@ -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}_2004-2005.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2005.nc'" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands index eb8c77306e..b149c2421d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Din/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/CN-Din/CLM1PT_data/CTSM_DATM_CN-Din_2003-2005.nc '" >> user_nl_datm_streams +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 @@ -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-2005.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2005.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=2005" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands index 71cc97c6b3..6770f99db1 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Du2/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/CN-Du2/CLM1PT_data/CTSM_DATM_CN-Du2_2007-2008.nc '" >> user_nl_datm_streams +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 @@ -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}_2007-2008.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2007-2008.nc'" >> user_nl_clm echo "model_year_align_lai=2007" >> user_nl_clm echo "stream_year_first_lai=2007" >> user_nl_clm echo "stream_year_last_lai=2008" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands index 0a859ea76f..093f567ccc 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-HaM/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/CN-HaM/CLM1PT_data/CTSM_DATM_CN-HaM_2002-2003.nc '" >> user_nl_datm_streams +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 @@ -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-2003.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2003.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=2003" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands index af0e7d318e..5f21de2c4f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Qia/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/CN-Qia/CLM1PT_data/CTSM_DATM_CN-Qia_2003-2005.nc '" >> user_nl_datm_streams +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 @@ -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-2005.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2005.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=2005" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands index 0b0431048c..627a107b90 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CZ-wet/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/CZ-wet/CLM1PT_data/CTSM_DATM_CZ-wet_2007-2014.nc '" >> user_nl_datm_streams +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 @@ -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}_2007-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2007-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2007" >> user_nl_clm echo "stream_year_first_lai=2007" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands index 936f3ec40c..08728c5492 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=DE-Bay ./xmlchange PTS_LON=11.86694 -./xmlchange PTS_LAT=50.141941 +./xmlchange PTS_LAT=50.141940999999996 ./xmlchange RUN_STARTDATE=1996-12-31 ./xmlchange DATM_YR_ALIGN=1997 ./xmlchange DATM_YR_START=1997 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/DE-Bay/CLM1PT_data/CTSM_DATM_DE-Bay_1997-1999.nc '" >> user_nl_datm_streams +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 @@ -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}_1997-1999.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1997-1999.nc'" >> user_nl_clm echo "model_year_align_lai=1997" >> user_nl_clm echo "stream_year_first_lai=1997" >> user_nl_clm echo "stream_year_last_lai=1999" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands index 68c5407976..e3dae9e4b5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Geb/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/DE-Geb/CLM1PT_data/CTSM_DATM_DE-Geb_2001-2014.nc '" >> user_nl_datm_streams +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 @@ -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}_2001-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2001-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2001" >> user_nl_clm echo "stream_year_first_lai=2001" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands index 4556c5c257..7c0a1c241e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=DE-Gri -./xmlchange PTS_LON=13.51253 +./xmlchange PTS_LON=13.512529999999998 ./xmlchange PTS_LAT=50.949471 ./xmlchange RUN_STARTDATE=2003-12-31 ./xmlchange DATM_YR_ALIGN=2004 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/DE-Gri/CLM1PT_data/CTSM_DATM_DE-Gri_2004-2014.nc '" >> user_nl_datm_streams +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 @@ -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}_2004-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands index 42a8acc018..102e20d702 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Hai/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/DE-Hai/CLM1PT_data/CTSM_DATM_DE-Hai_2000-2012.nc '" >> user_nl_datm_streams +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 @@ -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}_2000-2012.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2012.nc'" >> user_nl_clm echo "model_year_align_lai=2000" >> user_nl_clm echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands index 50ce862257..31521f2709 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=DE-Kli -./xmlchange PTS_LON=13.52238 +./xmlchange PTS_LON=13.522379999999998 ./xmlchange PTS_LAT=50.893059 ./xmlchange RUN_STARTDATE=2004-12-31 ./xmlchange DATM_YR_ALIGN=2005 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/DE-Kli/CLM1PT_data/CTSM_DATM_DE-Kli_2005-2014.nc '" >> user_nl_datm_streams +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 @@ -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}_2005-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands index f2798eea24..87f8abb24f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Meh/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/DE-Meh/CLM1PT_data/CTSM_DATM_DE-Meh_2004-2006.nc '" >> user_nl_datm_streams +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 @@ -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}_2004-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2006.nc'" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands index d95e72be27..c75984301b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Obe/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/DE-Obe/CLM1PT_data/CTSM_DATM_DE-Obe_2008-2014.nc '" >> user_nl_datm_streams +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 @@ -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}_2008-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2008-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2008" >> user_nl_clm echo "stream_year_first_lai=2008" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands index eb95868665..3b1df2431b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Seh/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/DE-Seh/CLM1PT_data/CTSM_DATM_DE-Seh_2008-2010.nc '" >> user_nl_datm_streams +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 @@ -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}_2008-2010.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2008-2010.nc'" >> user_nl_clm echo "model_year_align_lai=2008" >> user_nl_clm echo "stream_year_first_lai=2008" >> user_nl_clm echo "stream_year_last_lai=2010" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands index 73054e6106..e044452365 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-SfN/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/DE-SfN/CLM1PT_data/CTSM_DATM_DE-SfN_2013-2014.nc '" >> user_nl_datm_streams +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 @@ -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-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2013-2014.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=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands index d43214ada0..3e21eabc93 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=DE-Tha -./xmlchange PTS_LON=13.56694 +./xmlchange PTS_LON=13.566939999999999 ./xmlchange PTS_LAT=50.963612 ./xmlchange RUN_STARTDATE=1997-12-31 ./xmlchange DATM_YR_ALIGN=1998 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/DE-Tha/CLM1PT_data/CTSM_DATM_DE-Tha_1998-2014.nc '" >> user_nl_datm_streams +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 @@ -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}_1998-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1998-2014.nc'" >> user_nl_clm echo "model_year_align_lai=1998" >> user_nl_clm echo "stream_year_first_lai=1998" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands index d5136aeac5..fd5c50cbd0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Wet/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/DE-Wet/CLM1PT_data/CTSM_DATM_DE-Wet_2002-2006.nc '" >> user_nl_datm_streams +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 @@ -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-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2006.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=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands index d04913c8de..c5a359beb2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Fou/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/DK-Fou/CLM1PT_data/CTSM_DATM_DK-Fou_2005-2005.nc '" >> user_nl_datm_streams +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 @@ -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}_2005-2005.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2005.nc'" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands index 67013879b4..aca6377f36 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Lva/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/DK-Lva/CLM1PT_data/CTSM_DATM_DK-Lva_2005-2006.nc '" >> user_nl_datm_streams +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 @@ -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}_2005-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2006.nc'" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands index caa24e62c7..260741053f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Ris/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/DK-Ris/CLM1PT_data/CTSM_DATM_DK-Ris_2004-2005.nc '" >> user_nl_datm_streams +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 @@ -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}_2004-2005.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2005.nc'" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands index 197309bf84..4f32d8bd28 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=DK-Sor -./xmlchange PTS_LON=11.64464 +./xmlchange PTS_LON=11.644639999999999 ./xmlchange PTS_LAT=55.48587 ./xmlchange RUN_STARTDATE=1996-12-31 ./xmlchange DATM_YR_ALIGN=1997 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/DK-Sor/CLM1PT_data/CTSM_DATM_DK-Sor_1997-2014.nc '" >> user_nl_datm_streams +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 @@ -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}_1997-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1997-2014.nc'" >> user_nl_clm echo "model_year_align_lai=1997" >> user_nl_clm echo "stream_year_first_lai=1997" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands index 26e2d690d5..9140308808 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/DK-ZaH/CLM1PT_data/CTSM_DATM_DK-ZaH_2000-2013.nc '" >> user_nl_datm_streams +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 @@ -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}_2000-2013.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2013.nc'" >> user_nl_clm echo "model_year_align_lai=2000" >> user_nl_clm echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands index 9dfe5f1c24..c14e60c81c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-ES1/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/ES-ES1/CLM1PT_data/CTSM_DATM_ES-ES1_1999-2006.nc '" >> user_nl_datm_streams +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 @@ -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}_1999-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1999-2006.nc'" >> user_nl_clm echo "model_year_align_lai=1999" >> user_nl_clm echo "stream_year_first_lai=1999" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands index 683668d0e0..48c9ed18e3 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=ES-ES2 ./xmlchange PTS_LON=-0.315277 -./xmlchange PTS_LAT=39.275558 +./xmlchange PTS_LAT=39.275558000000004 ./xmlchange RUN_STARTDATE=2004-12-31 ./xmlchange DATM_YR_ALIGN=2005 ./xmlchange DATM_YR_START=2005 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/ES-ES2/CLM1PT_data/CTSM_DATM_ES-ES2_2005-2006.nc '" >> user_nl_datm_streams +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 @@ -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}_2005-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2006.nc'" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands index 33ad7b50fb..d25a523072 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-LMa/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/ES-LMa/CLM1PT_data/CTSM_DATM_ES-LMa_2004-2006.nc '" >> user_nl_datm_streams +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 @@ -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}_2004-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2006.nc'" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands index 93be547aa5..b0c382f8f4 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-LgS/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/ES-LgS/CLM1PT_data/CTSM_DATM_ES-LgS_2007-2007.nc '" >> user_nl_datm_streams +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 @@ -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}_2007-2007.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2007-2007.nc'" >> user_nl_clm echo "model_year_align_lai=2007" >> user_nl_clm echo "stream_year_first_lai=2007" >> user_nl_clm echo "stream_year_last_lai=2007" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands index e6794f48f0..ba7bc98158 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-VDA/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/ES-VDA/CLM1PT_data/CTSM_DATM_ES-VDA_2004-2004.nc '" >> user_nl_datm_streams +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 @@ -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}_2004-2004.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2004.nc'" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands index 8c488a5ae4..7cb35b48c4 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/FI-Hyy/CLM1PT_data/CTSM_DATM_FI-Hyy_1996-2014.nc '" >> user_nl_datm_streams +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 @@ -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}_1996-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1996-2014.nc'" >> user_nl_clm echo "model_year_align_lai=1996" >> user_nl_clm echo "stream_year_first_lai=1996" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands index 80f90227ff..a30711fbbb 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=FI-Kaa -./xmlchange PTS_LON=27.295031 +./xmlchange PTS_LON=27.295030999999998 ./xmlchange PTS_LAT=69.140694 ./xmlchange RUN_STARTDATE=1999-12-31 ./xmlchange DATM_YR_ALIGN=2000 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/FI-Kaa/CLM1PT_data/CTSM_DATM_FI-Kaa_2000-2002.nc '" >> user_nl_datm_streams +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 @@ -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}_2000-2002.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2002.nc'" >> user_nl_clm echo "model_year_align_lai=2000" >> user_nl_clm echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2002" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands index 1f3fd192c9..c921ed1f26 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/FI-Lom/CLM1PT_data/CTSM_DATM_FI-Lom_2007-2009.nc '" >> user_nl_datm_streams +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 @@ -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}_2007-2009.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2007-2009.nc'" >> user_nl_clm echo "model_year_align_lai=2007" >> user_nl_clm echo "stream_year_first_lai=2007" >> user_nl_clm echo "stream_year_last_lai=2009" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands index e8b079878e..aaec211a35 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/FI-Sod/CLM1PT_data/CTSM_DATM_FI-Sod_2008-2014.nc '" >> user_nl_datm_streams +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 @@ -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}_2008-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2008-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2008" >> user_nl_clm echo "stream_year_first_lai=2008" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands index 5ee361c24d..353b8bc6b2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=FR-Fon -./xmlchange PTS_LON=2.78014 -./xmlchange PTS_LAT=48.476398 +./xmlchange PTS_LON=2.7801400000000003 +./xmlchange PTS_LAT=48.476397999999996 ./xmlchange RUN_STARTDATE=2004-12-31 ./xmlchange DATM_YR_ALIGN=2005 ./xmlchange DATM_YR_START=2005 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/FR-Fon/CLM1PT_data/CTSM_DATM_FR-Fon_2005-2013.nc '" >> user_nl_datm_streams +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 @@ -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}_2005-2013.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2013.nc'" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands index c5fd20e523..5d11ce9cc9 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=FR-Gri -./xmlchange PTS_LON=1.95191 +./xmlchange PTS_LON=1.9519099999999998 ./xmlchange PTS_LAT=48.844219 ./xmlchange RUN_STARTDATE=2004-12-31 ./xmlchange DATM_YR_ALIGN=2005 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/FR-Gri/CLM1PT_data/CTSM_DATM_FR-Gri_2005-2013.nc '" >> user_nl_datm_streams +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 @@ -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}_2005-2013.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2013.nc'" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands index a71d105d79..19885c3fa3 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=FR-Hes -./xmlchange PTS_LON=7.06556 +./xmlchange PTS_LON=7.0655600000000005 ./xmlchange PTS_LAT=48.67416 ./xmlchange RUN_STARTDATE=1996-12-31 ./xmlchange DATM_YR_ALIGN=1997 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/FR-Hes/CLM1PT_data/CTSM_DATM_FR-Hes_1997-2006.nc '" >> user_nl_datm_streams +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 @@ -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}_1997-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1997-2006.nc'" >> user_nl_clm echo "model_year_align_lai=1997" >> user_nl_clm echo "stream_year_first_lai=1997" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands index 71eb832d6e..422024983f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=FR-LBr -./xmlchange PTS_LON=-0.769287 +./xmlchange PTS_LON=-0.7692869999999999 ./xmlchange PTS_LAT=44.71711 ./xmlchange RUN_STARTDATE=2002-12-31 ./xmlchange DATM_YR_ALIGN=2003 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/FR-LBr/CLM1PT_data/CTSM_DATM_FR-LBr_2003-2008.nc '" >> user_nl_datm_streams +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 @@ -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-2008.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2008.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=2008" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands index 0addcc16e5..1e56beb8dd 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/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/FR-Lq1/CLM1PT_data/CTSM_DATM_FR-Lq1_2004-2006.nc '" >> user_nl_datm_streams +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 @@ -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}_2004-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2006.nc'" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands index c2b4559176..67b9af9d10 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/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/FR-Lq2/CLM1PT_data/CTSM_DATM_FR-Lq2_2004-2006.nc '" >> user_nl_datm_streams +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 @@ -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}_2004-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2006.nc'" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands index 98a662228a..91b4d528bc 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=FR-Pue -./xmlchange PTS_LON=3.59583 +./xmlchange PTS_LON=3.5958300000000003 ./xmlchange PTS_LAT=43.74139 ./xmlchange RUN_STARTDATE=1999-12-31 ./xmlchange DATM_YR_ALIGN=2000 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/FR-Pue/CLM1PT_data/CTSM_DATM_FR-Pue_2000-2014.nc '" >> user_nl_datm_streams +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 @@ -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}_2000-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2000" >> user_nl_clm echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands b/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands index 815b4ce3cc..cf6f8c35df 100644 --- a/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/GF-Guy/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/GF-Guy/CLM1PT_data/CTSM_DATM_GF-Guy_2004-2014.nc '" >> user_nl_datm_streams +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 @@ -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}_2004-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands b/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands index bfa70e78f7..aad3425acf 100644 --- a/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=HU-Bug -./xmlchange PTS_LON=19.601299 +./xmlchange PTS_LON=19.601298999999997 ./xmlchange PTS_LAT=46.691101 ./xmlchange RUN_STARTDATE=2002-12-31 ./xmlchange DATM_YR_ALIGN=2003 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/HU-Bug/CLM1PT_data/CTSM_DATM_HU-Bug_2003-2006.nc '" >> user_nl_datm_streams +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 @@ -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-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2006.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=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands index 42915592ec..6215eb5908 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=ID-Pag -./xmlchange PTS_LON=114.036392 +./xmlchange PTS_LON=114.03639199999999 ./xmlchange PTS_LAT=-2.345 ./xmlchange RUN_STARTDATE=2001-12-31 ./xmlchange DATM_YR_ALIGN=2002 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=61200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/ID-Pag/CLM1PT_data/CTSM_DATM_ID-Pag_2002-2003.nc '" >> user_nl_datm_streams +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 @@ -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-2003.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2003.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=2003" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands index b1ef636d2d..290915db62 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=IE-Ca1 ./xmlchange PTS_LON=-6.918152 -./xmlchange PTS_LAT=52.858791 +./xmlchange PTS_LAT=52.858791000000004 ./xmlchange RUN_STARTDATE=2004-01-01 ./xmlchange DATM_YR_ALIGN=2004 ./xmlchange DATM_YR_START=2004 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/IE-Ca1/CLM1PT_data/CTSM_DATM_IE-Ca1_2004-2006.nc '" >> user_nl_datm_streams +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 @@ -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}_2004-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2006.nc'" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands index 329f98d349..34d63172a2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=IE-Dri -./xmlchange PTS_LON=-8.751801 +./xmlchange PTS_LON=-8.751800999999999 ./xmlchange PTS_LAT=51.986691 ./xmlchange RUN_STARTDATE=2003-01-01 ./xmlchange DATM_YR_ALIGN=2003 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/IE-Dri/CLM1PT_data/CTSM_DATM_IE-Dri_2003-2005.nc '" >> user_nl_datm_streams +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 @@ -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-2005.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2005.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=2005" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands index 69d99b4d41..cb7faa8078 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Amp/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/IT-Amp/CLM1PT_data/CTSM_DATM_IT-Amp_2003-2006.nc '" >> user_nl_datm_streams +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 @@ -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-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2006.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=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands index aa1166c949..79225efdd9 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-BCi/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/IT-BCi/CLM1PT_data/CTSM_DATM_IT-BCi_2005-2010.nc '" >> user_nl_datm_streams +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 @@ -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}_2005-2010.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2010.nc'" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2010" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands index cb1463aeb2..3d4a33b4be 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-CA1/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/IT-CA1/CLM1PT_data/CTSM_DATM_IT-CA1_2012-2013.nc '" >> user_nl_datm_streams +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 @@ -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/IT-CA2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands index 9d30711426..148966a7d7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-CA2/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/IT-CA2/CLM1PT_data/CTSM_DATM_IT-CA2_2012-2013.nc '" >> user_nl_datm_streams +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 @@ -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/IT-CA3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands index 4fca2b04f7..52230b82a8 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-CA3/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/IT-CA3/CLM1PT_data/CTSM_DATM_IT-CA3_2012-2013.nc '" >> user_nl_datm_streams +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 @@ -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/IT-Col/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands index a9d7985286..5d4ff78979 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Col/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/IT-Col/CLM1PT_data/CTSM_DATM_IT-Col_2007-2014.nc '" >> user_nl_datm_streams +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 @@ -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}_2007-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2007-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2007" >> user_nl_clm echo "stream_year_first_lai=2007" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands index b2540b46fc..a867863f43 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/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/IT-Cpz/CLM1PT_data/CTSM_DATM_IT-Cpz_2001-2008.nc '" >> user_nl_datm_streams +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 @@ -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}_2001-2008.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2001-2008.nc'" >> user_nl_clm echo "model_year_align_lai=2001" >> user_nl_clm echo "stream_year_first_lai=2001" >> user_nl_clm echo "stream_year_last_lai=2008" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands index 5a6575c33a..1577806246 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Isp/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/IT-Isp/CLM1PT_data/CTSM_DATM_IT-Isp_2013-2014.nc '" >> user_nl_datm_streams +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 @@ -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-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2013-2014.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=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands index cdd90c2471..27ac24ab4a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-LMa/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/IT-LMa/CLM1PT_data/CTSM_DATM_IT-LMa_2003-2004.nc '" >> user_nl_datm_streams +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 @@ -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-2004.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2004.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=2004" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands index 3d1ec720a0..6d0fa41232 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Lav/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/IT-Lav/CLM1PT_data/CTSM_DATM_IT-Lav_2005-2014.nc '" >> user_nl_datm_streams +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 @@ -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}_2005-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands index d5bd27cafe..2568e2095f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-MBo/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/IT-MBo/CLM1PT_data/CTSM_DATM_IT-MBo_2003-2012.nc '" >> user_nl_datm_streams +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 @@ -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-2012.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2012.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=2012" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands index bc102b1248..1e5cd86a4f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=IT-Mal -./xmlchange PTS_LON=11.70334 +./xmlchange PTS_LON=11.703339999999999 ./xmlchange PTS_LAT=46.114021 ./xmlchange RUN_STARTDATE=2002-12-31 ./xmlchange DATM_YR_ALIGN=2003 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/IT-Mal/CLM1PT_data/CTSM_DATM_IT-Mal_2003-2003.nc '" >> user_nl_datm_streams +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 @@ -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-2003.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2003.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=2003" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands index 65f5d7f095..e2cb91e3fd 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Noe/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/IT-Noe/CLM1PT_data/CTSM_DATM_IT-Noe_2004-2014.nc '" >> user_nl_datm_streams +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 @@ -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}_2004-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands index 29ca9eb047..73dd6134db 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=IT-Non ./xmlchange PTS_LON=11.09109 -./xmlchange PTS_LAT=44.690189 +./xmlchange PTS_LAT=44.690189000000004 ./xmlchange RUN_STARTDATE=2001-12-31 ./xmlchange DATM_YR_ALIGN=2002 ./xmlchange DATM_YR_START=2002 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/IT-Non/CLM1PT_data/CTSM_DATM_IT-Non_2002-2002.nc '" >> user_nl_datm_streams +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 @@ -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-2002.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2002.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=2002" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands index 2c9ba27f10..63e40d9bc7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-PT1/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/IT-PT1/CLM1PT_data/CTSM_DATM_IT-PT1_2003-2004.nc '" >> user_nl_datm_streams +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 @@ -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-2004.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2004.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=2004" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands index d9147fb233..6706f2994e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=IT-Ren -./xmlchange PTS_LON=11.43369 +./xmlchange PTS_LON=11.433689999999999 ./xmlchange PTS_LAT=46.586861 ./xmlchange RUN_STARTDATE=2009-12-31 ./xmlchange DATM_YR_ALIGN=2010 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/IT-Ren/CLM1PT_data/CTSM_DATM_IT-Ren_2010-2013.nc '" >> user_nl_datm_streams +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 @@ -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-2013.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2013.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=2013" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands index a1a6318d81..15b4f2b76d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=IT-Ro1 -./xmlchange PTS_LON=11.93001 +./xmlchange PTS_LON=11.930010000000001 ./xmlchange PTS_LAT=42.408119 ./xmlchange RUN_STARTDATE=2001-12-31 ./xmlchange DATM_YR_ALIGN=2002 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/IT-Ro1/CLM1PT_data/CTSM_DATM_IT-Ro1_2002-2006.nc '" >> user_nl_datm_streams +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 @@ -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-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2006.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=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands index 6661ae3796..e279d6f24f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/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/IT-Ro2/CLM1PT_data/CTSM_DATM_IT-Ro2_2002-2008.nc '" >> user_nl_datm_streams +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 @@ -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-2008.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2008.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=2008" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands index f2b6680e66..671a029c5f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-SR2/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/IT-SR2/CLM1PT_data/CTSM_DATM_IT-SR2_2013-2014.nc '" >> user_nl_datm_streams +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 @@ -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-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2013-2014.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=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands index 66f4a5e7df..fc2edc4db5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-SRo/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/IT-SRo/CLM1PT_data/CTSM_DATM_IT-SRo_2003-2012.nc '" >> user_nl_datm_streams +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 @@ -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-2012.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2012.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=2012" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands b/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands index 82fcacc565..95bc6c7653 100644 --- a/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=JP-SMF -./xmlchange PTS_LON=137.078796 +./xmlchange PTS_LON=137.07879599999998 ./xmlchange PTS_LAT=35.2617 ./xmlchange RUN_STARTDATE=2002-12-31 ./xmlchange DATM_YR_ALIGN=2003 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/JP-SMF/CLM1PT_data/CTSM_DATM_JP-SMF_2003-2006.nc '" >> user_nl_datm_streams +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 @@ -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-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2006.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=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands index 039271ffaf..b954520249 100644 --- a/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/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/NL-Ca1/CLM1PT_data/CTSM_DATM_NL-Ca1_2003-2006.nc '" >> user_nl_datm_streams +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 @@ -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-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2006.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=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands b/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands index 435fc3bd8d..616bb95363 100644 --- a/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/NL-Hor/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/NL-Hor/CLM1PT_data/CTSM_DATM_NL-Hor_2008-2011.nc '" >> user_nl_datm_streams +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 @@ -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}_2008-2011.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2008-2011.nc'" >> user_nl_clm echo "model_year_align_lai=2008" >> user_nl_clm echo "stream_year_first_lai=2008" >> user_nl_clm echo "stream_year_last_lai=2011" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands index 8cf8b99d06..36606ed491 100644 --- a/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=NL-Loo -./xmlchange PTS_LON=5.74356 -./xmlchange PTS_LAT=52.16658 +./xmlchange PTS_LON=5.7435599999999996 +./xmlchange PTS_LAT=52.166579999999996 ./xmlchange RUN_STARTDATE=1996-12-31 ./xmlchange DATM_YR_ALIGN=1997 ./xmlchange DATM_YR_START=1997 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/NL-Loo/CLM1PT_data/CTSM_DATM_NL-Loo_1997-2013.nc '" >> user_nl_datm_streams +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 @@ -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}_1997-2013.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1997-2013.nc'" >> user_nl_clm echo "model_year_align_lai=1997" >> user_nl_clm echo "stream_year_first_lai=1997" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands index 2c2ce98a63..94d3c961e5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/PL-wet/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/PL-wet/CLM1PT_data/CTSM_DATM_PL-wet_2004-2005.nc '" >> user_nl_datm_streams +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 @@ -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}_2004-2005.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2005.nc'" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands index 4fcd4e09d7..be0557eadc 100644 --- a/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/PT-Esp/CLM1PT_data/CTSM_DATM_PT-Esp_2002-2004.nc '" >> user_nl_datm_streams +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 @@ -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-2004.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2004.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=2004" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands index 5f1b9aab9d..eb778886e5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/PT-Mi1/CLM1PT_data/CTSM_DATM_PT-Mi1_2005-2005.nc '" >> user_nl_datm_streams +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 @@ -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}_2005-2005.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2005.nc'" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands index e804bd9f36..29f1a99369 100644 --- a/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/PT-Mi2/CLM1PT_data/CTSM_DATM_PT-Mi2_2005-2006.nc '" >> user_nl_datm_streams +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 @@ -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}_2005-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2006.nc'" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands b/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands index 24f96f6548..1f8f17001d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/RU-Che/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/RU-Che/CLM1PT_data/CTSM_DATM_RU-Che_2003-2004.nc '" >> user_nl_datm_streams +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 @@ -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-2004.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2004.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=2004" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands index 795cdb4d07..beb024b313 100644 --- a/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=RU-Fyo ./xmlchange PTS_LON=32.922081 -./xmlchange PTS_LAT=56.461529 +./xmlchange PTS_LAT=56.461529000000006 ./xmlchange RUN_STARTDATE=2002-12-31 ./xmlchange DATM_YR_ALIGN=2003 ./xmlchange DATM_YR_START=2003 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=75600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/RU-Fyo/CLM1PT_data/CTSM_DATM_RU-Fyo_2003-2014.nc '" >> user_nl_datm_streams +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 @@ -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-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2014.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=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands b/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands index c931fbf456..869518e592 100644 --- a/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=61200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/RU-Zot/CLM1PT_data/CTSM_DATM_RU-Zot_2003-2003.nc '" >> user_nl_datm_streams +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 @@ -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-2003.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2003.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=2003" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands b/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands index 32340e6ae8..4186e50d7d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=75600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/SD-Dem/CLM1PT_data/CTSM_DATM_SD-Dem_2005-2009.nc '" >> user_nl_datm_streams +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 @@ -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}_2005-2009.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2009.nc'" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2009" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands b/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands index b891381e14..b972b1bf04 100644 --- a/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/SE-Deg/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/SE-Deg/CLM1PT_data/CTSM_DATM_SE-Deg_2002-2005.nc '" >> user_nl_datm_streams +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 @@ -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-2005.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2005.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=2005" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands index 707d68ce43..972392b487 100644 --- a/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=UK-Gri -./xmlchange PTS_LON=-3.798065 +./xmlchange PTS_LON=-3.7980650000000002 ./xmlchange PTS_LAT=56.60722 ./xmlchange RUN_STARTDATE=2000-01-01 ./xmlchange DATM_YR_ALIGN=2000 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/UK-Gri/CLM1PT_data/CTSM_DATM_UK-Gri_2000-2001.nc '" >> user_nl_datm_streams +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 @@ -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}_2000-2001.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2001.nc'" >> user_nl_clm echo "model_year_align_lai=2000" >> user_nl_clm echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2001" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands b/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands index 1a74d5eb06..e4d329e90b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=UK-Ham -./xmlchange PTS_LON=-0.858307 -./xmlchange PTS_LAT=51.15353 +./xmlchange PTS_LON=-0.8583069999999999 +./xmlchange PTS_LAT=51.153529999999996 ./xmlchange RUN_STARTDATE=2004-01-01 ./xmlchange DATM_YR_ALIGN=2004 ./xmlchange DATM_YR_START=2004 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/UK-Ham/CLM1PT_data/CTSM_DATM_UK-Ham_2004-2004.nc '" >> user_nl_datm_streams +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 @@ -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}_2004-2004.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2004.nc'" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands index e790cfa4c7..3eaaf117e0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=UK-PL3 -./xmlchange PTS_LON=-1.266663 +./xmlchange PTS_LON=-1.2666629999999999 ./xmlchange PTS_LAT=51.450001 ./xmlchange RUN_STARTDATE=2005-01-01 ./xmlchange DATM_YR_ALIGN=2005 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/UK-PL3/CLM1PT_data/CTSM_DATM_UK-PL3_2005-2006.nc '" >> user_nl_datm_streams +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 @@ -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}_2005-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2006.nc'" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands index 9c76e5c1b9..0e841714e6 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-AR1/CLM1PT_data/CTSM_DATM_US-AR1_2010-2012.nc '" >> user_nl_datm_streams +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 @@ -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-2012.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2012.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=2012" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands index 93d6e8c2a2..a5f30cc7cb 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-AR2/CLM1PT_data/CTSM_DATM_US-AR2_2010-2011.nc '" >> user_nl_datm_streams +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 @@ -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-2011.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2011.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=2011" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands index bec32053ef..1f82295556 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-ARM/CLM1PT_data/CTSM_DATM_US-ARM_2003-2012.nc '" >> user_nl_datm_streams +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 @@ -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-2012.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2012.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=2012" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands index bad42eeda3..80c1a7e224 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Aud/CLM1PT_data/CTSM_DATM_US-Aud_2003-2005.nc '" >> user_nl_datm_streams +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 @@ -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-2005.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2005.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=2005" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands index 16685885d1..1eafb511c2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=US-Bar -./xmlchange PTS_LON=-71.288086 -./xmlchange PTS_LAT=44.06464 +./xmlchange PTS_LON=-71.28808599999999 +./xmlchange PTS_LAT=44.064640000000004 ./xmlchange RUN_STARTDATE=2005-01-01 ./xmlchange DATM_YR_ALIGN=2005 ./xmlchange DATM_YR_START=2005 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Bar/CLM1PT_data/CTSM_DATM_US-Bar_2005-2005.nc '" >> user_nl_datm_streams +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 @@ -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}_2005-2005.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2005.nc'" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands index 54fd5189ab..5d450c3f26 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=US-Bkg ./xmlchange PTS_LON=-96.836182 -./xmlchange PTS_LAT=44.345291 +./xmlchange PTS_LAT=44.345290999999996 ./xmlchange RUN_STARTDATE=2005-01-01 ./xmlchange DATM_YR_ALIGN=2005 ./xmlchange DATM_YR_START=2005 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Bkg/CLM1PT_data/CTSM_DATM_US-Bkg_2005-2006.nc '" >> user_nl_datm_streams +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 @@ -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}_2005-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2006.nc'" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands index 93efb6d9b4..c781eae3c3 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Blo/CLM1PT_data/CTSM_DATM_US-Blo_2000-2006.nc '" >> user_nl_datm_streams +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 @@ -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}_2000-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2006.nc'" >> user_nl_clm echo "model_year_align_lai=2000" >> user_nl_clm echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands index 4e61cc4c5e..f0939ec58d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Bo1/CLM1PT_data/CTSM_DATM_US-Bo1_1997-2006.nc '" >> user_nl_datm_streams +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 @@ -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}_1997-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1997-2006.nc'" >> user_nl_clm echo "model_year_align_lai=1997" >> user_nl_clm echo "stream_year_first_lai=1997" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands index 6b46bf2fd8..a1501a9aed 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=24 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Cop/CLM1PT_data/CTSM_DATM_US-Cop_2002-2003.nc '" >> user_nl_datm_streams +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 @@ -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-2003.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2003.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=2003" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands index 2def6ebc2a..6e77780236 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=US-FPe -./xmlchange PTS_LON=-105.101898 +./xmlchange PTS_LON=-105.10189799999999 ./xmlchange PTS_LAT=48.307701 ./xmlchange RUN_STARTDATE=2000-01-01 ./xmlchange DATM_YR_ALIGN=2000 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-FPe/CLM1PT_data/CTSM_DATM_US-FPe_2000-2006.nc '" >> user_nl_datm_streams +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 @@ -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}_2000-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2006.nc'" >> user_nl_clm echo "model_year_align_lai=2000" >> user_nl_clm echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands index 09a04652f2..fd47ccc9fb 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-GLE/CLM1PT_data/CTSM_DATM_US-GLE_2009-2014.nc '" >> user_nl_datm_streams +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 @@ -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-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2009-2014.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=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands index ba77805192..4a982dfa1a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=US-Goo -./xmlchange PTS_LON=-89.873505 +./xmlchange PTS_LON=-89.87350500000001 ./xmlchange PTS_LAT=34.2547 ./xmlchange RUN_STARTDATE=2004-01-01 ./xmlchange DATM_YR_ALIGN=2004 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Goo/CLM1PT_data/CTSM_DATM_US-Goo_2004-2006.nc '" >> user_nl_datm_streams +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 @@ -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}_2004-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2006.nc'" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands index ce6f8a7679..8897746e35 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=24 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Ha1/CLM1PT_data/CTSM_DATM_US-Ha1_1992-2012.nc '" >> user_nl_datm_streams +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 @@ -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}_1992-2012.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1992-2012.nc'" >> user_nl_clm echo "model_year_align_lai=1992" >> user_nl_clm echo "stream_year_first_lai=1992" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands index 59cd9e1331..333c2bc7c9 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Ho1/CLM1PT_data/CTSM_DATM_US-Ho1_1996-2004.nc '" >> user_nl_datm_streams +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 @@ -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}_1996-2004.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1996-2004.nc'" >> user_nl_clm echo "model_year_align_lai=1996" >> user_nl_clm echo "stream_year_first_lai=1996" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands index 271246f48e..8c51eebc47 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-KS2/CLM1PT_data/CTSM_DATM_US-KS2_2003-2006.nc '" >> user_nl_datm_streams +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 @@ -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-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2006.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=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands index dbc061b349..9c2c04ffc9 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Los/CLM1PT_data/CTSM_DATM_US-Los_2000-2008.nc '" >> user_nl_datm_streams +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 @@ -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}_2000-2008.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2008.nc'" >> user_nl_clm echo "model_year_align_lai=2000" >> user_nl_clm echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2008" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands index 1c238f1b7e..dc236ff9ac 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=US-MMS -./xmlchange PTS_LON=-86.413086 +./xmlchange PTS_LON=-86.41308599999999 ./xmlchange PTS_LAT=39.3232 ./xmlchange RUN_STARTDATE=1999-01-01 ./xmlchange DATM_YR_ALIGN=1999 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=24 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-MMS/CLM1PT_data/CTSM_DATM_US-MMS_1999-2014.nc '" >> user_nl_datm_streams +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 @@ -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}_1999-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1999-2014.nc'" >> user_nl_clm echo "model_year_align_lai=1999" >> user_nl_clm echo "stream_year_first_lai=1999" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands index 40ef4b3a77..6388a09932 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-MOz/CLM1PT_data/CTSM_DATM_US-MOz_2005-2006.nc '" >> user_nl_datm_streams +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 @@ -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}_2005-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2006.nc'" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands index 1972bc4b47..44385b5e3f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Me2/CLM1PT_data/CTSM_DATM_US-Me2_2002-2014.nc '" >> user_nl_datm_streams +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 @@ -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-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2014.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=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands index 0fbf988e35..aa0299dd06 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=US-Me4 -./xmlchange PTS_LON=-121.622406 +./xmlchange PTS_LON=-121.62240600000001 ./xmlchange PTS_LAT=44.499199 ./xmlchange RUN_STARTDATE=1996-01-01 ./xmlchange DATM_YR_ALIGN=1996 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Me4/CLM1PT_data/CTSM_DATM_US-Me4_1996-2000.nc '" >> user_nl_datm_streams +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 @@ -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}_1996-2000.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1996-2000.nc'" >> user_nl_clm echo "model_year_align_lai=1996" >> user_nl_clm echo "stream_year_first_lai=1996" >> user_nl_clm echo "stream_year_last_lai=2000" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands index 5771243380..fd2b6c5726 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Me6/CLM1PT_data/CTSM_DATM_US-Me6_2011-2014.nc '" >> user_nl_datm_streams +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 @@ -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-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2014.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=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands index a39f166d31..33be94e9d5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Myb/CLM1PT_data/CTSM_DATM_US-Myb_2011-2014.nc '" >> user_nl_datm_streams +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 @@ -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-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2014.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=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands index b8b0797102..e70585ab81 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-NR1/CLM1PT_data/CTSM_DATM_US-NR1_1999-2014.nc '" >> user_nl_datm_streams +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 @@ -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}_1999-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1999-2014.nc'" >> user_nl_clm echo "model_year_align_lai=1999" >> user_nl_clm echo "stream_year_first_lai=1999" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands index f3d9643377..e855f4e455 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=US-Ne1 -./xmlchange PTS_LON=-96.476593 +./xmlchange PTS_LON=-96.47659300000001 ./xmlchange PTS_LAT=41.1651 ./xmlchange RUN_STARTDATE=2002-01-01 ./xmlchange DATM_YR_ALIGN=2002 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=24 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Ne1/CLM1PT_data/CTSM_DATM_US-Ne1_2002-2012.nc '" >> user_nl_datm_streams +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 @@ -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/US-Ne2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands index 7fb87723bf..420f7a336d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=US-Ne2 ./xmlchange PTS_LON=-96.470093 -./xmlchange PTS_LAT=41.164902 +./xmlchange PTS_LAT=41.164902000000005 ./xmlchange RUN_STARTDATE=2002-01-01 ./xmlchange DATM_YR_ALIGN=2002 ./xmlchange DATM_YR_START=2002 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=24 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Ne2/CLM1PT_data/CTSM_DATM_US-Ne2_2002-2012.nc '" >> user_nl_datm_streams +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 @@ -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/US-Ne3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands index a5d01e3d10..9da10fa36c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=24 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Ne3/CLM1PT_data/CTSM_DATM_US-Ne3_2002-2012.nc '" >> user_nl_datm_streams +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 @@ -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/US-PFa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands index 3dfc6dd712..7284f9575b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=24 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-PFa/CLM1PT_data/CTSM_DATM_US-PFa_1995-2014.nc '" >> user_nl_datm_streams +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 @@ -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}_1995-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1995-2014.nc'" >> user_nl_clm echo "model_year_align_lai=1995" >> user_nl_clm echo "stream_year_first_lai=1995" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands index 88c25b2553..05ffd8c8a8 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=32400 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Prr/CLM1PT_data/CTSM_DATM_US-Prr_2011-2013.nc '" >> user_nl_datm_streams +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 @@ -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-2013.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2013.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=2013" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands index 8f59b0acf4..6af60df601 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-SP1/CLM1PT_data/CTSM_DATM_US-SP1_2005-2005.nc '" >> user_nl_datm_streams +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 @@ -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}_2005-2005.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2005.nc'" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands index 4943fdc3ca..684c7c7303 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-SP2/CLM1PT_data/CTSM_DATM_US-SP2_2000-2004.nc '" >> user_nl_datm_streams +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 @@ -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}_2000-2004.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2004.nc'" >> user_nl_clm echo "model_year_align_lai=2000" >> user_nl_clm echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands index 3446557c99..266017ba62 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-SP3/CLM1PT_data/CTSM_DATM_US-SP3_1999-2004.nc '" >> user_nl_datm_streams +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 @@ -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}_1999-2004.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1999-2004.nc'" >> user_nl_clm echo "model_year_align_lai=1999" >> user_nl_clm echo "stream_year_first_lai=1999" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands index c814e0a4a3..b164988f24 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-SRG/CLM1PT_data/CTSM_DATM_US-SRG_2009-2014.nc '" >> user_nl_datm_streams +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 @@ -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-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2009-2014.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=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands index f36611a1aa..9b96150a8d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-SRM/CLM1PT_data/CTSM_DATM_US-SRM_2004-2014.nc '" >> user_nl_datm_streams +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 @@ -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}_2004-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands index 87723933ea..93435126db 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Syv/CLM1PT_data/CTSM_DATM_US-Syv_2002-2008.nc '" >> user_nl_datm_streams +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 @@ -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-2008.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2008.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=2008" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands index 3c9923e050..a8444513d2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Ton/CLM1PT_data/CTSM_DATM_US-Ton_2001-2014.nc '" >> user_nl_datm_streams +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 @@ -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}_2001-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2001-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2001" >> user_nl_clm echo "stream_year_first_lai=2001" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands index 7410d9f4ed..ef4d9c143f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Tw4/CLM1PT_data/CTSM_DATM_US-Tw4_2014-2014.nc '" >> user_nl_datm_streams +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 @@ -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}_2014-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2014-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2014" >> user_nl_clm echo "stream_year_first_lai=2014" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands index f1bb9a6b0b..e0f5544c05 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Twt/CLM1PT_data/CTSM_DATM_US-Twt_2010-2014.nc '" >> user_nl_datm_streams +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 @@ -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-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2014.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=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands index 8328a8124d..f4b7984908 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=24 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-UMB/CLM1PT_data/CTSM_DATM_US-UMB_2000-2014.nc '" >> user_nl_datm_streams +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 @@ -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}_2000-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2000" >> user_nl_clm echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands index cfda272009..00839ea0f3 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=US-Var -./xmlchange PTS_LON=-120.950729 +./xmlchange PTS_LON=-120.95072900000001 ./xmlchange PTS_LAT=38.4133 ./xmlchange RUN_STARTDATE=2001-01-01 ./xmlchange DATM_YR_ALIGN=2001 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Var/CLM1PT_data/CTSM_DATM_US-Var_2001-2014.nc '" >> user_nl_datm_streams +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 @@ -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}_2001-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2001-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2001" >> user_nl_clm echo "stream_year_first_lai=2001" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands index 2d843ef5bf..0b4634b8a5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-WCr/CLM1PT_data/CTSM_DATM_US-WCr_1999-2006.nc '" >> user_nl_datm_streams +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 @@ -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}_1999-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1999-2006.nc'" >> user_nl_clm echo "model_year_align_lai=1999" >> user_nl_clm echo "stream_year_first_lai=1999" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands index 0cb83c70e2..d72b1c74ea 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Whs/CLM1PT_data/CTSM_DATM_US-Whs_2008-2014.nc '" >> user_nl_datm_streams +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 @@ -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}_2008-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2008-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2008" >> user_nl_clm echo "stream_year_first_lai=2008" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands index abee04fd80..79c5e43c6c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Wkg/CLM1PT_data/CTSM_DATM_US-Wkg_2005-2014.nc '" >> user_nl_datm_streams +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 @@ -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}_2005-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands index bfca16af4b..b65d130b59 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/ZA-Kru/CLM1PT_data/CTSM_DATM_ZA-Kru_2000-2002.nc '" >> user_nl_datm_streams +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 @@ -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}_2000-2002.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2002.nc'" >> user_nl_clm echo "model_year_align_lai=2000" >> user_nl_clm echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2002" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands index a8c00a01a8..44d65e8b1e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/ZM-Mon/CLM1PT_data/CTSM_DATM_ZM-Mon_2008-2008.nc '" >> user_nl_datm_streams +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 @@ -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}_2008-2008.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2008-2008.nc'" >> user_nl_clm echo "model_year_align_lai=2008" >> user_nl_clm echo "stream_year_first_lai=2008" >> user_nl_clm echo "stream_year_last_lai=2008" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_clm b/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_clm index 7828027f64..7521a0827c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_clm +++ b/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_clm @@ -19,9 +19,7 @@ !---------------------------------------------------------------------------------- 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_map/PLUMBER2/surfdata_1x1_PLUMBER2_${PLUMBER2SITE}_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc" -! For testing only, TODO, ${PLUMBER2SITE} doesn't work as implimented -fsurdat = "/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_${PLUMBER2SITE}_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc" +fsurdat = "$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_${PLUMBER2SITE}_hist_2000_16pfts_c240326.nc ! TODO, this is only needed for transient simulations, not spinup ! this allows for large h1 data files, regardless or run length diff --git a/tools/site_and_regional/plumber2_usermods.py b/tools/site_and_regional/plumber2_usermods.py index 2602ba8a05..c759fa037a 100644 --- a/tools/site_and_regional/plumber2_usermods.py +++ b/tools/site_and_regional/plumber2_usermods.py @@ -35,7 +35,7 @@ def write_usermods(lat,lon,site,start_year,end_year, iFile.close() #TODO, move these input files do a different directory and update script - LAIstream = '/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_'+ \ + LAIstream = '$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_'+ \ 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 @@ -51,7 +51,7 @@ def write_usermods(lat,lon,site,start_year,end_year, './xmlchange ATM_NCPL='+str(atm_ncpl) + '\n' \ '\n' \ - 'echo "CLM_USRDAT.PLUMBER2:datafiles=\'/glade/work/oleson/PLUMBER2/datm_files/'+site+'/CLM1PT_data/CTSM_DATM_'+site+'_'+str(start_year)+'-'+str(end_year)+'.nc \'" >> user_nl_datm_streams \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' \