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

*Fix bug with TIDAL_ENERGY_TYPE = "ER03" #232

Merged

Conversation

Hallberg-NOAA
Copy link
Member

Corrected a bug in converting depths read from an input file from units of cm to m when the ER03 version of tidal mixing is used. This commit will change answers when INT_TIDE_DISSIPATION = True, USE_CVMix_TIDAL = True, and TIDAL_ENERGY_TYPE = "ER03". There are no such configurations in the MOM6-examples pipeline tests, and it is not clear whether or where such a configuration has ever been used.

This bug was introduced into dev/gfdl on Nov. 19, 2018 as a part of PR mom-ocean#883 in
commit 967e470, which was supposed to be a refactoring of this portion of the code without changing answers, but introduced this bug. This commit should restore solutions with impacted configurations to what they would have been before that earlier commit.

@codecov
Copy link

codecov bot commented Nov 7, 2022

Codecov Report

Merging #232 (e1bdb84) into dev/gfdl (f92a4ab) will decrease coverage by 0.01%.
The diff coverage is 6.94%.

@@             Coverage Diff              @@
##           dev/gfdl     #232      +/-   ##
============================================
- Coverage     37.18%   37.17%   -0.02%     
============================================
  Files           263      263              
  Lines         73198    73221      +23     
  Branches      13636    13638       +2     
============================================
+ Hits          27217    27218       +1     
- Misses        40956    40978      +22     
  Partials       5025     5025              
Impacted Files Coverage Δ
src/ice_shelf/MOM_ice_shelf.F90 0.00% <0.00%> (ø)
src/initialization/MOM_coord_initialization.F90 55.81% <0.00%> (-0.66%) ⬇️
src/initialization/MOM_shared_initialization.F90 29.20% <0.00%> (-0.10%) ⬇️
src/initialization/MOM_state_initialization.F90 21.50% <0.00%> (-0.15%) ⬇️
src/ocean_data_assim/MOM_oda_driver.F90 0.00% <0.00%> (ø)
...c/parameterizations/lateral/MOM_internal_tides.F90 0.00% <0.00%> (ø)
...meterizations/vertical/MOM_internal_tide_input.F90 0.00% <0.00%> (ø)
...c/parameterizations/vertical/MOM_set_viscosity.F90 60.04% <0.00%> (-0.07%) ⬇️
...rc/parameterizations/vertical/MOM_tidal_mixing.F90 1.40% <0.00%> (-0.01%) ⬇️
src/core/MOM_dynamics_split_RK2.F90 63.55% <100.00%> (ø)
... and 1 more

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

@gustavo-marques
Copy link
Member

We (NCAR) use TIDAL_ENERGY_TYPE = "Jayne", so this PR does not impact our solutions.

@Hallberg-NOAA Hallberg-NOAA added bug Something isn't working answer-changing A change in results (actual or potential) labels Nov 15, 2022
  Corrected a bug in converting depths read from an input file from units of cm
to m when the ER03 version of tidal mixing is used.  This commit will change
answers when INT_TIDE_DISSIPATION = True, USE_CVMix_TIDAL = True, and
TIDAL_ENERGY_TYPE = "ER03".  There are no such configurations in the
MOM6-examples pipeline tests, and it is not clear whether or where such a
configuration has ever been used.

  This bug was introduced into dev/gfdl on Nov. 19, 2018 as a part of PR mom-ocean#883 in
commit NOAA-GFDL@967e470, which was supposed to
be a refactoring of this portion of the code without changing answers, but
introduced this bug.  This commit should restore solutions with impacted
configurations to what they would have been before that earlier commit.
@Hallberg-NOAA Hallberg-NOAA force-pushed the read_ER03_tidal_energy_bugfix branch from 0412a75 to afd3331 Compare November 16, 2022 14:06
@marshallward
Copy link
Member

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

@marshallward marshallward merged commit 08c9aa1 into NOAA-GFDL:dev/gfdl Nov 16, 2022
@Hallberg-NOAA Hallberg-NOAA deleted the read_ER03_tidal_energy_bugfix branch February 2, 2023 13:50
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) bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants