Merge pull request #2287 from SciML/dw/warnings

Fix warnings due to name conflicts with OrdinaryDiffEq
SciML · Sep 28, 2023 · 34d1853 · 34d1853 · devmotion · Sep 28, 2023
2 parents 984c262 + 7d21fd5
commit 34d1853
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "ModelingToolkit"
 uuid = "961ee093-0014-501f-94e3-6117800e7a78"
 authors = ["Yingbo Ma <[email protected]>", "Chris Rackauckas <[email protected]> and contributors"]
-version = "8.71.0"
+version = "8.71.1"
 
 [deps]
 AbstractTrees = "1520ce14-60c1-5f80-bbc7-55ef81b5835c"

diff --git a/src/ModelingToolkit.jl b/src/ModelingToolkit.jl
@@ -67,6 +67,7 @@ using PrecompileTools, Reexport
         substituter, scalarize, getparent
 
     import DiffEqBase: @add_kwonly
+    import OrdinaryDiffEq
 
     import Graphs: SimpleDiGraph, add_edge!, incidence_matrix
 

diff --git a/src/systems/abstractsystem.jl b/src/systems/abstractsystem.jl
@@ -1,4 +1,3 @@
-using OrdinaryDiffEq
 const SYSTEM_COUNT = Threads.Atomic{UInt}(0)
 
 get_component_type(x::AbstractSystem) = get_gui_metadata(x).type
@@ -1293,7 +1292,7 @@ function linearization_function(sys::AbstractSystem, inputs,
                     residual = fun(u, p, t)
                     if norm(residual[alge_idxs]) > √(eps(eltype(residual)))
                         prob = ODEProblem(fun, u, (t, t + 1), p)
-                        integ = init(prob, Rodas5P())
+                        integ = init(prob, OrdinaryDiffEq.Rodas5P())
                         u = integ.u
                     end
                 end