Restore computation of vorticity for ZB20 #715
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
Hallberg-NOAA
approved these changes
Aug 20, 2024
There was a problem hiding this comment.
I agree that this change is correct and necessary.
The change that restricted the conditions when vort_xy is calculated occurred at NCAR#268, on a parallel branch with the addition of the dependency of ZB20 on vort_xy at #484. The source of this problem was a semi-automated reconciliation of these two branches that failed to detect that there was in fact a subtle conflict between these two valuable new contributions.
|
Gaea regression: https://gitlab.gfdl.noaa.gov/ogrp/mom6ci/MOM6/-/pipelines/24552 ✔️ |
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.
Changes within the last 9 months turned off the computation of vorticity in MOM_hor_visc.F90 which is required as an input to MOM_Zanna_Bolton.F90 module, and so the ZB20 parameterization was working incorrectly. Here I resolved it with another one if statement.