Skip to content
Draft
Changes from all commits
Commits
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
30 changes: 19 additions & 11 deletions src/virtualship/instruments/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import copernicusmarine
import xarray as xr
from parcels import FieldSet
from parcels.tools import FieldOutOfBoundError
from yaspin import yaspin

from virtualship.errors import CopernicusCatalogueError
Expand Down Expand Up @@ -128,20 +129,27 @@ def simulate(

def execute(self, measurements: list, out_path: str | Path) -> None:
"""Run instrument simulation."""
if not self.verbose_progress:
with yaspin(
text=f"Simulating {self.__class__.__name__.split('Instrument')[0]} measurements... ",
side="right",
spinner=ship_spinner,
) as spinner:
instrument_name = self.__class__.__name__.split("Instrument")[0]
try:
if not self.verbose_progress:
with yaspin(
text=f"Simulating {instrument_name} measurements... ",
side="right",
spinner=ship_spinner,
) as spinner:
self.simulate(measurements, out_path)
spinner.ok("✅\n")
else:
print(f"Simulating {instrument_name} measurements... ")
self.simulate(measurements, out_path)
spinner.ok("✅\n")
else:
print("\n")

# do not exit simulation after out of bounds errors (rare and only possible for Argo Floats, but will handle for any future instruments too)
except FieldOutOfBoundError as e:
print(
f"Simulating {self.__class__.__name__.split('Instrument')[0]} measurements... "
f"\n❗️ ERROR: during {instrument_name} simulation: {e}\n\nAny subsequent instrument simulations will continue but {instrument_name} results may be incomplete.\n"
"Carrying on with the expedition...\n",
)
self.simulate(measurements, out_path)
print("\n")

def _get_copernicus_ds(
self,
Expand Down
Loading