Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ CommonSolve = "0.2.4"
ConstructionBase = "1"
DataInterpolations = "7, 8"
DataStructures = "0.18, 0.19"
DelayDiffEq = "5.61"
DelayDiffEq = "5.61, 6"
DiffEqBase = "6.210.0, 7"
DifferentiationInterface = "0.6.47, 0.7"
DocStringExtensions = "0.8, 0.9"
Expand All @@ -95,12 +95,12 @@ Moshi = "0.3.6"
NonlinearSolve = "4.3"
OffsetArrays = "1"
OrderedCollections = "1"
OrdinaryDiffEq = "6.82.0"
OrdinaryDiffEqBDF = "1"
OrdinaryDiffEq = "6.82.0, 7"
OrdinaryDiffEqBDF = "1, 2"
OrdinaryDiffEqCore = "1.34.0, 2, 3, 4"
OrdinaryDiffEqDefault = "1.2"
OrdinaryDiffEqNonlinearSolve = "1.5.0"
OrdinaryDiffEqRosenbrock = "1"
OrdinaryDiffEqDefault = "1.2, 2"
OrdinaryDiffEqNonlinearSolve = "1.5.0, 2"
OrdinaryDiffEqRosenbrock = "1, 2"
PreallocationTools = "0.4.27, 1"
PrecompileTools = "1.2.1"
REPL = "1"
Expand All @@ -116,7 +116,7 @@ SparseArrays = "1"
StateSelection = "1.9.1"
StaticArrays = "1.9.14"
StochasticDelayDiffEq = "1.11"
StochasticDiffEq = "6.82.0"
StochasticDiffEq = "6.82.0, 7"
SymbolicIndexingInterface = "0.3.39"
SymbolicUtils = "4.13"
Symbolics = "7"
Expand Down
4 changes: 2 additions & 2 deletions docs/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,13 @@ NonlinearSolve = "4"
Optim = "1.9, 2"
Optimization = "5"
OptimizationOptimJL = "0.4"
OrdinaryDiffEq = "6.31"
OrdinaryDiffEq = "6.31, 7"
Plots = "1.36"
PreallocationTools = "0.4, 1"
SciCompDSL = "1"
SciMLStructures = "1.1"
Setfield = "1"
StochasticDiffEq = "6"
StochasticDiffEq = "6, 7"
SymbolicIndexingInterface = "0.3.1"
SymbolicUtils = "4"
Symbolics = "7"
12 changes: 6 additions & 6 deletions lib/ModelingToolkitBase/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ Compat = "3.42, 4"
ConstructionBase = "1"
DataInterpolations = "8.7"
DataStructures = "0.18, 0.19"
DelayDiffEq = "5.61"
DelayDiffEq = "5.61, 6"
DiffEqBase = "6.210.0, 7"
DiffEqCallbacks = "2.16, 3, 4"
DiffEqNoiseProcess = "5"
Expand All @@ -124,7 +124,7 @@ ForwardDiff = "0.10.3, 1"
FunctionWrappers = "1.1"
FunctionWrappersWrappers = "0.1, 1"
Graphs = "1.5.2"
ImplicitDiscreteSolve = "0.1.2, 1"
ImplicitDiscreteSolve = "0.1.2, 1, 2"
InfiniteOpt = "0.6"
InteractiveUtils = "1"
JuliaFormatter = "1.0.47, 2"
Expand All @@ -142,9 +142,9 @@ NaNMath = "0.3, 1"
NonlinearSolve = "4.3"
OffsetArrays = "1"
OrderedCollections = "1"
OrdinaryDiffEq = "6.82.0"
OrdinaryDiffEqDefault = "1.2"
OrdinaryDiffEqNonlinearSolve = "1.5.0"
OrdinaryDiffEq = "6.82.0, 7"
OrdinaryDiffEqDefault = "1.2, 2"
OrdinaryDiffEqNonlinearSolve = "1.5.0, 2"
PreallocationTools = "0.4.27, 1"
PrecompileTools = "1.2.1"
Pyomo = "0.1.0"
Expand All @@ -165,7 +165,7 @@ SparseArrays = "1"
SpecialFunctions = "1, 2"
StaticArrays = "1.9.14"
StochasticDelayDiffEq = "1.11"
StochasticDiffEq = "6.82.0"
StochasticDiffEq = "6.82.0, 7"
SymbolicIndexingInterface = "0.3.39"
SymbolicUtils = "4.23.1"
Symbolics = "7.18.1"
Expand Down
8 changes: 4 additions & 4 deletions lib/ModelingToolkitBase/test/sdesystem.jl
Original file line number Diff line number Diff line change
Expand Up @@ -598,8 +598,8 @@ end

prob = SDEProblem(de, [u0map; parammap], (0.0, 1.0))

function prob_func(prob, i, repeat)
remake(prob, seed = seeds[i])
function prob_func(prob, ctx)
remake(prob, seed = seeds[ctx.i])
end
numtraj = Int(1.0e3)
seed = 100
Expand All @@ -608,7 +608,7 @@ end

ensemble_prob = EnsembleProblem(
prob;
output_func = (sol, i) -> (g(sol.u[end]), false),
output_func = (sol, ctx) -> (g(sol.u[end]), false),
prob_func = prob_func
)

Expand All @@ -624,7 +624,7 @@ end

ensemble_probmod = EnsembleProblem(
probmod;
output_func = (sol, i) -> (
output_func = (sol, ctx) -> (
g(sol[x][end]) *
sol[demod.weight][end],
false,
Expand Down
14 changes: 7 additions & 7 deletions test/fmi/fmi.jl
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ end
@test !MTK.isinput(adder.c) && !MTK.isoutput(adder.c)

sys, prob = build_simple_adder(adder)
sol = solve(prob, Rodas5P(autodiff = false), abstol = 1.0e-8, reltol = 1.0e-8)
sol = solve(prob, Rodas5P(autodiff = AutoFiniteDiff()), abstol = 1.0e-8, reltol = 1.0e-8)
@test SciMLBase.successful_retcode(sol)

@test truesol(
Expand All @@ -196,7 +196,7 @@ end
@test !MTK.isinput(adder.c) && !MTK.isoutput(adder.c)

sys, prob = build_simple_adder(adder)
sol = solve(prob, Rodas5P(autodiff = false), abstol = 1.0e-8, reltol = 1.0e-8)
sol = solve(prob, Rodas5P(autodiff = AutoFiniteDiff()), abstol = 1.0e-8, reltol = 1.0e-8)
@test SciMLBase.successful_retcode(sol)

@test truesol(
Expand Down Expand Up @@ -233,7 +233,7 @@ end
@test !MTK.isinput(sspace.x) && !MTK.isoutput(sspace.x)

sys, prob = build_sspace_model(sspace)
sol = solve(prob, Rodas5P(autodiff = false); abstol = 1.0e-8, reltol = 1.0e-8)
sol = solve(prob, Rodas5P(autodiff = AutoFiniteDiff()); abstol = 1.0e-8, reltol = 1.0e-8)
@test SciMLBase.successful_retcode(sol)

@test truesol(
Expand All @@ -257,7 +257,7 @@ end
@test !MTK.isinput(sspace.x) && !MTK.isoutput(sspace.x)

sys, prob = build_sspace_model(sspace)
sol = solve(prob, Rodas5P(autodiff = false); abstol = 1.0e-8, reltol = 1.0e-8)
sol = solve(prob, Rodas5P(autodiff = AutoFiniteDiff()); abstol = 1.0e-8, reltol = 1.0e-8)
@test SciMLBase.successful_retcode(sol)

@test truesol(
Expand Down Expand Up @@ -295,7 +295,7 @@ end
@named adder1 = MTK.FMIComponent(Val(2); fmu, type = :ME)
@named adder2 = MTK.FMIComponent(Val(2); fmu, type = :ME)
sys, prob = build_looped_adders(adder1, adder2)
sol = solve(prob, Rodas5P(autodiff = false); reltol = 1.0e-8)
sol = solve(prob, Rodas5P(autodiff = AutoFiniteDiff()); reltol = 1.0e-8)
@test SciMLBase.successful_retcode(sol)
@test truesol(
sol.t;
Expand Down Expand Up @@ -353,7 +353,7 @@ end
@named sspace1 = MTK.FMIComponent(Val(3); fmu, type = :ME)
@named sspace2 = MTK.FMIComponent(Val(3); fmu, type = :ME)
sys, prob = build_looped_sspace(sspace1, sspace2)
sol = solve(prob, Rodas5P(autodiff = false); reltol = 1.0e-8)
sol = solve(prob, Rodas5P(autodiff = AutoFiniteDiff()); reltol = 1.0e-8)
@test SciMLBase.successful_retcode(sol)
@test truesol(
sol.t;
Expand All @@ -372,7 +372,7 @@ end
Val(3); fmu, type = :CS, communication_step_size = 1.0e-5
)
sys, prob = build_looped_sspace(sspace1, sspace2)
sol = solve(prob, Rodas5P(autodiff = false); reltol = 1.0e-8)
sol = solve(prob, Rodas5P(autodiff = AutoFiniteDiff()); reltol = 1.0e-8)
@test SciMLBase.successful_retcode(sol)
@test truesol(
sol.t;
Expand Down
Loading