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

Updates related to Omega IOStreams #231

Open
wants to merge 9 commits into
base: main
Choose a base branch
from

Conversation

xylar
Copy link
Collaborator

@xylar xylar commented Sep 27, 2024

This merge adds the capability to only copy streams from the Omega Default.yml file if they are explicitly requested by a given test case.

Here, we also update the map of variables between MPAS-Ocean and Omega, and add placeholders for mapping dimension names once the new Omega names are fully supported. (See E3SM-Project/Omega#172).

This merge updates the manufactured solution test case to support Omega in all steps but analysis (which requires further development of the time variable, see E3SM-Project/Omega#169).

Checklist

  • Testing comment in the PR documents testing used to verify the changes

@xylar xylar added framework Changes relating to the polaris framework as opposed to individual tests or analysis ocean Related to ocean tests or analysis Omega PR required The polaris changes won't work with the current Omega submodule and require an update labels Sep 27, 2024
@xylar xylar self-assigned this Sep 27, 2024
@xylar
Copy link
Collaborator Author

xylar commented Sep 27, 2024

This requires E3SM-Project/Omega#132

@xylar xylar force-pushed the update-omega-iostream branch 2 times, most recently from 93d18f0 to a876c23 Compare September 28, 2024 16:43
@xylar xylar force-pushed the update-omega-iostream branch from 6dc2fda to 60ddce2 Compare November 7, 2024 20:05
@xylar xylar force-pushed the update-omega-iostream branch from 60ddce2 to 28e5f4a Compare November 28, 2024 13:31
@xylar xylar marked this pull request as ready for review November 28, 2024 13:32
@xylar xylar requested a review from cbegeman November 28, 2024 13:32
@xylar xylar added Omega PR finished The polaris changes required an update to the Omega submodule and this is now finished and removed Omega PR required The polaris changes won't work with the current Omega submodule and require an update labels Nov 28, 2024
@xylar
Copy link
Collaborator Author

xylar commented Nov 28, 2024

Testing

With these changes, I am able to run the manufactured solution test case with Omega on Chrysalis through all but the analysis step. I will not attempt to address the analysis step here because that will need E3SM-Project/Omega#169.

Results can be found here:

/lcrc/group/e3sm/ac.xylar/polaris_0.5/chrysalis/test_20241128/omega_mfd_soln/ocean/planar/manufactured_solution/convergence_both

@xylar
Copy link
Collaborator Author

xylar commented Nov 28, 2024

@cbegeman, I would appreciate your review when you get back from the holiday. You can look as much or as little as you have time for at the changes in model_step but I would appreciate having you take a look at the ocean framework and the convergence framework in particular. I don't think there are any controversial changes but it always helps to have another pair of eyes on those.

If you want to run the convergence_both test from manufactured_solutions somewhere, that would be great. The easiest way to build Omega is to run the CTest utility in Polaris, which will check out and build Omega for you. Then you can point to, e.g., polaris setup ... -p build_omega/build_chrysalis_intel.

@xylar xylar force-pushed the update-omega-iostream branch from caa340e to b8a996d Compare December 4, 2024 14:04
@xylar xylar added Omega PR required The polaris changes won't work with the current Omega submodule and require an update and removed Omega PR finished The polaris changes required an update to the Omega submodule and this is now finished labels Dec 4, 2024
@xylar
Copy link
Collaborator Author

xylar commented Dec 4, 2024

This now needs E3SM-Project/Omega#176

@xylar xylar force-pushed the update-omega-iostream branch from b8a996d to f11d40e Compare December 4, 2024 18:20
@xylar xylar added Omega PR finished The polaris changes required an update to the Omega submodule and this is now finished and removed Omega PR required The polaris changes won't work with the current Omega submodule and require an update labels Dec 4, 2024
@xylar
Copy link
Collaborator Author

xylar commented Dec 4, 2024

One more submodule update?

Ideally, we would wait for E3SM-Project/Omega#170 to be merged and update the Omega submodule one more time before merging this.

Testing

With that branch (merged with Omega's develop branch) and this branch, I was able to run the manufactured solution test case successfully on Chrysalis with Intel (including the viz step).
convergence_ssh
comparison

Copy link
Collaborator

@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.

This looks great to me. I ran manufactured_solution/convergence_space tests successfully with both Omega/develop and MPAS-Ocean on chrys with intel. Thanks for all your work on this, @xylar!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
framework Changes relating to the polaris framework as opposed to individual tests or analysis ocean Related to ocean tests or analysis Omega PR finished The polaris changes required an update to the Omega submodule and this is now finished
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants