Merge master to alpha-ctsm5.4.CMIP7 #3344
Merged
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
Opens in a Windows browser, avoiding the annoying warning messages.
I didn't run into a need for this, so put it in a new Troubleshooting section.
"The host 'wsl$' was not found in the list of allowed hosts"
… with faster time-step
The previous logic caused problems if "GRAIN" appeared in two (or more) strings, where one was a substring of the other. For example, in LREPRSTRUCT_Ly1_P128x1.f10_f10_mg37.I1850Clm50BgcCrop.derecho_gnu.clm-ciso--clm-cropMonthOutput, before this replacement, one line contained 'GRAINN_TO_FOOD' and a later line contained (among other things) "'GRAINN_TO_FOOD_PERHARV', 'GRAINN_TO_FOOD_ANN'". This was problematic because the first replacement of GRAINN_TO_FOOD incorrectly led to replacements in the later strings as well. This new logic should solve this issue. Resolves ESCOMP#3313
…1059 ctsm5.3.062: Put instantaneous and non-inst. fields on separate history files
Add decomp_init testlist and some extra PE layouts for some grids
…eplacement Fix string replacements in lreprstruct test
Fix ESCOMP#3110 (Initialization of historical using CTSM5.4 surface datasets fails)
tips-for-working-with-rst.md: Add common errors, cheatsheet links.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
8 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.
New tag will be alpha-ctsm5.4.CMIP7.03.ctsm5.3.063
This update will make it easy to see the diffs in #3233.