Skip to content

Commit

Permalink
[NF] Update inStream tests.
Browse files Browse the repository at this point in the history 
Belonging to [master]:
  - OpenModelica/OMCompiler#2329
  - OpenModelica/OpenModelica-testsuite#907
  • Loading branch information
@perost @OpenModelica-Hudson
perost authored and OpenModelica-Hudson committed Mar 28, 2018
1 parent 21c648d commit b8fa29d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions flattening/modelica/scodeinst/InStreamFlowThreshold.mo
View file
Expand Up @@ -55,9 +55,9 @@ end InStreamFlowThreshold;
// a.s2.r = a.s3.r;
// a.s2.r = a.s1.r;
// (-a.s2.f) + (-a.s3.f) + (-a.s1.f) = 0.0;
// a.s1.s = (max(a.s3.f, 2.0) * a.s3.s + max(a.s2.f, 2.0) * a.s2.s) / (max(a.s3.f, 2.0) + max(a.s2.f, 2.0)) " equation generated from stream connection";
// a.s3.s = (max(a.s1.f, 2.0) * a.s1.s + max(a.s2.f, 2.0) * a.s2.s) / (max(a.s1.f, 2.0) + max(a.s2.f, 2.0)) " equation generated from stream connection";
// a.s2.s = (max(a.s1.f, 2.0) * a.s1.s + max(a.s3.f, 2.0) * a.s3.s) / (max(a.s1.f, 2.0) + max(a.s3.f, 2.0)) " equation generated from stream connection";
// a.s1.s = ($OMC$PositiveMax(a.s3.f, 2.0) * a.s3.s + $OMC$PositiveMax(a.s2.f, 2.0) * a.s2.s) / ($OMC$PositiveMax(a.s3.f, 2.0) + $OMC$PositiveMax(a.s2.f, 2.0)) " equation generated from stream connection";
// a.s3.s = ($OMC$PositiveMax(a.s1.f, 2.0) * a.s1.s + $OMC$PositiveMax(a.s2.f, 2.0) * a.s2.s) / ($OMC$PositiveMax(a.s1.f, 2.0) + $OMC$PositiveMax(a.s2.f, 2.0)) " equation generated from stream connection";
// a.s2.s = ($OMC$PositiveMax(a.s1.f, 2.0) * a.s1.s + $OMC$PositiveMax(a.s3.f, 2.0) * a.s3.s) / ($OMC$PositiveMax(a.s1.f, 2.0) + $OMC$PositiveMax(a.s3.f, 2.0)) " equation generated from stream connection";
// a.s1.f = 0.0;
// a.s2.f = 0.0;
// a.s3.f = 0.0;
Expand Down
6 changes: 3 additions & 3 deletions flattening/modelica/scodeinst/InStreamNominalThreshold.mo
View file
Expand Up @@ -55,9 +55,9 @@ end InStreamNominalThreshold;
// a.s2.r = a.s3.r;
// a.s2.r = a.s1.r;
// (-a.s2.f) + (-a.s3.f) + (-a.s1.f) = 0.0;
// a.s1.s = (max(a.s3.f, 1e-07) * a.s3.s + max(a.s2.f, 1e-07 * 2000.0) * a.s2.s) / (max(a.s3.f, 1e-07) + max(a.s2.f, 1e-07 * 2000.0)) " equation generated from stream connection";
// a.s3.s = (max(a.s1.f, 1e-07 * 0.001) * a.s1.s + max(a.s2.f, 1e-07 * 2000.0) * a.s2.s) / (max(a.s1.f, 1e-07 * 0.001) + max(a.s2.f, 1e-07 * 2000.0)) " equation generated from stream connection";
// a.s2.s = (max(a.s1.f, 1e-07 * 0.001) * a.s1.s + max(a.s3.f, 1e-07) * a.s3.s) / (max(a.s1.f, 1e-07 * 0.001) + max(a.s3.f, 1e-07)) " equation generated from stream connection";
// a.s1.s = ($OMC$PositiveMax(a.s3.f, 1e-07) * a.s3.s + $OMC$PositiveMax(a.s2.f, 1e-07 * 2000.0) * a.s2.s) / ($OMC$PositiveMax(a.s3.f, 1e-07) + $OMC$PositiveMax(a.s2.f, 1e-07 * 2000.0)) " equation generated from stream connection";
// a.s3.s = ($OMC$PositiveMax(a.s1.f, 1e-07 * 0.001) * a.s1.s + $OMC$PositiveMax(a.s2.f, 1e-07 * 2000.0) * a.s2.s) / ($OMC$PositiveMax(a.s1.f, 1e-07 * 0.001) + $OMC$PositiveMax(a.s2.f, 1e-07 * 2000.0)) " equation generated from stream connection";
// a.s2.s = ($OMC$PositiveMax(a.s1.f, 1e-07 * 0.001) * a.s1.s + $OMC$PositiveMax(a.s3.f, 1e-07) * a.s3.s) / ($OMC$PositiveMax(a.s1.f, 1e-07 * 0.001) + $OMC$PositiveMax(a.s3.f, 1e-07)) " equation generated from stream connection";
// a.s1.f = 0.0;
// a.s2.f = 0.0;
// a.s3.f = 0.0;
Expand Down

0 comments on commit b8fa29d

Please sign in to comment.