Merge Consortium Icepack #23b6c1272b50d4, Aug 30, 2023 #28
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
* Deprecate zsalinity mostly with ifdef and comments for testing * Deprecate zsalinity, remove code * Update zsalinity warning messages Update interface documentation
…Consortium#454) * Corrects thin ice/snow treatment of enthalpy and other tracers Adopted from E3SM-Project/E3SM#5630 "This fix redistributes enthalpy and other tracers evenly in snow and ice when their respective thicknesses are < 1e-15 . Previously, these tracers were zero'd non-conservatively. Also corrects a bug in the zeroing of snow thicknesses, and removes snow in thickness_changes if the ice vanishes." * Clean up modifications
…o cice-consortium/E3SM-icepack-initial-integration Merge Icepack main #23b6c1272b50d42cad, includes thin ice enthalpy fix and zsalinity deprecation
eclare108213
approved these changes
Sep 14, 2023
eclare108213
merged commit 586b5e5
into
E3SM-Project:cice-consortium/E3SM-icepack-initial-integration
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.
For detailed information about submitting Pull Requests (PRs) to the CICE-Consortium,
please refer to: https://github.com/CICE-Consortium/About-Us/wiki/Resource-Index#information-for-developers
PR checklist
Merge Consortium Icepack #23b6c1272b50d4, Aug 30, 2023
apcraig
Icepack and CICE results identical with consortium except Icepack modal runs, CICE restarts (at ice-free gridcells), some roundoff changes in a very limited number of cases.
Includes thin ice enthalpy fix and zsalinity deprecation