Skip to content

ctsm5.4.064: b4b-dev merge 2026-10-15 - #4261

Merged
samsrabin merged 41 commits into
ESCOMP:masterfrom
samsrabin:b4b-dev-merge-20261015
Oct 16, 2026
Merged

samsrabin merged 41 commits into
ESCOMP:masterfrom
samsrabin:b4b-dev-merge-20261015

Conversation

@samsrabin

@samsrabin samsrabin commented Oct 16, 2026 •

Copy link
Copy Markdown
Member

Description of changes

Regular merge of b4b-dev branch into master. Includes these PRs:

Specific notes

Contributors other than yourself, if any:

CTSM issues resolved or otherwise addressed, if any: None

Any user interface changes (namelist or namelist defaults changes)? No

Testing planned or performed, if any:

  • aux_clm passes b4b
  • build-namelist testing
  • Python unit and system tests

Requirements before merge:

  • The code in this PR branch builds with no errors.
  • The code in this PR branch runs with no errors. Briefly describe tested configuration(s): aux_clm suite
  • This either (a) does not change answers, (b) it only changes answers at roundoff level, or (c) I have performed a scientific evaluation of the answer changes. Which?: a
  • I have reviewed relevant parts of the CLM documentation Tech Note or User's Guide to determine if anything needs to be changed or added. If it does, describe:
  • This PR either (a) does not create a need to update the documentation or (b) includes required documentation updates (see guidelines for contributing documentation). Which?: a

adrifoster and others added 30 commits April 24, 2026 10:49
….F90

This variable was removed from the struct over a decade ago during the clm4_5_12_r192 NGEE-T ED refactoring (see massive snapshot commit 85b9d5b). This commit removes the leftover allocation and history field comments.
Merge b4bdev 20261001

PR ESCOMP#4241 for details
ERP_D_Ld90.f45_f45_mg37.I2000Clm60Fates.izumi_nag.clm-FatesColdCStarvationExp
Update CLMBuildNamelist to allow AD spinup with FATES (not SP)
… purpose more clear, add some comments, add option to send in file and line number on error, get the unit test working with the changes
…n location rather than caller's arbitrary cwd
…ddiagonal, and remove whitespace after a few lines
Co-authored-by: Samuel Levis <slevis@ucar.edu>
Co-authored-by: Samuel Levis <slevis@ucar.edu>
ekluzek and others added 10 commits October 12, 2026 13:50
I might revert this for going on master if it changes answers.

Co-authored-by: Samuel Levis <slevis@ucar.edu>
Co-authored-by: Samuel Levis <slevis@ucar.edu>
…d-fix

test(python): Make run_ctsm_py_tests.py glob for CTSM test files relative to its own location rather than caller's arbitrary cwd
fix(biogeophys): Remove leftover gccanopy remnants in CanopyStateType.F90
ctsm5.4.063: Move CTSM tests from t232 to t233

Updating testlist_clm.xml, ExpectedTestFails.xml, config_compsets.xml, and documentation that needs updating.

NB: Moving tests from t232 to t233 but postpone the change for LII2 tests (issue ESCOMP#4245).

Changes answers relative to the baseline, only for cases with grids that changed to the t233 grid, and only due to the grid update.

PR ESCOMP#4223
Resolves issue ESCOMP#4238 by removing NorESM test
Contributes to ESCOMP#2540 Move testing from POP to MOM masks
@samsrabin samsrabin self-assigned this Oct 16, 2026
@samsrabin samsrabin added the b4b bit-for-bit label Oct 16, 2026
@slevis-lmwg
slevis-lmwg self-requested a review October 16, 2026 22:26
@samsrabin samsrabin added test: python Pass clm_pymods test suite plus Python sys/unit tests before merging test: aux_clm Pass aux_clm suite before merging labels Oct 16, 2026
@samsrabin
samsrabin merged commit 0594352 into ESCOMP:master Oct 16, 2026
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

b4b bit-for-bit test: aux_clm Pass aux_clm suite before merging test: python Pass clm_pymods test suite plus Python sys/unit tests before merging

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants