Skip to content

Commit 8e1309a

Browse files
ekluzekekluzek
authored
Merge pull request #959 from ekluzek/rel2300ext
Add surface datasets/landuse-timeseries/compsets/use-cases for extensions to 2300
2 parents 0b2b840 + 868239d commit 8e1309a

15 files changed

+199
-24
lines changed

‎Externals.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ required = True
3030
local_path = cime
3131
protocol = git
3232
repo_url = https://github.com/ESMCI/cime
33-
tag = cime5.6.32
33+
tag = cime5.6.33
3434
required = True
3535

3636
[externals_description]

‎bld/CLMBuildNamelist.pm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2338,7 +2338,7 @@ sub setup_logic_surface_dataset {
23382338
}
23392339

23402340
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'fsurdat',
2341-
'hgrid'=>$nl_flags->{'res'},
2341+
'hgrid'=>$nl_flags->{'res'}, 'ssp_rcp'=>$nl_flags->{'ssp_rcp'},
23422342
'sim_year'=>$nl_flags->{'sim_year'}, 'irrig'=>$nl_flags->{'irrig'},
23432343
'crop'=>$nl_flags->{'crop'}, 'glc_nec'=>$nl_flags->{'glc_nec'});
23442344
} else{
@@ -2349,7 +2349,7 @@ sub setup_logic_surface_dataset {
23492349
$log->fatal_error( "dynamic PFT's (setting flanduse_timeseries) are incompatible with ecosystem dynamics (use_fates=.true)." );
23502350
}
23512351
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'fsurdat',
2352-
'hgrid'=>$nl_flags->{'res'},
2352+
'hgrid'=>$nl_flags->{'res'}, 'ssp_rcp'=>$nl_flags->{'ssp_rcp'},
23532353
'sim_year'=>$nl_flags->{'sim_year'}, 'irrigate'=>$nl_flags->{'irrigate'},
23542354
'use_crop'=>$nl_flags->{'use_crop'}, 'glc_nec'=>$nl_flags->{'glc_nec'});
23552355
}

‎bld/namelist_files/namelist_defaults_clm4_5.xml

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
2727
<co2_ppmv sim_year="2000" >379.0</co2_ppmv>
2828
<co2_ppmv sim_year="2010" >388.8</co2_ppmv>
2929
<co2_ppmv sim_year="2015" >397.5</co2_ppmv>
30-
<co2_ppmv sim_year="2100" ssp_rcp="SSP5-8.5" >1141.9</co2_ppmv>
30+
<co2_ppmv sim_year="2100" ssp_rcp="SSP5-8.5" >1135.2</co2_ppmv>
31+
<co2_ppmv sim_year="2100" ssp_rcp="SSP5-3.4" >496.6</co2_ppmv>
32+
<co2_ppmv sim_year="2100" ssp_rcp="SSP1-2.6" >445.6</co2_ppmv>
3133
<co2_ppmv sim_year="1850" >284.7</co2_ppmv>
3234
<co2_ppmv sim_year="PtVg" >284.7</co2_ppmv>
3335

@@ -820,8 +822,12 @@ lnd/clm2/surfdata_map/landuse.timeseries_ne30np4_hist_16pfts_Irrig_CMIP6_simyr18
820822

821823

822824
<!-- Extension surface datasets at 2100 -->
825+
<fsurdat hgrid="0.9x1.25" sim_year="2100" use_crop=".true." ssp_rcp="SSP1-2.6" >
826+
lnd/clm2/surfdata_map/release-clm5.0.30/surfdata_0.9x1.25_SSP1-2.6_78pfts_CMIP6_simyr2100_c200329.nc</fsurdat>
823827
<fsurdat hgrid="0.9x1.25" sim_year="2100" use_crop=".true." ssp_rcp="SSP5-8.5" >
824-
lnd/clm2/surfdata_map/release-clm5.0.18/surfdata_0.9x1.25_hist_78pfts_CMIP6_simyr2000_c190214.nc</fsurdat>
828+
lnd/clm2/surfdata_map/release-clm5.0.30/surfdata_0.9x1.25_SSP5-8.5_78pfts_CMIP6_simyr2100_c200330.nc</fsurdat>
829+
<fsurdat hgrid="0.9x1.25" sim_year="2100" use_crop=".true." ssp_rcp="SSP5-3.4" >
830+
lnd/clm2/surfdata_map/release-clm5.0.30/surfdata_0.9x1.25_SSP5-3.4_78pfts_CMIP6_simyr2100_c200330.nc</fsurdat>
825831

826832
<!-- Dynamic PFT surface datasets (relative to {csmdata}) -->
827833

@@ -935,9 +941,12 @@ lnd/clm2/surfdata_map/release-clm5.0.18/surfdata_0.9x1.25_hist_78pfts_CMIP6_simy
935941

936942
<!-- Extensions of future scenarios - landuse time series files with crop on -->
937943

938-
<!-- SSP5-RCP8.5 - relative to {csmdata}) -->
939-
<flanduse_timeseries hgrid="0.9x1.25" sim_year_range="2100-2300" ssp_rcp="SSP5-8.5"
940-
use_crop=".true." >lnd/clm2/surfdata_map/release-clm5.0.18/landuse.timeseries_0.9x1.25_SSP5-8.5_78pfts_CMIP6_simyr1850-2100_c190214.nc</flanduse_timeseries>
944+
<flanduse_timeseries hgrid="0.9x1.25" sim_year_range="2100-2300" ssp_rcp="SSP5-8.5" use_crop=".true."
945+
>lnd/clm2/surfdata_map/release-clm5.0.30/landuse.timeseries_0.9x1.25_SSP5-8.5_78pfts_CMIP6_simyr2100-2300_c200330.nc</flanduse_timeseries>
946+
<flanduse_timeseries hgrid="0.9x1.25" sim_year_range="2100-2300" ssp_rcp="SSP5-3.4" use_crop=".true."
947+
>lnd/clm2/surfdata_map/release-clm5.0.30/landuse.timeseries_0.9x1.25_SSP5-3.4_78pfts_CMIP6_simyr2100-2300_c200330.nc</flanduse_timeseries>
948+
<flanduse_timeseries hgrid="0.9x1.25" sim_year_range="2100-2300" ssp_rcp="SSP1-2.6" use_crop=".true."
949+
>lnd/clm2/surfdata_map/release-clm5.0.30/landuse.timeseries_0.9x1.25_SSP1-2.6_78pfts_CMIP6_simyr2100-2300_c200329.nc</flanduse_timeseries>
941950

942951
<!-- Future scenarios - landuse time series files with crop off -->
943952

‎bld/namelist_files/namelist_defaults_overall.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,13 @@ determine default values for namelists.
2727
<clm_start_type bgc_spinup="on" >cold</clm_start_type> <!-- CLM 4.5 -->
2828

2929
<clm_start_type sim_year_range="1850-2100">arb_ic</clm_start_type>
30+
<clm_start_type sim_year_range="2100-2300">arb_ic</clm_start_type>
3031

3132

3233
<!-- For transient cases, turn on demand to set flanduse_timeseries -->
3334
<clm_demand sim_year_range="1850-2000">flanduse_timeseries</clm_demand>
3435
<clm_demand sim_year_range="1850-2100">flanduse_timeseries</clm_demand>
36+
<clm_demand sim_year_range="2100-2300">flanduse_timeseries</clm_demand>
3537

3638

3739
<!-- Default location of {csmdata} -->

‎bld/namelist_files/use_cases/2100-2300_SSP1-2.6_transient.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0"?>
2+
3+
<namelist_defaults>
4+
5+
<use_case_desc >Simulate transient land-use, and aerosol deposition changes from 2100 to 2300 with the CMIP6 SSP1-2.6 scenario</use_case_desc>
6+
<use_case_desc use_cn=".true." >Simulate transient land-use, aerosol deposition, and Nitrogen deposition changes from 2100 to 2300 with the CMIP6 SSP1-2.6 scenario</use_case_desc>
7+
8+
<!-- Have a minimal list of things set here, sim_year, sim_year_range, and ssp_rcp, other things should be dependent on these and
9+
set in a namelist_defaults xml file -->
10+
11+
<sim_year>2100</sim_year>
12+
13+
<sim_year_range>2100-2300</sim_year_range>
14+
15+
<ssp_rcp>SSP1-2.6</ssp_rcp>
16+
17+
</namelist_defaults>

‎bld/namelist_files/use_cases/2100-2300_SSP5-3.4_transient.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0"?>
2+
3+
<namelist_defaults>
4+
5+
<use_case_desc >Simulate transient land-use, and aerosol deposition changes from 2100 to 2300 with the CMIP6 SSP5-3.4 scenario</use_case_desc>
6+
<use_case_desc use_cn=".true." >Simulate transient land-use, aerosol deposition, and Nitrogen deposition changes from 2100 to 2300 with the CMIP6 SSP5-3.4 scenario</use_case_desc>
7+
8+
<!-- Have a minimal list of things set here, sim_year, sim_year_range, and ssp_rcp, other things should be dependent on these and
9+
set in a namelist_defaults xml file -->
10+
11+
<sim_year>2100</sim_year>
12+
13+
<sim_year_range>2100-2300</sim_year_range>
14+
15+
<ssp_rcp>SSP5-3.4</ssp_rcp>
16+
17+
</namelist_defaults>

