Updates MOM_kappa_shear averaging and diagnostics. #846
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
breichl
commented
Mar 3, 2025
breichl
commented
- Update to horizontal averaging procedure in MOM_kappa_shear for VERTEX_SHEAR = True.
- Adds geometric and thickness weighted averages for moving diffusivity from vertices to tracer points.
- Adds new diagnostics of N2, S2, Kd, and TKE both with and without VERTEX_SHEAR, useful for debugging.
- Bitwise reproduces OM5 config w/ VERTEX_SHEAR = True.
breichl
commented
Mar 4, 2025
added 2 commits
March 4, 2025 15:13
- Update to horizontal averaging procedure in MOM_kappa_shear for VERTEX_SHEAR = True. - Adds geometric and thickness weighted averages for moving diffusivity from vertices to tracer points. - Adds new diagnostics of N2, S2, Kd, and TKE both with and without VERTEX_SHEAR, useful for debugging.
Hallberg-NOAA
force-pushed
the
user/bgr/Kappa_Shear_HorzAvg
branch
from
ed026dc to
c79c5f6
Compare
- Fix OMP directives for new diagnostics - Remove quasi-2d fields that broke OMP threading - Reworking horizontal averaging algorithm.
|
The code now passes all OMP tests. I've moved the PR to draft until I finish evaluating that the new features still work as intended. |
breichl
commented
Mar 5, 2025
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.
Hallberg-NOAA
added
enhancement
*+Revise horizontal averaging in Calc_kappa_shear_vertex
…help with line length issues.
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## dev/gfdl #846 +/- ##
============================================
- Coverage 38.07% 38.05% -0.02%
============================================
Files 298 298
Lines 87830 87955 +125
Branches 16467 16516 +49
============================================
+ Hits 33440 33470 +30
- Misses 48352 48425 +73
- Partials 6038 6060 +22 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
|
I did a layout test in OM5 (with VERTEX_SHEAR = True, VERTEX_SHEAR_GEOMETRIC_MEAN = True, and VERTEX_SHEAR_THICKNESS_MEAN = True), which reproduced. I also checked that the effects of turning the new averaging on in a 1 month run are consistent with my developmental code and tests. I think this is now ready. |
Hallberg-NOAA
approved these changes
Mar 6, 2025
|
This PR has passed pipeline testing at https://gitlab.gfdl.noaa.gov/ogrp/mom6ci/MOM6/-/pipelines/26630 with the expected warnings about new runtime parameters and additional diagnostics. |
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.