Add sea-surface height #755
Merged
+6,650
−62
Conversation
This file contains 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
This variable has to be set from outside. CGDynamicsKernel::prepareIteration will compute the gradient of SeasurfaceHeight and stores it as CG-Vectors uGradSeasurfaceHeight and vGradSeasurfaceHeight ins CGDynamicsKernel. VPCGDynamicsKernel is using it in main update loop. Before merging we should activate a ice-only testcase.
Adds ssh to IDynamics and IOceanBoundary classes and all the derived classes. Also modifies TOPAZOcn_test.cpp and topaz_test_data.py to test ssh, as well as changing era5_topaz4_maker.py to include and interpolate ssh.
And that is "ssh" (instead of "SSH").
... to appease clang-format and the PR template
... which I missed on the last commit.
As pointed out by Tim when reviewing the PR.
…eheight_pure I also had to address some minor conflicts. The root of those was that we'd defined the gravity constant, g, in two places.
Move deg2rad to constants.hpp and use this for the radians function. Define also rad2deg and use in the degrees function ... but I still need to rewrite rad2deg as a proper hex float.
Strangely, time step two of the TOPAZ file was always NaNs. I don't understand why the model still worked.
Derived from the TOPAZ4 data, like the rest.
einola
commented
Dec 6, 2024
I converted 180/pi to a hex float here: https://observablehq.com/@jrus/hexfloat
einola
commented
Dec 6, 2024
This is a follow-up on the previous commit (should have used git commit-amend).
timspainNERSC
requested changes
Dec 6, 2024
| @@ -124,7 +127,9 @@ template <int DGadvection> class VPCGDynamicsKernel : public CGDynamicsKernel<DG | |||
| + cgA(i) | |||
| * (FAtm * absatm * uAtmos(i) + // atm forcing | |||
| FOcean * absocn * SC * uOcean(i)) // ocean forcing | |||
| + params.rhoIce * cgH(i) * params.fc * vOcnRel // cor + surface | |||
| - params.rhoIce * cgH(i) * params.fc * u(i) // Coriolis | |||
There was a problem hiding this comment.
Is u(i) correct here? I would expect the Coriolis term to take the other component of the 2D velocity.
There was a problem hiding this comment.
This is fixed now. Can you re-review @timspainNERSC ?
physics/src/modules/OceanBoundaryModule/FluxConfiguredOcean.cpp
Outdated
Show resolved
Hide resolved
This commit addresses the minor changes Tim asked for in his review. This includes re-naming variables and correcting spelling mistakes.
As per Tim's comment on PR #755. Also some mino cleaning of the mEVP momentum solver code.
|
Icelandicisms is a new word for misspellings :D And it's difficult to spell, which is definitely a plus! |
timspainNERSC
approved these changes
Dec 13, 2024
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.
Add sea-surface height
Fixes #538
Task List
Change Description
This PR adds the contribution of the sea-surface-height gradient to both the mEVP and BBM codes (through VPCGDynamicsKernel and BrittleDynamicsKernel). SSH is read in from IOceanBoundary and passed to the dynamical core. It can also be output through ConfigOutput as "ssh".
This PR is a repeat of PR #662 with some fixes to make sure the integration test runs.
Test Description
No unit test was implemented for this feature, and no quantitative test exists. Qualitative testing shows that setting a fixed sea-surface-height gradient gives drift speed close to back-of-the-envelope estimates (13 cm/s modelled, 20 cm/s from back-of-the-envelope).
Documentation Impact
None
Other Details
None
Pre-Request Checklist