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.

Sign up for GitHub

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

Jump to bottom

Add a manufactured solution to MPAS-Ocean #5725

Merged
merged 7 commits into from
Jun 15, 2023
Merged

Add a manufactured solution to MPAS-Ocean #5725

merged 7 commits into from
Jun 15, 2023

Conversation

sbrus89
Copy link
Contributor

@sbrus89 sbrus89 commented May 25, 2023 •
edited
Loading

This PR adds the tendencies necessary for a manufactured solution test case in MPAS-Ocean. The details of the case can be found in Section 3.7 of a pre-print by Sid Bishnu et al. https://doi.org/10.22541/essoar.167100170.03833124/v1.

A convergence study that uses this feature has been added to the polaris package E3SM-Project/polaris#72.

Note that currently this case shows first order convergence due to the issue #5364. However, corrections to the RK4 substep time forcing yields the expected 2nd order convergence. A follow-on PR will be submitted to address this issue.

[BFB]
[NML]

@sbrus89 sbrus89 added mpas-ocean BFB PR leaves answers BFB labels May 25, 2023
@sbrus89 sbrus89 requested review from mark-petersen and cbegeman May 25, 2023 18:10
@sbrus89 sbrus89 force-pushed the ocn/manufactured_solution branch from 63ac3a3 to 1d3f70d Compare May 25, 2023 18:13
@sbrus89 sbrus89 force-pushed the ocn/manufactured_solution branch from 1d3f70d to ad93c29 Compare May 25, 2023 18:15
@sbrus89 sbrus89 added the NML label May 25, 2023
@cbegeman cbegeman mentioned this pull request May 26, 2023
Merged
6 tasks
@sbrus89 sbrus89 force-pushed the ocn/manufactured_solution branch from f9cf883 to 96824ae Compare May 30, 2023 14:49
@mark-petersen
Copy link
Contributor

Thanks! I reviewed the code and it looks correct. I also compiled with gnu and intel.

@sbrus89 can you comment here on how you tested this PR?

@sbrus89
Copy link
Contributor Author

sbrus89 commented Jun 7, 2023

@mark-petersen I tested this with E3SM-Project/polaris#72 with debug flags on Perlmutter. The output plots for that case are below. The sub-optimal convergence is due to #5364

comparison
convergence

mark-petersen
mark-petersen approved these changes Jun 8, 2023
View reviewed changes
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.

@sbrus89 thanks for adding this test case. Approving based on visual inspection and your results.

cbegeman
cbegeman approved these changes Jun 9, 2023
View reviewed changes
Copy link
Contributor

@cbegeman cbegeman left a comment

Choose a reason for hiding this comment

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

I made a few minor comments. My testing with the polaris test case on chrys with intel, open-mpi was successful. Thanks, @sbrus89!

components/mpas-ocean/src/Registry.xml Outdated Show resolved Hide resolved
components/mpas-ocean/src/Registry.xml Outdated Show resolved Hide resolved
components/mpas-ocean/src/Registry.xml Outdated Show resolved Hide resolved
components/mpas-ocean/src/shared/mpas_ocn_manufactured_solution.F Outdated Show resolved Hide resolved
components/mpas-ocean/src/shared/mpas_ocn_manufactured_solution.F Show resolved Hide resolved
@sbrus89
Copy link
Contributor Author

sbrus89 commented Jun 9, 2023

@jonbob, just an FYI that this is ready to go. I'll let you run the E3SM namelist scripts, unless you'd like me to take care of it.

@sbrus89 sbrus89 force-pushed the ocn/manufactured_solution branch from f3bac4d to 42c78f6 Compare June 12, 2023 15:22
@sbrus89
Copy link
Contributor Author

sbrus89 commented Jun 12, 2023

The RK4 fix to correct the sub-optimal convergence is under discussion here: E3SM-Ocean-Discussion#55

@sbrus89 sbrus89 force-pushed the ocn/manufactured_solution branch from 42c78f6 to f3bac4d Compare June 12, 2023 15:45
@jonbob
Copy link
Contributor

jonbob commented Jun 12, 2023

Thanks @sbrus89 -- I'll run the scripts today and make sure this is good to go

@jonbob
Copy link
Contributor

jonbob commented Jun 12, 2023

@sbrus89 -- done. I'll mark this as ready to merge

@sbrus89
Copy link
Contributor Author

sbrus89 commented Jun 12, 2023

@jonbob, Thanks very much!

@sbrus89 sbrus89 mentioned this pull request Jun 13, 2023
Closed
jonbob added a commit that referenced this pull request Jun 14, 2023
@jonbob
Merge branch 'sbrus89/ocn/manufactured_solution' into next (PR #5725)
63ec2b1 
Add a manufactured solution to MPAS-Ocean

This PR adds the tendencies necessary for a manufactured solution test
case in MPAS-Ocean. A convergence study that uses this feature has been
added to the polaris package.

[NML]
[BFB]
@jonbob
Copy link
Contributor

jonbob commented Jun 14, 2023

passes:

  • SMS_D_Ld3.T62_oQU120.CMPASO-IAF.chrysalis_intel
  • ERS_Ld5.T62_oQU120.CMPASO-NYF.chrysalis_intel
  • SMS_D_Ld1.ne30pg2_EC30to60E2r2.WCYCL1850.chrysalis_intel.allactive-wcprod

with expected NML DIFFs. Merged to next

@jonbob jonbob merged commit b9c1a8c into E3SM-Project:master Jun 15, 2023
@jonbob
Copy link
Contributor

jonbob commented Jun 15, 2023

merged to master and expected NML DIFFs blessed

@xylar xylar mentioned this pull request Jun 17, 2023
Merged
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cbegeman cbegeman cbegeman approved these changes

@mark-petersen mark-petersen mark-petersen approved these changes

Assignees

@jonbob jonbob

Labels
BFB PR leaves answers BFB mpas-ocean NML
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@sbrus89 @mark-petersen @jonbob @cbegeman