Merge b4bdev 20251219 #3673
Open
Merge b4bdev 20251219 #3673
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
…n the primary history tape (the opposite of hist_empty_htapes). hist_fexcl* flags can be used on top of it, to disable individual fields. Add 'all_outputs' test to exercise the flag (and add that test to aux_clm).
Reduce outputs from matrixcnOn tests
I was adding a few variables to ELM output and comparing the code with CLM, and in the process I found a few typos and a potential bug in one of the diagnostic variables 1. The description and units of variable ustar were incorrect. 2. The units listed in variable VPD suggested Pa, but the calculation of VPD had a 0.001_r8 multiplication factor that implies conversion to kPa. This definitely needs double checking. 3. Replaced the "Monin-Obukhov length" occurrences in comments and output name with "Obukhov length", which is the correct name for the variable according to the American Meteorological Society.
…re this pull request is bit-for-bit). Replaced additional occurrences of Monin-Obukhov length and Obukhov length with Obukhov, following Keith Oleson's suggestion.
Only basic testing of argument parsing and checking.
…ch between DataArrays.
Add param_utils/compare_paramfiles tool
Add horizontal line
Suggestions from the code review from @slevis-lmwg Co-authored-by: Samuel Levis <slevis@ucar.edu>
More suggestions from the code review. Co-authored-by: Samuel Levis <slevis@ucar.edu>
more description about keeping your local master pristine.
Talk about --ff more and how it's helpful.
Update the What's New ctsm5.4 file
FATES JSON parameter files These changes accommodate a JSON format to the FATES parameter file. Documentation has been updated in the FATES User's Guide: https://fates-users-guide.readthedocs.io/en/latest/user/Parameter-File.html fates was updated from sci.1.88.0_api.42.0.0 to sci.1.89.0_api.43.0.0 ESCOMP and NGEET PRs: ESCOMP#3570 NGEET/fates#1493
Collaborator
Author
|
Testing is almost done, and looks as expected so far. Finished on Derecho, a couple tests running on Izumi. |
ekluzek
commented
Dec 27, 2025
| <option name="comment">Among other extra outputs, ensure that writing the list of all history fields to a separate file does not cause failure</option> | ||
| </options> | ||
| </test> | ||
| <test name="ERP_P36x2_D_Ld3" grid="f10_f10_mg37" compset="I1850Clm50BgcCrop" testmods="clm/default--clm/all_outputs"> |
Collaborator
Author
There was a problem hiding this comment.
This test is for 36x2 processors, so should be updated for Derecho processors. Also should be Clm60 so that excess-ice and Carbon isotopes are turned on. And also drydep and megan should be turned on. Also Hist as I think some history fields are only activated for transient cases.
To cover more fields we probably need one with Sp mode as well. So the testmod is run with: Fates, BgcCrop and Sp.
Collaborator
Author
There was a problem hiding this comment.
Also we should turn the namelist item on for the SaveHistFieldList tests to make sure all history fields are turned on for those tests.
Collaborator
Author
There was a problem hiding this comment.
Also add to the extra_outputs test mod.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 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
Bring in b4b-dev to master
Some documentation updates: Update the ctsm5.4 What's New file with text around the Carbon isotopes
Fixes to names and units of canopy turbulence variables.
New CTSM Tool: compare_parmfiles to nicely compare CTSM NetCDF parameter files in a clear way
New namelist option: hist_all_fields == TRUE flags to output ALL available history fields by default
Test-mod updates: Add a test-mod so that transient ERI tests work
#3670 Update ctm5.4 What's new and some README files
#3622 compare_parmfiles tool
#3113 Fixes to names and units of canopy turbulence vars
#2061 Add hist_all_fields to output ALL history fields by default
#3645 Have mosart history output daily so that ERI transient tests work
#3299 Testmod that allows transient ERI tests to work
Specific notes
Contributors other than yourself, if any:
@slevis-lmwg @samsrabin @mpaiao @johnpaulalex @billsacks
CTSM Issues Fixed (include github issue #):
Work on #2761 change README files to markdown
Fixes #3112 Updates to names and units of canopy turbulence vars
Fixes #29 Namelist option to run on all history fields, testmod for it
Fixes #3284 ERI tests fail for transient cases
Are answers expected to change (and if so in what way)? No
Any User Interface Changes (namelist or namelist defaults changes)?
New namelist item hist_all_fields
New compare_paramfiles tool to compare two parameter files
Does this create a need to change or add documentation? Did you do so? No But, documentation updates did happen
Testing performed, if any: regular