GitFlow: Merge develop into main for 2.51 release #3226
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
…ort for CICE6 rewind
Feature/fixes #3175
Fix up CI image code
# Conflicts: # CHANGELOG.md
…-var Fixes #2845. Allow ESMF_CONFIG_FILE to specify ESMF control file
* Fixes needed for flang * Update changelog * Remove general use pfio * Update to changelog to try and trigger CI
Workaround for ifx bug
Co-authored-by: Tom Clune <thomas.l.clune@nasa.gov>
…6-rewind support for CICE6(or others) to rewind
bena-nasa
approved these changes
Dec 6, 2024
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.
No description provided.