Skip to content

pass ODESystem kwargs via @mtkmodel constructor #3484

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

pass ODESystem kwargs via @mtkmodel constructor #3484

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
7 changes: 4 additions & 3 deletions src/systems/model_parsing.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,8 @@ function _model_macro(mod, name, expr, isconnector)
Ref(dict), [:constants, :defaults, :kwargs, :structural_parameters])

sys = :($ODESystem($(flatten_equations)(equations), $iv, variables, parameters;
name, description = $description, systems, gui_metadata = $gui_metadata, defaults))
name, description = $description, systems,
gui_metadata = $gui_metadata, defaults, syskwargs...))

if length(ext) == 0
push!(exprs.args, :(var"#___sys___" = $sys))
Expand All @@ -137,11 +138,11 @@ function _model_macro(mod, name, expr, isconnector)
]))))

f = if length(where_types) == 0
:($(Symbol(:__, name, :__))(; name, $(kwargs...)) = $exprs)
:($(Symbol(:__, name, :__))(; name, $(kwargs...), syskwargs...) = $exprs)
else
f_with_where = Expr(:where)
push!(f_with_where.args,
:($(Symbol(:__, name, :__))(; name, $(kwargs...))), where_types...)
:($(Symbol(:__, name, :__))(; name, $(kwargs...), syskwargs...)), where_types...)
:($f_with_where = $exprs)
end

Expand Down
14 changes: 14 additions & 0 deletions test/model_parsing.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1011,3 +1011,17 @@ end
@test any(isequal(u), vars)
end
end

@testset "Pass kwargs to ODESystem" begin
@mtkmodel UnitFailure begin
@variables begin
x(t), [unit = u"V"]
y(t), [unit = u"A"]
end
@equations begin
x ~ y
end
end
@test_throws ModelingToolkit.ValidationError UnitFailure(name = :uf)
UnitFailure(name = :uf, checks = false) # no error with passed kwarg
end
Loading