Skip to content

Commit e01adfc

Browse files
fixing unit tests for new kernel loop
1 parent fbc33f3 commit e01adfc

2 files changed

Lines changed: 9 additions & 6 deletions

File tree

src/parcels/_core/index_search.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ def _search_time_index(field: Field, time: datetime):
8585
if not field.time_interval.is_all_time_in_interval(time):
8686
_raise_outside_time_interval_error(time, field=None)
8787

88-
ti = np.searchsorted(field.data.time.data, time, side="right") - 1
89-
tau = (time - field.data.time.data[ti]) / (field.data.time.data[ti + 1] - field.data.time.data[ti])
88+
ti, tau = _search_1d_array(field.data.time.data, time)
89+
9090
return {"T": {"index": np.atleast_1d(ti), "bcoord": np.atleast_1d(tau)}}
9191

9292

tests/test_particleset_execute.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -159,18 +159,21 @@ def SampleU(particles, fieldset): # pragma: no cover
159159

160160
pset = ParticleSet(fieldset, lon=[0.2], lat=[5.0], time=[starttime])
161161
pset.execute(SampleU, endtime=endtime, dt=np.timedelta64(1, "D"))
162-
assert pset[0].time + pset[0].dt == endtime
162+
assert pset[0].time == endtime
163163

164164

165165
def test_particleset_interpolate_on_domainedge(zonal_flow_fieldset):
166166
fieldset = zonal_flow_fieldset
167167

168+
MyParticle = Particle.add_variable(Variable("var"))
169+
168170
def SampleU(particles, fieldset): # pragma: no cover
169-
particles.dlon = fieldset.U[particles]
171+
particles.var = fieldset.U[particles]
170172

171-
pset = ParticleSet(fieldset, lon=fieldset.U.grid.lon[-1], lat=fieldset.U.grid.lat[-1])
173+
print(fieldset.U.grid.lon)
174+
pset = ParticleSet(fieldset, pclass=MyParticle, lon=fieldset.U.grid.lon[-1], lat=fieldset.U.grid.lat[-1])
172175
pset.execute(SampleU, runtime=np.timedelta64(1, "D"), dt=np.timedelta64(1, "D"))
173-
np.testing.assert_equal(pset[0].dlon, 1)
176+
np.testing.assert_equal(pset[0].var, 1)
174177

175178

176179
def test_particleset_interpolate_outside_domainedge(zonal_flow_fieldset):

0 commit comments

Comments
 (0)