diff --git a/Project.toml b/Project.toml index a829e4e5..0c671f1a 100644 --- a/Project.toml +++ b/Project.toml @@ -15,21 +15,26 @@ Symbolics = "0c5d862f-8b57-4792-8d23-62f2024744c7" [compat] ADTypes = "1" Aqua = "0.8" -ChainRulesCore = "1.24" +ChainRulesCore = "1" ControlSystemsBase = "1.4" DataFrames = "1.7" DataInterpolations = "8" -DiffEqBase = "6.189.1" +DiffEqBase = "6.189.1, 7" ForwardDiff = "0.10, 1" IfElse = "0.1" LinearAlgebra = "1.10" ModelingToolkit = "11" ModelingToolkitBase = "1" -OrdinaryDiffEq = "6.87" -OrdinaryDiffEqDefault = "1.1" +OrdinaryDiffEq = "6, 7" +OrdinaryDiffEqBDF = "1, 2" +OrdinaryDiffEqDefault = "1, 2" +OrdinaryDiffEqNonlinearSolve = "1, 2" +OrdinaryDiffEqRosenbrock = "1, 2" +OrdinaryDiffEqSDIRK = "1, 2" PreallocationTools = "0.4.27, 1" SafeTestsets = "0.1" SciCompDSL = "1" +SciMLBase = "2, 3" SciMLStructures = "1.7.0" SymbolicIndexingInterface = "0.3.39" Symbolics = "7.4.1" @@ -46,12 +51,17 @@ ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210" LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" ModelingToolkit = "961ee093-0014-501f-94e3-6117800e7a78" OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed" +OrdinaryDiffEqBDF = "6ad6398a-0878-4a85-9266-38940aa047c8" OrdinaryDiffEqDefault = "50262376-6c5a-4cf5-baba-aaf4f84d72d7" +OrdinaryDiffEqNonlinearSolve = "127b3ac7-2247-4354-8eb6-78cf4e7c58e8" +OrdinaryDiffEqRosenbrock = "43230ef6-c299-4910-a778-202eb28ce4ce" +OrdinaryDiffEqSDIRK = "2d112036-d095-4a1e-ab9a-08536f3ecdbf" SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f" SciCompDSL = "91a8cdf1-4ca6-467b-a780-87fda3fff15e" +SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462" SciMLStructures = "53ae85a6-f571-4167-b2af-e1d143709226" SymbolicIndexingInterface = "2efcf032-c050-4f8e-a9bb-153293bab1f5" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [targets] -test = ["ADTypes", "Aqua", "LinearAlgebra", "OrdinaryDiffEqDefault", "OrdinaryDiffEq", "SafeTestsets", "Test", "ControlSystemsBase", "DataFrames", "DataInterpolations", "SciMLStructures", "SymbolicIndexingInterface", "ForwardDiff", "SciCompDSL", "ModelingToolkit"] +test = ["ADTypes", "Aqua", "LinearAlgebra", "OrdinaryDiffEqBDF", "OrdinaryDiffEqDefault", "OrdinaryDiffEq", "OrdinaryDiffEqNonlinearSolve", "OrdinaryDiffEqRosenbrock", "OrdinaryDiffEqSDIRK", "SafeTestsets", "Test", "ControlSystemsBase", "DataFrames", "DataInterpolations", "SciMLBase", "SciMLStructures", "SymbolicIndexingInterface", "ForwardDiff", "SciCompDSL", "ModelingToolkit"] diff --git a/docs/Project.toml b/docs/Project.toml index e176c2e6..cc92abd3 100644 --- a/docs/Project.toml +++ b/docs/Project.toml @@ -15,6 +15,6 @@ DataFrames = "1.7" DataInterpolations = "6.4, 7, 8" Documenter = "1" IfElse = "0.1" -ModelingToolkit = "10" -OrdinaryDiffEq = "6.31" +ModelingToolkit = "11" +OrdinaryDiffEq = "6, 7" Plots = "1.36" diff --git a/test/Blocks/continuous.jl b/test/Blocks/continuous.jl index b6121e08..40c1289d 100644 --- a/test/Blocks/continuous.jl +++ b/test/Blocks/continuous.jl @@ -3,6 +3,7 @@ using SciCompDSL using ModelingToolkitStandardLibrary.Blocks using ModelingToolkit: t_nounits as t using OrdinaryDiffEq: ReturnCode.Success +using OrdinaryDiffEqRosenbrock: Rodas4 using Test #= diff --git a/test/Blocks/math.jl b/test/Blocks/math.jl index e8e03224..aa799adb 100644 --- a/test/Blocks/math.jl +++ b/test/Blocks/math.jl @@ -4,6 +4,7 @@ using ModelingToolkit, OrdinaryDiffEq, Test using ModelingToolkitStandardLibrary.Blocks: _clamp, _dead_zone using ModelingToolkit: inputs, unbound_inputs, bound_inputs, t_nounits as t using OrdinaryDiffEq: ReturnCode.Success +using OrdinaryDiffEqRosenbrock: Rodas4 @testset "Gain" begin @named c = Constant(; k = 1) diff --git a/test/Blocks/nonlinear.jl b/test/Blocks/nonlinear.jl index 2a65d472..1545aba9 100644 --- a/test/Blocks/nonlinear.jl +++ b/test/Blocks/nonlinear.jl @@ -1,9 +1,11 @@ using ModelingToolkit, OrdinaryDiffEq using SciCompDSL +using SciMLBase using ModelingToolkitStandardLibrary.Blocks using ModelingToolkit: t_nounits as t using ModelingToolkitStandardLibrary.Blocks: _dead_zone using OrdinaryDiffEq: ReturnCode.Success +using OrdinaryDiffEqRosenbrock: Rodas4 @testset "Limiter" begin @testset "Constant" begin diff --git a/test/Blocks/sources.jl b/test/Blocks/sources.jl index f2120b75..31efad4d 100644 --- a/test/Blocks/sources.jl +++ b/test/Blocks/sources.jl @@ -1,11 +1,13 @@ using ModelingToolkit, ModelingToolkitStandardLibrary, OrdinaryDiffEq using SciCompDSL +using SciMLBase using ModelingToolkitStandardLibrary.Blocks using ModelingToolkit: t_nounits as t, D_nounits as D using ModelingToolkitStandardLibrary.Blocks: smooth_sin, smooth_cos, smooth_damped_sin, smooth_square, smooth_step, smooth_ramp, smooth_triangular, triangular, square using OrdinaryDiffEq: ReturnCode.Success +using OrdinaryDiffEqRosenbrock: Rodas4 using DataInterpolations using DataFrames using SymbolicIndexingInterface diff --git a/test/Blocks/test_analysis_points.jl b/test/Blocks/test_analysis_points.jl index 025f8c77..34bf8fbb 100644 --- a/test/Blocks/test_analysis_points.jl +++ b/test/Blocks/test_analysis_points.jl @@ -3,6 +3,7 @@ using SciCompDSL using ModelingToolkit using ModelingToolkitStandardLibrary.Blocks using OrdinaryDiffEq +using OrdinaryDiffEqRosenbrock: Rodas5 using ModelingToolkit: t_nounits as t using ControlSystemsBase diff --git a/test/Electrical/analog.jl b/test/Electrical/analog.jl index e3cf741a..66f7e321 100644 --- a/test/Electrical/analog.jl +++ b/test/Electrical/analog.jl @@ -1,5 +1,6 @@ using ModelingToolkitStandardLibrary.Electrical, ModelingToolkit, OrdinaryDiffEq, Test using SciCompDSL +using SciMLBase using ModelingToolkit: t_nounits as t, D_nounits as D using ModelingToolkitStandardLibrary.Blocks: Step, Constant, Sine, Cosine, ExpSine, Ramp, @@ -7,6 +8,7 @@ using ModelingToolkitStandardLibrary.Blocks: Step, using ModelingToolkitStandardLibrary.Blocks: square, triangular using ModelingToolkitStandardLibrary.Thermal: FixedTemperature using OrdinaryDiffEq: ReturnCode.Success +using OrdinaryDiffEqRosenbrock: Rodas4 # using Plots diff --git a/test/Hydraulic/isothermal_compressible.jl b/test/Hydraulic/isothermal_compressible.jl index c19da7c9..28515e6a 100644 --- a/test/Hydraulic/isothermal_compressible.jl +++ b/test/Hydraulic/isothermal_compressible.jl @@ -1,5 +1,6 @@ using ModelingToolkit, OrdinaryDiffEq, Test using SciCompDSL +using OrdinaryDiffEqNonlinearSolve: NLNewton using ModelingToolkit: t_nounits as t, D_nounits as D import ModelingToolkitStandardLibrary.Hydraulic.IsothermalCompressible as IC import ModelingToolkitStandardLibrary.Blocks as B diff --git a/test/Magnetic/magnetic.jl b/test/Magnetic/magnetic.jl index 334e1b69..17b396f0 100644 --- a/test/Magnetic/magnetic.jl +++ b/test/Magnetic/magnetic.jl @@ -1,5 +1,6 @@ using ModelingToolkitStandardLibrary.Magnetic, ModelingToolkit, OrdinaryDiffEq, Test using SciCompDSL +using SciMLBase import ModelingToolkitStandardLibrary.Electrical import ModelingToolkitStandardLibrary.Blocks @@ -7,6 +8,7 @@ import ModelingToolkitStandardLibrary.Magnetic using ModelingToolkit, OrdinaryDiffEq, Test using ModelingToolkit: t_nounits as t using OrdinaryDiffEq: ReturnCode.Success +using OrdinaryDiffEqRosenbrock: Rodas4 # using Plots @testset "Inductor" begin diff --git a/test/Mechanical/rotational.jl b/test/Mechanical/rotational.jl index 8b020595..c4d530c6 100644 --- a/test/Mechanical/rotational.jl +++ b/test/Mechanical/rotational.jl @@ -2,9 +2,12 @@ using ModelingToolkitStandardLibrary.Mechanical.Rotational, ModelingToolkit, OrdinaryDiffEq, Test using SciCompDSL +using SciMLBase using ModelingToolkit: t_nounits as t, D_nounits as D import ModelingToolkitStandardLibrary.Blocks using OrdinaryDiffEq: ReturnCode.Success +using OrdinaryDiffEqRosenbrock: Rodas4 +using OrdinaryDiffEqBDF: DFBDF # using Plots diff --git a/test/Mechanical/translational.jl b/test/Mechanical/translational.jl index 79426f20..1eb08543 100644 --- a/test/Mechanical/translational.jl +++ b/test/Mechanical/translational.jl @@ -1,6 +1,7 @@ using ModelingToolkit, OrdinaryDiffEq, Test using SciCompDSL using ModelingToolkit: t_nounits as t, D_nounits as D +using OrdinaryDiffEqRosenbrock: Rodas4 using ModelingToolkitStandardLibrary.Blocks import ModelingToolkitStandardLibrary.Mechanical.Translational as TV diff --git a/test/Mechanical/translational_modelica.jl b/test/Mechanical/translational_modelica.jl index 8f40d143..12539cc9 100644 --- a/test/Mechanical/translational_modelica.jl +++ b/test/Mechanical/translational_modelica.jl @@ -1,6 +1,8 @@ using ModelingToolkit, OrdinaryDiffEq, Test using SciCompDSL using ModelingToolkit: t_nounits as t, D_nounits as D +using OrdinaryDiffEqRosenbrock: Rodas4 +using OrdinaryDiffEqSDIRK: ImplicitMidpoint using ModelingToolkitStandardLibrary.Blocks: Sine using ModelingToolkitStandardLibrary.Mechanical.TranslationalModelica: Damper, Spring, Mass, diff --git a/test/Thermal/demo.jl b/test/Thermal/demo.jl index aee58e13..7c510896 100644 --- a/test/Thermal/demo.jl +++ b/test/Thermal/demo.jl @@ -1,5 +1,6 @@ using ModelingToolkitStandardLibrary.Thermal, ModelingToolkit, OrdinaryDiffEq, Test using SciCompDSL +using SciMLBase using ModelingToolkit: t_nounits as t, D_nounits as D using OrdinaryDiffEq: ReturnCode.Success diff --git a/test/Thermal/motor.jl b/test/Thermal/motor.jl index bdad6072..d991f66a 100644 --- a/test/Thermal/motor.jl +++ b/test/Thermal/motor.jl @@ -1,5 +1,6 @@ using ModelingToolkit, Test using SciCompDSL +using SciMLBase using ModelingToolkitStandardLibrary.Thermal using ModelingToolkitStandardLibrary.Blocks diff --git a/test/Thermal/piston.jl b/test/Thermal/piston.jl index 739717b8..a6bd0985 100644 --- a/test/Thermal/piston.jl +++ b/test/Thermal/piston.jl @@ -1,5 +1,6 @@ using ModelingToolkit, Test using SciCompDSL +using SciMLBase using ModelingToolkitStandardLibrary.Thermal using ModelingToolkitStandardLibrary.Blocks diff --git a/test/Thermal/thermal.jl b/test/Thermal/thermal.jl index d878ba71..fbba97fa 100644 --- a/test/Thermal/thermal.jl +++ b/test/Thermal/thermal.jl @@ -1,8 +1,10 @@ using ModelingToolkitStandardLibrary.Thermal, ModelingToolkit, OrdinaryDiffEq, Test using SciCompDSL +using SciMLBase using ModelingToolkit: t_nounits as t, D_nounits as D using ModelingToolkitStandardLibrary.Blocks: Constant, Step using OrdinaryDiffEq: ReturnCode.Success +using OrdinaryDiffEqRosenbrock: Rodas4 # Test HeatCapacitor, TemperatureSensor, RelativeTemperatureSensor, FixedTemperature @testset "Heat systems" begin diff --git a/test/chua_circuit.jl b/test/chua_circuit.jl index cf9f2089..30bc77b7 100644 --- a/test/chua_circuit.jl +++ b/test/chua_circuit.jl @@ -5,6 +5,7 @@ using ModelingToolkitStandardLibrary.Electrical using ModelingToolkitStandardLibrary.Electrical: OnePort using OrdinaryDiffEq using OrdinaryDiffEq: ReturnCode.Success +using OrdinaryDiffEqRosenbrock: Rodas4 using IfElse: ifelse @testset "Chua Circuit" begin diff --git a/test/multi_domain.jl b/test/multi_domain.jl index 0958a744..4b34fabf 100644 --- a/test/multi_domain.jl +++ b/test/multi_domain.jl @@ -7,6 +7,8 @@ import ModelingToolkitStandardLibrary using ModelingToolkit, OrdinaryDiffEq, Test using ModelingToolkit: t_nounits as t, D_nounits as D using OrdinaryDiffEq: ReturnCode.Success +using OrdinaryDiffEqRosenbrock: Rodas4 +using OrdinaryDiffEqBDF: DFBDF # using Plots @testset "DC motor" begin