Merge branch 'v4-dev' into testing_nemo_spatialhash

Author: erikvansebille

parcels/_core/utils/time.py

@@ -45,6 +45,9 @@ def __init__(self, left: T, right: T) -> None:
         self.left = left
         self.right = right
 
+    def __contains__(self, item: T) -> bool:
+        return self.left <= item <= self.right
+
     def is_all_time_in_interval(self, time):
         item = np.atleast_1d(time)
         return (self.left <= item).all() and (item <= self.right).all()

parcels/field.py

@@ -18,7 +18,6 @@
 )
 from parcels.application_kernels.interpolation import UXPiecewiseLinearNode, XLinear, ZeroInterpolator
 from parcels.particle import KernelParticle
-from parcels.particleset import ParticleSet
 from parcels.tools.converters import (
     UnitConverter,
     unitconverters_map,
@@ -36,9 +35,9 @@
 
 
 def _deal_with_errors(error, key, vector_type: VectorType):
-    if isinstance(key, (ParticleSet, KernelParticle)):
+    if isinstance(key, KernelParticle):
         key.state = AllParcelsErrorCodes[type(error)]
-    elif isinstance(key[-1], (ParticleSet, KernelParticle)):
+    elif isinstance(key[-1], KernelParticle):
         key[-1].state = AllParcelsErrorCodes[type(error)]
     else:
         raise RuntimeError(f"{error}. Error could not be handled because particle was not part of the Field Sampling.")
@@ -256,7 +255,7 @@ def eval(self, time: datetime, z, y, x, particle=None, applyConversion=True):
     def __getitem__(self, key):
         self._check_velocitysampling()
         try:
-            if isinstance(key, (KernelParticle, ParticleSet)):
+            if isinstance(key, KernelParticle):
                 return self.eval(key.time, key.depth, key.lat, key.lon, key)
             else:
                 return self.eval(*key)
@@ -348,7 +347,7 @@ def eval(self, time: datetime, z, y, x, particle=None, applyConversion=True):
 
     def __getitem__(self, key):
         try:
-            if isinstance(key, (KernelParticle, ParticleSet)):
+            if isinstance(key, KernelParticle):
                 return self.eval(key.time, key.depth, key.lat, key.lon, key)
             else:
                 return self.eval(*key)