ctsm5.4.025: Merge b4bdev to master#3813
Open
ekluzek wants to merge 165 commits intoESCOMP:masterfrom
Open
Conversation
Conflicts: Externals.cfg Externals_cime.cfg
…e we are pointing to the cime branch needed to work with mizuRoute
Misc bfb enhancements and fixes
(1) If CISM is running over Antarctica, use virtual glacier columns over
Antarctica
(2) Remove "mec" from some glacier/ice variable names (it is misleading
to have "mec" in variable names when the ice landunit can actually
have multiple columns *or* a single column) (ESCOMP#1294)
(3) Add history file metadata on each variable's l2g_scale_type (adds a
landunit_mask attribute) (ESCOMP#1343)
(4) Use python3 in more shebang lines - needed to run python unit tests
on cheyenne
(5) New compset naming for IG compsets (ESCOMP#1289)
(6) Remove calculation of fun_cost_fix that is overwritten
(ESCOMP#1115)
(7) Bypass grid-level water mass check when fates hydro is active
(ESCOMP#1334)
(8) Remove some dead code (ESCOMP#1333)
Conflicts:
Externals.cfg
Externals_cime.cfg
Move the NEON_NIWO test to NEON/NIWO to match the names in usermods. Output particular fields for the NEON cases, and use a reduced size dataset for lightning for NEON sites. Update NEON surface datasets with new scripts included here. Fix stop option for NUOPC. NEON NIWO test in testlist explicity uses the user-mod as well as the defaults testmod. This script is for modifying the surface dataset at neon sites using data available from the neon server. Also add the ability to output history fields for a particular time of day (in seconds) with the LXXXXX history averaging option from Ronny Meier. Externals are updated extensively to the version with cpl7 cime directories split out for CESM. Conflicts: Externals.cfg
Consolidate duplicated crop phenology code Conflicts: Externals.cfg
Conflicts: Externals.cfg
Conflicts: Externals.cfg
…or mizuRoute that run on more processors for mizuRoute
Implement dynamic (transient) urban capability This implements the capability to run transient simulations with changes in urban density types. However, see Caveats for users section below. If transient urban is activated (do_transient_urban=.true.) and an appropriate landuse dataset is provided, the model will read in yearly PCT_URBAN for three density types from the landuse dataset and adjust other landunits accordingly. Water and energy are conserved for these transitions. Urban landunits do not account for carbon and nitrogen, however, see the dynamic urban design document (doc/design/dynamic_urban.rst) for a discussion of this. Conflicts: cime_config/config_pes.xml
Fixing issues related to NEON transition from Amazon S3 to GCS Conflicts: Externals.cfg
… make sure you get a specific version of mizuRoute for standard testing and such
First pass at getting fates-sp mode to run without soil BGC Bring in externals updates that include adding AWS as a supported machine. Add a FatesSP compset and user-mod directory. Turn soil-BGC off when running FatesSP. Replace PGI tests on izumi with nvhpc tests on cheyenne. Fix an issue with a particular gnu compiler version in ch4Mod.F90 in DEBUG mode. Add some more threading tests for Fates. Start adding a prescribed-LAI tests for FatesSp Add a file to setup a python environment in conda for the python testing. Set line length for black to same as pylint (100). Add some extra excludes for black to the pylint checking. Paths for CIME python code was changed, which required changes to some CTSM python code.
Merging the modify_meshes tool to main. This tool is a follow-up to the modify_fsurdat tool for I- and F-cases where users are adding land to areas that by default were expected as ocean. In such cases, fsurdat modifications will take effect only if users also modify the mask_mesh file which ultimately determines the landmask used by the CTSM. Details in the tool's README. Adding test_sys_mesh_modifier.py to python system tests. Combining /modify_fsurdat and /modify_mesh_mask directories into one directory: /modify_input_files
ekluzek
added
external
ekluzek
moved this from Ready to start (or start again)
to In progress - master
in CTSM: Upcoming tags
Collaborator
Author
|
Testing is looking fine. The threaded CN-matrix tests have to be rerun. And there were a few small glitches that look fine now. |
slevis-lmwg
requested changes
Mar 13, 2026
Contributor
slevis-lmwg
left a comment
slevis-lmwg
left a comment
There was a problem hiding this comment.
I have comments affecting what goes into the ChangeLog.
Description of changes
Merge b4b-dev to master:
Important things coming in:
- mizuRoute!
- Documentation updates
- Move of a namelist parameter to the parameter file
If this refers to Sean's PR, it should say
Move a few namelist parameters to the parameter file
- move of X components for nuopc
- mksurfdata_esmf for Gnu compiler
- scripts for CRUJRA forcing to handle Antarctica/Greenland
- spinup scripts for FATES and SE grids
This one should say
SpinupStablity script update to handle FATES and SE grids
- Update cdeps for access to CMIP7 CO2
- Tests for FATES Tree Recruitment Scheme (TRS)
[...]
github-project-automation
bot
moved this from In progress - master
to Stalled (needs review, blocked etc.)
in CTSM: Upcoming tags
Collaborator
Author
|
Running the fates and ctsm_sci test lists, since there were tests added to both of these. |
…'s failing that was accidentally removed earlier
Collaborator
Author
|
Almost all tests are finished, and everything looks fine. |
ekluzek
added
the
PR status: ready
Collaborator
Author
|
fates and ctsm_sci testlists are all passing as expected. So this is ready to go, just need an approval. |
wwieder
approved these changes
Mar 15, 2026
Contributor
wwieder
left a comment
wwieder
left a comment
There was a problem hiding this comment.
assuming all is b4b and passing, so looks good
ekluzek
moved this from Stalled (needs review, blocked etc.)
to In progress - master
in CTSM: Upcoming tags
slevis-lmwg
approved these changes
Mar 16, 2026
Contributor
slevis-lmwg
left a comment
slevis-lmwg
left a comment
There was a problem hiding this comment.
Erik, thank you for all this work. I am approving, and you can decide whether to address my nit-picky corrections :-)
| [Remove any lines that don't apply. Remove entire section if nothing applies.] | ||
|
|
||
| List any git submodules updated (cime, rtm, mosart, cism, fates, etc.): mizuroute changed to mizuRoute | ||
| the mizuRoute directory needs to be capitolized as mizuRoute rather than mizuroute |
Contributor
There was a problem hiding this comment.
nit typo
Suggested change
| the mizuRoute directory needs to be capitolized as mizuRoute rather than mizuroute | |
| the mizuRoute directory needs to be capitalized as mizuRoute rather than mizuroute |
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
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.
Description of changes
Merge b4b-dev to master:
Important things coming in:
PR's involved:
#3391
#3736
#3701
#3757
#3776
#3773
#3793
#920
#3750
Specific notes
Contributors other than yourself, if any: @nmizukami @olyson @slevis-lmwg @swensosc @wwieder @billsacks @glemieux @cdevaneprugh
CTSM Issues Fixed (include github issue #):
Fixes #3722
Fixes #2760
Fixes #2989
Fixes #3386
Are answers expected to change (and if so in what way)? No
Any User Interface Changes (namelist or namelist defaults changes)? Yes
New compsets to use for mizuRoute
parameter files have new data that used to be on the namelist
Does this create a need to change or add documentation? Did you do so? Yes Yes
Testing performed, if any: will run regular and fates will check documentation