From e1323024783cc7ae91501d374dbea52afa1969d6 Mon Sep 17 00:00:00 2001 From: Christopher Rackauckas Date: Sun, 10 Dec 2023 22:40:21 -0500 Subject: [PATCH] fix some convergence tests --- src/perform_step/nordsieck_perform_step.jl | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/perform_step/nordsieck_perform_step.jl b/src/perform_step/nordsieck_perform_step.jl index 56c720ba1f..fa3b54f8bf 100644 --- a/src/perform_step/nordsieck_perform_step.jl +++ b/src/perform_step/nordsieck_perform_step.jl @@ -14,7 +14,7 @@ function initialize!(integrator, cache::AN5ConstantCache) end @muladd function perform_step!(integrator, cache::AN5ConstantCache, repeat_step = false) - @unpack t, dt, uprev, u, f, p = integrator + @unpack t, dt, uprev, u, f, p, differential_vars = integrator @unpack z, l, m, c_LTE, dts, tsit5tab = cache # handle callbacks, rewind back to order one. if integrator.u_modified @@ -28,11 +28,11 @@ end z[1] = integrator.uprev z[2] = integrator.k[1] * dt z[3] = ode_interpolant(t, dt, nothing, nothing, integrator.k, tsit5tab, nothing, - Val{2}) * dt^2 / 2 + Val{2}, differential_vars) * dt^2 / 2 z[4] = ode_interpolant(t, dt, nothing, nothing, integrator.k, tsit5tab, nothing, - Val{3}) * dt^3 / 6 + Val{3}, differential_vars) * dt^3 / 6 z[5] = ode_interpolant(t, dt, nothing, nothing, integrator.k, tsit5tab, nothing, - Val{4}) * dt^4 / 24 + Val{4}, differential_vars) * dt^4 / 24 z[6] = zero(cache.z[6]) fill!(dts, dt) perform_predict!(cache) @@ -105,7 +105,7 @@ function initialize!(integrator, cache::AN5Cache) end @muladd function perform_step!(integrator, cache::AN5Cache, repeat_step = false) - @unpack t, dt, uprev, u, f, p, uprev2 = integrator + @unpack t, dt, uprev, u, f, p, uprev2, differential_vars = integrator @unpack z, l, m, c_LTE, dts, tmp, ratetmp, atmp, tsit5cache = cache # handle callbacks, rewind back to order one. if integrator.u_modified @@ -120,11 +120,11 @@ end @.. broadcast=false z[1]=integrator.uprev @.. broadcast=false z[2]=integrator.k[1] * dt ode_interpolant!(z[3], t, dt, nothing, nothing, integrator.k, tsit5cache, nothing, - Val{2}) + Val{2}, differential_vars) ode_interpolant!(z[4], t, dt, nothing, nothing, integrator.k, tsit5cache, nothing, - Val{3}) + Val{3}, differential_vars) ode_interpolant!(z[5], t, dt, nothing, nothing, integrator.k, tsit5cache, nothing, - Val{4}) + Val{4}, differential_vars) @.. broadcast=false z[3]=z[3] * dt^2 / 2 @.. broadcast=false z[4]=z[4] * dt^3 / 6 @.. broadcast=false z[5]=z[5] * dt^4 / 24 @@ -198,7 +198,7 @@ function initialize!(integrator, cache::JVODEConstantCache) end @muladd function perform_step!(integrator, cache::JVODEConstantCache, repeat_step = false) - @unpack t, dt, uprev, u, f, p = integrator + @unpack t, dt, uprev, u, f, p, differential_vars = integrator @unpack z, l, m, c_LTE, dts, tsit5tab = cache # handle callbacks, rewind back to order one. if integrator.u_modified || integrator.iter == 1 @@ -265,7 +265,7 @@ function initialize!(integrator, cache::JVODECache) end @muladd function perform_step!(integrator, cache::JVODECache, repeat_step = false) - @unpack t, dt, uprev, u, f, p, uprev2 = integrator + @unpack t, dt, uprev, u, f, p, uprev2, differential_vars = integrator @unpack z, l, m, c_LTE, dts, tmp, ratetmp, atmp, tsit5cache = cache # handle callbacks, rewind back to order one. if integrator.u_modified || integrator.iter == 1