Skip to content

Commit

Permalink
Merge pull request #949 from ekluzek/rel2300ext
Browse files Browse the repository at this point in the history 
Surface dataset creation for 2100-2300 SSP extensions (SSP1-2.6, SSP5-3.4, SSP5-8.5)
  • Loading branch information
@ekluzek
ekluzek authored Mar 29, 2020
2 parents 2aebe6f + 1249e7c commit 0b2b840
Show file tree
Hide file tree
Showing 37 changed files with 3,946 additions and 169 deletions.
4 changes: 2 additions & 2 deletions Externals.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ required = True
local_path = components/cism
protocol = git
repo_url = https://github.com/ESCOMP/CISM-wrapper
tag = cism-release-cesm2.1.2_01
tag = cism-release-cesm2.1.2_02
externals = Externals_CISM.cfg
required = True

Expand All @@ -30,7 +30,7 @@ required = True
local_path = cime
protocol = git
repo_url = https://github.com/ESMCI/cime
tag = cime5.6.28
tag = cime5.6.32
required = True

[externals_description]
Expand Down
13 changes: 11 additions & 2 deletions bld/CLMBuildNamelist.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1893,7 +1893,8 @@ sub setup_logic_co2_type {
my $group = $definition->get_group_name($var);
$nl->set_variable_value($group, $var, $opts->{$var});
} else {
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, $var, 'sim_year'=>$nl_flags->{'sim_year'} );
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, $var, 'sim_year'=>$nl_flags->{'sim_year'},
'ssp_rcp'=>$nl_flags->{'ssp_rcp'} );
}
}
}
Expand Down Expand Up @@ -3272,9 +3273,17 @@ sub setup_logic_nitrogen_deposition {
'use_cn'=>$nl_flags->{'use_cn'}, 'lnd_tuning_mode'=>$nl_flags->{'lnd_tuning_mode'},
'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'},
'hgrid'=>"1.9x2.5", 'ssp_rcp'=>$nl_flags->{'ssp_rcp'} );
'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') ) ) {
$log->warning("Did NOT find the Nitrogen-deposition forcing file (stream_fldfilename_ndep) for this ssp_rcp\n" .
"One way to get around this is to point to a file for another existing ssp_rcp in your user_nl_clm file.\n" .
"If you are running with CAM and WACCM chemistry Nitrogen deposition will come through the coupler.\n" .
"This file won't be used, so it doesn't matter what it points to -- but it's required to point to something.\n" )
}
}
} else {
# If bgc is NOT CN/CNDV then make sure none of the ndep settings are set!
Expand Down
12 changes: 6 additions & 6 deletions bld/namelist_files/createMkSrfEntry.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
class mksrfDataEntry_prog:

# Class data
year_start = 850
year_end = 1849
ssp_rcp = "hist"
subdir = "pftcftdynharv.0.25x0.25.LUH2.histsimyr0850-1849.c171012"
cdate = 171012
desc = "histclm50_LUH2"
year_start = 2101
year_end = 2300
ssp_rcp = "SSP1-2.6"
subdir = "pftcftdynharv.0.25x0.25.SSP1-2.6.simyr2101-2300.c20200320"
cdate = "200320"
desc = "SSP1RCP26x_clm5"

def parse_cmdline_args( self ):
"Parse the command line arguments for create data entry list"
Expand Down
48 changes: 42 additions & 6 deletions bld/namelist_files/namelist_defaults_clm4_5.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,13 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
<dtime>1800</dtime>

<!-- CO2 volume mixing ratio -->
<co2_ppmv sim_year="1000" >379.0</co2_ppmv>
<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="1850" >284.7</co2_ppmv>
<co2_ppmv sim_year="PtVg" >284.7</co2_ppmv>
<co2_ppmv sim_year="1000" >379.0</co2_ppmv>
<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="1850" >284.7</co2_ppmv>
<co2_ppmv sim_year="PtVg" >284.7</co2_ppmv>

<!-- CO2 type -->
<co2_type>constant</co2_type>
Expand Down Expand Up @@ -817,6 +818,11 @@ lnd/clm2/surfdata_map/landuse.timeseries_ne30np4_hist_16pfts_Irrig_CMIP6_simyr18
<fsurdat hgrid="0.9x1.25" sim_year="PtVg" use_crop=".false." irrigate=".false."
>lnd/clm2/surfdata_map/surfdata_0.9x1.25_hist_16pfts_nourb_CMIP6_simyrPtVg_c181114.nc</fsurdat>


<!-- Extension surface datasets at 2100 -->
<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>

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

<flanduse_timeseries hgrid="0.9x1.25" sim_year_range="1850-2000" irrigate=".true."
Expand Down Expand Up @@ -927,6 +933,12 @@ lnd/clm2/surfdata_map/landuse.timeseries_ne30np4_hist_16pfts_Irrig_CMIP6_simyr18
<flanduse_timeseries hgrid="10x15" sim_year_range="1850-2100" ssp_rcp="SSP5-3.4"
use_crop=".true." >lnd/clm2/surfdata_map/release-clm5.0.18/landuse.timeseries_10x15_SSP5-3.4_78pfts_CMIP6_simyr1850-2100_c190228.nc</flanduse_timeseries>

<!-- 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>

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

<!-- SSP5-RCP8.5 - relative to {csmdata}) -->
Expand Down Expand Up @@ -1033,6 +1045,14 @@ lnd/clm2/surfdata_map/landuse.timeseries_ne30np4_hist_16pfts_Irrig_CMIP6_simyr18
<stream_year_last_ndep phys="clm5_0" use_cn=".true." sim_year_range="1850-2100" >2101</stream_year_last_ndep>
<model_year_align_ndep phys="clm5_0" use_cn=".true." sim_year_range="1850-2100" >2015</model_year_align_ndep>

<stream_year_first_ndep phys="clm4_5" use_cn=".true." sim_year_range="2100-2300" >2101</stream_year_first_ndep>
<stream_year_last_ndep phys="clm4_5" use_cn=".true." sim_year_range="2100-2300" >2101</stream_year_last_ndep>
<model_year_align_ndep phys="clm4_5" use_cn=".true." sim_year_range="2100-2300" >2101</model_year_align_ndep>

<stream_year_first_ndep phys="clm5_0" use_cn=".true." sim_year_range="2100-2300" >2101</stream_year_first_ndep>
<stream_year_last_ndep phys="clm5_0" use_cn=".true." sim_year_range="2100-2300" >2101</stream_year_last_ndep>
<model_year_align_ndep phys="clm5_0" use_cn=".true." sim_year_range="2100-2300" >2101</model_year_align_ndep>

<stream_year_first_ndep use_cn=".true." sim_year="2010" >2010</stream_year_first_ndep>
<stream_year_last_ndep use_cn=".true." sim_year="2010" >2010</stream_year_last_ndep>

Expand Down Expand Up @@ -1160,6 +1180,14 @@ lnd/clm2/surfdata_map/landuse.timeseries_ne30np4_hist_16pfts_Irrig_CMIP6_simyr18
<stream_year_last_popdens phys="clm5_0" cnfireson=".true." sim_year_range="1850-2100" >2100</stream_year_last_popdens>
<model_year_align_popdens phys="clm5_0" cnfireson=".true." sim_year_range="1850-2100" >2015</model_year_align_popdens>

<stream_year_first_popdens phys="clm4_5" cnfireson=".true." sim_year_range="2100-2300" >2100</stream_year_first_popdens>
<stream_year_last_popdens phys="clm4_5" cnfireson=".true." sim_year_range="2100-2300" >2100</stream_year_last_popdens>
<model_year_align_popdens phys="clm4_5" cnfireson=".true." sim_year_range="2100-2300" >2100</model_year_align_popdens>

<stream_year_first_popdens phys="clm5_0" cnfireson=".true." sim_year_range="2100-2300" >2100</stream_year_first_popdens>
<stream_year_last_popdens phys="clm5_0" cnfireson=".true." sim_year_range="2100-2300" >2100</stream_year_last_popdens>
<model_year_align_popdens phys="clm5_0" cnfireson=".true." sim_year_range="2100-2300" >2100</model_year_align_popdens>

<stream_year_first_popdens use_cn=".true." sim_year="2010" >2010</stream_year_first_popdens>
<stream_year_last_popdens use_cn=".true." sim_year="2010" >2010</stream_year_last_popdens>

Expand Down Expand Up @@ -1215,6 +1243,14 @@ lnd/clm2/surfdata_map/landuse.timeseries_ne30np4_hist_16pfts_Irrig_CMIP6_simyr18
<stream_year_last_urbantv phys="clm4_5" sim_year_range="1850-2100" >2106</stream_year_last_urbantv>
<model_year_align_urbantv phys="clm4_5" sim_year_range="1850-2100" >2015</model_year_align_urbantv>

<stream_year_first_urbantv phys="clm5_0" sim_year_range="2100-2300" >2100</stream_year_first_urbantv>
<stream_year_last_urbantv phys="clm5_0" sim_year_range="2100-2300" >2106</stream_year_last_urbantv>
<model_year_align_urbantv phys="clm5_0" sim_year_range="2100-2300" >2100</model_year_align_urbantv>

<stream_year_first_urbantv phys="clm4_5" sim_year_range="2100-2300" >2100</stream_year_first_urbantv>
<stream_year_last_urbantv phys="clm4_5" sim_year_range="2100-2300" >2106</stream_year_last_urbantv>
<model_year_align_urbantv phys="clm4_5" sim_year_range="2100-2300" >2100</model_year_align_urbantv>

<stream_year_first_urbantv phys="clm5_0" sim_year="2000" >2000</stream_year_first_urbantv>
<stream_year_last_urbantv phys="clm5_0" sim_year="2000" >2000</stream_year_last_urbantv>

Expand Down
Loading

0 comments on commit 0b2b840

Please sign in to comment.