Skip to content

Commit eb44d73

Browse files
Merge pull request #450 from SciML/linsolve
update defaults for LinearSolve.jl
2 parents e5fb05d + e61cd05 commit eb44d73

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ FiniteDiff = "2"
4141
ForwardDiff = "0.10.3"
4242
MuladdMacro = "0.2.1"
4343
NLsolve = "4"
44-
OrdinaryDiffEq = "5.69"
44+
OrdinaryDiffEq = "6"
4545
RandomNumbers = "1.5.3"
4646
RecursiveArrayTools = "2"
4747
Reexport = "0.2, 1.0"

src/algorithms.jl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -635,7 +635,7 @@ struct ImplicitEM{CS,AD,F,F2,FDT,ST,T2,Controller} <: StochasticDiffEqNewtonAdap
635635
end
636636
ImplicitEM(;chunk_size=0,autodiff=true,diff_type=Val{:central},
637637
standardtag = Val{true}(),
638-
linsolve=DEFAULT_LINSOLVE,nlsolve=NLNewton(),
638+
linsolve=nothing,nlsolve=NLNewton(),
639639
extrapolant=:constant,
640640
theta = 1,symplectic=false,
641641
new_jac_conv_bound = 1e-3,
@@ -667,7 +667,7 @@ struct ImplicitEulerHeun{CS,AD,F,FDT,ST,N,T2,Controller} <: StochasticDiffEqNewt
667667
end
668668
ImplicitEulerHeun(;chunk_size=0,autodiff=true,diff_type=Val{:central},
669669
standardtag = Val{true}(),
670-
linsolve=DEFAULT_LINSOLVE,nlsolve=NLNewton(),
670+
linsolve=nothing,nlsolve=NLNewton(),
671671
extrapolant=:constant,
672672
theta = 1,symplectic = false,
673673
new_jac_conv_bound = 1e-3,
@@ -700,7 +700,7 @@ struct ImplicitRKMil{CS,AD,F,FDT,ST,N,T2,Controller,interpretation} <: Stochasti
700700
end
701701
ImplicitRKMil(;chunk_size=0,autodiff=true,diff_type=Val{:central},
702702
standardtag = Val{true}(),
703-
linsolve=DEFAULT_LINSOLVE,nlsolve=NLNewton(),
703+
linsolve=nothing,nlsolve=NLNewton(),
704704
extrapolant=:constant,
705705
theta = 1,symplectic = false,
706706
new_jac_conv_bound = 1e-3,
@@ -732,7 +732,7 @@ struct ISSEM{CS,AD,F,FDT,ST,N,T2,Controller} <: StochasticDiffEqNewtonAdaptiveAl
732732
end
733733
ISSEM(;chunk_size=0,autodiff=true,diff_type=Val{:central},
734734
standardtag = Val{true}(),
735-
linsolve=DEFAULT_LINSOLVE,nlsolve=NLNewton(),
735+
linsolve=nothing,nlsolve=NLNewton(),
736736
extrapolant=:constant,
737737
theta = 1,symplectic=false,
738738
new_jac_conv_bound = 1e-3,
@@ -764,7 +764,7 @@ struct ISSEulerHeun{CS,AD,F,FDT,ST,N,T2,Controller} <: StochasticDiffEqNewtonAda
764764
end
765765
ISSEulerHeun(;chunk_size=0,autodiff=true,diff_type=Val{:central},
766766
standardtag = Val{true}(),
767-
linsolve=DEFAULT_LINSOLVE,nlsolve=NLNewton(),
767+
linsolve=nothing,nlsolve=NLNewton(),
768768
extrapolant=:constant,
769769
theta = 1,symplectic=false,
770770
new_jac_conv_bound = 1e-3,
@@ -793,7 +793,7 @@ end
793793

794794
SKenCarp(;chunk_size=0,autodiff=true,diff_type=Val{:central},
795795
standardtag = Val{true}(),
796-
linsolve=DEFAULT_LINSOLVE,nlsolve=NLNewton(),
796+
linsolve=nothing,nlsolve=NLNewton(),
797797
smooth_est=true,extrapolant=:min_correct,
798798
new_jac_conv_bound = 1e-3,controller = :Predictive,
799799
ode_error_est = true) =

src/perform_step/kencarp.jl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,9 @@ end
290290
@.. g1 = btilde1*z₁ + btilde2*z₂ + btilde3*z₃ + btilde4*z₄
291291
end
292292
if alg.smooth_est # From Shampine
293-
nlsolver.cache.linsolve(vec(E₁),OrdinaryDiffEq.get_W(nlsolver),vec(g1),false)
293+
linres = OrdinaryDiffEq.dolinsolve(integrator, nlsolver.cache.linsolve;
294+
b = OrdinaryDiffEq._vec(g1),
295+
u = OrdinaryDiffEq._vec(E₁))
294296
else
295297
E₁ .= dz
296298
end

0 commit comments

Comments
 (0)