Skip to content

fixed SampledData initializaiton #355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 12, 2025
Merged

fixed SampledData initializaiton #355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 2 additions & 6 deletions src/Blocks/sources.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -672,10 +672,7 @@ data input component.
eqs = [
output.u ~ get_sampled_data(t, p)
]
return ODESystem(eqs, t, vars, [pars; p]; name, systems,
defaults = [
output.u => get_sampled_data(0.0, p)
])
return ODESystem(eqs, t, vars, [pars; p]; name, systems)
end

"""
Expand All @@ -701,8 +698,7 @@ data input component.
eqs = [
output.u ~ get_sampled_data(t, buffer)
]
return ODESystem(eqs, t, vars, pars; name, systems,
defaults = [output.u => get_sampled_data(0.0, buffer)])
return ODESystem(eqs, t, vars, pars; name, systems)
end

SampledData(x::SampledDataType.Option; kwargs...) = SampledData(Val(x); kwargs...)
Expand Down
8 changes: 4 additions & 4 deletions test/Blocks/sources.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ end
x = @. time^2 + 1.0

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

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

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

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

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

Expand Down
Loading