|
17 | 17 | end |
18 | 18 |
|
19 | 19 | # Helper to get abstol from either the algorithm or integrator opts |
20 | | -@inline function get_abstol(alg::Union{BrownFullBasicInit, OrdinaryDiffEqCore.BrownFullBasicInit}, integrator) |
| 20 | +@inline function get_abstol(alg::Union{DiffEqBase.BrownBasicInit, DiffEqBase.BrownFullBasicInit}, integrator) |
21 | 21 | return alg.abstol |
22 | 22 | end |
23 | 23 |
|
24 | | -@inline function get_abstol(alg::DiffEqBase.BrownBasicInit, integrator) |
25 | | - return integrator.opts.abstol |
26 | | -end |
27 | | - |
28 | 24 | # Helper to get nlsolve from either the algorithm or nothing |
29 | | -@inline function get_nlsolve(alg::Union{BrownFullBasicInit, OrdinaryDiffEqCore.BrownFullBasicInit, OrdinaryDiffEqCore.ShampineCollocationInitExt}) |
| 25 | +@inline function get_nlsolve(alg::Union{DiffEqBase.BrownBasicInit, DiffEqBase.BrownFullBasicInit, DiffEqBase.ShampineCollocationInit}) |
30 | 26 | return alg.nlsolve |
31 | 27 | end |
32 | 28 |
|
33 | | -@inline function get_nlsolve(alg::Union{DiffEqBase.BrownBasicInit, DiffEqBase.ShampineCollocationInit}) |
34 | | - return nothing |
35 | | -end |
36 | | - |
37 | 29 | # Helper to get initdt from either the algorithm or nothing |
38 | | -@inline function get_initdt(alg::OrdinaryDiffEqCore.ShampineCollocationInitExt) |
| 30 | +@inline function get_initdt(alg::DiffEqBase.ShampineCollocationInit) |
39 | 31 | return alg.initdt |
40 | 32 | end |
41 | 33 |
|
42 | | -@inline function get_initdt(alg::Union{DiffEqBase.ShampineCollocationInit, OrdinaryDiffEqCore.ShampineCollocationInit}) |
43 | | - return nothing |
44 | | -end |
45 | | - |
46 | 34 | function default_nlsolve( |
47 | 35 | ::Nothing, isinplace::Val{true}, u, ::AbstractNonlinearProblem, autodiff = false) |
48 | 36 | FastShortcutNonlinearPolyalg(; |
@@ -80,7 +68,7 @@ Solve for `u` |
80 | 68 |
|
81 | 69 | =# |
82 | 70 |
|
83 | | -function _initialize_dae!(integrator, prob::ODEProblem, alg::Union{ShampineCollocationInit, OrdinaryDiffEqCore.ShampineCollocationInitExt}, |
| 71 | +function _initialize_dae!(integrator, prob::ODEProblem, alg::DiffEqBase.ShampineCollocationInit, |
84 | 72 | isinplace::Val{true}) |
85 | 73 | @unpack p, t, f = integrator |
86 | 74 | M = integrator.f.mass_matrix |
@@ -196,7 +184,7 @@ function _initialize_dae!(integrator, prob::ODEProblem, alg::Union{ShampineCollo |
196 | 184 | return |
197 | 185 | end |
198 | 186 |
|
199 | | -function _initialize_dae!(integrator, prob::ODEProblem, alg::Union{ShampineCollocationInit, OrdinaryDiffEqCore.ShampineCollocationInitExt}, |
| 187 | +function _initialize_dae!(integrator, prob::ODEProblem, alg::DiffEqBase.ShampineCollocationInit, |
200 | 188 | isinplace::Val{false}) |
201 | 189 | @unpack p, t, f = integrator |
202 | 190 | u0 = integrator.u |
@@ -417,7 +405,7 @@ function algebraic_jacobian(jac_prototype::T, algebraic_eqs, |
417 | 405 | end |
418 | 406 |
|
419 | 407 | function _initialize_dae!(integrator, prob::ODEProblem, |
420 | | - alg::Union{BrownFullBasicInit, DiffEqBase.BrownBasicInit}, isinplace::Val{true}) |
| 408 | + alg::Union{DiffEqBase.BrownBasicInit, DiffEqBase.BrownFullBasicInit}, isinplace::Val{true}) |
421 | 409 | @unpack p, t, f = integrator |
422 | 410 | u = integrator.u |
423 | 411 | M = integrator.f.mass_matrix |
@@ -498,7 +486,7 @@ function _initialize_dae!(integrator, prob::ODEProblem, |
498 | 486 | end |
499 | 487 |
|
500 | 488 | function _initialize_dae!(integrator, prob::ODEProblem, |
501 | | - alg::Union{BrownFullBasicInit, DiffEqBase.BrownBasicInit}, isinplace::Val{false}) |
| 489 | + alg::Union{DiffEqBase.BrownBasicInit, DiffEqBase.BrownFullBasicInit}, isinplace::Val{false}) |
502 | 490 | @unpack p, t, f = integrator |
503 | 491 |
|
504 | 492 | u0 = integrator.u |
@@ -566,7 +554,7 @@ function _initialize_dae!(integrator, prob::ODEProblem, |
566 | 554 | end |
567 | 555 |
|
568 | 556 | function _initialize_dae!(integrator, prob::DAEProblem, |
569 | | - alg::Union{BrownFullBasicInit, DiffEqBase.BrownBasicInit}, isinplace::Val{true}) |
| 557 | + alg::Union{DiffEqBase.BrownBasicInit, DiffEqBase.BrownFullBasicInit}, isinplace::Val{true}) |
570 | 558 | @unpack p, t, f = integrator |
571 | 559 | differential_vars = prob.differential_vars |
572 | 560 | u = integrator.u |
@@ -648,7 +636,7 @@ function _initialize_dae!(integrator, prob::DAEProblem, |
648 | 636 | end |
649 | 637 |
|
650 | 638 | function _initialize_dae!(integrator, prob::DAEProblem, |
651 | | - alg::Union{BrownFullBasicInit, DiffEqBase.BrownBasicInit}, isinplace::Val{false}) |
| 639 | + alg::Union{DiffEqBase.BrownBasicInit, DiffEqBase.BrownFullBasicInit}, isinplace::Val{false}) |
652 | 640 | @unpack p, t, f = integrator |
653 | 641 | differential_vars = prob.differential_vars |
654 | 642 |
|
|
0 commit comments