Rpointers update cdeps

cime_config/stream_cdeps.py

@@ -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 (
@@ -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")

datm/CMakeLists.txt

@@ -5,7 +5,6 @@ set(SRCFILES atm_comp_nuopc.F90
              datm_datamode_core2_mod.F90
              datm_datamode_jra_mod.F90
              datm_datamode_gefs_mod.F90
-             datm_datamode_cfsr_mod.F90
              datm_datamode_era5_mod.F90
              datm_datamode_simple_mod.F90)
 

datm/cime_config/config_component.xml

@@ -10,10 +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-RYF8485][%JRA-RYF9091][%JRA-RYF0304][%SIMPLE]"> Data driven ATM </desc>
+    <desc atm="DATM[%QIA][%WISOQIA][%CRUJRA2024][%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>
+    <desc option="CRUJRA2024"> CRUJRA 2024 data set </desc>
     <desc option="CRUv7"> CLM CRU NCEP v7 data set </desc>
     <desc option="GSWP3v1"> GSWP3v1 data set </desc>
     <desc option="NLDAS2"> NLDAS2 regional 0.125 degree data set over the U.S. (25-53N, 235-293E). WARNING: Garbage data will be produced for runs extending beyond this regional domain. </desc>
@@ -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>
@@ -41,21 +42,23 @@
 
   <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,CLMCRUJRA2024,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>
       <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%CRUJRA2024">CLMCRUJRA2024</value>
       <value compset="DATM%CRUv7">CLMCRUNCEPv7</value>
       <value compset="DATM%GSWP3v1">CLMGSWP3v1</value>
       <value compset="DATM%NLDAS2">CLMNLDAS2</value>
@@ -71,7 +74,7 @@
     <valid_values>none,clim_1850,clim_2000,clim_2010,hist,SSP1-1.9,SSP1-2.6,SSP2-4.5,SSP3-7.0,SSP4-3.4,SSP4-6.0,SSP5-3.4,SSP5-8.5,cplhist</valid_values>
     <default_value>clim_2000</default_value>
     <values match="last">
-      <value compset="^1850_"   >clim_1850</value>
+      <value compset="^1850[CE]?_"   >clim_1850</value>
       <value compset="^2000_"   >clim_2000</value>
       <value compset="^2010_"   >clim_2010</value>
       <value compset="^SSP119_" >SSP1-1.9</value>
@@ -82,7 +85,7 @@
       <value compset="^SSP460_" >SSP4-6.0</value>
       <value compset="^SSP534_" >SSP5-3.4</value>
       <value compset="^SSP585_" >SSP5-8.5</value>
-      <value compset="^HIST_"   >hist</value>
+      <value compset="^HIST[CE]?_"   >hist</value>
       <value compset="^20TR_"   >hist</value>
       <value compset="_DATM%CPLHIST">cplhist</value>
       <value compset="_DATM.*_DICE.*_DOCN.*_DROF">none</value>
@@ -97,14 +100,14 @@
     <valid_values>none,clim_1850,clim_2000,clim_2010,hist,SSP1-2.6,SSP2-4.5,SSP3-7.0,SSP5-3.4,SSP5-8.5,cplhist</valid_values>
     <default_value>clim_2000</default_value>
     <values match="last">
-      <value compset="^1850_"   >clim_1850</value>
+      <value compset="^1850[CE]?_"   >clim_1850</value>
       <value compset="^2000_"   >clim_2000</value>
       <value compset="^2010_"   >clim_2010</value>
       <value compset="^SSP126_" >SSP1-2.6</value>
       <value compset="^SSP245_" >SSP2-4.5</value>
       <value compset="^SSP370_" >SSP3-7.0</value>
       <value compset="^SSP585_" >SSP5-8.5</value>
-      <value compset="^HIST_"   >hist</value>
+      <value compset="^HIST[CE]?_"   >hist</value>
       <value compset="^20TR_"   >hist</value>
       <value compset="_DATM%CPLHIST">cplhist</value>
       <value compset="_DATM.*_DICE.*_DOCN.*_DROF">none</value>
@@ -119,13 +122,13 @@
     <valid_values>none,clim_1850,clim_2000,clim_2010,hist,SSP2-4.5,SSP3-7.0,SSP5-8.5</valid_values>
     <default_value>clim_2000</default_value>
     <values match="last">
-      <value compset="^1850_"   >clim_1850</value>
+      <value compset="^1850[CE]?_"   >clim_1850</value>
       <value compset="^2000_"   >clim_2000</value>
       <value compset="^2010_"   >clim_2010</value>
       <value compset="^SSP245_" >SSP2-4.5</value>
       <value compset="^SSP370_" >SSP3-7.0</value>
       <value compset="^SSP585_" >SSP5-8.5</value>
-      <value compset="^HIST_"   >hist</value>
+      <value compset="^HIST[CE]?_"   >hist</value>
       <value compset="^20TR_"   >hist</value>
       <!-- Only needed for compsets with active land; only in DATM CLMNCEP mode -->
       <value compset="_SLND">none</value>
@@ -164,7 +167,7 @@
       <value compset="^SSP460_">SSP4-6.0</value>
       <value compset="^SSP534_">SSP5-3.4</value>
       <value compset="^SSP585_">SSP5-8.5</value>
-      <value compset="^HIST"   >20tr</value>
+      <value compset="^HIST[CE]?_"   >20tr</value>
       <value compset="^20TR"   >20tr</value>
       <value compset="^OMIP_DATM%IAF.*_POP2%[^_]*ECO">omip.iaf</value>
       <value compset="^OMIP_DATM%JRA.*_POP2%[^_]*ECO">omip.jra</value>
@@ -215,20 +218,22 @@
     <values match="last">
       <value compset="2000.*_DATM%1PT">$DATM_YR_START</value>
       <value compset="1850.*_DATM%QIA">1</value>
-      <value compset="1850.*_DATM%CRU">1</value>
+      <value compset="1850.*_DATM%CRUJRA2024">1</value>
+      <value compset="1850.*_DATM%CRUv7">1</value>
       <value compset="1850.*_DATM%GSW">1</value>
       <value compset="HIST.*_DATM%QIA">1895</value>
-      <value compset="HIST.*_DATM%CRU">1901</value>
+      <value compset="HIST.*_DATM%CRUJRA2024">1901</value>
+      <value compset="HIST.*_DATM%CRUv7">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%CRU">1901</value>
+      <value compset="20TR.*_DATM%CRUJRA2024">1901</value>
+      <value compset="20TR.*_DATM%CRUv7">1901</value>
       <value compset="20TR.*_DATM%GSW">1901</value>
       <value compset="SSP.*_DATM%QIA">$DATM_YR_START</value>
-      <value compset="SSP.*_DATM%CRU">$DATM_YR_START</value>
+      <value compset="SSP.*_DATM%CRUJRA2024">$DATM_YR_START</value>
+      <value compset="SSP.*_DATM%CRUv7">$DATM_YR_START</value>
       <value compset="SSP.*_DATM%GSW">$DATM_YR_START</value>
-      <value compset="1850.*_DATM%CRU">1</value>
-      <value compset="1850.*_DATM%GSW">1</value>
       <value compset="2000.*_DATM">$DATM_YR_START</value>
       <value compset="2003.*_DATM">$DATM_YR_START</value>
       <value compset="2010.*_DATM">$DATM_YR_START</value>
@@ -261,28 +266,36 @@
       <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%CRU">1901</value>
+      <value compset="1850.*_DATM%CRUJRA2024">1901</value>
+      <value compset="1850.*_DATM%CRUv7">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%CRU">1901</value>
+      <value compset="HIST.*_DATM%CRUJRA2024">1901</value>
+      <value compset="HIST.*_DATM%CRUv7">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%CRU">1901</value>
+      <value compset="20TR.*_DATM%CRUJRA2024">1901</value>
+      <value compset="20TR.*_DATM%CRUv7">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%CRU" >2001</value>
+      <value compset="SSP.*_DATM%CRUJRA2024" >2001</value>
+      <value compset="SSP.*_DATM%CRUv7">2001</value>
       <value compset="SSP.*_DATM%GSW" >2001</value>
       <value compset="2003.*_DATM%QIA.*_TEST">2002</value>
-      <value compset="1850.*_DATM%CRU">1901</value>
-      <value compset="2000.*_DATM%CRU">1991</value>
-      <value compset="2003.*_DATM%CRU">2002</value>
-      <value compset="2010.*_DATM%CRU">2005</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%CRUv7">1901</value>
+      <value compset="2000.*_DATM%CRUv7">1991</value>
+      <value compset="2003.*_DATM%CRUv7">2002</value>
+      <value compset="2010.*_DATM%CRUv7">2005</value>
       <value compset="1850.*_DATM%GSW">1901</value>
       <value compset="2000.*_DATM%GSW">1991</value>
       <value compset="2010.*_DATM%GSW">2005</value>
@@ -315,28 +328,36 @@
       <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%CRU">1920</value>
+      <value   compset="1850.*_DATM%CRUJRA2024">1920</value>
+      <value   compset="1850.*_DATM%CRUv7">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%CRU">1920</value>
+      <value   compset="HIST.*_DATM%CRUJRA2024">1920</value>
+      <value   compset="HIST.*_DATM%CRUv7">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%CRU">1920</value>
+      <value   compset="20TR.*_DATM%CRUJRA2024">1920</value>
+      <value   compset="20TR.*_DATM%CRUv7">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%CRU">2016</value>
+      <value   compset="SSP.*_DATM%CRUJRA2024">2023</value>
+      <value   compset="SSP.*_DATM%CRUv7">2016</value>
       <value   compset="SSP.*_DATM%GSW">2014</value>
       <value   compset="2003.*_DATM%QIA.*_TEST">2003</value>
-      <value   compset="1850.*_DATM%CRU">1920</value>
-      <value   compset="2000.*_DATM%CRU">2010</value>
-      <value   compset="2003.*_DATM%CRU">2003</value>
-      <value   compset="2010.*_DATM%CRU">2014</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%CRUv7">1920</value>
+      <value   compset="2000.*_DATM%CRUv7">2010</value>
+      <value   compset="2003.*_DATM%CRUv7">2003</value>
+      <value   compset="2010.*_DATM%CRUv7">2014</value>
       <value   compset="1850.*_DATM%GSW">1920</value>
       <value   compset="2000.*_DATM%GSW">2010</value>
       <value   compset="2010.*_DATM%GSW">2014</value>

datm/cime_config/namelist_definition_datm.xml

@@ -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>
@@ -55,6 +58,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>
@@ -332,20 +338,47 @@
     <category>datm</category>
     <group>datm_nml</group>
     <desc>
-      Frequency to update radiation in number of steps (or hours if negative)
-      irdasw is the radiation setting used to compute the next shortwave
-      Julian date.  values greater than 1 set the next radiation to the
-      present time plus 2 timesteps every iradsw.  values less than 0 turn
-      set the next radiation to the present time plus two timesteps every
-      -iradsw hours.  if iradsw is zero, the next radiation time is the
-      present time plus 1 timestep.  (default=0.)
+      Frequency to update radiation in number of steps (or hours if negative).
+
+      irdasw is the radiation setting used to compute the next shortwave Julian date.
+      Values greater than 1 set the next radiation to the present time plus either 1 or 2
+      timesteps (depending on the value of nextsw_cday_calc) every iradsw timesteps.
+      Values less than 0 set the next radiation to the present time plus either 1 or 2
+      timesteps (depending on the value of nextsw_cday_calc) every -iradsw hours. If
+      iradsw is either 0 or 1, the next radiation time is the present time plus 1
+      timestep. (default=1 for non-CPLHIST cases, and -1 for CPLHIST cases.)
     </desc>
     <values>
       <value>1</value>
       <value datm_mode="CPLHIST">-1</value>
     </values>
   </entry>
 
+  <entry id="nextsw_cday_calc">
+    <type>char</type>
+    <category>datm</category>
+    <group>datm_nml</group>
+    <valid_values>cam6,cam7</valid_values>
+    <desc>
+      Logic to use for calculating nextsw_cday. This variable has no effect when iradsw is
+      0 or 1, so by default this only applies in CPLHIST cases.
+
+      For CPLHIST cases, this should agree with the version of CAM (or other atmosphere
+      model) used to generate the CPLHIST forcings; the valid values for this variable are
+      based on this: 'cam6' is appropriate for cases generated with the driver ordering in
+      CAM6 and earlier, and 'cam7' is appropriate for cases generated with the driver
+      ordering in CAM7 and later.
+
+      For 'cam6', the next radiation timestep is set to the present time plus 2 timesteps
+      when mod(tod+dtime,delta_radsw)==0. For 'cam7', the next radiation timestep is set
+      to the present time plus 1 timestep when mod(tod,delta_radsw)==0.
+    </desc>
+    <values>
+      <value>cam6</value>
+      <value datm_mode="CPLHIST">cam7</value>
+    </values>
+  </entry>
+
   <entry id="restfilm">
     <type>char</type>
     <category>datm</category>