Skip to content

Commit 1787edb

Browse files
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
1 parent c4ec11e commit 1787edb

33 files changed

+96
-112
lines changed

parcels/__init__.py

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44

55
import warnings as _stdlib_warnings
66

7-
from parcels._logger import logger
8-
from parcels._tutorial import download_example_dataset, list_example_datasets
9-
from parcels._core.warnings import (
10-
FieldSetWarning,
11-
FileWarning,
12-
KernelWarning,
13-
ParticleSetWarning,
7+
from parcels._core.basegrid import BaseGrid
8+
from parcels._core.converters import (
9+
Geographic,
10+
GeographicPolar,
11+
GeographicPolarSquare,
12+
GeographicSquare,
13+
UnitConverter,
1414
)
1515
from parcels._core.field import Field, VectorField
1616
from parcels._core.fieldset import FieldSet
@@ -25,25 +25,24 @@
2525
from parcels._core.particleset import ParticleSet
2626
from parcels._core.statuscodes import (
2727
AllParcelsErrorCodes,
28+
FieldInterpolationError,
2829
FieldOutOfBoundError,
2930
FieldSamplingError,
3031
KernelError,
3132
StatusCode,
32-
FieldInterpolationError,
3333
TimeExtrapolationError,
3434
)
35-
from parcels.utils import *
36-
37-
from parcels._core.converters import (
38-
Geographic,
39-
GeographicPolar,
40-
GeographicPolarSquare,
41-
GeographicSquare,
42-
UnitConverter,
35+
from parcels._core.uxgrid import UxGrid
36+
from parcels._core.warnings import (
37+
FieldSetWarning,
38+
FileWarning,
39+
KernelWarning,
40+
ParticleSetWarning,
4341
)
4442
from parcels._core.xgrid import XGrid
45-
from parcels._core.uxgrid import UxGrid
46-
from parcels._core.basegrid import BaseGrid
43+
from parcels._logger import logger
44+
from parcels._tutorial import download_example_dataset, list_example_datasets
45+
from parcels.utils import *
4746

4847
_stdlib_warnings.warn(
4948
"This is an alpha version of Parcels v4. The API is not stable and may change without deprecation warnings.",

parcels/_core/basegrid.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
from __future__ import annotations
32

43
from abc import ABC, abstractmethod

parcels/_core/field.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,19 @@
88
import uxarray as ux
99
import xarray as xr
1010

11+
from parcels._core.constants import LEFT_OUT_OF_BOUNDS, RIGHT_OUT_OF_BOUNDS
12+
from parcels._core.converters import (
13+
UnitConverter,
14+
_unitconverters_map,
15+
)
16+
from parcels._core.particle import KernelParticle
17+
from parcels._core.statuscodes import (
18+
AllParcelsErrorCodes,
19+
StatusCode,
20+
)
1121
from parcels._core.utils.time import TimeInterval
22+
from parcels._core.uxgrid import UxGrid
23+
from parcels._core.xgrid import XGrid, _transpose_xfield_data_to_tzyx
1224
from parcels._reprs import default_repr
1325
from parcels._typing import VectorType
1426
from parcels.interpolators import (
@@ -17,19 +29,7 @@
1729
ZeroInterpolator,
1830
ZeroInterpolator_Vector,
1931
)
20-
from parcels._core.particle import KernelParticle
21-
from parcels._core.statuscodes import (
22-
AllParcelsErrorCodes,
23-
StatusCode,
24-
)
2532
from parcels.utils._helpers import _assert_same_function_signature
26-
from parcels._core.converters import (
27-
UnitConverter,
28-
_unitconverters_map,
29-
)
30-
from parcels._core.uxgrid import UxGrid
31-
from parcels._core.xgrid import XGrid, _transpose_xfield_data_to_tzyx
32-
from parcels._core.constants import RIGHT_OUT_OF_BOUNDS, LEFT_OUT_OF_BOUNDS
3333

3434
from .._index_search import GRID_SEARCH_ERROR, _search_time_index
3535

parcels/_core/fieldset.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@
99
import xarray as xr
1010
import xgcm
1111

12+
from parcels._core.converters import Geographic, GeographicPolar
13+
from parcels._core.field import Field, VectorField
1214
from parcels._core.utils.time import get_datetime_type_calendar
1315
from parcels._core.utils.time import is_compatible as datetime_is_compatible
16+
from parcels._core.xgrid import _DEFAULT_XGCM_KWARGS, XGrid
1417
from parcels._logger import logger
1518
from parcels._typing import Mesh
16-
from parcels._core.field import Field, VectorField
17-
from parcels._core.converters import Geographic, GeographicPolar
18-
from parcels._core.xgrid import _DEFAULT_XGCM_KWARGS, XGrid
1919

2020
if TYPE_CHECKING:
21-
from parcels._typing import TimeLike
2221
from parcels._core.basegrid import BaseGrid
22+
from parcels._typing import TimeLike
2323
__all__ = ["FieldSet"]
2424

2525

parcels/_core/kernel.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,7 @@
88

99
import numpy as np
1010

11-
from parcels._core.warnings import KernelWarning
1211
from parcels._core.basegrid import GridType
13-
from parcels.kernels import (
14-
AdvectionAnalytical,
15-
AdvectionRK4,
16-
AdvectionRK45,
17-
)
1812
from parcels._core.statuscodes import (
1913
StatusCode,
2014
_raise_field_interpolation_error,
@@ -24,6 +18,12 @@
2418
_raise_grid_searching_error,
2519
_raise_time_extrapolation_error,
2620
)
21+
from parcels._core.warnings import KernelWarning
22+
from parcels.kernels import (
23+
AdvectionAnalytical,
24+
AdvectionRK4,
25+
AdvectionRK45,
26+
)
2727
from parcels.utils._helpers import _assert_same_function_signature
2828

2929
if TYPE_CHECKING:

parcels/_core/particle.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
import numpy as np
99

1010
from parcels._compat import _attrgetter_helper
11+
from parcels._core.statuscodes import StatusCode
1112
from parcels._core.utils.time import TimeInterval
1213
from parcels._reprs import _format_list_items_multiline
13-
from parcels._core.statuscodes import StatusCode
1414

1515
__all__ = ["KernelParticle", "Particle", "ParticleClass", "Variable"]
1616
_TO_WRITE_OPTIONS = [True, False, "once"]

parcels/_core/particlefile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
from parcels.utils._helpers import timedelta_to_float
1919

2020
if TYPE_CHECKING:
21-
from parcels._core.utils.time import TimeInterval
2221
from parcels._core.particle import Variable
2322
from parcels._core.particleset import ParticleSet
23+
from parcels._core.utils.time import TimeInterval
2424

2525
__all__ = ["ParticleFile"]
2626

parcels/_core/particleset.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
from tqdm import tqdm
1010
from zarr.storage import DirectoryStore
1111

12+
from parcels._core.converters import _convert_to_flat_array
13+
from parcels._core.kernel import Kernel
14+
from parcels._core.particle import KernelParticle, Particle, create_particle_data
15+
from parcels._core.statuscodes import StatusCode
1216
from parcels._core.utils.time import TimeInterval, maybe_convert_python_timedelta_to_numpy
17+
from parcels._core.warnings import ParticleSetWarning
1318
from parcels._logger import logger
1419
from parcels._reprs import particleset_repr
15-
from parcels._core.warnings import ParticleSetWarning
16-
from parcels._core.kernel import Kernel
1720
from parcels.kernels import AdvectionRK4
18-
from parcels._core.particle import KernelParticle, Particle, create_particle_data
19-
from parcels._core.statuscodes import StatusCode
20-
from parcels._core.converters import _convert_to_flat_array
2121

2222
__all__ = ["ParticleSet"]
2323

parcels/_core/spatialhash.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import numpy as np
22

3-
import parcels
43
from parcels._index_search import GRID_SEARCH_ERROR, _latlon_rad_to_xyz, curvilinear_point_in_cell, uxgrid_point_in_cell
54
from parcels._python import isinstance_noimport
65

parcels/_core/utils/array.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import numpy as np
2+
23
from parcels._core.constants import LEFT_OUT_OF_BOUNDS, RIGHT_OUT_OF_BOUNDS
34

45

0 commit comments

Comments
 (0)