*+Revise horizontal averaging in Calc_kappa_shear_vertex#4
Merged
breichl merged 1 commit intoMar 6, 2025
Conversation
ca7f68e to
faa3a6f
Compare
Revised the Calc_kappa_shear_vertex code where it averages the diffusivities at the vertices back to the tracer points when there is either a geometric mean being used or thickness weighting. With these changes, the code should now pass dimensional consistency testing, work properly with openMP threading enabled, and give sensible values of the diffusivity for massless layers. Also corrected the indenting of several recently added lines to follow the MOM6 2-space indenting convention. This commit can change answers slightly in some cases where VERTEX_SHEAR = True, especially if VERTEX_SHEAR_GEOMETRIC_MEAN = True or VERTEX_SHEAR_THICKNESS_MEAN = True. The recently added runtime parameter VERTEX_SHEAR_KD_MEAN_ANSWER_DATE (which has not yet been added to the dev/gfdl branch of the code) was no longer needed and has been eliminated.
faa3a6f to
8eaf06a
Compare
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
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.
Revised the
Calc_kappa_shear_vertex()code where it averages the diffusivities at the vertices back to the tracer points when there is either a geometric mean being used or thickness weighting. With these changes, the code should now pass dimensional consistency testing, work properly withopenMPthreading enabled, and give sensible values of the diffusivity for massless layers. This can change answers slightly in some cases whereVERTEX_SHEAR = True, especially ifVERTEX_SHEAR_GEOMETRIC_MEAN = TrueorVERTEX_SHEAR_THICKNESS_MEAN = True. The recently added runtime parameterVERTEX_SHEAR_KD_MEAN_ANSWER_DATE(which has not yet been added to the dev/gfdl branch of the code) was no longer needed and has been eliminated.