Merge pull request #1641 from ibpsa/thorade-der_spliceFunction

der_spliceFunction check limits
ibpsa · Sep 28, 2022 · 36b9a23 · 36b9a23
2 parents 2584136 + d140830
commit 36b9a23
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/IBPSA/Utilities/Math/Functions/BaseClasses/der_spliceFunction.mo b/IBPSA/Utilities/Math/Functions/BaseClasses/der_spliceFunction.mo
@@ -11,16 +11,17 @@ function der_spliceFunction "Derivative of splice function"
   input Real ddeltax=0;
   output Real out;
 protected
+  constant Real lim = 0.9999999999 "Limit in criterion for smoothing range";
   Real scaledX1 "x scaled to -1 ... 1 interval";
   Real scaledXp "x scaled to -pi/2 ... pi/2 interval";
   Real scaledXt "x scaled to -inf ... inf interval";
   Real dscaledX1;
   Real y;
 algorithm
   scaledX1 := x/deltax;
-  if scaledX1 <= -0.9999999999 then
+  if scaledX1 <= -lim then
     y := 0.0;
-  elseif scaledX1 >= 0.9999999999 then
+  elseif scaledX1 >= lim then
     y := 1.0;
   else
     scaledXp := scaledX1*0.5*Modelica.Constants.pi;
@@ -29,7 +30,7 @@ algorithm
   end if;
   out := dpos*y + (1 - y)*dneg;
 
-  if (abs(scaledX1) < 1) then
+  if (abs(scaledX1) < lim) then
     dscaledX1 := (dx - scaledX1*ddeltax)/deltax;
     out := out + (pos - neg)*dscaledX1*0.25*Modelica.Constants.pi*(1 - Modelica.Math.tanh(scaledXt)^2)*(scaledXt^2 + 1);
   end if;
@@ -47,6 +48,11 @@ IBPSA.Utilities.Math.Functions.spliceFunction</a>.
 revisions="<html>
 <ul>
 <li>
+September 27, 2022, by Matthis Thorade:<br/>
+Changed limits.<br/>
+This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/pull/1640\">IBPSA, issue #1640</a>.
+</li>
+<li>
 October 13, 2021, by Michael Wetter:<br/>
 Changed implementation to not use <code>cosh</code> which overflows around <i>800</i>.<br/>
 This is for

diff --git a/IBPSA/Utilities/Math/Functions/spliceFunction.mo b/IBPSA/Utilities/Math/Functions/spliceFunction.mo
@@ -7,14 +7,15 @@ function spliceFunction
     input Real deltax "Half width of transition interval";
     output Real out "Smoothed value";
 protected
+    constant Real lim = 0.9999999999;
     Real scaledX1;
     Real y;
     constant Real asin1 = Modelica.Math.asin(1);
 algorithm
     scaledX1 := x/deltax;
-    if scaledX1 <= -0.999999999 then
+    if scaledX1 <= -lim then
       out := neg;
-    elseif scaledX1 >= 0.999999999 then
+    elseif scaledX1 >= lim then
       out := pos;
     else
       y := (Modelica.Math.tanh(Modelica.Math.tan(scaledX1*asin1)) + 1)/2;
@@ -37,6 +38,11 @@ for easier accessability to model developers.
 </html>", revisions="<html>
 <ul>
 <li>
+September 27, 2022, by Matthis Thorade:<br/>
+Changed limits.<br/>
+This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/pull/1640\">IBPSA, issue #1640</a>.
+</li>
+<li>
 May 10, 2013, by Michael Wetter:<br/>
 Reformulated implementation to avoid unrequired computations.
 </li>