Skip to content

Commit

Permalink
Merge pull request #651 from ekluzek/newsrfdataAntwetlndsfix
Browse files Browse the repository at this point in the history 
New datasets and capability to run CMIP6 future scenarios...
  • Loading branch information
@ekluzek
ekluzek authored Mar 12, 2019
2 parents aa213cc + f3eb2a2 commit c9868bf
Show file tree
Hide file tree
Showing 35 changed files with 813 additions and 795 deletions.
120 changes: 66 additions & 54 deletions bld/CLMBuildNamelist.pm
View file

Large diffs are not rendered by default.

60 changes: 0 additions & 60 deletions bld/namelist_files/namelist_defaults_clm4_0.xml
View file
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

0 comments on commit c9868bf

Please sign in to comment.