Skip to content

Only verify connection units if both are provided #844

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 28, 2021
Merged

Only verify connection units if both are provided #844

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c6bd452
Only verify connection units if both are provided
lrennels Sep 27, 2021
ee28448
Merge branch 'master' into unit-checking
lrennels Sep 27, 2021
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
12 changes: 8 additions & 4 deletions src/core/connections.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,10 +313,14 @@ Try calling:
backup_param_name = nothing
end

# Check the units, if provided
if ! ignoreunits && ! verify_units(variable_unit(src_comp_def, src_var_name),
parameter_unit(dst_comp_def, dst_par_name))
error("Units of $src_comp_path:$src_var_name do not match $dst_comp_path:$dst_par_name.")
# Check the units, if both are provided
var_unit = variable_unit(src_comp_def, src_var_name)
par_unit = parameter_unit(dst_comp_def, dst_par_name)

if !ignoreunits && var_unit !== "" && par_unit !== ""
if ! verify_units(var_unit, par_unit)
error("Units of $src_comp_path:$src_var_name ($var_unit) do not match $dst_comp_path:$dst_par_name ($par_unit).")
end
end

conn = InternalParameterConnection(src_comp_path, src_var_name, dst_comp_path, dst_par_name,
Expand Down