Skip to content

Commit e1ff3ee

Browse files
committed
Merge branch 'shallow-argos' of github.com:OceanParcels/virtualship into shallow-argos
2 parents 6c7189c + a953ccf commit e1ff3ee

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

src/virtualship/instruments/base.py

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

99
import copernicusmarine
1010
import xarray as xr
11+
from parcels import FieldSet
1112
from yaspin import yaspin
1213

13-
from parcels import FieldSet
1414
from virtualship.errors import CopernicusCatalogueError
1515
from virtualship.utils import (
1616
COPERNICUSMARINE_PHYS_VARIABLES,

0 commit comments

Comments
 (0)