Merge pull request #959 from ekluzek/rel2300ext

Add surface datasets/landuse-timeseries/compsets/use-cases for extensions to 2300
ESCOMP · Apr 2, 2020 · 8e1309a · 8e1309a
2 parents 0b2b840 + 868239d
commit 8e1309a
Show file tree

Hide file tree

Showing 15 changed files with 199 additions and 24 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.32
+tag = cime5.6.33
 required = True
 
 [externals_description]

diff --git 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
@@ -27,7 +27,9 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
 <co2_ppmv sim_year="2000" >379.0</co2_ppmv>
 <co2_ppmv sim_year="2010" >388.8</co2_ppmv>
 <co2_ppmv sim_year="2015" >397.5</co2_ppmv>
-<co2_ppmv sim_year="2100" ssp_rcp="SSP5-8.5" >1141.9</co2_ppmv>
+<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="1850" >284.7</co2_ppmv>
 <co2_ppmv sim_year="PtVg" >284.7</co2_ppmv>
 
@@ -820,8 +822,12 @@ lnd/clm2/surfdata_map/landuse.timeseries_ne30np4_hist_16pfts_Irrig_CMIP6_simyr18
 
 
 <!-- Extension surface datasets at 2100 -->
+<fsurdat hgrid="0.9x1.25" sim_year="2100" use_crop=".true." ssp_rcp="SSP1-2.6" >
+lnd/clm2/surfdata_map/release-clm5.0.30/surfdata_0.9x1.25_SSP1-2.6_78pfts_CMIP6_simyr2100_c200329.nc</fsurdat>
 <fsurdat hgrid="0.9x1.25" sim_year="2100" use_crop=".true." ssp_rcp="SSP5-8.5" >
-lnd/clm2/surfdata_map/release-clm5.0.18/surfdata_0.9x1.25_hist_78pfts_CMIP6_simyr2000_c190214.nc</fsurdat>
+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>
 
 <!-- Dynamic PFT surface datasets (relative to {csmdata}) -->
 
@@ -935,9 +941,12 @@ lnd/clm2/surfdata_map/release-clm5.0.18/surfdata_0.9x1.25_hist_78pfts_CMIP6_simy
 
 <!-- Extensions of future scenarios - landuse time series files with crop on -->
 
-<!-- SSP5-RCP8.5 - relative to {csmdata}) -->
-<flanduse_timeseries hgrid="0.9x1.25" sim_year_range="2100-2300" ssp_rcp="SSP5-8.5"
- 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>
+<flanduse_timeseries hgrid="0.9x1.25" sim_year_range="2100-2300" ssp_rcp="SSP5-8.5" use_crop=".true."
+>lnd/clm2/surfdata_map/release-clm5.0.30/landuse.timeseries_0.9x1.25_SSP5-8.5_78pfts_CMIP6_simyr2100-2300_c200330.nc</flanduse_timeseries>
+<flanduse_timeseries hgrid="0.9x1.25" sim_year_range="2100-2300" ssp_rcp="SSP5-3.4" use_crop=".true."
+>lnd/clm2/surfdata_map/release-clm5.0.30/landuse.timeseries_0.9x1.25_SSP5-3.4_78pfts_CMIP6_simyr2100-2300_c200330.nc</flanduse_timeseries>
+<flanduse_timeseries hgrid="0.9x1.25" sim_year_range="2100-2300" ssp_rcp="SSP1-2.6" use_crop=".true."
+>lnd/clm2/surfdata_map/release-clm5.0.30/landuse.timeseries_0.9x1.25_SSP1-2.6_78pfts_CMIP6_simyr2100-2300_c200329.nc</flanduse_timeseries>
 
 <!-- Future scenarios - landuse time series files with crop off -->
 

diff --git 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.
 <clm_start_type bgc_spinup="on" >cold</clm_start_type> <!-- CLM 4.5 -->
 
 <clm_start_type sim_year_range="1850-2100">arb_ic</clm_start_type>
+<clm_start_type sim_year_range="2100-2300">arb_ic</clm_start_type>
 
 
 <!-- For transient cases, turn on demand to set flanduse_timeseries -->
 <clm_demand sim_year_range="1850-2000">flanduse_timeseries</clm_demand>
 <clm_demand sim_year_range="1850-2100">flanduse_timeseries</clm_demand>
+<clm_demand sim_year_range="2100-2300">flanduse_timeseries</clm_demand>
 
 
 <!-- Default location of {csmdata} -->

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
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+
+<namelist_defaults>
+
+<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>
+<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>
+
+<!-- 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>
+
+<sim_year_range>2100-2300</sim_year_range>
+
+<ssp_rcp>SSP1-2.6</ssp_rcp>
+
+</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
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+
+<namelist_defaults>
+
+<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>
+<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>
+
+<!-- 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>
+
+<sim_year_range>2100-2300</sim_year_range>
+
+<ssp_rcp>SSP5-3.4</ssp_rcp>
+
+</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 = 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
@@ -109,6 +109,7 @@
  <value compset="^1850_" >1850_control</value>
  <value compset="^1850_.*_CLM50%[^_]*NOANTHRO" >1850_noanthro_control</value>
  <value compset="^HIST_" >20thC_transient</value>
+ <!-- Future scenarios to 2100 -->
  <value compset="^SSP585_" >1850-2100_SSP5-8.5_transient</value>
  <value compset="^SSP126_" >1850-2100_SSP1-2.6_transient</value>
  <value compset="^SSP370_" >1850-2100_SSP3-7.0_transient</value>
@@ -118,6 +119,11 @@
  <value compset="^SSP434_" >1850-2100_SSP4-3.4_transient</value>
  <value compset="^SSP460_" >1850-2100_SSP4-6.0_transient</value>
  <value compset="^SSP585_" >1850-2100_SSP5-8.5_transient</value>
+ <!-- SSP extensions to 2300 -->
+ <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>
+ <!-- Periods used for CAM -->
  <value compset="^AMIP_" >20thC_transient</value>
  <value compset="^PIPD_" >1850-2100_SSP5-8.5_transient</value>
  </values>

diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml
@@ -295,6 +295,22 @@
  <lname>SSP534_DATM%GSWP3v1_CLM50%BGC-CROP_SICE_SOCN_MOSART_CISM2%NOEVOLVE_SWAV</lname>
  </compset>
 
+ <!-- Future scenario compset - extensions -->
+ <compset>
+ <alias>ISSP585ExtClm50BgcCrop</alias>
+ <lname>SSP585EXT_DATM%GSWP3v1_CLM50%BGC-CROP_SICE_SOCN_MOSART_CISM2%NOEVOLVE_SWAV</lname>
+ </compset>
+
+ <compset>
+ <alias>ISSP534ExtClm50BgcCrop</alias>
+ <lname>SSP534EXT_DATM%GSWP3v1_CLM50%BGC-CROP_SICE_SOCN_MOSART_CISM2%NOEVOLVE_SWAV</lname>
+ </compset>
+
+ <compset>
+ <alias>ISSP126ExtClm50BgcCrop</alias>
+ <lname>SSP126EXT_DATM%GSWP3v1_CLM50%BGC-CROP_SICE_SOCN_MOSART_CISM2%NOEVOLVE_SWAV</lname>
+ </compset>
+
 
 <!-- I CLM45 Compsets -->
 
@@ -485,9 +501,10 @@
 
  <entries>
  <entry id="RUN_STARTDATE">
- <values>
+ <values match="last">
  <value compset="HIST_" >1850-01-01</value>
  <value compset="SSP" >2015-01-01</value>
+ <value compset="SSP[0-9]+EXT" >2101-01-01</value>
  <value compset="CLM[45].*_CISM.*_TEST" >1980-01-15</value>
  <value compset="CLM[45]%[^_]*CNDV.*_TEST" >1997-12-31</value>
  <value grid="a%1x1_mexicocityMEX" >1993-12-01</value>

diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml
@@ -1541,6 +1541,15 @@
  <option name="comment" >Transient production low res future scenario SSP5-8.5 case with isotopes with a december 2050 start</option>
  </options>
  </test>
+ <test name="SMS_Ld5" grid="f09_g17" compset="ISSP585ExtClm50BgcCrop" testmods="clm/default">
+ <machines>
+ <machine name="cheyenne" compiler="intel" category="aux_clm"/>
+ </machines>
+ <options>
+ <option name="wallclock">00:20:00</option>
+ <option name="comment" >Transient production future scenario SSP5-8.5 extension case</option>
+ </options>
+ </test>
  <test name="SMS_Ld5" grid="f10_f10_musgs" compset="ISSP245Clm50BgcCrop" testmods="clm/ciso_dec2050Start">
  <machines>
  <machine name="cheyenne" compiler="gnu" category="aux_clm"/>

diff --git a/cime_config/usermods_dirs/cmip6_waccm_deck/shell_commands 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
@@ -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
@@ -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
@@ -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