Skip to content

*+Revise non-Boussinesq gprime expressions#393

Merged
marshallward merged 2 commits into
NOAA-GFDL:dev/gfdlfrom
Hallberg-NOAA:nonBous_gprime
Jul 24, 2023
Merged

*+Revise non-Boussinesq gprime expressions#393
marshallward merged 2 commits into
NOAA-GFDL:dev/gfdlfrom
Hallberg-NOAA:nonBous_gprime

Conversation

@Hallberg-NOAA
Copy link
Copy Markdown
Member

Revised the calculation of gprime and the coordinate densities (GV%Rlay) in fully non-Boussinesq mode to use the arithmetic mean of adjacent coordinate densities in the denominator of the expression for g_prime in place of RHO_0. Also use LIGHTEST_DENSITY in place of RHO_0 to specify the top-level coordinate density in certain coordinate modes. Also made corresponding changes to the fully non-Boussinesq APE calculation when CALCULATE_APE is true.

This commit will change answers in some fully non-Boussinesq calculations, and an existing runtime parameter is used and logged in some new cases, changing the MOM_parameter_doc file in those cases.

@Hallberg-NOAA Hallberg-NOAA added the answer-changing A change in results (actual or potential) label Jun 30, 2023
@codecov
Copy link
Copy Markdown

codecov Bot commented Jun 30, 2023

Codecov Report

Merging #393 (d041ab9) into dev/gfdl (ccd3ded) will decrease coverage by 0.02%.
The diff coverage is 17.54%.

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

@@             Coverage Diff              @@
##           dev/gfdl     #393      +/-   ##
============================================
- Coverage     38.17%   38.16%   -0.02%     
============================================
  Files           269      269              
  Lines         76553    76587      +34     
  Branches      14076    14084       +8     
============================================
  Hits          29227    29227              
- Misses        42077    42107      +30     
- Partials       5249     5253       +4     
Files Changed Coverage Δ
src/diagnostics/MOM_sum_output.F90 64.27% <6.25%> (-0.57%) ⬇️
src/initialization/MOM_coord_initialization.F90 48.75% <21.95%> (-7.06%) ⬇️

... and 1 file with indirect coverage changes

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

  Revised the calculation of gprime and the coordinate densities (GV%Rlay) in
fully non-Boussinesq mode to use the arithmetic mean of adjacent coordinate
densities in the denominator of the expression for g_prime in place of RHO_0.
Also use LIGHTEST_DENSITY in place of RHO_0 to specify the top-level coordinate
density in certain coordinate modes.  Also made corresponding changes to the
fully non-Boussinesq APE calculation when CALCULATE_APE is true, and eliminated
an incorrect calculation of the layer volumes in non-Boussinesq mode using the
Boussinesq reference density that was never actually being used when
CALCULATE_APE is false.

  This commit will change answers in some fully non-Boussinesq calculations, and
an existing runtime parameter is used and logged in some new cases, changing
the MOM_parameter_doc file in those cases.
@StephenGriffies
Copy link
Copy Markdown
Collaborator

I see no problems, though did not scrutinize every line. I suggest we move ahead.

@marshallward
Copy link
Copy Markdown
Member

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

@marshallward marshallward merged commit 6102be2 into NOAA-GFDL:dev/gfdl Jul 24, 2023
@Hallberg-NOAA Hallberg-NOAA deleted the nonBous_gprime branch July 26, 2023 17:38
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)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants