Skip to content

Commit 725da10

Browse files
Merge pull request #3094 from SciML/ChrisRackauckas-patch-6
Test master
2 parents 3a110df + 422230b commit 725da10

File tree

4 files changed

+6
-18
lines changed

4 files changed

+6
-18
lines changed

Project.toml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ OffsetArrays = "1"
111111
OrderedCollections = "1"
112112
OrdinaryDiffEq = "6.82.0"
113113
PrecompileTools = "1"
114+
REPL = "1"
114115
RecursiveArrayTools = "3.26"
115116
Reexport = "0.2, 1"
116117
RuntimeGeneratedFunctions = "0.5.9"
@@ -148,6 +149,7 @@ OptimizationMOI = "fd9f6733-72f4-499f-8506-86b2bdd0dea1"
148149
OptimizationOptimJL = "36348300-93cb-4f02-beb5-3c3902f8871e"
149150
OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"
150151
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
152+
REPL = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
151153
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
152154
ReferenceTests = "324d217c-45ce-50fc-942e-d289b448e8cf"
153155
SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
@@ -160,4 +162,4 @@ Sundials = "c3572dad-4567-51f8-b174-8c6c989267f4"
160162
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
161163

162164
[targets]
163-
test = ["AmplNLWriter", "BenchmarkTools", "ControlSystemsBase", "DataInterpolations", "DelayDiffEq", "NonlinearSolve", "ForwardDiff", "Ipopt", "Ipopt_jll", "ModelingToolkitStandardLibrary", "Optimization", "OptimizationOptimJL", "OptimizationMOI", "OrdinaryDiffEq", "Random", "ReferenceTests", "SafeTestsets", "StableRNGs", "Statistics", "SteadyStateDiffEq", "Test", "StochasticDiffEq", "Sundials", "StochasticDelayDiffEq", "Pkg", "JET"]
165+
test = ["AmplNLWriter", "BenchmarkTools", "ControlSystemsBase", "DataInterpolations", "DelayDiffEq", "NonlinearSolve", "ForwardDiff", "Ipopt", "Ipopt_jll", "ModelingToolkitStandardLibrary", "Optimization", "OptimizationOptimJL", "OptimizationMOI", "OrdinaryDiffEq", "REPL", "Random", "ReferenceTests", "SafeTestsets", "StableRNGs", "Statistics", "SteadyStateDiffEq", "Test", "StochasticDiffEq", "Sundials", "StochasticDelayDiffEq", "Pkg", "JET"]

test/dde.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ sol = solve(prob, MethodOfSteps(Tsit5()))
124124
obsfn = ModelingToolkit.build_explicit_observed_function(
125125
sys, [sys.osc1.delx, sys.osc2.delx])
126126
@test_nowarn sol[[sys.osc1.delx, sys.osc2.delx]]
127-
@test sol[sys.osc1.delx] sol(sol.t .- 0.01; idxs = sys.osc1.x)
127+
@test sol[sys.osc1.delx] sol(sol.t .- 0.01; idxs = sys.osc1.x).u
128128

129129
@testset "DDE observed with array variables" begin
130130
@component function valve(; name)

test/runtests.jl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
using SafeTestsets, Pkg, Test
2+
# https://github.com/JuliaLang/julia/issues/54664
3+
import REPL
24

35
const GROUP = get(ENV, "GROUP", "All")
46

test/structural_transformation/tearing.jl

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -169,22 +169,6 @@ infprob = ODEProblem(structural_simplify(sys), [x => 1.0], (0, 1.0), [p => 0.2])
169169
infprob.f(du, infprob.u0, pr, tt)
170170
@test any(isnan, du)
171171

172-
sol1 = solve(prob, RosShamp4(), reltol = 8e-7)
173-
sol2 = solve(ODEProblem{false}((u, p, t) -> [-asin(u[1] - pr * t)],
174-
[1.0],
175-
(0, 1.0),
176-
0.2),
177-
Tsit5(), tstops = sol1.t, adaptive = false)
178-
@test Array(sol1[x])Array(sol2[1, :]) atol=1e-5
179-
180-
@test sol1[x] == first.(sol1.u)
181-
@test sol1[y] == first.(sol1.u)
182-
@test sin.(sol1[z]) .+ sol1[y]pr[1] * sol1.t atol=5e-5
183-
@test sol1[sin(z) + y]sin.(sol1[z]) .+ sol1[y] rtol=1e-12
184-
185-
@test sol1[y, :] == sol1[x, :]
186-
@test (@. sin(sol1[z, :]) + sol1[y, :])pr * sol1.t atol=5e-5
187-
188172
# 1426
189173
function Translational_Mass(; name, m = 1.0)
190174
sts = @variables s(t) v(t) a(t)

0 commit comments

Comments
 (0)