Adding tests for particleset creation

and fixing setting lonlatdepth_dtype

Author: erikvansebille

parcels/particleset.py

@@ -159,15 +159,15 @@ def __init__(
 
         self._data = xr.Dataset(
             {
-                "lon": (["trajectory"], lon),
-                "lat": (["trajectory"], lat),
-                "depth": (["trajectory"], depth),
+                "lon": (["trajectory"], lon.astype(lonlatdepth_dtype)),
+                "lat": (["trajectory"], lat.astype(lonlatdepth_dtype)),
+                "depth": (["trajectory"], depth.astype(lonlatdepth_dtype)),
                 "time": (["trajectory"], time),
                 "dt": (["trajectory"], np.timedelta64(1, "ns") * np.ones(len(pid_orig))),
                 "state": (["trajectory"], np.zeros((len(pid_orig)), dtype=np.int32)),
-                "lon_nextloop": (["trajectory"], lon),
-                "lat_nextloop": (["trajectory"], lat),
-                "depth_nextloop": (["trajectory"], depth),
+                "lon_nextloop": (["trajectory"], lon.astype(lonlatdepth_dtype)),
+                "lat_nextloop": (["trajectory"], lat.astype(lonlatdepth_dtype)),
+                "depth_nextloop": (["trajectory"], depth.astype(lonlatdepth_dtype)),
                 "time_nextloop": (["trajectory"], time),
             },
             coords={

tests/v4/test_particleset.py

@@ -34,6 +34,36 @@ def DoNothing(particle, fieldset, time):
     pass
 
 
+def test_pset_create_lon_lat(fieldset):
+    npart = 100
+    lon = np.linspace(0, 1, npart, dtype=np.float32)
+    lat = np.linspace(1, 0, npart, dtype=np.float32)
+    pset = ParticleSet(fieldset, lon=lon, lat=lat, pclass=Particle)
+    assert np.allclose([p.lon for p in pset], lon, rtol=1e-12)
+    assert np.allclose([p.lat for p in pset], lat, rtol=1e-12)
+
+
+@pytest.mark.parametrize("lonlatdepth_dtype", [np.float64, np.float32])
+def test_pset_create_line(fieldset, lonlatdepth_dtype):
+    npart = 100
+    lon = np.linspace(0, 1, npart, dtype=lonlatdepth_dtype)
+    lat = np.linspace(1, 0, npart, dtype=lonlatdepth_dtype)
+    pset = ParticleSet.from_line(
+        fieldset, size=npart, start=(0, 1), finish=(1, 0), pclass=Particle, lonlatdepth_dtype=lonlatdepth_dtype
+    )
+    assert np.allclose([p.lon for p in pset], lon, rtol=1e-12)
+    assert np.allclose([p.lat for p in pset], lat, rtol=1e-12)
+    assert isinstance(pset[0].lat, lonlatdepth_dtype)
+
+
+def test_create_empty_pset(fieldset):
+    pset = ParticleSet(fieldset, pclass=Particle)
+    assert pset.size == 0
+
+    pset.execute(DoNothing, endtime=1.0, dt=1.0)
+    assert pset.size == 0
+
+
 @pytest.mark.parametrize(
     "time, expectation",
     [