ODE -> ODETsit5

Author: baggepinnen

Project.toml

@@ -8,16 +8,15 @@ DiffEqCallbacks = "459566f4-90b8-5000-8ac3-15dfb0a30def"
 JuliaSimCompiler = "8391cb6b-4921-5777-4e45-fd9aab8cb88d"
 ModelingToolkit = "961ee093-0014-501f-94e3-6117800e7a78"
 ModelingToolkitStandardLibrary = "16a59e39-deab-5bd0-87e4-056b12336739"
-OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"
+OrdinaryDiffEqTsit5 = "b1df2697-797e-41e3-8120-5422d3b24e4a"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 StableRNGs = "860ef19b-820b-49d6-a774-d7a799459cd3"
 
 [compat]
 DiffEqCallbacks = "~3.8"
-JuliaSimCompiler = "0.1.19"
 ModelingToolkit = "9"
 ModelingToolkitStandardLibrary = "2"
-OrdinaryDiffEq = "6.89"
+OrdinaryDiffEqTsit5 = "1.1.0"
 Random = "1"
 StableRNGs = "1"
 julia = "1.10"

docs/src/examples/dc_motor_pi.md

@@ -20,7 +20,7 @@ using ModelingToolkit: t_nounits as t
 using ModelingToolkitStandardLibrary.Electrical
 using ModelingToolkitStandardLibrary.Mechanical.Rotational
 using ModelingToolkitStandardLibrary.Blocks
-using OrdinaryDiffEq
+using OrdinaryDiffEqTsit5
 using Plots
 
 R = 0.5 # [Ohm] armature resistance

docs/src/examples/onoffcontroller.md

@@ -7,7 +7,7 @@ where ``τ = 100`` is a time constant. The controller ``u = f(x)`` is an on/off
 
 
 ```@example ONOFF
-using ModelingToolkit, ModelingToolkitSampledData, OrdinaryDiffEq, Plots
+using ModelingToolkit, ModelingToolkitSampledData, OrdinaryDiffEqTsit5, Plots
 using ModelingToolkit: t_nounits as t, D_nounits as D
 using ModelingToolkitStandardLibrary.Blocks
 using JuliaSimCompiler

docs/src/examples/sliding_mode_control.md

@@ -10,7 +10,7 @@ ė = -e
 which yields the switching variable ``s = ė + e``, encoded in the function ``s = σ(x, t)``
 
 ```@example ONOFF
-using ModelingToolkit, ModelingToolkitSampledData, OrdinaryDiffEq, Plots
+using ModelingToolkit, ModelingToolkitSampledData, OrdinaryDiffEqTsit5, Plots
 using ModelingToolkit: t_nounits as t, D_nounits as D
 using ModelingToolkitStandardLibrary.Blocks
 using JuliaSimCompiler
@@ -42,7 +42,7 @@ end
     end
     @parameters begin
         k = 1,    [description = "Control gain"]
-        k2 = 1.1, [description = "Tuning parameter, often set to 1.1"]
+        k2 = 0.5, [description = "Tuning parameter"]
     end
     @variables begin
         s(t) = 0.0, [description = "Sliding surface"]
@@ -85,7 +85,8 @@ prob = ODEProblem(ssys, [m.plant.x => -1, m.plant.xd => 0, m.controller.x(z-1) =
 sol = solve(prob, Tsit5(), dtmax=0.01)
 figy = plot(sol, idxs=[m.plant.x])
 plot!(sol.t, qr.(sol.t), label="Reference")
-figu = plot(sol, idxs=[m.zoh.y, m.disturbance], label=["Control signal" "Disturbance"])
+figu = plot(sol, idxs=m.controller.y, label="Control signal")
+plot!(sol, idxs=m.disturbance, label="Disturbance")
 plot(figy, figu, layout=(2,1))
 ```
 

test/test_discrete_blocks.jl

@@ -1,8 +1,8 @@
 using ModelingToolkitSampledData
-using ModelingToolkit, ModelingToolkitStandardLibrary, OrdinaryDiffEq
+using ModelingToolkit, ModelingToolkitStandardLibrary, OrdinaryDiffEqTsit5
 using ModelingToolkitStandardLibrary.Blocks
 using ModelingToolkit: t_nounits as t, D_nounits as D
-using OrdinaryDiffEq: ReturnCode.Success
+using OrdinaryDiffEqTsit5: ReturnCode.Success
 using JuliaSimCompiler
 using Test
 Difference = ModelingToolkitSampledData.Difference
@@ -56,7 +56,7 @@ end
     sys = structural_simplify(IRSystem(model))
     prob = ODEProblem(sys, Pair[int.x(k - 1) => 1
                                 int.u(k - 1) => 0], (0.0, 1.0))
-    sol = solve(prob, Rodas4())
+    sol = solve(prob, Tsit5())
     @test sol.retcode == Success
     @test_skip sol.prob.kwargs[:disc_saved_values][1].t ≈ 0:sampletime(clock):1
     @test sol[model.int.x] ≈ range(1.1, step = sampletime(clock), length = 11)
@@ -73,7 +73,7 @@ end
     sys = structural_simplify(IRSystem(model))
     prob = ODEProblem(sys, Pair[int.x(k - 1) => 1
                                 int.u(k - 1) => 0], (0.0, 1.0))
-    sol = solve(prob, Rodas4())
+    sol = solve(prob, Tsit5())
     @test sol.retcode == Success
     @test_skip sol.prob.kwargs[:disc_saved_values][1].t ≈ 0:sampletime(clock):1
     @test sol[model.int.x] ≈
@@ -91,7 +91,7 @@ end
     sys = structural_simplify(IRSystem(model))
     prob = ODEProblem(sys, Pair[int.x(k - 1) => 1
                                 int.u(k - 1) => 0], (0.0, 1.0))
-    sol = solve(prob, Rodas4())
+    sol = solve(prob, Tsit5())
     @test sol.retcode == Success
     @test_skip sol.prob.kwargs[:disc_saved_values][1].t ≈ 0:sampletime(clock):1
     @test sol[model.int.x] ≈