Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

+*Ignore SURFACE_ANSWER_DATE when non-Boussinesq #422

Merged
merged 2 commits into from
Aug 10, 2023

Conversation

Hallberg-NOAA
Copy link
Member

Ignore SURFACE_ANSWER_DATE in non-Boussinesq mode and always allocate tv%SpV_avg in fully non-Boussinesq mode, setting it to the inverse of the layer densities in calc_derived_thermo() if there is no equation of state. Also when in fully non-Boussinesq mode cancelled out some rescaling factors in dz_to_thickness_EOS and dz_to_thickness_tv. Also revised dz_to_thickness_simple in non-Boussinesq and non-layered mode to use RHO_KV_CONVERT instead of RHO_0 to rescale vertical distances to thicknesses. Also set the default value of CALC_RHO_FOR_SEA_LEVEL to true when fully non-Boussinesq. All Boussinesq answers are bitwise identical, but some non-Boussinesq answers do change and become less dependent on the Boussinesq reference density. Because SURFACE_ANSWER_DATE is no longer being used in non-Boussinesq mode, is is no longer being logged in the MOM_parameter_doc files for these experiments.

@Hallberg-NOAA Hallberg-NOAA added enhancement New feature or request answer-changing A change in results (actual or potential) Parameter change Input parameter changes (addition, removal, or description) labels Jul 21, 2023
@codecov
Copy link

codecov bot commented Jul 21, 2023

Codecov Report

Merging #422 (97f1770) into dev/gfdl (648012e) will decrease coverage by 9.10%.
The diff coverage is 4.54%.

❗ Current head 97f1770 differs from pull request most recent head 8485b1a. Consider uploading reports for the commit 8485b1a to get more accurate results

@@             Coverage Diff              @@
##           dev/gfdl     #422      +/-   ##
============================================
- Coverage     47.15%   38.05%   -9.10%     
============================================
  Files            41      269     +228     
  Lines          4583    77062   +72479     
  Branches        806    14225   +13419     
============================================
+ Hits           2161    29328   +27167     
- Misses         2241    42415   +40174     
- Partials        181     5319    +5138     
Files Changed Coverage Δ
src/core/MOM_interface_heights.F90 20.53% <0.00%> (ø)
src/core/MOM.F90 50.90% <50.00%> (ø)

... and 253 files with indirect coverage changes

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

Copy link
Member

@marshallward marshallward left a comment

Choose a reason for hiding this comment

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

@marshallward
Copy link
Member

Looks like some of the non-sequential PR updates caused the declarations to multiply.

Apologies for this, but it needs a fixup.

  Ignore SURFACE_ANSWER_DATE in non-Boussinesq mode and always allocate
tv%SpV_avg in fully non-Boussinesq mode, setting it to the inverse of the layer
densities in calc_derived_thermo() if there is no equation of state.  Also when
in fully non-Boussinesq mode cancelled out some rescaling factors in
dz_to_thickness_EOS and dz_to_thickness_tv.  Also revised dz_to_thickness_simple
in non-Boussinesq and non-layered mode to use RHO_KV_CONVERT instead of RHO_0 to
rescale vertical distances to thicknesses.  Also set the default value of
CALC_RHO_FOR_SEA_LEVEL to true when fully non-Boussinesq.  All Boussinesq
answers are bitwise identical, but some non-Boussinesq answers do change and
become less dependent on the Boussinesq reference density.  Because
SURFACE_ANSWER_DATE is no longer being used in non-Boussinesq mode, is is no
longer being logged in the MOM_parameter_doc files for these experiments.
@Hallberg-NOAA
Copy link
Member Author

No apologies needed! I have fixed the rebasing problem, and then I rebased this on top of the latest version of dev/gfdl.

@marshallward
Copy link
Member

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

@marshallward marshallward merged commit 07713af into NOAA-GFDL:dev/gfdl Aug 10, 2023
10 checks passed
@Hallberg-NOAA Hallberg-NOAA deleted the nonBous_without_EOS branch September 27, 2023 16:10
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 Parameter change Input parameter changes (addition, removal, or description)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants