Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix eigen_est for in place explicit solvers with Complex u0 #2262

Merged
merged 5 commits into from
Jun 27, 2024
Merged

fix eigen_est for in place explicit solvers with Complex u0 #2262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
546d686
use norm(x,Inf) rather than maximum(x) to deal with Complex arrays
oscardssmith Jun 26, 2024
c3dafcb
add tests
oscardssmith Jun 26, 2024
0bb0e6c
typo
oscardssmith Jun 26, 2024
38cff65
fix tests
oscardssmith Jun 27, 2024
62c5a7f
fix test
oscardssmith Jun 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/perform_step/explicit_rk_perform_step.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ end
if integrator.alg isa CompositeAlgorithm
# Hairer II, page 22 modified to use Inf norm
@.. broadcast=false utilde=abs((kk[end] - kk[end - 1]) / (u - tmp))
integrator.eigen_est = integrator.opts.internalnorm(maximum(utilde), t)
integrator.eigen_est = integrator.opts.internalnorm(norm(utilde, Inf), t)
end

if integrator.opts.adaptive
Expand Down
4 changes: 2 additions & 2 deletions src/perform_step/low_order_rk_perform_step.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -838,7 +838,7 @@ end
g6 = tmp
# Hairer II, page 22 modified to use Inf norm
@.. broadcast=false thread=thread utilde=abs((k7 - k6) / (g7 - g6))
integrator.eigen_est = integrator.opts.internalnorm(maximum(utilde), t)
integrator.eigen_est = integrator.opts.internalnorm(norm(utilde, Inf), t)
end
if integrator.opts.adaptive
@.. broadcast=false thread=thread utilde=dt * (btilde1 * k1 + btilde2 * k2 +
Expand Down Expand Up @@ -956,7 +956,7 @@ end
g7 = u
# Hairer II, page 22 modified to use Inf norm
@.. broadcast=false thread=thread utilde=abs((k7 - k6) / (g7 - g6))
integrator.eigen_est = integrator.opts.internalnorm(maximum(utilde) * oneunit(t), t)
integrator.eigen_est = integrator.opts.internalnorm(norm(utilde, Inf) * oneunit(t), t)
end
if integrator.opts.adaptive
@.. broadcast=false thread=thread utilde=dt * (btilde1 * k1 + btilde3 * k3 +
Expand Down
8 changes: 4 additions & 4 deletions src/perform_step/verner_rk_perform_step.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ end
g9 = u
g8 = tmp
@.. broadcast=false thread=thread rtmp=abs((k9 - k8) / (g9 - g8))
integrator.eigen_est = integrator.opts.internalnorm(maximum(rtmp), t)
integrator.eigen_est = integrator.opts.internalnorm(norm(rtmp, Inf), t)
end
if integrator.opts.adaptive
@.. broadcast=false thread=thread utilde=dt * (btilde1 * k1 + btilde4 * k4 +
Expand Down Expand Up @@ -411,7 +411,7 @@ end
g10 = u
g9 = tmp
@.. broadcast=false thread=thread rtmp=abs((k10 - k9) / (g10 - g9))
integrator.eigen_est = integrator.opts.internalnorm(maximum(rtmp), t)
integrator.eigen_est = integrator.opts.internalnorm(norm(rtmp, Inf), t)
end
if integrator.opts.adaptive
@.. broadcast=false thread=thread utilde=dt * (btilde1 * k1 + btilde4 * k4 +
Expand Down Expand Up @@ -731,7 +731,7 @@ end
g13 = u
g12 = tmp
@.. broadcast=false thread=thread rtmp=abs((k13 - k12) / (g13 - g12))
integrator.eigen_est = integrator.opts.internalnorm(maximum(rtmp), t)
integrator.eigen_est = integrator.opts.internalnorm(norm(rtmp, Inf), t)
end
@.. broadcast=false thread=thread u=uprev +
dt *
Expand Down Expand Up @@ -1136,7 +1136,7 @@ end
g16 = u
g15 = tmp
@.. broadcast=false thread=thread rtmp=abs((k16 - k15) / (g16 - g15))
integrator.eigen_est = integrator.opts.internalnorm(maximum(rtmp), t)
integrator.eigen_est = integrator.opts.internalnorm(norm(rtmp, Inf), t)
end
@.. broadcast=false thread=thread u=uprev +
dt *
Expand Down
4 changes: 4 additions & 0 deletions test/interface/composite_algorithm_test.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,7 @@ sol = solve(prob, alg = AutoVern7(Rodas5()))
sol = solve(prob,
alg = OrdinaryDiffEq.AutoAlgSwitch(ExplicitRK(constructVerner7()), Rodas5()))
@test sol.t[end] == 1000.0

prob = remake(prob_ode_2Dlinear, u0=rand(ComplexF64, 2, 2))
sol = solve(prob, AutoTsit5(Rosenbrock23(autodiff=false))) # Complex and AD don't mix
@test sol.retcode == ReturnCode.Success
Loading