Merge ctsm5.3.063 into b4b-dev#3327
Merged
Merged
Conversation
Reduce outputs from matrixcnOn tests slevis resolved conflicts: src/main/histFileMod.F90
Bring in several fixes for testing in the previous cesm3_0_beta03/04 tags Fix a list of issues mostly for testing that came in with the cesm3_0_beta03 and cesm3_0_beta04 tags for the science "chill" deadline bringing in the baseline science capabilities needed for the cesm3_0 release. List of things: - New polarcap grid - Fix use_init_interp for several resolutions that had problems - Remove clm5_1 physics option - Newly needed surface datasets added to auto build in Makefile for mksurfdata_esmf - Fix several individual tests that were failing - Update to submodules to ones roughly based on cesm3_0_beta04 - Add graceful error checking to the FATES parameter file tests that will get it working in some cases
This commit does not resolve all the errors
Standardize time metadata (release tag for ctsm5.3) Last of the 3 "history" tags that ended up numbered as follows: ctsm5.3.018 time now middle of time_bounds ctsm5.3.019 eliminate 0th time step ctsm5.3.021 standardize time metadata As the release tag for ctsm5.3, this also includes the file WhatsNewInCTSM5.3.md. PRs that document the changes ESCOMP#2052 ESCOMP/MOSART#66 ESCOMP/RTM#35 slevis resolved conflicts: src/main/histFileMod.F90
Fix FATES branch runs
Merge b4b-dev to master
Merge b4bdev 20250509 Updates to the b4b-dev branch since its last merge to master (PRs ESCOMP#3091 ESCOMP#3092), as shown by git log: - Merge pull request Update docs infrastructure ESCOMP#2809 from samsrabin/update-docs-builder-2 Update docs infrastructure - Merge pull request Update externals to cesm3_0_alpha06c ESCOMP#3106 from ekluzek/update_to_alpha06c Update externals to cesm3_0_alpha06c - Merge pull request User control over snow thermal conductivity scheme over glaciers ESCOMP#3072 from wwieder/JordanGlacier User control over snow thermal conductivity scheme over glaciers
Merge b4b-dev to master slevis resolved conflicts: src/main/histFileMod.F90
…1059 ctsm5.3.062: Put instantaneous and non-inst. fields on separate history files
Put instantaneous and non-inst. fields on separate hist files hX and rhX files become hXa/hXi and rhXa/rhXi This tag comes with updates to mosart and rtm: mosart1.1.08 --> mosart1.1.09 rtm1_0_86 --> rtm1_0_87
b4b-dev merge 2025-07-10
Merge b4b-dev to master
slevis-lmwg
approved these changes
Jul 10, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description of changes
Merge master back to b4b-dev.