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

Brankart PGF update #1193

Merged
merged 8 commits into from
Sep 9, 2020
Merged

Brankart PGF update #1193

merged 8 commits into from
Sep 9, 2020

Conversation

adcroft
Copy link
Collaborator

@adcroft adcroft commented Aug 31, 2020

  • Adds a diagnostic of the parameterized SGS temperature variance
  • Updates the estimate of grid-scale variance, replacing a gradient-along-coordinate squared form by a thickness-weighted least-squares fit. The latter handles coordinates collapsed against topography much better and addresses the spurious behavior we were seeing.

adcroft added 4 commits August 3, 2020 21:36
- Adds a diagnostic of the parameterized SGS T variance used in the
  Brankart correction to the PGF
- The SGS T variance is measure from the grid-scale variance. It should
  be a horizontal difference but is approximated as along coordinate.
  This adds thickness weighting to avoid large values near topography.
- One line was too long
- Noticed several spelling and grammar problems in comments
@codecov-commenter
Copy link

codecov-commenter commented Aug 31, 2020

Codecov Report

Merging #1193 into dev/gfdl will decrease coverage by 0.04%.
The diff coverage is 38.73%.

Impacted file tree graph

@@             Coverage Diff              @@
##           dev/gfdl    #1193      +/-   ##
============================================
- Coverage     46.08%   46.03%   -0.05%     
============================================
  Files           214      224      +10     
  Lines         69399    70537    +1138     
============================================
+ Hits          31984    32474     +490     
- Misses        37415    38063     +648     
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/user_surface_forcing.F90 0.00% <0.00%> (ø)
src/ALE/MOM_regridding.F90 31.47% <0.00%> (-0.17%) ⬇️
... and 183 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 fc59c04...edff25e. Read the comment docs.

@adcroft
Copy link
Collaborator Author

adcroft commented Sep 1, 2020

Closing to solve a restart problem that appeared with the merge

@adcroft adcroft closed this Sep 1, 2020
- The restart tests were failing because land values differ before/after
  a restart. Adding 2d land masking of h value in the stencil removes
  the sensitivity.
@adcroft adcroft reopened this Sep 4, 2020
- A variable was poorly named and also changed units mid-stream.
  The newly named variable now only has the same units ever.
@Hallberg-NOAA
Copy link
Collaborator

This PR changes answers in some test cases (e.g., TC2 in .testing), although it does not change any answers in the MOM6-examples test suite. This should have been noted in the comments describing this PR.

Copy link
Collaborator

@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 have examined these code changes and tested them, and I am convinced that this PR should be merged into dev/gfdl.

@marshallward
Copy link
Collaborator

marshallward commented Sep 9, 2020

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

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.

4 participants