diff --git a/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands index e0fbe3006e..ce4fcd179d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2010.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AR-SLu/LAI_stream_AR-SLu_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 1351451831..bc2b290f5e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2012.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AT-Neu/LAI_stream_AT-Neu_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 15d2cf8977..b0bc044696 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2017.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-ASM/LAI_stream_AU-ASM_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 9a0011d275..0ba7b3eea5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2015.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Cow/LAI_stream_AU-Cow_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 2dde9a13b8..f96ee40ad7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2017.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Cpr/LAI_stream_AU-Cpr_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 0ad5fa18a0..90525cdf13 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2017.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Ctr/LAI_stream_AU-Ctr_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 7f2efca67b..66907b8134 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2013-2018.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Cum/LAI_stream_AU-Cum_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 98f5c8ba66..d06bf06d12 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2009-2012.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-DaP/LAI_stream_AU-DaP_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 18a66d0c6f..89460ba28a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2017.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-DaS/LAI_stream_AU-DaS_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 5ca6da10e7..6961b541ab 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2015.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Dry/LAI_stream_AU-Dry_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 f52d8c683d..74405d1d73 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2012-2013.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Emr/LAI_stream_AU-Emr_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 7eb27e4147..206587eb3f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2013-2017.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-GWW/LAI_stream_AU-GWW_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 07e7774cf3..78e1d48d5a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2012-2017.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Gin/LAI_stream_AU-Gin_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 178a7d3581..6a3e773b4a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2017.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-How/LAI_stream_AU-How_2003-2017.nc'" >> user_nl_clm echo "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 bb284fb315..6458c92bdb 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2016-2017.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Lit/LAI_stream_AU-Lit_2016-2017.nc'" >> user_nl_clm echo "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 95b8044f12..f9fdf9da44 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2009-2010.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Otw/LAI_stream_AU-Otw_2009-2010.nc'" >> user_nl_clm echo "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 4b800758f2..e627eddb4b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2016.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Rig/LAI_stream_AU-Rig_2011-2016.nc'" >> user_nl_clm echo "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 0f2e14a2da..d5ca9d0b90 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2014-2017.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Rob/LAI_stream_AU-Rob_2014-2017.nc'" >> user_nl_clm echo "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 0839b80fdb..4b1658fbd7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2017.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Sam/LAI_stream_AU-Sam_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 710710b06f..7cd2d493ca 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2017.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Stp/LAI_stream_AU-Stp_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 7e646bac5d..4613b2b1a4 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2013-2017.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-TTE/LAI_stream_AU-TTE_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 1c97c31d13..327b4afa22 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2017.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Tum/LAI_stream_AU-Tum_2002-2017.nc'" >> user_nl_clm echo "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 7544645aee..c70b8da507 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2015-2016.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Whr/LAI_stream_AU-Whr_2015-2016.nc'" >> user_nl_clm echo "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 8c352f8f59..862f5c179f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2016-2017.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Wrr/LAI_stream_AU-Wrr_2016-2017.nc'" >> user_nl_clm echo "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 c12b54196f..f72f0111a7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2017.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Ync/LAI_stream_AU-Ync_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 0c03eb5bbb..42c08114f8 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/BE-Bra/LAI_stream_BE-Bra_2004-2014.nc'" >> user_nl_clm echo "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 caa71df25f..3f0e9efcb9 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/BE-Lon/LAI_stream_BE-Lon_2005-2014.nc'" >> user_nl_clm echo "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 d071f9458a..d13a84a9e0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1997-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/BE-Vie/LAI_stream_BE-Vie_1997-2014.nc'" >> user_nl_clm echo "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 0deef21292..e656c23f7c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2001-2003.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/BR-Sa3/LAI_stream_BR-Sa3_2001-2003.nc'" >> user_nl_clm echo "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 9494793cc1..ad757f2913 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2000.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/BW-Ma1/LAI_stream_BW-Ma1_2000-2000.nc'" >> user_nl_clm echo "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 6a65ea1ef5..561f205363 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2003.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CA-NS1/LAI_stream_CA-NS1_2003-2003.nc'" >> user_nl_clm echo "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 c303db50ca..a90b4ab44f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2004.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CA-NS2/LAI_stream_CA-NS2_2002-2004.nc'" >> user_nl_clm echo "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 a14dc72425..a16d1d6adc 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2004.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CA-NS4/LAI_stream_CA-NS4_2003-2004.nc'" >> user_nl_clm echo "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 59497267e7..8d8015463e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2004.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CA-NS5/LAI_stream_CA-NS5_2003-2004.nc'" >> user_nl_clm echo "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 d1d0c25bbf..33bef39a08 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2004.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CA-NS6/LAI_stream_CA-NS6_2002-2004.nc'" >> user_nl_clm echo "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 fe08e895e8..0a065cf80c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2004.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CA-NS7/LAI_stream_CA-NS7_2003-2004.nc'" >> user_nl_clm echo "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 e325fb0b25..6036c9384d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2006.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CA-Qcu/LAI_stream_CA-Qcu_2002-2006.nc'" >> user_nl_clm echo "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 a0097e3fad..8d926b0230 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2010.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CA-Qfo/LAI_stream_CA-Qfo_2004-2010.nc'" >> user_nl_clm echo "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 9c2d58b88d..5892d13bbb 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2006.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CA-SF1/LAI_stream_CA-SF1_2004-2006.nc'" >> user_nl_clm echo "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 8e5f442715..7ac36361d2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2005.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CA-SF2/LAI_stream_CA-SF2_2003-2005.nc'" >> user_nl_clm echo "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 b5cc0e3ec2..0879941ba5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2005.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CA-SF3/LAI_stream_CA-SF3_2003-2005.nc'" >> user_nl_clm echo "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 5def12473d..ef2b855ff4 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2006-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CH-Cha/LAI_stream_CH-Cha_2006-2014.nc'" >> user_nl_clm echo "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 7e82f826da..9630013084 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1997-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CH-Dav/LAI_stream_CH-Dav_1997-2014.nc'" >> user_nl_clm echo "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 22db85b06f..3beae58058 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2007-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CH-Fru/LAI_stream_CH-Fru_2007-2014.nc'" >> user_nl_clm echo "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 3f5390a210..a5923c495b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2008.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CH-Oe1/LAI_stream_CH-Oe1_2002-2008.nc'" >> user_nl_clm echo "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 973914aaef..b16ab42a62 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2005.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CN-Cha/LAI_stream_CN-Cha_2003-2005.nc'" >> user_nl_clm echo "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 183a9f3e53..6b5246607f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2008-2009.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CN-Cng/LAI_stream_CN-Cng_2008-2009.nc'" >> user_nl_clm echo "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 b5fc93cd3c..21b2b06287 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2005.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CN-Dan/LAI_stream_CN-Dan_2004-2005.nc'" >> user_nl_clm echo "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 0e64dd70b9..c44d27ecda 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2005.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CN-Din/LAI_stream_CN-Din_2003-2005.nc'" >> user_nl_clm echo "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 96083e71ad..862913c330 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2007-2008.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CN-Du2/LAI_stream_CN-Du2_2007-2008.nc'" >> user_nl_clm echo "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 050f973117..9edae96ac8 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2003.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CN-HaM/LAI_stream_CN-HaM_2002-2003.nc'" >> user_nl_clm echo "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 e753be949d..5d98b7a460 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2005.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CN-Qia/LAI_stream_CN-Qia_2003-2005.nc'" >> user_nl_clm echo "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 4c36bdc84c..8beef8b15d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2007-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CZ-wet/LAI_stream_CZ-wet_2007-2014.nc'" >> user_nl_clm echo "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 d543bd9b90..ded51614a9 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1997-1999.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DE-Bay/LAI_stream_DE-Bay_1997-1999.nc'" >> user_nl_clm echo "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 1c03e1c107..e3622b023c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2001-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DE-Geb/LAI_stream_DE-Geb_2001-2014.nc'" >> user_nl_clm echo "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 bb90bceb68..671c2b5b57 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DE-Gri/LAI_stream_DE-Gri_2004-2014.nc'" >> user_nl_clm echo "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 c0df3d46cf..2992bc0a01 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2012.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DE-Hai/LAI_stream_DE-Hai_2000-2012.nc'" >> user_nl_clm echo "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 0141e3c808..057e1d303c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DE-Kli/LAI_stream_DE-Kli_2005-2014.nc'" >> user_nl_clm echo "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 9b34aff782..b0941e6f2a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2006.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DE-Meh/LAI_stream_DE-Meh_2004-2006.nc'" >> user_nl_clm echo "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 ccceb5e532..6ebbd21c44 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2008-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DE-Obe/LAI_stream_DE-Obe_2008-2014.nc'" >> user_nl_clm echo "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 e314864954..ac365d827f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2008-2010.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DE-Seh/LAI_stream_DE-Seh_2008-2010.nc'" >> user_nl_clm echo "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 8241a6dde1..7567e506e3 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2013-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DE-SfN/LAI_stream_DE-SfN_2013-2014.nc'" >> user_nl_clm echo "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 e788f2ce89..105834ebdc 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1998-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DE-Tha/LAI_stream_DE-Tha_1998-2014.nc'" >> user_nl_clm echo "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 82d21eabb3..af7c5c7f26 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2006.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DE-Wet/LAI_stream_DE-Wet_2002-2006.nc'" >> user_nl_clm echo "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 7217dd6ea7..98989d3047 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2005.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DK-Fou/LAI_stream_DK-Fou_2005-2005.nc'" >> user_nl_clm echo "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 c6527aa706..b6cc2a46c0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2006.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DK-Lva/LAI_stream_DK-Lva_2005-2006.nc'" >> user_nl_clm echo "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 9b5e5b0fd0..a7a319f9fe 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2005.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DK-Ris/LAI_stream_DK-Ris_2004-2005.nc'" >> user_nl_clm echo "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 7ea614b787..b2acac8333 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1997-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DK-Sor/LAI_stream_DK-Sor_1997-2014.nc'" >> user_nl_clm echo "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 c9ced51710..a5c068cb72 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2013.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DK-ZaH/LAI_stream_DK-ZaH_2000-2013.nc'" >> user_nl_clm echo "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 82367ead77..3093a5dfd0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1999-2006.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/ES-ES1/LAI_stream_ES-ES1_1999-2006.nc'" >> user_nl_clm echo "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 225cd25c98..ccc7d77922 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2006.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/ES-ES2/LAI_stream_ES-ES2_2005-2006.nc'" >> user_nl_clm echo "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 51845e00cb..47d92c7422 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2006.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/ES-LMa/LAI_stream_ES-LMa_2004-2006.nc'" >> user_nl_clm echo "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 743a68d77d..3e0d911f82 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2007-2007.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/ES-LgS/LAI_stream_ES-LgS_2007-2007.nc'" >> user_nl_clm echo "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 3870f8163e..24f618a5eb 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2004.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/ES-VDA/LAI_stream_ES-VDA_2004-2004.nc'" >> user_nl_clm echo "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 28dce0b519..9f9ddad2ca 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1996-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/FI-Hyy/LAI_stream_FI-Hyy_1996-2014.nc'" >> user_nl_clm echo "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 7d8b39a66e..7ca89dc807 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2002.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/FI-Kaa/LAI_stream_FI-Kaa_2000-2002.nc'" >> user_nl_clm echo "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 e80dfee283..0abb0de852 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2007-2009.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/FI-Lom/LAI_stream_FI-Lom_2007-2009.nc'" >> user_nl_clm echo "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 3bf1f43cc5..9aee1c0892 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2008-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/FI-Sod/LAI_stream_FI-Sod_2008-2014.nc'" >> user_nl_clm echo "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 6c7646e661..156f54c1b3 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2013.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/FR-Fon/LAI_stream_FR-Fon_2005-2013.nc'" >> user_nl_clm echo "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 53281682c5..3c291fc0d1 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2013.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/FR-Gri/LAI_stream_FR-Gri_2005-2013.nc'" >> user_nl_clm echo "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 ed218f4c4d..62c715f70d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1997-2006.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/FR-Hes/LAI_stream_FR-Hes_1997-2006.nc'" >> user_nl_clm echo "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 c2330472bb..1395b6d8b4 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2008.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/FR-LBr/LAI_stream_FR-LBr_2003-2008.nc'" >> user_nl_clm echo "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 b11e475863..269a1300a7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2006.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/FR-Lq1/LAI_stream_FR-Lq1_2004-2006.nc'" >> user_nl_clm echo "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 1bf8fd0208..511a16c9ab 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2006.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/FR-Lq2/LAI_stream_FR-Lq2_2004-2006.nc'" >> user_nl_clm echo "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 870562ba02..52bec0cd37 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/FR-Pue/LAI_stream_FR-Pue_2000-2014.nc'" >> user_nl_clm echo "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 4a33b0b220..d36335e8d6 100644 --- a/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/GF-Guy/LAI_stream_GF-Guy_2004-2014.nc'" >> user_nl_clm echo "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 c32a6f302a..1de8af42ae 100644 --- a/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2006.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/HU-Bug/LAI_stream_HU-Bug_2003-2006.nc'" >> user_nl_clm echo "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 b2b8131fbc..9d6e9a636c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2003.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/ID-Pag/LAI_stream_ID-Pag_2002-2003.nc'" >> user_nl_clm echo "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 a35c164eb0..520d6398e2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2006.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IE-Ca1/LAI_stream_IE-Ca1_2004-2006.nc'" >> user_nl_clm echo "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 f5c9867618..de2159762c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2005.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IE-Dri/LAI_stream_IE-Dri_2003-2005.nc'" >> user_nl_clm echo "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 d3741fc74e..13d05c8f5c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2006.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-Amp/LAI_stream_IT-Amp_2003-2006.nc'" >> user_nl_clm echo "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 e13bdb70b6..949025e4b0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2010.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-BCi/LAI_stream_IT-BCi_2005-2010.nc'" >> user_nl_clm echo "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 39d6c6ab39..c382537fbc 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2012-2013.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-CA1/LAI_stream_IT-CA1_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 f57fbd6c6f..72a96fef26 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2012-2013.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-CA2/LAI_stream_IT-CA2_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 757643c73c..716f026f7a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2012-2013.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-CA3/LAI_stream_IT-CA3_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 4795f051cc..c8cf54e961 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2007-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-Col/LAI_stream_IT-Col_2007-2014.nc'" >> user_nl_clm echo "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 13f1dd4908..8f5462c381 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2001-2008.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-Cpz/LAI_stream_IT-Cpz_2001-2008.nc'" >> user_nl_clm echo "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 2f2ab608d7..c92fc8f8f0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2013-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-Isp/LAI_stream_IT-Isp_2013-2014.nc'" >> user_nl_clm echo "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 b9726c1f43..42a1d8c1dc 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2004.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-LMa/LAI_stream_IT-LMa_2003-2004.nc'" >> user_nl_clm echo "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 1d0ea94816..354f5e96db 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-Lav/LAI_stream_IT-Lav_2005-2014.nc'" >> user_nl_clm echo "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 b5673ac746..47641dad10 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2012.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-MBo/LAI_stream_IT-MBo_2003-2012.nc'" >> user_nl_clm echo "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 b5c9481cf0..b7abc1c202 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2003.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-Mal/LAI_stream_IT-Mal_2003-2003.nc'" >> user_nl_clm echo "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 3a9c16d5b1..7be6480036 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-Noe/LAI_stream_IT-Noe_2004-2014.nc'" >> user_nl_clm echo "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 2cef11e176..3aa5fe1b22 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2002.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-Non/LAI_stream_IT-Non_2002-2002.nc'" >> user_nl_clm echo "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 cb60ceba3a..e39698c428 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2004.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-PT1/LAI_stream_IT-PT1_2003-2004.nc'" >> user_nl_clm echo "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 7dae634dca..a330de1a17 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2013.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-Ren/LAI_stream_IT-Ren_2010-2013.nc'" >> user_nl_clm echo "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 dce7e660bc..29e2d23290 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2006.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-Ro1/LAI_stream_IT-Ro1_2002-2006.nc'" >> user_nl_clm echo "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 ab6f7f6bdd..03a5b3440b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2008.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-Ro2/LAI_stream_IT-Ro2_2002-2008.nc'" >> user_nl_clm echo "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 00143864d8..572751c8bf 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2013-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-SR2/LAI_stream_IT-SR2_2013-2014.nc'" >> user_nl_clm echo "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 cea54a23f8..578dacb81a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2012.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-SRo/LAI_stream_IT-SRo_2003-2012.nc'" >> user_nl_clm echo "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 9197414be2..9b0446ac0b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2006.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/JP-SMF/LAI_stream_JP-SMF_2003-2006.nc'" >> user_nl_clm echo "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 b4f552a454..9f531d81c7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2006.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/NL-Ca1/LAI_stream_NL-Ca1_2003-2006.nc'" >> user_nl_clm echo "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 82c9e8d185..725c034516 100644 --- a/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2008-2011.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/NL-Hor/LAI_stream_NL-Hor_2008-2011.nc'" >> user_nl_clm echo "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 e2f0c56b70..3c9999cfbd 100644 --- a/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1997-2013.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/NL-Loo/LAI_stream_NL-Loo_1997-2013.nc'" >> user_nl_clm echo "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 b63949ac6b..ea9d398769 100644 --- a/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2005.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/PL-wet/LAI_stream_PL-wet_2004-2005.nc'" >> user_nl_clm echo "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 6d4c5bcf54..02ffbb6faa 100644 --- a/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2004.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/PT-Esp/LAI_stream_PT-Esp_2002-2004.nc'" >> user_nl_clm echo "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 53a2ac0ae3..4fca1927c5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2005.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/PT-Mi1/LAI_stream_PT-Mi1_2005-2005.nc'" >> user_nl_clm echo "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 8321e77007..946be09d3d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2006.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/PT-Mi2/LAI_stream_PT-Mi2_2005-2006.nc'" >> user_nl_clm echo "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 44f1533f63..ca53d5be69 100644 --- a/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2004.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/RU-Che/LAI_stream_RU-Che_2003-2004.nc'" >> user_nl_clm echo "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 7a22685bee..ac23886c1f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/RU-Fyo/LAI_stream_RU-Fyo_2003-2014.nc'" >> user_nl_clm echo "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 e0b964be3a..aabb6da38d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2003.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/RU-Zot/LAI_stream_RU-Zot_2003-2003.nc'" >> user_nl_clm echo "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 d95b94ec2d..acb137008d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2009.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/SD-Dem/LAI_stream_SD-Dem_2005-2009.nc'" >> user_nl_clm echo "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 f1e4964429..da2f7ae944 100644 --- a/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2005.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/SE-Deg/LAI_stream_SE-Deg_2002-2005.nc'" >> user_nl_clm echo "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 c29a583334..ddba58fc8b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2001.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/UK-Gri/LAI_stream_UK-Gri_2000-2001.nc'" >> user_nl_clm echo "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 114ded1067..de471c7a77 100644 --- a/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2004.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/UK-Ham/LAI_stream_UK-Ham_2004-2004.nc'" >> user_nl_clm echo "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 f464283f9f..6c0ee39584 100644 --- a/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2006.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/UK-PL3/LAI_stream_UK-PL3_2005-2006.nc'" >> user_nl_clm echo "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 4dacfded3a..16cf9a642f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2012.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-AR1/LAI_stream_US-AR1_2010-2012.nc'" >> user_nl_clm echo "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 82ac9cfcb4..edf27903f7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2011.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-AR2/LAI_stream_US-AR2_2010-2011.nc'" >> user_nl_clm echo "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 a3e8b65dee..1856fd69b2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2012.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-ARM/LAI_stream_US-ARM_2003-2012.nc'" >> user_nl_clm echo "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 94d9dd6c6a..bf8f45e9be 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2005.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Aud/LAI_stream_US-Aud_2003-2005.nc'" >> user_nl_clm echo "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 1b5e9e3a2b..d0fc95ca5e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2005.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Bar/LAI_stream_US-Bar_2005-2005.nc'" >> user_nl_clm echo "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 f218d3294e..753597ab3d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2006.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Bkg/LAI_stream_US-Bkg_2005-2006.nc'" >> user_nl_clm echo "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 fcbfa62899..b075baa9c9 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2006.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Blo/LAI_stream_US-Blo_2000-2006.nc'" >> user_nl_clm echo "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 273201827b..4e164b98a4 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1997-2006.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Bo1/LAI_stream_US-Bo1_1997-2006.nc'" >> user_nl_clm echo "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 b291dfe747..bccbd7a37b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2003.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Cop/LAI_stream_US-Cop_2002-2003.nc'" >> user_nl_clm echo "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 992c245dca..70b78c0c86 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2006.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-FPe/LAI_stream_US-FPe_2000-2006.nc'" >> user_nl_clm echo "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 b92a353c95..fab2b713d9 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2009-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-GLE/LAI_stream_US-GLE_2009-2014.nc'" >> user_nl_clm echo "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 b564a7ea7d..fd008126d4 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2006.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Goo/LAI_stream_US-Goo_2004-2006.nc'" >> user_nl_clm echo "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 1f52f4cb8f..2c4e239763 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1992-2012.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Ha1/LAI_stream_US-Ha1_1992-2012.nc'" >> user_nl_clm echo "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 5fe2f89f12..1d33c85b78 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1996-2004.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Ho1/LAI_stream_US-Ho1_1996-2004.nc'" >> user_nl_clm echo "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 eca15a31c7..a79882b207 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2006.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-KS2/LAI_stream_US-KS2_2003-2006.nc'" >> user_nl_clm echo "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 e93d7a8ae2..c7b41701c7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2008.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Los/LAI_stream_US-Los_2000-2008.nc'" >> user_nl_clm echo "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 31c1494070..29314c7e7d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1999-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-MMS/LAI_stream_US-MMS_1999-2014.nc'" >> user_nl_clm echo "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 bc9cb7a4ce..0e8e837841 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2006.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-MOz/LAI_stream_US-MOz_2005-2006.nc'" >> user_nl_clm echo "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 ac202382d7..12d3fce166 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Me2/LAI_stream_US-Me2_2002-2014.nc'" >> user_nl_clm echo "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 baeb89630a..37b65e0853 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1996-2000.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Me4/LAI_stream_US-Me4_1996-2000.nc'" >> user_nl_clm echo "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 f87447e19c..a11b9d7845 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Me6/LAI_stream_US-Me6_2011-2014.nc'" >> user_nl_clm echo "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 193b6c3322..7fa2f5a6df 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Myb/LAI_stream_US-Myb_2011-2014.nc'" >> user_nl_clm echo "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 f214bc092a..4cb2f1cd84 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1999-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-NR1/LAI_stream_US-NR1_1999-2014.nc'" >> user_nl_clm echo "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 7667a44750..26540ef020 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2012.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Ne1/LAI_stream_US-Ne1_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 47450ca4c8..f37f265a6a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2012.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Ne2/LAI_stream_US-Ne2_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 c68f41322d..8fbf964ed0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2012.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Ne3/LAI_stream_US-Ne3_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 6d04938599..533f69237b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1995-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-PFa/LAI_stream_US-PFa_1995-2014.nc'" >> user_nl_clm echo "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 1cee11514d..682c02c609 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2013.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Prr/LAI_stream_US-Prr_2011-2013.nc'" >> user_nl_clm echo "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 62a22eec56..f47a97056f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2005.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-SP1/LAI_stream_US-SP1_2005-2005.nc'" >> user_nl_clm echo "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 ea6c919762..9462ca96fe 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2004.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-SP2/LAI_stream_US-SP2_2000-2004.nc'" >> user_nl_clm echo "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 5afd807fb0..151df53a46 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1999-2004.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-SP3/LAI_stream_US-SP3_1999-2004.nc'" >> user_nl_clm echo "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 9010fda086..2bbea39d11 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2009-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-SRG/LAI_stream_US-SRG_2009-2014.nc'" >> user_nl_clm echo "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 9231d0943e..7dc3f83f3c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-SRM/LAI_stream_US-SRM_2004-2014.nc'" >> user_nl_clm echo "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 5919a4d86a..09bc42706b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2008.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Syv/LAI_stream_US-Syv_2002-2008.nc'" >> user_nl_clm echo "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 644d2e112b..e7d110fa84 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2001-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Ton/LAI_stream_US-Ton_2001-2014.nc'" >> user_nl_clm echo "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 fe23b8f352..6773942aed 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2014-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Tw4/LAI_stream_US-Tw4_2014-2014.nc'" >> user_nl_clm echo "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 44ebfcd623..9bb5e6bfa2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Twt/LAI_stream_US-Twt_2010-2014.nc'" >> user_nl_clm echo "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 ee5dd15d2e..58e3a063c4 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-UMB/LAI_stream_US-UMB_2000-2014.nc'" >> user_nl_clm echo "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 a5bab622a2..c4f49fe662 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2001-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Var/LAI_stream_US-Var_2001-2014.nc'" >> user_nl_clm echo "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 0d407d7c89..e65ddbc6b5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1999-2006.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-WCr/LAI_stream_US-WCr_1999-2006.nc'" >> user_nl_clm echo "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 1d3ee2ea11..6fc485d959 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2008-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Whs/LAI_stream_US-Whs_2008-2014.nc'" >> user_nl_clm echo "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 5b7668d9fd..5357c4dd1b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Wkg/LAI_stream_US-Wkg_2005-2014.nc'" >> user_nl_clm echo "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 5b45a7625a..959c2e2e2d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2002.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/ZA-Kru/LAI_stream_ZA-Kru_2000-2002.nc'" >> user_nl_clm echo "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 90a6426a27..a9c0c44b4a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2008-2008.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/ZM-Mon/LAI_stream_ZM-Mon_2008-2008.nc'" >> user_nl_clm echo "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/tools/site_and_regional/plumber2_usermods.py b/tools/site_and_regional/plumber2_usermods.py index fc6134e711..4031442883 100644 --- a/tools/site_and_regional/plumber2_usermods.py +++ b/tools/site_and_regional/plumber2_usermods.py @@ -34,7 +34,7 @@ def write_usermods(lat,lon,site,start_year,end_year, iFile.write('../defaults') iFile.close() - LAIstream = '\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_'+ \ + LAIstream = '\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/'+site+'/LAI_stream_'+site+'_'+ \ str(start_year)+'-'+str(end_year)+'.nc' shell = os.path.join(site_dir,'shell_commands') sFile = open(shell, 'w') # or 'a' to add text instead of truncate @@ -51,6 +51,7 @@ def write_usermods(lat,lon,site,start_year,end_year, './xmlchange ATM_NCPL='+str(atm_ncpl) + '\n' \ '\n' \ # TODO, get working for CTSM5.1, remove this line as it's redundant after PLUMBER2SITE is added + # Alternatively, we can take this out of default/user_nl_clm since doing it this way is works fine TODO for 5.2 'echo "fsurdat=\'/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_'+site+'_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc \' " >> user_nl_clm \n' \ 'echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/'+site+'/CLM1PT_data/CTSM_DATM_'+site+'_'+str(start_year)+'-'+str(end_year)+'.nc " >> user_nl_datm_streams \n' \ @@ -84,10 +85,9 @@ def write_usermods(lat,lon,site,start_year,end_year, 'fi \n' \ '\n' \ - # TODO, check to see if this works after PLUMBER2SITE is added '# Turn on LAI streams for a SP case \n' \ 'if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then \n' \ - ' echo "stream_fldfilename_lai='+LAIstream+'" >> user_nl_clm \n' \ + ' echo "stream_fldfilename_lai=\''+LAIstream+'\'" >> user_nl_clm \n' \ ' echo "model_year_align_lai='+str(start_year) + '" >> user_nl_clm \n' \ ' echo "stream_year_first_lai='+str(start_year) + '" >> user_nl_clm \n' \ ' echo "stream_year_last_lai='+str(end_year) + '" >> user_nl_clm \n' \