Skip to content

Commit 1020000

Browse files
committed
Merge branch 'shallow-argos' of github.com:OceanParcels/virtualship into shallow-argos
2 parents ab8879c + 06d279f commit 1020000

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/virtualship/instruments/argo_float.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
from typing import ClassVar
55

66
import numpy as np
7-
87
from parcels import (
98
AdvectionRK4,
109
JITParticle,
1110
ParticleSet,
1211
StatusCode,
1312
Variable,
1413
)
14+
1515
from virtualship.instruments.base import Instrument
1616
from virtualship.instruments.types import InstrumentType
1717
from virtualship.models.spacetime import Spacetime

tests/instruments/test_argo_float.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
import numpy as np
66
import xarray as xr
7-
87
from parcels import FieldSet
8+
99
from virtualship.instruments.argo_float import ArgoFloat, ArgoFloatInstrument
1010
from virtualship.models import Location, Spacetime
1111

0 commit comments

Comments
 (0)