Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upstream #13

Merged
merged 72 commits into from
Aug 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
e6c5dcb
commit
ParamThakkar123 Aug 22, 2024
5aa94f9
Cleaned master
ParamThakkar123 Aug 22, 2024
a315d61
Merge branch 'master' of https://github.com/SciML/OrdinaryDiffEq.jl
ParamThakkar123 Aug 22, 2024
eb36d65
fixes #2373
ParamThakkar123 Aug 22, 2024
2ceb19b
fixes #2373
ParamThakkar123 Aug 22, 2024
954dcdf
Fixes
ParamThakkar123 Aug 22, 2024
3bc0e40
Fixed abstract types
ParamThakkar123 Aug 22, 2024
4e79ff8
fixes
ParamThakkar123 Aug 22, 2024
61c3da3
Fixes
ParamThakkar123 Aug 22, 2024
f6c28c9
Fixes
ParamThakkar123 Aug 22, 2024
b724e76
Changes
ParamThakkar123 Aug 22, 2024
2bedaa4
CompatHelper: add new compat entry for OrdinaryDiffEqIMEXMultistep at…
Aug 23, 2024
4274eec
CompatHelper: add new compat entry for OrdinaryDiffEqExplicitRK at ve…
Aug 23, 2024
253adb8
Changes made
ParamThakkar123 Aug 23, 2024
19367f5
Changes
ParamThakkar123 Aug 23, 2024
f1c01c7
Merge pull request #2410 from SciML/compathelper/new_version/2024-08-…
ChrisRackauckas Aug 23, 2024
2c08fd9
CompatHelper: add new compat entry for OrdinaryDiffEqIMEXMultistep at…
Aug 23, 2024
c43ffad
Merge branch 'master' into compathelper/new_version/2024-08-23-02-17-…
ChrisRackauckas Aug 23, 2024
427f099
Merge pull request #2412 from SciML/compathelper/new_version/2024-08-…
ChrisRackauckas Aug 23, 2024
a115d5e
Merge pull request #2411 from SciML/compathelper/new_version/2024-08-…
ChrisRackauckas Aug 23, 2024
2093b6a
CompatHelper: add new compat entry for OrdinaryDiffEqFIRK at version …
Aug 23, 2024
3d8a5e8
CompatHelper: add new compat entry for OrdinaryDiffEqFIRK at version …
Aug 23, 2024
f5ca77b
Merge pull request #2416 from SciML/compathelper/new_version/2024-08-…
ChrisRackauckas Aug 23, 2024
9dac97c
Merge pull request #2415 from SciML/compathelper/new_version/2024-08-…
ChrisRackauckas Aug 23, 2024
5023084
Fixes
ParamThakkar123 Aug 23, 2024
ca00cf1
CompatHelper: add new compat entry for OrdinaryDiffEqLinear at versio…
Aug 23, 2024
a9ebea8
CompatHelper: add new compat entry for OrdinaryDiffEqBDF at version 1…
Aug 23, 2024
b114c1f
CompatHelper: add new compat entry for OrdinaryDiffEqRosenbrock at ve…
Aug 23, 2024
157d583
CompatHelper: add new compat entry for OrdinaryDiffEqNordsieck at ver…
Aug 23, 2024
b9e9f2d
CompatHelper: add new compat entry for OrdinaryDiffEqSDIRK at version…
Aug 23, 2024
3acf488
CompatHelper: add new compat entry for OrdinaryDiffEqDefault at versi…
Aug 23, 2024
6e18290
CompatHelper: add new compat entry for OrdinaryDiffEqExponentialRK at…
Aug 23, 2024
f7896d3
CompatHelper: add new compat entry for OrdinaryDiffEqPDIRK at version…
Aug 23, 2024
71fdc1a
CompatHelper: add new compat entry for OrdinaryDiffEqSSPRK at version…
Aug 23, 2024
9d5b45e
CompatHelper: add new compat entry for OrdinaryDiffEqSymplecticRK at …
Aug 23, 2024
a32a0f8
CompatHelper: add new compat entry for OrdinaryDiffEqStabilizedIRK at…
Aug 23, 2024
7607fba
Merge pull request #2427 from SciML/compathelper/new_version/2024-08-…
ChrisRackauckas Aug 23, 2024
3ef3da5
Merge pull request #2426 from SciML/compathelper/new_version/2024-08-…
ChrisRackauckas Aug 23, 2024
cdd11cc
Merge branch 'master' into compathelper/new_version/2024-08-23-14-07-…
ChrisRackauckas Aug 23, 2024
8925d3a
Merge pull request #2425 from SciML/compathelper/new_version/2024-08-…
ChrisRackauckas Aug 23, 2024
49fe7d3
Merge pull request #2424 from SciML/compathelper/new_version/2024-08-…
ChrisRackauckas Aug 23, 2024
2744c4e
Merge pull request #2423 from SciML/compathelper/new_version/2024-08-…
ChrisRackauckas Aug 23, 2024
53b5c52
Merge pull request #2422 from SciML/compathelper/new_version/2024-08-…
ChrisRackauckas Aug 23, 2024
76aed6b
Merge branch 'master' into compathelper/new_version/2024-08-23-14-07-…
ChrisRackauckas Aug 23, 2024
15f4987
Merge pull request #2421 from SciML/compathelper/new_version/2024-08-…
ChrisRackauckas Aug 23, 2024
92eb646
Merge branch 'master' into compathelper/new_version/2024-08-23-14-07-…
ChrisRackauckas Aug 23, 2024
564f67e
Merge pull request #2420 from SciML/compathelper/new_version/2024-08-…
ChrisRackauckas Aug 23, 2024
bef44c0
Merge branch 'master' into compathelper/new_version/2024-08-23-14-07-…
ChrisRackauckas Aug 23, 2024
e307a2b
Merge pull request #2419 from SciML/compathelper/new_version/2024-08-…
ChrisRackauckas Aug 23, 2024
6cecb54
Merge pull request #2418 from SciML/compathelper/new_version/2024-08-…
ChrisRackauckas Aug 23, 2024
fbf4371
Merge pull request #2417 from SciML/compathelper/new_version/2024-08-…
ChrisRackauckas Aug 23, 2024
b637b86
Ready a release
ChrisRackauckas Aug 24, 2024
f8358fe
Fixes
ParamThakkar123 Aug 24, 2024
ff181f3
Update Project.toml
ChrisRackauckas Aug 24, 2024
722806c
Update OrdinaryDiffEqCoreEnzymeCoreExt.jl
ChrisRackauckas Aug 24, 2024
dc4ec92
Merge pull request #2428 from SciML/ChrisRackauckas-patch-2
ChrisRackauckas Aug 24, 2024
0ca92b3
format
ChrisRackauckas Aug 24, 2024
4dc378b
Update OrdinaryDiffEqCoreEnzymeCoreExt.jl
ChrisRackauckas Aug 24, 2024
ceae110
Update Project.toml
ChrisRackauckas Aug 24, 2024
e7dd8b3
Fixes
ParamThakkar123 Aug 24, 2024
568f8ea
Merge branch 'master' into Fixes5
ParamThakkar123 Aug 24, 2024
dd76a49
Update alg_utils.jl
ChrisRackauckas Aug 24, 2024
51ead36
Update alg_utils.jl
ChrisRackauckas Aug 24, 2024
360d5c9
no need to import strip_interpolation
ChrisRackauckas Aug 24, 2024
11bae91
Merge branch 'master' of https://github.com/SciML/OrdinaryDiffEq.jl
ChrisRackauckas Aug 24, 2024
9529728
Update Project.toml
ChrisRackauckas Aug 24, 2024
ff65f68
Update lib/OrdinaryDiffEqLowStorageRK/test/ode_low_storage_rk_tests.jl
ChrisRackauckas Aug 25, 2024
b43e515
Changes
ParamThakkar123 Aug 25, 2024
533668a
Update alg_utils.jl
ChrisRackauckas Aug 25, 2024
b7a9233
Merge pull request #2408 from ParamThakkar123/Fixes5
ChrisRackauckas Aug 25, 2024
cbe41dd
Update Project.toml
ChrisRackauckas Aug 25, 2024
5f8f3a0
Update Project.toml
ChrisRackauckas Aug 25, 2024
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
18 changes: 16 additions & 2 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "OrdinaryDiffEq"
uuid = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"
authors = ["Chris Rackauckas <[email protected]>", "Yingbo Ma <[email protected]>"]
version = "6.87.0"
version = "6.88.1"

[deps]
ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b"
Expand Down Expand Up @@ -98,19 +98,33 @@ MacroTools = "0.5"
MuladdMacro = "0.2.1"
NonlinearSolve = "3"
OrdinaryDiffEqAdamsBashforthMoulton = "1"
OrdinaryDiffEqBDF = "1"
OrdinaryDiffEqCore = "1"
OrdinaryDiffEqDefault = "1"
OrdinaryDiffEqDifferentiation = "1"
OrdinaryDiffEqExplicitRK = "1"
OrdinaryDiffEqExponentialRK = "1"
OrdinaryDiffEqExtrapolation = "1"
OrdinaryDiffEqFIRK = "1"
OrdinaryDiffEqFeagin = "1"
OrdinaryDiffEqFunctionMap = "1"
OrdinaryDiffEqHighOrderRK = "1"
OrdinaryDiffEqIMEXMultistep = "1"
OrdinaryDiffEqLinear = "1"
OrdinaryDiffEqLowOrderRK = "1"
OrdinaryDiffEqLowStorageRK = "1"
OrdinaryDiffEqHighOrderRK = "1"
OrdinaryDiffEqNonlinearSolve = "1"
OrdinaryDiffEqNordsieck = "1"
OrdinaryDiffEqPDIRK = "1"
OrdinaryDiffEqPRK = "1"
OrdinaryDiffEqQPRK = "1"
OrdinaryDiffEqRKN = "1"
OrdinaryDiffEqRosenbrock = "1"
OrdinaryDiffEqSDIRK = "1"
OrdinaryDiffEqStabilizedIRK = "1"
OrdinaryDiffEqSSPRK = "1"
OrdinaryDiffEqStabilizedRK = "1"
OrdinaryDiffEqSymplecticRK = "1"
OrdinaryDiffEqTsit5 = "1"
OrdinaryDiffEqVerner = "1"
Polyester = "0.7"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
abstract type ABMMutableCache <: OrdinaryDiffEqMutableCache end
abstract type ABMVariableCoefficientMutableCache <: OrdinaryDiffEqMutableCache end
get_fsalfirstlast(cache::ABMMutableCache,u) = (cache.fsalfirst, cache.k)
get_fsalfirstlast(cache::ABMVariableCoefficientMutableCache,u) = (cache.fsalfirst, cache.k4)
get_fsalfirstlast(cache::ABMMutableCache, u) = (cache.fsalfirst, cache.k)
function get_fsalfirstlast(cache::ABMVariableCoefficientMutableCache, u)
(cache.fsalfirst, cache.k4)
end
@cache mutable struct AB3Cache{uType, rateType} <: ABMMutableCache
u::uType
uprev::uType
Expand Down
5 changes: 3 additions & 2 deletions lib/OrdinaryDiffEqBDF/src/algorithms.jl
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ end
function QNDF1(; chunk_size = Val{0}(), autodiff = Val{true}(), standardtag = Val{true}(),
concrete_jac = nothing, diff_type = Val{:forward},
linsolve = nothing, precs = DEFAULT_PRECS, nlsolve = NLNewton(),
extrapolant = :linear, kappa = -37//200,
extrapolant = :linear, kappa = -37 // 200,
controller = :Standard, step_limiter! = trivial_limiter!)
QNDF1{
_unwrap_val(chunk_size), _unwrap_val(autodiff), typeof(linsolve), typeof(nlsolve),
Expand Down Expand Up @@ -233,7 +233,8 @@ function QNDF(; max_order::Val{MO} = Val{5}(), chunk_size = Val{0}(),
diff_type = Val{:forward},
linsolve = nothing, precs = DEFAULT_PRECS, nlsolve = NLNewton(), κ = nothing,
tol = nothing,
extrapolant = :linear, kappa = (-37//200, -1//9, -823//10000, -83//2000, 0//1),
extrapolant = :linear, kappa = (
-37 // 200, -1 // 9, -823 // 10000, -83 // 2000, 0 // 1),
controller = :Standard, step_limiter! = trivial_limiter!) where {MO}
QNDF{MO, _unwrap_val(chunk_size), _unwrap_val(autodiff), typeof(linsolve),
typeof(nlsolve), typeof(precs), diff_type, _unwrap_val(standardtag),
Expand Down
4 changes: 3 additions & 1 deletion lib/OrdinaryDiffEqBDF/src/bdf_caches.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
abstract type BDFMutableCache <: OrdinaryDiffEqMutableCache end
get_fsalfirstlast(cache::BDFMutableCache,u) = (cache.fsalfirst, du_alias_or_new(cache.nlsolver, cache.fsalfirst))
function get_fsalfirstlast(cache::BDFMutableCache, u)
(cache.fsalfirst, du_alias_or_new(cache.nlsolver, cache.fsalfirst))
end

@cache mutable struct ABDF2ConstantCache{N, dtType, rate_prototype} <:
OrdinaryDiffEqConstantCache
Expand Down
4 changes: 2 additions & 2 deletions lib/OrdinaryDiffEqBDF/src/controllers.jl
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ function choose_order!(alg::FBDF, integrator,
Val(max_order))
local terk_tmp
if u isa Number
terk_tmp = fd_weights[k - 2, 1]*u
terk_tmp = fd_weights[k - 2, 1] * u
for i in 2:(k - 2)
terk_tmp += fd_weights[i, k - 2] * u_history[i - 1]
end
Expand All @@ -215,7 +215,7 @@ function choose_order!(alg::FBDF, integrator,
# we need terk_tmp to be mutable.
# so it can be updated
terk_tmp = similar(u)
@.. terk_tmp = fd_weights[k - 2, 1]*_vec(u)
@.. terk_tmp = fd_weights[k - 2, 1] * _vec(u)
for i in 2:(k - 2)
@.. @views terk_tmp += fd_weights[i, k - 2] * u_history[:, i - 1]
end
Expand Down
6 changes: 4 additions & 2 deletions lib/OrdinaryDiffEqBDF/src/dae_caches.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
abstract type DAEBDFMutableCache <: OrdinaryDiffEqMutableCache end
get_fsalfirstlast(cache::DAEBDFMutableCache,u) = (cache.fsalfirst, du_alias_or_new(cache.nlsolver, cache.fsalfirst))
function get_fsalfirstlast(cache::DAEBDFMutableCache, u)
(cache.fsalfirst, du_alias_or_new(cache.nlsolver, cache.fsalfirst))
end

@cache mutable struct DImplicitEulerCache{uType, rateType, uNoUnitsType, N} <:
DAEBDFMutableCache
Expand All @@ -13,7 +15,7 @@ get_fsalfirstlast(cache::DAEBDFMutableCache,u) = (cache.fsalfirst, du_alias_or_n
end

# Not FSAL
get_fsalfirstlast(cache::DImplicitEulerCache,u) = (u,u)
get_fsalfirstlast(cache::DImplicitEulerCache, u) = (u, u)

mutable struct DImplicitEulerConstantCache{N} <: OrdinaryDiffEqConstantCache
nlsolver::N
Expand Down
2 changes: 0 additions & 2 deletions lib/OrdinaryDiffEqBDF/src/dae_perform_step.jl
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,6 @@ end
end

function initialize!(integrator, cache::DABDF2Cache)


integrator.kshortsize = 2
@unpack k₁, k₂ = cache.eulercache
resize!(integrator.k, integrator.kshortsize)
Expand Down
2 changes: 1 addition & 1 deletion lib/OrdinaryDiffEqCore/Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "OrdinaryDiffEqCore"
uuid = "bbf590c4-e513-4bbe-9b18-05decba2e5d8"
authors = ["ParamThakkar123 <[email protected]>"]
version = "1.2.0"
version = "1.3.0"

[deps]
ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b"
Expand Down
24 changes: 16 additions & 8 deletions lib/OrdinaryDiffEqCore/ext/OrdinaryDiffEqCoreEnzymeCoreExt.jl
Original file line number Diff line number Diff line change
@@ -1,12 +1,20 @@
module OrdinaryDiffEqCoreEnzymeCoreExt
import OrdinaryDiffEqCore, EnzymeCore

Enzyme.EnzymeCore.EnzymeRules.inactive(::typeof(OrdinaryDiffEqCore.increment_nf!), args...) = true
Enzyme.EnzymeCore.EnzymeRules.inactive(::typeof(OrdinaryDiffEqCore.fixed_t_for_floatingpoint_error!), args...) = true
Enzyme.EnzymeCore.EnzymeRules.inactive(::typeof(OrdinaryDiffEqCore.increment_accept!), args...) = true
Enzyme.EnzymeCore.EnzymeRules.inactive(::typeof(OrdinaryDiffEqCore.increment_reject!), args...) = true
Enzyme.EnzymeCore.EnzymeRules.inactive(::typeof(OrdinaryDiffEqCore.increment_nf_perform_step!), args...) = true
Enzyme.EnzymeCore.EnzymeRules.inactive(::typeof(OrdinaryDiffEqCore.check_error!), args...) = true
Enzyme.EnzymeCore.EnzymeRules.inactive(::typeof(OrdinaryDiffEqCore.log_step!), args...) = true
EnzymeCore.EnzymeRules.inactive(::typeof(OrdinaryDiffEqCore.increment_nf!), args...) = true
function EnzymeCore.EnzymeRules.inactive(
::typeof(OrdinaryDiffEqCore.fixed_t_for_floatingpoint_error!), args...)
true
end
function EnzymeCore.EnzymeRules.inactive(
::typeof(OrdinaryDiffEqCore.increment_accept!), args...)
true
end
function EnzymeCore.EnzymeRules.inactive(
::typeof(OrdinaryDiffEqCore.increment_reject!), args...)
true
end
EnzymeCore.EnzymeRules.inactive(::typeof(OrdinaryDiffEqCore.check_error!), args...) = true
EnzymeCore.EnzymeRules.inactive(::typeof(OrdinaryDiffEqCore.log_step!), args...) = true

end
end
3 changes: 1 addition & 2 deletions lib/OrdinaryDiffEqCore/src/OrdinaryDiffEqCore.jl
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ using SimpleUnPack, RecursiveArrayTools, DataStructures, ArrayInterface
import TruncatedStacktraces

import StaticArraysCore: SArray, MVector, SVector, StaticArray, MMatrix,
StaticMatrix
StaticMatrix

# Integrator Interface
import DiffEqBase: resize!, deleteat!, addat!, full_cache, user_cache, u_cache, du_cache,
Expand All @@ -54,7 +54,6 @@ import DiffEqBase: resize!, deleteat!, addat!, full_cache, user_cache, u_cache,
isautodifferentiable,
get_tstops, get_tstops_array, get_tstops_max


using DiffEqBase: check_error!, @def, _vec, _reshape

using FastBroadcast: @.., True, False
Expand Down
12 changes: 12 additions & 0 deletions lib/OrdinaryDiffEqCore/src/alg_utils.jl
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,18 @@ qsteady_max_default(alg::OrdinaryDiffEqImplicitAlgorithm) = isadaptive(alg) ? 1
#DiffEqBase.nlsolve_default(::QNDF, ::Val{κ}) = 1//2

# SSP coefficients

"""
ssp_coefficient(alg)
Return the SSP coefficient of the ODE algorithm `alg`. If one time step of size
`dt` with `alg` can be written as a convex combination of explicit Euler steps
with step sizes `cᵢ * dt`, the SSP coefficient is the minimal value of `1/cᵢ`.
# Examples
```julia-repl
julia> ssp_coefficient(SSPRK104())
6
```
"""
ssp_coefficient(alg) = error("$alg is not a strong stability preserving method.")

# We shouldn't do this probably.
Expand Down
11 changes: 6 additions & 5 deletions lib/OrdinaryDiffEqCore/src/caches/basic_caches.jl
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ struct ODEEmptyCache <: OrdinaryDiffEqConstantCache end
struct ODEChunkCache{CS} <: OrdinaryDiffEqConstantCache end

# Don't worry about the potential alloc on a constant cache
get_fsalfirstlast(cache::OrdinaryDiffEqConstantCache,u) = (zero(u), zero(u))
get_fsalfirstlast(cache::OrdinaryDiffEqConstantCache, u) = (zero(u), zero(u))

mutable struct CompositeCache{T, F} <: OrdinaryDiffEqCache
caches::T
choice_function::F
current::Int
end

get_fsalfirstlast(cache::CompositeCache,u) = get_fsalfirstlast(cache.caches[1],u)
get_fsalfirstlast(cache::CompositeCache, u) = get_fsalfirstlast(cache.caches[1], u)

mutable struct DefaultCache{T1, T2, T3, T4, T5, T6, A, F, uType} <: OrdinaryDiffEqCache
args::A
Expand All @@ -28,12 +28,13 @@ mutable struct DefaultCache{T1, T2, T3, T4, T5, T6, A, F, uType} <: OrdinaryDiff
cache6::T6
function DefaultCache{T1, T2, T3, T4, T5, T6, F, uType}(
args, choice_function, current, u) where {T1, T2, T3, T4, T5, T6, F, uType}
new{T1, T2, T3, T4, T5, T6, typeof(args), F, uType}(args, choice_function, current, u)
new{T1, T2, T3, T4, T5, T6, typeof(args), F, uType}(
args, choice_function, current, u)
end
end

function get_fsalfirstlast(cache::DefaultCache,u)
(cache.u,cache.u) # will be overwritten by the cache choice
function get_fsalfirstlast(cache::DefaultCache, u)
(cache.u, cache.u) # will be overwritten by the cache choice
end

function alg_cache(alg::CompositeAlgorithm, u, rate_prototype, ::Type{uEltypeNoUnits},
Expand Down
16 changes: 8 additions & 8 deletions lib/OrdinaryDiffEqCore/src/integrators/integrator_utils.jl
Original file line number Diff line number Diff line change
Expand Up @@ -255,8 +255,8 @@ function _loopfooter!(integrator)
end
if integrator.opts.progress && integrator.iter % integrator.opts.progress_steps == 0
log_step!(integrator.opts.progress_name, integrator.opts.progress_id,
integrator.opts.progress_message, integrator.dt, integrator.u,
integrator.p, integrator.t, integrator.sol.prob.tspan)
integrator.opts.progress_message, integrator.dt, integrator.u,
integrator.p, integrator.t, integrator.sol.prob.tspan)
end

# Take value because if t is dual then maxeig can be dual
Expand All @@ -280,18 +280,18 @@ end

function log_step!(progress_name, progress_id, progress_message, dt, u, p, t, tspan)
t1, t2 = tspan
@logmsg(LogLevel(-1),progress_name,
_id=progress_id,
message=progress_message(dt, u, p, t),
progress=(t - t1) / (t2 - t1))
@logmsg(LogLevel(-1), progress_name,
_id=progress_id,
message=progress_message(dt, u, p, t),
progress=(t - t1) / (t2 - t1))
end

function fixed_t_for_floatingpoint_error!(integrator, ttmp)
if has_tstop(integrator)
tstop = integrator.tdir * first_tstop(integrator)
if abs(ttmp - tstop) <
100eps(float(max(integrator.t, tstop) / oneunit(integrator.t))) *
oneunit(integrator.t)
100eps(float(max(integrator.t, tstop) / oneunit(integrator.t))) *
oneunit(integrator.t)
tstop
else
ttmp
Expand Down
3 changes: 1 addition & 2 deletions lib/OrdinaryDiffEqCore/src/interp_func.jl
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ end

# strip interpolation of function information
function SciMLBase.strip_interpolation(id::InterpolationData)

cache = strip_cache(id.cache)

InterpolationData(nothing, id.timeseries,
Expand All @@ -78,7 +77,7 @@ end
function strip_cache(cache)
if hasfield(typeof(cache), :jac_config) || hasfield(typeof(cache), :grad_config)
fieldnums = length(fieldnames(typeof(cache)))
noth_list = fill(nothing,fieldnums)
noth_list = fill(nothing, fieldnums)
cache_type_name = Base.typename(typeof(cache)).wrapper
cache_type_name(noth_list...)
else
Expand Down
Loading
Loading