+Merge dev/master into dev/gfdl #1204
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 is done via parameter RE_AH: if nonzero, the biharmonic coefficient is scaled so that the biharmonic Reynolds number is equal to this.
grid_Re_Kh = (U sqtr(dx2))/Kh grid_Re_Kh = (U dx3)/Ah where dx2 is the harmonic mean of the squares of the grid [L2], and dx3 is the harmonic mean of the squares of the grid^(3/2) [L3]
Hoping this will fix the floating point exception in symmetric mode.
This PR add two hard-coded parameters (AH_min and KH_min) to avoid dividing by zero when computing the Biharmonic and Laplacian grid Reynolds numbers, respectively. It also fixed the size of an array used in the Biharmonic Re calculation.
* Follow Bob's suggestion throughout the code: - remove unnecessary halo updates - change loop indices - make expressions rotationally symmetric - fix bugs in vort_xy_dy and grid_sp_v2 * clean the code by deleting commented lines
There were a few mistakes in the Leith AH coefficient calculation that are now fixed. * Use inv_PI6 instead of inv_PI5 * Use Del2vort_q instead of vert_vort_mag
Add option to control Biharmonic coeff. via grid Reynolds number
Improve Leith schemes
Add tidal diffusivities into Kd_int
Add new diagnostics
…interp_external_init Add calls time_interp_external_init
Fix bugs when restarting a run with NUOPC
…s_jun2020 Improvements when applying lateral boundary diffusion
Fix multi-restart files in NUOPC cap
* Fix grid metrics * Fix averaging expression to get the kinetic energy at a vorticity point * Fix loop ranges
…didate-ncar-2020-08-11 Dev master candidate NCAR 2020-08-11
This was referenced Sep 18, 2020
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 merges the latest changes from dev/master into dev/gfdl. The changes
introduced with this PR come primarily from contributions from the NCAR/MOM6
fork, but with some changes to reconcile conflicts with other developments.
There are new runtime parameters and diagnostics with this PR, so some of the
MOM_parameteter_doc files and available_diags files will need to be updated.
All answers in the MOM6-examples test cases are bitwise identical, and an
interactive version of the travis testing passes, apart from noting the newly
added diagnostics. The list of commits in this PR include: