Merge pull request #3734 from slevis-lmwg/cruncep20260129

ctsm5.4.017: Introduce CRUJRA2024b datm option (Greenland snow hole filled)

Author: slevis-lmwg

.gitmodules

@@ -84,15 +84,15 @@ fxDONOTUSEurl = https://github.com/ESMCI/cime
 [submodule "cmeps"]
 path = components/cmeps
 url = https://github.com/ESCOMP/CMEPS.git
-fxtag = cmeps1.1.24
+fxtag = cmeps1.1.29
 fxrequired = ToplevelRequired
 # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
 fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git
 
 [submodule "cdeps"]
 path = components/cdeps
 url = https://github.com/ESCOMP/CDEPS.git
-fxtag = cdeps1.0.84
+fxtag = cdeps1.0.91
 fxrequired = ToplevelRequired
 # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
 fxDONOTUSEurl = https://github.com/ESCOMP/CDEPS.git

bld/namelist_files/namelist_defaults_ctsm.xml

@@ -122,7 +122,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
        They can only be on for BGC compsets (NOT SP or FATES).
        
        Also, we configured the defaults the following ways:
-       - On only for CRUJRA2024 or CAM7 forcing because that is how the CESM3.0 clm6_0 simulations were run
+       - On only for CRUJRA2024, CRUJRA2024b, or CAM7 forcing because that is how the CESM3.0 clm6_0 simulations were run
        - In contrast to above, it's turned off for other forcing options as we haven't run simulations with those configurations
       - It's also only turned on for Historical periods and NOT future scenarios because we don't have CMIP7 data for them -->
 <use_c13 phys="clm6_0" bgc_mode="bgc" lnd_tuning_mode="clm6_0_CRUJRA2024" ssp_rcp="hist">.true.</use_c13>

cime_config/config_component.xml

@@ -64,6 +64,7 @@
           that have been tuned. The buildnml will also warn you if a tuning combination is based on another set.
           Atm forcing options:
                CRUJRA2024
+               CRUJRA2024b
                CRUv7
                GSWP3
                CAM4.0
@@ -80,7 +81,7 @@
     <!-- List of forcing options for each CLM physics option: CRUJRA2024, CRUv7, GSWP3, cam7.0, cam6.0, cam5.0, cam4.0, QIAN, 1PT, NLDAS2, ERA5 -->
     <valid_values>clm5_0_cam6.0,clm5_0_cam7.0,clm5_0_cam5.0,clm5_0_cam4.0,clm5_0_GSWP3v1,clm5_0_CRUJRA2024,clm5_0_CRUv7,clm5_0_QIAN,clm5_0_1PT,clm5_0_NLDAS2,clm5_0_ERA5,clm4_5_CRUv7,clm4_5_GSWP3v1,clm4_5_QIAN,clm4_5_cam6.0,clm4_5_cam7.0,clm4_5_cam5.0,clm4_5_cam4.0,clm4_5_1PT,clm4_5_NLDAS2,clm4_5_ERA5,clm6_0_CRUv7,clm6_0_GSWP3v1,clm6_0_CRUJRA2024,clm6_0_cam6.0,clm6_0_cam7.0,clm6_0_cam5.0,clm6_0_cam4.0,clm6_0_QIAN,clm6_0_1PT,clm6_0_NLDAS2,clm6_0_ERA5</valid_values>
     <values match="last">
-      <!-- Options for atm forcing are: CRUJRA2024, CRUv7, GSWP3, cam6.0 (also used for DATM%CPLHIST), cam5.0, cam4.0, QIAN, WISOQIA, 1PT, NLDAS2, and ERA5) -->
+      <!-- Options for atm forcing are: CRUJRA2024, CRUJRA2024b, CRUv7, GSWP3, cam6.0 (also used for DATM%CPLHIST), cam5.0, cam4.0, QIAN, WISOQIA, 1PT, NLDAS2, and ERA5) -->
       <!-- All the clm4_5 physics options -->
       <value compset="SATM_CLM45"        >clm4_5_CRUv7</value>
       <value compset="DATM%CRUv7_CLM45"  >clm4_5_CRUv7</value>
