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.

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

add new JRA 1.5 streams for datm and drof #304

Merged
merged 5 commits into from
Oct 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions cime_config/stream_cdeps.py
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,7 @@ def create_stream_xml(
elif node_name == "stream_datafiles":
# Get the resolved stream data files
stream_vars[node_name] = ""
stream_datafiles_list = [] # to join stream_datafiles if multiple entries are present
stream_datafiles = ""
for child in self.get_children(root=node):
if (
Expand Down Expand Up @@ -306,6 +307,8 @@ def create_stream_xml(
stream_datafiles.split("\n"), "file"
)
# endif
stream_datafiles_list.append(stream_datafiles)
stream_datafiles = "\n".join(stream_datafiles_list)
elif node_name in xml_scalar_names:
attributes["model_grid"] = case.get_value("GRID")
attributes["compset"] = case.get_value("COMPSET")
Expand Down
6 changes: 4 additions & 2 deletions datm/cime_config/config_component.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
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-RYF8485][%JRA-RYF9091][%JRA-RYF0304][%SIMPLE]"> Data driven ATM </desc>
<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 option="QIA"> QIAN data set </desc>
<desc option="WISOQIA">QIAN with water isotopes</desc>
<desc option="CRU"> CRUNCEP data set </desc>
Expand All @@ -23,6 +23,7 @@
<desc option="IAF">COREv2 interannual forcing</desc>
<desc option="JRA">interannual JRA55 forcing</desc>
<desc option="JRA-1p4-2018">interannual JRA55 forcing, v1.4, through 2018</desc>
<desc option="JRA-1p5-2023">interannual JRA55 forcing, v1.5, through 2023</desc>
<desc option="JRA-RYF8485"> JRA55 Repeat Year Forcing v1.3 1984-1985</desc>
<desc option="JRA-RYF9091"> JRA55 Repeat Year Forcing v1.3 1990-1991</desc>
<desc option="JRA-RYF0304"> JRA55 Repeat Year Forcing v1.3 2003-2004</desc>
Expand All @@ -41,7 +42,7 @@

<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,ERA5,SIMPLE</valid_values>
<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>
<default_value>CORE2_NYF</default_value>
<group>run_component_datm</group>
<file>env_run.xml</file>
Expand All @@ -54,6 +55,7 @@
<value compset="DATM%IAF">CORE2_IAF</value>
<value compset="DATM%JRA">CORE_IAF_JRA</value>
<value compset="DATM%JRA-1p4-2018">CORE_IAF_JRA_1p4_2018</value>
<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%CRUv7">CLMCRUNCEPv7</value>
Expand Down
3 changes: 3 additions & 0 deletions datm/cime_config/namelist_definition_datm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@
<value datm_mode="CORE_IAF_JRA_1p4_2018" >
CORE_IAF_JRA_1p4_2018.GCGCS.PREC,CORE_IAF_JRA_1p4_2018.GISS.LWDN,CORE_IAF_JRA_1p4_2018.GISS.SWDN,CORE_IAF_JRA_1p4_2018.NCEP.Q_10,CORE_IAF_JRA_1p4_2018.NCEP.SLP_,CORE_IAF_JRA_1p4_2018.NCEP.T_10,CORE_IAF_JRA_1p4_2018.NCEP.U_10,CORE_IAF_JRA_1p4_2018.NCEP.V_10
</value>
<value datm_mode="CORE_IAF_JRA_1p5_2023" >
CORE_IAF_JRA_1p5_2023.GCGCS.PREC,CORE_IAF_JRA_1p5_2023.GISS.LWDN,CORE_IAF_JRA_1p5_2023.GISS.SWDN,CORE_IAF_JRA_1p5_2023.NCEP.Q_10,CORE_IAF_JRA_1p5_2023.NCEP.SLP_,CORE_IAF_JRA_1p5_2023.NCEP.T_10,CORE_IAF_JRA_1p5_2023.NCEP.U_10,CORE_IAF_JRA_1p5_2023.NCEP.V_10
</value>
<value datm_mode="CORE_RYF8485_JRA">
CORE_RYF8485_JRA.GISS.LWDN,CORE_RYF8485_JRA.GISS.SWDN,CORE_RYF8485_JRA.GCGCS,CORE_RYF8485_JRA.NCEP
</value>
Expand Down
291 changes: 284 additions & 7 deletions datm/cime_config/stream_definition_datm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,14 @@
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)
1PT = Run with supplied single point data (force CLM)
CORE2_NYF = CORE2 normal year forcing (for forcing POP and CICE)
CORE2_IAF = CORE2 intra-annual year forcing (for forcing POP and CICE)
CORE_IAF_JRA = JRA55 intra-annual year forcing (for forcing POP and CICE)
CORE_IAF_JRA_1p4_2018 = JRA55 intra-annual year forcing, v1.4, through 2018 (for forcing POP and CICE)
CORE_RYF8485_JRA = JRA55 repeat year forcing, v1.3, 1984-1985 (for forcing POP and CICE)
CORE_RYF9091_JRA = JRA55 repeat year forcing, v1.3, 1990-1991 (for forcing POP and CICE)
CORE_RYF0304_JRA = JRA55 repeat year forcing, v1.3, 2003-2004 (for forcing POP and CICE)
CORE2_NYF = CORE2 normal year forcing (for forcing MOM6 and CICE)
CORE2_IAF = CORE2 intra-annual year forcing (for forcing MOM6 and CICE)
CORE_IAF_JRA = JRA55 intra-annual year forcing (for forcing MOM6 and CICE)
CORE_IAF_JRA_1p4_2018 = JRA55 intra-annual year forcing, v1.4, through 2018 (for forcing MOM6 and CICE)
CORE_IAF_JRA_1p5_2023 = JRA55 intra-annual year forcing, v1.5, through 2023 (for forcing MOM6 and CICE)
CORE_RYF8485_JRA = JRA55 repeat year forcing, v1.3, 1984-1985 (for forcing MOM6 and CICE)
CORE_RYF9091_JRA = JRA55 repeat year forcing, v1.3, 1990-1991 (for forcing MOM6 and CICE)
CORE_RYF0304_JRA = JRA55 repeat year forcing, v1.3, 2003-2004 (for forcing MOM6 and CICE)
Comment on lines +38 to +43
Copy link
Contributor

