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

Modified ocean/mesh/remap_topography to allow smoothing #863

Merged
merged 15 commits into from
Jan 11, 2025

Conversation

bmooremaley
Copy link
Contributor

@bmooremaley bmooremaley commented Oct 7, 2024

The ocean/mesh/remap_topography step has been modified to remap combined topography from a cubed sphere source grid to MPAS meshes, instead of a lat-lon source grid. The weights file generation has been switched to mbtempest so that smoothing can be defined in the target MPAS mesh SCRIP file. Smoothing parameters have been added to ocean/mesh/remap_topography.cfg. This new workflow also uses a pre-build source SCRIP file stored in the bathymetry database, in addition to the combined topography file.

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

@xylar xylar self-requested a review October 9, 2024 19:58
@xylar xylar self-assigned this Oct 9, 2024
@xylar xylar added enhancement New feature or request ocean labels Oct 9, 2024
@xylar
Copy link
Collaborator

xylar commented Oct 9, 2024

@bmooremaley, as we discussed, we'll need some way to support a different topography dataset for lower res regression testing. I pulled out the config options into their own config file:
#864
If we want to continue to support that 1/20 degree dataset, we would need a way to still use ESMF for that resolution. An alternative (if mbtempest if fast enough) is to use a lower resolution cubed-sphere dataset as we discussed and stick with the modified workflow you have here. I would lean slightly toward the latter so that the regression testing is using a more similar workflow to the high resolution runs.

@xylar
Copy link
Collaborator

xylar commented Jan 2, 2025

I'm moving 5de71c4 to #879. This branch should be rebased once that PR gets merged.

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.

@bmooremaley, some preliminary comments and suggested changes while you work on the documentation.

compass/ocean/mesh/remap_topography.cfg Outdated Show resolved Hide resolved
compass/ocean/mesh/remap_topography.cfg Outdated Show resolved Hide resolved
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.

@bmooremaley, a few more suggested edits. I'm extending this code in #829 to combine this topography with a dataset from MALI. That process is qualitatively similar to your modified remap_topography so it was a useful chance to look through your code in more detail.

compass/ocean/mesh/remap_topography.py Outdated Show resolved Hide resolved
compass/ocean/mesh/remap_topography.py Outdated Show resolved Hide resolved
compass/ocean/mesh/remap_topography.py Outdated Show resolved Hide resolved
@xylar xylar force-pushed the ocean-topo-from-cubedsphere branch 2 times, most recently from 3e0de0b to 37a08ef Compare January 10, 2025 14:53
@xylar
Copy link
Collaborator

xylar commented Jan 10, 2025

I think the only remaining steps are:

  • run all the global ocean tests from the pr suite but without cached meshes and initial conditions
  • update the cached mesh and initial condition files
  • make sure the pr suite succeeds

@xylar xylar force-pushed the ocean-topo-from-cubedsphere branch from 37a08ef to 6cac480 Compare January 11, 2025 13:37
Hoping this will prevent download failures
@xylar
Copy link
Collaborator

xylar commented Jan 11, 2025

Testing

I tested this on Chrysalis with Intel and OpenMPI. I ran the Icos240, IcoswISC240, Icos and IcoswISC meshes through the mesh, init and performance_test test cases without caching. Then, I cached mesh and init steps. Then, I successfully ran the pr suite (which uses the new cached files). I looked at the relevant topography fields from the initial_state step for each mesh and everything looked great to me.

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.

@bmooremaley, thanks for very hard work on this! I took care of the last few finishing touches so I think it's ready to merge!

@xylar xylar merged commit 13959a3 into MPAS-Dev:main Jan 11, 2025
6 checks passed
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.

2 participants