Skip to content

Commit 79e4420

Browse files
Increasing RK45_tol to speed up tests
For some reason RK45 was set so strict that it reduced dt to 1 second, severely slowing down the tests
1 parent 4c56dde commit 79e4420

File tree

1 file changed

+6
-18
lines changed

1 file changed

+6
-18
lines changed

tests/v4/test_advection.py

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -227,11 +227,7 @@ def test_radialrotation(npart=10):
227227
("AdvDiffM1", 1e-2),
228228
("RK4", 1e-5),
229229
("RK4_3D", 1e-5),
230-
pytest.param(
231-
"RK45",
232-
1e-5,
233-
marks=pytest.mark.skip(reason="https://github.com/OceanParcels/Parcels/pull/2134#issuecomment-3160726036"),
234-
),
230+
("RK45", 1e-5),
235231
],
236232
)
237233
def test_moving_eddy(method, rtol):
@@ -260,7 +256,7 @@ def test_moving_eddy(method, rtol):
260256
if method == "RK45":
261257
# Use RK45Particles to set next_dt
262258
RK45Particles = Particle.add_variable(Variable("next_dt", initial=dt, dtype="timedelta64[s]"))
263-
fieldset.add_constant("RK45_tol", 1e-6)
259+
fieldset.add_constant("RK45_tol", 1e-3)
264260

265261
pclass = RK45Particles if method == "RK45" else Particle
266262
pset = ParticleSet(
@@ -286,11 +282,7 @@ def truth_moving(x_0, y_0, t):
286282
[
287283
("EE", 1e-2),
288284
("RK4", 1e-5),
289-
pytest.param(
290-
"RK45",
291-
1e-5,
292-
marks=pytest.mark.skip(reason="https://github.com/OceanParcels/Parcels/pull/2134#issuecomment-3160726036"),
293-
),
285+
("RK45", 1e-3),
294286
],
295287
)
296288
def test_decaying_moving_eddy(method, rtol):
@@ -307,7 +299,7 @@ def test_decaying_moving_eddy(method, rtol):
307299
if method == "RK45":
308300
# Use RK45Particles to set next_dt
309301
RK45Particles = Particle.add_variable(Variable("next_dt", initial=dt, dtype="timedelta64[s]"))
310-
fieldset.add_constant("RK45_tol", 1e-6)
302+
fieldset.add_constant("RK45_tol", 1e-3)
311303

312304
pclass = RK45Particles if method == "RK45" else Particle
313305

@@ -338,11 +330,7 @@ def truth_moving(x_0, y_0, t):
338330
"method, atol",
339331
[
340332
("RK4", 1),
341-
pytest.param(
342-
"RK45",
343-
1,
344-
marks=pytest.mark.skip(reason="https://github.com/OceanParcels/Parcels/pull/2134#issuecomment-3160726036"),
345-
),
333+
("RK45", 1),
346334
],
347335
)
348336
@pytest.mark.parametrize("grid_type", ["A"]) # TODO also implement C-grid once available
@@ -377,7 +365,7 @@ def test_gyre_flowfields(method, grid_type, atol, flowfield):
377365
Variable("next_dt", initial=dt, dtype="timedelta64[s]"),
378366
]
379367
)
380-
fieldset.add_constant("RK45_tol", 1e-6)
368+
fieldset.add_constant("RK45_tol", 1e-3)
381369
else:
382370
SampleParticle = Particle.add_variable(
383371
[Variable("p", initial=0.0, dtype=np.float32), Variable("p_start", initial=0.0, dtype=np.float32)]

0 commit comments

Comments
 (0)