Merge tag 'ctsm5.4.020' into merge-b4bdev-20260219

Address C-cycle + fire biases in CESM3 runs by updating nml defaults

- New defaults for lnd_tuning_mode="clm6_0_cam7.0"
 defo_fire_precip_thresh_bet = 1.4d00
 rh_hgh = 80.0d00

- New default paramfiles
 for clm6: /glade/work/linnia/CLM6-PPE/ctsm6_cal/paramfiles/ctsm60_params.c260204.nc
 for lnd_tuning_mode="clm6_0_cam7.0": /glade/u/home/slevis/paramfiles/iss3725_forFang/ctsm60_params.c260204.cesm3-01.nc
 The latter got renamed to ctsm60-cam70_params.c260204.nc and it increases pft-specific values of "rswf_max" and "rswf_min"

- New default finidat for ne30 and 1850
 /glade/derecho/scratch/wwieder/archive/ctsm5.4.015_BGCcrop_ne30_144_pSASU/rest/0181-01-01-00000/ctsm5.4.015_BGCcrop_ne30_144_pSASU.clm2.r.0181-01-01-00000.nc

 All new files got moved to /inputdata and got rimported.

Issue ESCOMP#3725
PR ESCOMP#3756

Changes answers relative to baseline in Clm6 cases:
- Nature of change: larger than roundoff due to changes in defaults
- LMWG_dev issue number(s): NCAR/LMWG_dev#141
                            NCAR/LMWG_dev#143

Author: slevis-lmwg

.gitmodules

@@ -84,15 +84,15 @@ fxDONOTUSEurl = https://github.com/ESMCI/cime
 [submodule "cmeps"]
 path = components/cmeps
 url = https://github.com/ESCOMP/CMEPS.git
-fxtag = cmeps1.1.24
+fxtag = cmeps1.1.29
 fxrequired = ToplevelRequired
 # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
 fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git
 
 [submodule "cdeps"]
 path = components/cdeps
 url = https://github.com/ESCOMP/CDEPS.git
-fxtag = cdeps1.0.84
+fxtag = cdeps1.0.91
 fxrequired = ToplevelRequired
 # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
 fxDONOTUSEurl = https://github.com/ESCOMP/CDEPS.git

bld/CLMBuildNamelist.pm

@@ -1360,8 +1360,8 @@ sub setup_cmdl_simulation_year {
     }
     $val = "'".$defaults->get_value($var)."'";
     $nl->set_variable_value($group, $var, $val );
-    $log->verbose_message("CLM sim_year_range is $nl_flags->{'sim_year_range'}");
   }
+  $log->verbose_message("CLM sim_year_range is $nl_flags->{'sim_year_range'}");
 }
 
 #-------------------------------------------------------------------------------
@@ -1758,10 +1758,10 @@ sub process_namelist_inline_logic {
   ###############################
   setup_logic_methane($opts, $nl_flags, $definition, $defaults, $nl);
 
-  ###############################
-  # namelist group: ndepdyn_nml #
-  ###############################
-  setup_logic_nitrogen_deposition($opts,  $nl_flags, $definition, $defaults, $nl);
+  ######################################################
+  # Handle Nitrogen Deposition either from CPL or CTSM #
+  ######################################################
+  setup_logic_nitrogen_deposition($opts, $nl_flags, $definition, $defaults, $nl, $envxml_ref);
 
   ##################################
   # namelist group: cnmresp_inparm #
@@ -3916,12 +3916,33 @@ sub setup_logic_c14_streams {
 #-------------------------------------------------------------------------------
 
 sub setup_logic_nitrogen_deposition {
+  my ($opts, $nl_flags, $definition, $defaults, $nl, $envxml_ref) = @_;
+
+  # Determine if we are using ndep from the CPL or internal to CTSM
+  # and if it's needed
+  $nl_flags->{'ndep_from_cpl'} = logical_to_fortran( $envxml_ref->{'CLM_NDEP_FROM_CPL'} );
+  if ( ($nl_flags->{'bgc_mode'} =~/bgc/) ) {   # or  ($nl_flags->{'bgc_mode'} =~/fates/) ) {
+    $nl_flags->{'ndep_needed'} = ".true."
+  } else {
+    $nl_flags->{'ndep_needed'} = ".false."
+  }
+  # Handle the ndep_inparm namelist in drv_flds_in
+  if ( &value_is_true($nl_flags->{'ndep_from_cpl'}) && &value_is_true($nl_flags->{'ndep_needed'}) ) {
+     add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, "ndep_list", val=>"'noy','nhx'" );
+  }
+  # Handle the internal ndep-streams namelist
+  setup_logic_nitrogen_deposition_streams($opts,  $nl_flags, $definition, $defaults, $nl);
+}
+
+#-------------------------------------------------------------------------------
+
+sub setup_logic_nitrogen_deposition_streams {
   my ($opts, $nl_flags, $definition, $defaults, $nl) = @_;
 
   #
-  # Nitrogen deposition for bgc=CN or fates
+  # Nitrogen deposition streams when needed to be read internally for BGC
   #
-  if ( ($nl_flags->{'bgc_mode'} =~/bgc/) ) {   # or  ($nl_flags->{'bgc_mode'} =~/fates/) ) {
+  if ( (not &value_is_true($nl_flags->{'ndep_from_cpl'})) and &value_is_true($nl_flags->{'ndep_needed'}) ) {
     add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'ndepmapalgo', 'phys'=>$nl_flags->{'phys'},
                 'use_cn'=>$nl_flags->{'use_cn'}, 'hgrid'=>$nl_flags->{'res'},
                 'clm_accelerated_spinup'=>$nl_flags->{'clm_accelerated_spinup'} );
@@ -3943,15 +3964,17 @@ sub setup_logic_nitrogen_deposition {
                   'sim_year_range'=>$nl_flags->{'sim_year_range'});
     }
     add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'stream_fldfilename_ndep', 'phys'=>$nl_flags->{'phys'},
-                'use_cn'=>$nl_flags->{'use_cn'}, 'lnd_tuning_mode'=>$nl_flags->{'lnd_tuning_mode'},
-                'hgrid'=>"0.9x1.25", 'ssp_rcp'=>$nl_flags->{'ssp_rcp'}, 'nofail'=>1 );
+                'use_cn'=>$nl_flags->{'use_cn'}, 'lnd_tuning_mode'=>$nl_flags->{'lnd_tuning_mode'}, 'sim_year_range'=>$nl_flags->{'sim_year_range'},
+                'hgrid'=>"0.9x1.25", 'ssp_rcp'=>$nl_flags->{'ssp_rcp'}, 'sim_year'=>$nl_flags->{'sim_year'}, 'nofail'=>1 );
     if ( ! defined($nl->get_value('stream_fldfilename_ndep') ) ) {
         # Also check at f19 resolution
         add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'stream_fldfilename_ndep', 'phys'=>$nl_flags->{'phys'},
-                    'use_cn'=>$nl_flags->{'use_cn'}, 'lnd_tuning_mode'=>$nl_flags->{'lnd_tuning_mode'},
-                    'hgrid'=>"1.9x2.5", 'ssp_rcp'=>$nl_flags->{'ssp_rcp'}, 'nofail'=>1 );
+                    'use_cn'=>$nl_flags->{'use_cn'}, 'lnd_tuning_mode'=>$nl_flags->{'lnd_tuning_mode'}, 'sim_year_range'=>$nl_flags->{'sim_year_range'},
+                    'hgrid'=>"1.9x2.5", 'ssp_rcp'=>$nl_flags->{'ssp_rcp'}, 'sim_year'=>$nl_flags->{'sim_year'}, 'nofail'=>1 );
         # If not found report an error
         if ( ! defined($nl->get_value('stream_fldfilename_ndep') ) ) {
+            $log->verbose_message( "lnd_tuning_mode = " . $nl_flags->{'lnd_tuning_mode'}, " ssp_rcp = " . $nl_flags->{'ssp_rcp'} );
+            $log->verbose_message( "sim_year = " . $nl_flags->{'sim_year'}, " sim_year_range = " . $nl_flags->{'sim_year_range'} );
             $log->warning("Did NOT find the Nitrogen-deposition forcing file (stream_fldfilename_ndep) for this ssp_rcp\n" .
                           "One way to get around this is to point to a file for another existing ssp_rcp in your user_nl_clm file.\n" .
                           "If you are running with CAM and WACCM chemistry Nitrogen deposition will come through the coupler.\n" .
@@ -3974,15 +3997,15 @@ sub setup_logic_nitrogen_deposition {
         }
     }
   } else {
-    # If bgc is NOT CN/CNDV then make sure none of the ndep settings are set!
+    # If ndep is NOT required then make sure none of the ndep settings are set!
     if ( defined($nl->get_value('stream_year_first_ndep')) ||
          defined($nl->get_value('stream_year_last_ndep'))  ||
          defined($nl->get_value('model_year_align_ndep'))  ||
          defined($nl->get_value('ndep_taxmode'         ))  ||
          defined($nl->get_value('ndep_varlist'         ))  ||
          defined($nl->get_value('stream_fldfilename_ndep'))
        ) {
-      $log->fatal_error("When bgc is NOT CN or CNDV none of: stream_year_first_ndep," .
+      $log->fatal_error("When ndep isn't required or coming from the CPL none of: stream_year_first_ndep," .
                   "stream_year_last_ndep, model_year_align_ndep, ndep_taxmod, " .
                   "ndep_varlist, nor stream_fldfilename_ndep" .
                   " can be set!");
@@ -5452,7 +5475,7 @@ sub write_output_files {
   $log->verbose_message("Writing clm namelist to $outfile");
 
   # Drydep, fire-emission or MEGAN namelist for driver
-  @groups = qw(drydep_inparm megan_emis_nl fire_emis_nl carma_inparm dust_emis_inparm);
+  @groups = qw(drydep_inparm megan_emis_nl fire_emis_nl carma_inparm dust_emis_inparm ndep_inparm);
   $outfile = "$opts->{'dir'}/drv_flds_in";
   $nl->write($outfile, 'groups'=>\@groups, 'note'=>"$note" );
   $log->verbose_message("Writing @groups namelists to $outfile");

bld/namelist_files/namelist_defaults_ctsm.xml

@@ -122,7 +122,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
        They can only be on for BGC compsets (NOT SP or FATES).
        
        Also, we configured the defaults the following ways:
-       - On only for CRUJRA2024 or CAM7 forcing because that is how the CESM3.0 clm6_0 simulations were run
+       - On only for CRUJRA2024, CRUJRA2024b, or CAM7 forcing because that is how the CESM3.0 clm6_0 simulations were run
        - In contrast to above, it's turned off for other forcing options as we haven't run simulations with those configurations
       - It's also only turned on for Historical periods and NOT future scenarios because we don't have CMIP7 data for them -->
 <use_c13 phys="clm6_0" bgc_mode="bgc" lnd_tuning_mode="clm6_0_CRUJRA2024" ssp_rcp="hist">.true.</use_c13>
@@ -335,7 +335,6 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
 <nonborpeat_fire_precip_denom>1.0d00</nonborpeat_fire_precip_denom>
 
 <defo_fire_precip_thresh_bet>4.0d00</defo_fire_precip_thresh_bet>
-<defo_fire_precip_thresh_bet fire_method="li2024crujra">3.0d00</defo_fire_precip_thresh_bet>
 
 <rh_low                   fire_method="li2014qianfrc" >30.0d00</rh_low>
 <rh_hgh                   fire_method="li2014qianfrc" >80.0d00</rh_hgh>
@@ -452,6 +451,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
 
 <rh_low                   fire_method="li2024crujra" >30.0d00</rh_low>
 <rh_hgh                   fire_method="li2024crujra" >85.0d00</rh_hgh>
+<rh_hgh                   fire_method="li2024crujra" lnd_tuning_mode="clm6_0_cam7.0">80.0d00</rh_hgh>
 <bt_min                   fire_method="li2024crujra" >0.85d00</bt_min>
 <bt_max                   fire_method="li2024crujra" >0.98d00</bt_max>
 <cli_scale                fire_method="li2024crujra" >0.03d00</cli_scale>
@@ -465,7 +465,8 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
 <cmb_cmplt_fact_litter    fire_method="li2024crujra" >0.5d00</cmb_cmplt_fact_litter>
 <cmb_cmplt_fact_cwd       fire_method="li2024crujra" >0.28d00</cmb_cmplt_fact_cwd>
 <max_rh30_affecting_fuel  fire_method="li2024crujra" >95.</max_rh30_affecting_fuel>
-<defo_fire_precip_thresh_bet fire_method="li2024crujra" >1.8d00</defo_fire_precip_thresh_bet>
+<defo_fire_precip_thresh_bet fire_method="li2024crujra" >3.0d00</defo_fire_precip_thresh_bet>
+<defo_fire_precip_thresh_bet fire_method="li2024crujra" lnd_tuning_mode="clm6_0_cam7.0">1.4d00</defo_fire_precip_thresh_bet>
 <defo_fire_precip_thresh_bdt fire_method="li2024crujra" >0.6d00</defo_fire_precip_thresh_bdt>
 <borpeat_fire_soilmoist_denom fire_method="li2024crujra" > 0.3d00</borpeat_fire_soilmoist_denom>
 <nonborpeat_fire_precip_denom fire_method="li2024crujra" >6.5d00</nonborpeat_fire_precip_denom>
@@ -622,7 +623,8 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
 <!-- The default filenames are given relative to the root directory
      for the CLM2 data in the CESM distribution -->
 <!-- Plant function types (relative to {csmdata}) -->
-<paramfile phys="clm6_0" >lnd/clm2/paramdata/ctsm60_params.c260108.nc</paramfile>
+<paramfile phys="clm6_0" >lnd/clm2/paramdata/ctsm60_params.c260204.nc</paramfile>
+<paramfile phys="clm6_0" lnd_tuning_mode="clm6_0_cam7.0">ctsm60-cam70_params.c260204.nc</paramfile>
 <paramfile phys="clm5_0" >lnd/clm2/paramdata/clm50_params.c250311.nc</paramfile>
 <paramfile phys="clm4_5" >lnd/clm2/paramdata/clm45_params.c250311.nc</paramfile>
 
@@ -1456,7 +1458,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
          sim_year="1850" do_transient_pfts=".false." use_excess_ice=".true."
          use_crop=".true."
          phys="clm6_0"
->lnd/clm2/initdata_esmf/ctsm5.4/ctsm5.4.CMIP7_ciso_ctsm5.4.004_bgc_ne30_130_pSASU_greenland.clm2.r.0121-01-01-00000.nc
+>lnd/clm2/initdata_esmf/ctsm5.4/ctsm5.4.015_BGCcrop_ne30_144_pSASU.clm2.r.0181-01-01-00000.nc
 </finidat>
 <!-- Corresponding f19 -->
 <finidat hgrid="1.9x2.5" mask="tx2_3v2" use_cn=".true." use_cndv=".false." use_fates=".false."
@@ -2182,17 +2184,23 @@ lnd/clm2/surfdata_esmf/NEON/ctsm5.4.0/surfdata_1x1_NEON_TOOL_hist_2000_78pfts_c2
 <do_sno_oc           >.false.</do_sno_oc>
 
 <!-- Nitrogen deposition streams namelist defaults -->
-<stream_year_first_ndep                use_cn=".true." sim_year_range="1850-2100"  >2015</stream_year_first_ndep>
-<stream_year_last_ndep                 use_cn=".true." sim_year_range="1850-2100"  >2101</stream_year_last_ndep>
-<model_year_align_ndep                 use_cn=".true." sim_year_range="1850-2100"  >2015</model_year_align_ndep>
+<stream_year_first_ndep use_cn=".true." sim_year_range="1850-2100"  >2015</stream_year_first_ndep>
+<stream_year_last_ndep  use_cn=".true." sim_year_range="1850-2100"  >2101</stream_year_last_ndep>
+<model_year_align_ndep  use_cn=".true." sim_year_range="1850-2100"  >2015</model_year_align_ndep>
+
+<stream_year_first_ndep use_cn=".true."   sim_year="1850" sim_year_range="1850-2000" >1850</stream_year_first_ndep>
+<stream_year_last_ndep  use_cn=".true."   sim_year="1850" sim_year_range="1850-2000" >2015</stream_year_last_ndep>
+<model_year_align_ndep  use_cn=".true."   sim_year="1850" sim_year_range="1850-2000" >1850</model_year_align_ndep>
 
 <stream_year_first_ndep use_cn=".true."   sim_year="2018" >2018</stream_year_first_ndep>
 <stream_year_last_ndep  use_cn=".true."   sim_year="2018" >2018</stream_year_last_ndep>
+<stream_year_last_ndep  use_cn=".true."   sim_year="2018" sim_year_range="1850-2100" >2022</stream_year_last_ndep>
 
 <stream_year_first_ndep use_cn=".true."   sim_year="2010" >2010</stream_year_first_ndep>
 <stream_year_last_ndep  use_cn=".true."   sim_year="2010" >2010</stream_year_last_ndep>
 
 <stream_year_first_ndep use_cn=".true."   sim_year="2000" >2000</stream_year_first_ndep>
+
 <stream_year_last_ndep  use_cn=".true."   sim_year="2000" >2000</stream_year_last_ndep>
 
 <stream_year_first_ndep use_cn=".true."   sim_year="1850" >1850</stream_year_first_ndep>
@@ -2201,13 +2209,18 @@ lnd/clm2/surfdata_esmf/NEON/ctsm5.4.0/surfdata_1x1_NEON_TOOL_hist_2000_78pfts_c2
 <stream_year_first_ndep use_cn=".true."   sim_year="1000" >2000</stream_year_first_ndep>
 <stream_year_last_ndep  use_cn=".true."   sim_year="1000" >2000</stream_year_last_ndep>
 
+<stream_year_first_ndep use_cn=".true."   sim_year="PtVg" >1850</stream_year_first_ndep>
+<stream_year_last_ndep  use_cn=".true."   sim_year="PtVg" >1850</stream_year_last_ndep>
+
 <stream_year_first_ndep use_cn=".true."   sim_year="constant" sim_year_range="1000-1002" >2000</stream_year_first_ndep>
 <stream_year_last_ndep  use_cn=".true."   sim_year="constant" sim_year_range="1000-1002" >2000</stream_year_last_ndep>
 
 <stream_year_first_ndep use_cn=".true."   sim_year="constant" sim_year_range="1000-1004" >2000</stream_year_first_ndep>
 <stream_year_last_ndep  use_cn=".true."   sim_year="constant" sim_year_range="1000-1004" >2000</stream_year_last_ndep>
 
-<stream_fldfilename_ndep                hgrid="0.9x1.25" use_cn=".true." ssp_rcp="hist" >lnd/clm2/ndepdata/fndep_clm_hist_b.e21.BWHIST.f09_g17.CMIP6-historical-WACCM.ensmean_1849-2015_monthly_0.9x1.25_c180926.nc</stream_fldfilename_ndep>
+<stream_fldfilename_ndep hgrid="0.9x1.25" use_cn=".true." ssp_rcp="hist" sim_year_range="1850-2000" >lnd/clm2/ndepdata/fndep_clm_hist_b.e21.BWHIST.f09_g17.CMIP6-historical-WACCM.ensmean_1849-2015_monthly_0.9x1.25_c180926.nc</stream_fldfilename_ndep>
+<stream_fldfilename_ndep hgrid="0.9x1.25" use_cn=".true." ssp_rcp="hist" sim_year="1850" sim_year_range="constant">lnd/clm2/ndepdata/fndep_clm_WACCM6_CMIP6piControl001_y21-50avg_1850monthly_0.95x1.25_c180802.nc</stream_fldfilename_ndep>
+<stream_fldfilename_ndep hgrid="0.9x1.25" use_cn=".true." ssp_rcp="hist" sim_year_range="constant" >lnd/clm2/ndepdata/fndep_clm_hist_b.e21.BWHIST.f09_g17.CMIP6-historical-WACCM.ensmean_1849-2015_monthly_0.9x1.25_c180926.nc</stream_fldfilename_ndep>
 
 <stream_meshfile_ndep hgrid="1.9x2.5">share/meshes/fv1.9x2.5_141008_ESMFmesh_c20191001.nc</stream_meshfile_ndep>
 <stream_meshfile_ndep hgrid="0.9x1.25">share/meshes/fv0.9x1.25_141008_polemod_ESMFmesh.nc</stream_meshfile_ndep>

bld/namelist_files/namelist_definition_drv_flds.xml

@@ -85,6 +85,17 @@
     Henry's law coefficients.
   </entry>
 
+  <!-- ========================================================================================  -->
+  <!-- Nitrogen deposition -->
+  <!-- ========================================================================================  -->
+
+  <entry id="ndep_list"
+    type="char*16(2)"
+    category="nitrogen_deposition"
+    group="ndep_inparm" valid_values="noy,nhx">
+      List of nitrogen deposition fluxes to be sent from ATM to surface models.
+  </entry>
+
   <!-- ========================================================================================  -->
   <!-- Fire emissions fluxes                                                                     -->
   <!-- ========================================================================================  -->

bld/namelist_files/use_cases/1850_control.xml

@@ -10,16 +10,10 @@
 
 <irrigate use_crop=".true." >.false.</irrigate>
 
-<stream_year_first_ndep use_cn=".true." >1850</stream_year_first_ndep>
-<stream_year_last_ndep  use_cn=".true." >1850</stream_year_last_ndep>
-
 <stream_year_first_popdens cnfireson=".true." >1850</stream_year_first_popdens>
 <stream_year_last_popdens  cnfireson=".true." >1850</stream_year_last_popdens>
 
 <stream_year_first_urbantv >1850</stream_year_first_urbantv>
 <stream_year_last_urbantv  >1850</stream_year_last_urbantv>
 
-<stream_fldfilename_ndep use_cn=".true."
->lnd/clm2/ndepdata/fndep_clm_WACCM6_CMIP6piControl001_y21-50avg_1850monthly_0.95x1.25_c180802.nc</stream_fldfilename_ndep>
-
 </namelist_defaults>

bld/namelist_files/use_cases/1850_noanthro_control.xml

@@ -10,9 +10,6 @@
 
 <irrigate>.false.</irrigate>
 
-<stream_year_first_ndep use_cn=".true." >1850</stream_year_first_ndep>
-<stream_year_last_ndep  use_cn=".true." >1850</stream_year_last_ndep>
-
 <stream_year_first_popdens cnfireson=".true." >1925</stream_year_first_popdens>
 <stream_year_last_popdens  cnfireson=".true." >1925</stream_year_last_popdens>
 

bld/namelist_files/use_cases/2000_control.xml

@@ -12,9 +12,6 @@
 <irrigate use_crop=".true." use_cndv=".true." >.false.</irrigate>
 <irrigate use_crop=".true." phys="clm4_5"     >.false.</irrigate>
 
-<stream_year_first_ndep use_cn=".true." >2000</stream_year_first_ndep>
-<stream_year_last_ndep  use_cn=".true." >2000</stream_year_last_ndep>
-
 <stream_year_first_popdens cnfireson=".true." >2000</stream_year_first_popdens>
 <stream_year_last_popdens  cnfireson=".true." >2000</stream_year_last_popdens>
 

bld/namelist_files/use_cases/2010_control.xml

@@ -12,9 +12,6 @@
 <irrigate use_crop=".true." use_cndv=".true."                >.false.</irrigate>
 <irrigate use_crop=".true." use_cndv=".false." phys="clm4_5" >.false.</irrigate>
 
-<stream_year_first_ndep bgc="cn" use_cn=".true." >2010</stream_year_first_ndep>
-<stream_year_last_ndep  bgc="cn" use_cn=".true." >2010</stream_year_last_ndep>
-
 <stream_year_first_popdens cnfireson=".true." >2010</stream_year_first_popdens>
 <stream_year_last_popdens  cnfireson=".true." >2010</stream_year_last_popdens>
 

bld/namelist_files/use_cases/2018-PD_transient.xml

@@ -18,10 +18,6 @@
 <!-- Use future data as needed from the SSP3-7.0 scenario-->
 <ssp_rcp>SSP3-7.0</ssp_rcp>
 
-<stream_year_first_ndep use_cn=".true."   >2018</stream_year_first_ndep>
-<stream_year_last_ndep  use_cn=".true."   >2022</stream_year_last_ndep>
-<model_year_align_ndep  use_cn=".true."   >2018</model_year_align_ndep>
-
 <stream_year_first_popdens cnfireson=".true."   >2018</stream_year_first_popdens>
 <stream_year_last_popdens  cnfireson=".true."   >2022</stream_year_last_popdens>
 <model_year_align_popdens  cnfireson=".true."   >2018</model_year_align_popdens>

bld/namelist_files/use_cases/20thC_transient.xml

@@ -22,10 +22,6 @@
 <irrigate use_crop=".true."               use_cndv=".true." >.false.</irrigate>
 <irrigate use_crop=".true." phys="clm4_5" use_cndv=".false.">.false.</irrigate>
 
-<stream_year_first_ndep use_cn=".true."   >1850</stream_year_first_ndep>
-<stream_year_last_ndep  use_cn=".true."   >2015</stream_year_last_ndep>
-<model_year_align_ndep  use_cn=".true."   >1850</model_year_align_ndep>
-
 <stream_year_first_popdens cnfireson=".true."   >1850</stream_year_first_popdens>
 <stream_year_last_popdens  cnfireson=".true."   >2016</stream_year_last_popdens>
 <model_year_align_popdens  cnfireson=".true."   >1850</model_year_align_popdens>