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

(*)Improve advective CFL calculation with tiny h #1172

Merged
merged 3 commits into from
Aug 8, 2020

Conversation

Hallberg-NOAA
Copy link
Collaborator

Improved handling of massless layers in the calculation of the advective CFL
numbers used in PPM tracer advection by using an Adcroft reciprocal instead of
adding a small value in the denominator. Also addressed newly exposed issues
with the handling of very thin layers in make_frazil. This does not change
answers for typical values of ANGSTROM, but can avoid problems that can arise
when ANGSTROM=0. All answers in the existing MOM6-examples test cases are
bitwise identical, and there are no changes to model output files.

  • NOAA/GFDL/MOM6@948e2926f (*)Improve advective CFL calculation with tiny h
  • NOAA/GFDL/MOM6@1daad4469 (*)Improve make_frazil

  Improve the handling of very thin layers in make_frazil.  This does not change
answers for typical values of ANGSTROM, but can avoid problems that can arise
when ANGSTROM=0.  All answers in the existing MOM6-examples test cases are
bitwise identical.
  Improved handling of massless layers in the calculation of the advective CFL
numbers used in PPM tracer advection by using an Adcroft reciprocal instead of
adding a small value in the denominator.  Although all answers are bitwise
identical in the existing MOM6-examples test cases, this can avoid problems
with tracer advection when ANGSTROM is 0 or very small like those that were
recently found in analogous SIS2 code.
@codecov-commenter
Copy link

codecov-commenter commented Jul 31, 2020

Codecov Report

Merging #1172 into dev/gfdl will decrease coverage by 0.13%.
The diff coverage is 41.01%.

Impacted file tree graph

@@             Coverage Diff              @@
##           dev/gfdl    #1172      +/-   ##
============================================
- Coverage     46.08%   45.95%   -0.14%     
============================================
  Files           214      224      +10     
  Lines         69399    70504    +1105     
============================================
+ Hits          31984    32397     +413     
- Misses        37415    38107     +692     
Impacted Files Coverage Δ
...g_src/external/GFDL_ocean_BGC/FMS_coupler_util.F90 0.00% <0.00%> (ø)
...fig_src/external/GFDL_ocean_BGC/generic_tracer.F90 0.00% <0.00%> (ø)
...c/external/GFDL_ocean_BGC/generic_tracer_utils.F90 0.00% <0.00%> (ø)
config_src/external/ODA_hooks/kdtree.f90 0.00% <0.00%> (ø)
config_src/external/ODA_hooks/ocean_da_core.F90 0.00% <0.00%> (ø)
config_src/external/ODA_hooks/ocean_da_types.F90 0.00% <0.00%> (ø)
config_src/external/ODA_hooks/write_ocean_obs.F90 0.00% <0.00%> (ø)
config_src/solo_driver/MESO_surface_forcing.F90 0.00% <0.00%> (ø)
config_src/solo_driver/MOM_driver.F90 68.72% <ø> (ø)
config_src/solo_driver/user_surface_forcing.F90 0.00% <0.00%> (ø)
... and 155 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update f16c250...ef85adb. Read the comment docs.

@marshallward
Copy link
Collaborator

marshallward commented Aug 7, 2020

Gaea regression testing: https://gitlab.gfdl.noaa.gov/ogrp/MOM6/-/pipelines/10942

Tests have passed 🎉

@marshallward marshallward self-assigned this Aug 7, 2020
@marshallward marshallward merged commit f8d1379 into mom-ocean:dev/gfdl Aug 8, 2020
@Hallberg-NOAA Hallberg-NOAA deleted the better_advective_CFL branch July 30, 2021 18:13
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.

3 participants