Skip to content

Commit 532f912

Browse files
Fixing error_particles test
1 parent c96997c commit 532f912

2 files changed

Lines changed: 6 additions & 8 deletions

File tree

parcels/kernel.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -330,9 +330,8 @@ def execute(self, pset, endtime, dt):
330330
n_error = pset._num_error_particles
331331

332332
while n_error > 0:
333-
error_pset = pset._error_particles
334-
# Check for StatusCodes
335-
for p in error_pset:
333+
for i in pset._error_particles:
334+
p = pset[i]
336335
if p.state == StatusCode.StopExecution:
337336
return
338337
if p.state == StatusCode.StopAllExecution:

parcels/particleset.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -732,15 +732,14 @@ def data_indices(self, variable_name, compare_values, invert=False):
732732

733733
@property
734734
def _error_particles(self):
735-
"""Get an iterator over all particles that are in an error state.
735+
"""Get indices of all particles that are in an error state.
736736
737737
Returns
738738
-------
739-
iterator
740-
ParticleDataIterator over error particles. # TODO update this return
739+
indices
740+
Indices of error particles.
741741
"""
742-
error_indices = self.data_indices("state", [StatusCode.Success, StatusCode.Evaluate], invert=True)
743-
return error_indices # TODO fix to return old ParticleDataIterator(self.particledata, subset=error_indices)
742+
return self.data_indices("state", [StatusCode.Success, StatusCode.Evaluate], invert=True)
744743

745744
@property
746745
def _num_error_particles(self):

0 commit comments

Comments
 (0)