Choose a reason for hiding this comment

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

Is there a reason to have the CORE_ prefix here? It's different than the CORE2_ prefix used for CORE forcing, but it's similar enough to feel like maybe it's not necessary?

Copy link
Member Author

Choose a reason for hiding this comment

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

I can't remember the exact reason but it was a desired prefix at the time when we first introduced JRA forcing (i.e., it was intentional).

ERA5 = ERA5 intra-annual year forcing
NEON = Run with forcing from NEON tower data
PLUMBER2 = Run with forcing from PLUMBER2 tower data
Expand Down Expand Up @@ -2462,6 +2463,282 @@
<stream_readmode>single</stream_readmode>
</stream_entry>

<!-- ================================ -->
<!-- datm_mode CORE_IAF_JRA_1p5_2023 -->
<!-- ================================ -->

<stream_entry name="CORE_IAF_JRA_1p5_2023.GCGCS.PREC">
<stream_meshfile>
<meshfile>$DIN_LOC_ROOT/share/meshes/TL319_151007_ESMFmesh.nc</meshfile>
</stream_meshfile>
<stream_datafiles>
<file first_year="1958" last_year="2020">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.prec.TL319.%y.210504.nc</file>
<file first_year="2021" last_year="2021">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.prec.TL319.%y.220505.nc</file>
<file first_year="2022" last_year="2022">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.prec.TL319.%y.230718.nc</file>
<file first_year="2023" last_year="2023">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.prec.TL319.%y.240531.nc</file>
</stream_datafiles>
<stream_datavars>
<var>prec Faxa_prec</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>1</stream_year_align>
<stream_year_first>1958</stream_year_first>
<stream_year_last>2023</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>

<stream_entry name="CORE_IAF_JRA_1p5_2023.GISS.LWDN">
<stream_meshfile>
<meshfile>$DIN_LOC_ROOT/share/meshes/TL319_151007_ESMFmesh.nc</meshfile>
</stream_meshfile>
<stream_datafiles>
<file first_year="1958" last_year="2020">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.lwdn.TL319.%y.210504.nc</file>
<file first_year="2021" last_year="2021">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.lwdn.TL319.%y.220505.nc</file>
<file first_year="2022" last_year="2022">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.lwdn.TL319.%y.230718.nc</file>
<file first_year="2023" last_year="2023">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.lwdn.TL319.%y.240531.nc</file>
</stream_datafiles>
<stream_datavars>
<var>lwdn 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>1</stream_year_align>
<stream_year_first>1958</stream_year_first>
<stream_year_last>2023</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>

<stream_entry name="CORE_IAF_JRA_1p5_2023.GISS.SWDN">
<stream_meshfile>
<meshfile>$DIN_LOC_ROOT/share/meshes/TL319_151007_ESMFmesh.nc</meshfile>
</stream_meshfile>
<stream_datafiles>
<file first_year="1958" last_year="2020">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.swdn.TL319.%y.210504.nc</file>
<file first_year="2021" last_year="2021">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.swdn.TL319.%y.220505.nc</file>
<file first_year="2022" last_year="2022">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.swdn.TL319.%y.230718.nc</file>
<file first_year="2023" last_year="2023">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.swdn.TL319.%y.240531.nc</file>
</stream_datafiles>
<stream_datavars>
<var>swdn 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>1</stream_year_align>
<stream_year_first>1958</stream_year_first>
<stream_year_last>2023</stream_year_last>
<stream_offset>-5400</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="CORE_IAF_JRA_1p5_2023.NCEP.Q_10">
<stream_meshfile>
<meshfile>$DIN_LOC_ROOT/share/meshes/TL319_151007_ESMFmesh.nc</meshfile>
</stream_meshfile>
<stream_datafiles>
<file first_year="1958" last_year="2020">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.q_10.TL319.%y.210504.nc</file>
<file first_year="2021" last_year="2021">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.q_10.TL319.%y.220505.nc</file>
<file first_year="2022" last_year="2022">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.q_10.TL319.%y.230718.nc</file>
<file first_year="2023" last_year="2023">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.q_10.TL319.%y.240531.nc</file>
</stream_datafiles>
<stream_datavars>
<var>q_10 Sa_shum</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>1</stream_year_align>
<stream_year_first>1958</stream_year_first>
<stream_year_last>2023</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>

<stream_entry name="CORE_IAF_JRA_1p5_2023.NCEP.SLP_">
<stream_meshfile>
<meshfile>$DIN_LOC_ROOT/share/meshes/TL319_151007_ESMFmesh.nc</meshfile>
</stream_meshfile>
<stream_datafiles>
<file first_year="1958" last_year="2020">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.slp.TL319.%y.210504.nc</file>
<file first_year="2021" last_year="2021">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.slp.TL319.%y.220505.nc</file>
<file first_year="2022" last_year="2022">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.slp.TL319.%y.230718.nc</file>
<file first_year="2023" last_year="2023">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.slp.TL319.%y.240531.nc</file>
</stream_datafiles>
<stream_datavars>
<var>slp Sa_pslv</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>1</stream_year_align>
<stream_year_first>1958</stream_year_first>
<stream_year_last>2023</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>

<stream_entry name="CORE_IAF_JRA_1p5_2023.NCEP.T_10">
<stream_meshfile>
<meshfile>$DIN_LOC_ROOT/share/meshes/TL319_151007_ESMFmesh.nc</meshfile>
</stream_meshfile>
<stream_datafiles>
<file first_year="1958" last_year="2020">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.t_10.TL319.%y.210504.nc</file>
<file first_year="2021" last_year="2021">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.t_10.TL319.%y.220505.nc</file>
<file first_year="2022" last_year="2022">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.t_10.TL319.%y.230718.nc</file>
<file first_year="2023" last_year="2023">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.t_10.TL319.%y.240531.nc</file>
</stream_datafiles>
<stream_datavars>
<var>t_10 Sa_tbot</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>1</stream_year_align>
<stream_year_first>1958</stream_year_first>
<stream_year_last>2023</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>

<stream_entry name="CORE_IAF_JRA_1p5_2023.NCEP.U_10">
<stream_meshfile>
<meshfile>$DIN_LOC_ROOT/share/meshes/TL319_151007_ESMFmesh.nc</meshfile>
</stream_meshfile>
<stream_datafiles>
<file first_year="1958" last_year="2020">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.u_10.TL319.%y.210504.nc</file>
<file first_year="2021" last_year="2021">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.u_10.TL319.%y.220505.nc</file>
<file first_year="2022" last_year="2022">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.u_10.TL319.%y.230718.nc</file>
<file first_year="2023" last_year="2023">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.u_10.TL319.%y.240531.nc</file>
</stream_datafiles>
<stream_datavars>
<var>u_10 Sa_u</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>1</stream_year_align>
<stream_year_first>1958</stream_year_first>
<stream_year_last>2023</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>

<stream_entry name="CORE_IAF_JRA_1p5_2023.NCEP.V_10">
<stream_meshfile>
<meshfile>$DIN_LOC_ROOT/share/meshes/TL319_151007_ESMFmesh.nc</meshfile>
</stream_meshfile>
<stream_datafiles>
<file first_year="1958" last_year="2020">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.v_10.TL319.%y.210504.nc</file>
<file first_year="2021" last_year="2021">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.v_10.TL319.%y.220505.nc</file>
<file first_year="2022" last_year="2022">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.v_10.TL319.%y.230718.nc</file>
<file first_year="2023" last_year="2023">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.v_10.TL319.%y.240531.nc</file>
</stream_datafiles>
<stream_datavars>
<var>v_10 Sa_v</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>1</stream_year_align>
<stream_year_first>1958</stream_year_first>
<stream_year_last>2023</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 CORE_RYF8485_JRA -->
<!-- ================================ -->
Expand Down
Loading
Loading