User/wfc/spear 20200207 #7
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
This reverts commit 8f4af3d.
This reverts commit bc6c6e6.
This reverts commit 48e90d0.
Updates MOM code to dev/gfdl as of 2/7/2019 (6dd6f52) and reverts 3 answer changing modifications. Update produced by git revert 8f4af3d git add src/tracer/MOM_neutral_diffusion.F90 git revert --continue git revert bc6c6e6 git add src/core/MOM.F90 git revert --continue git revert 48e90d0 git add src/equation_of_state/MOM_EOS.F90 git revert --continue Some conflict resolution was needed.
Merge remote-tracking branch 'upstream/dev/gfdl' into HEAD
…_salt_coeffs Optional use of differing restoring piston velocities for temp and salt
Also "corrects" some spelling differences in variables (MStar vs mstar)
wfcooke
pushed a commit
that referenced
this pull request
Nov 30, 2021
Corrected the descriptions of 60 variables
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.