Skip to content

Properly set vertex_shear in set_diffusivity_init#1202

Merged
marshallward merged 2 commits into
mom-ocean:dev/gfdlfrom
Hallberg-NOAA:fix_vertex_query
Sep 10, 2020
Merged

Properly set vertex_shear in set_diffusivity_init#1202
marshallward merged 2 commits into
mom-ocean:dev/gfdlfrom
Hallberg-NOAA:fix_vertex_query

Conversation

@Hallberg-NOAA
Copy link
Copy Markdown
Collaborator

Always call kappa_shear_at_vertex so that the Vertex_shear element of the
control structure for the MOM_set_diffusivity module is always actively set. It
had previously been initialized only if USE_JACKSON_PARAM is true, which led to
the issues reported in MOM6 issue #1201. Also clarified or corrected some of
the comments in MOM_kappa_shear. All answers will be bitwise identical in all
cases that worked previously, and this PR corrects the problems noted in issue
#1201, which can closed once it is accepted.

  Always call kappa_shear_at_vertex so that the Vertex_shear element of the
control structure for the MOM_set_diffusivity module is always actively set.  It
had previously been initialized only if USE_JACKSON_PARAM is true, which led to
the issues reported in MOM6 issue mom-ocean#1201.  Also clarified or corrected some of
the comments in MOM_kappa_shear.  All answers will be bitwise identical in all
cases that worked previously, and this PR corrects the problems noted in issue
mom-ocean#1201, which can closed once it is accepted.
@codecov-commenter
Copy link
Copy Markdown

codecov-commenter commented Sep 8, 2020

Codecov Report

Merging #1202 into dev/gfdl will decrease coverage by 0.06%.
The diff coverage is 37.59%.

Impacted file tree graph

@@             Coverage Diff              @@
##           dev/gfdl    #1202      +/-   ##
============================================
- Coverage     46.08%   46.01%   -0.07%     
============================================
  Files           214      224      +10     
  Lines         69399    70527    +1128     
============================================
+ Hits          31984    32455     +471     
- Misses        37415    38072     +657     
Impacted Files Coverage Δ
...g_src/external/GFDL_ocean_BGC/FMS_coupler_util.F90 0.00% <0.00%> (ø)
...fig_src/external/GFDL_ocean_BGC/generic_tracer.F90 0.00% <0.00%> (ø)
...c/external/GFDL_ocean_BGC/generic_tracer_utils.F90 0.00% <0.00%> (ø)
config_src/external/ODA_hooks/kdtree.f90 0.00% <0.00%> (ø)
config_src/external/ODA_hooks/ocean_da_core.F90 0.00% <0.00%> (ø)
config_src/external/ODA_hooks/ocean_da_types.F90 0.00% <0.00%> (ø)
config_src/external/ODA_hooks/write_ocean_obs.F90 0.00% <0.00%> (ø)
config_src/solo_driver/MESO_surface_forcing.F90 0.00% <0.00%> (ø)
config_src/solo_driver/user_surface_forcing.F90 0.00% <0.00%> (ø)
src/ALE/MOM_regridding.F90 31.47% <0.00%> (-0.17%) ⬇️
... and 184 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5dd727a...e042f38. Read the comment docs.

@adcroft
Copy link
Copy Markdown
Collaborator

adcroft commented Sep 10, 2020

@marshallward
Copy link
Copy Markdown
Collaborator

Overriding hanging Travis build. Otherwise everything passes.

@marshallward marshallward merged commit 2e40bf9 into mom-ocean:dev/gfdl Sep 10, 2020
@Hallberg-NOAA Hallberg-NOAA deleted the fix_vertex_query branch July 30, 2021 16:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants