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

CTSM5.2 1979 fsurdat and 1979-2026 landuse ne0np4 files #2490

Merged
merged 12 commits into from
May 9, 2024
Merged

CTSM5.2 1979 fsurdat and 1979-2026 landuse ne0np4 files #2490

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d863c13
Add 1979 and 1979-2026 ne0np4 files to namelist defaults
slevis-lmwg Apr 25, 2024
c4debee
Replace 3 vr-grid test compsets with ISSP245Clm50BgcCrop compset
slevis-lmwg Apr 26, 2024
73ac9d7
Remove sim_year_range from new flanduse_timeseries for xml file to work
slevis-lmwg Apr 26, 2024
e95f9ea
Add to Makefile for automatic generation 1979-2026 fsurdat/landuse files
slevis-lmwg Apr 26, 2024
de8406b
Update namelist_defaults_ctsm.xml for 1979 fsurdat files
slevis-lmwg Apr 30, 2024
99d7100
Draft modifications to address new compset and new test for 1979-2026
slevis-lmwg Apr 30, 2024
75cdcd2
Improve a comment in namelist_defaults_ctsm.xml
slevis-lmwg Apr 30, 2024
c063060
Request same #tasks in Makefile as when I generated the ne0np4 files
slevis-lmwg Apr 30, 2024
89a4d1d
Update ctsm_sci tests for 3 VR grids
slevis-lmwg May 7, 2024
b64ceb6
Change an expected failure "status" from PEND to FAIL
slevis-lmwg May 8, 2024
d2cccd8
Merge remote-tracking branch 'escomp/master' into vr_grid_updates
slevis-lmwg May 9, 2024
f997494
Updated ChangeLog/ChangeSum
slevis-lmwg May 9, 2024
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
14 changes: 11 additions & 3 deletions bld/namelist_files/namelist_defaults_ctsm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1469,11 +1469,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 @@ -1498,6 +1498,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 (SSP2 label is irrelevant in these files) -->
<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 @@ -1571,6 +1572,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
View file
Open in desktop
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_ne0np4" >1850-2100_SSP2-4.5_transient</value>
ekluzek marked this conversation as resolved.
Show resolved Hide resolved
<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
14 changes: 6 additions & 8 deletions cime_config/testdefs/testlist_clm.xml
View file
Open in desktop
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="ERS_Ln9" grid="ne0ARCTICne30x4_ne0ARCTICne30x4_mt12" compset="ISSP245Clm50BgcCrop" testmods="clm/clm50cam6LndTuningMode_1979Start">
ekluzek marked this conversation as resolved.
Show resolved Hide resolved
<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="ISSP245Clm50BgcCrop" testmods="clm/clm50cam6LndTuningMode_1979Start">
ekluzek marked this conversation as resolved.
Show resolved Hide resolved
<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="ISSP245Clm50BgcCrop" testmods="clm/clm50cam6LndTuningMode_2013Start">
ekluzek marked this conversation as resolved.
Show resolved Hide resolved
<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
10 changes: 10 additions & 0 deletions python/ctsm/toolchain/gen_mksurfdata_jobscript_multi.py
View file
Open in desktop
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
View file
Open in desktop
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 [email protected] --walltime 12:00:00
$(BATCHJOBS) [email protected]

crop-global-SSP2-4.5-ne0np4 : FORCE
$(MKSURFDATA) --number-of-nodes 9 --scenario $@ --jobscript-file [email protected] --walltime 12:00:00
$(BATCHJOBS) [email protected]

crop-global-SSP2-4.5-C96 : FORCE
$(MKSURFDATA) --number-of-nodes 9 --scenario $@ --jobscript-file [email protected] --walltime 12:00:00
$(BATCHJOBS) [email protected]
Expand Down
Loading