@@ -97,7 +98,7 @@
       <value compset="DATM%NLDAS2_CLM45" >clm4_5_NLDAS2</value>
       <value compset="DATM%ERA5_CLM45"   >clm4_5_ERA5</value>
       <!-- All the clm5_0 physics options -->
-      <value compset="DATM%CRUJRA2024_CLM50">clm5_0_CRUJRA2024</value>
+      <value compset="DATM%CRUJRA2024[b]*_CLM50">clm5_0_CRUJRA2024</value>
       <value compset="DATM%CRUv7_CLM50"  >clm5_0_CRUv7</value>
       <value compset="SATM_CLM50"        >clm5_0_GSWP3v1</value>
       <value compset="DATM%GSWP3v1_CLM50">clm5_0_GSWP3v1</value>
@@ -113,7 +114,7 @@
       <value compset="DATM%NLDAS2_CLM50" >clm5_0_NLDAS2</value>
       <value compset="DATM%ERA5_CLM50"   >clm5_0_ERA5</value>
       <!-- All the clm6_0 physics options -->
-      <value compset="DATM%CRUJRA2024_CLM60">clm6_0_CRUJRA2024</value>
+      <value compset="DATM%CRUJRA2024[b]*_CLM60">clm6_0_CRUJRA2024</value>
       <value compset="DATM%CRUv7_CLM60"  >clm6_0_CRUv7</value>
       <value compset="SATM_CLM60"        >clm6_0_GSWP3v1</value>
       <value compset="DATM%GSWP3v1_CLM60">clm6_0_GSWP3v1</value>

cime_config/config_compsets.xml

@@ -89,7 +89,7 @@
   </compset>
   <compset>
     <alias>I2000Clm60SpCrujraRs</alias>
-    <lname>2000_DATM%CRUJRA2024_CLM60%SP_SICE_SOCN_SROF_SGLC_SWAV</lname>
+    <lname>2000_DATM%CRUJRA2024b_CLM60%SP_SICE_SOCN_SROF_SGLC_SWAV</lname>
   </compset>
 
   <compset>
@@ -100,7 +100,7 @@
   </compset>
   <compset>
     <alias>I2000Clm60SpCrujra</alias>
-    <lname>2000_DATM%CRUJRA2024_CLM60%SP_SICE_SOCN_MOSART_SGLC_SWAV</lname>
+    <lname>2000_DATM%CRUJRA2024b_CLM60%SP_SICE_SOCN_MOSART_SGLC_SWAV</lname>
     <science_support grid="f09_t232"/>
     <science_support grid="f19_g17"/>
   </compset>
@@ -143,7 +143,7 @@
   </compset>
   <compset>
     <alias>I2000Clm60BgcCropCrujra</alias>
-    <lname>2000_DATM%CRUJRA2024_CLM60%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV</lname>
+    <lname>2000_DATM%CRUJRA2024b_CLM60%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV</lname>
   </compset>
 
   <compset>
@@ -152,7 +152,7 @@
   </compset>
   <compset>
     <alias>I2000Clm60BgcCrujra</alias>
-    <lname>2000_DATM%CRUJRA2024_CLM60%BGC_SICE_SOCN_MOSART_SGLC_SWAV</lname>
+    <lname>2000_DATM%CRUJRA2024b_CLM60%BGC_SICE_SOCN_MOSART_SGLC_SWAV</lname>
   </compset>
 
   <!-- Primarily for testing -->
@@ -172,7 +172,7 @@
 
   <compset>
     <alias>I1850Clm60SpCrujra</alias>
