Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 3 additions & 23 deletions parcels/kernel.py
Original file line number Diff line number Diff line change
Expand Up @@ -379,27 +379,7 @@ def evaluate_particle(self, p, endtime):
dt :
computational integration timestep
"""
sign_dt = 1 if p.dt >= 0 else -1
while p.state in [StatusCode.Evaluate, StatusCode.Repeat]:
if sign_dt * (endtime - p.time_nextloop) <= 0:
return p

pre_dt = p.dt
# TODO implement below later again
# try: # Use next_dt from AdvectionRK45 if it is set
# if abs(endtime - p.time_nextloop) < abs(p.next_dt) - 1e-6:
# p.next_dt = abs(endtime - p.time_nextloop) * sign_dt
# except AttributeError:
if sign_dt * (endtime - p.time_nextloop) <= p.dt:
p.dt = sign_dt * (endtime - p.time_nextloop)
res = self._pyfunc(p, self._fieldset, p.time_nextloop)

if res is None:
if p.state == StatusCode.Success:
if sign_dt * (p.time - endtime) > 0:
p.state = StatusCode.Evaluate
else:
p.state = res

p.dt = pre_dt
# TODO: this is breaking change for performance checking
self._pyfunc(p, self._fieldset, endtime)

return p
2 changes: 1 addition & 1 deletion parcels/particle.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ def __setattr__(self, name, value):
if name in ["_data", "_index"]:
object.__setattr__(self, name, value)
else:
self._data[name][self._index] = value
pass # TODO this is a breaking change, just for checking performance

def delete(self):
"""Signal the particle for deletion."""
Expand Down
Loading