Feature/update to gfdl 20200909 commit #35
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
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
…update-to-GFDL-20200811
solve minor conflict in
config_src/nuopc_driver/mom_cap.F90 (on restart file handling)
src/framework/MOM_restart.F90 (remove empty line)
this is corresponding to GFDL 20200909 commit (hash # eb57e51) based on dev-master-candidate-ncar-2020-08-11
|
add Dell-P3 run log |
DeniseWorthen
approved these changes
Sep 12, 2020
jiandewang
pushed a commit
to jiandewang/MOM6
that referenced
this pull request
Jun 17, 2021
Merge in dev/gfdl updates
jiandewang
pushed a commit
to jiandewang/MOM6
that referenced
this pull request
Feb 1, 2022
* In MOM_ice_shelf_dynamics.F90 changes are made to calc_shelf_visc() and calc_shelf_driving_stress() to account for an irregular quadrilateral grid. In MOM_ice_shelf_initialize.F90 changes are made to initialize_ice_thickness_from_file() to correct masks at initialization. * Changed indentation * Changes are made to 'calc_shelf_visc()` to make computations of the velocity derivatives rotation-invariant. Changes in `update_ice_shelf()` utilize G%IareaT(:,:) instead of 1/G%areaT(:,:).
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.
Orion-log.pdf
Hera-log.pdf
Description of changes
update EMC MOM6 to GFDL 20200909 commit (dev-master-candidate-NCAR-2020-08-11)
Specific notes
Issues Fixed (include github issue #):
Issue #34
Are changes expected to change answers?
Specific changes:
changes in parm directory (no)
changes in module files (no)
new tests added or removed (no)
Testing performed:
Hashes used for testing:
NEMS: 9d05172b
CMEPS: 5e63bd4d
FV3: 0975bb66
MOM6: fbfa05b (https://github.com/jiandewang/MOM6/tree/feature/update-to-GFDL-20200811)
CICE: 285985c08
WW3: 96e3f3a8f
stochastic_physics: a8e2cc1c8
Co-authored by: Denise Worthen