|
| 1 | +struct MER5v2{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAdaptiveAlgorithm |
| 2 | + stage_limiter!::StageLimiter |
| 3 | + step_limiter!::StepLimiter |
| 4 | + thread::Thread |
| 5 | +end |
| 6 | + |
| 7 | +function MER5v2(; stage_limiter! = trivial_limiter!, step_limiter! = trivial_limiter!, |
| 8 | + thread = False()) |
| 9 | + MER5v2{typeof(stage_limiter!), typeof(step_limiter!), typeof(thread)}(stage_limiter!, |
| 10 | + step_limiter!, |
| 11 | + thread) |
| 12 | +end |
| 13 | + |
| 14 | +# for backwards compatibility |
| 15 | +function MER5v2(stage_limiter!, step_limiter! = trivial_limiter!) |
| 16 | + MER5v2{typeof(stage_limiter!), typeof(step_limiter!), False}(stage_limiter!, |
| 17 | + step_limiter!, False()) |
| 18 | +end |
| 19 | + |
| 20 | +struct MER6v2{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAdaptiveAlgorithm |
| 21 | + stage_limiter!::StageLimiter |
| 22 | + step_limiter!::StepLimiter |
| 23 | + thread::Thread |
| 24 | +end |
| 25 | + |
| 26 | +function MER6v2(; stage_limiter! = trivial_limiter!, step_limiter! = trivial_limiter!, |
| 27 | + thread = False()) |
| 28 | + MER6v2{typeof(stage_limiter!), typeof(step_limiter!), typeof(thread)}(stage_limiter!, |
| 29 | + step_limiter!, |
| 30 | + thread) |
| 31 | +end |
| 32 | + |
| 33 | +# for backwards compatibility |
| 34 | +function MER6v2(stage_limiter!, step_limiter! = trivial_limiter!) |
| 35 | + MER6v2{typeof(stage_limiter!), typeof(step_limiter!), False}(stage_limiter!, |
| 36 | + step_limiter!, False()) |
| 37 | +end |
| 38 | + |
| 39 | +struct RK6v4{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAdaptiveAlgorithm |
| 40 | + stage_limiter!::StageLimiter |
| 41 | + step_limiter!::StepLimiter |
| 42 | + thread::Thread |
| 43 | +end |
| 44 | + |
| 45 | +function RK6v4(; stage_limiter! = trivial_limiter!, step_limiter! = trivial_limiter!, |
| 46 | + thread = False()) |
| 47 | + RK6v4{typeof(stage_limiter!), typeof(step_limiter!), typeof(thread)}(stage_limiter!, |
| 48 | + step_limiter!, |
| 49 | + thread) |
| 50 | +end |
| 51 | + |
| 52 | +# for backwards compatibility |
| 53 | +function RK6v4(stage_limiter!, step_limiter! = trivial_limiter!) |
| 54 | + RK6v4{typeof(stage_limiter!), typeof(step_limiter!), False}(stage_limiter!, |
| 55 | + step_limiter!, False()) |
| 56 | +end |
| 57 | + |
| 58 | +function Base.show(io::IO, alg::Union{MER5v2, MER6v2, RK6v4}) |
| 59 | + print(io, "$(nameof(typeof(alg)))(stage_limiter! = ", alg.stage_limiter!, |
| 60 | + ", step_limiter! = ", alg.step_limiter!, |
| 61 | + ", thread = ", alg.thread, ")") |
| 62 | +end |
| 63 | + |
| 64 | +OrdinaryDiffEqCore.alg_order(alg::MER5v2) = 5 |
| 65 | +OrdinaryDiffEqCore.alg_order(alg::MER6v2) = 6 |
| 66 | +OrdinaryDiffEqCore.alg_order(alg::RK6v4) = 6 |
0 commit comments