Skip to content

Update from main#242

Merged
Hallberg-NOAA merged 3 commits into
dev/gfdlfrom
main_to_dev
Nov 16, 2022
Merged

Update from main#242
Hallberg-NOAA merged 3 commits into
dev/gfdlfrom
main_to_dev

Conversation

@marshallward
Copy link
Copy Markdown
Member

Merge of main branch to dev/gfdl (mom-ocean#1586). Includes the spherical harmonic allocation bugfix.

marshallward and others added 3 commits November 7, 2022 17:55
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.
@marshallward
Copy link
Copy Markdown
Member Author

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

@codecov
Copy link
Copy Markdown

codecov Bot commented Nov 16, 2022

Codecov Report

Merging #242 (2623242) into dev/gfdl (f92a4ab) will not change coverage.
The diff coverage is 100.00%.

@@            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           
Impacted Files Coverage Δ
src/core/MOM_dynamics_split_RK2.F90 63.55% <100.00%> (ø)

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

Copy link
Copy Markdown
Member

@Hallberg-NOAA Hallberg-NOAA left a 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.

@Hallberg-NOAA
Copy link
Copy Markdown
Member

This PR has passed pipeline testing at https://gitlab.gfdl.noaa.gov/ogrp/MOM6/-/pipelines/17442.

@Hallberg-NOAA Hallberg-NOAA merged commit f1fe63d into dev/gfdl Nov 16, 2022
@Hallberg-NOAA Hallberg-NOAA deleted the main_to_dev branch November 16, 2022 09:50
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants