Merge master into b4b-dev 2024-05-02 #2514
Merged
Conversation
This file contains 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
These failures are already tracked with derecho versions
This will be reverted once issue ESCOMP#2423 has been addressed
This also adds a corresponding namelist build unit test and similar test to check that sp mode + spitfire fails
Merge b4b-dev Some fixes for run_neon that came up in ctsm5.1.dev172. Small bug fix for units of vector format hillslope hydrology. Start adding PLUMBER2 users-mods (NOT functional)
FATES API35 parameter file update
FATES default allometry parameter file update
This updates the default FATES parameter file which includes a number
of changes:
- Default global tree pft allometry update
- New allometric mode options
- New scaling coefficients for alternative leaf maintenance respiration
- New switch to control the use of host land model day length scaling factor
This also incorporates some testing additions and clean up, including:
- Removes cheyenne expected failure tests that have been converted to derecho
- Adds a 5x5_amazon test to aux_clm and the expected failures list
- Temporarilry converts a fates 5x5_amazon test to f10 test
- Adds namelist check and corresponding unit test to make sure fates hydro
and fates satellite phenology mode can not be used together
The FATES externals tag is also updated which includes a number of bug fixes
and the addition of new history output.
ekluzek
approved these changes
May 2, 2024
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
Merging master back into b4b-dev after merging b4b-dev into master.