+(*)Fix USE_QG_LEITH_VISC = True reproducibility #604
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
added
bug
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## dev/gfdl #604 +/- ##
============================================
+ Coverage 37.01% 37.07% +0.05%
============================================
Files 271 271
Lines 81134 80992 -142
Branches 15139 15123 -16
============================================
- Hits 30034 30027 -7
+ Misses 45475 45343 -132
+ Partials 5625 5622 -3 ☔ View full report in Codecov by Sentry. |
This commit includes a series of changes that get MOM6 to reproduce across
processor counts, layouts and restarts when USE_QG_LEITH_VISC = True and also to
implement related changes to the QG Leith code to be consistent with not making
the Boussinesq approximation when in non-Boussinesq mode. These changes
include:
- Adding a thermo_var_ptrs and a timestep argument to to the interfaces to
horizontal_viscosity, initialize_dyn_split_RK2 and initialize_dyn_split_RK2b
- Correcting a bug in the powers of H_subroundoff in the denominators of some
expressions for the effective thicknesses associated with interfaces,
thereby correcting some dimensionally inconsistencies in these expressions
- Adding the new publicly visible routine calc_QG_slopes
- Adding the arguments slope_x and slope_y to calc_QG_Leith_viscosity and
avoiding the use of the VarMix%slope_[xy] elements in that routine
- Using thickness_to_dz to consistently convert layer thicknesses to the
vertical distances across layers and provide this as an argument to
calc_QG_Leith_viscosity
- Determining vertical distances in calculating the vertical derivatives of
the slopes consistently with avoiding the Boussinesq approximation when in
non-Boussinesq mode
- Increasing some loop extents in calc_QG_Leith_viscosity
Note that several of the expansions of the halo sizes in updates or in some of
the calculations are not necessary if an extra halo update is included for
slope_x and slope_y and dz after the calls to calc_QG_slopes and thickness_to_dz
in horizontal_viscosity. This extra halo update has also been included in a
comment for later reference.
This commit includes several changes to publicly visible interfaces, and it
will change answers with USE_QG_LEITH_VISC = True (which had previously
triggered a fatal error), but answers and output are bitwise identical in other
cases.
Hallberg-NOAA
force-pushed
the
NonBous_Leith_QG_visc
branch
from
c1ab0db
to
58f6ae8
Compare
gustavo-marques
approved these changes
May 8, 2024
|
@Hallberg-NOAA, thanks for these fixes! |
|
Gaea regression: https://gitlab.gfdl.noaa.gov/ogrp/MOM6/-/pipelines/23424 ✔️ |
This was referenced May 16, 2024
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 commit includes a series of changes that get MOM6 to reproduce across processor counts, layouts and restarts when USE_QG_LEITH_VISC = True and also to implement related changes to the QG Leith code to be consistent with not making the Boussinesq approximation when in non-Boussinesq mode. These changes include:
Adding a
thermo_var_ptrsand a timestep argument to to the interfaces tohorizontal_viscosity(),initialize_dyn_split_RK2()andinitialize_dyn_split_RK2b()Correcting a bug in the powers of
H_subroundoffin the denominators of some expressions for the effective thicknesses associated with interfaces, thereby correcting some dimensionally inconsistencies in these expressionsAdding the new publicly visible routine
calc_QG_slopes()Adding the arguments
slope_xandslope_ytocalc_QG_Leith_viscosity()and avoiding the use of theVarMix%slope_[xy]elements in that routineUsing
thickness_to_dz()to consistently convert layer thicknesses to the vertical distances across layers and provide this as an argument tocalc_QG_Leith_viscosity()Determining vertical distances in calculating the vertical derivatives of the slopes consistently with avoiding the Boussinesq approximation when in non-Boussinesq mode
Increasing some loop extents in
calc_QG_Leith_viscosity()Note that several of the expansions of the halo sizes in updates or in some of the calculations are not necessary if an extra halo update is included for
slope_xandslope_yanddzafter the calls tocalc_QG_slopes()andthickness_to_dz()inhorizontal_viscosity(). This extra halo update has also been included in a comment for later reference.This commit includes several changes to publicly visible interfaces, and it will change answers with USE_QG_LEITH_VISC = True (which had previously triggered a fatal error), but answers and output are bitwise identical in other cases.