Merge master 20250626 #3288
Merged
Merge master 20250626 #3288
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
…y fail as expected
…FATES, and also off when coupled to CAM
… initialization of the CNFireNorFire class
… initialization of the CNFireNorFire class
…file' into ne3np4_to_defaults_and_makefile
…efile slevis resolved conflicts: bld/unit_testers/build-namelist_test.pl
Bring back clm5-cam6 init_interp_attributes for ne0CONUS grid
…ts with 3d CAM using F2000climo with SROF
ctsm warm_start mods
…np4_to_defaults_and_makefile
…d_makefile ne3np4 to namelist_defaults_ctsm.xml and Makefile for PTS mode and add ability for warm starts in PTS mode
Fix clm6 ISSP compset aliases slevis resolved conflicts: tools/mksurfdata_esmf/gen_mksurfdata_namelist.xml
…selines, adding SEQ and PEA tests, make sure the changes are for Clm60 tests
ctsm5.3.059: Various cleanup efforts from the cesm3_0_beta04 tags for testing and usability
Bring in various cleanup efforts found in previous testing after the chill changes came in Various updates for testing and other problems identified in the cesm3_0_beta04 tag. So fixes and cleanup for usability. Including the following: - Fix SHR_ASSERT so single-point matrix test passes - ne3np4 to namelist_defaults_ctsm.xml and Makefile for PTS mode and add ability - Fixes warm starts in PTS_MODE so that SCAM can use restart files - f19 + f45 16pft fsurdat/landuse files to namelist_defaults_ctsm + Makefile - Changes in the FORTRAN code to properly abort when fire-emission is asked for it can't be provided. Added unit testing for this. slevis resolved conflicts: doc/ChangeLog doc/ChangeSum
…aults ctsm5.3.060: Preliminary update of ctsm54 defaults (answer changing)
Preliminary update of ctsm54 defaults (answer changing) Allows running coupled without having to adjust clm things manually. In particular, updates namelist defaults, including new IC files, that have been limited to the ctsm5.4 branch so far.
Merge b4bdev 20250625
Merge b4b-dev to master
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 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
Merging ctsm5.3.061 into b4b-dev