Skip to content

Commit 5a2bfbd

Browse files
Merge pull request #355 from SciML/bgc/fix_sampleddata
fixed SampledData initializaiton
2 parents 7197b13 + f15d608 commit 5a2bfbd

File tree

2 files changed

+6
-10
lines changed

2 files changed

+6
-10
lines changed

src/Blocks/sources.jl

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -672,10 +672,7 @@ data input component.
672672
eqs = [
673673
output.u ~ get_sampled_data(t, p)
674674
]
675-
return ODESystem(eqs, t, vars, [pars; p]; name, systems,
676-
defaults = [
677-
output.u => get_sampled_data(0.0, p)
678-
])
675+
return ODESystem(eqs, t, vars, [pars; p]; name, systems)
679676
end
680677

681678
"""
@@ -701,8 +698,7 @@ data input component.
701698
eqs = [
702699
output.u ~ get_sampled_data(t, buffer)
703700
]
704-
return ODESystem(eqs, t, vars, pars; name, systems,
705-
defaults = [output.u => get_sampled_data(0.0, buffer)])
701+
return ODESystem(eqs, t, vars, pars; name, systems)
706702
end
707703

708704
SampledData(x::SampledDataType.Option; kwargs...) = SampledData(Val(x); kwargs...)

test/Blocks/sources.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ end
424424
x = @. time^2 + 1.0
425425

426426
@testset "using Parameter type" begin
427-
vars = @variables y(t)=1 dy(t)=0 ddy(t)=0
427+
vars = @variables y(t) dy(t) ddy(t)
428428
@named src = SampledData(Float64)
429429
@named int = Integrator()
430430
@named iosys = ODESystem(
@@ -443,7 +443,7 @@ end
443443
tofloat = false)
444444
# prob = remake(prob; p = Parameter.(prob.p)) #<-- no longer needed with ModelingToolkit.jl PR #2231
445445

446-
sol = solve(prob, Rodas4(); initializealg = NoInit())
446+
sol = solve(prob, Rodas4())
447447
@test sol.retcode == Success
448448
@test sol[src.output.u][1] == 1.0 #check correct initial condition
449449

@@ -454,7 +454,7 @@ end
454454
end
455455

456456
@testset "using Vector Based" begin
457-
vars = @variables y(t)=1 dy(t)=0 ddy(t)=0
457+
vars = @variables y(t) dy(t) ddy(t)
458458
@named src = SampledData(dt)
459459
@named int = Integrator()
460460
@named iosys = ODESystem(
@@ -472,7 +472,7 @@ end
472472
[s.src.buffer => x, s.src.sample_time => dt];
473473
tofloat = false)
474474

475-
sol = solve(prob, Rodas4(); initializealg = NoInit())
475+
sol = solve(prob, Rodas4())
476476
@test sol.retcode == Success
477477
@test sol[src.output.u][1] == 1.0 #check correct initial condition
478478

0 commit comments

Comments
 (0)