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

Replace init mode in drying slope test cases #716

Merged
merged 9 commits into from
Nov 30, 2023

Conversation

cbegeman
Copy link
Collaborator

@cbegeman cbegeman commented Oct 11, 2023

This PR replaces the mode_init MPAS-Ocean run in the initial_state step with local computations. The initial state is unchanged for the configuration that is currently used in the drying_slope cases. I did not retain all of the configuration options that were previously present in mode_init, e.g., the idealized transect.

I added some buffer space in the y-dimension (the new config options Ly as differentiated from Ly_analysis) because the 1km case did not include the full 25km stretch of wetting and drying.

Checklist

  • User's Guide has been updated
  • Developer's Guide has been updated
  • Documentation has been built locally and changes look as expected
  • Document (in a comment titled Testing in this PR) any testing that was used to verify the changes

@cbegeman
Copy link
Collaborator Author

Testing

Drying slope tests have been run on chrys with intel, impi. Results are qualitatively similar by visual inspection. Before the domain size was changed, the initial state was also verified to be quantitatively similar

@cbegeman cbegeman force-pushed the ocn-enhance-drying-slope-init branch 4 times, most recently from 63430d4 to 7cff7e9 Compare October 17, 2023 19:17
@cbegeman cbegeman marked this pull request as ready for review October 17, 2023 22:11
@cbegeman cbegeman requested review from sbrus89 and xylar October 17, 2023 22:11
@cbegeman cbegeman added enhancement New feature or request ocean labels Oct 17, 2023
Copy link
Collaborator

@xylar xylar left a comment

Choose a reason for hiding this comment

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

I'm not super involved with the drying slope test case so I'm mostly leaving the review of the details to @sbrus89. The approach here looks great to me! I'm always in favor of moving away from init mode.

@cbegeman
Copy link
Collaborator Author

@sbrus89 FYI, I'm going to add coriolis parameter as a config option if you want to hold off reviewing.

@cbegeman
Copy link
Collaborator Author

@sbrus89 Ready for your review. Thanks!

@sbrus89
Copy link
Collaborator

sbrus89 commented Oct 25, 2023

@cbegeman, would you mind rebasing this now that #703 is merged?

@cbegeman
Copy link
Collaborator Author

@sbrus89 No problem. I'll ping you once I've rebased and retested.

@sbrus89
Copy link
Collaborator

sbrus89 commented Oct 25, 2023

Thanks very much!

@cbegeman cbegeman force-pushed the ocn-enhance-drying-slope-init branch from 64ff904 to b092afc Compare October 25, 2023 21:20
@cbegeman
Copy link
Collaborator Author

@sbrus89 Ready for your review!

@cbegeman
Copy link
Collaborator Author

@sbrus89 Just a reminder to review this when you have the chance

@sbrus89
Copy link
Collaborator

sbrus89 commented Nov 16, 2023

Thanks @cbegeman, sorry for losing track of this.

Copy link
Collaborator

@sbrus89 sbrus89 left a comment

Choose a reason for hiding this comment

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

@cbegeman, this looks great and is a huge improvement over the init mode config. I had a couple minor comments. Also, I did notice in testing that the convergence seems to have been altered:

baseline:
image

this pr:
image

compass/ocean/tests/drying_slope/drying_slope.cfg Outdated Show resolved Hide resolved
compass/ocean/tests/drying_slope/drying_slope.cfg Outdated Show resolved Hide resolved
compass/ocean/tests/drying_slope/initial_state.py Outdated Show resolved Hide resolved
@cbegeman
Copy link
Collaborator Author

@cbegeman, this looks great and is a huge improvement over the init mode config. I had a couple minor comments. Also, I did notice in testing that the convergence seems to have been altered:

Let me look into this. The change shouldn't have been this large. I may have forgotten to take into account the (new) domain offset when we evaluate convergence.

@cbegeman cbegeman force-pushed the ocn-enhance-drying-slope-init branch from b092afc to 66f2039 Compare November 27, 2023 16:51
@cbegeman
Copy link
Collaborator Author

Yep, as I suspected in the rebase I forgot to add the yCell offset to the analysis step of the convergence test. Now the convergence plot is the same as before:
image

@cbegeman
Copy link
Collaborator Author

@sbrus89 Thanks for your thorough review! I have now addressed all your comments. Let me know if you spot anything else.

Copy link
Collaborator

@sbrus89 sbrus89 left a comment

Choose a reason for hiding this comment

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

@cbegeman, this looks great. Thanks for the effort on this!

@cbegeman cbegeman self-assigned this Nov 29, 2023
@cbegeman
Copy link
Collaborator Author

@xylar This is ready to merge. Do I have the go-ahead from you?

@xylar
Copy link
Collaborator

xylar commented Nov 30, 2023

Yep, go for it!

@xylar
Copy link
Collaborator

xylar commented Nov 30, 2023

(You don't need to ask me if the PR is assigned to you, you can just merge. But I appreciate you checking!)

@cbegeman
Copy link
Collaborator Author

@xylar Thanks! I wanted to check because I assigned it to myself :)

@cbegeman cbegeman merged commit cebf950 into MPAS-Dev:main Nov 30, 2023
4 checks passed
@xylar
Copy link
Collaborator

xylar commented Nov 30, 2023

Ah, yeah, fair enough. You have my blanket permission to assign yourself and merge when you see fit :-)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request ocean
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants