Skip to content

Commit

Permalink
treat reductions to empty connection sets (#3430)
Browse files Browse the repository at this point in the history
  • Loading branch information
@rfranke
rfranke committed Sep 5, 2015
1 parent 83ed62a commit 7c85c2e
Showing 1 changed file with 54 additions and 47 deletions.
101 changes: 54 additions & 47 deletions Compiler/FrontEnd/ConnectUtil.mo
View file
Expand Up @@ -2781,6 +2781,42 @@ algorithm
end match;
end isOutsideStream;

protected function isZeroFlowMinMax
"Returns true if the given flow attribute of a connector is zero."
input DAE.ComponentRef inStreamCref;
input ConnectorElement inElement;
output Boolean isZero;
algorithm
if compareCrefStreamSet(inStreamCref, inElement) then
isZero := false;
elseif isOutsideStream(inElement) then
isZero := isZeroFlow(inElement, "max");
else
isZero := isZeroFlow(inElement, "min");
end if;
end isZeroFlowMinMax;

protected function isZeroFlow
"Returns true if the given flow attribute of a connector is zero."
input ConnectorElement inElement;
input String attr;
output Boolean isZero;
protected
DAE.Type ty;
Option<DAE.Exp> attr_oexp;
DAE.Exp flow_exp, attr_exp;
algorithm
flow_exp := flowExp(inElement);
ty := Expression.typeof(flow_exp);
attr_oexp := Types.lookupAttributeExp(Types.getAttributes(ty), attr);
if isSome(attr_oexp) then
SOME(attr_exp) := attr_oexp;
isZero := Expression.isZero(attr_exp);
else
isZero := false;
end if;
end isZeroFlow;

protected function streamEquationGeneral
"Generates an equation for an outside stream connector element."
input list<ConnectorElement> inOutsideElements;
Expand Down Expand Up @@ -2822,60 +2858,28 @@ protected function streamSumEquationExp
output DAE.Exp outSumExp;
protected
DAE.Exp outside_sum1, outside_sum2, inside_sum1, inside_sum2, res;
list<ConnectorElement> insideElements, outsideElements;
algorithm
insideElements := List.filterOnFalse(inInsideElements, function isZeroFlow(attr="min"));
outsideElements := List.filterOnFalse(inOutsideElements, function isZeroFlow(attr="max"));
// adrpo: TODO! FIXME! HACK!
// what happens if both these filtered lists are empty, what do we return?
// Test with model: ThermoPower.PowerPlants.SteamTurbineGroup.Tests.TestST3LRh_bypass
// as this seems to happen there! For now I unfilter the lists!
if listEmpty(outsideElements) and listEmpty(insideElements) then
insideElements := inInsideElements;
outsideElements := inOutsideElements;
end if;
if listEmpty(outsideElements) then
algorithm
if listEmpty(inOutsideElements) then
// No outside components.
inside_sum1 := sumMap(insideElements, sumInside1, inFlowThreshold);
inside_sum2 := sumMap(insideElements, sumInside2, inFlowThreshold);
inside_sum1 := sumMap(inInsideElements, sumInside1, inFlowThreshold);
inside_sum2 := sumMap(inInsideElements, sumInside2, inFlowThreshold);
outSumExp := Expression.expDiv(inside_sum1, inside_sum2);
elseif listEmpty(insideElements) then
elseif listEmpty(inInsideElements) then
// No inside components.
outside_sum1 := sumMap(outsideElements, sumOutside1, inFlowThreshold);
outside_sum2 := sumMap(outsideElements, sumOutside2, inFlowThreshold);
outside_sum1 := sumMap(inOutsideElements, sumOutside1, inFlowThreshold);
outside_sum2 := sumMap(inOutsideElements, sumOutside2, inFlowThreshold);
outSumExp := Expression.expDiv(outside_sum1, outside_sum2);
else
// Both outside and inside components.
outside_sum1 := sumMap(outsideElements, sumOutside1, inFlowThreshold);
outside_sum2 := sumMap(outsideElements, sumOutside2, inFlowThreshold);
inside_sum1 := sumMap(insideElements, sumInside1, inFlowThreshold);
inside_sum2 := sumMap(insideElements, sumInside2, inFlowThreshold);
outside_sum1 := sumMap(inOutsideElements, sumOutside1, inFlowThreshold);
outside_sum2 := sumMap(inOutsideElements, sumOutside2, inFlowThreshold);
inside_sum1 := sumMap(inInsideElements, sumInside1, inFlowThreshold);
inside_sum2 := sumMap(inInsideElements, sumInside2, inFlowThreshold);
outSumExp := Expression.expDiv(Expression.expAdd(outside_sum1, inside_sum1),
Expression.expAdd(outside_sum2, inside_sum2));
end if;
end streamSumEquationExp;

protected function isZeroFlow
"Returns true if the given flow attribute of a connector is zero."
input ConnectorElement inElement;
input String attr;
output Boolean isZero = false;
protected
DAE.Type ty;
Option<DAE.Exp> attr_oexp;
DAE.Exp flow_exp, attr_exp;
algorithm
flow_exp := flowExp(inElement);
ty := Expression.typeof(flow_exp);
attr_oexp := Types.lookupAttributeExp(Types.getAttributes(ty), attr);
if isSome(attr_oexp) then
SOME(attr_exp) := attr_oexp;
isZero := Expression.isZero(attr_exp);
else
isZero := false;
end if;
end isZeroFlow;

protected function sumMap
"Creates a sum expression by applying the given function on the list of
elements and summing up the resulting expressions."
Expand Down Expand Up @@ -3210,8 +3214,11 @@ protected function generateInStreamExp
input array<Set> inSetArray;
input Real inFlowThreshold;
output DAE.Exp outExp;
protected
list<ConnectorElement> reducedStreams;
algorithm
outExp := match inStreams
reducedStreams := List.filterOnFalse(inStreams, function isZeroFlowMinMax(inStreamCref = inStreamCref));
outExp := match reducedStreams
local
DAE.ComponentRef c;
Connect.Face f1, f2;
Expand All @@ -3230,7 +3237,7 @@ algorithm
Connect.CONNECTOR_ELEMENT(face = Connect.INSIDE())}
algorithm
{Connect.CONNECTOR_ELEMENT(name = c)} :=
removeStreamSetElement(inStreamCref, inStreams);
removeStreamSetElement(inStreamCref, reducedStreams);
e := Expression.crefExp(c);
then
e;
Expand All @@ -3242,15 +3249,15 @@ algorithm
algorithm
false := faceEqual(f1, f2);
{Connect.CONNECTOR_ELEMENT(name = c)} :=
removeStreamSetElement(inStreamCref, inStreams);
removeStreamSetElement(inStreamCref, reducedStreams);
e := evaluateInStream(c, inSets, inSetArray, inFlowThreshold);
then
e;

// The general case:
else
algorithm
(outside, inside) := List.splitOnTrue(inStreams, isOutsideStream);
(outside, inside) := List.splitOnTrue(reducedStreams, isOutsideStream);
inside := removeStreamSetElement(inStreamCref, inside);
e := streamSumEquationExp(outside, inside, inFlowThreshold);
// Evaluate any inStream calls that were generated.
Expand Down

0 comments on commit 7c85c2e

Please sign in to comment.