Skip to content

Commit 9ea5de2

Browse files
fix
1 parent 2c48154 commit 9ea5de2

File tree

2 files changed

+18
-201
lines changed

2 files changed

+18
-201
lines changed

test/Electrical/dc_motor.jl

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

test/multi_domain.jl

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,11 @@ D = Differential(t)
6666
# test steady-state values
6767
dc_gain = [f/(k^2 + f * R) k/(k^2 + f * R); k/(k^2 + f * R) -R/(k^2 + f * R)]
6868
idx_t = findfirst(sol.t .> 2.5)
69-
@test sol[inertia.w][idx_t] (dc_gain * [V_step; 0])[2]
70-
@test sol[emf.i][idx_t] (dc_gain * [V_step; 0])[1]
69+
@test sol[inertia.w][idx_t](dc_gain * [V_step; 0])[2] rtol=1e-3
70+
@test sol[emf.i][idx_t](dc_gain * [V_step; 0])[1] rtol=1e-3
7171
idx_t = findfirst(sol.t .> 5.5)
72-
@test sol[inertia.w][idx_t] (dc_gain * [V_step; -tau_L_step])[2]
73-
@test sol[emf.i][idx_t] (dc_gain * [V_step; -tau_L_step])[1]
72+
@test sol[inertia.w][idx_t](dc_gain * [V_step; -tau_L_step])[2] rtol=1e-3
73+
@test sol[emf.i][idx_t](dc_gain * [V_step; -tau_L_step])[1] rtol=1e-3
7474
end
7575

7676
prob = DAEProblem(sys, D.(states(sys)) .=> 0.0, Pair[], (0, 6.0))
@@ -82,11 +82,11 @@ D = Differential(t)
8282
# test steady-state values
8383
dc_gain = [f/(k^2 + f * R) k/(k^2 + f * R); k/(k^2 + f * R) -R/(k^2 + f * R)]
8484
idx_t = findfirst(sol.t .> 2.5)
85-
@test sol[inertia.w][idx_t] (dc_gain * [V_step; 0])[2]
86-
@test sol[emf.i][idx_t] (dc_gain * [V_step; 0])[1]
85+
@test sol[inertia.w][idx_t](dc_gain * [V_step; 0])[2] rtol=1e-3
86+
@test sol[emf.i][idx_t](dc_gain * [V_step; 0])[1] rtol=1e-3
8787
idx_t = findfirst(sol.t .> 5.5)
88-
@test sol[inertia.w][idx_t] (dc_gain * [V_step; -tau_L_step])[2]
89-
@test sol[emf.i][idx_t] (dc_gain * [V_step; -tau_L_step])[1]
88+
@test sol[inertia.w][idx_t](dc_gain * [V_step; -tau_L_step])[2] rtol=1e-3
89+
@test sol[emf.i][idx_t](dc_gain * [V_step; -tau_L_step])[1] rtol=1e-3
9090

9191
# p1 = Plots.plot(sol, vars=[inertia.w], ylabel="Angular Vel. in rad/s", label="")
9292
# p2 = Plots.plot(sol, vars=[emf.i], ylabel="Current in A", label="")
@@ -155,14 +155,14 @@ end
155155
# test steady-state values
156156
dc_gain = [f/(k^2 + f * R) k/(k^2 + f * R); k/(k^2 + f * R) -R/(k^2 + f * R)]
157157
idx_t = findfirst(sol.t .> 2.5)
158-
@test sol[inertia.w][idx_t] (dc_gain * [V_step; 0])[2]
159-
@test sol[emf.i][idx_t] (dc_gain * [V_step; 0])[1]
158+
@test sol[inertia.w][idx_t](dc_gain * [V_step; 0])[2] rtol=1e-3
159+
@test sol[emf.i][idx_t](dc_gain * [V_step; 0])[1] rtol=1e-3
160160
idx_t = findfirst(sol.t .> 5.5)
161-
@test sol[inertia.w][idx_t] (dc_gain * [V_step; -tau_L_step])[2]
162-
@test sol[emf.i][idx_t] (dc_gain * [V_step; -tau_L_step])[1]
161+
@test sol[inertia.w][idx_t](dc_gain * [V_step; -tau_L_step])[2] rtol=1e-3
162+
@test sol[emf.i][idx_t](dc_gain * [V_step; -tau_L_step])[1] rtol=1e-3
163163

164164
#
165-
@test sol[inertia.w] == sol[speed_sensor.w]
165+
@test all(sol[inertia.w] .== sol[speed_sensor.w.u])
166166
end
167167

168168
prob = DAEProblem(sys, D.(states(sys)) .=> 0.0, Pair[], (0, 6.0))
@@ -175,13 +175,13 @@ end
175175
# test steady-state values
176176
dc_gain = [f/(k^2 + f * R) k/(k^2 + f * R); k/(k^2 + f * R) -R/(k^2 + f * R)]
177177
idx_t = findfirst(sol.t .> 2.5)
178-
@test sol[inertia.w][idx_t] (dc_gain * [V_step; 0])[2]
179-
@test sol[emf.i][idx_t] (dc_gain * [V_step; 0])[1]
178+
@test sol[inertia.w][idx_t](dc_gain * [V_step; 0])[2] rtol=1e-3
179+
@test sol[emf.i][idx_t](dc_gain * [V_step; 0])[1] rtol=1e-3
180180
idx_t = findfirst(sol.t .> 5.5)
181-
@test sol[inertia.w][idx_t] (dc_gain * [V_step; -tau_L_step])[2]
182-
@test sol[emf.i][idx_t] (dc_gain * [V_step; -tau_L_step])[1]
181+
@test sol[inertia.w][idx_t](dc_gain * [V_step; -tau_L_step])[2] rtol=1e-3
182+
@test sol[emf.i][idx_t](dc_gain * [V_step; -tau_L_step])[1] rtol=1e-3
183183
#
184-
@test sol[inertia.w] == sol[speed_sensor.w.u]
184+
@test all(sol[inertia.w] .== sol[speed_sensor.w.u])
185185
end
186186

187187
@testset "El. Heating Circuit" begin

0 commit comments

Comments
 (0)