Merge b4b-dev 2025-05-24 #3154
Merged
Merge b4b-dev 2025-05-24 #3154
Conversation
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
Standardizing on the behavior used by CIME.
Only test is failing.
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 master 20250509
Fix a couple of things in documentation conf.py
Fix Longitude comparison error for regional subset_data
…-qol QOL improvements in mksurfdata_esmf makefile
Fix ctsm-docs container version tagging
This reverts commit 1daa3b5.
…ngelog Don't build docs for ChangeLog/Sum
…ommon Fix error when docker-image-common.yml runs on new tag
…tion Don't run workflows on plain tag creation
Add docs issue template
For FATES set itype to ispval and a few unused variables to nan On FATES patches, there should be no notion of pft associated with the patch, and therefore patch%itype should always be invalid. Even for FATES-SP, the patch should be associated with the FATES pft, which is not associated with itype. In this set of changes, itype is set to spval on fates patches. This will help prevent bugs in the future, because its use in a fates context should trigger errors, particularly in debug mode. When FATES with itype tset o ispval which when used in DEBUG mode will show up as a bounds overflow. For example in issue 2932, where the use of Meier 2022 was turned on in FATES and shouldn't have been. For FATES also set the fields downreg, leafn, froot, and croot t NaN, so when used in DEBUG mode their use will result in a floting point exception.
ekluzek
approved these changes
May 26, 2025
Collaborator
ekluzek
left a comment
ekluzek
left a comment
There was a problem hiding this comment.
Lots of great stuff coming in with this merge. I looked at a lot of this more closely when it went I to b4b-dev.
So approve.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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
Regular b4b-dev merge to master.
Specific notes
PRs included:
Issues resolved:
Testing performed, if any:
aux_clmpasses on Derechoaux_clmpasses on Izumi—at least, the tests that have a readable baseline