Dev merge #1025
Merged
Dev merge #1025
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
Adds time0 and timenow in MCT and NUOPC
Obsolete ADD_KV_SLOW and remove visc%Kv_slow from restart files
NOTE: we need to add a warning that MEKE_EQUILIBRIUM only works if MEKE_KHCOEFF > 0.
Check for consistency of lat, lon and mask between mesh and mom6 grid
…ck_nuopc Adds consistency check between mesh and mom6 grid
This will use an alternative formula for computing the equilibrium (initial) value of MEKE.
Changed the loop indices on boundary mask. Added three new runtime parameters for GME (GME_H0, GME_EFFICIENCY, GME_LIMITER)
Improve mesh consistency check
…of_doxygen Create ncar fork of doxygen
Create ncar fork of doxygen
…of_doxygen further doxygen changes
…/export field tables
Fix the NUOPC cap doxygen to use HTML style formatting
…of_doxygen further changes for doxygen ncar fork
…didate-ncar-2019-10-02 Dev master candidate from NCAR 2019/10/02
This commit merges dev/master into dev/gfdl, and resolves a conflict in MOM_hor_visc.F90. We also include several OpenMP fixes due to missing or renamed variables. Finally, the default optimization for the OpenMP build was set to -O3 which was causing different answers from DEBUG on some platforms. We now enable both OPENMP and DEBUG during OpenMP testing.
|
Gaea Regression tests: https://gitlab.gfdl.noaa.gov/ogrp/MOM6/pipelines/9310 No regressions; all Gaea tests have passed. |
Codecov Report
@@ Coverage Diff @@
## dev/gfdl #1025 +/- ##
===========================================
- Coverage 43.63% 43.6% -0.04%
===========================================
Files 212 212
Lines 62242 62191 -51
===========================================
- Hits 27160 27116 -44
+ Misses 35082 35075 -7
Continue to review full report at Codecov.
|
|
Travis is currently failing because we've since turned on the Travis regression testing and the changes to the diagnostics have caused the chksum_diag output to differ. We're still discussing how to handle this situation, which we've been predicting for a while but have been completely dodging! |
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 PR incldues the merge of
dev/masterincluding recent NCAR changes intodev/gfdl.This also resolves a conflict in MOM_hor_visc.F90.
We also include several OpenMP fixes due to missing or renamed variables.
Finally, the default optimization for the OpenMP build was set to -O3 which was causing different answers from DEBUG on some platforms. We now enable both OPENMP and DEBUG during OpenMP testing.