Skip to content

Commit

Permalink
reverted double insertion of jump management from r7267
Browse files Browse the repository at this point in the history
  • Loading branch information
svenruetz committed May 12, 2014
1 parent 15a8c76 commit 521f20d
Showing 1 changed file with 1 addition and 29 deletions.
30 changes: 1 addition & 29 deletions Modelica_ResultCompare/Tubes.cs
Original file line number Diff line number Diff line change
Expand Up @@ -314,34 +314,7 @@ public void CalculateTubes(System.Array x, System.Array y, List<double> xHigh, L
yLow.Add(_dY2 - _dDelta * _dS);
}
else
{
if (bJump)
{
// initial values upper tube
_li0h[0] = i - 1;
_lmh[0] = 0.0;
xHigh.Add(_dX2 - _dDelta - _dXMinStep);
yHigh.Add(_dY2 + _dDelta * _dS);
_li0h.Add(i);
_li1h.Add(i - 1);
_lmh.Add(_dCurrentSlope);
xHigh.Add(_dX2 - _dDelta * _dCurrentSlope / (_dS + Math.Sqrt((_dCurrentSlope * _dCurrentSlope) + (_dS * _dS))));
yHigh.Add(_dY2 + _dDelta * _dS);

// initial values lower tube
_li0l[0] = i - 1;
_lml[0] = 0.0;
xLow.Add(_dX2 - _dDelta - _dXMinStep);
yLow.Add(_dY2 - _dDelta * _dS);
_li0l.Add(i);
_li1l.Add(i - 1);
_lml.Add(_dCurrentSlope);
xLow.Add(_dX2 + _dDelta * _dCurrentSlope / (_dS + Math.Sqrt((_dCurrentSlope * _dCurrentSlope) + (_dS * _dS))));
yLow.Add(_dY2 - _dDelta * _dS);
}
else
{
// initial values upper tube
{ // initial values upper tube
xHigh.Add(_dX2 - _dDelta);
yHigh.Add(_dY2 - _dCurrentSlope * _dDelta + _dDelta * Math.Sqrt((_dCurrentSlope * _dCurrentSlope) + (_dS * _dS)));

Expand All @@ -350,7 +323,6 @@ public void CalculateTubes(System.Array x, System.Array y, List<double> xHigh, L
yLow.Add(_dY2 - _dCurrentSlope * _dDelta - _dDelta * Math.Sqrt((_dCurrentSlope * _dCurrentSlope) + (_dS * _dS)));
}
}
}
else // if not 1st interval (3.2.6)
{
// fill lists with new values, set X and Y to arbitrary value (3.2.6.1)
Expand Down

0 comments on commit 521f20d

Please sign in to comment.