[#2034] Add test for particleset.execute on unstructure stommel gyre

Author: fluidnumericsJoe

tests/v4/test_particleset.py

@@ -0,0 +1,50 @@
+from datetime import timedelta
+
+from parcels import (
+    AdvectionEE,
+    Field,
+    FieldSet,
+    Particle,
+    ParticleSet,
+    UXPiecewiseConstantFace,
+    VectorField,
+)
+from parcels._datasets.unstructured.generic import datasets as datasets_unstructured
+from parcels.uxgrid import UxGrid
+
+
+def test_uxstommel_gyre():
+    ds = datasets_unstructured["stommel_gyre_delaunay"]
+    grid = UxGrid(grid=ds.uxgrid, z=ds.coords["nz"])
+    U = Field(
+        name="U",
+        data=ds.U,
+        grid=grid,
+        mesh_type="spherical",
+        interp_method=UXPiecewiseConstantFace,
+    )
+    V = Field(
+        name="V",
+        data=ds.V,
+        grid=grid,
+        mesh_type="spherical",
+        interp_method=UXPiecewiseConstantFace,
+    )
+    P = Field(
+        name="P",
+        data=ds.p,
+        grid=grid,
+        mesh_type="spherical",
+        interp_method=UXPiecewiseConstantFace,
+    )
+    UV = VectorField(name="UV", U=U, V=V)
+    fieldset = FieldSet([UV, UV.U, UV.V, P])
+    pset = ParticleSet(
+        fieldset,
+        lon=[30.0],
+        lat=[5.0],
+        depth=[50.0],
+        time=[0.0],  # important otherwise initialization appears to take forever?
+        pclass=Particle,
+    )
+    pset.execute(endtime=timedelta(minutes=10), dt=timedelta(seconds=60), pyfunc=AdvectionEE, verbose_progress=False)

tests/v4/test_uxarray_fieldset.py

@@ -1,5 +1,3 @@
-from datetime import timedelta
-
 import pytest
 import uxarray as ux
 
@@ -104,19 +102,6 @@ def test_set_interp_methods(ds_fesom_channel, uv_fesom_channel):
     fieldset.V.interp_method = UXPiecewiseConstantFace
 
 
-@pytest.mark.skip(reason="ParticleSet.__init__ needs major refactoring")
-def test_fesom_channel(ds_fesom_channel, uvw_fesom_channel):
-    fieldset = FieldSet([uvw_fesom_channel, uvw_fesom_channel.U, uvw_fesom_channel.V, uvw_fesom_channel.W])
-
-    # Check that the fieldset has the expected properties
-    assert (fieldset.U == ds_fesom_channel.U).all()
-    assert (fieldset.V == ds_fesom_channel.V).all()
-    assert (fieldset.W == ds_fesom_channel.W).all()
-
-    pset = ParticleSet(fieldset, pclass=Particle)
-    pset.execute(endtime=timedelta(days=1), dt=timedelta(hours=1))
-
-
 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.