Updates from dev/cpt 08/20/21#1474
Merged
marshallward merged 39 commits intoAug 31, 2021
Merged
Conversation
- I had a "*" in place of a "/" for calculating a non-dimensional quantity that led to OOB numbers.
- I'd previously made the NW2 tracers mandatory in the restart field which prohibits adding tracers on a restart. This commit allows a restart without tracers to be used.
- I noticed an unnecessary function call which is now removed.
- An inverted do/if loop was using uninitialized variables and was overwriting restart data.
Dev gfdl main candidate 2021 02 19
- The number of tracers was hard coded via an integer parameter which is unnecessarily restrictive.
- The first interation of NW2 tracers implemented 20 tracesr with 10 different spatial structures and 2 different restoration time scales. This has been replaced with 9 tracers with 3 spatial, corresponding to sin(2x), y, z, and 3 time scales. - Number of tracer groups and time scales are now run-time configurable.
Main to dev/cpt
Merge dev gfdl 19may2021
Remove MEKE_damping from use_drag_rate so we can use linear dissipation without bottom drag. This is needed for the GEOMETRIC scheme.
Visc_rem_[uv] multiplied momentum budget diagnostics
Make use_drag_rate independent of MEKE_damping
…Aug2021 Merging dev/gfdl 08/05/2021
Codecov Report
@@ Coverage Diff @@
## dev/gfdl #1474 +/- ##
============================================
- Coverage 29.08% 29.08% -0.01%
============================================
Files 235 236 +1
Lines 71097 71294 +197
============================================
+ Hits 20681 20736 +55
- Misses 50416 50558 +142
Continue to review full report at Codecov.
|
This patch now always initializes drag_rate, either to zero or to the bottom drag formula. It also changes the logic to always execute the second Strang splitting calculation. Removed unused code, including drag_rate_J15 and some commented code.
Hallberg-NOAA
approved these changes
Aug 31, 2021
Collaborator
Hallberg-NOAA
left a comment
Hallberg-NOAA
left a comment
There was a problem hiding this comment.
With the corrections to this PR, I am satisfied that it should be accepted, while still noting that there is a minor issue with one of the comments mis-documenting the units of a variable that will be addressed in a subsequent small PR.
Collaborator
|
Gaea regression: https://gitlab.gfdl.noaa.gov/ogrp/MOM6/-/pipelines/13506 ✔️ 🟡 New parameters:
New diagnostics:
|
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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 PR includes all the developments been done in dev/cpt since Dec 23, 2020. The main updates are summarized below:
GEOMETRIC scheme (Make use_drag_rate independent of MEKE_damping ocean-eddy-cpt/MOM6#11).