Skip to content

Commit 50ae82a

Browse files
committed
Remove empty hierarchies in mappedParameters
1 parent ab5942a commit 50ae82a

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

src/ModiaLang.jl

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -291,14 +291,16 @@ prependDict(dict, prefix) = OrderedDict([prepend(k, prefix) => prepend(v, prefix
291291

292292

293293
function mergeModelStructures(parent::ModelStructure, child::ModelStructure, prefix)
294-
merge!(parent.parameters, child.parameters)
295-
parent.mappedParameters[prefix] = child.mappedParameters
294+
if length(child.mappedParameters) > 0
295+
merge!(parent.parameters, child.parameters)
296+
parent.mappedParameters[prefix] = child.mappedParameters
296297

297-
merge!(parent.init, child.init)
298-
parent.mappedParameters[prefix] = child.mappedParameters
298+
merge!(parent.init, child.init)
299+
parent.mappedParameters[prefix] = child.mappedParameters
299300

300-
merge!(parent.start, child.start)
301-
parent.mappedParameters[prefix] = child.mappedParameters
301+
merge!(parent.start, child.start)
302+
parent.mappedParameters[prefix] = child.mappedParameters
303+
end
302304

303305
merge!(parent.variables, child.variables)
304306
merge!(parent.flows, child.flows)

0 commit comments

Comments
 (0)