Merge pull request #2482 from ekluzek/merge-b4bdev-20240420

Merge b4bdev 20240420

.git-blame-ignore-revs

@@ -1,4 +1,5 @@
 # Ran python directory through black python formatter
+b429b63824e09f82e95d2982f14311cbbd8e4a37
 d229b5c6689efc4c2a6cef077515c4ccd5c18ff6
 4cd83cb3ee6d85eb909403487abf5eeaf4d98911
 0aa2957c1f8603c63fa30b11295c06cfddff44a5

bld/namelist_files/namelist_definition_ctsm.xml

@@ -1746,6 +1746,12 @@ Filename of input stream data for LAI
 Filename of input stream data for LAI
 </entry>
 
+<entry id="lai_dtlimit" type="real" category="datasets"
+       group="lai_streams" valid_values="" >
+dtlimit (ratio of max/min stream delta times) for LAI streams, which allows for cycling over a year of data 
+</entry>
+
+
 <entry id="lai_tintalgo" type="char*80" category="datasets"
        group="lai_streams" valid_values="linear,nearest,lower,upper" >
 Time interpolation method to use with LAI streams

cime_config/usermods_dirs/NEON/defaults/shell_commands

@@ -19,6 +19,7 @@ TEST=`./xmlquery TEST --value`
 
 # For a transient case run the whole length and don't cycle
 if  [[ $compset =~ ^HIST ]]; then
+  ./xmlchange CALENDAR=GREGORIAN
   ./xmlchange DATM_YR_END=2022
   ./xmlchange RUN_STARTDATE=2018-01-01
   # Number of months that can be run for the full transient case
@@ -29,6 +30,7 @@ if  [[ $compset =~ ^HIST ]]; then
   ./xmlchange CLM_NML_USE_CASE="2018-PD_transient"
 else
   ./xmlchange CLM_NML_USE_CASE="2018_control"
+  ./xmlchange CALENDAR=NO_LEAP
 fi
 
 # If needed for SP simulations: & set history file variables

cime_config/usermods_dirs/PLUMBER2/AR-SLu/include_user_mods

@@ -0,0 +1 @@
+../defaults

cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands

@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=-66.459808
+./xmlchange PTS_LAT=-33.464802
+./xmlchange DATM_YR_END=2010
+./xmlchange START_TOD=10800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AR-SLu_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AR-SLu/CLM1PT_data/CTSM_DATM_AR-SLu_2010-2010.nc " >> user_nl_datm_streams 
+echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams 
+echo "presaero.SSP3-7.0:year_last=2010" >> user_nl_datm_streams 
+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 
+  # set start date for transient case with historical compset 
+  ./xmlchange RUN_STARTDATE=2010-01-01
+  ./xmlchange DATM_YR_ALIGN=2010
+  ./xmlchange DATM_YR_START=2010
+else 
+  # for spinup case with I2000 compset 
+  ./xmlchange RUN_STARTDATE=0001-01-01
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange DATM_YR_START=2010
+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/AR-SLu/LAI_stream_AR-SLu_2010-2010.nc'" >> user_nl_clm 
+  echo "stream_year_last_lai=2010" >> user_nl_clm 
+  if  [[ $compset =~ ^HIST ]]; then 
+    # for transient case with a historical compset 
+    echo "model_year_align_lai=2010" >> user_nl_clm 
+    echo "stream_year_first_lai=2010" >> user_nl_clm 
+  else 
+    # for a spinup case with a i2000 compset 
+    echo "model_year_align_lai=1" >> user_nl_clm 
+    echo "stream_year_first_lai=2010" >> user_nl_clm 
+  fi 
+fi 
+

cime_config/usermods_dirs/PLUMBER2/AT-Neu/include_user_mods

@@ -0,0 +1 @@
+../defaults

cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands

@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=11.3175
+./xmlchange PTS_LAT=47.116669
+./xmlchange DATM_YR_END=2012
+./xmlchange START_TOD=82800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AT-Neu_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AT-Neu/CLM1PT_data/CTSM_DATM_AT-Neu_2002-2012.nc " >> user_nl_datm_streams 
+echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams 
+echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams 
+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 
+  # set start date for transient case with historical compset 
+  ./xmlchange RUN_STARTDATE=2001-12-31
+  ./xmlchange DATM_YR_ALIGN=2001
+  ./xmlchange DATM_YR_START=2001
+else 
+  # for spinup case with I2000 compset 
+  ./xmlchange RUN_STARTDATE=0001-01-01
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange DATM_YR_START=2002
+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/AT-Neu/LAI_stream_AT-Neu_2002-2012.nc'" >> user_nl_clm 
+  echo "stream_year_last_lai=2012" >> user_nl_clm 
+  if  [[ $compset =~ ^HIST ]]; then 
+    # for transient case with a historical compset 
+    echo "model_year_align_lai=2001" >> user_nl_clm 
+    echo "stream_year_first_lai=2001" >> user_nl_clm 
+  else 
+    # for a spinup case with a i2000 compset 
+    echo "model_year_align_lai=1" >> user_nl_clm 
+    echo "stream_year_first_lai=2002" >> user_nl_clm 
+  fi 
+fi 
+

cime_config/usermods_dirs/PLUMBER2/AU-ASM/include_user_mods

@@ -0,0 +1 @@
+../defaults

cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands

@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=133.24899299999998
+./xmlchange PTS_LAT=-22.283001000000002
+./xmlchange DATM_YR_END=2017
+./xmlchange START_TOD=54000
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-ASM_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-ASM/CLM1PT_data/CTSM_DATM_AU-ASM_2011-2017.nc " >> user_nl_datm_streams 
+echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams 
+echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams 
+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 
+  # set start date for transient case with historical compset 
+  ./xmlchange RUN_STARTDATE=2010-12-31
+  ./xmlchange DATM_YR_ALIGN=2010
+  ./xmlchange DATM_YR_START=2010
+else 
+  # for spinup case with I2000 compset 
+  ./xmlchange RUN_STARTDATE=0001-01-01
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange DATM_YR_START=2011
+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/AU-ASM/LAI_stream_AU-ASM_2011-2017.nc'" >> user_nl_clm 
+  echo "stream_year_last_lai=2017" >> user_nl_clm 
+  if  [[ $compset =~ ^HIST ]]; then 
+    # for transient case with a historical compset 
+    echo "model_year_align_lai=2010" >> user_nl_clm 
+    echo "stream_year_first_lai=2010" >> user_nl_clm 
+  else 
+    # for a spinup case with a i2000 compset 
+    echo "model_year_align_lai=1" >> user_nl_clm 
+    echo "stream_year_first_lai=2011" >> user_nl_clm 
+  fi 
+fi 
+

cime_config/usermods_dirs/PLUMBER2/AU-Cow/include_user_mods

@@ -0,0 +1 @@
+../defaults

cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands

@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=145.427155
+./xmlchange PTS_LAT=-16.23819
+./xmlchange DATM_YR_END=2015
+./xmlchange START_TOD=50400
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Cow_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Cow/CLM1PT_data/CTSM_DATM_AU-Cow_2010-2015.nc " >> user_nl_datm_streams 
+echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams 
+echo "presaero.SSP3-7.0:year_last=2015" >> user_nl_datm_streams 
+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 
+  # set start date for transient case with historical compset 
+  ./xmlchange RUN_STARTDATE=2009-12-31
+  ./xmlchange DATM_YR_ALIGN=2009
+  ./xmlchange DATM_YR_START=2009
+else 
+  # for spinup case with I2000 compset 
+  ./xmlchange RUN_STARTDATE=0001-01-01
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange DATM_YR_START=2010
+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/AU-Cow/LAI_stream_AU-Cow_2010-2015.nc'" >> user_nl_clm 
+  echo "stream_year_last_lai=2015" >> user_nl_clm 
+  if  [[ $compset =~ ^HIST ]]; then 
+    # for transient case with a historical compset 
+    echo "model_year_align_lai=2009" >> user_nl_clm 
+    echo "stream_year_first_lai=2009" >> user_nl_clm 
+  else 
+    # for a spinup case with a i2000 compset 
+    echo "model_year_align_lai=1" >> user_nl_clm 
+    echo "stream_year_first_lai=2010" >> user_nl_clm 
+  fi 
+fi 
+

cime_config/usermods_dirs/PLUMBER2/AU-Cpr/include_user_mods

@@ -0,0 +1 @@
+../defaults

cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands

@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=140.589127
+./xmlchange PTS_LAT=-34.00206
+./xmlchange DATM_YR_END=2017
+./xmlchange START_TOD=46800
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Cpr_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Cpr/CLM1PT_data/CTSM_DATM_AU-Cpr_2011-2017.nc " >> user_nl_datm_streams 
+echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams 
+echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams 
+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 
+  # set start date for transient case with historical compset 
+  ./xmlchange RUN_STARTDATE=2010-12-31
+  ./xmlchange DATM_YR_ALIGN=2010
+  ./xmlchange DATM_YR_START=2010
+else 
+  # for spinup case with I2000 compset 
+  ./xmlchange RUN_STARTDATE=0001-01-01
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange DATM_YR_START=2011
+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/AU-Cpr/LAI_stream_AU-Cpr_2011-2017.nc'" >> user_nl_clm 
+  echo "stream_year_last_lai=2017" >> user_nl_clm 
+  if  [[ $compset =~ ^HIST ]]; then 
+    # for transient case with a historical compset 
+    echo "model_year_align_lai=2010" >> user_nl_clm 
+    echo "stream_year_first_lai=2010" >> user_nl_clm 
+  else 
+    # for a spinup case with a i2000 compset 
+    echo "model_year_align_lai=1" >> user_nl_clm 
+    echo "stream_year_first_lai=2011" >> user_nl_clm 
+  fi 
+fi 
+

cime_config/usermods_dirs/PLUMBER2/AU-Ctr/include_user_mods

@@ -0,0 +1 @@
+../defaults

cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands

@@ -0,0 +1,56 @@
+./xmlchange PTS_LON=145.446854
+./xmlchange PTS_LAT=-16.103279
+./xmlchange DATM_YR_END=2017
+./xmlchange START_TOD=50400
+./xmlchange ATM_NCPL=48
+
+echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Ctr_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm 
+echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Ctr/CLM1PT_data/CTSM_DATM_AU-Ctr_2010-2017.nc " >> user_nl_datm_streams 
+echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams 
+echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams 
+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 
+  # set start date for transient case with historical compset 
+  ./xmlchange RUN_STARTDATE=2009-12-31
+  ./xmlchange DATM_YR_ALIGN=2009
+  ./xmlchange DATM_YR_START=2009
+else 
+  # for spinup case with I2000 compset 
+  ./xmlchange RUN_STARTDATE=0001-01-01
+  ./xmlchange DATM_YR_ALIGN=1
+  ./xmlchange DATM_YR_START=2010
+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/AU-Ctr/LAI_stream_AU-Ctr_2010-2017.nc'" >> user_nl_clm 
+  echo "stream_year_last_lai=2017" >> user_nl_clm 
+  if  [[ $compset =~ ^HIST ]]; then 
+    # for transient case with a historical compset 
+    echo "model_year_align_lai=2009" >> user_nl_clm 
+    echo "stream_year_first_lai=2009" >> user_nl_clm 
+  else 
+    # for a spinup case with a i2000 compset 
+    echo "model_year_align_lai=1" >> user_nl_clm 
+    echo "stream_year_first_lai=2010" >> user_nl_clm 
+  fi 
+fi 
+

cime_config/usermods_dirs/PLUMBER2/AU-Cum/include_user_mods

@@ -0,0 +1 @@
+../defaults