Merge b4bdev 20250509#3123
Merged
Merged
Conversation
And tests thereof.
With minor changes to get it to work as Markdown embed. https://github.com/ESCOMP/CTSM/wiki/Directions-for-editing-CLM-documentation-on-github-and-sphinx
Merge b4b-dev to master
Merge master (ctsm5.3.041) into b4b-dev 2025-04-24
…list items for gld and lake, remove the unneeded check for validity as the validate check at the end covers this
This reverts commit e469029.
…around moving use statements for error and logging to the top as well as removing subname as errMsg gives the file and line number and doesn't need to be changed, this makes some progress on ESCOMP#1452
User control over snow thermal conductivity scheme over glaciers
… and/or cime updates
Update externals to cesm3_0_alpha06c
Environments resulting from -u vs. -o can differ in subtle ways. Deleting -u option to avoid this. Resolves samsrabin/docs-deploy-testing#8 This reverts commit acef2b1.
Raise minimum supported Python to 3.7.
Update docs infrastructure
Update FatesColdAllVars history output
ekluzek
approved these changes
May 9, 2025
ekluzek
left a comment
ekluzek
left a comment
Contributor
There was a problem hiding this comment.
I did a quick review. This looks like Sam R's documentation changes, and the submodule and st_archive revert I did.
So approving.
Contributor
Author
|
aux_clm |
github-project-automation
Bot
moved this from In Progress
to Done
in LMWG: Sprint Planning Board
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
4 participants
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
Updates to the b4b-dev branch since its last merge to master (PRs #3091 #3092), as shown by git log:
Update docs infrastructure
Update externals to cesm3_0_alpha06c
User control over snow thermal conductivity scheme over glaciers
Specific notes
CTSM Issues Fixed (include github issue #):
The above PRs document that they resolve the following issues:
Resolves #2818
Resolves #3098
Resolves #3071
Resolves #3080
Are answers expected to change (and if so in what way)?
No
Testing performed, if any:
aux_clm on derecho looks promising so far.