Merge tmp-241219 branch to master #2928
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
This reverts commit 97d1657.
…fly" This reverts commit f2f7535.
This tag includes the fix to NGEET/fates#1254 and will allow the current default fates parameter file to be used in fates hydro tests
…nd update ctsm60 file so that it is based on the previous one with the nfix fields just added to the end
Merge b4b-dev Bring in latest b4b-dev branch to main CTSM development. - Update git-fleximod - Fix equation number in tech note - Implement urbanl and urbanc coszen filters - Make ALBGRD and ALBGRI active by default - Some adjustments to control pylint for the RXCROPMATURITY python tests - Run_sys_tests: Print test list in --verbose/--debug.
Merge ctsm5.3.013 into b4b-dev
Update temperature cost function for symbiotic Nfix in FUN
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.
Merge b4bdev 20241220
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.
Update FATES hydro test mod to remove temporary test failure workaround
Bug fix for izumi nag tests to pass (PR into tmp-241219)
slevis-lmwg
added
enhancement
|
@ekluzek I am now ready to merge this, pending your (or someone else's) review :-) |
ekluzek
reviewed
Jan 9, 2025
ekluzek
approved these changes
Jan 9, 2025
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
Includes three tmp-241219 tags:
nfix_method options Houlton (default), Bytnerowicz (option)
Specific notes
Contributors other than yourself, if any:
@glemieux
CTSM Issues Fixed (include github issue #):
Fixes #2924 Fix problem with izumi nag tests
Fixes #2878 Remove fates_allom_smode shell_command update in FatesColdHydro testmod
Fixes #2869 Update temperature cost function for symbiotic nfix in FUN
Are answers expected to change (and if so in what way)?
Yes, fates cases only, as documented in the ChangeLog
Any User Interface Changes (namelist or namelist defaults changes)?
nfix_method, as documented in the ChangeLog