Merge tag 'ctsm5.4.011' into CUPiD

Merge b4b-dev to master

- Change some _U and _R history fields to be on by default PR #3667 by Keith Oleson
- Update to cime version that fixes the check_input_data --download issue PR #3647 by Erik Kluzek; #3647 updated to cime6.1.145, while updating b4b-dev to master in this PR gets us to cime6.1.146.
- Initial fixes to generate_gdd20_baseline PR #3543
- Decomp mod unittest PR #3699

Author: ekluzek

.gitmodules

@@ -76,7 +76,7 @@ fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git
 [submodule "cime"]
 path = cime
 url = https://github.com/ESMCI/cime
-fxtag = cime6.1.144
+fxtag = cime6.1.146
 fxrequired = ToplevelRequired
 # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
 fxDONOTUSEurl = https://github.com/ESMCI/cime

cime

@@ -148,10 +148,8 @@ Changes answers relative to baseline:
 
    If this tag changes climate list the run(s) done to evaluate the new
    climate (from https://github.com/NCAR/LMWG_dev)
-       - issue number:
+       - issue number(s):
 
-   URL for LDF diagnostics output used to validate new climate:
-       - 
 Other details
 -------------
 [Remove any lines that don't apply. Remove entire section if nothing applies.]

doc/.ChangeLog_template

@@ -1,4 +1,254 @@
 ===============================================================
+Tag name: ctsm5.4.011
+Originator(s): slevis (Samuel Levis,UCAR/TSS,303-665-1310)
+Date: Thu Jan 22 04:01:52 PM MST 2026
+One-line Summary: Merge b4b-dev to master
+
+Purpose and description of changes
+----------------------------------
+ Change some _U and _R history fields to be on by default PR #3667 by Keith Oleson
+ Update to cime version that fixes the check_input_data --download issue PR #3647 by Erik Kluzek; #3647 updated to cime6.1.145, while updating b4b-dev to master in this PR gets us to cime6.1.146.
+ Initial fixes to generate_gdd20_baseline PR #3543
+ Decomp mod unittest PR #3699
+
+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]:
+ No issues were opened for the PRs listed above.
+
+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
+
+  python testing (if python code has changed; see instructions in python/README.md; document testing done):
+
+    derecho - OK
+
+  regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing):
+
+    derecho ----- OK
+    izumi ------- OK
+
+Answer changes
+--------------
+Changes answers relative to baseline: No
+
+Other details
+-------------
+Pull Requests that document the changes (include PR ids):
+ https://github.com/ESCOMP/ctsm/pull/3709
+
+===============================================================
+===============================================================
+Tag name: ctsm5.4.010
+Originator(s): erik (Erik Kluzek,UCAR/TSS,303-497-1326)
+Date: Wed Jan 21 11:49:59 AM MST 2026
+One-line Summary: Update cime to version that changes answers for ERI tests
+
+Purpose and description of changes
+----------------------------------
+
+This just updates the cime version to one that changes answers for ERI tests.
+
+
+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 #3651 -- update to cime6.1.146 changes answers
+
+Notes of particular relevance for users
+---------------------------------------
+
+Notes of particular relevance for developers:
+---------------------------------------------
+
+Changes to tests or testing:
+
+   The details of the ERI tests was changed, so that you can't compare to the previous baselines.
+   This means that it registers them as all failing the baseline compare with a DIFF
+
+Testing summary: regular
+----------------
+ [PASS means all tests PASS; OK means tests PASS other than expected fails.]
+
+  regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing):
+
+    derecho ----- OK
+    izumi ------- OK
+
+If the tag used for baseline comparisons was NOT the previous tag, note that here:
+
+
+Answer changes
+--------------
+
+Changes answers relative to baseline: No (other than the ERI tests!)
+
+  Summarize any changes to answers, i.e.,
+    - what code configurations: Only ERI tests
+    - what platforms/compilers: All
+    - nature of change: test details changed so can't be compared to the baseline
+
+Other details
+-------------
+[Remove any lines that don't apply. Remove entire section if nothing applies.]
+
+List any git submodules updated (cime, rtm, mosart, cism, fates, etc.): cime
+   Update to cime6.1.146
+
+Pull Requests that document the changes (include PR ids):
+(https://github.com/ESCOMP/ctsm/pull)
+
+   https://github.com/ESCOMP/CTSM/pull/3698
+
+===============================================================
+===============================================================
+Tag name: ctsm5.4.009
+Originator(s): olyson (Keith Oleson)
+Date: Mon Jan 19 12:53:18 PM MST 2026
+One-line Summary: Dewpoint Temperature check for bare ground
+
+Purpose and description of changes
+----------------------------------
+
+Implement dewpoint temperature check for bare ground to fix RRTMG error
+
+Cecile Hannay reported an RRTMGP crash in this 4xCO2 experiment at year 37:
+
+NCAR/cesm_dev#246
+
+Output from placing write statements in the CAM radiation code show that it's a baresoil patch in
+a grid cell in the Arabian Penninsula. The bare soil patch occupies 99.28% of the gridcell.
+Solar and longwave forcing and absorbed solar don't appear to be unreasonable, but t_grnd is 358K.
+
+This bug fix eliminates dew flux (sets evaporation conductance to zero) x if t_grnd > forc_dewpoint, where forc_dewpoint is the dewpoint temperature at the forcing height.
+This prevents large spurious negative latent heat fluxes that increase heat flux into the soil and signficantly increase surface soil temperature (t_grnd) such that soil temperature > 355K, triggering a RRTMGP error.
+
+Contributors:
+-------------
+@swensosc , @wwieder , @slevis-lmwg , @dlawrenncar, ekluzek
+
+
+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 #3589 355+ K land temperature triggers RRTMGP error
+
+Notes of particular relevance for users
+---------------------------------------
+
+Caveats for users (e.g., need to interpolate initial conditions):
+   This is currently ONLY done for bare-soil, probably should be done for other landunits.
+
+Changes to documentation: None, but needs to be added
+
+Notes of particular relevance for developers:
+---------------------------------------------
+
+Caveats for developers (e.g., code that is duplicated that requires double maintenance):
+   https://github.com/ESCOMP/CTSM/issues/3694
+   Documents making this a function added to QSat
+   This should especially be done when this is added for other landunit types
+
+Testing summary: regular
+----------------
+ [PASS means all tests PASS; OK means tests PASS other than expected fails.]
+
+  regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing):
+
+    derecho ----- OK
+    izumi ------- OK
+
+If the tag used for baseline comparisons was NOT the previous tag, note that here:
+
+
+Answer changes
+--------------
+
+Changes answers relative to baseline: Yes! Almost ALL cases if run long enough
+
+  Summarize any changes to answers, i.e.,
+    - what code configurations: All
+    - what platforms/compilers: All
+    - nature of change: same climate
+
+   climate (from https://github.com/NCAR/LMWG_dev)
+       - issue number(s): 135 and 136
+
+   URL for LDF diagnostics output used to validate new climate:
+
+     - ILAMB: https://webext.cgd.ucar.edu/I2000/Clm60SP_ctsmdew_1deg_Dew_2000/lnd/BUGFIX/_build_DEW/
+     - LDF: https://webext.cgd.ucar.edu/I2000/Clm60SP_ctsmdew_1deg_Dew_2000/lnd/BUGFIX/Clm60SP_ctsmdew_1deg_Dew_2000_2005_2019-Clm60SP_ctsmdew_1deg_Control_2000_2005_2019/setsIndex.html
+
+Standard diagnostics results are here
+Other details
+-------------
+
+Pull Requests that document the changes (include PR ids):
+(https://github.com/ESCOMP/ctsm/pull)
+    #3688 -- Implement dewpoint temperature check for bare ground to fix RRTMGP error   
+
+
+===============================================================
+===============================================================
 Tag name: ctsm5.4.008
 Originator(s): swensosc (Sean Swenson)
 Date: Mon Jan 12 11:19:38 PM MST 2026

doc/ChangeLog

@@ -1,5 +1,8 @@
 Tag                   Who      Date  Summary
 ============================================================================================================================
+       ctsm5.4.011   slevis 01/22/2026 Merge b4b-dev to master
+       ctsm5.4.010     erik 01/21/2026 Update cime to version that changes answers for ERI tests
+       ctsm5.4.009   olyson 01/19/2026 Dewpoint Temperature check for bare ground
        ctsm5.4.008 swensosc 01/12/2026 Add a correction for oversaturated soil layers in SoilWaterMovement (erik)
        ctsm5.4.007 samrabin 01/09/2026 Update (irrigated_)rice grnfill and lfemerg
        ctsm5.4.006     erik 01/07/2026 Merge b4b-dev to master

doc/ChangeSum

@@ -144,7 +144,7 @@ def check_rx_obeyed(
             continue
         ds_thisveg = dates_ds.isel(patch=thisveg_patches)
 
-        vegtype_int = utils.vegtype_str2int(vegtype_str)[0]
+        vegtype_int = utils.vegtype_str2int(vegtype_str)
         rx_da = rx_ds[f"gs1_{vegtype_int}"]
         rx_array = rx_da.values[
             ds_thisveg.patches1d_jxy.values.astype(int) - 1,

python/ctsm/crop_calendars/check_rx_obeyed.py

@@ -265,6 +265,8 @@ def vegtype_str2int(vegtype_str, vegtype_mainlist=None):
     convert_to_ndarray = not isinstance(vegtype_str, np.ndarray)
     if convert_to_ndarray:
         vegtype_str = np.array(vegtype_str)
+    was_0d = vegtype_str.ndim == 0
+    vegtype_str = np.atleast_1d(vegtype_str)
 
     if isinstance(vegtype_mainlist, xr.Dataset):
         vegtype_mainlist = vegtype_mainlist.vegtype_str.values
@@ -289,6 +291,10 @@ def vegtype_str2int(vegtype_str, vegtype_mainlist=None):
         indices[np.where(vegtype_str == vegtype_str_2)] = vegtype_mainlist.index(vegtype_str_2)
     if convert_to_ndarray:
         indices = [int(x) for x in indices]
+
+    if was_0d:
+        indices = indices[0]
+
     return indices