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

Add tidal boundary conditions to split-explicit time integrator #6049

Merged
merged 4 commits into from
Jan 3, 2024

Conversation

cbegeman
Copy link
Contributor

@cbegeman cbegeman commented Nov 3, 2023

This PR adds the option to have a tidal boundary condition with the split-explicit time integrator. Formerly, only tidal boundary conditions were supported with RK4. The changes to the ssh and layerThickness terms are described in https://www.overleaf.com/read/htysppyxksyh#6b2d8f.

This PR also includes options for a linearly-varying tidal boundary condition to match a test case from O'Dea et al. 2021 used for validation.

This work depends on #6047 in that the test cases used for verification of the forcing will fail without the use of upwinded advection and that fix.

[BFB] when feature is turned off

This feature is only available in MPAS-Ocean standalone configurations.

@cbegeman cbegeman added enhancement Stealth PR has feature which, if turned on, could change climate. fka FCC MPAS-Ocean standalone Issues and features for standalone MPAS-Ocean code that dont impact E3SM. labels Nov 3, 2023
@cbegeman
Copy link
Contributor Author

cbegeman commented Nov 3, 2023

Testing

This PR is BFB with #6047 across the compass PR test suite on chrysalis with intel, openmpi.

The linear tidal forcing feature is tested with a new configuration of the drying_slope test case following O'Dea et al. (2021) on chrysalis with intel, openmpi in which the tide drops linearly by 1m over 3 hours.
image

@rljacob
Copy link
Member

rljacob commented Dec 7, 2023

notes: ready but low priority

@jonbob jonbob requested a review from mark-petersen December 14, 2023 19:42
@jonbob
Copy link
Contributor

jonbob commented Dec 14, 2023

@cbegeman -- I asked @mark-petersen to review, but please add anyone else who makes sense as well

@mark-petersen
Copy link
Contributor

mark-petersen commented Dec 21, 2023

@cbegeman since #6047 is now merged, I rebased locally on master (09491ec) and I'm testing that. The rebase had no conflicts.

Copy link
Contributor

@mark-petersen mark-petersen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Compiled with intel on chrysalis and ran nightly test suite. Compares bfb against master branch point, as expected.

This all looks reasonable. The new code is protected by flags when the boundary tidal forcing is off. Approving based on @cbegeman's tests above, where the drying slope test has boundary forcing. Very nice!

jonbob added a commit that referenced this pull request Jan 2, 2024
Add tidal boundary conditions to split-explicit time integrator

This PR adds the option to have a tidal boundary condition with the
split-explicit time integrator. Formerly, only tidal boundary conditions
were supported with RK4.

This PR also includes options for a linearly-varying tidal boundary
condition to match a test case from O'Dea et al. 2021 used for
validation.

[BFB] used by standalone mpaso only
@jonbob
Copy link
Contributor

jonbob commented Jan 2, 2024

passes:

  • SMS_Ld1.ne30pg2_EC30to60E2r2.WCYCL1850.chrysalis_intel.allactive-wcprod_1850
  • ERS_Ld5.T62_oQU120.CMPASO-NYF.chrysalis_intel

merged to next

@cbegeman
Copy link
Contributor Author

cbegeman commented Jan 2, 2024

@mark-petersen Thank you for your review and testing and @jonbob thanks for your testing!

@jonbob jonbob merged commit a733924 into E3SM-Project:master Jan 3, 2024
2 checks passed
@jonbob
Copy link
Contributor

jonbob commented Jan 3, 2024

merged to master

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement MPAS-Ocean standalone Issues and features for standalone MPAS-Ocean code that dont impact E3SM. Stealth PR has feature which, if turned on, could change climate. fka FCC
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants