Skip to content

Commit

Permalink
Treat components in top-level connectors with --exposeLocalIOs (#10599)…
Browse files Browse the repository at this point in the history 
… (#12384)

Identify top-level IOs using the same function removeNonTopLevelDirection that will be called later on.
  • Loading branch information
@rfranke
rfranke committed May 6, 2024
1 parent 7739146 commit 08994d8
Show file tree
Hide file tree
Showing 2 changed files with 91 additions and 45 deletions.
37 changes: 21 additions & 16 deletions OMCompiler/Compiler/NFFrontEnd/NFFlatten.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2286,22 +2286,27 @@ algorithm
(attributes.direction == Direction.INPUT or attributes.direction == Direction.OUTPUT) and
not UnorderedSet.contains(variable.name, connectedLocalIOs)
then
tlio_var := variable; // same attributes like start, unit
tlio_var.name := ComponentRef.combineSubscripts(tlio_var.name);
tlio_var.binding := UNBOUND(); // value is defined with tlio_eql
// find new name in global scope, using underscore instead of dot
cref := tlio_var.name;
name := stringDelimitList(ComponentRef.toString_impl(cref, {}), ".");
while UnorderedMap.contains(tlio_var.name, variables) loop
tlio_node := InstNode.NAME_NODE(Util.makeQuotedIdentifier(name));
tlio_var.name := match cref case ComponentRef.CREF() then
ComponentRef.CREF(tlio_node, cref.subscripts, cref.ty, cref.origin, ComponentRef.EMPTY());
end match;
name := name + "_" "append underscore until name is unique";
end while;
tlio_vars := tlio_var :: tlio_vars;
tlio_eql := Equation.makeCrefEquality(variable.name, tlio_var.name,
InstNode.EMPTY_NODE(), ElementSource.createElementSource(variable.info)) :: tlio_eql;
// add a new variable and equation if removeNonTopLevelDirection removes the direction
tlio_var := Variable.removeNonTopLevelDirection(variable);
attributes := tlio_var.attributes;
if attributes.direction == Direction.NONE then
tlio_var := variable; // same attributes like start, unit
tlio_var.name := ComponentRef.combineSubscripts(tlio_var.name);
tlio_var.binding := UNBOUND(); // value is defined with tlio_eql
// find new name in global scope, starting with quoted identifier
cref := tlio_var.name;
name := stringDelimitList(ComponentRef.toString_impl(cref, {}), ".");
while UnorderedMap.contains(tlio_var.name, variables) loop
tlio_node := InstNode.NAME_NODE(Util.makeQuotedIdentifier(name));
tlio_var.name := match cref case ComponentRef.CREF() then
ComponentRef.CREF(tlio_node, cref.subscripts, cref.ty, cref.origin, ComponentRef.EMPTY());
end match;
name := name + "_" "append underscore until name is unique";
end while;
tlio_vars := tlio_var :: tlio_vars;
tlio_eql := Equation.makeCrefEquality(variable.name, tlio_var.name,
InstNode.EMPTY_NODE(), ElementSource.createElementSource(variable.info)) :: tlio_eql;
end if;
end if;
end for;
end generateTopLevelIOs;
Expand Down
99 changes: 70 additions & 29 deletions testsuite/openmodelica/cppruntime/fmu/modelExchange/2.0/exposeLocalIOs.mos
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@ package LocalIOs
connector RealInput = input Real;
connector RealOutput = output Real;

connector StructuredConnector
input Real u;
output Real y;
end StructuredConnector;

connector PhysicalConnector
Real p;
flow Real f;
Expand Down Expand Up @@ -51,6 +56,7 @@ end Medium;

model Component
PhysicalConnector c;
StructuredConnector s;
input Real modifiedInput annotation(Dialog(enable=true));
output Real simpleOutput = signaling.y;
RealOutput measurement;
Expand All @@ -62,6 +68,7 @@ equation
signaling.'u2' = 2;
signaling.u = 3:4;
c.f = f(c.p) + modifiedInput + signaling.y;
s.y = s.u;
connect(signaling.y, measurement);
end Component;

Expand All @@ -80,11 +87,13 @@ model System
Signaling signaling;
Real 'component.measurement' = 0 \"name already in use\";
RealOutput y \"unconnected IO at level 0\";
StructuredConnector s;
equation
y = time;
connect(source.c, component.c);
connect(source.yf, signaling.u1);
connect(source.y, signaling.u);
connect(s, component.s);
end System;

end LocalIOs;
Expand Down Expand Up @@ -196,135 +205,165 @@ readFile("modelDescription.tmp.xml");
// </ScalarVariable>
// <!-- Index of variable = \"9\" -->
// <ScalarVariable
// name=\"source.y[2]\"
// name=\"s.u\"
// valueReference=\"13\"
// causality=\"input\"
// >
// <Real/>
// <Real start=\"0.0\"/>
// </ScalarVariable>
// <!-- Index of variable = \"10\" -->
// <ScalarVariable
// name=\"y\"
// name=\"s.y\"
// valueReference=\"14\"
// description=\"unconnected IO at level 0\"
// causality=\"output\"
// >
// <Real/>
// </ScalarVariable>
// <!-- Index of variable = \"11\" -->
// <ScalarVariable
// name=\"source.u_par\"
// name=\"source.y[2]\"
// valueReference=\"15\"
// >
// <Real/>
// </ScalarVariable>
// <!-- Index of variable = \"12\" -->
// <ScalarVariable
// name=\"y\"
// valueReference=\"16\"
// description=\"unconnected IO at level 0\"
// causality=\"output\"
// >
// <Real/>
// </ScalarVariable>
// <!-- Index of variable = \"13\" -->
// <ScalarVariable
// name=\"source.u_par\"
// valueReference=\"17\"
// variability=\"fixed\"
// causality=\"parameter\"
// >
// <Real start=\"2.0\"/>
// </ScalarVariable>
// <!-- Index of variable = \"12\" -->
// <!-- Index of variable = \"14\" -->
// <ScalarVariable
// name=\"component.c.f\"
// valueReference=\"20\"
// valueReference=\"23\"
// >
// <Real/>
// </ScalarVariable>
// <!-- Index of variable = \"13\" -->
// <!-- Index of variable = \"15\" -->
// <ScalarVariable
// name=\"component.c.p\"
// valueReference=\"5\"
// >
// <Real/>
// </ScalarVariable>
// <!-- Index of variable = \"14\" -->
// <!-- Index of variable = \"16\" -->
// <ScalarVariable
// name=\"component.measurement\"
// valueReference=\"2\"
// >
// <Real/>
// </ScalarVariable>
// <!-- Index of variable = \"15\" -->
// <!-- Index of variable = \"17\" -->
// <ScalarVariable
// name=\"component.s.u\"
// valueReference=\"13\"
// >
// <Real/>
// </ScalarVariable>
// <!-- Index of variable = \"18\" -->
// <ScalarVariable
// name=\"component.s.y\"
// valueReference=\"13\"
// >
// <Real/>
// </ScalarVariable>
// <!-- Index of variable = \"19\" -->
// <ScalarVariable
// name=\"component.simpleOutput\"
// valueReference=\"2\"
// >
// <Real/>
// </ScalarVariable>
// <!-- Index of variable = \"16\" -->
// <!-- Index of variable = \"20\" -->
// <ScalarVariable
// name=\"signaling.'u2'\"
// valueReference=\"3\"
// >
// <Real/>
// </ScalarVariable>
// <!-- Index of variable = \"17\" -->
// <!-- Index of variable = \"21\" -->
// <ScalarVariable
// name=\"signaling.u[1]\"
// valueReference=\"5\"
// >
// <Real/>
// </ScalarVariable>
// <!-- Index of variable = \"18\" -->
// <!-- Index of variable = \"22\" -->
// <ScalarVariable
// name=\"signaling.u[2]\"
// valueReference=\"13\"
// valueReference=\"15\"
// >
// <Real/>
// </ScalarVariable>
// <!-- Index of variable = \"19\" -->
// <!-- Index of variable = \"23\" -->
// <ScalarVariable
// name=\"signaling.u1\"
// valueReference=\"13\"
// valueReference=\"15\"
// >
// <Real/>
// </ScalarVariable>
// <!-- Index of variable = \"20\" -->
// <!-- Index of variable = \"24\" -->
// <ScalarVariable
// name=\"signaling.y\"
// valueReference=\"4\"
// >
// <Real/>
// </ScalarVariable>
// <!-- Index of variable = \"21\" -->
// <!-- Index of variable = \"25\" -->
// <ScalarVariable
// name=\"source.c.f\"
// valueReference=\"13\"
// valueReference=\"15\"
// >
// <Real/>
// </ScalarVariable>
// <!-- Index of variable = \"22\" -->
// <!-- Index of variable = \"26\" -->
// <ScalarVariable
// name=\"source.c.p\"
// valueReference=\"5\"
// >
// <Real/>
// </ScalarVariable>
// <!-- Index of variable = \"23\" -->
// <!-- Index of variable = \"27\" -->
// <ScalarVariable
// name=\"source.u_in\"
// valueReference=\"5\"
// >
// <Real/>
// </ScalarVariable>
// <!-- Index of variable = \"24\" -->
// <!-- Index of variable = \"28\" -->
// <ScalarVariable
// name=\"source.y[1]\"
// valueReference=\"5\"
// >
// <Real/>
// </ScalarVariable>
// <!-- Index of variable = \"25\" -->
// <!-- Index of variable = \"29\" -->
// <ScalarVariable
// name=\"source.yf\"
// valueReference=\"13\"
// valueReference=\"15\"
// >
// <Real/>
// </ScalarVariable>
// <!-- Index of variable = \"26\" -->
// <!-- Index of variable = \"30\" -->
// <ScalarVariable
// name=\"source.yp\"
// valueReference=\"5\"
// >
// <Real/>
// </ScalarVariable>
// <!-- Index of variable = \"27\" -->
// <!-- Index of variable = \"31\" -->
// <ScalarVariable
// name=\"source.use_u_in\"
// valueReference=\"0\"
Expand All @@ -339,14 +378,16 @@ readFile("modelDescription.tmp.xml");
// <Unknown index=\"2\" dependencies=\"\" dependenciesKind=\"\" />
// <Unknown index=\"4\" dependencies=\"3 5\" dependenciesKind=\"dependent dependent\" />
// <Unknown index=\"6\" dependencies=\"5\" dependenciesKind=\"dependent\" />
// <Unknown index=\"10\" dependencies=\"\" dependenciesKind=\"\" />
// <Unknown index=\"10\" dependencies=\"9\" dependenciesKind=\"dependent\" />
// <Unknown index=\"12\" dependencies=\"\" dependenciesKind=\"\" />
// </Outputs>
// <InitialUnknowns>
// <Unknown index=\"2\" dependencies=\"\" dependenciesKind=\"\" />
// <Unknown index=\"4\" dependencies=\"3 5\" dependenciesKind=\"dependent dependent\" />
// <Unknown index=\"6\" dependencies=\"5\" dependenciesKind=\"dependent\" />
// <Unknown index=\"10\" dependencies=\"\" dependenciesKind=\"\" />
// <Unknown index=\"27\" dependencies=\"\" dependenciesKind=\"\" />
// <Unknown index=\"10\" dependencies=\"9\" dependenciesKind=\"dependent\" />
// <Unknown index=\"12\" dependencies=\"\" dependenciesKind=\"\" />
// <Unknown index=\"31\" dependencies=\"\" dependenciesKind=\"\" />
// </InitialUnknowns>
// </ModelStructure>
// </fmiModelDescription>
Expand Down

0 comments on commit 08994d8

Please sign in to comment.