More cleanup of the code

Author: erikvansebille

parcels/kernel.py

@@ -55,7 +55,7 @@ def __init__(
         self.funcvars = funcvars
         self.funccode = funccode
         self.py_ast = py_ast  # TODO v4: check if this is needed
-        self.scipy_positionupdate_kernels_added = False
+        self._positionupdate_kernels_added = False
 
     @property
     def ptype(self):
@@ -181,7 +181,7 @@ def pyfunc(self):
     def fieldset(self):
         return self._fieldset
 
-    def add_scipy_positionupdate_kernels(self):
+    def add_positionupdate_kernels(self):
         # Adding kernels that set and update the coordinate changes
         def Setcoords(particle, fieldset, time):  # pragma: no cover
             particle_dlon = 0  # noqa
@@ -324,23 +324,6 @@ def from_list(cls, fieldset, ptype, pyfunc_list, *args, **kwargs):
         pyfunc_list[0] = cls(fieldset, ptype, pyfunc_list[0], *args, **kwargs)
         return functools.reduce(lambda x, y: x + y, pyfunc_list)
 
-    def execute_python(self, pset, endtime, dt):
-        """Performs the core update loop via Python."""
-        if self.fieldset is not None:
-            for f in self.fieldset.get_fields():
-                if isinstance(f, (VectorField, NestedField)):
-                    continue
-                f.data = np.array(f.data)
-
-        if not self.scipy_positionupdate_kernels_added:
-            self.add_scipy_positionupdate_kernels()
-            self.scipy_positionupdate_kernels_added = True
-
-        for p in pset:
-            self.evaluate_particle(p, endtime)
-            if p.state == StatusCode.StopAllExecution:
-                return StatusCode.StopAllExecution
-
     def execute(self, pset, endtime, dt):
         """Execute this Kernel over a ParticleSet for several timesteps."""
         pset.particledata.state[:] = StatusCode.Evaluate
@@ -359,7 +342,19 @@ def execute(self, pset, endtime, dt):
                         g._load_chunk == g._chunk_loaded_touched, g._chunk_deprecated, g._load_chunk
                     )
 
-        self.execute_python(pset, endtime, dt)
+            for f in self.fieldset.get_fields():
+                if isinstance(f, (VectorField, NestedField)):
+                    continue
+                f.data = np.array(f.data)
+
+        if not self._positionupdate_kernels_added:
+            self.add_positionupdate_kernels()
+            self._positionupdate_kernels_added = True
+
+        for p in pset:
+            self.evaluate_particle(p, endtime)
+            if p.state == StatusCode.StopAllExecution:
+                return StatusCode.StopAllExecution
 
         # Remove all particles that signalled deletion
         self.remove_deleted(pset)

parcels/particledata.py

@@ -147,7 +147,7 @@ def __init__(self, pclass, lon, lat, depth, time, lonlatdepth_dtype, pid_orig, n
             self._data["id"][:] = pid
             self._data["obs_written"][:] = 0
 
-            # special case for exceptions which can only be handled from scipy
+            # special case for exceptions which can only be handled from scipy  # TODO v4: check if this can be removed now that JIT is dropped
             self._data["exception"] = np.empty(self._ncount, dtype=object)
 
             initialised |= {