Merge pull request #2040 from ibpsa/issue2039_functionInlining

Issue2039 function inlining

Author: mwetter

IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Airflow_Multizone_Examples_OneOpenDoor.txt

@@ -1,12 +1,12 @@
-last-generated=2018-06-07
+last-generated=2025-08-22
 statistics-simulation=
 {
   "linear": "0",
   "nonlinear": "1",
   "number of continuous time states": "5",
   "numerical Jacobians": "0"
 }
-simpleZone.volRoom.T=[2.931499938964844e+02, 2.904224243164062e+02, 2.903838195800781e+02, 2.903834228515625e+02, 2.903833923339844e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.908861389160156e+02, 2.910499877929688e+02, 2.910529174804688e+02, 2.91052978515625e+02, 2.91052978515625e+02, 2.91052978515625e+02, 2.91052978515625e+02, 2.91052978515625e+02, 2.91052978515625e+02, 2.91052978515625e+02, 2.91052978515625e+02, 2.91052978515625e+02, 2.91052978515625e+02, 2.91052978515625e+02, 2.91052978515625e+02, 2.91052978515625e+02, 2.91052978515625e+02, 2.91052978515625e+02, 2.91052978515625e+02, 2.91052978515625e+02, 2.91052978515625e+02, 2.91052978515625e+02, 2.91052978515625e+02, 2.91052978515625e+02, 2.91052978515625e+02, 2.91052978515625e+02, 2.91052978515625e+02, 2.91052978515625e+02, 2.91052978515625e+02, 2.91052978515625e+02, 2.91052978515625e+02, 2.91052978515625e+02, 2.91052978515625e+02, 2.91052978515625e+02]
 time=[0e+00, 6e+06]
