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

Added cubed_sphere target grid test to utility/combine_topo #861

Merged
merged 14 commits into from
Jan 11, 2025

Conversation

bmooremaley
Copy link
Contributor

@bmooremaley bmooremaley commented Sep 25, 2024

The ocean/utility/combine_topo test has been split into two separate tests: one for a lat_lon target grid and one for a cubed_sphere target grid. The cubed_sphere test allows the migration to mbtempest for remapping bathymetry to MPAS grids by removing the pole singularities. The workflow for the existing lat_lon target grid has also been updated to use remapping tools more consistently between the GEBCO and BedMachineAntarctica data sets, and between the lat_lon and cubed_sphere target mesh workflows. Specifically, the GEBCO dataset is separated into tiles prior to remapping, ESMF_RegridWeightGen is used for building weights files, and ncremap is used for the final remapping step.

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

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, this is excellent work! I'm very happy with the way you have reorganized things and the clean-up you've done along the way.

I have some suggested changes that we can discuss today.

compass/ocean/tests/utility/combine_topo/__init__.py Outdated Show resolved Hide resolved
compass/ocean/tests/utility/combine_topo/__init__.py Outdated Show resolved Hide resolved
compass/ocean/tests/utility/combine_topo/__init__.py Outdated Show resolved Hide resolved
compass/ocean/tests/utility/combine_topo/combine_topo.cfg Outdated Show resolved Hide resolved
compass/ocean/tests/utility/combine_topo/__init__.py Outdated Show resolved Hide resolved
compass/ocean/tests/utility/combine_topo/__init__.py Outdated Show resolved Hide resolved
compass/ocean/tests/utility/combine_topo/__init__.py Outdated Show resolved Hide resolved
@xylar
Copy link
Collaborator

xylar commented Sep 26, 2024

Presumably, you'll need to do a commit to make the linter happy. The easiest way to do that is probably to add an extra newline somewhere (maybe at the end of the file) and then fix whatever it complains about. Make sure you do that with the conda environment loaded so pre-commit can happen.

@bmooremaley bmooremaley force-pushed the combine-topo-to-cubedsphere branch from b94f7d9 to 1ed573a Compare October 6, 2024 19:39
@xylar xylar added enhancement New feature or request ocean labels Oct 9, 2024
@xylar xylar self-assigned this Oct 9, 2024
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, this looks good and seems to work for the most part. I did run into an unexpected behavior that I describe below and provide a suggested fix for. I also noticed that the docstrings need some small tweaks in formatting. We use the numpydoc format so this may be a little different than what you've done in the past.

compass/ocean/tests/utility/combine_topo/__init__.py Outdated Show resolved Hide resolved
compass/ocean/tests/utility/combine_topo/__init__.py 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.

As soon as #879 goes in, I will rebase this an merge it.

Thanks for the very hard work on this, @bmooremaley!!

@xylar xylar force-pushed the combine-topo-to-cubedsphere branch from b50bf38 to e8c9b70 Compare January 10, 2025 14:00
@xylar
Copy link
Collaborator

xylar commented Jan 10, 2025

A bit more debugging on how to handle NETCDF3_64BIT_DATA but I think I've got it working now. I have the ne120 data done and the others in progress.

@xylar xylar force-pushed the combine-topo-to-cubedsphere branch from 87da1aa to 5b42aa2 Compare January 10, 2025 21:21
@xylar xylar merged commit ed88baa 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