Skip to content

Commit 646bace

Browse files
Merge pull request #3851 from SciML/nonlinearsolve_default
Remove nonlinearsolve as a dep by just using the default nonlinearsolve
2 parents ea6c022 + 048f024 commit 646bace

File tree

6 files changed

+6
-5
lines changed

6 files changed

+6
-5
lines changed

Project.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
4141
MLStyle = "d8e11817-5142-5d16-987a-aa16d5891078"
4242
Moshi = "2e0e35c7-a2e4-4343-998d-7ef72827ed2d"
4343
NaNMath = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3"
44-
NonlinearSolve = "8913a72c-1f9b-4ce2-8d82-65094dcecaec"
4544
OffsetArrays = "6fe1bfb0-de20-5000-8ca7-80f57d26f881"
4645
OrderedCollections = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
4746
OrdinaryDiffEqCore = "bbf590c4-e513-4bbe-9b18-05decba2e5d8"
@@ -149,7 +148,7 @@ RecursiveArrayTools = "3.26"
149148
Reexport = "0.2, 1"
150149
RuntimeGeneratedFunctions = "0.5.9"
151150
SCCNonlinearSolve = "1.0.0"
152-
SciMLBase = "2.104.0"
151+
SciMLBase = "2.106.0"
153152
SciMLPublic = "1.0.0"
154153
SciMLStructures = "1.7"
155154
Serialization = "1"

src/ModelingToolkit.jl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ import JuliaFormatter
5252
using MLStyle
5353
import Moshi
5454
using Moshi.Data: @data
55-
using NonlinearSolve
5655
import SCCNonlinearSolve
5756
using ImplicitDiscreteSolve
5857
using Reexport

src/linearization.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"""
2-
lin_fun, simplified_sys = linearization_function(sys::AbstractSystem, inputs, outputs; simplify = false, initialize = true, initialization_solver_alg = TrustRegion(), kwargs...)
2+
lin_fun, simplified_sys = linearization_function(sys::AbstractSystem, inputs, outputs; simplify = false, initialize = true, initialization_solver_alg = nothing, kwargs...)
33
44
Return a function that linearizes the system `sys`. The function [`linearize`](@ref) provides a higher-level and easier to use interface.
55
@@ -39,7 +39,7 @@ function linearization_function(sys::AbstractSystem, inputs,
3939
op = Dict(),
4040
p = DiffEqBase.NullParameters(),
4141
zero_dummy_der = false,
42-
initialization_solver_alg = TrustRegion(),
42+
initialization_solver_alg = nothing,
4343
autodiff = AutoForwardDiff(),
4444
eval_expression = false, eval_module = @__MODULE__,
4545
warn_initialize_determined = true,

test/downstream/Project.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ DataInterpolations = "82cc6244-b520-54b8-b5a6-8a565e85f1d0"
44
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
55
ModelingToolkit = "961ee093-0014-501f-94e3-6117800e7a78"
66
ModelingToolkitStandardLibrary = "16a59e39-deab-5bd0-87e4-056b12336739"
7+
NonlinearSolve = "8913a72c-1f9b-4ce2-8d82-65094dcecaec"
78
OrdinaryDiffEqFIRK = "5960d6e9-dd7a-4743-88e7-cf307b64f125"
89
OrdinaryDiffEqNonlinearSolve = "127b3ac7-2247-4354-8eb6-78cf4e7c58e8"
910
OrdinaryDiffEqRosenbrock = "43230ef6-c299-4910-a778-202eb28ce4ce"

test/downstream/linearization_dd.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ using ModelingToolkitStandardLibrary.Blocks
77
using ModelingToolkitStandardLibrary.Mechanical.MultiBody2D
88
using ModelingToolkitStandardLibrary.Mechanical.TranslationalPosition
99
using Test
10+
import NonlinearSolve
1011

1112
using ControlSystemsMTK
1213
using ControlSystemsMTK.ControlSystemsBase: sminreal, minreal, poles

test/downstream/test_disturbance_model.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ analysis-point specific method for `generate_control_function`.
66
using ModelingToolkit, OrdinaryDiffEqTsit5, LinearAlgebra, Test
77
using ModelingToolkitStandardLibrary.Mechanical.Rotational
88
using ModelingToolkitStandardLibrary.Blocks
9+
import NonlinearSolve
910
using ModelingToolkit: connect
1011
# using Plots
1112

0 commit comments

Comments
 (0)