Update from main#242
Merged
Merged
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
Member
Author
|
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 |
Hallberg-NOAA
approved these changes
Nov 16, 2022
Member
Hallberg-NOAA
left a comment
There was a problem hiding this comment.
I agree that these changes coming in from main are correct.
Member
|
This PR has passed pipeline testing at https://gitlab.gfdl.noaa.gov/ogrp/MOM6/-/pipelines/17442. |
This was referenced Apr 6, 2023
marshallward
pushed a commit
that referenced
this pull request
Oct 25, 2023
migrate nearly all refs to CFC_cap into MOM_tracer_flow_control and MOM_CFC_cap
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merge of main branch to dev/gfdl (mom-ocean#1586). Includes the spherical harmonic allocation bugfix.