Dev/master candidate from NCAR 2019 08 07 #972
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
changes needed for mom6 validation
Prohibits USE_GME to be used when SPLIT=False
…x_from_net_FW * Remove volume flux contribution due to sea ice melt via salt flux
hard-wire WIND_STAGGER=AGRID in nuopc cap as well
…r-candidate-2019-07-08 Merge dev master candidate 2019 07 08
…ation Refactor MCT driver to make modules consistent with those in the NUOPC driver
Rename modules in NUOPC and MCT
In the calculation of MEKE%mom_src, made the old method (using FrictWork) the default and made the new calculation of FrictWork only available when using GME.
…_friction Deletes contribution from kv%slow when computing a_cpl
Updates in MEKE and hor_visc
|
I approve this PR. |
adcroft
reviewed
Aug 12, 2019
There was a problem hiding this comment.
I managed to test both dev/master and the subsequent merge onto dev/gfdl (which has conflicts to resolve). Everything passes. https://gitlab.gfdl.noaa.gov/ogrp/MOM6/pipelines/8618
|
Overall this PR looks good. However, with the changes to MOM_vert_friction in this PR to no longer use visc%Kv_slow to set viscosity (a move with which I strongly approve), I wonder whether it would make sense to eliminate visc%Kv_slow and visc%add_Kv_slow altogether. |
adcroft
approved these changes
Aug 16, 2019
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.
The main goal of this PR is to bring the latest changes from dev/ncar into dev/master. A summary of the main commits is provided below:
This PR does not change answers for the GFDL tests when evaluated against the latest dev/master.