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

GM-Brankart update from NCAR #1209

Merged
merged 10 commits into from
Sep 18, 2020
Merged

GM-Brankart update from NCAR #1209

merged 10 commits into from
Sep 18, 2020

Conversation

adcroft
Copy link
Collaborator

@adcroft adcroft commented Sep 16, 2020

This implements to thickness diffusion the same recent update made to the Brankart/Stanley pressure force correction term. Both were originally poorly thought out approximations to local grid-scale variance which was fixed for the pressure gradient in #1193.

The Travis-CI will fail tc2 and tc2.a tests for which answers are updated by this PR. None of the MOM6-examples suite should be affected.

Code was implemented by @jskenigson and reviewed/tested by @adcroft.

jskenigson and others added 8 commits September 2, 2020 14:52
mn_T = 0 so remove subtraction of mn_T^2 in SGS temperature variance
- Commit b67d3c6 added back two submodules
  that still exist on the NCAR branch but no longer are used in the GFDL
  branch and soon will be expunged on the main branch too. This removes
  the submodules as was done in NOAA_GFDL/MOM6#1139.
- Following suggestions from @Hallberg-NOAA for PR #1193, I've
  copied the more completely-documented declaration lines from
  PressureForce_FV_Bouss() to thickness_diffuse_full().
- Similarly to the other module made a change of an intermediate
  variable to its reciprocal.
- Corrected missing OpenMP directives for some local variables.
@marshallward
Copy link
Collaborator

marshallward commented Sep 18, 2020

@marshallward
Copy link
Collaborator

The missed dev/gfdl merge was the in-place README updates, so I will go ahead and merge this.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants