Omega/add coupling fluxes#418
Draft
alicebarthel wants to merge 17 commits into
Draft
Conversation
Author
|
Note that this branch should be sufficient to test the Coupling+Forcing infrastructure, but does not currently implement the temperature tendency as documented in the v2 coupling document (i.e. missing the enthalpy of liq water). The proper implementation needs the freezing point calculation which is implemented in a different branch that I did not have time to cherry pick on this one. Let's make sure we update this before the full merge. |
11 tasks
sbrus89
added a commit
that referenced
this pull request
Jun 24, 2026
Adds the new Forcing class (with minimal changes). Wind Forcing has been moved to the Forcing class and renamed a more general "SrfStress" to account for sea ice stress. The docs have been updated accordingly. The longer term vision is that Forcing will own 3 classes of AuxVars for momentum forcing, surface restoring, and surface tracer forcing. This PR is 1/3 to make #418 more digestible.
This file contains hidden or 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
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.
This (draft) PR includes a rebase of the Forcing class development on the recent develop, the grouping of all surface forcing terms in the Forcing class, and some renaming for readability/consistency.
We went back and forth on the design of including the Forcing terms in AuxVars, but this is what we decided to go ahead with for now.
I tried to update the documentation as I went.
Some tests may have been removed and not added back - it needs careful review for code coverage in its current format.
The ctests pass successfully, except for DRIVER_TEST. Afaik, this is because it looks for the restoring and wind terms in forcing.nc, which does not include these terms at the moment.
Checklist
CTest on pm-cpu only. DRIVER_TEST fails.
New tests: