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

Make CRUJRA2024 the default datm input for clm6 #322

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Make CRUJRA2024 the default datm input for clm6 #322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 24 additions & 3 deletions datm/cime_config/config_component.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@
This file may have atm desc entries.
-->
<description modifier_mode="1">
<desc atm="DATM[%QIA][%WISOQIA][%CRU][%CRUv7][%GSWP3v1][%MOSARTTEST][%NLDAS2][%CPLHIST][%1PT][%NYF][%IAF][%JRA][%JRA-1p4-2018][%JRA-1p5-2023][%JRA-RYF8485][%JRA-RYF9091][%JRA-RYF0304][%SIMPLE]"> Data driven ATM </desc>
<desc atm="DATM[%QIA][%WISOQIA][%CRUJRA2024][%CRU][%CRUv7][%GSWP3v1][%MOSARTTEST][%NLDAS2][%CPLHIST][%1PT][%NYF][%IAF][%JRA][%JRA-1p4-2018][%JRA-1p5-2023][%JRA-RYF8485][%JRA-RYF9091][%JRA-RYF0304][%SIMPLE]"> Data driven ATM </desc>
<desc option="QIA"> QIAN data set </desc>
<desc option="WISOQIA">QIAN with water isotopes</desc>
<desc option="CRUJRA2024"> CRUJRA 2024 data set </desc>
<desc option="CRU"> CRUNCEP data set </desc>
<desc option="CRUv7"> CLM CRU NCEP v7 data set </desc>
<desc option="GSWP3v1"> GSWP3v1 data set </desc>
Expand Down Expand Up @@ -42,13 +43,13 @@

<entry id="DATM_MODE">
<type>char</type>
<valid_values>CORE2_NYF,CORE2_IAF,CLM_QIAN,CLM_QIAN_WISO,1PT,CLMCRUNCEP,CLMCRUNCEPv7,CLMGSWP3v1,CLMNLDAS2,CPLHIST,CORE_IAF_JRA,CORE_IAF_JRA_1p4_2018,CORE_IAF_JRA_1p5_2023,ERA5,SIMPLE</valid_values>
<valid_values>CORE2_NYF,CORE2_IAF,CLM_QIAN,CLM_QIAN_WISO,1PT,CLMCRUJRA2024,CLMCRUNCEP,CLMCRUNCEPv7,CLMGSWP3v1,CLMNLDAS2,CPLHIST,CORE_IAF_JRA,CORE_IAF_JRA_1p4_2018,CORE_IAF_JRA_1p5_2023,ERA5,SIMPLE</valid_values>
<default_value>CORE2_NYF</default_value>
<group>run_component_datm</group>
<file>env_run.xml</file>
<desc>Mode for data atmosphere component.
CORE2_NYF (CORE2 normal year forcing) are modes used in forcing prognostic ocean/sea-ice components.
CLMCRUNCEPv7, CLMGSWP3v1, CLMNLDAS2 and 1PT are modes using observational data for forcing prognostic land components.
CLMCRUJRA2024, CLMCRUNCEPv7, CLMGSWP3v1, CLMNLDAS2 and 1PT are modes using observational data for forcing prognostic land components.
WARNING for CLMNLDAS2: This is a regional forcing dataset over the U.S. (25-53N, 235-293E). Garbage data will be produced for runs extending beyond this regional domain. </desc>
<values match="last">
<value compset="DATM%NYF">CORE2_NYF</value>
Expand All @@ -58,6 +59,7 @@
<value compset="DATM%JRA-1p5-2023">CORE_IAF_JRA_1p5_2023</value>
<value compset="DATM%QIA">CLM_QIAN</value>
<value compset="DATM%WISOQIA">CLM_QIAN_WISO</value>
<value compset="DATM%CRUJRA2024">CLMCRUJRA2024</value>
<value compset="DATM%CRUv7">CLMCRUNCEPv7</value>
<value compset="DATM%GSWP3v1">CLMGSWP3v1</value>
<value compset="DATM%NLDAS2">CLMNLDAS2</value>
Expand Down Expand Up @@ -217,13 +219,16 @@
<values match="last">
<value compset="2000.*_DATM%1PT">$DATM_YR_START</value>
<value compset="1850.*_DATM%QIA">1</value>
<value compset="1850.*_DATM%CRUJRA2024">1</value>
<value compset="1850.*_DATM%CRU">1</value>
<value compset="1850.*_DATM%GSW">1</value>
<value compset="HIST.*_DATM%QIA">1895</value>
<value compset="HIST.*_DATM%CRUJRA2024">1901</value>
<value compset="HIST.*_DATM%CRU">1901</value>
<value compset="HIST.*_DATM%GSW">1901</value>
<value compset="HIST.*_DATM%NLDAS2">$DATM_YR_START</value>
<value compset="20TR.*_DATM%QIA">1895</value>
<value compset="20TR.*_DATM%CRUJRA2024">1901</value>
<value compset="20TR.*_DATM%CRU">1901</value>
<value compset="20TR.*_DATM%GSW">1901</value>
<value compset="SSP.*_DATM%QIA">$DATM_YR_START</value>
Expand Down Expand Up @@ -263,24 +268,32 @@
<value compset="2000.*_DATM%1PT" grid="1x1_vancouverCAN" >1992</value>
<value compset="2000.*_DATM%1PT" grid="1x1_urbanc_alpha" >1</value>
<value compset="1850.*_DATM%QIA">1948</value>
<value compset="1850.*_DATM%CRUJRA2024">1901</value>
<value compset="1850.*_DATM%CRU">1901</value>
<value compset="1850.*_DATM%GSW">1901</value>
<value compset="1850.*_DATM%NLDAS2">0</value> <!-- Unsupported -->
<value compset="2000.*_DATM%WISOQIA">2000</value>
<value compset="2000.*_DATM%QIA">1972</value>
<value compset="HIST.*_DATM%QIA">1948</value>
<value compset="HIST.*_DATM%CRUJRA2024">1901</value>
<value compset="HIST.*_DATM%CRU">1901</value>
<value compset="HIST.*_DATM%GSW">1901</value>
<value compset="HIST.*_DATM%NLDAS2">0</value> <!-- Unsupported -->
<value compset="20TR.*_DATM%QIA">1948</value>
<value compset="20TR.*_DATM%CRUJRA2024">1901</value>
<value compset="20TR.*_DATM%CRU">1901</value>
<value compset="20TR.*_DATM%GSW">1901</value>
<value compset="20TR.*_DATM%NLDAS2">0</value> <!-- Unsupported -->
<value compset="4804.*_DATM%QIA">1948</value>
<value compset="SSP.*_DATM%QIA" >1995</value>
<value compset="SSP.*_DATM%CRUJRA2024" >2001</value>
<value compset="SSP.*_DATM%CRU" >2001</value>
<value compset="SSP.*_DATM%GSW" >2001</value>
<value compset="2003.*_DATM%QIA.*_TEST">2002</value>
<value compset="1850.*_DATM%CRUJRA2024">1901</value>
<value compset="2000.*_DATM%CRUJRA2024">1991</value>
<value compset="2003.*_DATM%CRUJRA2024">2002</value>
<value compset="2010.*_DATM%CRUJRA2024">2005</value>
<value compset="1850.*_DATM%CRU">1901</value>
<value compset="2000.*_DATM%CRU">1991</value>
<value compset="2003.*_DATM%CRU">2002</value>
Expand Down Expand Up @@ -317,24 +330,32 @@
<value compset="2000.*_DATM%1PT" grid="1x1_vancouverCAN" >1992</value>
<value compset="2000.*_DATM%1PT" grid="1x1_urbanc_alpha" >2</value>
<value compset="1850.*_DATM%QIA">1972</value>
<value compset="1850.*_DATM%CRUJRA2024">1920</value>
<value compset="1850.*_DATM%CRU">1920</value>
<value compset="1850.*_DATM%GSW">1920</value>
<value compset="1850.*_DATM%NLDAS2">-1</value> <!-- Unsupported -->
<value compset="2000.*_DATM%WISOQIA">2004</value>
<value compset="2000.*_DATM%QIA">2004</value>
<value compset="HIST.*_DATM%QIA">1972</value>
<value compset="HIST.*_DATM%CRUJRA2024">1920</value>
<value compset="HIST.*_DATM%CRU">1920</value>
<value compset="HIST.*_DATM%GSW">1920</value>
<value compset="HIST.*_DATM%NLDAS2">-1</value> <!-- Unsupported -->
<value compset="20TR.*_DATM%QIA">1972</value>
<value compset="20TR.*_DATM%CRUJRA2024">1920</value>
<value compset="20TR.*_DATM%CRU">1920</value>
<value compset="20TR.*_DATM%GSW">1920</value>
<value compset="20TR.*_DATM%NLDAS2">-1</value> <!-- Unsupported -->
<value compset="4804.*_DATM%QIA">2004</value>
<value compset="SSP.*_DATM%QIA">2004</value>
<value compset="SSP.*_DATM%CRUJRA2024">2023</value>
<value compset="SSP.*_DATM%CRU">2016</value>
<value compset="SSP.*_DATM%GSW">2014</value>
<value compset="2003.*_DATM%QIA.*_TEST">2003</value>
<value compset="1850.*_DATM%CRUJRA2024">1920</value>
<value compset="2000.*_DATM%CRUJRA2024">2010</value>
<value compset="2003.*_DATM%CRUJRA2024">2003</value>
<value compset="2010.*_DATM%CRUJRA2024">2014</value>
<value compset="1850.*_DATM%CRU">1920</value>
<value compset="2000.*_DATM%CRU">2010</value>
<value compset="2003.*_DATM%CRU">2003</value>
Expand Down
3 changes: 3 additions & 0 deletions datm/cime_config/namelist_definition_datm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@
<value datm_mode="CLM_QIAN_WISO">
CLM_QIAN_WISO.Solar,CLM_QIAN_WISO.Precip,CLM_QIAN_WISO.TPQW
</value>
<value datm_mode="CLMCRUJRA2024">
CLMCRUJRA2024.Solar,CLMCRUJRA2024.Precip,CLMCRUJRA2024.TPQW
</value>
<value datm_mode="CLMCRUNCEPv7">
CLMCRUNCEPv7.Solar,CLMCRUNCEPv7.Precip,CLMCRUNCEPv7.TPQW
</value>
Expand Down
109 changes: 109 additions & 0 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 @@ -29,6 +29,7 @@
Currently the following data modes are supported:
CLM_QIAN = Run with the CLM Qian dataset valid from 1948 to 2004 (force CLM)
CLM_QIAN_WISO = Run with the CLM Qian dataset with isotopes valid from 2000 to 2004 (force CLM)
CLMCRUJRA2024 = Run with the CLM CRUJRA 2024 forcing valid from 1901 to 2023 (force CLM)
CLMCRUNCEPv7 = Run with the CLM CRU NCEP V7 forcing valid from 1900 to 2010 (force CLM)
CLMGSWP3v1 = Run with the CLM GSWP3 V1 forcing (force CLM)
CLMNLDAS2 = Run with the CLM NLDAS2 regional forcing valid from 1980 to 2018 (force CLM)
Expand Down Expand Up @@ -68,6 +69,13 @@
CLMGSWP3v1.Precip
CLMGSWP3v1.TPQW

========================
datm_mode CLMCRUJRA2024: (DATM%CRUJRA2024 in env_run.xml)
========================
CLMCRUJRA2024.Solar
CLMCRUJRA2024.Precip
CLMCRUJRA2024.TPQW

========================
datm_mode CLMCRUNCEPv7: (DATM%CRUv7 in env_run.xml)
========================
Expand Down Expand Up @@ -489,6 +497,107 @@
<stream_readmode>single</stream_readmode>
</stream_entry>

<!-- =================================== -->
<!-- datm_mode CLMCRUJRA2024 -->
<!-- =================================== -->

<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>
</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>
</stream_datafiles>
<stream_datavars>
<var>FSDS Faxa_swdn</var>
</stream_datavars>
<stream_lev_dimname>null</stream_lev_dimname>
<stream_mapalgo>
<mapalgo>bilinear</mapalgo>
</stream_mapalgo>
<stream_vectors>null</stream_vectors>
<stream_year_align>$DATM_YR_ALIGN</stream_year_align>
<stream_year_first>$DATM_YR_START</stream_year_first>
<stream_year_last>$DATM_YR_END</stream_year_last>
<stream_offset>0</stream_offset>
<stream_tintalgo>
<tintalgo>coszen</tintalgo>
</stream_tintalgo>
<stream_taxmode>
<taxmode>cycle</taxmode>
</stream_taxmode>
<stream_dtlimit>
<dtlimit>1.5</dtlimit>
</stream_dtlimit>
<stream_readmode>single</stream_readmode>
</stream_entry>

<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>
</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>
</stream_datafiles>
<stream_datavars>
<var>PRECTmms Faxa_precn</var>
</stream_datavars>
<stream_lev_dimname>null</stream_lev_dimname>
<stream_mapalgo>
<mapalgo>bilinear</mapalgo>
</stream_mapalgo>
<stream_vectors>null</stream_vectors>
<stream_year_align>$DATM_YR_ALIGN</stream_year_align>
<stream_year_first>$DATM_YR_START</stream_year_first>
<stream_year_last>$DATM_YR_END</stream_year_last>
<stream_offset>0</stream_offset>
<stream_tintalgo>
<tintalgo>nearest</tintalgo>
</stream_tintalgo>
<stream_taxmode>
<taxmode>cycle</taxmode>
</stream_taxmode>
<stream_dtlimit>
<dtlimit>1.5</dtlimit>
</stream_dtlimit>
<stream_readmode>single</stream_readmode>
</stream_entry>

<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>
</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>
</stream_datafiles>
<stream_datavars>
<var>TBOT Sa_tbot</var>
<var>WIND Sa_wind</var>
<var>QBOT Sa_shum</var>
<var>PSRF Sa_pbot</var>
<var>FLDS Faxa_lwdn</var>
</stream_datavars>
<stream_lev_dimname>null</stream_lev_dimname>
<stream_mapalgo>
<mapalgo>bilinear</mapalgo>
</stream_mapalgo>
<stream_vectors>null</stream_vectors>
<stream_year_align>$DATM_YR_ALIGN</stream_year_align>
<stream_year_first>$DATM_YR_START</stream_year_first>
<stream_year_last>$DATM_YR_END</stream_year_last>
<stream_offset>0</stream_offset>
<stream_tintalgo>
<tintalgo>linear</tintalgo>
</stream_tintalgo>
<stream_taxmode>
<taxmode>cycle</taxmode>
</stream_taxmode>
<stream_dtlimit>
<dtlimit>1.5</dtlimit>
</stream_dtlimit>
<stream_readmode>single</stream_readmode>
</stream_entry>

<!-- =================================== -->
<!-- datm_mode CLMCRUNCEPv7 -->
<!-- =================================== -->
Expand Down
17 changes: 13 additions & 4 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 @@ -25,7 +25,7 @@
<option name="wallclock"> 00:10:00 </option>
</options>
</test>
<test compset="HIST_DATM%GSWP3v1_SLND_SICE_SOCN_SROF_SGLC_SWAV_SESP" grid="f10_f10_mg37" name="SMS_Ld5">
<test compset="2000_DATM%GSWP3v1_SLND_SICE_SOCN_SROF_SGLC_SWAV_SESP" grid="f10_f10_mg37" name="SMS_Ld5">
<machines>
<machine name="derecho" compiler="intel" category="aux_cdeps"/>
<machine name="betzy" compiler="intel" category="aux_cdeps_noresm"/>
Expand All @@ -34,7 +34,7 @@
<option name="wallclock"> 00:10:00 </option>
</options>
</test>
<test compset="1850_DATM%GSWP3v1_SLND_SICE_SOCN_SROF_SGLC_SWAV_SESP" grid="f10_f10_mg37" name="SMS_Ld5">
<test compset="HIST_DATM%CRUJRA2024_SLND_SICE_SOCN_SROF_SGLC_SWAV_SESP" grid="f10_f10_mg37" name="SMS_Ld5">
<machines>
<machine name="derecho" compiler="intel" category="aux_cdeps"/>
<machine name="betzy" compiler="intel" category="aux_cdeps_noresm"/>
Expand All @@ -43,7 +43,7 @@
<option name="wallclock"> 00:10:00 </option>
</options>
</test>
<test compset="2010_DATM%GSWP3v1_SLND_SICE_SOCN_SROF_SGLC_SWAV_SESP" grid="f10_f10_mg37" name="SMS_Ld5">
<test compset="1850_DATM%CRUJRA2024_SLND_SICE_SOCN_SROF_SGLC_SWAV_SESP" grid="f10_f10_mg37" name="SMS_Ld5">
<machines>
<machine name="derecho" compiler="intel" category="aux_cdeps"/>
<machine name="betzy" compiler="intel" category="aux_cdeps_noresm"/>
Expand All @@ -52,7 +52,16 @@
<option name="wallclock"> 00:10:00 </option>
</options>
</test>
<test compset="SSP585_DATM%GSWP3v1_SLND_SICE_SOCN_SROF_SGLC_SWAV_SESP" grid="f10_f10_mg37" name="SMS_Ld5">
<test compset="2010_DATM%CRUJRA2024_SLND_SICE_SOCN_SROF_SGLC_SWAV_SESP" grid="f10_f10_mg37" name="SMS_Ld5">
<machines>
<machine name="derecho" compiler="intel" category="aux_cdeps"/>
<machine name="betzy" compiler="intel" category="aux_cdeps_noresm"/>
</machines>
<options>
<option name="wallclock"> 00:10:00 </option>
</options>
</test>
<test compset="SSP585_DATM%CRUJRA2024_SLND_SICE_SOCN_SROF_SGLC_SWAV_SESP" grid="f10_f10_mg37" name="SMS_Ld5">
<machines>
<machine name="derecho" compiler="intel" category="aux_cdeps"/>
<machine name="betzy" compiler="intel" category="aux_cdeps_noresm"/>
Expand Down
8 changes: 7 additions & 1 deletion doc/source/datm.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ referred to as its mode.
In the case of CESM, the active model components would be: CTSM,
POP2, MOM6, POP2, CICE5-6, WW3 and MOSART. As examples, CORE2_NYF
(CORE2 normal year forcing) is the DATM mode used in driving
POP2 and MOM6. On the other hand CLM_QIAN, CLMCRUNCEP, CLMGSWP3
POP2 and MOM6. On the other hand CLM_QIAN, CLMCRUJRA2024, CLMCRUNCEP, CLMGSWP3
and CLM1PT are DATM modes using observational data for forcing CTSM.

.. _datm-datamodes:
Expand Down Expand Up @@ -123,6 +123,12 @@ DATM%CLM_QIAN
- streams: CLM_QIAN.Solar,CLM_QIAN.Precip,CLM_QIAN.TPQW
- datamode: CLMNCEP

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

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