Skip to content

refactor: update to MTKv10 #141

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

Merged
merged 1 commit into from
May 29, 2025
Merged

refactor: update to MTKv10 #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 lib/ODEProblemLibrary/Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ RuntimeGeneratedFunctions = "7e49a35a-f44a-4d26-94aa-eba1b4ca6b47"
Aqua = "0.5"
DiffEqBase = "6"
Latexify = "0.16"
ModelingToolkit = "9"
ModelingToolkit = "9, 10"
RuntimeGeneratedFunctions = "0.5"
julia = "1.10"

Expand Down
7 changes: 7 additions & 0 deletions lib/ODEProblemLibrary/src/ODEProblemLibrary.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,13 @@ export prob_ode_linear, prob_ode_bigfloatlinear, prob_ode_2Dlinear,
prob_ode_chen, prob_ode_rossler, prob_ode_rabinovich_fabrikant, prob_ode_sprott,
prob_ode_hindmarsh_rose

# For MTKv9 compatibility
@static if !isdefined(ModelingToolkit, :mtkcompile)
function mtkcompile(args...; kwargs...)
structural_simplify(args...; kwargs...)
end
end

include("ode_linear_prob.jl")
include("ode_simple_nonlinear_prob.jl")
include("brusselator_prob.jl")
Expand Down
32 changes: 16 additions & 16 deletions lib/ODEProblemLibrary/src/ode_simple_nonlinear_prob.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ prob_ode_fitzhughnagumo = ODEProblem(fitz, [1.0; 1.0], (0.0, 1.0),

eqs = [D(y) ~ μ * ((1 - x^2) * y - x),
D(x) ~ y]
van = ODESystem(eqs, t; name = :van_der_pol) |> structural_simplify |> complete
van = System(eqs, t; name = :van_der_pol) |> mtkcompile

"""
Van der Pol Equations
Expand All @@ -70,7 +70,7 @@ with ``μ=1.0`` and ``u_0=[x => \\sqrt{3}, y => 0]``

Non-stiff parameters.
"""
prob_ode_vanderpol = ODEProblem(van, [y => 0, x => sqrt(3)], (0.0, 1.0), [μ => 1.0], jac=true, eval_module = @__MODULE__)
prob_ode_vanderpol = ODEProblem(van, [y => 0, x => sqrt(3), μ => 1.0], (0.0, 1.0), jac=true, eval_module = @__MODULE__)

"""
Van der Pol Equations
Expand All @@ -86,7 +86,7 @@ with ``μ=10^6`` and ``u_0=[x => \\sqrt{3}, y => 0]``

Stiff parameters.
"""
prob_ode_vanderpol_stiff = ODEProblem(van, [y => 0, x => sqrt(3)], (0.0, 1.0), [μ => 1e6], jac=true, eval_module = @__MODULE__)
prob_ode_vanderpol_stiff = ODEProblem(van, [y => 0, x => sqrt(3), μ => 1e6], (0.0, 1.0), jac=true, eval_module = @__MODULE__)

# ROBER
@parameters k₁ k₂ k₃
Expand All @@ -95,7 +95,7 @@ prob_ode_vanderpol_stiff = ODEProblem(van, [y => 0, x => sqrt(3)], (0.0, 1.0), [
eqs = [D(y₁) ~ -k₁ * y₁ + k₃ * y₂ * y₃,
D(y₂) ~ k₁ * y₁ - k₂ * y₂^2 - k₃ * y₂ * y₃,
D(y₃) ~ k₂ * y₂^2]
rober = ODESystem(eqs, t; name = :rober) |> structural_simplify |> complete
rober = System(eqs, t; name = :rober) |> mtkcompile

"""
The Robertson biochemical reactions: (Stiff)
Expand All @@ -116,7 +116,7 @@ Hairer Norsett Wanner Solving Ordinary Differential Equations I - Nonstiff Probl

Usually solved on ``[0,1e11]``
"""
prob_ode_rober = ODEProblem(rober, [y₁, y₂, y₃] .=> [1.0; 0.0; 0.0], (0.0, 1e11), [k₁, k₂, k₃] .=> (0.04, 3e7, 1e4), jac = true, eval_module = @__MODULE__)
prob_ode_rober = ODEProblem(rober, [[y₁, y₂, y₃] .=> [1.0; 0.0; 0.0]; [k₁, k₂, k₃] .=> (0.04, 3e7, 1e4)], (0.0, 1e11), jac = true, eval_module = @__MODULE__)

# Three Body
const threebody_μ = big(0.012277471);
Expand Down Expand Up @@ -175,7 +175,7 @@ prob_ode_threebody = ODEProblem(threebody,
eqs = [D(y₁) ~ I₁ * y₂ * y₃,
D(y₂) ~ I₂ * y₁ * y₃,
D(y₃) ~ I₃ * y₁ * y₂]
rigid = ODESystem(eqs, t; name = :rigid_body) |> structural_simplify |> complete
rigid = System(eqs, t; name = :rigid_body) |> mtkcompile

"""
Rigid Body Equations (Non-stiff)
Expand All @@ -200,9 +200,8 @@ or Hairer Norsett Wanner Solving Ordinary Differential Equations I - Nonstiff Pr

Usually solved from 0 to 20.
"""
prob_ode_rigidbody = ODEProblem(rigid, [y₁, y₂, y₃] .=> [1.0, 0.0, 0.9], (0.0, 20.0),
[I₁, I₂, I₃] .=> (-2.0, 1.25, -0.5), jac = true,
eval_module = @__MODULE__)
prob_ode_rigidbody = ODEProblem(rigid, [[y₁, y₂, y₃] .=> [1.0, 0.0, 0.9]; [I₁, I₂, I₃] .=> (-2.0, 1.25, -0.5)], (0.0, 20.0),
jac = true, eval_module = @__MODULE__)

# Pleiades Problem

Expand Down Expand Up @@ -359,12 +358,16 @@ eqs = [D(y1) ~ -p1 * y1 + p2 * y2 + p3 * y3 + p4,
p2 * y6 + p11 * y7,
D(y7) ~ p10 * y6 * y8 - p12 * y7,
D(y8) ~ -p10 * y6 * y8 + p12 * y7]
hires = ODESystem(eqs, t; name = :hires) |> structural_simplify |> complete
hires = System(eqs, t; name = :hires) |> mtkcompile

u0 = zeros(8)
u0[1] = 1
u0[8] = 0.0057

u0 = [y1, y2, y3, y4, y5, y6, y7, y8] .=> u0
p = [p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12] .=> (1.71, 0.43, 8.32, 0.0007, 8.75,
10.03, 0.035, 1.12, 1.745, 280.0, 0.69, 1.81)

"""
Hires Problem (Stiff)

Expand All @@ -387,18 +390,15 @@ where ``f`` is defined by
Reference: [demohires.pdf](http://www.radford.edu/~thompson/vodef90web/problems/demosnodislin/Demos_Pitagora/DemoHires/demohires.pdf)
Notebook: [Hires.ipynb](http://nbviewer.jupyter.org/github/JuliaDiffEq/DiffEqBenchmarks.jl/blob/master/StiffODE/Hires.ipynb)
"""
prob_ode_hires = ODEProblem(hires, [y1, y2, y3, y4, y5, y6, y7, y8] .=> u0, (0.0, 321.8122),
[p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12] .=> (1.71, 0.43, 8.32, 0.0007, 8.75,
10.03, 0.035, 1.12, 1.745, 280.0,
0.69, 1.81), jac = true, eval_module = @__MODULE__)
prob_ode_hires = ODEProblem(hires, [u0; p], (0.0, 321.8122), jac = true, eval_module = @__MODULE__)

@parameters p1 p2 p3
@variables y1(t) y2(t) y3(t)

eqs = [D(y1) ~ p1 * (y2 + y1 * (1 - p2 * y1 - y2)),
D(y2) ~ (y3 - (1 + y1) * y2) / p1,
D(y3) ~ p3 * (y1 - y3)]
orego = ODESystem(eqs, t; name = :orego) |> structural_simplify |> complete
orego = System(eqs, t; name = :orego) |> mtkcompile

"""
Orego Problem (Stiff)
Expand All @@ -418,4 +418,4 @@ where ``s=77.27``, ``w=0.161`` and ``q=8.375⋅10^{-6}``.
Reference: [demoorego.pdf](http://www.radford.edu/~thompson/vodef90web/problems/demosnodislin/Demos_Pitagora/DemoOrego/demoorego.pdf)
Notebook: [Orego.ipynb](http://nbviewer.jupyter.org/github/JuliaDiffEq/DiffEqBenchmarks.jl/blob/master/StiffODE/Orego.ipynb)
"""
prob_ode_orego = ODEProblem(orego, [y1, y2, y3] .=> [1.0, 2.0, 3.0], (0.0, 30.0), [p1, p2, p3] .=> [77.27, 8.375e-6, 0.161], jac = true, eval_module = @__MODULE__)
prob_ode_orego = ODEProblem(orego, [[y1, y2, y3] .=> [1.0, 2.0, 3.0]; [p1, p2, p3] .=> [77.27, 8.375e-6, 0.161]], (0.0, 30.0), jac = true, eval_module = @__MODULE__)
18 changes: 9 additions & 9 deletions lib/ODEProblemLibrary/src/strange_attractors.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ eqs = [D(x) ~ sin(y) - b * x,
D(y) ~ sin(z) - b * y,
D(z) ~ sin(x) - b * z]

@mtkbuild thomas = ODESystem(eqs, t)
@mtkbuild thomas = System(eqs, t)

"""
Thomas' cyclically symmetric attractor equations
Expand All @@ -33,7 +33,7 @@ eqs = [D(x) ~ σ * (y - x),
D(y) ~ x * (ρ - z) - y,
D(z) ~ x * y - β * z]

@mtkbuild lorenz = ODESystem(eqs, t)
@mtkbuild lorenz = System(eqs, t)

"""
Lorenz equations
Expand All @@ -56,7 +56,7 @@ eqs = [D(x) ~ (z - b) * x - d * y,
D(y) ~ d * x + (z - b) * y,
D(z) ~ c + a * z - z^3 / 3 - (x^2 + y^2) * (1 + e * z) + f * z * x^3]

@mtkbuild aizawa = ODESystem(eqs, t)
@mtkbuild aizawa = System(eqs, t)

"""
Aizawa equations
Expand All @@ -78,7 +78,7 @@ eqs = [D(x) ~ y - a * x + b * y * z,
D(y) ~ c * y - x * z + z,
D(z) ~ d * x * y - e * z]

@mtkbuild dadras = ODESystem(eqs, t)
@mtkbuild dadras = System(eqs, t)

"""
Dadras equations
Expand All @@ -100,7 +100,7 @@ eqs = [D(x) ~ a * (y - x),
D(y) ~ (c - a) * x - x * z + c * y,
D(z) ~ x * y - b * z]

@mtkbuild chen = ODESystem(eqs, t)
@mtkbuild chen = System(eqs, t)

"""
chen equations
Expand All @@ -122,7 +122,7 @@ eqs = [D(x) ~ -(y + z),
D(y) ~ x + a * y,
D(z) ~ b + z * (x - c)]

@mtkbuild rossler = ODESystem(eqs, t)
@mtkbuild rossler = System(eqs, t)

"""
rossler equations
Expand All @@ -145,7 +145,7 @@ eqs = [D(x) ~ y * (z - 1 + x^2) + b * x,
D(y) ~ x * (3 * z + 1 - x^2) + b * y,
D(z) ~ -2 * z * (a + x * y)]

@mtkbuild rabinovich_fabrikant = ODESystem(eqs, t)
@mtkbuild rabinovich_fabrikant = System(eqs, t)

"""
rabinovich_fabrikant equations
Expand All @@ -167,7 +167,7 @@ eqs = [D(x) ~ y + a * x * y + x * z,
D(y) ~ 1 - b * x^2 + y * z,
D(z) ~ x - x^2 - y^2]

@mtkbuild sprott = ODESystem(eqs, t)
@mtkbuild sprott = System(eqs, t)

"""
sprott equations
Expand All @@ -189,7 +189,7 @@ eqs = [D(x) ~ y - a * x^3 + b * x^2 - z + i,
D(y) ~ c - d * x^2 - y,
D(z) ~ r * (s * (x - xr) - z)]

@mtkbuild hindmarsh_rose = ODESystem(eqs, t)
@mtkbuild hindmarsh_rose = System(eqs, t)

"""
hindmarsh_rose equations
Expand Down
Loading