From 7d21fd5a67e334e7b2b53d87d53738baa3beceff Mon Sep 17 00:00:00 2001 From: David Widmann Date: Wed, 27 Sep 2023 15:04:44 +0200 Subject: [PATCH] Fix warnings due to name conflicts with OrdinaryDiffEq --- Project.toml | 2 +- src/ModelingToolkit.jl | 1 + src/systems/abstractsystem.jl | 3 +-- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Project.toml b/Project.toml index 58d73f2921..470adc92b6 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "ModelingToolkit" uuid = "961ee093-0014-501f-94e3-6117800e7a78" authors = ["Yingbo Ma ", "Chris Rackauckas 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 index 91a07a4dfb..d5c4172340 100644 --- 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 index 48d647f621..1e4531a33b 100644 --- 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