Skip to content

Commit 09aa469

Browse files
format
1 parent 6a0d6c3 commit 09aa469

File tree

20 files changed

+210
-197
lines changed

20 files changed

+210
-197
lines changed

docs/src/massmatrixdae/Rosenbrock.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ the former is more efficient, but the latter is more reliable.
1111
For larger systems look at multistep methods.
1212

1313
!!! warn
14-
14+
1515
In order to use OrdinaryDiffEqRosenbrock with DAEs that require a non-trivial
1616
consistent initialization, a nonlinear solver is required and thus
1717
`using OrdinaryDiffEqNonlinearSolve` is required or you must pass an `initializealg`

lib/OrdinaryDiffEqBDF/src/bdf_perform_step.jl

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1113,7 +1113,8 @@ function perform_step!(integrator, cache::FBDFConstantCache{max_order},
11131113
end
11141114
tmp = -uprev * bdf_coeffs[k, 2]
11151115
for i in 1:(k - 1)
1116-
tmp = @.. tmp - $(_reshape(view(u_corrector, :, i), axes(u))) * bdf_coeffs[k, i + 2]
1116+
tmp = @.. tmp -
1117+
$(_reshape(view(u_corrector, :, i), axes(u))) * bdf_coeffs[k, i + 2]
11171118
end
11181119
end
11191120

@@ -1170,7 +1171,9 @@ function perform_step!(integrator, cache::FBDFConstantCache{max_order},
11701171
terk *= abs(dt^(k))
11711172
else
11721173
for i in 2:(k + 1)
1173-
terk = @.. terk + fd_weights[i, k + 1] * $(_reshape(view(u_history, :, i - 1), axes(u)))
1174+
terk = @.. terk +
1175+
fd_weights[i, k + 1] *
1176+
$(_reshape(view(u_history, :, i - 1), axes(u)))
11741177
end
11751178
terk *= abs(dt^(k))
11761179
end

lib/OrdinaryDiffEqBDF/src/controllers.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,8 @@ function choose_order!(alg::FBDF, integrator,
217217
terk_tmp = similar(u)
218218
@.. terk_tmp = fd_weights[k - 2, 1] * _vec(u)
219219
for i in 2:(k - 2)
220-
@.. terk_tmp += fd_weights[i, k - 2] * $(_reshape(view(u_history, :, i - 1), axes(u)))
220+
@.. terk_tmp += fd_weights[i, k - 2] *
221+
$(_reshape(view(u_history, :, i - 1), axes(u)))
221222
end
222223
@.. terk_tmp *= abs(dt^(k - 2))
223224
end

lib/OrdinaryDiffEqCore/src/caches/basic_caches.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ function get_fsalfirstlast(cache::DefaultCache, u)
5151
(cache.u, cache.u) # will be overwritten by the cache choice
5252
end
5353

54-
function ismutablecache(cache::DefaultCache{T1, T2, T3, T4, T5, T6, A, F, uType}) where {T1, T2, T3, T4, T5, T6, A, F, uType}
54+
function ismutablecache(cache::DefaultCache{
55+
T1, T2, T3, T4, T5, T6, A, F, uType}) where {T1, T2, T3, T4, T5, T6, A, F, uType}
5556
T1 <: OrdinaryDiffEqMutableCache
5657
end
5758

lib/OrdinaryDiffEqCore/src/initialize_dae.jl

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -121,20 +121,23 @@ function default_nlsolve(
121121
end
122122

123123
function default_nlsolve(
124-
::Nothing, isinplace::Val{false}, u::Nothing, ::NonlinearProblem, autodiff = false)
125-
nothing
124+
::Nothing, isinplace::Val{false}, u::Nothing, ::NonlinearProblem, autodiff = false)
125+
nothing
126126
end
127127

128128
function default_nlsolve(
129-
::Nothing, isinplace::Val{false}, u::Nothing, ::NonlinearLeastSquaresProblem, autodiff = false)
130-
nothing
129+
::Nothing, isinplace::Val{false}, u::Nothing,
130+
::NonlinearLeastSquaresProblem, autodiff = false)
131+
nothing
131132
end
132133

133-
function OrdinaryDiffEqCore.default_nlsolve(::Nothing, isinplace, u, ::NonlinearProblem, autodiff = false)
134+
function OrdinaryDiffEqCore.default_nlsolve(
135+
::Nothing, isinplace, u, ::NonlinearProblem, autodiff = false)
134136
error("This ODE requires a DAE initialization and thus a nonlinear solve but no nonlinear solve has been loaded. To solve this problem, do `using OrdinaryDiffEqNonlinearSolve` or pass a custom `nlsolve` choice into the `initializealg`.")
135137
end
136138

137-
function OrdinaryDiffEqCore.default_nlsolve(::Nothing, isinplace, u, ::NonlinearLeastSquaresProblem, autodiff = false)
139+
function OrdinaryDiffEqCore.default_nlsolve(
140+
::Nothing, isinplace, u, ::NonlinearLeastSquaresProblem, autodiff = false)
138141
error("This ODE requires a DAE initialization and thus a nonlinear solve but no nonlinear solve has been loaded. To solve this problem, do `using OrdinaryDiffEqNonlinearSolve` or pass a custom `nlsolve` choice into the `initializealg`.")
139142
end
140143

@@ -179,12 +182,13 @@ end
179182

180183
## CheckInit
181184
struct CheckInitFailureError <: Exception
182-
normresid
183-
abstol
185+
normresid::Any
186+
abstol::Any
184187
end
185188

186189
function Base.showerror(io::IO, e::CheckInitFailureError)
187-
print(io, "CheckInit specified but initialization not satisifed. normresid = $(e.normresid) > abstol = $(e.abstol)")
190+
print(io,
191+
"CheckInit specified but initialization not satisifed. normresid = $(e.normresid) > abstol = $(e.abstol)")
188192
end
189193

190194
function _initialize_dae!(integrator, prob::ODEProblem, alg::CheckInit,
@@ -202,7 +206,7 @@ function _initialize_dae!(integrator, prob::ODEProblem, alg::CheckInit,
202206
tmp .= ArrayInterface.restructure(tmp, algebraic_eqs .* _vec(tmp))
203207

204208
normresid = integrator.opts.internalnorm(tmp, t)
205-
if normresid > integrator.opts.abstol
209+
if normresid > integrator.opts.abstol
206210
throw(CheckInitFailureError(normresid, integrator.opts.abstol))
207211
end
208212
end
@@ -221,7 +225,7 @@ function _initialize_dae!(integrator, prob::ODEProblem, alg::CheckInit,
221225
resid = _vec(du)[algebraic_eqs]
222226

223227
normresid = integrator.opts.internalnorm(resid, t)
224-
if normresid > integrator.opts.abstol
228+
if normresid > integrator.opts.abstol
225229
throw(CheckInitFailureError(normresid, integrator.opts.abstol))
226230
end
227231
end
@@ -234,7 +238,7 @@ function _initialize_dae!(integrator, prob::DAEProblem,
234238

235239
f(resid, integrator.du, u0, p, t)
236240
normresid = integrator.opts.internalnorm(resid, t)
237-
if normresid > integrator.opts.abstol
241+
if normresid > integrator.opts.abstol
238242
throw(CheckInitFailureError(normresid, integrator.opts.abstol))
239243
end
240244
end
@@ -252,7 +256,7 @@ function _initialize_dae!(integrator, prob::DAEProblem,
252256

253257
resid = f(integrator.du, u0, p, t)
254258
normresid = integrator.opts.internalnorm(resid, t)
255-
if normresid > integrator.opts.abstol
259+
if normresid > integrator.opts.abstol
256260
throw(CheckInitFailureError(normresid, integrator.opts.abstol))
257261
end
258-
end
262+
end

lib/OrdinaryDiffEqCore/src/integrators/integrator_interface.jl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,10 @@ end
3838
function DiffEqBase.reeval_internals_due_to_modification!(
3939
integrator::ODEIntegrator, continuous_modification = true;
4040
callback_initializealg = nothing)
41-
4241
if integrator.isdae
43-
DiffEqBase.initialize_dae!(integrator, isnothing(callback_initializealg) ? integrator.initializealg : callback_initializealg)
42+
DiffEqBase.initialize_dae!(integrator,
43+
isnothing(callback_initializealg) ? integrator.initializealg :
44+
callback_initializealg)
4445
update_uprev!(integrator)
4546
end
4647

lib/OrdinaryDiffEqCore/src/interp_func.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,8 @@ end
7676

7777
function strip_cache(cache)
7878
if hasfield(typeof(cache), :jac_config) || hasfield(typeof(cache), :grad_config) ||
79-
hasfield(typeof(cache), :nlsolver) || hasfield(typeof(cache), :tf) || hasfield(typeof(cache), :uf)
79+
hasfield(typeof(cache), :nlsolver) || hasfield(typeof(cache), :tf) ||
80+
hasfield(typeof(cache), :uf)
8081
fieldnums = length(fieldnames(typeof(cache)))
8182
noth_list = fill(nothing, fieldnums)
8283
cache_type_name = Base.typename(typeof(cache)).wrapper

lib/OrdinaryDiffEqDefault/test/default_solver_tests.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using OrdinaryDiffEqDefault, OrdinaryDiffEqTsit5, OrdinaryDiffEqVerner, OrdinaryDiffEqRosenbrock, OrdinaryDiffEqBDF
1+
using OrdinaryDiffEqDefault, OrdinaryDiffEqTsit5, OrdinaryDiffEqVerner,
2+
OrdinaryDiffEqRosenbrock, OrdinaryDiffEqBDF
23
using Test, LinearSolve, LinearAlgebra, SparseArrays, StaticArrays
34

45
f_2dlinear = (du, u, p, t) -> (@. du = p * u)

lib/OrdinaryDiffEqDifferentiation/src/alg_utils.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,4 +76,4 @@ end
7676
@generated function pick_static_chunksize(::Val{chunksize}) where {chunksize}
7777
x = ForwardDiff.pickchunksize(chunksize)
7878
:(Val{$x}())
79-
end
79+
end

lib/OrdinaryDiffEqDifferentiation/src/derivative_utils.jl

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ struct StaticWOperator{isinv, T, F} <: AbstractSciMLOperator{T}
1212
# doing to how StaticArrays and StaticArraysCore are split up
1313
StaticArrays.LU(LowerTriangular(W), UpperTriangular(W), SVector{n}(1:n))
1414
else
15-
lu(W, check=false)
15+
lu(W, check = false)
1616
end
1717
# when constructing W for the first time for the type
1818
# inv(W) can be singular
@@ -938,28 +938,28 @@ function LinearSolve.init_cacheval(
938938
end
939939

940940
for alg in [LinearSolve.AppleAccelerateLUFactorization,
941-
LinearSolve.BunchKaufmanFactorization,
942-
LinearSolve.CHOLMODFactorization,
943-
LinearSolve.CholeskyFactorization,
944-
LinearSolve.CudaOffloadFactorization,
945-
LinearSolve.DiagonalFactorization,
946-
LinearSolve.FastLUFactorization,
947-
LinearSolve.FastQRFactorization,
948-
LinearSolve.GenericFactorization,
949-
LinearSolve.GenericLUFactorization,
950-
LinearSolve.KLUFactorization,
951-
LinearSolve.LDLtFactorization,
952-
LinearSolve.LUFactorization,
953-
LinearSolve.MKLLUFactorization,
954-
LinearSolve.MetalLUFactorization,
955-
LinearSolve.NormalBunchKaufmanFactorization,
956-
LinearSolve.NormalCholeskyFactorization,
957-
LinearSolve.QRFactorization,
958-
LinearSolve.RFLUFactorization,
959-
LinearSolve.SVDFactorization,
960-
LinearSolve.SimpleLUFactorization,
961-
LinearSolve.SparspakFactorization,
962-
LinearSolve.UMFPACKFactorization]
941+
LinearSolve.BunchKaufmanFactorization,
942+
LinearSolve.CHOLMODFactorization,
943+
LinearSolve.CholeskyFactorization,
944+
LinearSolve.CudaOffloadFactorization,
945+
LinearSolve.DiagonalFactorization,
946+
LinearSolve.FastLUFactorization,
947+
LinearSolve.FastQRFactorization,
948+
LinearSolve.GenericFactorization,
949+
LinearSolve.GenericLUFactorization,
950+
LinearSolve.KLUFactorization,
951+
LinearSolve.LDLtFactorization,
952+
LinearSolve.LUFactorization,
953+
LinearSolve.MKLLUFactorization,
954+
LinearSolve.MetalLUFactorization,
955+
LinearSolve.NormalBunchKaufmanFactorization,
956+
LinearSolve.NormalCholeskyFactorization,
957+
LinearSolve.QRFactorization,
958+
LinearSolve.RFLUFactorization,
959+
LinearSolve.SVDFactorization,
960+
LinearSolve.SimpleLUFactorization,
961+
LinearSolve.SparspakFactorization,
962+
LinearSolve.UMFPACKFactorization]
963963
@eval function LinearSolve.init_cacheval(alg::$alg, A::WOperator, b, u, Pl, Pr,
964964
maxiters::Int, abstol, reltol, verbose::Bool,
965965
assumptions::OperatorAssumptions)
@@ -1003,4 +1003,4 @@ function resize_J_W!(cache, integrator, i)
10031003
end
10041004

10051005
nothing
1006-
end
1006+
end

0 commit comments

Comments
 (0)