Merge tag ctsm5.3.020 into b4b-dev #2940
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
Fix unit tests for nstep starting at 1 instead of 0
Add sowing window input files Previously, one could run crops with either (a) sowing windows defined by the hemisphere-specific start and end dates on the paramfile or (b) prescribed sowing dates specified by input file stream_fldFileName_sdate. This PR replaces the latter with two new input files, stream_fldFileName_swindow_start and stream_fldFileName_swindow_end.
Fix RXCROPMATURITY test in zerothtstep branch
...and other mods that I'm preserving from closed PR ESCOMP#2019, such as - changes to long_names and - treating avgflag as a tape (not field) trait for 'I' and 'L' tapes
…e_mid_of_time_bounds
Merge b4b-dev slevis resolved conflicts: python/ctsm/crop_calendars/generate_gdds_functions.py src/cpl/nuopc/lnd_comp_nuopc.F90 src/main/accumulMod.F90
Fix handling of finidat with cold starts
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. slevis resolved conflicts: doc/ChangeLog doc/ChangeSum
…_bounds Change history time to be equal to the middle of the time bounds
slevis resolved conflicts: .gitmodules
ctsm5.3.019: Stop running 0th time step
Includes merge conflicts in src/cpl/lilac/lnd_comp_esmf.F90 due to PR ESCOMP#2912.
These were resolved with PR ESCOMP#2912.
Merge b4b-dev
ekluzek
approved these changes
Jan 21, 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.
Merge latest master tag (ctsm5.3.020) back into b4b-dev.