diff --git a/Externals.cfg b/Externals.cfg
index efaf785287..5d684f44ea 100644
--- 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
index f38a229b9f..9c28ed0315 100644
--- 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
index 988cf7de24..0102423d4f 100755
--- 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
index 8254d3f94a..d0547accd2 100644
--- 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).
1135.2
496.6
445.6
+432.3
284.7
284.7
@@ -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
-lnd/clm2/surfdata_map/landuse.timeseries_ne30np4_hist_16pfts_Irrig_CMIP6_simyr1850-2015_c170824.nc
+lnd/clm2/surfdata_map/release-clm5.0.30/surfdata_ne30np4_hist_78pfts_CMIP6_simyr1850_c200426.nc
lnd/clm2/surfdata_map/release-clm5.0.30/surfdata_0.9x1.25_SSP5-3.4_78pfts_CMIP6_simyr2100_c200330.nc
+
+lnd/clm2/surfdata_map/release-clm5.0.34/surfdata_0.9x1.25_SSP3-7.0_78pfts_CMIP6_simyr2100_c211227.nc
@@ -1087,23 +1090,14 @@ lnd/clm2/surfdata_map/release-clm5.0.30/surfdata_0.9x1.25_SSP5-3.4_78pfts_CMIP6_
lnd/clm2/ndepdata/fndep_clm_hist_b.e21.BWHIST.f09_g17.CMIP6-historical-WACCM.ensmean_1849-2015_monthly_0.9x1.25_c180926.nc
-lnd/clm2/ndepdata/fndep_clm_f09_g17.CMIP6-SSP5-8.5-WACCM_1849-2101_monthly_c191007.nc
-lnd/clm2/ndepdata/fndep_clm_f09_g17.CMIP6-SSP1-2.6-WACCM_1849-2101_monthly_c191007.nc
-lnd/clm2/ndepdata/fndep_clm_f09_g17.CMIP6-SSP2-4.5-WACCM_1849-2101_monthly_c191007.nc
-lnd/clm2/ndepdata/fndep_clm_f09_g17.CMIP6-SSP3-7.0-WACCM_1849-2101_monthly_c191007.nc
-
-lnd/clm2/ndepdata/fndep_clm_f09_g17.CMIP6-SSP5-8.5-WACCM_1849-2101_monthly_c191007.nc
-lnd/clm2/ndepdata/fndep_clm_f09_g17.CMIP6-SSP1-2.6-WACCM_1849-2101_monthly_c191007.nc
-lnd/clm2/ndepdata/fndep_clm_f09_g17.CMIP6-SSP5-8.5-WACCM_1849-2101_monthly_c191007.nc
-lnd/clm2/ndepdata/fndep_clm_f09_g17.CMIP6-SSP3-7.0-WACCM_1849-2101_monthly_c191007.nc
+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
cycle
NDEP_month
diff --git a/bld/namelist_files/use_cases/1850_smyle_control.xml b/bld/namelist_files/use_cases/1850_smyle_control.xml
new file mode 100644
index 0000000000..7098be8336
--- /dev/null
+++ b/bld/namelist_files/use_cases/1850_smyle_control.xml
@@ -0,0 +1,58 @@
+
+
+
+
+Conditions to simulate 1850 land-use
+
+1850
+
+constant
+
+.false.
+.false.
+
+1850
+1850
+
+1850
+1850
+
+1850
+1850
+
+1850
+1850
+
+1850
+1850
+
+1850
+1850
+
+1850
+1850
+
+1850
+1850
+
+
+lnd/clm2/ndepdata/fndep_clm_WACCM6_CMIP6piControl001_y21-50avg_1850monthly_0.95x1.25_c180802.nc
+
+lnd/clm2/ndepdata/fndep_clm_WACCM6_CMIP6piControl001_y21-50avg_1850monthly_0.95x1.25_c180802.nc
+
+cycle
+
+NDEP_month
+
+
+.true.
+.true.
+ .false.
+ .false.
+
+ 'single_at_atm_topo', 'virtual', 'virtual', 'virtual'
+
diff --git a/bld/namelist_files/use_cases/20thC_smyle_transient.xml b/bld/namelist_files/use_cases/20thC_smyle_transient.xml
new file mode 100644
index 0000000000..e28a14e57d
--- /dev/null
+++ b/bld/namelist_files/use_cases/20thC_smyle_transient.xml
@@ -0,0 +1,68 @@
+
+
+
+
+lnd/clm2/surfdata_map/ctsm5.1.dev052/landuse.timeseries_0.9x1.25_hist_78pfts_CMIP6_simyr1700-2020_c210908.nc
+lnd/clm2/surfdata_map/ctsm5.1.dev052/surfdata_0.9x1.25_hist_78pfts_CMIP6_simyr1700_c210820.nc
+
+Simulate transient land-use, and aerosol deposition changes from 1850 to 2015
+Simulate transient land-use, aerosol deposition, and Nitrogen deposition changes from 1850 to 2015
+Simulate transient land-use, aerosol deposition, and Nitrogen deposition changes from 1850 to 2015
+Simulate transient land-use, aerosol deposition, and Nitrogen deposition changes from 1850 to 2015
+
+1850
+
+1850-2100
+
+arb_ic
+
+SSP3-7.0
+
+flanduse_timeseries
+
+.true.
+.false.
+.false.
+
+1850
+2025
+1850
+
+1850
+2025
+1850
+
+1850
+2025
+1850
+
+1850
+2025
+1850
+
+1850
+2025
+1850
+
+1850
+2025
+1850
+
+1850
+2106
+1850
+
+1850
+2106
+1850
+
+
+.true.
+.true.
+ .false.
+ .false.
+
+ 'single_at_atm_topo', 'virtual', 'virtual', 'virtual'
+
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
index da8444f22f..b7123c3253 100644
--- 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 @@
SSP5-3.4
+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
+
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
index 47702026bc..d66a0ccd87 100644
--- 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 @@
SSP5-8.5
+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
+
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
new file mode 100644
index 0000000000..ee564cfb63
--- /dev/null
+++ b/bld/namelist_files/use_cases/2100_SSP3-7.0_control.xml
@@ -0,0 +1,29 @@
+
+
+
+
+Simulate land-use, and aerosol deposition for 2100 with the CMIP6 SSP3-7.0 scenario
+Simulate land-use, and aerosol and Nitrogen deposition for 2100 with the CMIP6 SSP3-7.0 scenario
+
+
+
+2100
+
+SSP3-7.0
+
+1850-2100
+
+2100
+2100
+
+2100
+2100
+
+2100
+2100
+
+
+lnd/clm2/surfdata_map/release-clm5.0.18/surfdata_0.9x1.25_hist_78pfts_CMIP6_simyr1850_c190214.nc
+
+
diff --git a/bld/unit_testers/build-namelist_test.pl b/bld/unit_testers/build-namelist_test.pl
index 6c2d91a035..21f7a7cc7b 100755
--- 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
index b58f0d80a7..a81fd85ab6 100644
--- a/cime_config/config_component.xml
+++ b/cime_config/config_component.xml
@@ -123,9 +123,13 @@
2100-2300_SSP5-8.5_transient
2100-2300_SSP5-3.4_transient
2100-2300_SSP1-2.6_transient
+ 2100_SSP3-7.0_control
20thC_transient
1850-2100_SSP5-8.5_transient
+
+ 1850_smyle_control
+ 20thC_smyle_transient
run_component_clm
env_run.xml
diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml
index 6e48601cd8..cab15fc295 100644
--- a/cime_config/config_compsets.xml
+++ b/cime_config/config_compsets.xml
@@ -311,6 +311,11 @@
SSP126EXT_DATM%GSWP3v1_CLM50%BGC-CROP_SICE_SOCN_MOSART_CISM2%NOEVOLVE_SWAV
+
+ ISSP370ExtClm50BgcCrop
+ SSP370EXT_DATM%GSWP3v1_CLM50%BGC-CROP_SICE_SOCN_MOSART_CISM2%NOEVOLVE_SWAV
+
+
diff --git a/cime_config/testdefs/ExpectedTestFails.xml b/cime_config/testdefs/ExpectedTestFails.xml
index 63854f7888..2dd7db3f0a 100644
--- a/cime_config/testdefs/ExpectedTestFails.xml
+++ b/cime_config/testdefs/ExpectedTestFails.xml
@@ -7,6 +7,8 @@
FAIL SMS.f10_f10_musgs.I2000Clm50BgcCrop.hobart_pgi.clm-crop RUN
FAIL SMS_D.f10_f10_musgs.I2000Clm50BgcCrop.hobart_pgi.clm-crop RUN
FAIL PEPEM_Ld1.f10_f10_musgs.I2000Clm50BgcCrop.hobart_intel.clm-crop RUN
+ FAIL SMS.f10_f10_musgs.I2000Clm50BgcCrop.izumi_pgi.clm-crop RUN
+ FAIL SMS_D.f10_f10_musgs.I2000Clm50BgcCrop.izumi_pgi.clm-crop RUN
FAIL SMS_Lm3_D_Mmpi-serial.1x1_brazil.I2000Clm50FatesCruGs.cheyenne_intel.clm-FatesHydro RUN
diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml
index 3364f01916..9382bdbcc8 100644
--- a/cime_config/testdefs/testlist_clm.xml
+++ b/cime_config/testdefs/testlist_clm.xml
@@ -1105,13 +1105,14 @@
-
+
+
@@ -1506,6 +1507,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1550,6 +1569,15 @@
+
+
+
+
+
+
+
+
+
diff --git a/cime_config/testdefs/testmods_dirs/clm/smyle_1850/shell_commands b/cime_config/testdefs/testmods_dirs/clm/smyle_1850/shell_commands
new file mode 100644
index 0000000000..8fe5e54bb0
--- /dev/null
+++ b/cime_config/testdefs/testmods_dirs/clm/smyle_1850/shell_commands
@@ -0,0 +1 @@
+./xmlchange CLM_NML_USE_CASE=1850_smyle_control
diff --git a/cime_config/testdefs/testmods_dirs/clm/smyle_hist/shell_commands b/cime_config/testdefs/testmods_dirs/clm/smyle_hist/shell_commands
new file mode 100644
index 0000000000..4399a30d62
--- /dev/null
+++ b/cime_config/testdefs/testmods_dirs/clm/smyle_hist/shell_commands
@@ -0,0 +1 @@
+./xmlchange CLM_NML_USE_CASE=20thC_smyle_transient
diff --git a/doc/ChangeSum b/doc/ChangeSum
index ae49702e70..e3957d339b 100644
--- a/doc/ChangeSum
+++ b/doc/ChangeSum
@@ -1,5 +1,6 @@
Tag Who Date Summary
============================================================================================================================
+release-clm5.0.35 erik 02/08/2022 Add SSP3-7.0 extension, and SMYLE 1850 and transient, compsets and use-cases
release-clm5.0.34 erik 04/20/2020 Update documentation for release-clm5.0 branch, and fix issues with no-anthro surface dataset creation
release-clm5.0.33 erik 04/07/2020 Turn irrigation on for 2300 SSP extensions
release-clm5.0.32 erik 04/02/2020 Extensions to 2300 for SSP5-8.5,SSP5-3.4, and SSP1-2.6
diff --git a/doc/release-clm5.0.ChangeLog b/doc/release-clm5.0.ChangeLog
index ac35550b72..ee1f660ac5 100644
--- a/doc/release-clm5.0.ChangeLog
+++ b/doc/release-clm5.0.ChangeLog
@@ -1,4 +1,124 @@
===============================================================
+Tag name: release-clm5.0.35
+Originator(s): erik (Erik Kluzek,UCAR/TSS,303-497-1326)
+Date: Tue Feb 8 16:09:57 MST 2022
+One-line Summary: Add SSP3-7.0 extension, and SMYLE 1850 and transient, compsets and use-cases
+
+Purpose of this version:
+------------------------
+
+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.
+
+
+CTSM Master Tag This Corresponds To:
+
+Summary of changes:
+-------------------
+
+Issues fixed (include CTSM Issue #):
+ Fixes #1197 SMYLE use-case setup
+ Fixes #1633 2100 to 2500 Extension compset for SSP3-7.0
+ Fixes #1632 Missing ndep file to 2100 for SSP5-3.4
+ Fixes #1631 ndep file for SSP2-4.5 is incorrect
+ Fixes #1578 Need to replace SSP370 ndep file with new one
+ Fixes #1131 Nitrogen Deposition file for SSP534OS
+ Fixes #1093 Problems with running fates_next_api/release-clm5.0 on izumi
+ Fixes #1036 ne30np4 1850 case fails because the fsurdat file is incorrect.
+ Fixes #738 Totvegc threshold used to zero out soil carbon upon exit_spinup needs to be revisited
+
+Science changes since: release-clm5.0.34
+ Increase totvegcthresh to 1.0 to provide more seed Carbon to PFT's that may have died in AD spinup mode
+ Update Nitorogen Deposition files for several SSP cases
+
+Software changes since: release-clm5.0.34
+ Add tests for new use-cases
+
+Changes to User Interface since:
+ New 2100_SSP3-7.0_control use-case and ISSP370ExtClm50BgcCrop compset
+ New 20thC_smyle_transient and 1850_smyle_control use-cases
+
+Testing:
+--------
+
+ [PASS means all tests PASS and OK means tests PASS other than expected fails.]
+
+ build-namelist tests:
+
+ cheyenne - PASS (30 different because of updates)
+
+ unit-tests (components/clm/src):
+
+ cheyenne - PASS
+
+ tools-tests (components/clm/test/tools):
+
+ cheyenne - OK
+
+ PTCLM testing (components/clm/tools/shared/PTCLM/test):
+
+ cheyenne - OK
+
+ regular tests (aux_clm):
+
+ cheyenne_intel ---- OK
+ cheyenne_gnu ------ OK
+ izumi_nag --------- OK
+ izumi_pgi --------- OK
+ izumi_intel ------- PASS
+
+ fates tests (fates):
+
+ cheyenne_intel ---- OK
+ cheyenne_gnu ------ PASS
+ izumi_nag --------- OK
+ izumi_pgi --------- OK
+ izumi_intel ------- PASS
+
+Summary of Answer changes:
+-------------------------
+
+If the tag used for baseline comparisons was NOT the previous tag, note that here: previous
+
+Changes answers relative to baseline: Yes, only for some SSP cases and for AD spinup
+
+ Summarize any changes to answers, i.e.,
+ - what code configurations: AD spinup mode, and SSP3-7.0, SSP2-4.5 and SSP5-3.4 because of ndep files
+ - what platforms/compilers: All
+ - nature of change:
+ SSP cases are different because of update Nitrogen Deposition files
+ Gives more seed Carbon to PFT's that may have died
+
+ Will new REFCASES need to be made for cesm and/or CAM?: No
+ (This will likely be true if the LII tests failed)
+
+Detailed list of changes:
+------------------------
+
+Externals being used: (update cism, cime, and PTCLM)
+
+ cism: cism-release-cesm2.1.2_02
+ rtm: release-cesm2.0.04
+ mosart: release-cesm2.0.04
+ cime: cim5.6.39
+ FATES: sci.1.30.0_api.8.0.0
+ PTCLM: PTCLM2_20200902
+
+CTSM Tag versions pulled over from master development branch: None
+
+Pull Requests that document the changes (include PR ids):
+(https://github.com/ESCOMP/ctsm/pull)
+ #1614 -- add smyle L83 compset and SSP3-7.0 extension (jedwards4b)
+
+===============================================================
+===============================================================
Tag name: release-clm5.0.34
Originator(s): erik (Erik Kluzek,UCAR/TSS,303-497-1326)
Date: Mon Apr 20 22:08:42 MDT 2020
diff --git a/src/main/controlMod.F90 b/src/main/controlMod.F90
index 3d1d8a7dca..94f0860885 100644
--- a/src/main/controlMod.F90
+++ b/src/main/controlMod.F90
@@ -736,7 +736,7 @@ subroutine control_spmd()
call mpi_bcast (hist_nhtfrq, size(hist_nhtfrq), MPI_INTEGER, 0, mpicom, ier)
call mpi_bcast (hist_mfilt, size(hist_mfilt), MPI_INTEGER, 0, mpicom, ier)
call mpi_bcast (hist_ndens, size(hist_ndens), MPI_INTEGER, 0, mpicom, ier)
- call mpi_bcast (hist_avgflag_pertape, size(hist_avgflag_pertape), MPI_CHARACTER, 0, mpicom, ier)
+ call mpi_bcast (hist_avgflag_pertape, len(hist_avgflag_pertape)*size(hist_avgflag_pertape), MPI_CHARACTER, 0, mpicom, ier)
call mpi_bcast (hist_type1d_pertape, max_namlen*size(hist_type1d_pertape), MPI_CHARACTER, 0, mpicom, ier)
if (use_lch4) then
call mpi_bcast (hist_wrtch4diag, 1, MPI_LOGICAL, 0, mpicom, ier)
diff --git a/src/soilbiogeochem/SoilBiogeochemPrecisionControlMod.F90 b/src/soilbiogeochem/SoilBiogeochemPrecisionControlMod.F90
index 2bd92d2d41..3740700ab1 100644
--- a/src/soilbiogeochem/SoilBiogeochemPrecisionControlMod.F90
+++ b/src/soilbiogeochem/SoilBiogeochemPrecisionControlMod.F90
@@ -43,7 +43,7 @@ subroutine SoilBiogeochemPrecisionControlInit( soilbiogeochem_carbonstate_inst,
type(soilbiogeochem_nitrogenstate_type) , intent(inout) :: soilbiogeochem_nitrogenstate_inst
!
! !LOCAL VARIABLES:
- real(r8), parameter :: totvegcthresh = 0.1_r8 ! Total vegetation carbon threshold to zero out decomposition pools
+ real(r8), parameter :: totvegcthresh = 1.0_r8 ! Total vegetation carbon threshold to zero out decomposition pools
!-----------------------------------------------------------------------
ccrit = 1.e-8_r8 ! critical carbon state value for truncation (gC/m2)
ncrit = 1.e-8_r8 ! critical nitrogen state value for truncation (gN/m2)