|
18 | 18 | ) |
19 | 19 | from parcels.application_kernels.interpolation import UXPiecewiseLinearNode, XLinear, ZeroInterpolator |
20 | 20 | from parcels.particle import KernelParticle |
21 | | -from parcels.particleset import ParticleSet |
22 | 21 | from parcels.tools.converters import ( |
23 | 22 | UnitConverter, |
24 | 23 | unitconverters_map, |
|
36 | 35 |
|
37 | 36 |
|
38 | 37 | def _deal_with_errors(error, key, vector_type: VectorType): |
39 | | - if isinstance(key, (ParticleSet, KernelParticle)): |
| 38 | + if isinstance(key, KernelParticle): |
40 | 39 | key.state = AllParcelsErrorCodes[type(error)] |
41 | | - elif isinstance(key[-1], (ParticleSet, KernelParticle)): |
| 40 | + elif isinstance(key[-1], KernelParticle): |
42 | 41 | key[-1].state = AllParcelsErrorCodes[type(error)] |
43 | 42 | else: |
44 | 43 | 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): |
256 | 255 | def __getitem__(self, key): |
257 | 256 | self._check_velocitysampling() |
258 | 257 | try: |
259 | | - if isinstance(key, (KernelParticle, ParticleSet)): |
| 258 | + if isinstance(key, KernelParticle): |
260 | 259 | return self.eval(key.time, key.depth, key.lat, key.lon, key) |
261 | 260 | else: |
262 | 261 | return self.eval(*key) |
@@ -348,7 +347,7 @@ def eval(self, time: datetime, z, y, x, particle=None, applyConversion=True): |
348 | 347 |
|
349 | 348 | def __getitem__(self, key): |
350 | 349 | try: |
351 | | - if isinstance(key, (KernelParticle, ParticleSet)): |
| 350 | + if isinstance(key, KernelParticle): |
352 | 351 | return self.eval(key.time, key.depth, key.lat, key.lon, key) |
353 | 352 | else: |
354 | 353 | return self.eval(*key) |
|
0 commit comments