Skip to content

Commit 0a8148a

Browse files
Use DiffEqBase 6.190.2 - remove temporary definitions
- DiffEqBase 6.190.2 is now available in registry - Remove all temporary local type definitions - Import DefaultInit, BrownFullBasicInit, ShampineCollocationInit from DiffEqBase - Update version constraint to 6.190.2
1 parent f98e7f7 commit 0a8148a

File tree

2 files changed

+3
-22
lines changed

2 files changed

+3
-22
lines changed

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ ArrayInterface = "7.17.1"
2929
CEnum = "0.5"
3030
DAEProblemLibrary = "0.1"
3131
DataStructures = "0.18, 0.19"
32-
DiffEqBase = "6.190.0"
32+
DiffEqBase = "6.190.2"
3333
DiffEqCallbacks = "4"
3434
DifferentiationInterface = "0.6, 0.7"
3535
ExplicitImports = "1"

src/Sundials.jl

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ using DiffEqBase: DiffEqBase, NonlinearFunction, ODEFunction, add_saveat!,
1010
get_tstops_array, initialize!, isinplace,
1111
reeval_internals_due_to_modification!, reinit!, savevalues!,
1212
set_proposed_dt!, solve, solve!, step!, terminate!, u_modified!,
13-
update_coefficients!, warn_compat
13+
update_coefficients!, warn_compat, DefaultInit, BrownFullBasicInit,
14+
ShampineCollocationInit
1415
using SciMLBase: AbstractSciMLOperator, DAEProblem, ODEProblem, ReturnCode,
1516
SciMLBase, SplitODEProblem, VectorContinuousCallback
1617
import Accessors: @reset
@@ -52,26 +53,6 @@ using Sundials_jll: Sundials_jll, libsundials_core,
5253
libsundials_sunmatrixsparse, libsundials_sunnonlinsolfixedpoint,
5354
libsundials_sunnonlinsolnewton
5455

55-
# Temporary definitions until DiffEqBase 6.190.2 is available
56-
# These will be removed once the new version is released
57-
if !isdefined(DiffEqBase, :DefaultInit)
58-
abstract type DAEInitializationAlgorithm end
59-
struct DefaultInit <: DAEInitializationAlgorithm end
60-
struct BrownFullBasicInit{T, F} <: DAEInitializationAlgorithm
61-
abstol::T
62-
nlsolve::F
63-
end
64-
BrownFullBasicInit(; abstol = nothing, nlsolve = nothing) = BrownFullBasicInit(abstol, nlsolve)
65-
struct ShampineCollocationInit{T, F} <: DAEInitializationAlgorithm
66-
initdt::T
67-
nlsolve::F
68-
end
69-
ShampineCollocationInit(; initdt = nothing, nlsolve = nothing) = ShampineCollocationInit(initdt, nlsolve)
70-
else
71-
using DiffEqBase: DefaultInit, BrownFullBasicInit, ShampineCollocationInit
72-
const DAEInitializationAlgorithm = DiffEqBase.DAEInitializationAlgorithm
73-
end
74-
7556
export solve,
7657
SundialsODEAlgorithm, SundialsDAEAlgorithm, ARKODE, CVODE_BDF, CVODE_Adams, IDA,
7758
KINSOL, DefaultInit, BrownFullBasicInit, ShampineCollocationInit

0 commit comments

Comments
 (0)