diff --git a/Externals.cfg b/Externals.cfg
index a3db5bd76d..f092d867db 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.32
+tag = cime5.6.33
required = True
[externals_description]
diff --git a/bld/CLMBuildNamelist.pm b/bld/CLMBuildNamelist.pm
index 5d0bf5f000..988cf7de24 100755
--- a/bld/CLMBuildNamelist.pm
+++ b/bld/CLMBuildNamelist.pm
@@ -2338,7 +2338,7 @@ sub setup_logic_surface_dataset {
}
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'fsurdat',
- 'hgrid'=>$nl_flags->{'res'},
+ 'hgrid'=>$nl_flags->{'res'}, 'ssp_rcp'=>$nl_flags->{'ssp_rcp'},
'sim_year'=>$nl_flags->{'sim_year'}, 'irrig'=>$nl_flags->{'irrig'},
'crop'=>$nl_flags->{'crop'}, 'glc_nec'=>$nl_flags->{'glc_nec'});
} else{
@@ -2349,7 +2349,7 @@ sub setup_logic_surface_dataset {
$log->fatal_error( "dynamic PFT's (setting flanduse_timeseries) are incompatible with ecosystem dynamics (use_fates=.true)." );
}
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'fsurdat',
- 'hgrid'=>$nl_flags->{'res'},
+ 'hgrid'=>$nl_flags->{'res'}, 'ssp_rcp'=>$nl_flags->{'ssp_rcp'},
'sim_year'=>$nl_flags->{'sim_year'}, 'irrigate'=>$nl_flags->{'irrigate'},
'use_crop'=>$nl_flags->{'use_crop'}, 'glc_nec'=>$nl_flags->{'glc_nec'});
}
diff --git a/bld/namelist_files/namelist_defaults_clm4_5.xml b/bld/namelist_files/namelist_defaults_clm4_5.xml
index cc99601bb5..93cdc6420f 100644
--- a/bld/namelist_files/namelist_defaults_clm4_5.xml
+++ b/bld/namelist_files/namelist_defaults_clm4_5.xml
@@ -27,7 +27,9 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
379.0
388.8
397.5
-1141.9
+1135.2
+496.6
+445.6
284.7
284.7
@@ -820,8 +822,12 @@ lnd/clm2/surfdata_map/landuse.timeseries_ne30np4_hist_16pfts_Irrig_CMIP6_simyr18
+
+lnd/clm2/surfdata_map/release-clm5.0.30/surfdata_0.9x1.25_SSP1-2.6_78pfts_CMIP6_simyr2100_c200329.nc
-lnd/clm2/surfdata_map/release-clm5.0.18/surfdata_0.9x1.25_hist_78pfts_CMIP6_simyr2000_c190214.nc
+lnd/clm2/surfdata_map/release-clm5.0.30/surfdata_0.9x1.25_SSP5-8.5_78pfts_CMIP6_simyr2100_c200330.nc
+
+lnd/clm2/surfdata_map/release-clm5.0.30/surfdata_0.9x1.25_SSP5-3.4_78pfts_CMIP6_simyr2100_c200330.nc
@@ -935,9 +941,12 @@ lnd/clm2/surfdata_map/release-clm5.0.18/surfdata_0.9x1.25_hist_78pfts_CMIP6_simy
-
-lnd/clm2/surfdata_map/release-clm5.0.18/landuse.timeseries_0.9x1.25_SSP5-8.5_78pfts_CMIP6_simyr1850-2100_c190214.nc
+lnd/clm2/surfdata_map/release-clm5.0.30/landuse.timeseries_0.9x1.25_SSP5-8.5_78pfts_CMIP6_simyr2100-2300_c200330.nc
+lnd/clm2/surfdata_map/release-clm5.0.30/landuse.timeseries_0.9x1.25_SSP5-3.4_78pfts_CMIP6_simyr2100-2300_c200330.nc
+lnd/clm2/surfdata_map/release-clm5.0.30/landuse.timeseries_0.9x1.25_SSP1-2.6_78pfts_CMIP6_simyr2100-2300_c200329.nc
diff --git a/bld/namelist_files/namelist_defaults_overall.xml b/bld/namelist_files/namelist_defaults_overall.xml
index 44da084342..3019677185 100644
--- a/bld/namelist_files/namelist_defaults_overall.xml
+++ b/bld/namelist_files/namelist_defaults_overall.xml
@@ -27,11 +27,13 @@ determine default values for namelists.
cold
arb_ic
+arb_ic
flanduse_timeseries
flanduse_timeseries
+flanduse_timeseries
diff --git a/bld/namelist_files/use_cases/2100-2300_SSP1-2.6_transient.xml b/bld/namelist_files/use_cases/2100-2300_SSP1-2.6_transient.xml
new file mode 100644
index 0000000000..b8deed90a7
--- /dev/null
+++ b/bld/namelist_files/use_cases/2100-2300_SSP1-2.6_transient.xml
@@ -0,0 +1,17 @@
+
+
+
+
+Simulate transient land-use, and aerosol deposition changes from 2100 to 2300 with the CMIP6 SSP1-2.6 scenario
+Simulate transient land-use, aerosol deposition, and Nitrogen deposition changes from 2100 to 2300 with the CMIP6 SSP1-2.6 scenario
+
+
+
+2100
+
+2100-2300
+
+SSP1-2.6
+
+
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
new file mode 100644
index 0000000000..da8444f22f
--- /dev/null
+++ b/bld/namelist_files/use_cases/2100-2300_SSP5-3.4_transient.xml
@@ -0,0 +1,17 @@
+
+
+
+
+Simulate transient land-use, and aerosol deposition changes from 2100 to 2300 with the CMIP6 SSP5-3.4 scenario
+Simulate transient land-use, aerosol deposition, and Nitrogen deposition changes from 2100 to 2300 with the CMIP6 SSP5-3.4 scenario
+
+
+
+2100
+
+2100-2300
+
+SSP5-3.4
+
+
diff --git a/bld/unit_testers/build-namelist_test.pl b/bld/unit_testers/build-namelist_test.pl
index 962f8a2931..6c2d91a035 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 = 841;
+my $ntests = 916;
if ( defined($opts{'compare'}) ) {
- $ntests += 504;
+ $ntests += 558;
}
plan( tests=>$ntests );
@@ -1037,6 +1037,11 @@ sub make_env_run {
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",
+ namelst=>"",
+ GLC_TWO_WAY_COUPLING=>"FALSE",
+ conopts=>"-phys clm5_0",
+ },
"bad_megan_spec" =>{ options=>"-envxml_dir . -bgc bgc -megan",
namelst=>"megan_specifier='ZZTOP=zztop'",
GLC_TWO_WAY_COUPLING=>"FALSE",
@@ -1258,7 +1263,7 @@ sub make_env_run {
# of the different use cases.
$mode = "-phys clm4_5";
system( "../configure -s $mode" );
-my @glc_res = ( "48x96", "0.9x1.25", "1.9x2.5" );
+my @glc_res = ( "0.9x1.25", "1.9x2.5" );
my @use_cases = ( "1850-2100_SSP1-2.6_transient",
"1850-2100_SSP2-4.5_transient",
"1850-2100_SSP3-7.0_transient",
@@ -1269,7 +1274,7 @@ sub make_env_run {
"20thC_transient",
);
foreach my $res ( @glc_res ) {
- foreach my $usecase ( @usecases ) {
+ foreach my $usecase ( @use_cases ) {
$options = "-bgc bgc -res $res -use_case $usecase -envxml_dir . ";
&make_env_run();
eval{ system( "$bldnml $options > $tempfile 2>&1 " ); };
@@ -1291,9 +1296,10 @@ 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",
);
foreach my $res ( @glc_res ) {
- foreach my $usecase ( @usecases ) {
+ foreach my $usecase ( @use_cases ) {
$options = "-bgc bgc -res $res -bgc bgc -crop -use_case $usecase -envxml_dir . ";
&make_env_run();
eval{ system( "$bldnml $options > $tempfile 2>&1 " ); };
diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml
index 4a5ababeeb..b58f0d80a7 100644
--- a/cime_config/config_component.xml
+++ b/cime_config/config_component.xml
@@ -109,6 +109,7 @@
1850_control
1850_noanthro_control
20thC_transient
+
1850-2100_SSP5-8.5_transient
1850-2100_SSP1-2.6_transient
1850-2100_SSP3-7.0_transient
@@ -118,6 +119,11 @@
1850-2100_SSP4-3.4_transient
1850-2100_SSP4-6.0_transient
1850-2100_SSP5-8.5_transient
+
+ 2100-2300_SSP5-8.5_transient
+ 2100-2300_SSP5-3.4_transient
+ 2100-2300_SSP1-2.6_transient
+
20thC_transient
1850-2100_SSP5-8.5_transient
diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml
index cff59f02fa..6e48601cd8 100644
--- a/cime_config/config_compsets.xml
+++ b/cime_config/config_compsets.xml
@@ -295,6 +295,22 @@
SSP534_DATM%GSWP3v1_CLM50%BGC-CROP_SICE_SOCN_MOSART_CISM2%NOEVOLVE_SWAV
+
+
+ ISSP585ExtClm50BgcCrop
+ SSP585EXT_DATM%GSWP3v1_CLM50%BGC-CROP_SICE_SOCN_MOSART_CISM2%NOEVOLVE_SWAV
+
+
+
+ ISSP534ExtClm50BgcCrop
+ SSP534EXT_DATM%GSWP3v1_CLM50%BGC-CROP_SICE_SOCN_MOSART_CISM2%NOEVOLVE_SWAV
+
+
+
+ ISSP126ExtClm50BgcCrop
+ SSP126EXT_DATM%GSWP3v1_CLM50%BGC-CROP_SICE_SOCN_MOSART_CISM2%NOEVOLVE_SWAV
+
+
@@ -485,9 +501,10 @@
-
+
1850-01-01
2015-01-01
+ 2101-01-01
1980-01-15
1997-12-31
1993-12-01
diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml
index 97ced69e17..3364f01916 100644
--- a/cime_config/testdefs/testlist_clm.xml
+++ b/cime_config/testdefs/testlist_clm.xml
@@ -1541,6 +1541,15 @@
+
+
+
+
+
+
+
+
+
diff --git a/cime_config/usermods_dirs/cmip6_waccm_deck/shell_commands b/cime_config/usermods_dirs/cmip6_waccm_deck/shell_commands
new file mode 100755
index 0000000000..5b872fb7bc
--- /dev/null
+++ b/cime_config/usermods_dirs/cmip6_waccm_deck/shell_commands
@@ -0,0 +1,3 @@
+#!/bin/bash
+# Turn ignore-warnings on, so won't abort on missing ndep file, as WACCM should provide it
+./xmlchange --append CLM_BLDNML_OPTS="--ignore_warnings"
diff --git a/doc/.release-ChangeLog_template b/doc/.release-ChangeLog_template
index 19c997d86d..aca4c9440c 100644
--- a/doc/.release-ChangeLog_template
+++ b/doc/.release-ChangeLog_template
@@ -36,37 +36,37 @@ Testing:
unit-tests (components/clm/src):
cheyenne -
- hobart ---
+ izumi ----
tools-tests (components/clm/test/tools):
cheyenne -
- hobart ---
+ izumi ----
PTCLM testing (components/clm/tools/shared/PTCLM/test):
cheyenne -
- hobart ---
+ izumi ----
regular tests (aux_clm):
cheyenne_intel ----
cheyenne_gnu ------
- hobart_nag --------
- hobart_pgi --------
- hobart_intel ------
+ izumi_nag ---------
+ izumi_pgi ---------
+ izumi_intel -------
regular tests (prealpha):
cheyenne_intel -
cheyenne_gnu ---
- hobart_nag -----
+ izumi_nag ------
regular tests (prebeta):
cheyenne_intel -
cheyenne_gnu ---
- hobart_nag -----
+ izumi_nag ------
Summary of Answer changes:
-------------------------
diff --git a/doc/ChangeSum b/doc/ChangeSum
index 66533bcdf3..4d0e951cd7 100644
--- a/doc/ChangeSum
+++ b/doc/ChangeSum
@@ -1,5 +1,6 @@
Tag Who Date Summary
============================================================================================================================
+release-clm5.0.32 erik 04/02/2020 Extensions to 2300 for SSP5-8.5,SSP5-3.4, and SSP1-2.6
release-clm5.0.31 erik 03/29/2020 Bring in raw datasets for 2100-2300 extension for SSP5-8.5/3.5 and SSP1-2.6, some other misc. changes
release-clm5.0.30 erik 01/21/2020 Update FATES to sci.1.30.0_api.8.0.0
release-clm5.0.29 erik 11/19/2019 Some answer changes needed for prescribed soil-moisture and clm4_5 defaults (1850-ndep, and urbantv settings)
diff --git a/doc/release-clm5.0.ChangeLog b/doc/release-clm5.0.ChangeLog
index 52065c7dc9..279699fa1a 100644
--- a/doc/release-clm5.0.ChangeLog
+++ b/doc/release-clm5.0.ChangeLog
@@ -1,4 +1,92 @@
===============================================================
+Tag name: release-clm5.0.32
+Originator(s): erik (Erik Kluzek)
+Date: Thu Apr 2 00:23:04 MDT 2020
+One-line Summary: Extensions to 2300 for SSP5-8.5,SSP5-3.4, and SSP1-2.6
+
+Purpose of this version:
+------------------------
+
+Add 2100 surface datasets, landuse.timeseries files for 2100-2300 for SSP5-3.4, SSP5-8.5, and SSP1-2.6.
+Also add compsets to run them and the build-namelist use-cases for them. Only for f09 resolution with crop on.
+
+Updates cime as a cime update was needed to run the extensions in I compsets (for presaero and CO2).
+Add a test for it. Add -ignore_warnings to cmip6_waccm_deck user-mod which is required for the
+fully coupled compset for BWSSP534osext as the ndep file doesn't exist for it, but WACCM is
+providing ndep. Get more of the build-namelist unit tester tests working, which previously weren't running.
+
+CTSM Master Tag This Corresponds To: ctsm1.0.dev025 (with many other changes)
+
+Summary of changes:
+-------------------
+
+Issues fixed (include CTSM Issue #): #944, #955
+ Fixes #944 -- extensions to 2300
+ Fixes #955 -- surface dataset creation bug for 2100
+
+Science changes since: release-clm5.0.31
+ Add 2100 surface datasets and transient extensions from 2100-2300
+
+Software changes since: release-clm5.0.31
+ Fix bug with creation of 2100 surface datasets
+
+Changes to User Interface since: release-clm5.0.31
+
+ New compsets: ISSP585ExtClm50BgcCrop, ISSP534xtClm50BgcCrop, ISSP126ExtClm50BgcCrop
+ New CLM_NML_USE_CASE: 2100-2300_SSP5-8.5_transient, 2100-2300_SSP5-3.4_transient, 2100-2300_SSP1-2.6_transient
+
+Testing:
+--------
+
+ [PASS means all tests PASS and OK means tests PASS other than expected fails.]
+
+ build-namelist tests:
+
+ cheyenne - PASS
+
+ unit-tests (components/clm/src):
+
+ cheyenne - PASS
+
+ tools-tests (components/clm/test/tools): None
+
+ PTCLM testing (components/clm/tools/shared/PTCLM/test): None
+
+ regular tests (aux_clm):
+
+ cheyenne_intel ---- OK
+ cheyenne_gnu ------ OK
+ izumi_nag --------- PASS
+ izumi_pgi --------- PASS
+ 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: No (bit-for-bit)
+
+Detailed list of changes:
+------------------------
+
+Externals being used: cime updated
+
+ cism: cism-release-cesm2.1.2_04
+ rtm: release-cesm2.0.04
+ mosart: release-cesm2.0.04
+ cime: cim5.6.33
+ FATES: sci.1.30.0_api.8.0.0
+ PTCLM: PTCLM2_20200121
+
+CTSM Tag versions pulled over from master development branch: None
+
+Pull Requests that document the changes (include PR ids): #959
+(https://github.com/ESCOMP/ctsm/pull)
+ #959 -- Add surface datasets/landuse-timeseries/compsets/use-cases for extensions to 2300
+
+===============================================================
+===============================================================
Tag name: release-clm5.0.31
Originator(s): erik (Erik Kluzek)
Date: Sun Mar 29 15:09:19 MDT 2020
diff --git a/tools/mksurfdata_map/mksurfdata.pl b/tools/mksurfdata_map/mksurfdata.pl
index bf14234e91..783466d063 100755
--- a/tools/mksurfdata_map/mksurfdata.pl
+++ b/tools/mksurfdata_map/mksurfdata.pl
@@ -748,13 +748,13 @@ sub write_namelist_file {
# determine simulation year to use for the surface dataset:
my $sim_yr_surfdat = "$sim_yr0";
- my $cmd = "$scrdir/../../bld/queryDefaultNamelist.pl $queryfilopts $resol -options sim_year='${sim_yr_surfdat}'$mkcrop -var mksrf_fvegtyp -namelist clmexp";
+ my $cmd = "$scrdir/../../bld/queryDefaultNamelist.pl $queryfilopts $resol -options sim_year='${sim_yr_surfdat}'$mkcrop,ssp_rcp=${ssp_rcp}${mkcrop} -var mksrf_fvegtyp -namelist clmexp";
my $vegtyp = `$cmd`;
chomp( $vegtyp );
if ( $vegtyp eq "" ) {
die "** trouble getting vegtyp file with: $cmd\n";
}
- my $cmd = "$scrdir/../../bld/queryDefaultNamelist.pl $queryfilopts $resolhrv -options sim_year='${sim_yr_surfdat}'$mkcrop -var mksrf_fvegtyp -namelist clmexp";
+ my $cmd = "$scrdir/../../bld/queryDefaultNamelist.pl $queryfilopts $resolhrv -options sim_year='${sim_yr_surfdat}'$mkcrop,ssp_rcp=${ssp_rcp}${mkcrop} -var mksrf_fvegtyp -namelist clmexp";
my $hrvtyp = `$cmd`;
chomp( $hrvtyp );
if ( $hrvtyp eq "" ) {