ESCOMP · slevis-lmwg · May 4, 2023 · May 15, 2023 · Jun 5, 2023 · Jun 7, 2023
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -1,4 +1,5 @@
 # Ran python directory through black python formatter
+b429b63824e09f82e95d2982f14311cbbd8e4a37
 d229b5c6689efc4c2a6cef077515c4ccd5c18ff6
 4cd83cb3ee6d85eb909403487abf5eeaf4d98911
 0aa2957c1f8603c63fa30b11295c06cfddff44a5

diff --git a/cime_config/buildlib b/cime_config/buildlib
@@ -131,6 +131,7 @@ def _main_func():
                 os.path.join(lnd_root, "src", "biogeophys"),
                 os.path.join(lnd_root, "src", "biogeochem"),
                 os.path.join(lnd_root, "src", "soilbiogeochem"),
+                os.path.join(lnd_root, "src", "multilayer_canopy"),
                 os.path.join(lnd_root, "src", "dyn_subgrid"),
                 os.path.join(lnd_root, "src", "init_interp"),
                 os.path.join(lnd_root, "src", "self_tests"),

diff --git a/cime_config/usermods_dirs/PLUMBER2/AR-SLu/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/AR-SLu/include_user_mods
@@ -0,0 +1 @@
+../defaults
diff --git a/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands
@@ -0,0 +1,42 @@
+./xmlchange PLUMBER2SITE=AR-SLu
+./xmlchange PTS_LON=-66.459808
+./xmlchange PTS_LAT=-33.464802
+./xmlchange RUN_STARTDATE=2010-01-01
+./xmlchange DATM_YR_ALIGN=2010
+./xmlchange DATM_YR_START=2010
+./xmlchange DATM_YR_END=2010
+./xmlchange START_TOD=10800
+./xmlchange ATM_NCPL=48
+
+echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AR-SLu/CLM1PT_data/CTSM_DATM_AR-SLu_2010-2010.nc '" >> user_nl_datm_streams 
+echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams 
+echo "presaero.SSP3-7.0:year_last=2010" >> user_nl_datm_streams 
+echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams 
+
+echo "presndep.SSP3-7.0:year_first=2010" >> user_nl_datm_streams 
+echo "presndep.SSP3-7.0:year_last=2010" >> user_nl_datm_streams 
+echo "presndep.SSP3-7.0:year_align=2010" >> user_nl_datm_streams 
+
+echo "co2tseries.SSP3-7.0:year_first=2010" >> user_nl_datm_streams 
+echo "co2tseries.SSP3-7.0:year_last=2010" >> user_nl_datm_streams 
+echo "co2tseries.SSP3-7.0:year_align=2010" >> user_nl_datm_streams 
+
+compset=`./xmlquery COMPSET --value` 
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` 
+TEST=`./xmlquery TEST --value` 
+
+# For a transient case run the whole length and do not cycle 
+if  [[ $compset =~ ^HIST ]]; then 
+  # Number of years that can be run for the full transient case 
+  if [[ $TEST != "TRUE" ]]; then  
+    ./xmlchange STOP_N=1
+  fi 
+fi 
+
+# Turn on LAI streams for a SP case 
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then 
+  echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2010.nc'" >> user_nl_clm 
+  echo "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 
+fi 
diff --git a/cime_config/usermods_dirs/PLUMBER2/AT-Neu/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/AT-Neu/include_user_mods
@@ -0,0 +1 @@
+../defaults
diff --git a/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands
@@ -0,0 +1,42 @@
+./xmlchange PLUMBER2SITE=AT-Neu
+./xmlchange PTS_LON=11.3175
+./xmlchange PTS_LAT=47.116669
+./xmlchange RUN_STARTDATE=2001-12-31
+./xmlchange DATM_YR_ALIGN=2002
+./xmlchange DATM_YR_START=2002
+./xmlchange DATM_YR_END=2012
+./xmlchange START_TOD=82800
+./xmlchange ATM_NCPL=48
+
+echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AT-Neu/CLM1PT_data/CTSM_DATM_AT-Neu_2002-2012.nc '" >> user_nl_datm_streams 
+echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams 
+echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams 
+echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams 
+
+echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams 
+echo "presndep.SSP3-7.0:year_last=2012" >> user_nl_datm_streams 
+echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams 
+
+echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams 
+echo "co2tseries.SSP3-7.0:year_last=2012" >> user_nl_datm_streams 
+echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams 
+
+compset=`./xmlquery COMPSET --value` 
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` 
+TEST=`./xmlquery TEST --value` 
+
+# For a transient case run the whole length and do not cycle 
+if  [[ $compset =~ ^HIST ]]; then 
+  # Number of years that can be run for the full transient case 
+  if [[ $TEST != "TRUE" ]]; then  
+    ./xmlchange STOP_N=11
+  fi 
+fi 
+
+# Turn on LAI streams for a SP case 
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then 
+  echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2012.nc'" >> user_nl_clm 
+  echo "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 
+fi 
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-ASM/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/AU-ASM/include_user_mods
@@ -0,0 +1 @@
+../defaults
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands
@@ -0,0 +1,42 @@
+./xmlchange PLUMBER2SITE=AU-ASM
+./xmlchange PTS_LON=133.248993
+./xmlchange PTS_LAT=-22.283001
+./xmlchange RUN_STARTDATE=2010-12-31
+./xmlchange DATM_YR_ALIGN=2011
+./xmlchange DATM_YR_START=2011
+./xmlchange DATM_YR_END=2017
+./xmlchange START_TOD=54000
+./xmlchange ATM_NCPL=48
+
+echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-ASM/CLM1PT_data/CTSM_DATM_AU-ASM_2011-2017.nc '" >> user_nl_datm_streams 
+echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams 
+echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams 
+echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams 
+
+echo "presndep.SSP3-7.0:year_first=2011" >> user_nl_datm_streams 
+echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams 
+echo "presndep.SSP3-7.0:year_align=2011" >> user_nl_datm_streams 
+
+echo "co2tseries.SSP3-7.0:year_first=2011" >> user_nl_datm_streams 
+echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams 
+echo "co2tseries.SSP3-7.0:year_align=2011" >> user_nl_datm_streams 
+
+compset=`./xmlquery COMPSET --value` 
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` 
+TEST=`./xmlquery TEST --value` 
+
+# For a transient case run the whole length and do not cycle 
+if  [[ $compset =~ ^HIST ]]; then 
+  # Number of years that can be run for the full transient case 
+  if [[ $TEST != "TRUE" ]]; then  
+    ./xmlchange STOP_N=7
+  fi 
+fi 
+
+# Turn on LAI streams for a SP case 
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then 
+  echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2017.nc'" >> user_nl_clm 
+  echo "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 
+fi 
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cow/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/AU-Cow/include_user_mods
@@ -0,0 +1 @@
+../defaults
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands
@@ -0,0 +1,42 @@
+./xmlchange PLUMBER2SITE=AU-Cow
+./xmlchange PTS_LON=145.427155
+./xmlchange PTS_LAT=-16.23819
+./xmlchange RUN_STARTDATE=2009-12-31
+./xmlchange DATM_YR_ALIGN=2010
+./xmlchange DATM_YR_START=2010
+./xmlchange DATM_YR_END=2015
+./xmlchange START_TOD=50400
+./xmlchange ATM_NCPL=48
+
+echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-Cow/CLM1PT_data/CTSM_DATM_AU-Cow_2010-2015.nc '" >> user_nl_datm_streams 
+echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams 
+echo "presaero.SSP3-7.0:year_last=2015" >> user_nl_datm_streams 
+echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams 
+
+echo "presndep.SSP3-7.0:year_first=2010" >> user_nl_datm_streams 
+echo "presndep.SSP3-7.0:year_last=2015" >> user_nl_datm_streams 
+echo "presndep.SSP3-7.0:year_align=2010" >> user_nl_datm_streams 
+
+echo "co2tseries.SSP3-7.0:year_first=2010" >> user_nl_datm_streams 
+echo "co2tseries.SSP3-7.0:year_last=2015" >> user_nl_datm_streams 
+echo "co2tseries.SSP3-7.0:year_align=2010" >> user_nl_datm_streams 
+
+compset=`./xmlquery COMPSET --value` 
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` 
+TEST=`./xmlquery TEST --value` 
+
+# For a transient case run the whole length and do not cycle 
+if  [[ $compset =~ ^HIST ]]; then 
+  # Number of years that can be run for the full transient case 
+  if [[ $TEST != "TRUE" ]]; then  
+    ./xmlchange STOP_N=6
+  fi 
+fi 
+
+# Turn on LAI streams for a SP case 
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then 
+  echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2015.nc'" >> user_nl_clm 
+  echo "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 
+fi 
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/include_user_mods
@@ -0,0 +1 @@
+../defaults
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands
@@ -0,0 +1,42 @@
+./xmlchange PLUMBER2SITE=AU-Cpr
+./xmlchange PTS_LON=140.589127
+./xmlchange PTS_LAT=-34.00206
+./xmlchange RUN_STARTDATE=2010-12-31
+./xmlchange DATM_YR_ALIGN=2011
+./xmlchange DATM_YR_START=2011
+./xmlchange DATM_YR_END=2017
+./xmlchange START_TOD=46800
+./xmlchange ATM_NCPL=48
+
+echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-Cpr/CLM1PT_data/CTSM_DATM_AU-Cpr_2011-2017.nc '" >> user_nl_datm_streams 
+echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams 
+echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams 
+echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams 
+
+echo "presndep.SSP3-7.0:year_first=2011" >> user_nl_datm_streams 
+echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams 
+echo "presndep.SSP3-7.0:year_align=2011" >> user_nl_datm_streams 
+
+echo "co2tseries.SSP3-7.0:year_first=2011" >> user_nl_datm_streams 
+echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams 
+echo "co2tseries.SSP3-7.0:year_align=2011" >> user_nl_datm_streams 
+
+compset=`./xmlquery COMPSET --value` 
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` 
+TEST=`./xmlquery TEST --value` 
+
+# For a transient case run the whole length and do not cycle 
+if  [[ $compset =~ ^HIST ]]; then 
+  # Number of years that can be run for the full transient case 
+  if [[ $TEST != "TRUE" ]]; then  
+    ./xmlchange STOP_N=7
+  fi 
+fi 
+
+# Turn on LAI streams for a SP case 
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then 
+  echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2017.nc'" >> user_nl_clm 
+  echo "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 
+fi 
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/include_user_mods
@@ -0,0 +1 @@
+../defaults
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands
@@ -0,0 +1,42 @@
+./xmlchange PLUMBER2SITE=AU-Ctr
+./xmlchange PTS_LON=145.446854
+./xmlchange PTS_LAT=-16.103279
+./xmlchange RUN_STARTDATE=2009-12-31
+./xmlchange DATM_YR_ALIGN=2010
+./xmlchange DATM_YR_START=2010
+./xmlchange DATM_YR_END=2017
+./xmlchange START_TOD=50400
+./xmlchange ATM_NCPL=48
+
+echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-Ctr/CLM1PT_data/CTSM_DATM_AU-Ctr_2010-2017.nc '" >> user_nl_datm_streams 
+echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams 
+echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams 
+echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams 
+
+echo "presndep.SSP3-7.0:year_first=2010" >> user_nl_datm_streams 
+echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams 
+echo "presndep.SSP3-7.0:year_align=2010" >> user_nl_datm_streams 
+
+echo "co2tseries.SSP3-7.0:year_first=2010" >> user_nl_datm_streams 
+echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams 
+echo "co2tseries.SSP3-7.0:year_align=2010" >> user_nl_datm_streams 
+
+compset=`./xmlquery COMPSET --value` 
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` 
+TEST=`./xmlquery TEST --value` 
+
+# For a transient case run the whole length and do not cycle 
+if  [[ $compset =~ ^HIST ]]; then 
+  # Number of years that can be run for the full transient case 
+  if [[ $TEST != "TRUE" ]]; then  
+    ./xmlchange STOP_N=8
+  fi 
+fi 
+
+# Turn on LAI streams for a SP case 
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then 
+  echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2017.nc'" >> user_nl_clm 
+  echo "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 
+fi 
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cum/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/AU-Cum/include_user_mods
@@ -0,0 +1 @@
+../defaults
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands
@@ -0,0 +1,42 @@
+./xmlchange PLUMBER2SITE=AU-Cum
+./xmlchange PTS_LON=150.722473
+./xmlchange PTS_LAT=-33.613297
+./xmlchange RUN_STARTDATE=2012-12-31
+./xmlchange DATM_YR_ALIGN=2013
+./xmlchange DATM_YR_START=2013
+./xmlchange DATM_YR_END=2018
+./xmlchange START_TOD=46800
+./xmlchange ATM_NCPL=48
+
+echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-Cum/CLM1PT_data/CTSM_DATM_AU-Cum_2013-2018.nc '" >> user_nl_datm_streams 
+echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams 
+echo "presaero.SSP3-7.0:year_last=2018" >> user_nl_datm_streams 
+echo "presaero.SSP3-7.0:year_align=2013" >> user_nl_datm_streams 
+
+echo "presndep.SSP3-7.0:year_first=2013" >> user_nl_datm_streams 
+echo "presndep.SSP3-7.0:year_last=2018" >> user_nl_datm_streams 
+echo "presndep.SSP3-7.0:year_align=2013" >> user_nl_datm_streams 
+
+echo "co2tseries.SSP3-7.0:year_first=2013" >> user_nl_datm_streams 
+echo "co2tseries.SSP3-7.0:year_last=2018" >> user_nl_datm_streams 
+echo "co2tseries.SSP3-7.0:year_align=2013" >> user_nl_datm_streams 
+
+compset=`./xmlquery COMPSET --value` 
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` 
+TEST=`./xmlquery TEST --value` 
+
+# For a transient case run the whole length and do not cycle 
+if  [[ $compset =~ ^HIST ]]; then 
+  # Number of years that can be run for the full transient case 
+  if [[ $TEST != "TRUE" ]]; then  
+    ./xmlchange STOP_N=6
+  fi 
+fi 
+
+# Turn on LAI streams for a SP case 
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then 
+  echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2013-2018.nc'" >> user_nl_clm 
+  echo "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 
+fi 
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-DaP/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/AU-DaP/include_user_mods
@@ -0,0 +1 @@
+../defaults
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands
@@ -0,0 +1,42 @@
+./xmlchange PLUMBER2SITE=AU-DaP
+./xmlchange PTS_LON=131.3181
+./xmlchange PTS_LAT=-14.0633
+./xmlchange RUN_STARTDATE=2008-12-31
+./xmlchange DATM_YR_ALIGN=2009
+./xmlchange DATM_YR_START=2009
+./xmlchange DATM_YR_END=2012
+./xmlchange START_TOD=54000
+./xmlchange ATM_NCPL=48
+
+echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-DaP/CLM1PT_data/CTSM_DATM_AU-DaP_2009-2012.nc '" >> user_nl_datm_streams 
+echo "presaero.SSP3-7.0:year_first=2009" >> user_nl_datm_streams 
+echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams 
+echo "presaero.SSP3-7.0:year_align=2009" >> user_nl_datm_streams 
+
+echo "presndep.SSP3-7.0:year_first=2009" >> user_nl_datm_streams 
+echo "presndep.SSP3-7.0:year_last=2012" >> user_nl_datm_streams 
+echo "presndep.SSP3-7.0:year_align=2009" >> user_nl_datm_streams 
+
+echo "co2tseries.SSP3-7.0:year_first=2009" >> user_nl_datm_streams 
+echo "co2tseries.SSP3-7.0:year_last=2012" >> user_nl_datm_streams 
+echo "co2tseries.SSP3-7.0:year_align=2009" >> user_nl_datm_streams 
+
+compset=`./xmlquery COMPSET --value` 
+CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` 
+TEST=`./xmlquery TEST --value` 
+
+# For a transient case run the whole length and do not cycle 
+if  [[ $compset =~ ^HIST ]]; then 
+  # Number of years that can be run for the full transient case 
+  if [[ $TEST != "TRUE" ]]; then  
+    ./xmlchange STOP_N=4
+  fi 
+fi 
+
+# Turn on LAI streams for a SP case 
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then 
+  echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2009-2012.nc'" >> user_nl_clm 
+  echo "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 
+fi 
diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-DaS/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/AU-DaS/include_user_mods
@@ -0,0 +1 @@
+../defaults