GitFlow: Merge develop into v12 - 2026Jan07 #1195
Merged
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
…filled by Extdata when running in DataAtm
… CALVING on tripolar grid
…heet; disable for now
…proc/topography/obsolete; update headers in Fortran/Python drivers
v11: Updates for GCC 15 and Moist
…3-cmake Fixes #1069. Clean up WW3 Cmake
…ocumentation Add Topography documentation & some cleanup
…ff-distribution improve runoff distribution
# Conflicts: # .github/workflows/workflow.yml # GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/CMakeLists.txt
mathomp4
added
the
0 diff
This was referenced Jan 7, 2026
Contributor
|
@biljanaorescanin, please take a look at this PR and make sure that the changes re. topography are ok. It looks like it's alright to me, but I'm not the expert. |
biljanaorescanin
approved these changes
Jan 8, 2026
gmao-rreichle
approved these changes
Jan 8, 2026
sdrabenh
approved these changes
Jan 16, 2026
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 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.
This PR merges the current
developinto v12 developmentI tested all four of these:
together and they seem to be zero-diff for me.