Merging latest master changes into the feature-hamocc_beyond-CMIP6 branch #246
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
…adual change of layer thickness in a transition zone separating interfaces with constant pressure and constant potential density, respectively.
… vertical coordinate.
…emperature restoring flux, surface salinity restoring flux and brine flux.
…or hybrid vertical coordinate and selectable as namelist flag.
* fixes for restart units as suggested * fix restart units for sediment restart file * fix indention of line &
String counter adjusted to fit changed restart file units in #239.
Hybrid coordinate enhancements
JorgSchwinger
approved these changes
Feb 22, 2023
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.
Since there were a number of changes in
masterI would like to update thebeyond-CMIPbranch (early enough to not run into merge conflicts again).