Repository navigation
Merge tag 'ctsm5.4.058' into b4b-dev - #4221
Merged
Merged
Conversation
Removing whitespace in this line.
Removing whitespace from this line.
Removing whitespace from this line.
Removing more whitespace.
Removing more blank-line whitespace.
Removing another string of whitespace.
Removing a string of whitespace from this line.
Removing whitespace; sorry, I should have done this for all the lines that needed it in one commit, but now I'm on a roll...
…t name, in case SSP ends up later
…set specifier for DATM
Merge wetlands.n04.ctsm5.4.055 to master Equivalent to ending the wetlands branch and merging it to master. Details in PR ESCOMP#4204
…re both set together, both fail correctly, but a better fail should be done for CLM_USRDAT_NAME without CLM_USRDAT resolution
…, and fix the build namelist tester for this
…, but it doesn't do a graceful fail
… one for PLUMBER2
…tter checking, and corrections on error messaging
…USRDAT and CLM_USRDAT_NAME to be uppercase LILAC to appear similart to NEON/PLUMBER2 options
…Reg-EX handling that was needed for that
…CPLHIST forcing, also fix a few other things that I saw at the same time
ctsm5.4.057: CDEPS/CMEPS updates for cplhist and 1850 ndep from DATM
CDEPS/CMEPS updates for CPLHIST mode and 1850 ndep from DATM Update CDEPS with changes for CPLHIST mode. Turn on CLM_NDEP_FROM_CPL for CPLHIST mode. change cplhist test mod to use a different case. This should have everything needed to start CPLHIST spinups out of the box. Also for 1850 with CLM60 use ndep from DATM
ctsm5.4.058: Merge b4bdev 20260917
Merge b4b-dev to master Brings in complete CLM-U tech note. Some refactoring simlplications to compsets and FATES paramgen tests. Improves error messaging in code for history and adds a warning for hillslope. Put comments in testlist into one line (so you see all the comments when using query_testlist). Simplify compsets - Merge multiple test-comments into single comments in testlist - Import CLM-U tech note from Word into the CTSM Tech Note. - No longer need to allow for C/E at end of time period (changes to CAM and CESM required for this are already in CESM tags) - Improve history restart error messages - Simplify FATES paramgen in tests (ncgen no longer needed), get it to work in both CESM and CTSM checkouts - Adds warning when use_init_interp is used with hillslope
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.
Merge ctsm5.4.058 back to b4b-dev