‎bld/unit_testers/build-namelist_test.pl

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,9 @@ sub make_env_run {
123123
#
124124
# Figure out number of tests that will run
125125
#
126-
my $ntests = 841;
126+
my $ntests = 916;
127127
if ( defined($opts{'compare'}) ) {
128-
$ntests += 504;
128+
$ntests += 558;
129129
}
130130
plan( tests=>$ntests );
131131

@@ -1037,6 +1037,11 @@ sub make_env_run {
10371037
GLC_TWO_WAY_COUPLING=>"FALSE",
10381038
conopts=>"-phys clm5_0",
10391039
},
1040+
"ext_SSP5-3.4" =>{ options=>"-res 0.9x1.25 -envxml_dir . -bgc bgc -crop -use_case 2100-2300_SSP5-3.4_transient",
1041+
namelst=>"",
1042+
GLC_TWO_WAY_COUPLING=>"FALSE",
1043+
conopts=>"-phys clm5_0",
1044+
},
10401045
"bad_megan_spec" =>{ options=>"-envxml_dir . -bgc bgc -megan",
10411046
namelst=>"megan_specifier='ZZTOP=zztop'",
10421047
GLC_TWO_WAY_COUPLING=>"FALSE",
@@ -1258,7 +1263,7 @@ sub make_env_run {
12581263
# of the different use cases.
12591264
$mode = "-phys clm4_5";
12601265
system( "../configure -s $mode" );
1261-
my @glc_res = ( "48x96", "0.9x1.25", "1.9x2.5" );
1266+
my @glc_res = ( "0.9x1.25", "1.9x2.5" );
12621267
my @use_cases = ( "1850-2100_SSP1-2.6_transient",
12631268
"1850-2100_SSP2-4.5_transient",
12641269
"1850-2100_SSP3-7.0_transient",
@@ -1269,7 +1274,7 @@ sub make_env_run {
12691274
"20thC_transient",
12701275
);
12711276
foreach my $res ( @glc_res ) {
1272-
foreach my $usecase ( @usecases ) {
1277+
foreach my $usecase ( @use_cases ) {
12731278
$options = "-bgc bgc -res $res -use_case $usecase -envxml_dir . ";
12741279
&make_env_run();
12751280
eval{ system( "$bldnml $options > $tempfile 2>&1 " ); };
@@ -1291,9 +1296,10 @@ sub make_env_run {
12911296
system( "../configure -s $mode" );
12921297
@glc_res = ( "0.9x1.25" );
12931298
my @use_cases = ( "2100-2300_SSP5-8.5_transient",
1299+
"2100-2300_SSP1-2.6_transient",
12941300
);
12951301
foreach my $res ( @glc_res ) {
1296-
foreach my $usecase ( @usecases ) {
1302+
foreach my $usecase ( @use_cases ) {
12971303
$options = "-bgc bgc -res $res -bgc bgc -crop -use_case $usecase -envxml_dir . ";
12981304
&make_env_run();
12991305
eval{ system( "$bldnml $options > $tempfile 2>&1 " ); };

‎cime_config/config_component.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@
109109
<value compset="^1850_" >1850_control</value>
110110
<value compset="^1850_.*_CLM50%[^_]*NOANTHRO" >1850_noanthro_control</value>
111111
<value compset="^HIST_" >20thC_transient</value>
112+
<!-- Future scenarios to 2100 -->
112113
<value compset="^SSP585_" >1850-2100_SSP5-8.5_transient</value>
113114
<value compset="^SSP126_" >1850-2100_SSP1-2.6_transient</value>
114115
<value compset="^SSP370_" >1850-2100_SSP3-7.0_transient</value>
@@ -118,6 +119,11 @@
118119
<value compset="^SSP434_" >1850-2100_SSP4-3.4_transient</value>
119120
<value compset="^SSP460_" >1850-2100_SSP4-6.0_transient</value>
120121
<value compset="^SSP585_" >1850-2100_SSP5-8.5_transient</value>
122+
<!-- SSP extensions to 2300 -->
123+
<value compset="^SSP585EXT_" >2100-2300_SSP5-8.5_transient</value>
124+
<value compset="^SSP534EXT_" >2100-2300_SSP5-3.4_transient</value>
125+
<value compset="^SSP126EXT_" >2100-2300_SSP1-2.6_transient</value>
126+
<!-- Periods used for CAM -->
121127
<value compset="^AMIP_" >20thC_transient</value>
122128
<value compset="^PIPD_" >1850-2100_SSP5-8.5_transient</value>
123129
</values>

‎cime_config/config_compsets.xml

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,22 @@
295295
<lname>SSP534_DATM%GSWP3v1_CLM50%BGC-CROP_SICE_SOCN_MOSART_CISM2%NOEVOLVE_SWAV</lname>
296296
</compset>
297297

298+
<!-- Future scenario compset - extensions -->
299+
<compset>
300+
<alias>ISSP585ExtClm50BgcCrop</alias>
301+
<lname>SSP585EXT_DATM%GSWP3v1_CLM50%BGC-CROP_SICE_SOCN_MOSART_CISM2%NOEVOLVE_SWAV</lname>
302+
</compset>
303+
304+
<compset>
305+
<alias>ISSP534ExtClm50BgcCrop</alias>
306+
<lname>SSP534EXT_DATM%GSWP3v1_CLM50%BGC-CROP_SICE_SOCN_MOSART_CISM2%NOEVOLVE_SWAV</lname>
307+
</compset>
308+
309+
<compset>
310+
<alias>ISSP126ExtClm50BgcCrop</alias>
311+
<lname>SSP126EXT_DATM%GSWP3v1_CLM50%BGC-CROP_SICE_SOCN_MOSART_CISM2%NOEVOLVE_SWAV</lname>
312+
</compset>
313+
298314

299315
<!-- I CLM45 Compsets -->
300316

@@ -485,9 +501,10 @@
485501

486502
<entries>
487503
<entry id="RUN_STARTDATE">
488-
<values>
504+
<values match="last">
489505
<value compset="HIST_" >1850-01-01</value>
490506
<value compset="SSP" >2015-01-01</value>
507+
<value compset="SSP[0-9]+EXT" >2101-01-01</value>
491508
<value compset="CLM[45].*_CISM.*_TEST" >1980-01-15</value>
492509
<value compset="CLM[45]%[^_]*CNDV.*_TEST" >1997-12-31</value>
493510
<value grid="a%1x1_mexicocityMEX" >1993-12-01</value>

‎cime_config/testdefs/testlist_clm.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1541,6 +1541,15 @@
15411541
<option name="comment" >Transient production low res future scenario SSP5-8.5 case with isotopes with a december 2050 start</option>
15421542
</options>
15431543
</test>
1544+
<test name="SMS_Ld5" grid="f09_g17" compset="ISSP585ExtClm50BgcCrop" testmods="clm/default">
1545+
<machines>
1546+
<machine name="cheyenne" compiler="intel" category="aux_clm"/>
1547+
</machines>
1548+
<options>
1549+
<option name="wallclock">00:20:00</option>
1550+
<option name="comment" >Transient production future scenario SSP5-8.5 extension case</option>
1551+
</options>
1552+
</test>
15441553
<test name="SMS_Ld5" grid="f10_f10_musgs" compset="ISSP245Clm50BgcCrop" testmods="clm/ciso_dec2050Start">
15451554
<machines>
15461555
<machine name="cheyenne" compiler="gnu" category="aux_clm"/>

‎cime_config/usermods_dirs/cmip6_waccm_deck/shell_commands

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/bin/bash
2+
# Turn ignore-warnings on, so won't abort on missing ndep file, as WACCM should provide it
3+
./xmlchange --append CLM_BLDNML_OPTS="--ignore_warnings"

‎doc/.release-ChangeLog_template

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,37 +36,37 @@ Testing:
3636
unit-tests (components/clm/src):
3737

3838
cheyenne -
39-
hobart ---
39+
izumi ----
4040

4141
tools-tests (components/clm/test/tools):
4242

4343
cheyenne -
44-
hobart ---
44+
izumi ----
4545

4646
PTCLM testing (components/clm/tools/shared/PTCLM/test):
4747

4848
cheyenne -
49-
hobart ---
49+
izumi ----
5050

5151
regular tests (aux_clm):
5252

5353
cheyenne_intel ----
5454
cheyenne_gnu ------
55-
hobart_nag --------
56-
hobart_pgi --------
57-
hobart_intel ------
55+
izumi_nag ---------
56+
izumi_pgi ---------
57+
izumi_intel -------
5858

5959
regular tests (prealpha):
6060

6161
cheyenne_intel -
6262
cheyenne_gnu ---
63-
hobart_nag -----
63+
izumi_nag ------
6464

6565
regular tests (prebeta):
6666

6767
cheyenne_intel -
6868
cheyenne_gnu ---
69-
hobart_nag -----
69+
izumi_nag ------
7070

7171
Summary of Answer changes:
7272
-------------------------

‎doc/ChangeSum

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
Tag Who Date Summary
22
============================================================================================================================
3+
release-clm5.0.32 erik 04/02/2020 Extensions to 2300 for SSP5-8.5,SSP5-3.4, and SSP1-2.6
34
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
45
release-clm5.0.30 erik 01/21/2020 Update FATES to sci.1.30.0_api.8.0.0
56
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)

‎doc/release-clm5.0.ChangeLog

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,92 @@
11
===============================================================
2+
Tag name: release-clm5.0.32
3+
Originator(s): erik (Erik Kluzek)
4+
Date: Thu Apr 2 00:23:04 MDT 2020
5+
One-line Summary: Extensions to 2300 for SSP5-8.5,SSP5-3.4, and SSP1-2.6
6+
7+
Purpose of this version:
8+
------------------------
9+
10+
Add 2100 surface datasets, landuse.timeseries files for 2100-2300 for SSP5-3.4, SSP5-8.5, and SSP1-2.6.
11+
Also add compsets to run them and the build-namelist use-cases for them. Only for f09 resolution with crop on.
12+
13+
Updates cime as a cime update was needed to run the extensions in I compsets (for presaero and CO2).
14+
Add a test for it. Add -ignore_warnings to cmip6_waccm_deck user-mod which is required for the
15+
fully coupled compset for BWSSP534osext as the ndep file doesn't exist for it, but WACCM is
16+
providing ndep. Get more of the build-namelist unit tester tests working, which previously weren't running.
17+
18+
CTSM Master Tag This Corresponds To: ctsm1.0.dev025 (with many other changes)
19+
20+
Summary of changes:
21+
-------------------
22+
23+
Issues fixed (include CTSM Issue #): #944, #955
24+
Fixes #944 -- extensions to 2300
25+
Fixes #955 -- surface dataset creation bug for 2100
26+
27+
Science changes since: release-clm5.0.31
28+
Add 2100 surface datasets and transient extensions from 2100-2300
29+
30+
Software changes since: release-clm5.0.31
31+
Fix bug with creation of 2100 surface datasets
32+
33+
Changes to User Interface since: release-clm5.0.31
34+
35+
New compsets: ISSP585ExtClm50BgcCrop, ISSP534xtClm50BgcCrop, ISSP126ExtClm50BgcCrop
36+
New CLM_NML_USE_CASE: 2100-2300_SSP5-8.5_transient, 2100-2300_SSP5-3.4_transient, 2100-2300_SSP1-2.6_transient
37+
38+
Testing:
39+
--------
40+
41+
[PASS means all tests PASS and OK means tests PASS other than expected fails.]
42+
43+
build-namelist tests:
44+
45+
cheyenne - PASS
46+
47+
unit-tests (components/clm/src):
48+
49+
cheyenne - PASS
50+
51+
tools-tests (components/clm/test/tools): None
52+
53+
PTCLM testing (components/clm/tools/shared/PTCLM/test): None
54+
55+
regular tests (aux_clm):
56+
57+
cheyenne_intel ---- OK
58+
cheyenne_gnu ------ OK
59+
izumi_nag --------- PASS
60+
izumi_pgi --------- PASS
61+
izumi_intel ------- PASS
62+
63+
Summary of Answer changes:
64+
-------------------------
65+
66+
If the tag used for baseline comparisons was NOT the previous tag, note that here: previous
67+
68+
Changes answers relative to baseline: No (bit-for-bit)
69+
70+
Detailed list of changes:
71+
------------------------
72+
73+
Externals being used: cime updated
74+
75+
cism: cism-release-cesm2.1.2_04
76+
rtm: release-cesm2.0.04
77+
mosart: release-cesm2.0.04
78+
cime: cim5.6.33
79+
FATES: sci.1.30.0_api.8.0.0
80+
PTCLM: PTCLM2_20200121
81+
82+
CTSM Tag versions pulled over from master development branch: None
83+
84+
Pull Requests that document the changes (include PR ids): #959
85+
(https://github.com/ESCOMP/ctsm/pull)
86+
#959 -- Add surface datasets/landuse-timeseries/compsets/use-cases for extensions to 2300
87+
88+
===============================================================
89+
===============================================================
290
Tag name: release-clm5.0.31
391
Originator(s): erik (Erik Kluzek)
492
Date: Sun Mar 29 15:09:19 MDT 2020

0 commit comments

Comments
 (0)