Merge tag 'release-clm5.0.35' into releasedoc

Update externals for cism and cime to cesm2.1.4-rc-10. cime update was needed to run on izumi. iAdds a compset for the smyle L83 model (both 1850 and transient). BWsc1850smyle (jedwards4b) Add SSP3-7.0 extension compset and use-case, that runs for fixed 2100 conditions with 2100 landuse and 2100 harvest and fertilizer. Update Nitrogen-deposition datasets with files created from WACCM simulations for SSP scenarios (SSP3-7.0, SSP5-3.4, and SSP5-8.5). Fix several issues.
ESCOMP · Jun 10, 2022 · e61613c · e61613c
2 parents 698d1f1 + 9fb8611
commit e61613c
Show file tree

Hide file tree

Showing 20 changed files with 359 additions and 27 deletions.
diff --git a/Externals.cfg b/Externals.cfg
@@ -30,7 +30,7 @@ required = True
 local_path = cime
 protocol = git
 repo_url = https://github.com/ESMCI/cime
-tag = cime5.6.33
+tag = cime5.6.39
 required = True
 
 [doc-builder]

diff --git a/Externals_CLM.cfg b/Externals_CLM.cfg
@@ -9,7 +9,7 @@ required = True
 local_path = tools/PTCLM
 protocol = git
 repo_url = https://github.com/ESCOMP/PTCLM
-tag = PTCLM2_20200121
+tag = PTCLM2_20200902
 required = True
 
 [externals_description]

diff --git a/bld/CLMBuildNamelist.pm b/bld/CLMBuildNamelist.pm
@@ -3270,12 +3270,12 @@ 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'},
+                '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'}, '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'},
+                   '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'}, 'nofail'=>1 );
        # If not found report an error
        if ( ! defined($nl->get_value('stream_fldfilename_ndep') ) ) {
@@ -4312,6 +4312,15 @@ sub check_use_case_name {
     } else {
       $log->fatal_error($diestring);
     }
+  } elsif ( $use_case =~ /^[0-9]+([a-zA-Z0-9_\.-]*)_control$/ ) {
+    my $string = $1;
+    if (      $string =~ /^_($ssp_rcp)_*($desc)$/ ) {
+       # valid name
+    } elsif ( $string =~ /^_*($desc)$/ ) {
+       # valid name
+    } else {
+      $log->fatal_error($diestring);
+    }
   } elsif ( $use_case =~ /^([0-9]+)_*($desc)_control$/   ) {
      # valid name
   } elsif ( $use_case =~ /^($desc)_pd$/   ) {

diff --git a/bld/namelist_files/namelist_defaults_clm4_5.xml b/bld/namelist_files/namelist_defaults_clm4_5.xml
@@ -30,6 +30,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
 <co2_ppmv sim_year="2100" ssp_rcp="SSP5-8.5" >1135.2</co2_ppmv>
 <co2_ppmv sim_year="2100" ssp_rcp="SSP5-3.4" >496.6</co2_ppmv>
 <co2_ppmv sim_year="2100" ssp_rcp="SSP1-2.6" >445.6</co2_ppmv>
+<co2_ppmv sim_year="2100" ssp_rcp="SSP3-7.0" >432.3</co2_ppmv>
 <co2_ppmv sim_year="1850"                    >284.7</co2_ppmv>
 <co2_ppmv sim_year="PtVg"                    >284.7</co2_ppmv>
 
@@ -817,7 +818,7 @@ lnd/clm2/surfdata_map/release-clm5.0.18/surfdata_1x1_numaIA_hist_78pfts_CMIP6_si
 lnd/clm2/surfdata_map/release-clm5.0.18/surfdata_1x1_brazil_hist_78pfts_CMIP6_simyr1850_c190214.nc</fsurdat>
 
 <fsurdat hgrid="ne30np4"      sim_year="1850" use_crop=".true." >
-lnd/clm2/surfdata_map/landuse.timeseries_ne30np4_hist_16pfts_Irrig_CMIP6_simyr1850-2015_c170824.nc</fsurdat>
+lnd/clm2/surfdata_map/release-clm5.0.30/surfdata_ne30np4_hist_78pfts_CMIP6_simyr1850_c200426.nc</fsurdat>
 
 <!-- Potential vegetation land use dataset, crop is off, and zeroed, all areas are natural vegetation without human disturbance -->
 <fsurdat hgrid="0.9x1.25"     sim_year="PtVg" use_crop=".false." irrigate=".false."
@@ -831,6 +832,8 @@ lnd/clm2/surfdata_map/release-clm5.0.30/surfdata_0.9x1.25_SSP1-2.6_78pfts_CMIP6_
 lnd/clm2/surfdata_map/release-clm5.0.30/surfdata_0.9x1.25_SSP5-8.5_78pfts_CMIP6_simyr2100_c200330.nc</fsurdat>
 <fsurdat hgrid="0.9x1.25"  sim_year="2100" use_crop=".true." ssp_rcp="SSP5-3.4" >
 lnd/clm2/surfdata_map/release-clm5.0.30/surfdata_0.9x1.25_SSP5-3.4_78pfts_CMIP6_simyr2100_c200330.nc</fsurdat>
+<fsurdat hgrid="0.9x1.25"  sim_year="2100" use_crop=".true." ssp_rcp="SSP3-7.0" >
+lnd/clm2/surfdata_map/release-clm5.0.34/surfdata_0.9x1.25_SSP3-7.0_78pfts_CMIP6_simyr2100_c211227.nc</fsurdat>
 
 <!-- Dynamic PFT surface datasets (relative to {csmdata}) -->
 
@@ -1087,23 +1090,14 @@ lnd/clm2/surfdata_map/release-clm5.0.30/surfdata_0.9x1.25_SSP5-3.4_78pfts_CMIP6_
 <stream_fldfilename_ndep phys="clm4_5" 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>
 
 <!-- Only the CMIP6 Tier I Nitogen deposition files are available -->
-<stream_fldfilename_ndep phys="clm5_0" hgrid="0.9x1.25"   use_cn=".true."   ssp_rcp="SSP5-8.5"
+<stream_fldfilename_ndep hgrid="0.9x1.25"   use_cn=".true."   ssp_rcp="SSP5-8.5" sim_year_range="1850-2100"
 >lnd/clm2/ndepdata/fndep_clm_f09_g17.CMIP6-SSP5-8.5-WACCM_1849-2101_monthly_c191007.nc</stream_fldfilename_ndep>
-<stream_fldfilename_ndep phys="clm5_0" hgrid="0.9x1.25"   use_cn=".true."   ssp_rcp="SSP1-2.6"
+<stream_fldfilename_ndep hgrid="0.9x1.25"   use_cn=".true."   ssp_rcp="SSP1-2.6" sim_year_range="1850-2100"
 >lnd/clm2/ndepdata/fndep_clm_f09_g17.CMIP6-SSP1-2.6-WACCM_1849-2101_monthly_c191007.nc</stream_fldfilename_ndep>
-<stream_fldfilename_ndep phys="clm5_0" hgrid="0.9x1.25"   use_cn=".true."   ssp_rcp="SSP2-4.5"
+<stream_fldfilename_ndep hgrid="0.9x1.25"   use_cn=".true."   ssp_rcp="SSP2-4.5" sim_year_range="1850-2100"
 >lnd/clm2/ndepdata/fndep_clm_f09_g17.CMIP6-SSP2-4.5-WACCM_1849-2101_monthly_c191007.nc</stream_fldfilename_ndep>
-<stream_fldfilename_ndep phys="clm5_0" hgrid="0.9x1.25"   use_cn=".true."   ssp_rcp="SSP3-7.0"
->lnd/clm2/ndepdata/fndep_clm_f09_g17.CMIP6-SSP3-7.0-WACCM_1849-2101_monthly_c191007.nc</stream_fldfilename_ndep>
-
-<stream_fldfilename_ndep phys="clm4_5" hgrid="0.9x1.25"   use_cn=".true."   ssp_rcp="SSP5-8.5"
->lnd/clm2/ndepdata/fndep_clm_f09_g17.CMIP6-SSP5-8.5-WACCM_1849-2101_monthly_c191007.nc</stream_fldfilename_ndep>
-<stream_fldfilename_ndep phys="clm4_5" hgrid="0.9x1.25"   use_cn=".true."   ssp_rcp="SSP1-2.6"
->lnd/clm2/ndepdata/fndep_clm_f09_g17.CMIP6-SSP1-2.6-WACCM_1849-2101_monthly_c191007.nc</stream_fldfilename_ndep>
-<stream_fldfilename_ndep phys="clm4_5" hgrid="0.9x1.25"   use_cn=".true."   ssp_rcp="SSP2-4.5"
->lnd/clm2/ndepdata/fndep_clm_f09_g17.CMIP6-SSP5-8.5-WACCM_1849-2101_monthly_c191007.nc</stream_fldfilename_ndep>
-<stream_fldfilename_ndep phys="clm4_5" hgrid="0.9x1.25"   use_cn=".true."   ssp_rcp="SSP3-7.0"
->lnd/clm2/ndepdata/fndep_clm_f09_g17.CMIP6-SSP3-7.0-WACCM_1849-2101_monthly_c191007.nc</stream_fldfilename_ndep>
+<stream_fldfilename_ndep hgrid="0.9x1.25"   use_cn=".true."   ssp_rcp="SSP3-7.0" sim_year_range="1850-2100"
+>lnd/clm2/ndepdata/fndep_clm_SSP370_b.e21.BWSSP370cmip6.f09_g17.CMIP6-SSP3-7.0-WACCM.002_1849-2101_monthly_0.9x1.25_c211216.nc</stream_fldfilename_ndep>
 
 <ndep_taxmode            phys="clm5_0" use_cn=".true.">cycle</ndep_taxmode>
 <ndep_varlist            phys="clm5_0" use_cn=".true.">NDEP_month</ndep_varlist>

diff --git a/bld/namelist_files/use_cases/1850_smyle_control.xml b/bld/namelist_files/use_cases/1850_smyle_control.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+
+<namelist_defaults>
+
+<use_case_desc>Conditions to simulate 1850 land-use</use_case_desc>
+
+<sim_year>1850</sim_year>
+
+<sim_year_range>constant</sim_year_range>
+
+<irrigate use_crop=".true." phys="clm5_0" >.false.</irrigate>
+<irrigate use_crop=".true." phys="clm4_5" >.false.</irrigate>
+
+<stream_year_first_ndep phys="clm4_0" bgc="cn"   >1850</stream_year_first_ndep>
+<stream_year_last_ndep  phys="clm4_0" bgc="cn"   >1850</stream_year_last_ndep>
+
+<stream_year_first_ndep phys="clm4_0" bgc="cndv" >1850</stream_year_first_ndep>
+<stream_year_last_ndep  phys="clm4_0" bgc="cndv" >1850</stream_year_last_ndep>
+
+<stream_year_first_ndep phys="clm4_5" use_cn=".true." >1850</stream_year_first_ndep>
+<stream_year_last_ndep  phys="clm4_5" use_cn=".true." >1850</stream_year_last_ndep>
+
+<stream_year_first_ndep phys="clm5_0" use_cn=".true." >1850</stream_year_first_ndep>
+<stream_year_last_ndep  phys="clm5_0" use_cn=".true." >1850</stream_year_last_ndep>
+
+<stream_year_first_popdens phys="clm4_5" cnfireson=".true." >1850</stream_year_first_popdens>
+<stream_year_last_popdens  phys="clm4_5" cnfireson=".true." >1850</stream_year_last_popdens>
+
+<stream_year_first_popdens phys="clm5_0" cnfireson=".true." >1850</stream_year_first_popdens>
+<stream_year_last_popdens  phys="clm5_0" cnfireson=".true." >1850</stream_year_last_popdens>
+
+<stream_year_first_urbantv phys="clm5_0"  >1850</stream_year_first_urbantv>
+<stream_year_last_urbantv  phys="clm5_0"  >1850</stream_year_last_urbantv>
+
+<stream_year_first_urbantv phys="clm4_5"  >1850</stream_year_first_urbantv>
+<stream_year_last_urbantv  phys="clm4_5"  >1850</stream_year_last_urbantv>
+
+<!-- Use single year ndep file for CLM50 as the new multi-year file has different times that change answers relative to control sims -->
+<stream_fldfilename_ndep phys="clm5_0" use_cn=".true."
+>lnd/clm2/ndepdata/fndep_clm_WACCM6_CMIP6piControl001_y21-50avg_1850monthly_0.95x1.25_c180802.nc</stream_fldfilename_ndep>
+
+<stream_fldfilename_ndep phys="clm4_5" use_cn=".true."
+>lnd/clm2/ndepdata/fndep_clm_WACCM6_CMIP6piControl001_y21-50avg_1850monthly_0.95x1.25_c180802.nc</stream_fldfilename_ndep>
+
+<ndep_taxmode            phys="clm5_0" use_cn=".true." >cycle</ndep_taxmode>
+
+<ndep_varlist            phys="clm5_0" use_cn=".true." >NDEP_month</ndep_varlist>
+
+<!-- SMYLE L83 changes -->
+<dribble_crophrv_xsmrpool_2atm use_crop=".true." >.true.</dribble_crophrv_xsmrpool_2atm>
+<use_init_interp>.true.</use_init_interp>
+<use_c13 use_cn=".true."> .false.</use_c13>
+<use_c14 use_cn=".true."> .false.</use_c14>
+<!-- This differs from the default in that it turns on virtual columns over Antarctica
+     This is desired so that we have the output needed to drive a later offline CISM Antarctica simulation
+     However, this increases the cost of CLM by about 10% -->
+<glacier_region_behavior> 'single_at_atm_topo', 'virtual', 'virtual', 'virtual'</glacier_region_behavior>
+</namelist_defaults>
diff --git a/bld/namelist_files/use_cases/20thC_smyle_transient.xml b/bld/namelist_files/use_cases/20thC_smyle_transient.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0"?>
+
+<namelist_defaults>
+
+<flanduse_timeseries hgrid="0.9x1.25" use_crop=".true.">lnd/clm2/surfdata_map/ctsm5.1.dev052/landuse.timeseries_0.9x1.25_hist_78pfts_CMIP6_simyr1700-2020_c210908.nc</flanduse_timeseries>
+<fsurdat             hgrid="0.9x1.25" use_crop=".true.">lnd/clm2/surfdata_map/ctsm5.1.dev052/surfdata_0.9x1.25_hist_78pfts_CMIP6_simyr1700_c210820.nc</fsurdat>
+
+<use_case_desc            >Simulate transient land-use, and aerosol deposition changes from 1850 to 2015</use_case_desc>
+<use_case_desc bgc="cn"   >Simulate transient land-use, aerosol deposition, and Nitrogen deposition changes from 1850 to 2015</use_case_desc>
+<use_case_desc phys="clm4_0" bgc="cndv" >Simulate transient land-use, aerosol deposition, and Nitrogen deposition changes from 1850 to 2015</use_case_desc>
+<use_case_desc use_cn=".true." >Simulate transient land-use, aerosol deposition, and Nitrogen deposition changes from 1850 to 2015</use_case_desc>
+
+<sim_year>1850</sim_year>
+
+<sim_year_range>1850-2100</sim_year_range>
+
+<clm_start_type>arb_ic</clm_start_type>
+
+<ssp_rcp>SSP3-7.0</ssp_rcp>
+
+<clm_demand >flanduse_timeseries</clm_demand>
+
+<irrigate use_crop=".true." phys="clm5_0" use_cndv=".false.">.true.</irrigate>
+<irrigate use_crop=".true." phys="clm5_0" use_cndv=".true." >.false.</irrigate>
+<irrigate use_crop=".true." phys="clm4_5"                   >.false.</irrigate>
+
+<stream_year_first_ndep phys="clm4_0" bgc="cn"   >1850</stream_year_first_ndep>
+<stream_year_last_ndep  phys="clm4_0" bgc="cn"   >2025</stream_year_last_ndep>
+<model_year_align_ndep  phys="clm4_0" bgc="cn"   >1850</model_year_align_ndep>
+
+<stream_year_first_ndep phys="clm4_0" bgc="cndv" >1850</stream_year_first_ndep>
+<stream_year_last_ndep  phys="clm4_0" bgc="cndv" >2025</stream_year_last_ndep>
+<model_year_align_ndep  phys="clm4_0" bgc="cndv" >1850</model_year_align_ndep>
+
+<stream_year_first_ndep phys="clm4_5" use_cn=".true."   >1850</stream_year_first_ndep>
+<stream_year_last_ndep  phys="clm4_5" use_cn=".true."   >2025</stream_year_last_ndep>
+<model_year_align_ndep  phys="clm4_5" use_cn=".true."   >1850</model_year_align_ndep>
+
+<stream_year_first_ndep phys="clm5_0" use_cn=".true."   >1850</stream_year_first_ndep>
+<stream_year_last_ndep  phys="clm5_0" use_cn=".true."   >2025</stream_year_last_ndep>
+<model_year_align_ndep  phys="clm5_0" use_cn=".true."   >1850</model_year_align_ndep>
+
+<stream_year_first_popdens phys="clm4_5" cnfireson=".true."   >1850</stream_year_first_popdens>
+<stream_year_last_popdens  phys="clm4_5" cnfireson=".true."   >2025</stream_year_last_popdens>
+<model_year_align_popdens  phys="clm4_5" cnfireson=".true."   >1850</model_year_align_popdens>
+
+<stream_year_first_popdens phys="clm5_0" cnfireson=".true."   >1850</stream_year_first_popdens>
+<stream_year_last_popdens  phys="clm5_0" cnfireson=".true."   >2025</stream_year_last_popdens>
+<model_year_align_popdens  phys="clm5_0" cnfireson=".true."   >1850</model_year_align_popdens>
+
+<stream_year_first_urbantv phys="clm5_0"  >1850</stream_year_first_urbantv>
+<stream_year_last_urbantv  phys="clm5_0"  >2106</stream_year_last_urbantv>
+<model_year_align_urbantv  phys="clm5_0"  >1850</model_year_align_urbantv>
+
+<stream_year_first_urbantv phys="clm4_5"  >1850</stream_year_first_urbantv>
+<stream_year_last_urbantv  phys="clm4_5"  >2106</stream_year_last_urbantv>
+<model_year_align_urbantv  phys="clm4_5"  >1850</model_year_align_urbantv>
+
+<!-- SMYLE L83 changes -->
+<dribble_crophrv_xsmrpool_2atm use_crop=".true.">.true.</dribble_crophrv_xsmrpool_2atm>
+<use_init_interp>.true.</use_init_interp>
+<use_c13 use_cn=".true."> .false.</use_c13>
+<use_c14 use_cn=".true."> .false.</use_c14>
+<!-- This differs from the default in that it turns on virtual columns over Antarctica
+     This is desired so that we have the output needed to drive a later offline CISM Antarctica simulation
+     However, this increases the cost of CLM by about 10% -->
+<glacier_region_behavior> 'single_at_atm_topo', 'virtual', 'virtual', 'virtual'</glacier_region_behavior>
+</namelist_defaults>
diff --git a/bld/namelist_files/use_cases/2100-2300_SSP5-3.4_transient.xml b/bld/namelist_files/use_cases/2100-2300_SSP5-3.4_transient.xml
@@ -14,4 +14,7 @@
 
 <ssp_rcp>SSP5-3.4</ssp_rcp>
 
+<stream_fldfilename_ndep use_cn=".true."
+>lnd/clm2/ndepdata/fndep_clm_SSP534osext_b.e21.BWSSP534osextcmip6.f09_g17.CMIP6-SSP5-3.4OSext-WACCM.001_2100-2300_monthly_0.9x1.25_c200624.nc</stream_fldfilename_ndep>
+
 </namelist_defaults>
diff --git a/bld/namelist_files/use_cases/2100-2300_SSP5-8.5_transient.xml b/bld/namelist_files/use_cases/2100-2300_SSP5-8.5_transient.xml
@@ -14,4 +14,7 @@
 
 <ssp_rcp>SSP5-8.5</ssp_rcp>
 
+<stream_fldfilename_ndep use_cn=".true."
+>lnd/clm2/ndepdata/fndep_clm_SSP585ext_b.e21.BWSSP585extcmip6.f09_g17.CMIP6-SSP5-8.5ext-WACCM.001_2100-2300_monthly_0.9x1.25_c200623.nc</stream_fldfilename_ndep>
+
 </namelist_defaults>
diff --git a/bld/namelist_files/use_cases/2100_SSP3-7.0_control.xml b/bld/namelist_files/use_cases/2100_SSP3-7.0_control.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+
+<namelist_defaults>
+
+<use_case_desc                 >Simulate land-use, and aerosol deposition for 2100 with the CMIP6 SSP3-7.0 scenario</use_case_desc>
+<use_case_desc use_cn=".true." >Simulate land-use, and aerosol and Nitrogen deposition for 2100 with the CMIP6 SSP3-7.0 scenario</use_case_desc>
+
+<!-- Have a minimal list of things set here, sim_year, sim_year_range, and ssp_rcp, other things should be dependent on these and
+     set in a namelist_defaults xml file -->
+
+<sim_year>2100</sim_year>
+
+<ssp_rcp>SSP3-7.0</ssp_rcp>
+
+<sim_year_range>1850-2100</sim_year_range>
+
+<stream_year_first_ndep use_cn=".true." >2100</stream_year_first_ndep>
+<stream_year_last_ndep  use_cn=".true." >2100</stream_year_last_ndep>
+
+<stream_year_first_popdens cnfireson=".true." >2100</stream_year_first_popdens>
+<stream_year_last_popdens  cnfireson=".true." >2100</stream_year_last_popdens>
+
+<stream_year_first_urbantv >2100</stream_year_first_urbantv>
+<stream_year_last_urbantv  >2100</stream_year_last_urbantv>
+
+<fsurdat hgrid="0.9x1.25"  use_crop=".true." >
+lnd/clm2/surfdata_map/release-clm5.0.18/surfdata_0.9x1.25_hist_78pfts_CMIP6_simyr1850_c190214.nc</fsurdat>
+
+</namelist_defaults>
diff --git a/bld/unit_testers/build-namelist_test.pl b/bld/unit_testers/build-namelist_test.pl
@@ -123,9 +123,9 @@ sub make_env_run {
 #
 # Figure out number of tests that will run
 #
-my $ntests = 916;
+my $ntests = 940;
 if ( defined($opts{'compare'}) ) {
-   $ntests += 558;
+   $ntests += 576;
 }
 plan( tests=>$ntests );
 
@@ -316,9 +316,14 @@ sub make_env_run {
                       "-bgc sp  -use_case 1850-2100_SSP2-4.5_transient -namelist '&a start_ymd=18501223/'",
                       "-bgc bgc -use_case 1850-2100_SSP3-7.0_transient -namelist '&a start_ymd=20701029/'",
                       "-bgc fates  -use_case 2000_control -no-megan",
+                      "-bgc bgc -use_case 2010_control",
+                      "-res 1x1_mexicocityMEX -use_case stdurbpt_pd",
                       "-bgc sp  -use_case 2000_control -res 0.9x1.25 -namelist '&a use_soil_moisture_streams = T/'",
                       "-bgc cn  -use_case 1850-2100_SSP5-8.5_transient -namelist '&a start_ymd=19201023/'",
                       "-bgc bgc -use_case 2000_control -namelist \"&a fire_method='nofire'/\" -crop",
+                      "-res 0.9x1.25 -bgc bgc -use_case 20thC_smyle_transient ",
+                      "-res 0.9x1.25 -bgc bgc -use_case 1850_smyle_control ",
+                      "-bgc sp -use_case 20thC_transient ",
                       "-res 0.9x1.25 -bgc bgc -use_case 1850_noanthro_control -drydep -fire_emis -light_res 360x720",
                      ) {
    my $file = $startfile;
@@ -1032,12 +1037,12 @@ sub make_env_run {
                                      GLC_TWO_WAY_COUPLING=>"FALSE",
                                      conopts=>"-phys clm5_0",
                                    },
-     "missing_ndep_file"         =>{ options=>"-envxml_dir . -bgc bgc -ssp_rcp SSP5-3.4",
+     "missing_ndep_file"         =>{ options=>"-envxml_dir . -bgc bgc -ssp_rcp SSP4-6.0",
                                      namelst=>"",
                                      GLC_TWO_WAY_COUPLING=>"FALSE",
                                      conopts=>"-phys clm5_0",
                                    },
-     "ext_SSP5-3.4"              =>{ options=>"-res 0.9x1.25 -envxml_dir . -bgc bgc -crop -use_case 2100-2300_SSP5-3.4_transient",
+     "ext_SSP1-2.6"              =>{ options=>"-res 0.9x1.25 -envxml_dir . -bgc bgc -crop -use_case 2100-2300_SSP1-2.6_transient",
                                      namelst=>"",
                                      GLC_TWO_WAY_COUPLING=>"FALSE",
                                      conopts=>"-phys clm5_0",
@@ -1296,7 +1301,8 @@ sub make_env_run {
 system( "../configure -s $mode" );
 @glc_res = ( "0.9x1.25" );
 my @use_cases = ( "2100-2300_SSP5-8.5_transient",
-                  "2100-2300_SSP1-2.6_transient",
+                  "2100-2300_SSP5-3.4_transient",
+                  "2100_SSP3-7.0_control",
                 );
 foreach my $res ( @glc_res ) {
    foreach my $usecase ( @use_cases ) {

diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml
@@ -123,9 +123,13 @@
       <value compset="^SSP585EXT_"                  >2100-2300_SSP5-8.5_transient</value>
       <value compset="^SSP534EXT_"                  >2100-2300_SSP5-3.4_transient</value>
       <value compset="^SSP126EXT_"                  >2100-2300_SSP1-2.6_transient</value>
+      <value compset="^SSP370EXT_"                  >2100_SSP3-7.0_control</value>
       <!-- Periods used for CAM -->
       <value compset="^AMIP_"	                    >20thC_transient</value>
       <value compset="^PIPD_"                       >1850-2100_SSP5-8.5_transient</value>
+      <!-- SMYLE L83 -->
+      <value compset="1850_CAM60%WCSC%SMYLE_CLM50%BGC-CROP_CICE_POP2%ECO%ABIO-DIC_MOSART_CISM2%NOEVOLVE_WW3_BGC%BDRD">1850_smyle_control</value>
+      <value compset="HIST_CAM60%WCSC%SMYLE_CLM50%BGC-CROP_CICE_POP2%ECO%ABIO-DIC_MOSART_CISM2%NOEVOLVE_WW3_BGC%BDRD">20thC_smyle_transient</value>
     </values>
     <group>run_component_clm</group>
     <file>env_run.xml</file>

diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml
@@ -311,6 +311,11 @@
     <lname>SSP126EXT_DATM%GSWP3v1_CLM50%BGC-CROP_SICE_SOCN_MOSART_CISM2%NOEVOLVE_SWAV</lname>
   </compset>
 
+  <compset>
+    <alias>ISSP370ExtClm50BgcCrop</alias>
+    <lname>SSP370EXT_DATM%GSWP3v1_CLM50%BGC-CROP_SICE_SOCN_MOSART_CISM2%NOEVOLVE_SWAV</lname>
+  </compset>
+
 
 <!-- I CLM45 Compsets -->