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

Smooth merge #155

Merged
merged 4 commits into from
Jun 17, 2024
Merged

Smooth merge #155

merged 4 commits into from
Jun 17, 2024

Conversation

felicio93
Copy link
Collaborator

merge_overlapping_meshes function added. tests also added.

This will allow merging meshes with smooth transitions, e.g. (floodplain, river, ocean meshes)

@felicio93
Copy link
Collaborator Author

@SorooshMani-NOAA, it seems like 2 tests failed for reasons unrelated to the changes I just made. How do you want me to proceed?

@SorooshMani-NOAA
Copy link
Collaborator

Let's address the failing test in a separate pull request at some point. It seems to have something to do with latest jigsawpy and python 3.9. I'm just guessing ... everything else looks good. Thank you!

@felicio93 felicio93 closed this Jun 17, 2024
@felicio93 felicio93 deleted the smooth_merge branch June 17, 2024 16:09
@felicio93 felicio93 restored the smooth_merge branch June 17, 2024 16:10
@felicio93 felicio93 reopened this Jun 17, 2024
@felicio93 felicio93 merged commit 6b042ff into noaa-ocs-modeling:main Jun 17, 2024
18 of 20 checks passed
@felicio93 felicio93 deleted the smooth_merge branch June 17, 2024 16:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants