Skip to content

Commit

Permalink
Merge pull request #2490 from slevis-lmwg/vr_grid_updates
Browse files Browse the repository at this point in the history
CTSM5.2 1979 fsurdat and 1979-2026 landuse ne0np4 files + 2 fixes
  • Loading branch information
slevis-lmwg authored May 9, 2024
2 parents 9a28e2a + f997494 commit 7cf411a
Show file tree
Hide file tree
Showing 8 changed files with 143 additions and 15 deletions.
20 changes: 14 additions & 6 deletions bld/namelist_files/namelist_defaults_ctsm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -939,12 +939,12 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
>hgrid=1.9x2.5 maxpft=17 mask=gx1v7 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false.
</init_interp_attributes>

<init_interp_attributes sim_year="1979" use_cndv=".false." use_fates=".false." lnd_tuning_mode="clm5_0_cam6.0"
<init_interp_attributes sim_year="1979" use_cndv=".false." use_fates=".false." lnd_tuning_mode="clm6_0_cam6.0"
hgrid="ne0np4.ARCTIC.ne30x4" use_cn=".false." maxpft="17"
>hgrid=ne0np4.ARCTIC.ne30x4 maxpft=17 mask=tx0.1v2 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false.
</init_interp_attributes>

<init_interp_attributes sim_year="1979" use_cndv=".false." use_fates=".false." lnd_tuning_mode="clm5_0_cam6.0"
<init_interp_attributes sim_year="1979" use_cndv=".false." use_fates=".false." lnd_tuning_mode="clm6_0_cam6.0"
hgrid="ne0np4.ARCTICGRIS.ne30x8" use_cn=".false." maxpft="17"
>hgrid=ne0np4.ARCTICGRIS.ne30x8 maxpft=17 mask=tx0.1v2 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false.
</init_interp_attributes>
Expand All @@ -956,7 +956,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
</init_interp_attributes>

<!-- 2013 IC's - exact match for CONUS grid ... -->
<init_interp_attributes sim_year="2013" use_cndv=".false." use_fates=".false." lnd_tuning_mode="clm5_0_cam6.0"
<init_interp_attributes sim_year="2013" use_cndv=".false." use_fates=".false." lnd_tuning_mode="clm6_0_cam6.0"
hgrid="ne0np4CONUS.ne30x8" use_cn=".false." maxpft="17"
>hgrid=ne0np4CONUS.ne30x8 maxpft=17 mask=tx0.1v2 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false.
</init_interp_attributes>
Expand Down Expand Up @@ -1471,11 +1471,11 @@ lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_ne16np4.pg3_hist_1850_78pfts_c240216.n
<fsurdat hgrid="ne120np4.pg3" sim_year="1850">
lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_ne120np4.pg3_hist_1850_78pfts_c240216.nc</fsurdat>
<fsurdat hgrid="ne0np4.ARCTICGRIS.ne30x8" sim_year="1850">
lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_ne0np4.ARCTICGRIS.ne30x8_hist_1850_78pfts_c240216.nc</fsurdat>
lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_ne0np4.ARCTICGRIS.ne30x8_hist_1979_78pfts_c240425.nc</fsurdat>
<fsurdat hgrid="ne0np4.ARCTIC.ne30x4" sim_year="1850">
lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_ne0np4.ARCTIC.ne30x4_hist_1850_78pfts_c240216.nc</fsurdat>
lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_ne0np4.ARCTIC.ne30x4_hist_1979_78pfts_c240425.nc</fsurdat>
<fsurdat hgrid="ne0np4CONUS.ne30x8" sim_year="1850">
lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_ne0np4CONUS.ne30x8_hist_1850_78pfts_c240216.nc</fsurdat>
lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_ne0np4CONUS.ne30x8_hist_1979_78pfts_c240425.nc</fsurdat>

<!-- Potential vegetation land use dataset, crop is off, and zeroed, all areas are natural vegetation without human disturbance -->
<fsurdat hgrid="0.9x1.25" sim_year="PtVg" use_crop=".false."
Expand All @@ -1500,6 +1500,7 @@ lnd/clm2/surfdata_esmf/NEON/surfdata_1x1_NEON_TOOL_hist_78pfts_CMIP6_simyr2000_c
>lnd/clm2/surfdata_esmf/NEON/landuse.timeseries_NEON_${NEONSITE}_hist_78pfts_simyr2018-2023_c230931.nc</flanduse_timeseries>
-->

<!-- Historical 1850-2000 -->
<flanduse_timeseries hgrid="0.9x1.25" sim_year_range="1850-2000"
>lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_0.9x1.25_SSP2-4.5_1850-2100_78pfts_c240216.nc</flanduse_timeseries>
<flanduse_timeseries hgrid="1.9x2.5" sim_year_range="1850-2000"
Expand Down Expand Up @@ -1573,6 +1574,13 @@ lnd/clm2/surfdata_esmf/NEON/surfdata_1x1_NEON_TOOL_hist_78pfts_CMIP6_simyr2000_c
<flanduse_timeseries hgrid="C96" sim_year_range="1850-2100" ssp_rcp="SSP2-4.5"
>lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_C96_SSP2-4.5_1850-2100_78pfts_c240216.nc</flanduse_timeseries>

<flanduse_timeseries hgrid="ne0np4.ARCTICGRIS.ne30x8" sim_year_range="1850-2100" ssp_rcp="SSP2-4.5"
>lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_ne0np4.ARCTICGRIS.ne30x8_SSP2-4.5_1979-2026_78pfts_c240425.nc</flanduse_timeseries>
<flanduse_timeseries hgrid="ne0np4.ARCTIC.ne30x4" sim_year_range="1850-2100" ssp_rcp="SSP2-4.5"
>lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_ne0np4.ARCTIC.ne30x4_SSP2-4.5_1979-2026_78pfts_c240425.nc</flanduse_timeseries>
<flanduse_timeseries hgrid="ne0np4CONUS.ne30x8" sim_year_range="1850-2100" ssp_rcp="SSP2-4.5"
>lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_ne0np4CONUS.ne30x8_SSP2-4.5_1979-2026_78pfts_c240425.nc</flanduse_timeseries>

<!-- SSP3-RCP7.0 - relative to {csmdata}) -->
<flanduse_timeseries hgrid="0.9x1.25" sim_year_range="1850-2100" ssp_rcp="SSP3-7.0"
>lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_0.9x1.25_SSP3-7.0_1850-2100_78pfts_c240216.nc</flanduse_timeseries>
Expand Down
1 change: 1 addition & 0 deletions cime_config/config_component.xml
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,7 @@
<value compset="^SSP370_" >1850-2100_SSP3-7.0_transient</value>
<value compset="^SSP534_" >1850-2100_SSP5-3.4_transient</value>
<value compset="^SSP245_" >1850-2100_SSP2-4.5_transient</value>
<value compset="^HIST" grid="ne0np4" >1850-2100_SSP2-4.5_transient</value>
<value compset="^SSP119_" >1850-2100_SSP1-1.9_transient</value>
<value compset="^SSP434_" >1850-2100_SSP4-3.4_transient</value>
<value compset="^SSP460_" >1850-2100_SSP4-6.0_transient</value>
Expand Down
2 changes: 1 addition & 1 deletion cime_config/testdefs/ExpectedTestFails.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<!-- ctsm_sci test suite failures -->
<test name="RXCROPMATURITY_Lm61.f09_g17.IHistClm50BgcCrop.derecho_intel.clm-cropMonthOutput">
<phase name="RUN">
<status>PEND</status>
<status>FAIL</status>
<issue>#2460</issue>
</phase>
</test>
Expand Down
14 changes: 6 additions & 8 deletions cime_config/testdefs/testlist_clm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2034,17 +2034,16 @@
<option name="wallclock">00:20:00</option>
</options>
</test>
<test name="ERS_Ln9" grid="ne0ARCTICne30x4_ne0ARCTICne30x4_mt12" compset="I1850Clm60Sp" testmods="clm/clm60cam6LndTuningMode_1979Start">
<test name="SMS_Ln9" grid="ne0ARCTICne30x4_ne0ARCTICne30x4_mt12" compset="IHistClm60Sp" testmods="clm/clm60cam6LndTuningMode_1979Start">
<machines>
<machine name="derecho" compiler="intel" category="ctsm_sci"/>
</machines>
<options>
<option name="wallclock">00:20:00</option>
<option name="comment" >Run ARCTIC for transient case starting in 1979 as for AMIP CAM cases, with latest CLM version
(no need to run this high core count test with every tag, but include it in the less frequent ctsm_sci testing)"</option>
<option name="comment" >Run ARCTIC for transient case starting in 1979 as for AMIP CAM cases (no need to run this high core count test with every tag, but include it in the less frequent ctsm_sci testing)"</option>
</options>
</test>
<test name="SMS_Ln9" grid="ne0ARCTICGRISne30x8_ne0ARCTICGRISne30x8_mt12" compset="I2000Clm60Sp" testmods="clm/clm60cam6LndTuningMode_1979Start">
<test name="SMS_Ln9" grid="ne0ARCTICGRISne30x8_ne0ARCTICGRISne30x8_mt12" compset="IHistClm60Sp" testmods="clm/clm60cam6LndTuningMode_1979Start">
<machines>
<machine name="derecho" compiler="intel" category="ctsm_sci"/>
</machines>
Expand All @@ -2059,10 +2058,10 @@
</machines>
<options>
<option name="wallclock">00:40:00</option>
<option name="comment" >Run ARCTICGRIS for future transient case (do not run this expensive test with every tag, but include it in the less frequent ctsm_sci testing)"</option>
<option name="comment" >Run ARCTICGRIS for 1850 case (do not run this expensive test with every tag, but include it in the less frequent ctsm_sci testing)"</option>
</options>
</test>
<test name="SMS_Ln9" grid="ne0CONUSne30x8_ne0CONUSne30x8_mt12" compset="I1850Clm60Sp" testmods="clm/clm60cam6LndTuningMode_2013Start">
<test name="SMS_Ln9" grid="ne0CONUSne30x8_ne0CONUSne30x8_mt12" compset="IHistClm60Sp" testmods="clm/clm60cam6LndTuningMode_2013Start">
<machines>
<machine name="derecho" compiler="intel" category="ctsm_sci"/>
</machines>
Expand Down Expand Up @@ -2141,12 +2140,11 @@
</test>
<test name="SMS_Ln9" grid="ne3pg3_ne3pg3_mg37" compset="I2000Clm50Sp" testmods="clm/clm50cam6LndTuningMode">
<machines>
<machine name="cheyenne" compiler="gnu" category="aux_clm"/>
<machine name="derecho" compiler="gnu" category="aux_clm"/>
</machines>
<options>
<option name="wallclock">00:20:00</option>
<option name="comment" >Run course resolution ne3pg3_ne3pg3_mg37 to make sure will work for CAM"</option>
<option name="comment" >Run coarse resolution ne3pg3_ne3pg3_mg37 to make sure will work for CAM"</option>
</options>
</test>
<test name="SMS_D" grid="f10_f10_mg37" compset="I2000Clm60BgcCrop" testmods="clm/crop">
Expand Down
105 changes: 105 additions & 0 deletions doc/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,4 +1,109 @@
===============================================================
Tag name: ctsm5.2.004
Originator(s): slevis (Samuel Levis,UCAR/TSS,303-665-1310)
Date: Thu 09 May 2024 03:10:52 PM MDT
One-line Summary: CTSM5.2 1979 fsurdat and 1979-2026 landuse ne0np4 files + two fixes

Purpose and description of changes
----------------------------------

Includes work by multiple people:
@slevis-lmwg: new fsurdat/landuse files and corresponding infrastructure for
the three so-called VR grids (ne0np4)
@samsrabin: a subset_data fix
@olyson: corrections to a couple of history long-names and updates to
history_fields_fates.rst and history_fields_nofates.rst


Significant changes to scientifically-supported configurations
--------------------------------------------------------------

Does this tag change answers significantly for any of the following physics configurations?
(Details of any changes will be given in the "Answer changes" section below.)

[Put an [X] in the box for any configuration with significant answer changes.]

[ ] clm6_0

[ ] clm5_1

[ ] clm5_0

[ ] ctsm5_0-nwp

[ ] clm4_5


Bugs fixed
----------
List of CTSM issues fixed (include CTSM Issue # and description) [one per line]:
Fixes #2487 VR grids
Fixes #2527 subset_data is broken
Fixes #2511 a hist long name is incorrect
Fixes #2506 a hist long name is incorrect

Notes of particular relevance for users
---------------------------------------
Changes made to namelist defaults (e.g., changed parameter values):
The so-called VR grids now use 1979 fsurdat files for 1850 compsets
and 1979-2026 landuse for historical compsets. The latter cross over into
SSP years and use SSP2-4.5 for that.

Changes to the datasets (e.g., parameter, surface or initial files):
Same comment.

Changes to documentation:
See Purpose and Description above.

Substantial timing or memory changes:
Not considered.

Notes of particular relevance for developers:
---------------------------------------------
Changes to tests or testing:
Updated the ctsm_sci tests for the three VR grids.

Testing summary:
----------------
[PASS means all tests PASS; OK means tests PASS other than expected fails.]

build-namelist tests (if CLMBuildNamelist.pm has changed):

derecho - PASS

python testing (if python code has changed; see instructions in python/README.md; document testing done):

derecho - PASS

regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing):

derecho ----- OK
izumi ------- OK

any other testing (give details below):

ctsm_sci
derecho ---- OK


Answer changes
--------------

Changes answers relative to baseline: NO

However, note that the ctsm_sci test-suite showed diffs in
- Fates cases as expected since the last available baseline was ctsm_sci-ctsm5.2.0.
- the preexisting VR grid test for 1850 as expected since the fsurdat changed to 1979.

Other details
-------------
Pull Requests that document the changes (include PR ids):
https://github.com/ESCOMP/ctsm/pull/2590
https://github.com/ESCOMP/ctsm/pull/2512
https://github.com/ESCOMP/ctsm/pull/2528

===============================================================
===============================================================
Tag name: ctsm5.2.003
Originator(s): samrabin (Sam Rabin, UCAR/TSS, [email protected])
Date: Thu May 2 14:06:54 MDT 2024
Expand Down
1 change: 1 addition & 0 deletions doc/ChangeSum
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Tag Who Date Summary
============================================================================================================================
ctsm5.2.004 multiple 05/09/2024 CTSM5.2 1979 fsurdat and 1979-2026 landuse ne0np4 files + two fixes
ctsm5.2.003 samrabin 05/02/2024 Merge b4b-dev
ctsm5.2.002 glemieux 04/26/2024 FATES default allometry parameter file update
ctsm5.2.001 erik 04/22/2024 Merge b4b-dev
Expand Down
10 changes: 10 additions & 0 deletions python/ctsm/toolchain/gen_mksurfdata_jobscript_multi.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
"crop-global-SSP2-4.5-f19",
"crop-global-SSP2-4.5-f10",
"crop-global-SSP2-4.5-f45",
"crop-global-SSP2-4.5-ne0np4",
"crop-global-SSP2-4.5-ne3",
"crop-global-SSP2-4.5-ne16",
"crop-global-SSP2-4.5-ne30",
Expand Down Expand Up @@ -204,6 +205,11 @@ def main():
"ne3": ["ne3np4.pg3"],
"ne16": ["ne16np4.pg3"],
"ne30": ["ne30np4.pg3", "ne30np4.pg2", "ne30np4"],
"ne0np4": [
"ne0np4.ARCTICGRIS.ne30x8",
"ne0np4.ARCTIC.ne30x4",
"ne0np4CONUS.ne30x8",
],
"ne120": [
"ne0np4.ARCTICGRIS.ne30x8",
"ne0np4.ARCTIC.ne30x4",
Expand Down Expand Up @@ -333,6 +339,10 @@ def main():
"--start-year 1850 --end-year 2100 --nosurfdata --ssp-rcp SSP2-4.5 --res",
"f45",
),
"crop-global-SSP2-4.5-ne0np4": (
"--start-year 1979 --end-year 2026 --ssp-rcp SSP2-4.5 --res",
"ne0np4",
),
"crop-global-SSP2-4.5-ne3": (
"--start-year 1850 --end-year 2100 --nosurfdata --ssp-rcp SSP2-4.5 --res",
"ne3",
Expand Down
5 changes: 5 additions & 0 deletions tools/mksurfdata_esmf/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,7 @@ crop-global-SSP2-4.5 : crop-global-SSP2-4.5-f09 \
crop-global-SSP2-4.5-hcru \
crop-global-SSP2-4.5-ne16 \
crop-global-SSP2-4.5-ne30 \
crop-global-SSP2-4.5-ne0np4 \
crop-global-SSP2-4.5-C96 \
crop-global-SSP2-4.5-mpasa120

Expand Down Expand Up @@ -318,6 +319,10 @@ crop-global-SSP2-4.5-ne30 : FORCE
$(MKSURFDATA) --number-of-nodes 9 --scenario $@ --jobscript-file $@.sh --walltime 12:00:00
$(BATCHJOBS) $@.sh

crop-global-SSP2-4.5-ne0np4 : FORCE
$(MKSURFDATA) --number-of-nodes 2 --scenario $@ --jobscript-file $@.sh --walltime 12:00:00
$(BATCHJOBS) $@.sh

crop-global-SSP2-4.5-C96 : FORCE
$(MKSURFDATA) --number-of-nodes 9 --scenario $@ --jobscript-file $@.sh --walltime 12:00:00
$(BATCHJOBS) $@.sh
Expand Down

0 comments on commit 7cf411a

Please sign in to comment.