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 Stokes drift spectrum rescaling #593

Merged

Conversation

Hallberg-NOAA
Copy link
Member

Eliminated unneeded rescaling factors when setting the surface Stokes drift spectrum variables (UStk_Hb and VStk_Hb) from forces%[UV]Stkb in Update_Surface_Waves(). This bug appears to have been introduced when merging in code that updates the Stokes drifts that was added on one branch (dev/ncar) separately from changes in how these Stokes drifts are scaled in the mech_forcing type on anther branch (dev/gfdl), although it might just have been an oversight during refactoring. All answers are bitwise identical when no dimensional rescaling is being used, but answers could change for some uncommon cases using the Stokes drift spectrum when dimensional rescaling is applied.

  Eliminated unneeded rescaling factors when setting the surface Stokes drift
spectrum variables (UStk_Hb and VStk_Hb) from forces%[UV]Stkb in
Update_Surface_Waves.  This bug appears to have been introduced when merging in
code that updates the Stokes drifts that was added on one branch (dev/ncar)
separately from changes in how these Stokes drifts are scaled in the
mech_forcing type on anther branch (dev/gfdl), although it might just have been
an oversight during refactoring.  All answers are bitwise identical when no
dimensional rescaling is being used, but answers could change for some uncommon
cases using the Stokes drift spectrum when dimensional rescaling is applied.
@Hallberg-NOAA Hallberg-NOAA added the bug Something isn't working label Apr 2, 2024
Copy link

codecov bot commented Apr 2, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 37.12%. Comparing base (6f1c79e) to head (93654b8).

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

Additional details and impacted files
@@             Coverage Diff              @@
##           dev/gfdl     #593      +/-   ##
============================================
+ Coverage     37.07%   37.12%   +0.04%     
============================================
  Files           271      271              
  Lines         80968    80797     -171     
  Branches      15118    15082      -36     
============================================
- Hits          30022    29998      -24     
+ Misses        45324    45198     -126     
+ Partials       5622     5601      -21     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@marshallward
Copy link
Member

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

@marshallward marshallward merged commit 3a3baf1 into NOAA-GFDL:dev/gfdl Apr 17, 2024
10 checks passed
@Hallberg-NOAA Hallberg-NOAA deleted the fix_wave_stokes_scaling branch May 10, 2024 21:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants