Skip to content

Conversation

@fluidnumerics-joe
Copy link
Contributor

  • [ X ] Chose the correct base branch (main for v3 changes, v4-dev for v4 changes)

This PR brings in a couple patches uncovered during testing/development of examples with the new v4 field and fieldset.

@fluidnumerics-joe
Copy link
Contributor Author

@VeckoTheGecko - Regarding the scope of this PR : I really just want the tests/v4 to run without error; I got a bit sloppy on the final cleanup in #1946 .

  • FieldSet.__init__ was failing due to an incorrect data type required for the grid input in Field.__init__
  • spatial hash creation, which occurs during Field.__init__ was throwing a segmentation fault with python 3.13
  • When adding fields to a fieldset, the previously deleted Fieldset._gridset_size was being incremented which led to failure.

Resolving these now has the tests/v4 passing.

@fluidnumerics-joe
Copy link
Contributor Author

I think it'd be good to merge in #1983 before this one

@VeckoTheGecko
Copy link
Contributor

I think it'd be good to merge in #1983 before this one

Done

@VeckoTheGecko
Copy link
Contributor

Regarding the scope of this PR : I really just want the tests/v4 to run without error

Gotcha, that sounds good. I think we also need to fix a typo in environment.yml

-  - uxaray>=2025.3.0
+  - uxarray>=2025.3.0

@fluidnumerics-joe
Copy link
Contributor Author

I see that in #1982 . Let's get #1982 and #1983 in and i'll update this branch

@VeckoTheGecko
Copy link
Contributor

I see that in #1982 . Let's get #1982 and #1983 in and i'll update this branch

Oh yes, I forgot I put up #1982 . I've put #1982 and #1983 through now as well as updated this branch (there was some CI finagling with the Python 3.13 stuff that I also needed to sort out).

Should be up to date now

@fluidnumerics-joe fluidnumerics-joe merged commit 65861ec into v4-dev Apr 22, 2025
6 of 11 checks passed
@fluidnumerics-joe fluidnumerics-joe deleted the patch/uxarray branch April 22, 2025 14:28
@github-project-automation github-project-automation bot moved this from Backlog to Done in Parcels development Apr 22, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

3 participants