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.

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

Rebase Relaxation-Controller #2452

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
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
Prev Previous commit
fix tests
oscardssmith committed Sep 3, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 49c80575975a60f6b32116f285ee4d5c3a415022
2 changes: 1 addition & 1 deletion lib/OrdinaryDiffEqCore/src/integrators/controllers.jl
Original file line number Diff line number Diff line change
@@ -441,7 +441,7 @@ Controller to perform a relaxation on a step of a Runge-Kuttas method.
mutable struct RelaxationController{CON, T} <: AbstractController
controller::CON
gamma::T
function RelaxationController(controller::AbstractController, T)
function RelaxationController(controller::AbstractController, T=Float64)
new{typeof(controller), T}(controller, one(T))
end
end
18 changes: 9 additions & 9 deletions test/relaxation/harmonic_oscillator.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using OrdinaryDiffEq, DiffEqDevTools, LinearAlgebra
using OrdinaryDiffEq, DiffEqDevTools, LinearAlgebra, Test

printstyled("Harmonic Oscillator\n"; bold = true)
@testset "Harmonic oscillator" begin

dts = (1 / 2) .^ (6:-1:4)

@@ -10,14 +10,14 @@ prob = ODEProblem(
[1.0, 0.0],
(0.0, 1.0))

invariant(x) = norm(x)

# Convergence with the old method Tsit5()
sim = test_convergence(dts, prob, Tsit5(), adaptive = true)
println("order of convergence of Tsit5 without relaxation : "*string(sim.𝒪est[:final]))
@test sim.𝒪est[:final] ≈ 5 atol=0.2

# Convergence with relaxation with FSAL-R, i.e f(uᵧ,ₙ₊₁) ≈ f(uᵧ,ₙ) + γ ( f(uₙ₊₁) - f(uᵧ,ₙ))
r = Relaxation(invariant)
sim_relax = test_convergence(dts, prob, Tsit5(); relaxation = r, adaptive = true)
println("order with relaxation with FSAL-R modification: "*string(sim_relax.𝒪est[:final]))
# Convergence with relaxation with FSAL-R, i.e f(uᵧ,ₙ₊₁) ≈ f(uᵧ,ₙ) + γ ( f(uₙ₊₁) - f(uᵧ,ₙ))
relaxation = Relaxation(norm)
controller = RelaxationController(NonAdaptiveController())
sim_relax = test_convergence(dts, prob, Tsit5(); relaxation, controller)
@test sim_relax.𝒪est[:final] ≈ 5 atol=0.2

end
18 changes: 10 additions & 8 deletions test/relaxation/non_linear_oscillator.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using OrdinaryDiffEq, DiffEqDevTools
using OrdinaryDiffEq, DiffEqDevTools, LinearAlgebra, Test

printstyled("Non linear harmonic oscillator\n"; bold = true)
@testset "Non linear harmonic oscillator" begin

dts = (1 / 2) .^ (6:-1:4)

@@ -10,13 +10,15 @@ prob = ODEProblem(
[1.0, 0.0],
(0.0, 1.0))

invariant(x) = norm(x)

# Convergence with the method Tsit5()
sim = test_convergence(dts, prob, Tsit5())
println("order of convergence of older perform_step! : "*string(sim.𝒪est[:final]))
@test sim.𝒪est[:final] ≈ 5.4 atol=0.2

# Convergence with relaxation with FSAL-R, i.e f(uᵧ,ₙ₊₁) ≈ f(uᵧ,ₙ) + γ ( f(uₙ₊₁) - f(uᵧ,ₙ))
r = Relaxation(invariant)
sim = test_convergence(dts, prob, Tsit5(); relaxation = r)
println("order with relaxation with FSAL-R modification: "*string(sim.𝒪est[:final]))
# Convergence with relaxation with FSAL-R, i.e f(uᵧ,ₙ₊₁) ≈ f(uᵧ,ₙ) + γ ( f(uₙ₊₁) - f(uᵧ,ₙ))
relaxation = Relaxation(norm)
controller = RelaxationController(NonAdaptiveController())
sim_relax = test_convergence(dts, prob, Tsit5(); relaxation, controller, adaptive=true)
@test sim.𝒪est[:final] ≈ 5.4 atol=0.2

end
25 changes: 13 additions & 12 deletions test/relaxation/time_dependant_harmonic_oscillator.jl
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
using OrdinaryDiffEq, DiffEqDevTools
using OrdinaryDiffEq, DiffEqDevTools, LinearAlgebra, Test

printstyled("Time-dependent harmonic oscillator\n"; bold = true)

@testset "Time-dependent harmonic oscillator" begin

dts = (1 / 2) .^ (6:-1:4)

f = (u, p, t) -> [-(1+0.5 * sin(t))*u[2], (1+0.5 * sin(t))*u[1]]
prob = ODEProblem(
ODEFunction(f;
analytic = (u0, p, t)->[cos(0.5)*cos(t-0.5*cos(t))-sin(0.5)*sin(t-0.5*cos(t)),
ODEFunction(f;
analytic = (u0, p, t)->[cos(0.5)*cos(t-0.5*cos(t))-sin(0.5)*sin(t-0.5*cos(t)),
sin(0.5)*cos(t-0.5*cos(t))+cos(0.5)*sin(t-0.5*cos(t))]),
[1.0, 0.0],
(0.0, 1.0))

invariant(x) = norm(x)

# Convergence with the method Tsit5()
sim = test_convergence(dts, prob, Tsit5(), adaptative = true)
println("order of convergence of older perform_step! : "*string(sim.𝒪est[:final]))
sim = test_convergence(dts, prob, Tsit5())
@test sim.𝒪est[:final] ≈ 5.2 atol=0.2

# Convergence with relaxation with FSAL-R, i.e f(uᵧ,ₙ₊₁) ≈ f(uᵧ,ₙ) + γ ( f(uₙ₊₁) - f(uᵧ,ₙ))
r = Relaxation(invariant)
sim = test_convergence(dts, prob, Tsit5(); relaxation = r, adaptative = true)
println("order with relaxation with FSAL-R modification: "*string(sim.𝒪est[:final]))
# Convergence with relaxation with FSAL-R, i.e f(uᵧ,ₙ₊₁) ≈ f(uᵧ,ₙ) + γ ( f(uₙ₊₁) - f(uᵧ,ₙ))
relaxation = Relaxation(norm)
controller = RelaxationController(NonAdaptiveController())
sim_relax = test_convergence(dts, prob, Tsit5(); relaxation, controller, adaptive=true)
@test sim.𝒪est[:final] ≈ 5.2 atol=0.2
end