Skip to content

*Non-Boussinesq revision of MOM_CVMix_KPP#446

Merged
marshallward merged 2 commits into
NOAA-GFDL:dev/gfdlfrom
Hallberg-NOAA:nonBous_CVMix_KPP
Aug 14, 2023
Merged

*Non-Boussinesq revision of MOM_CVMix_KPP#446
marshallward merged 2 commits into
NOAA-GFDL:dev/gfdlfrom
Hallberg-NOAA:nonBous_CVMix_KPP

Conversation

@Hallberg-NOAA
Copy link
Copy Markdown
Member

This commit revises MOM_CVMix_KPP to work in an appropriate mixture of thickness and vertical extent variables to enable their use in non-Boussinesq mode, using thickness_to_dz to convert between the two, while retaining the previous answers in Boussinesq mode. This includes the use of a layer thicknesses rather than a vertical distance in the denominator of the calculation of the buoyancy frequency and the replacement of the layer thickness argument (h) to KPP_smooth_BLD with a layer vertical extent (dz). When in non-Boussinesq mode, the buoyancy difference between layers is normalized by the average of the density of the two layers rather than the Boussinesq reference density. This commit eliminates any direct or indirect dependency on the Boussinesq reference density in CVMix_KPP when in non-Boussinesq mode.

This set of changes includes changing the units of 1 internal variables and the addition of 2 new internal variables, and a change to the name and units of one argument to KPP_smooth_BLD. These changes lead to the removal of 5 factors of GV%H_to_Z.

Answers will change in non-Boussinesq mode when USE_KPP is true, but they are bitwise identical in all Boussinesq test cases.

  This commit revises MOM_CVMix_KPP to work in an appropriate mixture of
thickness and vertical extent variables to enable their use in non-Boussinesq
mode, using thickness_to_dz to convert between the two, while retaining the
previous answers in Boussinesq mode.  This includes the use of a layer
thicknesses rather than a vertical distance in the denominator of the
calculation of the buoyancy frequency and the replacement of the layer thickness
argument (h) to KPP_smooth_BLD with a layer vertical extent (dz).  When in
non-Boussinesq mode, the buoyancy difference between layers is normalized by the
average of the density of the two layers rather than the Boussinesq reference
density. This commit eliminates any direct or indirect dependency on the
Boussinesq reference density in CVMix_KPP when in non-Boussinesq mode.

  This set of changes includes changing the units of 1 internal variables and
the addition of 2 new internal variables, and a change to the name and units of
one argument to KPP_smooth_BLD.  These changes lead to the removal of 5 factors
of GV%H_to_Z.

  Answers will change in non-Boussinesq mode when USE_KPP is true, but they are
bitwise identical in all Boussinesq test cases.
@Hallberg-NOAA Hallberg-NOAA added enhancement New feature or request answer-changing A change in results (actual or potential) labels Aug 7, 2023
@codecov
Copy link
Copy Markdown

codecov Bot commented Aug 7, 2023

Codecov Report

Merging #446 (4183959) into dev/gfdl (f847b3c) will decrease coverage by 0.01%.
The diff coverage is 0.00%.

❗ Current head 4183959 differs from pull request most recent head 99d1e48. Consider uploading reports for the commit 99d1e48 to get more accurate results

@@             Coverage Diff              @@
##           dev/gfdl     #446      +/-   ##
============================================
- Coverage     38.06%   38.06%   -0.01%     
============================================
  Files           269      269              
  Lines         77194    77202       +8     
  Branches      14258    14260       +2     
============================================
+ Hits          29386    29387       +1     
- Misses        42484    42492       +8     
+ Partials       5324     5323       -1     
Files Changed Coverage Δ
src/parameterizations/vertical/MOM_CVMix_KPP.F90 0.76% <0.00%> (-0.02%) ⬇️

... and 1 file with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

Copy link
Copy Markdown
Collaborator

@StephenGriffies StephenGriffies left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code looks good. No red flags.

@marshallward
Copy link
Copy Markdown
Member

Gaea regression: https://gitlab.gfdl.noaa.gov/ogrp/MOM6/-/pipelines/20310 ✔️

@marshallward marshallward merged commit 22a370c into NOAA-GFDL:dev/gfdl Aug 14, 2023
@Hallberg-NOAA Hallberg-NOAA deleted the nonBous_CVMix_KPP branch September 27, 2023 15:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

answer-changing A change in results (actual or potential) enhancement New feature or request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants