CPT updates for diagnostics and configurations #1274
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
- New diagnostic variables were missing from parallel openmp directive so caused compilation errors in the Travis-CI test - https://travis-ci.com/github/ocean-eddy-cpt/MOM6/jobs/372199318#L2373-L2392
- The dimensions for NoSt and ShSt (s-1) were inverted which was detected in the dimensional test for T-scaling: - https://travis-ci.com/github/ocean-eddy-cpt/MOM6/jobs/372199318#L2093-L2106
…MOM6 into neerajabhamidipati-MOM6_neeraja
To fixes issues reported in https://travis-ci.com/github/ocean-eddy-cpt/MOM6/jobs/393643505#L600 - 2 trailing spaces - also noticed a mismatched indent
- The diagnostic for the barotropic contribution to KE uses pointers to arrays that do not exist in the unsplit mode. This led to the fail at https://travis-ci.com/github/ocean-eddy-cpt/MOM6/jobs/393643506#L2018-L2019 - Added an `if (split)` around the KE_BT diagnostic registration.
…ate-mom6-nov-2020
Update CPT fork of MOM6 to latest (12/10/2020) from NOAA-GFDL
|
Given that there are 21 commits, this may need a squash. Also, do I need write permissions? I am not able to do an update against |
Hallberg-NOAA
approved these changes
Dec 18, 2020
There was a problem hiding this comment.
These code changes appear to me to be correct, and they have passed the automated testing. This should be merged in (along with an update to MOM6-examples because of the updated available diagnostics and perhaps changes to the parameter_doc file due to the introduction of new parameter), once it has passed regression testing.
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.
This contains the modifications being used by the Ocean eddy CPT:
I would send this to "main" but it's small enough that we cause less work by sending to "dev/gfdl".