Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New datasets and capability to run CMIP6 future scenarios... #651

Merged
merged 29 commits into from
Mar 12, 2019
Merged

New datasets and capability to run CMIP6 future scenarios... #651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
c14c18d
Reseed generic crops and increase totvegc threshold from 0 to 1 (see …
olyson Jan 10, 2019
bb1bd0b
Correct name of pointer for QSNOEVAP in history, this fixes #624
ekluzek Jan 23, 2019
6c6e162
Remove rcp, and make only ssp_rcp valid
ekluzek Jan 28, 2019
cd3f4df
Update datasets get CMIP6 ssp_rcp combinations working
ekluzek Feb 28, 2019
516f27a
Break up future scenarios generation by specific scenario
ekluzek Feb 28, 2019
88b8d55
Add in new SSP ndep and popdens datasets, get namelist working correc…
ekluzek Mar 1, 2019
d1d3bf1
Straighten out ndep settings, and also make sure ssp_rcp is required …
ekluzek Mar 1, 2019
b9ab34d
Update datasets, and get unit test working, and make sure all dataset…
ekluzek Mar 5, 2019
7ff3cf8
Add missing SSP scenario
ekluzek Mar 5, 2019
1f977f6
Merge remote-tracking branch 'ekluzek/qsnoevapfix' into newsrfdataAnt…
ekluzek Mar 5, 2019
560967d
Change for of SSP-RCP period in compset longnames, so it doesn't incl…
ekluzek Mar 5, 2019
8899358
Get rid of reading ZWT0, F0, and P3 fields from the surface dataset, …
ekluzek Mar 6, 2019
d5fe170
Merge branch 'newsrfdataAntwetlndsfix' of github.com:ekluzek/ctsm int…
ekluzek Mar 6, 2019
ba9854c
Merge remote-tracking branch 'olyson/reseed_generic_crop' into newsrf…
ekluzek Mar 6, 2019
60df802
Correct the ISSP126Clm50BgcCrop compset, remove the extra SSP3 compse…
ekluzek Mar 6, 2019
25eb04f
Add a test for one future scenario with isotopes on, and a dec 2050 s…
ekluzek Mar 6, 2019
3349a60
Merge branch 'newsrfdataAntwetlndsfix' of github.com:ekluzek/ctsm int…
ekluzek Mar 6, 2019
9486dd9
Make new use_case files cleaner by reducing the amount of information…
ekluzek Mar 6, 2019
c31c662
Do NOT set CO2 to diagnostic for SSP cases, as this needs to be coord…
ekluzek Mar 6, 2019
74da99c
Merge branch 'newsrfdataAntwetlndsfix' of github.com:ekluzek/ctsm int…
ekluzek Mar 6, 2019
f2efea7
Merge tag 'release-clm5.0.19' into newsrfdataAntwetlndsfix
ekluzek Mar 8, 2019
c8a0b50
Updated finidat files that are interpolated from the previous ones fo…
ekluzek Mar 11, 2019
35feefa
Update finidat file, as previous one somehow got removed
ekluzek Mar 12, 2019
013db0b
Fix a couple tests
ekluzek Mar 12, 2019
6da3eaa
Increase wall clock limit
ekluzek Mar 12, 2019
39ed2d7
Merge branch 'newsrfdataAntwetlndsfix' of github.com:ekluzek/ctsm int…
ekluzek Mar 12, 2019
5ea8ee0
Remove test as hcru_hcru resolution was removed, and ERP_D tests and …
ekluzek Mar 12, 2019
a0806b2
Merge branch 'newsrfdataAntwetlndsfix' of github.com:ekluzek/ctsm int…
ekluzek Mar 12, 2019
f3eb2a2
Update change files
ekluzek Mar 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
120 changes: 66 additions & 54 deletions bld/CLMBuildNamelist.pm
View file
Open in desktop

Large diffs are not rendered by default.

60 changes: 0 additions & 60 deletions bld/namelist_files/namelist_defaults_clm4_0.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,58 +400,6 @@ lnd/clm2/surfdata_map/surfdata_ne240np4_simyr1850_c130313.nc</fsurdat>
<flanduse_timeseries hgrid="ne60np4" sim_year_range="1850-2000" irrig=".false." crop="off">lnd/clm2/surfdata_map/surfdata.pftdyn_ne60np4_hist_simyr1850-2005_c120907.nc</flanduse_timeseries>
<flanduse_timeseries hgrid="ne120np4" sim_year_range="1850-2000" irrig=".false." crop="off">lnd/clm2/surfdata_map/surfdata.pftdyn_ne120np4_hist_simyr1850-2005_c130313.nc</flanduse_timeseries>

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

<!-- Dynamic PFT for glacier multiple elevation class -->
<flanduse_timeseries hgrid="0.9x1.25" rcp="2.6" glc_nec="10" sim_year_range="1850-2100" irrig=".false." crop="off">lnd/clm2/surfdata_map/surfdata.pftdyn_0.9x1.25_rcp2.6_simyr1850-2100_glcmec10_c120927.nc</flanduse_timeseries>
<flanduse_timeseries hgrid="1.9x2.5" rcp="2.6" glc_nec="10" sim_year_range="1850-2100" irrig=".false." crop="off">lnd/clm2/surfdata_map/surfdata.pftdyn_1.9x2.5_rcp2.6_simyr1850-2100_glcmec10_c120928.nc</flanduse_timeseries>
<flanduse_timeseries hgrid="48x96" rcp="2.6" glc_nec="10" sim_year_range="1850-2100" irrig=".false." crop="off">lnd/clm2/surfdata_map/surfdata.pftdyn_48x96_rcp2.6_simyr1850-2100_glcmec10_c120928.nc</flanduse_timeseries>

<flanduse_timeseries hgrid="0.9x1.25" rcp="4.5" glc_nec="10" sim_year_range="1850-2100" irrig=".false." crop="off">lnd/clm2/surfdata_map/surfdata.pftdyn_0.9x1.25_rcp4.5_simyr1850-2100_glcmec10_c120927.nc</flanduse_timeseries>
<flanduse_timeseries hgrid="1.9x2.5" rcp="4.5" glc_nec="10" sim_year_range="1850-2100" irrig=".false." crop="off">lnd/clm2/surfdata_map/surfdata.pftdyn_1.9x2.5_rcp4.5_simyr1850-2100_glcmec10_c120928.nc</flanduse_timeseries>
<flanduse_timeseries hgrid="48x96" rcp="4.5" glc_nec="10" sim_year_range="1850-2100" irrig=".false." crop="off">lnd/clm2/surfdata_map/surfdata.pftdyn_48x96_rcp4.5_simyr1850-2100_glcmec10_c120928.nc</flanduse_timeseries>

<flanduse_timeseries hgrid="0.9x1.25" rcp="6" glc_nec="10" sim_year_range="1850-2100" irrig=".false." crop="off">lnd/clm2/surfdata_map/surfdata.pftdyn_0.9x1.25_rcp6.0_simyr1850-2100_glcmec10_c120927.nc</flanduse_timeseries>
<flanduse_timeseries hgrid="1.9x2.5" rcp="6" glc_nec="10" sim_year_range="1850-2100" irrig=".false." crop="off">lnd/clm2/surfdata_map/surfdata.pftdyn_1.9x2.5_rcp6.0_simyr1850-2100_glcmec10_c120928.nc</flanduse_timeseries>
<flanduse_timeseries hgrid="48x96" rcp="6" glc_nec="10" sim_year_range="1850-2100" irrig=".false." crop="off">lnd/clm2/surfdata_map/surfdata.pftdyn_48x96_rcp6.0_simyr1850-2100_glcmec10_c120928.nc</flanduse_timeseries>

<flanduse_timeseries hgrid="0.9x1.25" rcp="8.5" glc_nec="10" sim_year_range="1850-2100" irrig=".false." crop="off">lnd/clm2/surfdata_map/surfdata.pftdyn_0.9x1.25_rcp8.5_simyr1850-2100_glcmec10_c120928.nc</flanduse_timeseries>
<flanduse_timeseries hgrid="1.9x2.5" rcp="8.5" glc_nec="10" sim_year_range="1850-2100" irrig=".false." crop="off">lnd/clm2/surfdata_map/surfdata.pftdyn_1.9x2.5_rcp8.5_simyr1850-2100_glcmec10_c120928.nc</flanduse_timeseries>
<flanduse_timeseries hgrid="48x96" rcp="8.5" glc_nec="10" sim_year_range="1850-2100" irrig=".false." crop="off">lnd/clm2/surfdata_map/surfdata.pftdyn_48x96_rcp8.5_simyr1850-2100_glcmec10_c120928.nc</flanduse_timeseries>

<!-- Other future scenario Dynamic PFT datasets -->
<flanduse_timeseries hgrid="0.47x0.63" rcp="8.5" sim_year_range="1850-2100" irrig=".false." crop="off">lnd/clm2/surfdata/surfdata.pftdyn_0.47x0.63_rcp8.5_simyr1850-2100_c120224.nc</flanduse_timeseries>
<flanduse_timeseries hgrid="0.9x1.25" rcp="8.5" sim_year_range="1850-2100" irrig=".false." crop="off">lnd/clm2/surfdata/surfdata.pftdyn_0.9x1.25_rcp8.5_simyr1850-2100_c130702.nc</flanduse_timeseries>
<flanduse_timeseries hgrid="1.9x2.5" rcp="8.5" sim_year_range="1850-2100" irrig=".false." crop="off">lnd/clm2/surfdata/surfdata.pftdyn_1.9x2.5_rcp8.5_simyr1850-2100_c130709.nc</flanduse_timeseries>
<flanduse_timeseries hgrid="10x15" rcp="8.5" sim_year_range="1850-2100" irrig=".false." crop="off">lnd/clm2/surfdata/surfdata.pftdyn_10x15_rcp8.5_simyr1850-2100_c140520.nc</flanduse_timeseries>
<flanduse_timeseries hgrid="48x96" rcp="8.5" sim_year_range="1850-2100" irrig=".false." crop="off">lnd/clm2/surfdata_map/surfdata.pftdyn_48x96_rcp8.5_simyr1850-2100_c140520.nc</flanduse_timeseries>
<flanduse_timeseries hgrid="ne30np4" rcp="8.5" sim_year_range="1850-2100" irrig=".false." crop="off">lnd/clm2/surfdata_map/surfdata.pftdyn_ne30np4_rcp8.5_simyr1850-2100_c140520.nc</flanduse_timeseries>
<flanduse_timeseries hgrid="ne120np4" rcp="8.5" sim_year_range="1850-2100" irrig=".false." crop="off">lnd/clm2/surfdata_map/surfdata.pftdyn_ne120np4_rcp8.5_simyr1850-2100_c130311.nc</flanduse_timeseries>

<flanduse_timeseries hgrid="0.47x0.63" rcp="6" sim_year_range="1850-2100" irrig=".false." crop="off">lnd/clm2/surfdata/surfdata.pftdyn_0.47x0.63_rcp6.0_simyr1850-2100_c120223.nc</flanduse_timeseries>
<flanduse_timeseries hgrid="0.9x1.25" rcp="6" sim_year_range="1850-2100" irrig=".false." crop="off">lnd/clm2/surfdata/surfdata.pftdyn_0.9x1.25_rcp6.0_simyr1850-2100_c130709.nc</flanduse_timeseries>
<flanduse_timeseries hgrid="1.9x2.5" rcp="6" sim_year_range="1850-2100" irrig=".false." crop="off">lnd/clm2/surfdata/surfdata.pftdyn_1.9x2.5_rcp6.0_simyr1850-2100_c130709.nc</flanduse_timeseries>
<flanduse_timeseries hgrid="10x15" rcp="6" sim_year_range="1850-2100" irrig=".false." crop="off">lnd/clm2/surfdata/surfdata.pftdyn_10x15_rcp6.0_simyr1850-2100_c140520.nc</flanduse_timeseries>
<flanduse_timeseries hgrid="48x96" rcp="6" sim_year_range="1850-2100" irrig=".false." crop="off">lnd/clm2/surfdata_map/surfdata.pftdyn_48x96_rcp6.0_simyr1850-2100_c140520.nc</flanduse_timeseries>
<flanduse_timeseries hgrid="ne30np4" rcp="6" sim_year_range="1850-2100" irrig=".false." crop="off">lnd/clm2/surfdata_map/surfdata.pftdyn_ne30np4_rcp6.0_simyr1850-2100_c121001.nc</flanduse_timeseries>
<flanduse_timeseries hgrid="ne120np4" rcp="6" sim_year_range="1850-2100" irrig=".false." crop="off">lnd/clm2/surfdata_map/surfdata.pftdyn_ne120np4_rcp6.0_simyr1850-2100_c130313.nc</flanduse_timeseries>

<flanduse_timeseries hgrid="0.47x0.63" rcp="4.5" sim_year_range="1850-2100" irrig=".false." crop="off">lnd/clm2/surfdata/surfdata.pftdyn_0.47x0.63_rcp4.5_simyr1850-2100_c120217.nc</flanduse_timeseries>
<flanduse_timeseries hgrid="0.9x1.25" rcp="4.5" sim_year_range="1850-2100" irrig=".false." crop="off">lnd/clm2/surfdata/surfdata.pftdyn_0.9x1.25_rcp4.5_simyr1850-2100_c100406.nc</flanduse_timeseries>
<flanduse_timeseries hgrid="1.9x2.5" rcp="4.5" sim_year_range="1850-2100" irrig=".false." crop="off">lnd/clm2/surfdata/surfdata.pftdyn_1.9x2.5_rcp4.5_simyr1850-2100_c100322.nc</flanduse_timeseries>
<flanduse_timeseries hgrid="10x15" rcp="4.5" sim_year_range="1850-2100" irrig=".false." crop="off">lnd/clm2/surfdata/surfdata.pftdyn_10x15_rcp4.5_simyr1850-2100_c100322.nc</flanduse_timeseries>
<flanduse_timeseries hgrid="48x96" rcp="4.5" sim_year_range="1850-2100" irrig=".false." crop="off">lnd/clm2/surfdata_map/surfdata.pftdyn_48x96_rcp4.5_simyr1850-2100_c120123.nc</flanduse_timeseries>
<flanduse_timeseries hgrid="ne30np4" rcp="4.5" sim_year_range="1850-2100" irrig=".false." crop="off">lnd/clm2/surfdata_map/surfdata.pftdyn_ne30np4_rcp4.5_simyr1850-2100_c121001.nc</flanduse_timeseries>
<flanduse_timeseries hgrid="ne120np4" rcp="4.5" sim_year_range="1850-2100" irrig=".false." crop="off">lnd/clm2/surfdata_map/surfdata.pftdyn_ne120np4_rcp4.5_simyr1850-2100_c130313.nc</flanduse_timeseries>

<flanduse_timeseries hgrid="0.47x0.63" rcp="2.6" sim_year_range="1850-2100" irrig=".false." crop="off">lnd/clm2/surfdata/surfdata.pftdyn_0.47x0.63_rcp2.6_simyr1850-2100_c120215.nc</flanduse_timeseries>
<flanduse_timeseries hgrid="0.9x1.25" rcp="2.6" sim_year_range="1850-2100" irrig=".false." crop="off">lnd/clm2/surfdata/surfdata.pftdyn_0.9x1.25_rcp2.6_simyr1850-2100_c100323.nc</flanduse_timeseries>
<flanduse_timeseries hgrid="1.9x2.5" rcp="2.6" sim_year_range="1850-2100" irrig=".false." crop="off">lnd/clm2/surfdata/surfdata.pftdyn_1.9x2.5_rcp2.6_simyr1850-2100_c100322.nc</flanduse_timeseries>
<flanduse_timeseries hgrid="10x15" rcp="2.6" sim_year_range="1850-2100" irrig=".false." crop="off">lnd/clm2/surfdata/surfdata.pftdyn_10x15_rcp2.6_simyr1850-2100_c100322.nc</flanduse_timeseries>
<flanduse_timeseries hgrid="48x96" rcp="2.6" sim_year_range="1850-2100" irrig=".false." crop="off">lnd/clm2/surfdata_map/surfdata.pftdyn_48x96_rcp2.6_simyr1850-2100_c120123.nc</flanduse_timeseries>
<flanduse_timeseries hgrid="ne30np4" rcp="2.6" sim_year_range="1850-2100" irrig=".false." crop="off">lnd/clm2/surfdata_map/surfdata.pftdyn_ne30np4_rcp2.6_simyr1850-2100_c121001.nc</flanduse_timeseries>
<flanduse_timeseries hgrid="ne120np4" rcp="2.6" sim_year_range="1850-2100" irrig=".false." crop="off">lnd/clm2/surfdata_map/surfdata.pftdyn_ne120np4_rcp2.6_simyr1850-2100_c130313.nc</flanduse_timeseries>

<!-- GLC mask datasets (relative to {csmdata}) -->
<fglcmask hgrid="48x96">glc/cism/griddata/glcmaskdata_48x96_gland_c141105.nc</fglcmask>
<!-- for f09, use the old version of this file, for compatibility with
Expand Down Expand Up @@ -512,14 +460,6 @@ lnd/clm2/surfdata_map/surfdata_ne240np4_simyr1850_c130313.nc</fsurdat>

<stream_fldfilename_ndep hgrid="1.9x2.5" bgc="cn">lnd/clm2/ndepdata/fndep_clm_hist_simyr1849-2006_1.9x2.5_c100428.nc</stream_fldfilename_ndep>
<stream_fldfilename_ndep hgrid="1.9x2.5" bgc="cndv">lnd/clm2/ndepdata/fndep_clm_hist_simyr1849-2006_1.9x2.5_c100428.nc</stream_fldfilename_ndep>
<stream_fldfilename_ndep hgrid="1.9x2.5" bgc="cn" rcp="8.5">lnd/clm2/ndepdata/fndep_clm_rcp8.5_simyr1849-2106_1.9x2.5_c100428.nc</stream_fldfilename_ndep>
<stream_fldfilename_ndep hgrid="1.9x2.5" bgc="cndv" rcp="8.5">lnd/clm2/ndepdata/fndep_clm_rcp8.5_simyr1849-2106_1.9x2.5_c100428.nc</stream_fldfilename_ndep>
<stream_fldfilename_ndep hgrid="1.9x2.5" bgc="cn" rcp="6">lnd/clm2/ndepdata/fndep_clm_rcp6.0_simyr1849-2106_1.9x2.5_c100810.nc</stream_fldfilename_ndep>
<stream_fldfilename_ndep hgrid="1.9x2.5" bgc="cndv" rcp="6">lnd/clm2/ndepdata/fndep_clm_rcp6.0_simyr1849-2106_1.9x2.5_c100810.nc</stream_fldfilename_ndep>
<stream_fldfilename_ndep hgrid="1.9x2.5" bgc="cn" rcp="4.5">lnd/clm2/ndepdata/fndep_clm_rcp4.5_simyr1849-2106_1.9x2.5_c100428.nc</stream_fldfilename_ndep>
<stream_fldfilename_ndep hgrid="1.9x2.5" bgc="cndv" rcp="4.5">lnd/clm2/ndepdata/fndep_clm_rcp4.5_simyr1849-2106_1.9x2.5_c100428.nc</stream_fldfilename_ndep>
<stream_fldfilename_ndep hgrid="1.9x2.5" bgc="cn" rcp="2.6">lnd/clm2/ndepdata/fndep_clm_rcp2.6_simyr1849-2106_1.9x2.5_c100428.nc</stream_fldfilename_ndep>
<stream_fldfilename_ndep hgrid="1.9x2.5" bgc="cndv" rcp="2.6">lnd/clm2/ndepdata/fndep_clm_rcp2.6_simyr1849-2106_1.9x2.5_c100428.nc</stream_fldfilename_ndep>

<ndepmapalgo bgc="cn">bilinear</ndepmapalgo>
<ndepmapalgo bgc="cndv">bilinear</ndepmapalgo>
Expand Down
Loading