Skip to content

Commit 0ba696d

Browse files
Merge branch 'master' into head
2 parents 6774e5d + 84ef783 commit 0ba696d

39 files changed

+75679
-31
lines changed

src/OrdinaryDiffEq.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ export FunctionMap, Euler, Heun, Ralston, Midpoint, RK4, ExplicitRK, OwrenZen3,
428428
FRK65, PFRK87,
429429
RKM, MSRK5, MSRK6, Stepanov5, SIR54, QPRK98, PSRK4p7q6, PSRK3p6q5, PSRK3p5q4
430430

431-
export RadauIIA3, RadauIIA5, RadauIIA7
431+
export RadauIIA3, RadauIIA5, RadauIIA9
432432

433433
export MagnusMidpoint, LinearExponential, MagnusLeapfrog, LieEuler, CayleyEuler,
434434
MagnusGauss4, MagnusNC6, MagnusGL6, MagnusGL8, MagnusNC8, MagnusGL4,

src/alg_utils.jl

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ qmin_default(alg::DP8) = 1 // 3
175175
qmax_default(alg::Union{OrdinaryDiffEqAlgorithm, DAEAlgorithm}) = 10
176176
qmax_default(alg::CompositeAlgorithm) = minimum(qmax_default.(alg.algs))
177177
qmax_default(alg::DP8) = 6
178-
qmax_default(alg::Union{RadauIIA3, RadauIIA5, RadauIIA7}) = 8
178+
qmax_default(alg::Union{RadauIIA3, RadauIIA5, RadauIIA9}) = 8
179179

180180
function has_chunksize(alg::OrdinaryDiffEqAlgorithm)
181181
return alg isa Union{OrdinaryDiffEqExponentialAlgorithm,
@@ -430,7 +430,8 @@ alg_order(alg::TanYam7) = 7
430430
alg_order(alg::TsitPap8) = 8
431431
alg_order(alg::RadauIIA3) = 3
432432
alg_order(alg::RadauIIA5) = 5
433-
alg_order(alg::RadauIIA7) = 7
433+
alg_order(alg::RadauIIA9) = 9
434+
alg_order(alg::ImplicitEuler) = 1
434435
alg_order(alg::RKMK2) = 2
435436
alg_order(alg::RKMK4) = 4
436437
alg_order(alg::LieRK4) = 4
@@ -530,6 +531,7 @@ alg_adaptive_order(alg::Rosenbrock32) = 2
530531

531532
alg_adaptive_order(alg::RadauIIA3) = 1
532533
alg_adaptive_order(alg::RadauIIA5) = 3
534+
alg_adaptive_order(alg::RadauIIA9) = 7
533535

534536
# this is actually incorrect and is purposefully decreased as this tends
535537
# to track the real error much better

src/algorithms.jl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -673,10 +673,10 @@ year={1999},
673673
publisher={Elsevier}
674674
}
675675
676-
RadauIIA7: Fully-Implicit Runge-Kutta Method
676+
RadauII97: Fully-Implicit Runge-Kutta Method
677677
An A-B-L stable fully implicit Runge-Kutta method with internal tableau complex basis transform for efficiency.
678678
"""
679-
struct RadauIIA7{CS, AD, F, P, FDT, ST, CJ, Tol, C1, C2, StepLimiter} <:
679+
struct RadauIIA9{CS, AD, F, P, FDT, ST, CJ, Tol, C1, C2, StepLimiter} <:
680680
OrdinaryDiffEqNewtonAdaptiveAlgorithm{CS, AD, FDT, ST, CJ}
681681
linsolve::F
682682
precs::P
@@ -690,15 +690,15 @@ struct RadauIIA7{CS, AD, F, P, FDT, ST, CJ, Tol, C1, C2, StepLimiter} <:
690690
step_limiter!::StepLimiter
691691
end
692692

693-
function RadauIIA7(; chunk_size = Val{0}(), autodiff = Val{true}(),
693+
function RadauIIA9(; chunk_size = Val{0}(), autodiff = Val{true}(),
694694
standardtag = Val{true}(), concrete_jac = nothing,
695695
diff_type = Val{:forward},
696696
linsolve = nothing, precs = DEFAULT_PRECS,
697697
extrapolant = :dense, fast_convergence_cutoff = 1 // 5,
698698
new_W_γdt_cutoff = 1 // 5,
699699
controller = :Predictive, κ = nothing, maxiters = 10, smooth_est = true,
700700
step_limiter! = trivial_limiter!)
701-
RadauIIA7{_unwrap_val(chunk_size), _unwrap_val(autodiff), typeof(linsolve),
701+
RadauIIA9{_unwrap_val(chunk_size), _unwrap_val(autodiff), typeof(linsolve),
702702
typeof(precs), diff_type, _unwrap_val(standardtag), _unwrap_val(concrete_jac),
703703
typeof(κ), typeof(fast_convergence_cutoff),
704704
typeof(new_W_γdt_cutoff), typeof(step_limiter!)}(linsolve,
@@ -712,7 +712,7 @@ function RadauIIA7(; chunk_size = Val{0}(), autodiff = Val{true}(),
712712
controller,
713713
step_limiter!)
714714
end
715-
TruncatedStacktraces.@truncate_stacktrace RadauIIA7
715+
TruncatedStacktraces.@truncate_stacktrace RadauIIA9
716716

717717
################################################################################
718718

0 commit comments

Comments
 (0)