Skip to content

Commit 3c3b036

Browse files
pre-commit-ci[bot]VeckoTheGecko
authored andcommitted
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
1 parent c038f7b commit 3c3b036

File tree

13 files changed

+29
-31
lines changed

13 files changed

+29
-31
lines changed

parcels/application_kernels/EOSseawaterproperties.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import math
44

5-
__all__ = ["PressureFromLatDepth", "AdiabticTemperatureGradient", "PtempFromTemp", "TempFromPtemp", "UNESCODensity"]
5+
__all__ = ["AdiabticTemperatureGradient", "PressureFromLatDepth", "PtempFromTemp", "TempFromPtemp", "UNESCODensity"]
66

77

88
def PressureFromLatDepth(particle, fieldset, time):

parcels/application_kernels/advection.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
from parcels.tools.statuscodes import StatusCode
66

77
__all__ = [
8-
"AdvectionRK4",
8+
"AdvectionAnalytical",
99
"AdvectionEE",
10-
"AdvectionRK45",
10+
"AdvectionRK4",
1111
"AdvectionRK4_3D",
12-
"AdvectionAnalytical",
1312
"AdvectionRK4_3D_CROCO",
13+
"AdvectionRK45",
1414
]
1515

1616

parcels/application_kernels/advectiondiffusion.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import parcels
99

10-
__all__ = ["DiffusionUniformKh", "AdvectionDiffusionM1", "AdvectionDiffusionEM"]
10+
__all__ = ["AdvectionDiffusionEM", "AdvectionDiffusionM1", "DiffusionUniformKh"]
1111

1212

1313
def AdvectionDiffusionM1(particle, fieldset, time):

parcels/application_kernels/interaction.py

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

55
from parcels.tools.statuscodes import StatusCode
66

7-
__all__ = ["AsymmetricAttraction", "NearestNeighborWithinRange", "MergeWithNearestNeighbor"]
7+
__all__ = ["AsymmetricAttraction", "MergeWithNearestNeighbor", "NearestNeighborWithinRange"]
88

99

1010
def NearestNeighborWithinRange(particle, fieldset, time, neighbors, mutator):

parcels/field.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050

5151
from parcels.fieldset import FieldSet
5252

53-
__all__ = ["Field", "VectorField", "NestedField"]
53+
__all__ = ["Field", "NestedField", "VectorField"]
5454

5555

5656
def _isParticle(key):
@@ -1630,10 +1630,8 @@ def _chunk_data(self):
16301630
g = self.grid
16311631
if isinstance(self.data, da.core.Array):
16321632
for block_id in range(len(self.grid._load_chunk)):
1633-
if (
1634-
g._load_chunk[block_id] == g._chunk_loading_requested
1635-
or g._load_chunk[block_id] in g._chunk_loaded
1636-
and self._data_chunks[block_id] is None
1633+
if g._load_chunk[block_id] == g._chunk_loading_requested or (
1634+
g._load_chunk[block_id] in g._chunk_loaded and self._data_chunks[block_id] is None
16371635
):
16381636
block = self._get_block(block_id)
16391637
self._data_chunks[block_id] = np.array(

parcels/grid.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
from parcels.tools.warnings import FieldSetWarning
1313

1414
__all__ = [
15-
"GridType",
16-
"GridCode",
17-
"RectilinearZGrid",
18-
"RectilinearSGrid",
19-
"CurvilinearZGrid",
20-
"CurvilinearSGrid",
2115
"CGrid",
16+
"CurvilinearSGrid",
17+
"CurvilinearZGrid",
2218
"Grid",
19+
"GridCode",
20+
"GridType",
21+
"RectilinearSGrid",
22+
"RectilinearZGrid",
2323
]
2424

2525

parcels/interaction/neighborsearch/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
)
1212

1313
__all__ = [
14-
"HashFlatNeighborSearch",
15-
"HashSphericalNeighborSearch",
1614
"BruteFlatNeighborSearch",
1715
"BruteSphericalNeighborSearch",
16+
"HashFlatNeighborSearch",
17+
"HashSphericalNeighborSearch",
1818
"KDTreeFlatNeighborSearch",
1919
]

parcels/kernel.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
)
4343
from parcels.tools.warnings import KernelWarning
4444

45-
__all__ = ["Kernel", "BaseKernel"]
45+
__all__ = ["BaseKernel", "Kernel"]
4646

4747

4848
class BaseKernel(abc.ABC):

parcels/particle.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
from parcels.tools.statuscodes import StatusCode
88

9-
__all__ = ["ScipyParticle", "JITParticle", "Variable", "ScipyInteractionParticle"]
9+
__all__ = ["JITParticle", "ScipyInteractionParticle", "ScipyParticle", "Variable"]
1010

1111
indicators_64bit = [np.float64, np.uint64, np.int64, c_void_p]
1212

parcels/rng.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
from parcels.tools import get_cache_dir, get_package_dir
1111
from parcels.tools.loggers import logger
1212

13-
__all__ = ["seed", "random", "uniform", "randint", "normalvariate", "expovariate", "vonmisesvariate"]
13+
__all__ = ["expovariate", "normalvariate", "randint", "random", "seed", "uniform", "vonmisesvariate"]
1414

1515

1616
class RandomC:

0 commit comments

Comments
 (0)