-bou.ports[2].m_flow=[0e+00, 3.341532945632935e-01, 3.364447057247162e-01, 3.364683091640472e-01, 3.364692628383636e-01, 3.364689350128174e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.052481710910794e-01, 2.943538427352905e-01, 2.941556572914124e-01, 2.941518127918243e-01, 2.941517531871796e-01, 2.941518127918243e-01, 2.941518127918243e-01, 2.941518127918243e-01, 2.941518127918243e-01, 2.941518127918243e-01, 2.941518127918243e-01, 2.941518127918243e-01, 2.941518127918243e-01, 2.941518127918243e-01, 2.941518127918243e-01, 2.941518127918243e-01, 2.941518127918243e-01, 2.941518127918243e-01, 2.941518127918243e-01, 2.941518127918243e-01, 2.941518127918243e-01, 2.941518127918243e-01, 2.941518127918243e-01, 2.941518127918243e-01, 2.941518127918243e-01, 2.941518127918243e-01, 2.941518127918243e-01, 2.941518127918243e-01, 2.941518127918243e-01, 2.941518127918243e-01, 2.941518127918243e-01, 2.941518127918243e-01, 2.941518127918243e-01, 2.941518127918243e-01]
-bou.ports[1].m_flow=[0e+00, -2.841533124446869e-01, -2.864447236061096e-01, -2.864683270454407e-01, -2.864692509174347e-01, -2.864689230918884e-01, -2.86468893289566e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.552481591701504e-01, -2.443538308143616e-01, -2.441556602716446e-01, -2.441518306732178e-01, -2.441517859697342e-01, -2.441518008708954e-01, -2.441518008708954e-01, -2.441518157720566e-01, -2.441518157720566e-01, -2.441518157720566e-01, -2.441518157720566e-01, -2.441518157720566e-01, -2.441518157720566e-01, -2.441518157720566e-01, -2.441518157720566e-01, -2.441518008708954e-01, -2.441518008708954e-01, -2.441518008708954e-01, -2.441518008708954e-01, -2.441518008708954e-01, -2.441518008708954e-01, -2.441518008708954e-01, -2.441518008708954e-01, -2.441518008708954e-01, -2.441518008708954e-01, -2.441518008708954e-01, -2.441518157720566e-01, -2.441518157720566e-01, -2.441518157720566e-01, -2.441518157720566e-01, -2.441518157720566e-01, -2.441518157720566e-01, -2.441518008708954e-01, -2.441518008708954e-01]
+simpleZone.volRoom.T=[2.931499938964844e+02, 2.904224548339844e+02, 2.903838195800781e+02, 2.903829345703125e+02, 2.903834533691406e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.903834228515625e+02, 2.9088623046875e+02, 2.910501098632812e+02, 2.910528869628906e+02, 2.91052978515625e+02, 2.91052978515625e+02, 2.91052978515625e+02, 2.91052978515625e+02, 2.91052978515625e+02, 2.91052978515625e+02, 2.91052978515625e+02, 2.91052978515625e+02, 2.91052978515625e+02, 2.91052978515625e+02, 2.91052978515625e+02, 2.91052978515625e+02, 2.91052978515625e+02, 2.91052978515625e+02, 2.91052978515625e+02, 2.91052978515625e+02, 2.91052978515625e+02, 2.91052978515625e+02, 2.91052978515625e+02, 2.91052978515625e+02, 2.91052978515625e+02, 2.91052978515625e+02, 2.91052978515625e+02, 2.91052978515625e+02, 2.91052978515625e+02, 2.91052978515625e+02, 2.91052978515625e+02, 2.91052978515625e+02, 2.91052978515625e+02, 2.91052978515625e+02, 2.91052978515625e+02]
+bou.ports[1].m_flow=[0e+00, -2.841519713401794e-01, -2.864576876163483e-01, -2.888666391372681e-01, -2.864698469638824e-01, -2.864722013473511e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.86468893289566e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688336849213e-01, -2.864688336849213e-01, -2.864688336849213e-01, -2.864688336849213e-01, -2.864688336849213e-01, -2.864688336849213e-01, -2.864688336849213e-01, -2.864688336849213e-01, -2.864688336849213e-01, -2.864688336849213e-01, -2.864688336849213e-01, -2.864688336849213e-01, -2.864688336849213e-01, -2.864688336849213e-01, -2.864688336849213e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.864688634872437e-01, -2.552406489849087e-01, -2.443323880434037e-01, -2.441579401493073e-01, -2.441520839929581e-01, -2.441521435976028e-01, -2.441518008708954e-01, -2.441517412662506e-01, -2.441517412662506e-01, -2.441518008708954e-01, -2.441518157720566e-01, -2.441518157720566e-01, -2.441518157720566e-01, -2.441518157720566e-01, -2.441518157720566e-01, -2.441518157720566e-01, -2.441518157720566e-01, -2.441518157720566e-01, -2.441518157720566e-01, -2.441518157720566e-01, -2.441518157720566e-01, -2.441518157720566e-01, -2.441518157720566e-01, -2.441518157720566e-01, -2.441518157720566e-01, -2.441518157720566e-01, -2.441518157720566e-01, -2.441518157720566e-01, -2.441518157720566e-01, -2.441518157720566e-01, -2.441518157720566e-01, -2.441518157720566e-01, -2.441518157720566e-01, -2.441518157720566e-01, -2.441518157720566e-01]
+bou.ports[2].m_flow=[0e+00, 3.341511487960815e-01, 3.364364206790924e-01, 3.349625766277313e-01, 3.364636898040771e-01, 3.36466908454895e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688456058502e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.364688754081726e-01, 3.052432835102078e-01, 2.943518757820129e-01, 2.941577136516571e-01, 2.941520810127258e-01, 2.941521406173706e-01, 2.941518425941467e-01, 2.941517531871796e-01, 2.941517233848572e-01, 2.94151782989502e-01, 2.94151782989502e-01, 2.941518127918243e-01, 2.941518127918243e-01, 2.941518127918243e-01, 2.941518127918243e-01, 2.941518127918243e-01, 2.941518127918243e-01, 2.941518127918243e-01, 2.941518127918243e-01, 2.941518127918243e-01, 2.941518127918243e-01, 2.941518127918243e-01, 2.941518127918243e-01, 2.941518127918243e-01, 2.941518127918243e-01, 2.941518127918243e-01, 2.941518127918243e-01, 2.941518127918243e-01, 2.941518127918243e-01, 2.941518127918243e-01, 2.941518127918243e-01, 2.941518127918243e-01, 2.941518127918243e-01, 2.941518127918243e-01, 2.941518127918243e-01]

IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Experimental_Benchmarks_AirFlow_Examples_ZoneStepResponse.txt

@@ -6,11 +6,9 @@ function bicubic "Bicubic function"
  input Real x2 "Independent variable";
  output Real y "Result";
 protected
- Real x1Sq "= x1^2";
- Real x2Sq "= x2^2";
+ Real x1Sq = x1*x1 "x1 squared";
+ Real x2Sq = x2*x2 "x2 squared";
 algorithm
-  x1Sq :=x1*x1;
-  x2Sq :=x2*x2;
   y := a[1] + a[2] * x1 + a[3] * x1^2
             + a[4] * x2 + a[5] * x2^2
             + a[6] * x1 * x2
@@ -19,7 +17,7 @@ algorithm
             + a[9] * x1Sq * x2
             + a[10] * x1 * x2Sq;
 
-  annotation (smoothOrder=999, Documentation(info="<html>
+  annotation (smoothOrder=999, Inline=true, Documentation(info="<html>
 <p>
 This function computes
 </p>
@@ -36,6 +34,12 @@ This function computes
 </html>", revisions="<html>
 <ul>
 <li>
+July 21, 2025 by Hongxiang Fu:<br/>
+Made the function inlined.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4278\">#4278</a>.
+</li>
+<li>
 June 25, 2023, by Michael Wetter:<br/>
 Corrected html formatting.
 </li>

IBPSA/Utilities/Math/Functions/bicubic.mo

@@ -7,12 +7,11 @@ function quadraticLinear
  input Real x2 "Independent variable for linear part";
  output Real y "Result";
 protected
- Real x1Sq;
+ Real x1Sq=x1*x1;
 algorithm
-  x1Sq :=x1*x1;
-  y :=a[1] + a[2]*x1 + a[3]*x1Sq + (a[4] + a[5]*x1 + a[6]*x1Sq)*x2;
+  y := a[1] + a[2]*x1 + a[3]*x1Sq + (a[4] + a[5]*x1 + a[6]*x1Sq)*x2;
 
-  annotation (smoothOrder=999, Documentation(info="<html>
+  annotation (smoothOrder=999, Inline=true, Documentation(info="<html>
 This function computes
 <p align=\"center\" style=\"font-style:italic;\">
   y =   a<sub>1</sub> + a<sub>2</sub>  x<sub>1</sub>
@@ -23,6 +22,12 @@ This function computes
 </html>", revisions="<html>
 <ul>
 <li>
+July 21, 2025 by Matthis Thorade and Hongxiang Fu:<br/>
+Made the function inlined.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4278\">#4278</a>.
+</li>
+<li>
 February 29, 2009 by Michael Wetter:<br/>
 First implementation.
 </li>

IBPSA/Utilities/Math/Functions/quadraticLinear.mo

@@ -29,10 +29,16 @@ protected
 algorithm
   y :=H0*y1 + H1*y1d*h  + H2*y1dd*hpow2 + H3*y2dd*hpow2 + H4*y2d*h + H5*y2;
 
-annotation (smoothOrder=99,
+annotation (smoothOrder=99, Inline=true,
 Documentation(revisions="<html>
 <ul>
 <li>
+July 21, 2025 by Hongxiang Fu:<br/>
+Made the function inlined.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4278\">#4278</a>.
+</li>
+<li>
 April 19, 2017, by Filip Jorissen:<br/>
 First implementation.
 </li>

IBPSA/Utilities/Math/Functions/quinticHermite.mo

@@ -11,7 +11,7 @@ protected
 algorithm
   y := smooth(2, max(0, min(1, 0.5+dx*(1.875+xpow2*(-5+6*xpow2)))));
 
- annotation (smoothOrder = 2,
+ annotation (smoothOrder = 2, Inline=true,
  Documentation(info="<html>
 <p>
 Twice Lipschitz continuously differentiable approximation to the
@@ -24,6 +24,12 @@ IBPSA.Utilities.Math.Examples.SmoothHeaviside</a>.
 </html>", revisions="<html>
 <ul>
 <li>
+July 21, 2025 by Hongxiang Fu:<br/>
+Made the function inlined.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4278\">#4278</a>.
+</li>
+<li>
 October 21, 2019:<br/>
 Added <code>delta.min</code> attribute to guard against division by zero.<br/>
 This is for

IBPSA/Utilities/Math/Functions/smoothHeaviside.mo

@@ -9,12 +9,13 @@ function smoothLimit
   output Real y "Result";
 
 protected
-  Real cor;
+  Real cor = deltaX/10;
 algorithm
-  cor :=deltaX/10;
-  y := IBPSA.Utilities.Math.Functions.smoothMax(x,l+deltaX,cor);
-  y := IBPSA.Utilities.Math.Functions.smoothMin(y,u-deltaX,cor);
-  annotation (smoothOrder = 1,
+  y := IBPSA.Utilities.Math.Functions.smoothMin(
+         IBPSA.Utilities.Math.Functions.smoothMax(
+           x,l+deltaX,cor),
+         u-deltaX,cor);
+  annotation (smoothOrder = 1, Inline=true,
   Documentation(info="<html>
 <p>
 Once continuously differentiable approximation to the <code>limit(.,.)</code> function.
@@ -28,6 +29,12 @@ IBPSA.Utilities.Math.Examples.SmoothMin</a>.
 </html>", revisions="<html>
 <ul>
 <li>
+July 21, 2025 by Hongxiang Fu:<br/>
+Made the function inlined.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4278\">#4278</a>.
+</li>
+<li>
 March 12, 2015, by Filip Jorissen:<br/>
 Added documentation reference demonstrating overshoot.
 </li>