-    <lname>1850_DATM%CRUJRA2024_CLM60%SP_SICE_SOCN_MOSART_SGLC_SWAV</lname>
+    <lname>1850_DATM%CRUJRA2024b_CLM60%SP_SICE_SOCN_MOSART_SGLC_SWAV</lname>
   </compset>
   <compset>
     <alias>I1850Clm60SpCru</alias>
@@ -193,7 +193,7 @@
   </compset>
   <compset>
     <alias>I1850Clm60BgcCropCrujra</alias>
-    <lname>1850_DATM%CRUJRA2024_CLM60%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV</lname>
+    <lname>1850_DATM%CRUJRA2024b_CLM60%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV</lname>
   </compset>
 
   <compset>
@@ -209,7 +209,7 @@
   </compset>
   <compset>
     <alias>I1850Clm60BgcCrujra</alias>
-    <lname>1850_DATM%CRUJRA2024_CLM60%BGC_SICE_SOCN_MOSART_SGLC_SWAV</lname>
+    <lname>1850_DATM%CRUJRA2024b_CLM60%BGC_SICE_SOCN_MOSART_SGLC_SWAV</lname>
   </compset>
 
 
@@ -225,7 +225,7 @@
   </compset>
   <compset>
     <alias>I1850Clm60BgcCropCrujraCmip6</alias>
-    <lname>1850_DATM%CRUJRA2024_CLM60%BGC-CROP-CMIP6DECK_SICE_SOCN_MOSART_SGLC_SWAV</lname>
+    <lname>1850_DATM%CRUJRA2024b_CLM60%BGC-CROP-CMIP6DECK_SICE_SOCN_MOSART_SGLC_SWAV</lname>
   </compset>
 
   <!-- Primarily for testing the CMIP6WACCMDECK compset option -->
@@ -240,7 +240,7 @@
   </compset>
   <compset>
     <alias>I1850Clm60BgcCropCrujraCmip6waccm</alias>
-    <lname>1850_DATM%CRUJRA2024_CLM60%BGC-CROP-CMIP6WACCMDECK_SICE_SOCN_MOSART_SGLC_SWAV</lname>
+    <lname>1850_DATM%CRUJRA2024b_CLM60%BGC-CROP-CMIP6WACCMDECK_SICE_SOCN_MOSART_SGLC_SWAV</lname>
   </compset>
 
   <!-- clm5_0 (CMIP6) version with BGC-Crop and CRU forcing -->
@@ -303,7 +303,7 @@
   </compset>
   <compset>
     <alias>I2000Clm60FatesSpCrujraRsGs</alias>
-    <lname>2000_DATM%CRUJRA2024_CLM60%FATES-SP_SICE_SOCN_SROF_SGLC_SWAV</lname>
+    <lname>2000_DATM%CRUJRA2024b_CLM60%FATES-SP_SICE_SOCN_SROF_SGLC_SWAV</lname>
   </compset>
   <compset>
     <alias>I2000Clm60FatesSpCruRsGs</alias>
@@ -328,7 +328,7 @@
   </compset>
   <compset>
     <alias>I2000Clm60FatesCrujraRs</alias>
-    <lname>2000_DATM%CRUJRA2024_CLM60%FATES_SICE_SOCN_SROF_SGLC_SWAV</lname>
+    <lname>2000_DATM%CRUJRA2024b_CLM60%FATES_SICE_SOCN_SROF_SGLC_SWAV</lname>
   </compset>
 
   <compset>
@@ -343,7 +343,7 @@
    </compset>
   <compset>
      <alias>I1850Clm60BgcCrujraNoAnthro</alias>
-     <lname>1850_DATM%CRUJRA2024_CLM60%BGC-NOANTHRO_SICE_SOCN_RTM_SGLC_SWAV</lname>
+     <lname>1850_DATM%CRUJRA2024b_CLM60%BGC-NOANTHRO_SICE_SOCN_RTM_SGLC_SWAV</lname>
      <science_support grid="f09_t232"/>
    </compset>
 
