add bathymetry to test argo fieldset

Author: j-atkins

src/virtualship/instruments/argo_float.py

@@ -4,14 +4,14 @@
 from typing import ClassVar
 
 import numpy as np
+
 from parcels import (
     AdvectionRK4,
     JITParticle,
     ParticleSet,
     StatusCode,
     Variable,
 )
-
 from virtualship.instruments.base import Instrument
 from virtualship.instruments.types import InstrumentType
 from virtualship.models.spacetime import Spacetime
@@ -196,8 +196,6 @@ def simulate(self, measurements, out_path) -> None:
 
         fieldset = self.load_input_data()
 
-        breakpoint()
-
         shallow_waypoints = {}
         for i, m in enumerate(measurements):
             loc_bathy = fieldset.bathymetry.eval(

tests/instruments/test_argo_float.py

@@ -4,8 +4,8 @@
 
 import numpy as np
 import xarray as xr
-from parcels import FieldSet
 
+from parcels import FieldSet
 from virtualship.instruments.argo_float import ArgoFloat, ArgoFloatInstrument
 from virtualship.models import Location, Spacetime
 
@@ -27,6 +27,7 @@ def test_simulate_argo_floats(tmpdir) -> None:
     u = np.full((2, 2, 2), 1.0)
     t = np.full((2, 2, 2), CONST_TEMPERATURE)
     s = np.full((2, 2, 2), CONST_SALINITY)
+    bathy = np.full((2, 2), -5000.0)
 
     fieldset = FieldSet.from_data(
         {"V": v, "U": u, "T": t, "S": s},
@@ -39,6 +40,15 @@ def test_simulate_argo_floats(tmpdir) -> None:
             ],
         },
     )
+    fieldset.add_field(
+        FieldSet.from_data(
+            {"bathymetry": bathy},
+            {
+                "lon": np.array([0.0, 10.0]),
+                "lat": np.array([0.0, 10.0]),
+            },
+        ).bathymetry
+    )
 
     # argo floats to deploy
     argo_floats = [