Skip to content

Fix Interpolation and mesh type in test_fesom2_square_delaunay_uniform_z_coordinate_eval() #3011

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.

Sign up for GitHub

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

Open
wyatt-fluidnumerics wants to merge 12 commits into
base: main
Choose a base branch
from
Open

Fix Interpolation and mesh type in test_fesom2_square_delaunay_uniform_z_coordinate_eval() #3011

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
0462c22
fixed _get_offsets_dictionary
wyatt-fluidnumerics Oct 23, 2026
12666c8
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 23, 2026
231e466
remove random pyright import
wyatt-fluidnumerics Oct 23, 2026
0fe6d8e
Merge branch '_get_offsets_dictionary-bug' of github.com:Parcels-code…
wyatt-fluidnumerics Oct 23, 2026
490c9f8
Fix test_fesom2_square_delaunay_uniform_z_coordinate_eval()
wyatt-fluidnumerics Oct 23, 2026
0d37c47
Remove commented out xfail ine
wyatt-fluidnumerics Oct 23, 2026
f4e30d7
Revert _uxinterpolators.py to main
wyatt-fluidnumerics Oct 23, 2026
2a4023d
Merge branch 'main' into issue-2674
wyatt-fluidnumerics Oct 23, 2026
1954ce0
Change to use FlatMesh()
wyatt-fluidnumerics Oct 23, 2026
ddcaa5e
Merge branch 'issue-2674' of github.com:Parcels-code/Parcels into iss…
wyatt-fluidnumerics Oct 23, 2026
394d1f2
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 23, 2026
f879471
Remove double import of FlatMesh
wyatt-fluidnumerics Oct 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions tests/test_uxarray_fieldset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
from parcels._datasets.unstructured.generic import datasets as datasets_unstructured
from parcels.interpolators import (
UxConstantFaceConstantZC,
UxLinearNodeConstantZC,
UxLinearNodeLinearZF,
)
from tests.utils import create_uxgrid_from_triangulation
Expand Down Expand Up @@ -50,7 +51,6 @@ def test_fesom_fieldset(ds_fesom_channel, fieldset_fesom_channel):
assert (fieldset_fesom_channel.V.data == ds_fesom_channel.V).all()


@pytest.mark.xfail(reason="#2674 - 'p' interpolator is not being selected properly")
def test_fesom2_square_delaunay_uniform_z_coordinate_eval():
"""
Test the evaluation of a fieldset with a FESOM2 square Delaunay grid and uniform z-coordinate.
Expand All @@ -59,12 +59,12 @@ def test_fesom2_square_delaunay_uniform_z_coordinate_eval():
"""
ds = datasets_unstructured["fesom2_square_delaunay_uniform_z_coordinate"]
ds = convert.fesom_to_ugrid(ds)
fieldset = FieldSet.from_ugrid_conventions(ds)
fieldset = FieldSet.from_ugrid_conventions(ds, mesh=FlatMesh())

assert isinstance(fieldset.U.interp_method, UxConstantFaceConstantZC)
assert isinstance(fieldset.V.interp_method, UxConstantFaceConstantZC)
assert isinstance(fieldset.W.interp_method, UxLinearNodeLinearZF)
assert isinstance(fieldset.p.interp_method, UxLinearNodeLinearZF)
assert isinstance(fieldset.p.interp_method, UxLinearNodeConstantZC)

(u, v, w) = fieldset.UVW.eval(t=[0.0], z=[1.0], y=[30.0], x=[30.0])
assert np.allclose([u.item(), v.item(), w.item()], [1.0, 1.0, 0.0], rtol=1e-3, atol=1e-6)
Expand Down
Loading