diff --git a/Project.toml b/Project.toml index 79b499748c..cec19daa22 100644 --- a/Project.toml +++ b/Project.toml @@ -41,7 +41,6 @@ LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" MLStyle = "d8e11817-5142-5d16-987a-aa16d5891078" Moshi = "2e0e35c7-a2e4-4343-998d-7ef72827ed2d" NaNMath = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3" -NonlinearSolve = "8913a72c-1f9b-4ce2-8d82-65094dcecaec" OffsetArrays = "6fe1bfb0-de20-5000-8ca7-80f57d26f881" OrderedCollections = "bac558e1-5e72-5ebc-8fee-abe8a469f55d" OrdinaryDiffEqCore = "bbf590c4-e513-4bbe-9b18-05decba2e5d8" @@ -149,7 +148,7 @@ RecursiveArrayTools = "3.26" Reexport = "0.2, 1" RuntimeGeneratedFunctions = "0.5.9" SCCNonlinearSolve = "1.0.0" -SciMLBase = "2.104.0" +SciMLBase = "2.106.0" SciMLPublic = "1.0.0" SciMLStructures = "1.7" Serialization = "1" diff --git a/src/ModelingToolkit.jl b/src/ModelingToolkit.jl index 2c259058b0..1dbf9d37dd 100644 --- a/src/ModelingToolkit.jl +++ b/src/ModelingToolkit.jl @@ -52,7 +52,6 @@ import JuliaFormatter using MLStyle import Moshi using Moshi.Data: @data -using NonlinearSolve import SCCNonlinearSolve using ImplicitDiscreteSolve using Reexport diff --git a/src/linearization.jl b/src/linearization.jl index f2d73f6bee..5c0c174cdc 100644 --- a/src/linearization.jl +++ b/src/linearization.jl @@ -1,5 +1,5 @@ """ - lin_fun, simplified_sys = linearization_function(sys::AbstractSystem, inputs, outputs; simplify = false, initialize = true, initialization_solver_alg = TrustRegion(), kwargs...) + lin_fun, simplified_sys = linearization_function(sys::AbstractSystem, inputs, outputs; simplify = false, initialize = true, initialization_solver_alg = nothing, kwargs...) Return a function that linearizes the system `sys`. The function [`linearize`](@ref) provides a higher-level and easier to use interface. @@ -39,7 +39,7 @@ function linearization_function(sys::AbstractSystem, inputs, op = Dict(), p = DiffEqBase.NullParameters(), zero_dummy_der = false, - initialization_solver_alg = TrustRegion(), + initialization_solver_alg = nothing, autodiff = AutoForwardDiff(), eval_expression = false, eval_module = @__MODULE__, warn_initialize_determined = true, diff --git a/test/downstream/Project.toml b/test/downstream/Project.toml index f64ed17de6..735dc7424f 100644 --- a/test/downstream/Project.toml +++ b/test/downstream/Project.toml @@ -4,6 +4,7 @@ DataInterpolations = "82cc6244-b520-54b8-b5a6-8a565e85f1d0" LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" ModelingToolkit = "961ee093-0014-501f-94e3-6117800e7a78" ModelingToolkitStandardLibrary = "16a59e39-deab-5bd0-87e4-056b12336739" +NonlinearSolve = "8913a72c-1f9b-4ce2-8d82-65094dcecaec" OrdinaryDiffEqFIRK = "5960d6e9-dd7a-4743-88e7-cf307b64f125" OrdinaryDiffEqNonlinearSolve = "127b3ac7-2247-4354-8eb6-78cf4e7c58e8" OrdinaryDiffEqRosenbrock = "43230ef6-c299-4910-a778-202eb28ce4ce" diff --git a/test/downstream/linearization_dd.jl b/test/downstream/linearization_dd.jl index d42e642915..3c757a53dc 100644 --- a/test/downstream/linearization_dd.jl +++ b/test/downstream/linearization_dd.jl @@ -7,6 +7,7 @@ using ModelingToolkitStandardLibrary.Blocks using ModelingToolkitStandardLibrary.Mechanical.MultiBody2D using ModelingToolkitStandardLibrary.Mechanical.TranslationalPosition using Test +import NonlinearSolve using ControlSystemsMTK using ControlSystemsMTK.ControlSystemsBase: sminreal, minreal, poles diff --git a/test/downstream/test_disturbance_model.jl b/test/downstream/test_disturbance_model.jl index 642ff85f99..1eb4025dd6 100644 --- a/test/downstream/test_disturbance_model.jl +++ b/test/downstream/test_disturbance_model.jl @@ -6,6 +6,7 @@ analysis-point specific method for `generate_control_function`. using ModelingToolkit, OrdinaryDiffEqTsit5, LinearAlgebra, Test using ModelingToolkitStandardLibrary.Mechanical.Rotational using ModelingToolkitStandardLibrary.Blocks +import NonlinearSolve using ModelingToolkit: connect # using Plots