-
Notifications
You must be signed in to change notification settings - Fork 65
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
Update from main #242
Update from main #242
Conversation
This patch moves the local `use_tides` flag of the split RK2 solver, which tracks the TIDES parameter, into the RK2 control structure (CS), and uses it to conditionally call `tidal_forcing_end(). The `tidal_forcing_init()` function conditionally allocates the spherical harmonic fields, but `tidal_forcing_end()` is always called, which will in turn always attempt to deallocate the fields. In some compilers, under certain levels of debugging, this can raise a runtime error.
…ain-2022-10-27 GFDL to main 2022-10-27
Gaea regression: https://gitlab.gfdl.noaa.gov/ogrp/MOM6/-/pipelines/17441 ✔️ |
Codecov Report
@@ Coverage Diff @@
## dev/gfdl #242 +/- ##
=========================================
Coverage 37.18% 37.18%
=========================================
Files 263 263
Lines 73198 73198
Branches 13636 13637 +1
=========================================
Hits 27217 27217
Misses 40956 40956
Partials 5025 5025
📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I agree that these changes coming in from main are correct.
This PR has passed pipeline testing at https://gitlab.gfdl.noaa.gov/ogrp/MOM6/-/pipelines/17442. |
migrate nearly all refs to CFC_cap into MOM_tracer_flow_control and MOM_CFC_cap
Merge of main branch to dev/gfdl (mom-ocean#1586). Includes the spherical harmonic allocation bugfix.