Skip to content

Commit 242b06d

Browse files
committed
Merge tag 'ctsm5.4.011' into merge-master-20260123
Merge b4b-dev to master - Change some _U and _R history fields to be on by default PR ESCOMP#3667 by Keith Oleson - Update to cime version that fixes the check_input_data --download issue PR ESCOMP#3647 by Erik Kluzek; ESCOMP#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 ESCOMP#3543 - Decomp mod unittest PR ESCOMP#3699
2 parents 92a9125 + 2f7aac6 commit 242b06d

File tree

8 files changed

+452
-17
lines changed

8 files changed

+452
-17
lines changed

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git
7676
[submodule "cime"]
7777
path = cime
7878
url = https://github.com/ESMCI/cime
79-
fxtag = cime6.1.145
79+
fxtag = cime6.1.146
8080
fxrequired = ToplevelRequired
8181
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
8282
fxDONOTUSEurl = https://github.com/ESMCI/cime

bld/namelist_files/namelist_defaults_ctsm.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -622,7 +622,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
622622
<!-- The default filenames are given relative to the root directory
623623
for the CLM2 data in the CESM distribution -->
624624
<!-- Plant function types (relative to {csmdata}) -->
625-
<paramfile phys="clm6_0" >lnd/clm2/paramdata/ctsm60_params.c251211.nc</paramfile>
625+
<paramfile phys="clm6_0" >lnd/clm2/paramdata/ctsm60_params.c260108.nc</paramfile>
626626
<paramfile phys="clm5_0" >lnd/clm2/paramdata/clm50_params.c250311.nc</paramfile>
627627
<paramfile phys="clm4_5" >lnd/clm2/paramdata/clm45_params.c250311.nc</paramfile>
628628

doc/.ChangeLog_template

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -146,12 +146,9 @@ Changes answers relative to baseline:
146146
only by roundoff level (because order of operation changes for example). Roundoff
147147
changes to state fields usually grow to greater than roundoff as the simulation progresses.
148148

149-
If this tag changes climate describe the run(s) done to evaluate the new
150-
climate (put details of the simulations in the experiment database)
151-
- casename:
152-
153-
URL for LMWG diagnostics output used to validate new climate:
154-
149+
If this tag changes climate list the run(s) done to evaluate the new
150+
climate (from https://github.com/NCAR/LMWG_dev)
151+
- issue number(s):
155152

156153
Other details
157154
-------------

0 commit comments

Comments
 (0)