Skip to content

Add CRUJRA2024 as an option to DATM_MODE #322

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

Merged
jedwards4b merged 15 commits into from
Mar 10, 2025
Merged

Add CRUJRA2024 as an option to DATM_MODE #322

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
2385f03
Make CRUJRA2024 the default datm input for clm6
slevis-lmwg Feb 7, 2025
bfb435b
Merge branch 'main' into mk_crujra_default
jedwards4b Feb 10, 2025
15e93d3
Removed plain CRU from config_component.xml
slevis-lmwg Feb 11, 2025
db187f7
Change testlist_datm following Erik's review
slevis-lmwg Feb 11, 2025
3000f0c
Fix bug in four shr_sys_abort calls
slevis-lmwg Feb 12, 2025
6fa792e
Add CRUv7 defaults previously set as CRU (the latter is removed now)
slevis-lmwg Feb 12, 2025
1bcd85a
Revert "Fix bug in four shr_sys_abort calls"
slevis-lmwg Feb 12, 2025
7e149c3
Merge remote-tracking branch 'origin/main' into mk_crujra_default
slevis-lmwg Feb 12, 2025
0fad468
Small updates in config_component.xml that I missed earlier
slevis-lmwg Feb 13, 2025
4f9b463
Merge branch 'main' into mk_crujra_default
jedwards4b Mar 5, 2025
1fb4025
Change path to the CRUJRA2024 data for consistency with other datasets
slevis-lmwg Mar 7, 2025
aea26e4
For DATM%CLMCRUJRA2024, change datamode and datm_mode to CLMNCEP
slevis-lmwg Mar 7, 2025
32f3517
Add comment explaining the four new tests in testlist_datm.xml
slevis-lmwg Mar 7, 2025
ef16f09
Corrections to a test and corresponding comments based on Erik's review
slevis-lmwg Mar 7, 2025
54af59f
Removed duplicate new test
slevis-lmwg Mar 7, 2025
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
12 changes: 6 additions & 6 deletions datm/cime_config/stream_definition_datm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,10 +503,10 @@

<stream_entry name="CLMCRUJRA2024.Solar">
<stream_meshfile>
<meshfile>$DIN_LOC_ROOT/atm/datm7/atm_forcing.datm7.CRUJRA.0.5d.c2024/TRENDY2024/inputs/three_stream/mesh_cdf5.nc</meshfile>
<meshfile>$DIN_LOC_ROOT/atm/datm7/atm_forcing.datm7.CRUJRA.0.5d.c20241231/inputs/three_stream/mesh_cdf5.nc</meshfile>
</stream_meshfile>
<stream_datafiles>
<file first_year="1901" last_year="2023">$DIN_LOC_ROOT_CLMFORC/atm_forcing.datm7.CRUJRA.0.5d.c2024/TRENDY2024/inputs/three_stream/clmforc.CRUJRAv2.5_0.5x0.5.Solr.%y.nc</file>
<file first_year="1901" last_year="2023">$DIN_LOC_ROOT_CLMFORC/atm_forcing.datm7.CRUJRA.0.5d.c20241231/inputs/three_stream/clmforc.CRUJRAv2.5_0.5x0.5.Solr.%y.nc</file>
</stream_datafiles>
<stream_datavars>
<var>FSDS Faxa_swdn</var>
Expand Down Expand Up @@ -534,10 +534,10 @@

<stream_entry name="CLMCRUJRA2024.Precip">
<stream_meshfile>
<meshfile>$DIN_LOC_ROOT/atm/datm7/atm_forcing.datm7.CRUJRA.0.5d.c2024/TRENDY2024/inputs/three_stream/mesh_cdf5.nc</meshfile>
<meshfile>$DIN_LOC_ROOT/atm/datm7/atm_forcing.datm7.CRUJRA.0.5d.c20241231/inputs/three_stream/mesh_cdf5.nc</meshfile>
</stream_meshfile>
<stream_datafiles>
<file first_year="1901" last_year="2023">$DIN_LOC_ROOT_CLMFORC/atm_forcing.datm7.CRUJRA.0.5d.c2024/TRENDY2024/inputs/three_stream/clmforc.CRUJRAv2.5_0.5x0.5.Prec.%y.nc</file>
<file first_year="1901" last_year="2023">$DIN_LOC_ROOT_CLMFORC/atm_forcing.datm7.CRUJRA.0.5d.c20241231/inputs/three_stream/clmforc.CRUJRAv2.5_0.5x0.5.Prec.%y.nc</file>
</stream_datafiles>
<stream_datavars>
<var>PRECTmms Faxa_precn</var>
Expand Down Expand Up @@ -565,10 +565,10 @@

<stream_entry name="CLMCRUJRA2024.TPQW">
<stream_meshfile>
<meshfile>$DIN_LOC_ROOT/atm/datm7/atm_forcing.datm7.CRUJRA.0.5d.c2024/TRENDY2024/inputs/three_stream/mesh_cdf5.nc</meshfile>
<meshfile>$DIN_LOC_ROOT/atm/datm7/atm_forcing.datm7.CRUJRA.0.5d.c20241231/inputs/three_stream/mesh_cdf5.nc</meshfile>
</stream_meshfile>
<stream_datafiles>
<file first_year="1901" last_year="2023">$DIN_LOC_ROOT_CLMFORC/atm_forcing.datm7.CRUJRA.0.5d.c2024/TRENDY2024/inputs/three_stream/clmforc.CRUJRAv2.5_0.5x0.5.TPQWL.%y.nc</file>
<file first_year="1901" last_year="2023">$DIN_LOC_ROOT_CLMFORC/atm_forcing.datm7.CRUJRA.0.5d.c20241231/inputs/three_stream/clmforc.CRUJRAv2.5_0.5x0.5.TPQWL.%y.nc</file>
</stream_datafiles>
<stream_datavars>
<var>TBOT Sa_tbot</var>
Expand Down
4 changes: 4 additions & 0 deletions datm/cime_config/testdefs/testlist_datm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
</machines>
<options>
<option name="wallclock"> 00:10:00 </option>
Comment thread
slevis-lmwg marked this conversation as resolved.
<option name="comment">Test historical CRUJRA2024 forcing in a short smoke test to make sure it works</option>
</options>
</test>
<test compset="1850_DATM%CRUJRA2024_SLND_SICE_SOCN_SROF_SGLC_SWAV_SESP" grid="f10_f10_mg37" name="SMS_Ld5">
Expand All @@ -77,6 +78,7 @@
</machines>
<options>
<option name="wallclock"> 00:10:00 </option>
<option name="comment">Test historical CRUJRA2024 forcing in a short smoke test to make sure it works</option>
Comment thread
slevis-lmwg marked this conversation as resolved.
Outdated
</options>
</test>
<test compset="2010_DATM%CRUJRA2024_SLND_SICE_SOCN_SROF_SGLC_SWAV_SESP" grid="f10_f10_mg37" name="SMS_Ld5">
Expand All @@ -86,6 +88,7 @@
</machines>
<options>
<option name="wallclock"> 00:10:00 </option>
<option name="comment">Test historical CRUJRA2024 forcing in a short smoke test to make sure it works</option>
Comment thread
slevis-lmwg marked this conversation as resolved.
Outdated
</options>
</test>
<test compset="SSP585_DATM%CRUJRA2024_SLND_SICE_SOCN_SROF_SGLC_SWAV_SESP" grid="f10_f10_mg37" name="SMS_Ld5">
Expand All @@ -95,6 +98,7 @@
</machines>
<options>
<option name="wallclock"> 00:10:00 </option>
<option name="comment">Test historical CRUJRA2024 forcing in a short smoke test to make sure it works</option>
Comment thread
slevis-lmwg marked this conversation as resolved.
Outdated
</options>
</test>
<test compset="2000_DATM%NLDAS2_SLND_SICE_SOCN_SROF_SGLC_SWAV_SESP" grid="f10_f10_mg37" name="SMS_Ld5">
Expand Down
4 changes: 2 additions & 2 deletions doc/source/datm.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,9 @@ DATM%CLM_QIAN

DATM%CLMCRUJRA2024
- CRUJRA atm input data (CESM I compsets)
- datm_mode: CLMCRUJRA2024
- datm_mode: CLMNCEP
- streams: CLMCRUJRA2024.Solar,CLMCRUJRA2024.Precip,CLMCRUJRA2024.TPQW
- datamode: CLMCRUJRA2024
- datamode: CLMNCEP

DATM%CLMCRUNCEPv7
- CRUNCEP atm input data (CESM I compsets)
Expand Down