Skip to content

+*Redefine GV%Angstrom_H in non-Boussinesq mode#365

Merged
marshallward merged 2 commits intoNOAA-GFDL:dev/gfdlfrom
Hallberg-NOAA:nonBous_Angstrom_H
Jun 1, 2023
Merged

+*Redefine GV%Angstrom_H in non-Boussinesq mode#365
marshallward merged 2 commits intoNOAA-GFDL:dev/gfdlfrom
Hallberg-NOAA:nonBous_Angstrom_H

Conversation

@Hallberg-NOAA
Copy link
Copy Markdown
Member

Redefined GV%Angstrom_H in non-Boussinesq mode so that it is equal to GV%H_to_Z*GV%Angstrom_Z, just as it is in Boussinesq mode. This will change answers (slightly) in all cases with BOUSSINESQ = False. In addition, this commit adds the elements semi_Boussinesq, dZ_subroundoff, m2_s_to_HZ_T, HZ_T_to_m2_s and HZ_T_to_MKS to the verticalGrid_type. The first 3 new elements are used in rescaling vertical viscosities and diffusivities. The last two elements are set using the new runtime parameters SEMI_BOUSSINESQ and RHO_KV_CONVERT, which are only used or logged when BOUSSINESQ = False. All answers and output are identical in Boussinesq cases, but answers change and there are new runtime parameters in non-Boussinesq cases.

  Redefined GV%Angstrom_H in non-Boussinesq mode so that it is equal to
GV%H_to_Z*GV%Angstrom_Z, just as it is in Boussinesq mode.  This will change
answers (slightly) in all cases with BOUSSINESQ = False.  In addition, this
commit adds the elements semi_Boussinesq, dZ_subroundoff, m2_s_to_HZ_T,
HZ_T_to_m2_s and HZ_T_to_MKS to the verticalGrid_type.   The first 3 new
elements are used in rescaling vertical viscosities and diffusivities.  The last
two elements are set using the new runtime parameters SEMI_BOUSSINESQ and
RHO_KV_CONVERT, which are only used or logged when BOUSSINESQ = False.  All
answers and output are identical in Boussinesq cases, but answers change and
there are new runtime parameters in non-Boussinesq cases.
@Hallberg-NOAA Hallberg-NOAA added the answer-changing A change in results (actual or potential) label May 14, 2023
@codecov
Copy link
Copy Markdown

codecov Bot commented May 14, 2023

Codecov Report

Merging #365 (c5517e6) into dev/gfdl (57b7a91) will decrease coverage by 0.01%.
The diff coverage is 81.81%.

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

@@             Coverage Diff              @@
##           dev/gfdl     #365      +/-   ##
============================================
- Coverage     38.29%   38.29%   -0.01%     
============================================
  Files           269      269              
  Lines         76005    76012       +7     
  Branches      13980    13981       +1     
============================================
+ Hits          29104    29106       +2     
- Misses        41676    41679       +3     
- Partials       5225     5227       +2     
Impacted Files Coverage Δ
src/core/MOM_verticalGrid.F90 64.42% <81.81%> (+1.53%) ⬆️

... and 1 file with indirect coverage changes

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

@marshallward
Copy link
Copy Markdown
Member

Gaea: https://gitlab.gfdl.noaa.gov/ogrp/MOM6/-/pipelines/19357 ❌ (✔️) 🟡

As expected, there is a regression in nonBous_global:

ocean_only/nonBous_global/ocean.stats.gnu: FAILED

@marshallward marshallward merged commit 53e9361 into NOAA-GFDL:dev/gfdl Jun 1, 2023
@Hallberg-NOAA Hallberg-NOAA deleted the nonBous_Angstrom_H branch August 23, 2023 08:31
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