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

Jump to bottom

Fixes F compsets to support ne4np4 #3333

Merged
merged 2 commits into from
Feb 7, 2020
Merged

Fixes F compsets to support ne4np4 #3333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0487b92
Fixes F2010C5-CMIP6-LR for ne4np4
bishtgautam Dec 3, 2019
e951011
Fixes F1850SC5-CMIP6 and F2010C5-CMIP6-HR
bishtgautam Dec 4, 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
27 changes: 25 additions & 2 deletions components/clm/bld/namelist_files/namelist_defaults_clm4_5.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,12 @@ ic_tod="0" sim_year="1850" glc_nec="0" use_crop=".false." >lnd/clm2/initdata_map
ic_tod="0" sim_year="2000" glc_nec="0" use_crop=".false." >lnd/clm2/initdata_map/clmi.ICRUCLM45.ne16_oQU240.1155ba0.clm2.r.nc
</finidat>

<!-- HOMME grid ne30 resolution -->

<finidat hgrid="ne30np4" maxpft="17" mask="gx1v6" use_cn=".false." ic_ymd="20150101" more_vertlayers=".false."
ic_tod="0" sim_year="2015" glc_nec="0" use_crop=".false." >lnd/clm2/initdata_map/20180716.DECKv1b_A3.ne30_oEC.edison.clm2.r.2010-01-01-00000.nc
</finidat>

<!-- HOMME grid ne120 resolution -->

<finidat hgrid="ne120np4" maxpft="17" mask="gx1v6" use_cn=".false." ic_ymd="18500101" more_vertlayers=".false."
Expand All @@ -166,6 +172,10 @@ ic_tod="0" sim_year="1850" glc_nec="0" use_crop=".false." >lnd/clm2/initdata_map
ic_tod="0" sim_year="2000" glc_nec="0" use_crop=".false." >lnd/clm2/initdata_map/clmi.ICRUCLM45.ne120_oRRS18v3.be55494.clm2.r.nc
</finidat>

<finidat hgrid="ne120np4" maxpft="17" mask="gx1v6" use_cn=".false." ic_ymd="20150101" more_vertlayers=".false."
ic_tod="0" sim_year="2015" glc_nec="0" use_crop=".false." >lnd/clm2/initdata_map/cori-knl.20190214_maint-1.0.F2010-CMIP6-HR.noCNT.ARE.nudgeUV.ne120_oRRS18v3.clm2.r.2011-01-01-00000.nc
</finidat>

<!-- HOMME grid ne240 resolution -->
<finidat hgrid="ne240np4" maxpft="17" mask="tx0.1v2" use_cn=".false." ic_ymd="18500101" more_vertlayers=".false."
ic_tod="0" sim_year="1850" glc_nec="0" use_crop=".false." >lnd/clm2/initdata_map/clmi.I1850CLM45.0521-01-01.ne240np4_tx0.1v2.162cd32_simyr1850_c170910.nc
Expand Down Expand Up @@ -194,6 +204,14 @@ ic_tod="0" sim_year="2000" glc_nec="0" use_crop=".true." irrigate=".true." nu_co
<finidat hgrid="ne0np4_enax4v1" sim_year="2000">lnd/clm2/initdata_map/clmi.ICRUCLM45SP.2000-01-01.enax4v1_oRRS18to6_simyr2000_c170621.nc</finidat>
<finidat hgrid="ne0np4_twpx4v1" ic_ymd="101" sim_year="2000">lnd/clm2/initdata_map/clmi.ICRUCLM45SP.2000-01-01.twpx4v1_oRRS18to6v3_simyr2000_c170712.nc</finidat>

<!-- for present day simulations - year 1950 -->
<fsurdat hgrid="ne120np4" sim_year="1950" >
lnd/clm2/surfdata_map/surfdata_ne120np4_simyr1950_c20180108.nc</fsurdat>

<!-- for present day simulations - year 2015 -->
<fsurdat hgrid="ne120np4" sim_year="2015" >
lnd/clm2/surfdata_map/surfdata_ne120np4_simyr2010_c20181023.nc</fsurdat>

<!-- for present day simulations - year 2000 -->
<fsurdat hgrid="360x720cru" sim_year="2000" use_crop=".false." >
lnd/clm2/surfdata_map/surfdata_360x720cru_simyr2000_c180216.nc</fsurdat>
Expand Down Expand Up @@ -251,6 +269,11 @@ lnd/clm2/surfdata_map/surfdata_1x1_mexicocityMEX_simyr2000_c130927.nc</fsurdat>
<fsurdat hgrid="1x1_urbanc_alpha" sim_year="2000" use_crop=".false." >
lnd/clm2/surfdata_map/surfdata_1x1_urbanc_alpha_simyr2000_c130927.nc</fsurdat>

<fsurdat hgrid="ne30np4" sim_year="2015" use_crop=".false.">
lnd/clm2/surfdata_map/surfdata_ne30np4_simyr2010_c20181025.nc</fsurdat>
<fsurdat hgrid="ne4np4" sim_year="2015" use_crop=".false.">
lnd/clm2/surfdata_map/surfdata_ne4np4_simyr2000_c160614.nc</fsurdat>

<!-- for pre-industrial simulations - year 1850 -->
<fsurdat hgrid="360x720cru" sim_year="1850" use_crop=".false." >
lnd/clm2/surfdata_map/surfdata_360x720cru_simyr1850_c180216.nc</fsurdat>
Expand All @@ -271,7 +294,7 @@ lnd/clm2/surfdata_map/surfdata_1x1_brazil_simyr1850_c140610.nc</fsurdat>


