Add temporary initialization type definitions for testing

- DiffEqBase 6.190.2 is not yet available
- Added local definitions of DefaultInit, BrownFullBasicInit, ShampineCollocationInit
- These will be removed once DiffEqBase 6.190.2 is released
- Adjusted version constraint to 6.190.0 for testing

Author: ChrisRackauckas

Project.toml

@@ -29,7 +29,7 @@ ArrayInterface = "7.17.1"
 CEnum = "0.5"
 DAEProblemLibrary = "0.1"
 DataStructures = "0.18, 0.19"
-DiffEqBase = "6.190.2"
+DiffEqBase = "6.190.0"
 DiffEqCallbacks = "4"
 DifferentiationInterface = "0.6, 0.7"
 ExplicitImports = "1"

src/Sundials.jl

@@ -10,8 +10,7 @@ using DiffEqBase: DiffEqBase, NonlinearFunction, ODEFunction, add_saveat!,
                   get_tstops_array, initialize!, isinplace,
                   reeval_internals_due_to_modification!, reinit!, savevalues!,
                   set_proposed_dt!, solve, solve!, step!, terminate!, u_modified!,
-                  update_coefficients!, warn_compat, DefaultInit, BrownFullBasicInit,
-                  ShampineCollocationInit
+                  update_coefficients!, warn_compat
 using SciMLBase: AbstractSciMLOperator, DAEProblem, ODEProblem, ReturnCode,
                  SciMLBase, SplitODEProblem, VectorContinuousCallback
 import Accessors: @reset
@@ -53,6 +52,26 @@ using Sundials_jll: Sundials_jll, libsundials_core,
                     libsundials_sunmatrixsparse, libsundials_sunnonlinsolfixedpoint,
                     libsundials_sunnonlinsolnewton
 
+# Temporary definitions until DiffEqBase 6.190.2 is available
+# These will be removed once the new version is released
+if !isdefined(DiffEqBase, :DefaultInit)
+    abstract type DAEInitializationAlgorithm end
+    struct DefaultInit <: DAEInitializationAlgorithm end
+    struct BrownFullBasicInit{T, F} <: DAEInitializationAlgorithm
+        abstol::T
+        nlsolve::F
+    end
+    BrownFullBasicInit(; abstol = nothing, nlsolve = nothing) = BrownFullBasicInit(abstol, nlsolve)
+    struct ShampineCollocationInit{T, F} <: DAEInitializationAlgorithm
+        initdt::T
+        nlsolve::F
+    end
+    ShampineCollocationInit(; initdt = nothing, nlsolve = nothing) = ShampineCollocationInit(initdt, nlsolve)
+else
+    using DiffEqBase: DefaultInit, BrownFullBasicInit, ShampineCollocationInit
+    const DAEInitializationAlgorithm = DiffEqBase.DAEInitializationAlgorithm
+end
+
 export solve,
        SundialsODEAlgorithm, SundialsDAEAlgorithm, ARKODE, CVODE_BDF, CVODE_Adams, IDA,
        KINSOL, DefaultInit, BrownFullBasicInit, ShampineCollocationInit

src/common_interface/integrator_utils.jl

@@ -238,7 +238,7 @@ DiffEqBase.set_proposed_dt!(i::AbstractSundialsIntegrator, dt) = nothing
 
 # DefaultInit for all Sundials integrators - handles ModelingToolkit parameter initialization
 function DiffEqBase.initialize_dae!(integrator::AbstractSundialsIntegrator,
-        initializealg::DiffEqBase.DefaultInit)
+        initializealg::DefaultInit)
     # DefaultInit intelligently chooses the actual initialization algorithm
     prob = integrator.sol.prob
     if haskey(prob.kwargs, :initialization_data) && prob.kwargs[:initialization_data] !== nothing
@@ -255,7 +255,7 @@ function DiffEqBase.initialize_dae!(integrator::AbstractSundialsIntegrator,
 end
 
 function DiffEqBase.initialize_dae!(integrator::IDAIntegrator,
-        initializealg::DiffEqBase.BrownFullBasicInit)
+        initializealg::BrownFullBasicInit)
     if integrator.u_modified
         IDAReinit!(integrator)
     end
@@ -288,7 +288,7 @@ function DiffEqBase.initialize_dae!(integrator::IDAIntegrator,
 end
 
 function DiffEqBase.initialize_dae!(integrator::IDAIntegrator,
-        initializealg::DiffEqBase.ShampineCollocationInit)
+        initializealg::ShampineCollocationInit)
     if integrator.u_modified
         IDAReinit!(integrator)
     end