ctsm5.3.020: Merge b4b-dev 2025-01-16 #2938
Merged
Conversation
This file contains 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
…esn't include the RTM, MOSART or CTSM changes though
…into cesm3_0_beta05_submodules
iRpointer files for restart now have the simulation timestamp in the filename Add the simulation timestamp to the rpointer files. Also update submodules with this change in CMEPS and CDEPS as well as updated cime to handle it. See the notes below for an explaination about this. Add a "clm" level directory under usermods_dirs so that the component where user-mods reside is declared and to make them function the same as test-mods.
…imemgr_init, now timemgr_init is always called, remove things already done in timemgr_init and add documentation around this
…20241230 Merge b4b-dev 20241220 This tag is in the temporary branch tmp-241219, while master remains "locked" in preparation for a cesm tag. The process was unorthodox, in that I (slevis) received a code review and made revisions and retested after having started the first merge steps.
Merge master 20241230 to b4b-dev
…nto cesm3_0_beta05_submodules Conflicts: .gitmodules
… initialize2, change order of alarms to stop first then restart
Bug fix for izumi nag tests to pass (PR into b4b-dev)
…nto cesm3_0_beta05_submodules
Merge tmp-241219 branch to master Includes three tmp-241219 tags: tmp-241219.n01.ctsm5.3.016 Merge b4b-dev: nfix_method options Houlton (default), Bytnerowicz (option) tmp-241219.n02.ctsm5.3.016 FATES hydro test update tmp-241219.n03.ctsm5.3.016 Bug fix for izumi nag tests to pass (b4b unless using Bytnerowicz) Fixes ESCOMP#2924 Fix problem with izumi nag tests Fixes ESCOMP#2878 Remove fates_allom_smode shell_command update in FatesColdHydro testmod Fixes ESCOMP#2869 Update temperature cost function for symbiotic nfix in FUN Changes answers as documented in the ChangeLog.
Merge to ctsm5.3.017
Delete unused hist_add_subscript method (no references in the CTSM repo)
Conflicts: src/main/histFileMod.F90
doc that masterlist actflag is just h0 in practice, doc that masterlist has all the fields.
…otes Update "What's New in CTSM 5.3"
Useful for redoing tests that failed due to ESCOMP#2916, after having replaced libraries/mpi-serial with a fresh copy.
Minor test suite tweaks.
Includes merge conflicts in src/cpl/lilac/lnd_comp_esmf.F90 due to PR ESCOMP#2912.
samsrabin
added
blocker
slevis-lmwg
previously approved these changes
Jan 16, 2025
There was a problem hiding this comment.
I include my conflict resolution suggestions.
Approving the PR preemptively. Thanks @samsrabin.
samsrabin
dismissed
slevis-lmwg’s stale review
This is still a work in progress.
samsrabin
changed the title
These were resolved with PR ESCOMP#2912.
slevis-lmwg
approved these changes
Jan 17, 2025
There was a problem hiding this comment.
@samsrabin thank you! I'm not familiar with every detail here, but things look good from a quick look.
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.
Description of changes
Regular merge of b4b-dev branch into master. Includes some improvements to test list / expected failures.
Specific notes
Contributors other than yourself, if any: None
CTSM Issues Fixed:
Are answers expected to change (and if so in what way)? No
Any User Interface Changes (namelist or namelist defaults changes)? No
Does this create a need to change or add documentation? Did you do so? No
Testing performed, if any:
aux_clmpasses.