Skip to content

Commit afba3fe

Browse files
Merge pull request #445 from ChrisRackauckas-Claude/bump-ordinarydiffeq-v7-ecosystem
Bump compat for OrdinaryDiffEq v7 / SciMLBase v3 ecosystem
2 parents f2f5faf + 83697ae commit afba3fe

19 files changed

Lines changed: 43 additions & 7 deletions

Project.toml

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,26 @@ Symbolics = "0c5d862f-8b57-4792-8d23-62f2024744c7"
1515
[compat]
1616
ADTypes = "1"
1717
Aqua = "0.8"
18-
ChainRulesCore = "1.24"
18+
ChainRulesCore = "1"
1919
ControlSystemsBase = "1.4"
2020
DataFrames = "1.7"
2121
DataInterpolations = "8"
22-
DiffEqBase = "6.189.1"
22+
DiffEqBase = "6.189.1, 7"
2323
ForwardDiff = "0.10, 1"
2424
IfElse = "0.1"
2525
LinearAlgebra = "1.10"
2626
ModelingToolkit = "11"
2727
ModelingToolkitBase = "1"
28-
OrdinaryDiffEq = "6.87"
29-
OrdinaryDiffEqDefault = "1.1"
28+
OrdinaryDiffEq = "6, 7"
29+
OrdinaryDiffEqBDF = "1, 2"
30+
OrdinaryDiffEqDefault = "1, 2"
31+
OrdinaryDiffEqNonlinearSolve = "1, 2"
32+
OrdinaryDiffEqRosenbrock = "1, 2"
33+
OrdinaryDiffEqSDIRK = "1, 2"
3034
PreallocationTools = "0.4.27, 1"
3135
SafeTestsets = "0.1"
3236
SciCompDSL = "1"
37+
SciMLBase = "2, 3"
3338
SciMLStructures = "1.7.0"
3439
SymbolicIndexingInterface = "0.3.39"
3540
Symbolics = "7.4.1"
@@ -46,12 +51,17 @@ ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
4651
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
4752
ModelingToolkit = "961ee093-0014-501f-94e3-6117800e7a78"
4853
OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"
54+
OrdinaryDiffEqBDF = "6ad6398a-0878-4a85-9266-38940aa047c8"
4955
OrdinaryDiffEqDefault = "50262376-6c5a-4cf5-baba-aaf4f84d72d7"
56+
OrdinaryDiffEqNonlinearSolve = "127b3ac7-2247-4354-8eb6-78cf4e7c58e8"
57+
OrdinaryDiffEqRosenbrock = "43230ef6-c299-4910-a778-202eb28ce4ce"
58+
OrdinaryDiffEqSDIRK = "2d112036-d095-4a1e-ab9a-08536f3ecdbf"
5059
SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
5160
SciCompDSL = "91a8cdf1-4ca6-467b-a780-87fda3fff15e"
61+
SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
5262
SciMLStructures = "53ae85a6-f571-4167-b2af-e1d143709226"
5363
SymbolicIndexingInterface = "2efcf032-c050-4f8e-a9bb-153293bab1f5"
5464
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
5565

5666
[targets]
57-
test = ["ADTypes", "Aqua", "LinearAlgebra", "OrdinaryDiffEqDefault", "OrdinaryDiffEq", "SafeTestsets", "Test", "ControlSystemsBase", "DataFrames", "DataInterpolations", "SciMLStructures", "SymbolicIndexingInterface", "ForwardDiff", "SciCompDSL", "ModelingToolkit"]
67+
test = ["ADTypes", "Aqua", "LinearAlgebra", "OrdinaryDiffEqBDF", "OrdinaryDiffEqDefault", "OrdinaryDiffEq", "OrdinaryDiffEqNonlinearSolve", "OrdinaryDiffEqRosenbrock", "OrdinaryDiffEqSDIRK", "SafeTestsets", "Test", "ControlSystemsBase", "DataFrames", "DataInterpolations", "SciMLBase", "SciMLStructures", "SymbolicIndexingInterface", "ForwardDiff", "SciCompDSL", "ModelingToolkit"]

docs/Project.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ DataFrames = "1.7"
1515
DataInterpolations = "6.4, 7, 8"
1616
Documenter = "1"
1717
IfElse = "0.1"
18-
ModelingToolkit = "10"
19-
OrdinaryDiffEq = "6.31"
18+
ModelingToolkit = "11"
19+
OrdinaryDiffEq = "6, 7"
2020
Plots = "1.36"

test/Blocks/continuous.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ using SciCompDSL
33
using ModelingToolkitStandardLibrary.Blocks
44
using ModelingToolkit: t_nounits as t
55
using OrdinaryDiffEq: ReturnCode.Success
6+
using OrdinaryDiffEqRosenbrock: Rodas4
67
using Test
78

89
#=

test/Blocks/math.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ using ModelingToolkit, OrdinaryDiffEq, Test
44
using ModelingToolkitStandardLibrary.Blocks: _clamp, _dead_zone
55
using ModelingToolkit: inputs, unbound_inputs, bound_inputs, t_nounits as t
66
using OrdinaryDiffEq: ReturnCode.Success
7+
using OrdinaryDiffEqRosenbrock: Rodas4
78

89
@testset "Gain" begin
910
@named c = Constant(; k = 1)

test/Blocks/nonlinear.jl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
using ModelingToolkit, OrdinaryDiffEq
22
using SciCompDSL
3+
using SciMLBase
34
using ModelingToolkitStandardLibrary.Blocks
45
using ModelingToolkit: t_nounits as t
56
using ModelingToolkitStandardLibrary.Blocks: _dead_zone
67
using OrdinaryDiffEq: ReturnCode.Success
8+
using OrdinaryDiffEqRosenbrock: Rodas4
79

810
@testset "Limiter" begin
911
@testset "Constant" begin

test/Blocks/sources.jl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
using ModelingToolkit, ModelingToolkitStandardLibrary, OrdinaryDiffEq
22
using SciCompDSL
3+
using SciMLBase
34
using ModelingToolkitStandardLibrary.Blocks
45
using ModelingToolkit: t_nounits as t, D_nounits as D
56
using ModelingToolkitStandardLibrary.Blocks: smooth_sin, smooth_cos, smooth_damped_sin,
67
smooth_square, smooth_step, smooth_ramp,
78
smooth_triangular, triangular, square
89
using OrdinaryDiffEq: ReturnCode.Success
10+
using OrdinaryDiffEqRosenbrock: Rodas4
911
using DataInterpolations
1012
using DataFrames
1113
using SymbolicIndexingInterface

test/Blocks/test_analysis_points.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ using SciCompDSL
33
using ModelingToolkit
44
using ModelingToolkitStandardLibrary.Blocks
55
using OrdinaryDiffEq
6+
using OrdinaryDiffEqRosenbrock: Rodas5
67
using ModelingToolkit: t_nounits as t
78
using ControlSystemsBase
89

test/Electrical/analog.jl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
using ModelingToolkitStandardLibrary.Electrical, ModelingToolkit, OrdinaryDiffEq, Test
22
using SciCompDSL
3+
using SciMLBase
34
using ModelingToolkit: t_nounits as t, D_nounits as D
45
using ModelingToolkitStandardLibrary.Blocks: Step,
56
Constant, Sine, Cosine, ExpSine, Ramp,
67
Square, Triangular
78
using ModelingToolkitStandardLibrary.Blocks: square, triangular
89
using ModelingToolkitStandardLibrary.Thermal: FixedTemperature
910
using OrdinaryDiffEq: ReturnCode.Success
11+
using OrdinaryDiffEqRosenbrock: Rodas4
1012

1113
# using Plots
1214

test/Hydraulic/isothermal_compressible.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using ModelingToolkit, OrdinaryDiffEq, Test
22
using SciCompDSL
3+
using OrdinaryDiffEqNonlinearSolve: NLNewton
34
using ModelingToolkit: t_nounits as t, D_nounits as D
45
import ModelingToolkitStandardLibrary.Hydraulic.IsothermalCompressible as IC
56
import ModelingToolkitStandardLibrary.Blocks as B

test/Magnetic/magnetic.jl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
using ModelingToolkitStandardLibrary.Magnetic, ModelingToolkit, OrdinaryDiffEq, Test
22
using SciCompDSL
3+
using SciMLBase
34

45
import ModelingToolkitStandardLibrary.Electrical
56
import ModelingToolkitStandardLibrary.Blocks
67
import ModelingToolkitStandardLibrary.Magnetic
78
using ModelingToolkit, OrdinaryDiffEq, Test
89
using ModelingToolkit: t_nounits as t
910
using OrdinaryDiffEq: ReturnCode.Success
11+
using OrdinaryDiffEqRosenbrock: Rodas4
1012
# using Plots
1113

1214
@testset "Inductor" begin

0 commit comments

Comments
 (0)