@@ -354,7 +354,7 @@
    </compset>
   <compset>
      <alias>I1850Clm60SpCrujraNoAnthro</alias>
-     <lname>1850_DATM%CRUJRA2024_CLM60%SP-NOANTHRO_SICE_SOCN_RTM_SGLC_SWAV</lname>
+     <lname>1850_DATM%CRUJRA2024b_CLM60%SP-NOANTHRO_SICE_SOCN_RTM_SGLC_SWAV</lname>
      <science_support grid="f09_t232"/>
    </compset>
 
@@ -384,7 +384,7 @@
   </compset>
   <compset>
     <alias>IHistClm60SpCrujra</alias>
-    <lname>HIST_DATM%CRUJRA2024_CLM60%SP_SICE_SOCN_MOSART_SGLC_SWAV</lname>
+    <lname>HIST_DATM%CRUJRA2024b_CLM60%SP_SICE_SOCN_MOSART_SGLC_SWAV</lname>
   </compset>
 
   <compset>
@@ -393,7 +393,7 @@
   </compset>
   <compset>
     <alias>IHistClm60SpCrujraRs</alias>
-    <lname>HIST_DATM%CRUJRA2024_CLM60%SP_SICE_SOCN_SROF_SGLC_SWAV</lname>
+    <lname>HIST_DATM%CRUJRA2024b_CLM60%SP_SICE_SOCN_SROF_SGLC_SWAV</lname>
   </compset>
 
   <compset>
@@ -407,7 +407,7 @@
   </compset>
   <compset>
     <alias>IHistClm60BgcCropCrujra</alias>
-    <lname>HIST_DATM%CRUJRA2024_CLM60%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV</lname>
+    <lname>HIST_DATM%CRUJRA2024b_CLM60%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV</lname>
   </compset>
 
   <compset>
@@ -461,7 +461,7 @@
   </compset>
   <compset>
     <alias>ISSP585Clm60BgcCropCrujra</alias>
-    <lname>SSP585_DATM%CRUJRA2024_CLM60%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV</lname>
+    <lname>SSP585_DATM%CRUJRA2024b_CLM60%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV</lname>
   </compset>
 
   <compset>
@@ -480,7 +480,7 @@
   </compset>
   <compset>
     <alias>ISSP245Clm60BgcCropCrujra</alias>
-    <lname>SSP245_DATM%CRUJRA2024_CLM60%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV</lname>
+    <lname>SSP245_DATM%CRUJRA2024b_CLM60%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV</lname>
   </compset>
 
   <compset>
@@ -489,7 +489,7 @@
   </compset>
   <compset>
     <alias>ISSP370Clm60BgcCropCrujra</alias>
-    <lname>SSP370_DATM%CRUJRA2024_CLM60%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV</lname>
+    <lname>SSP370_DATM%CRUJRA2024b_CLM60%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV</lname>
   </compset>
 
   <compset>
@@ -726,7 +726,7 @@
   </compset>
   <compset>
     <alias>I1850Clm60BgcCropCrujraG</alias>
-    <lname>1850_DATM%CRUJRA2024_CLM60%BGC-CROP_SICE_SOCN_MOSART_CISM2%GRIS-EVOLVE_SWAV</lname>
+    <lname>1850_DATM%CRUJRA2024b_CLM60%BGC-CROP_SICE_SOCN_MOSART_CISM2%GRIS-EVOLVE_SWAV</lname>
     <science_support grid="f09_t232"/>
     <science_support grid="f19_g17"/>
     <science_support grid="ne30pg3_t232"/>
@@ -757,7 +757,7 @@
   </compset>
   <compset>
     <alias>I1850Clm60SpCrujraRs</alias>
-    <lname>1850_DATM%CRUJRA2024_CLM60%SP_SICE_SOCN_SROF_SGLC_SWAV</lname>
+    <lname>1850_DATM%CRUJRA2024b_CLM60%SP_SICE_SOCN_SROF_SGLC_SWAV</lname>
   </compset>
 
 

components/cdeps

@@ -1,4 +1,102 @@
 ===============================================================
+Tag name: ctsm5.4.017
+Originator(s): slevis (Samuel Levis,UCAR/TSS,303-665-1310)
+Date: Mon Feb  9 12:34:51 PM MST 2026
+One-line Summary: Introduce CRUJRA2024b datm option (Greenand snow hole filled)
+
+Purpose and description of changes
+----------------------------------
+
+ Introduce CRUJRA2024b option:
+ - Includes corresponding changes in cdeps by updating to cdeps1.0.91
+ - Includes renaming of CRUJRA2024 files present in /python/ctsm/test/testinputs/expected_result_files to permit all tests to pass
+
+Significant changes to scientifically-supported configurations
+--------------------------------------------------------------
+
+Does this tag change answers significantly for any of the following physics configurations?
+(Details of any changes will be given in the "Answer changes" section below.)
+
+    [Put an [X] in the box for any configuration with significant answer changes.]
+
+[ ] clm6_0
+
+[ ] clm5_0
+
+[ ] ctsm5_0-nwp
+
+[ ] clm4_5
+
+
+Bugs fixed
+----------
+List of CTSM issues fixed (include CTSM Issue # and description) [one per line]:
+ Fixes #3680 and parts of #3707
+ In cdeps this fixes https://github.com/ESCOMP/CDEPS/issues/382
+
+Notes of particular relevance for users
+---------------------------------------
+Changes to CTSM's user interface (e.g., new/renamed XML or namelist variables):
+ - The default datm input dataset changes from CRUJRA2024 to CRUJRA2024b. The former has Antarctica filled and the latter has Greenland also filled.
+ - User may select either CRUJRA2024 or CRUJRA2024b using long compset names, e.g.
+ HIST_DATM%CRUJRA2024_SLND_SICE_SOCN_SROF_SGLC_SWAV_SESP
+ HIST_DATM%CRUJRA2024b_SLND_SICE_SOCN_SROF_SGLC_SWAV_SESP
+
+Changes to the datasets (e.g., streams, surface or initial files):
+ CRUJRA2024 already had Antarctica filled and CRUJRA2024b has Greenland also filled.
+
+Changes to documentation:
+ I updated from CRUJRA2024 to CRUJRA2024b where I found it mentioned.
+
+Notes of particular relevance for developers:
+---------------------------------------------
+Changes to tests or testing:
+ In aux_cdeps I kept one CRUJRA2024 test unchanged, for which I added a CRUJRA2024b test. All others I just changed to CRUJRA2024b.
+
+Testing summary:
+----------------
+
+ [PASS means all tests PASS; OK means tests PASS other than expected fails.]
+
+  build-namelist tests (if CLMBuildNamelist.pm has changed):
+
+    derecho - OK (2 failures expected)
+
+  python testing (if python code has changed; see instructions in python/README.md; document testing done):
+
+    derecho - PASS
+
+  regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing):
+
+    derecho ----- OK done against ctsm5.4.016
+    izumi ------- OK done against ctsm5.4.015 (b4b with .016)
+
+Answer changes
+--------------
+
+Changes answers relative to baseline: Yes
+
+  Summarize any changes to answers, i.e.,
+    - what code configurations: All
+    - what platforms/compilers: All
+    - nature of change: New climate over Greenland due to the new datm files; cpl output diffs due to the submodule updates listed below
+
+   If this tag changes climate list the run(s) done to evaluate the new
+   climate. Preferably in https://github.com/NCAR/LMWG_dev (or give details below)
+       - LMWG_dev issue number(s): https://github.com/NCAR/LMWG_dev/issues/133
+
+Other details
+-------------
+List any git submodules updated (cime, rtm, mosart, cism, fates, etc.):
+ cdeps1.0.84 --> cdeps1.0.91
+ cmeps1.1.24 --> cmeps1.1.29 (required for the cdeps update to work)
+
+Pull Requests that document the changes (include PR ids):
+ https://github.com/ESCOMP/ctsm/pull/3734
+ https://github.com/ESCOMP/CDEPS/pull/385
+
+===============================================================
+===============================================================
 Tag name: ctsm5.4.016
 Originator(s): samrabin (Sam Rabin, UCAR/TSS)
 Date: Fri Feb  6 09:09:56 MST 2026

components/cmeps

@@ -1,5 +1,6 @@
 Tag                   Who      Date  Summary
 ============================================================================================================================
+       ctsm5.4.017   slevis 02/09/2026 Introduce CRUJRA2024b datm option (Greenand snow hole filled)
        ctsm5.4.016 samrabin 02/06/2026 Merge b4b-dev to master
        ctsm5.4.015     erik 02/03/2026 Update CISM to latest version with answer changes
        ctsm5.4.014 mvdebols 01/29/2026 Fix for xm2 and revise logic for excess ice melt

doc/ChangeLog

@@ -43,7 +43,7 @@ the CRUJRA atm data between 1950 to 2010 and you want to run at
 ## Information on Compsets:
 
      "I" compsets are the ones with CTSM and NUOPC driver and CDEPS data models without ice and ocean.
-     Most of the "I" compsets are for clm6_0 physics and use the CRUJRA-2024 data with solar following
+     Most of the "I" compsets are for clm6_0 physics and use the CRUJRA2024b data with solar following
      the cosine of solar zenith angle, precipitation constant, and other
      variables linearly interpolated in time (and with appropriate time-stamps on
      the date). Previous CMIP6 simulations with clm5_0 physics used GSWP3 atmospheric forcing.

doc/ChangeSum

@@ -33,13 +33,13 @@ To subset surface data and climate forcings (DATM) for a single point, use the c
 -  ``$my_lon_type``: 180 if your longitude is in the [-180, 180] format (i.e., centered at the Prime/0th Meridian); 360 if it's in the [0, 360] format (i.e., centered at the 180th Meridian). Note that ``--lon-type $my_lon_type`` is not necessary if your longitude is unambiguous---i.e., it's only needed if your longitude is in the range [0, 180].
 -  ``$my_site_name``: name of site, *used for file naming*
 -  ``$my_start_year``: start year for DATM data to subset, *default between 1901 and 2014*
--  ``$my_end_year``: end year for DATM data to subset, *default between 1901 and 2014; the default CRUJRA2024 DATM data ends in 2023, while the old default GSWP3 ends in 2014; see note below about switching the default DATM data*
+-  ``$my_end_year``: end year for DATM data to subset, *default between 1901 and 2014; the default CRUJRA2024b DATM data ends in 2023, while the old default GSWP3 ends in 2014; see note below about switching the default DATM data*
 -  ``$my_output_dir``: output directory to place the subset data and user_mods directory. This should be something specific to *just* your data for ``$my_site_name``.
 
 You can also have the script subset land-use data. See the help (``tools/site_and_regional/subset_data --help``) for all argument options. For example, depending on your application, it may be helpful to specify a dominant PFT using ``--dompft`` and ``--pctpft`` flags. This allows you to control the PFTs that are present on your surface dataset
 
 .. note::
-   This script defaults to subsetting specific surface data, land-use timeseries, and the CRUJRA2024 DATM data. It can currently only be run as-is on Derecho. If you're not on Derecho, use ``--inputdata-dir`` to specify where the top level of your CESM input data is. 
+   This script defaults to subsetting specific surface data, land-use timeseries, and the CRUJRA2024b DATM data. It can currently only be run as-is on Derecho. If you're not on Derecho, use ``--inputdata-dir`` to specify where the top level of your CESM input data is.
 
    Using ``--create-datm`` with GSWP3 data is no longer supported; see `CTSM issue #3269 <https://github.com/ESCOMP/CTSM/issues/3269>`_.