[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

Author: pre-commit-ci[bot]

parcels/_index_search.py

@@ -218,8 +218,7 @@ def _search_indices_rectilinear(
         _raise_field_sampling_error(z, y, x)
 
     if particle:
-        particle.ei[field.igrid] = field.ravel_index(xi,yi,zi)
-
+        particle.ei[field.igrid] = field.ravel_index(xi, yi, zi)
 
     return (zeta, eta, xsi, zi, yi, xi)
 
@@ -308,7 +307,7 @@ def _search_indices_curvilinear(field: Field, time, z, y, x, ti=-1, particle=Non
         _raise_field_sampling_error(z, y, x)
 
     if particle:
-        particle.ei[field.igrid] = field.ravel_index(xi,yi,zi)
+        particle.ei[field.igrid] = field.ravel_index(xi, yi, zi)
 
     return (zeta, eta, xsi, zi, yi, xi)
 

parcels/application_kernels/advection.py

@@ -210,7 +210,7 @@ def AdvectionAnalytical(particle, fieldset, time):  # pragma: no cover
                 yi += 1
                 eta = 0
 
-    particle.ei[:] = fieldset.U.ravel_index(xi,yi,zi)
+    particle.ei[:] = fieldset.U.ravel_index(xi, yi, zi)
 
     grid = fieldset.U.grid
     if grid._gtype < 2:

parcels/field.py

@@ -1312,7 +1312,7 @@ def computeTimeChunk(self, data, tindex):
         data = self._data_concatenate(data, buffer_data, tindex)
         self.filebuffers[tindex] = filebuffer
         return data
-    
+
     def ravel_index(self, xi, yi, zi):
         """Return the flat index of the given grid points.
 
@@ -1330,8 +1330,8 @@ def ravel_index(self, xi, yi, zi):
         int
             flat index
         """
-        return xi + self.grid.xdim*(yi + self.grid.ydim*zi)
-    
+        return xi + self.grid.xdim * (yi + self.grid.ydim * zi)
+
     def unravel_index(self, ei):
         """Return the xi, yi, zi indices for a given flat index.
 
@@ -1349,13 +1349,11 @@ def unravel_index(self, ei):
         zi : int
             The z index.
         """
-
         zi = ei // (self.grid.xdim * self.grid.ydim)
         ei = ei % (self.grid.xdim * self.grid.ydim)
         yi = ei // self.grid.xdim
         xi = ei % self.grid.xdim
         return zi, yi, xi
-    
 
 
 class VectorField:

parcels/particleset.py

@@ -127,8 +127,8 @@ def ArrayClass_init(self, *args, **kwargs):
                     type(self).ngrids.initial = numgrids
                 self.ngrids = type(self).ngrids.initial
                 if self.ngrids >= 0:
-                    setattr(self, "ei", np.zeros(self.ngrids, dtype=np.int32))
-                    setattr(self, "ti", -1 * np.ones(self.ngrids, dtype=np.int32))
+                    self.ei = np.zeros(self.ngrids, dtype=np.int32)
+                    self.ti = -1 * np.ones(self.ngrids, dtype=np.int32)
                 super(type(self), self).__init__(*args, **kwargs)
 
             array_class_vdict = {
@@ -450,7 +450,7 @@ def populate_indices(self):
 
             idx = np.where(IN)[0][idx_nan]
 
-            self.particledata.data["ei"][:, i] = idx # assumes that we are in the surface layer (zi=0)
+            self.particledata.data["ei"][:, i] = idx  # assumes that we are in the surface layer (zi=0)
 
     @classmethod
     def from_list(

tests/test_fieldset_sampling.py

@@ -131,7 +131,7 @@ def test_verticalsampling(zdir):
     fieldset = FieldSet.from_data(data, dimensions, mesh="flat")
     pset = ParticleSet(fieldset, pclass=Particle, lon=0, lat=0, depth=0.7 * zdir)
     pset.execute(AdvectionRK4, dt=1.0, runtime=1.0)
-    zi,yi,xi = fieldset.U.unravel_index(pset[0].ei)
+    zi, yi, xi = fieldset.U.unravel_index(pset[0].ei)
     assert zi == [2]