Skip to content

Commit 1c22f35

Browse files
Merge branch 'SciML:master' into dg/nonlinear
2 parents 3838187 + be10c6f commit 1c22f35

20 files changed

+119
-581
lines changed

.github/workflows/Downstream.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,13 @@ jobs:
3535
- {user: SciML, repo: StochasticDiffEq.jl, group: AlgConvergence}
3636
- {user: SciML, repo: Sundials.jl, group: All}
3737
- {user: SciML, repo: LinearSolve.jl, group: All}
38-
- {user: SciML, repo: NonlinearSolve.jl, group: All}
38+
- {user: SciML, repo: NonlinearSolve.jl, group: Core}
3939
- {user: SciML, repo: Optimization.jl, group: All}
4040
- {user: SciML, repo: Integrals.jl, group: All}
4141
- {user: SciML, repo: BoundaryValueDiffEq.jl, group: All}
4242
- {user: SciML, repo: ModelingToolkit.jl, group: All}
4343
- {user: SciML, repo: ModelingToolkitStandardLibrary.jl, group: Core}
4444
- {user: SciML, repo: StochasticDelayDiffEq.jl, group: All}
45-
- {user: SciML, repo: SimpleNonlinearSolve.jl, group: All}
4645
- {user: SciML, repo: SimpleDiffEq.jl, group: All}
4746
- {user: SciML, repo: SciMLSensitivity.jl, group: Core1}
4847
- {user: SciML, repo: SciMLSensitivity.jl, group: Core2}

Project.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "SciMLBase"
22
uuid = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
33
authors = ["Chris Rackauckas <[email protected]> and contributors"]
4-
version = "2.75.1"
4+
version = "2.79.0"
55

66
[deps]
77
ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b"
@@ -85,7 +85,7 @@ RecipesBase = "1.3.4"
8585
RecursiveArrayTools = "3.27.2"
8686
Reexport = "1"
8787
RuntimeGeneratedFunctions = "0.5.12"
88-
SciMLOperators = "0.3.7"
88+
SciMLOperators = "0.3.13"
8989
SciMLStructures = "1.1"
9090
StableRNGs = "1.0"
9191
StaticArrays = "1.7"

src/SciMLBase.jl

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -575,21 +575,6 @@ $(TYPEDEF)
575575
abstract type AbstractSensitivitySolution{T, N, S} <: AbstractTimeseriesSolution{T, N, S} end
576576

577577
# Misc
578-
# TODO - deprecate AbstractDiffEqOperator family
579-
"""
580-
$(TYPEDEF)
581-
"""
582-
abstract type AbstractDiffEqOperator{T} <: AbstractSciMLOperator{T} end
583-
584-
"""
585-
$(TYPEDEF)
586-
"""
587-
abstract type AbstractDiffEqLinearOperator{T} <: AbstractDiffEqOperator{T} end
588-
589-
"""
590-
$(TYPEDEF)
591-
"""
592-
abstract type AbstractDiffEqCompositeOperator{T} <: AbstractDiffEqLinearOperator{T} end
593578

594579
"""
595580
$(TYPEDEF)
@@ -720,10 +705,6 @@ $(TYPEDEF)
720705
abstract type AbstractParameterizedFunction{iip} <: AbstractODEFunction{iip} end
721706

722707
include("retcodes.jl")
723-
include("operators/operators.jl")
724-
include("operators/basic_operators.jl")
725-
include("operators/diffeq_operator.jl")
726-
include("operators/common_defaults.jl")
727708
include("symbolic_utils.jl")
728709
include("performance_warnings.jl")
729710

@@ -853,10 +834,6 @@ export EnsembleAnalysis, EnsembleSummary
853834

854835
export tuples, intervals, TimeChoiceIterator
855836

856-
export AffineDiffEqOperator, DiffEqScaledOperator
857-
858-
export DiffEqScalar, DiffEqArrayOperator, DiffEqIdentity
859-
860837
export step!, deleteat!, addat!, get_tmp_cache,
861838
full_cache, user_cache, u_cache, du_cache,
862839
rand_cache, ratenoise_cache,

src/initialization.jl

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -216,8 +216,10 @@ Keyword arguments:
216216
If the former is `nothing`, this keyword argument will be used. If it is also not provided,
217217
an error will be thrown.
218218
219+
All additional keyword arguments are forwarded to `solve`.
220+
219221
In case the initialization problem is trivial, `nlsolve_alg`, `abstol` and `reltol` are
220-
not required.
222+
not required. `solve` is also not called.
221223
"""
222224
function get_initial_values(prob, valp, f, alg::OverrideInit,
223225
iip::Union{Val{true}, Val{false}}; nlsolve_alg = nothing, abstol = nothing, reltol = nothing, kwargs...)
@@ -257,7 +259,7 @@ function get_initial_values(prob, valp, f, alg::OverrideInit,
257259
else
258260
throw(OverrideInitNoTolerance(:reltol))
259261
end
260-
nlsol = solve(initprob, nlsolve_alg; abstol = _abstol, reltol = _reltol)
262+
nlsol = solve(initprob, nlsolve_alg; abstol = _abstol, reltol = _reltol, kwargs...)
261263
success = SciMLBase.successful_retcode(nlsol)
262264
end
263265

@@ -304,7 +306,8 @@ function initialization_status(prob::AbstractSciMLProblem)
304306
iprob = prob.f.initialization_data.initializeprob
305307
isnothing(prob) && return nothing
306308

307-
nunknowns = iprob.u0 === nothing ? 0 : length(iprob.u0)
309+
iu0 = state_values(iprob)
310+
nunknowns = iu0 === nothing ? 0 : length(iu0)
308311
neqs = if __has_resid_prototype(iprob.f) && iprob.f.resid_prototype !== nothing
309312
length(iprob.f.resid_prototype)
310313
else

src/operators/basic_operators.jl

Lines changed: 0 additions & 206 deletions
This file was deleted.

0 commit comments

Comments
 (0)