Skip to content

Fix heterogeneous parameters handling for linearize_function #225

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 2 commits into from
Sep 26, 2023
Merged

Fix heterogeneous parameters handling for linearize_function #225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
06de0c1
Fix heterogeneous parameters handling for `linearize_function`
YingboMa Sep 26, 2023
47a07ff
Relax tests
YingboMa Sep 26, 2023
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
13 changes: 10 additions & 3 deletions src/Blocks/analysis_points.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,10 +450,17 @@ end

# Methods above are implemented in terms of linearization_function, the method below creates wrappers for linearize
for f in [:get_sensitivity, :get_comp_sensitivity, :get_looptransfer]
@eval function $f(sys, ap, args...; loop_openings = nothing, kwargs...)
lin_fun, ssys = $(Symbol(string(f) * "_function"))(sys, ap, args...; loop_openings,
@eval function $f(sys,
ap,
args...;
loop_openings = nothing,
op = Dict(),
p = DiffEqBase.NullParameters(),
kwargs...)
lin_fun, ssys = $(Symbol(string(f) * "_function"))(sys, ap, args...; op, p,
loop_openings,
kwargs...)
ModelingToolkit.linearize(ssys, lin_fun; kwargs...), ssys
ModelingToolkit.linearize(ssys, lin_fun; op, p, kwargs...), ssys
end
end

Expand Down
2 changes: 1 addition & 1 deletion test/Thermal/thermal.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ end
@test sol.retcode == Success
@test sol[T_winding.T] == sol[winding.T]
@test sol[T_core.T] == sol[core.T]
@test sol[-core.port.Q_flow] ==
@test sol[-core.port.Q_flow] ≈
sol[coreLosses.port.Q_flow + convection.solid.Q_flow + winding2core.port_b.Q_flow]
@test sol[T_winding.T][end] >= 500 # not good but better than nothing
@test sol[T_core.T] <= sol[T_winding.T]
Expand Down