From e3370e4d73108811f02c420f17fbc54ad75f827e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jorge=20P=C3=A9rez?= Date: Sat, 11 Mar 2023 21:16:31 +0100 Subject: [PATCH] Update TaylorSeries and fix errors in DiffEq common interface (#159) * Bump TaylorSeries minor version * Minor update of DiffEq common interface (integrator.destats->integrator.stats) * Update Project.toml --- Project.toml | 4 ++-- src/common.jl | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Project.toml b/Project.toml index 0f83c8080..e4b0c4b8c 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "TaylorIntegration" uuid = "92b13dbe-c966-51a2-8445-caca9f8a7d42" repo = "https://github.com/PerezHz/TaylorIntegration.jl.git" -version = "0.11.0" +version = "0.11.1" [deps] BenchmarkTools = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf" @@ -32,7 +32,7 @@ RecursiveArrayTools = "2" Reexport = "0.2, 1" Requires = "0.5.2, 1" StaticArrays = "0.12.5, 1" -TaylorSeries = "0.13" +TaylorSeries = "0.14" julia = "1" [extras] diff --git a/src/common.jl b/src/common.jl index 053890348..c269f64ff 100644 --- a/src/common.jl +++ b/src/common.jl @@ -136,7 +136,7 @@ function initialize!(integrator, c::TaylorMethodConstantCache) integrator.kshortsize = 2 integrator.k = typeof(integrator.k)(undef, integrator.kshortsize) integrator.fsalfirst = integrator.f(integrator.uprev, integrator.p, integrator.t) # Pre-start fsal - integrator.destats.nf += 1 + integrator.stats.nf += 1 # Avoid undefined entries if k is an array of arrays integrator.fsallast = zero(integrator.fsalfirst) integrator.k[1] = integrator.fsalfirst @@ -151,7 +151,7 @@ function perform_step!(integrator,cache::TaylorMethodConstantCache) cache.uT[0] = u __jetcoeffs!(Val(cache.parse_eqs.x), f, tT, cache.uT, p, cache.rv) k = f(u, p, t+dt) # For the interpolation, needs k at the updated point - integrator.destats.nf += 1 + integrator.stats.nf += 1 integrator.fsallast = k integrator.k[1] = integrator.fsalfirst integrator.k[2] = integrator.fsallast @@ -170,7 +170,7 @@ function initialize!(integrator, cache::TaylorMethodCache) integrator.k[1] = integrator.fsalfirst # integrator.f(integrator.fsalfirst,integrator.uprev,integrator.p,integrator.t) integrator.fsalfirst = constant_term.(duT) - integrator.destats.nf += 1 + integrator.stats.nf += 1 end function perform_step!(integrator, cache::TaylorMethodCache) @@ -184,7 +184,7 @@ function perform_step!(integrator, cache::TaylorMethodCache) end __jetcoeffs!(Val(parse_eqs.x), f, tT, uT, duT, uauxT, p, rv) k = constant_term.(duT) # For the interpolation, needs k at the updated point - integrator.destats.nf += 1 + integrator.stats.nf += 1 end stepsize_controller!(integrator,alg::TaylorMethod) =