<fsurdat hgrid="ne30np4" sim_year="1850" use_crop=".false." >
lnd/clm2/surfdata_map/surfdata_ne30np4_simyr1850_c180306.nc</fsurdat>
lnd/clm2/surfdata_map/surfdata_ne30np4_simyr1850_2015_c171018.nc</fsurdat>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is the timestamp going backwards? From 180306 to 171018 ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because all supported 1850 compsets were using the older file. (e.g. https://github.com/E3SM-Project/E3SM/pull/3333/files#diff-7ece8b6f482388c76e3a4cab97c792eeL34)

Copy link
Contributor

@cameronsmith1 cameronsmith1 Dec 5, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The c171018 file is the surfdata file used in the CMIP6 compsets. I don't know where the c180306 file came from, or why it is a default. (I entered this comment before I saw the comment from @bishtgautam )

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where did the c180306 file come from?
What was it for?

<fsurdat hgrid="ne16np4" sim_year="1850" use_crop=".false." >
lnd/clm2/surfdata_map/surfdata_ne16np4_simyr1850_c160108.nc</fsurdat>
<fsurdat hgrid="ne120np4" sim_year="1850" >
Expand Down Expand Up @@ -334,7 +357,7 @@ lnd/clm2/surfdata_map/surfdata_twpx4v1_simyr2000_c170706.nc</fsurdat>
use_crop=".false." >lnd/clm2/surfdata_map/landuse.timeseries_1x1_brazil_rcp8.5_simyr1850-2100_c140610.nc</flanduse_timeseries>

<flanduse_timeseries hgrid="ne30np4" sim_year_range="1850-2000"
use_crop=".false." >lnd/clm2/surfdata_map/landuse.timeseries_ne30np4_hist_simyr1850-2015_c180306.nc</flanduse_timeseries>
use_crop=".false." >landuse.timeseries_ne30np4_hist_simyr1850_c20171102.nc</flanduse_timeseries>
<flanduse_timeseries hgrid="ne16np4" sim_year_range="1850-2000"
use_crop=".false." >lnd/clm2/surfdata_map/surfdata.pftdyn_ne16np4_hist_simyr1850-2005_c160803.nc</flanduse_timeseries>
<flanduse_timeseries hgrid="ne11np4" sim_year_range="1850-2000"
Expand Down
2 changes: 0 additions & 2 deletions components/clm/bld/namelist_files/use_cases/1850_CMIP6_control.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@

<!-- CMIP6 DECK compsets -->

<fsurdat>lnd/clm2/surfdata_map/surfdata_ne30np4_simyr1850_2015_c171018.nc </fsurdat>
<flanduse_timeseries>lnd/clm2/surfdata_map/landuse.timeseries_ne30np4_hist_simyr1850_c20171102.nc </flanduse_timeseries>
<finidat mask="oEC60to30v3">lnd/clm2/initdata_map/I1850CLM45.ne30_oECv3.edison.intel.36b43c9.clm2.r.0001-01-06-00000_c20171023.nc </finidat>

</namelist_defaults>
1 change: 0 additions & 1 deletion components/clm/bld/namelist_files/use_cases/1850_CMIP6bgc_control.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,5 @@

<!-- CMIP6 DECK compsets -->

<fsurdat>lnd/clm2/surfdata_map/surfdata_ne30np4_simyr1850_2015_c171018.nc </fsurdat>
<flanduse_timeseries>lnd/clm2/surfdata_map/landuse.timeseries_ne30np4_hist_simyr1850_c20171102.nc </flanduse_timeseries>
</namelist_defaults>
2 changes: 0 additions & 2 deletions components/clm/bld/namelist_files/use_cases/1850_SCMIP6_control.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@

<!-- CMIP6 DECK compsets -->

<fsurdat>lnd/clm2/surfdata_map/surfdata_ne30np4_simyr1850_2015_c171018.nc </fsurdat>
<flanduse_timeseries>lnd/clm2/surfdata_map/landuse.timeseries_ne30np4_hist_simyr1850_c20171102.nc </flanduse_timeseries>
<finidat mask="oEC60to30v3">lnd/clm2/initdata_map/I1850CLM45.ne30_oECv3.edison.intel.36b43c9.clm2.r.0001-01-06-00000_c20171023.nc </finidat>
<check_finidat_year_consistency>.false.</check_finidat_year_consistency>

Expand Down
1 change: 0 additions & 1 deletion components/clm/bld/namelist_files/use_cases/1950_CMIP6HR_control.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
<stream_year_last_popdens phys="clm4_5" use_cn=".true." ndepsrc="stream" >1955</stream_year_last_popdens>

<!-- CMIP6 HighResMIP compsets -->
<fsurdat hgrid="ne120np4" >lnd/clm2/surfdata_map/surfdata_ne120np4_simyr1950_c20180108.nc </fsurdat>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bishtgautam , why do some compsets still have finidat defined in the use_case xml file? I thought your plan was to move them all to the defaults xml file.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I only made changes for fsurdat + finidat for F1850SC5-CMIP6, F2010C5-CMIP6-LR, and F2010C5-CMIP6-HR. While change for fsurdat is straightforward, the finidat is a little complicated. If you provide me with res+compset for all CMIP6 compsets that are supported in maint-1.0, I will make relevant changes.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not sure about other CMIP6 F-compsets, but there are what I used on maint-1.0:
F1850SC5-CMIP6.ne30
F2010C5-CMIP6-LR.ne30
F2010C5-CMIP6-HR.ne120

I made the comment above on the 1950 file, but it is also true for 1850_CMIP6_control.xml and 1850_SCMIP6_control.xml (one of which is used by F1850SC5-CMIP6) that contain the finidat setting. Is there a reason why it's not moved to the default file? As long as there is a reason for that (not overlooked), I am fine with the changes.

<finidat hgrid="ne120np4" >lnd/clm2/initdata_map/clmi.A_WCYCL1950.ne120np4_oRRS18to6v3_ICG_simyr1950_c20180124.nc </finidat>

</namelist_defaults>
2 changes: 0 additions & 2 deletions components/clm/bld/namelist_files/use_cases/2010_CMIP6HR_control.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
<stream_year_last_popdens phys="clm4_5" use_cn=".true." ndepsrc="stream" >2015</stream_year_last_popdens>

<!-- CMIP6 HighResMIP compsets -->
<fsurdat hgrid="ne120np4" >lnd/clm2/surfdata_map/surfdata_ne120np4_simyr2010_c20181023.nc </fsurdat>
<finidat hgrid="ne120np4" >lnd/clm2/initdata_map/cori-knl.20190214_maint-1.0.F2010-CMIP6-HR.noCNT.ARE.nudgeUV.ne120_oRRS18v3.clm2.r.2011-01-01-00000.nc </finidat>
<check_finidat_pct_consistency>.false.</check_finidat_pct_consistency>

</namelist_defaults>
4 changes: 0 additions & 4 deletions components/clm/bld/namelist_files/use_cases/2010_CMIP6LR_control.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,4 @@
<stream_year_first_popdens phys="clm4_5" use_cn=".true." ndepsrc="stream" >2015</stream_year_first_popdens>
<stream_year_last_popdens phys="clm4_5" use_cn=".true." ndepsrc="stream" >2015</stream_year_last_popdens>

<!-- CMIP6 DECK compsets -->
<fsurdat hgrid="ne30np4" >lnd/clm2/surfdata_map/surfdata_ne30np4_simyr2010_c20181025.nc </fsurdat>
<finidat hgrid="ne30np4" >lnd/clm2/initdata_map/20180716.DECKv1b_A3.ne30_oEC.edison.clm2.r.2010-01-01-00000.nc </finidat>

</namelist_defaults>
1 change: 0 additions & 1 deletion components/clm/bld/namelist_files/use_cases/2015-2100_SSP585_transient.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@

<!-- CMIP6 DECK compsets -->

<fsurdat>lnd/clm2/surfdata_map/surfdata_ne30np4_simyr1850_2015_c171018.nc </fsurdat>
<flanduse_timeseries>lnd/clm2/surfdata_map/landuse.timeseries_ne30np4_ssp5_rcp8.5_simyr2015-2100_c190411.nc</flanduse_timeseries>
<finidat>lnd/clm2/initdata_map/20180215.DECKv1b_H1.ne30_oEC.edison.clm2.r.2015-01-01-00000.nc</finidat>
<check_finidat_year_consistency>.true.</check_finidat_year_consistency>
Expand Down
1 change: 0 additions & 1 deletion components/clm/bld/namelist_files/use_cases/20thC_CMIP6_transient.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@

<!-- CMIP6 DECK compsets -->

<fsurdat>lnd/clm2/surfdata_map/surfdata_ne30np4_simyr1850_2015_c171018.nc </fsurdat>
<flanduse_timeseries>lnd/clm2/surfdata_map/landuse.timeseries_ne30np4_hist_simyr1850_2015_c20171018.nc</flanduse_timeseries>
<finidat mask="oEC60to30v3">lnd/clm2/initdata_map/I1850CLM45.ne30_oECv3.edison.intel.36b43c9.clm2.r.0001-01-06-00000_c20171023.nc</finidat>
<check_finidat_year_consistency>.false.</check_finidat_year_consistency>
Expand Down
1 change: 0 additions & 1 deletion components/clm/bld/namelist_files/use_cases/20thC_CMIP6bgc_transient.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@

<!-- CMIP6 DECK compsets -->

<fsurdat>lnd/clm2/surfdata_map/surfdata_ne30np4_simyr1850_2015_c171018.nc </fsurdat>
<flanduse_timeseries>lnd/clm2/surfdata_map/landuse.timeseries_ne30np4_hist_simyr1850_c20171102.nc </flanduse_timeseries>

</namelist_defaults>