diff --git a/.travis.yml b/.travis.yml
index 85c736f61dd..c1773ac8bb1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -110,7 +110,6 @@ env:
     - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.Templates\""
     - TEST_ARG="make test-openmodelica  PACKAGE=\"Buildings.Templates\""
     - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.Templates\""
-    - TEST_ARG="make test-templates-optimica"
     - TEST_ARG="make test-templates-dymola"
 
 before_install:
@@ -180,7 +179,7 @@ script:
   - |
     TRAVIS_WAIT=90
     if [[ "$TEST_ARG" == *test-templates* ]]; then
-      TRAVIS_WAIT=180
+      TRAVIS_WAIT=120
     fi
     (cd Buildings/Resources/Scripts/travis && travis_wait $TRAVIS_WAIT $TEST_ARG)
 
diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Validation/Controller.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Validation/Controller.mo
index afcceb0434f..f3aab032d64 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Validation/Controller.mo
+++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Validation/Controller.mo
@@ -115,11 +115,20 @@ model Controller "Validation controller model"
     final period=3600)
     "Freeze protection reset"
     annotation (Placement(transformation(extent={{-240,-170},{-220,-150}})));
-  Buildings.Controls.OBC.CDL.Logical.TrueFalseHold truFalHol(
-    final trueHoldDuration=1)
-    "Break loop"
-    annotation (Placement(transformation(extent={{220,30},{240,50}})));
-
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea(
+    final realTrue=1,
+    final realFalse=0)
+    "Convert to real"
+    annotation (Placement(transformation(extent={{190,70},{170,90}})));
+  Buildings.Fluid.BaseClasses.ActuatorFilter fil(
+    final f=5/(2*Modelica.Constants.pi*10),
+    initType=Modelica.Blocks.Types.Init.InitialOutput,
+    final y_start=0)
+    "Filter signal"
+    annotation (Placement(transformation(extent={{160,70},{140,90}})));
+  Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr(final t=0.5)
+    "Compare filtered signal to threshold to trigger true status"
+    annotation (Placement(transformation(extent={{130,70},{110,90}})));
 equation
   connect(TOut.y, conAHU.TOut) annotation (Line(points={{-218,190},{62,190},{62,
           25.4545},{96,25.4545}},  color={0,0,127}));
@@ -159,11 +168,6 @@ equation
     annotation (Line(points={{-218,-160},{-202,-160}}, color={255,0,255}));
   connect(not1.y, conAHU.u1SofSwiRes) annotation (Line(points={{-178,-160},{56,
           -160},{56,-76.3636},{96,-76.3636}}, color={255,0,255}));
-  connect(conAHU.y1SupFan, truFalHol.u) annotation (Line(points={{184,-40},{200,
-          -40},{200,40},{218,40}}, color={255,0,255}));
-  connect(truFalHol.y, conAHU.u1SupFan) annotation (Line(points={{242,40},{250,
-          40},{250,70},{50,70},{50,16.3636},{96,16.3636}},
-                                                       color={255,0,255}));
   connect(sumDesPopBreZon.y, conAHU.VSumAdjPopBreZon_flow) annotation (Line(
         points={{-178,100},{38,100},{38,5.45455},{96,5.45455}}, color={0,0,127}));
   connect(sumDesAreBreZon.y, conAHU.VSumAdjAreBreZon_flow) annotation (Line(
@@ -172,6 +176,14 @@ equation
           {32,-3.63636},{96,-3.63636}}, color={0,0,127}));
   connect(opeMod.y, conAHU.uAhuOpeMod) annotation (Line(points={{-178,250},{80,
           250},{80,38.1818},{96,38.1818}}, color={255,127,0}));
+  connect(booToRea.y, fil.u)
+    annotation (Line(points={{168,80},{162,80}}, color={0,0,127}));
+  connect(fil.y, greThr.u)
+    annotation (Line(points={{139,80},{132,80}}, color={0,0,127}));
+  connect(greThr.y, conAHU.u1SupFan) annotation (Line(points={{108,80},{86,80},
+          {86,16.3636},{96,16.3636}}, color={255,0,255}));
+  connect(conAHU.y1SupFan, booToRea.u) annotation (Line(points={{184,-40},{200,
+          -40},{200,80},{192,80}}, color={255,0,255}));
 annotation (experiment(StopTime=3600.0, Tolerance=1e-06),
   __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Validation/Controller.mos"
     "Simulate and plot"),
@@ -184,6 +196,11 @@ Buildings.Controls.OBC.ASHRAE.G36.AHUs.MultiZone.VAV.Controller</a>.
 </html>", revisions="<html>
 <ul>
 <li>
+June 27, 2024, by Antoine Gautier:<br/>
+Refactored the computation of the supply fan status.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3787\">#3787</a>.
+</li>
+<li>
 February 8, 2022, by Jianjun Hu:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Validation/Controller_UnspecifiedClimate.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Validation/Controller_UnspecifiedClimate.mo
index 16c920d5d90..4f3ce917d8e 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Validation/Controller_UnspecifiedClimate.mo
+++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Validation/Controller_UnspecifiedClimate.mo
@@ -122,11 +122,20 @@ model Controller_UnspecifiedClimate
     final period=3600)
     "Freeze protection reset"
     annotation (Placement(transformation(extent={{-240,-170},{-220,-150}})));
-  Buildings.Controls.OBC.CDL.Logical.TrueFalseHold truFalHol(
-    final trueHoldDuration=1)
-    "Break loop"
-    annotation (Placement(transformation(extent={{220,30},{240,50}})));
-
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea(
+    final realTrue=1,
+    final realFalse=0)
+    "Convert to real"
+    annotation (Placement(transformation(extent={{190,70},{170,90}})));
+  Buildings.Fluid.BaseClasses.ActuatorFilter fil(
+    final f=5/(2*Modelica.Constants.pi*10),
+    initType=Modelica.Blocks.Types.Init.InitialOutput,
+    final y_start=0)
+    "Filter signal"
+    annotation (Placement(transformation(extent={{160,70},{140,90}})));
+  Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr(final t=0.5)
+    "Compare filtered signal to threshold to trigger true status"
+    annotation (Placement(transformation(extent={{130,70},{110,90}})));
 equation
   connect(TOut.y, conAHU.TOut) annotation (Line(points={{-218,190},{62,190},{62,
           25.4545},{96,25.4545}},  color={0,0,127}));
@@ -166,11 +175,6 @@ equation
     annotation (Line(points={{-218,-160},{-202,-160}}, color={255,0,255}));
   connect(not1.y, conAHU.u1SofSwiRes) annotation (Line(points={{-178,-160},{56,
           -160},{56,-76.3636},{96,-76.3636}}, color={255,0,255}));
-  connect(conAHU.y1SupFan, truFalHol.u) annotation (Line(points={{184,-40},{200,
-          -40},{200,40},{218,40}}, color={255,0,255}));
-  connect(truFalHol.y, conAHU.u1SupFan) annotation (Line(points={{242,40},{250,
-          40},{250,70},{50,70},{50,16.3636},{96,16.3636}},
-                                                       color={255,0,255}));
   connect(sumDesPopBreZon.y, conAHU.VSumAdjPopBreZon_flow) annotation (Line(
         points={{-178,100},{38,100},{38,5.45455},{96,5.45455}}, color={0,0,127}));
   connect(sumDesAreBreZon.y, conAHU.VSumAdjAreBreZon_flow) annotation (Line(
@@ -179,6 +183,14 @@ equation
           {32,-3.63636},{96,-3.63636}}, color={0,0,127}));
   connect(opeMod.y, conAHU.uAhuOpeMod) annotation (Line(points={{-178,250},{80,
           250},{80,38.1818},{96,38.1818}}, color={255,127,0}));
+  connect(booToRea.y, fil.u)
+    annotation (Line(points={{168,80},{162,80}}, color={0,0,127}));
+  connect(fil.y, greThr.u)
+    annotation (Line(points={{139,80},{132,80}}, color={0,0,127}));
+  connect(conAHU.y1SupFan, booToRea.u) annotation (Line(points={{184,-40},{200,
+          -40},{200,80},{192,80}}, color={255,0,255}));
+  connect(greThr.y, conAHU.u1SupFan) annotation (Line(points={{108,80},{86,80},
+          {86,16.3636},{96,16.3636}}, color={255,0,255}));
 annotation (experiment(StopTime=3600.0, Tolerance=1e-06),
   __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Validation/Controller_UnspecifiedClimate.mos"
     "Simulate and plot"),
@@ -192,6 +204,11 @@ warning when the climate zone is not specified.
 </html>", revisions="<html>
 <ul>
 <li>
+June 27, 2024, by Antoine Gautier:<br/>
+Refactored the computation of the supply fan status.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3787\">#3787</a>.
+</li>
+<li>
 February 8, 2022, by Jianjun Hu:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Controls/OBC/ASHRAE/G36/ThermalZones/Setpoints.mo b/Buildings/Controls/OBC/ASHRAE/G36/ThermalZones/Setpoints.mo
index c5416895462..1c9fd27fc11 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36/ThermalZones/Setpoints.mo
+++ b/Buildings/Controls/OBC/ASHRAE/G36/ThermalZones/Setpoints.mo
@@ -240,8 +240,9 @@ protected
     final t=300)
     "Check whether the zone has been unpopulated for 5 minutes continuously during occupied mode"
     annotation (Placement(transformation(extent={{-220,-280},{-200,-260}})));
-  Buildings.Controls.OBC.CDL.Logical.TrueHold truHol(
-    final duration=60)
+  Buildings.Controls.OBC.CDL.Logical.TrueFalseHold truHol(
+    final falseHoldDuration=0,
+    final trueHoldDuration=60)
     "When the zone is unpopulated by more than threshold time and then becomes populated, hold the change by short period"
     annotation (Placement(transformation(extent={{-100,-280},{-80,-260}})));
   Buildings.Controls.OBC.CDL.Logical.Edge edg1
diff --git a/Buildings/Controls/OBC/CDL/Logical/TrueFalseHold.mo b/Buildings/Controls/OBC/CDL/Logical/TrueFalseHold.mo
index 703593ea794..76eac861d93 100644
--- a/Buildings/Controls/OBC/CDL/Logical/TrueFalseHold.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/TrueFalseHold.mo
@@ -4,106 +4,54 @@ block TrueFalseHold
   parameter Real trueHoldDuration(
     final quantity="Time",
     final unit="s")
-    "true hold duration";
+    "true hold duration"
+    annotation (Evaluate=true);
   parameter Real falseHoldDuration(
     final quantity="Time",
     final unit="s")=trueHoldDuration
-    "false hold duration";
+    "false hold duration"
+    annotation (Evaluate=true);
   Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u
     "Boolean input signal"
-    annotation (Placement(transformation(extent={{-220,-20},{-180,20}}),iconTransformation(extent={{-140,-20},{-100,20}})));
+    annotation (Placement(transformation(extent={{-140,-20},{-100,20}}),
+      iconTransformation(extent={{-140,-20},{-100,20}})));
   Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y
     "Boolean output signal"
-    annotation (Placement(transformation(extent={{160,-20},{200,20}}),iconTransformation(extent={{100,-20},{140,20}})));
-
+    annotation (Placement(transformation(extent={{100,-20},{140,20}}),
+      iconTransformation(extent={{100,-20},{140,20}})));
 protected
-  Buildings.Controls.OBC.CDL.Logical.TrueDelay onDel1(
-    delayTime=falseHoldDuration)
-    "Output true when timer elapsed the required time"
-    annotation (Placement(transformation(extent={{-100,-40},{-80,-20}})));
-  Buildings.Controls.OBC.CDL.Logical.TrueDelay onDel2(
-    delayTime=trueHoldDuration)
-    "Output true when timer elapsed the required time"
-    annotation (Placement(transformation(extent={{20,-70},{40,-50}})));
-  inner Modelica.StateGraph.StateGraphRoot stateGraphRoot
-    "Root of state graph"
-    annotation (Placement(transformation(extent={{-160,100},{-140,120}})));
-  Modelica.StateGraph.StepWithSignal outputFalse(
-    nIn=2, nOut=1)
-    "State for which the block outputs false"
-    annotation (Placement(transformation(extent={{-60,10},{-40,30}})));
-  Modelica.StateGraph.TransitionWithSignal toTrue
-    "Transition to true"
-    annotation (Placement(transformation(extent={{-30,10},{-10,30}})));
-  CDL.Logical.Not notU
-    "Negation of input"
-    annotation (Placement(transformation(extent={{-140,60},{-120,80}})));
-  Modelica.StateGraph.StepWithSignal outputTrue(
-    nIn=2, nOut=1)
-    "State with true output signal"
-    annotation (Placement(transformation(extent={{0,10},{20,30}})));
-  Modelica.StateGraph.TransitionWithSignal toFalse
-    "Transition to false"
-    annotation (Placement(transformation(extent={{30,10},{50,30}})));
-  CDL.Logical.And and2
-    "Check for input and elapsed timer"
-    annotation (Placement(transformation(extent={{60,-70},{80,-50}})));
-  CDL.Logical.And and1
-    "Check for input and elapsed timer"
-    annotation (Placement(transformation(extent={{-50,-40},{-30,-20}})));
-  Modelica.StateGraph.InitialStep initialStep(
-    nIn=0,
-    nOut=2)
-    "Initial state"
-    annotation (Placement(transformation(extent={{-120,100},{-100,120}})));
-  Modelica.StateGraph.TransitionWithSignal toTrue1
-    "Transition to true"
-    annotation (Placement(transformation(extent={{-70,102},{-50,122}})));
-  Modelica.StateGraph.TransitionWithSignal toFalse1
-    "Transition to false"
-    annotation (Placement(transformation(extent={{-90,80},{-70,100}})));
-
+  /* The following parameter is required solely as a warkaround for a bug in OCT [Modelon - 1263].
+  Both Dymola and OMC can handle the initial equation pre(u)=u, which complies with MLS. */
+  parameter Boolean pre_u_start=false
+    "Value of pre(u) at initial time"
+    annotation (Evaluate=true);
+  discrete Real entryTimeTrue(
+    final quantity="Time",
+    final unit="s")
+    "Time instant when true hold started";
+  discrete Real entryTimeFalse(
+    final quantity="Time",
+    final unit="s")
+    "Time instant when false hold started";
+initial equation
+  pre(entryTimeTrue) = -Modelica.Constants.inf;
+  pre(entryTimeFalse) = -Modelica.Constants.inf;
+  pre(u) = pre_u_start;
+  pre(y) = u;
 equation
-  connect(outputTrue.outPort[1],toFalse.inPort)
-    annotation (Line(points={{20.5,20},{28,20},{36,20}},color={0,0,0}));
-  connect(outputTrue.active,y)
-    annotation (Line(points={{10,9},{10,0},{180,0}},color={255,0,255}));
-  connect(outputFalse.outPort[1],toTrue.inPort)
-    annotation (Line(points={{-39.5,20},{-32,20},{-24,20}},color={0,0,0}));
-  connect(toFalse.outPort,outputFalse.inPort[1])
-    annotation (Line(points={{41.5,20},{60,20},{60,40},{-70,40},{-70,20.5},{-61,20.5}},color={0,0,0}));
-  connect(outputTrue.active,onDel2.u)
-    annotation (Line(points={{10,9},{10,0},{10,-60},{18,-60}},color={255,0,255}));
-  connect(notU.y,and2.u2)
-    annotation (Line(points={{-118,70},{140,70},{140,-80},{48,-80},{48,-68},{58,-68}},color={255,0,255}));
-  connect(and2.y,toFalse.condition)
-    annotation (Line(points={{82,-60},{100,-60},{100,-20},{40,-20},{40,8}},color={255,0,255}));
-  connect(outputFalse.active,onDel1.u)
-    annotation (Line(points={{-50,9},{-50,0},{-140,0},{-140,-30},{-102,-30}},color={255,0,255}));
-  connect(u,and1.u2)
-    annotation (Line(points={{-200,0},{-160,0},{-160,-50},{-60,-50},{-60,-38},{-52,-38},{-52,-38}},color={255,0,255}));
-  connect(and1.y,toTrue.condition)
-    annotation (Line(points={{-28,-30},{-20,-30},{-20,8}},color={255,0,255}));
-  connect(u,toTrue1.condition)
-    annotation (Line(points={{-200,0},{-160,0},{-160,52},{-60,52},{-60,100}},color={255,0,255}));
-  connect(toTrue1.outPort,outputTrue.inPort[1])
-    annotation (Line(points={{-58.5,112},{-10,112},{-10,20.5},{-1,20.5}},color={0,0,0}));
-  connect(toTrue.outPort,outputTrue.inPort[2])
-    annotation (Line(points={{-18.5,20},{-1,20},{-1,19.5}},color={0,0,0}));
-  connect(toFalse1.outPort,outputFalse.inPort[2])
-    annotation (Line(points={{-78.5,90},{-72,90},{-72,44},{-72,20},{-61,20},{-61,19.5}},color={0,0,0}));
-  connect(initialStep.outPort[1],toTrue1.inPort)
-    annotation (Line(points={{-99.5,110.25},{-90,110.25},{-90,110},{-90,112},{-64,112}},color={0,0,0}));
-  connect(initialStep.outPort[2],toFalse1.inPort)
-    annotation (Line(points={{-99.5,109.75},{-94,109.75},{-94,110},{-90,110},{-90,90},{-84,90}},color={0,0,0}));
-  connect(notU.u,u)
-    annotation (Line(points={{-142,70},{-160,70},{-160,0},{-200,0}},color={255,0,255}));
-  connect(notU.y,toFalse1.condition)
-    annotation (Line(points={{-118,70},{-80,70},{-80,78}},color={255,0,255}));
-  connect(onDel1.y,and1.u1)
-    annotation (Line(points={{-78,-30},{-52,-30}},color={255,0,255}));
-  connect(onDel2.y,and2.u1)
-    annotation (Line(points={{42,-60},{42,-60},{58,-60}},color={255,0,255}));
+  when initial() then
+    y = u;
+    entryTimeTrue = if y then time else pre(entryTimeTrue);
+    entryTimeFalse = if not y then time else pre(entryTimeFalse);
+  elsewhen {change(u),
+            time >= pre(entryTimeFalse) + falseHoldDuration and
+            time >= pre(entryTimeTrue) + trueHoldDuration} then
+    y=if time >= pre(entryTimeFalse) + falseHoldDuration and
+         time >= pre(entryTimeTrue) + trueHoldDuration then u
+      else pre(y);
+    entryTimeTrue = if change(y) and y then time else pre(entryTimeTrue);
+    entryTimeFalse = if change(y) and not y then time else pre(entryTimeFalse);
+  end when;
   annotation (
     defaultComponentName="truFalHol",
     Icon(
@@ -134,29 +82,21 @@ equation
           textString="%falseHoldDuration"),
         Ellipse(
           extent={{71,7},{85,-7}},
-          lineColor=DynamicSelect({235,235,235},
-            if y then
-              {0,255,0}
-            else
-              {235,235,235}),
-          fillColor=DynamicSelect({235,235,235},
-            if y then
-              {0,255,0}
-            else
-              {235,235,235}),
+          lineColor=DynamicSelect({235,235,235},if y then
+                                                         {0,255,0} else
+                                                                      {235,235,235}),
+          fillColor=DynamicSelect({235,235,235},if y then
+                                                         {0,255,0} else
+                                                                      {235,235,235}),
           fillPattern=FillPattern.Solid),
         Ellipse(
           extent={{-83,7},{-69,-7}},
-          lineColor=DynamicSelect({235,235,235},
-            if u then
-              {0,255,0}
-            else
-              {235,235,235}),
-          fillColor=DynamicSelect({235,235,235},
-            if u then
-              {0,255,0}
-            else
-              {235,235,235}),
+          lineColor=DynamicSelect({235,235,235},if u then
+                                                         {0,255,0} else
+                                                                      {235,235,235}),
+          fillColor=DynamicSelect({235,235,235},if u then
+                                                         {0,255,0} else
+                                                                      {235,235,235}),
           fillPattern=FillPattern.Solid),
         Text(
           extent={{-90,96},{96,68}},
@@ -164,43 +104,26 @@ equation
           textString="%trueHoldDuration")}),
     Diagram(
       coordinateSystem(
-        preserveAspectRatio=false,
-        extent={{-180,-120},{160,140}})),
+        preserveAspectRatio=false)),
     Documentation(
       info="<html>
 <p>
 Block that holds a <code>true</code> or <code>false</code> signal for at least a defined time period.
 </p>
 <p>
-Whenever the input <code>u</code> switches, the output <code>y</code>
-switches and remains at that value for at least <code>duration</code>
-seconds, where <code>duration</code> is a parameter.
-After <code>duration</code> elapsed, the output will be
-<code>y = u</code>.
-If this change required changing the value of <code>y</code>,
-then <code>y</code> will remain at that value for at least <code>duration</code>.
-Otherwise, <code>y</code> will change immediately whenever <code>u</code>
-changes.
+Whenever the input <code>u</code> switches to true (resp. false),
+the output <code>y</code> switches and remains true for at least
+the duration specified by the parameter <code>trueHoldDuration</code>
+(resp. <code>falseHoldDuration</code>).
+After this duration has elapsed, the output will be <code>y = u</code>.
 </p>
 <p>
 This block could for example be used to disable an economizer,
-and not re-enable it for <i>10</i> minutes, and vice versa.
-</p>
-<p>
-The image below shows the implementation with a state graph in which
-each transition is only triggered when the input has the corresponding value,
-and the current state has been active for at least <code>duration</code> seconds.
+and not re-enable it for <i>10</i>&nbsp;min, and vice versa.
 </p>
-
-<p align=\"center\">
-<img src=\"modelica://Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueFalseHoldImplementation.png\"
-alt=\"Input and output of the block\"/>
-</p>
-
 <p>
-Simulation results of a typical example with <code>duration = 1000</code> seconds.
+Simulation results of a typical example with <code>trueHoldDuration = falseHoldDuration = 1000</code>&nbsp;s.
 </p>
-
 <p align=\"center\">
 <img src=\"modelica://Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueFalseHold.png\"
 alt=\"Input and output of the block\"/>
@@ -209,6 +132,12 @@ alt=\"Input and output of the block\"/>
       revisions="<html>
 <ul>
 <li>
+June 13, 2024, by Antoine Gautier:<br/>
+Refactored with synchronous language elements.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3787\">issue 3787</a>.
+</li>
+<li>
 November 12, 2020, by Michael Wetter:<br/>
 Reformulated to remove dependency to <code>Modelica.Units.SI</code>.<br/>
 This is for
diff --git a/Buildings/Controls/OBC/CDL/Logical/Validation/package.order b/Buildings/Controls/OBC/CDL/Logical/Validation/package.order
index 2b04f094ee7..5e5493538c4 100644
--- a/Buildings/Controls/OBC/CDL/Logical/Validation/package.order
+++ b/Buildings/Controls/OBC/CDL/Logical/Validation/package.order
@@ -18,7 +18,6 @@ TimerNegativeStartTime
 Toggle
 TrueDelay
 TrueFalseHold
-TrueHold
 VariablePulse
 VariablePulseMinHold
 Xor
diff --git a/Buildings/Controls/OBC/CDL/Logical/package.order b/Buildings/Controls/OBC/CDL/Logical/package.order
index 4eaa2076d39..d41c7de5745 100644
--- a/Buildings/Controls/OBC/CDL/Logical/package.order
+++ b/Buildings/Controls/OBC/CDL/Logical/package.order
@@ -17,7 +17,6 @@ TimerAccumulating
 Toggle
 TrueDelay
 TrueFalseHold
-TrueHold
 VariablePulse
 Xor
 Sources
diff --git a/Buildings/Controls/OBC/Utilities/BaseClasses/OptimalStartCalculation.mo b/Buildings/Controls/OBC/Utilities/BaseClasses/OptimalStartCalculation.mo
index d10af2c51a5..48897be069a 100644
--- a/Buildings/Controls/OBC/Utilities/BaseClasses/OptimalStartCalculation.mo
+++ b/Buildings/Controls/OBC/Utilities/BaseClasses/OptimalStartCalculation.mo
@@ -108,8 +108,9 @@ protected
     final k=tOptMax)
     "Maximum optimal start time"
     annotation (Placement(transformation(extent={{210,-40},{230,-20}})));
-  Buildings.Controls.OBC.CDL.Logical.TrueHold truHol(
-    final duration=tOptMax+11*3600)
+  Buildings.Controls.OBC.CDL.Logical.TrueFalseHold truHol(
+    final falseHoldDuration=0,
+    final trueHoldDuration=tOptMax + 11*3600)
     "Hold the start time for timer"
     annotation (Placement(transformation(extent={{-240,0},{-220,20}})));
   Buildings.Controls.OBC.CDL.Reals.Divide temSlo
diff --git a/Buildings/Obsolete/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Reheat/DamperValves.mo b/Buildings/Obsolete/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Reheat/DamperValves.mo
index 396aa50646d..0ee2b1c72f9 100644
--- a/Buildings/Obsolete/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Reheat/DamperValves.mo
+++ b/Buildings/Obsolete/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Reheat/DamperValves.mo
@@ -310,7 +310,8 @@ protected
   Buildings.Controls.OBC.CDL.Reals.Subtract sub2
     "Calculate temperature difference between AHU supply air and room "
     annotation (Placement(transformation(extent={{-160,190},{-140,210}})));
-  Buildings.Controls.OBC.CDL.Logical.TrueHold truHol2(duration=600)
+  Buildings.Controls.OBC.CDL.Logical.TrueFalseHold truHol2(
+    final falseHoldDuration=0, trueHoldDuration=600)
     "Check if the true input holds for certain time"
     annotation (Placement(transformation(extent={{-222,-220},{-202,-200}})));
   Buildings.Controls.OBC.CDL.Logical.TrueDelay truDel3(delayTime=600)
diff --git a/Buildings/Obsolete/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/SetPoints/ZoneTemperatures.mo b/Buildings/Obsolete/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/SetPoints/ZoneTemperatures.mo
index 8adce4f2ef5..0db5c4f4dca 100644
--- a/Buildings/Obsolete/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/SetPoints/ZoneTemperatures.mo
+++ b/Buildings/Obsolete/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/SetPoints/ZoneTemperatures.mo
@@ -232,7 +232,8 @@ block ZoneTemperatures
   Buildings.Controls.OBC.CDL.Logical.Timer tim(final t=300)
     "Check whether the zone has been unpopulated for 5 minutes continuously during occupied mode"
     annotation (Placement(transformation(extent={{-220,-280},{-200,-260}})));
-  Buildings.Controls.OBC.CDL.Logical.TrueHold truHol(duration=60)
+  Buildings.Controls.OBC.CDL.Logical.TrueFalseHold truHol(
+    final falseHoldDuration=0, trueHoldDuration=60)
     "When the zone is unpopulated by more than 5 minute and then becomes populated, hold the change by 1 minute"
     annotation (Placement(transformation(extent={{-100,-280},{-80,-260}})));
   Buildings.Controls.OBC.CDL.Logical.Edge edg1
diff --git a/Buildings/Controls/OBC/CDL/Logical/TrueHold.mo b/Buildings/Obsolete/Controls/OBC/CDL/Logical/TrueHold.mo
similarity index 96%
rename from Buildings/Controls/OBC/CDL/Logical/TrueHold.mo
rename to Buildings/Obsolete/Controls/OBC/CDL/Logical/TrueHold.mo
index 41afc4f2819..680c426a6fa 100644
--- a/Buildings/Controls/OBC/CDL/Logical/TrueHold.mo
+++ b/Buildings/Obsolete/Controls/OBC/CDL/Logical/TrueHold.mo
@@ -1,4 +1,4 @@
-within Buildings.Controls.OBC.CDL.Logical;
+within Buildings.Obsolete.Controls.OBC.CDL.Logical;
 block TrueHold
   "Block that holds a true signal for at least a requested duration"
   parameter Real duration(
@@ -164,6 +164,12 @@ alt=\"Input and output of the block\"/>
       revisions="<html>
 <ul>
 <li>
+June 13, 2024, by Antoine Gautier:<br/>
+Moved this model to the <code>Obsolete</code> package.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3787\">issue 3787</a>.
+</li>
+<li>
 March 27, 2024, by Michael Wetter:<br/>
 Renamed block from <code>TrueHoldWithReset</code> to <code>TrueHold</code>.<br/>
 This is for
diff --git a/Buildings/Controls/OBC/CDL/Logical/Validation/TrueHold.mo b/Buildings/Obsolete/Controls/OBC/CDL/Logical/Validation/TrueHold.mo
similarity index 80%
rename from Buildings/Controls/OBC/CDL/Logical/Validation/TrueHold.mo
rename to Buildings/Obsolete/Controls/OBC/CDL/Logical/Validation/TrueHold.mo
index e538c448110..efc224a8b65 100644
--- a/Buildings/Controls/OBC/CDL/Logical/Validation/TrueHold.mo
+++ b/Buildings/Obsolete/Controls/OBC/CDL/Logical/Validation/TrueHold.mo
@@ -1,4 +1,4 @@
-within Buildings.Controls.OBC.CDL.Logical.Validation;
+within Buildings.Obsolete.Controls.OBC.CDL.Logical.Validation;
 model TrueHold
   "Validation model for the TrueHold block"
   Buildings.Controls.OBC.CDL.Logical.Sources.Pulse booPul(
@@ -6,7 +6,7 @@ model TrueHold
     shift=300)
     "Boolean pulse input signal"
     annotation (Placement(transformation(extent={{-40,70},{-20,90}})));
-  Buildings.Controls.OBC.CDL.Logical.TrueHold truHol(
+  Buildings.Obsolete.Controls.OBC.CDL.Logical.TrueHold truHol(
     duration=3600)
     "Block that holds a signal on for a requested time period"
     annotation (Placement(transformation(extent={{20,70},{40,90}})));
@@ -14,7 +14,7 @@ model TrueHold
     period=3600)
     "Boolean pulse input signal"
     annotation (Placement(transformation(extent={{-40,20},{-20,40}})));
-  Buildings.Controls.OBC.CDL.Logical.TrueHold truHol1(
+  Buildings.Obsolete.Controls.OBC.CDL.Logical.TrueHold truHol1(
     duration=600)
     "Block that holds a signal on for a requested time period"
     annotation (Placement(transformation(extent={{20,20},{40,40}})));
@@ -23,7 +23,7 @@ model TrueHold
     shift=300)
     "Boolean pulse input signal"
     annotation (Placement(transformation(extent={{-40,-20},{-20,0}})));
-  Buildings.Controls.OBC.CDL.Logical.TrueHold truHol2(
+  Buildings.Obsolete.Controls.OBC.CDL.Logical.TrueHold truHol2(
     duration=3600)
     "Block that holds a signal on for a requested time period"
     annotation (Placement(transformation(extent={{20,-20},{40,0}})));
@@ -31,7 +31,7 @@ model TrueHold
     period=3600)
     "Boolean pulse input signal"
     annotation (Placement(transformation(extent={{-40,-70},{-20,-50}})));
-  Buildings.Controls.OBC.CDL.Logical.TrueHold truHol3(
+  Buildings.Obsolete.Controls.OBC.CDL.Logical.TrueHold truHol3(
     duration=600)
     "Block that holds a signal on for a requested time period"
     annotation (Placement(transformation(extent={{20,-70},{40,-50}})));
@@ -60,13 +60,13 @@ equation
       StopTime=15000.0,
       Tolerance=1e-06),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Logical/Validation/TrueHold.mos" "Simulate and plot"),
+      file="modelica://Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Logical/Validation/TrueHold.mos" "Simulate and plot"),
     Documentation(
       info="<html>
 <p>
 Validation test for the block
-<a href=\"modelica://Buildings.Controls.OBC.CDL.Logical.TrueHold\">
-Buildings.Controls.OBC.CDL.Logical.TrueHold</a>.
+<a href=\"modelica://Buildings.Obsolete.Controls.OBC.CDL.Logical.TrueHold\">
+Buildings.Obsolete.Controls.OBC.CDL.Logical.TrueHold</a>.
 </p>
 <p>
 The validation uses different instances to validate different hold durations, different lengths
@@ -76,6 +76,12 @@ of the input pulse, and different initial values for the input signal.
       revisions="<html>
 <ul>
 <li>
+June 13, 2024, by Antoine Gautier:<br/>
+Moved this model to the <code>Obsolete</code> package.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3787\">issue 3787</a>.
+</li>
+<li>
 June 14, 2017, by Michael Wetter:<br/>
 Added more tests for different initial signals and different hold values.
 </li>
diff --git a/Buildings/Obsolete/Controls/OBC/CDL/Logical/Validation/package.order b/Buildings/Obsolete/Controls/OBC/CDL/Logical/Validation/package.order
index 1ff2b4c409f..1f02a46a471 100644
--- a/Buildings/Obsolete/Controls/OBC/CDL/Logical/Validation/package.order
+++ b/Buildings/Obsolete/Controls/OBC/CDL/Logical/Validation/package.order
@@ -3,4 +3,5 @@ OnOffController
 Or3
 Timer
 TriggeredTrapezoid
+TrueHold
 ZeroCrossing
diff --git a/Buildings/Obsolete/Controls/OBC/CDL/Logical/package.order b/Buildings/Obsolete/Controls/OBC/CDL/Logical/package.order
index 487b4b699f5..a30cca469de 100644
--- a/Buildings/Obsolete/Controls/OBC/CDL/Logical/package.order
+++ b/Buildings/Obsolete/Controls/OBC/CDL/Logical/package.order
@@ -3,5 +3,6 @@ OnOffController
 Or3
 Timer
 TriggeredTrapezoid
+TrueHold
 ZeroCrossing
 Validation
diff --git a/Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueFalseHoldImplementation.png b/Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueFalseHoldImplementation.png
deleted file mode 100644
index f3f6f6e36ac..00000000000
Binary files a/Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueFalseHoldImplementation.png and /dev/null differ
diff --git a/Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueFalseHoldImplementation.svg b/Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueFalseHoldImplementation.svg
deleted file mode 100644
index 343695ff13d..00000000000
--- a/Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueFalseHoldImplementation.svg
+++ /dev/null
@@ -1,1711 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   viewBox="0 0 1774.0076 938.72797"
-   version="1.1"
-   id="svg1263"
-   sodipodi:docname="TrueFalseHoldImplementation-1.svg"
-   width="1774.0076"
-   height="938.72797"
-   inkscape:export-filename="/home/jianjun/GitFolder/modelica-buildings/Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueFalseHoldImplementation-1.png"
-   inkscape:export-xdpi="84.554703"
-   inkscape:export-ydpi="84.554703"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
-  <metadata
-     id="metadata1269">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs1267" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="3381"
-     inkscape:window-height="1897"
-     id="namedview1265"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:zoom="1.410596"
-     inkscape:cx="874.81541"
-     inkscape:cy="528.45871"
-     inkscape:window-x="51"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg1263" />
-  <rect
-     fill="#d2d2d2"
-     stroke="#000000"
-     stroke-opacity="1"
-     transform="scale(1,-1)"
-     x="466.85342"
-     y="-755.1897"
-     width="91"
-     height="91"
-     id="rect851" />
-  <rect
-     fill="#aca899"
-     stroke="none"
-     x="465.43542"
-     y="662.77069"
-     width="1.61067"
-     height="92.226097"
-     id="rect853" />
-  <rect
-     fill="#aca899"
-     stroke="none"
-     x="465.43542"
-     y="754.9967"
-     width="92.226097"
-     height="1.61067"
-     id="rect855" />
-  <rect
-     fill="#aca899"
-     stroke="none"
-     x="557.66144"
-     y="664.38165"
-     width="1.61067"
-     height="92.226097"
-     id="rect857" />
-  <rect
-     fill="#aca899"
-     stroke="none"
-     x="467.04645"
-     y="662.77069"
-     width="92.226097"
-     height="1.61067"
-     id="rect859" />
-  <rect
-     fill="#ffffff"
-     stroke="none"
-     x="467.04645"
-     y="664.38165"
-     width="2.4159999"
-     height="90.615402"
-     id="rect861" />
-  <rect
-     fill="#ffffff"
-     stroke="none"
-     x="467.04645"
-     y="664.38165"
-     width="90.615402"
-     height="2.4159999"
-     id="rect863" />
-  <rect
-     fill="#716f64"
-     stroke="none"
-     x="556.05042"
-     y="664.38165"
-     width="1.61067"
-     height="90.615402"
-     id="rect865" />
-  <rect
-     fill="#716f64"
-     stroke="none"
-     x="467.04645"
-     y="753.38666"
-     width="90.615402"
-     height="1.61067"
-     id="rect867" />
-  <rect
-     fill="#aca899"
-     stroke="none"
-     x="554.44043"
-     y="665.99268"
-     width="1.61067"
-     height="87.394096"
-     id="rect869" />
-  <rect
-     fill="#aca899"
-     stroke="none"
-     x="468.65643"
-     y="751.7757"
-     width="87.394096"
-     height="1.61067"
-     id="rect871" />
-  <text
-     fill="#000000"
-     font-size="14px"
-     font-family="helvetica"
-     text-anchor="middle"
-     dominant-baseline="central"
-     x="512.35345"
-     y="770.85468"
-     id="text873">falseHoldDuration</text>
-  <polyline
-     fill="none"
-     stroke="#000000"
-     stroke-opacity="1"
-     points="535.292308,815.133846 544.353846,815.133846 544.353846,795.198462 588.755385,795.198462 588.755385,815.133846 601.441538,815.133846"
-     id="polyline875"
-     transform="translate(-59.184586,-75.541293)" />
-  <polyline
-     fill="none"
-     stroke="#ff00ff"
-     stroke-opacity="1"
-     points="535.292308,770.732308 569.726154,770.732308 569.726154,750.796923 588.755385,750.796923 588.755385,770.732308 601.441538,770.732308"
-     id="polyline877"
-     transform="translate(-59.184586,-75.541293)" />
-  <circle
-     fill="#ebebeb"
-     stroke="#ebebeb"
-     stroke-opacity="1"
-     cx="477.01343"
-     cy="709.6897"
-     id="ellipse879"
-     r="3.17154" />
-  <circle
-     fill="#ebebeb"
-     stroke="#ebebeb"
-     stroke-opacity="1"
-     cx="547.69342"
-     cy="709.6897"
-     id="ellipse881"
-     r="3.17154" />
-  <text
-     fill="#0000ff"
-     font-size="18px"
-     font-family="helvetica"
-     text-anchor="middle"
-     dominant-baseline="central"
-     x="512.35345"
-     y="650.78967"
-     id="text883">onDel1</text>
-  <rect
-     fill="#d2d2d2"
-     stroke="#000000"
-     stroke-opacity="1"
-     transform="scale(1,-1)"
-     x="1010.5454"
-     y="-891.11273"
-     width="91"
-     height="91"
-     id="rect885" />
-  <rect
-     fill="#aca899"
-     stroke="none"
-     x="1009.1255"
-     y="798.69366"
-     width="1.61067"
-     height="92.226097"
-     id="rect887" />
-  <rect
-     fill="#aca899"
-     stroke="none"
-     x="1009.1255"
-     y="890.92065"
-     width="92.226097"
-     height="1.61067"
-     id="rect889" />
-  <rect
-     fill="#aca899"
-     stroke="none"
-     x="1101.3555"
-     y="800.30469"
-     width="1.61067"
-     height="92.226097"
-     id="rect891" />
-  <rect
-     fill="#aca899"
-     stroke="none"
-     x="1010.7355"
-     y="798.69366"
-     width="92.226097"
-     height="1.61067"
-     id="rect893" />
-  <rect
-     fill="#ffffff"
-     stroke="none"
-     x="1010.7355"
-     y="800.30469"
-     width="2.4159999"
-     height="90.615402"
-     id="rect895" />
-  <rect
-     fill="#ffffff"
-     stroke="none"
-     x="1010.7355"
-     y="800.30469"
-     width="90.615402"
-     height="2.4159999"
-     id="rect897" />
-  <rect
-     fill="#716f64"
-     stroke="none"
-     x="1099.7455"
-     y="800.30469"
-     width="1.61067"
-     height="90.615402"
-     id="rect899" />
-  <rect
-     fill="#716f64"
-     stroke="none"
-     x="1010.7355"
-     y="889.30969"
-     width="90.615402"
-     height="1.61067"
-     id="rect901" />
-  <rect
-     fill="#aca899"
-     stroke="none"
-     x="1098.1354"
-     y="801.91565"
-     width="1.61067"
-     height="87.394096"
-     id="rect903" />
-  <rect
-     fill="#aca899"
-     stroke="none"
-     x="1012.3455"
-     y="887.69867"
-     width="87.394096"
-     height="1.61067"
-     id="rect905" />
-  <text
-     fill="#000000"
-     font-size="14px"
-     font-family="helvetica"
-     text-anchor="middle"
-     dominant-baseline="central"
-     x="1056.0454"
-     y="906.77765"
-     id="text907">trueHoldDuration</text>
-  <polyline
-     fill="none"
-     stroke="#000000"
-     stroke-opacity="1"
-     points="1078.984615,951.056923 1088.046154,951.056923 1088.046154,931.121538 1132.447692,931.121538 1132.447692,951.056923 1145.133846,951.056923"
-     id="polyline909"
-     transform="translate(-59.184586,-75.541293)" />
-  <polyline
-     fill="none"
-     stroke="#ff00ff"
-     stroke-opacity="1"
-     points="1078.984615,906.655385 1113.418462,906.655385 1113.418462,886.720000 1132.447692,886.720000 1132.447692,906.655385 1145.133846,906.655385"
-     id="polyline911"
-     transform="translate(-59.184586,-75.541293)" />
-  <circle
-     fill="#ebebeb"
-     stroke="#ebebeb"
-     stroke-opacity="1"
-     cx="1020.7054"
-     cy="845.61267"
-     id="ellipse913"
-     r="3.17154" />
-  <circle
-     fill="#ebebeb"
-     stroke="#ebebeb"
-     stroke-opacity="1"
-     cx="1091.3854"
-     cy="845.61267"
-     id="ellipse915"
-     r="3.17154" />
-  <text
-     fill="#0000ff"
-     font-size="18px"
-     font-family="helvetica"
-     text-anchor="middle"
-     dominant-baseline="central"
-     x="1056.0454"
-     y="786.71271"
-     id="text917">onDel2</text>
-  <text
-     fill="#0000ff"
-     font-size="18px"
-     font-family="helvetica"
-     text-anchor="middle"
-     dominant-baseline="central"
-     x="240.5074"
-     y="16.48181"
-     id="text919">stateGraphRoot</text>
-  <rect
-     fill="none"
-     stroke="#000000"
-     stroke-opacity="1"
-     transform="scale(1,-1)"
-     x="195.00742"
-     y="-120.88171"
-     width="91"
-     height="91"
-     id="rect921" />
-  <text
-     fill="#000000"
-     font-size="20px"
-     font-family="helvetica"
-     text-anchor="middle"
-     dominant-baseline="central"
-     x="241.41341"
-     y="50.009708"
-     id="text923">root</text>
-  <rect
-     fill="none"
-     stroke="#000000"
-     stroke-opacity="1"
-     transform="scale(1,-1)"
-     x="203.46341"
-     y="-93.302704"
-     width="17"
-     height="15"
-     id="rect925" />
-  <polyline
-     fill="none"
-     stroke="#000000"
-     stroke-opacity="1"
-     points="299.692308,146.392308 299.692308,178.107692"
-     id="polyline927"
-     transform="translate(-59.184586,-75.541293)" />
-  <rect
-     fill="none"
-     stroke="#000000"
-     stroke-opacity="1"
-     transform="scale(1,-1)"
-     x="262.3634"
-     y="-93.302704"
-     width="17"
-     height="15"
-     id="rect929" />
-  <polygon
-     fill="#000000"
-     stroke="#000000"
-     stroke-opacity="1"
-     points="294.25538,163.60923 294.25538,158.17231 299.69231,160.89077 "
-     id="polygon931"
-     transform="translate(-59.184586,-75.541293)" />
-  <polyline
-     fill="none"
-     stroke="#000000"
-     stroke-opacity="1"
-     points="279.756923,160.890769 294.255385,160.890769"
-     id="polyline933"
-     transform="translate(-59.184586,-75.541293)" />
-  <polygon
-     fill="#000000"
-     stroke="#000000"
-     stroke-opacity="1"
-     points="316.00308,163.60923 316.00308,158.17231 321.44,160.89077 "
-     id="polygon935"
-     transform="translate(-59.184586,-75.541293)" />
-  <polyline
-     fill="none"
-     stroke="#000000"
-     stroke-opacity="1"
-     points="299.692308,160.890769 316.003077,160.890769"
-     id="polyline937"
-     transform="translate(-59.184586,-75.541293)" />
-  <text
-     fill="#0000ff"
-     font-size="18px"
-     font-family="helvetica"
-     text-anchor="middle"
-     dominant-baseline="central"
-     x="693.58441"
-     y="424.2507"
-     id="text939">outputFalse</text>
-  <rect
-     fill="#ffffff"
-     stroke="#000000"
-     stroke-opacity="1"
-     transform="scale(1,-1)"
-     x="648.08441"
-     y="-528.6507"
-     width="91"
-     height="91"
-     id="rect941" />
-  <text
-     fill="#000000"
-     font-size="10px"
-     font-family="helvetica"
-     text-anchor="middle"
-     dominant-baseline="central"
-     x="694.03741"
-     y="520.75665"
-     id="text943">active</text>
-  <text
-     fill="#ffffff"
-     font-size="11px"
-     font-family="helvetica"
-     text-anchor="middle"
-     dominant-baseline="central"
-     x="879.34644"
-     y="468.42569"
-     id="text945">0 s</text>
-  <rect
-     fill="#000000"
-     stroke="#000000"
-     stroke-opacity="1"
-     transform="scale(1,-1)"
-     x="825.00739"
-     y="-528.6507"
-     width="9"
-     height="91"
-     id="rect947" />
-  <polyline
-     fill="none"
-     stroke="#000000"
-     stroke-opacity="1"
-     points="875.100000,558.692308 884.161538,558.692308"
-     id="polyline949"
-     transform="translate(-59.184586,-75.541293)" />
-  <text
-     fill="#0000ff"
-     font-size="18px"
-     font-family="helvetica"
-     text-anchor="middle"
-     dominant-baseline="central"
-     x="829.50745"
-     y="424.2507"
-     id="text951">toTrue</text>
-  <circle
-     fill="#000000"
-     stroke="#000000"
-     stroke-opacity="1"
-     cx="829.50745"
-     cy="523.02167"
-     id="ellipse953"
-     r="3.17154" />
-  <rect
-     fill="#d7d7d7"
-     stroke="#000000"
-     stroke-opacity="1"
-     transform="scale(1,-1)"
-     x="285.62341"
-     y="-302.1127"
-     width="91"
-     height="91"
-     id="rect955" />
-  <rect
-     fill="#aca899"
-     stroke="none"
-     x="284.20441"
-     y="209.6937"
-     width="1.61067"
-     height="92.226097"
-     id="rect957" />
-  <rect
-     fill="#aca899"
-     stroke="none"
-     x="284.20441"
-     y="301.92072"
-     width="92.226097"
-     height="1.61067"
-     id="rect959" />
-  <rect
-     fill="#aca899"
-     stroke="none"
-     x="376.43042"
-     y="211.30472"
-     width="1.61067"
-     height="92.226097"
-     id="rect961" />
-  <rect
-     fill="#aca899"
-     stroke="none"
-     x="285.81543"
-     y="209.6937"
-     width="92.226097"
-     height="1.61067"
-     id="rect963" />
-  <rect
-     fill="#ffffff"
-     stroke="none"
-     x="285.81543"
-     y="211.30472"
-     width="2.4159999"
-     height="90.615402"
-     id="rect965" />
-  <rect
-     fill="#ffffff"
-     stroke="none"
-     x="285.81543"
-     y="211.30472"
-     width="90.615402"
-     height="2.4159999"
-     id="rect967" />
-  <rect
-     fill="#716f64"
-     stroke="none"
-     x="374.82043"
-     y="211.30472"
-     width="1.61067"
-     height="90.615402"
-     id="rect969" />
-  <rect
-     fill="#716f64"
-     stroke="none"
-     x="285.81543"
-     y="300.30972"
-     width="90.615402"
-     height="1.61067"
-     id="rect971" />
-  <rect
-     fill="#aca899"
-     stroke="none"
-     x="373.20941"
-     y="212.91571"
-     width="1.61067"
-     height="87.394096"
-     id="rect973" />
-  <rect
-     fill="#aca899"
-     stroke="none"
-     x="287.42639"
-     y="298.6987"
-     width="87.394096"
-     height="1.61067"
-     id="rect975" />
-  <text
-     fill="#000000"
-     font-size="24px"
-     font-family="helvetica"
-     text-anchor="middle"
-     dominant-baseline="central"
-     x="334.74744"
-     y="255.7067"
-     id="text977">not</text>
-  <circle
-     fill="#ebebeb"
-     stroke="#ebebeb"
-     stroke-opacity="1"
-     cx="366.46344"
-     cy="256.6127"
-     id="ellipse979"
-     r="3.17154" />
-  <text
-     fill="#0000ff"
-     font-size="18px"
-     font-family="helvetica"
-     text-anchor="middle"
-     dominant-baseline="central"
-     x="331.12341"
-     y="197.71271"
-     id="text981">notU</text>
-  <text
-     fill="#0000ff"
-     font-size="18px"
-     font-family="helvetica"
-     text-anchor="middle"
-     dominant-baseline="central"
-     x="965.43542"
-     y="424.2507"
-     id="text983">outputTrue</text>
-  <rect
-     fill="#ffffff"
-     stroke="#000000"
-     stroke-opacity="1"
-     transform="scale(1,-1)"
-     x="919.93542"
-     y="-528.6507"
-     width="91"
-     height="91"
-     id="rect985" />
-  <text
-     fill="#000000"
-     font-size="10px"
-     font-family="helvetica"
-     text-anchor="middle"
-     dominant-baseline="central"
-     x="965.88538"
-     y="520.75665"
-     id="text987">active</text>
-  <text
-     fill="#ffffff"
-     font-size="11px"
-     font-family="helvetica"
-     text-anchor="middle"
-     dominant-baseline="central"
-     x="1151.1954"
-     y="468.42569"
-     id="text989">0 s</text>
-  <rect
-     fill="#000000"
-     stroke="#000000"
-     stroke-opacity="1"
-     transform="scale(1,-1)"
-     x="1096.8555"
-     y="-528.6507"
-     width="9"
-     height="91"
-     id="rect991" />
-  <polyline
-     fill="none"
-     stroke="#000000"
-     stroke-opacity="1"
-     points="1146.946154,558.692308 1156.007692,558.692308"
-     id="polyline993"
-     transform="translate(-59.184586,-75.541293)" />
-  <text
-     fill="#0000ff"
-     font-size="18px"
-     font-family="helvetica"
-     text-anchor="middle"
-     dominant-baseline="central"
-     x="1101.3555"
-     y="424.2507"
-     id="text995">toFalse</text>
-  <circle
-     fill="#000000"
-     stroke="#000000"
-     stroke-opacity="1"
-     cx="1101.3555"
-     cy="523.02167"
-     id="ellipse997"
-     r="3.17154" />
-  <rect
-     fill="#d2d2d2"
-     stroke="#000000"
-     stroke-opacity="1"
-     transform="scale(1,-1)"
-     x="1191.7754"
-     y="-891.11273"
-     width="91"
-     height="91"
-     id="rect999" />
-  <rect
-     fill="#aca899"
-     stroke="none"
-     x="1190.3555"
-     y="798.69366"
-     width="1.61067"
-     height="92.226097"
-     id="rect1001" />
-  <rect
-     fill="#aca899"
-     stroke="none"
-     x="1190.3555"
-     y="890.92065"
-     width="92.226097"
-     height="1.61067"
-     id="rect1003" />
-  <rect
-     fill="#aca899"
-     stroke="none"
-     x="1282.5854"
-     y="800.30469"
-     width="1.61067"
-     height="92.226097"
-     id="rect1005" />
-  <rect
-     fill="#aca899"
-     stroke="none"
-     x="1191.9655"
-     y="798.69366"
-     width="92.226097"
-     height="1.61067"
-     id="rect1007" />
-  <rect
-     fill="#ffffff"
-     stroke="none"
-     x="1191.9655"
-     y="800.30469"
-     width="2.4159999"
-     height="90.615402"
-     id="rect1009" />
-  <rect
-     fill="#ffffff"
-     stroke="none"
-     x="1191.9655"
-     y="800.30469"
-     width="90.615402"
-     height="2.4159999"
-     id="rect1011" />
-  <rect
-     fill="#716f64"
-     stroke="none"
-     x="1280.9755"
-     y="800.30469"
-     width="1.61067"
-     height="90.615402"
-     id="rect1013" />
-  <rect
-     fill="#716f64"
-     stroke="none"
-     x="1191.9655"
-     y="889.30969"
-     width="90.615402"
-     height="1.61067"
-     id="rect1015" />
-  <rect
-     fill="#aca899"
-     stroke="none"
-     x="1279.3655"
-     y="801.91565"
-     width="1.61067"
-     height="87.394096"
-     id="rect1017" />
-  <rect
-     fill="#aca899"
-     stroke="none"
-     x="1193.5754"
-     y="887.69867"
-     width="87.394096"
-     height="1.61067"
-     id="rect1019" />
-  <text
-     fill="#000000"
-     font-size="36px"
-     font-family="helvetica"
-     text-anchor="middle"
-     dominant-baseline="central"
-     x="1237.2754"
-     y="845.61267"
-     id="text1021">and</text>
-  <circle
-     fill="#ebebeb"
-     stroke="#ebebeb"
-     stroke-opacity="1"
-     cx="1272.6155"
-     cy="845.61267"
-     id="ellipse1023"
-     r="3.17154" />
-  <circle
-     fill="#ebebeb"
-     stroke="#ebebeb"
-     stroke-opacity="1"
-     cx="1200.1255"
-     cy="845.15967"
-     id="ellipse1025"
-     r="3.17154" />
-  <circle
-     fill="#ebebeb"
-     stroke="#ebebeb"
-     stroke-opacity="1"
-     cx="1200.1255"
-     cy="881.8587"
-     id="ellipse1027"
-     r="3.17154" />
-  <text
-     fill="#0000ff"
-     font-size="18px"
-     font-family="helvetica"
-     text-anchor="middle"
-     dominant-baseline="central"
-     x="1237.2754"
-     y="786.71271"
-     id="text1029">and2</text>
-  <rect
-     fill="#d2d2d2"
-     stroke="#000000"
-     stroke-opacity="1"
-     transform="scale(1,-1)"
-     x="693.3924"
-     y="-755.1897"
-     width="91"
-     height="91"
-     id="rect1031" />
-  <rect
-     fill="#aca899"
-     stroke="none"
-     x="691.97443"
-     y="662.77069"
-     width="1.61067"
-     height="92.226097"
-     id="rect1033" />
-  <rect
-     fill="#aca899"
-     stroke="none"
-     x="691.97443"
-     y="754.9967"
-     width="92.226097"
-     height="1.61067"
-     id="rect1035" />
-  <rect
-     fill="#aca899"
-     stroke="none"
-     x="784.20044"
-     y="664.38165"
-     width="1.61067"
-     height="92.226097"
-     id="rect1037" />
-  <rect
-     fill="#aca899"
-     stroke="none"
-     x="693.58441"
-     y="662.77069"
-     width="92.226097"
-     height="1.61067"
-     id="rect1039" />
-  <rect
-     fill="#ffffff"
-     stroke="none"
-     x="693.58441"
-     y="664.38165"
-     width="2.4159999"
-     height="90.615402"
-     id="rect1041" />
-  <rect
-     fill="#ffffff"
-     stroke="none"
-     x="693.58441"
-     y="664.38165"
-     width="90.615402"
-     height="2.4159999"
-     id="rect1043" />
-  <rect
-     fill="#716f64"
-     stroke="none"
-     x="782.58942"
-     y="664.38165"
-     width="1.61067"
-     height="90.615402"
-     id="rect1045" />
-  <rect
-     fill="#716f64"
-     stroke="none"
-     x="693.58441"
-     y="753.38666"
-     width="90.615402"
-     height="1.61067"
-     id="rect1047" />
-  <rect
-     fill="#aca899"
-     stroke="none"
-     x="780.97845"
-     y="665.99268"
-     width="1.61067"
-     height="87.394096"
-     id="rect1049" />
-  <rect
-     fill="#aca899"
-     stroke="none"
-     x="695.19543"
-     y="751.7757"
-     width="87.394096"
-     height="1.61067"
-     id="rect1051" />
-  <text
-     fill="#000000"
-     font-size="36px"
-     font-family="helvetica"
-     text-anchor="middle"
-     dominant-baseline="central"
-     x="738.89246"
-     y="709.6897"
-     id="text1053">and</text>
-  <circle
-     fill="#ebebeb"
-     stroke="#ebebeb"
-     stroke-opacity="1"
-     cx="774.23242"
-     cy="709.6897"
-     id="ellipse1055"
-     r="3.17154" />
-  <circle
-     fill="#ebebeb"
-     stroke="#ebebeb"
-     stroke-opacity="1"
-     cx="701.74042"
-     cy="709.23669"
-     id="ellipse1057"
-     r="3.17154" />
-  <circle
-     fill="#ebebeb"
-     stroke="#ebebeb"
-     stroke-opacity="1"
-     cx="701.74042"
-     cy="745.93567"
-     id="ellipse1059"
-     r="3.17154" />
-  <text
-     fill="#0000ff"
-     font-size="18px"
-     font-family="helvetica"
-     text-anchor="middle"
-     dominant-baseline="central"
-     x="738.89246"
-     y="650.78967"
-     id="text1061">and1</text>
-  <text
-     fill="#0000ff"
-     font-size="18px"
-     font-family="helvetica"
-     text-anchor="middle"
-     dominant-baseline="central"
-     x="421.7384"
-     y="16.48181"
-     id="text1063">initialStep</text>
-  <rect
-     fill="#ffffff"
-     stroke="#000000"
-     stroke-opacity="1"
-     transform="scale(1,-1)"
-     x="376.2384"
-     y="-120.88171"
-     width="91"
-     height="91"
-     id="rect1065" />
-  <rect
-     fill="none"
-     stroke="#000000"
-     stroke-opacity="1"
-     transform="scale(1,-1)"
-     x="385.7384"
-     y="-111.38171"
-     width="72"
-     height="72"
-     id="rect1067" />
-  <text
-     fill="#ffffff"
-     font-size="11px"
-     font-family="helvetica"
-     text-anchor="middle"
-     dominant-baseline="central"
-     x="698.11542"
-     y="51.595707"
-     id="text1069">0 s</text>
-  <rect
-     fill="#000000"
-     stroke="#000000"
-     stroke-opacity="1"
-     transform="scale(1,-1)"
-     x="643.7774"
-     y="-111.82071"
-     width="9"
-     height="91"
-     id="rect1071" />
-  <polyline
-     fill="none"
-     stroke="#000000"
-     stroke-opacity="1"
-     points="693.869231,141.861538 702.930769,141.861538"
-     id="polyline1073"
-     transform="translate(-59.184586,-75.541293)" />
-  <text
-     fill="#0000ff"
-     font-size="18px"
-     font-family="helvetica"
-     text-anchor="middle"
-     dominant-baseline="central"
-     x="648.2774"
-     y="7.4202094"
-     id="text1075">toTrue1</text>
-  <circle
-     fill="#000000"
-     stroke="#000000"
-     stroke-opacity="1"
-     cx="648.2774"
-     cy="106.1907"
-     id="ellipse1077"
-     r="3.17154" />
-  <text
-     fill="#ffffff"
-     font-size="11px"
-     font-family="helvetica"
-     text-anchor="middle"
-     dominant-baseline="central"
-     x="607.50043"
-     y="151.27171"
-     id="text1079">0 s</text>
-  <rect
-     fill="#000000"
-     stroke="#000000"
-     stroke-opacity="1"
-     transform="scale(1,-1)"
-     x="553.16144"
-     y="-211.4967"
-     width="9"
-     height="91"
-     id="rect1081" />
-  <polyline
-     fill="none"
-     stroke="#000000"
-     stroke-opacity="1"
-     points="603.253846,241.538462 612.315385,241.538462"
-     id="polyline1083"
-     transform="translate(-59.184586,-75.541293)" />
-  <text
-     fill="#0000ff"
-     font-size="18px"
-     font-family="helvetica"
-     text-anchor="middle"
-     dominant-baseline="central"
-     x="557.66144"
-     y="107.09671"
-     id="text1085">toFalse1</text>
-  <circle
-     fill="#000000"
-     stroke="#000000"
-     stroke-opacity="1"
-     cx="557.66144"
-     cy="205.86771"
-     id="ellipse1087"
-     r="3.17154" />
-  <polyline
-     fill="none"
-     stroke="#ffffff"
-     stroke-width="5"
-     stroke-opacity="1"
-     points="1072.188462,558.692308 1106.169231,558.692308 1142.415385,558.692308"
-     id="polyline1089"
-     transform="translate(-59.184586,-75.541293)" />
-  <polyline
-     fill="none"
-     stroke="#000000"
-     stroke-opacity="1"
-     points="1072.188462,558.692308 1106.169231,558.692308 1142.415385,558.692308"
-     id="polyline1091"
-     transform="translate(-59.184586,-75.541293)" />
-  <polyline
-     fill="none"
-     stroke="#ffffff"
-     stroke-width="5"
-     stroke-opacity="1"
-     points="1024.615385,608.530769 1024.615385,649.307692 1794.846154,649.307692"
-     id="polyline1093"
-     transform="translate(-59.184586,-75.541293)" />
-  <polyline
-     fill="none"
-     stroke="#ff00ff"
-     stroke-opacity="1"
-     points="1024.615385,608.530769 1024.615385,649.307692 1794.846154,649.307692"
-     id="polyline1095"
-     transform="translate(-59.184586,-75.541293)" />
-  <polyline
-     fill="none"
-     stroke="#ffffff"
-     stroke-width="5"
-     stroke-opacity="1"
-     points="800.342308,558.692308 834.323077,558.692308 870.569231,558.692308"
-     id="polyline1097"
-     transform="translate(-59.184586,-75.541293)" />
-  <polyline
-     fill="none"
-     stroke="#000000"
-     stroke-opacity="1"
-     points="800.342308,558.692308 834.323077,558.692308 870.569231,558.692308"
-     id="polyline1099"
-     transform="translate(-59.184586,-75.541293)" />
-  <polyline
-     fill="none"
-     stroke="#ffffff"
-     stroke-width="5"
-     stroke-opacity="1"
-     points="1167.334615,558.692308 1251.153846,558.692308 1251.153846,468.076923 662.153846,468.076923 662.153846,556.426923 702.930769,556.426923"
-     id="polyline1101"
-     transform="translate(-59.184586,-75.541293)" />
-  <polyline
-     fill="none"
-     stroke="#000000"
-     stroke-opacity="1"
-     points="1167.334615,558.692308 1251.153846,558.692308 1251.153846,468.076923 662.153846,468.076923 662.153846,556.426923 702.930769,556.426923"
-     id="polyline1103"
-     transform="translate(-59.184586,-75.541293)" />
-  <polyline
-     fill="none"
-     stroke="#ffffff"
-     stroke-width="5"
-     stroke-opacity="1"
-     points="1024.615385,608.530769 1024.615385,649.307692 1024.615385,921.153846 1060.861538,921.153846"
-     id="polyline1105"
-     transform="translate(-59.184586,-75.541293)" />
-  <polyline
-     fill="none"
-     stroke="#ff00ff"
-     stroke-opacity="1"
-     points="1024.615385,608.530769 1024.615385,649.307692 1024.615385,921.153846 1060.861538,921.153846"
-     id="polyline1107"
-     transform="translate(-59.184586,-75.541293)" />
-  <polyline
-     fill="none"
-     stroke="#ffffff"
-     stroke-width="5"
-     stroke-opacity="1"
-     points="444.676923,332.153846 1613.615385,332.153846 1613.615385,1011.769231 1196.784615,1011.769231 1196.784615,957.400000 1242.092308,957.400000"
-     id="polyline1109"
-     transform="translate(-59.184586,-75.541293)" />
-  <polyline
-     fill="none"
-     stroke="#ff00ff"
-     stroke-opacity="1"
-     points="444.676923,332.153846 1613.615385,332.153846 1613.615385,1011.769231 1196.784615,1011.769231 1196.784615,957.400000 1242.092308,957.400000"
-     id="polyline1111"
-     transform="translate(-59.184586,-75.541293)" />
-  <polyline
-     fill="none"
-     stroke="#ffffff"
-     stroke-width="5"
-     stroke-opacity="1"
-     points="1350.830769,921.153846 1432.384615,921.153846 1432.384615,739.923077 1160.538462,739.923077 1160.538462,613.061538"
-     id="polyline1113"
-     transform="translate(-59.184586,-75.541293)" />
-  <polyline
-     fill="none"
-     stroke="#ff00ff"
-     stroke-opacity="1"
-     points="1350.830769,921.153846 1432.384615,921.153846 1432.384615,739.923077 1160.538462,739.923077 1160.538462,613.061538"
-     id="polyline1115"
-     transform="translate(-59.184586,-75.541293)" />
-  <polyline
-     fill="none"
-     stroke="#ffffff"
-     stroke-width="5"
-     stroke-opacity="1"
-     points="752.769231,608.530769 752.769231,649.307692 345.000000,649.307692 345.000000,785.230769 517.169231,785.230769"
-     id="polyline1117"
-     transform="translate(-59.184586,-75.541293)" />
-  <polyline
-     fill="none"
-     stroke="#ff00ff"
-     stroke-opacity="1"
-     points="752.769231,608.530769 752.769231,649.307692 345.000000,649.307692 345.000000,785.230769 517.169231,785.230769"
-     id="polyline1119"
-     transform="translate(-59.184586,-75.541293)" />
-  <polyline
-     fill="none"
-     stroke="#ffffff"
-     stroke-width="5"
-     stroke-opacity="1"
-     points="73.153846,649.307692 254.384615,649.307692 254.384615,875.846154 707.461538,875.846154 707.461538,821.476923 743.707692,821.476923 743.707692,821.476923"
-     id="polyline1121"
-     transform="translate(-59.184586,-75.541293)" />
-  <polyline
-     fill="none"
-     stroke="#ff00ff"
-     stroke-opacity="1"
-     points="73.153846,649.307692 254.384615,649.307692 254.384615,875.846154 707.461538,875.846154 707.461538,821.476923 743.707692,821.476923 743.707692,821.476923"
-     id="polyline1123"
-     transform="translate(-59.184586,-75.541293)" />
-  <polyline
-     fill="none"
-     stroke="#ffffff"
-     stroke-width="5"
-     stroke-opacity="1"
-     points="852.446154,785.230769 888.692308,785.230769 888.692308,613.061538"
-     id="polyline1125"
-     transform="translate(-59.184586,-75.541293)" />
-  <polyline
-     fill="none"
-     stroke="#ff00ff"
-     stroke-opacity="1"
-     points="852.446154,785.230769 888.692308,785.230769 888.692308,613.061538"
-     id="polyline1127"
-     transform="translate(-59.184586,-75.541293)" />
-  <polyline
-     fill="none"
-     stroke="#ffffff"
-     stroke-width="5"
-     stroke-opacity="1"
-     points="73.153846,649.307692 254.384615,649.307692 254.384615,413.707692 707.461538,413.707692 707.461538,196.230769"
-     id="polyline1129"
-     transform="translate(-59.184586,-75.541293)" />
-  <polyline
-     fill="none"
-     stroke="#ff00ff"
-     stroke-opacity="1"
-     points="73.153846,649.307692 254.384615,649.307692 254.384615,413.707692 707.461538,413.707692 707.461538,196.230769"
-     id="polyline1131"
-     transform="translate(-59.184586,-75.541293)" />
-  <polyline
-     fill="none"
-     stroke="#ffffff"
-     stroke-width="5"
-     stroke-opacity="1"
-     points="714.257692,141.861538 934.000000,141.861538 934.000000,556.426923 974.776923,556.426923"
-     id="polyline1133"
-     transform="translate(-59.184586,-75.541293)" />
-  <polyline
-     fill="none"
-     stroke="#000000"
-     stroke-opacity="1"
-     points="714.257692,141.861538 934.000000,141.861538 934.000000,556.426923 974.776923,556.426923"
-     id="polyline1135"
-     transform="translate(-59.184586,-75.541293)" />
-  <polyline
-     fill="none"
-     stroke="#ffffff"
-     stroke-width="5"
-     stroke-opacity="1"
-     points="895.488462,558.692308 974.776923,558.692308 974.776923,560.957692"
-     id="polyline1137"
-     transform="translate(-59.184586,-75.541293)" />
-  <polyline
-     fill="none"
-     stroke="#000000"
-     stroke-opacity="1"
-     points="895.488462,558.692308 974.776923,558.692308 974.776923,560.957692"
-     id="polyline1139"
-     transform="translate(-59.184586,-75.541293)" />
-  <polyline
-     fill="none"
-     stroke="#ffffff"
-     stroke-width="5"
-     stroke-opacity="1"
-     points="623.642308,241.538462 653.092308,241.538462 653.092308,449.953846 653.092308,558.692308 702.930769,558.692308 702.930769,560.957692"
-     id="polyline1141"
-     transform="translate(-59.184586,-75.541293)" />
-  <polyline
-     fill="none"
-     stroke="#000000"
-     stroke-opacity="1"
-     points="623.642308,241.538462 653.092308,241.538462 653.092308,449.953846 653.092308,558.692308 702.930769,558.692308 702.930769,560.957692"
-     id="polyline1143"
-     transform="translate(-59.184586,-75.541293)" />
-  <polyline
-     fill="none"
-     stroke="#ffffff"
-     stroke-width="5"
-     stroke-opacity="1"
-     points="528.496154,149.790385 571.538462,149.790385 571.538462,150.923077 571.538462,141.861538 689.338462,141.861538"
-     id="polyline1145"
-     transform="translate(-59.184586,-75.541293)" />
-  <polyline
-     fill="none"
-     stroke="#000000"
-     stroke-opacity="1"
-     points="528.496154,149.790385 571.538462,149.790385 571.538462,150.923077 571.538462,141.861538 689.338462,141.861538"
-     id="polyline1147"
-     transform="translate(-59.184586,-75.541293)" />
-  <polyline
-     fill="none"
-     stroke="#ffffff"
-     stroke-width="5"
-     stroke-opacity="1"
-     points="528.496154,152.055769 553.415385,152.055769 553.415385,150.923077 571.538462,150.923077 571.538462,241.538462 598.723077,241.538462"
-     id="polyline1149"
-     transform="translate(-59.184586,-75.541293)" />
-  <polyline
-     fill="none"
-     stroke="#000000"
-     stroke-opacity="1"
-     points="528.496154,152.055769 553.415385,152.055769 553.415385,150.923077 571.538462,150.923077 571.538462,241.538462 598.723077,241.538462"
-     id="polyline1151"
-     transform="translate(-59.184586,-75.541293)" />
-  <polyline
-     fill="none"
-     stroke="#ffffff"
-     stroke-width="5"
-     stroke-opacity="1"
-     points="335.938462,332.153846 254.384615,332.153846 254.384615,649.307692 73.153846,649.307692"
-     id="polyline1153"
-     transform="translate(-59.184586,-75.541293)" />
-  <polyline
-     fill="none"
-     stroke="#ff00ff"
-     stroke-opacity="1"
-     points="335.938462,332.153846 254.384615,332.153846 254.384615,649.307692 73.153846,649.307692"
-     id="polyline1155"
-     transform="translate(-59.184586,-75.541293)" />
-  <polyline
-     fill="none"
-     stroke="#ffffff"
-     stroke-width="5"
-     stroke-opacity="1"
-     points="444.676923,332.153846 616.846154,332.153846 616.846154,295.907692"
-     id="polyline1157"
-     transform="translate(-59.184586,-75.541293)" />
-  <polyline
-     fill="none"
-     stroke="#ff00ff"
-     stroke-opacity="1"
-     points="444.676923,332.153846 616.846154,332.153846 616.846154,295.907692"
-     id="polyline1159"
-     transform="translate(-59.184586,-75.541293)" />
-  <polyline
-     fill="none"
-     stroke="#ffffff"
-     stroke-width="5"
-     stroke-opacity="1"
-     points="625.907692,785.230769 743.707692,785.230769"
-     id="polyline1161"
-     transform="translate(-59.184586,-75.541293)" />
-  <polyline
-     fill="none"
-     stroke="#ff00ff"
-     stroke-opacity="1"
-     points="625.907692,785.230769 743.707692,785.230769"
-     id="polyline1163"
-     transform="translate(-59.184586,-75.541293)" />
-  <polyline
-     fill="none"
-     stroke="#ffffff"
-     stroke-width="5"
-     stroke-opacity="1"
-     points="1169.600000,921.153846 1169.600000,921.153846 1242.092308,921.153846"
-     id="polyline1165"
-     transform="translate(-59.184586,-75.541293)" />
-  <polyline
-     fill="none"
-     stroke="#ff00ff"
-     stroke-opacity="1"
-     points="1169.600000,921.153846 1169.600000,921.153846 1242.092308,921.153846"
-     id="polyline1167"
-     transform="translate(-59.184586,-75.541293)" />
-  <circle
-     fill="#ff00ff"
-     stroke="#ff00ff"
-     cx="195.20041"
-     cy="573.76666"
-     id="ellipse1169"
-     r="3" />
-  <circle
-     fill="#ff00ff"
-     stroke="#ff00ff"
-     cx="195.20041"
-     cy="573.76666"
-     id="ellipse1171"
-     r="3" />
-  <circle
-     fill="#ff00ff"
-     stroke="#ff00ff"
-     cx="195.20041"
-     cy="338.16672"
-     id="ellipse1173"
-     r="3" />
-  <circle
-     fill="#ff00ff"
-     stroke="#ff00ff"
-     cx="557.66144"
-     cy="256.6127"
-     id="ellipse1175"
-     r="3" />
-  <circle
-     fill="#ff00ff"
-     stroke="#ff00ff"
-     cx="965.43542"
-     cy="573.76666"
-     id="ellipse1177"
-     r="3" />
-  <polygon
-     fill="#ff00ff"
-     stroke="#ff00ff"
-     stroke-opacity="1"
-     points="73.153846,694.61538 73.153846,604 163.76923,649.30769 "
-     id="polygon1179"
-     transform="translate(-59.184586,-75.541293)" />
-  <text
-     fill="#ff00ff"
-     font-size="23px"
-     font-family="helvetica"
-     text-anchor="middle"
-     dominant-baseline="central"
-     x="4.9077148"
-     y="508.07071"
-     id="text1181">u</text>
-  <polygon
-     fill="#ffffff"
-     stroke="#ff00ff"
-     stroke-opacity="1"
-     points="1704.2308,694.61538 1704.2308,604 1794.8462,649.30769 "
-     id="polygon1183"
-     transform="translate(-59.184586,-75.541293)" />
-  <text
-     fill="#ff00ff"
-     font-size="45px"
-     font-family="helvetica"
-     text-anchor="middle"
-     dominant-baseline="central"
-     x="1762.8455"
-     y="496.74368"
-     id="text1185">y</text>
-  <polygon
-     fill="#ff00ff"
-     stroke="#ff00ff"
-     stroke-opacity="1"
-     points="517.16923,789.76154 517.16923,780.7 526.23077,785.23077 "
-     id="polygon1187"
-     transform="translate(-59.184586,-75.541293)" />
-  <polygon
-     fill="#ffffff"
-     stroke="#ff00ff"
-     stroke-opacity="1"
-     points="616.84615,789.76154 616.84615,780.7 625.90769,785.23077 "
-     id="polygon1189"
-     transform="translate(-59.184586,-75.541293)" />
-  <polygon
-     fill="#ff00ff"
-     stroke="#ff00ff"
-     stroke-opacity="1"
-     points="1060.8615,925.68462 1060.8615,916.62308 1069.9231,921.15385 "
-     id="polygon1191"
-     transform="translate(-59.184586,-75.541293)" />
-  <polygon
-     fill="#ffffff"
-     stroke="#ff00ff"
-     stroke-opacity="1"
-     points="1160.5385,925.68462 1160.5385,916.62308 1169.6,921.15385 "
-     id="polygon1193"
-     transform="translate(-59.184586,-75.541293)" />
-  <polygon
-     fill="#000000"
-     stroke="#000000"
-     stroke-opacity="1"
-     points="698.4,554.16154 698.4,563.22308 707.46154,558.69231 "
-     id="polygon1195"
-     transform="translate(-59.184586,-75.541293)" />
-  <polygon
-     fill="#000000"
-     stroke="#000000"
-     stroke-opacity="1"
-     points="698.4,554.16154 698.4,563.22308 707.46154,558.69231 "
-     id="polygon1197"
-     transform="translate(-59.184586,-75.541293)" />
-  <rect
-     fill="#ffffff"
-     stroke="#000000"
-     stroke-opacity="1"
-     x="738.65741"
-     y="480.65073"
-     width="5"
-     height="5"
-     id="rect1199" />
-  <rect
-     fill="#ffffff"
-     stroke="#000000"
-     stroke-opacity="1"
-     x="738.65741"
-     y="480.65073"
-     width="5"
-     height="5"
-     id="rect1201" />
-  <polygon
-     fill="#ffffff"
-     stroke="#ff00ff"
-     stroke-opacity="1"
-     points="748.23846,604 757.3,604 752.76923,613.06154 "
-     id="polygon1203"
-     transform="translate(-59.184586,-75.541293)" />
-  <polygon
-     fill="#000000"
-     stroke="#000000"
-     stroke-opacity="1"
-     points="866.03846,563.22308 866.03846,554.16154 875.1,558.69231 "
-     id="polygon1205"
-     transform="translate(-59.184586,-75.541293)" />
-  <rect
-     fill="#ffffff"
-     stroke="#000000"
-     stroke-opacity="1"
-     transform="scale(1,-1)"
-     x="833.80341"
-     y="-485.6507"
-     width="5"
-     height="5"
-     id="rect1207" />
-  <polygon
-     fill="#ff00ff"
-     stroke="#ff00ff"
-     stroke-opacity="1"
-     points="897.75385,622.12308 879.63077,622.12308 888.69231,604 "
-     id="polygon1209"
-     transform="translate(-59.184586,-75.541293)" />
-  <polygon
-     fill="#ff00ff"
-     stroke="#ff00ff"
-     stroke-opacity="1"
-     points="335.93846,336.68462 335.93846,327.62308 345,332.15385 "
-     id="polygon1211"
-     transform="translate(-59.184586,-75.541293)" />
-  <polygon
-     fill="#ffffff"
-     stroke="#ff00ff"
-     stroke-opacity="1"
-     points="435.61539,336.68462 435.61539,327.62308 444.67692,332.15385 "
-     id="polygon1213"
-     transform="translate(-59.184586,-75.541293)" />
-  <polygon
-     fill="#000000"
-     stroke="#000000"
-     stroke-opacity="1"
-     points="970.24615,554.16154 970.24615,563.22308 979.30769,558.69231 "
-     id="polygon1215"
-     transform="translate(-59.184586,-75.541293)" />
-  <polygon
-     fill="#000000"
-     stroke="#000000"
-     stroke-opacity="1"
-     points="970.24615,554.16154 970.24615,563.22308 979.30769,558.69231 "
-     id="polygon1217"
-     transform="translate(-59.184586,-75.541293)" />
-  <rect
-     fill="#ffffff"
-     stroke="#000000"
-     stroke-opacity="1"
-     x="1010.5054"
-     y="480.65073"
-     width="5"
-     height="5"
-     id="rect1219" />
-  <rect
-     fill="#ffffff"
-     stroke="#000000"
-     stroke-opacity="1"
-     x="1010.5054"
-     y="480.65073"
-     width="5"
-     height="5"
-     id="rect1221" />
-  <polygon
-     fill="#ffffff"
-     stroke="#ff00ff"
-     stroke-opacity="1"
-     points="1020.0846,604 1029.1462,604 1024.6154,613.06154 "
-     id="polygon1223"
-     transform="translate(-59.184586,-75.541293)" />
-  <polygon
-     fill="#000000"
-     stroke="#000000"
-     stroke-opacity="1"
-     points="1137.8846,563.22308 1137.8846,554.16154 1146.9462,558.69231 "
-     id="polygon1225"
-     transform="translate(-59.184586,-75.541293)" />
-  <rect
-     fill="#ffffff"
-     stroke="#000000"
-     stroke-opacity="1"
-     transform="scale(1,-1)"
-     x="1105.6454"
-     y="-485.6507"
-     width="5"
-     height="5"
-     id="rect1227" />
-  <polygon
-     fill="#ff00ff"
-     stroke="#ff00ff"
-     stroke-opacity="1"
-     points="1169.6,622.12308 1151.4769,622.12308 1160.5385,604 "
-     id="polygon1229"
-     transform="translate(-59.184586,-75.541293)" />
-  <polygon
-     fill="#ff00ff"
-     stroke="#ff00ff"
-     stroke-opacity="1"
-     points="1242.0923,925.68462 1242.0923,916.62308 1251.1538,921.15385 "
-     id="polygon1231"
-     transform="translate(-59.184586,-75.541293)" />
-  <polygon
-     fill="#ff00ff"
-     stroke="#ff00ff"
-     stroke-opacity="1"
-     points="1242.0923,961.93077 1242.0923,952.86923 1251.1538,957.4 "
-     id="polygon1233"
-     transform="translate(-59.184586,-75.541293)" />
-  <polygon
-     fill="#ffffff"
-     stroke="#ff00ff"
-     stroke-opacity="1"
-     points="1341.7692,925.68462 1341.7692,916.62308 1350.8308,921.15385 "
-     id="polygon1235"
-     transform="translate(-59.184586,-75.541293)" />
-  <polygon
-     fill="#ff00ff"
-     stroke="#ff00ff"
-     stroke-opacity="1"
-     points="743.70769,789.76154 743.70769,780.7 752.76923,785.23077 "
-     id="polygon1237"
-     transform="translate(-59.184586,-75.541293)" />
-  <polygon
-     fill="#ff00ff"
-     stroke="#ff00ff"
-     stroke-opacity="1"
-     points="743.70769,826.00769 743.70769,816.94615 752.76923,821.47692 "
-     id="polygon1239"
-     transform="translate(-59.184586,-75.541293)" />
-  <polygon
-     fill="#ffffff"
-     stroke="#ff00ff"
-     stroke-opacity="1"
-     points="843.38462,789.76154 843.38462,780.7 852.44615,785.23077 "
-     id="polygon1241"
-     transform="translate(-59.184586,-75.541293)" />
-  <polygon
-     fill="#000000"
-     stroke="#000000"
-     stroke-opacity="1"
-     points="426.55385,146.39231 426.55385,155.45385 435.61539,150.92308 "
-     id="polygon1243"
-     transform="translate(-59.184586,-75.541293)" />
-  <polygon
-     fill="#000000"
-     stroke="#000000"
-     stroke-opacity="1"
-     points="426.55385,146.39231 426.55385,155.45385 435.61539,150.92308 "
-     id="polygon1245"
-     transform="translate(-59.184586,-75.541293)" />
-  <rect
-     fill="#ffffff"
-     stroke="#000000"
-     stroke-opacity="1"
-     x="466.8114"
-     y="72.881714"
-     width="5"
-     height="5"
-     id="rect1247" />
-  <rect
-     fill="#ffffff"
-     stroke="#000000"
-     stroke-opacity="1"
-     x="466.8114"
-     y="72.881714"
-     width="5"
-     height="5"
-     id="rect1249" />
-  <polygon
-     fill="#000000"
-     stroke="#000000"
-     stroke-opacity="1"
-     points="684.80769,146.39231 684.80769,137.33077 693.86923,141.86154 "
-     id="polygon1251"
-     transform="translate(-59.184586,-75.541293)" />
-  <rect
-     fill="#ffffff"
-     stroke="#000000"
-     stroke-opacity="1"
-     transform="scale(1,-1)"
-     x="652.57343"
-     y="-68.820709"
-     width="5"
-     height="5"
-     id="rect1253" />
-  <polygon
-     fill="#ff00ff"
-     stroke="#ff00ff"
-     stroke-opacity="1"
-     points="716.52308,205.29231 698.4,205.29231 707.46154,187.16923 "
-     id="polygon1255"
-     transform="translate(-59.184586,-75.541293)" />
-  <polygon
-     fill="#000000"
-     stroke="#000000"
-     stroke-opacity="1"
-     points="594.19231,246.06923 594.19231,237.00769 603.25385,241.53846 "
-     id="polygon1257"
-     transform="translate(-59.184586,-75.541293)" />
-  <rect
-     fill="#ffffff"
-     stroke="#000000"
-     stroke-opacity="1"
-     transform="scale(1,-1)"
-     x="561.9574"
-     y="-168.4967"
-     width="5"
-     height="5"
-     id="rect1259" />
-  <polygon
-     fill="#ff00ff"
-     stroke="#ff00ff"
-     stroke-opacity="1"
-     points="625.90769,304.96923 607.78462,304.96923 616.84615,286.84615 "
-     id="polygon1261"
-     transform="translate(-59.184586,-75.541293)" />
-</svg>
diff --git a/Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueHold.png b/Buildings/Resources/Images/Obsolete/Controls/OBC/CDL/Logical/TrueHold.png
similarity index 100%
rename from Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueHold.png
rename to Buildings/Resources/Images/Obsolete/Controls/OBC/CDL/Logical/TrueHold.png
diff --git a/Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueHold1.png b/Buildings/Resources/Images/Obsolete/Controls/OBC/CDL/Logical/TrueHold1.png
similarity index 100%
rename from Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueHold1.png
rename to Buildings/Resources/Images/Obsolete/Controls/OBC/CDL/Logical/TrueHold1.png
diff --git a/Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueHold2.png b/Buildings/Resources/Images/Obsolete/Controls/OBC/CDL/Logical/TrueHold2.png
similarity index 100%
rename from Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueHold2.png
rename to Buildings/Resources/Images/Obsolete/Controls/OBC/CDL/Logical/TrueHold2.png
diff --git a/Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueHold3.png b/Buildings/Resources/Images/Obsolete/Controls/OBC/CDL/Logical/TrueHold3.png
similarity index 100%
rename from Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueHold3.png
rename to Buildings/Resources/Images/Obsolete/Controls/OBC/CDL/Logical/TrueHold3.png
diff --git a/Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueHoldImplementation.png b/Buildings/Resources/Images/Obsolete/Controls/OBC/CDL/Logical/TrueHoldImplementation.png
similarity index 100%
rename from Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueHoldImplementation.png
rename to Buildings/Resources/Images/Obsolete/Controls/OBC/CDL/Logical/TrueHoldImplementation.png
diff --git a/Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueHoldImplementation.svg b/Buildings/Resources/Images/Obsolete/Controls/OBC/CDL/Logical/TrueHoldImplementation.svg
similarity index 100%
rename from Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueHoldImplementation.svg
rename to Buildings/Resources/Images/Obsolete/Controls/OBC/CDL/Logical/TrueHoldImplementation.svg
diff --git a/Buildings/Resources/Images/Templates/Plants/HeatPumps/AirToWater.png b/Buildings/Resources/Images/Templates/Plants/HeatPumps/AirToWater.png
index e56207c6969..5837259f0e5 100644
Binary files a/Buildings/Resources/Images/Templates/Plants/HeatPumps/AirToWater.png and b/Buildings/Resources/Images/Templates/Plants/HeatPumps/AirToWater.png differ
diff --git a/Buildings/Resources/Images/Templates/Plants/HeatPumps/AirToWater.svg b/Buildings/Resources/Images/Templates/Plants/HeatPumps/AirToWater.svg
index da70a336999..041df0d2a3c 100644
--- a/Buildings/Resources/Images/Templates/Plants/HeatPumps/AirToWater.svg
+++ b/Buildings/Resources/Images/Templates/Plants/HeatPumps/AirToWater.svg
@@ -2,13 +2,16 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
-   width="215.25mm"
-   height="115.25mm"
-   viewBox="0 0 215.25 115.25"
+   width="235.00002mm"
+   height="153.89977mm"
+   viewBox="0 0 235.00002 153.89976"
    version="1.1"
    id="svg1"
-   inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)"
+   inkscape:version="1.3.2 (091e20e, 2023-11-25)"
    sodipodi:docname="AirToWater.svg"
+   inkscape:export-filename="AirToWater.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns="http://www.w3.org/2000/svg"
@@ -24,20 +27,20 @@
      inkscape:deskcolor="#d1d1d1"
      inkscape:document-units="mm"
      showgrid="true"
-     inkscape:zoom="1.4142136"
-     inkscape:cx="345.77521"
-     inkscape:cy="257.03331"
-     inkscape:window-width="2560"
-     inkscape:window-height="1369"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
+     inkscape:zoom="0.50000001"
+     inkscape:cx="447.99999"
+     inkscape:cy="195.99999"
+     inkscape:window-width="1880"
+     inkscape:window-height="1027"
+     inkscape:window-x="43"
+     inkscape:window-y="25"
      inkscape:window-maximized="1"
      inkscape:current-layer="layer1">
     <inkscape:grid
        id="grid6"
        units="mm"
-       originx="-114.875"
-       originy="-79.874993"
+       originx="-105"
+       originy="-73.905994"
        spacingx="1"
        spacingy="0.99999998"
        empcolor="#0099e5"
@@ -130,10 +133,10 @@
      inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
-     transform="translate(-114.87501,-79.874992)">
+     transform="translate(-105.00001,-73.905994)">
     <path
        style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       d="m 120,120 h 35"
+       d="m 105.00001,120.00001 h 50"
        id="path2-83-1"
        sodipodi:nodetypes="cc" />
     <path
@@ -141,11 +144,6 @@
        d="m 140,120 v 20"
        id="path2-83-1-8"
        sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-dasharray:4, 2;stroke-dashoffset:0;stroke-opacity:1"
-       d="m 120,140 h 33 m 4,0 h 8"
-       id="path2-83-7-1"
-       sodipodi:nodetypes="cccc" />
     <path
        style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-start:url(#Stop-1-0-0);marker-end:url(#Stop-1-0-0)"
        d="m 155,115 v 74.99999"
@@ -158,12 +156,12 @@
        sodipodi:nodetypes="cc" />
     <path
        style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-dasharray:none;stroke-opacity:1"
-       d="m 280.00001,140 h 8 m 4,0 h 33"
+       d="m 280.00001,140 h 8 m 4,0 h 48.00001"
        id="path2-83-7-1-6"
        sodipodi:nodetypes="cccc" />
     <path
        style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-dasharray:4, 2;stroke-dashoffset:0;stroke-opacity:1"
-       d="m 290.00001,120 h 35"
+       d="m 290.00001,120 h 50.00001"
        id="path2-83-7-1-6-9"
        sodipodi:nodetypes="cc" />
     <path
@@ -178,12 +176,12 @@
        sodipodi:nodetypes="cc" />
     <path
        style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-dasharray:4, 2;stroke-dashoffset:0;stroke-opacity:1"
-       d="m 210,155 -1e-5,-50.00001"
+       d="m 210,155 -1e-5,-55.000031"
        id="path2-83-74-0"
        sodipodi:nodetypes="cc" />
     <path
        style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       d="m 195,165 -1e-5,-60.00001"
+       d="m 195,165 -1e-5,-65.000031"
        id="path2-83-74-0-3"
        sodipodi:nodetypes="cc" />
     <g
@@ -209,7 +207,7 @@
     </g>
     <path
        style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       d="m 235.00001,185.00001 -1e-5,-80"
+       d="M 235.00001,185.00001 235,99.999989"
        id="path2-83-74-0-3-4"
        sodipodi:nodetypes="cc" />
     <path
@@ -229,7 +227,7 @@
        sodipodi:nodetypes="cccc" />
     <path
        style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-dasharray:4, 2;stroke-dashoffset:0;stroke-opacity:1"
-       d="m 250.00001,175.00002 v -70"
+       d="M 250.00001,175.00002 V 99.999999"
        id="path2-83-74-0-35"
        sodipodi:nodetypes="cc" />
     <path
@@ -361,222 +359,14 @@
     <text
        xml:space="preserve"
        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.36661px;line-height:0;font-family:'Arial Narrow';-inkscape-font-specification:'Arial Narrow, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;display:inline;fill:#000000;stroke-width:0.596446"
-       x="242.5641"
-       y="91.924835"
+       x="242.07478"
+       y="103.20987"
        id="text5-1-9-3-0-2-2-9-5"><tspan
          sodipodi:role="line"
-         x="242.5641"
-         y="91.924835"
+         x="242.07478"
+         y="103.20987"
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.36661px;line-height:1.25;font-family:'Arial Narrow';-inkscape-font-specification:'Arial Narrow, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;text-anchor:middle;stroke-width:0.596446"
          id="tspan2-4-1-2-4">AWHP-2</tspan></text>
-    <g
-       id="g1"
-       transform="matrix(0,-1.4214802,1.4214802,0,154.55682,448.47328)">
-      <ellipse
-         cy="249.4752"
-         cx="67.043098"
-         id="circle5669-8-4-7-9"
-         style="display:inline;fill:none;fill-opacity:0;stroke:#4d4d4d;stroke-width:0.132292;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         transform="matrix(0,1,1,0,0,0)"
-         rx="1.7583774"
-         ry="1.7565393" />
-      <path
-         id="path427"
-         d="m 247.87271,66.352258 2.50934,-0.832062"
-         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         id="path429"
-         d="m 247.82879,67.746427 2.58463,0.80383"
-         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <rect
-         y="-256.56128"
-         x="58.351643"
-         height="3.5130787"
-         width="7.0335097"
-         id="rect1469-2-9"
-         style="display:inline;fill:none;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.132292;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         transform="rotate(90)" />
-      <path
-         id="path1471-4-1"
-         d="m 253.04822,58.351681 3.51308,7.033472"
-         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         id="path459"
-         d="m 256.56126,58.351681 -3.51308,7.033472"
-         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         id="path481"
-         d="m 251.29169,67.143547 h 1.75654 V 65.3851"
-         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         id="path483"
-         d="m 253.04823,58.351681 v -1.758394 h -1.75654"
-         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         id="path5655-7-5-9-1-5"
-         d="m 251.24604,55.715558 v 1.755431 l -1.7109,-0.877702 z"
-         style="display:inline;fill:none;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         id="path5657-8-5-7-6-3"
-         d="m 247.82425,55.715558 v 1.755431 l 1.71089,-0.877702 z"
-         style="display:inline;fill:none;fill-opacity:0;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <rect
-         style="display:inline;fill:none;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.132292;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect1469-2-9-7"
-         width="7.0335097"
-         height="3.5130787"
-         x="58.351643"
-         y="-246.02203"
-         transform="rotate(90)" />
-      <path
-         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="m 242.50899,58.351681 3.51307,7.033472"
-         id="path1471-4-1-5" />
-      <path
-         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="m 246.02203,58.351681 -3.51308,7.033472"
-         id="path459-5" />
-      <path
-         id="path3481"
-         d="m 246.02207,58.351681 v -1.758394 h 1.75654"
-         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         id="path3538"
-         d="m 246.02207,65.385153 v 1.758368 h 1.69947"
-         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         id="path3662"
-         d="m 241.63072,54.834892 h 15.80885 v 14.946207 h -15.80885 z"
-         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         id="path3728"
-         d="m 241.63072,56.593287 h 0.87827 v 1.758394"
-         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         id="path3730"
-         d="m 256.5613,58.351681 v -1.758394 h 0.87827"
-         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         id="path3732"
-         d="m 256.5613,65.385153 v 1.758368 h 0.87827"
-         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         id="path3734"
-         d="m 241.63072,67.143547 h 0.87827 V 65.3851"
-         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    </g>
-    <g
-       id="g3-9"
-       style="display:inline"
-       transform="matrix(1.0012268,0,0,1.0012268,-40.285234,-2.4919381)">
-      <text
-         xml:space="preserve"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.36661px;line-height:0;font-family:'Arial Narrow';-inkscape-font-specification:'Arial Narrow, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;display:inline;fill:#000000;stroke-width:0.596446"
-         x="242.5641"
-         y="94.285057"
-         id="text5-1-9-3-0-2-2-9-5-0"><tspan
-           sodipodi:role="line"
-           x="242.5641"
-           y="94.285057"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.36661px;line-height:1.25;font-family:'Arial Narrow';-inkscape-font-specification:'Arial Narrow, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;text-anchor:middle;stroke-width:0.596446"
-           id="tspan2-4-1-2-4-5">AWHP-1</tspan></text>
-      <g
-         id="g2-0"
-         transform="matrix(0,-1.4197388,1.4197388,0,154.65231,450.41273)">
-        <ellipse
-           cy="249.4752"
-           cx="67.043098"
-           id="circle5669-8-4-7-9-9"
-           style="display:inline;fill:none;fill-opacity:0;stroke:#4d4d4d;stroke-width:0.132292;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           transform="matrix(0,1,1,0,0,0)"
-           rx="1.7583774"
-           ry="1.7565393" />
-        <path
-           id="path427-7"
-           d="m 247.87271,66.352258 2.50934,-0.832062"
-           style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-        <path
-           id="path429-1"
-           d="m 247.82879,67.746427 2.58463,0.80383"
-           style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-        <rect
-           y="-256.56128"
-           x="58.351643"
-           height="3.5130787"
-           width="7.0335097"
-           id="rect1469-2-9-5"
-           style="display:inline;fill:none;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.132292;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           transform="rotate(90)" />
-        <path
-           id="path1471-4-1-6"
-           d="m 253.04822,58.351681 3.51308,7.033472"
-           style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-        <path
-           id="path459-7"
-           d="m 256.56126,58.351681 -3.51308,7.033472"
-           style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-        <path
-           id="path481-4"
-           d="m 251.29169,67.143547 h 1.75654 V 65.3851"
-           style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-        <path
-           id="path483-6"
-           d="m 253.04823,58.351681 v -1.758394 h -1.75654"
-           style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-        <path
-           id="path5655-7-5-9-1-5-6"
-           d="m 251.24604,55.715558 v 1.755431 l -1.7109,-0.877702 z"
-           style="display:inline;fill:none;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-        <path
-           id="path5657-8-5-7-6-3-4"
-           d="m 247.82425,55.715558 v 1.755431 l 1.71089,-0.877702 z"
-           style="display:inline;fill:none;fill-opacity:0;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-        <rect
-           style="display:inline;fill:none;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.132292;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           id="rect1469-2-9-7-9"
-           width="7.0335097"
-           height="3.5130787"
-           x="58.351643"
-           y="-246.02203"
-           transform="rotate(90)" />
-        <path
-           style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 242.50899,58.351681 3.51307,7.033472"
-           id="path1471-4-1-5-4" />
-        <path
-           style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 246.02203,58.351681 -3.51308,7.033472"
-           id="path459-5-4" />
-        <path
-           id="path3481-8"
-           d="m 246.02207,58.351681 v -1.758394 h 1.75654"
-           style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-        <path
-           id="path3538-5"
-           d="m 246.02207,65.385153 v 1.758368 h 1.69947"
-           style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-        <path
-           id="path3662-3"
-           d="m 241.63072,54.834892 h 15.80885 v 14.946207 h -15.80885 z"
-           style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-        <path
-           id="path3728-5"
-           d="m 241.63072,56.593287 h 0.87827 v 1.758394"
-           style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-        <path
-           id="path3730-9"
-           d="m 256.5613,58.351681 v -1.758394 h 0.87827"
-           style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-        <path
-           id="path3732-2"
-           d="m 256.5613,65.385153 v 1.758368 h 0.87827"
-           style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-        <path
-           id="path3734-8"
-           d="m 241.63072,67.143547 h 0.87827 V 65.3851"
-           style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      </g>
-    </g>
     <path
        style="display:inline;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        d="m 305.00001,120 v 20"
@@ -912,5 +702,480 @@
          style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.199747;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
          transform="matrix(0,1,1,0,0,0)" />
     </g>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.36661px;line-height:0;font-family:'Arial Narrow';-inkscape-font-specification:'Arial Narrow, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;display:inline;fill:#000000;stroke-width:0.596446"
+       x="222.4507"
+       y="217.32829"
+       id="text5-1-9-3-0-2-2-9-5-3"><tspan
+         sodipodi:role="line"
+         x="222.4507"
+         y="217.32829"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.36661px;line-height:1.25;font-family:'Arial Narrow';-inkscape-font-specification:'Arial Narrow, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;text-anchor:middle;stroke-width:0.596446"
+         id="tspan2-4-1-2-4-9">HRC</tspan></text>
+    <g
+       id="g2-05"
+       transform="matrix(1.4214802,0,0,1.4214802,-132.20926,127.55376)"
+       style="display:inline">
+      <ellipse
+         cy="249.4752"
+         cx="67.043098"
+         id="circle5669-8-4-7-9-2"
+         style="display:inline;fill:none;fill-opacity:0;stroke:#4d4d4d;stroke-width:0.132292;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         transform="matrix(0,1,1,0,0,0)"
+         rx="1.7583774"
+         ry="1.7565393" />
+      <path
+         id="path427-2"
+         d="m 247.87271,66.352258 2.50934,-0.832062"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path429-7"
+         d="m 247.82879,67.746427 2.58463,0.80383"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <rect
+         y="-256.56128"
+         x="58.351643"
+         height="3.5130787"
+         width="7.0335097"
+         id="rect1469-2-9-3"
+         style="display:inline;fill:none;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.132292;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         transform="rotate(90)" />
+      <path
+         id="path1471-4-1-7"
+         d="m 253.04822,58.351681 3.51308,7.033472"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path459-9"
+         d="m 256.56126,58.351681 -3.51308,7.033472"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path481-0"
+         d="m 251.29169,67.143547 h 1.75654 V 65.3851"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path483-2"
+         d="m 253.04823,58.351681 v -1.758394 h -1.75654"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path5655-7-5-9-1-5-3"
+         d="m 251.24604,55.715558 v 1.755431 l -1.7109,-0.877702 z"
+         style="display:inline;fill:none;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path5657-8-5-7-6-3-9"
+         d="m 247.82425,55.715558 v 1.755431 l 1.71089,-0.877702 z"
+         style="display:inline;fill:none;fill-opacity:0;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <rect
+         style="display:inline;fill:none;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.132292;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1469-2-9-7-97"
+         width="7.0335097"
+         height="3.5130787"
+         x="58.351643"
+         y="-246.02203"
+         transform="rotate(90)" />
+      <path
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 242.50899,58.351681 3.51307,7.033472"
+         id="path1471-4-1-5-0" />
+      <path
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 246.02203,58.351681 -3.51308,7.033472"
+         id="path459-5-3" />
+      <path
+         id="path3481-9"
+         d="m 246.02207,58.351681 v -1.758394 h 1.75654"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path3538-8"
+         d="m 246.02207,65.385153 v 1.758368 h 1.69947"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path3662-6"
+         d="m 241.63072,54.834892 h 15.80885 v 14.946207 h -15.80885 z"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path3728-57"
+         d="m 241.63072,56.593287 h 0.87827 v 1.758394"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path3730-6"
+         d="m 256.5613,58.351681 v -1.758394 h 0.87827"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path3732-27"
+         d="m 256.5613,65.385153 v 1.758368 h 0.87827"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path3734-0"
+         d="m 241.63072,67.143547 h 0.87827 V 65.3851"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+    <path
+       style="font-variation-settings:normal;opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:4, 2;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 335.00001,120 v 18"
+       id="path1" />
+    <path
+       style="font-variation-settings:normal;opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:4, 2;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 233.73599,222.99694 101.26402,0.003 0.002,-81"
+       id="path2" />
+    <g
+       id="g6-2"
+       transform="matrix(-1,0,0,1,564.57821,88.019239)"
+       style="display:inline">
+      <ellipse
+         style="display:inline;fill:#fefdfd;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.25;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="path10-1-39-91-0-1-6"
+         cx="314.89743"
+         cy="-134.98076"
+         rx="4.6807604"
+         ry="4.6807609"
+         transform="scale(1,-1)" />
+      <path
+         style="display:inline;fill:#4d4d4d;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.271144;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         d="m 319.27014,134.98076 -4.20376,4.46404 v -8.92808 z"
+         id="path11-4-05-72-0-4-9"
+         sodipodi:nodetypes="cccc" />
+    </g>
+    <path
+       style="font-variation-settings:normal;opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 233.73599,208 h 91.26403 v -66"
+       id="path3" />
+    <path
+       style="font-variation-settings:normal;opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="M 325.00002,138 V 120"
+       id="path5" />
+    <path
+       style="font-variation-settings:normal;opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:4, 2;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 110.00001,140 v 68 h 101.26401"
+       id="path8" />
+    <g
+       id="g6-2-8"
+       transform="translate(-120.57818,73.019239)"
+       style="display:inline">
+      <ellipse
+         style="display:inline;fill:#fefdfd;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.25;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="path10-1-39-91-0-1-6-3"
+         cx="314.89743"
+         cy="-134.98076"
+         rx="4.6807604"
+         ry="4.6807609"
+         transform="scale(1,-1)" />
+      <path
+         style="display:inline;fill:#4d4d4d;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.271144;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         d="m 319.27014,134.98076 -4.20376,4.46404 v -8.92808 z"
+         id="path11-4-05-72-0-4-9-8"
+         sodipodi:nodetypes="cccc" />
+    </g>
+    <path
+       style="font-variation-settings:normal;opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 211.00001,222.99999 h -91 V 210"
+       id="path9" />
+    <path
+       style="font-variation-settings:normal;opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="M 120.00001,206 V 140"
+       id="path10" />
+    <path
+       style="font-variation-settings:normal;opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:4, 2;stroke-dashoffset:2.05;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="M 153,140 H 105.00001"
+       id="path11" />
+    <path
+       style="font-variation-settings:normal;opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:4, 2;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 157.00001,140 h 8"
+       id="path15" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.37074px;line-height:0;font-family:'Arial Narrow';-inkscape-font-specification:'Arial Narrow, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;display:inline;fill:#000000;stroke-width:0.597178"
+       x="202.25758"
+       y="103.21136"
+       id="text5-1-9-3-0-2-2-9-5-0"><tspan
+         sodipodi:role="line"
+         x="202.25758"
+         y="103.21136"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.37074px;line-height:1.25;font-family:'Arial Narrow';-inkscape-font-specification:'Arial Narrow, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;text-anchor:middle;stroke-width:0.597178"
+         id="tspan2-4-1-2-4-5">AWHP-1</tspan></text>
+    <g
+       id="g19">
+      <g
+         id="g2-9-4-4"
+         transform="matrix(0,-0.37943096,-0.37943096,0,200.60139,140.95804)"
+         style="display:inline;stroke-width:0.495478;stroke-dasharray:none">
+        <g
+           id="g3-9"
+           style="stroke-width:0.495478;stroke-dasharray:none">
+          <ellipse
+             style="fill:#fefdfd;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.495478;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+             id="path10-1-39-91-0-59"
+             cx="169.99998"
+             cy="-5"
+             rx="4.6807604"
+             ry="4.6807609" />
+          <path
+             style="fill:#4d4d4d;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.263553;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+             d="m 174.3727,-5.0000002 -4.20376,-4.4640421 v 8.92808458 z"
+             id="path11-4-05-72-0-0"
+             sodipodi:nodetypes="cccc" />
+        </g>
+      </g>
+      <g
+         id="g15"
+         transform="translate(0,0.0895507)">
+        <ellipse
+           cy="-202.59354"
+           cx="88.590912"
+           id="circle5669-8-4-7-9-9"
+           style="display:inline;fill:none;fill-opacity:0;stroke:#4d4d4d;stroke-width:0.188051;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           transform="rotate(90)"
+           rx="2.4994993"
+           ry="2.4968865" />
+        <path
+           id="path427-7"
+           d="m 204.87145,87.608898 -3.56698,-1.18276"
+           style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.188051;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           id="path429-1"
+           d="m 204.93388,89.590678 -3.674,1.14263"
+           style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.188051;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      </g>
+      <rect
+         y="78.776505"
+         x="-207.49754"
+         height="4.993773"
+         width="9.9979973"
+         id="rect1469-2-9-5"
+         style="display:inline;fill:none;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.188051;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         transform="scale(-1,1)" />
+      <path
+         id="path1471-4-1-6"
+         d="m 207.49748,83.77025 -9.99794,-4.993775"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.188051;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path459-7"
+         d="m 207.49748,78.776532 -9.99794,4.993775"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.188051;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path481-4"
+         d="m 195.00001,86.248441 v -2.496888 h 2.4996"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.188051;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path483-6"
+         d="m 207.49748,83.770235 h 2.49953 v 2.496888"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.188051;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path5655-7-5-9-1-5-6"
+         d="m 211.24468,86.332013 h -2.49531 l 1.24764,2.432011 z"
+         style="display:inline;fill:none;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.188051;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path5657-8-5-7-6-3-4"
+         d="m 211.24468,91.196021 h -2.49531 l 1.24764,-2.431997 z"
+         style="display:inline;fill:none;fill-opacity:0;stroke:#4d4d4d;stroke-width:0.188051;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <rect
+         style="display:inline;fill:none;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.188051;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1469-2-9-7-9"
+         width="9.9979973"
+         height="4.993773"
+         x="-207.49754"
+         y="93.757835"
+         transform="scale(-1,1)" />
+      <path
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.188051;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 207.49748,98.75156 -9.99794,-4.993761"
+         id="path1471-4-1-5-4" />
+      <path
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.188051;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 207.49748,93.757842 -9.99794,4.993774"
+         id="path459-5-4" />
+      <path
+         id="path3481-8"
+         d="m 207.49748,93.757785 h 2.49953 v -2.496887"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.188051;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path3538-5"
+         d="m 197.49954,93.757785 h -2.49949 l -4e-5,-2.645336"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.188051;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:nodetypes="ccc" />
+      <path
+         id="path3662-3"
+         d="M 213.90598,99.999997 V 73.999994 h -23.81195 v 26.000003 z"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.188;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path3728-5"
+         d="m 209.99701,100 v -1.24844 h -2.49953"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.188051;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path3734-8"
+         d="m 195.00002,100 v -1.24844 h 2.4996"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.188051;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path5655-7-5-9-1-5-6-9"
+         d="m 196.24766,86.248441 h -2.4953 L 195,88.680452 Z"
+         style="display:inline;fill:none;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.188051;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path5657-8-5-7-6-3-4-3"
+         d="m 196.24766,91.112449 h -2.4953 L 195,88.680452 Z"
+         style="display:inline;fill:none;fill-opacity:0;stroke:#4d4d4d;stroke-width:0.188051;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path5655-7-5-9-1-5-6-9-9"
+         d="m 197.43201,89.928112 v -2.4953 L 195,88.680452 Z"
+         style="display:inline;fill:none;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.188051;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path5655-7-5-9-1-5-6-9-9-5"
+         d="m 192.56799,89.928112 v -2.4953 L 195,88.680452 Z"
+         style="display:inline;fill:none;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.188051;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         style="font-variation-settings:normal;vector-effect:none;fill:none;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.188051;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;stop-color:#000000"
+         d="m 197.43201,88.680462 h 2.66464"
+         id="path16" />
+      <path
+         style="font-variation-settings:normal;vector-effect:none;fill:none;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.188051;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;stop-color:#000000"
+         d="m 205.09042,88.680462 h 1.90959 v 3.319535 h -11"
+         id="path17" />
+      <path
+         style="font-variation-settings:normal;vector-effect:none;fill:none;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.188051;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;stop-color:#000000"
+         d="m 192.56799,88.680462 h -1.56798 v 3.319535 h 3"
+         id="path18" />
+    </g>
+    <g
+       id="g19-9"
+       style="display:inline"
+       transform="translate(39.999986)">
+      <g
+         id="g2-9-4-4-3"
+         transform="matrix(0,-0.37943096,-0.37943096,0,200.60139,140.95804)"
+         style="display:inline;stroke-width:0.495478;stroke-dasharray:none">
+        <g
+           id="g3-9-7"
+           style="stroke-width:0.495478;stroke-dasharray:none">
+          <ellipse
+             style="fill:#fefdfd;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.495478;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+             id="path10-1-39-91-0-59-4"
+             cx="169.99998"
+             cy="-5"
+             rx="4.6807604"
+             ry="4.6807609" />
+          <path
+             style="fill:#4d4d4d;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.263553;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+             d="m 174.3727,-5.0000002 -4.20376,-4.4640421 v 8.92808458 z"
+             id="path11-4-05-72-0-0-8"
+             sodipodi:nodetypes="cccc" />
+        </g>
+      </g>
+      <g
+         id="g15-0"
+         transform="translate(0,0.0895507)">
+        <ellipse
+           cy="-202.59354"
+           cx="88.590912"
+           id="circle5669-8-4-7-9-9-4"
+           style="display:inline;fill:none;fill-opacity:0;stroke:#4d4d4d;stroke-width:0.188051;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           transform="rotate(90)"
+           rx="2.4994993"
+           ry="2.4968865" />
+        <path
+           id="path427-7-0"
+           d="m 204.87145,87.608898 -3.56698,-1.18276"
+           style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.188051;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           id="path429-1-5"
+           d="m 204.93388,89.590678 -3.674,1.14263"
+           style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.188051;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      </g>
+      <rect
+         y="78.776505"
+         x="-207.49754"
+         height="4.993773"
+         width="9.9979973"
+         id="rect1469-2-9-5-7"
+         style="display:inline;fill:none;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.188051;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         transform="scale(-1,1)" />
+      <path
+         id="path1471-4-1-6-0"
+         d="m 207.49748,83.77025 -9.99794,-4.993775"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.188051;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path459-7-0"
+         d="m 207.49748,78.776532 -9.99794,4.993775"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.188051;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path481-4-5"
+         d="m 195.00001,86.248441 v -2.496888 h 2.4996"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.188051;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path483-6-6"
+         d="m 207.49748,83.770235 h 2.49953 v 2.496888"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.188051;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path5655-7-5-9-1-5-6-7"
+         d="m 211.24468,86.332013 h -2.49531 l 1.24764,2.432011 z"
+         style="display:inline;fill:none;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.188051;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path5657-8-5-7-6-3-4-8"
+         d="m 211.24468,91.196021 h -2.49531 l 1.24764,-2.431997 z"
+         style="display:inline;fill:none;fill-opacity:0;stroke:#4d4d4d;stroke-width:0.188051;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <rect
+         style="display:inline;fill:none;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.188051;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1469-2-9-7-9-0"
+         width="9.9979973"
+         height="4.993773"
+         x="-207.49754"
+         y="93.757835"
+         transform="scale(-1,1)" />
+      <path
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.188051;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 207.49748,98.75156 -9.99794,-4.993761"
+         id="path1471-4-1-5-4-6" />
+      <path
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.188051;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 207.49748,93.757842 -9.99794,4.993774"
+         id="path459-5-4-5" />
+      <path
+         id="path3481-8-7"
+         d="m 207.49748,93.757785 h 2.49953 v -2.496887"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.188051;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path3538-5-3"
+         d="m 197.49954,93.757785 h -2.49949 l -4e-5,-2.645336"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.188051;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:nodetypes="ccc" />
+      <path
+         id="path3662-3-4"
+         d="M 213.90598,99.999997 V 73.999994 h -23.81195 v 26.000003 z"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.188;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path3728-5-3"
+         d="m 209.99701,100 v -1.24844 h -2.49953"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.188051;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path3734-8-0"
+         d="m 195.00002,100 v -1.24844 h 2.4996"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.188051;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path5655-7-5-9-1-5-6-9-4"
+         d="m 196.24766,86.248441 h -2.4953 L 195,88.680452 Z"
+         style="display:inline;fill:none;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.188051;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path5657-8-5-7-6-3-4-3-8"
+         d="m 196.24766,91.112449 h -2.4953 L 195,88.680452 Z"
+         style="display:inline;fill:none;fill-opacity:0;stroke:#4d4d4d;stroke-width:0.188051;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path5655-7-5-9-1-5-6-9-9-7"
+         d="m 197.43201,89.928112 v -2.4953 L 195,88.680452 Z"
+         style="display:inline;fill:none;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.188051;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path5655-7-5-9-1-5-6-9-9-5-5"
+         d="m 192.56799,89.928112 v -2.4953 L 195,88.680452 Z"
+         style="display:inline;fill:none;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.188051;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         style="font-variation-settings:normal;vector-effect:none;fill:none;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.188051;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;stop-color:#000000"
+         d="m 197.43201,88.680462 h 2.66464"
+         id="path16-9" />
+      <path
+         style="font-variation-settings:normal;vector-effect:none;fill:none;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.188051;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;stop-color:#000000"
+         d="m 205.09042,88.680462 h 1.90959 v 3.319535 h -11"
+         id="path17-5" />
+      <path
+         style="font-variation-settings:normal;vector-effect:none;fill:none;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.188051;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;stop-color:#000000"
+         d="m 192.56799,88.680462 h -1.56798 v 3.319535 h 3"
+         id="path18-3" />
+    </g>
   </g>
 </svg>
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Air_Systems_SingleZone_VAV_Examples_Guideline36.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Air_Systems_SingleZone_VAV_Examples_Guideline36.txt
index 32d35f0fc38..f4d2df8bd24 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Air_Systems_SingleZone_VAV_Examples_Guideline36.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Air_Systems_SingleZone_VAV_Examples_Guideline36.txt
@@ -1,4 +1,4 @@
-last-generated=2023-06-16
+last-generated=2024-06-26
 statistics-initialization=
 {
   "linear": "19",
@@ -7,7 +7,7 @@ statistics-initialization=
 }
 statistics-simulation=
 {
-  "linear": "11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0",
+  "linear": "0, 0, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0",
   "nonlinear": "2",
   "number of continuous time states": "77",
   "numerical Jacobians": "0"
@@ -15,7 +15,7 @@ statistics-simulation=
 time=[0e+00, 8.64e+05]
 con.TZonCooSet=[3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02]
 con.TZonHeaSet=[2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02]
-con.TZon=[2.931499938964844e+02, 2.881708412901966e+02, 2.8814541015625e+02, 2.881586059570312e+02, 2.932137620833666e+02, 2.981744079589844e+02, 2.981406799316406e+02, 2.980884023192801e+02, 2.921817260742188e+02, 2.881296881957004e+02, 2.881338500976562e+02, 2.881412841796875e+02, 2.881448364257812e+02, 2.881477355957031e+02, 2.931741516113281e+02, 2.931488037109375e+02, 2.931475769042969e+02, 2.931411193847656e+02, 2.881209777832031e+02, 2.881438232421875e+02, 2.88150146484375e+02, 2.881508422851563e+02, 2.881469177246094e+02, 2.88153564453125e+02, 2.931589240738797e+02, 2.949009094238281e+02, 2.981109959827905e+02, 2.928961426859526e+02, 2.880988891601563e+02, 2.881424255371094e+02, 2.881441650390625e+02, 2.881483032226562e+02, 2.881494506835937e+02, 2.881644165039062e+02, 2.932552001953125e+02, 2.981781616210938e+02, 2.98140493828723e+02, 2.956985837394845e+02, 2.8808974609375e+02, 2.881398803710937e+02, 2.881473388671875e+02, 2.881533935546875e+02, 2.88143603515625e+02, 2.881689758300781e+02, 2.958422909293462e+02, 2.981611328125e+02, 2.981418762207031e+02, 2.978611402731818e+02, 2.904062002805857e+02, 2.88128125e+02, 2.881471557617188e+02, 2.881533020019531e+02, 2.881433349609375e+02, 2.881657165527344e+02, 2.970977045482136e+02, 2.981617736816406e+02, 2.981373107910156e+02, 2.980869652481268e+02, 2.919863159179688e+02, 2.882360446728979e+02, 2.881524963378906e+02, 2.881447204589844e+02, 2.88149072265625e+02, 2.881661965610494e+02, 2.973881240936832e+02, 2.981594848632812e+02, 2.981390441894531e+02, 2.980822384909358e+02, 2.912711364746094e+02, 2.881558811899785e+02, 2.881434326171875e+02, 2.881487670898438e+02, 2.881539733886719e+02, 2.881635925292969e+02, 2.961217058761517e+02, 2.981614074707031e+02, 2.981394836425781e+02, 2.980845323198297e+02, 2.915411315917969e+02, 2.881577186982495e+02, 2.881436462402344e+02, 2.881488708496094e+02, 2.881504333496094e+02, 2.881717041015625e+02, 2.975146149379177e+02, 2.981603088378906e+02, 2.981392150878906e+02, 2.98058573313172e+02, 2.921733642578125e+02, 2.879998851658142e+02, 2.881443481445312e+02, 2.881521301269531e+02, 2.881460632324219e+02, 2.881640399972198e+02, 2.97618142455389e+02, 2.981616516113281e+02, 2.981401000976563e+02, 2.980458599937485e+02, 2.927048947590189e+02, 2.882251662498139e+02, 2.881438598632812e+02]
-con.ySupFan=[0e+00, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1e+00, 1e+00, 3.829282845519556e-01, -4.247929202254136e-17, 1.000000007634437e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000087331879287e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 3.241244554519653e-01, 1e+00, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1e+00, 1e+00, 3.248661366749536e-01, -2.754988815179871e-15, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1e+00, 1e+00, 3.990124278437385e-01, 1.151342726889746e-15, 1.000000061608088e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1e+00, 1e+00, 3.776077076577563e-01, -3.721060062262363e-14, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1e+00, 1e+00, 3.934394838332309e-01, -3.212621979692816e-19, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1e+00, 1e+00, 4.538714209949968e-01, 9.274108010778504e-18, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1e+00, 1e+00, 6.698478377445426e-01, 3.331570000828181e-16, 9.999861843524172e-02, 1.000000014901161e-01]
-con.yHeaCoi=[0e+00, 1.191348698076575e-01, 1.889723122119903e-01, 1.708299458026886e-01, 1.397288489686828e-01, 0e+00, 0e+00, 0e+00, 0e+00, 8.106412463651841e-02, 2.246169447898865e-01, 2.942746818065644e-01, 3.37281858921051e-01, 3.675026774406433e-01, 5.667595982551572e-01, 5.205696225166321e-01, 5.393194437026978e-01, 5.990546226501465e-01, 3.702061533927917e-01, 4.444905996322632e-01, 4.644619524478912e-01, 4.638719856739044e-01, 4.747083127498627e-01, 4.852543473243713e-01, 7.383068272043746e-01, 1.880130618810654e-01, 1.385799323650278e-01, 7.511079861249794e-01, 3.507599651813513e-01, 4.594473898410796e-01, 4.971909523010254e-01, 5.324109792709351e-01, 5.356214165687561e-01, 5.05428010225296e-01, 2.65725514292717e-01, 0e+00, 0e+00, 1.457785073575509e-01, 2.981199026107788e-01, 4.397510707378388e-01, 4.599391222000122e-01, 4.526578485965729e-01, 3.469646275043488e-01, 3.222648501396179e-01, 8.743062548950652e-02, 0e+00, 0e+00, 0e+00, 0e+00, 1.761203169822693e-01, 2.25147157907486e-01, 2.398828148841858e-01, 2.343704730272293e-01, 2.172131136059761e-01, 3.334035026798334e-02, 0e+00, 0e+00, 0e+00, 0e+00, 7.998597081646391e-02, 1.475437879562378e-01, 2.088676542043686e-01, 2.359964728355408e-01, 2.071730698293337e-01, 2.723030480165187e-02, 0e+00, 0e+00, 0e+00, 0e+00, 1.522459069662182e-01, 2.423659563064575e-01, 2.601283490657806e-01, 2.472299575805664e-01, 2.252948492765427e-01, 7.769921076299963e-02, 0e+00, 0e+00, 0e+00, 0e+00, 1.474850730880301e-01, 2.501237988471985e-01, 2.709315061569214e-01, 2.687302410602569e-01, 2.207727268338203e-01, 2.191263472093023e-02, 0e+00, 0e+00, 0e+00, 0e+00, 5.688297740884662e-01, 1.884703189134598e-01, 1.680980950593948e-01, 1.684332728385925e-01, 1.606322942262e-01, 1.477817862233749e-02, 0e+00, 0e+00, 0e+00, 0e+00, 8.025106029419124e-02, 1.856891810894012e-01]
-con.yCooCoi=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.510642915964127e-01, 2.017307668924332e-01, 1.676787498165729e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.266339442249528e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.594933271408081e-01, 1.77300551533699e-01, 1.3068926848059e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.403316944837579e-01, 2.334853112697589e-01, 1.776694595086408e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.419518977403641e-01, 2.05886760354042e-01, 1.603583083021735e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.183084636926651e-01, 2.02361524105072e-01, 1.656179974242456e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.386096119880676e-01, 2.244520843029022e-01, 1.918992278564654e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.452208548784256e-01, 2.302548468112945e-01, 2.289363564640541e-02, 0e+00, 0e+00, 0e+00]
+con.TZon=[2.931499938964844e+02, 2.881705469647798e+02, 2.881453857421875e+02, 2.881586303710938e+02, 2.932134763199762e+02, 2.981744079589844e+02, 2.981406982421875e+02, 2.980886365368937e+02, 2.9218173828125e+02, 2.881297187916117e+02, 2.881338806152344e+02, 2.881412902832031e+02, 2.881448608398438e+02, 2.881477478027344e+02, 2.931741394042969e+02, 2.931488037109375e+02, 2.931475769042969e+02, 2.931411193847656e+02, 2.881209777832031e+02, 2.881438232421875e+02, 2.88150146484375e+02, 2.881508422851563e+02, 2.881469177246094e+02, 2.88153564453125e+02, 2.931613178310109e+02, 2.949046630859375e+02, 2.981108166428912e+02, 2.928941105065845e+02, 2.880988830566406e+02, 2.881424682617188e+02, 2.881443176269531e+02, 2.881483703613281e+02, 2.881494018554687e+02, 2.881643859863281e+02, 2.93255615234375e+02, 2.981781311035156e+02, 2.981405405531164e+02, 2.956952300308631e+02, 2.8808984375e+02, 2.881399169921875e+02, 2.881473083496094e+02, 2.881531616210938e+02, 2.8814375e+02, 2.881689697265625e+02, 2.958416350795913e+02, 2.981611022949219e+02, 2.981418029785156e+02, 2.97859185061627e+02, 2.904047725315598e+02, 2.881281311035156e+02, 2.881471862792969e+02, 2.881530944824219e+02, 2.881435668945313e+02, 2.881656921386719e+02, 2.970979585911728e+02, 2.981617736816406e+02, 2.98137255859375e+02, 2.980868737941904e+02, 2.919862060546876e+02, 2.88235732716566e+02, 2.881525573730469e+02, 2.881445495605469e+02, 2.881490905761719e+02, 2.881660906848977e+02, 2.973895109421676e+02, 2.981594543457031e+02, 2.981390441894531e+02, 2.980836612997417e+02, 2.912715759277344e+02, 2.881559200275586e+02, 2.881434326171875e+02, 2.881488403320312e+02, 2.881538208007813e+02, 2.88163623046875e+02, 2.961220304755876e+02, 2.981614379882812e+02, 2.981394714355469e+02, 2.98084415182153e+02, 2.915411254882812e+02, 2.881577327170654e+02, 2.881436462402344e+02, 2.881488525390625e+02, 2.881504150390625e+02, 2.88171728515625e+02, 2.975144931011088e+02, 2.981603698730469e+02, 2.981392578125e+02, 2.980584049149217e+02, 2.921740661621094e+02, 2.879991437619556e+02, 2.881443786621094e+02, 2.881521423339844e+02, 2.881460144042969e+02, 2.881640376197013e+02, 2.976177722734939e+02, 2.981616821289062e+02, 2.981401123046875e+02, 2.98046394589418e+02, 2.927044017373922e+02, 2.882251187779788e+02, 2.881438598632812e+02]
+con.ySupFan=[0e+00, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1e+00, 1e+00, 3.829922909200898e-01, -1.490036812659206e-18, 1.000000007632462e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.00004059231993e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 3.239583373069763e-01, 1e+00, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1e+00, 1e+00, 3.245598915956784e-01, 1.5623557735832e-12, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1e+00, 1e+00, 3.990152880690457e-01, -1.485197755071715e-17, 1.000000061547362e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1e+00, 1e+00, 3.768156579991591e-01, -1.499788968375107e-14, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1e+00, 1e+00, 3.932675723235052e-01, -1.136981459184816e-19, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1e+00, 1e+00, 4.541060062919745e-01, -8.420805594120434e-18, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1e+00, 1e+00, 6.697497100397455e-01, -8.550366803489603e-17, 9.999811457965373e-02, 1.000000014901161e-01]
+con.yHeaCoi=[0e+00, 1.191425467920945e-01, 1.891066402196884e-01, 1.707441508769989e-01, 1.396658487667311e-01, 0e+00, 0e+00, 0e+00, 0e+00, 8.106378925191239e-02, 2.245890945196152e-01, 2.942774415016174e-01, 3.372626006603241e-01, 3.674807071685791e-01, 5.66755163669586e-01, 5.205664038658142e-01, 5.393183946609497e-01, 5.990533471107483e-01, 3.702060222625733e-01, 4.444905579090118e-01, 4.644619524478912e-01, 4.6387197971344e-01, 4.747083187103271e-01, 4.852554500102997e-01, 7.37131941318512e-01, 1.880003213882446e-01, 1.38554748766031e-01, 6.292566849312206e-01, 3.506269872188574e-01, 4.593903958797453e-01, 4.969803988933563e-01, 5.322838425636292e-01, 5.356639742851257e-01, 5.055206835269928e-01, 2.656657844781876e-01, 0e+00, 0e+00, 1.458020473026747e-01, 2.981329202651978e-01, 4.397539019584656e-01, 4.599641263484955e-01, 4.530164837837219e-01, 3.467176139354706e-01, 3.222818642854691e-01, 8.745367085824156e-02, 0e+00, 0e+00, 0e+00, 0e+00, 1.761346191167831e-01, 2.251495718955994e-01, 2.401551365852356e-01, 2.340443432331085e-01, 2.172048300504685e-01, 3.333237094422669e-02, 0e+00, 0e+00, 0e+00, 0e+00, 7.998931614687645e-02, 1.475500017404556e-01, 2.09119388461113e-01, 2.358778297901153e-01, 2.072327275345518e-01, 2.718179304997673e-02, 0e+00, 0e+00, 0e+00, 0e+00, 1.522602078426103e-01, 2.423663437366486e-01, 2.60015195608139e-01, 2.474371671676636e-01, 2.252916216850281e-01, 7.768735629137355e-02, 0e+00, 0e+00, 0e+00, 0e+00, 1.474874021786572e-01, 2.501192092895508e-01, 2.70954841375351e-01, 2.688025891780853e-01, 2.207827478647232e-01, 2.191670967290564e-02, 0e+00, 0e+00, 0e+00, 0e+00, 5.614099091161853e-01, 1.884880661964417e-01, 1.680808573961258e-01, 1.683912575244904e-01, 1.606406724629137e-01, 1.478820419191978e-02, 0e+00, 0e+00, 0e+00, 0e+00, 8.025119248378967e-02, 1.856953948736191e-01]
+con.yCooCoi=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.510835886001587e-01, 2.019075691699982e-01, 1.676625521351974e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.26223424291014e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.595708131790161e-01, 1.772516787052155e-01, 1.296313485383981e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.401841580867776e-01, 2.334671795368182e-01, 1.77505372609705e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.41875484585762e-01, 2.058255463838577e-01, 1.605233724767208e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.182597219944e-01, 2.023606032133102e-01, 1.659548971669383e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.385224252939224e-01, 2.244111478328705e-01, 1.920681131468024e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.450845986604691e-01, 2.302487194538116e-01, 2.265225994445247e-02, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_G36_AHUs_MultiZone_VAV_SetPoints_Validation_FreezeProtection.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_G36_AHUs_MultiZone_VAV_SetPoints_Validation_FreezeProtection.txt
index 4ae295d583e..9ea688ddaa7 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_G36_AHUs_MultiZone_VAV_SetPoints_Validation_FreezeProtection.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_G36_AHUs_MultiZone_VAV_SetPoints_Validation_FreezeProtection.txt
@@ -1,4 +1,4 @@
-last-generated=2022-05-10
+last-generated=2024-06-26
 statistics-simulation=
 {
   "linear": " ",
@@ -9,16 +9,16 @@ statistics-simulation=
 time=[0e+00, 3.6e+03]
 frePro.uOutDamPosMin=[1.000000014901161e-01, 1.000000014901161e-01]
 frePro.uOutDam=[1.000000014901161e-01, 1.049999967217445e-01, 1.099999994039536e-01, 1.150000020861626e-01, 1.19999997317791e-01, 1.25e-01, 1.299999952316284e-01, 1.35000005364418e-01, 1.400000005960464e-01, 1.449999958276749e-01, 1.500000059604645e-01, 1.550000011920929e-01, 1.599999964237213e-01, 1.650000065565109e-01, 1.700000017881393e-01, 1.749999970197678e-01, 1.800000071525574e-01, 1.850000023841858e-01, 1.899999976158142e-01, 1.949999928474426e-01, 2.000000029802322e-01, 2.049999982118607e-01, 2.099999934434891e-01, 2.150000035762787e-01, 2.199999988079071e-01, 2.249999940395355e-01, 2.300000041723251e-01, 2.349999994039536e-01, 2.39999994635582e-01, 2.450000047683716e-01, 2.5e-01, 2.549999952316284e-01, 2.599999904632568e-01, 2.649999856948853e-01, 2.700000107288361e-01, 2.750000059604645e-01, 2.800000011920929e-01, 2.849999964237213e-01, 2.899999916553497e-01, 2.949999868869781e-01, 3.00000011920929e-01, 3.050000071525574e-01, 3.100000023841858e-01, 3.149999976158142e-01, 3.199999928474426e-01, 3.24999988079071e-01, 3.300000131130219e-01, 3.350000083446503e-01, 3.400000035762787e-01, 3.449999988079071e-01, 3.499999940395355e-01, 3.549999892711639e-01, 3.600000143051147e-01, 3.650000095367432e-01, 3.700000047683716e-01, 3.750000000000001e-01, 3.799999952316285e-01, 3.849999904632568e-01, 3.899999856948853e-01, 3.950000107288361e-01, 4.000000059604645e-01, 4.050000011920929e-01, 4.099999964237213e-01, 4.149999916553497e-01, 4.199999868869781e-01, 4.25000011920929e-01, 4.300000071525574e-01, 4.350000023841858e-01, 4.399999976158142e-01, 4.449999928474426e-01, 4.49999988079071e-01, 4.550000131130219e-01, 4.600000083446503e-01, 4.650000035762787e-01, 4.699999988079071e-01, 4.749999940395355e-01, 4.799999892711639e-01, 4.850000143051147e-01, 4.900000095367432e-01, 4.950000047683716e-01, 5e-01, 5.049999952316284e-01, 5.099999904632568e-01, 5.149999856948853e-01, 5.199999809265137e-01, 5.249999761581421e-01, 5.299999713897705e-01, 5.350000262260437e-01, 5.400000214576721e-01, 5.450000166893005e-01, 5.50000011920929e-01, 5.550000071525574e-01, 5.600000023841858e-01, 5.649999976158142e-01, 5.699999928474426e-01, 5.74999988079071e-01, 5.799999833106995e-01, 5.849999785423279e-01, 5.899999737739563e-01, 5.950000286102295e-01, 6.000000238418579e-01]
-frePro.yOutDam=[1.000000014901161e-01, 1.049999967217445e-01, 1.099999994039536e-01, 1.150000020861626e-01, 1.19999997317791e-01, 1.25e-01, 1.299999952316284e-01, 1.35000005364418e-01, 1.400000005960464e-01, 1.449999958276749e-01, 1.500000059604645e-01, 1.550000011920929e-01, 1.599999964237213e-01, 1.650000065565109e-01, 1.700000017881393e-01, 1.749999970197678e-01, 1.800000071525574e-01, 1.850000023841858e-01, 1.899999976158142e-01, 1.949999928474426e-01, 2.000000029802322e-01, 2.049999982118607e-01, 2.099999934434891e-01, 2.150000035762787e-01, 2.199999988079071e-01, 2.249999940395355e-01, 2.300000041723251e-01, 2.349999994039536e-01, 2.39999994635582e-01, 2.450000047683716e-01, 2.5e-01, 2.549999952316284e-01, 2.599999904632568e-01, 2.649999856948853e-01, 2.700000107288361e-01, 2.750000059604645e-01, 2.800000011920929e-01, 2.849999964237213e-01, 2.899999916553497e-01, 2.949999868869781e-01, 3.00000011920929e-01, 3.050000071525574e-01, 3.100000023841858e-01, 3.149999976158142e-01, 3.199999928474426e-01, 3.24999988079071e-01, 3.300000131130219e-01, 3.350000083446503e-01, 3.400000035762787e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 0e+00, 0e+00, 0e+00, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01]
+frePro.yOutDam=[1.000000014901161e-01, 1.049999967217445e-01, 1.099999994039536e-01, 1.150000020861626e-01, 1.19999997317791e-01, 1.25e-01, 1.299999952316284e-01, 1.35000005364418e-01, 1.400000005960464e-01, 1.449999958276749e-01, 1.500000059604645e-01, 1.550000011920929e-01, 1.599999964237213e-01, 1.650000065565109e-01, 1.700000017881393e-01, 1.749999970197678e-01, 1.800000071525574e-01, 1.850000023841858e-01, 1.899999976158142e-01, 1.949999928474426e-01, 2.000000029802322e-01, 2.049999982118607e-01, 2.099999934434891e-01, 2.150000035762787e-01, 2.199999988079071e-01, 2.249999940395355e-01, 2.300000041723251e-01, 2.349999994039536e-01, 2.39999994635582e-01, 2.450000047683716e-01, 2.5e-01, 2.549999952316284e-01, 2.599999904632568e-01, 2.649999856948853e-01, 2.700000107288361e-01, 2.750000059604645e-01, 2.800000011920929e-01, 2.849999964237213e-01, 2.899999916553497e-01, 2.949999868869781e-01, 3.00000011920929e-01, 3.050000071525574e-01, 3.100000023841858e-01, 3.149999976158142e-01, 3.199999928474426e-01, 3.24999988079071e-01, 3.300000131130219e-01, 3.350000083446503e-01, 3.400000035762787e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
 frePro.uHeaCoi=[5e-01, 5.045999884605408e-01, 5.091999769210815e-01, 5.138000249862671e-01, 5.184000134468079e-01, 5.230000019073486e-01, 5.275999903678894e-01, 5.321999788284302e-01, 5.368000268936157e-01, 5.414000153541565e-01, 5.460000038146973e-01, 5.50599992275238e-01, 5.551999807357788e-01, 5.598000288009644e-01, 5.644000172615051e-01, 5.690000057220459e-01, 5.735999941825867e-01, 5.781999826431274e-01, 5.827999711036682e-01, 5.874000191688538e-01, 5.920000076293945e-01, 5.965999960899353e-01, 6.011999845504761e-01, 6.057999730110168e-01, 6.104000210762024e-01, 6.150000095367432e-01, 6.195999979972839e-01, 6.241999864578247e-01, 6.287999749183655e-01, 6.33400022983551e-01, 6.380000114440918e-01, 6.425999999046326e-01, 6.471999883651733e-01, 6.517999768257141e-01, 6.564000248908997e-01, 6.610000133514404e-01, 6.656000018119812e-01, 6.70199990272522e-01, 6.747999787330627e-01, 6.794000267982483e-01, 6.840000152587891e-01, 6.886000037193298e-01, 6.931999921798706e-01, 6.977999806404114e-01, 7.024000287055969e-01, 7.070000171661377e-01, 7.116000056266785e-01, 7.161999940872192e-01, 7.2079998254776e-01, 7.253999710083008e-01, 7.300000190734863e-01, 7.346000075340271e-01, 7.391999959945679e-01, 7.437999844551086e-01, 7.483999729156494e-01, 7.53000020980835e-01, 7.576000094413757e-01, 7.621999979019165e-01, 7.667999863624573e-01, 7.71399974822998e-01, 7.760000228881836e-01, 7.806000113487244e-01, 7.851999998092651e-01, 7.897999882698059e-01, 7.943999767303467e-01, 7.990000247955322e-01, 8.03600013256073e-01, 8.082000017166138e-01, 8.127999901771545e-01, 8.173999786376953e-01, 8.220000267028809e-01, 8.266000151634216e-01, 8.312000036239624e-01, 8.357999920845032e-01, 8.403999805450439e-01, 8.450000286102295e-01, 8.496000170707703e-01, 8.54200005531311e-01, 8.587999939918518e-01, 8.633999824523926e-01, 8.679999709129333e-01, 8.726000189781189e-01, 8.772000074386597e-01, 8.817999958992004e-01, 8.863999843597412e-01, 8.90999972820282e-01, 8.956000208854675e-01, 9.002000093460083e-01, 9.047999978065491e-01, 9.093999862670898e-01, 9.139999747276306e-01, 9.186000227928162e-01, 9.232000112533569e-01, 9.277999997138977e-01, 9.323999881744385e-01, 9.369999766349792e-01, 9.416000247001648e-01, 9.462000131607056e-01, 9.508000016212463e-01, 9.553999900817871e-01, 9.599999785423279e-01]
 frePro.yHeaCoi=[5e-01, 5.045999884605408e-01, 5.091999769210815e-01, 5.138000249862671e-01, 5.184000134468079e-01, 5.230000019073486e-01, 5.275999903678894e-01, 5.321999788284302e-01, 5.368000268936157e-01, 5.414000153541565e-01, 5.460000038146973e-01, 5.50599992275238e-01, 5.551999807357788e-01, 5.598000288009644e-01, 5.644000172615051e-01, 5.690000057220459e-01, 5.735999941825867e-01, 5.781999826431274e-01, 5.827999711036682e-01, 5.874000191688538e-01, 5.920000076293945e-01, 5.965999960899353e-01, 6.011999845504761e-01, 6.057999730110168e-01, 6.104000210762024e-01, 6.150000095367432e-01, 6.195999979972839e-01, 6.241999864578247e-01, 6.287999749183655e-01, 6.33400022983551e-01, 6.380000114440918e-01, 6.425999999046326e-01, 6.471999883651733e-01, 6.517999768257141e-01, 6.564000248908997e-01, 6.610000133514404e-01, 6.656000018119812e-01, 6.70199990272522e-01, 6.747999787330627e-01, 6.794000267982483e-01, 6.840000152587891e-01, 6.886000037193298e-01, 6.931999921798706e-01, 6.977999806404114e-01, 7.024000287055969e-01, 7.070000171661377e-01, 7.116000056266785e-01, 7.161999940872192e-01, 7.2079998254776e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
 frePro.yCooCoi=[5e-01, 5.019999742507935e-01, 5.040000081062317e-01, 5.059999823570251e-01, 5.080000162124634e-01, 5.099999904632568e-01, 5.120000243186951e-01, 5.139999985694885e-01, 5.15999972820282e-01, 5.180000066757202e-01, 5.199999809265137e-01, 5.220000147819519e-01, 5.239999890327454e-01, 5.260000228881836e-01, 5.279999971389771e-01, 5.299999713897705e-01, 5.320000052452087e-01, 5.339999794960022e-01, 5.360000133514404e-01, 5.379999876022339e-01, 5.400000214576721e-01, 5.419999957084656e-01, 5.440000295639038e-01, 5.460000038146973e-01, 5.479999780654907e-01, 5.50000011920929e-01, 5.519999861717224e-01, 5.540000200271606e-01, 5.559999942779541e-01, 5.580000281333923e-01, 5.600000023841858e-01, 5.619999766349792e-01, 5.640000104904175e-01, 5.659999847412109e-01, 5.680000185966492e-01, 5.699999928474426e-01, 5.720000267028809e-01, 5.740000009536743e-01, 5.759999752044678e-01, 5.78000009059906e-01, 5.799999833106995e-01, 5.820000171661377e-01, 5.839999914169312e-01, 5.860000252723694e-01, 5.879999995231628e-01, 5.899999737739563e-01, 5.920000076293945e-01, 5.93999981880188e-01, 5.960000157356262e-01, 5.979999899864197e-01, 6.000000238418579e-01, 6.019999980926514e-01, 6.039999723434448e-01, 6.060000061988831e-01, 6.079999804496765e-01, 6.100000143051147e-01, 6.119999885559082e-01, 6.140000224113464e-01, 6.159999966621399e-01, 6.179999709129333e-01, 6.200000047683716e-01, 6.21999979019165e-01, 6.240000128746033e-01, 6.259999871253967e-01, 6.28000020980835e-01, 6.299999952316284e-01, 6.320000290870667e-01, 6.340000033378601e-01, 6.359999775886536e-01, 6.380000114440918e-01, 6.399999856948853e-01, 6.420000195503235e-01, 6.439999938011169e-01, 6.460000276565552e-01, 6.480000019073486e-01, 6.499999761581421e-01, 6.520000100135803e-01, 6.539999842643738e-01, 6.56000018119812e-01, 6.579999923706055e-01, 6.600000262260437e-01, 6.620000004768372e-01, 6.639999747276306e-01, 6.660000085830688e-01, 6.679999828338623e-01, 6.700000166893005e-01, 6.71999990940094e-01, 6.740000247955322e-01, 6.759999990463257e-01, 6.779999732971191e-01, 6.800000071525574e-01, 6.819999814033508e-01, 6.840000152587891e-01, 1e+00, 1e+00, 1e+00, 6.919999718666077e-01, 6.940000057220459e-01, 6.959999799728394e-01, 6.980000138282776e-01, 6.99999988079071e-01]
 frePro.uRetDam=[6.99999988079071e-01, 7.020000219345093e-01, 7.039999961853027e-01, 7.059999704360962e-01, 7.080000042915344e-01, 7.099999785423279e-01, 7.120000123977661e-01, 7.139999866485596e-01, 7.160000205039978e-01, 7.179999947547913e-01, 7.200000286102295e-01, 7.220000028610229e-01, 7.239999771118164e-01, 7.260000109672546e-01, 7.279999852180481e-01, 7.300000190734863e-01, 7.319999933242798e-01, 7.34000027179718e-01, 7.360000014305115e-01, 7.379999756813049e-01, 7.400000095367432e-01, 7.419999837875366e-01, 7.440000176429749e-01, 7.459999918937683e-01, 7.480000257492065e-01, 7.5e-01, 7.519999742507935e-01, 7.540000081062317e-01, 7.559999823570251e-01, 7.580000162124634e-01, 7.599999904632568e-01, 7.620000243186951e-01, 7.639999985694885e-01, 7.65999972820282e-01, 7.680000066757202e-01, 7.699999809265137e-01, 7.720000147819519e-01, 7.739999890327454e-01, 7.760000228881836e-01, 7.779999971389771e-01, 7.799999713897705e-01, 7.820000052452087e-01, 7.839999794960022e-01, 7.860000133514404e-01, 7.879999876022339e-01, 7.900000214576721e-01, 7.919999957084656e-01, 7.940000295639038e-01, 7.960000038146973e-01, 7.979999780654907e-01, 8.00000011920929e-01, 8.019999861717224e-01, 8.040000200271606e-01, 8.059999942779541e-01, 8.080000281333923e-01, 8.100000023841858e-01, 8.119999766349792e-01, 8.140000104904175e-01, 8.159999847412109e-01, 8.180000185966492e-01, 8.199999928474426e-01, 8.220000267028809e-01, 8.240000009536743e-01, 8.259999752044678e-01, 8.28000009059906e-01, 8.299999833106995e-01, 8.320000171661377e-01, 8.339999914169312e-01, 8.360000252723694e-01, 8.379999995231628e-01, 8.399999737739563e-01, 8.420000076293945e-01, 8.43999981880188e-01, 8.460000157356262e-01, 8.479999899864197e-01, 8.500000238418579e-01, 8.519999980926514e-01, 8.539999723434448e-01, 8.560000061988831e-01, 8.579999804496765e-01, 8.600000143051147e-01, 8.619999885559082e-01, 8.640000224113464e-01, 8.659999966621399e-01, 8.679999709129333e-01, 8.700000047683716e-01, 8.71999979019165e-01, 8.740000128746033e-01, 8.759999871253967e-01, 8.78000020980835e-01, 8.799999952316284e-01, 8.820000290870667e-01, 8.840000033378601e-01, 8.859999775886536e-01, 8.880000114440918e-01, 8.899999856948853e-01, 8.920000195503235e-01, 8.939999938011169e-01, 8.960000276565552e-01, 8.980000019073486e-01, 8.999999761581421e-01]
-frePro.yRetDam=[6.99999988079071e-01, 7.020000219345093e-01, 7.039999961853027e-01, 7.059999704360962e-01, 7.080000042915344e-01, 7.099999785423279e-01, 7.120000123977661e-01, 7.139999866485596e-01, 7.160000205039978e-01, 7.179999947547913e-01, 7.200000286102295e-01, 7.220000028610229e-01, 7.239999771118164e-01, 7.260000109672546e-01, 7.279999852180481e-01, 7.300000190734863e-01, 7.319999933242798e-01, 7.34000027179718e-01, 7.360000014305115e-01, 7.379999756813049e-01, 7.400000095367432e-01, 7.419999837875366e-01, 7.440000176429749e-01, 7.459999918937683e-01, 7.480000257492065e-01, 7.5e-01, 7.519999742507935e-01, 7.540000081062317e-01, 7.559999823570251e-01, 7.580000162124634e-01, 7.599999904632568e-01, 7.620000243186951e-01, 7.639999985694885e-01, 7.65999972820282e-01, 7.680000066757202e-01, 7.699999809265137e-01, 7.720000147819519e-01, 7.739999890327454e-01, 7.760000228881836e-01, 7.779999971389771e-01, 7.799999713897705e-01, 7.820000052452087e-01, 7.839999794960022e-01, 7.860000133514404e-01, 7.879999876022339e-01, 7.900000214576721e-01, 7.919999957084656e-01, 7.940000295639038e-01, 7.960000038146973e-01, 7.979999780654907e-01, 8.00000011920929e-01, 8.019999861717224e-01, 8.040000200271606e-01, 8.059999942779541e-01, 8.080000281333923e-01, 8.100000023841858e-01, 8.119999766349792e-01, 8.140000104904175e-01, 8.159999847412109e-01, 8.180000185966492e-01, 8.199999928474426e-01, 8.220000267028809e-01, 8.240000009536743e-01, 8.259999752044678e-01, 8.28000009059906e-01, 8.299999833106995e-01, 8.320000171661377e-01, 8.339999914169312e-01, 8.360000252723694e-01, 8.379999995231628e-01, 8.399999737739563e-01, 8.420000076293945e-01, 8.43999981880188e-01, 8.460000157356262e-01, 8.479999899864197e-01, 8.500000238418579e-01, 8.519999980926514e-01, 8.539999723434448e-01, 8.560000061988831e-01, 8.579999804496765e-01, 8.600000143051147e-01, 8.619999885559082e-01, 8.640000224113464e-01, 8.659999966621399e-01, 8.679999709129333e-01, 8.700000047683716e-01, 8.71999979019165e-01, 8.740000128746033e-01, 8.759999871253967e-01, 8.78000020980835e-01, 8.799999952316284e-01, 8.820000290870667e-01, 8.840000033378601e-01, 0e+00, 0e+00, 0e+00, 8.920000195503235e-01, 8.939999938011169e-01, 8.960000276565552e-01, 8.980000019073486e-01, 8.999999761581421e-01]
+frePro.yRetDam=[6.99999988079071e-01, 7.020000219345093e-01, 7.039999961853027e-01, 7.059999704360962e-01, 7.080000042915344e-01, 7.099999785423279e-01, 7.120000123977661e-01, 7.139999866485596e-01, 7.160000205039978e-01, 7.179999947547913e-01, 7.200000286102295e-01, 7.220000028610229e-01, 7.239999771118164e-01, 7.260000109672546e-01, 7.279999852180481e-01, 7.300000190734863e-01, 7.319999933242798e-01, 7.34000027179718e-01, 7.360000014305115e-01, 7.379999756813049e-01, 7.400000095367432e-01, 7.419999837875366e-01, 7.440000176429749e-01, 7.459999918937683e-01, 7.480000257492065e-01, 7.5e-01, 7.519999742507935e-01, 7.540000081062317e-01, 7.559999823570251e-01, 7.580000162124634e-01, 7.599999904632568e-01, 7.620000243186951e-01, 7.639999985694885e-01, 7.65999972820282e-01, 7.680000066757202e-01, 7.699999809265137e-01, 7.720000147819519e-01, 7.739999890327454e-01, 7.760000228881836e-01, 7.779999971389771e-01, 7.799999713897705e-01, 7.820000052452087e-01, 7.839999794960022e-01, 7.860000133514404e-01, 7.879999876022339e-01, 7.900000214576721e-01, 7.919999957084656e-01, 7.940000295639038e-01, 7.960000038146973e-01, 7.979999780654907e-01, 8.00000011920929e-01, 8.019999861717224e-01, 8.040000200271606e-01, 8.059999942779541e-01, 8.080000281333923e-01, 8.100000023841858e-01, 8.119999766349792e-01, 8.140000104904175e-01, 8.159999847412109e-01, 8.180000185966492e-01, 8.199999928474426e-01, 8.220000267028809e-01, 8.240000009536743e-01, 8.259999752044678e-01, 8.28000009059906e-01, 8.299999833106995e-01, 8.320000171661377e-01, 8.339999914169312e-01, 8.360000252723694e-01, 8.379999995231628e-01, 8.399999737739563e-01, 8.420000076293945e-01, 8.43999981880188e-01, 8.460000157356262e-01, 8.479999899864197e-01, 8.500000238418579e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
 frePro.uSupFan=[5e-01, 5.019999742507935e-01, 5.040000081062317e-01, 5.059999823570251e-01, 5.080000162124634e-01, 5.099999904632568e-01, 5.120000243186951e-01, 5.139999985694885e-01, 5.15999972820282e-01, 5.180000066757202e-01, 5.199999809265137e-01, 5.220000147819519e-01, 5.239999890327454e-01, 5.260000228881836e-01, 5.279999971389771e-01, 5.299999713897705e-01, 5.320000052452087e-01, 5.339999794960022e-01, 5.360000133514404e-01, 5.379999876022339e-01, 5.400000214576721e-01, 5.419999957084656e-01, 5.440000295639038e-01, 5.460000038146973e-01, 5.479999780654907e-01, 5.50000011920929e-01, 5.519999861717224e-01, 5.540000200271606e-01, 5.559999942779541e-01, 5.580000281333923e-01, 5.600000023841858e-01, 5.619999766349792e-01, 5.640000104904175e-01, 5.659999847412109e-01, 5.680000185966492e-01, 5.699999928474426e-01, 5.720000267028809e-01, 5.740000009536743e-01, 5.759999752044678e-01, 5.78000009059906e-01, 5.799999833106995e-01, 5.820000171661377e-01, 5.839999914169312e-01, 5.860000252723694e-01, 5.879999995231628e-01, 5.899999737739563e-01, 5.920000076293945e-01, 5.93999981880188e-01, 5.960000157356262e-01, 5.979999899864197e-01, 6.000000238418579e-01, 6.019999980926514e-01, 6.039999723434448e-01, 6.060000061988831e-01, 6.079999804496765e-01, 6.100000143051147e-01, 6.119999885559082e-01, 6.140000224113464e-01, 6.159999966621399e-01, 6.179999709129333e-01, 6.200000047683716e-01, 6.21999979019165e-01, 6.240000128746033e-01, 6.259999871253967e-01, 6.28000020980835e-01, 6.299999952316284e-01, 6.320000290870667e-01, 6.340000033378601e-01, 6.359999775886536e-01, 6.380000114440918e-01, 6.399999856948853e-01, 6.420000195503235e-01, 6.439999938011169e-01, 6.460000276565552e-01, 6.480000019073486e-01, 6.499999761581421e-01, 6.520000100135803e-01, 6.539999842643738e-01, 6.56000018119812e-01, 6.579999923706055e-01, 6.600000262260437e-01, 6.620000004768372e-01, 6.639999747276306e-01, 6.660000085830688e-01, 6.679999828338623e-01, 6.700000166893005e-01, 6.71999990940094e-01, 6.740000247955322e-01, 6.759999990463257e-01, 6.779999732971191e-01, 6.800000071525574e-01, 6.819999814033508e-01, 6.840000152587891e-01, 6.859999895095825e-01, 6.880000233650208e-01, 6.899999976158142e-01, 6.919999718666077e-01, 6.940000057220459e-01, 6.959999799728394e-01, 6.980000138282776e-01, 6.99999988079071e-01]
 frePro.ySupFan=[5e-01, 5.019999742507935e-01, 5.040000081062317e-01, 5.059999823570251e-01, 5.080000162124634e-01, 5.099999904632568e-01, 5.120000243186951e-01, 5.139999985694885e-01, 5.15999972820282e-01, 5.180000066757202e-01, 5.199999809265137e-01, 5.220000147819519e-01, 5.239999890327454e-01, 5.260000228881836e-01, 5.279999971389771e-01, 5.299999713897705e-01, 5.320000052452087e-01, 5.339999794960022e-01, 5.360000133514404e-01, 5.379999876022339e-01, 5.400000214576721e-01, 5.419999957084656e-01, 5.440000295639038e-01, 5.460000038146973e-01, 5.479999780654907e-01, 5.50000011920929e-01, 5.519999861717224e-01, 5.540000200271606e-01, 5.559999942779541e-01, 5.580000281333923e-01, 5.600000023841858e-01, 5.619999766349792e-01, 5.640000104904175e-01, 5.659999847412109e-01, 5.680000185966492e-01, 5.699999928474426e-01, 5.720000267028809e-01, 5.740000009536743e-01, 5.759999752044678e-01, 5.78000009059906e-01, 5.799999833106995e-01, 5.820000171661377e-01, 5.839999914169312e-01, 5.860000252723694e-01, 5.879999995231628e-01, 5.899999737739563e-01, 5.920000076293945e-01, 5.93999981880188e-01, 5.960000157356262e-01, 5.979999899864197e-01, 6.000000238418579e-01, 6.019999980926514e-01, 6.039999723434448e-01, 6.060000061988831e-01, 6.079999804496765e-01, 6.100000143051147e-01, 6.119999885559082e-01, 6.140000224113464e-01, 6.159999966621399e-01, 6.179999709129333e-01, 6.200000047683716e-01, 6.21999979019165e-01, 6.240000128746033e-01, 6.259999871253967e-01, 6.28000020980835e-01, 6.299999952316284e-01, 6.320000290870667e-01, 6.340000033378601e-01, 6.359999775886536e-01, 6.380000114440918e-01, 6.399999856948853e-01, 6.420000195503235e-01, 6.439999938011169e-01, 6.460000276565552e-01, 6.480000019073486e-01, 6.499999761581421e-01, 6.520000100135803e-01, 6.539999842643738e-01, 6.56000018119812e-01, 6.579999923706055e-01, 6.600000262260437e-01, 6.620000004768372e-01, 6.639999747276306e-01, 6.660000085830688e-01, 6.679999828338623e-01, 6.700000166893005e-01, 6.71999990940094e-01, 6.740000247955322e-01, 6.759999990463257e-01, 6.779999732971191e-01, 6.800000071525574e-01, 6.819999814033508e-01, 6.840000152587891e-01, 0e+00, 0e+00, 0e+00, 6.919999718666077e-01, 6.940000057220459e-01, 6.959999799728394e-01, 6.980000138282776e-01, 6.99999988079071e-01]
-frePro.yAla=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2e+00, 2e+00, 2e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+frePro.yAla=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 2e+00, 2e+00, 2e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00]
 frePro.yHotWatPlaReq=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00]
 frePro.TAirSup=[2.791499938964844e+02, 2.791099853515625e+02, 2.790700073242188e+02, 2.790299987792969e+02, 2.78989990234375e+02, 2.789500122070312e+02, 2.789100036621094e+02, 2.788699951171875e+02, 2.788299865722656e+02, 2.787900085449219e+02, 2.7875e+02, 2.787099914550781e+02, 2.786700134277344e+02, 2.786300048828125e+02, 2.785899963378906e+02, 2.785499877929688e+02, 2.78510009765625e+02, 2.784700012207031e+02, 2.784299926757812e+02, 2.783900146484375e+02, 2.783500061035156e+02, 2.783099975585938e+02, 2.782699890136719e+02, 2.782300109863281e+02, 2.781900024414062e+02, 2.781499938964844e+02, 2.781099853515625e+02, 2.780700073242188e+02, 2.780299987792969e+02, 2.77989990234375e+02, 2.779500122070312e+02, 2.779100036621094e+02, 2.778699951171875e+02, 2.778299865722656e+02, 2.777900085449219e+02, 2.7775e+02, 2.777099914550781e+02, 2.776700134277344e+02, 2.776300048828125e+02, 2.775899963378906e+02, 2.775499877929688e+02, 2.77510009765625e+02, 2.774700012207031e+02, 2.774299926757812e+02, 2.773900146484375e+02, 2.773500061035156e+02, 2.773099975585938e+02, 2.772699890136719e+02, 2.772300109863281e+02, 2.771900024414062e+02, 2.771499938964844e+02, 2.771099853515625e+02, 2.770700073242188e+02, 2.770299987792969e+02, 2.76989990234375e+02, 2.769500122070312e+02, 2.769100036621094e+02, 2.768699951171875e+02, 2.768299865722656e+02, 2.767900085449219e+02, 2.7675e+02, 2.767099914550781e+02, 2.766700134277344e+02, 2.766300048828125e+02, 2.765899963378906e+02, 2.765499877929688e+02, 2.76510009765625e+02, 2.764700012207031e+02, 2.764299926757812e+02, 2.763900146484375e+02, 2.763500061035156e+02, 2.763099975585938e+02, 2.762699890136719e+02, 2.762300109863281e+02, 2.761900024414062e+02, 2.761499938964844e+02, 2.761099853515625e+02, 2.760700073242188e+02, 2.760299987792969e+02, 2.75989990234375e+02, 2.759500122070312e+02, 2.759100036621094e+02, 2.758699951171875e+02, 2.758299865722656e+02, 2.757900085449219e+02, 2.7575e+02, 2.757099914550781e+02, 2.756700134277344e+02, 2.756300048828125e+02, 2.755899963378906e+02, 2.755499877929688e+02, 2.75510009765625e+02, 2.754700012207031e+02, 2.754299926757812e+02, 2.753900146484375e+02, 2.753500061035156e+02, 2.753099975585938e+02, 2.752699890136719e+02, 2.752300109863281e+02, 2.751900024414062e+02, 2.751499938964844e+02]
-frePro.yFreProSta=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 3e+00, 3e+00, 3e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+frePro.yFreProSta=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 3e+00, 3e+00, 3e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00]
 frePro.u1SofSwiRes=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_G36_AHUs_MultiZone_VAV_Validation_Controller.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_G36_AHUs_MultiZone_VAV_Validation_Controller.txt
index d6bf2d9dc7f..afde0b0edd5 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_G36_AHUs_MultiZone_VAV_Validation_Controller.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_G36_AHUs_MultiZone_VAV_Validation_Controller.txt
@@ -1,22 +1,22 @@
-last-generated=2022-08-31
+last-generated=2024-06-27
 statistics-simulation=
 {
   "linear": " ",
   "nonlinear": " ",
-  "number of continuous time states": "5",
+  "number of continuous time states": "7",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 3.6e+03]
 conAHU.dpDuc=[2e+02, 2.094185791015625e+02, 2.187999877929688e+02, 2.281071929931641e+02, 2.373034820556641e+02, 2.463525543212891e+02, 2.552186889648438e+02, 2.638668823242188e+02, 2.722630615234375e+02, 2.803740234375e+02, 2.881677856445312e+02, 2.956135864257812e+02, 3.026820678710938e+02, 3.093453063964844e+02, 3.155769958496094e+02, 3.213525390625e+02, 3.266492004394531e+02, 3.314460144042969e+02, 3.357240600585938e+02, 3.394664611816406e+02, 3.426584777832031e+02, 3.452874755859375e+02, 3.473430786132812e+02, 3.488171997070312e+02, 3.497040100097656e+02, 3.5e+02, 3.497040100097656e+02, 3.488171997070312e+02, 3.473430786132812e+02, 3.452874755859375e+02, 3.426584777832031e+02, 3.394664611816406e+02, 3.357240600585938e+02, 3.314460144042969e+02, 3.266492004394531e+02, 3.213525390625e+02, 3.155769958496094e+02, 3.093453063964844e+02, 3.026820678710938e+02, 2.956135864257812e+02, 2.881677856445312e+02, 2.803740234375e+02, 2.722630615234375e+02, 2.638668823242188e+02, 2.552186889648438e+02, 2.463525543212891e+02, 2.373034820556641e+02, 2.281071929931641e+02, 2.187999877929688e+02, 2.094185791015625e+02, 2e+02, 1.905814208984375e+02, 1.812000122070312e+02, 1.718928070068359e+02, 1.626965179443359e+02, 1.536474456787109e+02, 1.447813110351562e+02, 1.361331024169922e+02, 1.27736946105957e+02, 1.196259841918945e+02, 1.118322143554688e+02, 1.043863983154297e+02, 9.731793212890625e+01, 9.065470886230469e+01, 8.442301177978516e+01, 7.864745330810547e+01, 7.335081481933594e+01, 6.855400085449219e+01, 6.427593994140625e+01, 6.053352737426758e+01, 5.734152221679688e+01, 5.47125244140625e+01, 5.265691375732422e+01, 5.118279647827148e+01, 5.029598999023438e+01, 5e+01, 5.029598999023438e+01, 5.118279647827148e+01, 5.265691375732422e+01, 5.47125244140625e+01, 5.734152221679688e+01, 6.053352737426758e+01, 6.427593994140625e+01, 6.855400085449219e+01, 7.335081481933594e+01, 7.864745330810547e+01, 8.442301177978516e+01, 9.065470886230469e+01, 9.731793212890625e+01, 1.043863983154297e+02, 1.118322143554688e+02, 1.196259841918945e+02, 1.27736946105957e+02, 1.361331024169922e+02, 1.447813110351562e+02, 1.536474456787109e+02, 1.626965179443359e+02, 1.718928070068359e+02, 1.812000122070312e+02, 1.905814208984375e+02, 2e+02]
 conAHU.conSupFan.staPreSetRes.y=[1.2e+02, 1.2e+02, 1.2e+02, 1.2e+02, 1.2e+02, 1.2e+02, 1.2e+02, 1.2e+02, 1.2e+02, 1.2e+02, 1.2e+02, 1.2e+02, 1.2e+02, 1.2e+02, 1.2e+02, 1.2e+02, 1.2e+02, 1.2e+02, 1.2e+02, 1.2e+02, 1.2e+02, 1.38e+02, 1.38e+02, 1.38e+02, 1.56e+02, 1.56e+02, 1.56e+02, 1.74e+02, 1.74e+02, 1.74e+02, 1.74e+02, 1.92e+02, 1.92e+02, 1.92e+02, 2.1e+02, 2.1e+02, 2.1e+02, 2.3e+02, 2.3e+02, 2.3e+02, 2.3e+02, 2.5e+02, 2.5e+02, 2.5e+02, 2.7e+02, 2.7e+02, 2.7e+02, 2.9e+02, 2.9e+02, 2.9e+02, 2.9e+02, 3.1e+02, 3.1e+02, 3.1e+02, 3.3e+02, 3.3e+02, 3.3e+02, 3.5e+02, 3.5e+02, 3.5e+02, 3.5e+02, 3.7e+02, 3.7e+02, 3.7e+02, 3.9e+02, 3.9e+02, 3.9e+02, 4.1e+02, 4.1e+02, 4.1e+02, 4.1e+02, 4.3e+02, 4.3e+02, 4.3e+02, 4.5e+02, 4.5e+02, 4.5e+02, 4.7e+02, 4.7e+02, 4.7e+02, 4.7e+02, 4.9e+02, 4.9e+02, 4.9e+02, 5.1e+02, 5.1e+02, 5.1e+02, 5.3e+02, 5.3e+02, 5.3e+02, 5.3e+02, 5.5e+02, 5.5e+02, 5.5e+02, 5.7e+02, 5.7e+02, 5.7e+02, 5.9e+02, 5.9e+02, 5.9e+02, 5.9e+02]
-conAHU.ySupFan=[1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.001122519373894e-01, 1.019729897379875e-01, 1.047497615218163e-01, 1.08448900282383e-01, 1.13074392080307e-01, 1.18626169860363e-01, 1.251078248023987e-01, 1.325124800205231e-01, 1.408358067274094e-01, 1.500728130340576e-01, 1.602175235748292e-01, 1.712512075901032e-01, 1.831627041101457e-01, 1.959429681301117e-01, 2.095669060945511e-01, 2.240155637264252e-01, 2.392694503068924e-01, 2.55311518907547e-01, 2.721075713634491e-01, 2.896345555782318e-01, 3.078694343566895e-01, 3.26778918504715e-01, 3.46328467130661e-01, 3.664933443069458e-01, 3.872356712818146e-01, 4.085254669189453e-01, 4.303285181522369e-01, 4.526152312755585e-01, 4.753392040729523e-01, 4.984705448150635e-01, 5.219794511795044e-01, 5.458210706710815e-01, 5.699626803398132e-01, 5.943731665611267e-01, 6.190122365951538e-01, 6.438457369804382e-01, 6.688414812088013e-01, 6.939691305160522e-01, 7.1919184923172e-01, 7.444809675216675e-01, 7.698069214820862e-01, 7.951394319534302e-01, 8.204507827758789e-01, 8.457161784172058e-01, 8.709117770195007e-01, 8.960141539573669e-01, 9.210035800933838e-01, 9.458608031272888e-01, 9.705690741539001e-01, 9.951133728027344e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+conAHU.ySupFan=[1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.001139804720879e-01, 1.019745320081711e-01, 1.047519445419312e-01, 1.084515228867531e-01, 1.130750924348831e-01, 1.186267957091331e-01, 1.251088827848434e-01, 1.325163096189499e-01, 1.40840470790863e-01, 1.500763297080994e-01, 1.602214872837067e-01, 1.712549775838853e-01, 1.83168187737465e-01, 1.959490180015564e-01, 2.095731794834137e-01, 2.240217328071594e-01, 2.392752468585968e-01, 2.553174495697021e-01, 2.721129059791565e-01, 2.896388471126556e-01, 3.078743517398834e-01, 3.267791569232941e-01, 3.463262021541595e-01, 3.664909601211548e-01, 3.872348964214325e-01, 4.085228741168976e-01, 4.3032306432724e-01, 4.526135325431824e-01, 4.753392040729523e-01, 4.984722435474396e-01, 5.219822525978088e-01, 5.458288192749023e-01, 5.69970428943634e-01, 5.943800806999207e-01, 6.190190315246582e-01, 6.438522934913635e-01, 6.688478589057922e-01, 6.939756274223328e-01, 7.191981673240662e-01, 7.444868087768555e-01, 7.698127627372742e-01, 7.951453924179077e-01, 8.20456326007843e-01, 8.45721423625946e-01, 8.70917022228241e-01, 8.960192799568176e-01, 9.210081696510315e-01, 9.45865273475647e-01, 9.70573365688324e-01, 9.951185584068298e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
 conAHU.y1SupFan=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
 conAHU.uAhuOpeMod=[1e+00, 1e+00]
 conAHU.TAirSup=[2.871499938964844e+02, 2.871900024414062e+02, 2.872300109863281e+02, 2.872699890136719e+02, 2.873099975585938e+02, 2.873500061035156e+02, 2.873900146484375e+02, 2.874299926757812e+02, 2.874700012207031e+02, 2.87510009765625e+02, 2.875499877929688e+02, 2.875899963378906e+02, 2.876300048828125e+02, 2.876700134277344e+02, 2.877099914550781e+02, 2.8775e+02, 2.877900085449219e+02, 2.878299865722656e+02, 2.878699951171875e+02, 2.879100036621094e+02, 2.879500122070312e+02, 2.87989990234375e+02, 2.880299987792969e+02, 2.880700073242188e+02, 2.881099853515625e+02, 2.881499938964844e+02, 2.881900024414062e+02, 2.882300109863281e+02, 2.882699890136719e+02, 2.883099975585938e+02, 2.883500061035156e+02, 2.883900146484375e+02, 2.884299926757812e+02, 2.884700012207031e+02, 2.88510009765625e+02, 2.885499877929688e+02, 2.885899963378906e+02, 2.886300048828125e+02, 2.886700134277344e+02, 2.887099914550781e+02, 2.8875e+02, 2.887900085449219e+02, 2.888299865722656e+02, 2.888699951171875e+02, 2.889100036621094e+02, 2.889500122070312e+02, 2.88989990234375e+02, 2.890299987792969e+02, 2.890700073242188e+02, 2.891099853515625e+02, 2.891499938964844e+02, 2.891900024414062e+02, 2.892300109863281e+02, 2.892699890136719e+02, 2.893099975585938e+02, 2.893500061035156e+02, 2.893900146484375e+02, 2.894299926757812e+02, 2.894700012207031e+02, 2.89510009765625e+02, 2.895499877929688e+02, 2.895899963378906e+02, 2.896300048828125e+02, 2.896700134277344e+02, 2.897099914550781e+02, 2.8975e+02, 2.897900085449219e+02, 2.898299865722656e+02, 2.898699951171875e+02, 2.899100036621094e+02, 2.899500122070312e+02, 2.89989990234375e+02, 2.900299987792969e+02, 2.900700073242188e+02, 2.901099853515625e+02, 2.901499938964844e+02, 2.901900024414062e+02, 2.902300109863281e+02, 2.902699890136719e+02, 2.903099975585938e+02, 2.903500061035156e+02, 2.903900146484375e+02, 2.904299926757812e+02, 2.904700012207031e+02, 2.90510009765625e+02, 2.905499877929688e+02, 2.905899963378906e+02, 2.906300048828125e+02, 2.906700134277344e+02, 2.907099914550781e+02, 2.9075e+02, 2.907900085449219e+02, 2.908299865722656e+02, 2.908699951171875e+02, 2.909100036621094e+02, 2.909500122070312e+02, 2.90989990234375e+02, 2.910299987792969e+02, 2.910700073242188e+02, 2.911099853515625e+02, 2.911499938964844e+02]
-conAHU.TAirSupSet=[2.8875e+02, 2.883732604980469e+02, 2.879979858398438e+02, 2.876257019042969e+02, 2.872578735351562e+02, 2.868959045410156e+02, 2.86541259765625e+02, 2.861953125e+02, 2.858594665527344e+02, 2.855350341796875e+02, 2.852232971191406e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.852037353515625e+02, 2.854002685546875e+02, 2.856111755371094e+02, 2.858294677734375e+02, 2.859383850097656e+02, 2.861393432617188e+02, 2.863444519042969e+02, 2.863465881347656e+02, 2.865265197753906e+02, 2.867079162597656e+02, 2.868900146484375e+02, 2.867406921386719e+02, 2.868908081054688e+02, 2.870397033691406e+02, 2.867625122070312e+02, 2.868771362304688e+02, 2.869894409179688e+02, 2.865499877929688e+02, 2.865499877929688e+02, 2.865499877929688e+02, 2.865499877929688e+02, 2.860499877929688e+02, 2.860499877929688e+02, 2.860499877929688e+02, 2.855499877929688e+02, 2.855499877929688e+02, 2.855499877929688e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02]
+conAHU.TAirSupSet=[2.991499938964844e+02, 2.883732604980469e+02, 2.879979858398438e+02, 2.876257019042969e+02, 2.872578735351562e+02, 2.868959045410156e+02, 2.86541259765625e+02, 2.861953125e+02, 2.858594665527344e+02, 2.855350341796875e+02, 2.852232971191406e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.852037353515625e+02, 2.854002685546875e+02, 2.856111755371094e+02, 2.858294677734375e+02, 2.859383850097656e+02, 2.861393432617188e+02, 2.863444519042969e+02, 2.863465881347656e+02, 2.865265197753906e+02, 2.867079162597656e+02, 2.868900146484375e+02, 2.867406921386719e+02, 2.868908081054688e+02, 2.870397033691406e+02, 2.867625122070312e+02, 2.868771362304688e+02, 2.869894409179688e+02, 2.865499877929688e+02, 2.865499877929688e+02, 2.865499877929688e+02, 2.865499877929688e+02, 2.860499877929688e+02, 2.860499877929688e+02, 2.860499877929688e+02, 2.855499877929688e+02, 2.855499877929688e+02, 2.855499877929688e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02]
 conAHU.TOut=[2.911499938964844e+02, 2.914639587402344e+02, 2.917766723632812e+02, 2.920869140625e+02, 2.923934631347656e+02, 2.926950988769531e+02, 2.929906311035156e+02, 2.932789001464844e+02, 2.935587768554688e+02, 2.938291320800781e+02, 2.940889282226562e+02, 2.943371276855469e+02, 2.945727233886719e+02, 2.947948303222656e+02, 2.950025634765625e+02, 2.951950988769531e+02, 2.953716430664062e+02, 2.955315246582031e+02, 2.956741333007812e+02, 2.957988891601562e+02, 2.959052734375e+02, 2.95992919921875e+02, 2.960614318847656e+02, 2.961105651855469e+02, 2.9614013671875e+02, 2.961499938964844e+02, 2.9614013671875e+02, 2.961105651855469e+02, 2.960614318847656e+02, 2.95992919921875e+02, 2.959052734375e+02, 2.957988891601562e+02, 2.956741333007812e+02, 2.955315246582031e+02, 2.953716430664062e+02, 2.951950988769531e+02, 2.950025634765625e+02, 2.947948303222656e+02, 2.945727233886719e+02, 2.943371276855469e+02, 2.940889282226562e+02, 2.938291320800781e+02, 2.935587768554688e+02, 2.932789001464844e+02, 2.929906311035156e+02, 2.926950988769531e+02, 2.923934631347656e+02, 2.920869140625e+02, 2.917766723632812e+02, 2.914639587402344e+02, 2.911499938964844e+02, 2.908360595703125e+02, 2.905233459472656e+02, 2.902131042480469e+02, 2.899065551757812e+02, 2.896049194335938e+02, 2.893093872070312e+02, 2.890211181640625e+02, 2.887412414550781e+02, 2.884708557128906e+02, 2.882110595703125e+02, 2.87962890625e+02, 2.877272644042969e+02, 2.875051574707031e+02, 2.872974243164062e+02, 2.871049194335938e+02, 2.869283752441406e+02, 2.867684631347656e+02, 2.866258544921875e+02, 2.865011291503906e+02, 2.863947143554688e+02, 2.863070983886719e+02, 2.862385559082031e+02, 2.861894226074219e+02, 2.861598815917969e+02, 2.861499938964844e+02, 2.861598815917969e+02, 2.861894226074219e+02, 2.862385559082031e+02, 2.863070983886719e+02, 2.863947143554688e+02, 2.865011291503906e+02, 2.866258544921875e+02, 2.867684631347656e+02, 2.869283752441406e+02, 2.871049194335938e+02, 2.872974243164062e+02, 2.875051574707031e+02, 2.877272644042969e+02, 2.87962890625e+02, 2.882110595703125e+02, 2.884708557128906e+02, 2.887412414550781e+02, 2.890211181640625e+02, 2.893093872070312e+02, 2.896049194335938e+02, 2.899065551757812e+02, 2.902131042480469e+02, 2.905233459472656e+02, 2.908360595703125e+02, 2.911499938964844e+02]
-conAHU.ecoCon.uTSup=[0e+00, 1.666252687573433e-02, 3.449901193380356e-02, 5.342879146337509e-02, 7.336752861738205e-02, 9.42266583442688e-02, 1.159151941537857e-01, 1.383394300937653e-01, 1.614021956920624e-01, 1.850058436393738e-01, 2.090497314929962e-01, 2.219468206167221e-01, 2.313268482685089e-01, 2.408270984888077e-01, 2.504474222660065e-01, 2.601874172687531e-01, 2.700474262237549e-01, 2.800280749797821e-01, 2.901282012462616e-01, 3.003492653369904e-01, 3.106893002986908e-01, 3.211493492126465e-01, 3.317293524742126e-01, 3.424293398857117e-01, 3.532510995864868e-01, 3.641912937164307e-01, 3.752533495426178e-01, 3.864364624023438e-01, 3.977380394935608e-01, 4.091606438159943e-01, 4.207008481025696e-01, 4.323609173297882e-01, 4.441409707069397e-01, 4.56041008234024e-01, 4.680632650852203e-01, 4.802034795284271e-01, 4.924635887145996e-01, 5.048465132713318e-01, 5.173471570014954e-01, 5.299673080444336e-01, 5.399931669235229e-01, 5.425808429718018e-01, 5.439480543136597e-01, 5.444213151931763e-01, 5.500306487083435e-01, 5.506566166877747e-01, 5.505847334861755e-01, 5.603623390197754e-01, 5.612049698829651e-01, 5.615545511245728e-01, 5.614420175552368e-01, 5.784210562705994e-01, 5.800998210906982e-01, 5.815090537071228e-01, 6.047269105911255e-01, 6.085270643234253e-01, 6.122234463691711e-01, 6.438291668891907e-01, 6.545292139053345e-01, 6.653492450714111e-01, 6.762892603874207e-01, 7.13849663734436e-01, 7.265296578407288e-01, 7.393296957015991e-01, 7.782501578330994e-01, 7.927906513214111e-01, 8.074507117271423e-01, 8.426312208175659e-01, 8.587313294410706e-01, 8.749513626098633e-01, 8.912913203239441e-01, 9.077520370483398e-01, 9.243320822715759e-01, 9.410321116447449e-01, 9.578530192375183e-01, 9.747930765151978e-01, 9.918531179428101e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+conAHU.ecoCon.uTSup=[0e+00, 1.626430079340935e-02, 3.410078585147858e-02, 5.303056538105011e-02, 7.296933978796005e-02, 9.38284695148468e-02, 1.155169978737831e-01, 1.379412859678269e-01, 1.610040366649628e-01, 1.846077740192413e-01, 2.086517065763474e-01, 2.215481549501419e-01, 2.309281975030899e-01, 2.404284626245499e-01, 2.50048816204071e-01, 2.5978884100914e-01, 2.696488499641418e-01, 2.796295881271362e-01, 2.897297441959381e-01, 2.999509572982788e-01, 3.102910220623016e-01, 3.207526504993439e-01, 3.3133265376091e-01, 3.420345783233643e-01, 3.528566658496857e-01, 3.637968897819519e-01, 3.748592436313629e-01, 3.860428035259247e-01, 3.973435759544373e-01, 4.087661802768707e-01, 4.203064739704132e-01, 4.319692552089691e-01, 4.437493979930878e-01, 4.556494653224945e-01, 4.676721096038818e-01, 4.798124134540558e-01, 4.920725524425507e-01, 5.044557452201843e-01, 5.169565081596375e-01, 5.295766592025757e-01, 5.396039485931396e-01, 5.421888828277588e-01, 5.435577630996704e-01, 5.440319776535034e-01, 5.496408343315125e-01, 5.502668619155884e-01, 5.501945614814758e-01, 5.599719882011414e-01, 5.608153939247131e-01, 5.611649751663208e-01, 5.610522031784058e-01, 5.780301690101624e-01, 5.797082781791687e-01, 5.811184644699097e-01, 6.043362021446228e-01, 6.081364750862122e-01, 6.118317842483521e-01, 6.434365510940552e-01, 6.54136598110199e-01, 6.649565696716309e-01, 6.758965849876404e-01, 7.134570479393005e-01, 7.26137101650238e-01, 7.389370799064636e-01, 7.778576016426086e-01, 7.92397677898407e-01, 8.070576786994934e-01, 8.422383069992065e-01, 8.583384156227112e-01, 8.745584487915039e-01, 8.908984065055847e-01, 9.073599576950073e-01, 9.239400029182434e-01, 9.406400322914124e-01, 9.574610590934753e-01, 9.744021892547607e-01, 9.914623498916626e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
 conAHU.yHeaCoi=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-conAHU.yCooCoi=[5.551115123125783e-17, 5.551115123125783e-17, 5.551115123125783e-17, 5.551115123125783e-17, 5.551115123125783e-17, 5.551115123125783e-17, 5.551115123125783e-17, 5.551115123125783e-17, 5.551115123125783e-17, 5.551115123125783e-17, 5.551115123125783e-17, 5.551115123125783e-17, 5.551115123125783e-17, 5.551115123125783e-17, 5.965458694845642e-04, 1.35832354426384e-02, 2.67298985272646e-02, 4.003743454813957e-02, 5.350428074598312e-02, 6.713234633207321e-02, 8.09190645813942e-02, 9.486579149961472e-02, 1.089724600315094e-01, 1.23239129781723e-01, 1.376681327819824e-01, 1.52255043387413e-01, 1.670044511556625e-01, 1.819152981042862e-01, 1.969840526580811e-01, 2.122141867876053e-01, 2.276011109352112e-01, 2.431478947401047e-01, 2.588546276092529e-01, 2.747213244438171e-01, 2.90751039981842e-01, 3.069379925727844e-01, 3.23284775018692e-01, 3.3979532122612e-01, 3.564629256725311e-01, 3.732897341251373e-01, 3.866575658321381e-01, 3.901077806949615e-01, 3.919307887554169e-01, 3.925617635250092e-01, 4.000408351421356e-01, 4.008754789829254e-01, 4.00779664516449e-01, 4.138164818286896e-01, 4.149399399757385e-01, 4.154061079025269e-01, 4.152560532093048e-01, 4.37894731760025e-01, 4.401330947875977e-01, 4.420120716094971e-01, 4.729692041873932e-01, 4.780360460281373e-01, 4.8296457529068e-01, 5.251055955886841e-01, 5.393723249435425e-01, 5.537989735603333e-01, 5.683856606483459e-01, 6.184661984443665e-01, 6.353728771209717e-01, 6.524395942687988e-01, 7.043335437774658e-01, 7.237208485603333e-01, 7.432675957679749e-01, 7.901749610900879e-01, 8.116417527198792e-01, 8.332684636116028e-01, 8.550550937652588e-01, 8.770027756690979e-01, 8.991094827651978e-01, 9.2137610912323e-01, 9.438039660453796e-01, 9.663907885551453e-01, 9.891374707221985e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+conAHU.yCooCoi=[5.551115123125783e-17, 5.551115123125783e-17, 5.551115123125783e-17, 5.551115123125783e-17, 5.551115123125783e-17, 5.551115123125783e-17, 5.551115123125783e-17, 5.551115123125783e-17, 5.551115123125783e-17, 5.551115123125783e-17, 5.551115123125783e-17, 5.551115123125783e-17, 5.551115123125783e-17, 5.551115123125783e-17, 6.510721141241669e-05, 1.305180136114359e-02, 2.619846723973751e-02, 3.950613737106323e-02, 5.297298356890678e-02, 6.660126894712448e-02, 8.038801699876785e-02, 9.43368524312973e-02, 1.084435507655144e-01, 1.227127686142921e-01, 1.371422111988068e-01, 1.517291814088821e-01, 1.664790064096451e-01, 1.81390404701233e-01, 1.964581012725831e-01, 2.116882503032684e-01, 2.270752936601639e-01, 2.426256537437439e-01, 2.583325207233429e-01, 2.741992771625519e-01, 2.902294993400574e-01, 3.064165711402893e-01, 3.227633833885193e-01, 3.392742872238159e-01, 3.559420108795166e-01, 3.727688789367676e-01, 3.861385583877563e-01, 3.895851373672485e-01, 3.914103806018829e-01, 3.920426368713379e-01, 3.99521142244339e-01, 4.003558158874512e-01, 4.002594649791718e-01, 4.132959842681885e-01, 4.144205451011658e-01, 4.148866236209869e-01, 4.14736270904541e-01, 4.373735785484314e-01, 4.396110773086548e-01, 4.414912760257721e-01, 4.724482893943787e-01, 4.775153100490571e-01, 4.824423789978028e-01, 5.245820283889771e-01, 5.388487577438354e-01, 5.53275465965271e-01, 5.678621530532837e-01, 6.17942750453949e-01, 6.348494291305542e-01, 6.519160866737366e-01, 7.038101553916931e-01, 7.231969237327576e-01, 7.427436113357544e-01, 7.896510362625122e-01, 8.111178874969482e-01, 8.327445983886719e-01, 8.545312285423279e-01, 8.764799237251282e-01, 8.985866904258728e-01, 9.20853316783905e-01, 9.43281352519989e-01, 9.658696055412292e-01, 9.886164665222168e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
 conAHU.yOutDam=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
 conAHU.yRetDam=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_G36_AHUs_MultiZone_VAV_Validation_Controller_UnspecifiedClimate.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_G36_AHUs_MultiZone_VAV_Validation_Controller_UnspecifiedClimate.txt
index 4e883f69178..9e709287085 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_G36_AHUs_MultiZone_VAV_Validation_Controller_UnspecifiedClimate.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_G36_AHUs_MultiZone_VAV_Validation_Controller_UnspecifiedClimate.txt
@@ -1,22 +1,22 @@
-last-generated=2022-12-21
+last-generated=2024-06-27
 statistics-simulation=
 {
   "linear": " ",
   "nonlinear": " ",
-  "number of continuous time states": "5",
+  "number of continuous time states": "7",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 3.6e+03]
 conAHU.dpDuc=[2e+02, 2.094185791015625e+02, 2.187999877929688e+02, 2.281071929931641e+02, 2.373034820556641e+02, 2.463525543212891e+02, 2.552186889648438e+02, 2.638668823242188e+02, 2.722630615234375e+02, 2.803740234375e+02, 2.881677856445312e+02, 2.956135864257812e+02, 3.026820678710938e+02, 3.093453063964844e+02, 3.155769958496094e+02, 3.213525390625e+02, 3.266492004394531e+02, 3.314460144042969e+02, 3.357240600585938e+02, 3.394664611816406e+02, 3.426584777832031e+02, 3.452874755859375e+02, 3.473430786132812e+02, 3.488171997070312e+02, 3.497040100097656e+02, 3.5e+02, 3.497040100097656e+02, 3.488171997070312e+02, 3.473430786132812e+02, 3.452874755859375e+02, 3.426584777832031e+02, 3.394664611816406e+02, 3.357240600585938e+02, 3.314460144042969e+02, 3.266492004394531e+02, 3.213525390625e+02, 3.155769958496094e+02, 3.093453063964844e+02, 3.026820678710938e+02, 2.956135864257812e+02, 2.881677856445312e+02, 2.803740234375e+02, 2.722630615234375e+02, 2.638668823242188e+02, 2.552186889648438e+02, 2.463525543212891e+02, 2.373034820556641e+02, 2.281071929931641e+02, 2.187999877929688e+02, 2.094185791015625e+02, 2e+02, 1.905814208984375e+02, 1.812000122070312e+02, 1.718928070068359e+02, 1.626965179443359e+02, 1.536474456787109e+02, 1.447813110351562e+02, 1.361331024169922e+02, 1.27736946105957e+02, 1.196259841918945e+02, 1.118322143554688e+02, 1.043863983154297e+02, 9.731793212890625e+01, 9.065470886230469e+01, 8.442301177978516e+01, 7.864745330810547e+01, 7.335081481933594e+01, 6.855400085449219e+01, 6.427593994140625e+01, 6.053352737426758e+01, 5.734152221679688e+01, 5.47125244140625e+01, 5.265691375732422e+01, 5.118279647827148e+01, 5.029598999023438e+01, 5e+01, 5.029598999023438e+01, 5.118279647827148e+01, 5.265691375732422e+01, 5.47125244140625e+01, 5.734152221679688e+01, 6.053352737426758e+01, 6.427593994140625e+01, 6.855400085449219e+01, 7.335081481933594e+01, 7.864745330810547e+01, 8.442301177978516e+01, 9.065470886230469e+01, 9.731793212890625e+01, 1.043863983154297e+02, 1.118322143554688e+02, 1.196259841918945e+02, 1.27736946105957e+02, 1.361331024169922e+02, 1.447813110351562e+02, 1.536474456787109e+02, 1.626965179443359e+02, 1.718928070068359e+02, 1.812000122070312e+02, 1.905814208984375e+02, 2e+02]
 conAHU.conSupFan.staPreSetRes.y=[1.2e+02, 1.2e+02, 1.2e+02, 1.2e+02, 1.2e+02, 1.2e+02, 1.2e+02, 1.2e+02, 1.2e+02, 1.2e+02, 1.2e+02, 1.2e+02, 1.2e+02, 1.2e+02, 1.2e+02, 1.2e+02, 1.2e+02, 1.2e+02, 1.2e+02, 1.2e+02, 1.2e+02, 1.38e+02, 1.38e+02, 1.38e+02, 1.56e+02, 1.56e+02, 1.56e+02, 1.74e+02, 1.74e+02, 1.74e+02, 1.74e+02, 1.92e+02, 1.92e+02, 1.92e+02, 2.1e+02, 2.1e+02, 2.1e+02, 2.3e+02, 2.3e+02, 2.3e+02, 2.3e+02, 2.5e+02, 2.5e+02, 2.5e+02, 2.7e+02, 2.7e+02, 2.7e+02, 2.9e+02, 2.9e+02, 2.9e+02, 2.9e+02, 3.1e+02, 3.1e+02, 3.1e+02, 3.3e+02, 3.3e+02, 3.3e+02, 3.5e+02, 3.5e+02, 3.5e+02, 3.5e+02, 3.7e+02, 3.7e+02, 3.7e+02, 3.9e+02, 3.9e+02, 3.9e+02, 4.1e+02, 4.1e+02, 4.1e+02, 4.1e+02, 4.3e+02, 4.3e+02, 4.3e+02, 4.5e+02, 4.5e+02, 4.5e+02, 4.7e+02, 4.7e+02, 4.7e+02, 4.7e+02, 4.9e+02, 4.9e+02, 4.9e+02, 5.1e+02, 5.1e+02, 5.1e+02, 5.3e+02, 5.3e+02, 5.3e+02, 5.3e+02, 5.5e+02, 5.5e+02, 5.5e+02, 5.7e+02, 5.7e+02, 5.7e+02, 5.9e+02, 5.9e+02, 5.9e+02, 5.9e+02]
-conAHU.ySupFan=[1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.001122519373894e-01, 1.019729897379875e-01, 1.047497615218163e-01, 1.08448900282383e-01, 1.13074392080307e-01, 1.18626169860363e-01, 1.251078248023987e-01, 1.325138956308365e-01, 1.408377289772034e-01, 1.500737816095352e-01, 1.602227687835694e-01, 1.712571233510972e-01, 1.831702888011933e-01, 1.959508806467056e-01, 2.09574818611145e-01, 2.240284532308578e-01, 2.3928402364254e-01, 2.55326122045517e-01, 2.721221446990967e-01, 2.896491289138794e-01, 3.07884007692337e-01, 3.267934918403625e-01, 3.463430404663086e-01, 3.665079176425934e-01, 3.872502446174622e-01, 4.085400402545929e-01, 4.303455650806427e-01, 4.526323080062866e-01, 4.753562808036804e-01, 4.984876215457916e-01, 5.219964981079102e-01, 5.458381175994873e-01, 5.69979727268219e-01, 5.943902730941772e-01, 6.190292835235596e-01, 6.43862783908844e-01, 6.68858528137207e-01, 6.93986177444458e-01, 7.192088961601257e-01, 7.44498074054718e-01, 7.698240280151367e-01, 7.951565384864807e-01, 8.204678297042847e-01, 8.457332253456116e-01, 8.709288239479065e-01, 8.960312008857727e-01, 9.210206270217896e-01, 9.458779096603394e-01, 9.705861806869507e-01, 9.951304197311401e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+conAHU.ySupFan=[1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.001139804720879e-01, 1.019745320081711e-01, 1.047519445419312e-01, 1.084515228867531e-01, 1.130750924348831e-01, 1.186267957091331e-01, 1.251088827848434e-01, 1.325163096189499e-01, 1.40840470790863e-01, 1.500763297080994e-01, 1.602264195680619e-01, 1.712609231472016e-01, 1.831736117601395e-01, 1.95954754948616e-01, 2.095789164304733e-01, 2.240329384803772e-01, 2.392890155315399e-01, 2.553312182426453e-01, 2.72126704454422e-01, 2.896526455879211e-01, 3.078881502151489e-01, 3.267929255962372e-01, 3.463399708271027e-01, 3.665047287940979e-01, 3.872486650943756e-01, 4.085366427898407e-01, 4.303401410579681e-01, 4.526306092739105e-01, 4.75356251001358e-01, 4.984893202781677e-01, 5.219993591308594e-01, 5.458459258079529e-01, 5.699874758720398e-01, 5.943971276283264e-01, 6.19036078453064e-01, 6.438694000244141e-01, 6.688649654388428e-01, 6.939926743507385e-01, 7.192152142524719e-01, 7.445038557052612e-01, 7.698298096656799e-01, 7.951624393463135e-01, 8.204733729362488e-01, 8.457385301589966e-01, 8.709341287612915e-01, 8.960363268852234e-01, 9.210252165794373e-01, 9.458823204040527e-01, 9.705904722213745e-01, 9.951356053352356e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
 conAHU.y1SupFan=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
 conAHU.uAhuOpeMod=[1e+00, 1e+00]
 conAHU.TAirSup=[2.871499938964844e+02, 2.871900024414062e+02, 2.872300109863281e+02, 2.872699890136719e+02, 2.873099975585938e+02, 2.873500061035156e+02, 2.873900146484375e+02, 2.874299926757812e+02, 2.874700012207031e+02, 2.87510009765625e+02, 2.875499877929688e+02, 2.875899963378906e+02, 2.876300048828125e+02, 2.876700134277344e+02, 2.877099914550781e+02, 2.8775e+02, 2.877900085449219e+02, 2.878299865722656e+02, 2.878699951171875e+02, 2.879100036621094e+02, 2.879500122070312e+02, 2.87989990234375e+02, 2.880299987792969e+02, 2.880700073242188e+02, 2.881099853515625e+02, 2.881499938964844e+02, 2.881900024414062e+02, 2.882300109863281e+02, 2.882699890136719e+02, 2.883099975585938e+02, 2.883500061035156e+02, 2.883900146484375e+02, 2.884299926757812e+02, 2.884700012207031e+02, 2.88510009765625e+02, 2.885499877929688e+02, 2.885899963378906e+02, 2.886300048828125e+02, 2.886700134277344e+02, 2.887099914550781e+02, 2.8875e+02, 2.887900085449219e+02, 2.888299865722656e+02, 2.888699951171875e+02, 2.889100036621094e+02, 2.889500122070312e+02, 2.88989990234375e+02, 2.890299987792969e+02, 2.890700073242188e+02, 2.891099853515625e+02, 2.891499938964844e+02, 2.891900024414062e+02, 2.892300109863281e+02, 2.892699890136719e+02, 2.893099975585938e+02, 2.893500061035156e+02, 2.893900146484375e+02, 2.894299926757812e+02, 2.894700012207031e+02, 2.89510009765625e+02, 2.895499877929688e+02, 2.895899963378906e+02, 2.896300048828125e+02, 2.896700134277344e+02, 2.897099914550781e+02, 2.8975e+02, 2.897900085449219e+02, 2.898299865722656e+02, 2.898699951171875e+02, 2.899100036621094e+02, 2.899500122070312e+02, 2.89989990234375e+02, 2.900299987792969e+02, 2.900700073242188e+02, 2.901099853515625e+02, 2.901499938964844e+02, 2.901900024414062e+02, 2.902300109863281e+02, 2.902699890136719e+02, 2.903099975585938e+02, 2.903500061035156e+02, 2.903900146484375e+02, 2.904299926757812e+02, 2.904700012207031e+02, 2.90510009765625e+02, 2.905499877929688e+02, 2.905899963378906e+02, 2.906300048828125e+02, 2.906700134277344e+02, 2.907099914550781e+02, 2.9075e+02, 2.907900085449219e+02, 2.908299865722656e+02, 2.908699951171875e+02, 2.909100036621094e+02, 2.909500122070312e+02, 2.90989990234375e+02, 2.910299987792969e+02, 2.910700073242188e+02, 2.911099853515625e+02, 2.911499938964844e+02]
-conAHU.TAirSupSet=[2.8875e+02, 2.883732604980469e+02, 2.879979858398438e+02, 2.876257019042969e+02, 2.872578735351562e+02, 2.868959045410156e+02, 2.86541259765625e+02, 2.861953125e+02, 2.858594665527344e+02, 2.855350341796875e+02, 2.852232971191406e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.852037353515625e+02, 2.854002685546875e+02, 2.856111755371094e+02, 2.858294677734375e+02, 2.859383850097656e+02, 2.861393432617188e+02, 2.863444519042969e+02, 2.863465881347656e+02, 2.865265197753906e+02, 2.867079162597656e+02, 2.868900146484375e+02, 2.867406921386719e+02, 2.868908081054688e+02, 2.870397033691406e+02, 2.867625122070312e+02, 2.868771362304688e+02, 2.869894409179688e+02, 2.865499877929688e+02, 2.865499877929688e+02, 2.865499877929688e+02, 2.865499877929688e+02, 2.860499877929688e+02, 2.860499877929688e+02, 2.860499877929688e+02, 2.855499877929688e+02, 2.855499877929688e+02, 2.855499877929688e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02]
+conAHU.TAirSupSet=[2.991499938964844e+02, 2.883732604980469e+02, 2.879979858398438e+02, 2.876257019042969e+02, 2.872578735351562e+02, 2.868959045410156e+02, 2.86541259765625e+02, 2.861953125e+02, 2.858594665527344e+02, 2.855350341796875e+02, 2.852232971191406e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.852037353515625e+02, 2.854002685546875e+02, 2.856111755371094e+02, 2.858294677734375e+02, 2.859383850097656e+02, 2.861393432617188e+02, 2.863444519042969e+02, 2.863465881347656e+02, 2.865265197753906e+02, 2.867079162597656e+02, 2.868900146484375e+02, 2.867406921386719e+02, 2.868908081054688e+02, 2.870397033691406e+02, 2.867625122070312e+02, 2.868771362304688e+02, 2.869894409179688e+02, 2.865499877929688e+02, 2.865499877929688e+02, 2.865499877929688e+02, 2.865499877929688e+02, 2.860499877929688e+02, 2.860499877929688e+02, 2.860499877929688e+02, 2.855499877929688e+02, 2.855499877929688e+02, 2.855499877929688e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02]
 conAHU.TOut=[2.911499938964844e+02, 2.914639587402344e+02, 2.917766723632812e+02, 2.920869140625e+02, 2.923934631347656e+02, 2.926950988769531e+02, 2.929906311035156e+02, 2.932789001464844e+02, 2.935587768554688e+02, 2.938291320800781e+02, 2.940889282226562e+02, 2.943371276855469e+02, 2.945727233886719e+02, 2.947948303222656e+02, 2.950025634765625e+02, 2.951950988769531e+02, 2.953716430664062e+02, 2.955315246582031e+02, 2.956741333007812e+02, 2.957988891601562e+02, 2.959052734375e+02, 2.95992919921875e+02, 2.960614318847656e+02, 2.961105651855469e+02, 2.9614013671875e+02, 2.961499938964844e+02, 2.9614013671875e+02, 2.961105651855469e+02, 2.960614318847656e+02, 2.95992919921875e+02, 2.959052734375e+02, 2.957988891601562e+02, 2.956741333007812e+02, 2.955315246582031e+02, 2.953716430664062e+02, 2.951950988769531e+02, 2.950025634765625e+02, 2.947948303222656e+02, 2.945727233886719e+02, 2.943371276855469e+02, 2.940889282226562e+02, 2.938291320800781e+02, 2.935587768554688e+02, 2.932789001464844e+02, 2.929906311035156e+02, 2.926950988769531e+02, 2.923934631347656e+02, 2.920869140625e+02, 2.917766723632812e+02, 2.914639587402344e+02, 2.911499938964844e+02, 2.908360595703125e+02, 2.905233459472656e+02, 2.902131042480469e+02, 2.899065551757812e+02, 2.896049194335938e+02, 2.893093872070312e+02, 2.890211181640625e+02, 2.887412414550781e+02, 2.884708557128906e+02, 2.882110595703125e+02, 2.87962890625e+02, 2.877272644042969e+02, 2.875051574707031e+02, 2.872974243164062e+02, 2.871049194335938e+02, 2.869283752441406e+02, 2.867684631347656e+02, 2.866258544921875e+02, 2.865011291503906e+02, 2.863947143554688e+02, 2.863070983886719e+02, 2.862385559082031e+02, 2.861894226074219e+02, 2.861598815917969e+02, 2.861499938964844e+02, 2.861598815917969e+02, 2.861894226074219e+02, 2.862385559082031e+02, 2.863070983886719e+02, 2.863947143554688e+02, 2.865011291503906e+02, 2.866258544921875e+02, 2.867684631347656e+02, 2.869283752441406e+02, 2.871049194335938e+02, 2.872974243164062e+02, 2.875051574707031e+02, 2.877272644042969e+02, 2.87962890625e+02, 2.882110595703125e+02, 2.884708557128906e+02, 2.887412414550781e+02, 2.890211181640625e+02, 2.893093872070312e+02, 2.896049194335938e+02, 2.899065551757812e+02, 2.902131042480469e+02, 2.905233459472656e+02, 2.908360595703125e+02, 2.911499938964844e+02]
-conAHU.ecoCon.uTSup=[0e+00, 1.666252687573433e-02, 3.449901193380356e-02, 5.342879146337509e-02, 7.336752861738205e-02, 9.42266583442688e-02, 1.159151941537857e-01, 1.383394300937653e-01, 1.614021956920624e-01, 1.850058436393738e-01, 2.090497314929962e-01, 2.219468206167221e-01, 2.313268482685089e-01, 2.408270984888077e-01, 2.504474222660065e-01, 2.601874172687531e-01, 2.700474262237549e-01, 2.800280749797821e-01, 2.901282012462616e-01, 3.003492653369904e-01, 3.106893002986908e-01, 3.211493492126465e-01, 3.317293524742126e-01, 3.424293398857117e-01, 3.532510995864868e-01, 3.641912937164307e-01, 3.752533495426178e-01, 3.864364624023438e-01, 3.977380394935608e-01, 4.091606438159943e-01, 4.207008481025696e-01, 4.323609173297882e-01, 4.441409707069397e-01, 4.56041008234024e-01, 4.680632650852203e-01, 4.802034795284271e-01, 4.924635887145996e-01, 5.048465132713318e-01, 5.173471570014954e-01, 5.299673080444336e-01, 5.399931669235229e-01, 5.425808429718018e-01, 5.439480543136597e-01, 5.444213151931763e-01, 5.500306487083435e-01, 5.506566166877747e-01, 5.505847334861755e-01, 5.603623390197754e-01, 5.612049698829651e-01, 5.615545511245728e-01, 5.614420175552368e-01, 5.784205198287964e-01, 5.800989270210266e-01, 5.815088748931885e-01, 6.047254204750061e-01, 6.085250973701477e-01, 6.122204661369324e-01, 6.438249945640564e-01, 6.545250415802002e-01, 6.653454303741455e-01, 6.76285445690155e-01, 7.138458490371704e-01, 7.265258431434631e-01, 7.393258810043335e-01, 7.782463431358337e-01, 7.927868366241455e-01, 8.074468970298767e-01, 8.426274061203003e-01, 8.587275147438049e-01, 8.749475479125977e-01, 8.912879228591919e-01, 9.077486991882324e-01, 9.243287444114685e-01, 9.410287141799927e-01, 9.578496217727661e-01, 9.747896790504456e-01, 9.918497204780579e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+conAHU.ecoCon.uTSup=[0e+00, 1.62642989307642e-02, 3.410078212618828e-02, 5.303056165575981e-02, 7.296933978796005e-02, 9.38284695148468e-02, 1.155169904232025e-01, 1.379412859678269e-01, 1.610040366649628e-01, 1.846077740192413e-01, 2.086517065763474e-01, 2.215481549501419e-01, 2.309281975030899e-01, 2.404284626245499e-01, 2.50048816204071e-01, 2.5978884100914e-01, 2.696488499641418e-01, 2.796295881271362e-01, 2.897297441959381e-01, 2.999509572982788e-01, 3.102910220623016e-01, 3.207526504993439e-01, 3.3133265376091e-01, 3.420345783233643e-01, 3.528566658496857e-01, 3.637968897819519e-01, 3.748592436313629e-01, 3.860428035259247e-01, 3.973435759544373e-01, 4.087661802768707e-01, 4.203064739704132e-01, 4.319692552089691e-01, 4.437493979930878e-01, 4.556494653224945e-01, 4.676721096038818e-01, 4.798124134540558e-01, 4.920725524425507e-01, 5.044557452201843e-01, 5.169565081596375e-01, 5.295766592025757e-01, 5.396039485931396e-01, 5.421888828277588e-01, 5.435577630996704e-01, 5.440319776535034e-01, 5.496408343315125e-01, 5.502668619155884e-01, 5.501945614814758e-01, 5.599719882011414e-01, 5.608153939247131e-01, 5.611649751663208e-01, 5.610522031784058e-01, 5.780301690101624e-01, 5.797082781791687e-01, 5.811184644699097e-01, 6.043346524238586e-01, 6.081342697143555e-01, 6.11829936504364e-01, 6.43434464931488e-01, 6.541345119476318e-01, 6.649549603462219e-01, 6.758949756622314e-01, 7.134554386138916e-01, 7.261354923248291e-01, 7.389354705810547e-01, 7.778559923171997e-01, 7.92396068572998e-01, 8.070560693740845e-01, 8.422366976737976e-01, 8.583368062973022e-01, 8.74556839466095e-01, 8.908973336219788e-01, 9.073588252067566e-01, 9.239388704299927e-01, 9.406388998031616e-01, 9.574599266052246e-01, 9.7440105676651e-01, 9.914612174034119e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
 conAHU.yHeaCoi=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-conAHU.yCooCoi=[5.551115123125783e-17, 5.551115123125783e-17, 5.551115123125783e-17, 5.551115123125783e-17, 5.551115123125783e-17, 5.551115123125783e-17, 5.551115123125783e-17, 5.551115123125783e-17, 5.551115123125783e-17, 5.551115123125783e-17, 5.551115123125783e-17, 5.551115123125783e-17, 5.551115123125783e-17, 5.551115123125783e-17, 5.965458694845642e-04, 1.35832354426384e-02, 2.67298985272646e-02, 4.003743454813957e-02, 5.350428074598312e-02, 6.713234633207321e-02, 8.09190645813942e-02, 9.486579149961472e-02, 1.089724600315094e-01, 1.23239129781723e-01, 1.376681327819824e-01, 1.52255043387413e-01, 1.670044511556625e-01, 1.819152981042862e-01, 1.969840526580811e-01, 2.122141867876053e-01, 2.276011109352112e-01, 2.431478947401047e-01, 2.588546276092529e-01, 2.747213244438171e-01, 2.90751039981842e-01, 3.069379925727844e-01, 3.23284775018692e-01, 3.3979532122612e-01, 3.564629256725311e-01, 3.732897341251373e-01, 3.866575658321381e-01, 3.901077806949615e-01, 3.919307887554169e-01, 3.925617635250092e-01, 4.000408351421356e-01, 4.008754789829254e-01, 4.00779664516449e-01, 4.138164818286896e-01, 4.149399399757385e-01, 4.154061079025269e-01, 4.152560532093048e-01, 4.378940165042877e-01, 4.401318728923798e-01, 4.420118629932404e-01, 4.729671776294709e-01, 4.780334830284119e-01, 4.829606115818024e-01, 5.250999927520752e-01, 5.393667221069336e-01, 5.537939071655273e-01, 5.6838059425354e-01, 6.184611320495605e-01, 6.353678107261658e-01, 6.524344682693481e-01, 7.043284177780151e-01, 7.237157821655273e-01, 7.432625293731689e-01, 7.90169894695282e-01, 8.116366863250732e-01, 8.332633376121521e-01, 8.550506234169006e-01, 8.76998245716095e-01, 8.991049528121948e-01, 9.213716387748718e-01, 9.437994956970215e-01, 9.663862586021423e-01, 9.891329407691956e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+conAHU.yCooCoi=[5.551115123125783e-17, 5.551115123125783e-17, 5.551115123125783e-17, 5.551115123125783e-17, 5.551115123125783e-17, 5.551115123125783e-17, 5.551115123125783e-17, 5.551115123125783e-17, 5.551115123125783e-17, 5.551115123125783e-17, 5.551115123125783e-17, 5.551115123125783e-17, 5.551115123125783e-17, 5.551115123125783e-17, 6.510524690386086e-05, 1.305179856717587e-02, 2.619846537709236e-02, 3.950613364577293e-02, 5.297298356890678e-02, 6.660126894712448e-02, 8.038800954818726e-02, 9.433684498071671e-02, 1.084435507655144e-01, 1.227127686142921e-01, 1.371422111988068e-01, 1.517291814088821e-01, 1.664790064096451e-01, 1.81390404701233e-01, 1.964581012725831e-01, 2.116882503032684e-01, 2.270752936601639e-01, 2.426256537437439e-01, 2.583325207233429e-01, 2.741992771625519e-01, 2.902294993400574e-01, 3.064165711402893e-01, 3.227633833885193e-01, 3.392742872238159e-01, 3.559420108795166e-01, 3.727688789367676e-01, 3.861385583877563e-01, 3.895851373672485e-01, 3.914103806018829e-01, 3.920426368713379e-01, 3.99521142244339e-01, 4.003558158874512e-01, 4.002594649791718e-01, 4.132959842681885e-01, 4.144205451011658e-01, 4.148865938186646e-01, 4.14736270904541e-01, 4.373735785484314e-01, 4.396110773086548e-01, 4.414912760257721e-01, 4.724462032318116e-01, 4.775123894214631e-01, 4.82439935207367e-01, 5.245792865753174e-01, 5.388460159301758e-01, 5.532733201980591e-01, 5.678600072860718e-01, 6.179406046867371e-01, 6.348472833633423e-01, 6.519139409065247e-01, 7.038080096244812e-01, 7.231947779655457e-01, 7.427414655685425e-01, 7.896488904953003e-01, 8.111157417297363e-01, 8.3274245262146e-01, 8.545297384262085e-01, 8.764784336090088e-01, 8.985852003097534e-01, 9.208518266677856e-01, 9.432798624038696e-01, 9.658681154251099e-01, 9.886149764060974e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
 conAHU.yOutDam=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
 conAHU.yRetDam=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_G36_AHUs_SingleZone_VAV_SetPoints_Validation_FreezeProtection.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_G36_AHUs_SingleZone_VAV_SetPoints_Validation_FreezeProtection.txt
index 79619bc2b62..1bce0f61957 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_G36_AHUs_SingleZone_VAV_SetPoints_Validation_FreezeProtection.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_G36_AHUs_SingleZone_VAV_SetPoints_Validation_FreezeProtection.txt
@@ -1,4 +1,4 @@
-last-generated=2022-06-24
+last-generated=2024-06-27
 statistics-simulation=
 {
   "linear": " ",
@@ -9,16 +9,16 @@ statistics-simulation=
 time=[0e+00, 3.6e+03]
 frePro.uOutDamPosMin=[1.000000014901161e-01, 1.000000014901161e-01]
 frePro.uOutDam=[1.000000014901161e-01, 1.049999967217445e-01, 1.099999994039536e-01, 1.150000020861626e-01, 1.19999997317791e-01, 1.25e-01, 1.299999952316284e-01, 1.35000005364418e-01, 1.400000005960464e-01, 1.449999958276749e-01, 1.500000059604645e-01, 1.550000011920929e-01, 1.599999964237213e-01, 1.650000065565109e-01, 1.700000017881393e-01, 1.749999970197678e-01, 1.800000071525574e-01, 1.850000023841858e-01, 1.899999976158142e-01, 1.949999928474426e-01, 2.000000029802322e-01, 2.049999982118607e-01, 2.099999934434891e-01, 2.150000035762787e-01, 2.199999988079071e-01, 2.249999940395355e-01, 2.300000041723251e-01, 2.349999994039536e-01, 2.39999994635582e-01, 2.450000047683716e-01, 2.5e-01, 2.549999952316284e-01, 2.599999904632568e-01, 2.649999856948853e-01, 2.700000107288361e-01, 2.750000059604645e-01, 2.800000011920929e-01, 2.849999964237213e-01, 2.899999916553497e-01, 2.949999868869781e-01, 3.00000011920929e-01, 3.050000071525574e-01, 3.100000023841858e-01, 3.149999976158142e-01, 3.199999928474426e-01, 3.24999988079071e-01, 3.300000131130219e-01, 3.350000083446503e-01, 3.400000035762787e-01, 3.449999988079071e-01, 3.499999940395355e-01, 3.549999892711639e-01, 3.600000143051147e-01, 3.650000095367432e-01, 3.700000047683716e-01, 3.750000000000001e-01, 3.799999952316285e-01, 3.849999904632568e-01, 3.899999856948853e-01, 3.950000107288361e-01, 4.000000059604645e-01, 4.050000011920929e-01, 4.099999964237213e-01, 4.149999916553497e-01, 4.199999868869781e-01, 4.25000011920929e-01, 4.300000071525574e-01, 4.350000023841858e-01, 4.399999976158142e-01, 4.449999928474426e-01, 4.49999988079071e-01, 4.550000131130219e-01, 4.600000083446503e-01, 4.650000035762787e-01, 4.699999988079071e-01, 4.749999940395355e-01, 4.799999892711639e-01, 4.850000143051147e-01, 4.900000095367432e-01, 4.950000047683716e-01, 5e-01, 5.049999952316284e-01, 5.099999904632568e-01, 5.149999856948853e-01, 5.199999809265137e-01, 5.249999761581421e-01, 5.299999713897705e-01, 5.350000262260437e-01, 5.400000214576721e-01, 5.450000166893005e-01, 5.50000011920929e-01, 5.550000071525574e-01, 5.600000023841858e-01, 5.649999976158142e-01, 5.699999928474426e-01, 5.74999988079071e-01, 5.799999833106995e-01, 5.849999785423279e-01, 5.899999737739563e-01, 5.950000286102295e-01, 6.000000238418579e-01]
-frePro.yOutDam=[1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01]
+frePro.yOutDam=[1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
 frePro.uHeaCoi=[5e-01, 5.058799982070923e-01, 5.117599964141846e-01, 5.176399946212769e-01, 5.235199928283691e-01, 5.293999910354614e-01, 5.352799892425537e-01, 5.41159987449646e-01, 5.470399856567383e-01, 5.529199838638306e-01, 5.587999820709229e-01, 5.646799802780151e-01, 5.705599784851074e-01, 5.764399766921997e-01, 5.82319974899292e-01, 5.881999731063843e-01, 5.940799713134766e-01, 5.999600291252136e-01, 6.058400273323059e-01, 6.117200255393982e-01, 6.176000237464905e-01, 6.234800219535828e-01, 6.29360020160675e-01, 6.352400183677673e-01, 6.411200165748596e-01, 6.470000147819519e-01, 6.528800129890442e-01, 6.587600111961365e-01, 6.646400094032288e-01, 6.70520007610321e-01, 6.764000058174133e-01, 6.822800040245056e-01, 6.881600022315979e-01, 6.940400004386902e-01, 6.999199986457825e-01, 7.057999968528748e-01, 7.11679995059967e-01, 7.175599932670593e-01, 7.234399914741516e-01, 7.293199896812439e-01, 7.351999878883362e-01, 7.410799860954285e-01, 7.469599843025208e-01, 7.52839982509613e-01, 7.587199807167053e-01, 7.645999789237976e-01, 7.704799771308899e-01, 7.763599753379822e-01, 7.822399735450745e-01, 7.881199717521667e-01, 7.940000295639038e-01, 7.998800277709961e-01, 8.057600259780884e-01, 8.116400241851807e-01, 8.175200223922729e-01, 8.234000205993652e-01, 8.292800188064575e-01, 8.351600170135498e-01, 8.410400152206421e-01, 8.469200134277344e-01, 8.528000116348267e-01, 8.586800098419189e-01, 8.645600080490112e-01, 8.704400062561035e-01, 8.763200044631958e-01, 8.822000026702881e-01, 8.880800008773804e-01, 8.939599990844727e-01, 8.998399972915649e-01, 9.057199954986572e-01, 9.115999937057495e-01, 9.174799919128418e-01, 9.233599901199341e-01, 9.292399883270264e-01, 9.351199865341187e-01, 9.409999847412109e-01, 9.468799829483032e-01, 9.527599811553955e-01, 9.586399793624878e-01, 9.645199775695801e-01, 9.703999757766724e-01, 9.762799739837646e-01, 9.821599721908569e-01, 9.880399703979492e-01, 9.900000095367432e-01, 9.900000095367432e-01, 9.900000095367432e-01, 9.900000095367432e-01, 9.900000095367432e-01, 9.900000095367432e-01, 9.900000095367432e-01, 9.900000095367432e-01, 9.900000095367432e-01, 9.900000095367432e-01, 9.900000095367432e-01, 9.900000095367432e-01, 9.900000095367432e-01, 9.900000095367432e-01, 9.900000095367432e-01, 9.900000095367432e-01, 9.900000095367432e-01]
 frePro.yHeaCoi=[0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
 frePro.yCooCoi=[5e-01, 5.019999742507935e-01, 5.040000081062317e-01, 5.059999823570251e-01, 5.080000162124634e-01, 5.099999904632568e-01, 5.120000243186951e-01, 5.139999985694885e-01, 5.15999972820282e-01, 5.180000066757202e-01, 5.199999809265137e-01, 5.220000147819519e-01, 5.239999890327454e-01, 5.260000228881836e-01, 5.279999971389771e-01, 5.299999713897705e-01, 5.320000052452087e-01, 5.339999794960022e-01, 5.360000133514404e-01, 5.379999876022339e-01, 5.400000214576721e-01, 5.419999957084656e-01, 5.440000295639038e-01, 5.460000038146973e-01, 5.479999780654907e-01, 5.50000011920929e-01, 5.519999861717224e-01, 5.540000200271606e-01, 5.559999942779541e-01, 5.580000281333923e-01, 5.600000023841858e-01, 5.619999766349792e-01, 5.640000104904175e-01, 5.659999847412109e-01, 5.680000185966492e-01, 5.699999928474426e-01, 5.720000267028809e-01, 5.740000009536743e-01, 5.759999752044678e-01, 5.78000009059906e-01, 5.799999833106995e-01, 5.820000171661377e-01, 5.839999914169312e-01, 5.860000252723694e-01, 5.879999995231628e-01, 5.899999737739563e-01, 5.920000076293945e-01, 5.93999981880188e-01, 5.960000157356262e-01, 5.979999899864197e-01, 6.000000238418579e-01, 6.019999980926514e-01, 6.039999723434448e-01, 6.060000061988831e-01, 6.079999804496765e-01, 6.100000143051147e-01, 6.119999885559082e-01, 6.140000224113464e-01, 6.159999966621399e-01, 6.179999709129333e-01, 6.200000047683716e-01, 6.21999979019165e-01, 6.240000128746033e-01, 6.259999871253967e-01, 6.28000020980835e-01, 6.299999952316284e-01, 6.320000290870667e-01, 6.340000033378601e-01, 6.359999775886536e-01, 6.380000114440918e-01, 6.399999856948853e-01, 6.420000195503235e-01, 6.439999938011169e-01, 6.460000276565552e-01, 6.480000019073486e-01, 6.499999761581421e-01, 6.520000100135803e-01, 6.539999842643738e-01, 6.56000018119812e-01, 6.579999923706055e-01, 6.600000262260437e-01, 6.620000004768372e-01, 6.639999747276306e-01, 6.660000085830688e-01, 6.679999828338623e-01, 6.700000166893005e-01, 6.71999990940094e-01, 6.740000247955322e-01, 6.759999990463257e-01, 6.779999732971191e-01, 6.800000071525574e-01, 6.819999814033508e-01, 6.840000152587891e-01, 6.859999895095825e-01, 6.880000233650208e-01, 6.899999976158142e-01, 6.919999718666077e-01, 6.940000057220459e-01, 6.959999799728394e-01, 6.980000138282776e-01, 6.99999988079071e-01]
 frePro.uRetDam=[6.99999988079071e-01, 7.020000219345093e-01, 7.039999961853027e-01, 7.059999704360962e-01, 7.080000042915344e-01, 7.099999785423279e-01, 7.120000123977661e-01, 7.139999866485596e-01, 7.160000205039978e-01, 7.179999947547913e-01, 7.200000286102295e-01, 7.220000028610229e-01, 7.239999771118164e-01, 7.260000109672546e-01, 7.279999852180481e-01, 7.300000190734863e-01, 7.319999933242798e-01, 7.34000027179718e-01, 7.360000014305115e-01, 7.379999756813049e-01, 7.400000095367432e-01, 7.419999837875366e-01, 7.440000176429749e-01, 7.459999918937683e-01, 7.480000257492065e-01, 7.5e-01, 7.519999742507935e-01, 7.540000081062317e-01, 7.559999823570251e-01, 7.580000162124634e-01, 7.599999904632568e-01, 7.620000243186951e-01, 7.639999985694885e-01, 7.65999972820282e-01, 7.680000066757202e-01, 7.699999809265137e-01, 7.720000147819519e-01, 7.739999890327454e-01, 7.760000228881836e-01, 7.779999971389771e-01, 7.799999713897705e-01, 7.820000052452087e-01, 7.839999794960022e-01, 7.860000133514404e-01, 7.879999876022339e-01, 7.900000214576721e-01, 7.919999957084656e-01, 7.940000295639038e-01, 7.960000038146973e-01, 7.979999780654907e-01, 8.00000011920929e-01, 8.019999861717224e-01, 8.040000200271606e-01, 8.059999942779541e-01, 8.080000281333923e-01, 8.100000023841858e-01, 8.119999766349792e-01, 8.140000104904175e-01, 8.159999847412109e-01, 8.180000185966492e-01, 8.199999928474426e-01, 8.220000267028809e-01, 8.240000009536743e-01, 8.259999752044678e-01, 8.28000009059906e-01, 8.299999833106995e-01, 8.320000171661377e-01, 8.339999914169312e-01, 8.360000252723694e-01, 8.379999995231628e-01, 8.399999737739563e-01, 8.420000076293945e-01, 8.43999981880188e-01, 8.460000157356262e-01, 8.479999899864197e-01, 8.500000238418579e-01, 8.519999980926514e-01, 8.539999723434448e-01, 8.560000061988831e-01, 8.579999804496765e-01, 8.600000143051147e-01, 8.619999885559082e-01, 8.640000224113464e-01, 8.659999966621399e-01, 8.679999709129333e-01, 8.700000047683716e-01, 8.71999979019165e-01, 8.740000128746033e-01, 8.759999871253967e-01, 8.78000020980835e-01, 8.799999952316284e-01, 8.820000290870667e-01, 8.840000033378601e-01, 8.859999775886536e-01, 8.880000114440918e-01, 8.899999856948853e-01, 8.920000195503235e-01, 8.939999938011169e-01, 8.960000276565552e-01, 8.980000019073486e-01, 8.999999761581421e-01]
-frePro.yRetDam=[6.99999988079071e-01, 7.020000219345093e-01, 7.039999961853027e-01, 7.059999704360962e-01, 7.080000042915344e-01, 7.099999785423279e-01, 7.120000123977661e-01, 7.139999866485596e-01, 7.160000205039978e-01, 7.179999947547913e-01, 7.200000286102295e-01, 7.220000028610229e-01, 7.239999771118164e-01, 7.260000109672546e-01, 7.279999852180481e-01, 7.300000190734863e-01, 7.319999933242798e-01, 7.34000027179718e-01, 7.360000014305115e-01, 7.379999756813049e-01, 7.400000095367432e-01, 7.419999837875366e-01, 7.440000176429749e-01, 7.459999918937683e-01, 7.480000257492065e-01, 7.5e-01, 7.519999742507935e-01, 7.540000081062317e-01, 7.559999823570251e-01, 7.580000162124634e-01, 7.599999904632568e-01, 7.620000243186951e-01, 7.639999985694885e-01, 7.65999972820282e-01, 7.680000066757202e-01, 7.699999809265137e-01, 7.720000147819519e-01, 7.739999890327454e-01, 7.760000228881836e-01, 7.779999971389771e-01, 7.799999713897705e-01, 7.820000052452087e-01, 7.839999794960022e-01, 7.860000133514404e-01, 7.879999876022339e-01, 7.900000214576721e-01, 7.919999957084656e-01, 7.940000295639038e-01, 7.960000038146973e-01, 7.979999780654907e-01, 8.00000011920929e-01, 8.019999861717224e-01, 8.040000200271606e-01, 8.059999942779541e-01, 8.080000281333923e-01, 8.100000023841858e-01, 8.119999766349792e-01, 8.140000104904175e-01, 8.159999847412109e-01, 8.180000185966492e-01, 8.199999928474426e-01, 8.220000267028809e-01, 8.240000009536743e-01, 8.259999752044678e-01, 8.28000009059906e-01, 8.299999833106995e-01, 8.320000171661377e-01, 8.339999914169312e-01, 8.360000252723694e-01, 8.379999995231628e-01, 8.399999737739563e-01, 8.420000076293945e-01, 8.43999981880188e-01, 8.460000157356262e-01, 8.479999899864197e-01, 8.500000238418579e-01, 8.519999980926514e-01, 8.539999723434448e-01, 8.560000061988831e-01, 8.579999804496765e-01, 8.600000143051147e-01, 8.619999885559082e-01, 8.640000224113464e-01, 8.659999966621399e-01, 8.679999709129333e-01, 8.700000047683716e-01, 8.71999979019165e-01, 8.740000128746033e-01, 8.759999871253967e-01, 8.78000020980835e-01, 8.799999952316284e-01, 8.820000290870667e-01, 8.840000033378601e-01, 8.859999775886536e-01, 8.880000114440918e-01, 8.899999856948853e-01, 8.920000195503235e-01, 8.939999938011169e-01, 8.960000276565552e-01, 8.980000019073486e-01, 8.999999761581421e-01]
+frePro.yRetDam=[6.99999988079071e-01, 7.020000219345093e-01, 7.039999961853027e-01, 7.059999704360962e-01, 7.080000042915344e-01, 7.099999785423279e-01, 7.120000123977661e-01, 7.139999866485596e-01, 7.160000205039978e-01, 7.179999947547913e-01, 7.200000286102295e-01, 7.220000028610229e-01, 7.239999771118164e-01, 7.260000109672546e-01, 7.279999852180481e-01, 7.300000190734863e-01, 7.319999933242798e-01, 7.34000027179718e-01, 7.360000014305115e-01, 7.379999756813049e-01, 7.400000095367432e-01, 7.419999837875366e-01, 7.440000176429749e-01, 7.459999918937683e-01, 7.480000257492065e-01, 7.5e-01, 7.519999742507935e-01, 7.540000081062317e-01, 7.559999823570251e-01, 7.580000162124634e-01, 7.599999904632568e-01, 7.620000243186951e-01, 7.639999985694885e-01, 7.65999972820282e-01, 7.680000066757202e-01, 7.699999809265137e-01, 7.720000147819519e-01, 7.739999890327454e-01, 7.760000228881836e-01, 7.779999971389771e-01, 7.799999713897705e-01, 7.820000052452087e-01, 7.839999794960022e-01, 7.860000133514404e-01, 7.879999876022339e-01, 7.900000214576721e-01, 7.919999957084656e-01, 7.940000295639038e-01, 7.960000038146973e-01, 7.979999780654907e-01, 8.00000011920929e-01, 8.019999861717224e-01, 8.040000200271606e-01, 8.059999942779541e-01, 8.080000281333923e-01, 8.100000023841858e-01, 8.119999766349792e-01, 8.140000104904175e-01, 8.159999847412109e-01, 8.180000185966492e-01, 8.199999928474426e-01, 8.220000267028809e-01, 8.240000009536743e-01, 8.259999752044678e-01, 8.28000009059906e-01, 8.299999833106995e-01, 8.320000171661377e-01, 8.339999914169312e-01, 8.360000252723694e-01, 8.379999995231628e-01, 8.399999737739563e-01, 8.420000076293945e-01, 8.43999981880188e-01, 8.460000157356262e-01, 8.479999899864197e-01, 8.500000238418579e-01, 8.519999980926514e-01, 8.539999723434448e-01, 8.560000061988831e-01, 8.579999804496765e-01, 8.600000143051147e-01, 8.619999885559082e-01, 8.640000224113464e-01, 8.659999966621399e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
 frePro.uSupFan=[5e-01, 5.019999742507935e-01, 5.040000081062317e-01, 5.059999823570251e-01, 5.080000162124634e-01, 5.099999904632568e-01, 5.120000243186951e-01, 5.139999985694885e-01, 5.15999972820282e-01, 5.180000066757202e-01, 5.199999809265137e-01, 5.220000147819519e-01, 5.239999890327454e-01, 5.260000228881836e-01, 5.279999971389771e-01, 5.299999713897705e-01, 5.320000052452087e-01, 5.339999794960022e-01, 5.360000133514404e-01, 5.379999876022339e-01, 5.400000214576721e-01, 5.419999957084656e-01, 5.440000295639038e-01, 5.460000038146973e-01, 5.479999780654907e-01, 5.50000011920929e-01, 5.519999861717224e-01, 5.540000200271606e-01, 5.559999942779541e-01, 5.580000281333923e-01, 5.600000023841858e-01, 5.619999766349792e-01, 5.640000104904175e-01, 5.659999847412109e-01, 5.680000185966492e-01, 5.699999928474426e-01, 5.720000267028809e-01, 5.740000009536743e-01, 5.759999752044678e-01, 5.78000009059906e-01, 5.799999833106995e-01, 5.820000171661377e-01, 5.839999914169312e-01, 5.860000252723694e-01, 5.879999995231628e-01, 5.899999737739563e-01, 5.920000076293945e-01, 5.93999981880188e-01, 5.960000157356262e-01, 5.979999899864197e-01, 6.000000238418579e-01, 6.019999980926514e-01, 6.039999723434448e-01, 6.060000061988831e-01, 6.079999804496765e-01, 6.100000143051147e-01, 6.119999885559082e-01, 6.140000224113464e-01, 6.159999966621399e-01, 6.179999709129333e-01, 6.200000047683716e-01, 6.21999979019165e-01, 6.240000128746033e-01, 6.259999871253967e-01, 6.28000020980835e-01, 6.299999952316284e-01, 6.320000290870667e-01, 6.340000033378601e-01, 6.359999775886536e-01, 6.380000114440918e-01, 6.399999856948853e-01, 6.420000195503235e-01, 6.439999938011169e-01, 6.460000276565552e-01, 6.480000019073486e-01, 6.499999761581421e-01, 6.520000100135803e-01, 6.539999842643738e-01, 6.56000018119812e-01, 6.579999923706055e-01, 6.600000262260437e-01, 6.620000004768372e-01, 6.639999747276306e-01, 6.660000085830688e-01, 6.679999828338623e-01, 6.700000166893005e-01, 6.71999990940094e-01, 6.740000247955322e-01, 6.759999990463257e-01, 6.779999732971191e-01, 6.800000071525574e-01, 6.819999814033508e-01, 6.840000152587891e-01, 6.859999895095825e-01, 6.880000233650208e-01, 6.899999976158142e-01, 6.919999718666077e-01, 6.940000057220459e-01, 6.959999799728394e-01, 6.980000138282776e-01, 6.99999988079071e-01]
 frePro.ySupFan=[5e-01, 5.019999742507935e-01, 5.040000081062317e-01, 5.059999823570251e-01, 5.080000162124634e-01, 5.099999904632568e-01, 5.120000243186951e-01, 5.139999985694885e-01, 5.15999972820282e-01, 5.180000066757202e-01, 5.199999809265137e-01, 5.220000147819519e-01, 5.239999890327454e-01, 5.260000228881836e-01, 5.279999971389771e-01, 5.299999713897705e-01, 5.320000052452087e-01, 5.339999794960022e-01, 5.360000133514404e-01, 5.379999876022339e-01, 5.400000214576721e-01, 5.419999957084656e-01, 5.440000295639038e-01, 5.460000038146973e-01, 5.479999780654907e-01, 5.50000011920929e-01, 5.519999861717224e-01, 5.540000200271606e-01, 5.559999942779541e-01, 5.580000281333923e-01, 5.600000023841858e-01, 5.619999766349792e-01, 5.640000104904175e-01, 5.659999847412109e-01, 5.680000185966492e-01, 5.699999928474426e-01, 5.720000267028809e-01, 5.740000009536743e-01, 5.759999752044678e-01, 5.78000009059906e-01, 5.799999833106995e-01, 5.820000171661377e-01, 5.839999914169312e-01, 5.860000252723694e-01, 5.879999995231628e-01, 5.899999737739563e-01, 5.920000076293945e-01, 5.93999981880188e-01, 5.960000157356262e-01, 5.979999899864197e-01, 6.000000238418579e-01, 6.019999980926514e-01, 6.039999723434448e-01, 6.060000061988831e-01, 6.079999804496765e-01, 6.100000143051147e-01, 6.119999885559082e-01, 6.140000224113464e-01, 6.159999966621399e-01, 6.179999709129333e-01, 6.200000047683716e-01, 6.21999979019165e-01, 6.240000128746033e-01, 6.259999871253967e-01, 6.28000020980835e-01, 6.299999952316284e-01, 6.320000290870667e-01, 6.340000033378601e-01, 6.359999775886536e-01, 6.380000114440918e-01, 6.399999856948853e-01, 6.420000195503235e-01, 6.439999938011169e-01, 6.460000276565552e-01, 6.480000019073486e-01, 6.499999761581421e-01, 6.520000100135803e-01, 6.539999842643738e-01, 6.56000018119812e-01, 6.579999923706055e-01, 6.600000262260437e-01, 6.620000004768372e-01, 6.639999747276306e-01, 6.660000085830688e-01, 6.679999828338623e-01, 6.700000166893005e-01, 6.71999990940094e-01, 6.740000247955322e-01, 6.759999990463257e-01, 6.779999732971191e-01, 6.800000071525574e-01, 6.819999814033508e-01, 6.840000152587891e-01, 6.859999895095825e-01, 6.880000233650208e-01, 6.899999976158142e-01, 6.919999718666077e-01, 6.940000057220459e-01, 6.959999799728394e-01, 6.980000138282776e-01, 6.99999988079071e-01]
-frePro.yAla=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+frePro.yAla=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00]
 frePro.yHotWatPlaReq=[2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00]
 frePro.TAirSup=[2.791499938964844e+02, 2.791099853515625e+02, 2.790700073242188e+02, 2.790299987792969e+02, 2.78989990234375e+02, 2.789500122070312e+02, 2.789100036621094e+02, 2.788699951171875e+02, 2.788299865722656e+02, 2.787900085449219e+02, 2.7875e+02, 2.787099914550781e+02, 2.786700134277344e+02, 2.786300048828125e+02, 2.785899963378906e+02, 2.785499877929688e+02, 2.78510009765625e+02, 2.784700012207031e+02, 2.784299926757812e+02, 2.783900146484375e+02, 2.783500061035156e+02, 2.783099975585938e+02, 2.782699890136719e+02, 2.782300109863281e+02, 2.781900024414062e+02, 2.781499938964844e+02, 2.781099853515625e+02, 2.780700073242188e+02, 2.780299987792969e+02, 2.77989990234375e+02, 2.779500122070312e+02, 2.779100036621094e+02, 2.778699951171875e+02, 2.778299865722656e+02, 2.777900085449219e+02, 2.7775e+02, 2.777099914550781e+02, 2.776700134277344e+02, 2.776300048828125e+02, 2.775899963378906e+02, 2.775499877929688e+02, 2.77510009765625e+02, 2.774700012207031e+02, 2.774299926757812e+02, 2.773900146484375e+02, 2.773500061035156e+02, 2.773099975585938e+02, 2.772699890136719e+02, 2.772300109863281e+02, 2.771900024414062e+02, 2.771499938964844e+02, 2.771099853515625e+02, 2.770700073242188e+02, 2.770299987792969e+02, 2.76989990234375e+02, 2.769500122070312e+02, 2.769100036621094e+02, 2.768699951171875e+02, 2.768299865722656e+02, 2.767900085449219e+02, 2.7675e+02, 2.767099914550781e+02, 2.766700134277344e+02, 2.766300048828125e+02, 2.765899963378906e+02, 2.765499877929688e+02, 2.76510009765625e+02, 2.764700012207031e+02, 2.764299926757812e+02, 2.763900146484375e+02, 2.763500061035156e+02, 2.763099975585938e+02, 2.762699890136719e+02, 2.762300109863281e+02, 2.761900024414062e+02, 2.761499938964844e+02, 2.761099853515625e+02, 2.760700073242188e+02, 2.760299987792969e+02, 2.75989990234375e+02, 2.759500122070312e+02, 2.759100036621094e+02, 2.758699951171875e+02, 2.758299865722656e+02, 2.757900085449219e+02, 2.7575e+02, 2.757099914550781e+02, 2.756700134277344e+02, 2.756300048828125e+02, 2.755899963378906e+02, 2.755499877929688e+02, 2.75510009765625e+02, 2.754700012207031e+02, 2.754299926757812e+02, 2.753900146484375e+02, 2.753500061035156e+02, 2.753099975585938e+02, 2.752699890136719e+02, 2.752300109863281e+02, 2.751900024414062e+02, 2.751499938964844e+02]
-frePro.yFreProSta=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+frePro.yFreProSta=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00]
 frePro.u1SofSwiRes=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Examples_Combined_SeriesConstantFlow.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Examples_Combined_SeriesConstantFlow.txt
index 55614c7dabd..014d23765f0 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Examples_Combined_SeriesConstantFlow.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Examples_Combined_SeriesConstantFlow.txt
@@ -1,4 +1,4 @@
-last-generated=2024-06-25
+last-generated=2024-06-26
 statistics-initialization=
 {
   "nonlinear": "1, 1, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 2, 0, 2, 0,   2, 0, 2, 0, 2, 0, 2, 0, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,   1",
@@ -7,22 +7,22 @@ statistics-initialization=
 statistics-simulation=
 {
   "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2,   2, 2",
-  "nonlinear": "2, 2, 2, 4, 4, 1, 1, 1, 2, 4, 1, 1, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1",
+  "nonlinear": "2, 2, 2, 2, 4, 4, 4, 1, 1, 1, 1, 2, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1",
   "number of continuous time states": "157",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 6.048e+05]
-borFie.TBorAve=[2.853500061035156e+02, 2.856446228027344e+02, 2.856423034667969e+02, 2.856139221191406e+02, 2.855429077148438e+02, 2.854171752929688e+02, 2.853715515136719e+02, 2.853467407226562e+02, 2.852872314453125e+02, 2.852747192382812e+02, 2.85284912109375e+02, 2.852352600097656e+02, 2.851984252929688e+02, 2.851658020019531e+02, 2.85208251953125e+02, 2.852390747070312e+02, 2.852457580566406e+02, 2.852388305664062e+02, 2.852147521972656e+02, 2.851044006347656e+02, 2.850663757324219e+02, 2.85065185546875e+02, 2.850543518066406e+02, 2.850569763183594e+02, 2.850994262695312e+02, 2.850797729492188e+02, 2.8505078125e+02, 2.850308532714844e+02, 2.8506201171875e+02, 2.851099548339844e+02, 2.851302185058594e+02, 2.851341552734375e+02, 2.851286315917969e+02, 2.850368347167969e+02, 2.849789123535156e+02, 2.849888610839844e+02, 2.850156860351562e+02, 2.850190124511719e+02, 2.85090087890625e+02, 2.8511083984375e+02, 2.850772399902344e+02, 2.850641784667969e+02, 2.850650939941406e+02, 2.851247253417969e+02, 2.851508483886719e+02, 2.851536254882812e+02, 2.851446838378906e+02, 2.850711975097656e+02, 2.849808959960938e+02, 2.8495458984375e+02, 2.849384155273438e+02, 2.848787231445312e+02, 2.848804626464844e+02, 2.84889404296875e+02, 2.848334045410156e+02, 2.8480029296875e+02, 2.847738342285156e+02, 2.848304748535156e+02, 2.848617858886719e+02, 2.848748168945312e+02, 2.848796997070312e+02, 2.848539428710938e+02, 2.847469482421875e+02, 2.84725830078125e+02, 2.847118835449219e+02, 2.846554870605469e+02, 2.846260986328125e+02, 2.846422729492188e+02, 2.846021728515625e+02, 2.845643920898438e+02, 2.845410766601562e+02, 2.84585693359375e+02, 2.846332092285156e+02, 2.846605834960938e+02, 2.846734619140625e+02, 2.846707153320312e+02, 2.845687561035156e+02, 2.845372619628906e+02, 2.845423583984375e+02, 2.845182189941406e+02, 2.844674072265625e+02, 2.844969482421875e+02, 2.844812927246094e+02, 2.84424560546875e+02, 2.843923950195312e+02, 2.844071960449219e+02, 2.844647521972656e+02, 2.845000305175781e+02, 2.84517578125e+02, 2.845260620117188e+02, 2.844537048339844e+02, 2.844004821777344e+02, 2.844115600585938e+02, 2.844091186523438e+02, 2.843461608886719e+02, 2.843867492675781e+02, 2.844167175292969e+02, 2.843644409179688e+02, 2.843392333984375e+02, 2.843303833007812e+02, 2.844030456542969e+02]
-bui[1].ets.volMix_a.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931175842285156e+02, 2.931175231933594e+02, 2.900768127441406e+02, 2.863383178710938e+02, 2.856841430664062e+02, 2.855731811523438e+02, 2.855335388183594e+02, 2.854922180175781e+02, 2.854546508789062e+02, 2.854494323730469e+02, 2.854494323730469e+02, 2.854494323730469e+02, 2.854479064941406e+02, 2.854479064941406e+02, 2.85436767578125e+02, 2.854246215820312e+02, 2.854160461425781e+02, 2.85412841796875e+02, 2.8535791015625e+02, 2.852987365722656e+02, 2.852760925292969e+02, 2.852666015625e+02, 2.852498168945312e+02, 2.852545471191406e+02, 2.852545471191406e+02, 2.852545471191406e+02, 2.852545166015625e+02, 2.852541198730469e+02, 2.852550354003906e+02, 2.852652587890625e+02, 2.8528173828125e+02, 2.853173217773438e+02, 2.852928466796875e+02, 2.85232421875e+02, 2.85212890625e+02, 2.852115478515625e+02, 2.852091064453125e+02, 2.852138671875e+02, 2.852142028808594e+02, 2.852142028808594e+02, 2.852142028808594e+02, 2.852142028808594e+02, 2.852151489257812e+02, 2.852157897949219e+02, 2.85230224609375e+02, 2.853016662597656e+02, 2.853162536621094e+02, 2.852432250976562e+02, 2.852023620605469e+02, 2.851825561523438e+02, 2.8514501953125e+02, 2.851165771484375e+02, 2.851150207519531e+02, 2.851150207519531e+02, 2.851142883300781e+02, 2.851139831542969e+02, 2.851049194335938e+02, 2.850925903320312e+02, 2.850901794433594e+02, 2.850963745117188e+02, 2.851112976074219e+02, 2.85048828125e+02, 2.850015258789062e+02, 2.849854431152344e+02, 2.84957763671875e+02, 2.849133605957031e+02, 2.849078369140625e+02, 2.849076538085938e+02, 2.848956604003906e+02, 2.848690185546875e+02, 2.8484716796875e+02, 2.848567504882812e+02, 2.848828735351562e+02, 2.8490869140625e+02, 2.849339904785156e+02, 2.849129333496094e+02, 2.848595275878906e+02, 2.8483349609375e+02, 2.848298034667969e+02, 2.847947692871094e+02, 2.84779296875e+02, 2.847877807617188e+02, 2.847691650390625e+02, 2.847356262207031e+02, 2.847035217285156e+02, 2.847162780761719e+02, 2.847489624023438e+02, 2.847767639160156e+02, 2.84802734375e+02, 2.847975463867188e+02, 2.847418212890625e+02, 2.84716064453125e+02, 2.847204895019531e+02, 2.846912841796875e+02, 2.846732788085938e+02, 2.846982421875e+02, 2.847000732421875e+02, 2.846786193847656e+02, 2.846474609375e+02]
-bui[1].ets.volMix_b.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.907016296386719e+02, 2.842084350585938e+02, 2.82002197265625e+02, 2.816852722167969e+02, 2.815735473632812e+02, 2.815157775878906e+02, 2.814953002929688e+02, 2.815169677734375e+02, 2.815169677734375e+02, 2.815169677734375e+02, 2.815233459472656e+02, 2.815233459472656e+02, 2.815022277832031e+02, 2.814713745117188e+02, 2.814191589355469e+02, 2.813967895507812e+02, 2.813745727539062e+02, 2.813498229980469e+02, 2.813106994628906e+02, 2.812649230957031e+02, 2.812657165527344e+02, 2.813046264648438e+02, 2.813046264648438e+02, 2.813046264648438e+02, 2.813113403320312e+02, 2.813103332519531e+02, 2.813030090332031e+02, 2.812851257324219e+02, 2.812679748535156e+02, 2.81272705078125e+02, 2.812966613769531e+02, 2.81286376953125e+02, 2.812947998046875e+02, 2.8127685546875e+02, 2.812413330078125e+02, 2.812470397949219e+02, 2.812469787597656e+02, 2.812469787597656e+02, 2.812469787597656e+02, 2.812469787597656e+02, 2.812538757324219e+02, 2.812536010742188e+02, 2.812426147460938e+02, 2.812129211425781e+02, 2.812922058105469e+02, 2.812726440429688e+02, 2.812643127441406e+02, 2.811881408691406e+02, 2.811614074707031e+02, 2.811597595214844e+02, 2.811831665039062e+02, 2.811831665039062e+02, 2.811895446777344e+02, 2.811892700195312e+02, 2.811771240234375e+02, 2.811469116210938e+02, 2.811188354492188e+02, 2.810594787597656e+02, 2.810882873535156e+02, 2.8105810546875e+02, 2.810450134277344e+02, 2.809848022460938e+02, 2.809670715332031e+02, 2.8095458984375e+02, 2.809836120605469e+02, 2.809670715332031e+02, 2.809366149902344e+02, 2.809031372070312e+02, 2.808723449707031e+02, 2.808552551269531e+02, 2.808634643554688e+02, 2.808757019042969e+02, 2.809135437011719e+02, 2.809252319335938e+02, 2.808889465332031e+02, 2.808499755859375e+02, 2.808347473144531e+02, 2.808129272460938e+02, 2.807888793945312e+02, 2.807932739257812e+02, 2.807799377441406e+02, 2.807548522949219e+02, 2.807213134765625e+02, 2.807101440429688e+02, 2.807301940917969e+02, 2.807503051757812e+02, 2.807858581542969e+02, 2.808043518066406e+02, 2.807682189941406e+02, 2.807301940917969e+02, 2.807205505371094e+02, 2.8070654296875e+02, 2.806795959472656e+02, 2.807008056640625e+02, 2.806993408203125e+02, 2.806878967285156e+02, 2.80661865234375e+02]
-bui[2].ets.volMix_a.T=[2.931499938964844e+02, 2.889847412109375e+02, 2.867328796386719e+02, 2.860090942382812e+02, 2.858437805175781e+02, 2.857818298339844e+02, 2.855805969238281e+02, 2.854559020996094e+02, 2.854183959960938e+02, 2.853894348144531e+02, 2.853486022949219e+02, 2.854270935058594e+02, 2.854343566894531e+02, 2.854067687988281e+02, 2.853822937011719e+02, 2.8536181640625e+02, 2.853645629882812e+02, 2.853680419921875e+02, 2.853430480957031e+02, 2.852213439941406e+02, 2.85135009765625e+02, 2.851030883789062e+02, 2.85163330078125e+02, 2.851560974121094e+02, 2.851289978027344e+02, 2.852214660644531e+02, 2.852846069335938e+02, 2.852688903808594e+02, 2.8525537109375e+02, 2.852349853515625e+02, 2.852470397949219e+02, 2.852639770507812e+02, 2.852693176269531e+02, 2.851537475585938e+02, 2.850986328125e+02, 2.850679931640625e+02, 2.851447448730469e+02, 2.851795349121094e+02, 2.851773376464844e+02, 2.852065124511719e+02, 2.852762451171875e+02, 2.8528125e+02, 2.852748107910156e+02, 2.852577209472656e+02, 2.852620849609375e+02, 2.852940063476562e+02, 2.853079528808594e+02, 2.852013549804688e+02, 2.8511474609375e+02, 2.850136108398438e+02, 2.850636901855469e+02, 2.850774230957031e+02, 2.850048217773438e+02, 2.849983215332031e+02, 2.851127014160156e+02, 2.851003112792969e+02, 2.850705871582031e+02, 2.850361633300781e+02, 2.850237121582031e+02, 2.850357666015625e+02, 2.850455322265625e+02, 2.850076293945312e+02, 2.848988647460938e+02, 2.847671813964844e+02, 2.84746337890625e+02, 2.847871398925781e+02, 2.847113952636719e+02, 2.846985473632812e+02, 2.8485986328125e+02, 2.848868408203125e+02, 2.848348388671875e+02, 2.847909545898438e+02, 2.847688598632812e+02, 2.847886352539062e+02, 2.848130798339844e+02, 2.848138427734375e+02, 2.848222351074219e+02, 2.847894287109375e+02, 2.847316589355469e+02, 2.847085571289062e+02, 2.847087707519531e+02, 2.846640625e+02, 2.846512145996094e+02, 2.846924438476562e+02, 2.846532287597656e+02, 2.846188354492188e+02, 2.845821228027344e+02, 2.846015930175781e+02, 2.846327209472656e+02, 2.846555480957031e+02, 2.846486206054688e+02, 2.846409606933594e+02, 2.845848693847656e+02, 2.845659790039062e+02, 2.845770874023438e+02, 2.845462036132812e+02, 2.845229187011719e+02, 2.845793762207031e+02, 2.84576416015625e+02, 2.845497436523438e+02, 2.845127563476562e+02]
-bui[2].ets.volMix_b.T=[2.931499938964844e+02, 2.895508117675781e+02, 2.855796508789062e+02, 2.832065734863281e+02, 2.818673400878906e+02, 2.818927001953125e+02, 2.8172802734375e+02, 2.814696044921875e+02, 2.814798889160156e+02, 2.814653015136719e+02, 2.813082275390625e+02, 2.814050598144531e+02, 2.814306945800781e+02, 2.8149169921875e+02, 2.814247131347656e+02, 2.813758850097656e+02, 2.813607177734375e+02, 2.813627014160156e+02, 2.813306579589844e+02, 2.813306274414062e+02, 2.81199951171875e+02, 2.811224365234375e+02, 2.811679077148438e+02, 2.812246398925781e+02, 2.811418151855469e+02, 2.811807250976562e+02, 2.812692260742188e+02, 2.812969055175781e+02, 2.812957763671875e+02, 2.812493286132812e+02, 2.81237548828125e+02, 2.812512817382812e+02, 2.811909484863281e+02, 2.812354125976562e+02, 2.81156494140625e+02, 2.811113891601562e+02, 2.811091613769531e+02, 2.812423706054688e+02, 2.812151489257812e+02, 2.811739501953125e+02, 2.812589721679688e+02, 2.812679443359375e+02, 2.813392639160156e+02, 2.812811279296875e+02, 2.812555236816406e+02, 2.812710571289062e+02, 2.812746887207031e+02, 2.812435913085938e+02, 2.811758728027344e+02, 2.810592346191406e+02, 2.809886779785156e+02, 2.811556701660156e+02, 2.810507507324219e+02, 2.809458618164062e+02, 2.811039428710938e+02, 2.811002197265625e+02, 2.811554565429688e+02, 2.810536499023438e+02, 2.810236206054688e+02, 2.810297546386719e+02, 2.810413208007812e+02, 2.810170593261719e+02, 2.809774780273438e+02, 2.808185729980469e+02, 2.806770629882812e+02, 2.808184204101562e+02, 2.807541809082031e+02, 2.806247863769531e+02, 2.8083251953125e+02, 2.808891296386719e+02, 2.809178161621094e+02, 2.808128662109375e+02, 2.807733154296875e+02, 2.807781982421875e+02, 2.808031311035156e+02, 2.807603149414062e+02, 2.809049072265625e+02, 2.808084106445312e+02, 2.807493286132812e+02, 2.807196350097656e+02, 2.807460632324219e+02, 2.806766662597656e+02, 2.806495056152344e+02, 2.80686279296875e+02, 2.806557006835938e+02, 2.806414184570312e+02, 2.805894775390625e+02, 2.805908813476562e+02, 2.806215515136719e+02, 2.8057861328125e+02, 2.806734924316406e+02, 2.806541442871094e+02, 2.806000671386719e+02, 2.805532836914062e+02, 2.806668701171875e+02, 2.80563720703125e+02, 2.805066833496094e+02, 2.805729370117188e+02, 2.805760498046875e+02, 2.806046447753906e+02, 2.80523681640625e+02]
-bui[3].ets.volMix_a.T=[2.931499938964844e+02, 2.911788330078125e+02, 2.886017150878906e+02, 2.868385620117188e+02, 2.843616638183594e+02, 2.850379028320312e+02, 2.849870300292969e+02, 2.847863464355469e+02, 2.842113342285156e+02, 2.849566345214844e+02, 2.847385559082031e+02, 2.841067810058594e+02, 2.841549987792969e+02, 2.84157958984375e+02, 2.843677062988281e+02, 2.846051330566406e+02, 2.846678466796875e+02, 2.846256103515625e+02, 2.838267517089844e+02, 2.839316101074219e+02, 2.843572692871094e+02, 2.844788208007812e+02, 2.83845703125e+02, 2.845614624023438e+02, 2.846969299316406e+02, 2.838545227050781e+02, 2.8393408203125e+02, 2.838659973144531e+02, 2.840191040039062e+02, 2.843034973144531e+02, 2.844679870605469e+02, 2.844930114746094e+02, 2.84140869140625e+02, 2.833764343261719e+02, 2.843392028808594e+02, 2.8448974609375e+02, 2.8417333984375e+02, 2.843243408203125e+02, 2.847666320800781e+02, 2.842794494628906e+02, 2.841538696289062e+02, 2.840907287597656e+02, 2.84125244140625e+02, 2.841658020019531e+02, 2.843998413085938e+02, 2.845218200683594e+02, 2.845052490234375e+02, 2.833144226074219e+02, 2.8424755859375e+02, 2.841292419433594e+02, 2.835789794921875e+02, 2.8359375e+02, 2.842376708984375e+02, 2.834889831542969e+02, 2.832105102539062e+02, 2.832738037109375e+02, 2.835411376953125e+02, 2.840081176757812e+02, 2.839989013671875e+02, 2.83965087890625e+02, 2.839498901367188e+02, 2.828047180175781e+02, 2.836605224609375e+02, 2.836619567871094e+02, 2.834830017089844e+02, 2.825989990234375e+02, 2.837231750488281e+02, 2.834275817871094e+02, 2.825386352539062e+02, 2.827760314941406e+02, 2.828079223632812e+02, 2.835738220214844e+02, 2.836064147949219e+02, 2.835799865722656e+02, 2.835357055664062e+02, 2.8267041015625e+02, 2.827064514160156e+02, 2.834771423339844e+02, 2.834376220703125e+02, 2.822335205078125e+02, 2.835099182128906e+02, 2.834446716308594e+02, 2.822153015136719e+02, 2.82410400390625e+02, 2.823162841796875e+02, 2.832588195800781e+02, 2.833244934082031e+02, 2.832899169921875e+02, 2.832509460449219e+02, 2.831154479980469e+02, 2.820361938476562e+02, 2.832936706542969e+02, 2.831862487792969e+02, 2.82065673828125e+02, 2.828934631347656e+02, 2.834534301757812e+02, 2.824039001464844e+02, 2.823562316894531e+02, 2.823941345214844e+02, 2.830365905761719e+02, 2.833431091308594e+02]
-bui[3].ets.volMix_b.T=[2.931499938964844e+02, 2.917830200195312e+02, 2.8888134765625e+02, 2.858088989257812e+02, 2.810224304199219e+02, 2.807597351074219e+02, 2.809918212890625e+02, 2.809148559570312e+02, 2.803055725097656e+02, 2.806744079589844e+02, 2.808551330566406e+02, 2.80275634765625e+02, 2.801406860351562e+02, 2.801593627929688e+02, 2.801795043945312e+02, 2.803567504882812e+02, 2.80552490234375e+02, 2.806170349121094e+02, 2.801697998046875e+02, 2.796494445800781e+02, 2.803437194824219e+02, 2.8041943359375e+02, 2.800644226074219e+02, 2.801743469238281e+02, 2.805838928222656e+02, 2.801129760742188e+02, 2.799103088378906e+02, 2.798889770507812e+02, 2.799389953613281e+02, 2.800383911132812e+02, 2.8026416015625e+02, 2.804202270507812e+02, 2.803080749511719e+02, 2.793350524902344e+02, 2.802598571777344e+02, 2.804035034179688e+02, 2.803860473632812e+02, 2.802093200683594e+02, 2.803956909179688e+02, 2.804900207519531e+02, 2.802603149414062e+02, 2.801181945800781e+02, 2.801537475585938e+02, 2.801507263183594e+02, 2.802040405273438e+02, 2.803782958984375e+02, 2.804602966308594e+02, 2.794181518554688e+02, 2.800891723632812e+02, 2.801267395019531e+02, 2.799011840820312e+02, 2.7937109375e+02, 2.802008972167969e+02, 2.798423156738281e+02, 2.792014465332031e+02, 2.79266357421875e+02, 2.793403930664062e+02, 2.797718811035156e+02, 2.799707641601562e+02, 2.799705200195312e+02, 2.799552612304688e+02, 2.790427551269531e+02, 2.793098754882812e+02, 2.79677734375e+02, 2.795833740234375e+02, 2.785752258300781e+02, 2.796294555664062e+02, 2.795577087402344e+02, 2.785838623046875e+02, 2.787261352539062e+02, 2.787669372558594e+02, 2.793312683105469e+02, 2.795701293945312e+02, 2.79587646484375e+02, 2.795494995117188e+02, 2.790375671386719e+02, 2.784508361816406e+02, 2.794799194335938e+02, 2.794371337890625e+02, 2.783866271972656e+02, 2.79189697265625e+02, 2.794564819335938e+02, 2.78394287109375e+02, 2.783403930664062e+02, 2.783421325683594e+02, 2.788827209472656e+02, 2.792838745117188e+02, 2.7929736328125e+02, 2.792613220214844e+02, 2.791642150878906e+02, 2.780224914550781e+02, 2.792176818847656e+02, 2.791923828125e+02, 2.784470825195312e+02, 2.784527587890625e+02, 2.794123229980469e+02, 2.787868347167969e+02, 2.783014221191406e+02, 2.783982238769531e+02, 2.786430053710938e+02, 2.792347717285156e+02]
-ETot.y=[0e+00, 3.47145856e+08, 7.67082752e+08, 1.245176704e+09, 2.502477824e+09, 3.643532032e+09, 4.49998592e+09, 5.347493376000002e+09, 6.533577728e+09, 7.1614976e+09, 7.91718912e+09, 9.111007232e+09, 1.0195360768e+10, 1.1202975744e+10, 1.1593368576e+10, 1.2094879744e+10, 1.2674420736e+10, 1.331974144e+10, 1.4367903744e+10, 1.5945131008e+10, 1.703983616e+10, 1.794167808e+10, 1.9173466112e+10, 1.9886721024e+10, 2.0551766016e+10, 2.17651712e+10, 2.2882336768e+10, 2.4074993664e+10, 2.4537393152e+10, 2.5037287424e+10, 2.5610149888e+10, 2.6246746112e+10, 2.7116208128e+10, 2.8896264192e+10, 2.9999443968e+10, 3.0842540032e+10, 3.1801051136e+10, 3.250578432e+10, 3.2940023808e+10, 3.3819000832e+10, 3.4817294336e+10, 3.585772748799999e+10, 3.644854272e+10, 3.6834148352e+10, 3.7318893568e+10, 3.7905362944e+10, 3.857678336e+10, 4.0261681152e+10, 4.1610366976e+10, 4.2822684672e+10, 4.4138450944e+10, 4.566859776e+10, 4.6642458624e+10, 4.790964224e+10, 4.9551990784e+10, 5.1091324928e+10, 5.235821363200001e+10, 5.307112243199999e+10, 5.3887361024e+10, 5.4751035392e+10, 5.5638478848e+10, 5.7294536704e+10, 5.9120586752e+10, 6.057494528e+10, 6.2048710656e+10, 6.4182173696e+10, 6.5554444288e+10, 6.6930376704e+10, 6.896888217600002e+10, 7.079491174399998e+10, 7.2579473408e+10, 7.3454477312e+10, 7.4404765696e+10, 7.539023872e+10, 7.6434939904e+10, 7.7955899392e+10, 8.0242589696e+10, 8.1714962432e+10, 8.31608832e+10, 8.5293785088e+10, 8.6918316032e+10, 8.824500224000002e+10, 9.032527052799998e+10, 9.2416e+10, 9.4524194816e+10, 9.5695396864e+10, 9.6753328128e+10, 9.785065472e+10, 9.9003793408e+10, 1.00275961856e+11, 1.02798901248e+11, 1.04413446144e+11, 1.05925804032e+11, 1.07928829952e+11, 1.09842530304e+11, 1.110032384e+11, 1.12673808384e+11, 1.1473276928e+11, 1.16692475904e+11, 1.18117998592e+11, 1.1909218304e+11]
-EHeaPum.y=[0e+00, 1.28602264e+08, 3.21786336e+08, 5.69908288e+08, 1.59303616e+09, 2.50099328e+09, 3.127018496e+09, 3.744583680000001e+09, 4.699187712e+09, 5.097055232e+09, 5.6228096e+09, 6.588190208e+09, 7.453400576e+09, 8.241711616e+09, 8.411343872000001e+09, 8.682891264e+09, 9.032598528e+09, 9.448224768000002e+09, 1.0263017472e+10, 1.159989248e+10, 1.246208512e+10, 1.3133371392e+10, 1.4133305344e+10, 1.4616383488e+10, 1.5051498496e+10, 1.6032970752e+10, 1.6930484224e+10, 1.790296064e+10, 1.8140485632e+10, 1.8410385408e+10, 1.8753388544e+10, 1.9160264704e+10, 1.9799130112e+10, 2.1336152064e+10, 2.220679168e+10, 2.2819637248e+10, 2.3547621376e+10, 2.4021864448e+10, 2.4225507328e+10, 2.4873926656e+10, 2.5650311168e+10, 2.6471890944e+10, 2.6848038912e+10, 2.701512704e+10, 2.7278651392e+10, 2.7635296256e+10, 2.8077008896e+10, 2.9521096704e+10, 3.0633449472e+10, 3.161218048e+10, 3.269443584e+10, 3.3986521088e+10, 3.4729742336e+10, 3.576365056e+10, 3.7170130944e+10, 3.8482915328e+10, 3.952142336e+10, 4.000459571199999e+10, 4.0590848e+10, 4.1224290304e+10, 4.1881391104e+10, 4.3294736384e+10, 4.4872982528e+10, 4.6089273344e+10, 4.7325802496e+10, 4.920745984e+10, 5.0343518208e+10, 5.1484860416e+10, 5.327210905600002e+10, 5.485194035199998e+10, 5.6391294976e+10, 5.7035890688e+10, 5.7755398144e+10, 5.8509824e+10, 5.932283904e+10, 6.0603711488e+10, 6.2627651584e+10, 6.3861067776e+10, 6.5069510656e+10, 6.694905856e+10, 6.8329951232e+10, 6.942240768000002e+10, 7.125011660799998e+10, 7.3087582208e+10, 7.4943176704e+10, 7.5879407616e+10, 7.6705800192e+10, 7.7571096576e+10, 7.8491435008e+10, 7.952912384e+10, 8.1784659968e+10, 8.315662336e+10, 8.4431167488e+10, 8.61847552e+10, 8.7846674432e+10, 8.8776138752e+10, 9.0205609984e+10, 9.2013174784e+10, 9.3725360128e+10, 9.4911832064e+10, 9.56555264e+10]
-EPum.y=[0e+00, 2.18543584e+08, 4.45296448e+08, 6.75268416e+08, 9.094416e+08, 1.142538752e+09, 1.372967552e+09, 1.602909568e+09, 1.834390016e+09, 2.064442368e+09, 2.29437952e+09, 2.52281728e+09, 2.741959936e+09, 2.961264128e+09, 3.18202496e+09, 3.411989248e+09, 3.641822464e+09, 3.871516672e+09, 4.104886016e+09, 4.345238016e+09, 4.57775104e+09, 4.808306176e+09, 5.04016128e+09, 5.27033856e+09, 5.500268544e+09, 5.732199936e+09, 5.951852544e+09, 6.172032512e+09, 6.396907520000001e+09, 6.626901504e+09, 6.856760832e+09, 7.08648192e+09, 7.317078016e+09, 7.560112128e+09, 7.792652800000001e+09, 8.02290432e+09, 8.253431296e+09, 8.483920896e+09, 8.714515456e+09, 8.945074176e+09, 9.166984192e+09, 9.385837567999998e+09, 9.600503808e+09, 9.819020288e+09, 1.00402432e+10, 1.0270067712e+10, 1.0499772416e+10, 1.0740585472e+10, 1.0976915456e+10, 1.1210505216e+10, 1.144401408e+10, 1.168207872e+10, 1.1912717312e+10, 1.214599168e+10, 1.2381857792e+10, 1.2608411648e+10, 1.28367872e+10, 1.3066527744e+10, 1.3296512e+10, 1.352674304e+10, 1.3757088768e+10, 1.399980032e+10, 1.4247600128e+10, 1.448567296e+10, 1.472290816e+10, 1.4974715904e+10, 1.521092608e+10, 1.5445515264e+10, 1.569677312e+10, 1.5942969344e+10, 1.6188177408e+10, 1.6418582528e+10, 1.66493696e+10, 1.6880416768e+10, 1.7112101888e+10, 1.7352185856e+10, 1.7614936064e+10, 1.7853894656e+10, 1.8091374592e+10, 1.8344728576e+10, 1.85883648e+10, 1.8822596608e+10, 1.907515392e+10, 1.9328423936e+10, 1.9581018112e+10, 1.9815983104e+10, 2.0047529984e+10, 2.0279558144e+10, 2.0512360448e+10, 2.0746838016e+10, 2.101424128e+10, 2.125682688e+10, 2.1494634496e+10, 2.17440768e+10, 2.1995855872e+10, 2.22270976e+10, 2.2468200448e+10, 2.2719592448e+10, 2.296712192e+10, 2.320616448e+10, 2.3436652544e+10]
-EPumETS.y=[0e+00, 1.00640024e+08, 2.09489296e+08, 3.21557696e+08, 4.3782736e+08, 5.53020864e+08, 6.65546176e+08, 7.775846400000001e+08, 8.91161536e+08, 1.003310208e+09, 1.115343872e+09, 1.225878016e+09, 1.327117056e+09, 1.42851776e+09, 1.531375104e+09, 1.643435648e+09, 1.755365248e+09, 1.867155968e+09, 1.982621824e+09, 2.10507008e+09, 2.219679488e+09, 2.332331008e+09, 2.446282752e+09, 2.55855616e+09, 2.670582784e+09, 2.784610816e+09, 2.886359808e+09, 2.988636416e+09, 3.095607296e+09, 3.20769792e+09, 3.319653632e+09, 3.431471104e+09, 3.54416384e+09, 3.669294336e+09, 3.783931392e+09, 3.896279552e+09, 4.008902656e+09, 4.12148864e+09, 4.23417984e+09, 4.346834944e+09, 4.450841088e+09, 4.551791103999999e+09, 4.648553984e+09, 4.749167104e+09, 4.852486144e+09, 4.964407296e+09, 5.076208128e+09, 5.199117824e+09, 5.317543936e+09, 5.433230336e+09, 5.54883584e+09, 5.668996096e+09, 5.78173184e+09, 5.897102848e+09, 6.015065088e+09, 6.123716096e+09, 6.234187264000001e+09, 6.346024447999999e+09, 6.458105344e+09, 6.570432512e+09, 6.68287488e+09, 6.807683072e+09, 6.93757952e+09, 7.057747968e+09, 7.177079808e+09, 7.31098368e+09, 7.429291008e+09, 7.54597632e+09, 7.679329792000001e+09, 7.807622655999999e+09, 7.934927872e+09, 8.047428608e+09, 8.160312832e+09, 8.273456128e+09, 8.387237888e+09, 8.509418496e+09, 8.654265344e+09, 8.775319552e+09, 8.894896128e+09, 9.030346752e+09, 9.15608064e+09, 9.272407040000002e+09, 9.407062015999998e+09, 9.542427648e+09, 9.677118464e+09, 9.794180096e+09, 9.907822592e+09, 1.0021947392e+10, 1.013684736e+10, 1.025341952e+10, 1.0402920448e+10, 1.052760064e+10, 1.0647506944e+10, 1.077904384e+10, 1.0912920576e+10, 1.102625792e+10, 1.1149457408e+10, 1.1282946048e+10, 1.141257216e+10, 1.1533710336e+10, 1.1646296064e+10]
+borFie.TBorAve=[2.853500061035156e+02, 2.856446228027344e+02, 2.856423034667969e+02, 2.856139221191406e+02, 2.855429077148438e+02, 2.854171752929688e+02, 2.853715515136719e+02, 2.853467407226562e+02, 2.852872314453125e+02, 2.852747192382812e+02, 2.85284912109375e+02, 2.852352600097656e+02, 2.851984252929688e+02, 2.851658020019531e+02, 2.85208251953125e+02, 2.852390747070312e+02, 2.852457580566406e+02, 2.852388305664062e+02, 2.852147521972656e+02, 2.851044006347656e+02, 2.850663757324219e+02, 2.85065185546875e+02, 2.850543518066406e+02, 2.850569763183594e+02, 2.850994262695312e+02, 2.850797729492188e+02, 2.8505078125e+02, 2.850308532714844e+02, 2.8506201171875e+02, 2.851099548339844e+02, 2.851302185058594e+02, 2.851341552734375e+02, 2.851286315917969e+02, 2.850368347167969e+02, 2.849789123535156e+02, 2.849888610839844e+02, 2.850156860351562e+02, 2.850190124511719e+02, 2.85090087890625e+02, 2.8511083984375e+02, 2.850772399902344e+02, 2.850641784667969e+02, 2.850650939941406e+02, 2.851247253417969e+02, 2.851508483886719e+02, 2.851536254882812e+02, 2.851446838378906e+02, 2.850711975097656e+02, 2.849808959960938e+02, 2.8495458984375e+02, 2.849384155273438e+02, 2.848787231445312e+02, 2.848804626464844e+02, 2.84889404296875e+02, 2.848334045410156e+02, 2.8480029296875e+02, 2.847738342285156e+02, 2.848304748535156e+02, 2.848617858886719e+02, 2.848748168945312e+02, 2.848796997070312e+02, 2.848539428710938e+02, 2.847469482421875e+02, 2.84725830078125e+02, 2.847118835449219e+02, 2.846554870605469e+02, 2.846260986328125e+02, 2.846422729492188e+02, 2.846021728515625e+02, 2.845643920898438e+02, 2.845410766601562e+02, 2.845857238769531e+02, 2.846332092285156e+02, 2.846605834960938e+02, 2.846734619140625e+02, 2.846707153320312e+02, 2.845687561035156e+02, 2.845372619628906e+02, 2.845423583984375e+02, 2.845182189941406e+02, 2.844674072265625e+02, 2.844969787597656e+02, 2.844812927246094e+02, 2.84424560546875e+02, 2.843923950195312e+02, 2.844071960449219e+02, 2.844647521972656e+02, 2.845000305175781e+02, 2.84517578125e+02, 2.845260620117188e+02, 2.844537048339844e+02, 2.844004821777344e+02, 2.844115600585938e+02, 2.844091186523438e+02, 2.843461608886719e+02, 2.843867492675781e+02, 2.844167175292969e+02, 2.843644409179688e+02, 2.843392333984375e+02, 2.843303833007812e+02, 2.844030456542969e+02]
+bui[1].ets.volMix_a.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931175842285156e+02, 2.931175231933594e+02, 2.900768127441406e+02, 2.863383178710938e+02, 2.856841430664062e+02, 2.855731811523438e+02, 2.855335388183594e+02, 2.854922180175781e+02, 2.854546508789062e+02, 2.854494323730469e+02, 2.854494323730469e+02, 2.854494323730469e+02, 2.854479064941406e+02, 2.854479064941406e+02, 2.85436767578125e+02, 2.854246215820312e+02, 2.854160461425781e+02, 2.85412841796875e+02, 2.8535791015625e+02, 2.852987365722656e+02, 2.85276123046875e+02, 2.852666015625e+02, 2.852498168945312e+02, 2.852545471191406e+02, 2.852545471191406e+02, 2.852545471191406e+02, 2.852545166015625e+02, 2.852541198730469e+02, 2.852550354003906e+02, 2.852652587890625e+02, 2.8528173828125e+02, 2.853173217773438e+02, 2.852928466796875e+02, 2.85232421875e+02, 2.85212890625e+02, 2.852115478515625e+02, 2.852091064453125e+02, 2.852138671875e+02, 2.852142028808594e+02, 2.852142028808594e+02, 2.852142028808594e+02, 2.852142028808594e+02, 2.852151489257812e+02, 2.852157897949219e+02, 2.85230224609375e+02, 2.853016662597656e+02, 2.853162536621094e+02, 2.852432250976562e+02, 2.852023620605469e+02, 2.851825561523438e+02, 2.8514501953125e+02, 2.851165771484375e+02, 2.851150207519531e+02, 2.851150207519531e+02, 2.851142883300781e+02, 2.851139831542969e+02, 2.851049194335938e+02, 2.850925903320312e+02, 2.850901794433594e+02, 2.850963745117188e+02, 2.851112976074219e+02, 2.85048828125e+02, 2.850015258789062e+02, 2.849854431152344e+02, 2.84957763671875e+02, 2.849133605957031e+02, 2.849078369140625e+02, 2.849076538085938e+02, 2.848956604003906e+02, 2.848690185546875e+02, 2.8484716796875e+02, 2.848567504882812e+02, 2.848828735351562e+02, 2.8490869140625e+02, 2.849339904785156e+02, 2.849129333496094e+02, 2.848595275878906e+02, 2.8483349609375e+02, 2.848298034667969e+02, 2.847947692871094e+02, 2.84779296875e+02, 2.847877807617188e+02, 2.847691650390625e+02, 2.847356262207031e+02, 2.847035217285156e+02, 2.847162780761719e+02, 2.847489624023438e+02, 2.847767639160156e+02, 2.848027038574219e+02, 2.847975463867188e+02, 2.847418212890625e+02, 2.84716064453125e+02, 2.847204895019531e+02, 2.846912841796875e+02, 2.846732788085938e+02, 2.846982421875e+02, 2.847000732421875e+02, 2.846786193847656e+02, 2.846474609375e+02]
+bui[1].ets.volMix_b.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.907016296386719e+02, 2.842084045410156e+02, 2.820022277832031e+02, 2.816852722167969e+02, 2.815735473632812e+02, 2.815157775878906e+02, 2.814953002929688e+02, 2.815169677734375e+02, 2.815169677734375e+02, 2.815169677734375e+02, 2.815233459472656e+02, 2.815233459472656e+02, 2.81502197265625e+02, 2.814713745117188e+02, 2.814191589355469e+02, 2.813967895507812e+02, 2.813745727539062e+02, 2.813498229980469e+02, 2.813106994628906e+02, 2.812649230957031e+02, 2.812657165527344e+02, 2.813046264648438e+02, 2.813046264648438e+02, 2.813046264648438e+02, 2.813113403320312e+02, 2.813103332519531e+02, 2.81302978515625e+02, 2.812851257324219e+02, 2.812679748535156e+02, 2.81272705078125e+02, 2.812966613769531e+02, 2.81286376953125e+02, 2.812947998046875e+02, 2.8127685546875e+02, 2.812413330078125e+02, 2.812470397949219e+02, 2.812469787597656e+02, 2.812469787597656e+02, 2.812469787597656e+02, 2.812469787597656e+02, 2.812538757324219e+02, 2.812536010742188e+02, 2.812426147460938e+02, 2.812129211425781e+02, 2.812922058105469e+02, 2.812726440429688e+02, 2.812643127441406e+02, 2.811881408691406e+02, 2.811614074707031e+02, 2.811597595214844e+02, 2.811831665039062e+02, 2.811831665039062e+02, 2.811895446777344e+02, 2.811892700195312e+02, 2.811771240234375e+02, 2.811469116210938e+02, 2.811188354492188e+02, 2.810594787597656e+02, 2.810882873535156e+02, 2.8105810546875e+02, 2.810450134277344e+02, 2.809848022460938e+02, 2.809670715332031e+02, 2.8095458984375e+02, 2.809836120605469e+02, 2.809670715332031e+02, 2.809365844726562e+02, 2.809031372070312e+02, 2.808723449707031e+02, 2.808552551269531e+02, 2.808634643554688e+02, 2.808757019042969e+02, 2.809135437011719e+02, 2.809252624511719e+02, 2.808889770507812e+02, 2.808500061035156e+02, 2.808347473144531e+02, 2.808129577636719e+02, 2.807888793945312e+02, 2.807932739257812e+02, 2.807799377441406e+02, 2.807548522949219e+02, 2.807213134765625e+02, 2.807101745605469e+02, 2.80730224609375e+02, 2.807503051757812e+02, 2.807858276367188e+02, 2.808043518066406e+02, 2.807682189941406e+02, 2.807301940917969e+02, 2.807205505371094e+02, 2.8070654296875e+02, 2.806795959472656e+02, 2.807008056640625e+02, 2.806993408203125e+02, 2.806878967285156e+02, 2.80661865234375e+02]
+bui[2].ets.volMix_a.T=[2.931499938964844e+02, 2.889847412109375e+02, 2.867328796386719e+02, 2.860090942382812e+02, 2.858437805175781e+02, 2.857818298339844e+02, 2.855805969238281e+02, 2.854559020996094e+02, 2.854183959960938e+02, 2.853894348144531e+02, 2.853486022949219e+02, 2.854270935058594e+02, 2.854343566894531e+02, 2.854067687988281e+02, 2.853822937011719e+02, 2.8536181640625e+02, 2.853645629882812e+02, 2.853680419921875e+02, 2.853430480957031e+02, 2.852213439941406e+02, 2.85135009765625e+02, 2.851030883789062e+02, 2.85163330078125e+02, 2.851560974121094e+02, 2.851289978027344e+02, 2.852214660644531e+02, 2.852846069335938e+02, 2.852688903808594e+02, 2.8525537109375e+02, 2.852349853515625e+02, 2.852470397949219e+02, 2.852639770507812e+02, 2.852693176269531e+02, 2.851537475585938e+02, 2.850986328125e+02, 2.850679931640625e+02, 2.851447448730469e+02, 2.851795349121094e+02, 2.851773376464844e+02, 2.852065124511719e+02, 2.852762451171875e+02, 2.8528125e+02, 2.852748107910156e+02, 2.852577209472656e+02, 2.852620849609375e+02, 2.852940063476562e+02, 2.853079833984375e+02, 2.852013549804688e+02, 2.8511474609375e+02, 2.850136108398438e+02, 2.850636901855469e+02, 2.850774230957031e+02, 2.850048217773438e+02, 2.849983215332031e+02, 2.851127014160156e+02, 2.85100341796875e+02, 2.850705871582031e+02, 2.850361633300781e+02, 2.850237121582031e+02, 2.850357666015625e+02, 2.850455322265625e+02, 2.850076293945312e+02, 2.848988647460938e+02, 2.847671813964844e+02, 2.84746337890625e+02, 2.847871398925781e+02, 2.847113952636719e+02, 2.846985473632812e+02, 2.8485986328125e+02, 2.848868408203125e+02, 2.848348388671875e+02, 2.847909545898438e+02, 2.847688598632812e+02, 2.847886352539062e+02, 2.848131103515625e+02, 2.848138427734375e+02, 2.84822265625e+02, 2.847894287109375e+02, 2.847316589355469e+02, 2.847085571289062e+02, 2.847087707519531e+02, 2.846640625e+02, 2.846512145996094e+02, 2.846924438476562e+02, 2.846532287597656e+02, 2.846188354492188e+02, 2.845821228027344e+02, 2.846015930175781e+02, 2.846327209472656e+02, 2.846555480957031e+02, 2.846486206054688e+02, 2.846409301757812e+02, 2.845848388671875e+02, 2.845659790039062e+02, 2.845770874023438e+02, 2.845462036132812e+02, 2.845229187011719e+02, 2.845793762207031e+02, 2.84576416015625e+02, 2.845497436523438e+02, 2.845127563476562e+02]
+bui[2].ets.volMix_b.T=[2.931499938964844e+02, 2.895508117675781e+02, 2.855796508789062e+02, 2.832065734863281e+02, 2.818673400878906e+02, 2.818927001953125e+02, 2.8172802734375e+02, 2.814696044921875e+02, 2.814798889160156e+02, 2.814653015136719e+02, 2.813082275390625e+02, 2.814050598144531e+02, 2.814306640625e+02, 2.8149169921875e+02, 2.814247131347656e+02, 2.813758850097656e+02, 2.813607177734375e+02, 2.813627014160156e+02, 2.813306579589844e+02, 2.813306274414062e+02, 2.81199951171875e+02, 2.811224365234375e+02, 2.811679077148438e+02, 2.812246398925781e+02, 2.811418151855469e+02, 2.811807250976562e+02, 2.812692260742188e+02, 2.812969055175781e+02, 2.812957763671875e+02, 2.812493286132812e+02, 2.81237548828125e+02, 2.812512817382812e+02, 2.811909484863281e+02, 2.812354125976562e+02, 2.81156494140625e+02, 2.811113891601562e+02, 2.811091613769531e+02, 2.812423706054688e+02, 2.812151489257812e+02, 2.811739807128906e+02, 2.812590026855469e+02, 2.812679443359375e+02, 2.813392639160156e+02, 2.812811279296875e+02, 2.812555236816406e+02, 2.812710876464844e+02, 2.812746887207031e+02, 2.812435913085938e+02, 2.811758728027344e+02, 2.810592346191406e+02, 2.809886779785156e+02, 2.811556701660156e+02, 2.810507507324219e+02, 2.809458618164062e+02, 2.811039428710938e+02, 2.811002197265625e+02, 2.811554565429688e+02, 2.810536499023438e+02, 2.810236206054688e+02, 2.810297546386719e+02, 2.810413208007812e+02, 2.810170593261719e+02, 2.809774780273438e+02, 2.80818603515625e+02, 2.806770629882812e+02, 2.808184204101562e+02, 2.807541809082031e+02, 2.806247863769531e+02, 2.8083251953125e+02, 2.808891296386719e+02, 2.809178161621094e+02, 2.808128662109375e+02, 2.807733154296875e+02, 2.807781982421875e+02, 2.808031311035156e+02, 2.807603149414062e+02, 2.809049072265625e+02, 2.808084106445312e+02, 2.807493286132812e+02, 2.807196350097656e+02, 2.807460632324219e+02, 2.806766662597656e+02, 2.806495361328125e+02, 2.80686279296875e+02, 2.806557006835938e+02, 2.806414184570312e+02, 2.805894775390625e+02, 2.805908813476562e+02, 2.806215515136719e+02, 2.8057861328125e+02, 2.806734924316406e+02, 2.806541442871094e+02, 2.806000671386719e+02, 2.805532836914062e+02, 2.806668701171875e+02, 2.80563720703125e+02, 2.805066833496094e+02, 2.805729370117188e+02, 2.805760498046875e+02, 2.806046447753906e+02, 2.80523681640625e+02]
+bui[3].ets.volMix_a.T=[2.931499938964844e+02, 2.911788330078125e+02, 2.886017150878906e+02, 2.868385620117188e+02, 2.843616638183594e+02, 2.850379028320312e+02, 2.849870300292969e+02, 2.847863464355469e+02, 2.842113037109375e+02, 2.849566345214844e+02, 2.847385559082031e+02, 2.841067810058594e+02, 2.841549987792969e+02, 2.84157958984375e+02, 2.843677062988281e+02, 2.846051330566406e+02, 2.846678466796875e+02, 2.846256103515625e+02, 2.838267517089844e+02, 2.83931640625e+02, 2.843572692871094e+02, 2.844788208007812e+02, 2.83845703125e+02, 2.845614624023438e+02, 2.846969299316406e+02, 2.838545227050781e+02, 2.839341125488281e+02, 2.838659973144531e+02, 2.840191040039062e+02, 2.843034973144531e+02, 2.844679565429688e+02, 2.844930114746094e+02, 2.84140869140625e+02, 2.833764343261719e+02, 2.843392028808594e+02, 2.8448974609375e+02, 2.8417333984375e+02, 2.843243713378906e+02, 2.847666625976562e+02, 2.842794494628906e+02, 2.841538696289062e+02, 2.840907287597656e+02, 2.84125244140625e+02, 2.841658020019531e+02, 2.843998413085938e+02, 2.845218200683594e+02, 2.845052490234375e+02, 2.833144226074219e+02, 2.8424755859375e+02, 2.841292419433594e+02, 2.835789794921875e+02, 2.8359375e+02, 2.842376708984375e+02, 2.834889831542969e+02, 2.832105102539062e+02, 2.832738037109375e+02, 2.835411376953125e+02, 2.840081176757812e+02, 2.839989013671875e+02, 2.83965087890625e+02, 2.839498901367188e+02, 2.828047180175781e+02, 2.836605224609375e+02, 2.836619567871094e+02, 2.834830017089844e+02, 2.825989990234375e+02, 2.837232055664062e+02, 2.834275817871094e+02, 2.825386352539062e+02, 2.827760314941406e+02, 2.828079223632812e+02, 2.835738220214844e+02, 2.836064453125e+02, 2.835799865722656e+02, 2.835357055664062e+02, 2.8267041015625e+02, 2.827064514160156e+02, 2.834771423339844e+02, 2.834376220703125e+02, 2.822334899902344e+02, 2.835099182128906e+02, 2.834446411132812e+02, 2.822153015136719e+02, 2.82410400390625e+02, 2.823162841796875e+02, 2.832588195800781e+02, 2.833244934082031e+02, 2.832899169921875e+02, 2.832509460449219e+02, 2.831154479980469e+02, 2.820361633300781e+02, 2.832936706542969e+02, 2.831862182617188e+02, 2.82065673828125e+02, 2.828934631347656e+02, 2.834534301757812e+02, 2.824039001464844e+02, 2.823562316894531e+02, 2.823941345214844e+02, 2.830365905761719e+02, 2.833431091308594e+02]
+bui[3].ets.volMix_b.T=[2.931499938964844e+02, 2.917829895019531e+02, 2.8888134765625e+02, 2.858088989257812e+02, 2.810224304199219e+02, 2.807597351074219e+02, 2.809918212890625e+02, 2.809148559570312e+02, 2.803055114746094e+02, 2.806744079589844e+02, 2.808551330566406e+02, 2.80275634765625e+02, 2.801406860351562e+02, 2.801593627929688e+02, 2.801795043945312e+02, 2.803567504882812e+02, 2.80552490234375e+02, 2.806170349121094e+02, 2.801698303222656e+02, 2.796494445800781e+02, 2.803437194824219e+02, 2.8041943359375e+02, 2.80064453125e+02, 2.801743469238281e+02, 2.805838928222656e+02, 2.801129760742188e+02, 2.799103088378906e+02, 2.798889770507812e+02, 2.799389953613281e+02, 2.800383911132812e+02, 2.8026416015625e+02, 2.804202270507812e+02, 2.803080749511719e+02, 2.793350524902344e+02, 2.802598571777344e+02, 2.804035034179688e+02, 2.803860473632812e+02, 2.802093200683594e+02, 2.803956909179688e+02, 2.804900207519531e+02, 2.802603149414062e+02, 2.801181945800781e+02, 2.801537475585938e+02, 2.801507568359375e+02, 2.802040405273438e+02, 2.803782958984375e+02, 2.804602966308594e+02, 2.794181518554688e+02, 2.800891723632812e+02, 2.801267700195312e+02, 2.799011840820312e+02, 2.7937109375e+02, 2.802008972167969e+02, 2.798423156738281e+02, 2.792014465332031e+02, 2.79266357421875e+02, 2.793403930664062e+02, 2.797718811035156e+02, 2.799707641601562e+02, 2.799705200195312e+02, 2.799552917480469e+02, 2.790427551269531e+02, 2.793099060058594e+02, 2.79677734375e+02, 2.795833740234375e+02, 2.785752563476562e+02, 2.796294555664062e+02, 2.795577087402344e+02, 2.785838623046875e+02, 2.787261352539062e+02, 2.787669372558594e+02, 2.793312683105469e+02, 2.795701599121094e+02, 2.79587646484375e+02, 2.795494995117188e+02, 2.790375671386719e+02, 2.784508361816406e+02, 2.794799194335938e+02, 2.794371337890625e+02, 2.783866271972656e+02, 2.791897277832031e+02, 2.794564514160156e+02, 2.78394287109375e+02, 2.783403930664062e+02, 2.783421325683594e+02, 2.788827209472656e+02, 2.792838745117188e+02, 2.792973327636719e+02, 2.792613220214844e+02, 2.791642456054688e+02, 2.780224914550781e+02, 2.792177124023438e+02, 2.791923828125e+02, 2.784470825195312e+02, 2.784527587890625e+02, 2.794123229980469e+02, 2.78786865234375e+02, 2.783014221191406e+02, 2.783982238769531e+02, 2.786430053710938e+02, 2.792347717285156e+02]
+ETot.y=[0e+00, 3.47147488e+08, 7.67084224e+08, 1.245178112e+09, 2.502479104e+09, 3.643533312e+09, 4.49998592e+09, 5.347493376000002e+09, 6.533590528e+09, 7.1615104e+09, 7.917203456e+09, 9.111021568e+09, 1.0195375104e+10, 1.1202992128e+10, 1.1593383936e+10, 1.2094896128e+10, 1.2674436096e+10, 1.33197568e+10, 1.4367906816e+10, 1.594513408e+10, 1.7039837184e+10, 1.7941673984e+10, 1.9173455872e+10, 1.9886708736e+10, 2.0551753728e+10, 2.1765158912e+10, 2.2882318336e+10, 2.4074962944e+10, 2.4537362432e+10, 2.5037256704e+10, 2.5610129408e+10, 2.624672768e+10, 2.7116189696e+10, 2.8896241664e+10, 2.9999419392e+10, 3.0842517504e+10, 3.1801028608e+10, 3.2505751552e+10, 3.2939988992e+10, 3.3818966016e+10, 3.4817261568e+10, 3.585769471999999e+10, 3.6448509952e+10, 3.6834115584e+10, 3.73188608e+10, 3.7905330176e+10, 3.8576746496e+10, 4.0261648384e+10, 4.1610330112e+10, 4.2822647808e+10, 4.4138409984e+10, 4.56685568e+10, 4.6642417664e+10, 4.790960128e+10, 4.9551945728e+10, 5.1091279872e+10, 5.235816448000001e+10, 5.307107737599999e+10, 5.3887311872e+10, 5.475098624e+10, 5.56384256e+10, 5.7294483456e+10, 5.9120529408e+10, 6.0574892032e+10, 6.2048653312e+10, 6.4182116352e+10, 6.5554386944e+10, 6.693031936e+10, 6.896882483200002e+10, 7.079484620799998e+10, 7.2579407872e+10, 7.3454411776e+10, 7.4404708352e+10, 7.5390173184e+10, 7.6434849792e+10, 7.795580928e+10, 8.0242491392e+10, 8.1714864128e+10, 8.3160784896e+10, 8.5293694976e+10, 8.6918217728e+10, 8.824491212800002e+10, 9.032517222399998e+10, 9.2415909888e+10, 9.4524104704e+10, 9.569529856e+10, 9.6753229824e+10, 9.7850580992e+10, 9.9003727872e+10, 1.00275888128e+11, 1.0279882752e+11, 1.04413372416e+11, 1.05925730304e+11, 1.07928748032e+11, 1.09842448384e+11, 1.11003148288e+11, 1.1267371008e+11, 1.14732670976e+11, 1.16692385792e+11, 1.1811790848e+11, 1.19092084736e+11]
+EHeaPum.y=[0e+00, 1.28602376e+08, 3.21786304e+08, 5.69908224e+08, 1.593036032e+09, 2.500993024e+09, 3.12701696e+09, 3.744582400000001e+09, 4.699198976e+09, 5.097066496e+09, 5.6228224e+09, 6.588203008e+09, 7.453413376e+09, 8.241725952e+09, 8.411357696000001e+09, 8.682904576e+09, 9.03261184e+09, 9.448238080000002e+09, 1.026301952e+10, 1.1599894528e+10, 1.246208512e+10, 1.3133366272e+10, 1.4133293056e+10, 1.4616370176e+10, 1.5051485184e+10, 1.6032958464e+10, 1.6930463744e+10, 1.7902927872e+10, 1.8140454912e+10, 1.8410354688e+10, 1.8753368064e+10, 1.9160246272e+10, 1.979911168e+10, 2.1336129536e+10, 2.2206767104e+10, 2.2819612672e+10, 2.35475968e+10, 2.4021829632e+10, 2.4225472512e+10, 2.487389184e+10, 2.5650276352e+10, 2.6471858176e+10, 2.6848006144e+10, 2.7015094272e+10, 2.7278618624e+10, 2.763526144e+10, 2.8076972032e+10, 2.9521061888e+10, 3.0633414656e+10, 3.1612141568e+10, 3.269439488e+10, 3.398647808e+10, 3.4729701376e+10, 3.5763605504e+10, 3.7170089984e+10, 3.8482866176e+10, 3.9521378304e+10, 4.000454655999999e+10, 4.0590798848e+10, 4.1224241152e+10, 4.1881337856e+10, 4.3294683136e+10, 4.487292928e+10, 4.6089220096e+10, 4.7325745152e+10, 4.9207402496e+10, 5.0343460864e+10, 5.1484803072e+10, 5.327204761600002e+10, 5.485187891199998e+10, 5.6391233536e+10, 5.7035829248e+10, 5.7755336704e+10, 5.8509754368e+10, 5.9322748928e+10, 6.0603621376e+10, 6.2627557376e+10, 6.3860969472e+10, 6.5069412352e+10, 6.6948964352e+10, 6.8329848832e+10, 6.942231756800002e+10, 7.125001830399998e+10, 7.3087483904e+10, 7.4943086592e+10, 7.5879317504e+10, 7.6705701888e+10, 7.7571022848e+10, 7.849136128e+10, 7.9529050112e+10, 8.178458624e+10, 8.3156549632e+10, 8.4431101952e+10, 8.618467328e+10, 8.7846592512e+10, 8.8776056832e+10, 9.020551168e+10, 9.201307648e+10, 9.3725261824e+10, 9.4911741952e+10, 9.5655436288e+10]
+EPum.y=[0e+00, 2.18545104e+08, 4.45297952e+08, 6.75269888e+08, 9.09443136e+08, 1.142540288e+09, 1.372969088e+09, 1.602911104e+09, 1.83439168e+09, 2.064443904e+09, 2.294381056e+09, 2.522818816e+09, 2.741961472e+09, 2.961265664e+09, 3.182026752e+09, 3.411990784e+09, 3.641824e+09, 3.871518208e+09, 4.10488704e+09, 4.34523904e+09, 4.577752064e+09, 4.8083072e+09, 5.040162304e+09, 5.270339072e+09, 5.500269056e+09, 5.73220096e+09, 5.951853568e+09, 6.172033536e+09, 6.396908032000001e+09, 6.626902016e+09, 6.856761344e+09, 7.086482432e+09, 7.317078528e+09, 7.56011264e+09, 7.792652800000001e+09, 8.022904832e+09, 8.253431296e+09, 8.483920896e+09, 8.714515456e+09, 8.945074176e+09, 9.166984192e+09, 9.385837567999998e+09, 9.600503808e+09, 9.819021312e+09, 1.00402432e+10, 1.0270067712e+10, 1.0499772416e+10, 1.0740585472e+10, 1.0976915456e+10, 1.1210505216e+10, 1.144401408e+10, 1.168207872e+10, 1.1912717312e+10, 1.214599168e+10, 1.2381857792e+10, 1.2608411648e+10, 1.28367872e+10, 1.3066527744e+10, 1.3296512e+10, 1.352674304e+10, 1.3757088768e+10, 1.399980032e+10, 1.4247600128e+10, 1.448567296e+10, 1.472290816e+10, 1.497471488e+10, 1.5210927104e+10, 1.5445515264e+10, 1.569677312e+10, 1.5942969344e+10, 1.6188177408e+10, 1.6418582528e+10, 1.66493696e+10, 1.6880416768e+10, 1.7112100864e+10, 1.7352185856e+10, 1.7614936064e+10, 1.7853894656e+10, 1.8091374592e+10, 1.8344728576e+10, 1.85883648e+10, 1.882259456e+10, 1.907515392e+10, 1.9328423936e+10, 1.9581018112e+10, 1.9815983104e+10, 2.0047527936e+10, 2.0279558144e+10, 2.0512360448e+10, 2.0746838016e+10, 2.101424128e+10, 2.1256824832e+10, 2.1494634496e+10, 2.1744074752e+10, 2.1995855872e+10, 2.2227095552e+10, 2.24681984e+10, 2.27195904e+10, 2.2967119872e+10, 2.3206162432e+10, 2.3436650496e+10]
+EPumETS.y=[0e+00, 1.00641528e+08, 2.09490816e+08, 3.215592e+08, 4.37828864e+08, 5.530224e+08, 6.65547712e+08, 7.775861760000001e+08, 8.91163136e+08, 1.003311808e+09, 1.115345536e+09, 1.22587968e+09, 1.32711872e+09, 1.428519424e+09, 1.531376768e+09, 1.643437312e+09, 1.755366912e+09, 1.867157632e+09, 1.982622848e+09, 2.105071104e+09, 2.219680512e+09, 2.332332032e+09, 2.44628352e+09, 2.558557184e+09, 2.670583552e+09, 2.78461184e+09, 2.886360576e+09, 2.988637184e+09, 3.095608064e+09, 3.207698688e+09, 3.3196544e+09, 3.431471872e+09, 3.544164608e+09, 3.669294848e+09, 3.783931648e+09, 3.896280064e+09, 4.008902912e+09, 4.121488896e+09, 4.234180096e+09, 4.346835456e+09, 4.450841088e+09, 4.551791615999999e+09, 4.648553984e+09, 4.749167616e+09, 4.852486144e+09, 4.964407296e+09, 5.07620864e+09, 5.199117824e+09, 5.317543936e+09, 5.433230336e+09, 5.54883584e+09, 5.668996096e+09, 5.78173184e+09, 5.897102848e+09, 6.015065088e+09, 6.123715584e+09, 6.234187264000001e+09, 6.346024447999999e+09, 6.458104832e+09, 6.570432512e+09, 6.682874368e+09, 6.807683072e+09, 6.937579008e+09, 7.057747968e+09, 7.177079808e+09, 7.310983168e+09, 7.429291008e+09, 7.54597632e+09, 7.679330304000001e+09, 7.807622655999999e+09, 7.934927872e+09, 8.047428608e+09, 8.160312832e+09, 8.273456128e+09, 8.387237376e+09, 8.509417984e+09, 8.65426432e+09, 8.775319552e+09, 8.894895104e+09, 9.030346752e+09, 9.156079616e+09, 9.272406016000002e+09, 9.407062015999998e+09, 9.542426624e+09, 9.67711744e+09, 9.794179072e+09, 9.907821568e+09, 1.0021947392e+10, 1.0136846336e+10, 1.025341952e+10, 1.0402920448e+10, 1.052760064e+10, 1.0647506944e+10, 1.077904384e+10, 1.0912919552e+10, 1.1026256896e+10, 1.1149456384e+10, 1.1282945024e+10, 1.1412571136e+10, 1.1533709312e+10, 1.1646294016e+10]
 EPumPla.y=[0e+00, 1.5766179e+07, 3.1532358e+07, 4.7298536e+07, 6.3064716e+07, 7.8830896e+07, 9.4597072e+07, 1.10363248e+08, 1.26129432e+08, 1.418956e+08, 1.57661792e+08, 1.73427968e+08, 1.89194144e+08, 2.0496032e+08, 2.20726496e+08, 2.36492672e+08, 2.52258864e+08, 2.6802504e+08, 2.837912e+08, 2.99557408e+08, 3.15323584e+08, 3.3108976e+08, 3.46855936e+08, 3.62622112e+08, 3.78388288e+08, 3.94154464e+08, 4.0992064e+08, 4.25686816e+08, 4.414529920000001e+08, 4.57219168e+08, 4.72985344e+08, 4.88751552e+08, 5.04517728e+08, 5.20283904e+08, 5.360500800000001e+08, 5.51816256e+08, 5.675824e+08, 5.83348608e+08, 5.99114816e+08, 6.1488096e+08, 6.30647168e+08, 6.464133119999999e+08, 6.6217952e+08, 6.77945664e+08, 6.93711872e+08, 7.09478016e+08, 7.25244224e+08, 7.41010368e+08, 7.56776576e+08, 7.72542784e+08, 7.88308928e+08, 8.04075136e+08, 8.1984128e+08, 8.35607488e+08, 8.51373632e+08, 8.6713984e+08, 8.829059840000001e+08, 8.986721919999999e+08, 9.14438336e+08, 9.30204544e+08, 9.45970688e+08, 9.61736896e+08, 9.77503104e+08, 9.93269248e+08, 1.009035456e+09, 1.0248016e+09, 1.040567808e+09, 1.056333952e+09, 1.07210016e+09, 1.087866368e+09, 1.103632512e+09, 1.119398656e+09, 1.1351648e+09, 1.150931072e+09, 1.166697216e+09, 1.18246336e+09, 1.198229632e+09, 1.213995776e+09, 1.22976192e+09, 1.245528064e+09, 1.261294336e+09, 1.27706048e+09, 1.292826624e+09, 1.308592768e+09, 1.32435904e+09, 1.340125184e+09, 1.355891328e+09, 1.3716576e+09, 1.387423744e+09, 1.403189888e+09, 1.418956032e+09, 1.434722304e+09, 1.450488448e+09, 1.466254592e+09, 1.482020736e+09, 1.497787008e+09, 1.513553152e+09, 1.529319296e+09, 1.545085568e+09, 1.560851712e+09, 1.576617856e+09]
 EPumDis.y=[0e+00, 6.326488e+07, 1.2652976e+08, 1.8979464e+08, 2.5305952e+08, 3.16324384e+08, 3.7958928e+08, 4.428541440000001e+08, 5.0611904e+08, 5.69383936e+08, 6.32648768e+08, 6.95913664e+08, 7.5917856e+08, 8.22443456e+08, 8.857082880000001e+08, 9.48973184e+08, 1.01223808e+09, 1.075502976e+09, 1.138767872e+09, 1.20203264e+09, 1.265297536e+09, 1.328562432e+09, 1.391827328e+09, 1.455092224e+09, 1.51835712e+09, 1.581622016e+09, 1.644886912e+09, 1.70815168e+09, 1.771416576e+09, 1.834681472e+09, 1.897946368e+09, 1.961211264e+09, 2.02447616e+09, 2.087741056e+09, 2.151005952e+09, 2.21427072e+09, 2.277535744e+09, 2.340800512e+09, 2.40406528e+09, 2.467330304e+09, 2.530595072e+09, 2.593860096e+09, 2.657124864e+09, 2.720389888e+09, 2.783654656e+09, 2.84691968e+09, 2.910184448e+09, 2.973449216e+09, 3.03671424e+09, 3.099979008e+09, 3.163244032e+09, 3.2265088e+09, 3.289773824e+09, 3.353038592e+09, 3.41630336e+09, 3.479568384e+09, 3.542833152e+09, 3.606098176e+09, 3.669362944e+09, 3.732627968e+09, 3.795892736e+09, 3.859157504e+09, 3.922422528e+09, 3.985687296e+09, 4.04895232e+09, 4.112217088e+09, 4.175482112e+09, 4.23874688e+09, 4.302011904000001e+09, 4.365276671999999e+09, 4.42854144e+09, 4.491806208e+09, 4.555071488e+09, 4.618336256e+09, 4.681601024e+09, 4.744865792e+09, 4.80813056e+09, 4.87139584e+09, 4.934660608e+09, 4.997925376e+09, 5.061190144e+09, 5.124455424000001e+09, 5.187720191999999e+09, 5.25098496e+09, 5.314249728e+09, 5.377514496e+09, 5.440779776e+09, 5.504044544e+09, 5.567309312e+09, 5.63057408e+09, 5.69383936e+09, 5.757104128e+09, 5.820368896e+09, 5.883633664e+09, 5.946898432e+09, 6.010163712e+09, 6.07342848e+09, 6.136693248e+09, 6.199958016e+09, 6.263222784e+09, 6.326488064e+09]
 EPumSto.y=[0e+00, 3.8872512e+07, 7.7745024e+07, 1.16617536e+08, 1.55490048e+08, 1.9436256e+08, 2.33235072e+08, 2.721075840000001e+08, 3.10980096e+08, 3.49852608e+08, 3.8872512e+08, 4.27597632e+08, 4.66470144e+08, 5.05342656e+08, 5.442151680000001e+08, 5.8308768e+08, 6.21960192e+08, 6.608327040000001e+08, 6.99705216e+08, 7.38577728e+08, 7.7745024e+08, 8.16322752e+08, 8.55195264e+08, 8.94067776e+08, 9.32940288e+08, 9.718128e+08, 1.010685312e+09, 1.049557824e+09, 1.088430336e+09, 1.127302784e+09, 1.16617536e+09, 1.205047808e+09, 1.243920384e+09, 1.282792832e+09, 1.321665408e+09, 1.360537856e+09, 1.399410432e+09, 1.43828288e+09, 1.477155456e+09, 1.516027904e+09, 1.55490048e+09, 1.593772928e+09, 1.632645504e+09, 1.671517952e+09, 1.710390528e+09, 1.749262976e+09, 1.788135552e+09, 1.827008e+09, 1.865880576e+09, 1.904753024e+09, 1.9436256e+09, 1.982498048e+09, 2.021370624e+09, 2.060243072e+09, 2.099115648e+09, 2.137988096e+09, 2.176860672e+09, 2.215733248e+09, 2.254605568e+09, 2.293478144e+09, 2.33235072e+09, 2.371223296e+09, 2.410095616e+09, 2.448968192e+09, 2.487840768e+09, 2.526713088e+09, 2.565585664e+09, 2.60445824e+09, 2.643330816e+09, 2.682203136e+09, 2.721075712e+09, 2.759948288e+09, 2.798820864e+09, 2.837693184e+09, 2.87656576e+09, 2.915438336e+09, 2.954310912e+09, 2.993183232e+09, 3.032055808e+09, 3.070928384e+09, 3.10980096e+09, 3.14867328e+09, 3.187545856e+09, 3.226418432e+09, 3.265291008e+09, 3.304163328e+09, 3.343035904e+09, 3.38190848e+09, 3.420781056e+09, 3.459653376e+09, 3.498525952e+09, 3.537398528e+09, 3.576271104e+09, 3.615143424e+09, 3.654016e+09, 3.692888576e+09, 3.731761152e+09, 3.770633472e+09, 3.809506048e+09, 3.848378624e+09, 3.8872512e+09]
@@ -36,35 +36,35 @@ bui[3].ets.proHeaWat.heaPum.m2_flow_nominal=[2.721976661682129e+01, 2.7219766616
 bui[1].ets.proHotWat.heaPum.m2_flow_nominal=[1.182039231061935e-01, 1.182039231061935e-01]
 bui[2].ets.proHotWat.heaPum.m2_flow_nominal=[3.171242475509644e+00, 3.171242475509644e+00]
 bui[3].ets.proHotWat.heaPum.m2_flow_nominal=[1.465728640556335e+00, 1.465728640556335e+00]
-bui[1].ets.proHeaWat.heaPum.COP=[8.832118034362793e+00, 8.832118034362793e+00, 9.578669548034668e+00, 1.149408340454102e+01, 8.464118003845215e+00, 6.733849048614502e+00, 6.465660095214844e+00, 6.958513259887695e+00, 6.860299587249756e+00, 6.723076343536377e+00, 7.065055847167969e+00, 7.810423374176025e+00, 7.810423374176025e+00, 7.810423374176025e+00, 8.171112060546875e+00, 7.747063636779785e+00, 7.562938213348389e+00, 7.452758312225342e+00, 6.948009014129639e+00, 6.186785221099854e+00, 5.961783409118652e+00, 6.56658935546875e+00, 6.933595657348633e+00, 6.640655040740967e+00, 6.775224208831787e+00, 7.738275051116943e+00, 7.738275051116943e+00, 7.738275051116943e+00, 8.000337600708006e+00, 7.67849588394165e+00, 7.562907218933105e+00, 7.483052730560303e+00, 7.234586238861084e+00, 6.303709030151367e+00, 6.117691993713381e+00, 6.797225475311279e+00, 7.619205951690674e+00, 7.59052848815918e+00, 7.341903686523438e+00, 7.646537303924561e+00, 7.718747615814209e+00, 7.718747615814209e+00, 7.718747615814209e+00, 7.718747615814209e+00, 8.060064315795898e+00, 7.667906761169434e+00, 7.463686943054199e+00, 6.358322143554688e+00, 5.941397190093994e+00, 6.070896625518799e+00, 6.94050121307373e+00, 6.663463592529297e+00, 6.496829032897949e+00, 7.020649433135986e+00, 7.679779529571533e+00, 7.679779529571533e+00, 8.018821716308592e+00, 7.63221406936646e+00, 7.484617233276367e+00, 7.383017539978027e+00, 7.275481700897217e+00, 6.544101715087891e+00, 5.955185413360596e+00, 5.580656051635742e+00, 6.103002071380615e+00, 6.111221313476562e+00, 5.808063507080078e+00, 6.298904418945312e+00, 7.41623687744141e+00, 7.371795654296876e+00, 7.238071441650391e+00, 7.096462249755859e+00, 7.023647308349609e+00, 6.948507308959961e+00, 6.902331829071045e+00, 6.68340539932251e+00, 6.663026809692383e+00, 6.67689323425293e+00, 6.668135643005371e+00, 6.642698287963867e+00, 6.614918231964111e+00, 6.579551696777344e+00, 6.593111038208007e+00, 6.774030208587646e+00, 6.709828853607178e+00, 6.660850048065186e+00, 6.630977153778076e+00, 6.611183166503906e+00, 6.590970516204834e+00, 6.468142509460449e+00, 6.367702007293701e+00, 6.386754512786865e+00, 6.410825252532959e+00, 6.434871673583984e+00, 6.439208984375e+00, 6.422690868377686e+00, 6.402301788330078e+00, 6.642704486846924e+00, 6.576510429382324e+00, 6.531630039215088e+00, 6.496640205383301e+00]
-bui[1].ets.proHotWat.heaPum.COP=[1.2960498046875e+02, 3.456180810928345e+00, 3.456180572509766e+00, 3.456180334091187e+00, 2.874247550964355e+00, 2.607767820358276e+00, 2.538888454437256e+00, 2.64374566078186e+00, 2.571810722351074e+00, 2.580917596817017e+00, 2.672436237335205e+00, 2.717372894287109e+00, 2.717398881912231e+00, 2.717425107955933e+00, 2.717451333999634e+00, 2.717477560043335e+00, 2.717503547668457e+00, 2.717529773712158e+00, 2.711179971694946e+00, 2.607230186462402e+00, 2.525211095809937e+00, 2.590358257293701e+00, 2.59869122505188e+00, 2.553485631942749e+00, 2.62247109413147e+00, 2.707716226577759e+00, 2.707743167877197e+00, 2.707769155502319e+00, 2.707795143127441e+00, 2.707821369171143e+00, 2.707847356796265e+00, 2.707873344421387e+00, 2.708590984344482e+00, 2.638764142990112e+00, 2.522619485855103e+00, 2.558012247085571e+00, 2.618253469467163e+00, 2.522111654281616e+00, 2.591498613357544e+00, 2.704804420471191e+00, 2.705750226974487e+00, 2.705776214599609e+00, 2.705802202224731e+00, 2.705828189849854e+00, 2.705854177474976e+00, 2.705880165100098e+00, 2.706025123596191e+00, 2.66813588142395e+00, 2.543618679046631e+00, 2.529780149459839e+00, 2.631735324859619e+00, 2.536641120910645e+00, 2.57263445854187e+00, 2.670093536376953e+00, 2.700870752334595e+00, 2.700896739959717e+00, 2.70092248916626e+00, 2.700948476791382e+00, 2.700974225997925e+00, 2.700999975204468e+00, 2.701025724411011e+00, 2.66590404510498e+00, 2.575676679611206e+00, 2.512958288192749e+00, 2.599437713623047e+00, 2.570048093795776e+00, 2.550500631332397e+00, 2.627528429031372e+00, 2.690728187561035e+00, 2.690753936767578e+00, 2.690779447555542e+00, 2.690804958343506e+00, 2.690830230712891e+00, 2.690855503082275e+00, 2.690881013870239e+00, 2.690906524658203e+00, 2.691534757614136e+00, 2.691662311553955e+00, 2.69168758392334e+00, 2.691712856292725e+00, 2.69173789024353e+00, 2.691762924194336e+00, 2.691787481307983e+00, 2.69181227684021e+00, 2.691837072372437e+00, 2.691861629486084e+00, 2.691885948181152e+00, 2.691910266876221e+00, 2.691934585571289e+00, 2.691959142684937e+00, 2.691983938217163e+00, 2.692008972167969e+00, 2.692033529281616e+00, 2.692057847976685e+00, 2.692082166671753e+00, 2.692106485366821e+00, 2.692130565643311e+00, 2.6921546459198e+00, 2.692178726196289e+00, 2.692202806472778e+00, 2.692226886749268e+00]
-bui[2].ets.proHeaWat.heaPum.COP=[8.832118034362793e+00, 8.673344612121582e+00, 7.583049297332764e+00, 7.244997501373291e+00, 6.057694911956787e+00, 7.189290046691895e+00, 7.166745662689209e+00, 6.286579132080077e+00, 6.863254547119141e+00, 7.339444160461426e+00, 6.212939262390137e+00, 6.403409957885742e+00, 6.340539932250977e+00, 7.362026214599609e+00, 7.116178035736084e+00, 6.9731125831604e+00, 6.858783721923828e+00, 6.781675338745117e+00, 5.758934497833252e+00, 6.784115314483643e+00, 6.766770362854004e+00, 6.716529369354248e+00, 6.279787540435791e+00, 7.29054069519043e+00, 6.757626533508301e+00, 6.201102733612061e+00, 6.288732528686523e+00, 6.514286041259766e+00, 7.049261093139648e+00, 6.91746711730957e+00, 6.814195156097412e+00, 6.742717742919922e+00, 5.767636299133301e+00, 6.161611080169678e+00, 6.75306797027588e+00, 7.079164028167725e+00, 6.286551475524902e+00, 7.624083042144775e+00, 7.391311645507812e+00, 6.303359031677246e+00, 6.53947639465332e+00, 6.355924129486085e+00, 7.314258575439453e+00, 7.084325790405273e+00, 6.911806106567383e+00, 6.789093017578125e+00, 6.436480045318604e+00, 5.722317695617676e+00, 6.597826480865479e+00, 6.578579902648926e+00, 5.684180736541748e+00, 6.654390811920166e+00, 6.652524471282959e+00, 5.634208679199219e+00, 5.858718395233154e+00, 5.760365962982178e+00, 6.754826545715328e+00, 6.48621416091919e+00, 6.38988208770752e+00, 6.373463153839111e+00, 6.34946870803833e+00, 5.385532855987549e+00, 6.394960880279541e+00, 6.262407779693604e+00, 5.684648990631104e+00, 5.590036392211914e+00, 6.325102806091309e+00, 5.617728710174561e+00, 5.451234340667728e+00, 5.51559591293335e+00, 6.123020648956299e+00, 6.229332447052002e+00, 6.222259521484375e+00, 6.157179832458496e+00, 6.109789848327637e+00, 5.122889041900635e+00, 5.955754280090332e+00, 6.072970390319824e+00, 6.080562591552734e+00, 5.238978385925293e+00, 6.255973339080811e+00, 6.084283828735332e+00, 5.223905086517332e+00, 5.37993335723877e+00, 5.34652042388916e+00, 6.132142543792725e+00, 6.0709547996521e+00, 6.020712852478027e+00, 5.979767799377441e+00, 5.394742012023926e+00, 5.232340812683105e+00, 5.976589202880859e+00, 5.947353839874268e+00, 5.058567047119141e+00, 6.346871376037598e+00, 6.208418369293213e+00, 5.246096134185791e+00, 5.474371433258057e+00, 5.390777111053467e+00, 6.329629898071289e+00, 6.13770866394043e+00]
-bui[2].ets.proHotWat.heaPum.COP=[1.2960498046875e+02, 3.456160545349121e+00, 3.45610237121582e+00, 3.454193592071533e+00, 2.649298191070557e+00, 2.758260726928711e+00, 2.758283853530884e+00, 2.584692716598511e+00, 2.690731763839722e+00, 2.734387636184692e+00, 2.647071361541748e+00, 2.572214841842651e+00, 2.569281816482544e+00, 2.73244833946228e+00, 2.762246608734131e+00, 2.762267112731934e+00, 2.762287616729736e+00, 2.762308120727539e+00, 2.690022706985474e+00, 2.733964204788208e+00, 2.732781410217285e+00, 2.61574649810791e+00, 2.630719184875488e+00, 2.721907138824463e+00, 2.662500381469727e+00, 2.562320709228516e+00, 2.566035032272339e+00, 2.59447979927063e+00, 2.75499153137207e+00, 2.755012035369873e+00, 2.755032539367676e+00, 2.755053043365479e+00, 2.607191562652588e+00, 2.674058198928833e+00, 2.723819494247437e+00, 2.723842620849609e+00, 2.587421894073486e+00, 2.72274112701416e+00, 2.72276496887207e+00, 2.581628561019897e+00, 2.565672159194946e+00, 2.525053024291993e+00, 2.755558252334595e+00, 2.755578994750977e+00, 2.755599498748779e+00, 2.755620002746582e+00, 2.638955593109131e+00, 2.631630420684814e+00, 2.724059104919434e+00, 2.724081754684448e+00, 2.553943872451782e+00, 2.702165126800537e+00, 2.717300415039062e+00, 2.614076137542725e+00, 2.558617353439331e+00, 2.543966770172119e+00, 2.74509072303772e+00, 2.745110988616943e+00, 2.745131254196167e+00, 2.745151519775391e+00, 2.745171785354614e+00, 2.599832534790039e+00, 2.712048053741455e+00, 2.71207070350647e+00, 2.593092679977417e+00, 2.634116172790527e+00, 2.701776266098022e+00, 2.637803792953491e+00, 2.547760248184204e+00, 2.548940896987915e+00, 2.638469457626343e+00, 2.73281192779541e+00, 2.732831954956055e+00, 2.73285174369812e+00, 2.732872009277344e+00, 2.577309131622314e+00, 2.687716484069824e+00, 2.707938194274902e+00, 2.706576824188232e+00, 2.589927434921265e+00, 2.699539661407471e+00, 2.69690656661987e+00, 2.542282819747926e+00, 2.540665149688721e+00, 2.508508205413818e+00, 2.723194122314453e+00, 2.723213911056519e+00, 2.723233938217163e+00, 2.723253965377808e+00, 2.608450651168823e+00, 2.623758316040039e+00, 2.699581384658813e+00, 2.699604272842407e+00, 2.543952226638794e+00, 2.693643569946289e+00, 2.692903280258179e+00, 2.572353839874268e+00, 2.535870790481567e+00, 2.510150671005249e+00, 2.719022274017334e+00, 2.719042301177979e+00]
-bui[3].ets.proHeaWat.heaPum.COP=[8.832118034362793e+00, 1.037484264373779e+01, 8.641454696655273e+00, 7.733193874359131e+00, 5.790937900543213e+00, 6.030800819396973e+00, 6.327885627746582e+00, 6.55162525177002e+00, 6.51778507232666e+00, 6.722873687744141e+00, 6.548710823059082e+00, 6.704437732696533e+00, 6.644754886627197e+00, 7.298916339874268e+00, 7.073493957519531e+00, 6.954570293426514e+00, 6.822532653808594e+00, 6.708759784698486e+00, 5.601308345794678e+00, 5.458237171173096e+00, 5.869500637054443e+00, 6.400157451629639e+00, 6.573611259460449e+00, 6.715955257415771e+00, 6.545863628387451e+00, 6.552031993865967e+00, 6.665543556213379e+00, 6.714180946350098e+00, 7.041211605072021e+00, 6.953646183013916e+00, 6.834445953369141e+00, 6.723182678222656e+00, 5.821475982666016e+00, 5.361154079437256e+00, 5.845478057861332e+00, 6.559496402740479e+00, 6.965935230255127e+00, 7.180587768554688e+00, 7.042598247528076e+00, 6.835870742797852e+00, 7.100340843200684e+00, 6.789055347442628e+00, 7.622903347015381e+00, 7.118522644042969e+00, 6.958954334259033e+00, 6.8027024269104e+00, 6.438936233520508e+00, 5.304065704345703e+00, 5.477269172668457e+00, 5.58405876159668e+00, 5.6859450340271e+00, 5.689492225646973e+00, 5.817795753479004e+00, 5.645281791687012e+00, 5.969228744506836e+00, 5.898680686950684e+00, 6.548152923583983e+00, 6.43938159942627e+00, 6.318801879882812e+00, 6.277206897735596e+00, 6.229623317718506e+00, 5.091707229614258e+00, 5.186501026153564e+00, 5.205503940582275e+00, 5.314774513244629e+00, 5.218402862548828e+00, 5.406082153320312e+00, 5.394825458526611e+00, 5.56499814987183e+00, 5.669243335723878e+00, 5.98873233795166e+00, 6.136077404022217e+00, 6.127557277679443e+00, 6.045365333557129e+00, 5.984736442565918e+00, 5.054518699645996e+00, 4.976476192474365e+00, 5.116479873657227e+00, 5.258751392364502e+00, 5.148015022277832e+00, 5.358715534210205e+00, 5.352599620819091e+00, 5.254422187805173e+00, 5.490602970123291e+00, 5.433807373046875e+00, 5.993888854980469e+00, 5.948522567749023e+00, 5.888158798217773e+00, 5.845647811889648e+00, 5.356822490692139e+00, 4.898157596588135e+00, 5.182486057281494e+00, 5.216961860656738e+00, 5.065121173858643e+00, 5.510020732879639e+00, 5.631017208099365e+00, 5.336628437042236e+00, 5.564374923706055e+00, 5.492208003997803e+00, 6.105745315551758e+00, 6.005731105804443e+00]
-bui[3].ets.proHotWat.heaPum.COP=[1.2960498046875e+02, 3.45617413520813e+00, 3.456138849258423e+00, 3.453030824661255e+00, 2.489476203918457e+00, 2.513033390045166e+00, 2.510531187057495e+00, 2.505069494247437e+00, 2.480884075164795e+00, 2.510043144226074e+00, 2.503913402557373e+00, 2.479831218719482e+00, 2.481730937957764e+00, 2.671186208724976e+00, 2.699634790420532e+00, 2.699656963348389e+00, 2.699679851531982e+00, 2.699702978134155e+00, 2.560579299926758e+00, 2.470406532287598e+00, 2.485947608947754e+00, 2.491737842559814e+00, 2.467812776565552e+00, 2.494024515151978e+00, 2.501058101654053e+00, 2.470231533050537e+00, 2.473211765289307e+00, 2.53450608253479e+00, 2.688970327377319e+00, 2.68899130821228e+00, 2.689013957977295e+00, 2.689037084579468e+00, 2.500861883163452e+00, 2.450540781021118e+00, 2.485251188278198e+00, 2.491491794586182e+00, 2.480932950973511e+00, 2.484484910964966e+00, 2.503052949905396e+00, 2.486481189727783e+00, 2.481644630432129e+00, 2.479280710220337e+00, 2.696649074554443e+00, 2.696669101715088e+00, 2.696690082550049e+00, 2.696712255477905e+00, 2.585559606552124e+00, 2.449162483215332e+00, 2.482031106948853e+00, 2.477282285690308e+00, 2.458988428115845e+00, 2.456511735916138e+00, 2.48234486579895e+00, 2.456308841705322e+00, 2.445764064788818e+00, 2.448286533355713e+00, 2.665245056152344e+00, 2.665266990661621e+00, 2.665289878845215e+00, 2.665312528610229e+00, 2.665334939956665e+00, 2.430618762969971e+00, 2.459951162338257e+00, 2.459440469741821e+00, 2.454679250717163e+00, 2.420804738998413e+00, 2.462364196777344e+00, 2.453282117843628e+00, 2.420921802520752e+00, 2.429739236831665e+00, 2.547980785369873e+00, 2.645199298858643e+00, 2.645221948623657e+00, 2.645244598388672e+00, 2.645266771316528e+00, 2.42605447769165e+00, 2.42633581161499e+00, 2.455913305282593e+00, 2.454393863677979e+00, 2.409866809844971e+00, 2.456873416900635e+00, 2.454699277877808e+00, 2.409269094467163e+00, 2.416268348693848e+00, 2.42292308807373e+00, 2.63064169883728e+00, 2.630664348602295e+00, 2.63068675994873e+00, 2.630708932876587e+00, 2.505616664886475e+00, 2.402584791183472e+00, 2.449031829833984e+00, 2.444978475570679e+00, 2.404221773147583e+00, 2.433231115341187e+00, 2.455014705657959e+00, 2.416473865509033e+00, 2.414206504821777e+00, 2.415761470794678e+00, 2.631080627441406e+00, 2.631102800369263e+00]
-TDisWatSup.T=[2.931499938964844e+02, 2.853012390136719e+02, 2.856661071777344e+02, 2.857296142578125e+02, 2.857287292480469e+02, 2.856882019042969e+02, 2.855920104980469e+02, 2.85533935546875e+02, 2.855123596191406e+02, 2.854620056152344e+02, 2.8543798828125e+02, 2.8544921875e+02, 2.854208374023438e+02, 2.853896484375e+02, 2.853494262695312e+02, 2.853656311035156e+02, 2.853936462402344e+02, 2.854071044921875e+02, 2.854092407226562e+02, 2.854070434570312e+02, 2.85331787109375e+02, 2.852784423828125e+02, 2.852690734863281e+02, 2.852551574707031e+02, 2.852486877441406e+02, 2.852833557128906e+02, 2.852819519042969e+02, 2.852607421875e+02, 2.852301635742188e+02, 2.852398376464844e+02, 2.8527783203125e+02, 2.853031005859375e+02, 2.85312744140625e+02, 2.853265686035156e+02, 2.852660217285156e+02, 2.85204833984375e+02, 2.85193115234375e+02, 2.852084655761719e+02, 2.852077331542969e+02, 2.852563171386719e+02, 2.852890319824219e+02, 2.852763366699219e+02, 2.85258056640625e+02, 2.852481994628906e+02, 2.852847900390625e+02, 2.853154296875e+02, 2.853265991210938e+02, 2.853375854492188e+02, 2.85296630859375e+02, 2.852202758789062e+02, 2.85180908203125e+02, 2.851690063476562e+02, 2.851210327148438e+02, 2.851078491210938e+02, 2.851195983886719e+02, 2.850878295898438e+02, 2.850560913085938e+02, 2.850210266113281e+02, 2.8504638671875e+02, 2.850768432617188e+02, 2.850932922363281e+02, 2.851071472167969e+02, 2.851037292480469e+02, 2.850292053222656e+02, 2.849905395507812e+02, 2.849830322265625e+02, 2.849392395019531e+02, 2.849033508300781e+02, 2.849148254394531e+02, 2.848924865722656e+02, 2.848607482910156e+02, 2.848243408203125e+02, 2.848421020507812e+02, 2.848793334960938e+02, 2.849085693359375e+02, 2.849257202148438e+02, 2.849432678222656e+02, 2.848748474121094e+02, 2.8483056640625e+02, 2.848299865722656e+02, 2.84816650390625e+02, 2.847728576660156e+02, 2.847848815917969e+02, 2.847845458984375e+02, 2.847470397949219e+02, 2.847044982910156e+02, 2.846985778808594e+02, 2.847360229492188e+02, 2.847702941894531e+02, 2.847904663085938e+02, 2.8481640625e+02, 2.847713317871094e+02, 2.847176818847656e+02, 2.847127075195312e+02, 2.84718017578125e+02, 2.846690979003906e+02, 2.846795349121094e+02, 2.847124328613281e+02, 2.846895446777344e+02, 2.846604309082031e+02, 2.846385192871094e+02]
-TDisWatRet.T=[2.931499938964844e+02, 2.8571923828125e+02, 2.857627258300781e+02, 2.854278259277344e+02, 2.836870422363281e+02, 2.845422973632812e+02, 2.845000915527344e+02, 2.840389404296875e+02, 2.8404541015625e+02, 2.846918029785156e+02, 2.839190979003906e+02, 2.838742065429688e+02, 2.838446350097656e+02, 2.846858825683594e+02, 2.847670593261719e+02, 2.845969543457031e+02, 2.844581604003906e+02, 2.8435888671875e+02, 2.830097045898438e+02, 2.834228515625e+02, 2.8376416015625e+02, 2.841117858886719e+02, 2.835539855957031e+02, 2.845581970214844e+02, 2.842768249511719e+02, 2.835138854980469e+02, 2.837244873046875e+02, 2.836481628417969e+02, 2.847100524902344e+02, 2.844787902832031e+02, 2.843525390625e+02, 2.842654113769531e+02, 2.83207763671875e+02, 2.827503356933594e+02, 2.837303466796875e+02, 2.842374572753906e+02, 2.836258239746094e+02, 2.84967529296875e+02, 2.847430725097656e+02, 2.836841430664062e+02, 2.840791015625e+02, 2.837828979492188e+02, 2.850377197265625e+02, 2.847335510253906e+02, 2.845050659179688e+02, 2.8435693359375e+02, 2.8415673828125e+02, 2.825677795410156e+02, 2.834761962890625e+02, 2.834369506835938e+02, 2.826848754882812e+02, 2.83265380859375e+02, 2.836029052734375e+02, 2.825949096679688e+02, 2.828545532226562e+02, 2.827703552246094e+02, 2.840922241210938e+02, 2.837874145507812e+02, 2.836624450683594e+02, 2.83639892578125e+02, 2.836064147949219e+02, 2.819679565429688e+02, 2.829276428222656e+02, 2.828216857910156e+02, 2.825869140625e+02, 2.819371643066406e+02, 2.829526672363281e+02, 2.825418701171875e+02, 2.820386047363281e+02, 2.822449340820312e+02, 2.827215576171875e+02, 2.832600708007812e+02, 2.832613830566406e+02, 2.831896362304688e+02, 2.831307678222656e+02, 2.816163940429688e+02, 2.820139465332031e+02, 2.826033325195312e+02, 2.826537780761719e+02, 2.815314025878906e+02, 2.828186340332031e+02, 2.826962890625e+02, 2.8154248046875e+02, 2.81863037109375e+02, 2.817008972167969e+02, 2.830362243652344e+02, 2.829216918945312e+02, 2.828673400878906e+02, 2.828216552734375e+02, 2.82284423828125e+02, 2.812244873046875e+02, 2.824537353515625e+02, 2.824012145996094e+02, 2.811894836425781e+02, 2.826455993652344e+02, 2.828299255371094e+02, 2.816006469726562e+02, 2.819039611816406e+02, 2.818041381835938e+02, 2.832556762695312e+02, 2.829621887207031e+02]
-TDisWatBorLvg.T=[2.931499938964844e+02, 2.847350463867188e+02, 2.851080322265625e+02, 2.851689758300781e+02, 2.851674194335938e+02, 2.851138916015625e+02, 2.850070495605469e+02, 2.849444885253906e+02, 2.849211730957031e+02, 2.848626098632812e+02, 2.848394470214844e+02, 2.848517150878906e+02, 2.848173217773438e+02, 2.847825012207031e+02, 2.847387390136719e+02, 2.847604370117188e+02, 2.84791259765625e+02, 2.848051452636719e+02, 2.848080444335938e+02, 2.848014221191406e+02, 2.847139892578125e+02, 2.846570739746094e+02, 2.846498107910156e+02, 2.846309204101562e+02, 2.846278381347656e+02, 2.846678161621094e+02, 2.846617431640625e+02, 2.846384582519531e+02, 2.846030578613281e+02, 2.846190795898438e+02, 2.846617126464844e+02, 2.846887817382812e+02, 2.84698974609375e+02, 2.84712890625e+02, 2.846390991210938e+02, 2.845738830566406e+02, 2.845654602050781e+02, 2.845802001953125e+02, 2.845822448730469e+02, 2.846400146484375e+02, 2.846712341308594e+02, 2.846564636230469e+02, 2.846337585449219e+02, 2.846277160644531e+02, 2.84669921875e+02, 2.847030334472656e+02, 2.847142028808594e+02, 2.847269897460938e+02, 2.846732482910156e+02, 2.845899047851562e+02, 2.845481567382812e+02, 2.845341491699219e+02, 2.844793090820312e+02, 2.844683227539062e+02, 2.844796447753906e+02, 2.84442138671875e+02, 2.844058532714844e+02, 2.843699035644531e+02, 2.844009704589844e+02, 2.844343566894531e+02, 2.84451904296875e+02, 2.844691162109375e+02, 2.844580688476562e+02, 2.84374267578125e+02, 2.843333435058594e+02, 2.84325927734375e+02, 2.842724304199219e+02, 2.842362976074219e+02, 2.842503051757812e+02, 2.842217712402344e+02, 2.841869506835938e+02, 2.841469116210938e+02, 2.841708374023438e+02, 2.842126770019531e+02, 2.8424462890625e+02, 2.842640075683594e+02, 2.842801208496094e+02, 2.841990966796875e+02, 2.841534118652344e+02, 2.841558532714844e+02, 2.841348266601562e+02, 2.840889282226562e+02, 2.841059875488281e+02, 2.841004333496094e+02, 2.840581359863281e+02, 2.840089111328125e+02, 2.840085144042969e+02, 2.840515747070312e+02, 2.840891723632812e+02, 2.841109313964844e+02, 2.841395263671875e+02, 2.840817565917969e+02, 2.840259399414062e+02, 2.840236206054688e+02, 2.840253295898438e+02, 2.839711303710938e+02, 2.839883422851562e+02, 2.840216369628906e+02, 2.839938354492188e+02, 2.839595336914062e+02, 2.839402160644531e+02]
-pla.dH_flow=[-1.34378578125e+05, 2.43639625e+05, 2.26089734375e+05, 2.2312959375e+05, 2.23187875e+05, 2.2540903125e+05, 2.3023365625e+05, 2.33100140625e+05, 2.34163734375e+05, 2.3675025e+05, 2.37874390625e+05, 2.373125e+05, 2.38801421875e+05, 2.403674375e+05, 2.423659375e+05, 2.4146865625e+05, 2.4007025e+05, 2.3942034375e+05, 2.3930290625e+05, 2.395016875e+05, 2.4336515625e+05, 2.459859375e+05, 2.463823125e+05, 2.47158875e+05, 2.47390484375e+05, 2.45616859375e+05, 2.45790890625e+05, 2.46848140625e+05, 2.48416265625e+05, 2.4781e+05, 2.45894609375e+05, 2.4465078125e+05, 2.4418090625e+05, 2.4351678125e+05, 2.46702375e+05, 2.49707203125e+05, 2.50191234375e+05, 2.4947090625e+05, 2.49447109375e+05, 2.46924390625e+05, 2.45397984375e+05, 2.46050921875e+05, 2.47020625e+05, 2.47406765625e+05, 2.455359375e+05, 2.44020546875e+05, 2.43489125e+05, 2.42922703125e+05, 2.45163265625e+05, 2.48958265625e+05, 2.5088734375e+05, 2.51497671875e+05, 2.53940859375e+05, 2.54520015625e+05, 2.53965671875e+05, 2.55610703125e+05, 2.572209375e+05, 2.58915609375e+05, 2.575768125e+05, 2.5606003125e+05, 2.55252296875e+05, 2.54517796875e+05, 2.5484703125e+05, 2.58611296875e+05, 2.60502453125e+05, 2.6085534375e+05, 2.631624375e+05, 2.64877e+05, 2.6427015625e+05, 2.6547553125e+05, 2.6705609375e+05, 2.688754375e+05, 2.67887875e+05, 2.6601034375e+05, 2.6455696875e+05, 2.6369253125e+05, 2.62883125e+05, 2.6643121875e+05, 2.6857021875e+05, 2.68528e+05, 2.6933565625e+05, 2.714719375e+05, 2.70783375e+05, 2.709165e+05, 2.7281225e+05, 2.7499053125e+05, 2.7514709375e+05, 2.7323578125e+05, 2.71528875e+05, 2.705328125e+05, 2.6923421875e+05, 2.716709375e+05, 2.7427509375e+05, 2.74453125e+05, 2.7427571875e+05, 2.76730625e+05, 2.7607978125e+05, 2.745003125e+05, 2.7570384375e+05, 2.7720478125e+05, 2.78194e+05]
-borFie.Q_flow=[0e+00, 5.954119375e+05, 4.097475625e+05, 2.872329375e+05, -7.26542626953125e+03, -1.40736578125e+05, -1.3509515625e+05, -1.345112031250002e+05, -2.68637625e+05, -1.47970890625e+05, -1.352665625e+05, -2.774259375e+05, -2.8421303125e+05, -2.910916875e+05, -1.07348828125e+05, -9.0361171875e+04, -1.059366484375e+05, -1.319663906250001e+05, -2.645914375e+05, -4.605576875e+05, -3.953310625e+05, -3.210365e+05, -3.8117546875e+05, -2.46052859375e+05, -1.86255171875e+05, -3.1966234375e+05, -3.2627190625e+05, -3.6147740625e+05, -1.678477187499995e+05, -1.231907109375e+05, -1.27568296875e+05, -1.463283125e+05, -1.97582515625e+05, -4.8436665625e+05, -4.135673437499997e+05, -3.161339375e+05, -3.0214815625e+05, -2.07521703125e+05, -7.4352578125e+04, -1.78871203125e+05, -2.19193953125e+05, -2.503968437499998e+05, -1.33539984375e+05, -5.29509921875e+04, -6.076734765625e+04, -9.43529375e+04, -1.30085671875e+05, -4.0028315625e+05, -4.4381309375e+05, -4.306654375e+05, -4.46575875e+05, -5.457643125e+05, -4.1830271875e+05, -4.458946875e+05, -5.594495625e+05, -5.68727875e+05, -5.151819687499969e+05, -3.604550000000003e+05, -3.343909375e+05, -3.3332821875e+05, -3.354465e+05, -5.231734375e+05, -6.44257875e+05, -5.937683125e+05, -5.836078125e+05, -7.498778125e+05, -6.4182e+05, -5.90347375e+05, -7.388433750000002e+05, -7.317905e+05, -7.389485625e+05, -5.245278125e+05, -4.7091703125e+05, -4.46906e+05, -4.498665e+05, -5.396716875e+05, -7.874173125e+05, -6.774269375e+05, -6.38248375e+05, -7.71106375e+05, -7.245443125e+05, -6.333621249999995e+05, -7.652216249999984e+05, -8.1479375e+05, -8.387296875e+05, -6.450493125e+05, -5.6019925e+05, -5.310164375e+05, -5.274506875e+05, -5.335393125e+05, -8.18160625e+05, -7.394905e+05, -6.872761875e+05, -7.655775e+05, -8.057098125e+05, -6.22505875e+05, -6.739428125e+05, -7.7554975e+05, -7.9107275e+05, -6.7089425e+05, -5.487326875e+05]
-bui[1].ets.PHea=[0e+00, 0e+00, 0e+00, 0e+00, 7.5010986328125e+03, 1.294184375e+04, 1.45194951171875e+04, 7.584149414062497e+03, 9.1304501953125e+03, 1.04653154296875e+04, 6.14490673828125e+03, 0e+00, 0e+00, 0e+00, 1.640609741210945e+01, 1.976537628173828e+02, 1.636634521484375e+03, 2.395054931640627e+03, 6.66627783203125e+03, 1.7255623046875e+04, 2.1326802734375e+04, 1.142060546875e+04, 7.31668896484375e+03, 1.09685048828125e+04, 8.719025390625e+03, 0e+00, 0e+00, 0e+00, 4.780485916137753e+01, 2.433467254638672e+02, 1.014356994628906e+03, 1.804359497070312e+03, 3.667193603515625e+03, 1.4882865234375e+04, 1.850781054687496e+04, 8.8462392578125e+03, 1.480332641601562e+03, 2.160460205078125e+03, 3.6161640625e+03, 4.6218994140625e+02, 0e+00, 0e+00, 0e+00, 0e+00, 1.82686824798584e+01, 2.273200378417969e+02, 1.699206420898438e+03, 1.4146560546875e+04, 2.179189453125e+04, 1.8876912109375e+04, 6.7223564453125e+03, 1.065638671875e+04, 1.2109123046875e+04, 5.55805322265625e+03, 0e+00, 0e+00, 1.542880344390923e+01, 1.865105590820283e+02, 1.183362426757812e+03, 2.071812255859375e+03, 2.8955908203125e+03, 1.0817716796875e+04, 2.0460533203125e+04, 2.81750234375e+04, 1.6823080078125e+04, 1.72905703125e+04, 2.2708486328125e+04, 1.336987109375e+04, 1.347864868164042e+03, 1.621683105468727e+03, 2.684640380859375e+03, 3.8507548828125e+03, 4.44947412109375e+03, 5.198693359375e+03, 5.7335458984375e+03, 8.2457666015625e+03, 8.4723544921875e+03, 8.2391650390625e+03, 8.18820703125e+03, 8.412111328125e+03, 8.7302412109375e+03, 9.0469814453125e+03, 8.823901367187507e+03, 6.77646923828125e+03, 7.44934765625e+03, 7.9187119140625e+03, 8.16300537109375e+03, 8.43642578125e+03, 8.771484375e+03, 1.049559375e+04, 1.18084306640625e+04, 1.15198173828125e+04, 1.10234619140625e+04, 1.06302646484375e+04, 1.05912861328125e+04, 1.072479296875e+04, 1.0935845703125e+04, 7.9153544921875e+03, 8.804845703125e+03, 9.290970703125e+03, 9.634951171875e+03]
-bui[2].ets.PHea=[0e+00, 2.2176345703125e+04, 3.06460390625e+04, 3.6028203125e+04, 1.44260671875e+05, 3.479938671875e+04, 3.311055078125e+04, 1.259500156250001e+05, 5.366045703125e+04, 2.03161484375e+04, 1.174524921875e+05, 1.134113125e+05, 1.20677625e+05, 2.3725583984375e+04, 3.255658789062502e+04, 4.083721484375e+04, 4.8501140625e+04, 5.383391015625001e+04, 1.554806875e+05, 4.8459390625e+04, 5.0305140625e+04, 5.76207734375e+04, 1.046481171875e+05, 1.76458828125e+04, 5.1364671875e+04, 1.28424359375e+05, 1.222163828125e+05, 9.55256171875e+04, 3.435796875000004e+04, 4.212236328125e+04, 4.93833359375e+04, 5.470666796875e+04, 1.7553546875e+05, 1.046843046875e+05, 5.07803046874999e+04, 2.9223046875e+04, 1.13277453125e+05, 2.133385498046875e+03, 1.3830841796875e+04, 1.130926953125e+05, 9.96055390625e+04, 1.233020390624999e+05, 1.81481796875e+04, 3.214871484375e+04, 4.298287890625e+04, 5.203047265625e+04, 8.5485859375e+04, 1.690461875e+05, 6.296323828125e+04, 6.2118671875e+04, 1.8895728125e+05, 5.697163671875e+04, 5.65592734375e+04, 1.793086875e+05, 1.63895171875e+05, 1.80099921875e+05, 4.782734765625039e+04, 7.025036718749993e+04, 7.81882890625e+04, 7.97911796875e+04, 8.21461640625e+04, 2.20584546875e+05, 7.4254125e+04, 8.45308984375e+04, 1.72531921875e+05, 1.71409609375e+05, 7.8146890625e+04, 1.72434e+05, 2.155438437499995e+05, 2.073467812499999e+05, 1.06678515625e+05, 8.82294140625e+04, 8.84125625e+04, 9.53829453125e+04, 1.006649765625e+05, 2.70058625e+05, 1.13853828125e+05, 1.03912703125e+05, 1.021114453125e+05, 2.38217828125e+05, 8.421465625e+04, 1.007668593750029e+05, 2.48768046875e+05, 2.24707328125e+05, 2.3397846875e+05, 9.50671953125e+04, 9.9912640625e+04, 1.057953984375e+05, 1.1087696875e+05, 2.12022546875e+05, 2.26953015625e+05, 1.118362734375e+05, 1.13483171875e+05, 2.796364375e+05, 6.96814453125e+04, 8.5310375e+04, 2.33469640625e+05, 2.05848e+05, 2.25630078125e+05, 7.4011484375e+04, 9.16704453125e+04]
-bui[3].ets.PHea=[0e+00, 3.8344716796875e+03, 6.4584765625e+03, 9.18580078125e+03, 6.371323828125e+04, 5.82331953125e+04, 4.7082109375e+04, 3.882598437499999e+04, 3.6082703125e+04, 3.547725390625e+04, 3.87412421875e+04, 3.0305921875e+04, 3.209351953125e+04, 3.4643251953125e+03, 6.19641308593751e+03, 1.02694873046875e+04, 1.37727900390625e+04, 1.634165527343751e+04, 5.42752109375e+04, 7.679078125e+04, 5.95883203125e+04, 4.113317578125e+04, 3.2016314453125e+04, 3.308141796875e+04, 3.863441015625e+04, 3.2609693359375e+04, 2.9994171875e+04, 2.3661779296875e+04, 3.47107763671878e+03, 8.328779296875e+03, 1.2154146484375e+04, 1.50705361328125e+04, 5.961637890625e+04, 7.77428203125e+04, 6.046769921874987e+04, 3.651390625e+04, 2.479899609375e+04, 2.1084046875e+04, 2.661521875e+04, 2.8401044921875e+04, 2.119557421875e+04, 2.809379687499998e+04, 6.096221542358398e+01, 2.99696484375e+03, 8.848109375e+03, 1.327770703125e+04, 2.6383384765625e+04, 8.0921890625e+04, 7.8508171875e+04, 7.1548296875e+04, 6.206491015625e+04, 6.242223828125e+04, 6.136760546875e+04, 6.343433203125e+04, 4.69015546875e+04, 5.051318359375e+04, 1.273721289062508e+04, 1.960283789062496e+04, 2.3222943359375e+04, 2.4289091796875e+04, 2.577265625e+04, 9.09850703125e+04, 9.14539921875e+04, 9.002640625e+04, 8.13466796875e+04, 8.00798515625e+04, 7.81455546875e+04, 7.62915859375e+04, 5.934353124999985e+04, 5.668148828124996e+04, 3.0873517578125e+04, 2.623158203125e+04, 2.67395390625e+04, 2.9582123046875e+04, 3.15345e+04, 9.3047921875e+04, 9.7762515625e+04, 9.4318828125e+04, 8.43725625e+04, 8.11226171875e+04, 7.89800546875e+04, 7.884824218750003e+04, 7.372272656250023e+04, 6.25908203125e+04, 6.3835421875e+04, 2.9281654296875e+04, 3.1323560546875e+04, 3.3507546875e+04, 3.492725e+04, 6.988346875e+04, 9.77157890625e+04, 8.8245703125e+04, 8.4993953125e+04, 8.51389375e+04, 6.524704296875e+04, 6.391688671875e+04, 7.08997890625e+04, 5.803565234375e+04, 6.23618359375e+04, 2.3186765625e+04, 2.928676171875e+04]
-bui[1].ets.PPum=[1.396844291687012e+01, 1.355741500854492e+01, 1.952925903320312e+03, 1.952925903320312e+03, 1.93222607421875e+03, 1.944798950195312e+03, 1.96459375e+03, 1.933519775390625e+03, 1.933377685546875e+03, 1.93218701171875e+03, 1.935439575195312e+03, 1.355741500854492e+01, 1.355741500854492e+01, 1.355741500854492e+01, 1.952925903320312e+03, 1.952965576171875e+03, 1.948585327148438e+03, 1.94519580078125e+03, 1.935464965820312e+03, 2.003266479492188e+03, 2.08644873046875e+03, 1.940799682617188e+03, 1.935078979492188e+03, 1.93268896484375e+03, 1.9317080078125e+03, 1.355719375610352e+01, 1.355741500854492e+01, 1.355741500854492e+01, 1.952925903320312e+03, 1.953093872070312e+03, 1.952608642578125e+03, 1.94783984375e+03, 1.941164794921875e+03, 1.969833740234375e+03, 2.0216552734375e+03, 1.933138793945312e+03, 1.95237646484375e+03, 1.954497680664062e+03, 1.943780883789062e+03, 1.952905029296875e+03, 1.355741500854492e+01, 1.355741500854492e+01, 1.355741500854492e+01, 1.355741500854492e+01, 1.952925903320312e+03, 1.953079223632812e+03, 1.94861083984375e+03, 1.952197265625e+03, 2.07350634765625e+03, 2.042091430664062e+03, 1.93516259765625e+03, 1.932261352539062e+03, 1.938366943359375e+03, 1.9364072265625e+03, 1.355741500854492e+01, 1.355741500854492e+01, 1.952925903320312e+03, 1.953039794921875e+03, 1.951237548828125e+03, 1.946736328125e+03, 1.943527954101562e+03, 1.930988159179688e+03, 2.049356201171875e+03, 2.2763017578125e+03, 2.019160278320312e+03, 1.995274291992188e+03, 2.1130146484375e+03, 1.964776977539062e+03, 1.950262817382813e+03, 1.94886181640625e+03, 1.944390258789062e+03, 1.9407294921875e+03, 1.939255615234375e+03, 1.937682495117188e+03, 1.936723510742188e+03, 1.932831420898438e+03, 1.932154541015625e+03, 1.93251611328125e+03, 1.9326875e+03, 1.932317749023438e+03, 1.931880615234375e+03, 1.93164013671875e+03, 1.9317724609375e+03, 1.935313110351562e+03, 1.934562255859375e+03, 1.93348486328125e+03, 1.932880859375e+03, 1.932365234375e+03, 1.931855712890625e+03, 1.93223193359375e+03, 1.941543090820312e+03, 1.939594848632812e+03, 1.936188720703125e+03, 1.934179321289062e+03, 1.933961303710938e+03, 1.934352783203125e+03, 1.93540625e+03, 1.933057495117188e+03, 1.931855834960938e+03, 1.93159423828125e+03, 1.93171630859375e+03]
-bui[2].ets.PPum=[1.20891025390625e+04, 1.19497314453125e+04, 1.19343193359375e+04, 1.1926412109375e+04, 1.303701171875e+04, 1.1928833984375e+04, 1.193207421875e+04, 1.21058720703125e+04, 1.18966201171875e+04, 1.1964587890625e+04, 1.215110546875e+04, 1.21078369140625e+04, 1.2156404296875e+04, 1.195383203125e+04, 1.19339443359375e+04, 1.1920615234375e+04, 1.19100224609375e+04, 1.18983828125e+04, 1.3695298828125e+04, 1.19025166015625e+04, 1.19039228515625e+04, 1.1906490234375e+04, 1.21785498046875e+04, 1.197549609375e+04, 1.19136591796875e+04, 1.23081416015625e+04, 1.2169916015625e+04, 1.2028015625e+04, 1.1930974609375e+04, 1.19192900390625e+04, 1.1908279296875e+04, 1.18976455078125e+04, 1.32526083984375e+04, 1.25430302734375e+04, 1.190405078125e+04, 1.19414658203125e+04, 1.21440625e+04, 1.203340234375e+04, 1.19902275390625e+04, 1.21348701171875e+04, 1.19370498046875e+04, 1.21021025390625e+04, 1.197384375e+04, 1.193522265625e+04, 1.19181689453125e+04, 1.19021318359375e+04, 1.1933693359375e+04, 1.38545390625e+04, 1.18978681640625e+04, 1.18986162109375e+04, 1.368884375e+04, 1.19171845703125e+04, 1.1896529296875e+04, 1.3892029296875e+04, 1.3235220703125e+04, 1.35536337890625e+04, 1.19071201171875e+04, 1.19212431640625e+04, 1.19837275390625e+04, 1.2004455078125e+04, 1.2030150390625e+04, 1.551554296875e+04, 1.19698779296875e+04, 1.20497109375e+04, 1.312536328125e+04, 1.43527841796875e+04, 1.19657138671875e+04, 1.33421044921875e+04, 1.503982519531248e+04, 1.460206542968749e+04, 1.24980625e+04, 1.2091419921875e+04, 1.20951396484375e+04, 1.21821591796875e+04, 1.2268236328125e+04, 1.7081876953125e+04, 1.30116025390625e+04, 1.2331380859375e+04, 1.22865966796875e+04, 1.6369658203125e+04, 1.20430849609375e+04, 1.222584765625004e+04, 1.638378808593751e+04, 1.5240763671875e+04, 1.55790361328125e+04, 1.21495302734375e+04, 1.22422021484375e+04, 1.2336419921875e+04, 1.2442453125e+04, 1.44474599609375e+04, 1.6656029296875e+04, 1.24505908203125e+04, 1.2498142578125e+04, 1.7563095703125e+04, 1.2008716796875e+04, 1.20455263671875e+04, 1.58723466796875e+04, 1.45693974609375e+04, 1.50203681640625e+04, 1.19405986328125e+04, 1.2116984375e+04]
-bui[3].ets.PPum=[4.69525439453125e+03, 4.65846826171875e+03, 4.64981787109375e+03, 4.6436787109375e+03, 4.817484375e+03, 4.77771435546875e+03, 4.66685205078125e+03, 4.63526171875e+03, 4.6383837890625e+03, 4.63822265625e+03, 4.6349296875e+03, 4.646234375e+03, 4.6436767578125e+03, 4.66950732421875e+03, 4.65509228515625e+03, 4.64297314453125e+03, 4.6362255859375e+03, 4.6328203125e+03, 4.85522021484375e+03, 5.134271484375e+03, 4.79518798828125e+03, 4.6383896484375e+03, 4.64450341796875e+03, 4.642095703125e+03, 4.63493017578125e+03, 4.64316796875e+03, 4.647435546875e+03, 4.64201806640625e+03, 4.6673388671875e+03, 4.6482978515625e+03, 4.63921142578125e+03, 4.634525390625e+03, 4.71879541015625e+03, 5.11745849609375e+03, 4.811960449218748e+03, 4.636443359375e+03, 4.65963427734375e+03, 4.6745849609375e+03, 4.653599609375e+03, 4.64964794921875e+03, 4.67407470703125e+03, 4.65086083984375e+03, 4.67427587890625e+03, 4.67134716796875e+03, 4.64678369140625e+03, 4.6371875e+03, 4.62402294921875e+03, 5.17638232421875e+03, 5.2017392578125e+03, 5.018619140625e+03, 4.79645654296875e+03, 4.785126953125e+03, 4.794505859375e+03, 4.80721630859375e+03, 4.6531650390625e+03, 4.66587646484375e+03, 4.6392099609375e+03, 4.6289833984375e+03, 4.62644091796875e+03, 4.62732861328125e+03, 4.62967578125e+03, 5.4021201171875e+03, 5.60046044921875e+03, 5.569224609375e+03, 5.260751953125e+03, 5.13115966796875e+03, 5.15882470703125e+03, 5.08476904296875e+03, 4.740729003906248e+03, 4.6998056640625e+03, 4.6322783203125e+03, 4.629767578125e+03, 4.63144384765625e+03, 4.6422001953125e+03, 4.652818359375e+03, 5.40688134765625e+03, 5.76993701171875e+03, 5.73113232421875e+03, 5.3553505859375e+03, 5.15837158203125e+03, 5.17232373046875e+03, 5.158404296875e+03, 4.995389648437505e+03, 4.7600029296875e+03, 4.80070654296875e+03, 4.6364130859375e+03, 4.650423828125e+03, 4.66090576171875e+03, 4.6691767578125e+03, 4.932576171875e+03, 5.6887607421875e+03, 5.46320068359375e+03, 5.3430556640625e+03, 5.28034228515625e+03, 4.83307958984375e+03, 4.8101240234375e+03, 4.91002392578125e+03, 4.71471630859375e+03, 4.75474658203125e+03, 4.6264423828125e+03, 4.63896533203125e+03]
-dis.mCon_flow[1]=[-1.18205338716507e-01, -5.036022798776685e-07, 1.023991262627533e-05, 1.023991262627533e-05, 2.988361835479736e+00, 4.093934059143066e+00, 4.413510799407959e+00, 2.563982248306274e+00, 2.888565301895142e+00, 3.322678565979004e+00, 2.157329559326172e+00, -5.036022798776685e-07, -5.036022798776685e-07, -5.036022798776685e-07, 1.023991262627533e-05, 3.972901403903961e-02, 6.416666507720947e-01, 9.202889800071723e-01, 2.302205801010132e+00, 5.16532039642334e+00, 6.043914318084717e+00, 3.630963802337646e+00, 2.387111902236938e+00, 3.396604776382446e+00, 2.872256755828857e+00, -5.036022798776685e-07, -5.036022798776685e-07, -5.036022798776685e-07, 1.023991262627533e-05, 9.705641120672226e-02, 3.811686635017395e-01, 6.979089379310608e-01, 1.345420598983765e+00, 4.603627681732178e+00, 5.366299152374259e+00, 2.806398868560791e+00, 4.189965724945068e-01, 4.258401989936829e-01, 1.125490069389343e+00, 1.598952263593674e-01, -5.036022798776685e-07, -5.036022798776685e-07, -5.036022798776685e-07, -5.036022798776685e-07, 1.023991262627533e-05, 9.07929390668869e-02, 6.39775812625885e-01, 4.455560684204102e+00, 6.139574527740479e+00, 5.471746921539307e+00, 2.252216339111328e+00, 3.254930019378662e+00, 3.752924203872681e+00, 1.968060970306396e+00, -5.036022798776685e-07, -5.036022798776685e-07, 1.023991262627533e-05, 7.377520948648097e-02, 4.621317982673645e-01, 7.861884236335754e-01, 1.081613540649414e+00, 3.493597030639648e+00, 5.819138526916504e+00, 7.445480823516846e+00, 5.025622367858887e+00, 5.03708553314209e+00, 6.305335998535156e+00, 4.171695709228516e+00, 5.245086550712508e-01, 6.214795708656203e-01, 9.959555268287659e-01, 1.399546384811401e+00, 1.59870970249176e+00, 1.846132874488831e+00, 2.021628141403198e+00, 2.802670955657959e+00, 2.866713047027588e+00, 2.794430732727051e+00, 2.771901607513428e+00, 2.834901571273804e+00, 2.92693042755127e+00, 3.015371084213257e+00, 2.952177762985231e+00, 2.33258843421936e+00, 2.539465665817261e+00, 2.675575256347656e+00, 2.745741128921509e+00, 2.826951265335083e+00, 2.93114185333252e+00, 3.402835845947266e+00, 3.788334608078003e+00, 3.708263397216797e+00, 3.564235687255859e+00, 3.452406406402588e+00, 3.442114114761353e+00, 3.472786903381348e+00, 3.531693696975708e+00, 2.667678594589233e+00, 2.932226896286011e+00, 3.069077968597412e+00, 3.162460565567017e+00]
-dis.mCon_flow[2]=[-7.8319091796875e+01, 9.480204582214355e+00, 1.180054950714111e+01, 1.327154159545898e+01, 4.027408599853516e+01, 1.279378700256348e+01, 1.21936206817627e+01, 3.371057128906252e+01, 1.799855804443359e+01, 7.677480697631836e+00, 3.38096809387207e+01, 3.004926872253418e+01, 3.174548530578613e+01, 8.922389030456543e+00, 1.186494541168213e+01, 1.454367733001709e+01, 1.695632362365723e+01, 1.858356857299805e+01, 4.371492767333984e+01, 1.676061630249023e+01, 1.73859977722168e+01, 1.742959594726562e+01, 3.00199146270752e+01, 6.540924072265625e+00, 1.629056549072266e+01, 3.363739395141602e+01, 3.20341911315918e+01, 2.649080657958984e+01, 1.239268875122072e+01, 1.486624050140381e+01, 1.713941192626953e+01, 1.876104164123535e+01, 4.576159286499023e+01, 3.177817344665527e+01, 1.748943901062009e+01, 1.065260982513428e+01, 3.072194290161133e+01, 8.324373364448547e-01, 5.199683666229248e+00, 3.058333969116211e+01, 2.596197319030762e+01, 3.081425094604491e+01, 6.704583644866943e+00, 1.164725208282471e+01, 1.515049457550049e+01, 1.797558975219727e+01, 2.580221939086914e+01, 4.506935882568359e+01, 2.096166038513184e+01, 2.071940612792969e+01, 4.753825378417969e+01, 1.930695915222168e+01, 1.907487106323242e+01, 4.718307113647461e+01, 4.189139556884766e+01, 4.494796371459961e+01, 1.620000648498548e+01, 2.299658966064451e+01, 2.516684913635254e+01, 2.561351776123047e+01, 2.62476863861084e+01, 5.462213897705078e+01, 2.381746292114258e+01, 2.656232452392578e+01, 4.42356071472168e+01, 4.606020736694336e+01, 2.47966194152832e+01, 4.526685333251953e+01, 5.242707824707021e+01, 5.067382049560544e+01, 3.105509948730469e+01, 2.755817413330078e+01, 2.758886337280273e+01, 2.937449073791504e+01, 3.072959899902344e+01, 6.337781143188477e+01, 3.407034683227539e+01, 3.149538040161133e+01, 3.085244560241699e+01, 5.75504264831543e+01, 2.633418655395508e+01, 3.016826248169006e+01, 5.837813568115237e+01, 5.372016906738281e+01, 5.528882217407227e+01, 2.905000114440918e+01, 3.026066780090332e+01, 3.17161750793457e+01, 3.298987197875977e+01, 5.224868774414062e+01, 5.686174011230469e+01, 3.320711517333984e+01, 3.353568649291992e+01, 6.388385009765625e+01, 2.232817077636719e+01, 2.652293586730957e+01, 5.616614151000977e+01, 4.985065460205078e+01, 5.30426139831543e+01, 2.342832565307617e+01, 2.810767364501953e+01]
-dis.mCon_flow[3]=[-2.868548393249512e+01, 1.946540355682373e+00, 2.792302846908569e+00, 3.550717115402222e+00, 1.46801118850708e+01, 1.38666467666626e+01, 1.098187446594238e+01, 8.573135375976561e+00, 7.641493797302246e+00, 7.704768657684326e+00, 8.512859344482422e+00, 5.933656215667725e+00, 6.437961578369141e+00, 1.193220973014832e+00, 2.251573324203495e+00, 3.649502754211426e+00, 4.780387401580811e+00, 5.563035964965822e+00, 1.414176845550537e+01, 1.741551208496094e+01, 1.37966251373291e+01, 9.194585800170898e+00, 6.296023368835449e+00, 6.854972839355469e+00, 8.518647193908691e+00, 6.549278259277344e+00, 5.722358226776123e+00, 5.359281063079834e+00, 1.267894625663767e+00, 2.965312242507935e+00, 4.231125354766846e+00, 5.144038677215576e+00, 1.383915519714355e+01, 1.721611404418945e+01, 1.400097465515134e+01, 7.895363330841064e+00, 4.113949775695801e+00, 2.828656673431396e+00, 4.830458164215088e+00, 5.368008136749268e+00, 2.846831798553467e+00, 5.185062885284416e+00, 3.759225364774466e-05, 1.012184858322144e+00, 3.146641254425049e+00, 4.592703819274902e+00, 7.57378625869751e+00, 1.775325584411621e+01, 1.780011940002441e+01, 1.630439186096191e+01, 1.382774066925049e+01, 1.410373497009277e+01, 1.410162830352783e+01, 1.410199737548828e+01, 1.022430229187012e+01, 1.109957313537598e+01, 4.23134613037112e+00, 6.365682125091543e+00, 7.370000839233398e+00, 7.653960227966309e+00, 8.044249534606934e+00, 1.92695369720459e+01, 2.003776359558105e+01, 1.967360305786133e+01, 1.784604835510254e+01, 1.71651554107666e+01, 1.740813636779785e+01, 1.678956604003906e+01, 1.288436508178708e+01, 1.234287738800048e+01, 8.258892059326172e+00, 8.056004524230957e+00, 8.189732551574707e+00, 8.906729698181152e+00, 9.386293411254883e+00, 1.951650047302246e+01, 2.065434455871582e+01, 2.039601135253906e+01, 1.850747299194336e+01, 1.717416191101074e+01, 1.754272842407227e+01, 1.741470909118652e+01, 1.574035072326665e+01, 1.348624992370605e+01, 1.39716796875e+01, 8.73634147644043e+00, 9.255402565002441e+00, 9.774713516235352e+00, 1.011020660400391e+01, 1.6124267578125e+01, 2.012039947509766e+01, 1.914225959777832e+01, 1.846793174743652e+01, 1.780702209472656e+01, 1.447059631347656e+01, 1.429231357574463e+01, 1.517389678955078e+01, 1.247019100189209e+01, 1.342143821716309e+01, 7.107746601104736e+00, 8.746417045593262e+00]
+bui[1].ets.proHeaWat.heaPum.COP=[8.832118034362793e+00, 8.832118034362793e+00, 9.578713417053223e+00, 1.149456214904785e+01, 8.46410083770752e+00, 6.733848571777344e+00, 6.465639591217041e+00, 6.958513259887695e+00, 6.860299587249756e+00, 6.723076820373535e+00, 7.065055847167969e+00, 7.810474395751953e+00, 7.810474395751953e+00, 7.810474395751953e+00, 8.170899391174316e+00, 7.746957302093506e+00, 7.56294584274292e+00, 7.452758312225342e+00, 6.948009014129639e+00, 6.186785221099854e+00, 5.961783409118652e+00, 6.566589832305908e+00, 6.933596134185791e+00, 6.640655517578125e+00, 6.775224208831787e+00, 7.73827075958252e+00, 7.73827075958252e+00, 7.73827075958252e+00, 8.0002384185791e+00, 7.678496360778809e+00, 7.562955379486084e+00, 7.483049869537354e+00, 7.234586238861084e+00, 6.303708553314209e+00, 6.117691516876222e+00, 6.797225475311279e+00, 7.619200706481934e+00, 7.59052848815918e+00, 7.341904163360596e+00, 7.646541595458984e+00, 7.718744277954102e+00, 7.718744277954102e+00, 7.718744277954102e+00, 7.718744277954102e+00, 8.060087203979492e+00, 7.667921543121338e+00, 7.463691711425781e+00, 6.358320236206055e+00, 5.941397190093994e+00, 6.070896625518799e+00, 6.940510272979736e+00, 6.663460254669189e+00, 6.496829032897949e+00, 7.020646572113037e+00, 7.6796875e+00, 7.6796875e+00, 8.018796920776365e+00, 7.632318019866948e+00, 7.484487056732178e+00, 7.383015632629395e+00, 7.275480270385742e+00, 6.544083118438721e+00, 5.955185890197754e+00, 5.580656051635742e+00, 6.103002071380615e+00, 6.111227989196777e+00, 5.808063507080078e+00, 6.298904418945312e+00, 7.41623687744141e+00, 7.371795177459718e+00, 7.238071441650391e+00, 7.096462249755859e+00, 7.0236496925354e+00, 6.948507308959961e+00, 6.902336597442627e+00, 6.683406829833984e+00, 6.663028240203857e+00, 6.676894187927246e+00, 6.668136596679688e+00, 6.642699241638184e+00, 6.61491870880127e+00, 6.579551696777344e+00, 6.593111515045165e+00, 6.774030685424805e+00, 6.709828853607178e+00, 6.660850524902344e+00, 6.630977153778076e+00, 6.611194133758545e+00, 6.590970516204834e+00, 6.468142032623291e+00, 6.367701530456543e+00, 6.386754035949707e+00, 6.410823822021484e+00, 6.434871196746826e+00, 6.439208507537842e+00, 6.422690868377686e+00, 6.402301788330078e+00, 6.642692089080811e+00, 6.576510906219482e+00, 6.531630516052246e+00, 6.496640682220459e+00]
+bui[1].ets.proHotWat.heaPum.COP=[1.2960498046875e+02, 3.456180810928345e+00, 3.456180572509766e+00, 3.456180334091187e+00, 2.874248027801514e+00, 2.607767820358276e+00, 2.538888692855835e+00, 2.64374566078186e+00, 2.571810722351074e+00, 2.580917596817017e+00, 2.672436237335205e+00, 2.717373371124268e+00, 2.717399597167969e+00, 2.717425584793091e+00, 2.717451810836792e+00, 2.717478036880493e+00, 2.717504262924194e+00, 2.717530250549316e+00, 2.711178541183472e+00, 2.607230186462402e+00, 2.525211095809937e+00, 2.59035849571228e+00, 2.598690986633301e+00, 2.553485631942749e+00, 2.62247109413147e+00, 2.707722663879395e+00, 2.707749366760254e+00, 2.707775354385376e+00, 2.707801342010498e+00, 2.70782732963562e+00, 2.707853317260742e+00, 2.707879543304443e+00, 2.708590745925903e+00, 2.638763904571533e+00, 2.522619485855103e+00, 2.558012962341309e+00, 2.618253469467163e+00, 2.522111654281616e+00, 2.591498613357544e+00, 2.704804420471191e+00, 2.705750465393066e+00, 2.705776453018188e+00, 2.705802440643311e+00, 2.705828428268433e+00, 2.705854177474976e+00, 2.705880165100098e+00, 2.706025123596191e+00, 2.668132305145264e+00, 2.543618679046631e+00, 2.529780149459839e+00, 2.631734848022461e+00, 2.536641359329224e+00, 2.572634696960449e+00, 2.670093536376953e+00, 2.700869798660278e+00, 2.700895547866821e+00, 2.700921535491943e+00, 2.700947284698486e+00, 2.700973272323608e+00, 2.700999021530151e+00, 2.701024532318115e+00, 2.665905714035034e+00, 2.575676679611206e+00, 2.512958288192749e+00, 2.599437713623047e+00, 2.570048570632935e+00, 2.550499439239502e+00, 2.627528667449951e+00, 2.690727472305298e+00, 2.690753221511841e+00, 2.690778732299805e+00, 2.690804481506348e+00, 2.690829753875732e+00, 2.690855026245117e+00, 2.690880298614502e+00, 2.690906047821045e+00, 2.691535234451294e+00, 2.69166374206543e+00, 2.691689252853394e+00, 2.691714286804199e+00, 2.691739320755005e+00, 2.691764354705811e+00, 2.691789150238037e+00, 2.691813945770264e+00, 2.69183874130249e+00, 2.691863298416138e+00, 2.691887617111206e+00, 2.691911697387695e+00, 2.691936254501343e+00, 2.69196081161499e+00, 2.691985607147217e+00, 2.692010402679443e+00, 2.69203519821167e+00, 2.692059516906738e+00, 2.692083835601807e+00, 2.692107915878296e+00, 2.692131996154785e+00, 2.692156076431274e+00, 2.692180395126343e+00, 2.692204475402832e+00, 2.692228317260742e+00]
+bui[2].ets.proHeaWat.heaPum.COP=[8.832118034362793e+00, 8.673343658447266e+00, 7.583047866821289e+00, 7.244997978210449e+00, 6.057694435119629e+00, 7.189291000366211e+00, 7.166741847991943e+00, 6.286578178405761e+00, 6.863255023956299e+00, 7.339444637298584e+00, 6.212936401367188e+00, 6.403409481048584e+00, 6.340540409088135e+00, 7.362026691436768e+00, 7.116178035736084e+00, 6.9731125831604e+00, 6.858786106109619e+00, 6.781675338745117e+00, 5.758934020996094e+00, 6.784116268157959e+00, 6.766770839691162e+00, 6.716540813446045e+00, 6.279788494110107e+00, 7.290541172027588e+00, 6.757628440856934e+00, 6.201103687286377e+00, 6.288732528686523e+00, 6.514286041259766e+00, 7.049261093139648e+00, 6.917468070983887e+00, 6.814195156097412e+00, 6.742717742919922e+00, 5.76763391494751e+00, 6.161610126495361e+00, 6.753067493438722e+00, 7.079164028167725e+00, 6.286551475524902e+00, 7.624082565307617e+00, 7.391317844390869e+00, 6.303359031677246e+00, 6.539476871490479e+00, 6.355924606323243e+00, 7.314258098602295e+00, 7.084326267242432e+00, 6.911806106567383e+00, 6.789093494415283e+00, 6.43648099899292e+00, 5.722317695617676e+00, 6.597826957702637e+00, 6.578580379486084e+00, 5.684194564819336e+00, 6.654390811920166e+00, 6.652524471282959e+00, 5.634207725524902e+00, 5.858718872070312e+00, 5.760365962982178e+00, 6.754826545715328e+00, 6.48621416091919e+00, 6.38988208770752e+00, 6.373465061187744e+00, 6.34946870803833e+00, 5.385532855987549e+00, 6.394960403442383e+00, 6.262408256530762e+00, 5.684649467468262e+00, 5.590025901794434e+00, 6.325102806091309e+00, 5.617727756500244e+00, 5.451234340667728e+00, 5.515595436096192e+00, 6.123021125793457e+00, 6.22933292388916e+00, 6.222293376922607e+00, 6.157179832458496e+00, 6.109789371490479e+00, 5.122888565063477e+00, 5.955752372741699e+00, 6.072971343994141e+00, 6.080565452575684e+00, 5.238978862762451e+00, 6.255973339080811e+00, 6.084297180175762e+00, 5.22390556335449e+00, 5.379933834075928e+00, 5.346521377563477e+00, 6.132143020629883e+00, 6.0709547996521e+00, 6.020719528198242e+00, 5.979767322540283e+00, 5.394741535186768e+00, 5.232339859008789e+00, 5.976588249206543e+00, 5.947351455688477e+00, 5.058566570281982e+00, 6.346874713897705e+00, 6.208418369293213e+00, 5.246101379394531e+00, 5.474366188049316e+00, 5.390777587890625e+00, 6.329630374908447e+00, 6.13770055770874e+00]
+bui[2].ets.proHotWat.heaPum.COP=[1.2960498046875e+02, 3.456160545349121e+00, 3.45610237121582e+00, 3.454194068908691e+00, 2.649298191070557e+00, 2.758260011672974e+00, 2.758283138275146e+00, 2.584692716598511e+00, 2.690731763839722e+00, 2.734395027160645e+00, 2.647071361541748e+00, 2.572214841842651e+00, 2.569282054901123e+00, 2.732448101043701e+00, 2.762248039245605e+00, 2.762268543243408e+00, 2.762289047241211e+00, 2.762309551239014e+00, 2.690024614334106e+00, 2.733962297439575e+00, 2.73277735710144e+00, 2.615747451782227e+00, 2.630717515945435e+00, 2.72192120552063e+00, 2.662503957748413e+00, 2.562321186065674e+00, 2.566035032272339e+00, 2.594479560852051e+00, 2.755000114440918e+00, 2.755020618438721e+00, 2.755041122436523e+00, 2.755061626434326e+00, 2.607190608978271e+00, 2.674058675765991e+00, 2.723821401596069e+00, 2.723844289779663e+00, 2.587421894073486e+00, 2.722738742828369e+00, 2.722762584686279e+00, 2.581628561019897e+00, 2.565672159194946e+00, 2.525053024291993e+00, 2.755558013916016e+00, 2.755578756332397e+00, 2.7555992603302e+00, 2.755619764328003e+00, 2.63895583152771e+00, 2.631630420684814e+00, 2.724065542221069e+00, 2.724088430404663e+00, 2.553945064544678e+00, 2.702165126800537e+00, 2.717291831970215e+00, 2.614076137542725e+00, 2.55861759185791e+00, 2.543966770172119e+00, 2.74509072303772e+00, 2.745110988616943e+00, 2.745131254196167e+00, 2.745151519775391e+00, 2.745171785354614e+00, 2.599832534790039e+00, 2.712057113647461e+00, 2.712079763412476e+00, 2.593092679977417e+00, 2.634115695953369e+00, 2.701760292053223e+00, 2.63780689239502e+00, 2.547760486602783e+00, 2.548940896987915e+00, 2.638467788696289e+00, 2.732799530029297e+00, 2.732819557189941e+00, 2.732839584350586e+00, 2.73285961151123e+00, 2.577309370040894e+00, 2.687721252441406e+00, 2.707885980606079e+00, 2.706527471542358e+00, 2.589927673339844e+00, 2.699536323547363e+00, 2.696899652481076e+00, 2.542282819747926e+00, 2.540665149688721e+00, 2.508508205413818e+00, 2.723187208175659e+00, 2.723206996917725e+00, 2.72322678565979e+00, 2.723246812820435e+00, 2.608450651168823e+00, 2.623758316040039e+00, 2.699588537216187e+00, 2.699611186981201e+00, 2.543951988220215e+00, 2.69365930557251e+00, 2.692919254302979e+00, 2.572354078292847e+00, 2.535870790481567e+00, 2.510154247283936e+00, 2.71902871131897e+00, 2.719048738479614e+00]
+bui[3].ets.proHeaWat.heaPum.COP=[8.832118034362793e+00, 1.037483787536621e+01, 8.641451835632324e+00, 7.733193874359131e+00, 5.790937900543213e+00, 6.030801773071289e+00, 6.327880859375e+00, 6.55162525177002e+00, 6.517777442932129e+00, 6.722872734069824e+00, 6.548709869384766e+00, 6.704437732696533e+00, 6.644754886627197e+00, 7.298915863037109e+00, 7.07349967956543e+00, 6.954569816589355e+00, 6.822532176971436e+00, 6.708759307861328e+00, 5.601310729980469e+00, 5.458239078521729e+00, 5.869503498077393e+00, 6.400157928466797e+00, 6.5736083984375e+00, 6.715955257415771e+00, 6.545863151550293e+00, 6.552034854888916e+00, 6.665548324584961e+00, 6.714183807373047e+00, 7.041207313537598e+00, 6.953648090362549e+00, 6.834443092346191e+00, 6.723183631896973e+00, 5.82147741317749e+00, 5.361154556274414e+00, 5.845478057861332e+00, 6.559496879577637e+00, 6.965934753417969e+00, 7.180591583251953e+00, 7.042600154876709e+00, 6.835870265960693e+00, 7.100340843200684e+00, 6.789055824279786e+00, 7.622922420501709e+00, 7.118515491485596e+00, 6.958953857421875e+00, 6.802702903747559e+00, 6.438936710357666e+00, 5.304065704345703e+00, 5.477270603179932e+00, 5.584059238433838e+00, 5.685944557189941e+00, 5.689493656158447e+00, 5.817796230316162e+00, 5.645281791687012e+00, 5.969228744506836e+00, 5.898680210113525e+00, 6.548153400421142e+00, 6.439382553100587e+00, 6.318802356719971e+00, 6.27720832824707e+00, 6.229624271392822e+00, 5.091707229614258e+00, 5.186501979827881e+00, 5.205503463745117e+00, 5.314774513244629e+00, 5.218406200408936e+00, 5.406083583831787e+00, 5.394824981689453e+00, 5.56499814987183e+00, 5.669243812561036e+00, 5.988733768463135e+00, 6.136078357696533e+00, 6.127579212188721e+00, 6.04536771774292e+00, 5.984733581542969e+00, 5.054518699645996e+00, 4.976476669311523e+00, 5.116480827331543e+00, 5.258752822875977e+00, 5.148014545440674e+00, 5.35871696472168e+00, 5.352597713470458e+00, 5.254421234130857e+00, 5.490602493286133e+00, 5.433808326721191e+00, 5.993890285491943e+00, 5.948522567749023e+00, 5.888163566589355e+00, 5.845647811889648e+00, 5.356822967529297e+00, 4.898156642913818e+00, 5.182486057281494e+00, 5.216959476470947e+00, 5.065120697021484e+00, 5.51002025604248e+00, 5.631017684936523e+00, 5.336630821228027e+00, 5.564367294311523e+00, 5.492208480834961e+00, 6.105746269226074e+00, 6.00572395324707e+00]
+bui[3].ets.proHotWat.heaPum.COP=[1.2960498046875e+02, 3.45617413520813e+00, 3.456138849258423e+00, 3.453031539916992e+00, 2.489476203918457e+00, 2.513033628463745e+00, 2.510531425476074e+00, 2.505069494247437e+00, 2.480882883071899e+00, 2.510043144226074e+00, 2.503913164138794e+00, 2.479831218719482e+00, 2.481730937957764e+00, 2.671185970306396e+00, 2.699632883071899e+00, 2.699654817581177e+00, 2.69967794418335e+00, 2.699700832366943e+00, 2.560580015182495e+00, 2.470407009124756e+00, 2.485948085784912e+00, 2.491737842559814e+00, 2.467812538146973e+00, 2.494024515151978e+00, 2.501058101654053e+00, 2.470231533050537e+00, 2.473212242126465e+00, 2.53450608253479e+00, 2.688977241516113e+00, 2.688998222351074e+00, 2.689020872116089e+00, 2.689043998718262e+00, 2.500861406326294e+00, 2.450540781021118e+00, 2.485251188278198e+00, 2.491492033004761e+00, 2.480932950973511e+00, 2.484485387802124e+00, 2.503053188323975e+00, 2.486481189727783e+00, 2.481644630432129e+00, 2.479280710220337e+00, 2.696654319763184e+00, 2.696674346923828e+00, 2.696695327758789e+00, 2.696717500686646e+00, 2.585555076599121e+00, 2.449162483215332e+00, 2.482031345367432e+00, 2.477282285690308e+00, 2.458988666534424e+00, 2.456511974334717e+00, 2.48234486579895e+00, 2.456308841705322e+00, 2.445764064788818e+00, 2.448286533355713e+00, 2.665245056152344e+00, 2.665266990661621e+00, 2.665289878845215e+00, 2.665312528610229e+00, 2.665335178375244e+00, 2.430618762969971e+00, 2.459951400756836e+00, 2.459440469741821e+00, 2.454679250717163e+00, 2.42080545425415e+00, 2.462364435195923e+00, 2.453282117843628e+00, 2.420922040939331e+00, 2.429739236831665e+00, 2.547980785369873e+00, 2.645184278488159e+00, 2.645206928253174e+00, 2.645229578018188e+00, 2.645251750946045e+00, 2.426053762435913e+00, 2.426336050033569e+00, 2.455913543701172e+00, 2.454394102096558e+00, 2.409866571426392e+00, 2.456873655319214e+00, 2.454698801040649e+00, 2.409269094467163e+00, 2.416268348693848e+00, 2.422922849655151e+00, 2.630635976791382e+00, 2.630658626556396e+00, 2.630681037902832e+00, 2.630703210830688e+00, 2.505617141723633e+00, 2.402584552764893e+00, 2.449031829833984e+00, 2.444978475570679e+00, 2.404221534729004e+00, 2.433230876922607e+00, 2.455014944076538e+00, 2.416474103927612e+00, 2.414206504821777e+00, 2.415761709213257e+00, 2.631088256835938e+00, 2.631110429763794e+00]
+TDisWatSup.T=[2.931499938964844e+02, 2.853012390136719e+02, 2.856661071777344e+02, 2.857296142578125e+02, 2.857287292480469e+02, 2.856882019042969e+02, 2.855920104980469e+02, 2.85533935546875e+02, 2.855123596191406e+02, 2.854620056152344e+02, 2.8543798828125e+02, 2.8544921875e+02, 2.854208374023438e+02, 2.853896484375e+02, 2.853494262695312e+02, 2.853656311035156e+02, 2.853936462402344e+02, 2.854071044921875e+02, 2.854092407226562e+02, 2.854070434570312e+02, 2.85331787109375e+02, 2.852784423828125e+02, 2.852690734863281e+02, 2.852551574707031e+02, 2.852486877441406e+02, 2.852833557128906e+02, 2.852819519042969e+02, 2.852607421875e+02, 2.852301635742188e+02, 2.852398376464844e+02, 2.8527783203125e+02, 2.853031005859375e+02, 2.85312744140625e+02, 2.853265686035156e+02, 2.852660217285156e+02, 2.85204833984375e+02, 2.85193115234375e+02, 2.852084655761719e+02, 2.852077331542969e+02, 2.852563171386719e+02, 2.852890319824219e+02, 2.852763366699219e+02, 2.85258056640625e+02, 2.852481994628906e+02, 2.852847900390625e+02, 2.853154296875e+02, 2.853265991210938e+02, 2.853375854492188e+02, 2.85296630859375e+02, 2.852202758789062e+02, 2.85180908203125e+02, 2.851690063476562e+02, 2.851210327148438e+02, 2.851078491210938e+02, 2.851195983886719e+02, 2.850878295898438e+02, 2.850560913085938e+02, 2.850210571289062e+02, 2.8504638671875e+02, 2.850768432617188e+02, 2.850932922363281e+02, 2.851071472167969e+02, 2.851037292480469e+02, 2.850292053222656e+02, 2.849905395507812e+02, 2.849830322265625e+02, 2.849392395019531e+02, 2.849033508300781e+02, 2.849148254394531e+02, 2.848924865722656e+02, 2.848607482910156e+02, 2.848243408203125e+02, 2.848421325683594e+02, 2.848793334960938e+02, 2.849085693359375e+02, 2.849257202148438e+02, 2.849432678222656e+02, 2.848748474121094e+02, 2.8483056640625e+02, 2.848299865722656e+02, 2.84816650390625e+02, 2.847728576660156e+02, 2.847848815917969e+02, 2.847845458984375e+02, 2.847470397949219e+02, 2.847044982910156e+02, 2.846985778808594e+02, 2.847360229492188e+02, 2.847702941894531e+02, 2.847904663085938e+02, 2.8481640625e+02, 2.847713317871094e+02, 2.847176818847656e+02, 2.847127075195312e+02, 2.84718017578125e+02, 2.846690979003906e+02, 2.846795349121094e+02, 2.847124328613281e+02, 2.846895446777344e+02, 2.846604309082031e+02, 2.846385192871094e+02]
+TDisWatRet.T=[2.931499938964844e+02, 2.8571923828125e+02, 2.857627258300781e+02, 2.854278259277344e+02, 2.836870422363281e+02, 2.845422973632812e+02, 2.845001220703125e+02, 2.840389404296875e+02, 2.840454406738281e+02, 2.846918029785156e+02, 2.839190979003906e+02, 2.838742065429688e+02, 2.838446350097656e+02, 2.846858825683594e+02, 2.847670593261719e+02, 2.845969543457031e+02, 2.844581604003906e+02, 2.8435888671875e+02, 2.830097045898438e+02, 2.834228820800781e+02, 2.8376416015625e+02, 2.841117858886719e+02, 2.835539855957031e+02, 2.845581970214844e+02, 2.842768249511719e+02, 2.835138854980469e+02, 2.837244873046875e+02, 2.836481628417969e+02, 2.847100524902344e+02, 2.844787902832031e+02, 2.843525390625e+02, 2.842654113769531e+02, 2.83207763671875e+02, 2.827503356933594e+02, 2.837303466796875e+02, 2.842374572753906e+02, 2.836258239746094e+02, 2.84967529296875e+02, 2.847430725097656e+02, 2.836841125488281e+02, 2.840791015625e+02, 2.837828979492188e+02, 2.850377197265625e+02, 2.847335510253906e+02, 2.845050659179688e+02, 2.8435693359375e+02, 2.8415673828125e+02, 2.825677795410156e+02, 2.834762268066406e+02, 2.834369506835938e+02, 2.826848754882812e+02, 2.83265380859375e+02, 2.836029357910156e+02, 2.825949096679688e+02, 2.828545532226562e+02, 2.827703552246094e+02, 2.840922241210938e+02, 2.837874145507812e+02, 2.836624450683594e+02, 2.83639892578125e+02, 2.836064147949219e+02, 2.819679565429688e+02, 2.829276428222656e+02, 2.828216857910156e+02, 2.825869140625e+02, 2.819371948242188e+02, 2.829526672363281e+02, 2.825418701171875e+02, 2.820386047363281e+02, 2.822449340820312e+02, 2.827215576171875e+02, 2.832600708007812e+02, 2.832614135742188e+02, 2.831896362304688e+02, 2.831307678222656e+02, 2.816163940429688e+02, 2.820139465332031e+02, 2.826033325195312e+02, 2.826537780761719e+02, 2.815313720703125e+02, 2.828186340332031e+02, 2.826962585449219e+02, 2.8154248046875e+02, 2.81863037109375e+02, 2.817008972167969e+02, 2.830362243652344e+02, 2.829216918945312e+02, 2.828673095703125e+02, 2.828216552734375e+02, 2.82284423828125e+02, 2.812244873046875e+02, 2.824537353515625e+02, 2.824011840820312e+02, 2.811894836425781e+02, 2.826455993652344e+02, 2.828299255371094e+02, 2.816006774902344e+02, 2.819039611816406e+02, 2.818041381835938e+02, 2.832556762695312e+02, 2.829621887207031e+02]
+TDisWatBorLvg.T=[2.931499938964844e+02, 2.847350463867188e+02, 2.851080322265625e+02, 2.851689758300781e+02, 2.851674194335938e+02, 2.851138916015625e+02, 2.850070495605469e+02, 2.849444885253906e+02, 2.849211730957031e+02, 2.848626098632812e+02, 2.848394470214844e+02, 2.848517150878906e+02, 2.848173217773438e+02, 2.847825012207031e+02, 2.847387390136719e+02, 2.847604370117188e+02, 2.84791259765625e+02, 2.848051452636719e+02, 2.848080444335938e+02, 2.848014221191406e+02, 2.847139892578125e+02, 2.846570739746094e+02, 2.846498107910156e+02, 2.846309204101562e+02, 2.846278381347656e+02, 2.846678161621094e+02, 2.846617431640625e+02, 2.846384582519531e+02, 2.846030578613281e+02, 2.846190795898438e+02, 2.846617126464844e+02, 2.846887817382812e+02, 2.84698974609375e+02, 2.84712890625e+02, 2.846390991210938e+02, 2.845738830566406e+02, 2.845654602050781e+02, 2.845802001953125e+02, 2.845822448730469e+02, 2.846400146484375e+02, 2.846712341308594e+02, 2.84656494140625e+02, 2.846337585449219e+02, 2.846277160644531e+02, 2.84669921875e+02, 2.847030334472656e+02, 2.847142028808594e+02, 2.847269897460938e+02, 2.846732482910156e+02, 2.845899047851562e+02, 2.845481567382812e+02, 2.845341491699219e+02, 2.844793090820312e+02, 2.844683227539062e+02, 2.844796447753906e+02, 2.84442138671875e+02, 2.844058532714844e+02, 2.843699035644531e+02, 2.844009704589844e+02, 2.844343566894531e+02, 2.84451904296875e+02, 2.844691162109375e+02, 2.844580688476562e+02, 2.84374267578125e+02, 2.843333435058594e+02, 2.84325927734375e+02, 2.842724304199219e+02, 2.842362976074219e+02, 2.842503051757812e+02, 2.842217712402344e+02, 2.841869506835938e+02, 2.841469116210938e+02, 2.841708374023438e+02, 2.842126770019531e+02, 2.8424462890625e+02, 2.842640075683594e+02, 2.842801208496094e+02, 2.841990966796875e+02, 2.841534118652344e+02, 2.841558837890625e+02, 2.841348266601562e+02, 2.840889282226562e+02, 2.841059875488281e+02, 2.841004333496094e+02, 2.840581359863281e+02, 2.840089111328125e+02, 2.840085144042969e+02, 2.840515747070312e+02, 2.840891723632812e+02, 2.841109008789062e+02, 2.841395263671875e+02, 2.840817565917969e+02, 2.840259399414062e+02, 2.840236206054688e+02, 2.840253295898438e+02, 2.839711303710938e+02, 2.839883422851562e+02, 2.840216369628906e+02, 2.839938354492188e+02, 2.839595336914062e+02, 2.839402160644531e+02]
+pla.dH_flow=[-1.34378578125e+05, 2.43639625e+05, 2.26089703125e+05, 2.23129578125e+05, 2.23187875e+05, 2.2540903125e+05, 2.30233640625e+05, 2.33100125e+05, 2.34163640625e+05, 2.36750234375e+05, 2.378744375e+05, 2.37312546875e+05, 2.3880146875e+05, 2.4036746875e+05, 2.4236596875e+05, 2.41468671875e+05, 2.4007025e+05, 2.3942034375e+05, 2.393029375e+05, 2.39501671875e+05, 2.43365125e+05, 2.459859375e+05, 2.46382328125e+05, 2.47158828125e+05, 2.47390421875e+05, 2.45616796875e+05, 2.45790875e+05, 2.46848109375e+05, 2.4841615625e+05, 2.47809890625e+05, 2.4589459375e+05, 2.44650859375e+05, 2.44180953125e+05, 2.43516796875e+05, 2.46702375e+05, 2.497071875e+05, 2.50191203125e+05, 2.4947090625e+05, 2.494470625e+05, 2.46924328125e+05, 2.45397921875e+05, 2.46050875e+05, 2.4702059375e+05, 2.47406734375e+05, 2.45535921875e+05, 2.44020515625e+05, 2.4348903125e+05, 2.42922640625e+05, 2.45163234375e+05, 2.48958234375e+05, 2.50887296875e+05, 2.51497625e+05, 2.53940828125e+05, 2.5451996875e+05, 2.53965625e+05, 2.556106875e+05, 2.5722090625e+05, 2.58915578125e+05, 2.57576796875e+05, 2.56060015625e+05, 2.55252265625e+05, 2.5451775e+05, 2.54846984375e+05, 2.5861125e+05, 2.60502390625e+05, 2.60855359375e+05, 2.6316246875e+05, 2.648769375e+05, 2.6427009375e+05, 2.6547546875e+05, 2.6705603125e+05, 2.68875375e+05, 2.6788784375e+05, 2.6601034375e+05, 2.6455659375e+05, 2.6369228125e+05, 2.6288296875e+05, 2.66431125e+05, 2.6857e+05, 2.68527875e+05, 2.693355625e+05, 2.71471875e+05, 2.7078328125e+05, 2.709164375e+05, 2.7281221875e+05, 2.749905e+05, 2.751470625e+05, 2.7323584375e+05, 2.7152896875e+05, 2.7053290625e+05, 2.692343125e+05, 2.7167096875e+05, 2.742753125e+05, 2.7445315625e+05, 2.7427571875e+05, 2.76730625e+05, 2.7607978125e+05, 2.7450028125e+05, 2.7570375e+05, 2.7720471875e+05, 2.7819396875e+05]
+borFie.Q_flow=[0e+00, 5.954121875e+05, 4.0974734375e+05, 2.872329375e+05, -7.265423828125e+03, -1.407355e+05, -1.3509421875e+05, -1.345108593750002e+05, -2.6864878125e+05, -1.47972828125e+05, -1.35268515625e+05, -2.7742653125e+05, -2.8421190625e+05, -2.91091375e+05, -1.07347375e+05, -9.0361140625e+04, -1.05936875e+05, -1.319667031250001e+05, -2.6459015625e+05, -4.60555875e+05, -3.953293125e+05, -3.2103421875e+05, -3.8117321875e+05, -2.460515e+05, -1.86254390625e+05, -3.196626875e+05, -3.262623125e+05, -3.6147234375e+05, -1.678461406249995e+05, -1.23190171875e+05, -1.27570140625e+05, -1.46328171875e+05, -1.9758278125e+05, -4.8436665625e+05, -4.135669374999997e+05, -3.1613359375e+05, -3.0214809375e+05, -2.075194375e+05, -7.43510078125e+04, -1.78871125e+05, -2.1919334375e+05, -2.503964843749998e+05, -1.335399375e+05, -5.295032421875e+04, -6.076725e+04, -9.43532421875e+04, -1.300856015625e+05, -4.002828125e+05, -4.4381234375e+05, -4.3066390625e+05, -4.4657475e+05, -5.45763625e+05, -4.1830203125e+05, -4.458945e+05, -5.5944975e+05, -5.68728375e+05, -5.151813749999969e+05, -3.604536250000003e+05, -3.3439090625e+05, -3.3332884375e+05, -3.354459375e+05, -5.2317315625e+05, -6.442563125e+05, -5.937674375e+05, -5.836075625e+05, -7.49868625e+05, -6.418173125e+05, -5.903470625e+05, -7.388428750000002e+05, -7.3179025e+05, -7.38947625e+05, -5.2452725e+05, -4.70913125e+05, -4.46906375e+05, -4.498603125e+05, -5.396685625e+05, -7.8741375e+05, -6.774243125e+05, -6.38243875e+05, -7.71105875e+05, -7.24542e+05, -6.333688124999995e+05, -7.652222499999984e+05, -8.147946875e+05, -8.387301875e+05, -6.450506875e+05, -5.601981875e+05, -5.310494375e+05, -5.27453375e+05, -5.3354075e+05, -8.181619375e+05, -7.394875625e+05, -6.872724375e+05, -7.65576125e+05, -8.057098125e+05, -6.225031875e+05, -6.73939375e+05, -7.755481875e+05, -7.910723125e+05, -6.708936875e+05, -5.487324375e+05]
+bui[1].ets.PHea=[0e+00, 0e+00, 0e+00, 0e+00, 7.5012177734375e+03, 1.2941845703125e+04, 1.451969140625e+04, 7.584148925781247e+03, 9.1304189453125e+03, 1.0465314453125e+04, 6.14490625e+03, 0e+00, 0e+00, 0e+00, 1.640927314758308e+01, 1.976576385498047e+02, 1.636634155273438e+03, 2.395054687500002e+03, 6.66627978515625e+03, 1.7255623046875e+04, 2.132679296875e+04, 1.14206064453125e+04, 7.31669970703125e+03, 1.09685048828125e+04, 8.7190244140625e+03, 0e+00, 0e+00, 0e+00, 4.780558013916073e+01, 2.433454437255859e+02, 1.014331848144531e+03, 1.804361206054688e+03, 3.6671953125e+03, 1.48828828125e+04, 1.850781249999996e+04, 8.846240234375e+03, 1.48033251953125e+03, 2.1604580078125e+03, 3.616163330078125e+03, 4.621892700195312e+02, 0e+00, 0e+00, 0e+00, 0e+00, 1.826766014099121e+01, 2.273285064697266e+02, 1.69922021484375e+03, 1.41466259765625e+04, 2.1791892578125e+04, 1.8876912109375e+04, 6.7223623046875e+03, 1.0656224609375e+04, 1.21091220703125e+04, 5.5580498046875e+03, 0e+00, 0e+00, 1.542897129058892e+01, 1.865089263915986e+02, 1.1833740234375e+03, 2.071833740234375e+03, 2.89558984375e+03, 1.08177421875e+04, 2.046053125e+04, 2.8175021484375e+04, 1.6823080078125e+04, 1.7290458984375e+04, 2.270848828125e+04, 1.336987109375e+04, 1.347864990234354e+03, 1.62168859863279e+03, 2.684640380859375e+03, 3.8507548828125e+03, 4.449458984375e+03, 5.1986943359375e+03, 5.733521484375e+03, 8.245765625e+03, 8.472353515625e+03, 8.23916796875e+03, 8.18820703125e+03, 8.4121103515625e+03, 8.730240234375e+03, 9.0469833984375e+03, 8.823901367187507e+03, 6.77646875e+03, 7.44934716796875e+03, 7.91871142578125e+03, 8.16300390625e+03, 8.436419921875e+03, 8.7714814453125e+03, 1.04955947265625e+04, 1.1808431640625e+04, 1.1519818359375e+04, 1.1023462890625e+04, 1.0630265625e+04, 1.0591287109375e+04, 1.07247919921875e+04, 1.0935845703125e+04, 7.91549072265625e+03, 8.80484765625e+03, 9.2909697265625e+03, 9.6349521484375e+03]
+bui[2].ets.PHea=[0e+00, 2.2176349609375e+04, 3.0646044921875e+04, 3.6028171875e+04, 1.44260671875e+05, 3.479940234375e+04, 3.311031640625e+04, 1.259498515625001e+05, 5.36604921875e+04, 2.0316146484375e+04, 1.17452703125e+05, 1.134113125e+05, 1.206776796875e+05, 2.372538671875e+04, 3.255657226562502e+04, 4.083721484375e+04, 4.8501078125e+04, 5.383391015625001e+04, 1.5548065625e+05, 4.8459375e+04, 5.030521875e+04, 5.762273828125e+04, 1.046480625e+05, 1.7645880859375e+04, 5.13646328125e+04, 1.28424296875e+05, 1.222165234375e+05, 9.5525625e+04, 3.435797265625004e+04, 4.21223515625e+04, 4.938333984375e+04, 5.4706625e+04, 1.75535953125e+05, 1.046843203125e+05, 5.07803124999999e+04, 2.9223044921875e+04, 1.132774140625e+05, 2.133389404296875e+03, 1.38308310546875e+04, 1.130926640625e+05, 9.960553125e+04, 1.233020390624999e+05, 1.8148171875e+04, 3.214871484375e+04, 4.298287890625e+04, 5.203047265625e+04, 8.54858515625e+04, 1.69046171875e+05, 6.296323828125e+04, 6.2118671875e+04, 1.88954546875e+05, 5.69716328125e+04, 5.655927734375e+04, 1.79308859375e+05, 1.63895171875e+05, 1.8009990625e+05, 4.782734375000039e+04, 7.025035937499993e+04, 7.818828125e+04, 7.9791078125e+04, 8.214615625e+04, 2.20584546875e+05, 7.42540234375e+04, 8.4530890625e+04, 1.72531921875e+05, 1.71412171875e+05, 7.81468984375e+04, 1.72434296875e+05, 2.155438281249995e+05, 2.073467812499999e+05, 1.06678515625e+05, 8.82294140625e+04, 8.84091484375e+04, 9.538284375e+04, 1.006646796875e+05, 2.70059e+05, 1.138537890625e+05, 1.039123984375e+05, 1.02111265625e+05, 2.382178125e+05, 8.421446875e+04, 1.007660000000029e+05, 2.4876803125e+05, 2.24707328125e+05, 2.33978359375e+05, 9.5067375e+04, 9.99126484375e+04, 1.057948984375e+05, 1.10876984375e+05, 2.120225625e+05, 2.26953765625e+05, 1.118364375e+05, 1.134833046875e+05, 2.796365e+05, 6.968140625e+04, 8.53103671875e+04, 2.33468234375e+05, 2.05849015625e+05, 2.25630015625e+05, 7.40114765625e+04, 9.1671328125e+04]
+bui[3].ets.PHea=[0e+00, 3.83447265625e+03, 6.45847802734375e+03, 9.1857958984375e+03, 6.371323828125e+04, 5.82331875e+04, 4.70822109375e+04, 3.882598828124999e+04, 3.608274609375e+04, 3.54772578125e+04, 3.874124609375e+04, 3.0305921875e+04, 3.209353125e+04, 3.464328857421875e+03, 6.19641113281251e+03, 1.02694873046875e+04, 1.3772791015625e+04, 1.634165625000001e+04, 5.427517578125e+04, 7.67907578125e+04, 5.9588296875e+04, 4.113317578125e+04, 3.2016353515625e+04, 3.308141796875e+04, 3.86344140625e+04, 3.260963671875e+04, 2.999433984375e+04, 2.36617890625e+04, 3.47107666015628e+03, 8.328775390625e+03, 1.2154150390625e+04, 1.50704853515625e+04, 5.961637890625e+04, 7.77428203125e+04, 6.046770312499987e+04, 3.651390625e+04, 2.4798998046875e+04, 2.1084041015625e+04, 2.661521484375e+04, 2.8401046875e+04, 2.119557421875e+04, 2.809379687499998e+04, 6.096226501464844e+01, 2.996974853515625e+03, 8.8481162109375e+03, 1.32777060546875e+04, 2.63834375e+04, 8.0921890625e+04, 7.850815625e+04, 7.1548296875e+04, 6.20649453125e+04, 6.24222265625e+04, 6.13676015625e+04, 6.34343203125e+04, 4.69015546875e+04, 5.0513171875e+04, 1.273721191406258e+04, 1.960283398437496e+04, 2.3222939453125e+04, 2.4289064453125e+04, 2.5772654296875e+04, 9.09850625e+04, 9.14539765625e+04, 9.00264140625e+04, 8.1346671875e+04, 8.007975e+04, 7.81455390625e+04, 7.629159375e+04, 5.934352734374985e+04, 5.668148828124996e+04, 3.0873509765625e+04, 2.6231580078125e+04, 2.6738794921875e+04, 2.95820625e+04, 3.1534380859375e+04, 9.30479921875e+04, 9.77625e+04, 9.43188828125e+04, 8.437253125e+04, 8.1122625e+04, 7.898003125e+04, 7.884825781250003e+04, 7.372273437500023e+04, 6.25908203125e+04, 6.383541015625e+04, 2.92816875e+04, 3.132355859375e+04, 3.35074453125e+04, 3.492725e+04, 6.98834609375e+04, 9.77158359375e+04, 8.8245703125e+04, 8.4994171875e+04, 8.51389375e+04, 6.524705078125e+04, 6.3916875e+04, 7.089975e+04, 5.803612890625e+04, 6.236183203125e+04, 2.3186763671875e+04, 2.928702734375e+04]
+bui[1].ets.PPum=[1.396844291687012e+01, 1.355741500854492e+01, 1.952925903320312e+03, 1.952925903320312e+03, 1.932226318359375e+03, 1.944798950195312e+03, 1.964592651367188e+03, 1.933519775390625e+03, 1.933378051757812e+03, 1.93218701171875e+03, 1.935439575195312e+03, 1.355741500854492e+01, 1.355741500854492e+01, 1.355741500854492e+01, 1.952925903320312e+03, 1.952968872070312e+03, 1.948584594726562e+03, 1.94519580078125e+03, 1.935464965820312e+03, 2.003266479492188e+03, 2.086448486328125e+03, 1.940799682617188e+03, 1.935078979492188e+03, 1.93268896484375e+03, 1.9317080078125e+03, 1.355721473693848e+01, 1.355741500854492e+01, 1.355741500854492e+01, 1.952925903320312e+03, 1.953093872070312e+03, 1.952608276367188e+03, 1.947839965820312e+03, 1.941164672851562e+03, 1.969833618164062e+03, 2.0216552734375e+03, 1.933138793945312e+03, 1.95237646484375e+03, 1.954497680664062e+03, 1.943780883789062e+03, 1.952905029296875e+03, 1.355741500854492e+01, 1.355741500854492e+01, 1.355741500854492e+01, 1.355741500854492e+01, 1.952925903320312e+03, 1.953079711914062e+03, 1.948608642578125e+03, 1.9521982421875e+03, 2.07350634765625e+03, 2.042091430664062e+03, 1.93516259765625e+03, 1.932261352539062e+03, 1.938366943359375e+03, 1.9364072265625e+03, 1.355741500854492e+01, 1.355741500854492e+01, 1.952925903320312e+03, 1.953039428710938e+03, 1.951236206054688e+03, 1.946736083984375e+03, 1.94352783203125e+03, 1.930988037109375e+03, 2.049356201171875e+03, 2.2763017578125e+03, 2.019160278320312e+03, 1.995274780273438e+03, 2.1130146484375e+03, 1.964776977539062e+03, 1.950262817382813e+03, 1.94886181640625e+03, 1.944390258789062e+03, 1.9407294921875e+03, 1.939255615234375e+03, 1.937682495117188e+03, 1.936723754882812e+03, 1.932831420898438e+03, 1.932154541015625e+03, 1.93251611328125e+03, 1.9326875e+03, 1.932317749023438e+03, 1.931880615234375e+03, 1.93164013671875e+03, 1.9317724609375e+03, 1.935313110351562e+03, 1.934562255859375e+03, 1.93348486328125e+03, 1.932880859375e+03, 1.932364868164062e+03, 1.931855712890625e+03, 1.93223193359375e+03, 1.941543090820312e+03, 1.939594848632812e+03, 1.936188720703125e+03, 1.934179321289062e+03, 1.933961303710938e+03, 1.934352783203125e+03, 1.93540625e+03, 1.933057250976562e+03, 1.931855834960938e+03, 1.93159423828125e+03, 1.93171630859375e+03]
+bui[2].ets.PPum=[1.20891025390625e+04, 1.19497314453125e+04, 1.19343193359375e+04, 1.1926412109375e+04, 1.303701171875e+04, 1.1928833984375e+04, 1.1932076171875e+04, 1.2105865234375e+04, 1.18966201171875e+04, 1.1964587890625e+04, 1.21511064453125e+04, 1.21078369140625e+04, 1.2156404296875e+04, 1.19538330078125e+04, 1.19339443359375e+04, 1.1920615234375e+04, 1.19100234375e+04, 1.18983828125e+04, 1.3695298828125e+04, 1.19025166015625e+04, 1.19039228515625e+04, 1.1906494140625e+04, 1.21785498046875e+04, 1.197549609375e+04, 1.19136591796875e+04, 1.2308140625e+04, 1.21699150390625e+04, 1.2028015625e+04, 1.1930974609375e+04, 1.19192900390625e+04, 1.1908279296875e+04, 1.18976455078125e+04, 1.325264453125e+04, 1.25430302734375e+04, 1.190405078125e+04, 1.19414658203125e+04, 1.21440625e+04, 1.203340234375e+04, 1.19902265625e+04, 1.21348701171875e+04, 1.19370498046875e+04, 1.21021025390625e+04, 1.197384375e+04, 1.193522265625e+04, 1.19181689453125e+04, 1.19021318359375e+04, 1.1933693359375e+04, 1.38545390625e+04, 1.18978681640625e+04, 1.18986162109375e+04, 1.36887998046875e+04, 1.19171845703125e+04, 1.1896529296875e+04, 1.3892033203125e+04, 1.3235220703125e+04, 1.3553634765625e+04, 1.19071201171875e+04, 1.19212431640625e+04, 1.19837275390625e+04, 1.20044560546875e+04, 1.2030150390625e+04, 1.551554296875e+04, 1.19698779296875e+04, 1.20497109375e+04, 1.312536328125e+04, 1.435276953125e+04, 1.19657138671875e+04, 1.33421181640625e+04, 1.503982519531248e+04, 1.460206542968749e+04, 1.24980625e+04, 1.2091419921875e+04, 1.20951181640625e+04, 1.21821591796875e+04, 1.22682353515625e+04, 1.7081876953125e+04, 1.30115986328125e+04, 1.2331380859375e+04, 1.2286591796875e+04, 1.63696572265625e+04, 1.20430859375e+04, 1.222585742187504e+04, 1.638378808593751e+04, 1.5240763671875e+04, 1.55790361328125e+04, 1.21495302734375e+04, 1.2242201171875e+04, 1.23364306640625e+04, 1.2442453125e+04, 1.4447458984375e+04, 1.665603125e+04, 1.24505908203125e+04, 1.2498142578125e+04, 1.7563095703125e+04, 1.2008716796875e+04, 1.20455263671875e+04, 1.5872345703125e+04, 1.45694140625e+04, 1.50203681640625e+04, 1.19405986328125e+04, 1.2116990234375e+04]
+bui[3].ets.PPum=[4.69525439453125e+03, 4.65846826171875e+03, 4.64981787109375e+03, 4.6436787109375e+03, 4.817484375e+03, 4.77771435546875e+03, 4.6668515625e+03, 4.63526171875e+03, 4.6383837890625e+03, 4.63822265625e+03, 4.6349296875e+03, 4.646234375e+03, 4.6436767578125e+03, 4.66950732421875e+03, 4.6550927734375e+03, 4.64297314453125e+03, 4.6362255859375e+03, 4.6328203125e+03, 4.85522021484375e+03, 5.134271484375e+03, 4.7951875e+03, 4.6383896484375e+03, 4.6445029296875e+03, 4.642095703125e+03, 4.63493017578125e+03, 4.64316796875e+03, 4.6474345703125e+03, 4.64201806640625e+03, 4.66733984375e+03, 4.6482978515625e+03, 4.63921142578125e+03, 4.634525390625e+03, 4.718796875e+03, 5.11745849609375e+03, 4.811960449218748e+03, 4.636443359375e+03, 4.65963427734375e+03, 4.6745849609375e+03, 4.653599609375e+03, 4.64964794921875e+03, 4.67407470703125e+03, 4.65086083984375e+03, 4.67427587890625e+03, 4.67134619140625e+03, 4.64678369140625e+03, 4.6371875e+03, 4.62402294921875e+03, 5.17638232421875e+03, 5.2017392578125e+03, 5.01861865234375e+03, 4.79645703125e+03, 4.785126953125e+03, 4.794505859375e+03, 4.80721630859375e+03, 4.6531650390625e+03, 4.66587646484375e+03, 4.6392099609375e+03, 4.6289833984375e+03, 4.62644091796875e+03, 4.62732861328125e+03, 4.62967578125e+03, 5.4021201171875e+03, 5.60046044921875e+03, 5.569224609375e+03, 5.260751953125e+03, 5.13116015625e+03, 5.15882470703125e+03, 5.08476904296875e+03, 4.740729003906248e+03, 4.6998056640625e+03, 4.6322783203125e+03, 4.629767578125e+03, 4.63144287109375e+03, 4.6422001953125e+03, 4.65281787109375e+03, 5.40688134765625e+03, 5.7699365234375e+03, 5.73113232421875e+03, 5.3553486328125e+03, 5.15837158203125e+03, 5.17232373046875e+03, 5.15840478515625e+03, 4.995389648437505e+03, 4.7600029296875e+03, 4.80070654296875e+03, 4.6364130859375e+03, 4.650423828125e+03, 4.6609072265625e+03, 4.6691767578125e+03, 4.93257568359375e+03, 5.68876123046875e+03, 5.46320068359375e+03, 5.3430556640625e+03, 5.28034228515625e+03, 4.83307958984375e+03, 4.8101240234375e+03, 4.91002392578125e+03, 4.71471826171875e+03, 4.75474658203125e+03, 4.6264423828125e+03, 4.63896630859375e+03]
+dis.mCon_flow[1]=[-1.182063147425652e-01, 1.549060613115216e-07, 1.55240559251979e-05, 1.55240559251979e-05, 2.988253116607666e+00, 4.093935966491699e+00, 4.413515567779541e+00, 2.563987493515014e+00, 2.88843035697937e+00, 3.322681188583374e+00, 2.157328128814697e+00, 1.549060613115216e-07, 1.549060613115216e-07, 1.549060613115216e-07, 1.552406138216611e-05, 4.136333987116814e-02, 6.417215466499329e-01, 9.202846884727485e-01, 2.302209854125977e+00, 5.16532039642334e+00, 6.043904304504395e+00, 3.630963087081909e+00, 2.387113571166992e+00, 3.396608352661133e+00, 2.872255563735962e+00, 2.521677288314095e-06, 1.549060613115216e-07, 1.549060613115216e-07, 1.55240559251979e-05, 9.704208374023438e-02, 3.811900317668915e-01, 6.978940963745117e-01, 1.345423698425293e+00, 4.603629589080811e+00, 5.3662986755371e+00, 2.806399583816528e+00, 4.189961552619934e-01, 4.258383214473724e-01, 1.125491499900818e+00, 1.598798930644989e-01, 1.549060613115216e-07, 1.549060613115216e-07, 1.549060613115216e-07, 1.549060613115216e-07, 1.552390676806681e-05, 9.10477340221405e-02, 6.399264931678772e-01, 4.455563545227051e+00, 6.139570713043213e+00, 5.471745014190674e+00, 2.252212047576904e+00, 3.254952669143677e+00, 3.75291919708252e+00, 1.968062877655029e+00, 1.549060613115216e-07, 1.549060613115216e-07, 1.55240559251979e-05, 7.360778003930692e-02, 4.622108936309814e-01, 7.862019538879395e-01, 1.081620216369629e+00, 3.49372124671936e+00, 5.819141387939453e+00, 7.445484638214111e+00, 5.025617599487305e+00, 5.037048816680908e+00, 6.305337429046631e+00, 4.171695709228516e+00, 5.245113968849104e-01, 6.214767098426711e-01, 9.959540367126465e-01, 1.399546146392822e+00, 1.598703503608704e+00, 1.846133947372437e+00, 2.021599769592285e+00, 2.802665233612061e+00, 2.8667151927948e+00, 2.794431924819946e+00, 2.771897554397583e+00, 2.834896564483643e+00, 2.926928520202637e+00, 3.015374898910522e+00, 2.952174663543703e+00, 2.33259129524231e+00, 2.539465188980103e+00, 2.675572633743286e+00, 2.745736598968506e+00, 2.827022314071655e+00, 2.931137084960938e+00, 3.40283727645874e+00, 3.788338899612427e+00, 3.70826268196106e+00, 3.564234018325806e+00, 3.452405214309692e+00, 3.442116737365723e+00, 3.472790956497192e+00, 3.531691551208496e+00, 2.667717695236206e+00, 2.932227373123169e+00, 3.069076538085938e+00, 3.162461757659912e+00]
+dis.mCon_flow[2]=[-7.8319091796875e+01, 9.480208396911621e+00, 1.180053997039795e+01, 1.327153587341309e+01, 4.027409362792969e+01, 1.279373931884766e+01, 1.219328880310059e+01, 3.371057128906252e+01, 1.799857139587402e+01, 7.677474498748779e+00, 3.380984878540039e+01, 3.004926681518555e+01, 3.174553298950195e+01, 8.922266960144043e+00, 1.186495018005372e+01, 1.454367542266846e+01, 1.695606422424316e+01, 1.858355712890625e+01, 4.371491241455078e+01, 1.676057815551758e+01, 1.738602828979492e+01, 1.742853546142578e+01, 3.001987457275391e+01, 6.540924549102783e+00, 1.629060173034668e+01, 3.363737487792969e+01, 3.203425216674805e+01, 2.649079132080078e+01, 1.239268684387208e+01, 1.486623764038086e+01, 1.713942718505859e+01, 1.876096343994141e+01, 4.576153564453125e+01, 3.177814483642578e+01, 1.748945617675778e+01, 1.065261840820312e+01, 3.072194862365723e+01, 8.323932886123657e-01, 5.199742317199707e+00, 3.058332061767578e+01, 2.596197128295898e+01, 3.081424713134764e+01, 6.704612731933594e+00, 1.164726161956787e+01, 1.515050315856934e+01, 1.79755859375e+01, 2.580222511291504e+01, 4.506935882568359e+01, 2.096165084838867e+01, 2.071941375732422e+01, 4.75382194519043e+01, 1.930696105957031e+01, 1.907486152648926e+01, 4.718310546875e+01, 4.189138793945312e+01, 4.494794082641602e+01, 1.620001983642591e+01, 2.299660491943358e+01, 2.516684722900391e+01, 2.561350631713867e+01, 2.62476806640625e+01, 5.462213897705078e+01, 2.381742095947266e+01, 2.656233024597168e+01, 4.42356071472168e+01, 4.606093597412109e+01, 2.4796630859375e+01, 4.52668342590332e+01, 5.242707443237295e+01, 5.067383193969724e+01, 3.105513191223145e+01, 2.755817794799805e+01, 2.758817100524902e+01, 2.937444877624512e+01, 3.072941017150879e+01, 6.337783432006836e+01, 3.407016754150391e+01, 3.149523162841797e+01, 3.085215377807617e+01, 5.755041122436523e+01, 2.633408164978027e+01, 3.016843032836975e+01, 5.837814712524417e+01, 5.372018432617188e+01, 5.528883361816406e+01, 2.905005073547363e+01, 3.026066780090332e+01, 3.171635055541992e+01, 3.298987579345703e+01, 5.224870681762695e+01, 5.686205291748047e+01, 3.320705032348633e+01, 3.353572082519531e+01, 6.388385009765625e+01, 2.232813453674316e+01, 2.652292060852051e+01, 5.61659049987793e+01, 4.985078811645508e+01, 5.304265975952148e+01, 2.342831230163574e+01, 2.810787582397461e+01]
+dis.mCon_flow[3]=[-2.868548393249512e+01, 1.946535468101501e+00, 2.792300462722778e+00, 3.550712108612061e+00, 1.468011093139648e+01, 1.386664390563965e+01, 1.098187923431396e+01, 8.573136329650877e+00, 7.641501426696777e+00, 7.704766750335693e+00, 8.512860298156738e+00, 5.933652400970459e+00, 6.437981605529785e+00, 1.193222880363464e+00, 2.251530885696415e+00, 3.649505376815796e+00, 4.780386447906494e+00, 5.563040256500246e+00, 1.414175891876221e+01, 1.74155101776123e+01, 1.379662036895752e+01, 9.194589614868164e+00, 6.296077728271484e+00, 6.854968547821045e+00, 8.518640518188477e+00, 6.549247741699219e+00, 5.722483158111572e+00, 5.359277725219727e+00, 1.267828941345225e+00, 2.965304136276245e+00, 4.231122016906738e+00, 5.144009590148926e+00, 1.383912658691406e+01, 1.721612167358398e+01, 1.400097656249997e+01, 7.895364284515381e+00, 4.113954544067383e+00, 2.82865309715271e+00, 4.830453395843506e+00, 5.368003368377686e+00, 2.846829175949097e+00, 5.185065269470207e+00, 3.296772774774581e-05, 1.01225209236145e+00, 3.146648645401001e+00, 4.592700958251953e+00, 7.573829650878906e+00, 1.775325393676758e+01, 1.780012130737305e+01, 1.630439758300781e+01, 1.38277416229248e+01, 1.410373687744141e+01, 1.41016263961792e+01, 1.410198974609375e+01, 1.022430324554443e+01, 1.109957408905029e+01, 4.231341838836697e+00, 6.365683555603018e+00, 7.370001316070557e+00, 7.653952598571777e+00, 8.044246673583984e+00, 1.92695369720459e+01, 2.003776359558105e+01, 1.96736011505127e+01, 1.784604644775391e+01, 1.716514205932617e+01, 1.740813636779785e+01, 1.67895622253418e+01, 1.288436985015866e+01, 1.234287548065185e+01, 8.258899688720703e+00, 8.056004524230957e+00, 8.189579010009766e+00, 8.906715393066406e+00, 9.386208534240723e+00, 1.951651000976562e+01, 2.065434646606445e+01, 2.039604568481445e+01, 1.850746726989746e+01, 1.717416381835938e+01, 1.754272079467773e+01, 1.741470718383789e+01, 1.57403535842896e+01, 1.348625087738037e+01, 1.397169017791748e+01, 8.736349105834961e+00, 9.255403518676758e+00, 9.774809837341309e+00, 1.011020183563232e+01, 1.61242618560791e+01, 2.012042427062988e+01, 1.914227104187012e+01, 1.846798324584961e+01, 1.78070240020752e+01, 1.447060108184814e+01, 1.4292311668396e+01, 1.517389106750488e+01, 1.247027397155762e+01, 1.342143630981445e+01, 7.107743263244629e+00, 8.746480941772461e+00]
 bui[1].ets.THeaWatSupSet=[3.011499938964844e+02, 3.011499938964844e+02, 3.011818542480469e+02, 3.012418518066406e+02, 3.033169555664062e+02, 3.041416320800781e+02, 3.044120483398438e+02, 3.030785827636719e+02, 3.032156066894531e+02, 3.035683288574219e+02, 3.027239074707031e+02, 3.011499938964844e+02, 3.011499938964844e+02, 3.011499938964844e+02, 3.011561889648438e+02, 3.012687683105469e+02, 3.015848388671875e+02, 3.018233032226562e+02, 3.029001159667969e+02, 3.050103454589844e+02, 3.057236633300781e+02, 3.038907470703125e+02, 3.028811340332031e+02, 3.03606201171875e+02, 3.032756652832031e+02, 3.011499938964844e+02, 3.011499938964844e+02, 3.011499938964844e+02, 3.011899719238281e+02, 3.012715148925781e+02, 3.014285888671875e+02, 3.016359558105469e+02, 3.021471557617188e+02, 3.045862426757812e+02, 3.051562805175781e+02, 3.032362060546875e+02, 3.014360961914062e+02, 3.014007263183594e+02, 3.018779602050781e+02, 3.012979736328125e+02, 3.011499938964844e+02, 3.011499938964844e+02, 3.011499938964844e+02, 3.011499938964844e+02, 3.011532592773438e+02, 3.012625122070312e+02, 3.015754699707031e+02, 3.043725891113281e+02, 3.057138977050781e+02, 3.052976379394531e+02, 3.028313293457031e+02, 3.034349060058594e+02, 3.039214782714844e+02, 3.0258935546875e+02, 3.011499938964844e+02, 3.011499938964844e+02, 3.011549072265625e+02, 3.012594604492188e+02, 3.014695739746094e+02, 3.017150573730469e+02, 3.019510803222656e+02, 3.0364501953125e+02, 3.055112609863281e+02, 3.068552856445312e+02, 3.050308837890625e+02, 3.049100036621094e+02, 3.059415893554688e+02, 3.04355712890625e+02, 3.015714721679688e+02, 3.015879211425781e+02, 3.018827514648438e+02, 3.021878051757812e+02, 3.023419189453125e+02, 3.025277099609375e+02, 3.026602478027344e+02, 3.032210693359375e+02, 3.033043518066406e+02, 3.032552490234375e+02, 3.032364196777344e+02, 3.032822570800781e+02, 3.033528442382812e+02, 3.03423583984375e+02, 3.033790893554688e+02, 3.0290576171875e+02, 3.030587768554688e+02, 3.0315966796875e+02, 3.032167053222656e+02, 3.032773742675781e+02, 3.033581237792969e+02, 3.03684326171875e+02, 3.040229187011719e+02, 3.039660339355469e+02, 3.038548889160156e+02, 3.037657470703125e+02, 3.037560424804688e+02, 3.0377978515625e+02, 3.038266296386719e+02, 3.031968383789062e+02, 3.03359130859375e+02, 3.0346533203125e+02, 3.035382385253906e+02]
-bui[1].ets.senTHeaWatSup.T=[2.931499938964844e+02, 2.931499938964844e+02, 3.096929321289062e+02, 3.070045166015625e+02, 3.032787475585938e+02, 3.041241455078125e+02, 3.044170532226562e+02, 3.030931396484375e+02, 3.031998596191406e+02, 3.035704040527344e+02, 3.027388305664062e+02, 2.998439636230469e+02, 2.992307434082031e+02, 2.992147216796875e+02, 3.002745361328125e+02, 3.012611694335938e+02, 3.015792236328125e+02, 3.018209228515625e+02, 3.028612670898438e+02, 3.0500048828125e+02, 3.057317810058594e+02, 3.03922119140625e+02, 3.028812866210938e+02, 3.03602783203125e+02, 3.032886352539062e+02, 3.011125183105469e+02, 2.992825622558594e+02, 2.992381591796875e+02, 3.011656799316406e+02, 3.012691650390625e+02, 3.014251098632812e+02, 3.016337890625e+02, 3.021309204101562e+02, 3.045799255371094e+02, 3.051615600585938e+02, 3.032622680664062e+02, 3.014456481933594e+02, 3.013972473144531e+02, 3.018735046386719e+02, 3.013154296875e+02, 2.9877197265625e+02, 2.986138610839844e+02, 2.986095886230469e+02, 2.986094665527344e+02, 3.002065124511719e+02, 3.01258544921875e+02, 3.015621643066406e+02, 3.043505249023438e+02, 3.056936645507812e+02, 3.053197021484375e+02, 3.028364562988281e+02, 3.034114990234375e+02, 3.039268493652344e+02, 3.026135559082031e+02, 2.996046142578125e+02, 2.99247802734375e+02, 3.007260437011719e+02, 3.0125537109375e+02, 3.014656066894531e+02, 3.017117614746094e+02, 3.019482116699219e+02, 3.035981140136719e+02, 3.054864807128906e+02, 3.068544311523438e+02, 3.050624389648438e+02, 3.048880004882812e+02, 3.05942626953125e+02, 3.043843688964844e+02, 3.015809326171875e+02, 3.015826721191406e+02, 3.01879150390625e+02, 3.02185791015625e+02, 3.023400268554688e+02, 3.025259399414062e+02, 3.026592102050781e+02, 3.032184753417969e+02, 3.033038330078125e+02, 3.03256103515625e+02, 3.032363891601562e+02, 3.03281494140625e+02, 3.03351806640625e+02, 3.03423583984375e+02, 3.033809814453125e+02, 3.029024658203125e+02, 3.030579223632812e+02, 3.031583862304688e+02, 3.032163391113281e+02, 3.032760009765625e+02, 3.033580017089844e+02, 3.0366748046875e+02, 3.040230407714844e+02, 3.039671936035156e+02, 3.0385595703125e+02, 3.037661437988281e+02, 3.037560424804688e+02, 3.037791137695312e+02, 3.038273010253906e+02, 3.03199951171875e+02, 3.033583068847656e+02, 3.034645690917969e+02, 3.035372619628906e+02]
+bui[1].ets.senTHeaWatSup.T=[2.931499938964844e+02, 2.931499938964844e+02, 3.096930541992188e+02, 3.0700390625e+02, 3.032787475585938e+02, 3.041241455078125e+02, 3.044170532226562e+02, 3.030931396484375e+02, 3.031998596191406e+02, 3.035704040527344e+02, 3.027388305664062e+02, 2.998440551757812e+02, 2.992307434082031e+02, 2.992146911621094e+02, 3.002747497558594e+02, 3.012611694335938e+02, 3.015811462402344e+02, 3.018209228515625e+02, 3.028612670898438e+02, 3.0500048828125e+02, 3.057317810058594e+02, 3.03922119140625e+02, 3.028812866210938e+02, 3.03602783203125e+02, 3.032886352539062e+02, 3.011123962402344e+02, 2.992825927734375e+02, 2.992381591796875e+02, 3.011656799316406e+02, 3.012691650390625e+02, 3.014251098632812e+02, 3.016337890625e+02, 3.021309204101562e+02, 3.045799255371094e+02, 3.051615600585938e+02, 3.032622680664062e+02, 3.014456481933594e+02, 3.013972473144531e+02, 3.018735046386719e+02, 3.013154296875e+02, 2.9877197265625e+02, 2.986138610839844e+02, 2.986095886230469e+02, 2.986094360351562e+02, 3.002068176269531e+02, 3.01258544921875e+02, 3.015621643066406e+02, 3.043500366210938e+02, 3.056936645507812e+02, 3.053197021484375e+02, 3.028364868164062e+02, 3.034117126464844e+02, 3.039268493652344e+02, 3.026135559082031e+02, 2.996046752929688e+02, 2.992477722167969e+02, 3.007260437011719e+02, 3.0125537109375e+02, 3.014656066894531e+02, 3.017117614746094e+02, 3.019482116699219e+02, 3.035981140136719e+02, 3.054864807128906e+02, 3.068544311523438e+02, 3.050624389648438e+02, 3.048880004882812e+02, 3.05942626953125e+02, 3.043843688964844e+02, 3.015809326171875e+02, 3.015826721191406e+02, 3.01879150390625e+02, 3.02185791015625e+02, 3.023400268554688e+02, 3.025259399414062e+02, 3.026592102050781e+02, 3.032184753417969e+02, 3.033038330078125e+02, 3.03256103515625e+02, 3.032363891601562e+02, 3.03281494140625e+02, 3.03351806640625e+02, 3.03423583984375e+02, 3.033809814453125e+02, 3.029024658203125e+02, 3.030579223632812e+02, 3.031583862304688e+02, 3.032163391113281e+02, 3.032760009765625e+02, 3.033580017089844e+02, 3.0366748046875e+02, 3.040230407714844e+02, 3.039671936035156e+02, 3.0385595703125e+02, 3.037661437988281e+02, 3.037560424804688e+02, 3.037791137695312e+02, 3.038273010253906e+02, 3.031999816894531e+02, 3.033583068847656e+02, 3.034645690917969e+02, 3.035372619628906e+02]
 bui[2].ets.THeaWatSupSet=[3.022371215820312e+02, 3.022929992675781e+02, 3.025325317382812e+02, 3.027109375e+02, 3.0576953125e+02, 3.026592102050781e+02, 3.025699462890625e+02, 3.046447448730469e+02, 3.032872619628906e+02, 3.0203173828125e+02, 3.047882385253906e+02, 3.044075622558594e+02, 3.045711669921875e+02, 3.021329040527344e+02, 3.025238037109375e+02, 3.028435974121094e+02, 3.031228942871094e+02, 3.033214416503906e+02, 3.064082336425781e+02, 3.032993774414062e+02, 3.032015380859375e+02, 3.032325134277344e+02, 3.045858154296875e+02, 3.019427795410156e+02, 3.031217956542969e+02, 3.048508911132812e+02, 3.0460595703125e+02, 3.040630798339844e+02, 3.025755310058594e+02, 3.028836364746094e+02, 3.031466064453125e+02, 3.033418884277344e+02, 3.06205078125e+02, 3.050321960449219e+02, 3.031983947753906e+02, 3.023972473144531e+02, 3.045396118164062e+02, 3.013359985351562e+02, 3.017449645996094e+02, 3.045319519042969e+02, 3.038887023925781e+02, 3.04413330078125e+02, 3.019764099121094e+02, 3.025020751953125e+02, 3.029153747558594e+02, 3.032434997558594e+02, 3.040957641601562e+02, 3.064471130371094e+02, 3.035986938476562e+02, 3.035945129394531e+02, 3.064448852539062e+02, 3.035657958984375e+02, 3.033815307617188e+02, 3.066045227050781e+02, 3.058945007324219e+02, 3.06213134765625e+02, 3.031752624511719e+02, 3.03856201171875e+02, 3.041219177246094e+02, 3.041805419921875e+02, 3.042574462890625e+02, 3.076214294433594e+02, 3.040094604492188e+02, 3.043080139160156e+02, 3.060822143554688e+02, 3.067025756835938e+02, 3.040648498535156e+02, 3.062969970703125e+02, 3.072484436035156e+02, 3.069846801757812e+02, 3.049280395507812e+02, 3.044254150390625e+02, 3.044303588867188e+02, 3.046428527832031e+02, 3.048128356933594e+02, 3.086090087890625e+02, 3.054629821777344e+02, 3.049158935546875e+02, 3.048506774902344e+02, 3.080462646484375e+02, 3.042694091796875e+02, 3.047711791992188e+02, 3.080608520507812e+02, 3.073917236328125e+02, 3.075439147949219e+02, 3.045775451660156e+02, 3.047623901367188e+02, 3.049385375976562e+02, 3.051003112792969e+02, 3.071455078125e+02, 3.081002807617188e+02, 3.051087951660156e+02, 3.051735534667969e+02, 3.087722473144531e+02, 3.039963989257812e+02, 3.0430224609375e+02, 3.078565063476562e+02, 3.069277648925781e+02, 3.072600402832031e+02, 3.039281311035156e+02, 3.04494873046875e+02]
-bui[2].ets.senTHeaWatSup.T=[2.931499938964844e+02, 3.022889709472656e+02, 3.025302734375e+02, 3.02699462890625e+02, 3.057750549316406e+02, 3.026554260253906e+02, 3.025732727050781e+02, 3.045914001464844e+02, 3.033598327636719e+02, 3.020285949707031e+02, 3.047373352050781e+02, 3.044178771972656e+02, 3.045671081542969e+02, 3.021787414550781e+02, 3.025203857421875e+02, 3.028400268554688e+02, 3.031202697753906e+02, 3.033199462890625e+02, 3.064070739746094e+02, 3.033298034667969e+02, 3.032083129882812e+02, 3.031789245605469e+02, 3.046055908203125e+02, 3.019335327148438e+02, 3.030521850585938e+02, 3.048588562011719e+02, 3.045985717773438e+02, 3.041311950683594e+02, 3.025703125e+02, 3.02880615234375e+02, 3.031442565917969e+02, 3.033402404785156e+02, 3.061416320800781e+02, 3.051129455566406e+02, 3.032017517089844e+02, 3.024026794433594e+02, 3.045532531738281e+02, 3.013327941894531e+02, 3.017372436523438e+02, 3.045425415039062e+02, 3.038844299316406e+02, 3.044116516113281e+02, 3.019644775390625e+02, 3.0249755859375e+02, 3.029110107421875e+02, 3.032404174804688e+02, 3.040276184082031e+02, 3.064543762207031e+02, 3.035905456542969e+02, 3.035966796875e+02, 3.0643994140625e+02, 3.036338806152344e+02, 3.033793334960938e+02, 3.066044921875e+02, 3.059033813476562e+02, 3.06208740234375e+02, 3.031722717285156e+02, 3.03853515625e+02, 3.041203002929688e+02, 3.041798400878906e+02, 3.042565307617188e+02, 3.076247863769531e+02, 3.040050964355469e+02, 3.043082580566406e+02, 3.059934387207031e+02, 3.067624206542969e+02, 3.040579833984375e+02, 3.062075805664062e+02, 3.072605590820312e+02, 3.069815368652344e+02, 3.050143432617188e+02, 3.044252319335938e+02, 3.04430419921875e+02, 3.046406555175781e+02, 3.048118591308594e+02, 3.086028137207031e+02, 3.055467224121094e+02, 3.049166564941406e+02, 3.048417053222656e+02, 3.080601196289062e+02, 3.042603149414062e+02, 3.047449951171876e+02, 3.080686950683594e+02, 3.073871154785156e+02, 3.075782775878906e+02, 3.04567138671875e+02, 3.0476123046875e+02, 3.0493603515625e+02, 3.050995788574219e+02, 3.07046630859375e+02, 3.081634826660156e+02, 3.051037902832031e+02, 3.051732177734375e+02, 3.087818908691406e+02, 3.040284729003906e+02, 3.043005065917969e+02, 3.07861083984375e+02, 3.069303894042969e+02, 3.072577209472656e+02, 3.039176330566406e+02, 3.044920349121094e+02]
+bui[2].ets.senTHeaWatSup.T=[2.931499938964844e+02, 3.022889709472656e+02, 3.025302734375e+02, 3.02699462890625e+02, 3.057750549316406e+02, 3.026554260253906e+02, 3.025732421875e+02, 3.045918884277344e+02, 3.033598327636719e+02, 3.020285949707031e+02, 3.047373657226562e+02, 3.044178771972656e+02, 3.045671081542969e+02, 3.021788024902344e+02, 3.025203857421875e+02, 3.028400268554688e+02, 3.031202697753906e+02, 3.033199462890625e+02, 3.064070739746094e+02, 3.033298034667969e+02, 3.032083129882812e+02, 3.031789245605469e+02, 3.046055908203125e+02, 3.019335327148438e+02, 3.030521850585938e+02, 3.048588562011719e+02, 3.045985717773438e+02, 3.041311950683594e+02, 3.025703125e+02, 3.02880615234375e+02, 3.031442565917969e+02, 3.033402404785156e+02, 3.061411437988281e+02, 3.051129455566406e+02, 3.032017517089844e+02, 3.024026794433594e+02, 3.045532531738281e+02, 3.013327941894531e+02, 3.017372436523438e+02, 3.045425415039062e+02, 3.038844299316406e+02, 3.044116516113281e+02, 3.019644775390625e+02, 3.0249755859375e+02, 3.029110107421875e+02, 3.032404174804688e+02, 3.040276184082031e+02, 3.064543762207031e+02, 3.035905456542969e+02, 3.035966796875e+02, 3.064404907226562e+02, 3.036338806152344e+02, 3.033793334960938e+02, 3.066044921875e+02, 3.059033813476562e+02, 3.06208740234375e+02, 3.031722717285156e+02, 3.03853515625e+02, 3.041203002929688e+02, 3.041798400878906e+02, 3.042565307617188e+02, 3.076247863769531e+02, 3.040050964355469e+02, 3.043082580566406e+02, 3.059934387207031e+02, 3.067624206542969e+02, 3.040579833984375e+02, 3.06207275390625e+02, 3.072605590820312e+02, 3.069815368652344e+02, 3.050143432617188e+02, 3.044252319335938e+02, 3.044303283691406e+02, 3.046406555175781e+02, 3.048118591308594e+02, 3.086028442382812e+02, 3.055467224121094e+02, 3.049166564941406e+02, 3.048417053222656e+02, 3.080601196289062e+02, 3.042603149414062e+02, 3.047449951171876e+02, 3.080686950683594e+02, 3.073871154785156e+02, 3.075782775878906e+02, 3.04567138671875e+02, 3.0476123046875e+02, 3.049360656738281e+02, 3.050995788574219e+02, 3.07046630859375e+02, 3.081634826660156e+02, 3.051037902832031e+02, 3.051732177734375e+02, 3.087818908691406e+02, 3.040284729003906e+02, 3.043005065917969e+02, 3.07861083984375e+02, 3.06930419921875e+02, 3.072577209472656e+02, 3.039176330566406e+02, 3.044920349121094e+02]
 bui[3].ets.THeaWatSupSet=[3.015830078125e+02, 3.017384643554688e+02, 3.020616760253906e+02, 3.023164672851562e+02, 3.055315856933594e+02, 3.052533569335938e+02, 3.042955322265625e+02, 3.035074462890625e+02, 3.031561584472656e+02, 3.031649475097656e+02, 3.034611206054688e+02, 3.025969543457031e+02, 3.027619323730469e+02, 3.014335632324219e+02, 3.018492736816406e+02, 3.02317138671875e+02, 3.026919250488281e+02, 3.029523315429688e+02, 3.057950744628906e+02, 3.064950866699219e+02, 3.05296630859375e+02, 3.037142028808594e+02, 3.027350769042969e+02, 3.028833312988281e+02, 3.034297485351562e+02, 3.028161315917969e+02, 3.025333557128906e+02, 3.024278259277344e+02, 3.015642700195312e+02, 3.020900573730469e+02, 3.025110168457031e+02, 3.028137512207031e+02, 3.051663818359375e+02, 3.064702453613281e+02, 3.053681945800781e+02, 3.032876586914062e+02, 3.020130615234375e+02, 3.015963745117188e+02, 3.022110900878906e+02, 3.024018859863281e+02, 3.016385192871094e+02, 3.02337890625e+02, 3.011651916503906e+02, 3.015142211914062e+02, 3.021448974609375e+02, 3.026300354003906e+02, 3.034896850585938e+02, 3.06657958984375e+02, 3.066563415527344e+02, 3.0615478515625e+02, 3.053432922363281e+02, 3.0532421875e+02, 3.053579711914062e+02, 3.0541748046875e+02, 3.04074462890625e+02, 3.043381958007812e+02, 3.0258203125e+02, 3.032113647460938e+02, 3.035560913085938e+02, 3.036563110351562e+02, 3.037868041992188e+02, 3.07205322265625e+02, 3.074538269042969e+02, 3.073782653808594e+02, 3.067622375488281e+02, 3.064886169433594e+02, 3.065491638183594e+02, 3.063687438964844e+02, 3.050221862792969e+02, 3.047802734375e+02, 3.037688293457031e+02, 3.037930603027344e+02, 3.038448181152344e+02, 3.040843200683594e+02, 3.042516174316406e+02, 3.072645874023438e+02, 3.0772265625e+02, 3.076467895507812e+02, 3.069666137695312e+02, 3.065372009277344e+02, 3.065844116210938e+02, 3.065560913085938e+02, 3.06064208984375e+02, 3.051891174316406e+02, 3.053666076660156e+02, 3.039945678710938e+02, 3.042120666503906e+02, 3.043890380859375e+02, 3.04509765625e+02, 3.061576843261719e+02, 3.076034545898438e+02, 3.071937866210938e+02, 3.069554748535156e+02, 3.068090515136719e+02, 3.05495361328125e+02, 3.054386291503906e+02, 3.058284912109375e+02, 3.048736267089844e+02, 3.051721496582031e+02, 3.034703979492188e+02, 3.040327758789062e+02]
-bui[3].ets.senTHeaWatSup.T=[2.931499938964844e+02, 3.017325134277344e+02, 3.020586853027344e+02, 3.023055419921875e+02, 3.055233154296875e+02, 3.052616577148438e+02, 3.043056030273438e+02, 3.03513671875e+02, 3.031575927734375e+02, 3.031634216308594e+02, 3.034589233398438e+02, 3.026072998046875e+02, 3.027566833496094e+02, 3.014655151367188e+02, 3.018433227539062e+02, 3.023121337890625e+02, 3.026884155273438e+02, 3.029499816894531e+02, 3.057655944824219e+02, 3.064988098144531e+02, 3.053147888183594e+02, 3.037291870117188e+02, 3.027366943359375e+02, 3.028789978027344e+02, 3.034235534667969e+02, 3.028280029296875e+02, 3.025247497558594e+02, 3.024700927734375e+02, 3.015572204589844e+02, 3.02084716796875e+02, 3.025071105957031e+02, 3.028109436035156e+02, 3.051087341308594e+02, 3.0647314453125e+02, 3.053883972167969e+02, 3.033063659667969e+02, 3.020243835449219e+02, 3.015947570800781e+02, 3.02200439453125e+02, 3.024179992675781e+02, 3.01633056640625e+02, 3.023347473144531e+02, 3.009332580566406e+02, 3.015063171386719e+02, 3.021380310058594e+02, 3.026254577636719e+02, 3.034351806640625e+02, 3.066553955078125e+02, 3.066568908691406e+02, 3.061634826660156e+02, 3.0534765625e+02, 3.053199462890625e+02, 3.053578491210938e+02, 3.05419189453125e+02, 3.040821228027344e+02, 3.043345336914062e+02, 3.025797729492188e+02, 3.032073364257812e+02, 3.03553955078125e+02, 3.036551818847656e+02, 3.037847595214844e+02, 3.071876831054688e+02, 3.074523010253906e+02, 3.073836975097656e+02, 3.067694702148438e+02, 3.064862060546875e+02, 3.0655126953125e+02, 3.063692932128906e+02, 3.050359497070312e+02, 3.047777099609375e+02, 3.038135681152344e+02, 3.037921752929688e+02, 3.038440856933594e+02, 3.040820007324219e+02, 3.042504272460938e+02, 3.072449645996094e+02, 3.077250671386719e+02, 3.076525573730469e+02, 3.069716186523438e+02, 3.065411682128906e+02, 3.065861511230469e+02, 3.065553894042969e+02, 3.060817260742188e+02, 3.051850280761719e+02, 3.053847351074219e+02, 3.0398486328125e+02, 3.042107849121094e+02, 3.043866271972656e+02, 3.045093688964844e+02, 3.060777893066406e+02, 3.076077270507812e+02, 3.0719580078125e+02, 3.069580078125e+02, 3.068231506347656e+02, 3.055002136230469e+02, 3.054342956542969e+02, 3.058315124511719e+02, 3.048770751953125e+02, 3.051698913574219e+02, 3.034613342285156e+02, 3.040293273925781e+02]
-bui[1].ets.senMasFloHeaWat.m_flow=[0e+00, 0e+00, 1.907802186906338e-02, 5.650922283530235e-02, 4.913886070251465e+00, 6.830461502075195e+00, 7.486810207366943e+00, 4.836093902587888e+00, 4.913466453552246e+00, 5.776059150695801e+00, 3.992825746536255e+00, 9.629751555621624e-03, 9.316707029938698e-03, 9.218022227287292e-03, 1.526960264891391e-02, 1.419278383255005e-01, 9.883195161819458e-01, 1.63261926174164e+00, 4.040690422058105e+00, 8.464424133300781e+00, 9.764196395874023e+00, 6.66143798828125e+00, 4.263032913208008e+00, 5.813726902008057e+00, 5.221812725067139e+00, 1.176953315734863e-02, 9.36212670058012e-03, 9.239771403372288e-03, 4.137039557099385e-02, 1.511259824037552e-01, 5.184541344642639e-01, 1.143440723419189e+00, 2.360296726226807e+00, 7.682586669921875e+00, 8.79878330230712e+00, 5.259971141815186e+00, 6.512159109115601e-01, 4.391359090805054e-01, 1.75006628036499e+00, 2.53130316734314e-01, 9.43696778267622e-03, 9.280359372496605e-03, 9.2045608907938e-03, 9.154973551630974e-03, 1.349500473588705e-02, 1.353709846735001e-01, 8.986884951591492e-01, 7.134055137634277e+00, 9.59162712097168e+00, 9.151237487792969e+00, 4.245627403259277e+00, 5.315555572509766e+00, 6.520086765289307e+00, 3.742336750030518e+00, 9.534734301269054e-03, 9.297775104641914e-03, 1.431833859533101e-02, 1.306172162294371e-01, 6.396066546440125e-01, 1.348366022109985e+00, 1.9562007188797e+00, 5.61201286315918e+00, 9.266173362731934e+00, 1.139950847625732e+01, 8.790456771850586e+00, 8.288570404052734e+00, 1.007950973510742e+01, 7.54924488067627e+00, 1.07034730911253e+00, 9.862239360809193e-01, 1.775656223297119e+00, 2.555433988571167e+00, 2.941936731338501e+00, 3.395514488220215e+00, 3.718926191329956e+00, 4.971457958221436e+00, 5.196498870849609e+00, 5.101318836212158e+00, 5.053286552429199e+00, 5.148354530334473e+00, 5.301048755645752e+00, 5.460617542266846e+00, 5.378552913665774e+00, 4.294852733612061e+00, 4.647029399871826e+00, 4.870942115783691e+00, 5.00563383102417e+00, 5.134284496307373e+00, 5.318195819854736e+00, 5.912323474884033e+00, 6.703351974487305e+00, 6.602551937103271e+00, 6.378395080566406e+00, 6.190916538238525e+00, 6.166208744049072e+00, 6.21066951751709e+00, 6.313164710998535e+00, 5.020211696624756e+00, 5.315396785736084e+00, 5.545042514801025e+00, 5.701092720031738e+00]
-bui[2].ets.senMasFloHeaWat.m_flow=[1.08927321434021e+00, 1.79671745300293e+01, 2.180493354797363e+01, 2.436251831054688e+01, 6.269527435302734e+01, 2.408813095092773e+01, 2.268944358825684e+01, 4.808853149414067e+01, 3.597139739990234e+01, 1.384779453277588e+01, 4.960204315185547e+01, 4.817955780029297e+01, 4.95422248840332e+01, 1.829814338684082e+01, 2.160977363586427e+01, 2.646441459655762e+01, 3.060564613342285e+01, 3.349098205566407e+01, 6.827639770507812e+01, 3.554620742797852e+01, 3.220097351074219e+01, 3.054324150085449e+01, 5.051443099975586e+01, 1.225518608093262e+01, 2.809441375732422e+01, 5.31740837097168e+01, 4.992004013061523e+01, 4.562568283081055e+01, 2.233383560180667e+01, 2.70866870880127e+01, 3.09587345123291e+01, 3.376416778564453e+01, 6.460816955566406e+01, 5.740045928955078e+01, 3.204269409179683e+01, 2.018499183654785e+01, 4.938328170776367e+01, 1.857160806655884e+00, 8.976045608520508e+00, 4.913460540771484e+01, 4.122620391845703e+01, 4.769316482543943e+01, 1.271831130981445e+01, 2.122047233581543e+01, 2.748053359985352e+01, 3.230265426635742e+01, 4.174452972412109e+01, 6.948289489746094e+01, 3.733308792114258e+01, 3.744686889648438e+01, 6.812482452392578e+01, 4.009382247924805e+01, 3.430030059814453e+01, 6.969175720214844e+01, 6.451583862304688e+01, 6.713115692138672e+01, 3.236344909667976e+01, 4.067887496948239e+01, 4.413715744018555e+01, 4.494984817504883e+01, 4.589860534667969e+01, 7.919842529296875e+01, 4.356481552124023e+01, 4.658539581298828e+01, 6.344938659667969e+01, 7.287903594970703e+01, 4.337843322753906e+01, 6.541695404052734e+01, 7.678321838378896e+01, 7.428682708740232e+01, 5.679471206665039e+01, 4.793854141235352e+01, 4.805471420288086e+01, 5.048455810546875e+01, 5.250945281982422e+01, 8.578896331787109e+01, 6.258539199829102e+01, 5.380998229980469e+01, 5.290689849853516e+01, 8.296286010742188e+01, 4.635924530029297e+01, 5.155027389526425e+01, 8.298738098144534e+01, 7.782255554199219e+01, 7.942977142333984e+01, 4.961361694335938e+01, 5.193453216552734e+01, 5.390122985839844e+01, 5.57736701965332e+01, 7.331666564941406e+01, 8.418491363525391e+01, 5.589741516113281e+01, 5.661760711669922e+01, 8.76474609375e+01, 4.510022735595703e+01, 4.644046020507812e+01, 8.080989074707031e+01, 7.410702514648438e+01, 7.663355255126953e+01, 4.206405258178711e+01, 4.870671844482422e+01]
-bui[3].ets.senMasFloHeaWat.m_flow=[1.571464985609055e-01, 3.230412244796753e+00, 5.182394504547119e+00, 6.593263149261475e+00, 2.161738204956055e+01, 2.092423629760742e+01, 1.699715423583984e+01, 1.32317943572998e+01, 1.135350799560547e+01, 1.133976650238037e+01, 1.281250953674316e+01, 8.509868621826172e+00, 9.117294311523438e+00, 1.95711886882782e+00, 3.88479661941529e+00, 6.625373840332031e+00, 8.757404327392578e+00, 1.019299221038819e+01, 2.232814598083496e+01, 2.534109878540039e+01, 2.126129150390625e+01, 1.440527725219727e+01, 9.157331466674805e+00, 9.80192756652832e+00, 1.258892154693604e+01, 9.75942325592041e+00, 7.819098472595215e+00, 7.94261360168457e+00, 2.098289012908953e+00, 5.306403636932373e+00, 7.742763042449951e+00, 9.43496036529541e+00, 1.957863998413086e+01, 2.520588493347168e+01, 2.155153274536129e+01, 1.237326335906982e+01, 5.170730113983154e+00, 2.42679238319397e+00, 5.916656970977783e+00, 7.440210819244385e+00, 2.655096292495728e+00, 6.752601623535141e+00, 4.42267432808876e-02, 1.735890030860901e+00, 5.596066474914551e+00, 8.393915176391602e+00, 1.230936717987061e+01, 2.56763973236084e+01, 2.587418174743652e+01, 2.428684425354004e+01, 2.128597450256348e+01, 2.105667877197266e+01, 2.123509979248047e+01, 2.14673957824707e+01, 1.599416732788086e+01, 1.693587493896484e+01, 8.378566741943382e+00, 1.151760768890379e+01, 1.32868070602417e+01, 1.380863380432129e+01, 1.442563056945801e+01, 2.724171829223633e+01, 2.835367202758789e+01, 2.819833374023438e+01, 2.631973457336426e+01, 2.53229866027832e+01, 2.554408836364746e+01, 2.493022537231445e+01, 2.016318893432612e+01, 1.887987327575683e+01, 1.503536796569824e+01, 1.444330787658691e+01, 1.472090721130371e+01, 1.580730438232422e+01, 1.658689308166504e+01, 2.726524543762207e+01, 2.915072059631348e+01, 2.89786434173584e+01, 2.696047019958496e+01, 2.554960060119629e+01, 2.565094947814941e+01, 2.554215812683106e+01, 2.405457305908208e+01, 2.057926177978516e+01, 2.137322616577148e+01, 1.531962013244629e+01, 1.640749931335449e+01, 1.71845703125e+01, 1.774318504333496e+01, 2.335325050354004e+01, 2.878772926330566e+01, 2.761859512329102e+01, 2.687964057922363e+01, 2.646376037597656e+01, 2.188864135742188e+01, 2.151008605957031e+01, 2.30051097869873e+01, 1.944101715087891e+01, 2.046612548828125e+01, 1.292298316955566e+01, 1.555160045623779e+01]
+bui[3].ets.senTHeaWatSup.T=[2.931499938964844e+02, 3.017325134277344e+02, 3.020586853027344e+02, 3.023055419921875e+02, 3.055233154296875e+02, 3.052616577148438e+02, 3.043056030273438e+02, 3.03513671875e+02, 3.031575927734375e+02, 3.031634216308594e+02, 3.034589233398438e+02, 3.026072998046875e+02, 3.027566833496094e+02, 3.014655151367188e+02, 3.018433227539062e+02, 3.023121337890625e+02, 3.026884155273438e+02, 3.029499816894531e+02, 3.057655944824219e+02, 3.064988098144531e+02, 3.053147888183594e+02, 3.037291870117188e+02, 3.027366943359375e+02, 3.028789978027344e+02, 3.034235534667969e+02, 3.028280029296875e+02, 3.025247497558594e+02, 3.024700927734375e+02, 3.015572204589844e+02, 3.02084716796875e+02, 3.025071105957031e+02, 3.028109436035156e+02, 3.051085510253906e+02, 3.0647314453125e+02, 3.053883972167969e+02, 3.033063659667969e+02, 3.020243835449219e+02, 3.015947570800781e+02, 3.02200439453125e+02, 3.024179992675781e+02, 3.01633056640625e+02, 3.023347473144531e+02, 3.009332580566406e+02, 3.015063171386719e+02, 3.021380310058594e+02, 3.026254577636719e+02, 3.034351806640625e+02, 3.066553955078125e+02, 3.066568908691406e+02, 3.061634826660156e+02, 3.0534765625e+02, 3.053199462890625e+02, 3.053578491210938e+02, 3.05419189453125e+02, 3.040821228027344e+02, 3.043345336914062e+02, 3.025797729492188e+02, 3.032073364257812e+02, 3.03553955078125e+02, 3.036551818847656e+02, 3.037847595214844e+02, 3.071876831054688e+02, 3.074523010253906e+02, 3.073836975097656e+02, 3.067694702148438e+02, 3.064862060546875e+02, 3.0655126953125e+02, 3.063692932128906e+02, 3.050359497070312e+02, 3.047777099609375e+02, 3.038135681152344e+02, 3.037921752929688e+02, 3.038440246582031e+02, 3.040820007324219e+02, 3.042504272460938e+02, 3.072449645996094e+02, 3.077250671386719e+02, 3.076525573730469e+02, 3.069716186523438e+02, 3.065411682128906e+02, 3.065861511230469e+02, 3.065553894042969e+02, 3.060817260742188e+02, 3.051850280761719e+02, 3.053847351074219e+02, 3.0398486328125e+02, 3.042107849121094e+02, 3.043866577148438e+02, 3.045093688964844e+02, 3.060777893066406e+02, 3.076077270507812e+02, 3.0719580078125e+02, 3.069580078125e+02, 3.068231506347656e+02, 3.055002136230469e+02, 3.054342956542969e+02, 3.058315124511719e+02, 3.048771057128906e+02, 3.051698913574219e+02, 3.034613342285156e+02, 3.040293579101562e+02]
+bui[1].ets.senMasFloHeaWat.m_flow=[0e+00, 0e+00, 1.90779734402895e-02, 5.651187151670456e-02, 4.913888931274414e+00, 6.830461502075195e+00, 7.486774921417236e+00, 4.83609342575073e+00, 4.91346549987793e+00, 5.776059150695801e+00, 3.992825746536255e+00, 9.62973665446043e-03, 9.316705167293549e-03, 9.218021295964718e-03, 1.52693642303348e-02, 1.419278383255005e-01, 9.882616400718689e-01, 1.63261926174164e+00, 4.040690422058105e+00, 8.464424133300781e+00, 9.764196395874023e+00, 6.661437511444092e+00, 4.263031482696533e+00, 5.813726902008057e+00, 5.221812725067139e+00, 1.175703201442957e-02, 9.362145327031612e-03, 9.239783510565758e-03, 4.137040674686475e-02, 1.511251628398895e-01, 5.184543132781982e-01, 1.14342725276947e+00, 2.360296487808228e+00, 7.682586193084717e+00, 8.79878330230712e+00, 5.259971141815186e+00, 6.51215672492981e-01, 4.391359984874725e-01, 1.75006628036499e+00, 2.531303763389587e-01, 9.436872787773609e-03, 9.280323050916195e-03, 9.20453853905201e-03, 9.15495865046978e-03, 1.349493768066168e-02, 1.353709697723389e-01, 8.986884951591492e-01, 7.13408899307251e+00, 9.59162712097168e+00, 9.151237487792969e+00, 4.245636463165283e+00, 5.315510749816895e+00, 6.520086765289307e+00, 3.742335081100464e+00, 9.534573182463646e-03, 9.29771363735199e-03, 1.431834045797616e-02, 1.306172162294371e-01, 6.396065354347229e-01, 1.348370432853699e+00, 1.9562007188797e+00, 5.612012386322021e+00, 9.26617431640625e+00, 1.139950847625732e+01, 8.790456771850586e+00, 8.288582801818848e+00, 1.007950973510742e+01, 7.549244403839111e+00, 1.070347547531109e+00, 9.862239956855641e-01, 1.775656223297119e+00, 2.555433988571167e+00, 2.941929578781128e+00, 3.395514249801636e+00, 3.71892237663269e+00, 4.971458435058594e+00, 5.196498870849609e+00, 5.101318359375e+00, 5.053286075592041e+00, 5.148354530334473e+00, 5.301048755645752e+00, 5.460616588592529e+00, 5.378552913665774e+00, 4.294853210449219e+00, 4.647029399871826e+00, 4.870942115783691e+00, 5.005632877349854e+00, 5.134357929229736e+00, 5.318195819854736e+00, 5.912322998046875e+00, 6.703351974487305e+00, 6.602551937103271e+00, 6.378395080566406e+00, 6.190916538238525e+00, 6.166208744049072e+00, 6.21066951751709e+00, 6.313164710998535e+00, 5.020244598388672e+00, 5.315397262573242e+00, 5.545042514801025e+00, 5.701093196868896e+00]
+bui[2].ets.senMasFloHeaWat.m_flow=[1.08927321434021e+00, 1.79671745300293e+01, 2.180493354797363e+01, 2.436249923706055e+01, 6.269527435302734e+01, 2.408813285827637e+01, 2.268926811218262e+01, 4.808830261230474e+01, 3.5971435546875e+01, 1.38477954864502e+01, 4.960206604003906e+01, 4.817956161499023e+01, 4.95422248840332e+01, 1.82980785369873e+01, 2.16097812652588e+01, 2.646441459655762e+01, 3.060564613342285e+01, 3.349098205566407e+01, 6.827639770507812e+01, 3.554620742797852e+01, 3.220095062255859e+01, 3.054323959350586e+01, 5.051442718505859e+01, 1.225518608093262e+01, 2.809441375732422e+01, 5.317406463623047e+01, 4.992002487182617e+01, 4.562567138671875e+01, 2.233383941650393e+01, 2.708668327331543e+01, 3.09587345123291e+01, 3.376409912109375e+01, 6.460850524902344e+01, 5.740045928955078e+01, 3.204269027709957e+01, 2.018499183654785e+01, 4.93832893371582e+01, 1.857159376144409e+00, 8.976045608520508e+00, 4.913461303710938e+01, 4.122620391845703e+01, 4.769316482543943e+01, 1.271831321716309e+01, 2.122047233581543e+01, 2.748053169250488e+01, 3.230265426635742e+01, 4.174452972412109e+01, 6.948289489746094e+01, 3.733308792114258e+01, 3.744686508178711e+01, 6.812449645996094e+01, 4.009381866455078e+01, 3.430030059814453e+01, 6.969178009033203e+01, 6.451583862304688e+01, 6.713116455078125e+01, 3.236344909667976e+01, 4.067887115478512e+01, 4.413715362548828e+01, 4.494986724853516e+01, 4.589860534667969e+01, 7.919842529296875e+01, 4.356482315063477e+01, 4.658539581298828e+01, 6.344939041137695e+01, 7.287892150878906e+01, 4.337843322753906e+01, 6.541706848144531e+01, 7.678321838378896e+01, 7.428682708740232e+01, 5.679470443725586e+01, 4.793853759765625e+01, 4.805407333374023e+01, 5.048455047607422e+01, 5.250943374633789e+01, 8.578896331787109e+01, 6.258535003662109e+01, 5.380999374389648e+01, 5.290679931640625e+01, 8.296286010742188e+01, 4.635925674438477e+01, 5.155051803588925e+01, 8.298738098144534e+01, 7.782255554199219e+01, 7.942977905273438e+01, 4.961361694335938e+01, 5.193452072143555e+01, 5.390143585205078e+01, 5.57736701965332e+01, 7.331665802001953e+01, 8.418491363525391e+01, 5.589741897583008e+01, 5.661760330200195e+01, 8.764745330810547e+01, 4.510022735595703e+01, 4.644046020507812e+01, 8.080989074707031e+01, 7.410712432861328e+01, 7.663355255126953e+01, 4.206405258178711e+01, 4.870687866210938e+01]
+bui[3].ets.senMasFloHeaWat.m_flow=[1.571464985609055e-01, 3.230412244796753e+00, 5.182394504547119e+00, 6.593258380889893e+00, 2.161738204956055e+01, 2.092423820495605e+01, 1.699713516235352e+01, 1.32317943572998e+01, 1.135350513458252e+01, 1.133976554870605e+01, 1.281250953674316e+01, 8.509869575500488e+00, 9.117295265197754e+00, 1.957125186920166e+00, 3.884798049926765e+00, 6.625373840332031e+00, 8.757404327392578e+00, 1.019299221038819e+01, 2.232814598083496e+01, 2.534109878540039e+01, 2.126128387451172e+01, 1.440527629852295e+01, 9.157327651977539e+00, 9.801926612854004e+00, 1.258892154693604e+01, 9.759393692016602e+00, 7.819103717803955e+00, 7.942611217498779e+00, 2.098288059234637e+00, 5.30640172958374e+00, 7.742763042449951e+00, 9.434930801391602e+00, 1.957868766784668e+01, 2.520588493347168e+01, 2.155153274536129e+01, 1.237326335906982e+01, 5.170730113983154e+00, 2.426792621612549e+00, 5.916656970977783e+00, 7.440210819244385e+00, 2.655096292495728e+00, 6.752601623535141e+00, 4.422673210501671e-02, 1.735891819000244e+00, 5.596065521240234e+00, 8.393915176391602e+00, 1.230936717987061e+01, 2.56763973236084e+01, 2.587418174743652e+01, 2.428684043884277e+01, 2.128597831726074e+01, 2.105667877197266e+01, 2.123509979248047e+01, 2.146739387512207e+01, 1.599416637420654e+01, 1.693587684631348e+01, 8.378566741943382e+00, 1.151760673522947e+01, 1.328680515289307e+01, 1.380863952636719e+01, 1.442563056945801e+01, 2.724171829223633e+01, 2.835367202758789e+01, 2.819833374023438e+01, 2.631973457336426e+01, 2.532299041748047e+01, 2.554409027099609e+01, 2.493022537231445e+01, 2.016318893432612e+01, 1.887987327575683e+01, 1.503536701202393e+01, 1.444330787658691e+01, 1.47207498550415e+01, 1.580730247497559e+01, 1.658688163757324e+01, 2.726524543762207e+01, 2.915072059631348e+01, 2.897863960266113e+01, 2.696045875549316e+01, 2.554960060119629e+01, 2.565094947814941e+01, 2.554215812683106e+01, 2.405457305908208e+01, 2.057926177978516e+01, 2.137322616577148e+01, 1.531962108612061e+01, 1.640749359130859e+01, 1.718465805053711e+01, 1.774318504333496e+01, 2.335324859619141e+01, 2.87877311706543e+01, 2.761859512329102e+01, 2.6879638671875e+01, 2.646376037597656e+01, 2.188864135742188e+01, 2.151008605957031e+01, 2.30051097869873e+01, 1.944108772277832e+01, 2.046612548828125e+01, 1.292298316955566e+01, 1.55516529083252e+01]
 bui[1].ets.TChiWatSupSet=[2.911499938964844e+02, 2.911499938964844e+02]
 bui[1].ets.senTChiWatSup.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
 bui[2].ets.TChiWatSupSet=[2.911499938964844e+02, 2.911499938964844e+02]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Examples_Combined_SeriesVariableFlowAgentControl.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Examples_Combined_SeriesVariableFlowAgentControl.txt
index e1e6b8ed074..cc48d9128ce 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Examples_Combined_SeriesVariableFlowAgentControl.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Examples_Combined_SeriesVariableFlowAgentControl.txt
@@ -1,4 +1,4 @@
-last-generated=2024-06-25
+last-generated=2024-06-26
 statistics-initialization=
 {
   "nonlinear": "1, 1, 1, 0, 1, 0, 1, 1, 1, 1, 2, 0, 2, 0, 2, 0, 2, 0, 2, 0, 2, 0, 1, 0, 4, 4, 4,   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1",
@@ -7,25 +7,25 @@ statistics-initialization=
 statistics-simulation=
 {
   "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2,   2, 2",
-  "nonlinear": "2, 2, 2, 2, 2, 2, 1, 1, 1, 4, 1, 4, 1, 1, 1, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1",
+  "nonlinear": "2, 2, 2, 2, 2, 2, 1, 4, 1, 4, 1, 1, 1, 1, 1, 1, 1, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1",
   "number of continuous time states": "190",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 6.048e+05]
-borFie.TBorAve=[2.853500061035156e+02, 2.853500061035156e+02, 2.853500061035156e+02, 2.853500061035156e+02, 2.853500061035156e+02, 2.853500061035156e+02, 2.853328247070312e+02, 2.852917175292969e+02, 2.852596435546875e+02, 2.852127380371094e+02, 2.851986694335938e+02, 2.851492614746094e+02, 2.85097900390625e+02, 2.850602111816406e+02, 2.85083251953125e+02, 2.851033325195312e+02, 2.851008605957031e+02, 2.850926513671875e+02, 2.850745849609375e+02, 2.849748229980469e+02, 2.849440307617188e+02, 2.84935302734375e+02, 2.849270935058594e+02, 2.84914794921875e+02, 2.849449157714844e+02, 2.849443359375e+02, 2.849107666015625e+02, 2.848882141113281e+02, 2.849064331054688e+02, 2.8495166015625e+02, 2.849603881835938e+02, 2.849619445800781e+02, 2.84959228515625e+02, 2.848789367675781e+02, 2.848376770019531e+02, 2.848385009765625e+02, 2.84863525390625e+02, 2.84858642578125e+02, 2.849017639160156e+02, 2.8493310546875e+02, 2.849139099121094e+02, 2.848993225097656e+02, 2.848914489746094e+02, 2.849385375976562e+02, 2.849687805175781e+02, 2.849609680175781e+02, 2.849501647949219e+02, 2.848837585449219e+02, 2.848192138671875e+02, 2.8479248046875e+02, 2.847696838378906e+02, 2.847119445800781e+02, 2.847149963378906e+02, 2.847168884277344e+02, 2.846665954589844e+02, 2.8463623046875e+02, 2.846181640625e+02, 2.846598510742188e+02, 2.846842956542969e+02, 2.846996765136719e+02, 2.847075805664062e+02, 2.846780395507812e+02, 2.84591064453125e+02, 2.845694885253906e+02, 2.845527954101562e+02, 2.844955749511719e+02, 2.844790344238281e+02, 2.844850158691406e+02, 2.844389953613281e+02, 2.844065551757812e+02, 2.843832702636719e+02, 2.844287719726562e+02, 2.84465576171875e+02, 2.844908142089844e+02, 2.845048828125e+02, 2.844952087402344e+02, 2.844067077636719e+02, 2.843804016113281e+02, 2.843793640136719e+02, 2.843529357910156e+02, 2.843123779296875e+02, 2.843342590332031e+02, 2.84315673828125e+02, 2.84268798828125e+02, 2.842366638183594e+02, 2.842596130371094e+02, 2.843026733398438e+02, 2.843333740234375e+02, 2.843509521484375e+02, 2.843564758300781e+02, 2.842849426269531e+02, 2.842444152832031e+02, 2.842484130859375e+02, 2.842411804199219e+02, 2.841893310546875e+02, 2.842308349609375e+02, 2.8424267578125e+02, 2.842014770507812e+02, 2.841785278320312e+02, 2.841779174804688e+02, 2.842372436523438e+02]
-bui[1].ets.volMix_a.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931465148925781e+02, 2.93146484375e+02, 2.918872375488281e+02, 2.900940246582031e+02, 2.874449157714844e+02, 2.858641967773438e+02, 2.856288452148438e+02, 2.855132446289062e+02, 2.856223754882812e+02, 2.855520629882812e+02, 2.855520629882812e+02, 2.855520629882812e+02, 2.855538024902344e+02, 2.855538024902344e+02, 2.855568542480469e+02, 2.855471496582031e+02, 2.854190673828125e+02, 2.847262268066406e+02, 2.850460510253906e+02, 2.852319030761719e+02, 2.850919189453125e+02, 2.852220458984375e+02, 2.855119323730469e+02, 2.854267578125e+02, 2.854267578125e+02, 2.854267578125e+02, 2.854220275878906e+02, 2.854260559082031e+02, 2.854323425292969e+02, 2.854381103515625e+02, 2.85419189453125e+02, 2.846890258789062e+02, 2.848697509765625e+02, 2.851647033691406e+02, 2.852975158691406e+02, 2.852687072753906e+02, 2.854054260253906e+02, 2.855297241210938e+02, 2.855292663574219e+02, 2.855292663574219e+02, 2.855292663574219e+02, 2.855292663574219e+02, 2.855311889648438e+02, 2.855304565429688e+02, 2.855121459960938e+02, 2.848909301757812e+02, 2.8468994140625e+02, 2.84783935546875e+02, 2.847879333496094e+02, 2.845074157714844e+02, 2.84830322265625e+02, 2.8482861328125e+02, 2.847175903320312e+02, 2.847175903320312e+02, 2.847117919921875e+02, 2.847128601074219e+02, 2.847484741210938e+02, 2.848233032226562e+02, 2.848842163085938e+02, 2.846043701171875e+02, 2.841882019042969e+02, 2.843257751464844e+02, 2.843201293945312e+02, 2.839779052734375e+02, 2.842731628417969e+02, 2.843329772949219e+02, 2.840833435058594e+02, 2.840606384277344e+02, 2.84017822265625e+02, 2.842650451660156e+02, 2.844425659179688e+02, 2.845451354980469e+02, 2.845585632324219e+02, 2.843908996582031e+02, 2.839092712402344e+02, 2.840177917480469e+02, 2.840781860351562e+02, 2.838897705078125e+02, 2.838915100097656e+02, 2.840779418945312e+02, 2.838611450195312e+02, 2.837496643066406e+02, 2.836963806152344e+02, 2.840186157226562e+02, 2.842151184082031e+02, 2.842779846191406e+02, 2.842735595703125e+02, 2.842528381347656e+02, 2.836925659179688e+02, 2.838146667480469e+02, 2.838909301757812e+02, 2.837603149414062e+02, 2.836617431640625e+02, 2.840518798828125e+02, 2.839292297363281e+02, 2.836964416503906e+02, 2.836676025390625e+02, 2.838462829589844e+02, 2.842048950195312e+02]
-bui[1].ets.volMix_b.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.910553588867188e+02, 2.871184692382812e+02, 2.848776245117188e+02, 2.825805053710938e+02, 2.819490051269531e+02, 2.815443115234375e+02, 2.816033325195312e+02, 2.816401977539062e+02, 2.816401977539062e+02, 2.816401977539062e+02, 2.81646240234375e+02, 2.816462097167969e+02, 2.816236267089844e+02, 2.815934753417969e+02, 2.815232543945312e+02, 2.808989562988281e+02, 2.809635620117188e+02, 2.811828918457031e+02, 2.812169494628906e+02, 2.811205139160156e+02, 2.813971557617188e+02, 2.815040588378906e+02, 2.815040588378906e+02, 2.815040588378906e+02, 2.8151025390625e+02, 2.815087280273438e+02, 2.814988708496094e+02, 2.814756469726562e+02, 2.81447509765625e+02, 2.809606628417969e+02, 2.807612609863281e+02, 2.81061279296875e+02, 2.812009582519531e+02, 2.812070922851562e+02, 2.812362670898438e+02, 2.813371276855469e+02, 2.813386535644531e+02, 2.813386535644531e+02, 2.813386535644531e+02, 2.813386535644531e+02, 2.8134912109375e+02, 2.813503112792969e+02, 2.813661804199219e+02, 2.811553039550781e+02, 2.806500854492188e+02, 2.807872009277344e+02, 2.808403930664062e+02, 2.806339721679688e+02, 2.806929016113281e+02, 2.808646240234375e+02, 2.808760986328125e+02, 2.808760986328125e+02, 2.808809509277344e+02, 2.808804016113281e+02, 2.808603820800781e+02, 2.80833251953125e+02, 2.808390808105469e+02, 2.807606811523438e+02, 2.802253112792969e+02, 2.803193969726562e+02, 2.803503112792969e+02, 2.800777282714844e+02, 2.801579895019531e+02, 2.803516235351562e+02, 2.803052673339844e+02, 2.802598266601562e+02, 2.801729736328125e+02, 2.801533813476562e+02, 2.80272216796875e+02, 2.804147338867188e+02, 2.805055847167969e+02, 2.804980163574219e+02, 2.801409606933594e+02, 2.800082397460938e+02, 2.800453186035156e+02, 2.800100402832031e+02, 2.79869873046875e+02, 2.800005493164062e+02, 2.799851379394531e+02, 2.798348999023438e+02, 2.797477416992188e+02, 2.798096313476562e+02, 2.800787048339844e+02, 2.80219970703125e+02, 2.802649230957031e+02, 2.802558288574219e+02, 2.7989990234375e+02, 2.7975537109375e+02, 2.79858642578125e+02, 2.79861572265625e+02, 2.796733703613281e+02, 2.799009094238281e+02, 2.800276489257812e+02, 2.798092651367188e+02, 2.797069091796875e+02, 2.797021179199219e+02, 2.800523376464844e+02]
-bui[2].ets.volMix_a.T=[2.931499938964844e+02, 2.929879760742188e+02, 2.923764953613281e+02, 2.915163879394531e+02, 2.874219970703125e+02, 2.853088073730469e+02, 2.865248413085938e+02, 2.853809509277344e+02, 2.840917663574219e+02, 2.844617614746094e+02, 2.84455078125e+02, 2.84998046875e+02, 2.851278076171875e+02, 2.850822448730469e+02, 2.846264343261719e+02, 2.852132568359375e+02, 2.854696350097656e+02, 2.853922424316406e+02, 2.848416748046875e+02, 2.843595886230469e+02, 2.842341918945312e+02, 2.843190307617188e+02, 2.8462109375e+02, 2.846112365722656e+02, 2.845841674804688e+02, 2.847453308105469e+02, 2.849864807128906e+02, 2.849400939941406e+02, 2.845378723144531e+02, 2.84632568359375e+02, 2.852944030761719e+02, 2.853341369628906e+02, 2.85105712890625e+02, 2.843157653808594e+02, 2.841924743652344e+02, 2.843080139160156e+02, 2.842336120605469e+02, 2.848264465332031e+02, 2.848920288085938e+02, 2.83827880859375e+02, 2.849239807128906e+02, 2.849723815917969e+02, 2.850345153808594e+02, 2.842442626953125e+02, 2.845275573730469e+02, 2.852767639160156e+02, 2.853384094238281e+02, 2.844656982421875e+02, 2.841526184082031e+02, 2.841271057128906e+02, 2.844303283691406e+02, 2.842255554199219e+02, 2.842718505859375e+02, 2.8450634765625e+02, 2.843440856933594e+02, 2.8437890625e+02, 2.843282165527344e+02, 2.849404907226562e+02, 2.849929809570312e+02, 2.849088439941406e+02, 2.84842529296875e+02, 2.842520141601562e+02, 2.837946472167969e+02, 2.837328186035156e+02, 2.837808837890625e+02, 2.836750793457031e+02, 2.836382446289062e+02, 2.838495788574219e+02, 2.838373107910156e+02, 2.839464721679688e+02, 2.838742980957031e+02, 2.843109436035156e+02, 2.843809204101562e+02, 2.843961181640625e+02, 2.8435107421875e+02, 2.841301574707031e+02, 2.836253051757812e+02, 2.838226623535156e+02, 2.838672485351562e+02, 2.836156005859375e+02, 2.836409606933594e+02, 2.838453063964844e+02, 2.835810241699219e+02, 2.835885620117188e+02, 2.835304870605469e+02, 2.837654724121094e+02, 2.839716796875e+02, 2.840120544433594e+02, 2.839978942871094e+02, 2.839908142089844e+02, 2.834118041992188e+02, 2.835487670898438e+02, 2.836307373046875e+02, 2.835032653808594e+02, 2.834066162109375e+02, 2.837314453125e+02, 2.836474609375e+02, 2.834773559570312e+02, 2.834861755371094e+02, 2.834993591308594e+02, 2.838919677734375e+02]
-bui[2].ets.volMix_b.T=[2.931499938964844e+02, 2.907112731933594e+02, 2.893207092285156e+02, 2.882584228515625e+02, 2.8452587890625e+02, 2.821005249023438e+02, 2.819524536132812e+02, 2.819225769042969e+02, 2.799496459960938e+02, 2.801759643554688e+02, 2.803783874511719e+02, 2.8082080078125e+02, 2.811002807617188e+02, 2.811379699707031e+02, 2.809724731445312e+02, 2.809385070800781e+02, 2.813160705566406e+02, 2.814028015136719e+02, 2.809811401367188e+02, 2.805904235839844e+02, 2.803208923339844e+02, 2.802753601074219e+02, 2.805274963378906e+02, 2.806529541015625e+02, 2.805774841308594e+02, 2.805527648925781e+02, 2.808997802734375e+02, 2.809908447265625e+02, 2.809057312011719e+02, 2.804571533203125e+02, 2.809930419921875e+02, 2.812746887207031e+02, 2.811549072265625e+02, 2.805274658203125e+02, 2.802801818847656e+02, 2.802695922851562e+02, 2.80107177734375e+02, 2.806574401855469e+02, 2.806968383789062e+02, 2.802166748046875e+02, 2.807377319335938e+02, 2.808567199707031e+02, 2.810582885742188e+02, 2.807896118164062e+02, 2.802878723144531e+02, 2.809412841796875e+02, 2.812518615722656e+02, 2.806852722167969e+02, 2.802848205566406e+02, 2.801476440429688e+02, 2.802569885253906e+02, 2.803330993652344e+02, 2.802434387207031e+02, 2.803949584960938e+02, 2.8034814453125e+02, 2.80380126953125e+02, 2.804050903320312e+02, 2.806870422363281e+02, 2.809660034179688e+02, 2.809359436035156e+02, 2.808688049316406e+02, 2.80469482421875e+02, 2.799301147460938e+02, 2.797674865722656e+02, 2.796793212890625e+02, 2.797394104003906e+02, 2.796415405273438e+02, 2.797081604003906e+02, 2.79825439453125e+02, 2.799351806640625e+02, 2.79962158203125e+02, 2.80123046875e+02, 2.803500671386719e+02, 2.803922729492188e+02, 2.803640441894531e+02, 2.801932983398438e+02, 2.79742919921875e+02, 2.797659301757812e+02, 2.798520812988281e+02, 2.796974487304688e+02, 2.796309509277344e+02, 2.797995300292969e+02, 2.796493225097656e+02, 2.795726928710938e+02, 2.795414733886719e+02, 2.796218872070312e+02, 2.799269714355469e+02, 2.799981079101562e+02, 2.800019226074219e+02, 2.799188232421875e+02, 2.794837646484375e+02, 2.794797058105469e+02, 2.796134643554688e+02, 2.795686950683594e+02, 2.794809875488281e+02, 2.796181945800781e+02, 2.797214965820312e+02, 2.794791870117188e+02, 2.794911804199219e+02, 2.795113525390625e+02, 2.797992858886719e+02]
-bui[3].ets.volMix_a.T=[2.931499938964844e+02, 2.93023681640625e+02, 2.924556884765625e+02, 2.913321533203125e+02, 2.878018798828125e+02, 2.835539245605469e+02, 2.829482727050781e+02, 2.831348876953125e+02, 2.813949279785156e+02, 2.825965270996094e+02, 2.822958679199219e+02, 2.810056457519531e+02, 2.810040893554688e+02, 2.811043395996094e+02, 2.811898193359375e+02, 2.812481994628906e+02, 2.814041137695312e+02, 2.815277404785156e+02, 2.813285827636719e+02, 2.817559509277344e+02, 2.820597534179688e+02, 2.820223388671875e+02, 2.809834594726562e+02, 2.820475158691406e+02, 2.825196838378906e+02, 2.810542907714844e+02, 2.808783874511719e+02, 2.809563903808594e+02, 2.810304565429688e+02, 2.810567016601562e+02, 2.811810607910156e+02, 2.813683776855469e+02, 2.814068603515625e+02, 2.812507934570312e+02, 2.821747131347656e+02, 2.820325622558594e+02, 2.814414978027344e+02, 2.812286682128906e+02, 2.824026489257812e+02, 2.820704040527344e+02, 2.811612243652344e+02, 2.80916015625e+02, 2.809346618652344e+02, 2.809549255371094e+02, 2.809958190917969e+02, 2.811600952148438e+02, 2.813863220214844e+02, 2.812332153320312e+02, 2.821911010742188e+02, 2.818982543945312e+02, 2.811082458496094e+02, 2.812553100585938e+02, 2.820549621582031e+02, 2.810977478027344e+02, 2.808014221191406e+02, 2.808083190917969e+02, 2.809627990722656e+02, 2.81166259765625e+02, 2.813106689453125e+02, 2.8133642578125e+02, 2.813217468261719e+02, 2.809512023925781e+02, 2.81672607421875e+02, 2.815702209472656e+02, 2.813659973144531e+02, 2.806631469726562e+02, 2.816297302246094e+02, 2.812915649414062e+02, 2.805196228027344e+02, 2.805722045898438e+02, 2.806251525878906e+02, 2.810061950683594e+02, 2.811124572753906e+02, 2.811299438476562e+02, 2.811100158691406e+02, 2.807283935546875e+02, 2.808979797363281e+02, 2.814101867675781e+02, 2.814038391113281e+02, 2.804812927246094e+02, 2.815018920898438e+02, 2.813787231445312e+02, 2.804592590332031e+02, 2.804211120605469e+02, 2.803852233886719e+02, 2.80843505859375e+02, 2.809598999023438e+02, 2.809796142578125e+02, 2.809615783691406e+02, 2.808684387207031e+02, 2.804399108886719e+02, 2.812339782714844e+02, 2.811856689453125e+02, 2.803775939941406e+02, 2.80906982421875e+02, 2.812912902832031e+02, 2.805403747558594e+02, 2.804293212890625e+02, 2.804176940917969e+02, 2.807664489746094e+02, 2.809525756835938e+02]
-bui[3].ets.volMix_b.T=[2.931499938964844e+02, 2.919476013183594e+02, 2.903473510742188e+02, 2.888741760253906e+02, 2.849490356445312e+02, 2.806016845703125e+02, 2.787611083984375e+02, 2.791642150878906e+02, 2.782038269042969e+02, 2.780986022949219e+02, 2.784778747558594e+02, 2.774477844238281e+02, 2.770724487304688e+02, 2.77118408203125e+02, 2.771166687011719e+02, 2.771574096679688e+02, 2.772705078125e+02, 2.774283752441406e+02, 2.774026489257812e+02, 2.774553833007812e+02, 2.781520385742188e+02, 2.780270385742188e+02, 2.774285888671875e+02, 2.774315795898438e+02, 2.783692321777344e+02, 2.776233520507812e+02, 2.770760498046875e+02, 2.769620971679688e+02, 2.770086975097656e+02, 2.770141296386719e+02, 2.770694274902344e+02, 2.772256774902344e+02, 2.773280944824219e+02, 2.772111206054688e+02, 2.781610717773438e+02, 2.780457458496094e+02, 2.779125671386719e+02, 2.774948120117188e+02, 2.777031860351562e+02, 2.783143310546875e+02, 2.777899169921875e+02, 2.7723828125e+02, 2.771553955078125e+02, 2.77140869140625e+02, 2.770530090332031e+02, 2.770630187988281e+02, 2.772200012207031e+02, 2.772278747558594e+02, 2.780157470703125e+02, 2.779140930175781e+02, 2.775672607421875e+02, 2.770401000976562e+02, 2.780826110839844e+02, 2.775423583984375e+02, 2.768738403320312e+02, 2.768058166503906e+02, 2.768877563476562e+02, 2.770438232421875e+02, 2.772276306152344e+02, 2.773179321289062e+02, 2.773231811523438e+02, 2.769746704101562e+02, 2.773586120605469e+02, 2.775914611816406e+02, 2.774908447265625e+02, 2.76643798828125e+02, 2.775859680175781e+02, 2.774373168945312e+02, 2.766072387695312e+02, 2.765588684082031e+02, 2.766132507324219e+02, 2.768724365234375e+02, 2.770604858398438e+02, 2.771177978515625e+02, 2.771156311035156e+02, 2.768356628417969e+02, 2.767213439941406e+02, 2.774241638183594e+02, 2.7741015625e+02, 2.765755004882812e+02, 2.772300109863281e+02, 2.773814697265625e+02, 2.765851440429688e+02, 2.764211730957031e+02, 2.763992309570312e+02, 2.76673583984375e+02, 2.769072265625e+02, 2.769691772460938e+02, 2.769673156738281e+02, 2.76877197265625e+02, 2.764518432617188e+02, 2.772188720703125e+02, 2.7718505859375e+02, 2.766123962402344e+02, 2.766054077148438e+02, 2.772758178710938e+02, 2.767960815429688e+02, 2.764507141113281e+02, 2.76421875e+02, 2.765760498046875e+02, 2.768662414550781e+02]
-ETot.y=[0e+00, 4.28436992e+08, 8.55840192e+08, 1.18526016e+09, 2.194828032e+09, 3.19123968e+09, 3.974635776e+09, 4.752461824000002e+09, 5.913414144e+09, 6.492882432e+09, 7.19870208e+09, 8.362564096e+09, 9.40379648e+09, 1.0364967936e+10, 1.0660614144e+10, 1.109871104e+10, 1.1615960064e+10, 1.2201122816e+10, 1.3205920768e+10, 1.4775370752e+10, 1.5845293056e+10, 1.6713056256e+10, 1.7913550848e+10, 1.8578802688e+10, 1.9188262912e+10, 2.0368461824e+10, 2.1442453504e+10, 2.2591848448e+10, 2.296691712e+10, 2.3399241728e+10, 2.3911911424e+10, 2.4488210432e+10, 2.5305020416e+10, 2.707730432e+10, 2.815746048e+10, 2.8963629056e+10, 2.9881769984e+10, 3.0529476608e+10, 3.0875230208e+10, 3.1695417344e+10, 3.2650942464e+10, 3.364571136e+10, 3.415999488e+10, 3.4447159296e+10, 3.4865553408e+10, 3.5394535424e+10, 3.6008472576e+10, 3.7675024384e+10, 3.9012548608e+10, 4.02061312e+10, 4.1504018432e+10, 4.3027546112e+10, 4.397131776e+10, 4.5213917184e+10, 4.6846849024e+10, 4.8372932608e+10, 4.961678950400001e+10, 5.028126310399999e+10, 5.1046313984e+10, 5.186033664e+10, 5.27003648e+10, 5.4342332416e+10, 5.619324928e+10, 5.7646411776e+10, 5.91182848e+10, 6.1302308864e+10, 6.2675357696e+10, 6.4042020864e+10, 6.611764838400002e+10, 6.796491161599998e+10, 6.9766602752e+10, 7.0604120064e+10, 7.1512768512e+10, 7.2456503296e+10, 7.3462112256e+10, 7.4970251264e+10, 7.732989952e+10, 7.8811643904e+10, 8.0257277952e+10, 8.2435670016e+10, 8.4087832576e+10, 8.540572057600002e+10, 8.752693247999998e+10, 8.9674235904e+10, 9.1841380352e+10, 9.3001097216e+10, 9.4027333632e+10, 9.5091458048e+10, 9.621413888e+10, 9.7463148544e+10, 1.00081033216e+11, 1.01728452608e+11, 1.03250788352e+11, 1.05296830464e+11, 1.0726854656e+11, 1.0841153536e+11, 1.10087954432e+11, 1.12196722688e+11, 1.14200829952e+11, 1.15634143232e+11, 1.16574650368e+11]
-EHeaPum.y=[0e+00, 1.14079968e+08, 2.59179456e+08, 4.4260032e+08, 1.3300352e+09, 2.210031104e+09, 2.847404032e+09, 3.469066240000001e+09, 4.470375424e+09, 4.891867136e+09, 5.441720832e+09, 6.44442624e+09, 7.333335552e+09, 8.143593984e+09, 8.319418368000001e+09, 8.60352e+09, 8.96361472e+09, 9.390876672000002e+09, 1.0230907904e+10, 1.1618932736e+10, 1.2523252736e+10, 1.3227362304e+10, 1.4262857728e+10, 1.4767019008e+10, 1.5219705856e+10, 1.623593472e+10, 1.7157203968e+10, 1.8153406464e+10, 1.8397280256e+10, 1.8682558464e+10, 1.9036811264e+10, 1.9454111744e+10, 2.0109602816e+10, 2.1695844352e+10, 2.2609268736e+10, 2.3252410368e+10, 2.401035264e+10, 2.4500074496e+10, 2.4713449472e+10, 2.5385172992e+10, 2.6185568256e+10, 2.7028576256e+10, 2.7412936704e+10, 2.758499328e+10, 2.7866310656e+10, 2.8236419072e+10, 2.8690763776e+10, 3.0176520192e+10, 3.1339587584e+10, 3.2366299136e+10, 3.3495263232e+10, 3.483789312e+10, 3.5617878016e+10, 3.6691767296e+10, 3.8145814528e+10, 3.9505055744e+10, 4.058145587200001e+10, 4.108332646399999e+10, 4.1685045248e+10, 4.233555968e+10, 4.3012046848e+10, 4.4465004544e+10, 4.6107582464e+10, 4.7383220224e+10, 4.8677769216e+10, 5.0632966144e+10, 5.1824713728e+10, 5.3018943488e+10, 5.487198617600002e+10, 5.651256934399998e+10, 5.8110078976e+10, 5.878392832e+10, 5.952874496e+10, 6.0308381696e+10, 6.1149085696e+10, 6.2470971392e+10, 6.4570585088e+10, 6.586513408e+10, 6.7129311232e+10, 6.9077663744e+10, 7.0520356864e+10, 7.166413209600002e+10, 7.355785215999998e+10, 7.5467276288e+10, 7.7396328448e+10, 7.8376288256e+10, 7.9236456448e+10, 8.0134094848e+10, 8.1088667648e+10, 8.2165243904e+10, 8.4500226048e+10, 8.593809408e+10, 8.7272333312e+10, 8.9093464064e+10, 9.082421248e+10, 9.1799363584e+10, 9.3280600064e+10, 9.5155830784e+10, 9.6935952384e+10, 9.8173280256e+10, 9.894961152e+10]
-EPum.y=[0e+00, 3.14357024e+08, 5.96660736e+08, 7.4265984e+08, 8.6479296e+08, 9.8120832e+08, 1.127231744e+09, 1.283395968e+09, 1.443038976e+09, 1.601015424e+09, 1.756981376e+09, 1.9181376e+09, 2.0704608e+09, 2.221373696e+09, 2.341196032e+09, 2.495190784e+09, 2.6523456e+09, 2.81024512e+09, 2.975012608e+09, 3.156437248e+09, 3.322040832e+09, 3.485694208e+09, 3.650693632e+09, 3.811783424e+09, 3.968557056e+09, 4.132527104e+09, 4.285248768e+09, 4.438441472e+09, 4.569635328000001e+09, 4.716683264e+09, 4.875099648e+09, 5.0340992e+09, 5.1954176e+09, 5.381459968e+09, 5.548191744000001e+09, 5.711218176e+09, 5.871417344e+09, 6.029403136e+09, 6.161780736e+09, 6.310244864e+09, 6.465375744e+09, 6.617135103999999e+09, 6.747058176e+09, 6.862166528e+09, 6.99924224e+09, 7.158114304e+09, 7.317707776e+09, 7.498504192e+09, 7.67296256e+09, 7.839833088e+09, 8.008756736e+09, 8.189652992e+09, 8.35344128e+09, 8.522149888e+09, 8.701036544e+09, 8.867873792e+09, 9.035331584000002e+09, 9.197937663999998e+09, 9.361268736e+09, 9.524773888e+09, 9.688317952e+09, 9.877326848e+09, 1.0085665792e+10, 1.0263191552e+10, 1.044051456e+10, 1.0669344768e+10, 1.0850642944e+10, 1.1023077376e+10, 1.1245663232e+10, 1.1452342272e+10, 1.1656522752e+10, 1.1820197888e+10, 1.1984027648e+10, 1.2148123648e+10, 1.2313028608e+10, 1.2499280896e+10, 1.275931648e+10, 1.2946509824e+10, 1.312797184e+10, 1.3358007296e+10, 1.3567480832e+10, 1.3741584384e+10, 1.3969084416e+10, 1.420695552e+10, 1.4445053952e+10, 1.4624816128e+10, 1.4790875136e+10, 1.4957364224e+10, 1.5125475328e+10, 1.529790464e+10, 1.5580806144e+10, 1.5790358528e+10, 1.597845504e+10, 1.6203365376e+10, 1.6444327936e+10, 1.661216768e+10, 1.6807350272e+10, 1.7040891904e+10, 1.726487552e+10, 1.7460860928e+10, 1.7625038848e+10]
-EPumETS.y=[0e+00, 1.00596336e+08, 2.09406096e+08, 3.21451168e+08, 4.377176e+08, 5.52905408e+08, 6.654208e+08, 7.774586880000001e+08, 8.910304e+08, 1.003180352e+09, 1.115215744e+09, 1.225751808e+09, 1.326994048e+09, 1.428397056e+09, 1.531261184e+09, 1.643324672e+09, 1.755256704e+09, 1.867050496e+09, 1.982513536e+09, 2.104951424e+09, 2.219557632e+09, 2.332209664e+09, 2.446162432e+09, 2.558439936e+09, 2.670469376e+09, 2.784497664e+09, 2.886249984e+09, 2.98852864e+09, 3.095504896e+09, 3.207602944e+09, 3.319560448e+09, 3.431380992e+09, 3.544074496e+09, 3.669193216e+09, 3.783826688e+09, 3.896176128e+09, 4.008800512e+09, 4.12139136e+09, 4.234081792e+09, 4.346734592e+09, 4.45074688e+09, 4.551700991999999e+09, 4.64846592e+09, 4.74908672e+09, 4.85241344e+09, 4.964336128e+09, 5.076140032e+09, 5.19904e+09, 5.317458432e+09, 5.4331392e+09, 5.548739072e+09, 5.668891648e+09, 5.781625856e+09, 5.896992256e+09, 6.014946304e+09, 6.12359168e+09, 6.234060800000001e+09, 6.345900543999999e+09, 6.457982976e+09, 6.57031168e+09, 6.68275456e+09, 6.80755456e+09, 6.937435648e+09, 7.057594368e+09, 7.176916992e+09, 7.310802944e+09, 7.429103104e+09, 7.545780736e+09, 7.679119872000001e+09, 7.807401471999999e+09, 7.934696448e+09, 8.047199744e+09, 8.160083968e+09, 8.273226752e+09, 8.387006976e+09, 8.509180928e+09, 8.654006272e+09, 8.77505024e+09, 8.894616576e+09, 9.03005184e+09, 9.15577344e+09, 9.272092672000002e+09, 9.406732287999998e+09, 9.54208256e+09, 9.676758016e+09, 9.793816576e+09, 9.907458048e+09, 1.0021581824e+10, 1.0136477696e+10, 1.025304576e+10, 1.040252416e+10, 1.0527192064e+10, 1.0647088128e+10, 1.0778610688e+10, 1.0912472064e+10, 1.1025805312e+10, 1.1148996608e+10, 1.1282469888e+10, 1.1412082688e+10, 1.1533216768e+10, 1.1645801472e+10]
-EPumPla.y=[0e+00, 2.137402191162109e+02, 2.137402191162109e+02, 2.137402191162109e+02, 2.137402191162109e+02, 2.137402191162109e+02, 4.263796e+06, 1.175619200000001e+07, 2.1670516e+07, 3.1123196e+07, 3.8500848e+07, 5.3709476e+07, 6.9475656e+07, 8.4275376e+07, 8.849154400000001e+07, 9.5412392e+07, 1.04170544e+08, 1.13929392e+08, 1.27114208e+08, 1.42880384e+08, 1.5864656e+08, 1.74021584e+08, 1.8916952e+08, 2.02009744e+08, 2.1016728e+08, 2.24306448e+08, 2.40072624e+08, 2.558388e+08, 2.62725792e+08, 2.69590496e+08, 2.796672e+08, 2.90559584e+08, 3.0316576e+08, 3.18931936e+08, 3.346981120000001e+08, 3.49611488e+08, 3.61026912e+08, 3.73693728e+08, 3.78168384e+08, 3.85063872e+08, 4.00725984e+08, 4.159637119999999e+08, 4.25674016e+08, 4.29673888e+08, 4.3657856e+08, 4.47248736e+08, 4.58882432e+08, 4.74570432e+08, 4.90336608e+08, 5.06102784e+08, 5.2186896e+08, 5.37635136e+08, 5.53401344e+08, 5.69167488e+08, 5.84933696e+08, 6.0069984e+08, 6.164660480000001e+08, 6.314691199999999e+08, 6.47235328e+08, 6.63001472e+08, 6.7876768e+08, 6.94533824e+08, 7.10300032e+08, 7.26066176e+08, 7.41832384e+08, 7.57598528e+08, 7.73364736e+08, 7.89130944e+08, 8.048970880000001e+08, 8.206632959999999e+08, 8.3642944e+08, 8.52195648e+08, 8.67961792e+08, 8.83728e+08, 8.99494144e+08, 9.15260352e+08, 9.31026496e+08, 9.46792704e+08, 9.62558912e+08, 9.78325056e+08, 9.94091264e+08, 1.009857408e+09, 1.025623616e+09, 1.04138976e+09, 1.057155968e+09, 1.072922112e+09, 1.088688256e+09, 1.104454528e+09, 1.120220672e+09, 1.135986816e+09, 1.151753088e+09, 1.167519232e+09, 1.183285376e+09, 1.19905152e+09, 1.214817792e+09, 1.230583936e+09, 1.24635008e+09, 1.262116224e+09, 1.277882496e+09, 1.29364864e+09, 1.309414784e+09]
-EPumDis.y=[0e+00, 2.13760256e+08, 3.87254176e+08, 4.21208192e+08, 4.2707488e+08, 4.28302464e+08, 4.49016224e+08, 4.756736000000001e+08, 5.02339328e+08, 5.2933952e+08, 5.56542656e+08, 5.82606272e+08, 6.08563328e+08, 6.33916288e+08, 6.37308992e+08, 6.62978816e+08, 6.90102592e+08, 7.171083520000001e+08, 7.43876544e+08, 7.77398464e+08, 8.0326912e+08, 8.2952672e+08, 8.56067904e+08, 8.82684032e+08, 9.09925888e+08, 9.3638176e+08, 9.6223584e+08, 9.88036096e+08, 9.96015168e+08, 1.01475936e+09, 1.041800704e+09, 1.06874688e+09, 1.095422208e+09, 1.13079488e+09, 1.157733248e+09, 1.184123904e+09, 1.210934656e+09, 1.234316416e+09, 1.240187392e+09, 1.25976192e+09, 1.285876992e+09, 1.312100992e+09, 1.326202496e+09, 1.327348352e+09, 1.344850304e+09, 1.371788416e+09, 1.398603008e+09, 1.431147264e+09, 1.461892352e+09, 1.487975168e+09, 1.516102912e+09, 1.551358976e+09, 1.57728128e+09, 1.605410688e+09, 1.640835584e+09, 1.673673984e+09, 1.705338624e+09, 1.731719296e+09, 1.757853312e+09, 1.783919104e+09, 1.809909632e+09, 1.848446208e+09, 1.900834432e+09, 1.932907136e+09, 1.965574528e+09, 2.033936512e+09, 2.071526528e+09, 2.102096e+09, 2.164851712e+09, 2.217370112e+09, 2.268424448e+09, 2.294469376e+09, 2.320304384e+09, 2.346149632e+09, 2.372167424e+09, 2.41055616e+09, 2.49811584e+09, 2.538738944e+09, 2.575191296e+09, 2.643139584e+09, 2.700780544e+09, 2.733256192e+09, 2.799516415999999e+09, 2.875337472e+09, 2.952078592e+09, 2.989347072e+09, 3.016646144e+09, 3.043886336e+09, 3.071956992e+09, 3.102573312e+09, 3.207380224e+09, 3.266115584e+09, 3.30871424e+09, 3.375493376e+09, 3.455624448e+09, 3.484989952e+09, 3.531075328e+09, 3.604338688e+09, 3.67232768e+09, 3.721366784e+09, 3.747849472e+09]
-EPumSto.y=[0e+00, 2.301928100585938e+02, 2.301928100585938e+02, 2.301928100585938e+02, 2.301928100585938e+02, 2.301928100585938e+02, 8.530953e+06, 1.850746400000001e+07, 2.7998682e+07, 3.73724e+07, 4.672208e+07, 5.6070044e+07, 6.5427748e+07, 7.4785104e+07, 8.413418400000003e+07, 9.3474944e+07, 1.02815704e+08, 1.1215696e+08, 1.215084e+08, 1.3120708e+08, 1.40567392e+08, 1.49936064e+08, 1.59293744e+08, 1.68649824e+08, 1.77994512e+08, 1.87341184e+08, 1.96690448e+08, 2.0603824e+08, 2.153894080000001e+08, 2.24730496e+08, 2.34071248e+08, 2.4341208e+08, 2.52754848e+08, 2.6254032e+08, 2.719338240000001e+08, 2.81306496e+08, 2.90655456e+08, 3.00001248e+08, 3.09343136e+08, 3.18684512e+08, 3.28025856e+08, 3.373697279999999e+08, 3.46715776e+08, 3.56057152e+08, 3.654e+08, 3.74741056e+08, 3.8408224e+08, 3.937464e+08, 4.03275072e+08, 4.1261616e+08, 4.22045632e+08, 4.31766912e+08, 4.4113296e+08, 4.5057984e+08, 4.60320992e+08, 4.69908704e+08, 4.794658240000001e+08, 4.888483519999999e+08, 4.98197024e+08, 5.07541792e+08, 5.16886368e+08, 5.2679216e+08, 5.37095872e+08, 5.46624064e+08, 5.561904e+08, 5.6700704e+08, 5.7664864e+08, 5.86069568e+08, 5.967948160000001e+08, 6.069072639999999e+08, 6.16971904e+08, 6.26333312e+08, 6.3567712e+08, 6.45019392e+08, 6.54360512e+08, 6.64283584e+08, 6.76167616e+08, 6.8592704e+08, 6.95604416e+08, 7.06490624e+08, 7.16836032e+08, 7.263783680000001e+08, 7.372118399999999e+08, 7.48146496e+08, 7.59062016e+08, 7.68729984e+08, 7.78082624e+08, 7.87441984e+08, 7.9682016e+08, 8.06298688e+08, 8.191488e+08, 8.29531392e+08, 8.39368e+08, 8.50210176e+08, 8.61413888e+08, 8.7078848e+08, 8.8092864e+08, 8.91967296e+08, 9.02582336e+08, 9.1263008e+08, 9.21973952e+08]
+borFie.TBorAve=[2.853500061035156e+02, 2.853500061035156e+02, 2.853500061035156e+02, 2.853500061035156e+02, 2.853500061035156e+02, 2.853500061035156e+02, 2.853328247070312e+02, 2.852917175292969e+02, 2.852596435546875e+02, 2.852127380371094e+02, 2.851986694335938e+02, 2.851492614746094e+02, 2.85097900390625e+02, 2.850602111816406e+02, 2.85083251953125e+02, 2.851033325195312e+02, 2.851008605957031e+02, 2.850926513671875e+02, 2.850745849609375e+02, 2.849748229980469e+02, 2.849440307617188e+02, 2.84935302734375e+02, 2.849270935058594e+02, 2.84914794921875e+02, 2.849449157714844e+02, 2.849443359375e+02, 2.849107666015625e+02, 2.848882141113281e+02, 2.849064331054688e+02, 2.8495166015625e+02, 2.849603881835938e+02, 2.849619445800781e+02, 2.849592590332031e+02, 2.848789367675781e+02, 2.848376770019531e+02, 2.848385009765625e+02, 2.84863525390625e+02, 2.84858642578125e+02, 2.849017639160156e+02, 2.8493310546875e+02, 2.849139099121094e+02, 2.848993225097656e+02, 2.848914489746094e+02, 2.849385375976562e+02, 2.849687805175781e+02, 2.849609680175781e+02, 2.849501647949219e+02, 2.848837585449219e+02, 2.848192138671875e+02, 2.8479248046875e+02, 2.847696838378906e+02, 2.847119445800781e+02, 2.847150268554688e+02, 2.847168884277344e+02, 2.846665954589844e+02, 2.8463623046875e+02, 2.846181640625e+02, 2.846598510742188e+02, 2.846842956542969e+02, 2.846996765136719e+02, 2.847075805664062e+02, 2.846780395507812e+02, 2.84591064453125e+02, 2.845694885253906e+02, 2.845527954101562e+02, 2.844955749511719e+02, 2.8447900390625e+02, 2.844850158691406e+02, 2.844389953613281e+02, 2.844065551757812e+02, 2.843832702636719e+02, 2.844287719726562e+02, 2.84465576171875e+02, 2.844908142089844e+02, 2.845048828125e+02, 2.844952087402344e+02, 2.844067077636719e+02, 2.843804016113281e+02, 2.843793640136719e+02, 2.843529357910156e+02, 2.843123779296875e+02, 2.843342590332031e+02, 2.84315673828125e+02, 2.84268798828125e+02, 2.842366638183594e+02, 2.842596130371094e+02, 2.843026733398438e+02, 2.843333740234375e+02, 2.843509521484375e+02, 2.843564758300781e+02, 2.842849426269531e+02, 2.842444152832031e+02, 2.842484130859375e+02, 2.842411804199219e+02, 2.841893310546875e+02, 2.842308349609375e+02, 2.8424267578125e+02, 2.842014770507812e+02, 2.841785278320312e+02, 2.841779174804688e+02, 2.842372436523438e+02]
+bui[1].ets.volMix_a.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931465148925781e+02, 2.93146484375e+02, 2.918872375488281e+02, 2.900940551757812e+02, 2.874447937011719e+02, 2.858641662597656e+02, 2.856288146972656e+02, 2.855132446289062e+02, 2.856223754882812e+02, 2.855520324707031e+02, 2.855520324707031e+02, 2.855520324707031e+02, 2.855538024902344e+02, 2.855538024902344e+02, 2.855568542480469e+02, 2.855471496582031e+02, 2.854190673828125e+02, 2.847262268066406e+02, 2.850460510253906e+02, 2.852319030761719e+02, 2.850919189453125e+02, 2.852220458984375e+02, 2.85511962890625e+02, 2.854267578125e+02, 2.854267578125e+02, 2.854267578125e+02, 2.854220275878906e+02, 2.854260559082031e+02, 2.854323425292969e+02, 2.854381103515625e+02, 2.85419189453125e+02, 2.846890258789062e+02, 2.848697509765625e+02, 2.851647033691406e+02, 2.852975463867188e+02, 2.852687072753906e+02, 2.854054260253906e+02, 2.855297241210938e+02, 2.855292663574219e+02, 2.855292663574219e+02, 2.855292663574219e+02, 2.855292663574219e+02, 2.855312194824219e+02, 2.855304565429688e+02, 2.855121459960938e+02, 2.848909301757812e+02, 2.8468994140625e+02, 2.84783935546875e+02, 2.847879333496094e+02, 2.845074157714844e+02, 2.84830322265625e+02, 2.8482861328125e+02, 2.847175903320312e+02, 2.847175903320312e+02, 2.847117919921875e+02, 2.847128601074219e+02, 2.847484741210938e+02, 2.848233032226562e+02, 2.848841857910156e+02, 2.846043701171875e+02, 2.841882019042969e+02, 2.843257751464844e+02, 2.843201599121094e+02, 2.839779052734375e+02, 2.842731628417969e+02, 2.843330078125e+02, 2.840833740234375e+02, 2.840606384277344e+02, 2.84017822265625e+02, 2.842650451660156e+02, 2.844425659179688e+02, 2.845451354980469e+02, 2.845585632324219e+02, 2.843909301757812e+02, 2.839092712402344e+02, 2.840177917480469e+02, 2.840781860351562e+02, 2.838897705078125e+02, 2.838915405273438e+02, 2.840779418945312e+02, 2.838611755371094e+02, 2.837496643066406e+02, 2.836963806152344e+02, 2.840186157226562e+02, 2.842151184082031e+02, 2.842779846191406e+02, 2.842735595703125e+02, 2.842528686523438e+02, 2.836925659179688e+02, 2.838146667480469e+02, 2.838908996582031e+02, 2.837603149414062e+02, 2.836617431640625e+02, 2.840518798828125e+02, 2.839292297363281e+02, 2.836964416503906e+02, 2.836676025390625e+02, 2.838462829589844e+02, 2.842048645019531e+02]
+bui[1].ets.volMix_b.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.910553588867188e+02, 2.871185302734375e+02, 2.848775634765625e+02, 2.825804443359375e+02, 2.81948974609375e+02, 2.815443115234375e+02, 2.816033325195312e+02, 2.816401977539062e+02, 2.816401977539062e+02, 2.816401977539062e+02, 2.816462097167969e+02, 2.816462097167969e+02, 2.816236267089844e+02, 2.815934753417969e+02, 2.815232238769531e+02, 2.808989562988281e+02, 2.809635925292969e+02, 2.811828918457031e+02, 2.812169494628906e+02, 2.811205139160156e+02, 2.813971557617188e+02, 2.815040588378906e+02, 2.815040588378906e+02, 2.815040588378906e+02, 2.8151025390625e+02, 2.815087280273438e+02, 2.814989013671875e+02, 2.814756469726562e+02, 2.81447509765625e+02, 2.809606628417969e+02, 2.807612609863281e+02, 2.81061279296875e+02, 2.812009582519531e+02, 2.812070922851562e+02, 2.812362670898438e+02, 2.813371276855469e+02, 2.813386535644531e+02, 2.813386535644531e+02, 2.813386535644531e+02, 2.813386535644531e+02, 2.8134912109375e+02, 2.813503112792969e+02, 2.813661804199219e+02, 2.811553039550781e+02, 2.806500854492188e+02, 2.807872009277344e+02, 2.808403930664062e+02, 2.806339721679688e+02, 2.806929016113281e+02, 2.808646240234375e+02, 2.808760986328125e+02, 2.808760986328125e+02, 2.808809509277344e+02, 2.808804016113281e+02, 2.808603820800781e+02, 2.80833251953125e+02, 2.808390808105469e+02, 2.807606811523438e+02, 2.802253112792969e+02, 2.803194274902344e+02, 2.803503112792969e+02, 2.800777282714844e+02, 2.801579895019531e+02, 2.803516235351562e+02, 2.803052673339844e+02, 2.802598266601562e+02, 2.801729736328125e+02, 2.801533813476562e+02, 2.80272216796875e+02, 2.804147338867188e+02, 2.805055847167969e+02, 2.804980163574219e+02, 2.801409606933594e+02, 2.800082397460938e+02, 2.800453186035156e+02, 2.800100402832031e+02, 2.79869873046875e+02, 2.800005493164062e+02, 2.799851684570312e+02, 2.798349304199219e+02, 2.797477416992188e+02, 2.798096313476562e+02, 2.800787048339844e+02, 2.80219970703125e+02, 2.802649230957031e+02, 2.802558288574219e+02, 2.7989990234375e+02, 2.7975537109375e+02, 2.798586120605469e+02, 2.79861572265625e+02, 2.796733703613281e+02, 2.799009094238281e+02, 2.800276489257812e+02, 2.798092651367188e+02, 2.797069091796875e+02, 2.797021179199219e+02, 2.800523376464844e+02]
+bui[2].ets.volMix_a.T=[2.931499938964844e+02, 2.929879760742188e+02, 2.923764953613281e+02, 2.91516357421875e+02, 2.874219665527344e+02, 2.853087463378906e+02, 2.865248413085938e+02, 2.853809204101562e+02, 2.840917663574219e+02, 2.844617614746094e+02, 2.844551086425781e+02, 2.84998046875e+02, 2.851278076171875e+02, 2.850822143554688e+02, 2.846264343261719e+02, 2.852132873535156e+02, 2.854696350097656e+02, 2.853922119140625e+02, 2.848416748046875e+02, 2.84359619140625e+02, 2.842342224121094e+02, 2.843190307617188e+02, 2.8462109375e+02, 2.846112365722656e+02, 2.845841674804688e+02, 2.847453002929688e+02, 2.849865112304688e+02, 2.849400939941406e+02, 2.845379028320312e+02, 2.846325988769531e+02, 2.8529443359375e+02, 2.853341369628906e+02, 2.85105712890625e+02, 2.843157653808594e+02, 2.841924743652344e+02, 2.843079833984375e+02, 2.842335815429688e+02, 2.848264465332031e+02, 2.848919982910156e+02, 2.83827880859375e+02, 2.849239196777344e+02, 2.849723205566406e+02, 2.850344848632812e+02, 2.842442626953125e+02, 2.845275268554688e+02, 2.852767639160156e+02, 2.853384399414062e+02, 2.844656982421875e+02, 2.841526184082031e+02, 2.841271362304688e+02, 2.844303283691406e+02, 2.842255554199219e+02, 2.842718505859375e+02, 2.845063781738281e+02, 2.843440856933594e+02, 2.8437890625e+02, 2.843281860351562e+02, 2.849404602050781e+02, 2.849929809570312e+02, 2.849088439941406e+02, 2.84842529296875e+02, 2.842519836425781e+02, 2.837946472167969e+02, 2.837328186035156e+02, 2.837808837890625e+02, 2.836750793457031e+02, 2.836382446289062e+02, 2.838495788574219e+02, 2.838373413085938e+02, 2.839464721679688e+02, 2.838742980957031e+02, 2.843109436035156e+02, 2.843809204101562e+02, 2.843961181640625e+02, 2.8435107421875e+02, 2.841301574707031e+02, 2.836253051757812e+02, 2.838226623535156e+02, 2.838672485351562e+02, 2.836156005859375e+02, 2.836409606933594e+02, 2.838453063964844e+02, 2.835810546875e+02, 2.835885925292969e+02, 2.835304870605469e+02, 2.837654724121094e+02, 2.839716796875e+02, 2.840120544433594e+02, 2.839978942871094e+02, 2.839908142089844e+02, 2.834118041992188e+02, 2.835487670898438e+02, 2.836307373046875e+02, 2.835032653808594e+02, 2.834066162109375e+02, 2.837314453125e+02, 2.836474609375e+02, 2.834773254394531e+02, 2.834861450195312e+02, 2.834993591308594e+02, 2.838919372558594e+02]
+bui[2].ets.volMix_b.T=[2.931499938964844e+02, 2.907112731933594e+02, 2.893207092285156e+02, 2.882584228515625e+02, 2.845258178710938e+02, 2.821004333496094e+02, 2.819524230957031e+02, 2.819225463867188e+02, 2.799496459960938e+02, 2.801759643554688e+02, 2.803783874511719e+02, 2.8082080078125e+02, 2.811003112792969e+02, 2.811379699707031e+02, 2.809724731445312e+02, 2.809385070800781e+02, 2.813160705566406e+02, 2.814028015136719e+02, 2.809811401367188e+02, 2.805904235839844e+02, 2.803208923339844e+02, 2.802753601074219e+02, 2.805274658203125e+02, 2.806529235839844e+02, 2.805774536132812e+02, 2.805527038574219e+02, 2.808997802734375e+02, 2.809908142089844e+02, 2.809057312011719e+02, 2.804571838378906e+02, 2.809930725097656e+02, 2.812746887207031e+02, 2.811549072265625e+02, 2.805274658203125e+02, 2.802801818847656e+02, 2.802695922851562e+02, 2.801071472167969e+02, 2.806574401855469e+02, 2.806968078613281e+02, 2.802166748046875e+02, 2.807377319335938e+02, 2.808567810058594e+02, 2.810582580566406e+02, 2.807896118164062e+02, 2.802878723144531e+02, 2.809412536621094e+02, 2.812518615722656e+02, 2.806852722167969e+02, 2.802848205566406e+02, 2.801476440429688e+02, 2.802569885253906e+02, 2.803330993652344e+02, 2.80243408203125e+02, 2.803949584960938e+02, 2.8034814453125e+02, 2.80380126953125e+02, 2.804050903320312e+02, 2.8068701171875e+02, 2.809660034179688e+02, 2.809359436035156e+02, 2.808688049316406e+02, 2.80469482421875e+02, 2.799301147460938e+02, 2.797674865722656e+02, 2.796793212890625e+02, 2.797394104003906e+02, 2.796415405273438e+02, 2.797081604003906e+02, 2.79825439453125e+02, 2.799351806640625e+02, 2.79962158203125e+02, 2.80123046875e+02, 2.803500366210938e+02, 2.803922729492188e+02, 2.803640441894531e+02, 2.801932983398438e+02, 2.79742919921875e+02, 2.797659301757812e+02, 2.798520812988281e+02, 2.796974182128906e+02, 2.796309509277344e+02, 2.797995300292969e+02, 2.796493530273438e+02, 2.795726928710938e+02, 2.795414733886719e+02, 2.796218872070312e+02, 2.799269714355469e+02, 2.799981079101562e+02, 2.80001953125e+02, 2.799188232421875e+02, 2.794837646484375e+02, 2.794797058105469e+02, 2.796134643554688e+02, 2.795686645507812e+02, 2.794809875488281e+02, 2.796181945800781e+02, 2.797214965820312e+02, 2.794791870117188e+02, 2.794911804199219e+02, 2.795113525390625e+02, 2.797992553710938e+02]
+bui[3].ets.volMix_a.T=[2.931499938964844e+02, 2.93023681640625e+02, 2.924556884765625e+02, 2.913321228027344e+02, 2.878017883300781e+02, 2.835538635253906e+02, 2.829482727050781e+02, 2.831348571777344e+02, 2.813948974609375e+02, 2.825965270996094e+02, 2.822958374023438e+02, 2.810056457519531e+02, 2.810040893554688e+02, 2.811043395996094e+02, 2.811898193359375e+02, 2.812482299804688e+02, 2.814041137695312e+02, 2.815277404785156e+02, 2.813285827636719e+02, 2.817559509277344e+02, 2.820597534179688e+02, 2.820223388671875e+02, 2.809834289550781e+02, 2.820475158691406e+02, 2.825196838378906e+02, 2.810542907714844e+02, 2.808783874511719e+02, 2.809563903808594e+02, 2.810304565429688e+02, 2.810567016601562e+02, 2.811810607910156e+02, 2.81368408203125e+02, 2.814068603515625e+02, 2.812507934570312e+02, 2.821747131347656e+02, 2.820325622558594e+02, 2.814414978027344e+02, 2.812286682128906e+02, 2.824026489257812e+02, 2.820704040527344e+02, 2.811612243652344e+02, 2.80916015625e+02, 2.809346618652344e+02, 2.809549560546875e+02, 2.809958190917969e+02, 2.811600952148438e+02, 2.813863220214844e+02, 2.812332153320312e+02, 2.821911010742188e+02, 2.818982849121094e+02, 2.811082458496094e+02, 2.812553100585938e+02, 2.82054931640625e+02, 2.810977172851562e+02, 2.808014221191406e+02, 2.808083190917969e+02, 2.809627990722656e+02, 2.81166259765625e+02, 2.813106689453125e+02, 2.8133642578125e+02, 2.813217468261719e+02, 2.809512023925781e+02, 2.816726379394531e+02, 2.815701904296875e+02, 2.813659973144531e+02, 2.806631164550781e+02, 2.816297302246094e+02, 2.812915649414062e+02, 2.805196228027344e+02, 2.805722045898438e+02, 2.806251525878906e+02, 2.810062255859375e+02, 2.811124572753906e+02, 2.811299438476562e+02, 2.811100158691406e+02, 2.807283935546875e+02, 2.808979797363281e+02, 2.814101867675781e+02, 2.814038391113281e+02, 2.804812927246094e+02, 2.815018920898438e+02, 2.813787231445312e+02, 2.804592590332031e+02, 2.804211120605469e+02, 2.803852233886719e+02, 2.80843505859375e+02, 2.809599304199219e+02, 2.809796142578125e+02, 2.809615783691406e+02, 2.808684387207031e+02, 2.804399108886719e+02, 2.812339782714844e+02, 2.811856384277344e+02, 2.803775939941406e+02, 2.80906982421875e+02, 2.812912902832031e+02, 2.805403747558594e+02, 2.804293212890625e+02, 2.804176940917969e+02, 2.807664184570312e+02, 2.809525451660156e+02]
+bui[3].ets.volMix_b.T=[2.931499938964844e+02, 2.919476013183594e+02, 2.903473510742188e+02, 2.888741760253906e+02, 2.84948974609375e+02, 2.806016235351562e+02, 2.787611083984375e+02, 2.791642150878906e+02, 2.782038269042969e+02, 2.780986022949219e+02, 2.784778747558594e+02, 2.774477844238281e+02, 2.770724487304688e+02, 2.77118408203125e+02, 2.7711669921875e+02, 2.771574096679688e+02, 2.772705078125e+02, 2.774283752441406e+02, 2.774026489257812e+02, 2.774553833007812e+02, 2.781520385742188e+02, 2.780270385742188e+02, 2.774285888671875e+02, 2.774315795898438e+02, 2.783692626953125e+02, 2.776233825683594e+02, 2.770760498046875e+02, 2.769620971679688e+02, 2.770086975097656e+02, 2.770141296386719e+02, 2.770694274902344e+02, 2.772256774902344e+02, 2.773280944824219e+02, 2.772111206054688e+02, 2.781610412597656e+02, 2.780457458496094e+02, 2.779125671386719e+02, 2.774948120117188e+02, 2.777031860351562e+02, 2.783143615722656e+02, 2.777899475097656e+02, 2.7723828125e+02, 2.771553955078125e+02, 2.77140869140625e+02, 2.770530090332031e+02, 2.770630187988281e+02, 2.772200317382812e+02, 2.772278747558594e+02, 2.780157775878906e+02, 2.779141235351562e+02, 2.775672912597656e+02, 2.770401000976562e+02, 2.780825805664062e+02, 2.775423583984375e+02, 2.768738403320312e+02, 2.768058166503906e+02, 2.768877563476562e+02, 2.770438232421875e+02, 2.772276306152344e+02, 2.773179321289062e+02, 2.773231811523438e+02, 2.769746704101562e+02, 2.773586120605469e+02, 2.775914306640625e+02, 2.774908447265625e+02, 2.766437683105469e+02, 2.775859680175781e+02, 2.774373168945312e+02, 2.766072387695312e+02, 2.765588684082031e+02, 2.766132507324219e+02, 2.768724365234375e+02, 2.770604858398438e+02, 2.771177978515625e+02, 2.771156311035156e+02, 2.768356628417969e+02, 2.767213439941406e+02, 2.774241638183594e+02, 2.7741015625e+02, 2.765755004882812e+02, 2.772300109863281e+02, 2.773814697265625e+02, 2.765851440429688e+02, 2.764211730957031e+02, 2.763992309570312e+02, 2.76673583984375e+02, 2.769072570800781e+02, 2.769692077636719e+02, 2.769673461914062e+02, 2.76877197265625e+02, 2.764518432617188e+02, 2.772188720703125e+02, 2.7718505859375e+02, 2.766123962402344e+02, 2.766053771972656e+02, 2.772758178710938e+02, 2.767960815429688e+02, 2.764507141113281e+02, 2.76421875e+02, 2.765760498046875e+02, 2.768662414550781e+02]
+ETot.y=[0e+00, 4.28438592e+08, 8.55848768e+08, 1.185265792e+09, 2.194834944e+09, 3.191257088e+09, 3.974655232e+09, 4.752482816000002e+09, 5.913434624e+09, 6.4929024e+09, 7.198724096e+09, 8.362582528e+09, 9.403809792e+09, 1.0364980224e+10, 1.0660626432e+10, 1.109872128e+10, 1.1615970304e+10, 1.2201131008e+10, 1.3205927936e+10, 1.477537792e+10, 1.5845301248e+10, 1.6713064448e+10, 1.7913563136e+10, 1.857881088e+10, 1.9188267008e+10, 2.036846592e+10, 2.14424576e+10, 2.2591854592e+10, 2.2966919168e+10, 2.3399247872e+10, 2.391191552e+10, 2.4488214528e+10, 2.5305024512e+10, 2.7077306368e+10, 2.8157464576e+10, 2.8963631104e+10, 2.9881776128e+10, 3.0529482752e+10, 3.0875236352e+10, 3.169542144e+10, 3.265094656e+10, 3.3645713408e+10, 3.4159996928e+10, 3.4447163392e+10, 3.4865557504e+10, 3.5394535424e+10, 3.6008472576e+10, 3.7675024384e+10, 3.9012552704e+10, 4.02061312e+10, 4.1504014336e+10, 4.3027542016e+10, 4.3971313664e+10, 4.5213913088e+10, 4.6846861312e+10, 4.83729408e+10, 4.961679769600001e+10, 5.028127539199999e+10, 5.1046326272e+10, 5.1860344832e+10, 5.2700381184e+10, 5.4342344704e+10, 5.6193261568e+10, 5.7646419968e+10, 5.9118292992e+10, 6.1302329344e+10, 6.267537408e+10, 6.4042033152e+10, 6.611766476800002e+10, 6.796492799999998e+10, 6.9766619136e+10, 7.0604136448e+10, 7.1512784896e+10, 7.2456511488e+10, 7.3462112256e+10, 7.4970251264e+10, 7.7329915904e+10, 7.8811660288e+10, 8.0257294336e+10, 8.2435694592e+10, 8.4087857152e+10, 8.540573696000002e+10, 8.752694886399998e+10, 8.9674252288e+10, 9.1841388544e+10, 9.3001105408e+10, 9.4027341824e+10, 9.509146624e+10, 9.6214147072e+10, 9.7463148544e+10, 1.000810496e+11, 1.01728468992e+11, 1.03250796544e+11, 1.05296838656e+11, 1.07268554752e+11, 1.08411543552e+11, 1.10087962624e+11, 1.1219673088e+11, 1.14200838144e+11, 1.15634151424e+11, 1.16574666752e+11]
+EHeaPum.y=[0e+00, 1.1408004e+08, 2.5917984e+08, 4.42599296e+08, 1.33003712e+09, 2.210043392e+09, 2.847417088e+09, 3.469080320000001e+09, 4.470388736e+09, 4.891880448e+09, 5.441736192e+09, 6.444438528e+09, 7.33334272e+09, 8.143600128e+09, 8.319424000000001e+09, 8.60352512e+09, 8.963618816e+09, 9.390879744000002e+09, 1.0230909952e+10, 1.1618934784e+10, 1.252325376e+10, 1.3227364352e+10, 1.4262861824e+10, 1.4767021056e+10, 1.5219703808e+10, 1.6235932672e+10, 1.7157202944e+10, 1.8153406464e+10, 1.8397280256e+10, 1.8682556416e+10, 1.9036809216e+10, 1.9454107648e+10, 2.0109600768e+10, 2.1695840256e+10, 2.2609266688e+10, 2.3252404224e+10, 2.4010350592e+10, 2.4500072448e+10, 2.4713447424e+10, 2.5385170944e+10, 2.618556416e+10, 2.7028570112e+10, 2.741293056e+10, 2.7584987136e+10, 2.786630656e+10, 2.8236414976e+10, 2.8690757632e+10, 3.0176514048e+10, 3.133958144e+10, 3.2366288896e+10, 3.3495250944e+10, 3.4837880832e+10, 3.5617865728e+10, 3.6691755008e+10, 3.8145814528e+10, 3.950505984e+10, 4.058145996800001e+10, 4.108333055999999e+10, 4.1685049344e+10, 4.2335563776e+10, 4.301205504e+10, 4.4465012736e+10, 4.610758656e+10, 4.7383220224e+10, 4.8677773312e+10, 5.0632974336e+10, 5.182472192e+10, 5.3018947584e+10, 5.487199027200002e+10, 5.651257753599998e+10, 5.8110091264e+10, 5.8783932416e+10, 5.9528749056e+10, 6.0308381696e+10, 6.1149077504e+10, 6.24709632e+10, 6.457059328e+10, 6.5865138176e+10, 6.7129315328e+10, 6.9077680128e+10, 7.0520365056e+10, 7.166414848000002e+10, 7.355786035199998e+10, 7.546728448e+10, 7.7396328448e+10, 7.8376288256e+10, 7.9236456448e+10, 8.0134094848e+10, 8.1088659456e+10, 8.2165235712e+10, 8.450023424e+10, 8.5938102272e+10, 8.7272333312e+10, 8.9093472256e+10, 9.0824220672e+10, 9.1799371776e+10, 9.3280608256e+10, 9.5155830784e+10, 9.6935952384e+10, 9.8173280256e+10, 9.8949619712e+10]
+EPum.y=[0e+00, 3.1435856e+08, 5.96668928e+08, 7.4266656e+08, 8.64797824e+08, 9.8121376e+08, 1.127238144e+09, 1.283402368e+09, 1.443045504e+09, 1.60102208e+09, 1.756988032e+09, 1.918144e+09, 2.0704672e+09, 2.221380352e+09, 2.341202176e+09, 2.495196928e+09, 2.652351744e+09, 2.810251264e+09, 2.975018496e+09, 3.156443648e+09, 3.322046976e+09, 3.485700352e+09, 3.650700288e+09, 3.81179008e+09, 3.968563456e+09, 4.132533248e+09, 4.285254912e+09, 4.438447616e+09, 4.569640960000001e+09, 4.716690944e+09, 4.875106816e+09, 5.03410688e+09, 5.195424768e+09, 5.381467136e+09, 5.548198912000001e+09, 5.711225344e+09, 5.871424512e+09, 6.029410304e+09, 6.161787904e+09, 6.310252032e+09, 6.465382912e+09, 6.617143295999999e+09, 6.747066368e+09, 6.862174208e+09, 6.999249408e+09, 7.158121984e+09, 7.317715456e+09, 7.49851136e+09, 7.67297024e+09, 7.839840768e+09, 8.008763904e+09, 8.189659648e+09, 8.353448448e+09, 8.522157056e+09, 8.701044736e+09, 8.867881984e+09, 9.035338752000002e+09, 9.197944831999998e+09, 9.361275904e+09, 9.524781056e+09, 9.688326144e+09, 9.877334016e+09, 1.008567296e+10, 1.026319872e+10, 1.0440521728e+10, 1.0669353984e+10, 1.0850651136e+10, 1.1023085568e+10, 1.1245671424e+10, 1.1452350464e+10, 1.1656530944e+10, 1.182020608e+10, 1.198403584e+10, 1.2148132864e+10, 1.2313037824e+10, 1.2499289088e+10, 1.2759325696e+10, 1.2946518016e+10, 1.3127981056e+10, 1.3358017536e+10, 1.3567490048e+10, 1.37415936e+10, 1.3969092608e+10, 1.4206963712e+10, 1.444506112e+10, 1.4624823296e+10, 1.4790882304e+10, 1.4957371392e+10, 1.5125482496e+10, 1.5297911808e+10, 1.5580814336e+10, 1.5790365696e+10, 1.5978463232e+10, 1.6203373568e+10, 1.6444336128e+10, 1.6612175872e+10, 1.6807359488e+10, 1.7040900096e+10, 1.7264883712e+10, 1.7460871168e+10, 1.7625049088e+10]
+EPumETS.y=[0e+00, 1.00597848e+08, 2.094076e+08, 3.21452704e+08, 4.37719136e+08, 5.52907456e+08, 6.65422784e+08, 7.774606720000001e+08, 8.91032384e+08, 1.003182336e+09, 1.115217792e+09, 1.225753728e+09, 1.326995968e+09, 1.428398976e+09, 1.531263104e+09, 1.643326592e+09, 1.755258624e+09, 1.867052416e+09, 1.982515456e+09, 2.104953472e+09, 2.21955968e+09, 2.332211712e+09, 2.44616448e+09, 2.558441984e+09, 2.670471424e+09, 2.784499712e+09, 2.886252032e+09, 2.988530432e+09, 3.095506944e+09, 3.207604992e+09, 3.319562496e+09, 3.43138304e+09, 3.544076544e+09, 3.669195008e+09, 3.78382848e+09, 3.89617792e+09, 4.008802304e+09, 4.121393408e+09, 4.234083584e+09, 4.34673664e+09, 4.450748928e+09, 4.551702527999999e+09, 4.648467456e+09, 4.749088768e+09, 4.852414976e+09, 4.964338176e+09, 5.07614208e+09, 5.199042048e+09, 5.31746048e+09, 5.433140736e+09, 5.54874112e+09, 5.668893184e+09, 5.781627392e+09, 5.896993792e+09, 6.014948352e+09, 6.123593728e+09, 6.234062848000001e+09, 6.345902591999999e+09, 6.457985024e+09, 6.570313728e+09, 6.682756608e+09, 6.807556608e+09, 6.937437696e+09, 7.057596416e+09, 7.17691904e+09, 7.310804992e+09, 7.429105152e+09, 7.545782784e+09, 7.679121920000001e+09, 7.807403519999999e+09, 7.934698496e+09, 8.047201792e+09, 8.160086016e+09, 8.2732288e+09, 8.387009024e+09, 8.509182976e+09, 8.654009344e+09, 8.775053312e+09, 8.894619648e+09, 9.030054912e+09, 9.155775488e+09, 9.272094720000002e+09, 9.406735359999998e+09, 9.542084608e+09, 9.676760064e+09, 9.793818624e+09, 9.907460096e+09, 1.0021583872e+10, 1.0136479744e+10, 1.0253047808e+10, 1.0402527232e+10, 1.0527195136e+10, 1.0647090176e+10, 1.0778612736e+10, 1.0912474112e+10, 1.1025808384e+10, 1.1148998656e+10, 1.1282471936e+10, 1.141208576e+10, 1.1533218816e+10, 1.164580352e+10]
+EPumPla.y=[0e+00, 2.137430572509766e+02, 2.137430572509766e+02, 2.137430572509766e+02, 2.137430572509766e+02, 2.137430572509766e+02, 4.2641055e+06, 1.175651400000001e+07, 2.1670878e+07, 3.1123628e+07, 3.85013e+07, 5.3709756e+07, 6.9475936e+07, 8.4275752e+07, 8.849189600000001e+07, 9.5412624e+07, 1.04170832e+08, 1.13929632e+08, 1.27114368e+08, 1.42880544e+08, 1.5864672e+08, 1.74021808e+08, 1.89169872e+08, 2.02010048e+08, 2.10167536e+08, 2.24306496e+08, 2.40072688e+08, 2.55838864e+08, 2.6272568e+08, 2.69590432e+08, 2.79667072e+08, 2.9055936e+08, 3.03165472e+08, 3.18931648e+08, 3.346978240000001e+08, 3.49611488e+08, 3.61026976e+08, 3.73694208e+08, 3.78168832e+08, 3.8506432e+08, 4.00726464e+08, 4.159652799999999e+08, 4.25675616e+08, 4.29675456e+08, 4.36580224e+08, 4.472504e+08, 4.58884096e+08, 4.74572064e+08, 4.9033824e+08, 5.06104416e+08, 5.21870592e+08, 5.376368e+08, 5.53402944e+08, 5.69169152e+08, 5.84935296e+08, 6.00701504e+08, 6.164676480000001e+08, 6.314706559999999e+08, 6.47236864e+08, 6.63003008e+08, 6.78769216e+08, 6.9453536e+08, 7.10301568e+08, 7.26067712e+08, 7.4183392e+08, 7.57600064e+08, 7.73366272e+08, 7.8913248e+08, 8.048986240000001e+08, 8.206648319999999e+08, 8.36430976e+08, 8.52197184e+08, 8.67963328e+08, 8.83729536e+08, 8.9949568e+08, 9.15261888e+08, 9.31028032e+08, 9.4679424e+08, 9.62560384e+08, 9.78326592e+08, 9.940928e+08, 1.009858944e+09, 1.025625152e+09, 1.041391296e+09, 1.057157504e+09, 1.072923648e+09, 1.088689792e+09, 1.104456064e+09, 1.120222208e+09, 1.135988352e+09, 1.151754496e+09, 1.167520768e+09, 1.183286912e+09, 1.199053056e+09, 1.214819328e+09, 1.230585472e+09, 1.246351616e+09, 1.26211776e+09, 1.277884032e+09, 1.293650176e+09, 1.30941632e+09]
+EPumDis.y=[0e+00, 2.13760256e+08, 3.87260896e+08, 4.21213408e+08, 4.27078272e+08, 4.2830592e+08, 4.49019936e+08, 4.756774080000001e+08, 5.023432e+08, 5.2934336e+08, 5.56546496e+08, 5.82610112e+08, 6.08567232e+08, 6.33920192e+08, 6.37312704e+08, 6.629824e+08, 6.90106176e+08, 7.171119360000001e+08, 7.43880128e+08, 7.7740224e+08, 8.03272832e+08, 8.29530496e+08, 8.56071744e+08, 8.82687936e+08, 9.09929792e+08, 9.36385536e+08, 9.62239616e+08, 9.88039872e+08, 9.96018368e+08, 1.01476448e+09, 1.041805888e+09, 1.068752064e+09, 1.095427328e+09, 1.130799872e+09, 1.157738368e+09, 1.184129024e+09, 1.210939648e+09, 1.234321408e+09, 1.240192128e+09, 1.259766272e+09, 1.285881344e+09, 1.312105344e+09, 1.326206848e+09, 1.327352704e+09, 1.344853888e+09, 1.371792e+09, 1.39860672e+09, 1.431150976e+09, 1.461896192e+09, 1.48797888e+09, 1.516106624e+09, 1.551362304e+09, 1.577284608e+09, 1.605414016e+09, 1.640839296e+09, 1.673677696e+09, 1.705342208e+09, 1.731723008e+09, 1.757857024e+09, 1.783922816e+09, 1.809913216e+09, 1.848450048e+09, 1.900838144e+09, 1.932910592e+09, 1.96557824e+09, 2.033941632e+09, 2.071531264e+09, 2.102100736e+09, 2.16485632e+09, 2.217374464e+09, 2.268429056e+09, 2.294473984e+09, 2.320308992e+09, 2.346154496e+09, 2.372172032e+09, 2.410560768e+09, 2.49812096e+09, 2.538743552e+09, 2.57519616e+09, 2.64314496e+09, 2.700785152e+09, 2.7332608e+09, 2.799520255999999e+09, 2.875341056e+09, 2.95208192e+09, 2.9893504e+09, 3.016649216e+09, 3.043889664e+09, 3.07196032e+09, 3.102576384e+09, 3.207383552e+09, 3.2661184e+09, 3.308717056e+09, 3.375496704e+09, 3.455628288e+09, 3.484993792e+09, 3.531079424e+09, 3.604342784e+09, 3.672332288e+09, 3.721371392e+09, 3.74785408e+09]
+EPumSto.y=[0e+00, 2.301958618164062e+02, 2.301958618164062e+02, 2.301958618164062e+02, 2.301958618164062e+02, 2.301958618164062e+02, 8.531306e+06, 1.850778800000001e+07, 2.7999002e+07, 3.737272e+07, 4.67224e+07, 5.6070364e+07, 6.5428064e+07, 7.4785416e+07, 8.413450400000003e+07, 9.3475256e+07, 1.02816016e+08, 1.12157272e+08, 1.2150872e+08, 1.312074e+08, 1.40567712e+08, 1.49936384e+08, 1.59294064e+08, 1.6865016e+08, 1.77994848e+08, 1.87341504e+08, 1.96690768e+08, 2.06038576e+08, 2.153897440000001e+08, 2.24730832e+08, 2.34071584e+08, 2.43412416e+08, 2.52755184e+08, 2.6254064e+08, 2.719341440000001e+08, 2.81306816e+08, 2.90655776e+08, 3.00001568e+08, 3.09343456e+08, 3.18684832e+08, 3.28026176e+08, 3.373700479999999e+08, 3.46716096e+08, 3.5605744e+08, 3.6540032e+08, 3.74741376e+08, 3.8408256e+08, 3.93746688e+08, 4.03275392e+08, 4.12616448e+08, 4.2204592e+08, 4.317672e+08, 4.41133248e+08, 4.50580096e+08, 4.6032128e+08, 4.69909024e+08, 4.794661120000001e+08, 4.888486399999999e+08, 4.98197312e+08, 5.07542112e+08, 5.16886656e+08, 5.26792448e+08, 5.37096192e+08, 5.46624384e+08, 5.5619072e+08, 5.67007424e+08, 5.76649024e+08, 5.86069952e+08, 5.967951360000001e+08, 6.069076479999999e+08, 6.16972288e+08, 6.26333696e+08, 6.35677504e+08, 6.45019776e+08, 6.54360896e+08, 6.64283968e+08, 6.76168064e+08, 6.85927424e+08, 6.956048e+08, 7.06491008e+08, 7.16836416e+08, 7.263787520000001e+08, 7.372121599999999e+08, 7.4814688e+08, 7.59062336e+08, 7.68730304e+08, 7.78082944e+08, 7.87442304e+08, 7.9682048e+08, 8.06299008e+08, 8.19149184e+08, 8.29531712e+08, 8.3936832e+08, 8.5021056e+08, 8.61414272e+08, 8.70788864e+08, 8.80929024e+08, 8.9196768e+08, 9.0258272e+08, 9.12630528e+08, 9.21974336e+08]
 datDes.mPumDis_flow_nominal=[9.730000305175781e+01, 9.730000305175781e+01]
 bui[1].ets.hexChi.m1_flow_nominal=[1.845721817016602e+01, 1.845721817016602e+01]
 bui[2].ets.hexChi.m1_flow_nominal=[8.781070709228516e+01, 8.781070709228516e+01]
@@ -36,35 +36,35 @@ bui[3].ets.proHeaWat.heaPum.m2_flow_nominal=[2.721976661682129e+01, 2.7219766616
 bui[1].ets.proHotWat.heaPum.m2_flow_nominal=[1.182039231061935e-01, 1.182039231061935e-01]
 bui[2].ets.proHotWat.heaPum.m2_flow_nominal=[3.171242475509644e+00, 3.171242475509644e+00]
 bui[3].ets.proHotWat.heaPum.m2_flow_nominal=[1.465728640556335e+00, 1.465728640556335e+00]
-bui[1].ets.proHeaWat.heaPum.COP=[8.832118034362793e+00, 8.832118034362793e+00, 9.579236030578613e+00, 1.149473285675049e+01, 9.387595176696777e+00, 8.031760215759277e+00, 6.971985816955566e+00, 7.05021333694458e+00, 6.889526844024658e+00, 6.729151725769043e+00, 7.119433403015137e+00, 7.847702503204346e+00, 7.847702503204346e+00, 7.847702503204346e+00, 8.215596199035645e+00, 7.787897109985352e+00, 7.607799053192139e+00, 7.497095108032227e+00, 6.949143409729004e+00, 6.023942470550537e+00, 5.892392158508301e+00, 6.548171997070312e+00, 6.876988410949707e+00, 6.628021240234375e+00, 6.853425025939941e+00, 7.801712989807129e+00, 7.801712989807129e+00, 7.801712989807129e+00, 8.070137023925779e+00, 7.744909763336182e+00, 7.629309177398682e+00, 7.546310424804688e+00, 7.281875610351562e+00, 6.14845085144043e+00, 6.018678188323977e+00, 6.777146339416504e+00, 7.651956081390381e+00, 7.611919403076172e+00, 7.411033630371094e+00, 7.76838493347168e+00, 7.842711925506592e+00, 7.842711925506592e+00, 7.842711925506592e+00, 7.842711925506592e+00, 8.195539474487305e+00, 7.790042400360107e+00, 7.56696891784668e+00, 6.254071235656738e+00, 5.80458402633667e+00, 5.96526575088501e+00, 6.814756393432617e+00, 6.476489067077637e+00, 6.412999153137207e+00, 6.930739879608154e+00, 7.527063846588135e+00, 7.527063846588135e+00, 7.853989601135252e+00, 7.483492851257329e+00, 7.357467174530029e+00, 7.289170265197754e+00, 7.205631732940674e+00, 6.411874294281006e+00, 5.754534244537354e+00, 5.442438125610352e+00, 5.945778369903564e+00, 5.880862712860107e+00, 5.665586948394775e+00, 6.155342102050781e+00, 7.133360385894779e+00, 7.084952354431153e+00, 6.951999664306641e+00, 6.905289649963379e+00, 6.897139072418213e+00, 6.852850914001465e+00, 6.804207324981689e+00, 6.538248538970947e+00, 6.383091926574707e+00, 6.430099487304688e+00, 6.452230453491211e+00, 6.38564920425415e+00, 6.36143970489502e+00, 6.386316299438477e+00, 6.346555709838867e+00, 6.480782985687256e+00, 6.413055419921875e+00, 6.46266508102417e+00, 6.495858192443848e+00, 6.490434646606445e+00, 6.461043834686279e+00, 6.331007480621338e+00, 6.092307567596436e+00, 6.140239715576172e+00, 6.194552898406982e+00, 6.19106912612915e+00, 6.16970157623291e+00, 6.258160591125488e+00, 6.212841510772705e+00, 6.370317459106445e+00, 6.30189323425293e+00, 6.311351776123047e+00, 6.379059791564941e+00]
-bui[1].ets.proHotWat.heaPum.COP=[1.2960498046875e+02, 3.456180810928345e+00, 3.456180810928345e+00, 3.456180810928345e+00, 3.011728048324585e+00, 2.786730766296387e+00, 2.613425731658936e+00, 2.657328128814697e+00, 2.57600736618042e+00, 2.581827878952026e+00, 2.680462121963501e+00, 2.722511053085327e+00, 2.722537279129028e+00, 2.722563505172729e+00, 2.72258996963501e+00, 2.722616195678711e+00, 2.722642421722412e+00, 2.722668647766113e+00, 2.71147632598877e+00, 2.576706171035767e+00, 2.512752771377563e+00, 2.587391376495361e+00, 2.590495347976685e+00, 2.5515456199646e+00, 2.634494066238403e+00, 2.716274976730347e+00, 2.716301202774048e+00, 2.716327428817749e+00, 2.71635365486145e+00, 2.716379642486572e+00, 2.716405868530273e+00, 2.716432094573975e+00, 2.716458320617676e+00, 2.609945297241211e+00, 2.505734205245972e+00, 2.555089950561523e+00, 2.622116088867188e+00, 2.524379253387451e+00, 2.600228548049927e+00, 2.720423221588135e+00, 2.721357822418213e+00, 2.721384048461914e+00, 2.721410274505615e+00, 2.721436500549316e+00, 2.721462726593018e+00, 2.721488952636719e+00, 2.72151517868042e+00, 2.64861536026001e+00, 2.517415523529053e+00, 2.511491775512695e+00, 2.612819910049438e+00, 2.508616924285889e+00, 2.558977603912354e+00, 2.65648341178894e+00, 2.681523561477661e+00, 2.681549072265625e+00, 2.681574583053589e+00, 2.681600093841553e+00, 2.68252158164978e+00, 2.686150074005127e+00, 2.689110994338989e+00, 2.643523216247559e+00, 2.535918712615967e+00, 2.484749794006348e+00, 2.569283485412598e+00, 2.526928901672363e+00, 2.521511316299438e+00, 2.601131439208984e+00, 2.65159797668457e+00, 2.651622772216797e+00, 2.651647329330444e+00, 2.659320116043091e+00, 2.667791843414307e+00, 2.672715663909912e+00, 2.673470258712769e+00, 2.673495531082153e+00, 2.673517942428589e+00, 2.673539400100708e+00, 2.673561573028564e+00, 2.673583745956421e+00, 2.673604488372803e+00, 2.67362642288208e+00, 2.673648357391357e+00, 2.673668622970581e+00, 2.673688888549805e+00, 2.673709154129028e+00, 2.673732042312622e+00, 2.673755407333374e+00, 2.673779010772705e+00, 2.673802375793457e+00, 2.673823833465576e+00, 2.673843860626221e+00, 2.673864841461182e+00, 2.673885822296143e+00, 2.673905372619629e+00, 2.67392635345459e+00, 2.673948764801025e+00, 2.673969030380249e+00, 2.673988819122314e+00, 2.67400860786438e+00, 2.674031019210815e+00]
-bui[2].ets.proHeaWat.heaPum.COP=[8.832118034362793e+00, 1.118170547485352e+01, 1.04738826751709e+01, 9.751559257507324e+00, 6.448669910430908e+00, 7.035157203674316e+00, 7.494921207427979e+00, 6.268749237060545e+00, 6.484261035919189e+00, 7.029953002929688e+00, 6.001748561859131e+00, 6.293087482452393e+00, 6.262985706329346e+00, 7.250072479248047e+00, 6.876954555511475e+00, 6.927047252655029e+00, 6.890727996826172e+00, 6.788834571838379e+00, 5.655632972717285e+00, 6.53858470916748e+00, 6.511754989624023e+00, 6.496723175048828e+00, 6.146374702453613e+00, 7.107863426208496e+00, 6.60134220123291e+00, 6.086810111999512e+00, 6.214474678039551e+00, 6.426208972930908e+00, 6.827092170715329e+00, 6.736899375915527e+00, 6.828428268432617e+00, 6.763267993927002e+00, 5.733590602874756e+00, 5.965600490570068e+00, 6.497612953186037e+00, 6.841570377349854e+00, 6.064656734466553e+00, 7.493085861206055e+00, 7.29171895980835e+00, 5.971362590789795e+00, 6.444950580596924e+00, 6.277298927307129e+00, 7.232322216033936e+00, 6.7709059715271e+00, 6.693346500396729e+00, 6.784047603607178e+00, 6.444722175598145e+00, 5.574278354644775e+00, 6.339847564697266e+00, 6.341522693634033e+00, 5.558156967163086e+00, 6.420924186706543e+00, 6.450650691986084e+00, 5.537694454193115e+00, 5.696375846862793e+00, 5.613054275512695e+00, 6.543828010559079e+00, 6.460666656494141e+00, 6.381892204284668e+00, 6.340704917907715e+00, 6.297637939453125e+00, 5.251560211181641e+00, 6.118616580963135e+00, 6.013729095458984e+00, 5.494224071502686e+00, 5.379233837127686e+00, 6.062032699584961e+00, 5.453674793243408e+00, 5.266814708709719e+00, 5.341381549835206e+00, 5.901956558227539e+00, 6.112855911254883e+00, 6.127926349639893e+00, 6.063818454742432e+00, 6.001943588256836e+00, 5.013803005218506e+00, 5.697818279266357e+00, 5.854313850402832e+00, 5.883738994598389e+00, 5.057819843292236e+00, 5.999972820281982e+00, 5.89727830886839e+00, 5.04743480682373e+00, 5.186665058135986e+00, 5.152535438537598e+00, 5.93421745300293e+00, 5.931003093719482e+00, 5.887782096862793e+00, 5.83889627456665e+00, 5.276049613952637e+00, 5.028687477111816e+00, 5.738559246063232e+00, 5.740413188934326e+00, 4.894706249237061e+00, 6.058821678161621e+00, 6.014223575592041e+00, 5.099551200866699e+00, 5.27415132522583e+00, 5.198909282684326e+00, 6.071236133575439e+00, 5.992098808288574e+00]
-bui[2].ets.proHotWat.heaPum.COP=[1.2960498046875e+02, 3.456180334091187e+00, 3.456175804138184e+00, 3.45432710647583e+00, 2.725096225738525e+00, 2.735087871551514e+00, 2.771454095840454e+00, 2.581644296646118e+00, 2.627911329269409e+00, 2.681134462356567e+00, 2.606119155883789e+00, 2.553684711456299e+00, 2.556069374084473e+00, 2.716229200363159e+00, 2.745803833007812e+00, 2.745822668075562e+00, 2.745845317840576e+00, 2.74586820602417e+00, 2.67076849937439e+00, 2.691081762313843e+00, 2.689949035644531e+00, 2.581517219543457e+00, 2.605998039245605e+00, 2.695207834243774e+00, 2.63673734664917e+00, 2.541966199874878e+00, 2.553187131881714e+00, 2.579910755157471e+00, 2.738595247268677e+00, 2.738611221313477e+00, 2.738632202148438e+00, 2.73865532875061e+00, 2.599866151809692e+00, 2.634563207626343e+00, 2.679667234420776e+00, 2.679689645767212e+00, 2.54759955406189e+00, 2.705121278762817e+00, 2.705144882202148e+00, 2.522303581237793e+00, 2.550584077835083e+00, 2.512647867202759e+00, 2.74407172203064e+00, 2.744089841842651e+00, 2.744103670120239e+00, 2.744123935699463e+00, 2.641921997070312e+00, 2.598189353942871e+00, 2.678274154663086e+00, 2.678296089172363e+00, 2.527142286300659e+00, 2.661020278930664e+00, 2.675347328186035e+00, 2.591992139816284e+00, 2.525964736938477e+00, 2.513765811920166e+00, 2.707292079925537e+00, 2.707314014434814e+00, 2.707338333129883e+00, 2.707362413406372e+00, 2.707386016845703e+00, 2.566430807113647e+00, 2.6585373878479e+00, 2.658559560775757e+00, 2.550694227218628e+00, 2.583630084991455e+00, 2.646888971328735e+00, 2.598934412002563e+00, 2.504868984222412e+00, 2.509411573410034e+00, 2.594568014144897e+00, 2.68592095375061e+00, 2.685943603515625e+00, 2.685966730117798e+00, 2.685989379882812e+00, 2.547724962234497e+00, 2.630867719650269e+00, 2.64989972114563e+00, 2.648616075515747e+00, 2.542208194732666e+00, 2.644774198532104e+00, 2.642263174057005e+00, 2.497627496719362e+00, 2.494681119918823e+00, 2.465056180953979e+00, 2.668483257293701e+00, 2.668505191802979e+00, 2.668527603149414e+00, 2.66855001449585e+00, 2.578573703765869e+00, 2.568197250366211e+00, 2.638865232467651e+00, 2.638888597488403e+00, 2.499477863311768e+00, 2.637222766876221e+00, 2.636525630950928e+00, 2.534584283828735e+00, 2.490127563476562e+00, 2.466034650802612e+00, 2.665183544158936e+00, 2.665204763412476e+00]
-bui[3].ets.proHeaWat.heaPum.COP=[8.832118034362793e+00, 1.184416389465332e+01, 1.101373958587646e+01, 9.970757484436035e+00, 6.628855228424072e+00, 5.706489086151123e+00, 5.846343040466309e+00, 6.126402854919434e+00, 5.829046726226807e+00, 6.101217269897461e+00, 5.939789772033691e+00, 5.91215705871582e+00, 5.855260848999023e+00, 6.376945972442627e+00, 6.175253391265869e+00, 6.043663501739502e+00, 5.966609954833984e+00, 5.917631149291992e+00, 5.145860195159912e+00, 5.077828884124756e+00, 5.406531810760498e+00, 5.814488410949707e+00, 5.862907886505127e+00, 6.057699680328369e+00, 5.997419834136963e+00, 5.85991096496582e+00, 5.891641139984131e+00, 5.962949275970459e+00, 6.19586706161499e+00, 6.067924976348877e+00, 5.969626903533936e+00, 5.922250270843506e+00, 5.286954879760742e+00, 5.001663684844971e+00, 5.41098213195801e+00, 5.944252490997314e+00, 6.2023606300354e+00, 6.27536153793335e+00, 6.359084129333496e+00, 6.229555606842041e+00, 6.240806102752686e+00, 5.959811687469483e+00, 6.582334041595459e+00, 6.202367782592773e+00, 6.035049438476562e+00, 5.92887020111084e+00, 5.704200267791748e+00, 4.959224700927734e+00, 5.114436626434326e+00, 5.176562786102295e+00, 5.21994686126709e+00, 5.246358394622803e+00, 5.383899688720703e+00, 5.199531555175781e+00, 5.466703414916992e+00, 5.397656440734863e+00, 5.905362129211425e+00, 5.76205062866211e+00, 5.698291301727295e+00, 5.677022933959961e+00, 5.638570785522461e+00, 4.806966781616211e+00, 4.871395111083984e+00, 4.872525215148926e+00, 4.963290214538574e+00, 4.905905723571777e+00, 5.046049118041992e+00, 5.0292649269104e+00, 5.193910598754885e+00, 5.251485347747804e+00, 5.526278972625732e+00, 5.573830604553223e+00, 5.581634521484375e+00, 5.522550106048584e+00, 5.477005481719971e+00, 4.761058807373047e+00, 4.710995674133301e+00, 4.798433780670166e+00, 4.927265644073486e+00, 4.871038913726807e+00, 5.018413066864014e+00, 5.003772258758544e+00, 4.964833259582517e+00, 5.134342193603516e+00, 5.094542026519775e+00, 5.485904693603516e+00, 5.458159923553467e+00, 5.417884349822998e+00, 5.386030197143555e+00, 4.978339672088623e+00, 4.669357776641846e+00, 4.856771469116211e+00, 4.895552158355713e+00, 4.806432723999023e+00, 5.15232515335083e+00, 5.227286338806152e+00, 5.020642280578613e+00, 5.208951473236084e+00, 5.137894153594971e+00, 5.607261180877686e+00, 5.500779628753662e+00]
-bui[3].ets.proHotWat.heaPum.COP=[1.2960498046875e+02, 3.456180572509766e+00, 3.456176519393921e+00, 3.453110933303833e+00, 2.631887435913086e+00, 2.457301616668701e+00, 2.432311058044434e+00, 2.441787004470825e+00, 2.377563953399658e+00, 2.420228719711304e+00, 2.4118971824646e+00, 2.366158962249756e+00, 2.366013526916504e+00, 2.532364368438721e+00, 2.556847810745239e+00, 2.55686616897583e+00, 2.556885242462158e+00, 2.556905269622803e+00, 2.455116510391235e+00, 2.390085458755493e+00, 2.400447845458984e+00, 2.399994850158691e+00, 2.363599061965942e+00, 2.399593114852905e+00, 2.418842554092407e+00, 2.36802339553833e+00, 2.361671447753906e+00, 2.416376113891602e+00, 2.552175045013428e+00, 2.552193164825439e+00, 2.55221152305603e+00, 2.552231073379517e+00, 2.393732070922852e+00, 2.373369693756104e+00, 2.404624938964844e+00, 2.399776220321655e+00, 2.380388021469116e+00, 2.37064003944397e+00, 2.41347599029541e+00, 2.404387474060059e+00, 2.371671199798584e+00, 2.363019227981567e+00, 2.548822164535522e+00, 2.548840045928955e+00, 2.548858165740967e+00, 2.548876762390137e+00, 2.453726768493652e+00, 2.373518943786621e+00, 2.405412673950195e+00, 2.394631624221802e+00, 2.369075775146484e+00, 2.371393442153931e+00, 2.40122127532959e+00, 2.369252443313599e+00, 2.358976364135742e+00, 2.359230279922485e+00, 2.548738241195679e+00, 2.548756837844849e+00, 2.548776626586914e+00, 2.548796653747559e+00, 2.548816919326782e+00, 2.363866806030273e+00, 2.387026309967041e+00, 2.382866621017456e+00, 2.377597332000732e+00, 2.352004051208496e+00, 2.385647773742676e+00, 2.37559175491333e+00, 2.349242925643921e+00, 2.351031541824341e+00, 2.456841945648193e+00, 2.540815830230713e+00, 2.540835618972778e+00, 2.540855407714844e+00, 2.540875196456909e+00, 2.353739500045776e+00, 2.361771583557129e+00, 2.380351781845093e+00, 2.380134344100952e+00, 2.347898960113525e+00, 2.383450746536255e+00, 2.379242420196533e+00, 2.347212553024292e+00, 2.345823764801025e+00, 2.353013753890991e+00, 2.535094499588013e+00, 2.53511381149292e+00, 2.535133600234985e+00, 2.535153388977051e+00, 2.415588855743408e+00, 2.346430063247681e+00, 2.374213218688965e+00, 2.372425079345703e+00, 2.344468593597412e+00, 2.362046957015991e+00, 2.376147985458374e+00, 2.350094079971313e+00, 2.346101045608521e+00, 2.345727682113647e+00, 2.535302400588989e+00, 2.535321474075317e+00]
-TDisWatSup.T=[2.931499938964844e+02, 2.92582275390625e+02, 2.915974426269531e+02, 2.906720581054688e+02, 2.902151794433594e+02, 2.893592224121094e+02, 2.855766296386719e+02, 2.8578369140625e+02, 2.8513232421875e+02, 2.857454223632812e+02, 2.855767211914062e+02, 2.85242919921875e+02, 2.852586364746094e+02, 2.857662963867188e+02, 2.859064331054688e+02, 2.856594543457031e+02, 2.855934753417969e+02, 2.855480041503906e+02, 2.848701477050781e+02, 2.848173217773438e+02, 2.851447143554688e+02, 2.854194030761719e+02, 2.84949462890625e+02, 2.856474609375e+02, 2.855693054199219e+02, 2.849398193359375e+02, 2.850672912597656e+02, 2.850259704589844e+02, 2.861770324707031e+02, 2.855629577636719e+02, 2.855037536621094e+02, 2.854762878417969e+02, 2.849061584472656e+02, 2.845181884765625e+02, 2.850751037597656e+02, 2.854505004882812e+02, 2.848786315917969e+02, 2.858276062011719e+02, 2.858765563964844e+02, 2.853567810058594e+02, 2.853517150878906e+02, 2.850812683105469e+02, 2.861438903808594e+02, 2.86142578125e+02, 2.855319213867188e+02, 2.85434326171875e+02, 2.853642883300781e+02, 2.844852905273438e+02, 2.848468017578125e+02, 2.848065490722656e+02, 2.843812866210938e+02, 2.845614013671875e+02, 2.849454345703125e+02, 2.843403625488281e+02, 2.844044494628906e+02, 2.843456726074219e+02, 2.852479248046875e+02, 2.850625305175781e+02, 2.850281677246094e+02, 2.850111389160156e+02, 2.849715270996094e+02, 2.841392211914062e+02, 2.843485412597656e+02, 2.843223571777344e+02, 2.842689819335938e+02, 2.839362487792969e+02, 2.843698120117188e+02, 2.842210388183594e+02, 2.839215087890625e+02, 2.839617309570312e+02, 2.841480407714844e+02, 2.845506896972656e+02, 2.846334228515625e+02, 2.845996398925781e+02, 2.845530395507812e+02, 2.838462524414062e+02, 2.838727722167969e+02, 2.840696411132812e+02, 2.841274108886719e+02, 2.837142028808594e+02, 2.841434936523438e+02, 2.841237182617188e+02, 2.836921691894531e+02, 2.83721923828125e+02, 2.836451416015625e+02, 2.842762756347656e+02, 2.843009643554688e+02, 2.842971496582031e+02, 2.842717895507812e+02, 2.839765625e+02, 2.83552490234375e+02, 2.839069519042969e+02, 2.839151306152344e+02, 2.835181579589844e+02, 2.839430847167969e+02, 2.841535034179688e+02, 2.836505737304688e+02, 2.836913146972656e+02, 2.836307373046875e+02, 2.844261474609375e+02, 2.842825622558594e+02]
-TDisWatRet.T=[2.931499938964844e+02, 2.92476806640625e+02, 2.913965148925781e+02, 2.89983642578125e+02, 2.870880126953125e+02, 2.83459228515625e+02, 2.804827270507812e+02, 2.805747985839844e+02, 2.801383666992188e+02, 2.805451049804688e+02, 2.804825744628906e+02, 2.8025244140625e+02, 2.802729187011719e+02, 2.804639892578125e+02, 2.806994018554688e+02, 2.805322570800781e+02, 2.804910583496094e+02, 2.804650573730469e+02, 2.800567321777344e+02, 2.800929565429688e+02, 2.802665405273438e+02, 2.804013366699219e+02, 2.801784057617188e+02, 2.805357666015625e+02, 2.805078735351562e+02, 2.801755676269531e+02, 2.802484436035156e+02, 2.802285461425781e+02, 2.809593811035156e+02, 2.804928588867188e+02, 2.804757385253906e+02, 2.8045751953125e+02, 2.80129150390625e+02, 2.799345092773438e+02, 2.802732238769531e+02, 2.804443969726562e+02, 2.801473083496094e+02, 2.806075134277344e+02, 2.806907653808594e+02, 2.804276123046875e+02, 2.803905029296875e+02, 2.802696228027344e+02, 2.807501525878906e+02, 2.813196105957031e+02, 2.804909362792969e+02, 2.804497985839844e+02, 2.804269104003906e+02, 2.799085998535156e+02, 2.801732788085938e+02, 2.801634216308594e+02, 2.798702392578125e+02, 2.800692138671875e+02, 2.802569274902344e+02, 2.798865051269531e+02, 2.799823913574219e+02, 2.799506530761719e+02, 2.803943481445312e+02, 2.803303833007812e+02, 2.80316650390625e+02, 2.803070983886719e+02, 2.8028759765625e+02, 2.797556762695312e+02, 2.799872436523438e+02, 2.799750671386719e+02, 2.799412841796875e+02, 2.796808471679688e+02, 2.800392456054688e+02, 2.799375610351562e+02, 2.797225036621094e+02, 2.797812194824219e+02, 2.799695129394531e+02, 2.801746826171875e+02, 2.802057495117188e+02, 2.801808166503906e+02, 2.801511840820312e+02, 2.79610107421875e+02, 2.797071533203125e+02, 2.7989794921875e+02, 2.799481811523438e+02, 2.795765991210938e+02, 2.799952392578125e+02, 2.799739074707031e+02, 2.795899353027344e+02, 2.796563110351562e+02, 2.79603759765625e+02, 2.800901184082031e+02, 2.800963439941406e+02, 2.800819702148438e+02, 2.800584716796875e+02, 2.798258361816406e+02, 2.79458740234375e+02, 2.79855224609375e+02, 2.798666381835938e+02, 2.794696350097656e+02, 2.799323425292969e+02, 2.80037353515625e+02, 2.796409606933594e+02, 2.796960144042969e+02, 2.796486511230469e+02, 2.802154235839844e+02, 2.801184997558594e+02]
-TDisWatBorLvg.T=[2.931499938964844e+02, 2.925395812988281e+02, 2.9151806640625e+02, 2.904457092285156e+02, 2.896138916015625e+02, 2.877421264648438e+02, 2.841339111328125e+02, 2.843036193847656e+02, 2.843265686035156e+02, 2.843807373046875e+02, 2.84343505859375e+02, 2.843193054199219e+02, 2.8426513671875e+02, 2.842280578613281e+02, 2.842157287597656e+02, 2.842267456054688e+02, 2.842286987304688e+02, 2.842249450683594e+02, 2.841043090820312e+02, 2.840822448730469e+02, 2.841324157714844e+02, 2.841029357910156e+02, 2.840670776367188e+02, 2.84070556640625e+02, 2.840776977539062e+02, 2.840626831054688e+02, 2.840684814453125e+02, 2.840551452636719e+02, 2.840431823730469e+02, 2.840683288574219e+02, 2.840839538574219e+02, 2.840907592773438e+02, 2.840228271484375e+02, 2.838610229492188e+02, 2.840322875976562e+02, 2.8400537109375e+02, 2.839539489746094e+02, 2.840028686523438e+02, 2.840199584960938e+02, 2.84046630859375e+02, 2.8405078125e+02, 2.840433654785156e+02, 2.840318298339844e+02, 2.840518798828125e+02, 2.840782775878906e+02, 2.840859069824219e+02, 2.840828552246094e+02, 2.838321838378906e+02, 2.839595642089844e+02, 2.839208679199219e+02, 2.836875305175781e+02, 2.838070983886719e+02, 2.838889770507812e+02, 2.836428833007812e+02, 2.836736450195312e+02, 2.836247863769531e+02, 2.838925476074219e+02, 2.838225708007812e+02, 2.838302307128906e+02, 2.8384228515625e+02, 2.838512573242188e+02, 2.835404357910156e+02, 2.8361865234375e+02, 2.835760192871094e+02, 2.835173950195312e+02, 2.833614807128906e+02, 2.835544738769531e+02, 2.834295959472656e+02, 2.833178100585938e+02, 2.833174743652344e+02, 2.834297485351562e+02, 2.835650634765625e+02, 2.836075744628906e+02, 2.836156921386719e+02, 2.836150207519531e+02, 2.832756652832031e+02, 2.832985534667969e+02, 2.83353271484375e+02, 2.833727722167969e+02, 2.831630554199219e+02, 2.833425903320312e+02, 2.8333740234375e+02, 2.831304321289062e+02, 2.831249084472656e+02, 2.830687561035156e+02, 2.833564758300781e+02, 2.833912048339844e+02, 2.834094543457031e+02, 2.834152526855469e+02, 2.832220458984375e+02, 2.830405578613281e+02, 2.831982116699219e+02, 2.8320166015625e+02, 2.829984436035156e+02, 2.83207763671875e+02, 2.832983093261719e+02, 2.830625e+02, 2.830739440917969e+02, 2.830282592773438e+02, 2.833415832519531e+02, 2.83337646484375e+02]
-pla.dH_flow=[-2.61571125e+05, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.136399296875e+05, 8.4164328125e+04, 1.23223546875e+05, 8.43207109375e+04, 1.0177534375e+05, 1.22317609375e+05, 1.24394609375e+05, 8.590290625e+04, 7.176931250000015e+04, 9.629553125e+04, 1.02509078125e+05, 1.0687703125e+05, 1.298191484375e+05, 1.3285275e+05, 1.295887109375e+05, 1.23432765625e+05, 1.3251071875e+05, 1.00054640625e+05, 1.0786175e+05, 1.3187721875e+05, 1.316344375e+05, 1.32568609375e+05, 4.287754296875019e+04, 1.07267671875e+05, 1.1251365625e+05, 1.14753734375e+05, 1.3175715625e+05, 1.4036503125e+05, 1.32554703125e+05, 1.19294375e+05, 1.34927796875e+05, 7.85404375e+04, 7.27842421875e+04, 1.264208671875e+05, 1.262718984375e+05, 1.31232484375e+05, 4.23448671875e+04, 4.261809375e+04, 1.052598359375e+05, 1.146388828125e+05, 1.2161746875e+05, 1.3961484375e+05, 1.341150625e+05, 1.35783125e+05, 1.451643125e+05, 1.41839375e+05, 1.367265e+05, 1.4712746875e+05, 1.46148265625e+05, 1.47956796875e+05, 1.373599218749995e+05, 1.392316875e+05, 1.38864625e+05, 1.38245609375e+05, 1.37733796875e+05, 1.5090575e+05, 1.48000453125e+05, 1.4936303125e+05, 1.50905375e+05, 1.586078125e+05, 1.49971921875e+05, 1.53801515625e+05, 1.60213375e+05, 1.59984671875e+05, 1.5665828125e+05, 1.49247265625e+05, 1.47226921875e+05, 1.46664734375e+05, 1.465741875e+05, 1.60877546875e+05, 1.6075509375e+05, 1.57712546875e+05, 1.5676575e+05, 1.6573834375e+05, 1.57910765625e+05, 1.57972921875e+05, 1.6683778125e+05, 1.6694396875e+05, 1.6935815625e+05, 1.56703484375e+05, 1.55192859375e+05, 1.5423584375e+05, 1.53885484375e+05, 1.6041953125e+05, 1.70038921875e+05, 1.6296028125e+05, 1.62788546875e+05, 1.7160878125e+05, 1.63138640625e+05, 1.58290578125e+05, 1.68506578125e+05, 1.67842390625e+05, 1.69633046875e+05, 1.55873515625e+05, 1.5613653125e+05]
-borFie.Q_flow=[0e+00, 1.101350212097168e+01, 5.558422565460205e+00, 3.411547422409058e+00, 2.084402084350586e+00, 1.401702404022217e+00, -1.028171875e+05, -1.37632375e+05, -2.22206421875e+05, -2.3258375e+05, -2.27713828125e+05, -3.716826875e+05, -3.9101359375e+05, -4.062321875e+05, -2.41685953125e+05, -2.44039359375e+05, -2.548896875e+05, -2.680843125000001e+05, -3.6790221875e+05, -5.0915275e+05, -4.862400625e+05, -4.3845478125e+05, -4.79863375e+05, -4.0648390625e+05, -3.2760153125e+05, -4.153769375e+05, -4.4058090625e+05, -4.7009453125e+05, -3.116849687499992e+05, -2.73889875e+05, -2.8434271875e+05, -2.912264375e+05, -3.1902603125e+05, -5.64022625e+05, -5.054753437499997e+05, -4.3911896875e+05, -3.7824896875e+05, -3.6932571875e+05, -2.60264703125e+05, -2.46794421875e+05, -3.445096875e+05, -3.653883124999997e+05, -2.9689040625e+05, -1.9926359375e+05, -2.157319375e+05, -2.55930828125e+05, -2.7985190625e+05, -5.019554375e+05, -5.250493125e+05, -5.300949375e+05, -5.925818125e+05, -6.150888125e+05, -5.3253e+05, -5.932619375e+05, -6.53209125e+05, -6.711138125e+05, -5.936474999999981e+05, -4.958606562500003e+05, -4.6163715625e+05, -4.4787259375e+05, -4.4395303125e+05, -6.253665625e+05, -7.10095875e+05, -6.843686875e+05, -6.816613125e+05, -8.316108125e+05, -7.17113625e+05, -7.347013125e+05, -8.275370000000002e+05, -8.26164875e+05, -8.199435625e+05, -6.424766875e+05, -5.892969375e+05, -5.594960625e+05, -5.5564675e+05, -6.7562475e+05, -8.53069125e+05, -7.735136875e+05, -7.415514375e+05, -8.598058125e+05, -8.08418625e+05, -7.405825624999997e+05, -8.54091562499999e+05, -8.947079375e+05, -9.250923125e+05, -7.39768375e+05, -6.728295e+05, -6.40045375e+05, -6.305611875e+05, -6.77659125e+05, -8.962138125e+05, -8.270889375e+05, -7.90529625e+05, -8.74884375e+05, -8.760193125e+05, -7.248435625e+05, -7.96429625e+05, -8.581509375e+05, -8.80611875e+05, -7.38672e+05, -6.618581875e+05]
-bui[1].ets.PHea=[0e+00, 0e+00, 0e+00, 0e+00, 6.77116015625e+03, 1.095484375e+04, 1.35257021484375e+04, 7.490169921874997e+03, 9.09457421875e+03, 1.04564638671875e+04, 6.09959716796875e+03, 0e+00, 0e+00, 0e+00, 1.631003761291511e+01, 1.96625e+02, 1.62698828125e+03, 2.380903808593752e+03, 6.66519189453125e+03, 1.77105234375e+04, 2.15685e+04, 1.145119140625e+04, 7.37290673828125e+03, 1.0988017578125e+04, 8.6239453125e+03, 0e+00, 0e+00, 0e+00, 4.739163970947322e+01, 2.412601470947266e+02, 1.005553894042969e+03, 1.789241577148438e+03, 3.643375244140625e+03, 1.5251990234375e+04, 1.879882812499996e+04, 8.870318359375e+03, 1.475735961914062e+03, 2.15701806640625e+03, 3.587587646484375e+03, 4.557392578125e+02, 0e+00, 0e+00, 0e+00, 0e+00, 1.797123908996582e+01, 2.237577056884766e+02, 1.676046875e+03, 1.438018359375e+04, 2.2288958984375e+04, 1.91972265625e+04, 6.840439453125e+03, 1.09413828125e+04, 1.22596982421875e+04, 5.62821337890625e+03, 0e+00, 0e+00, 1.575240612030084e+01, 1.902149505615204e+02, 1.203777465820312e+03, 2.098480712890625e+03, 2.92367236328125e+03, 1.103983984375e+04, 2.1156419921875e+04, 2.8871005859375e+04, 1.7256919921875e+04, 1.7947490234375e+04, 2.32640703125e+04, 1.36751689453125e+04, 1.401321411132791e+03, 1.687342285156226e+03, 2.7951123046875e+03, 3.957362060546875e+03, 4.53107568359375e+03, 5.27125927734375e+03, 5.81619677734375e+03, 8.428828125e+03, 8.843916015625e+03, 8.5553984375e+03, 8.4622021484375e+03, 8.750734375e+03, 9.0781083984375e+03, 9.3207255859375e+03, 9.166698242187505e+03, 7.08312939453125e+03, 7.794076171875e+03, 8.16154833984375e+03, 8.332806640625e+03, 8.593400390625e+03, 8.9478486328125e+03, 1.07229375e+04, 1.234221484375e+04, 1.198230859375e+04, 1.14083291015625e+04, 1.10488818359375e+04, 1.10539384765625e+04, 1.10067509765625e+04, 1.12693330078125e+04, 8.2539033203125e+03, 9.188537109375e+03, 9.6152431640625e+03, 9.81254296875e+03]
-bui[2].ets.PHea=[0e+00, 1.7201587890625e+04, 2.21876171875e+04, 2.67870078125e+04, 1.3606925e+05, 3.556165625e+04, 3.1660724609375e+04, 1.262683359375001e+05, 5.6578734375e+04, 2.1210681640625e+04, 1.213728984375e+05, 1.151002421875e+05, 1.219572265625e+05, 2.4069611328125e+04, 3.368907812500001e+04, 4.110878515625e+04, 4.827628515625e+04, 5.377714062500001e+04, 1.58298109375e+05, 5.02737734375e+04, 5.227520703125e+04, 5.945816796875e+04, 1.06737640625e+05, 1.8099400390625e+04, 5.254694140625e+04, 1.305200546875e+05, 1.2347434375e+05, 9.66293828125e+04, 3.547618359375006e+04, 4.32513515625e+04, 4.928041015625e+04, 5.454038671875e+04, 1.765221875e+05, 1.079986796875e+05, 5.277675781249989e+04, 3.0237884765625e+04, 1.1692021875e+05, 2.170681640625e+03, 1.4019765625e+04, 1.1861040625e+05, 1.008099609375e+05, 1.245664999999999e+05, 1.8353892578125e+04, 3.36368515625e+04, 4.438576171875e+04, 5.206916796875e+04, 8.53771484375e+04, 1.7333484375e+05, 6.552517578125e+04, 6.44408359375e+04, 1.92884890625e+05, 5.899311328125e+04, 5.832913671875e+04, 1.82302234375e+05, 1.6810815625e+05, 1.84369359375e+05, 4.936917187500039e+04, 7.052815624999994e+04, 7.82861796875e+04, 8.0203390625e+04, 8.28222421875e+04, 2.2596915625e+05, 7.76089921875e+04, 8.80264140625e+04, 1.78234875e+05, 1.779118125e+05, 8.15381796875e+04, 1.7752325e+05, 2.225636718749995e+05, 2.136127499999999e+05, 1.1041703125e+05, 8.99105859375e+04, 8.97708203125e+04, 9.6851390625e+04, 1.024735e+05, 2.7571265625e+05, 1.189433046875e+05, 1.077933984375e+05, 1.055256171875e+05, 2.46419640625e+05, 8.7807046875e+04, 1.039588203125029e+05, 2.56986453125e+05, 2.32523953125e+05, 2.42067953125e+05, 9.8237984375e+04, 1.02270390625e+05, 1.08184171875e+05, 1.135520390625e+05, 2.16667515625e+05, 2.35925796875e+05, 1.16475265625e+05, 1.175741953125e+05, 2.885591875e+05, 7.29897578125e+04, 8.80649375e+04, 2.399091875e+05, 2.13083078125e+05, 2.3328778125e+05, 7.71610703125e+04, 9.3900296875e+04]
-bui[3].ets.PHea=[0e+00, 3.35878662109375e+03, 5.06736376953125e+03, 7.13740380859375e+03, 5.690753125e+04, 6.09542734375e+04, 5.009219140625e+04, 4.077214843749999e+04, 3.9042328125e+04, 3.797483203125e+04, 4.16066171875e+04, 3.28797578125e+04, 3.49355078125e+04, 3.8662841796875e+03, 7.097731445312512e+03, 1.1817302734375e+04, 1.57485263671875e+04, 1.852637500000001e+04, 5.896825e+04, 8.182146875e+04, 6.38178125e+04, 4.419171484375e+04, 3.454737890625e+04, 3.5471609375e+04, 4.11763125e+04, 3.51594921875e+04, 3.247482421875e+04, 2.5723408203125e+04, 3.94456616210941e+03, 9.5445087890625e+03, 1.39149169921875e+04, 1.710860546875e+04, 6.481843359375e+04, 8.2638640625e+04, 6.450650781249986e+04, 3.91578828125e+04, 2.64460625e+04, 2.2444671875e+04, 2.8260900390625e+04, 3.0074337890625e+04, 2.25356328125e+04, 3.044649999999997e+04, 7.060041809082031e+01, 3.439625244140625e+03, 1.02026572265625e+04, 1.5234654296875e+04, 2.9543759765625e+04, 8.58876015625e+04, 8.33949140625e+04, 7.64063984375e+04, 6.6706125e+04, 6.68373828125e+04, 6.549746875e+04, 6.80150234375e+04, 5.02456953125e+04, 5.423685546875e+04, 1.412361035156259e+04, 2.190715429687496e+04, 2.57517890625e+04, 2.6856978515625e+04, 2.8474232421875e+04, 9.582675e+04, 9.676975e+04, 9.55397890625e+04, 8.6431984375e+04, 8.45655234375e+04, 8.30318125e+04, 8.11347578125e+04, 6.285799218749985e+04, 6.037705859374996e+04, 3.318099609375e+04, 2.8877615234375e+04, 2.9354197265625e+04, 3.23825703125e+04, 3.4457671875e+04, 9.82365078125e+04, 1.027587265625e+05, 9.99671796875e+04, 8.9418234375e+04, 8.51929921875e+04, 8.368959375e+04, 8.368087500000003e+04, 7.745499218750025e+04, 6.62351328125e+04, 6.745934375e+04, 3.199307421875e+04, 3.413773828125e+04, 3.641608203125e+04, 3.7907765625e+04, 7.48447421875e+04, 1.020563125e+05, 9.35410625e+04, 8.99586015625e+04, 8.9215546875e+04, 6.90840859375e+04, 6.80838671875e+04, 7.474615625e+04, 6.129933984375e+04, 6.59679296875e+04, 2.5248013671875e+04, 3.1975892578125e+04]
-bui[1].ets.PPum=[1.396844291687012e+01, 1.355741500854492e+01, 1.952925903320312e+03, 1.952925903320312e+03, 1.93168896484375e+03, 1.94494921875e+03, 1.964538940429688e+03, 1.933525756835938e+03, 1.933420043945312e+03, 1.932177978515625e+03, 1.935423095703125e+03, 1.355741500854492e+01, 1.355741500854492e+01, 1.355741500854492e+01, 1.952925903320312e+03, 1.95300048828125e+03, 1.948572265625e+03, 1.945189697265625e+03, 1.935527587890625e+03, 2.003194580078125e+03, 2.086427734375e+03, 1.940796875e+03, 1.93511767578125e+03, 1.932675537109375e+03, 1.931692016601562e+03, 1.35573616027832e+01, 1.355741500854492e+01, 1.355741500854492e+01, 1.952925903320312e+03, 1.953094604492188e+03, 1.952601806640625e+03, 1.947832397460938e+03, 1.941203979492188e+03, 1.969778686523438e+03, 2.02164794921875e+03, 1.933118774414062e+03, 1.952385986328125e+03, 1.954497924804688e+03, 1.943698120117188e+03, 1.952905151367188e+03, 1.355741500854492e+01, 1.355741500854492e+01, 1.355741500854492e+01, 1.355741500854492e+01, 1.952925903320312e+03, 1.953078369140625e+03, 1.94862548828125e+03, 1.95215087890625e+03, 2.07344091796875e+03, 2.042047973632812e+03, 1.935227172851562e+03, 1.932272827148438e+03, 1.938362060546875e+03, 1.936492553710938e+03, 1.355741500854492e+01, 1.355741500854492e+01, 1.952925903320312e+03, 1.953041259765625e+03, 1.951213745117188e+03, 1.946726806640625e+03, 1.94353173828125e+03, 1.931042236328125e+03, 2.04924609375e+03, 2.27613525390625e+03, 2.019099853515625e+03, 1.995171997070312e+03, 2.112925048828125e+03, 1.964762084960938e+03, 1.950336059570313e+03, 1.9489111328125e+03, 1.94445654296875e+03, 1.940724365234375e+03, 1.939257446289062e+03, 1.937702514648438e+03, 1.936755004882812e+03, 1.9329150390625e+03, 1.932218017578125e+03, 1.932554809570312e+03, 1.932722290039062e+03, 1.932385498046875e+03, 1.931903076171875e+03, 1.93166552734375e+03, 1.931832153320312e+03, 1.9353896484375e+03, 1.934634399414062e+03, 1.933487060546875e+03, 1.932898559570312e+03, 1.932388427734375e+03, 1.931880981445312e+03, 1.932249389648438e+03, 1.941544677734375e+03, 1.939598754882812e+03, 1.936199340820312e+03, 1.934209716796875e+03, 1.933975952148438e+03, 1.934360229492188e+03, 1.935428100585938e+03, 1.933119995117188e+03, 1.931907104492188e+03, 1.931587646484375e+03, 1.931726440429688e+03]
-bui[2].ets.PPum=[1.20891025390625e+04, 1.19434267578125e+04, 1.19309853515625e+04, 1.19241845703125e+04, 1.303602734375e+04, 1.19290732421875e+04, 1.1930767578125e+04, 1.21042119140625e+04, 1.18961376953125e+04, 1.1964708984375e+04, 1.21498798828125e+04, 1.21077392578125e+04, 1.21562568359375e+04, 1.19538828125e+04, 1.1934736328125e+04, 1.1920201171875e+04, 1.19099873046875e+04, 1.18984150390625e+04, 1.36946640625e+04, 1.1902958984375e+04, 1.19042080078125e+04, 1.190665234375e+04, 1.2178369140625e+04, 1.197583984375e+04, 1.19137890625e+04, 1.2307943359375e+04, 1.216984765625e+04, 1.20279765625e+04, 1.1932677734375e+04, 1.19185888671875e+04, 1.19081630859375e+04, 1.1897646484375e+04, 1.32517646484375e+04, 1.25425732421875e+04, 1.19043291015625e+04, 1.19416455078125e+04, 1.21443212890625e+04, 1.20334169921875e+04, 1.19900693359375e+04, 1.2134408203125e+04, 1.1937037109375e+04, 1.21021162109375e+04, 1.197414453125e+04, 1.19370205078125e+04, 1.19174130859375e+04, 1.19020400390625e+04, 1.193338671875e+04, 1.38530810546875e+04, 1.18980556640625e+04, 1.18987802734375e+04, 1.36881552734375e+04, 1.19174658203125e+04, 1.18966337890625e+04, 1.38912646484375e+04, 1.32343544921875e+04, 1.35526337890625e+04, 1.19073447265625e+04, 1.19212216796875e+04, 1.19837216796875e+04, 1.20044384765625e+04, 1.20301162109375e+04, 1.55132158203125e+04, 1.19699130859375e+04, 1.20495693359375e+04, 1.31242822265625e+04, 1.43511416015625e+04, 1.19656904296875e+04, 1.33411494140625e+04, 1.503800292968748e+04, 1.460048535156249e+04, 1.2497693359375e+04, 1.2091388671875e+04, 1.2095044921875e+04, 1.218201171875e+04, 1.22680146484375e+04, 1.7079328125e+04, 1.30108525390625e+04, 1.2330978515625e+04, 1.22862412109375e+04, 1.63671943359375e+04, 1.20429873046875e+04, 1.222558105468754e+04, 1.638133398437501e+04, 1.52387529296875e+04, 1.5576974609375e+04, 1.2149458984375e+04, 1.22419814453125e+04, 1.23361201171875e+04, 1.24420615234375e+04, 1.4446341796875e+04, 1.6653375e+04, 1.24500712890625e+04, 1.2497583984375e+04, 1.75600703125e+04, 1.2008841796875e+04, 1.2045443359375e+04, 1.58699619140625e+04, 1.456762890625e+04, 1.501837890625e+04, 1.19406376953125e+04, 1.21168740234375e+04]
-bui[3].ets.PPum=[4.69525439453125e+03, 4.656201171875e+03, 4.6482802734375e+03, 4.6428486328125e+03, 4.81775634765625e+03, 4.776685546875e+03, 4.666814453125e+03, 4.6353681640625e+03, 4.6390517578125e+03, 4.63840283203125e+03, 4.63524169921875e+03, 4.64689501953125e+03, 4.64417626953125e+03, 4.67007275390625e+03, 4.65581787109375e+03, 4.64365087890625e+03, 4.6367607421875e+03, 4.63328857421875e+03, 4.85413232421875e+03, 5.13326953125e+03, 4.79458740234375e+03, 4.6385595703125e+03, 4.64511962890625e+03, 4.64215380859375e+03, 4.6351806640625e+03, 4.64382861328125e+03, 4.648048828125e+03, 4.64237890625e+03, 4.66817919921875e+03, 4.6490078125e+03, 4.6398046875e+03, 4.63501806640625e+03, 4.71825634765625e+03, 5.11639697265625e+03, 4.811341796874998e+03, 4.63678662109375e+03, 4.66067236328125e+03, 4.67514892578125e+03, 4.65353857421875e+03, 4.6506611328125e+03, 4.6748720703125e+03, 4.651482421875e+03, 4.67427587890625e+03, 4.67202587890625e+03, 4.64746142578125e+03, 4.6377548828125e+03, 4.6243046875e+03, 5.1753544921875e+03, 5.20065380859375e+03, 5.01769775390625e+03, 4.79584228515625e+03, 4.7845439453125e+03, 4.79386962890625e+03, 4.80662939453125e+03, 4.65318505859375e+03, 4.665759765625e+03, 4.63991064453125e+03, 4.629349609375e+03, 4.62665673828125e+03, 4.62751513671875e+03, 4.62980517578125e+03, 5.4011787109375e+03, 5.59920068359375e+03, 5.56794091796875e+03, 5.25958349609375e+03, 5.13020654296875e+03, 5.15773779296875e+03, 5.0837490234375e+03, 4.740341308593748e+03, 4.69951318359375e+03, 4.63243798828125e+03, 4.62988916015625e+03, 4.63154296875e+03, 4.6421943359375e+03, 4.65273828125e+03, 5.40612353515625e+03, 5.768548828125e+03, 5.7297978515625e+03, 5.3542197265625e+03, 5.15753955078125e+03, 5.17128173828125e+03, 5.15743017578125e+03, 4.994713378906255e+03, 4.7595546875e+03, 4.80014599609375e+03, 4.636435546875e+03, 4.65036669921875e+03, 4.66077197265625e+03, 4.66898974609375e+03, 4.93166943359375e+03, 5.6876435546875e+03, 5.46194921875e+03, 5.341970703125e+03, 5.279689453125e+03, 4.83241748046875e+03, 4.80954931640625e+03, 4.90953466796875e+03, 4.71440283203125e+03, 4.754337890625e+03, 4.62674365234375e+03, 4.638984375e+03]
-dis.mCon_flow[1]=[-1.182050928473473e-01, -0e+00, 1.611527295608539e-05, 1.074351439456223e-05, 3.15659499168396e+00, 4.22320032119751e+00, 4.355947494506836e+00, 2.562768697738647e+00, 2.871365547180176e+00, 3.331134080886841e+00, 2.160864591598511e+00, -0e+00, -0e+00, -0e+00, 1.074351439456223e-05, 5.62315545976162e-02, 6.426233649253845e-01, 9.208481311798102e-01, 2.286338090896606e+00, 5.136517524719238e+00, 6.037415027618408e+00, 3.636196374893188e+00, 2.376487016677856e+00, 3.409314870834351e+00, 2.880089282989502e+00, -0e+00, -0e+00, -0e+00, 1.074351439456223e-05, 9.734699130058289e-02, 3.815559148788452e-01, 6.984788775444031e-01, 1.340672492980957e+00, 4.566251754760742e+00, 5.363323688507072e+00, 2.813554525375366e+00, 4.185566008090973e-01, 4.264960587024689e-01, 1.134461402893066e+00, 1.605081111192703e-01, -0e+00, 0e+00, -0e+00, -0e+00, 1.074351439456223e-05, 9.04603973031044e-02, 6.387127041816711e-01, 4.411007881164551e+00, 6.123008251190186e+00, 5.454955101013184e+00, 2.236896514892578e+00, 3.236322641372681e+00, 3.752742052078247e+00, 1.952666044235229e+00, -0e+00, -0e+00, 1.074351439456223e-05, 7.442032545804618e-02, 4.635933935642242e-01, 7.869517207145691e-01, 1.081184387207031e+00, 3.45541524887085e+00, 5.786457061767578e+00, 7.405751705169678e+00, 4.999924182891846e+00, 4.994429111480713e+00, 6.283172607421875e+00, 4.152368545532227e+00, 5.196852684020918e-01, 6.179132461547744e-01, 9.895744323730469e-01, 1.400180816650391e+00, 1.598387956619263e+00, 1.842630982398987e+00, 2.015504837036133e+00, 2.769613742828369e+00, 2.839629173278809e+00, 2.77912163734436e+00, 2.758461952209473e+00, 2.806990385055542e+00, 2.91646671295166e+00, 3.0019850730896e+00, 2.923632621765138e+00, 2.3135085105896e+00, 2.51774263381958e+00, 2.67480206489563e+00, 2.739080667495728e+00, 2.817389965057373e+00, 2.919260025024414e+00, 3.383444309234619e+00, 3.74714994430542e+00, 3.687528848648071e+00, 3.54357647895813e+00, 3.414525270462036e+00, 3.423786163330078e+00, 3.462419986724854e+00, 3.495918273925781e+00, 2.646192073822021e+00, 2.90827488899231e+00, 3.072881698608398e+00, 3.155638933181763e+00]
-dis.mCon_flow[2]=[-7.831910705566406e+01, 1.036104393005371e+01, 1.239069557189941e+01, 1.373686599731445e+01, 3.99755973815918e+01, 1.274805450439453e+01, 1.243507480621338e+01, 3.287492752075197e+01, 1.817392349243164e+01, 7.664088249206543e+00, 3.323621368408203e+01, 2.999446105957031e+01, 3.165873146057129e+01, 8.91630744934082e+00, 1.172947692871094e+01, 1.464294338226318e+01, 1.696838760375977e+01, 1.856880378723145e+01, 4.350537109375e+01, 1.661728858947754e+01, 1.728323364257812e+01, 1.737060928344727e+01, 2.988778495788574e+01, 6.507280349731445e+00, 1.625246429443359e+01, 3.354973220825195e+01, 3.200348663330078e+01, 2.64254150390625e+01, 1.208626174926759e+01, 1.504259204864502e+01, 1.718015098571777e+01, 1.876047325134277e+01, 4.554290008544922e+01, 3.15127010345459e+01, 1.738702201843259e+01, 1.062556266784668e+01, 3.094195747375488e+01, 8.382377624511719e-01, 5.213047981262207e+00, 3.028449249267578e+01, 2.584345436096191e+01, 3.08269691467285e+01, 6.674609184265137e+00, 1.134960556030273e+01, 1.534835910797119e+01, 1.801284027099609e+01, 2.581838035583496e+01, 4.468987655639648e+01, 2.080974006652832e+01, 2.059570503234863e+01, 4.737458801269531e+01, 1.917893409729004e+01, 1.90220775604248e+01, 4.699990081787109e+01, 4.164272689819336e+01, 4.468515014648438e+01, 1.613310623168958e+01, 2.304778099060057e+01, 2.514846992492676e+01, 2.55733814239502e+01, 2.619311904907227e+01, 5.409929656982422e+01, 2.361575126647949e+01, 2.635940551757812e+01, 4.394818115234375e+01, 4.564154434204102e+01, 2.464463996887207e+01, 4.502701568603516e+01, 5.200918197631826e+01, 5.030402755737302e+01, 3.082315635681152e+01, 2.752745246887207e+01, 2.751385498046875e+01, 2.927617263793945e+01, 3.060867500305176e+01, 6.281869506835938e+01, 3.374703216552734e+01, 3.129351043701172e+01, 3.066386413574219e+01, 5.70063362121582e+01, 2.617908668518066e+01, 2.999586868286194e+01, 5.783929824829104e+01, 5.326508331298828e+01, 5.482612228393555e+01, 2.899938201904297e+01, 3.013254165649414e+01, 3.157004165649414e+01, 3.282114028930664e+01, 5.198984909057617e+01, 5.626553344726562e+01, 3.298718643188477e+01, 3.330496215820312e+01, 6.322187423706055e+01, 2.215335273742676e+01, 2.640523338317871e+01, 5.563479232788086e+01, 4.942638397216797e+01, 5.257940292358398e+01, 2.330313301086426e+01, 2.799535942077637e+01]
-dis.mCon_flow[3]=[-2.868548393249512e+01, 2.148199081420898e+00, 2.967348098754883e+00, 3.667220115661621e+00, 1.477042102813721e+01, 1.345116233825684e+01, 1.092110919952393e+01, 8.513651847839354e+00, 7.422837734222412e+00, 7.641809463500977e+00, 8.350000381469727e+00, 5.815726757049561e+00, 6.332594871520996e+00, 1.156771659851074e+00, 2.183584451675419e+00, 3.554558277130127e+00, 4.674603939056396e+00, 5.44127941131592e+00, 1.394088745117188e+01, 1.716012001037598e+01, 1.355520820617676e+01, 9.044739723205566e+00, 6.172503471374512e+00, 6.840451717376709e+00, 8.386198997497559e+00, 6.405519485473633e+00, 5.619524955749512e+00, 5.224857330322266e+00, 1.211805701255808e+00, 2.883467435836792e+00, 4.132372856140137e+00, 5.033908367156982e+00, 1.365690326690674e+01, 1.694171905517578e+01, 1.376275157928464e+01, 7.766141414642334e+00, 4.005117416381836e+00, 2.789377450942993e+00, 4.838409423828125e+00, 5.216417789459229e+00, 2.791091680526733e+00, 5.096129417419426e+00, 4.395697033032775e-05, 9.717786908149719e-01, 3.064284324645996e+00, 4.487105369567871e+00, 7.417079448699951e+00, 1.749689674377441e+01, 1.75300178527832e+01, 1.604778861999512e+01, 1.358206653594971e+01, 1.388440227508545e+01, 1.386154460906982e+01, 1.388086414337158e+01, 1.004445362091064e+01, 1.092499923706055e+01, 4.115031719207789e+00, 6.232306957244863e+00, 7.228437900543213e+00, 7.500619411468506e+00, 7.883352756500244e+00, 1.905119323730469e+01, 1.975221824645996e+01, 1.937946319580078e+01, 1.755593109130859e+01, 1.691790580749512e+01, 1.713077926635742e+01, 1.651705169677734e+01, 1.268666267395016e+01, 1.216089344024657e+01, 8.087071418762207e+00, 7.902298450469971e+00, 8.036323547363281e+00, 8.742513656616211e+00, 9.212282180786133e+00, 1.934243965148926e+01, 2.034452819824219e+01, 2.009635734558105e+01, 1.823719787597656e+01, 1.695884132385254e+01, 1.72793083190918e+01, 1.716642761230469e+01, 1.554116249084477e+01, 1.329351043701172e+01, 1.377358722686768e+01, 8.561301231384277e+00, 9.092960357666016e+00, 9.603631019592285e+00, 9.931637763977051e+00, 1.588136768341064e+01, 1.986792373657227e+01, 1.885037422180176e+01, 1.820651626586914e+01, 1.764520645141602e+01, 1.423717880249023e+01, 1.408374691009521e+01, 1.501989841461182e+01, 1.228336906433105e+01, 1.32431583404541e+01, 6.944387912750244e+00, 8.593170166015625e+00]
+bui[1].ets.proHeaWat.heaPum.COP=[8.832118034362793e+00, 8.832118034362793e+00, 9.579221725463867e+00, 1.149501323699951e+01, 9.387635231018066e+00, 8.031779289245605e+00, 6.971954822540283e+00, 7.0502028465271e+00, 6.889526844024658e+00, 6.729149341583252e+00, 7.11943244934082e+00, 7.84765625e+00, 7.84765625e+00, 7.84765625e+00, 8.215466499328613e+00, 7.787877082824707e+00, 7.607791423797607e+00, 7.497085094451904e+00, 6.949143409729004e+00, 6.023943901062012e+00, 5.892392635345459e+00, 6.548171043395996e+00, 6.876989364624023e+00, 6.628021240234375e+00, 6.853427886962891e+00, 7.801688671112061e+00, 7.801688671112061e+00, 7.801688671112061e+00, 8.070176124572752e+00, 7.744912147521973e+00, 7.629341125488281e+00, 7.546317577362061e+00, 7.281877517700195e+00, 6.148449420928955e+00, 6.018684864044192e+00, 6.777149677276611e+00, 7.651956558227539e+00, 7.611922264099121e+00, 7.41103458404541e+00, 7.768378734588623e+00, 7.842714309692383e+00, 7.842714309692383e+00, 7.842714309692383e+00, 7.842714309692383e+00, 8.195549964904785e+00, 7.789941787719727e+00, 7.566837310791016e+00, 6.254076480865479e+00, 5.804583549499512e+00, 5.965267181396484e+00, 6.814761161804199e+00, 6.476490020751953e+00, 6.413000106811523e+00, 6.930737018585205e+00, 7.527099132537842e+00, 7.527099132537842e+00, 7.85388660430908e+00, 7.483488082885747e+00, 7.357434272766113e+00, 7.289169788360596e+00, 7.205630779266357e+00, 6.411882877349854e+00, 5.754534721374512e+00, 5.442438125610352e+00, 5.945779800415039e+00, 5.880862712860107e+00, 5.665586471557617e+00, 6.155343055725098e+00, 7.133344650268558e+00, 7.085088253021241e+00, 6.952001571655273e+00, 6.905290126800537e+00, 6.897139549255371e+00, 6.852850914001465e+00, 6.804208278656006e+00, 6.538249969482422e+00, 6.383091926574707e+00, 6.430099964141846e+00, 6.452228546142578e+00, 6.385649681091309e+00, 6.361441612243652e+00, 6.386318206787109e+00, 6.346558570861816e+00, 6.480782032012939e+00, 6.413055896759033e+00, 6.462666511535645e+00, 6.495858669281006e+00, 6.490438938140869e+00, 6.461043834686279e+00, 6.331009387969971e+00, 6.092306613922119e+00, 6.140239715576172e+00, 6.194551944732666e+00, 6.191067695617676e+00, 6.169701099395752e+00, 6.258161067962646e+00, 6.212842464447021e+00, 6.370314121246338e+00, 6.301892280578613e+00, 6.31135082244873e+00, 6.37905740737915e+00]
+bui[1].ets.proHotWat.heaPum.COP=[1.2960498046875e+02, 3.456180810928345e+00, 3.456180810928345e+00, 3.456180810928345e+00, 3.011730909347534e+00, 2.786733150482178e+00, 2.613421201705933e+00, 2.657326698303223e+00, 2.576006889343262e+00, 2.581827640533447e+00, 2.680461883544922e+00, 2.722509860992432e+00, 2.722536325454712e+00, 2.722562551498413e+00, 2.722588777542114e+00, 2.722615003585815e+00, 2.722641468048096e+00, 2.722667694091797e+00, 2.711479187011719e+00, 2.576706409454346e+00, 2.512753009796143e+00, 2.587391138076782e+00, 2.590495347976685e+00, 2.551545143127441e+00, 2.634494543075562e+00, 2.716270923614502e+00, 2.716297388076782e+00, 2.716323614120483e+00, 2.716349601745605e+00, 2.716375827789307e+00, 2.716402053833008e+00, 2.71642804145813e+00, 2.716454267501831e+00, 2.609945058822632e+00, 2.505733966827393e+00, 2.555089473724365e+00, 2.622116327285767e+00, 2.52437949180603e+00, 2.600228548049927e+00, 2.720423221588135e+00, 2.721357583999634e+00, 2.721383810043335e+00, 2.721410036087036e+00, 2.721436262130737e+00, 2.721462726593018e+00, 2.721488952636719e+00, 2.72151517868042e+00, 2.648615837097168e+00, 2.517415285110474e+00, 2.511492013931274e+00, 2.612820148468018e+00, 2.508616924285889e+00, 2.558977127075195e+00, 2.656482934951782e+00, 2.681524038314819e+00, 2.681549549102783e+00, 2.681575059890747e+00, 2.681600332260132e+00, 2.682522296905518e+00, 2.686150074005127e+00, 2.68911075592041e+00, 2.643518447875977e+00, 2.535918712615967e+00, 2.484749794006348e+00, 2.569283723831177e+00, 2.526928663253784e+00, 2.521509408950806e+00, 2.601131677627563e+00, 2.651603221893311e+00, 2.651628017425537e+00, 2.651652574539185e+00, 2.659320116043091e+00, 2.667791843414307e+00, 2.672715663909912e+00, 2.673471689224243e+00, 2.673496961593628e+00, 2.673519372940063e+00, 2.673540830612183e+00, 2.673563003540039e+00, 2.673585176467896e+00, 2.673605918884277e+00, 2.673627853393555e+00, 2.673649787902832e+00, 2.673670053482056e+00, 2.673690319061279e+00, 2.673710823059082e+00, 2.673733472824097e+00, 2.673756837844849e+00, 2.67378044128418e+00, 2.673803806304932e+00, 2.673825263977051e+00, 2.673845291137695e+00, 2.673866271972656e+00, 2.673887252807617e+00, 2.673906803131104e+00, 2.673927783966064e+00, 2.6739501953125e+00, 2.673970460891724e+00, 2.673990249633789e+00, 2.674010038375854e+00, 2.67403244972229e+00]
+bui[2].ets.proHeaWat.heaPum.COP=[8.832118034362793e+00, 1.118170738220215e+01, 1.047387790679932e+01, 9.75153636932373e+00, 6.448659420013428e+00, 7.035134315490723e+00, 7.49492359161377e+00, 6.268739223480223e+00, 6.484262943267822e+00, 7.029954433441162e+00, 6.001750469207764e+00, 6.293086528778076e+00, 6.262985229492188e+00, 7.250075817108154e+00, 6.87695837020874e+00, 6.927052021026611e+00, 6.890735626220703e+00, 6.788834571838379e+00, 5.655632495880127e+00, 6.538585186004639e+00, 6.511758327484131e+00, 6.496712684631348e+00, 6.146372318267822e+00, 7.107875347137451e+00, 6.601340770721436e+00, 6.086801052093506e+00, 6.21448278427124e+00, 6.42620849609375e+00, 6.827094078063962e+00, 6.736908435821533e+00, 6.828434467315674e+00, 6.763266563415527e+00, 5.733593463897705e+00, 5.965601444244385e+00, 6.497624397277834e+00, 6.841569423675537e+00, 6.064648151397705e+00, 7.493172168731689e+00, 7.2917160987854e+00, 5.97136116027832e+00, 6.444937705993652e+00, 6.277289390563965e+00, 7.232306957244873e+00, 6.770905017852783e+00, 6.693343162536621e+00, 6.784048557281494e+00, 6.444724082946777e+00, 5.574279308319092e+00, 6.339848041534424e+00, 6.341528415679932e+00, 5.558154582977295e+00, 6.420926570892334e+00, 6.450650691986084e+00, 5.53770923614502e+00, 5.696374416351318e+00, 5.613053321838379e+00, 6.543828487396238e+00, 6.460660457611084e+00, 6.381891250610352e+00, 6.340703964233398e+00, 6.297637462615967e+00, 5.251560211181641e+00, 6.118628978729248e+00, 6.013730049133301e+00, 5.494224548339844e+00, 5.379231929779053e+00, 6.062032222747803e+00, 5.453675270080566e+00, 5.266815662384036e+00, 5.341381549835206e+00, 5.901957988739014e+00, 6.112855911254883e+00, 6.127930641174316e+00, 6.063817501068115e+00, 6.001944065093994e+00, 5.013803482055664e+00, 5.697818279266357e+00, 5.854313373565674e+00, 5.883750915527344e+00, 5.057819843292236e+00, 5.999975681304932e+00, 5.897269725799542e+00, 5.047437191009521e+00, 5.186665058135986e+00, 5.152537822723389e+00, 5.934217929840088e+00, 5.931003570556641e+00, 5.887784481048584e+00, 5.838895797729492e+00, 5.276050567626953e+00, 5.028686046600342e+00, 5.738556861877441e+00, 5.740411758422852e+00, 4.894704818725586e+00, 6.058821201324463e+00, 6.014224529266357e+00, 5.099553108215332e+00, 5.274148941040039e+00, 5.198908805847168e+00, 6.071235656738281e+00, 5.99209451675415e+00]
+bui[2].ets.proHotWat.heaPum.COP=[1.2960498046875e+02, 3.456180334091187e+00, 3.456175804138184e+00, 3.454325199127197e+00, 2.725094318389893e+00, 2.735076189041138e+00, 2.771454334259033e+00, 2.581643104553222e+00, 2.627911806106567e+00, 2.681135892868042e+00, 2.606120586395264e+00, 2.553684711456299e+00, 2.556068897247314e+00, 2.716229200363159e+00, 2.745805740356445e+00, 2.745824813842773e+00, 2.745847225189209e+00, 2.745870113372803e+00, 2.670775175094604e+00, 2.691088199615479e+00, 2.689954519271851e+00, 2.581505298614502e+00, 2.605997562408447e+00, 2.695213794708252e+00, 2.636735916137695e+00, 2.541964292526245e+00, 2.553188562393188e+00, 2.579910516738892e+00, 2.738595247268677e+00, 2.738611221313477e+00, 2.738632440567017e+00, 2.73865532875061e+00, 2.599865913391113e+00, 2.634563446044922e+00, 2.67967963218689e+00, 2.679702281951904e+00, 2.547598123550415e+00, 2.705129384994507e+00, 2.705153226852417e+00, 2.522303104400635e+00, 2.550581932067871e+00, 2.512646913528443e+00, 2.744071483612061e+00, 2.744089841842651e+00, 2.744103670120239e+00, 2.744123697280884e+00, 2.641921281814575e+00, 2.59818959236145e+00, 2.678282499313354e+00, 2.678304672241211e+00, 2.527141809463501e+00, 2.661020755767822e+00, 2.675354957580566e+00, 2.591993093490601e+00, 2.525964736938477e+00, 2.513765573501587e+00, 2.707287549972534e+00, 2.707309484481812e+00, 2.70733380317688e+00, 2.707357883453369e+00, 2.7073814868927e+00, 2.566430568695068e+00, 2.658533334732056e+00, 2.658555507659912e+00, 2.55069637298584e+00, 2.583630084991455e+00, 2.646876096725464e+00, 2.598934412002563e+00, 2.504868745803833e+00, 2.509411573410034e+00, 2.594568014144897e+00, 2.685929298400879e+00, 2.685951948165894e+00, 2.685975074768066e+00, 2.685997724533081e+00, 2.547725200653076e+00, 2.630867481231689e+00, 2.649906158447266e+00, 2.648626327514648e+00, 2.542208194732666e+00, 2.644789218902588e+00, 2.642283916473386e+00, 2.49762797355652e+00, 2.494681358337402e+00, 2.4650559425354e+00, 2.668481111526489e+00, 2.668503046035767e+00, 2.668525457382202e+00, 2.668547868728638e+00, 2.578572273254395e+00, 2.568197011947632e+00, 2.638863563537598e+00, 2.63888692855835e+00, 2.499477624893188e+00, 2.637223720550537e+00, 2.636526823043823e+00, 2.534584760665894e+00, 2.490126848220825e+00, 2.466034173965454e+00, 2.665189504623413e+00, 2.665210723876953e+00]
+bui[3].ets.proHeaWat.heaPum.COP=[8.832118034362793e+00, 1.18441801071167e+01, 1.101373767852783e+01, 9.970730781555176e+00, 6.628832340240479e+00, 5.706474304199219e+00, 5.846347332000732e+00, 6.126397132873535e+00, 5.829042911529541e+00, 6.101219177246094e+00, 5.939780235290527e+00, 5.91215991973877e+00, 5.855259895324707e+00, 6.376946449279785e+00, 6.175245761871338e+00, 6.043664455413818e+00, 5.966609954833984e+00, 5.917632102966309e+00, 5.14586067199707e+00, 5.07783031463623e+00, 5.406531810760498e+00, 5.814489841461182e+00, 5.862907409667969e+00, 6.057697296142578e+00, 5.997423648834229e+00, 5.859904766082764e+00, 5.891638278961182e+00, 5.962950229644775e+00, 6.195881366729736e+00, 6.067923545837402e+00, 5.969629287719727e+00, 5.922250270843506e+00, 5.286956310272217e+00, 5.001662731170654e+00, 5.410987854003909e+00, 5.944252014160156e+00, 6.202363014221191e+00, 6.275360584259033e+00, 6.359087944030762e+00, 6.229555606842041e+00, 6.240801811218262e+00, 5.959816455841065e+00, 6.582426071166992e+00, 6.202398300170898e+00, 6.035050868988037e+00, 5.928869724273682e+00, 5.704200267791748e+00, 4.959224700927734e+00, 5.114437580108643e+00, 5.176565647125244e+00, 5.219947814941406e+00, 5.246359348297119e+00, 5.383895874023438e+00, 5.199528694152832e+00, 5.466701984405518e+00, 5.397655963897705e+00, 5.905358314514159e+00, 5.762051582336427e+00, 5.698288440704346e+00, 5.677022457122803e+00, 5.638570785522461e+00, 4.806965351104736e+00, 4.871397972106934e+00, 4.87252140045166e+00, 4.963290214538574e+00, 4.905903339385986e+00, 5.046048641204834e+00, 5.029263973236084e+00, 5.193911552429202e+00, 5.251485347747804e+00, 5.526278972625732e+00, 5.573834419250488e+00, 5.581635475158691e+00, 5.522549629211426e+00, 5.477006435394287e+00, 4.761058330535889e+00, 4.710996627807617e+00, 4.798433780670166e+00, 4.92726469039917e+00, 4.871038436889648e+00, 5.018412590026855e+00, 5.003770828247069e+00, 4.964833736419675e+00, 5.134341239929199e+00, 5.09454345703125e+00, 5.485905170440674e+00, 5.4581618309021e+00, 5.417886257171631e+00, 5.386033058166504e+00, 4.978339672088623e+00, 4.669355869293213e+00, 4.856771945953369e+00, 4.895549774169922e+00, 4.806431770324707e+00, 5.152324676513672e+00, 5.227285861968994e+00, 5.020641803741455e+00, 5.208950042724609e+00, 5.137893676757812e+00, 5.607260227203369e+00, 5.500781059265137e+00]
+bui[3].ets.proHotWat.heaPum.COP=[1.2960498046875e+02, 3.456180572509766e+00, 3.456176519393921e+00, 3.4531090259552e+00, 2.631883859634399e+00, 2.457298994064331e+00, 2.432311534881592e+00, 2.441786050796509e+00, 2.377563238143921e+00, 2.420228958129883e+00, 2.411895751953125e+00, 2.366159200668335e+00, 2.366013526916504e+00, 2.532364368438721e+00, 2.556846618652344e+00, 2.556865215301514e+00, 2.556884288787842e+00, 2.556904315948486e+00, 2.455117464065552e+00, 2.390085697174072e+00, 2.400447845458984e+00, 2.399995088577271e+00, 2.363599061965942e+00, 2.399592638015747e+00, 2.418843269348145e+00, 2.368023633956909e+00, 2.361670970916748e+00, 2.416376352310181e+00, 2.55217719078064e+00, 2.552195310592651e+00, 2.552213668823242e+00, 2.552233219146729e+00, 2.393731832504272e+00, 2.373369455337524e+00, 2.404624700546265e+00, 2.399775981903076e+00, 2.380388259887695e+00, 2.370639801025391e+00, 2.413476467132568e+00, 2.404387235641479e+00, 2.371671199798584e+00, 2.363019943237305e+00, 2.548820734024048e+00, 2.54883861541748e+00, 2.548856735229492e+00, 2.548875331878662e+00, 2.453723669052124e+00, 2.373518943786621e+00, 2.405412673950195e+00, 2.39463210105896e+00, 2.369075775146484e+00, 2.37139368057251e+00, 2.401220560073853e+00, 2.36925220489502e+00, 2.358976125717163e+00, 2.359230279922485e+00, 2.548733472824097e+00, 2.548752069473267e+00, 2.548771858215332e+00, 2.548791885375977e+00, 2.5488121509552e+00, 2.363866567611694e+00, 2.387027025222778e+00, 2.382865428924561e+00, 2.377597332000732e+00, 2.352003335952759e+00, 2.385647535324097e+00, 2.375591516494751e+00, 2.3492431640625e+00, 2.351031541824341e+00, 2.456841945648193e+00, 2.540821313858032e+00, 2.540840864181519e+00, 2.540860652923584e+00, 2.540880680084229e+00, 2.353739976882935e+00, 2.361771821975708e+00, 2.380351781845093e+00, 2.380134344100952e+00, 2.347898721694946e+00, 2.383450746536255e+00, 2.379242181777954e+00, 2.347212791442871e+00, 2.345823764801025e+00, 2.353011846542358e+00, 2.535093307495117e+00, 2.535112619400024e+00, 2.535132169723511e+00, 2.535151958465576e+00, 2.415589094161987e+00, 2.346429586410522e+00, 2.374213218688965e+00, 2.372425079345703e+00, 2.344468355178833e+00, 2.362046718597412e+00, 2.376147985458374e+00, 2.350093841552734e+00, 2.346100807189941e+00, 2.345727682113647e+00, 2.535308599472046e+00, 2.535327672958374e+00]
+TDisWatSup.T=[2.931499938964844e+02, 2.92582275390625e+02, 2.91597412109375e+02, 2.906720886230469e+02, 2.902152404785156e+02, 2.893591918945312e+02, 2.855766296386719e+02, 2.8578369140625e+02, 2.8513232421875e+02, 2.857454223632812e+02, 2.855767211914062e+02, 2.85242919921875e+02, 2.852586364746094e+02, 2.857662963867188e+02, 2.859064636230469e+02, 2.85659423828125e+02, 2.855934753417969e+02, 2.855480041503906e+02, 2.848701477050781e+02, 2.848173217773438e+02, 2.851447143554688e+02, 2.854194030761719e+02, 2.84949462890625e+02, 2.856474609375e+02, 2.855693054199219e+02, 2.849397888183594e+02, 2.850672607421875e+02, 2.850259704589844e+02, 2.861770324707031e+02, 2.855629272460938e+02, 2.855037841796875e+02, 2.854762878417969e+02, 2.849061584472656e+02, 2.845181884765625e+02, 2.850750732421875e+02, 2.854505004882812e+02, 2.848787231445312e+02, 2.8582763671875e+02, 2.858765563964844e+02, 2.853567810058594e+02, 2.853517150878906e+02, 2.850813598632812e+02, 2.861438903808594e+02, 2.86142578125e+02, 2.855319213867188e+02, 2.854342956542969e+02, 2.853642883300781e+02, 2.844852905273438e+02, 2.848468017578125e+02, 2.848065490722656e+02, 2.843812866210938e+02, 2.845614013671875e+02, 2.849454040527344e+02, 2.843403625488281e+02, 2.844044494628906e+02, 2.843456726074219e+02, 2.852479248046875e+02, 2.850625610351562e+02, 2.850281677246094e+02, 2.850111389160156e+02, 2.849715270996094e+02, 2.841392211914062e+02, 2.843485412597656e+02, 2.843223571777344e+02, 2.842689819335938e+02, 2.839362487792969e+02, 2.843698120117188e+02, 2.842210388183594e+02, 2.839215087890625e+02, 2.839617309570312e+02, 2.841480407714844e+02, 2.845506896972656e+02, 2.846334228515625e+02, 2.845996398925781e+02, 2.845530395507812e+02, 2.838462524414062e+02, 2.838727722167969e+02, 2.840696411132812e+02, 2.841274108886719e+02, 2.837142028808594e+02, 2.841434936523438e+02, 2.841236877441406e+02, 2.836921691894531e+02, 2.83721923828125e+02, 2.836451416015625e+02, 2.842763061523438e+02, 2.843009643554688e+02, 2.842971496582031e+02, 2.842717895507812e+02, 2.839765625e+02, 2.835524597167969e+02, 2.839069519042969e+02, 2.839151306152344e+02, 2.835181579589844e+02, 2.839430847167969e+02, 2.841535034179688e+02, 2.836505737304688e+02, 2.836913146972656e+02, 2.836307373046875e+02, 2.844261474609375e+02, 2.842825622558594e+02]
+TDisWatRet.T=[2.931499938964844e+02, 2.924768371582031e+02, 2.913965148925781e+02, 2.899835815429688e+02, 2.87087890625e+02, 2.834591674804688e+02, 2.804827270507812e+02, 2.805747985839844e+02, 2.80138427734375e+02, 2.805451049804688e+02, 2.804825744628906e+02, 2.8025244140625e+02, 2.802729187011719e+02, 2.804639892578125e+02, 2.806994934082031e+02, 2.805322570800781e+02, 2.804910583496094e+02, 2.804650573730469e+02, 2.800567321777344e+02, 2.800929565429688e+02, 2.802665100097656e+02, 2.804013366699219e+02, 2.801784362792969e+02, 2.805357666015625e+02, 2.805078735351562e+02, 2.80175537109375e+02, 2.802484130859375e+02, 2.802285461425781e+02, 2.809593811035156e+02, 2.804928588867188e+02, 2.804757690429688e+02, 2.8045751953125e+02, 2.80129150390625e+02, 2.799344787597656e+02, 2.802732543945312e+02, 2.804443969726562e+02, 2.801473083496094e+02, 2.806075134277344e+02, 2.806907653808594e+02, 2.804276123046875e+02, 2.803905334472656e+02, 2.802696838378906e+02, 2.807501525878906e+02, 2.813196105957031e+02, 2.804909362792969e+02, 2.804497985839844e+02, 2.804269104003906e+02, 2.799085998535156e+02, 2.801733093261719e+02, 2.801634216308594e+02, 2.798702392578125e+02, 2.800692138671875e+02, 2.802569274902344e+02, 2.7988623046875e+02, 2.79982421875e+02, 2.7995068359375e+02, 2.803943481445312e+02, 2.803304138183594e+02, 2.80316650390625e+02, 2.803070983886719e+02, 2.8028759765625e+02, 2.797556762695312e+02, 2.799872436523438e+02, 2.799750671386719e+02, 2.799411926269531e+02, 2.796808776855469e+02, 2.800392456054688e+02, 2.799375610351562e+02, 2.797225341796875e+02, 2.797812194824219e+02, 2.799695434570312e+02, 2.801747131347656e+02, 2.802057495117188e+02, 2.801808166503906e+02, 2.801511840820312e+02, 2.796101379394531e+02, 2.797071228027344e+02, 2.7989794921875e+02, 2.799482421875e+02, 2.795765991210938e+02, 2.799952392578125e+02, 2.799739074707031e+02, 2.795899353027344e+02, 2.796563110351562e+02, 2.79603759765625e+02, 2.800901184082031e+02, 2.800963439941406e+02, 2.800819702148438e+02, 2.800584716796875e+02, 2.798258056640625e+02, 2.79458740234375e+02, 2.79855224609375e+02, 2.798666381835938e+02, 2.794696350097656e+02, 2.799323425292969e+02, 2.80037353515625e+02, 2.796409606933594e+02, 2.796961364746094e+02, 2.796486511230469e+02, 2.802154235839844e+02, 2.801184692382812e+02]
+TDisWatBorLvg.T=[2.931499938964844e+02, 2.925395812988281e+02, 2.9151806640625e+02, 2.904457702636719e+02, 2.896138610839844e+02, 2.877420349121094e+02, 2.841339111328125e+02, 2.843036193847656e+02, 2.843265991210938e+02, 2.843807373046875e+02, 2.84343505859375e+02, 2.843193054199219e+02, 2.8426513671875e+02, 2.842280578613281e+02, 2.842157287597656e+02, 2.842267456054688e+02, 2.842286987304688e+02, 2.842249450683594e+02, 2.841043090820312e+02, 2.84082275390625e+02, 2.841324157714844e+02, 2.841029357910156e+02, 2.840670471191406e+02, 2.840705871582031e+02, 2.840776977539062e+02, 2.840627136230469e+02, 2.840684814453125e+02, 2.840551452636719e+02, 2.840431823730469e+02, 2.840683288574219e+02, 2.840839538574219e+02, 2.840907592773438e+02, 2.840228271484375e+02, 2.838610229492188e+02, 2.840322875976562e+02, 2.8400537109375e+02, 2.839539489746094e+02, 2.840028686523438e+02, 2.840199584960938e+02, 2.84046630859375e+02, 2.8405078125e+02, 2.840433654785156e+02, 2.840318298339844e+02, 2.840518798828125e+02, 2.840782775878906e+02, 2.840859069824219e+02, 2.840828552246094e+02, 2.838321838378906e+02, 2.839595642089844e+02, 2.839208679199219e+02, 2.836875305175781e+02, 2.838070678710938e+02, 2.838889770507812e+02, 2.836428833007812e+02, 2.836736450195312e+02, 2.836247863769531e+02, 2.83892578125e+02, 2.838225708007812e+02, 2.838302307128906e+02, 2.8384228515625e+02, 2.838512573242188e+02, 2.835404357910156e+02, 2.8361865234375e+02, 2.835760192871094e+02, 2.835174255371094e+02, 2.833614501953125e+02, 2.835544738769531e+02, 2.834295959472656e+02, 2.833178100585938e+02, 2.833174743652344e+02, 2.834297790527344e+02, 2.835650634765625e+02, 2.836075744628906e+02, 2.836156921386719e+02, 2.836150207519531e+02, 2.832756652832031e+02, 2.832985534667969e+02, 2.83353271484375e+02, 2.833727722167969e+02, 2.831630859375e+02, 2.833425903320312e+02, 2.8333740234375e+02, 2.831304321289062e+02, 2.831249084472656e+02, 2.830687561035156e+02, 2.833564758300781e+02, 2.833911743164062e+02, 2.834094543457031e+02, 2.834152526855469e+02, 2.832220458984375e+02, 2.830405578613281e+02, 2.831982116699219e+02, 2.8320166015625e+02, 2.829984436035156e+02, 2.83207763671875e+02, 2.832983093261719e+02, 2.830625e+02, 2.830739440917969e+02, 2.830282592773438e+02, 2.833415832519531e+02, 2.83337646484375e+02]
+pla.dH_flow=[-2.61571125e+05, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.136395e+05, 8.416453125e+04, 1.232234609375e+05, 8.4320859375e+04, 1.017768828125e+05, 1.223176640625e+05, 1.243946640625e+05, 8.59028359375e+04, 7.176764062500015e+04, 9.62963828125e+04, 1.02509171875e+05, 1.068771640625e+05, 1.2981915625e+05, 1.32852828125e+05, 1.29588734375e+05, 1.234323125e+05, 1.32510875e+05, 1.00054703125e+05, 1.078610390625e+05, 1.318775e+05, 1.31634421875e+05, 1.32568765625e+05, 4.287732812500019e+04, 1.0726915625e+05, 1.125107109375e+05, 1.147536796875e+05, 1.31757828125e+05, 1.40365046875e+05, 1.32554828125e+05, 1.192943515625e+05, 1.34925671875e+05, 7.853865625e+04, 7.278409375e+04, 1.2642128125e+05, 1.262716171875e+05, 1.31232484375e+05, 4.23441953125e+04, 4.2617984375e+04, 1.052609609375e+05, 1.146399140625e+05, 1.21617109375e+05, 1.3961484375e+05, 1.3411509375e+05, 1.35783e+05, 1.45164359375e+05, 1.41839734375e+05, 1.3672646875e+05, 1.4712753125e+05, 1.46148e+05, 1.47956921875e+05, 1.373597187499995e+05, 1.39231625e+05, 1.38864625e+05, 1.38245609375e+05, 1.37733828125e+05, 1.50905859375e+05, 1.4800034375e+05, 1.49363e+05, 1.50905375e+05, 1.5860809375e+05, 1.49972e+05, 1.5380175e+05, 1.602134375e+05, 1.59984703125e+05, 1.56658125e+05, 1.49247109375e+05, 1.4722696875e+05, 1.46664671875e+05, 1.46574046875e+05, 1.60877484375e+05, 1.6075490625e+05, 1.577125e+05, 1.5676571875e+05, 1.6573846875e+05, 1.57910703125e+05, 1.57972953125e+05, 1.66837640625e+05, 1.66944046875e+05, 1.69358015625e+05, 1.5670340625e+05, 1.55192734375e+05, 1.54235953125e+05, 1.53885359375e+05, 1.6041946875e+05, 1.70039171875e+05, 1.6296053125e+05, 1.62788390625e+05, 1.71608859375e+05, 1.63138703125e+05, 1.58290609375e+05, 1.68506609375e+05, 1.678425625e+05, 1.69633125e+05, 1.55873640625e+05, 1.5613659375e+05]
+borFie.Q_flow=[0e+00, 1.101364994049072e+01, 5.558592319488525e+00, 3.411531448364258e+00, 2.084430456161499e+00, 1.401720881462097e+00, -1.02820765625e+05, -1.37634359375e+05, -2.22204375e+05, -2.32585390625e+05, -2.27715109375e+05, -3.7167940625e+05, -3.9101128125e+05, -4.06231e+05, -2.416876875e+05, -2.4403796875e+05, -2.548893125e+05, -2.680843437500001e+05, -3.6790253125e+05, -5.0915340625e+05, -4.8624059375e+05, -4.38452875e+05, -4.798483125e+05, -4.064835e+05, -3.2759771875e+05, -4.15374625e+05, -4.4058296875e+05, -4.7009434375e+05, -3.116844687499992e+05, -2.7389065625e+05, -2.8434328125e+05, -2.9122575e+05, -3.1902575e+05, -5.64022875e+05, -5.054764687499997e+05, -4.3911853125e+05, -3.782464375e+05, -3.69327625e+05, -2.6026471875e+05, -2.4679421875e+05, -3.4450615625e+05, -3.653890624999997e+05, -2.96888e+05, -1.99262984375e+05, -2.1573053125e+05, -2.55930015625e+05, -2.7985178125e+05, -5.019556875e+05, -5.25047625e+05, -5.300930625e+05, -5.9258025e+05, -6.150930625e+05, -5.32528125e+05, -5.932616875e+05, -6.53216375e+05, -6.71115375e+05, -5.936486874999981e+05, -4.958620000000003e+05, -4.6163790625e+05, -4.478735625e+05, -4.4395375e+05, -6.253680625e+05, -7.100955625e+05, -6.843658125e+05, -6.81660375e+05, -8.31619e+05, -7.171176875e+05, -7.3470375e+05, -8.275360000000002e+05, -8.261655e+05, -8.199356875e+05, -6.424744375e+05, -5.89303e+05, -5.5949075e+05, -5.556419375e+05, -6.756220625e+05, -8.530766875e+05, -7.73513e+05, -7.41551875e+05, -8.598060625e+05, -8.084159375e+05, -7.405806874999997e+05, -8.54090624999999e+05, -8.947066875e+05, -9.250905625e+05, -7.397676875e+05, -6.7281825e+05, -6.400374375e+05, -6.30551875e+05, -6.7765575e+05, -8.962188125e+05, -8.270880625e+05, -7.905341875e+05, -8.74886375e+05, -8.76021625e+05, -7.248425e+05, -7.964291875e+05, -8.58153e+05, -8.806130625e+05, -7.38672875e+05, -6.618661875e+05]
+bui[1].ets.PHea=[0e+00, 0e+00, 0e+00, 0e+00, 6.77102685546875e+03, 1.09548173828125e+04, 1.352575e+04, 7.490180664062497e+03, 9.0945595703125e+03, 1.0456474609375e+04, 6.09959765625e+03, 0e+00, 0e+00, 0e+00, 1.630304908752449e+01, 1.966258239746094e+02, 1.626983764648438e+03, 2.380897949218752e+03, 6.665189453125e+03, 1.771051953125e+04, 2.1568498046875e+04, 1.14511923828125e+04, 7.37290625e+03, 1.0988017578125e+04, 8.6239375e+03, 0e+00, 0e+00, 0e+00, 4.739113998413143e+01, 2.412593078613281e+02, 1.005553771972656e+03, 1.789248046875e+03, 3.643377685546875e+03, 1.52519794921875e+04, 1.879871289062496e+04, 8.8703173828125e+03, 1.475740478515625e+03, 2.15701806640625e+03, 3.5875888671875e+03, 4.557392883300781e+02, 0e+00, 0e+00, 0e+00, 0e+00, 1.797393417358398e+01, 2.237602844238281e+02, 1.676079833984375e+03, 1.43799921875e+04, 2.22889609375e+04, 1.919723046875e+04, 6.84043212890625e+03, 1.094136328125e+04, 1.2259689453125e+04, 5.62822802734375e+03, 0e+00, 0e+00, 1.57528686523443e+01, 1.902169952392548e+02, 1.203803588867188e+03, 2.098486328125e+03, 2.923671630859375e+03, 1.10398173828125e+04, 2.115644921875e+04, 2.8871013671875e+04, 1.7256916015625e+04, 1.7947515625e+04, 2.3264072265625e+04, 1.367516796875e+04, 1.401346801757791e+03, 1.687287597656226e+03, 2.795111328125e+03, 3.957364501953125e+03, 4.53107861328125e+03, 5.27125537109375e+03, 5.8162060546875e+03, 8.42882421875e+03, 8.843916015625e+03, 8.5553994140625e+03, 8.4622041015625e+03, 8.7507333984375e+03, 9.07810546875e+03, 9.3207216796875e+03, 9.166693359375005e+03, 7.083154296875e+03, 7.794076171875e+03, 8.161546875e+03, 8.3328037109375e+03, 8.5933818359375e+03, 8.947853515625e+03, 1.07229345703125e+04, 1.23422158203125e+04, 1.198230859375e+04, 1.14083291015625e+04, 1.1048884765625e+04, 1.1053939453125e+04, 1.10067509765625e+04, 1.12693310546875e+04, 8.2539189453125e+03, 9.1885390625e+03, 9.6152451171875e+03, 9.81255078125e+03]
+bui[2].ets.PHea=[0e+00, 1.72015859375e+04, 2.2187630859375e+04, 2.678715625e+04, 1.36069453125e+05, 3.556172265625e+04, 3.166073046875e+04, 1.262684140625001e+05, 5.65787109375e+04, 2.121068359375e+04, 1.213737734375e+05, 1.151002578125e+05, 1.219573125e+05, 2.4069578125e+04, 3.368907812500001e+04, 4.110875390625e+04, 4.82762421875e+04, 5.377710937500001e+04, 1.58298140625e+05, 5.027376171875e+04, 5.22751796875e+04, 5.945894921875e+04, 1.067376796875e+05, 1.8099361328125e+04, 5.25472265625e+04, 1.305203828125e+05, 1.234742109375e+05, 9.6629390625e+04, 3.547620703125006e+04, 4.325129296875e+04, 4.92803671875e+04, 5.4540453125e+04, 1.76520859375e+05, 1.07998625e+05, 5.277643359374989e+04, 3.023790234375e+04, 1.16920328125e+05, 2.170667724609375e+03, 1.4019765625e+04, 1.186104375e+05, 1.008102265625e+05, 1.245666484374999e+05, 1.8353953125e+04, 3.3636859375e+04, 4.438578125e+04, 5.20691640625e+04, 8.5377125e+04, 1.733348125e+05, 6.552510546875e+04, 6.44407734375e+04, 1.9288521875e+05, 5.89931015625e+04, 5.832893359375e+04, 1.82299765625e+05, 1.68108375e+05, 1.84369296875e+05, 4.936921484375039e+04, 7.052819531249994e+04, 7.82861875e+04, 8.02034609375e+04, 8.28222421875e+04, 2.2596915625e+05, 7.76080625e+04, 8.8026390625e+04, 1.78234859375e+05, 1.7791171875e+05, 8.15381796875e+04, 1.7752328125e+05, 2.225634999999995e+05, 2.136127499999999e+05, 1.104170390625e+05, 8.991025e+04, 8.9770515625e+04, 9.68514140625e+04, 1.024735625e+05, 2.757129375e+05, 1.189433046875e+05, 1.07793328125e+05, 1.055246171875e+05, 2.46419625e+05, 8.78070234375e+04, 1.039593984375029e+05, 2.56986359375e+05, 2.32524203125e+05, 2.42067765625e+05, 9.82379765625e+04, 1.022702890625e+05, 1.081841015625e+05, 1.135520546875e+05, 2.1666746875e+05, 2.359255e+05, 1.164753203125e+05, 1.17574328125e+05, 2.885594375e+05, 7.29897734375e+04, 8.80649140625e+04, 2.39909171875e+05, 2.13083203125e+05, 2.332878125e+05, 7.71611171875e+04, 9.39001328125e+04]
+bui[3].ets.PHea=[0e+00, 3.3587822265625e+03, 5.0673662109375e+03, 7.13744677734375e+03, 5.690769140625e+04, 6.095440234375e+04, 5.009215625e+04, 4.077217578124999e+04, 3.904234765625e+04, 3.79748203125e+04, 4.16066640625e+04, 3.287973046875e+04, 3.493547265625e+04, 3.86628466796875e+03, 7.097743652343762e+03, 1.18172998046875e+04, 1.57485263671875e+04, 1.852635156250001e+04, 5.896825e+04, 8.18214453125e+04, 6.381780859375e+04, 4.41917109375e+04, 3.454737890625e+04, 3.547162109375e+04, 4.117628125e+04, 3.515968359375e+04, 3.2474841796875e+04, 2.572340234375e+04, 3.944544433593785e+03, 9.5445107421875e+03, 1.3914908203125e+04, 1.71086640625e+04, 6.4818140625e+04, 8.2638640625e+04, 6.450619140624986e+04, 3.91578828125e+04, 2.6446060546875e+04, 2.2444673828125e+04, 2.8260890625e+04, 3.0074337890625e+04, 2.2535630859375e+04, 3.044648632812497e+04, 7.060064697265625e+01, 3.4396044921875e+03, 1.020265625e+04, 1.52346552734375e+04, 2.9543751953125e+04, 8.58876015625e+04, 8.33948984375e+04, 7.64063671875e+04, 6.67061171875e+04, 6.6837375e+04, 6.54975078125e+04, 6.801509375e+04, 5.024575390625e+04, 5.42367890625e+04, 1.412362988281259e+04, 2.190714257812496e+04, 2.5751798828125e+04, 2.6856982421875e+04, 2.8474234375e+04, 9.58267734375e+04, 9.6769703125e+04, 9.55396484375e+04, 8.64319921875e+04, 8.45655859375e+04, 8.30318203125e+04, 8.11347734375e+04, 6.285789062499985e+04, 6.037706249999996e+04, 3.3181e+04, 2.8877521484375e+04, 2.9354130859375e+04, 3.2382583984375e+04, 3.445771484375e+04, 9.82365703125e+04, 1.02758703125e+05, 9.99671875e+04, 8.9418296875e+04, 8.5193e+04, 8.368959375e+04, 8.368089843750003e+04, 7.745498437500025e+04, 6.6235234375e+04, 6.7459390625e+04, 3.1993072265625e+04, 3.41376875e+04, 3.64160625e+04, 3.79076484375e+04, 7.48447421875e+04, 1.020563359375e+05, 9.35410546875e+04, 8.99589140625e+04, 8.92155390625e+04, 6.908409375e+04, 6.80838671875e+04, 7.47461640625e+04, 6.129938671875e+04, 6.59679375e+04, 2.5248021484375e+04, 3.197582421875e+04]
+bui[1].ets.PPum=[1.396844291687012e+01, 1.355741500854492e+01, 1.952925903320312e+03, 1.952925903320312e+03, 1.93168896484375e+03, 1.94494921875e+03, 1.9645390625e+03, 1.933525756835938e+03, 1.933420043945312e+03, 1.932177978515625e+03, 1.935423095703125e+03, 1.355741500854492e+01, 1.355741500854492e+01, 1.355741500854492e+01, 1.952925903320312e+03, 1.953002075195312e+03, 1.948572265625e+03, 1.945189819335938e+03, 1.935527587890625e+03, 2.003194580078125e+03, 2.086427734375e+03, 1.940796875e+03, 1.93511767578125e+03, 1.932675537109375e+03, 1.931692016601562e+03, 1.355733299255371e+01, 1.355741500854492e+01, 1.355741500854492e+01, 1.952925903320312e+03, 1.953094604492188e+03, 1.952599609375e+03, 1.94783251953125e+03, 1.941203979492188e+03, 1.969778686523438e+03, 2.021648071289062e+03, 1.93311865234375e+03, 1.952385986328125e+03, 1.954497924804688e+03, 1.943698120117188e+03, 1.952905395507812e+03, 1.355741500854492e+01, 1.355741500854492e+01, 1.355741500854492e+01, 1.355741500854492e+01, 1.952925903320312e+03, 1.953078247070312e+03, 1.948619506835938e+03, 1.952148071289062e+03, 2.07344091796875e+03, 2.042047607421875e+03, 1.935227172851562e+03, 1.932272827148438e+03, 1.938362060546875e+03, 1.936492431640625e+03, 1.355741500854492e+01, 1.355741500854492e+01, 1.952925903320312e+03, 1.953040893554688e+03, 1.951214721679688e+03, 1.946726806640625e+03, 1.94353173828125e+03, 1.931042236328125e+03, 2.04924609375e+03, 2.27613671875e+03, 2.019099975585938e+03, 1.995171875e+03, 2.1129248046875e+03, 1.964762084960938e+03, 1.950335571289063e+03, 1.948910400390625e+03, 1.94445654296875e+03, 1.940724243164062e+03, 1.939257446289062e+03, 1.937702514648438e+03, 1.9367548828125e+03, 1.9329150390625e+03, 1.932218017578125e+03, 1.932554809570312e+03, 1.932722412109375e+03, 1.932385498046875e+03, 1.931903076171875e+03, 1.93166552734375e+03, 1.931832153320312e+03, 1.9353896484375e+03, 1.934634399414062e+03, 1.933487060546875e+03, 1.932898559570312e+03, 1.932388427734375e+03, 1.931880981445312e+03, 1.932249389648438e+03, 1.941544677734375e+03, 1.939598754882812e+03, 1.936199340820312e+03, 1.934209716796875e+03, 1.933975952148438e+03, 1.934360229492188e+03, 1.935428100585938e+03, 1.9331201171875e+03, 1.931907104492188e+03, 1.931587646484375e+03, 1.931726440429688e+03]
+bui[2].ets.PPum=[1.20891025390625e+04, 1.19434267578125e+04, 1.19309853515625e+04, 1.19241845703125e+04, 1.303602734375e+04, 1.19290732421875e+04, 1.1930767578125e+04, 1.2104201171875e+04, 1.18961376953125e+04, 1.1964708984375e+04, 1.21498876953125e+04, 1.210773828125e+04, 1.2156255859375e+04, 1.19538828125e+04, 1.1934736328125e+04, 1.1920201171875e+04, 1.19099873046875e+04, 1.18984150390625e+04, 1.36946640625e+04, 1.1902958984375e+04, 1.19042080078125e+04, 1.19066552734375e+04, 1.2178369140625e+04, 1.197583984375e+04, 1.19137890625e+04, 1.23079453125e+04, 1.216984765625e+04, 1.20279765625e+04, 1.1932677734375e+04, 1.19185888671875e+04, 1.1908162109375e+04, 1.1897646484375e+04, 1.32517822265625e+04, 1.25425703125e+04, 1.19043291015625e+04, 1.194164453125e+04, 1.2144322265625e+04, 1.2033404296875e+04, 1.19900693359375e+04, 1.2134408203125e+04, 1.1937037109375e+04, 1.21021162109375e+04, 1.19741435546875e+04, 1.19370205078125e+04, 1.19174130859375e+04, 1.19020400390625e+04, 1.19333876953125e+04, 1.38530810546875e+04, 1.18980556640625e+04, 1.18987802734375e+04, 1.3688158203125e+04, 1.19174658203125e+04, 1.1896634765625e+04, 1.3891279296875e+04, 1.32343583984375e+04, 1.35526357421875e+04, 1.190734375e+04, 1.19212216796875e+04, 1.19837216796875e+04, 1.20044384765625e+04, 1.20301162109375e+04, 1.55132158203125e+04, 1.1969916015625e+04, 1.20495693359375e+04, 1.3124283203125e+04, 1.43511474609375e+04, 1.19656904296875e+04, 1.33411494140625e+04, 1.503800390624998e+04, 1.460048535156249e+04, 1.24976943359375e+04, 1.20913876953125e+04, 1.209504296875e+04, 1.218201171875e+04, 1.2268015625e+04, 1.707933203125e+04, 1.30108564453125e+04, 1.2330978515625e+04, 1.22862333984375e+04, 1.63671962890625e+04, 1.20429873046875e+04, 1.222557128906254e+04, 1.638133203125001e+04, 1.52387509765625e+04, 1.55769755859375e+04, 1.2149458984375e+04, 1.2241982421875e+04, 1.2336119140625e+04, 1.24420615234375e+04, 1.44463427734375e+04, 1.665338671875e+04, 1.24500712890625e+04, 1.249758203125e+04, 1.7560068359375e+04, 1.2008841796875e+04, 1.2045443359375e+04, 1.58699609375e+04, 1.456762890625e+04, 1.501837890625e+04, 1.19406376953125e+04, 1.21168681640625e+04]
+bui[3].ets.PPum=[4.69525439453125e+03, 4.65620068359375e+03, 4.6482802734375e+03, 4.6428486328125e+03, 4.81775634765625e+03, 4.776685546875e+03, 4.666814453125e+03, 4.6353681640625e+03, 4.6390517578125e+03, 4.63840283203125e+03, 4.63524169921875e+03, 4.64689501953125e+03, 4.6441767578125e+03, 4.67007275390625e+03, 4.65581787109375e+03, 4.6436513671875e+03, 4.6367607421875e+03, 4.63328857421875e+03, 4.85413232421875e+03, 5.13326953125e+03, 4.79458740234375e+03, 4.6385595703125e+03, 4.64511962890625e+03, 4.64215380859375e+03, 4.6351806640625e+03, 4.643828125e+03, 4.648048828125e+03, 4.64237890625e+03, 4.6681826171875e+03, 4.6490078125e+03, 4.6398046875e+03, 4.63501806640625e+03, 4.7182578125e+03, 5.11639697265625e+03, 4.811342285156248e+03, 4.63678662109375e+03, 4.66067236328125e+03, 4.67514892578125e+03, 4.65353857421875e+03, 4.6506611328125e+03, 4.67487255859375e+03, 4.651482421875e+03, 4.67427587890625e+03, 4.672029296875e+03, 4.64746142578125e+03, 4.6377548828125e+03, 4.6243046875e+03, 5.1753544921875e+03, 5.20065380859375e+03, 5.01769775390625e+03, 4.79584228515625e+03, 4.7845439453125e+03, 4.79386962890625e+03, 4.80663037109375e+03, 4.65318505859375e+03, 4.66576025390625e+03, 4.63991064453125e+03, 4.629349609375e+03, 4.62665673828125e+03, 4.62751513671875e+03, 4.62980517578125e+03, 5.4011787109375e+03, 5.59920068359375e+03, 5.567947265625e+03, 5.25958349609375e+03, 5.1302060546875e+03, 5.15773779296875e+03, 5.0837490234375e+03, 4.740341796874998e+03, 4.69951318359375e+03, 4.63243798828125e+03, 4.62988916015625e+03, 4.63154296875e+03, 4.6421943359375e+03, 4.65273876953125e+03, 5.4061240234375e+03, 5.76855078125e+03, 5.7297978515625e+03, 5.3542197265625e+03, 5.15753955078125e+03, 5.17128173828125e+03, 5.15743017578125e+03, 4.994713378906255e+03, 4.75955419921875e+03, 4.80014599609375e+03, 4.636435546875e+03, 4.6503671875e+03, 4.660771484375e+03, 4.668990234375e+03, 4.93166943359375e+03, 5.6876455078125e+03, 5.46194921875e+03, 5.3419658203125e+03, 5.279689453125e+03, 4.83241748046875e+03, 4.80954931640625e+03, 4.90953466796875e+03, 4.71440283203125e+03, 4.754337890625e+03, 4.62674365234375e+03, 4.63898388671875e+03]
+dis.mCon_flow[1]=[-1.182050928473473e-01, -0e+00, 1.611527295608539e-05, 1.074351439456223e-05, 3.156627178192139e+00, 4.223211288452148e+00, 4.355947494506836e+00, 2.562768697738647e+00, 2.871354818344116e+00, 3.331134080886841e+00, 2.160864591598511e+00, -0e+00, -0e+00, -0e+00, 1.074351439456223e-05, 5.69513700902462e-02, 6.426340937614441e-01, 9.208374023437507e-01, 2.286338090896606e+00, 5.136517524719238e+00, 6.037415027618408e+00, 3.636207103729248e+00, 2.376487016677856e+00, 3.409303903579712e+00, 2.880078554153442e+00, -0e+00, -0e+00, -0e+00, 1.074351439456223e-05, 9.734699130058289e-02, 3.816741108894348e-01, 6.984681487083435e-01, 1.340672492980957e+00, 4.566251754760742e+00, 5.363291740417472e+00, 2.813565254211426e+00, 4.185566008090973e-01, 4.264960587024689e-01, 1.134461402893066e+00, 1.606370359659195e-01, -0e+00, 0e+00, -0e+00, -0e+00, 1.074351439456223e-05, 9.040667861700058e-02, 6.391531825065613e-01, 4.411018371582031e+00, 6.123008251190186e+00, 5.454966068267822e+00, 2.236896514892578e+00, 3.236301183700562e+00, 3.752742052078247e+00, 1.952676773071289e+00, -0e+00, -0e+00, 1.074351439456223e-05, 7.426992058753611e-02, 4.635396897792816e-01, 7.869517207145691e-01, 1.081184387207031e+00, 3.45541524887085e+00, 5.786468029022217e+00, 7.405741214752197e+00, 4.999924182891846e+00, 4.994439601898193e+00, 6.283172607421875e+00, 4.152368545532227e+00, 5.197175145149153e-01, 6.17966949939717e-01, 9.895744323730469e-01, 1.400180816650391e+00, 1.598387956619263e+00, 1.842630982398987e+00, 2.015515565872192e+00, 2.76960825920105e+00, 2.839629173278809e+00, 2.77912163734436e+00, 2.758461952209473e+00, 2.806990385055542e+00, 2.91646671295166e+00, 3.0019850730896e+00, 2.923632621765138e+00, 2.31351375579834e+00, 2.51774263381958e+00, 2.67480206489563e+00, 2.739080667495728e+00, 2.817389965057373e+00, 2.919260025024414e+00, 3.383444309234619e+00, 3.74714994430542e+00, 3.687528848648071e+00, 3.54357647895813e+00, 3.414525270462036e+00, 3.423786163330078e+00, 3.462419986724854e+00, 3.495918273925781e+00, 2.646186828613281e+00, 2.90827488899231e+00, 3.072881698608398e+00, 3.155638933181763e+00]
+dis.mCon_flow[2]=[-7.831910705566406e+01, 1.036104393005371e+01, 1.239069366455078e+01, 1.373689651489258e+01, 3.997561264038086e+01, 1.274802494049072e+01, 1.243508338928223e+01, 3.28746032714844e+01, 1.817391586303711e+01, 7.664114475250244e+00, 3.323613739013672e+01, 2.999443817138672e+01, 3.165874671936035e+01, 8.916268348693848e+00, 1.172948741912843e+01, 1.464293670654297e+01, 1.696841239929199e+01, 1.856878662109375e+01, 4.350563049316406e+01, 1.661729621887207e+01, 1.728323364257812e+01, 1.736980056762695e+01, 2.988777732849121e+01, 6.507283210754395e+00, 1.625254249572754e+01, 3.354978942871094e+01, 3.200350570678711e+01, 2.64254150390625e+01, 1.208627510070802e+01, 1.504258918762207e+01, 1.718015098571777e+01, 1.876055717468262e+01, 4.554283905029297e+01, 3.15126895904541e+01, 1.738705825805661e+01, 1.062557315826416e+01, 3.094198799133301e+01, 8.33039402961731e-01, 5.213084697723389e+00, 3.028450202941895e+01, 2.584347152709961e+01, 3.082684898376463e+01, 6.674636363983154e+00, 1.134961032867432e+01, 1.534835338592529e+01, 1.801284408569336e+01, 2.58183536529541e+01, 4.468988037109375e+01, 2.080972290039062e+01, 2.0595703125e+01, 4.737458038330078e+01, 1.917893409729004e+01, 1.902203178405762e+01, 4.699963760375977e+01, 4.164276885986328e+01, 4.468509674072266e+01, 1.613326072692884e+01, 2.30477714538574e+01, 2.514846801757812e+01, 2.557338714599609e+01, 2.619311904907227e+01, 5.409930038452148e+01, 2.36152515411377e+01, 2.635939407348633e+01, 4.394814682006836e+01, 4.564140701293945e+01, 2.464463806152344e+01, 4.502704620361328e+01, 5.200912094116201e+01, 5.030402755737302e+01, 3.082318115234375e+01, 2.752729415893555e+01, 2.751380920410156e+01, 2.927617835998535e+01, 3.060870552062988e+01, 6.281868362426758e+01, 3.374707794189453e+01, 3.129348182678223e+01, 3.066333389282227e+01, 5.700635528564453e+01, 2.617909240722656e+01, 2.999534225463928e+01, 5.78393249511719e+01, 5.326518249511719e+01, 5.482624816894531e+01, 2.89993782043457e+01, 3.013252449035645e+01, 3.157004737854004e+01, 3.282113647460938e+01, 5.198987579345703e+01, 5.626529693603516e+01, 3.29871940612793e+01, 3.330496978759766e+01, 6.322192764282227e+01, 2.215335464477539e+01, 2.640522766113281e+01, 5.563484573364258e+01, 4.942637252807617e+01, 5.257940673828125e+01, 2.330315208435059e+01, 2.799538421630859e+01]
+dis.mCon_flow[3]=[-2.868548393249512e+01, 2.148199081420898e+00, 2.967359304428101e+00, 3.667242050170898e+00, 1.477042102813721e+01, 1.345114040374756e+01, 1.092110919952393e+01, 8.513651847839354e+00, 7.422815799713135e+00, 7.641809463500977e+00, 8.349978446960449e+00, 5.815704822540283e+00, 6.332572937011719e+00, 1.156771659851074e+00, 2.183540582656864e+00, 3.55453634262085e+00, 4.674603939056396e+00, 5.441257476806642e+00, 1.394090938568115e+01, 1.716012001037598e+01, 1.355520820617676e+01, 9.044739723205566e+00, 6.172503471374512e+00, 6.840451717376709e+00, 8.386198997497559e+00, 6.405585289001465e+00, 5.619524955749512e+00, 5.224857330322266e+00, 1.211585998535166e+00, 2.883467435836792e+00, 4.132394790649414e+00, 5.03393030166626e+00, 1.365688133239746e+01, 1.694169807434082e+01, 1.376266384124753e+01, 7.766141414642334e+00, 4.005117416381836e+00, 2.789377450942993e+00, 4.838409423828125e+00, 5.216417789459229e+00, 2.791069746017456e+00, 5.096151351928703e+00, 4.395697033032775e-05, 9.716028571128845e-01, 3.064284324645996e+00, 4.487105369567871e+00, 7.417057514190674e+00, 1.749689674377441e+01, 1.75300178527832e+01, 1.604778861999512e+01, 1.358204460144043e+01, 1.388438034057617e+01, 1.386154460906982e+01, 1.388092994689941e+01, 1.004447555541992e+01, 1.092495536804199e+01, 4.115053653717067e+00, 6.232306957244863e+00, 7.228437900543213e+00, 7.500619411468506e+00, 7.883352756500244e+00, 1.905119323730469e+01, 1.975221824645996e+01, 1.937946319580078e+01, 1.755593109130859e+01, 1.691790580749512e+01, 1.713077926635742e+01, 1.651705169677734e+01, 1.268663024902341e+01, 1.216089344024657e+01, 8.087071418762207e+00, 7.902254581451416e+00, 8.036323547363281e+00, 8.742513656616211e+00, 9.21230411529541e+00, 1.934243965148926e+01, 2.034453773498535e+01, 2.009635734558105e+01, 1.823719787597656e+01, 1.695884132385254e+01, 1.72793083190918e+01, 1.716642761230469e+01, 1.554116249084477e+01, 1.329354381561279e+01, 1.377361965179443e+01, 8.561301231384277e+00, 9.092960357666016e+00, 9.603631019592285e+00, 9.931615829467773e+00, 1.588136768341064e+01, 1.986791229248047e+01, 1.88503532409668e+01, 1.820651626586914e+01, 1.764520645141602e+01, 1.423717880249023e+01, 1.408374691009521e+01, 1.501990985870361e+01, 1.228336906433105e+01, 1.32431583404541e+01, 6.944387912750244e+00, 8.593170166015625e+00]
 bui[1].ets.THeaWatSupSet=[3.011499938964844e+02, 3.011499938964844e+02, 3.011818542480469e+02, 3.012418518066406e+02, 3.033169555664062e+02, 3.041416320800781e+02, 3.044120483398438e+02, 3.030785827636719e+02, 3.032156066894531e+02, 3.035683288574219e+02, 3.027239074707031e+02, 3.011499938964844e+02, 3.011499938964844e+02, 3.011499938964844e+02, 3.011561889648438e+02, 3.012687683105469e+02, 3.015848388671875e+02, 3.018233032226562e+02, 3.029001159667969e+02, 3.050103454589844e+02, 3.057236633300781e+02, 3.038907470703125e+02, 3.028811340332031e+02, 3.03606201171875e+02, 3.032756652832031e+02, 3.011499938964844e+02, 3.011499938964844e+02, 3.011499938964844e+02, 3.011899719238281e+02, 3.012715148925781e+02, 3.014285888671875e+02, 3.016359558105469e+02, 3.021471557617188e+02, 3.045862426757812e+02, 3.051562805175781e+02, 3.032362060546875e+02, 3.014360961914062e+02, 3.014007263183594e+02, 3.018779602050781e+02, 3.012979736328125e+02, 3.011499938964844e+02, 3.011499938964844e+02, 3.011499938964844e+02, 3.011499938964844e+02, 3.011532592773438e+02, 3.012625122070312e+02, 3.015754699707031e+02, 3.043725891113281e+02, 3.057138977050781e+02, 3.052976379394531e+02, 3.028313293457031e+02, 3.034349060058594e+02, 3.039214782714844e+02, 3.0258935546875e+02, 3.011499938964844e+02, 3.011499938964844e+02, 3.011549072265625e+02, 3.012594604492188e+02, 3.014695739746094e+02, 3.017150573730469e+02, 3.019510803222656e+02, 3.0364501953125e+02, 3.055112609863281e+02, 3.068552856445312e+02, 3.050308837890625e+02, 3.049100036621094e+02, 3.059415893554688e+02, 3.04355712890625e+02, 3.015714721679688e+02, 3.015879211425781e+02, 3.018827514648438e+02, 3.021878051757812e+02, 3.023419189453125e+02, 3.025277099609375e+02, 3.026602478027344e+02, 3.032210693359375e+02, 3.033043518066406e+02, 3.032552490234375e+02, 3.032364196777344e+02, 3.032822570800781e+02, 3.033528442382812e+02, 3.03423583984375e+02, 3.033790893554688e+02, 3.0290576171875e+02, 3.030587768554688e+02, 3.0315966796875e+02, 3.032167053222656e+02, 3.032773742675781e+02, 3.033581237792969e+02, 3.03684326171875e+02, 3.040229187011719e+02, 3.039660339355469e+02, 3.038548889160156e+02, 3.037657470703125e+02, 3.037560424804688e+02, 3.0377978515625e+02, 3.038266296386719e+02, 3.031968383789062e+02, 3.03359130859375e+02, 3.0346533203125e+02, 3.035382385253906e+02]
-bui[1].ets.senTHeaWatSup.T=[2.931499938964844e+02, 2.931499938964844e+02, 3.096929931640625e+02, 3.070046997070312e+02, 3.032787475585938e+02, 3.041241455078125e+02, 3.044170532226562e+02, 3.030931396484375e+02, 3.031998596191406e+02, 3.035704040527344e+02, 3.027388305664062e+02, 2.998436279296875e+02, 2.992306518554688e+02, 2.992146606445312e+02, 3.002746276855469e+02, 3.012611694335938e+02, 3.015811767578125e+02, 3.018209228515625e+02, 3.028612670898438e+02, 3.0500048828125e+02, 3.057317810058594e+02, 3.03922119140625e+02, 3.028812866210938e+02, 3.03602783203125e+02, 3.032886352539062e+02, 3.011121826171875e+02, 2.99282470703125e+02, 2.992381286621094e+02, 3.011657104492188e+02, 3.012691650390625e+02, 3.014251098632812e+02, 3.016337890625e+02, 3.021309204101562e+02, 3.045799255371094e+02, 3.051615600585938e+02, 3.032622680664062e+02, 3.014456481933594e+02, 3.013972473144531e+02, 3.018735046386719e+02, 3.013154296875e+02, 2.987718505859375e+02, 2.986138305664062e+02, 2.986095581054688e+02, 2.986094360351562e+02, 3.002066955566406e+02, 3.01258544921875e+02, 3.015621643066406e+02, 3.043494873046875e+02, 3.056936645507812e+02, 3.053197021484375e+02, 3.028364868164062e+02, 3.034102172851562e+02, 3.039268493652344e+02, 3.026135559082031e+02, 2.996044311523438e+02, 2.992477416992188e+02, 3.0072607421875e+02, 3.0125537109375e+02, 3.014656066894531e+02, 3.017117614746094e+02, 3.019482116699219e+02, 3.035981140136719e+02, 3.054864807128906e+02, 3.068544311523438e+02, 3.050624389648438e+02, 3.048880004882812e+02, 3.05942626953125e+02, 3.043843688964844e+02, 3.015809326171875e+02, 3.015832214355469e+02, 3.01879150390625e+02, 3.02185791015625e+02, 3.023400268554688e+02, 3.025259399414062e+02, 3.026592102050781e+02, 3.032184753417969e+02, 3.033038330078125e+02, 3.03256103515625e+02, 3.032363891601562e+02, 3.03281494140625e+02, 3.03351806640625e+02, 3.03423583984375e+02, 3.033809814453125e+02, 3.029024658203125e+02, 3.030579223632812e+02, 3.031583862304688e+02, 3.032163391113281e+02, 3.032760009765625e+02, 3.033580017089844e+02, 3.0366748046875e+02, 3.040230407714844e+02, 3.039671936035156e+02, 3.0385595703125e+02, 3.037661437988281e+02, 3.037560424804688e+02, 3.037791137695312e+02, 3.038273010253906e+02, 3.031999816894531e+02, 3.033583068847656e+02, 3.034645690917969e+02, 3.035372619628906e+02]
+bui[1].ets.senTHeaWatSup.T=[2.931499938964844e+02, 2.931499938964844e+02, 3.096924743652344e+02, 3.070043334960938e+02, 3.032787475585938e+02, 3.041241455078125e+02, 3.044170532226562e+02, 3.030931396484375e+02, 3.031998596191406e+02, 3.035704040527344e+02, 3.027388305664062e+02, 2.998435668945312e+02, 2.992306518554688e+02, 2.992146606445312e+02, 3.002745056152344e+02, 3.012611694335938e+02, 3.015811462402344e+02, 3.018209228515625e+02, 3.028612670898438e+02, 3.0500048828125e+02, 3.057317810058594e+02, 3.03922119140625e+02, 3.028812866210938e+02, 3.03602783203125e+02, 3.032886352539062e+02, 3.01112548828125e+02, 2.99282470703125e+02, 2.992381286621094e+02, 3.011657104492188e+02, 3.012691650390625e+02, 3.014251098632812e+02, 3.016337890625e+02, 3.021309204101562e+02, 3.045799255371094e+02, 3.051615600585938e+02, 3.032622680664062e+02, 3.014456481933594e+02, 3.013972473144531e+02, 3.018735046386719e+02, 3.013154296875e+02, 2.987718505859375e+02, 2.986138305664062e+02, 2.986095581054688e+02, 2.986094360351562e+02, 3.002066650390625e+02, 3.01258544921875e+02, 3.015621643066406e+02, 3.043514709472656e+02, 3.056936645507812e+02, 3.053197021484375e+02, 3.028364562988281e+02, 3.034102172851562e+02, 3.039268493652344e+02, 3.026135559082031e+02, 2.996041259765625e+02, 2.992477416992188e+02, 3.0072607421875e+02, 3.0125537109375e+02, 3.014656066894531e+02, 3.017117614746094e+02, 3.019482116699219e+02, 3.035980529785156e+02, 3.054864807128906e+02, 3.068544311523438e+02, 3.050624389648438e+02, 3.048880004882812e+02, 3.05942626953125e+02, 3.043843688964844e+02, 3.015809326171875e+02, 3.01582763671875e+02, 3.01879150390625e+02, 3.02185791015625e+02, 3.023400268554688e+02, 3.025259399414062e+02, 3.026592102050781e+02, 3.032184753417969e+02, 3.033038330078125e+02, 3.03256103515625e+02, 3.032363891601562e+02, 3.03281494140625e+02, 3.03351806640625e+02, 3.03423583984375e+02, 3.033809814453125e+02, 3.029024658203125e+02, 3.030579223632812e+02, 3.031583862304688e+02, 3.032163391113281e+02, 3.032760009765625e+02, 3.033580017089844e+02, 3.0366748046875e+02, 3.040230407714844e+02, 3.039671936035156e+02, 3.0385595703125e+02, 3.037661437988281e+02, 3.037560424804688e+02, 3.037791137695312e+02, 3.038273010253906e+02, 3.031999816894531e+02, 3.033583068847656e+02, 3.034645690917969e+02, 3.035372619628906e+02]
 bui[2].ets.THeaWatSupSet=[3.022371215820312e+02, 3.022929992675781e+02, 3.025325317382812e+02, 3.027109375e+02, 3.0576953125e+02, 3.026592102050781e+02, 3.025699462890625e+02, 3.046447448730469e+02, 3.032872619628906e+02, 3.0203173828125e+02, 3.047882385253906e+02, 3.044075622558594e+02, 3.045711669921875e+02, 3.021329040527344e+02, 3.025238037109375e+02, 3.028435974121094e+02, 3.031228942871094e+02, 3.033214416503906e+02, 3.064082336425781e+02, 3.032993774414062e+02, 3.032015380859375e+02, 3.032325134277344e+02, 3.045858154296875e+02, 3.019427795410156e+02, 3.031217956542969e+02, 3.048508911132812e+02, 3.0460595703125e+02, 3.040630798339844e+02, 3.025755310058594e+02, 3.028836364746094e+02, 3.031466064453125e+02, 3.033418884277344e+02, 3.06205078125e+02, 3.050321960449219e+02, 3.031983947753906e+02, 3.023972473144531e+02, 3.045396118164062e+02, 3.013359985351562e+02, 3.017449645996094e+02, 3.045319519042969e+02, 3.038887023925781e+02, 3.04413330078125e+02, 3.019764099121094e+02, 3.025020751953125e+02, 3.029153747558594e+02, 3.032434997558594e+02, 3.040957641601562e+02, 3.064471130371094e+02, 3.035986938476562e+02, 3.035945129394531e+02, 3.064448852539062e+02, 3.035657958984375e+02, 3.033815307617188e+02, 3.066045227050781e+02, 3.058945007324219e+02, 3.06213134765625e+02, 3.031752624511719e+02, 3.03856201171875e+02, 3.041219177246094e+02, 3.041805419921875e+02, 3.042574462890625e+02, 3.076214294433594e+02, 3.040094604492188e+02, 3.043080139160156e+02, 3.060822143554688e+02, 3.067025756835938e+02, 3.040648498535156e+02, 3.062969970703125e+02, 3.072484436035156e+02, 3.069846801757812e+02, 3.049280395507812e+02, 3.044254150390625e+02, 3.044303588867188e+02, 3.046428527832031e+02, 3.048128356933594e+02, 3.086090087890625e+02, 3.054629821777344e+02, 3.049158935546875e+02, 3.048506774902344e+02, 3.080462646484375e+02, 3.042694091796875e+02, 3.047711791992188e+02, 3.080608520507812e+02, 3.073917236328125e+02, 3.075439147949219e+02, 3.045775451660156e+02, 3.047623901367188e+02, 3.049385375976562e+02, 3.051003112792969e+02, 3.071455078125e+02, 3.081002807617188e+02, 3.051087951660156e+02, 3.051735534667969e+02, 3.087722473144531e+02, 3.039963989257812e+02, 3.0430224609375e+02, 3.078565063476562e+02, 3.069277648925781e+02, 3.072600402832031e+02, 3.039281311035156e+02, 3.04494873046875e+02]
-bui[2].ets.senTHeaWatSup.T=[2.931499938964844e+02, 3.022889709472656e+02, 3.025302734375e+02, 3.02699462890625e+02, 3.057750549316406e+02, 3.026554260253906e+02, 3.025732727050781e+02, 3.045884399414062e+02, 3.033598327636719e+02, 3.020285949707031e+02, 3.047384033203125e+02, 3.044178771972656e+02, 3.045671081542969e+02, 3.021788635253906e+02, 3.025203857421875e+02, 3.028400268554688e+02, 3.031202697753906e+02, 3.033199462890625e+02, 3.064070739746094e+02, 3.033298034667969e+02, 3.032083129882812e+02, 3.031789245605469e+02, 3.046055908203125e+02, 3.019335327148438e+02, 3.030521850585938e+02, 3.048588256835938e+02, 3.045985717773438e+02, 3.041311950683594e+02, 3.025703125e+02, 3.02880615234375e+02, 3.031442565917969e+02, 3.033402404785156e+02, 3.061410522460938e+02, 3.051129455566406e+02, 3.032017517089844e+02, 3.024026794433594e+02, 3.045532531738281e+02, 3.013327941894531e+02, 3.017372436523438e+02, 3.045425415039062e+02, 3.038844299316406e+02, 3.044116516113281e+02, 3.019644775390625e+02, 3.0249755859375e+02, 3.029110107421875e+02, 3.032404174804688e+02, 3.040276184082031e+02, 3.064543762207031e+02, 3.035905456542969e+02, 3.035966796875e+02, 3.064399719238281e+02, 3.036338806152344e+02, 3.033793334960938e+02, 3.066044921875e+02, 3.059033813476562e+02, 3.06208740234375e+02, 3.031722717285156e+02, 3.03853515625e+02, 3.041203002929688e+02, 3.041798400878906e+02, 3.042565307617188e+02, 3.076247863769531e+02, 3.040050964355469e+02, 3.043082580566406e+02, 3.059934387207031e+02, 3.067624206542969e+02, 3.040579833984375e+02, 3.062080688476562e+02, 3.072605590820312e+02, 3.069815368652344e+02, 3.050143432617188e+02, 3.044252319335938e+02, 3.044303283691406e+02, 3.046406555175781e+02, 3.048118591308594e+02, 3.086028137207031e+02, 3.055467224121094e+02, 3.049166564941406e+02, 3.048417053222656e+02, 3.080601196289062e+02, 3.042603149414062e+02, 3.047450256347657e+02, 3.080686950683594e+02, 3.073871154785156e+02, 3.075782775878906e+02, 3.04567138671875e+02, 3.0476123046875e+02, 3.0493603515625e+02, 3.050995788574219e+02, 3.07046630859375e+02, 3.081634826660156e+02, 3.051037902832031e+02, 3.051732482910156e+02, 3.087818908691406e+02, 3.040284729003906e+02, 3.043005065917969e+02, 3.07861083984375e+02, 3.06930419921875e+02, 3.072577209472656e+02, 3.039176330566406e+02, 3.044920959472656e+02]
+bui[2].ets.senTHeaWatSup.T=[2.931499938964844e+02, 3.022889709472656e+02, 3.025302734375e+02, 3.026994934082031e+02, 3.057750549316406e+02, 3.026554260253906e+02, 3.025732727050781e+02, 3.045914306640625e+02, 3.033598327636719e+02, 3.020285949707031e+02, 3.047360229492188e+02, 3.044178771972656e+02, 3.045671081542969e+02, 3.021788635253906e+02, 3.025203857421875e+02, 3.028400268554688e+02, 3.031202697753906e+02, 3.033199462890625e+02, 3.064070739746094e+02, 3.033298034667969e+02, 3.032083129882812e+02, 3.031789245605469e+02, 3.046055908203125e+02, 3.019335327148438e+02, 3.030521850585938e+02, 3.048588562011719e+02, 3.045985717773438e+02, 3.041311950683594e+02, 3.025703125e+02, 3.02880615234375e+02, 3.031442565917969e+02, 3.033402404785156e+02, 3.061410827636719e+02, 3.051129455566406e+02, 3.032017517089844e+02, 3.024026794433594e+02, 3.045532531738281e+02, 3.013327941894531e+02, 3.017372436523438e+02, 3.045425415039062e+02, 3.038844299316406e+02, 3.044116516113281e+02, 3.019644775390625e+02, 3.0249755859375e+02, 3.029110107421875e+02, 3.032404174804688e+02, 3.040276184082031e+02, 3.064543762207031e+02, 3.035905456542969e+02, 3.035966796875e+02, 3.064399719238281e+02, 3.036338806152344e+02, 3.033793334960938e+02, 3.066044921875e+02, 3.059033813476562e+02, 3.06208740234375e+02, 3.031722717285156e+02, 3.03853515625e+02, 3.041203002929688e+02, 3.041798400878906e+02, 3.042565307617188e+02, 3.076247863769531e+02, 3.040050964355469e+02, 3.043082580566406e+02, 3.059934387207031e+02, 3.067624206542969e+02, 3.040579833984375e+02, 3.062080688476562e+02, 3.072605590820312e+02, 3.069815368652344e+02, 3.050143432617188e+02, 3.044252319335938e+02, 3.044303283691406e+02, 3.046406555175781e+02, 3.048118591308594e+02, 3.086028442382812e+02, 3.055467224121094e+02, 3.049166564941406e+02, 3.048416748046875e+02, 3.080601196289062e+02, 3.042603149414062e+02, 3.047450256347657e+02, 3.080686950683594e+02, 3.073871154785156e+02, 3.075782775878906e+02, 3.04567138671875e+02, 3.0476123046875e+02, 3.0493603515625e+02, 3.050995788574219e+02, 3.07046630859375e+02, 3.081634826660156e+02, 3.051037902832031e+02, 3.051732177734375e+02, 3.087818908691406e+02, 3.040284729003906e+02, 3.043005065917969e+02, 3.07861083984375e+02, 3.06930419921875e+02, 3.072577209472656e+02, 3.039176330566406e+02, 3.044920654296875e+02]
 bui[3].ets.THeaWatSupSet=[3.015830078125e+02, 3.017384643554688e+02, 3.020616760253906e+02, 3.023164672851562e+02, 3.055315856933594e+02, 3.052533569335938e+02, 3.042955322265625e+02, 3.035074462890625e+02, 3.031561584472656e+02, 3.031649475097656e+02, 3.034611206054688e+02, 3.025969543457031e+02, 3.027619323730469e+02, 3.014335632324219e+02, 3.018492736816406e+02, 3.02317138671875e+02, 3.026919250488281e+02, 3.029523315429688e+02, 3.057950744628906e+02, 3.064950866699219e+02, 3.05296630859375e+02, 3.037142028808594e+02, 3.027350769042969e+02, 3.028833312988281e+02, 3.034297485351562e+02, 3.028161315917969e+02, 3.025333557128906e+02, 3.024278259277344e+02, 3.015642700195312e+02, 3.020900573730469e+02, 3.025110168457031e+02, 3.028137512207031e+02, 3.051663818359375e+02, 3.064702453613281e+02, 3.053681945800781e+02, 3.032876586914062e+02, 3.020130615234375e+02, 3.015963745117188e+02, 3.022110900878906e+02, 3.024018859863281e+02, 3.016385192871094e+02, 3.02337890625e+02, 3.011651916503906e+02, 3.015142211914062e+02, 3.021448974609375e+02, 3.026300354003906e+02, 3.034896850585938e+02, 3.06657958984375e+02, 3.066563415527344e+02, 3.0615478515625e+02, 3.053432922363281e+02, 3.0532421875e+02, 3.053579711914062e+02, 3.0541748046875e+02, 3.04074462890625e+02, 3.043381958007812e+02, 3.0258203125e+02, 3.032113647460938e+02, 3.035560913085938e+02, 3.036563110351562e+02, 3.037868041992188e+02, 3.07205322265625e+02, 3.074538269042969e+02, 3.073782653808594e+02, 3.067622375488281e+02, 3.064886169433594e+02, 3.065491638183594e+02, 3.063687438964844e+02, 3.050221862792969e+02, 3.047802734375e+02, 3.037688293457031e+02, 3.037930603027344e+02, 3.038448181152344e+02, 3.040843200683594e+02, 3.042516174316406e+02, 3.072645874023438e+02, 3.0772265625e+02, 3.076467895507812e+02, 3.069666137695312e+02, 3.065372009277344e+02, 3.065844116210938e+02, 3.065560913085938e+02, 3.06064208984375e+02, 3.051891174316406e+02, 3.053666076660156e+02, 3.039945678710938e+02, 3.042120666503906e+02, 3.043890380859375e+02, 3.04509765625e+02, 3.061576843261719e+02, 3.076034545898438e+02, 3.071937866210938e+02, 3.069554748535156e+02, 3.068090515136719e+02, 3.05495361328125e+02, 3.054386291503906e+02, 3.058284912109375e+02, 3.048736267089844e+02, 3.051721496582031e+02, 3.034703979492188e+02, 3.040327758789062e+02]
-bui[3].ets.senTHeaWatSup.T=[2.931499938964844e+02, 3.017325134277344e+02, 3.020586853027344e+02, 3.023055419921875e+02, 3.055233154296875e+02, 3.052616577148438e+02, 3.043056030273438e+02, 3.03513671875e+02, 3.031575927734375e+02, 3.031634216308594e+02, 3.034589233398438e+02, 3.026072998046875e+02, 3.027566833496094e+02, 3.014655151367188e+02, 3.018433227539062e+02, 3.023121337890625e+02, 3.026884155273438e+02, 3.029499816894531e+02, 3.057655944824219e+02, 3.064988098144531e+02, 3.053147888183594e+02, 3.037291870117188e+02, 3.027366943359375e+02, 3.028789978027344e+02, 3.034235534667969e+02, 3.028280029296875e+02, 3.025247497558594e+02, 3.024700927734375e+02, 3.015572204589844e+02, 3.02084716796875e+02, 3.025071105957031e+02, 3.028109436035156e+02, 3.051084899902344e+02, 3.0647314453125e+02, 3.053883972167969e+02, 3.033063659667969e+02, 3.020243835449219e+02, 3.015947570800781e+02, 3.02200439453125e+02, 3.024179992675781e+02, 3.01633056640625e+02, 3.023347473144531e+02, 3.009332580566406e+02, 3.015063171386719e+02, 3.021380310058594e+02, 3.026254577636719e+02, 3.034351806640625e+02, 3.066553955078125e+02, 3.066568908691406e+02, 3.061634826660156e+02, 3.0534765625e+02, 3.053199462890625e+02, 3.053578491210938e+02, 3.05419189453125e+02, 3.040821228027344e+02, 3.043345336914062e+02, 3.025797424316406e+02, 3.032073364257812e+02, 3.03553955078125e+02, 3.036551818847656e+02, 3.037847595214844e+02, 3.071876831054688e+02, 3.074523010253906e+02, 3.073836975097656e+02, 3.067694702148438e+02, 3.064862060546875e+02, 3.0655126953125e+02, 3.063692932128906e+02, 3.050359497070312e+02, 3.047777099609375e+02, 3.038135681152344e+02, 3.037921752929688e+02, 3.038440246582031e+02, 3.040820007324219e+02, 3.042504272460938e+02, 3.072449645996094e+02, 3.077250671386719e+02, 3.076525573730469e+02, 3.069716186523438e+02, 3.065411682128906e+02, 3.065861511230469e+02, 3.065553894042969e+02, 3.060817260742188e+02, 3.051850280761719e+02, 3.053847351074219e+02, 3.0398486328125e+02, 3.042107849121094e+02, 3.043866271972656e+02, 3.045093688964844e+02, 3.060777893066406e+02, 3.076077270507812e+02, 3.0719580078125e+02, 3.069580383300781e+02, 3.068231506347656e+02, 3.055002136230469e+02, 3.054342956542969e+02, 3.058315124511719e+02, 3.048771057128906e+02, 3.051698913574219e+02, 3.034613342285156e+02, 3.040293884277344e+02]
-bui[1].ets.senMasFloHeaWat.m_flow=[0e+00, 0e+00, 1.907798647880554e-02, 5.650842934846878e-02, 4.91388988494873e+00, 6.830461502075195e+00, 7.486812114715576e+00, 4.83609342575073e+00, 4.91346549987793e+00, 5.776049137115479e+00, 3.992825508117676e+00, 9.63177066296339e-03, 9.317022748291492e-03, 9.218187071382999e-03, 1.526960730552678e-02, 1.419281959533691e-01, 9.882640838623047e-01, 1.632619023323061e+00, 4.040690422058105e+00, 8.464424133300781e+00, 9.764198303222656e+00, 6.66143798828125e+00, 4.263031005859375e+00, 5.813726902008057e+00, 5.221812725067139e+00, 1.175139658153057e-02, 9.3625383451581e-03, 9.23995953053236e-03, 4.137026518583341e-02, 1.511251777410507e-01, 5.184524655342102e-01, 1.143420696258545e+00, 2.360294580459595e+00, 7.682585716247559e+00, 8.79878330230712e+00, 5.259971141815186e+00, 6.51216447353363e-01, 4.391358494758606e-01, 1.750065922737122e+00, 2.531298398971558e-01, 9.43697988986969e-03, 9.280364029109478e-03, 9.20456275343895e-03, 9.154975414276123e-03, 1.349509134888649e-02, 1.353709846735001e-01, 8.986884355545044e-01, 7.134109020233154e+00, 9.591628074645996e+00, 9.151239395141602e+00, 4.245635986328125e+00, 5.315531253814697e+00, 6.520086288452148e+00, 3.742337703704834e+00, 9.535401128232479e-03, 9.297924116253853e-03, 1.431834790855675e-02, 1.306172162294371e-01, 6.396066546440125e-01, 1.34836745262146e+00, 1.956200361251831e+00, 5.612012386322021e+00, 9.266172409057617e+00, 1.139950656890869e+01, 8.790456771850586e+00, 8.28857421875e+00, 1.007950973510742e+01, 7.549247264862061e+00, 1.070353865623455e+00, 9.862474799156056e-01, 1.775656223297119e+00, 2.555433988571167e+00, 2.941930532455444e+00, 3.395514011383057e+00, 3.71892237663269e+00, 4.971457481384277e+00, 5.196498870849609e+00, 5.101318359375e+00, 5.053285598754883e+00, 5.148354530334473e+00, 5.301048755645752e+00, 5.460617065429688e+00, 5.378552913665774e+00, 4.294850826263428e+00, 4.647029876708984e+00, 4.870942115783691e+00, 5.005630493164062e+00, 5.134275913238525e+00, 5.318197727203369e+00, 5.912323474884033e+00, 6.703351974487305e+00, 6.602551937103271e+00, 6.378394603729248e+00, 6.190916538238525e+00, 6.166208744049072e+00, 6.210669994354248e+00, 6.313164710998535e+00, 5.020257472991943e+00, 5.3153977394104e+00, 5.545042514801025e+00, 5.701094627380371e+00]
-bui[2].ets.senMasFloHeaWat.m_flow=[1.08927321434021e+00, 1.79671745300293e+01, 2.18049373626709e+01, 2.436252021789551e+01, 6.269527435302734e+01, 2.408818244934082e+01, 2.268939018249512e+01, 4.808924484252935e+01, 3.59714469909668e+01, 1.384784698486328e+01, 4.960216903686523e+01, 4.817934799194336e+01, 4.954230117797852e+01, 1.829808235168457e+01, 2.160977363586427e+01, 2.646441459655762e+01, 3.060564613342285e+01, 3.34909782409668e+01, 6.827639770507812e+01, 3.554625701904297e+01, 3.220095443725586e+01, 3.054325866699219e+01, 5.051442337036133e+01, 1.225518798828125e+01, 2.809441375732422e+01, 5.317404937744141e+01, 4.992002487182617e+01, 4.562568283081055e+01, 2.233383369445804e+01, 2.70866813659668e+01, 3.095873832702637e+01, 3.376406478881836e+01, 6.460832214355469e+01, 5.740047454833984e+01, 3.20426750183105e+01, 2.018499183654785e+01, 4.938327789306641e+01, 1.85716438293457e+00, 8.976045608520508e+00, 4.913460922241211e+01, 4.122623443603516e+01, 4.769316482543943e+01, 1.271831321716309e+01, 2.12204704284668e+01, 2.748053550720215e+01, 3.230265426635742e+01, 4.174452972412109e+01, 6.948290252685547e+01, 3.733308792114258e+01, 3.744686126708984e+01, 6.812465667724609e+01, 4.009384536743164e+01, 3.43002815246582e+01, 6.969155883789062e+01, 6.451584625244141e+01, 6.713114166259766e+01, 3.236336135864265e+01, 4.067887115478512e+01, 4.413714981079102e+01, 4.494985961914062e+01, 4.589860153198242e+01, 7.919843292236328e+01, 4.356475448608398e+01, 4.658539581298828e+01, 6.344938278198242e+01, 7.287899017333984e+01, 4.33784294128418e+01, 6.541679382324219e+01, 7.678321838378896e+01, 7.428681945800778e+01, 5.679471206665039e+01, 4.793853378295898e+01, 4.805412673950195e+01, 5.048455047607422e+01, 5.250943756103516e+01, 8.578897094726562e+01, 6.258535385131836e+01, 5.380999755859375e+01, 5.290674209594727e+01, 8.296284484863281e+01, 4.635927200317383e+01, 5.155086135864315e+01, 8.298737335205081e+01, 7.782255554199219e+01, 7.942977142333984e+01, 4.961362457275391e+01, 5.193450546264648e+01, 5.390121459960938e+01, 5.5773681640625e+01, 7.331665802001953e+01, 8.418489837646484e+01, 5.589742660522461e+01, 5.661763000488281e+01, 8.764746856689453e+01, 4.51002311706543e+01, 4.644043731689453e+01, 8.080989074707031e+01, 7.410715484619141e+01, 7.663356018066406e+01, 4.206409454345703e+01, 4.8707275390625e+01]
-bui[3].ets.senMasFloHeaWat.m_flow=[1.571464985609055e-01, 3.230412483215332e+00, 5.182393074035645e+00, 6.593266010284424e+00, 2.161738204956055e+01, 2.092423629760742e+01, 1.699714660644531e+01, 1.32317943572998e+01, 1.135350513458252e+01, 1.13397741317749e+01, 1.281250953674316e+01, 8.509758949279785e+00, 9.117323875427246e+00, 1.957109093666077e+00, 3.884797334671028e+00, 6.625374317169189e+00, 8.757404327392578e+00, 1.019299125671387e+01, 2.232814598083496e+01, 2.534109878540039e+01, 2.126128768920898e+01, 1.440527629852295e+01, 9.157327651977539e+00, 9.801926612854004e+00, 1.258892250061035e+01, 9.759353637695312e+00, 7.819093704223633e+00, 7.94261360168457e+00, 2.098274946212786e+00, 5.30640172958374e+00, 7.742763519287109e+00, 9.43491268157959e+00, 1.957862281799316e+01, 2.520588493347168e+01, 2.155153083801266e+01, 1.237326431274414e+01, 5.170730590820312e+00, 2.42679238319397e+00, 5.916656970977783e+00, 7.440210819244385e+00, 2.655136823654175e+00, 6.752602100372299e+00, 4.422654584050179e-02, 1.735893368721008e+00, 5.596068382263184e+00, 8.393915176391602e+00, 1.230936813354492e+01, 2.56763973236084e+01, 2.587418174743652e+01, 2.428684043884277e+01, 2.128597831726074e+01, 2.105667877197266e+01, 2.12351016998291e+01, 2.146739387512207e+01, 1.599417877197266e+01, 1.693586921691895e+01, 8.378546714782738e+00, 1.151760673522947e+01, 1.328680419921875e+01, 1.380863475799561e+01, 1.442562866210938e+01, 2.724171829223633e+01, 2.835367202758789e+01, 2.819833564758301e+01, 2.631973648071289e+01, 2.532298851013184e+01, 2.554409027099609e+01, 2.493022537231445e+01, 2.016319274902339e+01, 1.887987136840819e+01, 1.503536796569824e+01, 1.444330501556396e+01, 1.472076416015625e+01, 1.580730152130127e+01, 1.658688354492188e+01, 2.726524353027344e+01, 2.915071487426758e+01, 2.897863960266113e+01, 2.696045303344727e+01, 2.554960060119629e+01, 2.565094947814941e+01, 2.554216003417969e+01, 2.405457496643071e+01, 2.057925987243652e+01, 2.137322235107422e+01, 1.531962299346924e+01, 1.640748405456543e+01, 1.71845645904541e+01, 1.774318695068359e+01, 2.335324859619141e+01, 2.878772926330566e+01, 2.761859512329102e+01, 2.687966918945312e+01, 2.64637622833252e+01, 2.188864135742188e+01, 2.151008987426758e+01, 2.30051097869873e+01, 1.944111442565918e+01, 2.046612739562988e+01, 1.292299175262451e+01, 1.555178642272949e+01]
+bui[3].ets.senTHeaWatSup.T=[2.931499938964844e+02, 3.017325134277344e+02, 3.020586853027344e+02, 3.023055419921875e+02, 3.055233154296875e+02, 3.052616577148438e+02, 3.043056030273438e+02, 3.03513671875e+02, 3.031575927734375e+02, 3.031634216308594e+02, 3.034589233398438e+02, 3.026072998046875e+02, 3.027566833496094e+02, 3.014655151367188e+02, 3.018433227539062e+02, 3.023121337890625e+02, 3.026884155273438e+02, 3.029499816894531e+02, 3.057655944824219e+02, 3.064988098144531e+02, 3.053147888183594e+02, 3.037291870117188e+02, 3.027366943359375e+02, 3.028789978027344e+02, 3.034235534667969e+02, 3.028280334472656e+02, 3.025247497558594e+02, 3.024700927734375e+02, 3.015572204589844e+02, 3.02084716796875e+02, 3.025071105957031e+02, 3.028109436035156e+02, 3.051085205078125e+02, 3.0647314453125e+02, 3.053883972167969e+02, 3.033063659667969e+02, 3.020243835449219e+02, 3.015947570800781e+02, 3.02200439453125e+02, 3.024179992675781e+02, 3.01633056640625e+02, 3.023347473144531e+02, 3.009333190917969e+02, 3.015063171386719e+02, 3.021380310058594e+02, 3.026254577636719e+02, 3.034351806640625e+02, 3.066553955078125e+02, 3.066568908691406e+02, 3.061634826660156e+02, 3.0534765625e+02, 3.053199462890625e+02, 3.053578491210938e+02, 3.05419189453125e+02, 3.040821228027344e+02, 3.043345336914062e+02, 3.025797424316406e+02, 3.032073364257812e+02, 3.03553955078125e+02, 3.036551818847656e+02, 3.037847595214844e+02, 3.071876831054688e+02, 3.074523010253906e+02, 3.073837280273438e+02, 3.067694702148438e+02, 3.064862060546875e+02, 3.0655126953125e+02, 3.063692932128906e+02, 3.050359497070312e+02, 3.047777099609375e+02, 3.038135681152344e+02, 3.037921752929688e+02, 3.038440246582031e+02, 3.040820007324219e+02, 3.042504272460938e+02, 3.072449645996094e+02, 3.077250671386719e+02, 3.076525573730469e+02, 3.069716186523438e+02, 3.065411682128906e+02, 3.065861511230469e+02, 3.065553894042969e+02, 3.060817260742188e+02, 3.051850280761719e+02, 3.053847351074219e+02, 3.0398486328125e+02, 3.042107849121094e+02, 3.043866271972656e+02, 3.045093688964844e+02, 3.060777893066406e+02, 3.076077270507812e+02, 3.0719580078125e+02, 3.069580078125e+02, 3.068231506347656e+02, 3.055002136230469e+02, 3.054342956542969e+02, 3.058315124511719e+02, 3.048771057128906e+02, 3.051698913574219e+02, 3.034613342285156e+02, 3.040293884277344e+02]
+bui[1].ets.senMasFloHeaWat.m_flow=[0e+00, 0e+00, 1.907818205654621e-02, 5.651016905903816e-02, 4.913890361785889e+00, 6.830461978912354e+00, 7.486815452575684e+00, 4.83609342575073e+00, 4.91346549987793e+00, 5.776048183441162e+00, 3.992825746536255e+00, 9.632304310798645e-03, 9.317119605839252e-03, 9.218237362802029e-03, 1.526965852826838e-02, 1.419283002614975e-01, 9.882615804672241e-01, 1.63261926174164e+00, 4.040689945220947e+00, 8.464424133300781e+00, 9.76419734954834e+00, 6.661439418792725e+00, 4.263031005859375e+00, 5.813726902008057e+00, 5.221814155578613e+00, 1.178313419222832e-02, 9.362691082060337e-03, 9.240029379725456e-03, 4.137020930647893e-02, 1.511251628398895e-01, 5.184520483016968e-01, 1.143431663513184e+00, 2.360296726226807e+00, 7.682586193084717e+00, 8.798787117004386e+00, 5.259970664978027e+00, 6.512197852134705e-01, 4.39135879278183e-01, 1.750067234039307e+00, 2.531296610832214e-01, 9.437049739062786e-03, 9.280390106141567e-03, 9.204578585922718e-03, 9.154986590147018e-03, 1.349510811269283e-02, 1.353709846735001e-01, 8.986884355545044e-01, 7.134012222290039e+00, 9.591629028320312e+00, 9.151232719421387e+00, 4.245635032653809e+00, 5.315532207489014e+00, 6.520089149475098e+00, 3.742347478866577e+00, 9.535230696201324e-03, 9.297890588641167e-03, 1.431834883987933e-02, 1.306172162294371e-01, 6.396065950393677e-01, 1.348366141319275e+00, 1.956200242042542e+00, 5.612013816833496e+00, 9.266171455383301e+00, 1.139951610565186e+01, 8.790457725524902e+00, 8.288571357727051e+00, 1.007950878143311e+01, 7.549245834350586e+00, 1.070363044738751e+00, 9.862226247787342e-01, 1.775656223297119e+00, 2.555433988571167e+00, 2.941929578781128e+00, 3.395515203475952e+00, 3.718925476074219e+00, 4.971457958221436e+00, 5.196498870849609e+00, 5.101318359375e+00, 5.053285598754883e+00, 5.148354530334473e+00, 5.301048755645752e+00, 5.460617542266846e+00, 5.378552913665774e+00, 4.294846534729004e+00, 4.647029399871826e+00, 4.870942115783691e+00, 5.00563383102417e+00, 5.134277820587158e+00, 5.318193912506104e+00, 5.912323474884033e+00, 6.703352451324463e+00, 6.602551937103271e+00, 6.378395080566406e+00, 6.190916538238525e+00, 6.166208744049072e+00, 6.210669994354248e+00, 6.313164710998535e+00, 5.020257949829102e+00, 5.315397262573242e+00, 5.545042514801025e+00, 5.701093196868896e+00]
+bui[2].ets.senMasFloHeaWat.m_flow=[1.08927321434021e+00, 1.79671745300293e+01, 2.180493927001953e+01, 2.436257743835449e+01, 6.269527435302734e+01, 2.408820152282715e+01, 2.268940734863281e+01, 4.808892059326177e+01, 3.597143936157227e+01, 1.38478536605835e+01, 4.960239791870117e+01, 4.817931365966797e+01, 4.954228210449219e+01, 1.829807662963867e+01, 2.160976600646974e+01, 2.646441268920898e+01, 3.060564613342285e+01, 3.349098205566407e+01, 6.827639770507812e+01, 3.554624938964844e+01, 3.220095443725586e+01, 3.054323577880859e+01, 5.051442337036133e+01, 1.225518703460693e+01, 2.809438896179199e+01, 5.317409515380859e+01, 4.992002868652344e+01, 4.562568283081055e+01, 2.233381652832034e+01, 2.70866813659668e+01, 3.095873832702637e+01, 3.376412200927734e+01, 6.460848999023438e+01, 5.740043640136719e+01, 3.204276275634761e+01, 2.018499183654785e+01, 4.938329315185547e+01, 1.857159018516541e+00, 8.976045608520508e+00, 4.913460922241211e+01, 4.122623443603516e+01, 4.769316482543943e+01, 1.271830272674561e+01, 2.12204704284668e+01, 2.748053169250488e+01, 3.230265426635742e+01, 4.174452972412109e+01, 6.948290252685547e+01, 3.733309173583984e+01, 3.744686126708984e+01, 6.812467956542969e+01, 4.009383392333984e+01, 3.430033111572266e+01, 6.969167327880859e+01, 6.451588439941406e+01, 6.713117218017578e+01, 3.236339187622077e+01, 4.067887496948239e+01, 4.413715362548828e+01, 4.494984817504883e+01, 4.589860153198242e+01, 7.919843292236328e+01, 4.356485366821289e+01, 4.658539581298828e+01, 6.344938659667969e+01, 7.287903594970703e+01, 4.337843704223633e+01, 6.541679382324219e+01, 7.678322601318349e+01, 7.428681945800778e+01, 5.679472351074219e+01, 4.793852615356445e+01, 4.80540771484375e+01, 5.048454284667969e+01, 5.250946044921875e+01, 8.578898620605469e+01, 6.258539581298828e+01, 5.381000137329102e+01, 5.290658187866211e+01, 8.296285247802734e+01, 4.635927581787109e+01, 5.155064010620175e+01, 8.298736572265628e+01, 7.782254028320312e+01, 7.942977142333984e+01, 4.961362457275391e+01, 5.193453216552734e+01, 5.390120315551758e+01, 5.5773681640625e+01, 7.331666564941406e+01, 8.418494415283203e+01, 5.589741897583008e+01, 5.661760330200195e+01, 8.764745330810547e+01, 4.510024261474609e+01, 4.644043350219727e+01, 8.080988311767578e+01, 7.410716247558594e+01, 7.663356018066406e+01, 4.206409072875977e+01, 4.870711517333984e+01]
+bui[3].ets.senMasFloHeaWat.m_flow=[1.571464985609055e-01, 3.230412244796753e+00, 5.182392120361328e+00, 6.593280792236328e+00, 2.161738204956055e+01, 2.092423820495605e+01, 1.699714851379395e+01, 1.32317943572998e+01, 1.135350513458252e+01, 1.133977508544922e+01, 1.281250953674316e+01, 8.509746551513672e+00, 9.117313385009766e+00, 1.957111001014709e+00, 3.884795904159553e+00, 6.625373840332031e+00, 8.757404327392578e+00, 1.01929931640625e+01, 2.232814598083496e+01, 2.534109878540039e+01, 2.126128768920898e+01, 1.440527629852295e+01, 9.157327651977539e+00, 9.801926612854004e+00, 1.258892250061035e+01, 9.759435653686523e+00, 7.819094657897949e+00, 7.94261360168457e+00, 2.098270654678362e+00, 5.30640172958374e+00, 7.742763996124268e+00, 9.434942245483398e+00, 1.957867813110352e+01, 2.520588684082031e+01, 2.155154418945309e+01, 1.237326335906982e+01, 5.170733451843262e+00, 2.42679238319397e+00, 5.916656970977783e+00, 7.440210819244385e+00, 2.655136823654175e+00, 6.752601623535141e+00, 4.422643035650253e-02, 1.735889673233032e+00, 5.596065998077393e+00, 8.393915176391602e+00, 1.230936813354492e+01, 2.56763973236084e+01, 2.587418174743652e+01, 2.428683853149414e+01, 2.128597831726074e+01, 2.105667877197266e+01, 2.123509979248047e+01, 2.14674072265625e+01, 1.599417304992676e+01, 1.693587684631348e+01, 8.378554344177269e+00, 1.151760768890379e+01, 1.328680610656738e+01, 1.380863475799561e+01, 1.442562866210938e+01, 2.724171829223633e+01, 2.835367202758789e+01, 2.81983699798584e+01, 2.631973648071289e+01, 2.53229866027832e+01, 2.554409027099609e+01, 2.493022537231445e+01, 2.016319656372065e+01, 1.887986946105956e+01, 1.503537082672119e+01, 1.444330596923828e+01, 1.472074890136719e+01, 1.580729675292969e+01, 1.658689308166504e+01, 2.72652473449707e+01, 2.915072250366211e+01, 2.89786376953125e+01, 2.69604549407959e+01, 2.554960250854492e+01, 2.565095138549805e+01, 2.554215812683106e+01, 2.405457687377935e+01, 2.057925224304199e+01, 2.137322425842285e+01, 1.531962299346924e+01, 1.640749931335449e+01, 1.718456077575684e+01, 1.774322700500488e+01, 2.335325241088867e+01, 2.87877368927002e+01, 2.761859512329102e+01, 2.687963485717773e+01, 2.64637622833252e+01, 2.188863945007324e+01, 2.151008987426758e+01, 2.30051097869873e+01, 1.944111633300781e+01, 2.046612548828125e+01, 1.29229907989502e+01, 1.555172920227051e+01]
 bui[1].ets.TChiWatSupSet=[2.911499938964844e+02, 2.911499938964844e+02]
 bui[1].ets.senTChiWatSup.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
 bui[2].ets.TChiWatSupSet=[2.911499938964844e+02, 2.911499938964844e+02]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Examples_VAVReheat_Guideline36.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Examples_VAVReheat_Guideline36.txt
index 2577f6b9d5a..67a4ddaf152 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Examples_VAVReheat_Guideline36.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Examples_VAVReheat_Guideline36.txt
@@ -1,36 +1,36 @@
-last-generated=2024-06-04
+last-generated=2024-06-28
 statistics-initialization=
 {
   "linear": "0",
-  "nonlinear": "1, 4, 0, 5, 2, 5, 2, 5, 2, 5, 2, 1, 1, 0, 0, 0, 1, 1",
+  "nonlinear": "1, 3, 0, 0, 5, 2, 5, 2, 5, 2, 5, 2, 1, 1, 0, 0, 0, 1, 1",
   "numerical Jacobians": "0"
 }
 statistics-simulation=
 {
-  "linear": "0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 4, 3, 0, 0, 0, 3, 0",
-  "nonlinear": "5, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 1",
+  "linear": "0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 4, 0, 0, 3, 0, 0, 0, 0, 0, 3, 0, 3, 0",
+  "nonlinear": "5, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1",
   "number of continuous time states": "177",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 1.728e+05]
-flo.sou.air.vol.T=[2.931499938964844e+02, 2.921277160644531e+02, 2.920469665527344e+02, 2.920375061035156e+02, 2.920676879882812e+02, 2.919853210449219e+02, 2.919112854003906e+02, 2.918203125e+02, 2.916888427734375e+02, 2.916121215820312e+02, 2.916755676269531e+02, 2.939568481445312e+02, 2.930467834472656e+02, 2.924793701171875e+02, 2.927867431640625e+02, 2.927446594238281e+02, 2.928523254394531e+02, 2.931340942382812e+02, 2.937293395996094e+02, 2.932130737304688e+02, 2.931010131835938e+02, 2.932698364257812e+02, 2.932707824707031e+02, 2.934820251464844e+02, 2.938499450683594e+02, 2.940853271484375e+02, 2.940903015136719e+02, 2.941751708984375e+02, 2.946042785644531e+02, 2.947616271972656e+02, 2.948545837402344e+02, 2.948762817382812e+02, 2.948702392578125e+02, 2.948452453613281e+02, 2.948195495605469e+02, 2.948076171875e+02, 2.947294311523438e+02, 2.944900207519531e+02, 2.942246704101562e+02, 2.939064636230469e+02, 2.936614990234375e+02, 2.934823913574219e+02, 2.934639282226562e+02, 2.936396179199219e+02, 2.936488952636719e+02, 2.935104064941406e+02, 2.931743774414062e+02, 2.930562438964844e+02, 2.929590759277344e+02, 2.928849792480469e+02, 2.928208618164062e+02, 2.927605590820312e+02, 2.927202758789062e+02, 2.926012573242188e+02, 2.924842529296875e+02, 2.924425659179688e+02, 2.923933410644531e+02, 2.923888549804688e+02, 2.924735412597656e+02, 2.924199523925781e+02, 2.92177978515625e+02, 2.921342163085938e+02, 2.926333618164062e+02, 2.931618347167969e+02, 2.930527954101562e+02, 2.931668701171875e+02, 2.93158203125e+02, 2.931998901367188e+02, 2.932134704589844e+02, 2.932715759277344e+02, 2.931920471191406e+02, 2.9320947265625e+02, 2.932914428710938e+02, 2.933690795898438e+02, 2.935093994140625e+02, 2.937014465332031e+02, 2.936845703125e+02, 2.9376416015625e+02, 2.94000732421875e+02, 2.939927368164062e+02, 2.940057678222656e+02, 2.940290832519531e+02, 2.940416870117188e+02, 2.94046630859375e+02, 2.940238952636719e+02, 2.934440307617188e+02, 2.932797546386719e+02, 2.935112915039062e+02, 2.933454895019531e+02, 2.931187133789062e+02, 2.9290576171875e+02, 2.928275451660156e+02, 2.927649230957031e+02, 2.927405395507812e+02, 2.927926025390625e+02, 2.92817138671875e+02, 2.927137756347656e+02, 2.928190307617188e+02, 2.928566284179688e+02, 2.927897033691406e+02, 2.92643798828125e+02]
-flo.eas.air.vol.T=[2.931499938964844e+02, 2.922457580566406e+02, 2.921407470703125e+02, 2.920317993164062e+02, 2.919625549316406e+02, 2.919295349121094e+02, 2.919173583984375e+02, 2.918602600097656e+02, 2.917684020996094e+02, 2.916989135742188e+02, 2.917955017089844e+02, 2.943519287109375e+02, 2.936081237792969e+02, 2.925870361328125e+02, 2.929857788085938e+02, 2.931815795898438e+02, 2.932289733886719e+02, 2.934244079589844e+02, 2.932842102050781e+02, 2.932694702148438e+02, 2.931747131347656e+02, 2.932329406738281e+02, 2.931268005371094e+02, 2.931735229492188e+02, 2.932153930664062e+02, 2.932719116210938e+02, 2.932388305664062e+02, 2.932850341796875e+02, 2.935539245605469e+02, 2.937326049804688e+02, 2.93815673828125e+02, 2.938402709960938e+02, 2.938583374023438e+02, 2.938714294433594e+02, 2.938831787109375e+02, 2.939013977050781e+02, 2.93852294921875e+02, 2.936385498046875e+02, 2.933470458984375e+02, 2.930711364746094e+02, 2.929932861328125e+02, 2.9291845703125e+02, 2.929037170410156e+02, 2.929067993164062e+02, 2.929315185546875e+02, 2.928046875e+02, 2.927909240722656e+02, 2.927002258300781e+02, 2.926147155761719e+02, 2.925596008300781e+02, 2.925159301757812e+02, 2.924845581054688e+02, 2.9247705078125e+02, 2.923876953125e+02, 2.923106994628906e+02, 2.922811889648438e+02, 2.92248779296875e+02, 2.923013916015625e+02, 2.922002868652344e+02, 2.921875e+02, 2.921446533203125e+02, 2.920838012695312e+02, 2.927315063476562e+02, 2.927926635742188e+02, 2.930264587402344e+02, 2.931650390625e+02, 2.931903686523438e+02, 2.931942749023438e+02, 2.932727966308594e+02, 2.932960510253906e+02, 2.931871032714844e+02, 2.932149658203125e+02, 2.933114318847656e+02, 2.933932800292969e+02, 2.934391479492188e+02, 2.934996032714844e+02, 2.934645385742188e+02, 2.93523681640625e+02, 2.937406311035156e+02, 2.937427062988281e+02, 2.937635803222656e+02, 2.937942199707031e+02, 2.938218688964844e+02, 2.937469482421875e+02, 2.93611572265625e+02, 2.937760925292969e+02, 2.936802978515625e+02, 2.9335888671875e+02, 2.932250061035156e+02, 2.930655517578125e+02, 2.928569946289062e+02, 2.92834716796875e+02, 2.928189086914062e+02, 2.927208251953125e+02, 2.926417236328125e+02, 2.926207275390625e+02, 2.926466064453125e+02, 2.928141784667969e+02, 2.928464660644531e+02, 2.928067321777344e+02, 2.927291259765625e+02]
-flo.nor.air.vol.T=[2.931499938964844e+02, 2.923236694335938e+02, 2.922370300292969e+02, 2.921404724121094e+02, 2.920262145996094e+02, 2.91964599609375e+02, 2.919265747070312e+02, 2.918673706054688e+02, 2.917843627929688e+02, 2.917125244140625e+02, 2.917303161621094e+02, 2.93969482421875e+02, 2.930075378417969e+02, 2.925358276367188e+02, 2.929049987792969e+02, 2.928662414550781e+02, 2.928543701171875e+02, 2.929853210449219e+02, 2.933885803222656e+02, 2.933962707519531e+02, 2.927950134277344e+02, 2.931390380859375e+02, 2.931786804199219e+02, 2.931878662109375e+02, 2.9318798828125e+02, 2.93187255859375e+02, 2.931608581542969e+02, 2.931741027832031e+02, 2.932166748046875e+02, 2.933669738769531e+02, 2.934517822265625e+02, 2.934891662597656e+02, 2.935190124511719e+02, 2.93542236328125e+02, 2.935628967285156e+02, 2.935887451171875e+02, 2.935502319335938e+02, 2.933599243164062e+02, 2.931052551269531e+02, 2.930140686035156e+02, 2.927209167480469e+02, 2.926513977050781e+02, 2.926349487304688e+02, 2.926429748535156e+02, 2.926647033691406e+02, 2.926000061035156e+02, 2.925102233886719e+02, 2.924499206542969e+02, 2.923836975097656e+02, 2.923487548828125e+02, 2.923166198730469e+02, 2.922693481445312e+02, 2.922339477539062e+02, 2.9216943359375e+02, 2.921274108886719e+02, 2.921011657714844e+02, 2.9205615234375e+02, 2.920452270507812e+02, 2.920252380371094e+02, 2.92012939453125e+02, 2.919350280761719e+02, 2.919185485839844e+02, 2.925341491699219e+02, 2.928753967285156e+02, 2.92806396484375e+02, 2.930430297851562e+02, 2.931838073730469e+02, 2.932937316894531e+02, 2.934239501953125e+02, 2.932818908691406e+02, 2.931952514648438e+02, 2.931825561523438e+02, 2.931942138671875e+02, 2.932284545898438e+02, 2.932789306640625e+02, 2.933453979492188e+02, 2.933180847167969e+02, 2.93382568359375e+02, 2.936026916503906e+02, 2.936085205078125e+02, 2.936309204101562e+02, 2.936629638671875e+02, 2.936911010742188e+02, 2.937117309570312e+02, 2.937049865722656e+02, 2.936709594726562e+02, 2.935724792480469e+02, 2.933572082519531e+02, 2.931558532714844e+02, 2.930519714355469e+02, 2.928486328125e+02, 2.928031311035156e+02, 2.927670288085938e+02, 2.927189025878906e+02, 2.926309204101562e+02, 2.925744018554688e+02, 2.926487426757812e+02, 2.9266650390625e+02, 2.927059020996094e+02, 2.926658630371094e+02, 2.924699401855469e+02]
-flo.wes.air.vol.T=[2.931499938964844e+02, 2.920885925292969e+02, 2.920011596679688e+02, 2.919342346191406e+02, 2.918894958496094e+02, 2.918588562011719e+02, 2.918583984375e+02, 2.918036804199219e+02, 2.917080993652344e+02, 2.9163623046875e+02, 2.916146850585938e+02, 2.940826416015625e+02, 2.930517578125e+02, 2.925759887695312e+02, 2.929368896484375e+02, 2.929390258789062e+02, 2.929336547851562e+02, 2.930714416503906e+02, 2.934539794921875e+02, 2.932655029296875e+02, 2.928904113769531e+02, 2.930054321289062e+02, 2.932572937011719e+02, 2.932372131347656e+02, 2.931445617675781e+02, 2.931405029296875e+02, 2.931360473632812e+02, 2.931781005859375e+02, 2.932538757324219e+02, 2.932736206054688e+02, 2.934212951660156e+02, 2.935434875488281e+02, 2.936895446777344e+02, 2.937145080566406e+02, 2.937242736816406e+02, 2.937420349121094e+02, 2.93699462890625e+02, 2.935054321289062e+02, 2.932444763183594e+02, 2.930258483886719e+02, 2.928143615722656e+02, 2.927602844238281e+02, 2.927472229003906e+02, 2.928027954101562e+02, 2.928131103515625e+02, 2.927522277832031e+02, 2.926103515625e+02, 2.92555908203125e+02, 2.925127258300781e+02, 2.924899291992188e+02, 2.924683532714844e+02, 2.924085388183594e+02, 2.923504333496094e+02, 2.923045043945312e+02, 2.923134460449219e+02, 2.922814025878906e+02, 2.92202392578125e+02, 2.921538391113281e+02, 2.921840209960938e+02, 2.921640319824219e+02, 2.920563659667969e+02, 2.921046752929688e+02, 2.926220397949219e+02, 2.927492065429688e+02, 2.928377990722656e+02, 2.931233825683594e+02, 2.932569274902344e+02, 2.932384033203125e+02, 2.933156433105469e+02, 2.933097229003906e+02, 2.932142639160156e+02, 2.931893005371094e+02, 2.932552795410156e+02, 2.933375549316406e+02, 2.933888854980469e+02, 2.934558410644531e+02, 2.934292907714844e+02, 2.934973449707031e+02, 2.937247924804688e+02, 2.937392578125e+02, 2.937699584960938e+02, 2.938083801269531e+02, 2.938381958007812e+02, 2.938572082519531e+02, 2.938470153808594e+02, 2.93805908203125e+02, 2.937019653320312e+02, 2.934842529296875e+02, 2.9328369140625e+02, 2.930821533203125e+02, 2.929730834960938e+02, 2.929268493652344e+02, 2.928858032226562e+02, 2.928490295410156e+02, 2.927843627929688e+02, 2.927499389648438e+02, 2.927850036621094e+02, 2.928385009765625e+02, 2.928440246582031e+02, 2.92792724609375e+02, 2.926430969238281e+02]
-flo.cor.air.vol.T=[2.931499938964844e+02, 2.928221130371094e+02, 2.927656555175781e+02, 2.927209167480469e+02, 2.926880493164062e+02, 2.926540832519531e+02, 2.926307067871094e+02, 2.925934143066406e+02, 2.9253466796875e+02, 2.924859313964844e+02, 2.925057373046875e+02, 2.936622009277344e+02, 2.933919372558594e+02, 2.930375061035156e+02, 2.931718444824219e+02, 2.931468505859375e+02, 2.931573486328125e+02, 2.932129821777344e+02, 2.932007141113281e+02, 2.935195007324219e+02, 2.934573059082031e+02, 2.934929504394531e+02, 2.93535400390625e+02, 2.936041564941406e+02, 2.936683349609375e+02, 2.937433166503906e+02, 2.937148132324219e+02, 2.937655944824219e+02, 2.940059509277344e+02, 2.941527099609375e+02, 2.94251708984375e+02, 2.943041076660156e+02, 2.943504943847656e+02, 2.943815002441406e+02, 2.944080810546875e+02, 2.9443701171875e+02, 2.943934326171875e+02, 2.941884155273438e+02, 2.939030456542969e+02, 2.936100158691406e+02, 2.936039428710938e+02, 2.935626525878906e+02, 2.935404968261719e+02, 2.935353698730469e+02, 2.935387268066406e+02, 2.935018920898438e+02, 2.934410400390625e+02, 2.933944702148438e+02, 2.933489379882812e+02, 2.933150024414062e+02, 2.932852783203125e+02, 2.932528991699219e+02, 2.932248840332031e+02, 2.931822509765625e+02, 2.931413879394531e+02, 2.931161193847656e+02, 2.930807495117188e+02, 2.930636291503906e+02, 2.930536499023438e+02, 2.930355834960938e+02, 2.929764099121094e+02, 2.9294482421875e+02, 2.934089965820312e+02, 2.935302124023438e+02, 2.931185913085938e+02, 2.931607666015625e+02, 2.931668090820312e+02, 2.931657409667969e+02, 2.935957946777344e+02, 2.939425048828125e+02, 2.939370727539062e+02, 2.939533386230469e+02, 2.94032958984375e+02, 2.940992126464844e+02, 2.9413720703125e+02, 2.941936950683594e+02, 2.941349182128906e+02, 2.941776733398438e+02, 2.944124450683594e+02, 2.944349060058594e+02, 2.944675598144531e+02, 2.945067138671875e+02, 2.94545654296875e+02, 2.945702514648438e+02, 2.945628051757812e+02, 2.945130920410156e+02, 2.943997192382812e+02, 2.941797790527344e+02, 2.939812622070312e+02, 2.93774169921875e+02, 2.937356872558594e+02, 2.936923828125e+02, 2.936571044921875e+02, 2.936175537109375e+02, 2.935797729492188e+02, 2.935542297363281e+02, 2.935437622070312e+02, 2.935743103027344e+02, 2.935833435058594e+02, 2.935558166503906e+02, 2.934727783203125e+02]
-hvac.VAVBox[1].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 3.00081787109375e+02, 3.034493713378906e+02, 2.9902294921875e+02, 3.035533447265625e+02, 3.038892517089844e+02, 3.018009643554688e+02, 3.012509155273438e+02, 3.013980102539062e+02, 3.035107727050781e+02, 2.934010314941406e+02, 2.952901916503906e+02, 2.932965087890625e+02, 2.876617126464844e+02, 2.880506286621094e+02, 2.885172119140625e+02, 2.88966064453125e+02, 2.892743530273438e+02, 2.894991149902344e+02, 2.898684692382812e+02, 2.910851135253906e+02, 2.91296630859375e+02, 2.912509765625e+02, 2.91205810546875e+02, 2.911772155761719e+02, 2.911629638671875e+02, 2.911582946777344e+02, 2.911293029785156e+02, 2.910433959960938e+02, 2.910064392089844e+02, 2.904263305664062e+02, 2.89894775390625e+02, 2.89894775390625e+02, 2.89894775390625e+02, 2.89894775390625e+02, 2.89894775390625e+02, 2.89894775390625e+02, 2.89894775390625e+02, 2.89894775390625e+02, 2.89894775390625e+02, 2.89894775390625e+02, 2.89894775390625e+02, 2.89894775390625e+02, 2.89894775390625e+02, 2.89894775390625e+02, 2.89894775390625e+02, 2.89894775390625e+02, 2.89894775390625e+02, 2.89894775390625e+02, 2.89894775390625e+02, 2.89894775390625e+02, 2.89894775390625e+02, 2.89894775390625e+02, 3.02754150390625e+02, 3.002231140136719e+02, 3.018514709472656e+02, 3.014965209960938e+02, 3.011384582519531e+02, 3.005865478515625e+02, 2.98153564453125e+02, 2.942036743164063e+02, 2.915766906738281e+02, 2.908316650390625e+02, 2.914946899414062e+02, 2.915467834472656e+02, 2.913451538085938e+02, 2.912427673339844e+02, 2.9118017578125e+02, 2.911694030761719e+02, 2.910878601074219e+02, 2.909594116210938e+02, 2.91001708984375e+02, 2.910689697265625e+02, 2.911936950683594e+02, 2.912908020019531e+02, 2.912320556640625e+02, 2.911507568359375e+02, 2.910657958984375e+02, 2.9095947265625e+02, 2.910690612792969e+02, 2.911002502441406e+02, 2.917105712890625e+02, 2.917105712890625e+02, 2.917105712890625e+02, 2.917105712890625e+02, 2.917105712890625e+02, 2.917105712890625e+02, 2.917105712890625e+02, 2.917105712890625e+02, 2.917105712890625e+02, 2.917105712890625e+02, 2.917105712890625e+02]
-hvac.VAVBox[2].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 3.00351806640625e+02, 3.045024108886719e+02, 3.055538330078125e+02, 3.000387878417969e+02, 3.040322875976562e+02, 3.032380065917969e+02, 3.029374389648438e+02, 3.030913391113281e+02, 2.972207336425781e+02, 2.923171081542969e+02, 2.908606262207031e+02, 2.904880676269531e+02, 2.882044982910156e+02, 2.880503845214844e+02, 2.885169677734375e+02, 2.889658203125e+02, 2.892742309570312e+02, 2.894989929199219e+02, 2.898682861328125e+02, 2.910846557617188e+02, 2.91296630859375e+02, 2.912510070800781e+02, 2.912058410644531e+02, 2.9117724609375e+02, 2.911629638671875e+02, 2.911582946777344e+02, 2.911293334960938e+02, 2.9104345703125e+02, 2.910064392089844e+02, 2.918681030273438e+02, 2.9184814453125e+02, 2.9184814453125e+02, 2.9184814453125e+02, 2.9184814453125e+02, 2.9184814453125e+02, 2.9184814453125e+02, 2.9184814453125e+02, 2.9184814453125e+02, 2.9184814453125e+02, 2.9184814453125e+02, 2.9184814453125e+02, 2.9184814453125e+02, 2.9184814453125e+02, 2.9184814453125e+02, 2.9184814453125e+02, 2.9184814453125e+02, 2.9184814453125e+02, 2.9184814453125e+02, 2.9184814453125e+02, 2.9184814453125e+02, 2.9184814453125e+02, 2.9184814453125e+02, 3.0295361328125e+02, 2.947950134277344e+02, 3.040116577148438e+02, 3.04142578125e+02, 3.039295349121094e+02, 3.031903991699219e+02, 2.998179321289062e+02, 2.941615600585938e+02, 2.908409118652344e+02, 2.908316040039062e+02, 2.91494384765625e+02, 2.915469055175781e+02, 2.913452453613281e+02, 2.912427978515625e+02, 2.911802062988281e+02, 2.911694030761719e+02, 2.910879821777344e+02, 2.909594116210938e+02, 2.910016784667969e+02, 2.910689392089844e+02, 2.91193603515625e+02, 2.912908020019531e+02, 2.912320861816406e+02, 2.911507873535156e+02, 2.910658569335938e+02, 2.9095947265625e+02, 2.910689697265625e+02, 2.9281884765625e+02, 2.927143859863281e+02, 2.927143859863281e+02, 2.927143859863281e+02, 2.927143859863281e+02, 2.927143859863281e+02, 2.927143859863281e+02, 2.927143859863281e+02, 2.927143859863281e+02, 2.927143859863281e+02, 2.927143859863281e+02, 2.927143859863281e+02]
-hvac.VAVBox[3].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 3.002173156738281e+02, 3.035066528320312e+02, 2.996688232421875e+02, 3.026042785644531e+02, 3.040022583007812e+02, 3.018407287597656e+02, 3.012637634277344e+02, 3.014041748046875e+02, 3.023311767578125e+02, 3.007242126464844e+02, 2.937994995117188e+02, 2.989773864746094e+02, 2.983292846679688e+02, 2.970152587890625e+02, 2.955646057128906e+02, 2.94151123046875e+02, 2.942279052734375e+02, 2.934710998535156e+02, 2.898684692382812e+02, 2.910851135253906e+02, 2.91296630859375e+02, 2.912509765625e+02, 2.91205810546875e+02, 2.911772155761719e+02, 2.911629638671875e+02, 2.911582946777344e+02, 2.911293029785156e+02, 2.910433959960938e+02, 2.910064392089844e+02, 2.953613891601562e+02, 2.932407531738281e+02, 2.932407531738281e+02, 2.932407531738281e+02, 2.932407531738281e+02, 2.932407531738281e+02, 2.932407531738281e+02, 2.932407531738281e+02, 2.932407531738281e+02, 2.932407531738281e+02, 2.932407531738281e+02, 2.932407531738281e+02, 2.932407531738281e+02, 2.932407531738281e+02, 2.932407531738281e+02, 2.932407531738281e+02, 2.932407531738281e+02, 2.932407531738281e+02, 2.932407531738281e+02, 2.932407531738281e+02, 2.932407531738281e+02, 2.932407531738281e+02, 2.932407531738281e+02, 3.028385925292969e+02, 2.944474792480469e+02, 3.040479125976562e+02, 3.039420166015625e+02, 3.037332458496094e+02, 3.039012145996094e+02, 3.042174682617188e+02, 2.978413696289063e+02, 2.951009521484375e+02, 2.937685241699219e+02, 2.923878784179688e+02, 2.915467834472656e+02, 2.913451538085938e+02, 2.912427673339844e+02, 2.9118017578125e+02, 2.911694030761719e+02, 2.910878601074219e+02, 2.909594116210938e+02, 2.91001708984375e+02, 2.910689697265625e+02, 2.911936950683594e+02, 2.912908020019531e+02, 2.912320556640625e+02, 2.911507568359375e+02, 2.910657958984375e+02, 2.9095947265625e+02, 2.910690612792969e+02, 2.937086791992188e+02, 2.929392700195312e+02, 2.929392700195312e+02, 2.929392700195312e+02, 2.929392700195312e+02, 2.929392700195312e+02, 2.929392700195312e+02, 2.929392700195312e+02, 2.929392700195312e+02, 2.929392700195312e+02, 2.929392700195312e+02, 2.929392700195312e+02]
-hvac.VAVBox[4].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.999400329589844e+02, 3.038309020996094e+02, 3.022452087402344e+02, 3.02474365234375e+02, 3.039946899414062e+02, 3.0188330078125e+02, 3.012772216796875e+02, 3.014105529785156e+02, 3.027098999023438e+02, 3.002046813964844e+02, 2.953934936523438e+02, 3.025515441894531e+02, 3.027176513671875e+02, 2.979258117675781e+02, 2.966334228515625e+02, 2.97079833984375e+02, 2.985075378417969e+02, 2.980306091308594e+02, 2.938043212890625e+02, 2.910846557617188e+02, 2.91296630859375e+02, 2.912510070800781e+02, 2.912058410644531e+02, 2.9117724609375e+02, 2.911629638671875e+02, 2.911582946777344e+02, 2.911293334960938e+02, 2.9104345703125e+02, 2.910064392089844e+02, 2.932975463867188e+02, 2.929513244628906e+02, 2.929513244628906e+02, 2.929513244628906e+02, 2.929513244628906e+02, 2.929513244628906e+02, 2.929513244628906e+02, 2.929513244628906e+02, 2.929513244628906e+02, 2.929513244628906e+02, 2.929513244628906e+02, 2.929513244628906e+02, 2.929513244628906e+02, 2.929513244628906e+02, 2.929513244628906e+02, 2.929513244628906e+02, 2.929513244628906e+02, 2.929513244628906e+02, 2.929513244628906e+02, 2.929513244628906e+02, 2.929513244628906e+02, 2.929513244628906e+02, 2.929513244628906e+02, 3.029152526855469e+02, 2.949486694335938e+02, 3.040402221679688e+02, 3.041112670898438e+02, 3.041683654785156e+02, 3.041749877929688e+02, 3.031263427734374e+02, 2.969228515625001e+02, 2.932849731445312e+02, 2.91468994140625e+02, 2.91494384765625e+02, 2.915469055175781e+02, 2.913452453613281e+02, 2.912427978515625e+02, 2.911802062988281e+02, 2.911694030761719e+02, 2.910879821777344e+02, 2.909594116210938e+02, 2.910016784667969e+02, 2.910689392089844e+02, 2.91193603515625e+02, 2.912908020019531e+02, 2.912320861816406e+02, 2.911507873535156e+02, 2.910658569335938e+02, 2.9095947265625e+02, 2.910689697265625e+02, 2.918453979492188e+02, 2.92299560546875e+02, 2.92299560546875e+02, 2.92299560546875e+02, 2.92299560546875e+02, 2.92299560546875e+02, 2.92299560546875e+02, 2.92299560546875e+02, 2.92299560546875e+02, 2.92299560546875e+02, 2.92299560546875e+02, 2.92299560546875e+02]
-hvac.VAVBox[5].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 3.020520629882812e+02, 2.961254577636719e+02, 2.988206481933594e+02, 2.941813354492188e+02, 2.944034729003906e+02, 2.935268249511719e+02, 2.935842895507812e+02, 2.928834533691406e+02, 2.881960754394531e+02, 2.88905517578125e+02, 2.882654418945312e+02, 2.876324768066406e+02, 2.876616516113281e+02, 2.880506286621094e+02, 2.885172119140625e+02, 2.88966064453125e+02, 2.892743530273438e+02, 2.894991149902344e+02, 2.898684692382812e+02, 2.910851135253906e+02, 2.91296630859375e+02, 2.912509765625e+02, 2.91205810546875e+02, 2.911772155761719e+02, 2.911629638671875e+02, 2.911582946777344e+02, 2.911293029785156e+02, 2.910433959960938e+02, 2.910064392089844e+02, 2.904263305664062e+02, 2.898947448730469e+02, 2.898947448730469e+02, 2.898947448730469e+02, 2.898947448730469e+02, 2.898947448730469e+02, 2.898947448730469e+02, 2.898947448730469e+02, 2.898947448730469e+02, 2.898947448730469e+02, 2.898947448730469e+02, 2.898947448730469e+02, 2.898947448730469e+02, 2.898947448730469e+02, 2.898947448730469e+02, 2.898947448730469e+02, 2.898947448730469e+02, 2.898947448730469e+02, 2.898947448730469e+02, 2.898947448730469e+02, 2.898947448730469e+02, 2.898947448730469e+02, 2.898947448730469e+02, 2.973950805664062e+02, 2.941128845214844e+02, 2.895459289550781e+02, 2.912164611816406e+02, 2.899438171386719e+02, 2.902067565917969e+02, 2.906566162109375e+02, 2.908680725097656e+02, 2.908408813476562e+02, 2.908316650390625e+02, 2.914946899414062e+02, 2.915467834472656e+02, 2.913451538085938e+02, 2.912427673339844e+02, 2.9118017578125e+02, 2.911694030761719e+02, 2.910878601074219e+02, 2.909594116210938e+02, 2.91001708984375e+02, 2.910689697265625e+02, 2.911936950683594e+02, 2.912908020019531e+02, 2.912320556640625e+02, 2.911507568359375e+02, 2.910657958984375e+02, 2.9095947265625e+02, 2.910690612792969e+02, 2.911002502441406e+02, 2.90905029296875e+02, 2.90905029296875e+02, 2.90905029296875e+02, 2.90905029296875e+02, 2.90905029296875e+02, 2.90905029296875e+02, 2.90905029296875e+02, 2.90905029296875e+02, 2.90905029296875e+02, 2.90905029296875e+02, 2.90905029296875e+02]
-hvac.VAVBox[1].vav.m_flow=[9.356216973052667e-13, 2.082084366028525e-10, 2.116087027825841e-10, 1.943755989497475e-10, 1.64127003654535e-10, 1.300126117875777e-10, 9.221048230534379e-11, 9.369272718773304e-11, 1.066888244416475e-10, 1.113793640650229e-10, 2.616803906857967e-02, 6.856716871261597e-01, 2.057431042194366e-01, 1.961365938186646e-01, 2.710671424865723e-01, 3.014640510082245e-01, 3.282763361930847e-01, 3.555094003677369e-01, 2.988412380218506e-01, 2.257382273674011e-01, 1.984913200139999e-01, 1.933717727661133e-01, 1.9493268430233e-01, 1.971178352832794e-01, 1.983120292425156e-01, 1.98693573474884e-01, 1.986953169107437e-01, 1.98622539639473e-01, 1.986414045095444e-01, 1.986706256866455e-01, 1.985365599393845e-01, 1.984724849462509e-01, 1.98462188243866e-01, 1.984698623418808e-01, 1.984887570142746e-01, 1.984943896532059e-01, 1.985010653734207e-01, 1.985038816928864e-01, 1.985053569078445e-01, 1.98463499546051e-01, 1.456949560996179e-10, 1.803267396516262e-10, 9.284759072691884e-11, 9.872195942672857e-12, 4.470179651785977e-13, 8.044077903779367e-11, 1.40074021826031e-10, 1.764125789893711e-10, 2.001033921894546e-10, 1.802132748585095e-10, 1.669582944119341e-10, 1.687877060341236e-10, 1.178898645370907e-10, 1.90307089531494e-10, 1.711124852921131e-10, 1.679583416791532e-10, 1.973647634212487e-10, 1.191023807356482e-10, 8.865107259392602e-11, 9.249267324262789e-11, 3.276061921742013e-10, 2.093255846435937e-10, 1.779473572969437e-01, 2.14253231883049e-01, 1.923502832651138e-01, 1.911090463399887e-01, 1.99891209602356e-01, 2.048559784889221e-01, 2.061452120542526e-01, 1.995892673730851e-01, 1.963666677474976e-01, 1.964797228574753e-01, 1.975390613079071e-01, 1.982549577951431e-01, 1.985544115304947e-01, 1.986141800880432e-01, 1.985679268836975e-01, 1.985143721103668e-01, 1.985032558441162e-01, 1.984938681125641e-01, 1.984946131706238e-01, 1.985116302967072e-01, 1.985196024179459e-01, 1.985201239585876e-01, 1.985146701335907e-01, 1.985276639461517e-01, 1.985168755054474e-01, 1.984815746545792e-01, 1.98534220457077e-01, 1.984684616327286e-01, 1.259130716357859e-10, 1.159868451283685e-10, 1.167163865556375e-10, 1.332481486260306e-10, 2.39024605663829e-10, 3.565416573092506e-10, 2.696543821567587e-10, 2.865929542295031e-11, 2.105387451160035e-18, 4.120882107772061e-11, 9.926707372764909e-11]
-hvac.VAVBox[2].vav.m_flow=[8.884889894124337e-13, 1.9771977111116e-10, 2.009487437559798e-10, 1.845837788172489e-10, 1.558589785011222e-10, 1.234631286095578e-10, 8.756530917031213e-11, 8.897287767650754e-11, 1.013142902905884e-10, 1.057685328209601e-10, 2.484980411827564e-02, 5.195530652999878e-01, 2.923802137374878e-01, 1.598767042160034e-01, 1.89709708094597e-01, 2.33176663517952e-01, 2.453558743000031e-01, 2.040648460388182e-01, 1.823644638061523e-01, 1.738217324018478e-01, 1.599540412425995e-01, 1.570098698139191e-01, 1.587007194757462e-01, 1.607396304607391e-01, 1.618447154760361e-01, 1.622032225131989e-01, 1.622113138437271e-01, 1.621474027633667e-01, 1.62163645029068e-01, 1.621905565261841e-01, 1.620707213878632e-01, 1.620122045278549e-01, 1.620022505521774e-01, 1.620088219642639e-01, 1.620258241891861e-01, 1.620309948921204e-01, 1.620370298624039e-01, 1.620396375656128e-01, 1.620409786701202e-01, 1.620038002729416e-01, 1.383554520950625e-10, 1.712426311861748e-10, 8.817031826868771e-11, 9.374875875600708e-12, 4.244990589510195e-13, 7.638851357016918e-11, 1.330176802039063e-10, 1.67525660010881e-10, 1.900230250928558e-10, 1.711348840416349e-10, 1.585476333554325e-10, 1.602848825887904e-10, 1.119510734115536e-10, 1.807202026915533e-10, 1.624925471954697e-10, 1.594973042529093e-10, 1.874223554132474e-10, 1.131024926492871e-10, 8.418520047737132e-11, 8.783328231398713e-11, 3.111027546687239e-10, 1.987806447223406e-10, 1.344607323408127e-01, 1.744508743286133e-01, 1.563311517238617e-01, 1.686039566993713e-01, 1.682555973529816e-01, 1.687359213829041e-01, 1.691292226314544e-01, 1.631373167037964e-01, 1.601536124944687e-01, 1.602107435464859e-01, 1.611546576023102e-01, 1.618046313524246e-01, 1.62080392241478e-01, 1.621379554271698e-01, 1.620978564023972e-01, 1.620497405529022e-01, 1.620392799377441e-01, 1.620308309793472e-01, 1.62031278014183e-01, 1.62046492099762e-01, 1.620537638664246e-01, 1.620543450117111e-01, 1.620495915412903e-01, 1.620588302612305e-01, 1.620518118143082e-01, 1.620184481143951e-01, 1.620666533708572e-01, 1.620085686445236e-01, 1.195700899403462e-10, 1.101439148221139e-10, 1.108367078672678e-10, 1.265356708302079e-10, 2.269835430723788e-10, 3.385805802391673e-10, 2.560703316056845e-10, 2.721555966700429e-11, 2.035818252921875e-18, 3.913289484125393e-11, 9.426641411902636e-11]
-hvac.VAVBox[3].vav.m_flow=[9.356216973052667e-13, 2.082084366028525e-10, 2.116087027825841e-10, 1.943755989497475e-10, 1.64127003654535e-10, 1.300126117875777e-10, 9.221048230534379e-11, 9.369272718773304e-11, 1.066888244416475e-10, 1.113793640650229e-10, 2.616803906857967e-02, 6.768786907196045e-01, 2.875776290893555e-01, 1.927688121795654e-01, 2.623070776462556e-01, 2.997875213623047e-01, 3.276881277561188e-01, 3.551927506923676e-01, 3.592482209205627e-01, 2.482911497354507e-01, 2.022984772920609e-01, 1.940665990114212e-01, 1.950648576021194e-01, 1.971433907747269e-01, 1.983170062303543e-01, 1.986945420503616e-01, 1.986955106258392e-01, 1.986225843429565e-01, 1.986414045095444e-01, 1.986706256866455e-01, 1.985365599393845e-01, 1.984724849462509e-01, 1.98462188243866e-01, 1.984698623418808e-01, 1.984887570142746e-01, 1.984943896532059e-01, 1.985010653734207e-01, 1.985038816928864e-01, 1.985053569078445e-01, 1.98463499546051e-01, 1.456949560996179e-10, 1.803267396516262e-10, 9.284759072691884e-11, 9.872195942672857e-12, 4.47017992283652e-13, 8.044077903779367e-11, 1.40074021826031e-10, 1.764125789893711e-10, 2.001033921894546e-10, 1.802132748585095e-10, 1.669582944119341e-10, 1.687877060341236e-10, 1.178898645370907e-10, 1.90307089531494e-10, 1.711124852921131e-10, 1.679583416791532e-10, 1.973647634212487e-10, 1.191023807356482e-10, 8.865107259392602e-11, 9.249267324262789e-11, 3.276061921742013e-10, 2.093255846435937e-10, 2.553754448890686e-01, 2.720655798912048e-01, 2.293528467416763e-01, 2.976652979850769e-01, 3.319327533245087e-01, 3.300190269947052e-01, 2.558463215827933e-01, 2.083384096622469e-01, 1.979941576719284e-01, 1.96790024638176e-01, 1.975988149642944e-01, 1.982665061950684e-01, 1.98556661605835e-01, 1.986146122217178e-01, 1.985680013895035e-01, 1.98514387011528e-01, 1.985032707452774e-01, 1.984938681125641e-01, 1.984946131706238e-01, 1.985116302967072e-01, 1.985196024179459e-01, 1.985201239585876e-01, 1.985146701335907e-01, 1.985276639461517e-01, 1.985168755054474e-01, 1.984815746545792e-01, 1.98534220457077e-01, 1.984684616327286e-01, 1.259130716357859e-10, 1.159868451283685e-10, 1.167163865556375e-10, 1.332481486260306e-10, 2.39024605663829e-10, 3.565416573092506e-10, 2.696543821567587e-10, 2.865929542295031e-11, 2.160504563325974e-18, 4.120882107772061e-11, 9.926707372764909e-11]
-hvac.VAVBox[4].vav.m_flow=[6.910469917652262e-13, 1.537820426555925e-10, 1.562934642818092e-10, 1.435651597603282e-10, 1.212236422354351e-10, 9.602687395249276e-11, 6.810634695098017e-11, 6.920113093666914e-11, 7.880000124638187e-11, 8.226441750025515e-11, 1.932762563228607e-02, 4.650067389011383e-01, 2.314656972885132e-01, 1.274691969156265e-01, 1.862846910953523e-01, 2.20103919506073e-01, 2.415748238563538e-01, 2.621018290519715e-01, 2.501998245716095e-01, 1.582892835140228e-01, 1.285436004400253e-01, 1.229175701737404e-01, 1.2359369546175e-01, 1.250520199537277e-01, 1.258857697248459e-01, 1.261593997478485e-01, 1.261646151542664e-01, 1.26114696264267e-01, 1.261272877454758e-01, 1.261482089757919e-01, 1.260550022125244e-01, 1.260094940662384e-01, 1.260017454624176e-01, 1.260068714618683e-01, 1.260200887918472e-01, 1.260240972042084e-01, 1.260288059711456e-01, 1.260308176279068e-01, 1.260318607091904e-01, 1.260029524564743e-01, 1.076097960739375e-10, 1.331887100608498e-10, 6.857691497996754e-11, 7.291570125467217e-12, 3.301659347396818e-13, 5.941328679037738e-11, 1.034582003400786e-10, 1.302977309380893e-10, 1.477956784734502e-10, 1.331049159780662e-10, 1.233148305690435e-10, 1.246660136233757e-10, 8.707305709787505e-11, 1.405601607329388e-10, 1.263830984310488e-10, 1.240534619473267e-10, 1.457729353893103e-10, 8.796860462290177e-11, 6.547738046203122e-11, 6.831477744606573e-11, 2.419688061028324e-10, 1.546071604074939e-10, 1.33691668510437e-01, 1.565475761890411e-01, 1.440230458974838e-01, 1.970596760511398e-01, 2.070426493883133e-01, 1.861924976110458e-01, 1.472989320755003e-01, 1.298803687095643e-01, 1.251496374607086e-01, 1.247253865003586e-01, 1.253660619258881e-01, 1.258527934551239e-01, 1.260634809732437e-01, 1.261074990034103e-01, 1.260761618614197e-01, 1.260387003421783e-01, 1.260305494070053e-01, 1.260239779949188e-01, 1.260243207216263e-01, 1.260361671447754e-01, 1.260418146848679e-01, 1.260422617197037e-01, 1.260385662317276e-01, 1.26045748591423e-01, 1.260403096675873e-01, 1.260143518447876e-01, 1.260518431663513e-01, 1.260066628456116e-01, 9.299896269743257e-11, 8.566748699312399e-11, 8.62063267992319e-11, 9.841662901299841e-11, 1.765427526390084e-10, 2.633404605489886e-10, 1.991658088451587e-10, 2.116765790427522e-11, 1.586881174902475e-18, 3.043669483115963e-11, 7.331832363455248e-11]
+flo.sou.air.vol.T=[2.931499938964844e+02, 2.921277160644531e+02, 2.920469665527344e+02, 2.920375061035156e+02, 2.920676879882812e+02, 2.919853210449219e+02, 2.919112854003906e+02, 2.918203125e+02, 2.916888427734375e+02, 2.916121215820312e+02, 2.916385498046875e+02, 2.939043579101562e+02, 2.933412475585938e+02, 2.924960021972656e+02, 2.927845458984375e+02, 2.927412719726562e+02, 2.928491516113281e+02, 2.931309814453125e+02, 2.937285461425781e+02, 2.932136840820312e+02, 2.931012878417969e+02, 2.932697143554688e+02, 2.932699890136719e+02, 2.934822998046875e+02, 2.938500061035156e+02, 2.940853576660156e+02, 2.940903625488281e+02, 2.941752319335938e+02, 2.946043701171875e+02, 2.947619018554688e+02, 2.948547668457031e+02, 2.948764343261719e+02, 2.94870361328125e+02, 2.948453979492188e+02, 2.948196716308594e+02, 2.948077697753906e+02, 2.947295837402344e+02, 2.944901428222656e+02, 2.942247924804688e+02, 2.939066467285156e+02, 2.9366162109375e+02, 2.934824523925781e+02, 2.934640502929688e+02, 2.936397399902344e+02, 2.936490173339844e+02, 2.935105895996094e+02, 2.931744995117188e+02, 2.93056396484375e+02, 2.929591979980469e+02, 2.928851013183594e+02, 2.928210144042969e+02, 2.927607116699219e+02, 2.92720458984375e+02, 2.926014404296875e+02, 2.924844665527344e+02, 2.924427490234375e+02, 2.923935241699219e+02, 2.923890686035156e+02, 2.924737243652344e+02, 2.924202880859375e+02, 2.921781311035156e+02, 2.921343994140625e+02, 2.923724670410156e+02, 2.932266235351562e+02, 2.929752502441406e+02, 2.931677551269531e+02, 2.931575012207031e+02, 2.932003173828125e+02, 2.932140502929688e+02, 2.932716979980469e+02, 2.931920471191406e+02, 2.932098693847656e+02, 2.932909851074219e+02, 2.933687133789062e+02, 2.935090026855469e+02, 2.937010803222656e+02, 2.936841735839844e+02, 2.937637634277344e+02, 2.940003356933594e+02, 2.939923400878906e+02, 2.9400537109375e+02, 2.940286865234375e+02, 2.94041259765625e+02, 2.940462036132812e+02, 2.940234985351562e+02, 2.934436340332031e+02, 2.932793273925781e+02, 2.935108947753906e+02, 2.933450927734375e+02, 2.931182556152344e+02, 2.929053649902344e+02, 2.928270874023438e+02, 2.927644653320312e+02, 2.927400817871094e+02, 2.927921142578125e+02, 2.92816650390625e+02, 2.927132873535156e+02, 2.928185424804688e+02, 2.928561401367188e+02, 2.927891845703125e+02, 2.926432800292969e+02]
+flo.eas.air.vol.T=[2.931499938964844e+02, 2.922457580566406e+02, 2.921407470703125e+02, 2.920317993164062e+02, 2.919625549316406e+02, 2.919295349121094e+02, 2.919173583984375e+02, 2.918602600097656e+02, 2.917684020996094e+02, 2.916989135742188e+02, 2.917227478027344e+02, 2.943937683105469e+02, 2.93510009765625e+02, 2.925918579101562e+02, 2.929861755371094e+02, 2.931807861328125e+02, 2.932269287109375e+02, 2.934366149902344e+02, 2.932835693359375e+02, 2.93269287109375e+02, 2.931586303710938e+02, 2.932143249511719e+02, 2.9312548828125e+02, 2.931750183105469e+02, 2.932157592773438e+02, 2.932721862792969e+02, 2.932391052246094e+02, 2.932853088378906e+02, 2.935541687011719e+02, 2.937330322265625e+02, 2.938159790039062e+02, 2.938405456542969e+02, 2.938586120605469e+02, 2.938717041015625e+02, 2.938834533691406e+02, 2.939016723632812e+02, 2.938525695800781e+02, 2.936387939453125e+02, 2.933472900390625e+02, 2.930711975097656e+02, 2.929935607910156e+02, 2.929187316894531e+02, 2.929039916992188e+02, 2.929071044921875e+02, 2.929317932128906e+02, 2.928049926757812e+02, 2.927912292480469e+02, 2.927005310058594e+02, 2.926150207519531e+02, 2.925598754882812e+02, 2.925162048339844e+02, 2.924848327636719e+02, 2.924773254394531e+02, 2.923879699707031e+02, 2.923109741210938e+02, 2.922814636230469e+02, 2.922490539550781e+02, 2.923016662597656e+02, 2.922005615234375e+02, 2.921877746582031e+02, 2.921448669433594e+02, 2.920840759277344e+02, 2.924685668945312e+02, 2.931670532226562e+02, 2.929659423828125e+02, 2.931502685546875e+02, 2.931960144042969e+02, 2.931946716308594e+02, 2.932730407714844e+02, 2.932962646484375e+02, 2.931877136230469e+02, 2.932153930664062e+02, 2.9331103515625e+02, 2.933929748535156e+02, 2.934388122558594e+02, 2.934992370605469e+02, 2.934641723632812e+02, 2.935233154296875e+02, 2.93740234375e+02, 2.937423095703125e+02, 2.9376318359375e+02, 2.937938232421875e+02, 2.938214721679688e+02, 2.937465209960938e+02, 2.936111450195312e+02, 2.937756958007812e+02, 2.936799011230469e+02, 2.933584899902344e+02, 2.932245788574219e+02, 2.930654907226562e+02, 2.928565979003906e+02, 2.928341979980469e+02, 2.928184204101562e+02, 2.927203063964844e+02, 2.926412048339844e+02, 2.926202392578125e+02, 2.926460571289062e+02, 2.928136596679688e+02, 2.92845947265625e+02, 2.928062744140625e+02, 2.927286376953125e+02]
+flo.nor.air.vol.T=[2.931499938964844e+02, 2.923236694335938e+02, 2.922370300292969e+02, 2.921404724121094e+02, 2.920262145996094e+02, 2.91964599609375e+02, 2.919265747070312e+02, 2.918673706054688e+02, 2.917843627929688e+02, 2.917125244140625e+02, 2.916905212402344e+02, 2.939193420410156e+02, 2.932411499023438e+02, 2.925473022460938e+02, 2.928787536621094e+02, 2.928636779785156e+02, 2.928513793945312e+02, 2.929827270507812e+02, 2.933872680664062e+02, 2.933995056152344e+02, 2.927930603027344e+02, 2.931384887695312e+02, 2.93178955078125e+02, 2.931880493164062e+02, 2.931879272460938e+02, 2.931872253417969e+02, 2.931608276367188e+02, 2.931741027832031e+02, 2.932168884277344e+02, 2.933673400878906e+02, 2.934520568847656e+02, 2.934894409179688e+02, 2.93519287109375e+02, 2.935425109863281e+02, 2.935631713867188e+02, 2.935890197753906e+02, 2.935505065917969e+02, 2.933601989746094e+02, 2.931055297851562e+02, 2.930140991210938e+02, 2.927211608886719e+02, 2.926516723632812e+02, 2.926352233886719e+02, 2.926432189941406e+02, 2.926649780273438e+02, 2.926003112792969e+02, 2.92510498046875e+02, 2.924501953125e+02, 2.923839721679688e+02, 2.923490295410156e+02, 2.9231689453125e+02, 2.922696228027344e+02, 2.922342224121094e+02, 2.921697082519531e+02, 2.92127685546875e+02, 2.921014404296875e+02, 2.920564270019531e+02, 2.920455017089844e+02, 2.920255126953125e+02, 2.920132446289062e+02, 2.91935302734375e+02, 2.919188232421875e+02, 2.922847290039062e+02, 2.93192138671875e+02, 2.927841796875e+02, 2.930237121582031e+02, 2.931743469238281e+02, 2.932874450683594e+02, 2.934334716796875e+02, 2.932825622558594e+02, 2.93195068359375e+02, 2.931824951171875e+02, 2.931940002441406e+02, 2.932279052734375e+02, 2.932783508300781e+02, 2.933448181152344e+02, 2.933175048828125e+02, 2.933819580078125e+02, 2.936020812988281e+02, 2.9360791015625e+02, 2.936303100585938e+02, 2.936623840332031e+02, 2.936905212402344e+02, 2.937111511230469e+02, 2.937044067382812e+02, 2.9367041015625e+02, 2.935719299316406e+02, 2.933566589355469e+02, 2.931553039550781e+02, 2.930518798828125e+02, 2.9284814453125e+02, 2.928025817871094e+02, 2.927664489746094e+02, 2.927183227539062e+02, 2.926303405761719e+02, 2.925738220214844e+02, 2.926481323242188e+02, 2.926659240722656e+02, 2.92705322265625e+02, 2.92665283203125e+02, 2.924693298339844e+02]
+flo.wes.air.vol.T=[2.931499938964844e+02, 2.920885925292969e+02, 2.920011596679688e+02, 2.919342346191406e+02, 2.918894958496094e+02, 2.918588562011719e+02, 2.918583984375e+02, 2.918036804199219e+02, 2.917080993652344e+02, 2.9163623046875e+02, 2.915781555175781e+02, 2.940685729980469e+02, 2.930033569335938e+02, 2.925775146484375e+02, 2.929381713867188e+02, 2.929375610351562e+02, 2.929306945800781e+02, 2.930686950683594e+02, 2.934530029296875e+02, 2.932673645019531e+02, 2.928900451660156e+02, 2.930050659179688e+02, 2.93257568359375e+02, 2.932373657226562e+02, 2.931444702148438e+02, 2.931404724121094e+02, 2.931360473632812e+02, 2.931781005859375e+02, 2.9325390625e+02, 2.932739562988281e+02, 2.934215393066406e+02, 2.935437316894531e+02, 2.936897888183594e+02, 2.937147521972656e+02, 2.937245178222656e+02, 2.937422485351562e+02, 2.9369970703125e+02, 2.935056762695312e+02, 2.932446899414062e+02, 2.930259399414062e+02, 2.928145751953125e+02, 2.927605285644531e+02, 2.927474975585938e+02, 2.928030395507812e+02, 2.928133850097656e+02, 2.927525024414062e+02, 2.926106262207031e+02, 2.925562133789062e+02, 2.925130004882812e+02, 2.924902038574219e+02, 2.924685974121094e+02, 2.924088134765625e+02, 2.923507080078125e+02, 2.923047790527344e+02, 2.923136901855469e+02, 2.922816772460938e+02, 2.922026672363281e+02, 2.921541137695312e+02, 2.921842346191406e+02, 2.921643676757812e+02, 2.920564880371094e+02, 2.921049499511719e+02, 2.92373291015625e+02, 2.931617126464844e+02, 2.928102722167969e+02, 2.930944213867188e+02, 2.932481079101562e+02, 2.932454528808594e+02, 2.933194580078125e+02, 2.933092956542969e+02, 2.932141723632812e+02, 2.931893310546875e+02, 2.93254638671875e+02, 2.933369750976562e+02, 2.933883056640625e+02, 2.934552307128906e+02, 2.934286804199219e+02, 2.934967346191406e+02, 2.937241821289062e+02, 2.937386474609375e+02, 2.937693481445312e+02, 2.938077697753906e+02, 2.938375854492188e+02, 2.938566284179688e+02, 2.93846435546875e+02, 2.938053283691406e+02, 2.93701416015625e+02, 2.934837036132812e+02, 2.932831420898438e+02, 2.930819396972656e+02, 2.929725646972656e+02, 2.9292626953125e+02, 2.928852233886719e+02, 2.928484497070312e+02, 2.927837524414062e+02, 2.927493591308594e+02, 2.927843933105469e+02, 2.92837890625e+02, 2.928434448242188e+02, 2.927921142578125e+02, 2.926426086425781e+02]
+flo.cor.air.vol.T=[2.931499938964844e+02, 2.928221130371094e+02, 2.927656555175781e+02, 2.927209167480469e+02, 2.926880493164062e+02, 2.926540832519531e+02, 2.926307067871094e+02, 2.925934143066406e+02, 2.9253466796875e+02, 2.924859313964844e+02, 2.924714050292969e+02, 2.939193725585938e+02, 2.934137878417969e+02, 2.930497741699219e+02, 2.931659545898438e+02, 2.931474304199219e+02, 2.931573791503906e+02, 2.932134704589844e+02, 2.932008361816406e+02, 2.935188598632812e+02, 2.934573059082031e+02, 2.934921569824219e+02, 2.93536865234375e+02, 2.936051025390625e+02, 2.936685791015625e+02, 2.937435302734375e+02, 2.937149963378906e+02, 2.937658081054688e+02, 2.940061645507812e+02, 2.941531066894531e+02, 2.942519836425781e+02, 2.943043823242188e+02, 2.943507385253906e+02, 2.943817443847656e+02, 2.944083251953125e+02, 2.944372863769531e+02, 2.943936767578125e+02, 2.941886901855469e+02, 2.939032897949219e+02, 2.936102905273438e+02, 2.936042175292969e+02, 2.935629272460938e+02, 2.93540771484375e+02, 2.935356750488281e+02, 2.935390014648438e+02, 2.93502197265625e+02, 2.934413146972656e+02, 2.933947448730469e+02, 2.933491821289062e+02, 2.933152770996094e+02, 2.932855529785156e+02, 2.93253173828125e+02, 2.932251586914062e+02, 2.931825256347656e+02, 2.931416625976562e+02, 2.931163940429688e+02, 2.930809936523438e+02, 2.930639038085938e+02, 2.930539245605469e+02, 2.93035888671875e+02, 2.929766845703125e+02, 2.92945068359375e+02, 2.931630859375e+02, 2.935980224609375e+02, 2.931030883789062e+02, 2.931790161132812e+02, 2.931358947753906e+02, 2.931537475585938e+02, 2.935909423828125e+02, 2.939417724609375e+02, 2.939371643066406e+02, 2.939535522460938e+02, 2.940323791503906e+02, 2.940986938476562e+02, 2.941366882324219e+02, 2.941931457519531e+02, 2.941343994140625e+02, 2.941771240234375e+02, 2.944118957519531e+02, 2.944343566894531e+02, 2.944670104980469e+02, 2.945061645507812e+02, 2.945451049804688e+02, 2.945697021484375e+02, 2.945622863769531e+02, 2.945125732421875e+02, 2.943992004394531e+02, 2.941792907714844e+02, 2.939807434082031e+02, 2.93773681640625e+02, 2.937351989746094e+02, 2.936918029785156e+02, 2.936565246582031e+02, 2.936169738769531e+02, 2.935791625976562e+02, 2.935536499023438e+02, 2.935431823730469e+02, 2.9357373046875e+02, 2.93582763671875e+02, 2.935552368164062e+02, 2.934721984863281e+02]
+hvac.VAVBox[1].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 3.014938049316406e+02, 3.035239868164062e+02, 2.985349731445312e+02, 3.0371875e+02, 3.038788146972656e+02, 3.017809448242188e+02, 3.012407836914062e+02, 3.013976745605469e+02, 3.035014953613281e+02, 2.933995666503906e+02, 2.952864685058594e+02, 2.932946472167969e+02, 2.876640930175781e+02, 2.880513916015625e+02, 2.885172119140625e+02, 2.889659729003906e+02, 2.892743225097656e+02, 2.894991149902344e+02, 2.898685302734375e+02, 2.910861511230469e+02, 2.91296630859375e+02, 2.912509155273438e+02, 2.912057800292969e+02, 2.911771850585938e+02, 2.911629638671875e+02, 2.911582946777344e+02, 2.911293029785156e+02, 2.910433959960938e+02, 2.910064392089844e+02, 2.904275512695312e+02, 2.898953552246094e+02, 2.898953552246094e+02, 2.898953552246094e+02, 2.898953552246094e+02, 2.898953552246094e+02, 2.898953552246094e+02, 2.898953552246094e+02, 2.898953552246094e+02, 2.898953552246094e+02, 2.898953552246094e+02, 2.898953552246094e+02, 2.898953552246094e+02, 2.898953552246094e+02, 2.898953552246094e+02, 2.898953552246094e+02, 2.898953552246094e+02, 2.898953552246094e+02, 2.898953552246094e+02, 2.898953552246094e+02, 2.898953552246094e+02, 2.898953552246094e+02, 2.898953552246094e+02, 3.02691162109375e+02, 3.002444763183594e+02, 3.013018188476562e+02, 3.015270385742188e+02, 3.012021484375e+02, 3.00635986328125e+02, 2.981698303222656e+02, 2.942040405273438e+02, 2.915770263671875e+02, 2.908381042480469e+02, 2.914937438964844e+02, 2.915469665527344e+02, 2.913453369140625e+02, 2.912429504394531e+02, 2.911803283691406e+02, 2.911694641113281e+02, 2.91087890625e+02, 2.909594116210938e+02, 2.91001708984375e+02, 2.910689697265625e+02, 2.911936950683594e+02, 2.912908020019531e+02, 2.912320556640625e+02, 2.911507568359375e+02, 2.910657958984375e+02, 2.9095947265625e+02, 2.910690612792969e+02, 2.910979614257812e+02, 2.917124328613281e+02, 2.917124328613281e+02, 2.917124328613281e+02, 2.917124328613281e+02, 2.917124328613281e+02, 2.917124328613281e+02, 2.917124328613281e+02, 2.917124328613281e+02, 2.917124328613281e+02, 2.917124328613281e+02, 2.917124328613281e+02]
+hvac.VAVBox[2].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 3.016138916015625e+02, 3.045068969726562e+02, 3.0493212890625e+02, 3.001473999023438e+02, 3.04030029296875e+02, 3.031962585449219e+02, 3.028815612792969e+02, 3.032068176269531e+02, 2.972039794921875e+02, 2.923163757324219e+02, 2.907464599609375e+02, 2.903131713867188e+02, 2.876636962890625e+02, 2.880511474609375e+02, 2.885169677734375e+02, 2.889657287597656e+02, 2.892742004394531e+02, 2.894989929199219e+02, 2.898683471679688e+02, 2.910857238769531e+02, 2.91296630859375e+02, 2.912509460449219e+02, 2.912057800292969e+02, 2.911772155761719e+02, 2.911629638671875e+02, 2.911582946777344e+02, 2.911293334960938e+02, 2.9104345703125e+02, 2.910064392089844e+02, 2.918643493652344e+02, 2.918465576171875e+02, 2.918465576171875e+02, 2.918465576171875e+02, 2.918465576171875e+02, 2.918465576171875e+02, 2.918465576171875e+02, 2.918465576171875e+02, 2.918465576171875e+02, 2.918465576171875e+02, 2.918465576171875e+02, 2.918465576171875e+02, 2.918465576171875e+02, 2.918465576171875e+02, 2.918465576171875e+02, 2.918465576171875e+02, 2.918465576171875e+02, 2.918465576171875e+02, 2.918465576171875e+02, 2.918465576171875e+02, 2.918465576171875e+02, 2.918465576171875e+02, 2.918465576171875e+02, 3.02877197265625e+02, 3.016918334960938e+02, 3.033634338378906e+02, 3.04141357421875e+02, 3.041315002441406e+02, 3.032413940429688e+02, 2.998464965820312e+02, 2.941732482910157e+02, 2.908510742187501e+02, 2.908380737304688e+02, 2.914934387207031e+02, 2.915470886230469e+02, 2.913454284667969e+02, 2.912429809570312e+02, 2.911803283691406e+02, 2.911694946289062e+02, 2.910880126953125e+02, 2.909594421386719e+02, 2.910016784667969e+02, 2.910689086914062e+02, 2.91193603515625e+02, 2.912908020019531e+02, 2.912320861816406e+02, 2.911507873535156e+02, 2.910658569335938e+02, 2.9095947265625e+02, 2.910689697265625e+02, 2.928243103027344e+02, 2.92717041015625e+02, 2.92717041015625e+02, 2.92717041015625e+02, 2.92717041015625e+02, 2.92717041015625e+02, 2.92717041015625e+02, 2.92717041015625e+02, 2.92717041015625e+02, 2.92717041015625e+02, 2.92717041015625e+02, 2.92717041015625e+02]
+hvac.VAVBox[3].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 3.015859985351562e+02, 3.035417785644531e+02, 2.985322265625e+02, 3.020386352539062e+02, 3.039993286132812e+02, 3.01845703125e+02, 3.012609558105469e+02, 3.014070434570312e+02, 3.023318481445312e+02, 3.007464599609375e+02, 2.93708984375e+02, 2.989660339355469e+02, 2.983212280273438e+02, 2.97006103515625e+02, 2.955585327148438e+02, 2.94146240234375e+02, 2.942234191894531e+02, 2.934667053222656e+02, 2.898685302734375e+02, 2.910861511230469e+02, 2.91296630859375e+02, 2.912509155273438e+02, 2.912057800292969e+02, 2.911771850585938e+02, 2.911629638671875e+02, 2.911582946777344e+02, 2.911293029785156e+02, 2.910433959960938e+02, 2.910064392089844e+02, 2.953569030761719e+02, 2.932392883300781e+02, 2.932392883300781e+02, 2.932392883300781e+02, 2.932392883300781e+02, 2.932392883300781e+02, 2.932392883300781e+02, 2.932392883300781e+02, 2.932392883300781e+02, 2.932392883300781e+02, 2.932392883300781e+02, 2.932392883300781e+02, 2.932392883300781e+02, 2.932392883300781e+02, 2.932392883300781e+02, 2.932392883300781e+02, 2.932392883300781e+02, 2.932392883300781e+02, 2.932392883300781e+02, 2.932392883300781e+02, 2.932392883300781e+02, 2.932392883300781e+02, 2.932392883300781e+02, 3.02802978515625e+02, 3.041463012695312e+02, 3.040301818847656e+02, 3.041010131835938e+02, 3.037751770019531e+02, 3.038666381835938e+02, 3.042176513671875e+02, 2.978393249511719e+02, 2.951019897460938e+02, 2.937723388671875e+02, 2.923969116210938e+02, 2.915469665527344e+02, 2.913453369140625e+02, 2.912429504394531e+02, 2.911803283691406e+02, 2.911694641113281e+02, 2.91087890625e+02, 2.909594116210938e+02, 2.91001708984375e+02, 2.910689697265625e+02, 2.911936950683594e+02, 2.912908020019531e+02, 2.912320556640625e+02, 2.911507568359375e+02, 2.910657958984375e+02, 2.9095947265625e+02, 2.910690612792969e+02, 2.937164306640625e+02, 2.929425964355469e+02, 2.929425964355469e+02, 2.929425964355469e+02, 2.929425964355469e+02, 2.929425964355469e+02, 2.929425964355469e+02, 2.929425964355469e+02, 2.929425964355469e+02, 2.929425964355469e+02, 2.929425964355469e+02, 2.929425964355469e+02]
+hvac.VAVBox[4].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 3.013611755371094e+02, 3.036983947753906e+02, 3.006435546875e+02, 3.025251159667969e+02, 3.039919128417969e+02, 3.018610229492188e+02, 3.01265625e+02, 3.014091796875e+02, 3.027033386230469e+02, 3.002123413085938e+02, 2.953715515136719e+02, 3.025415649414062e+02, 3.027080078125e+02, 2.979157409667969e+02, 2.966266784667969e+02, 2.970746765136719e+02, 2.985029296875e+02, 2.980261535644531e+02, 2.937996520996094e+02, 2.910857238769531e+02, 2.91296630859375e+02, 2.912509460449219e+02, 2.912057800292969e+02, 2.911772155761719e+02, 2.911629638671875e+02, 2.911582946777344e+02, 2.911293334960938e+02, 2.9104345703125e+02, 2.910064392089844e+02, 2.932944030761719e+02, 2.929495239257812e+02, 2.929495239257812e+02, 2.929495239257812e+02, 2.929495239257812e+02, 2.929495239257812e+02, 2.929495239257812e+02, 2.929495239257812e+02, 2.929495239257812e+02, 2.929495239257812e+02, 2.929495239257812e+02, 2.929495239257812e+02, 2.929495239257812e+02, 2.929495239257812e+02, 2.929495239257812e+02, 2.929495239257812e+02, 2.929495239257812e+02, 2.929495239257812e+02, 2.929495239257812e+02, 2.929495239257812e+02, 2.929495239257812e+02, 2.929495239257812e+02, 2.929495239257812e+02, 3.028782653808594e+02, 3.041479797363281e+02, 3.040216979980469e+02, 3.041073303222656e+02, 3.04163330078125e+02, 3.041741638183594e+02, 3.031340026855468e+02, 2.969173889160157e+02, 2.932911987304688e+02, 2.914747009277344e+02, 2.914934387207031e+02, 2.915470886230469e+02, 2.913454284667969e+02, 2.912429809570312e+02, 2.911803283691406e+02, 2.911694946289062e+02, 2.910880126953125e+02, 2.909594421386719e+02, 2.910016784667969e+02, 2.910689086914062e+02, 2.91193603515625e+02, 2.912908020019531e+02, 2.912320861816406e+02, 2.911507873535156e+02, 2.910658569335938e+02, 2.9095947265625e+02, 2.910689697265625e+02, 2.918526611328125e+02, 2.923033752441406e+02, 2.923033752441406e+02, 2.923033752441406e+02, 2.923033752441406e+02, 2.923033752441406e+02, 2.923033752441406e+02, 2.923033752441406e+02, 2.923033752441406e+02, 2.923033752441406e+02, 2.923033752441406e+02, 2.923033752441406e+02]
+hvac.VAVBox[5].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 3.029650573730469e+02, 2.961257019042969e+02, 2.984535522460938e+02, 2.941957397460938e+02, 2.944042053222656e+02, 2.935321960449219e+02, 2.93592529296875e+02, 2.9288427734375e+02, 2.881796264648438e+02, 2.888975524902344e+02, 2.882666625976562e+02, 2.876352844238281e+02, 2.876638488769531e+02, 2.880513916015625e+02, 2.885172119140625e+02, 2.889659729003906e+02, 2.892743225097656e+02, 2.894991149902344e+02, 2.898685302734375e+02, 2.910861511230469e+02, 2.91296630859375e+02, 2.912509155273438e+02, 2.912057800292969e+02, 2.911771850585938e+02, 2.911629638671875e+02, 2.911582946777344e+02, 2.911293029785156e+02, 2.910433959960938e+02, 2.910064392089844e+02, 2.904275512695312e+02, 2.898953552246094e+02, 2.898953552246094e+02, 2.898953552246094e+02, 2.898953552246094e+02, 2.898953552246094e+02, 2.898953552246094e+02, 2.898953552246094e+02, 2.898953552246094e+02, 2.898953552246094e+02, 2.898953552246094e+02, 2.898953552246094e+02, 2.898953552246094e+02, 2.898953552246094e+02, 2.898953552246094e+02, 2.898953552246094e+02, 2.898953552246094e+02, 2.898953552246094e+02, 2.898953552246094e+02, 2.898953552246094e+02, 2.898953552246094e+02, 2.898953552246094e+02, 2.898953552246094e+02, 3.06115234375e+02, 2.940966186523438e+02, 2.899393615722656e+02, 2.91261474609375e+02, 2.899065551757812e+02, 2.901557006835938e+02, 2.906260681152344e+02, 2.908689880371094e+02, 2.908510437011719e+02, 2.908381042480469e+02, 2.914937438964844e+02, 2.915469665527344e+02, 2.913453369140625e+02, 2.912429504394531e+02, 2.911803283691406e+02, 2.911694641113281e+02, 2.91087890625e+02, 2.909594116210938e+02, 2.91001708984375e+02, 2.910689697265625e+02, 2.911936950683594e+02, 2.912908020019531e+02, 2.912320556640625e+02, 2.911507568359375e+02, 2.910657958984375e+02, 2.9095947265625e+02, 2.910690612792969e+02, 2.910979614257812e+02, 2.909048156738281e+02, 2.909048156738281e+02, 2.909048156738281e+02, 2.909048156738281e+02, 2.909048156738281e+02, 2.909048156738281e+02, 2.909048156738281e+02, 2.909048156738281e+02, 2.909048156738281e+02, 2.909048156738281e+02, 2.909048156738281e+02]
+hvac.VAVBox[1].vav.m_flow=[9.356216973052667e-13, 2.082084366028525e-10, 2.116087027825841e-10, 1.943755989497475e-10, 1.64127003654535e-10, 1.300126117875777e-10, 9.221048230534379e-11, 9.369272718773304e-11, 1.066888244416475e-10, 1.113793640650229e-10, 8.250709623098373e-03, 6.746090650558472e-01, 2.287349700927734e-01, 1.939104497432709e-01, 2.713625133037568e-01, 3.011673390865326e-01, 3.273951709270477e-01, 3.544707596302033e-01, 2.989048957824707e-01, 2.258458882570267e-01, 1.985734403133392e-01, 1.933998912572861e-01, 1.949349790811539e-01, 1.971127986907959e-01, 1.983076930046082e-01, 1.986915320158005e-01, 1.986948847770691e-01, 1.986227333545685e-01, 1.986416578292847e-01, 1.986707001924515e-01, 1.985365450382233e-01, 1.984724700450897e-01, 1.98462188243866e-01, 1.984698623418808e-01, 1.984887719154358e-01, 1.984943896532059e-01, 1.985010653734207e-01, 1.985038816928864e-01, 1.985053569078445e-01, 1.984635144472122e-01, 1.456949560996179e-10, 1.803267674072018e-10, 9.284759766581274e-11, 9.8738933695941e-12, 4.470181820190322e-13, 8.04413480270938e-11, 1.40074021826031e-10, 1.764127732784004e-10, 2.001033921894546e-10, 1.802133720030241e-10, 1.669582805341463e-10, 1.687888856460873e-10, 1.178898506593029e-10, 1.90307158920433e-10, 1.711098623902174e-10, 1.679583416791532e-10, 1.97360336406938e-10, 1.191118037535697e-10, 8.865054523798932e-11, 9.249351978768416e-11, 3.277038918003683e-10, 2.093280410120357e-10, 1.131115034222603e-01, 2.20616489648819e-01, 1.945388913154602e-01, 1.906102895736694e-01, 1.984770148992538e-01, 2.040170282125473e-01, 2.062005251646042e-01, 1.998959332704545e-01, 1.964823007583618e-01, 1.964808851480484e-01, 1.975097060203552e-01, 1.982323974370956e-01, 1.985447108745575e-01, 1.986124962568283e-01, 1.985690891742706e-01, 1.985156536102295e-01, 1.985039412975311e-01, 1.984940469264984e-01, 1.984945833683014e-01, 1.985115706920624e-01, 1.985195577144623e-01, 1.985201090574265e-01, 1.985146701335907e-01, 1.985276788473129e-01, 1.985168755054474e-01, 1.984815746545792e-01, 1.98534220457077e-01, 1.984682083129883e-01, 1.259130716357859e-10, 1.159868798228381e-10, 1.167164143112132e-10, 1.332481902593941e-10, 2.390233011517751e-10, 3.565416573092506e-10, 2.696636247634387e-10, 2.865931970907898e-11, 2.178351605427265e-18, 4.120900148896212e-11, 9.926881539001897e-11]
+hvac.VAVBox[2].vav.m_flow=[8.884889894124337e-13, 1.9771977111116e-10, 2.009487437559798e-10, 1.845837788172489e-10, 1.558589785011222e-10, 1.234631286095578e-10, 8.756530917031213e-11, 8.897287767650754e-11, 1.013142902905884e-10, 1.057685328209601e-10, 7.83507339656353e-03, 5.191460251808167e-01, 2.974719405174255e-01, 1.57040536403656e-01, 1.90358489751816e-01, 2.337575554847717e-01, 2.464021742343903e-01, 2.052578628063201e-01, 1.82529091835022e-01, 1.739448457956314e-01, 1.600336581468582e-01, 1.570372134447098e-01, 1.587034463882446e-01, 1.607352644205093e-01, 1.618408113718033e-01, 1.622013598680496e-01, 1.622108966112137e-01, 1.621475666761398e-01, 1.621638685464859e-01, 1.621906310319901e-01, 1.62070706486702e-01, 1.620121896266937e-01, 1.620022505521774e-01, 1.620088368654251e-01, 1.620258390903473e-01, 1.620309948921204e-01, 1.620370298624039e-01, 1.620396375656128e-01, 1.620409786701202e-01, 1.620038151741028e-01, 1.383554520950625e-10, 1.712426589417504e-10, 8.817032520758161e-11, 9.37648743370989e-12, 4.24499275791454e-13, 7.638904786499978e-11, 1.330176802039063e-10, 1.675258404221225e-10, 1.900230250928558e-10, 1.711349811861496e-10, 1.585476194776447e-10, 1.602860066896028e-10, 1.119510595337658e-10, 1.807202720804924e-10, 1.624900630714521e-10, 1.594973042529093e-10, 1.874181504435416e-10, 1.131114507613171e-10, 8.418470087701024e-11, 8.783408028678608e-11, 3.11195541558007e-10, 1.987829761906923e-10, 9.251109510660172e-02, 1.796547025442123e-01, 1.582353115081787e-01, 1.664656102657318e-01, 1.67761892080307e-01, 1.681413650512695e-01, 1.692008227109909e-01, 1.634182035923005e-01, 1.602615118026733e-01, 1.602135598659515e-01, 1.611286699771881e-01, 1.617842465639114e-01, 1.62071481347084e-01, 1.621363312005997e-01, 1.620988696813583e-01, 1.620508879423141e-01, 1.620398908853531e-01, 1.620310097932816e-01, 1.620312482118607e-01, 1.620464324951172e-01, 1.62053719162941e-01, 1.620543301105499e-01, 1.620495915412903e-01, 1.620588302612305e-01, 1.620518267154694e-01, 1.620184630155563e-01, 1.620666682720184e-01, 1.620083451271057e-01, 1.195700899403462e-10, 1.101439425776896e-10, 1.108367286839496e-10, 1.265356985857835e-10, 2.269823079492639e-10, 3.385805802391673e-10, 2.56079102367579e-10, 2.721558395313295e-11, 2.111984009749992e-18, 3.913306484415457e-11, 9.426806557577549e-11]
+hvac.VAVBox[3].vav.m_flow=[9.356216973052667e-13, 2.082084366028525e-10, 2.116087027825841e-10, 1.943755989497475e-10, 1.64127003654535e-10, 1.300126117875777e-10, 9.221048230534379e-11, 9.369272718773304e-11, 1.066888244416475e-10, 1.113793640650229e-10, 8.250709623098373e-03, 6.718000769615173e-01, 2.144119590520859e-01, 1.907568126916885e-01, 2.56591707468033e-01, 2.984495162963867e-01, 3.264763057231903e-01, 3.53991448879242e-01, 3.587372004985809e-01, 2.485539615154266e-01, 2.024078220129013e-01, 1.940995901823044e-01, 1.950680613517761e-01, 1.971385329961777e-01, 1.983126997947693e-01, 1.986925154924393e-01, 1.986950784921646e-01, 1.986227631568909e-01, 1.986416578292847e-01, 1.986707001924515e-01, 1.985365450382233e-01, 1.984724700450897e-01, 1.98462188243866e-01, 1.984698623418808e-01, 1.984887719154358e-01, 1.984943896532059e-01, 1.985010653734207e-01, 1.985038816928864e-01, 1.985053569078445e-01, 1.984635144472122e-01, 1.456949560996179e-10, 1.803267674072018e-10, 9.284759766581274e-11, 9.8738933695941e-12, 4.470181820190322e-13, 8.04413480270938e-11, 1.40074021826031e-10, 1.764127732784004e-10, 2.001033921894546e-10, 1.802133720030241e-10, 1.669582805341463e-10, 1.687888856460873e-10, 1.178898506593029e-10, 1.90307158920433e-10, 1.711098623902174e-10, 1.679583416791532e-10, 1.97360336406938e-10, 1.191118037535697e-10, 8.865054523798932e-11, 9.249351978768416e-11, 3.277038918003683e-10, 2.093280410120357e-10, 1.840386837720871e-01, 2.985402643680573e-01, 2.239954769611359e-01, 2.905648052692413e-01, 3.286280632019043e-01, 3.304982483386993e-01, 2.593997120857229e-01, 2.091995626688005e-01, 1.982111483812332e-01, 1.968102753162384e-01, 1.97573110461235e-01, 1.98244646191597e-01, 1.985470950603485e-01, 1.986129730939865e-01, 1.985691785812378e-01, 1.985156834125519e-01, 1.985039412975311e-01, 1.984940469264984e-01, 1.984945833683014e-01, 1.985115706920624e-01, 1.985195577144623e-01, 1.985201090574265e-01, 1.985146701335907e-01, 1.985276788473129e-01, 1.985168755054474e-01, 1.984815746545792e-01, 1.98534220457077e-01, 1.984682083129883e-01, 1.259130716357859e-10, 1.159868798228381e-10, 1.167164143112132e-10, 1.332481902593941e-10, 2.390233011517751e-10, 3.565416573092506e-10, 2.696636247634387e-10, 2.865931970907898e-11, 2.230813881417216e-18, 4.120900148896212e-11, 9.926881539001897e-11]
+hvac.VAVBox[4].vav.m_flow=[6.910469917652262e-13, 1.537820426555925e-10, 1.562934642818092e-10, 1.435651597603282e-10, 1.212236422354351e-10, 9.602687395249276e-11, 6.810634695098017e-11, 6.920113093666914e-11, 7.880000124638187e-11, 8.226441750025515e-11, 6.093945819884539e-03, 4.790239930152893e-01, 2.355253845453262e-01, 1.25419944524765e-01, 1.869439780712129e-01, 2.19961866736412e-01, 2.409772574901581e-01, 2.613756656646729e-01, 2.501303255558014e-01, 1.584948301315308e-01, 1.286250054836273e-01, 1.229424327611923e-01, 1.235965117812157e-01, 1.250487565994263e-01, 1.258827596902847e-01, 1.261579543352127e-01, 1.261643022298813e-01, 1.261148303747177e-01, 1.261274665594101e-01, 1.261482685804367e-01, 1.260549873113632e-01, 1.260094791650772e-01, 1.260017454624176e-01, 1.260068714618683e-01, 1.260200887918472e-01, 1.260240972042084e-01, 1.260288059711456e-01, 1.260308176279068e-01, 1.260318607091904e-01, 1.260029673576355e-01, 1.076097960739375e-10, 1.331887378164254e-10, 6.857692191886144e-11, 7.29282346317861e-12, 3.301660973700077e-13, 5.941370312401162e-11, 1.034581934011847e-10, 1.302978697159674e-10, 1.477956784734502e-10, 1.331049853670052e-10, 1.233148166912557e-10, 1.246669018017954e-10, 8.707304322008724e-11, 1.4056021624409e-10, 1.263811555407557e-10, 1.240534619473267e-10, 1.457696741091755e-10, 8.797557127238128e-11, 6.54769918839726e-11, 6.831539500762318e-11, 2.420409705994331e-10, 1.546089783976967e-10, 8.883631229400635e-02, 1.695755422115326e-01, 1.392542719841003e-01, 1.924186795949936e-01, 2.069043517112732e-01, 1.883659064769745e-01, 1.482793241739271e-01, 1.302771270275117e-01, 1.252676993608475e-01, 1.247343122959137e-01, 1.253471970558167e-01, 1.258372068405151e-01, 1.260566115379333e-01, 1.261062473058701e-01, 1.260769367218018e-01, 1.2603959441185e-01, 1.260310262441635e-01, 1.260241121053696e-01, 1.260243058204651e-01, 1.260361224412918e-01, 1.260417848825455e-01, 1.260422617197037e-01, 1.260385662317276e-01, 1.260457634925842e-01, 1.260403096675873e-01, 1.260143518447876e-01, 1.260518431663513e-01, 1.260064989328384e-01, 9.299896269743257e-11, 8.56675147486996e-11, 8.620634761591361e-11, 9.841665676857403e-11, 1.765417950716497e-10, 2.633404605489886e-10, 1.991726367167601e-10, 2.116767698623345e-11, 1.647727650183686e-18, 3.04368266701438e-11, 7.331960732992471e-11]
 hvac.VAVBox[5].vav.m_flow_turbulent=[1.618800044059753e+00, 1.618800044059753e+00]
-hvac.conAHU.VEffAirOut_flow_min=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.344280362129211e-01, 1.102639436721801e+00, 9.715641736984253e-01, 9.214510321617126e-01, 7.607907652854919e-01, 7.393175363540649e-01, 7.642143368721008e-01, 7.94097900390625e-01, 8.009231686592102e-01, 7.993564605712891e-01, 7.97762393951416e-01, 7.967603802680969e-01, 7.964362502098083e-01, 7.964408397674561e-01, 7.965081334114075e-01, 7.945657968521118e-01, 6.838011145591736e-01, 6.838257312774658e-01, 6.838370561599731e-01, 6.838386654853821e-01, 6.838371753692627e-01, 6.838337182998657e-01, 6.838327646255493e-01, 6.83831512928009e-01, 6.838310360908508e-01, 6.838307976722717e-01, 7.966522574424744e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.10699999332428e+00, 7.957197427749634e-01, 8.581672310829163e-01, 8.526837229728699e-01, 8.371156454086304e-01, 8.069052100181577e-01, 7.990140914916992e-01, 7.948272228240967e-01, 7.975477576255798e-01, 6.840184926986694e-01, 6.838756203651428e-01, 6.838207840919495e-01, 6.83810830116272e-01, 6.838197112083435e-01, 6.838294267654419e-01, 6.838312149047852e-01, 6.838329434394836e-01, 6.838327050209045e-01, 6.838296055793762e-01, 6.838281750679016e-01, 6.838281154632568e-01, 6.838291883468628e-01, 6.838259100914001e-01, 6.838288903236389e-01, 6.838347315788269e-01, 6.838254332542419e-01, 7.966479063034058e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-hvac.conAHU.VAirOut_flow=[0e+00, 1.450268140156764e-17, 1.488433095567103e-17, 1.373938229336086e-17, 1.18311345228439e-17, 9.159587644120164e-18, 6.488041592577038e-18, 6.488041592577038e-18, 7.251340700783821e-18, 8.014639808990603e-18, 1.843152075409193e-09, 5.655260437720244e-08, 1.13606901663843e-08, 6.849007215350866e-03, 5.083224177360547e-01, 9.274101853370667e-01, 9.654526710510254e-01, 8.912770152091977e-01, 7.706427574157715e-01, 6.915635466575623e-01, 7.199272513389587e-01, 7.735027670860291e-01, 7.969197630882263e-01, 8.020763993263245e-01, 8.003438115119934e-01, 7.980435490608215e-01, 7.967820763587952e-01, 7.964249849319458e-01, 7.951424717903137e-01, 7.158673405647278e-01, 6.924002766609192e-01, 6.861498951911926e-01, 6.844791769981384e-01, 6.840402483940125e-01, 6.839203834533691e-01, 6.838687062263489e-01, 6.838541626930237e-01, 6.838421821594238e-01, 6.838375329971313e-01, 7.389578819274902e-01, 1.030453630643034e-17, 1.259443363105069e-17, 6.488041592577038e-18, 7.632990048092059e-19, 0e+00, 5.724742484370256e-18, 9.541237198223556e-18, 1.221278407694729e-17, 1.412103184746425e-17, 1.259443363105069e-17, 1.18311345228439e-17, 1.18311345228439e-17, 8.396289363093994e-18, 1.297608318515408e-17, 1.18311345228439e-17, 1.18311345228439e-17, 1.373938229336094e-17, 8.396289363093994e-18, 6.106392038473647e-18, 6.488041592577038e-18, 2.289896993748102e-17, 1.450268140156764e-17, 1.011965977681939e-08, 2.066316083073616e-02, 4.079883098602295e-01, 7.105621695518494e-01, 8.40819239616394e-01, 8.413434028625488e-01, 7.978782057762142e-01, 7.775490880012512e-01, 7.824838757514953e-01, 7.936400175094604e-01, 7.361312508583069e-01, 6.991924643516541e-01, 6.886387467384338e-01, 6.852660179138184e-01, 6.841402649879456e-01, 6.838303804397583e-01, 6.838194727897644e-01, 6.838011145591736e-01, 6.838315725326538e-01, 6.83860182762146e-01, 6.838515400886536e-01, 6.838332414627075e-01, 6.838085651397705e-01, 6.841429471969604e-01, 6.838013529777527e-01, 6.839596629142761e-01, 6.839118599891663e-01, 7.092567086219788e-01, 9.159587644120164e-18, 8.396289363093994e-18, 8.396289363093994e-18, 9.922886752326947e-18, 1.679257872618799e-17, 2.480721770799798e-17, 1.870082484234372e-17, 1.908247563721803e-18, 0e+00, 3.053196019236824e-18, 6.86969114668043e-18]
-hvac.conAHU.yOutDam=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.002617299556732e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.889138042926788e-01, 9.584289193153381e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-hvac.conAHU.ecoCon.modRel.uOutDam_min=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.002617299556732e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.889138042926788e-01, 9.584289193153381e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-hvac.conAHU.ecoCon.modRel.uOutDam_max=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.002617299556732e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.889138042926788e-01, 9.584289193153381e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-hvac.conAHU.yRetDam=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.487550258636466e-01, 7.69231379032135e-01, 7.880491018295288e-01, 8.369503617286684e-01, 8.872827887535095e-01, 8.658269047737122e-01, 8.073558807373047e-01, 7.710303664207458e-01, 7.627512216567993e-01, 7.646617293357849e-01, 7.679142951965332e-01, 7.698118090629578e-01, 7.704408168792725e-01, 7.704740166664124e-01, 7.711480259895325e-01, 8.121412396430969e-01, 8.247482180595398e-01, 8.281302452087402e-01, 8.290538787841797e-01, 8.29317569732666e-01, 8.294230699539185e-01, 8.294636607170105e-01, 8.294851779937744e-01, 8.294975757598877e-01, 8.295031785964966e-01, 7.993046045303345e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 8.417900800704956e-01, 7.98899233341217e-01, 8.00542414188385e-01, 7.989733219146727e-01, 7.845463752746583e-01, 7.734742164611818e-01, 7.676889896392822e-01, 7.991586923599243e-01, 8.204164505004883e-01, 8.268896341323853e-01, 8.289108276367188e-01, 8.294564485549927e-01, 8.295254707336426e-01, 8.295093178749084e-01, 8.295010328292847e-01, 8.294851779937744e-01, 8.295027613639832e-01, 8.295235633850098e-01, 8.295350074768066e-01, 8.295381665229797e-01, 8.293737173080444e-01, 8.295466899871826e-01, 8.293862342834473e-01, 8.295183777809143e-01, 8.151431679725647e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+hvac.conAHU.VEffAirOut_flow_min=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.323133826255798e-01, 1.103965759277344e+00, 9.750580787658691e-01, 9.233920574188232e-01, 7.61072039604187e-01, 7.39488422870636e-01, 7.641836404800415e-01, 7.940324544906616e-01, 8.008980751037598e-01, 7.99351692199707e-01, 7.977666258811951e-01, 7.967641949653625e-01, 7.964380979537964e-01, 7.964411973953247e-01, 7.965079545974731e-01, 7.945654988288879e-01, 6.838011145591736e-01, 6.838257312774658e-01, 6.838370561599731e-01, 6.838386654853821e-01, 6.838371753692627e-01, 6.838337182998657e-01, 6.838327646255493e-01, 6.83831512928009e-01, 6.838310360908508e-01, 6.838307976722717e-01, 7.966521978378296e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.10699999332428e+00, 7.883020639419556e-01, 8.55194091796875e-01, 8.549110889434814e-01, 8.393377065658569e-01, 8.079755306243894e-01, 7.989349961280823e-01, 7.945314645767212e-01, 7.974908351898193e-01, 6.840251088142395e-01, 6.838799118995667e-01, 6.838225126266479e-01, 6.838110685348511e-01, 6.838194727897644e-01, 6.838291883468628e-01, 6.838310956954956e-01, 6.838329434394836e-01, 6.838327646255493e-01, 6.838296055793762e-01, 6.838281750679016e-01, 6.838281154632568e-01, 6.838291883468628e-01, 6.838259100914001e-01, 6.838288903236389e-01, 6.838347315788269e-01, 6.838254332542419e-01, 7.966481447219849e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+hvac.conAHU.VAirOut_flow=[0e+00, 1.450268140156764e-17, 1.488433095567103e-17, 1.373938229336086e-17, 1.18311345228439e-17, 9.159587644120164e-18, 6.488041592577038e-18, 6.488041592577038e-18, 7.251340700783821e-18, 8.014639808990603e-18, 5.798821978153512e-10, 5.916995604593467e-08, 1.128289994767329e-08, 6.785596255213022e-03, 5.057027935981763e-01, 9.297044277191162e-01, 9.679575562477112e-01, 8.929656744003291e-01, 7.715246677398682e-01, 6.922248601913452e-01, 7.199707627296448e-01, 7.733861207962036e-01, 7.968334555625916e-01, 8.020458221435547e-01, 8.00341784954071e-01, 7.980493903160095e-01, 7.96786904335022e-01, 7.964271306991577e-01, 7.951420545578003e-01, 7.158051133155823e-01, 6.923836469650269e-01, 6.861453056335449e-01, 6.844779253005981e-01, 6.840398907661438e-01, 6.839202642440796e-01, 6.838686466217041e-01, 6.838541626930237e-01, 6.838421821594238e-01, 6.838375329971313e-01, 7.388821840286255e-01, 1.030453630643034e-17, 1.259443363105069e-17, 6.488041592577038e-18, 7.632990048092059e-19, 0e+00, 5.724742484370256e-18, 9.541237198223556e-18, 1.297608318515408e-17, 1.412103184746425e-17, 1.259443363105069e-17, 1.18311345228439e-17, 1.18311345228439e-17, 8.396289363093994e-18, 1.335773273925747e-17, 1.144948496874051e-17, 1.18311345228439e-17, 1.373938229336094e-17, 8.396289363094053e-18, 6.488041592577038e-18, 6.488041592577038e-18, 2.289896993748102e-17, 1.450268140156764e-17, 6.717332468042514e-09, 2.170953713357449e-02, 4.053347110748291e-01, 7.009474635124207e-01, 8.407127261161804e-01, 8.451125621795654e-01, 8.01303923130035e-01, 7.780541777610779e-01, 7.818403244018554e-01, 7.931607961654663e-01, 7.362643480300903e-01, 6.992439031600952e-01, 6.886758804321289e-01, 6.852903366088867e-01, 6.841515898704529e-01, 6.838334202766418e-01, 6.838191151618958e-01, 6.838001012802124e-01, 6.838309168815613e-01, 6.838600039482117e-01, 6.838515400886536e-01, 6.838333010673523e-01, 6.838086247444153e-01, 6.841429471969604e-01, 6.838013529777527e-01, 6.839596629142761e-01, 6.839118003845215e-01, 7.095146775245667e-01, 8.777938090016773e-18, 8.396289363093994e-18, 8.014639808990603e-18, 9.541237198223556e-18, 1.679257872618799e-17, 2.480721770799798e-17, 1.870082484234372e-17, 2.289896911030041e-18, 0e+00, 2.671546465133432e-18, 6.488041592577038e-18]
+hvac.conAHU.yOutDam=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.995402157306671e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.887464642524719e-01, 9.554212093353271e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+hvac.conAHU.ecoCon.modRel.uOutDam_min=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.995402157306671e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.887464642524719e-01, 9.554212093353271e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+hvac.conAHU.ecoCon.modRel.uOutDam_max=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.995402157306671e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.887464642524719e-01, 9.554212093353271e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+hvac.conAHU.yRetDam=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.493229389190665e-01, 7.671731114387512e-01, 7.860631346702576e-01, 8.354911804199221e-01, 8.865204453468323e-01, 8.656753301620483e-01, 8.075000643730164e-01, 7.711479663848877e-01, 7.627992033958435e-01, 7.646668553352356e-01, 7.67906665802002e-01, 7.698049545288086e-01, 7.704375982284546e-01, 7.70473301410675e-01, 7.711487412452698e-01, 8.12174916267395e-01, 8.2475745677948e-01, 8.281328678131104e-01, 8.29054594039917e-01, 8.293177485466003e-01, 8.29423189163208e-01, 8.294636607170105e-01, 8.294851779937744e-01, 8.294975757598877e-01, 8.295031785964966e-01, 7.993442416191101e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 8.432227373123169e-01, 7.96393871307373e-01, 7.981933355331421e-01, 7.983766794204711e-01, 7.850604653358461e-01, 7.740609645843507e-01, 7.679363489151001e-01, 7.990323901176453e-01, 8.203436136245728e-01, 8.268494606018066e-01, 8.288937211036682e-01, 8.294523358345032e-01, 8.295263051986694e-01, 8.295108675956726e-01, 8.295019268989563e-01, 8.294854760169983e-01, 8.295027613639832e-01, 8.29523503780365e-01, 8.295349478721619e-01, 8.29538106918335e-01, 8.293737173080444e-01, 8.295466899871826e-01, 8.293862342834473e-01, 8.295183777809143e-01, 8.150023818016052e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Examples_VAVReheat_Validation_Guideline36SteadyState.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Examples_VAVReheat_Validation_Guideline36SteadyState.txt
index 8c71d84c970..2f19584b0ab 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Examples_VAVReheat_Validation_Guideline36SteadyState.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Examples_VAVReheat_Validation_Guideline36SteadyState.txt
@@ -1,14 +1,14 @@
-last-generated=2023-03-03
+last-generated=2024-06-28
 statistics-initialization=
 {
   "linear": "0",
-  "nonlinear": "1, 3, 0, 0, 0, 1, 1, 0, 0, 1, 16, 16, 16, 16, 1",
+  "nonlinear": "1, 4, 0, 16, 1, 1, 0, 0, 0, 1, 16, 16, 16, 1",
   "numerical Jacobians": "0"
 }
 statistics-simulation=
 {
-  "linear": "0, 0, 4, 13, 0, 0, 0, 13, 0, 13, 0, 13, 0, 0, 0, 8, 0, 0, 0, 0",
-  "nonlinear": "0, 0, 0, 1, 0, 5, 0, 0, 0, 0, 0, 1, 0, 1, 1",
+  "linear": "0, 0, 0, 0, 4, 0, 0, 0, 0, 13, 0, 8, 0, 0, 13, 0, 13, 0, 13, 0",
+  "nonlinear": "5, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1",
   "number of continuous time states": "177",
   "numerical Jacobians": "0"
 }
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Examples_VAVReheat_Validation_TraceSubstance.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Examples_VAVReheat_Validation_TraceSubstance.txt
index b5d6d58a1dd..2dea1631c17 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Examples_VAVReheat_Validation_TraceSubstance.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Examples_VAVReheat_Validation_TraceSubstance.txt
@@ -1,22 +1,22 @@
-last-generated=2024-06-04
+last-generated=2024-06-28
 statistics-initialization=
 {
   "linear": "0",
-  "nonlinear": "1, 0, 3, 0, 0, 16, 1, 1, 2, 0, 0, 0, 1, 16, 16, 16, 1",
+  "nonlinear": "1, 0, 3, 0, 0, 1, 1, 0, 2, 0, 0, 1, 16, 16, 16, 16, 1",
   "numerical Jacobians": "0"
 }
 statistics-simulation=
 {
-  "linear": "0, 0, 0, 0, 0, 0, 4, 13, 0, 0, 0, 13, 0, 13, 0, 0, 0, 13, 0, 0, 0, 8, 0, 0",
-  "nonlinear": "0, 5, 0, 0, 0, 2, 0, 0, 0, 1, 1, 1, 0, 1",
+  "linear": "0, 0, 0, 0, 0, 0, 4, 13, 0, 0, 0, 13, 0, 0, 0, 13, 0, 0, 0, 13, 0, 0, 0, 8",
+  "nonlinear": "0, 2, 0, 5, 0, 0, 0, 0, 1, 0, 0, 1, 1, 1",
   "number of continuous time states": "182",
   "numerical Jacobians": "0"
 }
 time=[4.4928e+06, 4.6656e+06]
-hvac.VOut1.V_flow=[0e+00, 3.471488150808e-07, 3.20175984143134e-07, 2.943068921013037e-07, 2.695492105431186e-07, 1.99913003484653e-07, 1.121139766269152e-07, 1.060245085682254e-07, 1.302398345615074e-07, 1.103439257121863e-07, 6.645824015549807e-08, 3.405263377942447e-08, 2.1267955327034e+00, 5.7239961341276e-01, 8.85335898399353e-01, 8.715847611427308e-01, 8.662255454063416e-01, 1.166982469558716e+00, 1.251228175163269e+00, 1.338765687942505e+00, 1.437180050412553e+00, 1.557578496932983e+00, 1.694696073532104e+00, 1.846552844047546e+00, 1.926517176628113e+00, 1.936926364898682e+00, 2.15153377532959e+00, 2.378439998626709e+00, 2.314821996688843e+00, 1.791980085372925e+00, 1.576862168312073e+00, 1.442741990089417e+00, 1.335164060592651e+00, 1.243790493011475e+00, 1.174955177307129e+00, 1.142589616775513e+00, 1.116042575836182e+00, 1.088995261192322e+00, 1.089268317222595e+00, 1.090886793136597e+00, 6.58835885457348e-08, 4.497815595527754e-08, 3.262866584918811e-08, 3.575558451984762e-08, 3.875779242434874e-08, 3.300142168427556e-08, 2.930054961325368e-08, 2.970067086494055e-08, 2.884086995891266e-08, 2.105251084572046e-08, 1.462306897792587e-08, 1.291221206400905e-08, 1.250456989509985e-08, 2.566374199375332e-08, 4.316329082598713e-08, 2.906544374070563e-08, 1.569941918688755e-08, 2.626846608677624e-08, 1.322355120692009e-07, 1.520790692666196e-07, 9.805914800153914e-08, 9.628639759284851e-08, 1.463255360126495e+00, 1.424965832233429e+00, 1.898181471748526e+00, 2.130455350875855e+00, 2.282875823974609e+00, 2.398703155517578e+00, 2.411884228040666e+00, 2.402624683380127e+00, 2.399082245875378e+00, 2.398102579116821e+00, 2.397847061157226e+00, 2.397649707794189e+00, 2.397119417190552e+00, 2.395327568054199e+00, 2.399387102127075e+00, 2.399604206085205e+00, 2.39876033782959e+00, 2.398564615249634e+00, 2.398566961288452e+00, 2.397694416046142e+00, 2.396870565414429e+00, 2.396920461654663e+00, 2.397775182723999e+00, 2.398191642761231e+00, 2.398289813995361e+00, 2.398262042999268e+00, 2.398114643096924e+00, 2.397937536239624e+00, 4.795736168944131e-01, 3.678851498989388e-07, 4.026871897622186e-07, 4.517225636391231e-07, 4.44115618165597e-07, 3.334658799758472e-07, 2.719603651257785e-07, 3.113223726813885e-07, 3.503012874261913e-07, 4.202706270461931e-07, 4.745859314425616e-07]
-hvac.senSupFlo.V_flow=[6.574138369103144e-12, -2.671601744275165e-09, -1.780219660574298e-10, 1.502658558092662e-04, 1.480231896877626e-06, -2.208497051015002e-07, -9.827303955489697e-08, 6.763895299854994e-08, 1.863155233650105e-08, -8.812532229285352e-08, -8.225251377780295e-08, -4.696405454751584e-08, 5.653099784851074e+00, 1.817449985924414e+00, 2.135701451301575e+00, 2.311973857879638e+00, 2.369331455230713e+00, 2.377153539657593e+00, 2.387274751663208e+00, 2.391734495162964e+00, 2.394132781436033e+00, 2.396243410110474e+00, 2.399119596481323e+00, 2.40225962638855e+00, 2.401722192764282e+00, 2.399470329284668e+00, 2.412422904968262e+00, 2.431682558059693e+00, 2.395431146621704e+00, 2.30631947517395e+00, 2.269967603683472e+00, 2.260003900527954e+00, 2.257324714660645e+00, 2.256961326599121e+00, 2.25661810874939e+00, 2.255006885528565e+00, 2.253263282775879e+00, 2.250545949935913e+00, 2.257517232894898e+00, 2.259251079559326e+00, -4.37281520869421e-08, 1.583282357842108e-07, -7.143094649109116e-09, 2.273637328187306e-08, -6.38533260932661e-09, -9.074098095140925e-09, -2.050583169932453e-10, 5.609418867180693e-09, -6.100767233618853e-09, -1.518254109100781e-08, -4.252940666304994e-09, -9.621861041253509e-10, 2.524961311145546e-09, 7.629495200944801e-08, 1.53991784657137e-09, -3.874642686696461e-08, -1.099552227438322e-08, 1.106889388324817e-07, 2.908524980682614e-07, -1.130564334062001e-07, -5.565359195713881e-08, 3.308981220584428e-08, 5.706996383666993e+00, 1.829448204040527e+00, 2.139108501519146e+00, 2.31705641746521e+00, 2.382355098724365e+00, 2.412605953216553e+00, 2.410694535503763e+00, 2.401439828872681e+00, 2.397899197072399e+00, 2.396920261383057e+00, 2.396664743423462e+00, 2.396467590332031e+00, 2.395937376022339e+00, 2.39414644241333e+00, 2.398204183578491e+00, 2.39842113494873e+00, 2.397577543258667e+00, 2.397381820678711e+00, 2.397384166717529e+00, 2.396512222290039e+00, 2.395688724517822e+00, 2.395738620758057e+00, 2.396592798233032e+00, 2.397009086608887e+00, 2.397107257843018e+00, 2.397079486846924e+00, 2.39693208694458e+00, 2.39675518989563e+00, 4.793557238663197e-01, 7.705891732712189e-08, 1.363492128803046e-07, 1.533866759473312e-07, -1.695307327054252e-07, -2.056384147408608e-07, 1.672999403012909e-08, 1.722859849451197e-07, 4.242006159671518e-08, 2.634362579101435e-07, 1.020548836550006e-07]
-flo.cor.air.vol.C[1]=[6.077586440369487e-04, 6.181496405042708e-04, 6.289238459430635e-04, 6.393244140781463e-04, 6.493908539414406e-04, 6.592127378098666e-04, 6.690265680663288e-04, 6.788303283974528e-04, 6.883642612956465e-04, 6.976565159857273e-04, 7.069185026921332e-04, 7.161683053709567e-04, 6.696994998492301e-04, 6.607647426821038e-04, 6.57172731589526e-04, 6.531963124871254e-04, 6.504562473855913e-04, 6.533054797910154e-04, 7.099994551390409e-04, 8.107572607696056e-04, 8.888609091471024e-04, 9.265392925590277e-04, 9.374820999801159e-04, 9.310933016240596e-04, 9.173549222759903e-04, 9.079960873350501e-04, 8.803936443291605e-04, 8.50211950019002e-04, 8.596933633089065e-04, 8.873059670440852e-04, 9.282988728955388e-04, 9.6711685648188e-04, 1.001890175975859e-03, 1.033058087341487e-03, 1.062940345145762e-03, 1.089514815248549e-03, 1.10233492217958e-03, 1.078546061180532e-03, 1.021153829060495e-03, 9.434662014245987e-04, 8.939818560409913e-04, 9.072183631360531e-04, 9.206823725253344e-04, 9.324773494154215e-04, 9.416239708662033e-04, 9.492330951616168e-04, 9.560041571967303e-04, 9.622489847242832e-04, 9.67683766502887e-04, 9.731628303416073e-04, 9.804924484342337e-04, 9.889002237468958e-04, 9.971421537920834e-04, 1.00456069689244e-03, 1.011590077541769e-03, 1.017797389067709e-03, 1.024513053707778e-03, 1.031409339047968e-03, 1.03413017001003e-03, 1.033438937738538e-03, 1.032823254354298e-03, 1.032786648720503e-03, 9.022602159529925e-04, 8.024767879396677e-04, 7.20679697789307e-04, 6.698778015561402e-04, 6.434118468314409e-04, 6.376189040020108e-04, 6.829146709735353e-04, 7.589539978653193e-04, 8.075974168308193e-04, 8.279947098344565e-04, 8.371804840862751e-04, 8.411136921495199e-04, 8.424863358959555e-04, 8.428433793596923e-04, 8.269793051294982e-04, 8.208217611536384e-04, 8.454521908424794e-04, 8.58221435919404e-04, 8.649221621453762e-04, 8.680102997459471e-04, 8.69143686722964e-04, 8.688914752565325e-04, 8.681038650684059e-04, 8.68859700858593e-04, 8.604934462346136e-04, 8.25508595444262e-04, 7.778569729998707e-04, 7.25891669280827e-04, 6.98945124167949e-04, 7.112115458585322e-04, 7.234573783352971e-04, 7.339337933808565e-04, 7.435340574011207e-04, 7.526036933995783e-04, 7.613303582184017e-04, 7.688697963021695e-04, 7.742916606366634e-04, 7.784034684300423e-04, 7.81834649387747e-04]
-flo.sou.air.vol.C[1]=[6.077586440369487e-04, 6.175615987740457e-04, 6.274831551127135e-04, 6.371558737009764e-04, 6.465895101428031e-04, 6.559780333191157e-04, 6.657138536684215e-04, 6.752410391345621e-04, 6.84213622007519e-04, 6.931756297126413e-04, 7.024365128017962e-04, 7.119292789138854e-04, 6.69514371547848e-04, 6.6096472822256e-04, 6.574215414002538e-04, 6.533521809615195e-04, 6.50563498493284e-04, 6.534765195101499e-04, 7.101239054463804e-04, 8.10973106417805e-04, 8.895059113737083e-04, 9.274044097401201e-04, 9.384172386489809e-04, 9.320279792882502e-04, 9.178384463302791e-04, 9.083714685402811e-04, 8.809929015114904e-04, 8.505663601681591e-04, 8.603504998609423e-04, 8.962852787226438e-04, 9.486479684710503e-04, 9.904618654400111e-04, 1.027621678076684e-03, 1.061279699206352e-03, 1.09300805721432e-03, 1.121807773597539e-03, 1.137927668169141e-03, 1.116787698119879e-03, 1.064802575856447e-03, 9.973140573129057e-04, 9.477713532279025e-04, 9.380078641697765e-04, 9.424609318375587e-04, 9.5178795279935e-04, 9.619644726626575e-04, 9.72828536760062e-04, 9.846871346235275e-04, 9.93344709277153e-04, 9.971864381805062e-04, 9.983535809442402e-04, 9.991319384425879e-04, 1.001319950446487e-03, 1.00561854429543e-03, 1.011045426130295e-03, 1.015193033963442e-03, 1.012476230971515e-03, 1.018078844062984e-03, 1.018284275196493e-03, 1.001936546526849e-03, 9.931066446006297e-04, 9.953816654160619e-04, 9.974979842081665e-04, 8.952638763003051e-04, 8.027979056350887e-04, 7.140777760611139e-04, 6.612882832996547e-04, 6.350325490348041e-04, 6.302519608289004e-04, 6.717126761742458e-04, 7.353669079020619e-04, 7.723482585231755e-04, 7.92112578637898e-04, 7.971094851382077e-04, 7.963370787911117e-04, 7.990084472112357e-04, 8.048929157666862e-04, 7.942384271882474e-04, 7.860055984929204e-04, 8.095277450047433e-04, 8.262882195413112e-04, 8.359060273505747e-04, 8.41682672034949e-04, 8.344093756750226e-04, 8.161117346026003e-04, 8.073341916315258e-04, 8.025062270462513e-04, 7.972248294390738e-04, 7.738671521656215e-04, 7.355656544677914e-04, 6.921865907497704e-04, 6.771279964596033e-04, 6.961208418942988e-04, 7.073860079981387e-04, 7.165471743792296e-04, 7.254260010086e-04, 7.349245483055711e-04, 7.442594715394079e-04, 7.510844245553017e-04, 7.554849633015692e-04, 7.591403555124998e-04, 7.621410768479109e-04]
-flo.eas.air.vol.C[1]=[6.077586440369487e-04, 6.181274657137692e-04, 6.290972162969411e-04, 6.39604451134801e-04, 6.497631990350783e-04, 6.596329621970654e-04, 6.693972297944128e-04, 6.792040471918881e-04, 6.888486933894455e-04, 6.981943105347455e-04, 7.07382895052433e-04, 7.166418898850679e-04, 6.650072336196899e-04, 6.588296238648689e-04, 6.532297469675541e-04, 6.480707786977291e-04, 6.454029842279851e-04, 6.480409158393741e-04, 6.991533725522459e-04, 7.864180137403309e-04, 8.490702374312053e-04, 8.728395495563745e-04, 8.7333730654791e-04, 8.583036996424198e-04, 8.374031633138657e-04, 8.283251663669944e-04, 8.036452764645219e-04, 7.725083664990961e-04, 7.871972653083503e-04, 8.17020470276475e-04, 8.62508057616651e-04, 8.921484020538628e-04, 9.220916987396777e-04, 9.53279179520905e-04, 9.818137763068079e-04, 1.004713075235486e-03, 1.016325429081917e-03, 9.981294255703688e-04, 9.588668588548898e-04, 8.876697579398751e-04, 8.66227784558366e-04, 8.951284852810204e-04, 9.10648622084409e-04, 9.229886904358864e-04, 9.323820937424898e-04, 9.406414697878063e-04, 9.480780991725624e-04, 9.542327513918281e-04, 9.596030367538333e-04, 9.672949719242752e-04, 9.778599487617612e-04, 9.87029504030943e-04, 9.940502466633915e-04, 9.966694470494985e-04, 9.989427076652646e-04, 1.006042351946235e-03, 1.016161926090717e-03, 1.023657899349928e-03, 1.033368608914316e-03, 1.036825799383223e-03, 1.036632130853832e-03, 1.033983994275332e-03, 8.842356293462217e-04, 7.903205952607095e-04, 7.056320043511162e-04, 6.521044997498393e-04, 6.300610653124749e-04, 6.275459611788392e-04, 6.696466576609622e-04, 7.296212064102293e-04, 7.59377158829011e-04, 7.641772530041635e-04, 7.655295287258923e-04, 7.659903774037957e-04, 7.657850929535926e-04, 7.660588598810136e-04, 7.577234716154634e-04, 7.52987409941852e-04, 7.819672091864049e-04, 7.870158180594445e-04, 7.850078982301056e-04, 7.837361819110811e-04, 7.839303556829691e-04, 7.847281242720782e-04, 7.844859780743718e-04, 7.836840464733541e-04, 7.814292516559363e-04, 7.557823625393211e-04, 7.271830295212567e-04, 6.872250302694737e-04, 6.80173677392304e-04, 7.039835676550865e-04, 7.163447351194918e-04, 7.28223854675889e-04, 7.405578391626478e-04, 7.506256341002881e-04, 7.597916247323156e-04, 7.672250224277377e-04, 7.724892813712359e-04, 7.800842449069023e-04, 7.848615059629083e-04]
-flo.nor.air.vol.C[1]=[6.077586440369487e-04, 6.181899993680418e-04, 6.292459485121071e-04, 6.3988997368142e-04, 6.501563056372106e-04, 6.601102417334914e-04, 6.699161068536341e-04, 6.796997552737594e-04, 6.893334211781621e-04, 6.987103261053562e-04, 7.079496746882797e-04, 7.171877333894372e-04, 6.707171816378832e-04, 6.610478108780364e-04, 6.574567873030901e-04, 6.53373240493238e-04, 6.505786441266537e-04, 6.534911529161036e-04, 7.10143712349236e-04, 8.109920541755855e-04, 8.895364044627001e-04, 9.275094303302467e-04, 9.386497410014272e-04, 9.322328260168433e-04, 9.180546109564602e-04, 9.086059289984405e-04, 8.81324599031359e-04, 8.509648195467889e-04, 8.610740443691611e-04, 8.877752372063696e-04, 9.244955843314528e-04, 9.578439337201417e-04, 9.894171217456459e-04, 1.020065555348992e-03, 1.049498468637466e-03, 1.075150445103645e-03, 1.087970789521933e-03, 1.057878704741597e-03, 1.005751313641667e-03, 9.344529267400503e-04, 8.837330573613112e-04, 8.961412450298667e-04, 9.105902328155935e-04, 9.210476884618402e-04, 9.287905460223556e-04, 9.367209509946406e-04, 9.440403408370912e-04, 9.500946477055549e-04, 9.553135023452342e-04, 9.620198491029441e-04, 9.719449444673955e-04, 9.814667934551836e-04, 9.901777841150761e-04, 1.000167913734913e-03, 1.012347592040896e-03, 1.019641687162221e-03, 1.026226291432977e-03, 1.033284901641309e-03, 1.037521120160818e-03, 1.038115876726806e-03, 1.037236535921693e-03, 1.037033530883491e-03, 9.052657056599856e-04, 8.040500897914171e-04, 7.230367907349491e-04, 6.713298964314163e-04, 6.442765216343104e-04, 6.380649050697684e-04, 6.835443471839623e-04, 7.600802462548017e-04, 8.08959775746857e-04, 8.292489778250456e-04, 8.379344013519585e-04, 8.416047925129533e-04, 8.431682991795242e-04, 8.438880904577672e-04, 8.289698674343527e-04, 8.224820205941796e-04, 8.480062871240079e-04, 8.608074812218547e-04, 8.663101354613901e-04, 8.687179279513657e-04, 8.698016405105591e-04, 8.702784054912627e-04, 8.704446349292994e-04, 8.704758482053875e-04, 8.628895319998264e-04, 8.289703633636236e-04, 7.81950568780303e-04, 7.292568497359752e-04, 7.027595071122051e-04, 7.151505025103688e-04, 7.271095481701195e-04, 7.377987494692206e-04, 7.474591443315149e-04, 7.564174942672252e-04, 7.649346510879696e-04, 7.724730111658573e-04, 7.781805563718081e-04, 7.8240160131827e-04, 7.861364865675569e-04]
-flo.wes.air.vol.C[1]=[6.077586440369487e-04, 6.181047717109322e-04, 6.290940172038972e-04, 6.396042974665761e-04, 6.497638230212033e-04, 6.596631254069507e-04, 6.695203902199865e-04, 6.793509237468243e-04, 6.888986169360578e-04, 6.982368510216474e-04, 7.075715810060501e-04, 7.155795209109783e-04, 6.678313342854381e-04, 6.600673284807827e-04, 6.557320919819177e-04, 6.512272055260837e-04, 6.483890977688134e-04, 6.511396146379411e-04, 7.057488453574479e-04, 8.01454356405884e-04, 8.73480003012611e-04, 9.050039504654706e-04, 9.111133613623678e-04, 9.014759724959731e-04, 8.852611598558724e-04, 8.753259899094701e-04, 8.498880313709378e-04, 8.192307921126485e-04, 8.281985577195883e-04, 8.565087569877506e-04, 8.941506966948509e-04, 9.285844233818352e-04, 9.599176631309093e-04, 9.948792029172181e-04, 1.025294214487076e-03, 1.048531220294535e-03, 1.060723257251084e-03, 1.037565311416984e-03, 9.900227095931769e-04, 9.159264271147549e-04, 8.841434373982521e-04, 9.084328170865775e-04, 9.229013603180647e-04, 9.349335636943579e-04, 9.443714679218828e-04, 9.520449093542993e-04, 9.587433375418186e-04, 9.647525823675096e-04, 9.700218332000076e-04, 9.75048360414803e-04, 9.815794182941318e-04, 9.896906185895204e-04, 9.980517532676458e-04, 1.005839477293193e-03, 1.012934963218868e-03, 1.019400381483138e-03, 1.025877268984914e-03, 1.032768506556749e-03, 1.035545784980059e-03, 1.03473087772727e-03, 1.033918792381883e-03, 1.034126351587474e-03, 8.965295879170298e-04, 7.986840000376106e-04, 7.157841889281145e-04, 6.631695781834423e-04, 6.376566621474921e-04, 6.331735709682106e-04, 6.77702268172887e-04, 7.482024608179927e-04, 7.888234104029834e-04, 8.02833503112197e-04, 8.077983441762627e-04, 8.096441673114896e-04, 8.105222741141916e-04, 8.107667090371251e-04, 7.981389597989619e-04, 7.928258203901351e-04, 8.188258460722864e-04, 8.301852806471288e-04, 8.332722587510944e-04, 8.337743720039726e-04, 8.348115207627416e-04, 8.346203481778503e-04, 8.337068790569901e-04, 8.333685807883739e-04, 8.285555057227611e-04, 8.001415221951902e-04, 7.572881481610239e-04, 7.101001380942762e-04, 6.910992437042296e-04, 7.105168560519815e-04, 7.238492392934859e-04, 7.343869027681649e-04, 7.438463787548244e-04, 7.530633010901511e-04, 7.619921350851655e-04, 7.696010824292898e-04, 7.750558783300221e-04, 7.789844856597483e-04, 7.824870990589261e-04]
+hvac.VOut1.V_flow=[0e+00, 3.471488150808e-07, 3.20175984143134e-07, 2.943073229744186e-07, 2.69549229869881e-07, 1.999139300323804e-07, 1.121131074910409e-07, 1.060427248944507e-07, 1.302393724245121e-07, 1.103623026210698e-07, 6.645836236884861e-08, 3.405305704973216e-08, 2.12689740896225e+00, 5.723881341643253e-01, 8.853349328041077e-01, 8.715849399566651e-01, 8.662294268608093e-01, 1.166984753608704e+00, 1.251227841377258e+00, 1.338765363693237e+00, 1.437180880961374e+00, 1.557578496932983e+00, 1.694696102142334e+00, 1.846553854942322e+00, 1.92651707649231e+00, 1.936940550804138e+00, 2.151567964553833e+00, 2.390979566574097e+00, 2.314492988586426e+00, 1.792019953727722e+00, 1.576752352714539e+00, 1.442743797302246e+00, 1.335165047645569e+00, 1.243791117668152e+00, 1.174956169128418e+00, 1.14259033203125e+00, 1.116044263839722e+00, 1.088998575210571e+00, 1.089261560440064e+00, 1.090886793136597e+00, 6.588303182700762e-08, 4.497818139270749e-08, 3.2628162216497e-08, 3.575581416725982e-08, 3.874778400358991e-08, 3.300115309912144e-08, 2.930073222273677e-08, 2.970063029295034e-08, 2.883332655301274e-08, 2.105026815968358e-08, 1.460662879537722e-08, 1.291211763287947e-08, 1.249763190713793e-08, 2.566071039211693e-08, 4.31493758412671e-08, 2.90653257906115e-08, 1.569754122243694e-08, 2.627191832971221e-08, 1.322479863574699e-07, 1.520780062946869e-07, 9.805861367340185e-08, 9.630471765831317e-08, 1.463617312908173e+00, 1.432230174541473e+00, 1.898184431516207e+00, 2.130464220046997e+00, 2.282943382263184e+00, 2.3987473487854e+00, 2.411885457174523e+00, 2.402625045776367e+00, 2.399082079463197e+00, 2.398102741241455e+00, 2.397847061157226e+00, 2.397649707794189e+00, 2.397119417190552e+00, 2.395327568054199e+00, 2.399387102127075e+00, 2.399604206085205e+00, 2.39876033782959e+00, 2.398564615249634e+00, 2.398566961288452e+00, 2.397694044113159e+00, 2.396870565414429e+00, 2.396920461654663e+00, 2.397775182723999e+00, 2.398191642761231e+00, 2.398289813995361e+00, 2.398262042999268e+00, 2.398114643096924e+00, 2.397937536239624e+00, 4.79573616894595e-01, 3.678851498989388e-07, 4.026877263640927e-07, 4.517079923971323e-07, 4.440962698026851e-07, 3.334605764848675e-07, 2.719653105032194e-07, 3.113216394012852e-07, 3.503450466268987e-07, 4.20270943095602e-07, 4.745500916669698e-07]
+hvac.senSupFlo.V_flow=[6.574138369103144e-12, -2.671285139754786e-09, -9.21923557939408e-08, 1.299895095871761e-04, 3.715494121792062e-07, -2.208094542766048e-07, -9.820870104704227e-08, 6.805105613238994e-08, 1.895906279969495e-08, -8.254297426901758e-08, -8.235032140646581e-08, -4.700832079151951e-08, 5.653107414245605e+00, 1.817439612291627e+00, 2.135704345703125e+00, 2.311976146697998e+00, 2.369332981109619e+00, 2.377156028747558e+00, 2.387275438308716e+00, 2.391734733581543e+00, 2.394132850674543e+00, 2.396243410110474e+00, 2.399119596481323e+00, 2.402259902954102e+00, 2.401722431182861e+00, 2.399471998214722e+00, 2.412423839569092e+00, 2.431588296890259e+00, 2.395432386398316e+00, 2.306363554000855e+00, 2.269978427886963e+00, 2.26001015663147e+00, 2.257327156066895e+00, 2.256962347030639e+00, 2.256618375778198e+00, 2.255008316040039e+00, 2.253264179229737e+00, 2.250546455383301e+00, 2.257517051696778e+00, 2.259252223968506e+00, -4.037783894323884e-08, -2.639685796737013e-06, -7.153040080254414e-09, 2.265923548350202e-08, -6.671476739938953e-09, -9.04934172041294e-09, -1.372633029461665e-10, 5.614666207520713e-09, -6.422714218246028e-09, -1.471075037784431e-08, -4.547123122478069e-09, -9.545081680606415e-10, 2.425606262512759e-09, 7.625462473015431e-08, -7.97894614379402e-09, -3.869114166832332e-08, -1.099444318301834e-08, 1.083506214172303e-07, 2.911181533704621e-07, -1.1128176481634e-07, -5.620671963413316e-08, 1.987049174489996e-07, 5.706918773651123e+00, 1.829084720611572e+00, 2.139100885391235e+00, 2.317058610916138e+00, 2.382353858947754e+00, 2.412602519989014e+00, 2.410695764637619e+00, 2.401440315246582e+00, 2.397898956248923e+00, 2.396920261383057e+00, 2.396664743423462e+00, 2.396467590332031e+00, 2.395937376022339e+00, 2.39414644241333e+00, 2.398204183578491e+00, 2.39842113494873e+00, 2.397577543258667e+00, 2.397381820678711e+00, 2.397384166717529e+00, 2.396511850357056e+00, 2.395688724517822e+00, 2.395738620758057e+00, 2.396592864990234e+00, 2.397009086608887e+00, 2.397107257843018e+00, 2.397079496383667e+00, 2.396932096481323e+00, 2.39675518989563e+00, 4.793369621236594e-01, 1.11478673829879e-07, 1.36370494772109e-07, 1.540127738053343e-07, -1.160596986835572e-06, -2.049851133278935e-07, 1.677668770128093e-08, 1.722338981835492e-07, 4.618504078734987e-08, 2.638693808876269e-07, 1.216650389324059e-07]
+flo.cor.air.vol.C[1]=[6.077586440369487e-04, 6.180465198121965e-04, 6.288250326178968e-04, 6.392270908690989e-04, 6.492924131453038e-04, 6.591156357899308e-04, 6.68935424182564e-04, 6.787419063039124e-04, 6.882776413112879e-04, 6.975734187290072e-04, 7.068384205922484e-04, 7.16089433990419e-04, 6.697233766317368e-04, 6.607813517941888e-04, 6.571851694025099e-04, 6.532054161652922e-04, 6.504629272967577e-04, 6.533108139410615e-04, 7.100039324723184e-04, 8.107641851529479e-04, 8.8886557501507e-04, 9.265417861752212e-04, 9.374834573827684e-04, 9.310940490104259e-04, 9.173557185567916e-04, 9.079976589418948e-04, 8.803937607444823e-04, 8.502133283764124e-04, 8.59692832455039e-04, 8.873040275648236e-04, 9.282956947572529e-04, 9.671137249097228e-04, 1.001887191087007e-03, 1.033055637963116e-03, 1.062939176335931e-03, 1.089512347243726e-03, 1.102335569448769e-03, 1.078546410426497e-03, 1.021153731271625e-03, 9.434639429673552e-04, 8.939796276425103e-04, 9.072171850129962e-04, 9.206823469139635e-04, 9.324766020290553e-04, 9.416227764450013e-04, 9.492324315942824e-04, 9.56007286440581e-04, 9.62251836899668e-04, 9.676896035671235e-04, 9.731688909232617e-04, 9.804940782487392e-04, 9.889002563431858e-04, 9.971386380493641e-04, 1.004558140411973e-03, 1.011586696840823e-03, 1.017793780192733e-03, 1.024509621784091e-03, 1.031404635868967e-03, 1.034120540134609e-03, 1.03342822752893e-03, 1.032813219353557e-03, 1.032775896601379e-03, 9.02275622356683e-04, 8.024021168239415e-04, 7.206368170535335e-04, 6.69856311287731e-04, 6.434023356996477e-04, 6.376149691641331e-04, 6.829139543951976e-04, 7.589535880833864e-04, 8.076004364219302e-04, 8.279947098344565e-04, 8.371805283240974e-04, 8.411136921495199e-04, 8.424863405525684e-04, 8.428434375673532e-04, 8.26979367993772e-04, 8.208218682557345e-04, 8.45452263019979e-04, 8.582210820168257e-04, 8.649221737869084e-04, 8.680099598132074e-04, 8.69144070893526e-04, 8.688928582705558e-04, 8.681035996414721e-04, 8.688593050464987e-04, 8.604919235222041e-04, 8.255108073353767e-04, 7.778591848909854e-04, 7.258929591625929e-04, 6.989318644627929e-04, 7.111994060687721e-04, 7.234458066523075e-04, 7.339227548800409e-04, 7.435240526683629e-04, 7.52595195081085e-04, 7.613236387260258e-04, 7.688631652854383e-04, 7.742835907265544e-04, 7.783966907300055e-04, 7.818308076821268e-04]
+flo.sou.air.vol.C[1]=[6.077586440369487e-04, 6.174689740873873e-04, 6.273923418484628e-04, 6.37065579649061e-04, 6.464998726733029e-04, 6.558878580108285e-04, 6.656273314729333e-04, 6.751571828499436e-04, 6.841316050849855e-04, 6.930964905768632e-04, 7.02359585557133e-04, 7.118539931252599e-04, 6.69537577778101e-04, 6.60981337334645e-04, 6.574340374208987e-04, 6.533612846396864e-04, 6.505701527930796e-04, 6.534818909130991e-04, 7.101284409873188e-04, 8.10979858506471e-04, 8.895106016414707e-04, 9.274068637751043e-04, 9.384185960516334e-04, 9.32028612587601e-04, 9.178389003500342e-04, 9.083731565624475e-04, 8.809934346936644e-04, 8.505677175708115e-04, 8.603501971811056e-04, 8.9627641486004e-04, 9.486421360634268e-04, 9.904580563306808e-04, 1.027620160020888e-03, 1.061278800480068e-03, 1.093007563613355e-03, 1.121806399896741e-03, 1.13792953081429e-03, 1.116790906526148e-03, 1.064803772605956e-03, 9.973171725869178e-04, 9.477889457136325e-04, 9.380237245932222e-04, 9.424738166853786e-04, 9.517980855889618e-04, 9.619740094058216e-04, 9.728399803861975e-04, 9.846732532605529e-04, 9.933370957151055e-04, 9.971813531592488e-04, 9.983475366607307e-04, 9.991285623982549e-04, 1.001316816546023e-03, 1.00561123341322e-03, 1.011039260774851e-03, 1.015193802304566e-03, 1.012465101666749e-03, 1.01807527244091e-03, 1.018276726827025e-03, 1.001929170452058e-03, 9.930970612913371e-04, 9.953740052878856e-04, 9.974880423396825e-04, 8.952777273952961e-04, 8.027232438325882e-04, 7.14037677523895e-04, 6.612685858272016e-04, 6.350252404808998e-04, 6.302495114505291e-04, 6.717124563352464e-04, 7.353669195435941e-04, 7.723501997708029e-04, 7.921122689731419e-04, 7.97109236009419e-04, 7.963370205834508e-04, 7.990082632750272e-04, 8.048925665207207e-04, 7.942383410409093e-04, 7.860053749755025e-04, 8.095274679362774e-04, 8.2628971664235e-04, 8.359063533134759e-04, 8.416817127726972e-04, 8.344085374847054e-04, 8.161070477217436e-04, 8.073355420492589e-04, 8.025083807297051e-04, 7.972212438471615e-04, 7.738626282662154e-04, 7.355619687587023e-04, 6.92184716463089e-04, 6.771156913600862e-04, 6.961093680001796e-04, 7.073760614730417e-04, 7.165379077196121e-04, 7.254174607805908e-04, 7.349179475568234e-04, 7.44254277087748e-04, 7.510785642080009e-04, 7.554780156351626e-04, 7.591344462707639e-04, 7.621383992955089e-04]
+flo.eas.air.vol.C[1]=[6.077586440369487e-04, 6.180243659764528e-04, 6.289973738603294e-04, 6.395052233710885e-04, 6.496548489667475e-04, 6.595394457690418e-04, 6.693083746358752e-04, 6.791154714301229e-04, 6.887607928365469e-04, 6.981134577654303e-04, 7.073063985444606e-04, 7.165538752451539e-04, 6.65032600518316e-04, 6.5884520891675e-04, 6.532412744127214e-04, 6.480786483734846e-04, 6.454084813594818e-04, 6.480455258861184e-04, 6.991574680432677e-04, 7.864215853624046e-04, 8.490732002852829e-04, 8.728408720344305e-04, 8.73338079545647e-04, 8.583039906807243e-04, 8.374018711037934e-04, 8.283278439193964e-04, 8.036479447036982e-04, 7.725112419575453e-04, 7.871972187422216e-04, 8.170175109989942e-04, 8.625069283880293e-04, 8.921467489562928e-04, 9.220912586897611e-04, 9.532784996554255e-04, 9.818114480003714e-04, 1.004710281267762e-03, 1.016324837692082e-03, 9.981246804818512e-04, 9.58863734267652e-04, 8.876698929816485e-04, 8.66230588411315e-04, 8.951271907426416e-04, 9.106486174277961e-04, 9.229879826307297e-04, 9.323810506612063e-04, 9.406411089003086e-04, 9.480798384174704e-04, 9.542355313897133e-04, 9.596097888424993e-04, 9.672962292097509e-04, 9.778643725439906e-04, 9.870304306969046e-04, 9.940522396937013e-04, 9.966726321727038e-04, 9.989391453564167e-04, 1.006039115600288e-03, 1.016158671118319e-03, 1.023651952855289e-03, 1.033344487659633e-03, 1.03681352455169e-03, 1.036617183126509e-03, 1.033979132771492e-03, 8.842475502751768e-04, 7.902364595793188e-04, 7.055884701772951e-04, 6.520857568830252e-04, 6.300543295219541e-04, 6.27543474547565e-04, 6.696461363393952e-04, 7.296208711341023e-04, 7.593785063437904e-04, 7.641773880459369e-04, 7.655296893790364e-04, 7.659904845058918e-04, 7.657850929535926e-04, 7.660588598810136e-04, 7.577236276119948e-04, 7.529872446320951e-04, 7.819672394543887e-04, 7.870159670710563e-04, 7.850071415305138e-04, 7.837386569008231e-04, 7.839278387837112e-04, 7.847260357812047e-04, 7.844862691126764e-04, 7.836833479814232e-04, 7.814296055585146e-04, 7.557820016518235e-04, 7.271806010976434e-04, 6.872215354815126e-04, 6.801617448218167e-04, 7.039704290218652e-04, 7.163334218785167e-04, 7.282137358561159e-04, 7.405493198893964e-04, 7.506174501031637e-04, 7.597848656587302e-04, 7.672184496186673e-04, 7.724821357987821e-04, 7.800777023658157e-04, 7.848605164326727e-04]
+flo.nor.air.vol.C[1]=[6.077586440369487e-04, 6.180827901698649e-04, 6.291438499465584e-04, 6.397898774594069e-04, 6.50052905548364e-04, 6.60012464504689e-04, 6.698238337412476e-04, 6.796101038344204e-04, 6.892454437911511e-04, 6.986266793683172e-04, 7.07869092002511e-04, 7.171064382418991e-04, 6.70739880297333e-04, 6.610643617824604e-04, 6.57469283323735e-04, 6.533824023790657e-04, 6.505852984264493e-04, 6.534965243190527e-04, 7.101482478901744e-04, 8.109987480565906e-04, 8.895410534267347e-04, 9.275118843652308e-04, 9.386510984040797e-04, 9.322335664182902e-04, 9.180550603196025e-04, 9.086076752282679e-04, 8.813252532854677e-04, 8.509664097800851e-04, 8.610736508853733e-04, 8.877752511762082e-04, 9.244950255379081e-04, 9.578426298685372e-04, 9.894160740077495e-04, 1.020064624026418e-03, 1.049497029744089e-03, 1.075148023664951e-03, 1.087971804663539e-03, 1.057877675630152e-03, 1.005738885141909e-03, 9.344525216147304e-04, 8.837328579772789e-04, 8.961398503743112e-04, 9.105901326984167e-04, 9.210468805395067e-04, 9.287900477647781e-04, 9.367206133902073e-04, 9.44041924085468e-04, 9.500973857939244e-04, 9.553191903978587e-04, 9.620247222483159e-04, 9.719461086206138e-04, 9.814680926501752e-04, 9.901733323931694e-04, 1.000168174505234e-03, 1.012347568757832e-03, 1.019639754667878e-03, 1.026223218068481e-03, 1.033279686234891e-03, 1.037511667236686e-03, 1.038104644976556e-03, 1.037227315828204e-03, 1.037023137323558e-03, 9.052811795845628e-04, 8.039769949391484e-04, 7.229933900257143e-04, 6.713076960295439e-04, 6.442666286602617e-04, 6.380606954917311e-04, 6.835433641495488e-04, 7.600797759369015e-04, 8.089627057103524e-04, 8.292488800361752e-04, 8.379344013519585e-04, 8.416047925129533e-04, 8.431682456284762e-04, 8.438880904577672e-04, 8.289698674343527e-04, 8.224820205941796e-04, 8.480063313618302e-04, 8.608074416406453e-04, 8.663101703859866e-04, 8.68717897683382e-04, 8.69801607914269e-04, 8.702784054912627e-04, 8.704446768388152e-04, 8.704758482053875e-04, 8.628877555020153e-04, 8.289716416038572e-04, 7.819524058140814e-04, 7.292575039900839e-04, 7.027464685961604e-04, 7.151377759873867e-04, 7.270977064035833e-04, 7.37786777317524e-04, 7.474498683586717e-04, 7.564093568362296e-04, 7.64927405398339e-04, 7.724663359113037e-04, 7.781724212691188e-04, 7.8239451861009e-04, 7.86131655331701e-04]
+flo.wes.air.vol.C[1]=[6.077586440369487e-04, 6.18001725524664e-04, 6.289941747672856e-04, 6.395054887980223e-04, 6.496552517637611e-04, 6.595685961656272e-04, 6.694305175915361e-04, 6.792619195766747e-04, 6.888107256963849e-04, 6.981555465608836e-04, 7.07492558285594e-04, 7.154981628991663e-04, 6.678555952385068e-04, 6.600840445371124e-04, 6.557442084886134e-04, 6.512358435429632e-04, 6.483953353017568e-04, 6.511446111835539e-04, 7.057532132603229e-04, 8.014615788124502e-04, 8.734853316524339e-04, 9.050063462927938e-04, 9.111146023496985e-04, 9.014765475876629e-04, 8.852609829045833e-04, 8.753276779316366e-04, 8.498897566460073e-04, 8.192318654619157e-04, 8.281976007856428e-04, 8.565122378058731e-04, 8.941511274315417e-04, 9.285842394456267e-04, 9.599209460429847e-04, 9.948833519592881e-04, 1.025289013050497e-03, 1.04852938093245e-03, 1.060723578557372e-03, 1.037565567530692e-03, 9.900214010849595e-04, 9.159261407330632e-04, 8.841452866071729e-04, 9.084314387291669e-04, 9.229011763818562e-04, 9.34933009557426e-04, 9.443699638359248e-04, 9.520442225039005e-04, 9.587443224154412e-04, 9.647546010091901e-04, 9.700272278860212e-04, 9.750560042448342e-04, 9.815810481086373e-04, 9.896901249885558e-04, 9.980472875759005e-04, 1.005836334079504e-03, 1.012932732701302e-03, 1.019398029893637e-03, 1.025873925536871e-03, 1.032763654366136e-03, 1.035535065457225e-03, 1.0347187705338e-03, 1.033911015838385e-03, 1.034116325899959e-03, 8.965438697487116e-04, 7.986062485724688e-04, 7.157413817297381e-04, 6.631487747654318e-04, 6.376484059728682e-04, 6.331705302000046e-04, 6.777017663387863e-04, 7.482022000476718e-04, 7.888256397898277e-04, 8.028333657421171e-04, 8.07798330206424e-04, 8.096441091038287e-04, 8.105222741141916e-04, 8.107667090371251e-04, 7.981389597989619e-04, 7.928257132880389e-04, 8.188257878646254e-04, 8.301850850693882e-04, 8.332720841281116e-04, 8.337739296257495e-04, 8.348113391548395e-04, 8.346204063855112e-04, 8.337068534456193e-04, 8.333684178069234e-04, 8.285547024570406e-04, 8.001368609257042e-04, 7.572848838753998e-04, 7.1009834529832e-04, 6.910840747877955e-04, 7.105037663131952e-04, 7.238372019492089e-04, 7.343750540167093e-04, 7.438375102356076e-04, 7.530553382821381e-04, 7.619855739176274e-04, 7.695945259183645e-04, 7.750477641820907e-04, 7.789776357822121e-04, 7.824830245226622e-04]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Obsolete_Air_Systems_SingleZone_VAV_Examples_Guideline36.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Obsolete_Air_Systems_SingleZone_VAV_Examples_Guideline36.txt
index b0ef00b6f3f..e45ce5e44b0 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Obsolete_Air_Systems_SingleZone_VAV_Examples_Guideline36.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Obsolete_Air_Systems_SingleZone_VAV_Examples_Guideline36.txt
@@ -1,4 +1,4 @@
-last-generated=2023-06-16
+last-generated=2024-06-28
 statistics-initialization=
 {
   "linear": "19",
@@ -15,7 +15,7 @@ statistics-simulation=
 time=[0e+00, 8.64e+05]
 con.TZonCooSet=[3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02]
 con.TZonHeaSet=[2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02]
-con.TZon=[2.931499938964844e+02, 2.881505111887779e+02, 2.881490478515625e+02, 2.881514221191406e+02, 2.931615356445312e+02, 2.981529541015625e+02, 2.981489868164062e+02, 2.981303405761719e+02, 2.922359802246094e+02, 2.882982482910156e+02, 2.88146728515625e+02, 2.881483093261719e+02, 2.881490356445312e+02, 2.88149462890625e+02, 2.931553955078125e+02, 2.931500244140625e+02, 2.931495849609375e+02, 2.931483337402344e+02, 2.881390075683594e+02, 2.881487121582031e+02, 2.881499633789062e+02, 2.881501647949219e+02, 2.881494567871094e+02, 2.881503234863281e+02, 2.931598571777344e+02, 2.94861328125e+02, 2.981431312133055e+02, 2.932211467550501e+02, 2.881337341308594e+02, 2.8814833984375e+02, 2.881489868164062e+02, 2.881495849609375e+02, 2.881498840332031e+02, 2.881518310546875e+02, 2.9317099609375e+02, 2.981515808105469e+02, 2.981490112304688e+02, 2.957610578213652e+02, 2.881368713378906e+02, 2.881477172851563e+02, 2.881495056152344e+02, 2.881504089355469e+02, 2.881490783691406e+02, 2.881520935058594e+02, 2.957564287601266e+02, 2.981518249511719e+02, 2.981490173339844e+02, 2.981276733398437e+02, 2.904569533361717e+02, 2.881473401431323e+02, 2.881494445800781e+02, 2.881503295898438e+02, 2.88148779296875e+02, 2.881518127441406e+02, 2.970053990962484e+02, 2.981520690917969e+02, 2.981476623535156e+02, 2.981297607421875e+02, 2.920404235839844e+02, 2.883177124023438e+02, 2.881505126953125e+02, 2.881489013671875e+02, 2.881497375488281e+02, 2.881520446777344e+02, 2.972856104220797e+02, 2.981518249511719e+02, 2.981485900878906e+02, 2.981297485351562e+02, 2.913249206542969e+02, 2.881465407450974e+02, 2.881485900878906e+02, 2.8814970703125e+02, 2.8815068359375e+02, 2.881515869140625e+02, 2.960332558836678e+02, 2.981521606445312e+02, 2.981486755371094e+02, 2.981305053710938e+02, 2.91596630859375e+02, 2.881463755802162e+02, 2.881485900878906e+02, 2.881497253417969e+02, 2.881501159667969e+02, 2.881528564453125e+02, 2.974208752539661e+02, 2.981519165039062e+02, 2.981483154296875e+02, 2.98133251953125e+02, 2.922306701660156e+02, 2.882960876464844e+02, 2.881488342285156e+02, 2.881503662109375e+02, 2.881493835449219e+02, 2.881518493652344e+02, 2.974785356294463e+02, 2.981553955078125e+02, 2.981476440429688e+02, 2.981396179199219e+02, 2.927576962923215e+02, 2.883128967285156e+02, 2.881487121582031e+02]
-con.yFan=[0e+00, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 4.025565087795258e-01, 4.893012285232544e-01, 1.325016140937802e-01, 0e+00, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.014760449528694e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 2.730369865894318e-01, 3.152227997779846e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 4.240369498729706e-01, 4.513365745544434e-01, 1.256349682807922e-01, 0e+00, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 5.492576956748985e-01, 5.376012682914714e-01, 1.339806854724911e-01, 0e+00, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 5.572786927223206e-01, 5.00334358215332e-01, 1.326642036437988e-01, 0e+00, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 5.258903503417969e-01, 4.968696594238281e-01, 1.336130619049072e-01, 0e+00, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 5.469434857368469e-01, 5.326281785964966e-01, 1.369211077690125e-01, 0e+00, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 6.996200084686279e-01, 7.30419659614563e-01, 1.385331571102142e-01, 0e+00, 1.000000014901161e-01, 1.000000014901161e-01]
-con.yHeaCoi=[0e+00, 1.324993093021699e-01, 1.893747568130493e-01, 1.707718312740326e-01, 1.187966041266918e-01, 0e+00, 0e+00, 4.547855257987988e-02, 0e+00, 1.183573633432388e-01, 2.243149429559708e-01, 2.944910049438477e-01, 3.373494565486908e-01, 3.674502611160279e-01, 5.556024432182309e-01, 5.081894993782043e-01, 5.266040921211242e-01, 5.846031069755554e-01, 3.696947276592255e-01, 4.443065345287323e-01, 4.643756747245789e-01, 4.639534056186676e-01, 4.748164772987366e-01, 4.849988877773285e-01, 6.717195391654969e-01, 1.720810979604721e-01, 1.46185304114485e-01, 2.87089772728756e-01, 3.498578250408179e-01, 4.592494010925292e-01, 4.967314600944519e-01, 5.323506593704224e-01, 5.355224013328552e-01, 5.045579671859741e-01, 2.479233056306839e-01, 0e+00, 0e+00, 1.507243694345697e-01, 2.953963339328766e-01, 4.38940167427063e-01, 4.597212076187134e-01, 4.528476536273957e-01, 3.458822429180145e-01, 3.207026898860931e-01, 8.481237210866399e-02, 0e+00, 0e+00, 8.194615840911866e-02, 0e+00, 1.741768194082592e-01, 2.252887040376663e-01, 2.401080369949341e-01, 2.338583528995514e-01, 2.161736562848091e-01, 3.114568732238031e-02, 0e+00, 0e+00, 5.295289754867446e-02, 0e+00, 1.190229713916779e-01, 1.482875645160675e-01, 2.089897871017456e-01, 2.358923614025116e-01, 2.057858973741531e-01, 2.506333803191733e-02, 0e+00, 0e+00, 5.627056360244751e-02, 0e+00, 1.672993724588338e-01, 2.422210723161697e-01, 2.598976492881775e-01, 2.471727967262268e-01, 2.245655238628387e-01, 7.536955312261243e-02, 0e+00, 0e+00, 5.163406133651734e-02, 0e+00, 1.638049615763238e-01, 2.50107616186142e-01, 2.709533751010895e-01, 2.68766313791275e-01, 2.197097793221474e-01, 1.951913693801979e-02, 0e+00, 0e+00, 3.207417726516724e-02, 0e+00, 1.191041111946106e-01, 1.885513216257095e-01, 1.67981830239296e-01, 1.685418725013733e-01, 1.548796102404594e-01, 1.436630555918727e-02, 0e+00, 0e+00, 0e+00, 0e+00, 7.748470008373261e-02, 1.857710480690002e-01]
+con.TZon=[2.931499938964844e+02, 2.881505097343972e+02, 2.881490478515625e+02, 2.881514221191406e+02, 2.931615905761719e+02, 2.981529541015625e+02, 2.981489868164062e+02, 2.981303405761719e+02, 2.922348449707031e+02, 2.882983825683594e+02, 2.88146728515625e+02, 2.881483093261719e+02, 2.881490356445312e+02, 2.88149462890625e+02, 2.931553955078125e+02, 2.931499633789062e+02, 2.931496032714844e+02, 2.9314833984375e+02, 2.881390319824219e+02, 2.881487121582031e+02, 2.881499633789062e+02, 2.881501770019531e+02, 2.881494567871094e+02, 2.881503234863281e+02, 2.931598693847656e+02, 2.948573608398438e+02, 2.981431649238334e+02, 2.932222013205309e+02, 2.881337585449219e+02, 2.881483520507812e+02, 2.881489562988281e+02, 2.881495910644531e+02, 2.881498596191406e+02, 2.881518615722656e+02, 2.9317099609375e+02, 2.981515808105469e+02, 2.981490112304688e+02, 2.957625644847295e+02, 2.881368957519531e+02, 2.881477172851563e+02, 2.881495056152344e+02, 2.881504089355469e+02, 2.881490783691406e+02, 2.881520874023437e+02, 2.957556968733322e+02, 2.981518249511719e+02, 2.981490173339844e+02, 2.981276489257813e+02, 2.904569656304852e+02, 2.88147340119567e+02, 2.881494445800781e+02, 2.881503295898438e+02, 2.881488098144531e+02, 2.881518127441406e+02, 2.9700258742434e+02, 2.981520690917969e+02, 2.981476623535156e+02, 2.9812978515625e+02, 2.920429504394532e+02, 2.883176940917969e+02, 2.881505126953125e+02, 2.881489013671875e+02, 2.881497436523438e+02, 2.881520446777344e+02, 2.9728680590494e+02, 2.981518249511719e+02, 2.981485900878906e+02, 2.981297729492188e+02, 2.913284423828125e+02, 2.881465277972458e+02, 2.881485900878906e+02, 2.8814970703125e+02, 2.8815068359375e+02, 2.881515625e+02, 2.960322517920273e+02, 2.981521606445312e+02, 2.981486572265625e+02, 2.981305114746094e+02, 2.915949951171875e+02, 2.881463756324678e+02, 2.881485900878906e+02, 2.881497253417969e+02, 2.881501159667969e+02, 2.881528564453125e+02, 2.974211200529674e+02, 2.981519165039062e+02, 2.981483154296875e+02, 2.98133251953125e+02, 2.92231103515625e+02, 2.882960632324219e+02, 2.881488342285156e+02, 2.881503662109375e+02, 2.881493896484375e+02, 2.881518676757813e+02, 2.974773335788782e+02, 2.981553955078125e+02, 2.981476440429688e+02, 2.981395446777344e+02, 2.927565751783919e+02, 2.883127807617187e+02, 2.881487121582031e+02]
+con.yFan=[0e+00, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 4.027428925037384e-01, 4.893500328063965e-01, 1.325222253799435e-01, 0e+00, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.014791324734688e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 2.730556726455688e-01, 3.152481734752655e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 4.239771962165833e-01, 4.513474345207215e-01, 1.256382256746292e-01, 0e+00, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 5.49242436885836e-01, 5.37592864036558e-01, 1.339765846729306e-01, 0e+00, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 5.573814511299133e-01, 5.003870368003845e-01, 1.326428413391113e-01, 0e+00, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 5.259127616882324e-01, 4.964861989021301e-01, 1.336126029491425e-01, 0e+00, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 5.470792055130005e-01, 5.326884865760804e-01, 1.369300723075867e-01, 0e+00, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 6.994165182113647e-01, 7.304715514183044e-01, 1.385479211807251e-01, 0e+00, 1.000000014901161e-01, 1.000000014901161e-01]
+con.yHeaCoi=[0e+00, 1.324407107905436e-01, 1.893377542495727e-01, 1.706964403390884e-01, 1.188726991415024e-01, 0e+00, 0e+00, 4.550533294677746e-02, 0e+00, 1.18183371424675e-01, 2.243170738220215e-01, 2.944717824459076e-01, 3.373490571975708e-01, 3.675763547420502e-01, 5.556261777877806e-01, 5.079663991928101e-01, 5.259721517562866e-01, 5.841893553733826e-01, 3.696604013442993e-01, 4.442892849445343e-01, 4.644045531749725e-01, 4.638973653316498e-01, 4.747953593730926e-01, 4.850083708763123e-01, 6.717570543289184e-01, 1.721021234989166e-01, 1.462145991786989e-01, 2.778537948133941e-01, 3.497578263282782e-01, 4.588380157947539e-01, 4.969935119152069e-01, 5.322388410568237e-01, 5.356165528297424e-01, 5.045635938644409e-01, 2.48005011677742e-01, 0e+00, 0e+00, 1.507139753911059e-01, 2.953866124153137e-01, 4.389357507228852e-01, 4.597059488296509e-01, 4.52883517742157e-01, 3.462755441665649e-01, 3.207211464643479e-01, 8.483842430235228e-02, 0e+00, 0e+00, 8.188497424125672e-02, 0e+00, 1.74193480858603e-01, 2.253252565860748e-01, 2.401423394680023e-01, 2.337224364280701e-01, 2.161565989255905e-01, 3.122940909135036e-02, 0e+00, 0e+00, 5.249993801116837e-02, 0e+00, 1.189456701278686e-01, 1.484570801258087e-01, 2.088935554027557e-01, 2.358522236347199e-01, 2.058325439691543e-01, 2.502127693352694e-02, 0e+00, 0e+00, 5.607784390449524e-02, 0e+00, 1.672547192250418e-01, 2.422091662883759e-01, 2.599117457866669e-01, 2.471608996391296e-01, 2.24782395362854e-01, 7.54071723602133e-02, 0e+00, 0e+00, 5.172338485717773e-02, 0e+00, 1.637992559189114e-01, 2.501147985458374e-01, 2.709497928619385e-01, 2.687620759010315e-01, 2.196981638669968e-01, 1.951078337708041e-02, 0e+00, 0e+00, 3.20505291223526e-02, 0e+00, 1.189758270978928e-01, 1.885376274585724e-01, 1.679752051830292e-01, 1.685477942228317e-01, 1.549375146627426e-01, 1.43991876569867e-02, 0e+00, 0e+00, 0e+00, 0e+00, 7.749025225639343e-02, 1.857789754867554e-01]
 con.yCooCoi=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_CDL_Logical_Validation_TrueHold.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Obsolete_Controls_OBC_CDL_Logical_Validation_TrueHold.txt
similarity index 99%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_CDL_Logical_Validation_TrueHold.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_Obsolete_Controls_OBC_CDL_Logical_Validation_TrueHold.txt
index b28373c8705..ce83bf6d510 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_CDL_Logical_Validation_TrueHold.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Obsolete_Controls_OBC_CDL_Logical_Validation_TrueHold.txt
@@ -1,16 +1,16 @@
-last-generated=2018-06-19
+last-generated=2024-06-13
 statistics-simulation=
 {
   "linear": " ",
   "nonlinear": " ",
   "numerical Jacobians": "0"
 }
+time=[0e+00, 1.5e+04]
 truHol.u=[0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
 truHol.y=[0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
-time=[0e+00, 1.5e+04]
-truHol1.y=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00]
 booPul1.y=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+truHol1.y=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00]
 truHol2.u=[1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
 truHol2.y=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
-truHol3.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00]
 truHol3.u=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+truHol3.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Obsolete_Examples_VAVReheat_Guideline36.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Obsolete_Examples_VAVReheat_Guideline36.txt
index e74d4ba57d3..dac80e3971b 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Obsolete_Examples_VAVReheat_Guideline36.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Obsolete_Examples_VAVReheat_Guideline36.txt
@@ -1,4 +1,4 @@
-last-generated=2023-03-03
+last-generated=2024-06-27
 statistics-initialization=
 {
   "linear": "0",
@@ -7,30 +7,30 @@ statistics-initialization=
 }
 statistics-simulation=
 {
-  "linear": "0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 4, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0",
+  "linear": "0, 0, 0, 0, 0, 4, 3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 3, 0, 3, 0, 0, 0",
   "nonlinear": "5, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 1",
   "number of continuous time states": "172",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 1.728e+05]
-flo.sou.air.vol.T=[2.931499938964844e+02, 2.921277160644531e+02, 2.920469665527344e+02, 2.920375061035156e+02, 2.920676879882812e+02, 2.919853210449219e+02, 2.919112854003906e+02, 2.918204040527344e+02, 2.916888427734375e+02, 2.916121215820312e+02, 2.916564331054688e+02, 2.923885498046875e+02, 2.926181030273438e+02, 2.922230834960938e+02, 2.921268615722656e+02, 2.922876892089844e+02, 2.925801391601562e+02, 2.929330139160156e+02, 2.934247131347656e+02, 2.937738647460938e+02, 2.937883911132812e+02, 2.939855651855469e+02, 2.940549926757812e+02, 2.941099548339844e+02, 2.941886596679688e+02, 2.943903503417969e+02, 2.943637084960938e+02, 2.94410888671875e+02, 2.948438110351562e+02, 2.950076293945312e+02, 2.950519714355469e+02, 2.950704345703125e+02, 2.950676879882812e+02, 2.950548400878906e+02, 2.95040283203125e+02, 2.950346069335938e+02, 2.949608154296875e+02, 2.947102661132812e+02, 2.944424438476562e+02, 2.941304321289062e+02, 2.937796936035156e+02, 2.93583251953125e+02, 2.935619506835938e+02, 2.937364501953125e+02, 2.93745361328125e+02, 2.936037902832031e+02, 2.932702026367188e+02, 2.931526794433594e+02, 2.930558166503906e+02, 2.929819641113281e+02, 2.929180603027344e+02, 2.928579711914062e+02, 2.928179626464844e+02, 2.926990661621094e+02, 2.925820007324219e+02, 2.925404663085938e+02, 2.924913330078125e+02, 2.924870300292969e+02, 2.925718383789062e+02, 2.925182800292969e+02, 2.922757568359375e+02, 2.923145141601562e+02, 2.930245971679688e+02, 2.927724304199219e+02, 2.925932006835938e+02, 2.926627807617188e+02, 2.928355102539062e+02, 2.929535827636719e+02, 2.932277221679688e+02, 2.935248718261719e+02, 2.935922546386719e+02, 2.936083374023438e+02, 2.935765075683594e+02, 2.935516662597656e+02, 2.936268615722656e+02, 2.938625793457031e+02, 2.9388134765625e+02, 2.939639892578125e+02, 2.942064514160156e+02, 2.941728820800781e+02, 2.941987609863281e+02, 2.942589721679688e+02, 2.942644958496094e+02, 2.942578125e+02, 2.94242431640625e+02, 2.936622924804688e+02, 2.935062255859375e+02, 2.937055358886719e+02, 2.936111450195312e+02, 2.932903747558594e+02, 2.930398254394531e+02, 2.929688415527344e+02, 2.929054870605469e+02, 2.928805847167969e+02, 2.929327087402344e+02, 2.929573059082031e+02, 2.928533630371094e+02, 2.929599609375e+02, 2.929984741210938e+02, 2.929309997558594e+02, 2.927837829589844e+02]
-flo.eas.air.vol.T=[2.931499938964844e+02, 2.922457275390625e+02, 2.921407470703125e+02, 2.920318298339844e+02, 2.919625549316406e+02, 2.919295654296875e+02, 2.919173583984375e+02, 2.918603515625e+02, 2.917684020996094e+02, 2.916989440917969e+02, 2.917625122070312e+02, 2.925853271484375e+02, 2.929255981445312e+02, 2.923872985839844e+02, 2.923330993652344e+02, 2.925342407226562e+02, 2.927309265136719e+02, 2.930465698242188e+02, 2.935599975585938e+02, 2.938963623046875e+02, 2.939451904296875e+02, 2.938953552246094e+02, 2.937904968261719e+02, 2.937476806640625e+02, 2.937576293945312e+02, 2.937644653320312e+02, 2.936871337890625e+02, 2.937048950195312e+02, 2.939255981445312e+02, 2.939805603027344e+02, 2.940070190429688e+02, 2.940274353027344e+02, 2.940472106933594e+02, 2.940699157714844e+02, 2.940876159667969e+02, 2.94110595703125e+02, 2.940684814453125e+02, 2.938755798339844e+02, 2.936171569824219e+02, 2.93265380859375e+02, 2.931070861816406e+02, 2.930249328613281e+02, 2.930082092285156e+02, 2.930105590820312e+02, 2.930354309082031e+02, 2.929076843261719e+02, 2.928932800292969e+02, 2.928019409179688e+02, 2.927160949707031e+02, 2.926608581542969e+02, 2.926171569824219e+02, 2.925858154296875e+02, 2.925786437988281e+02, 2.924889221191406e+02, 2.924114990234375e+02, 2.92382080078125e+02, 2.923497314453125e+02, 2.924033508300781e+02, 2.923015441894531e+02, 2.922889404296875e+02, 2.922456970214844e+02, 2.92412109375e+02, 2.9315869140625e+02, 2.9275048828125e+02, 2.925127258300781e+02, 2.925578002929688e+02, 2.927301330566406e+02, 2.928780822753906e+02, 2.932437133789062e+02, 2.935780944824219e+02, 2.93640869140625e+02, 2.936452026367188e+02, 2.936252746582031e+02, 2.936062622070312e+02, 2.936375427246094e+02, 2.937041320800781e+02, 2.936794128417969e+02, 2.937402648925781e+02, 2.93964599609375e+02, 2.939883422851562e+02, 2.940107116699219e+02, 2.940438842773438e+02, 2.940230407714844e+02, 2.939271850585938e+02, 2.93827392578125e+02, 2.940180053710938e+02, 2.939434509277344e+02, 2.935902709960938e+02, 2.934301452636719e+02, 2.931517639160156e+02, 2.92993896484375e+02, 2.929824829101562e+02, 2.929655151367188e+02, 2.928670349121094e+02, 2.927869262695312e+02, 2.927659301757812e+02, 2.927912292480469e+02, 2.929591369628906e+02, 2.929911804199219e+02, 2.92951416015625e+02, 2.928733825683594e+02]
-flo.nor.air.vol.T=[2.931499938964844e+02, 2.923236694335938e+02, 2.922370300292969e+02, 2.921404724121094e+02, 2.920262145996094e+02, 2.91964599609375e+02, 2.919265747070312e+02, 2.918674621582031e+02, 2.917843627929688e+02, 2.917125244140625e+02, 2.917061157226562e+02, 2.923973693847656e+02, 2.927013854980469e+02, 2.923439636230469e+02, 2.923348083496094e+02, 2.924664611816406e+02, 2.926190490722656e+02, 2.927859497070312e+02, 2.931255798339844e+02, 2.933905639648438e+02, 2.934608154296875e+02, 2.934990539550781e+02, 2.935341796875e+02, 2.93574951171875e+02, 2.936012573242188e+02, 2.935986938476562e+02, 2.935152893066406e+02, 2.935001525878906e+02, 2.93635986328125e+02, 2.936285400390625e+02, 2.936148681640625e+02, 2.936466064453125e+02, 2.936773376464844e+02, 2.937095031738281e+02, 2.937359313964844e+02, 2.937666320800781e+02, 2.937343139648438e+02, 2.935594482421875e+02, 2.933276672363281e+02, 2.930076904296875e+02, 2.928246459960938e+02, 2.927563171386719e+02, 2.927377624511719e+02, 2.927447814941406e+02, 2.927662963867188e+02, 2.927017211914062e+02, 2.926109619140625e+02, 2.9255029296875e+02, 2.924839782714844e+02, 2.924488525390625e+02, 2.924165344238281e+02, 2.923692016601562e+02, 2.923338012695312e+02, 2.922692260742188e+02, 2.922269287109375e+02, 2.922005615234375e+02, 2.921554565429688e+02, 2.921445007324219e+02, 2.9212451171875e+02, 2.921122131347656e+02, 2.920339050292969e+02, 2.921680908203125e+02, 2.927540893554688e+02, 2.925625610351562e+02, 2.924451293945312e+02, 2.925093994140625e+02, 2.926372680664062e+02, 2.927808227539062e+02, 2.931483764648438e+02, 2.934944152832031e+02, 2.935852355957031e+02, 2.936201477050781e+02, 2.936196594238281e+02, 2.936149597167969e+02, 2.936105346679688e+02, 2.936167297363281e+02, 2.935419921875e+02, 2.935763549804688e+02, 2.938009033203125e+02, 2.938255920410156e+02, 2.938495483398438e+02, 2.938840026855469e+02, 2.93905029296875e+02, 2.939148864746094e+02, 2.939157409667969e+02, 2.938917541503906e+02, 2.938093566894531e+02, 2.936110534667969e+02, 2.934007263183594e+02, 2.931440734863281e+02, 2.929789123535156e+02, 2.929475402832031e+02, 2.929107360839844e+02, 2.928619689941406e+02, 2.927735595703125e+02, 2.92717041015625e+02, 2.927908630371094e+02, 2.928084106445312e+02, 2.928479614257812e+02, 2.928078002929688e+02, 2.926115112304688e+02]
-flo.wes.air.vol.T=[2.931499938964844e+02, 2.920885925292969e+02, 2.920011901855469e+02, 2.919342346191406e+02, 2.918894958496094e+02, 2.918588562011719e+02, 2.918583984375e+02, 2.918037719726562e+02, 2.917080688476562e+02, 2.9163623046875e+02, 2.915909423828125e+02, 2.924892272949219e+02, 2.927572631835938e+02, 2.923437805175781e+02, 2.923136291503906e+02, 2.924697265625e+02, 2.926435546875e+02, 2.928177795410156e+02, 2.931494750976562e+02, 2.933974609375e+02, 2.934622802734375e+02, 2.932671813964844e+02, 2.934082946777344e+02, 2.935598754882812e+02, 2.934794311523438e+02, 2.934257507324219e+02, 2.933487854003906e+02, 2.933699340820312e+02, 2.935506286621094e+02, 2.9359765625e+02, 2.936410827636719e+02, 2.936832275390625e+02, 2.937850036621094e+02, 2.938818054199219e+02, 2.938989562988281e+02, 2.93922607421875e+02, 2.938869934082031e+02, 2.937090454101562e+02, 2.934741821289062e+02, 2.931506652832031e+02, 2.929263305664062e+02, 2.928643493652344e+02, 2.928486938476562e+02, 2.929027709960938e+02, 2.92912353515625e+02, 2.92851806640625e+02, 2.9270947265625e+02, 2.926546936035156e+02, 2.926112670898438e+02, 2.925882568359375e+02, 2.925665588378906e+02, 2.925068359375e+02, 2.924489440917969e+02, 2.924029541015625e+02, 2.924115600585938e+02, 2.923795471191406e+02, 2.923005676269531e+02, 2.922521362304688e+02, 2.922826538085938e+02, 2.922622680664062e+02, 2.921544799804688e+02, 2.92318603515625e+02, 2.928969421386719e+02, 2.926522827148438e+02, 2.924659729003906e+02, 2.92495849609375e+02, 2.926614685058594e+02, 2.928069763183594e+02, 2.931806030273438e+02, 2.935303955078125e+02, 2.935946044921875e+02, 2.936233215332031e+02, 2.936292114257812e+02, 2.936311340332031e+02, 2.936334228515625e+02, 2.93650146484375e+02, 2.936283264160156e+02, 2.936971130371094e+02, 2.939307861328125e+02, 2.9396533203125e+02, 2.939980773925781e+02, 2.940399169921875e+02, 2.940626525878906e+02, 2.940707702636719e+02, 2.940688171386719e+02, 2.940416564941406e+02, 2.939550476074219e+02, 2.93750732421875e+02, 2.935393371582031e+02, 2.932817687988281e+02, 2.9311328125e+02, 2.930747680664062e+02, 2.930323791503906e+02, 2.929946594238281e+02, 2.929292602539062e+02, 2.928945922851562e+02, 2.92929443359375e+02, 2.929825134277344e+02, 2.929881286621094e+02, 2.929366149902344e+02, 2.927872314453125e+02]
-flo.cor.air.vol.T=[2.931499938964844e+02, 2.928221130371094e+02, 2.927656555175781e+02, 2.927209167480469e+02, 2.926880493164062e+02, 2.926540832519531e+02, 2.926307067871094e+02, 2.925934753417969e+02, 2.9253466796875e+02, 2.924859313964844e+02, 2.924747924804688e+02, 2.931707153320312e+02, 2.93083251953125e+02, 2.930078430175781e+02, 2.927585144042969e+02, 2.929075927734375e+02, 2.930874328613281e+02, 2.932269592285156e+02, 2.935558471679688e+02, 2.937919921875e+02, 2.938943176269531e+02, 2.939457397460938e+02, 2.940144958496094e+02, 2.940865478515625e+02, 2.941268920898438e+02, 2.941590270996094e+02, 2.940978088378906e+02, 2.941214599609375e+02, 2.943433532714844e+02, 2.944082946777344e+02, 2.944494934082031e+02, 2.944920043945312e+02, 2.945367431640625e+02, 2.9458251953125e+02, 2.94615966796875e+02, 2.946502380371094e+02, 2.946134338378906e+02, 2.944262084960938e+02, 2.941759948730469e+02, 2.938404235839844e+02, 2.937289733886719e+02, 2.936799621582031e+02, 2.936552429199219e+02, 2.936487731933594e+02, 2.936513671875e+02, 2.936142883300781e+02, 2.935520935058594e+02, 2.935048522949219e+02, 2.934588623046875e+02, 2.934245910644531e+02, 2.933945617675781e+02, 2.933619079589844e+02, 2.933337707519531e+02, 2.93290771484375e+02, 2.932494812011719e+02, 2.932240295410156e+02, 2.931883850097656e+02, 2.931712341308594e+02, 2.931611328125e+02, 2.931429138183594e+02, 2.930832214355469e+02, 2.931031494140625e+02, 2.93394287109375e+02, 2.934368286132812e+02, 2.930964050292969e+02, 2.9301904296875e+02, 2.931580810546875e+02, 2.932673950195312e+02, 2.937164306640625e+02, 2.941568298339844e+02, 2.942527770996094e+02, 2.942975769042969e+02, 2.943181457519531e+02, 2.943336791992188e+02, 2.943621520996094e+02, 2.944180908203125e+02, 2.943672485351562e+02, 2.944078369140625e+02, 2.946468200683594e+02, 2.946889343261719e+02, 2.94721923828125e+02, 2.947656860351562e+02, 2.94793701171875e+02, 2.948041687011719e+02, 2.948075866699219e+02, 2.947695617675781e+02, 2.946778869628906e+02, 2.944698486328125e+02, 2.942524719238281e+02, 2.939849243164062e+02, 2.938831481933594e+02, 2.938479309082031e+02, 2.938114318847656e+02, 2.9377099609375e+02, 2.937326049804688e+02, 2.93706787109375e+02, 2.936957702636719e+02, 2.937262573242188e+02, 2.937352294921875e+02, 2.937074279785156e+02, 2.936238403320312e+02]
-hvac.VAVBox[1].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.943922119140625e+02, 3.004012451171875e+02, 3.025866394042969e+02, 3.034116516113281e+02, 3.040654907226562e+02, 3.041423034667969e+02, 3.041298217773438e+02, 3.041445007324219e+02, 3.041689453125e+02, 3.041800231933594e+02, 3.041753540039062e+02, 3.041853332519531e+02, 3.001326599121094e+02, 2.954757385253906e+02, 2.912317810058594e+02, 2.911973571777344e+02, 2.911658325195312e+02, 2.911555786132812e+02, 2.911521606445312e+02, 2.911486511230469e+02, 2.911486511230469e+02, 2.911492919921875e+02, 2.911495056152344e+02, 2.911494140625e+02, 2.911495361328125e+02, 2.911498413085938e+02, 2.911485900878906e+02, 2.911490173339844e+02, 2.911501770019531e+02, 2.911505737304688e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.981515197753906e+02, 3.020608825683594e+02, 2.980628662109375e+02, 2.973316650390625e+02, 3.002660217285156e+02, 3.022603454589844e+02, 3.033768310546875e+02, 3.029737243652344e+02, 3.010474243164062e+02, 2.988435974121094e+02, 2.965478210449219e+02, 2.944188232421875e+02, 2.923482360839844e+02, 2.911503295898438e+02, 2.911498718261719e+02, 2.911498107910156e+02, 2.911497802734375e+02, 2.911435241699219e+02, 2.911479797363281e+02, 2.911508178710938e+02, 2.911514892578125e+02, 2.911531982421875e+02, 2.911508178710938e+02, 2.911479187011719e+02, 2.911480102539062e+02, 2.911461791992188e+02, 2.911499328613281e+02, 2.911542358398438e+02, 2.911528625488281e+02, 2.911843566894531e+02, 2.911843566894531e+02, 2.911843566894531e+02, 2.911843566894531e+02, 2.911843566894531e+02, 2.911843566894531e+02, 2.911843566894531e+02, 2.911843566894531e+02, 2.911843566894531e+02, 2.911843566894531e+02, 2.911843566894531e+02]
-hvac.VAVBox[2].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.943922119140625e+02, 2.998370971679688e+02, 3.018217163085938e+02, 3.007055358886719e+02, 3.035872802734375e+02, 3.041407470703125e+02, 3.041329345703125e+02, 3.041498413085938e+02, 3.041763610839844e+02, 3.035138244628906e+02, 2.992943115234375e+02, 2.955514526367188e+02, 2.923335876464844e+02, 2.91120849609375e+02, 2.912040710449219e+02, 2.911974182128906e+02, 2.911658325195312e+02, 2.911555786132812e+02, 2.911521606445312e+02, 2.911486511230469e+02, 2.911486511230469e+02, 2.911492919921875e+02, 2.911495056152344e+02, 2.911494140625e+02, 2.911495361328125e+02, 2.911498413085938e+02, 2.911485900878906e+02, 2.911490173339844e+02, 2.911501770019531e+02, 2.911505737304688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.97869384765625e+02, 3.017598266601562e+02, 2.972743530273438e+02, 2.963502502441406e+02, 2.999309997558594e+02, 3.025094604492188e+02, 3.040097961425781e+02, 3.035481567382812e+02, 3.012990112304688e+02, 2.988445434570312e+02, 2.963743591308594e+02, 2.939403381347656e+02, 2.916434936523438e+02, 2.911503295898438e+02, 2.911498718261719e+02, 2.911498107910156e+02, 2.911497802734375e+02, 2.911435241699219e+02, 2.911479797363281e+02, 2.911508178710938e+02, 2.911514892578125e+02, 2.911531982421875e+02, 2.911508178710938e+02, 2.911479187011719e+02, 2.911480102539062e+02, 2.911461791992188e+02, 2.911499328613281e+02, 2.911542358398438e+02, 2.911528625488281e+02, 2.911721801757812e+02, 2.911721801757812e+02, 2.911721801757812e+02, 2.911721801757812e+02, 2.911721801757812e+02, 2.911721801757812e+02, 2.911721801757812e+02, 2.911721801757812e+02, 2.911721801757812e+02, 2.911721801757812e+02, 2.911721801757812e+02]
-hvac.VAVBox[3].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.943922119140625e+02, 3.00357177734375e+02, 3.024712524414062e+02, 3.026139831542969e+02, 3.040745849609375e+02, 3.041462707519531e+02, 3.04130859375e+02, 3.041376342773438e+02, 3.041553344726562e+02, 3.041658935546875e+02, 3.041643981933594e+02, 3.041651306152344e+02, 3.041650695800781e+02, 3.041670837402344e+02, 3.034148254394531e+02, 3.011780395507812e+02, 2.994577331542969e+02, 2.977142333984375e+02, 2.951505737304688e+02, 2.926778259277344e+02, 2.911486511230469e+02, 2.911492919921875e+02, 2.911495056152344e+02, 2.911494140625e+02, 2.911495361328125e+02, 2.911498413085938e+02, 2.911485900878906e+02, 2.911490173339844e+02, 2.911501770019531e+02, 2.911505737304688e+02, 2.923382568359375e+02, 2.923382568359375e+02, 2.923382568359375e+02, 2.923382568359375e+02, 2.923382568359375e+02, 2.923382568359375e+02, 2.923382568359375e+02, 2.923382568359375e+02, 2.923382568359375e+02, 2.923382568359375e+02, 2.923382568359375e+02, 2.923382568359375e+02, 2.923382568359375e+02, 2.923382568359375e+02, 2.923382568359375e+02, 2.923382568359375e+02, 2.923382568359375e+02, 2.923382568359375e+02, 2.923382568359375e+02, 2.923382568359375e+02, 2.923382568359375e+02, 2.98329833984375e+02, 3.023751525878906e+02, 2.99927734375e+02, 3.013651733398438e+02, 3.041434326171875e+02, 3.041411743164062e+02, 3.041419372558594e+02, 3.041543884277344e+02, 3.041664733886719e+02, 3.041665649414062e+02, 3.031309509277344e+02, 3.007805786132812e+02, 2.984571533203125e+02, 2.961755065917969e+02, 2.938397827148438e+02, 2.919570007324219e+02, 2.911497802734375e+02, 2.911435241699219e+02, 2.911479797363281e+02, 2.911508178710938e+02, 2.911514892578125e+02, 2.911531982421875e+02, 2.911508178710938e+02, 2.911479187011719e+02, 2.911480102539062e+02, 2.911461791992188e+02, 2.911499328613281e+02, 2.911542358398438e+02, 2.911528625488281e+02, 2.911843566894531e+02, 2.911843566894531e+02, 2.911843566894531e+02, 2.911843566894531e+02, 2.911843566894531e+02, 2.911843566894531e+02, 2.911843566894531e+02, 2.911843566894531e+02, 2.911843566894531e+02, 2.911843566894531e+02, 2.911843566894531e+02]
-hvac.VAVBox[4].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.943922119140625e+02, 3.002680053710938e+02, 3.023228759765625e+02, 3.022481689453125e+02, 3.040590209960938e+02, 3.041408996582031e+02, 3.041289367675781e+02, 3.041373901367188e+02, 3.041565246582031e+02, 3.041675720214844e+02, 3.041664123535156e+02, 3.041564025878906e+02, 3.041647338867188e+02, 3.041696166992188e+02, 3.041663818359375e+02, 3.037727966308594e+02, 3.029057922363281e+02, 3.018161926269531e+02, 2.996453247070312e+02, 2.974075317382812e+02, 2.949822998046875e+02, 2.92247802734375e+02, 2.911495056152344e+02, 2.911494140625e+02, 2.911495361328125e+02, 2.911498413085938e+02, 2.911485900878906e+02, 2.911490173339844e+02, 2.911501770019531e+02, 2.911505737304688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.980496826171875e+02, 3.021307067871094e+02, 2.988612670898438e+02, 2.993680114746094e+02, 3.033119506835938e+02, 3.041333312988281e+02, 3.041403503417969e+02, 3.041568603515625e+02, 3.041721496582031e+02, 3.032334594726562e+02, 3.008610534667969e+02, 2.984646606445312e+02, 2.9607177734375e+02, 2.936110229492188e+02, 2.91150146484375e+02, 2.911498107910156e+02, 2.911497802734375e+02, 2.911435241699219e+02, 2.911479797363281e+02, 2.911508178710938e+02, 2.911514892578125e+02, 2.911531982421875e+02, 2.911508178710938e+02, 2.911479187011719e+02, 2.911480102539062e+02, 2.911461791992188e+02, 2.911499328613281e+02, 2.911542358398438e+02, 2.911528625488281e+02, 2.911721801757812e+02, 2.911721801757812e+02, 2.911721801757812e+02, 2.911721801757812e+02, 2.911721801757812e+02, 2.911721801757812e+02, 2.911721801757812e+02, 2.911721801757812e+02, 2.911721801757812e+02, 2.911721801757812e+02, 2.911721801757812e+02]
-hvac.VAVBox[5].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.943922119140625e+02, 2.983070678710938e+02, 2.9739990234375e+02, 2.965088500976562e+02, 2.9215673828125e+02, 2.945640869140625e+02, 2.951918334960938e+02, 2.947295227050781e+02, 2.925187072753906e+02, 2.902047424316406e+02, 2.904849548339844e+02, 2.907567443847656e+02, 2.909376220703125e+02, 2.9112109375e+02, 2.912040710449219e+02, 2.911973571777344e+02, 2.911658325195312e+02, 2.911555786132812e+02, 2.911521606445312e+02, 2.911486511230469e+02, 2.911486511230469e+02, 2.911492919921875e+02, 2.911495056152344e+02, 2.911494140625e+02, 2.911495361328125e+02, 2.911498413085938e+02, 2.911485900878906e+02, 2.911490173339844e+02, 2.911501770019531e+02, 2.911505737304688e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.922526550292969e+02, 2.922527465820312e+02, 2.951414184570312e+02, 2.892771606445312e+02, 2.889491271972656e+02, 2.906075744628906e+02, 2.908924865722656e+02, 2.90919189453125e+02, 2.910694274902344e+02, 2.912070922851562e+02, 2.91196044921875e+02, 2.911678161621094e+02, 2.911522827148438e+02, 2.911503295898438e+02, 2.911498718261719e+02, 2.911498107910156e+02, 2.911497802734375e+02, 2.911435241699219e+02, 2.911479797363281e+02, 2.911508178710938e+02, 2.911514892578125e+02, 2.911531982421875e+02, 2.911508178710938e+02, 2.911479187011719e+02, 2.911480102539062e+02, 2.911461791992188e+02, 2.911499328613281e+02, 2.911542358398438e+02, 2.911528625488281e+02, 2.911843566894531e+02, 2.911843566894531e+02, 2.911843566894531e+02, 2.911843566894531e+02, 2.911843566894531e+02, 2.911843566894531e+02, 2.911843566894531e+02, 2.911843566894531e+02, 2.911843566894531e+02, 2.911843566894531e+02, 2.911843566894531e+02]
-hvac.VAVBox[1].vav.m_flow=[9.26812120972953e-13, 2.082084366028525e-10, 2.11608716660372e-10, 1.943756128275353e-10, 1.64127003654535e-10, 1.300127644432436e-10, 9.221033658857181e-11, 9.369258147096106e-11, 1.066898652757331e-10, 1.113793293705534e-10, 2.5656932964921e-02, 1.930467933416367e-01, 2.351460158824921e-01, 1.294549703598022e-01, 1.695190370082856e-01, 2.144340425729752e-01, 2.466252148151398e-01, 2.608519196510315e-01, 2.439651340246201e-01, 2.079178988933563e-01, 1.757072806358337e-01, 1.386348754167557e-01, 1.324429959058762e-01, 1.324604600667953e-01, 1.324494630098343e-01, 1.324417740106583e-01, 1.324389427900314e-01, 1.324399262666702e-01, 1.324497014284134e-01, 1.3245889544487e-01, 1.324573755264282e-01, 1.324550658464432e-01, 1.324517577886581e-01, 1.324487924575806e-01, 1.324480772018433e-01, 1.32447138428688e-01, 1.324459910392761e-01, 1.324452906847e-01, 1.324458420276642e-01, 1.324476450681686e-01, 1.456948867106789e-10, 1.803196064686929e-10, 9.284836094414217e-11, 9.873536016558049e-12, 4.467891172050403e-13, 8.044195864975734e-11, 1.400740079482432e-10, 1.764129675674297e-10, 2.001032117782131e-10, 1.802133026140851e-10, 1.669614446697665e-10, 1.687896905577801e-10, 1.178871444906804e-10, 1.902814988907764e-10, 1.711102232127004e-10, 1.679583694347288e-10, 1.973633201313167e-10, 1.19101811746348e-10, 8.865243261713118e-11, 9.249531696120528e-11, 3.276856008760376e-10, 6.541669368743896e-02, 2.184748351573944e-01, 1.294134557247162e-01, 1.324396878480911e-01, 1.323492825031281e-01, 1.323913782835007e-01, 1.3240747153759e-01, 1.324375569820404e-01, 1.324675530195236e-01, 1.324650794267654e-01, 1.32451206445694e-01, 1.324552595615387e-01, 1.324521154165268e-01, 1.324504911899567e-01, 1.324497014284134e-01, 1.324484646320343e-01, 1.32447138428688e-01, 1.324406117200851e-01, 1.32443904876709e-01, 1.324463784694672e-01, 1.324490904808044e-01, 1.324546635150909e-01, 1.324597150087357e-01, 1.324590444564819e-01, 1.324582993984222e-01, 1.324534267187119e-01, 1.324417144060135e-01, 1.324499547481537e-01, 1.324493288993835e-01, 1.259130716357859e-10, 1.159868520672624e-10, 1.167163865556375e-10, 1.332487592486942e-10, 2.390228848181408e-10, 3.56541629553675e-10, 2.696652345868245e-10, 2.865134691998339e-11, 4.692277667465376e-20, 4.12101290592215e-11, 9.926916233471417e-11]
-hvac.VAVBox[2].vav.m_flow=[8.801232312394269e-13, 1.9771977111116e-10, 2.009487576337676e-10, 1.845837788172489e-10, 1.558589785011222e-10, 1.234632673874358e-10, 8.756517039243406e-11, 8.897274583752336e-11, 1.013152756135227e-10, 1.057685050653845e-10, 2.436444349586964e-02, 1.833219081163406e-01, 2.233003377914429e-01, 9.663546830415726e-02, 9.901973605155945e-02, 1.306482255458832e-01, 1.517524421215057e-01, 1.587902307510376e-01, 1.373326480388641e-01, 9.910765290260315e-02, 9.909987449645996e-02, 9.910875558853149e-02, 9.910093247890472e-02, 9.911536425352097e-02, 9.910627454519272e-02, 9.909992665052414e-02, 9.909757971763611e-02, 9.909839183092117e-02, 9.910646826028824e-02, 9.91140678524971e-02, 9.911281615495682e-02, 9.911090880632401e-02, 9.910817444324493e-02, 9.910573065280914e-02, 9.910513460636139e-02, 9.910435229539871e-02, 9.91034135222435e-02, 9.910282492637634e-02, 9.910327941179276e-02, 9.910476952791214e-02, 1.383553965839113e-10, 1.712358588257246e-10, 8.817105379144152e-11, 9.376149162632075e-12, 4.242817035204904e-13, 7.638963073208771e-11, 1.330176663261184e-10, 1.67526020833364e-10, 1.900228585594022e-10, 1.711349117972105e-10, 1.58550630957599e-10, 1.6028678384572e-10, 1.119484782652336e-10, 1.806959165628896e-10, 1.624904100161473e-10, 1.594973320084849e-10, 1.874209815122544e-10, 1.131019652933504e-10, 8.418649805053136e-11, 8.783578725468644e-11, 3.111781665676716e-10, 6.212127581238747e-02, 2.074689865112305e-01, 9.660126268863678e-02, 9.909819811582565e-02, 9.902350604534149e-02, 9.905828535556793e-02, 9.907157719135284e-02, 9.909643977880478e-02, 9.912122786045074e-02, 9.911917895078659e-02, 9.910771250724792e-02, 9.911106526851654e-02, 9.910846501588821e-02, 9.910712391138077e-02, 9.910646826028824e-02, 9.910545498132706e-02, 9.910435974597931e-02, 9.909896552562714e-02, 9.910168498754501e-02, 9.910372644662857e-02, 9.910596162080765e-02, 9.911058098077774e-02, 9.911474585533142e-02, 9.911419451236725e-02, 9.91135835647583e-02, 9.910955280065536e-02, 9.909987449645996e-02, 9.910667687654495e-02, 9.910616278648376e-02, 1.195700899403462e-10, 1.101439217610078e-10, 1.108367009283739e-10, 1.26536239819508e-10, 2.269819054934175e-10, 3.385805524835916e-10, 2.560806289242379e-10, 2.720801188516031e-11, 4.46732589988158e-20, 3.913413690326273e-11, 9.426839864268288e-11]
-hvac.VAVBox[3].vav.m_flow=[9.26812120972953e-13, 2.082084366028525e-10, 2.11608716660372e-10, 1.943756128275353e-10, 1.64127003654535e-10, 1.300127644432436e-10, 9.221033658857181e-11, 9.369258147096106e-11, 1.066898652757331e-10, 1.113793293705534e-10, 2.5656932964921e-02, 1.930467933416367e-01, 2.351460158824921e-01, 1.294549703598022e-01, 1.503059566020966e-01, 1.826761215925217e-01, 2.098900228738785e-01, 2.309168577194214e-01, 2.321596294641495e-01, 2.179549485445023e-01, 2.011232525110245e-01, 1.833136975765228e-01, 1.64831817150116e-01, 1.456301510334015e-01, 1.324494630098343e-01, 1.324417740106583e-01, 1.324389427900314e-01, 1.324399262666702e-01, 1.324497014284134e-01, 1.3245889544487e-01, 1.324573755264282e-01, 1.324550658464432e-01, 1.324517577886581e-01, 1.324487924575806e-01, 1.324480772018433e-01, 1.32447138428688e-01, 1.324459910392761e-01, 1.324452906847e-01, 1.324458420276642e-01, 1.324476450681686e-01, 1.456948867106789e-10, 1.803196064686929e-10, 9.284836094414217e-11, 9.873536016558049e-12, 4.46789090099986e-13, 8.044195864975734e-11, 1.400740079482432e-10, 1.764129675674297e-10, 2.001032117782131e-10, 1.802133026140851e-10, 1.669614446697665e-10, 1.687896905577801e-10, 1.178871444906804e-10, 1.902814988907764e-10, 1.711102232127004e-10, 1.679583694347288e-10, 1.973633201313167e-10, 1.19101811746348e-10, 8.865243261713118e-11, 9.249531696120528e-11, 3.276856008760376e-10, 6.541669368743896e-02, 2.184748351573944e-01, 1.294134557247162e-01, 1.324396878480911e-01, 1.398024410009384e-01, 1.625388413667679e-01, 1.811299324035645e-01, 1.814407110214233e-01, 1.640101522207262e-01, 1.440176516771318e-01, 1.32451206445694e-01, 1.324552595615387e-01, 1.324521154165268e-01, 1.324504911899567e-01, 1.324497014284134e-01, 1.324484646320343e-01, 1.32447138428688e-01, 1.324406117200851e-01, 1.32443904876709e-01, 1.324463784694672e-01, 1.324490904808044e-01, 1.324546635150909e-01, 1.324597150087357e-01, 1.324590444564819e-01, 1.324582993984222e-01, 1.324534267187119e-01, 1.324417144060135e-01, 1.324499547481537e-01, 1.324493288993835e-01, 1.259130716357859e-10, 1.159868520672624e-10, 1.167163865556375e-10, 1.332487592486942e-10, 2.390228848181408e-10, 3.56541629553675e-10, 2.696652345868245e-10, 2.865134691998339e-11, 5.238469549578115e-20, 4.12101290592215e-11, 9.926916233471417e-11]
-hvac.VAVBox[4].vav.m_flow=[6.845403150573803e-13, 1.537820426555925e-10, 1.56293478159597e-10, 1.435651597603282e-10, 1.212236561132229e-10, 9.602698497479523e-11, 6.810624286757161e-11, 6.920101991436668e-11, 7.88007714636052e-11, 8.226438974467953e-11, 1.895012333989143e-02, 1.425836980342865e-01, 1.736780405044556e-01, 7.51609206199646e-02, 9.485694020986563e-02, 1.215028017759323e-01, 1.432194262742996e-01, 1.594838351011277e-01, 1.593141555786133e-01, 1.470415741205215e-01, 1.329375654459e-01, 1.286700963973999e-01, 1.187506839632988e-01, 1.014514416456223e-01, 8.894291520118713e-02, 7.7077716588974e-02, 7.707589119672775e-02, 7.707652449607849e-02, 7.708281278610229e-02, 7.708872109651566e-02, 7.708774507045746e-02, 7.708626240491867e-02, 7.708413153886795e-02, 7.708223164081573e-02, 7.708176970481873e-02, 7.708116620779037e-02, 7.708042860031128e-02, 7.707997411489487e-02, 7.708033174276352e-02, 7.708148658275604e-02, 1.076097475016802e-10, 1.331834365014828e-10, 6.857748396926766e-11, 7.292559785210262e-12, 3.299969076209913e-13, 5.941415415211537e-11, 1.034581864622908e-10, 1.302980223716332e-10, 1.477955535733599e-10, 1.33104929855854e-10, 1.233171481596074e-10, 1.246674985466711e-10, 8.707103787974901e-11, 1.405412591859445e-10, 1.263814330965118e-10, 1.240534897029024e-10, 1.457718667996491e-10, 8.796819522816144e-11, 6.547838660164729e-11, 6.831672727525273e-11, 2.420274536341083e-10, 4.831654578447342e-02, 1.613647639751434e-01, 7.513431459665298e-02, 7.707637548446655e-02, 7.701828330755234e-02, 9.450377523899078e-02, 1.080606430768967e-01, 1.070886179804801e-01, 9.217877686023726e-02, 7.709269970655441e-02, 7.70837813615799e-02, 7.708638906478882e-02, 7.708436250686646e-02, 7.708331942558289e-02, 7.70828053355217e-02, 7.708202302455902e-02, 7.708116620779037e-02, 7.70769789814949e-02, 7.707908749580383e-02, 7.708067446947098e-02, 7.708241790533066e-02, 7.708600163459778e-02, 7.708925008773804e-02, 7.708881795406342e-02, 7.708834111690521e-02, 7.70852118730545e-02, 7.707767933607101e-02, 7.708296924829483e-02, 7.70825669169426e-02, 9.299896269743257e-11, 8.566749393201789e-11, 8.62063267992319e-11, 9.841708004110217e-11, 1.765414897603179e-10, 2.63340432793413e-10, 1.991738163287238e-10, 2.116178760003251e-11, 4.87759262030625e-20, 3.043765933741227e-11, 7.331986406899915e-11]
+flo.sou.air.vol.T=[2.931499938964844e+02, 2.921277160644531e+02, 2.920469665527344e+02, 2.920375061035156e+02, 2.920676879882812e+02, 2.919853210449219e+02, 2.919112854003906e+02, 2.918204040527344e+02, 2.916888427734375e+02, 2.916121215820312e+02, 2.916564331054688e+02, 2.923885803222656e+02, 2.925850524902344e+02, 2.922471313476562e+02, 2.921119995117188e+02, 2.922735900878906e+02, 2.925703735351562e+02, 2.929272155761719e+02, 2.934209899902344e+02, 2.937713012695312e+02, 2.937864074707031e+02, 2.939838256835938e+02, 2.940531616210938e+02, 2.941087646484375e+02, 2.941873168945312e+02, 2.943901672363281e+02, 2.943635864257812e+02, 2.944106750488281e+02, 2.948436584472656e+02, 2.950075073242188e+02, 2.950517883300781e+02, 2.950703125e+02, 2.950675354003906e+02, 2.950547180175781e+02, 2.950401306152344e+02, 2.950344543457031e+02, 2.949606628417969e+02, 2.947101135253906e+02, 2.944422912597656e+02, 2.941303100585938e+02, 2.93779541015625e+02, 2.935830993652344e+02, 2.935618896484375e+02, 2.937362976074219e+02, 2.937452087402344e+02, 2.936040344238281e+02, 2.932701110839844e+02, 2.931525573730469e+02, 2.930556945800781e+02, 2.929818420410156e+02, 2.929179382324219e+02, 2.928578491210938e+02, 2.928178405761719e+02, 2.926989440917969e+02, 2.925819396972656e+02, 2.925403747558594e+02, 2.924912414550781e+02, 2.924869079589844e+02, 2.925717163085938e+02, 2.925181579589844e+02, 2.922756652832031e+02, 2.923305969238281e+02, 2.931182556152344e+02, 2.92765380859375e+02, 2.925777282714844e+02, 2.926468811035156e+02, 2.928224792480469e+02, 2.929437561035156e+02, 2.932219848632812e+02, 2.935211181640625e+02, 2.935890197753906e+02, 2.9360546875e+02, 2.935740966796875e+02, 2.935496520996094e+02, 2.936260986328125e+02, 2.93862060546875e+02, 2.938809509277344e+02, 2.939636840820312e+02, 2.942061767578125e+02, 2.941726684570312e+02, 2.941985473632812e+02, 2.942587890625e+02, 2.942643127441406e+02, 2.942576293945312e+02, 2.942422485351562e+02, 2.936621398925781e+02, 2.935060729980469e+02, 2.937053833007812e+02, 2.936109924316406e+02, 2.932902221679688e+02, 2.930396423339844e+02, 2.929686889648438e+02, 2.929053344726562e+02, 2.928804321289062e+02, 2.929325561523438e+02, 2.929571533203125e+02, 2.928532104492188e+02, 2.929596862792969e+02, 2.929983520507812e+02, 2.929308471679688e+02, 2.927836303710938e+02]
+flo.eas.air.vol.T=[2.931499938964844e+02, 2.922457275390625e+02, 2.921407470703125e+02, 2.920318298339844e+02, 2.919625549316406e+02, 2.919295654296875e+02, 2.919173583984375e+02, 2.918603515625e+02, 2.917684326171875e+02, 2.916989440917969e+02, 2.917625122070312e+02, 2.925853576660156e+02, 2.929136352539062e+02, 2.924063720703125e+02, 2.923237915039062e+02, 2.925265502929688e+02, 2.927259521484375e+02, 2.93045654296875e+02, 2.9356103515625e+02, 2.938970947265625e+02, 2.939462280273438e+02, 2.938963012695312e+02, 2.937910461425781e+02, 2.937474060058594e+02, 2.937575378417969e+02, 2.93764404296875e+02, 2.936871032714844e+02, 2.93704833984375e+02, 2.93925537109375e+02, 2.939804992675781e+02, 2.940069274902344e+02, 2.940273742675781e+02, 2.94047119140625e+02, 2.940698547363281e+02, 2.940875244140625e+02, 2.941105041503906e+02, 2.940683898925781e+02, 2.9387548828125e+02, 2.936170959472656e+02, 2.932653198242188e+02, 2.931069946289062e+02, 2.930248413085938e+02, 2.930079956054688e+02, 2.930104675292969e+02, 2.930353393554688e+02, 2.929076232910156e+02, 2.928931884765625e+02, 2.928018188476562e+02, 2.927160034179688e+02, 2.926607666015625e+02, 2.926170349121094e+02, 2.925857238769531e+02, 2.925785522460938e+02, 2.924888305664062e+02, 2.924114379882812e+02, 2.923819885253906e+02, 2.923496398925781e+02, 2.924032592773438e+02, 2.923014526367188e+02, 2.922888488769531e+02, 2.9224560546875e+02, 2.924338684082031e+02, 2.932310791015625e+02, 2.927451782226562e+02, 2.924991149902344e+02, 2.925451354980469e+02, 2.927213134765625e+02, 2.92870849609375e+02, 2.932382202148438e+02, 2.935741577148438e+02, 2.936373291015625e+02, 2.936420288085938e+02, 2.936224975585938e+02, 2.936039733886719e+02, 2.936368713378906e+02, 2.9370361328125e+02, 2.936790771484375e+02, 2.937400512695312e+02, 2.939644470214844e+02, 2.939881896972656e+02, 2.940105895996094e+02, 2.940437622070312e+02, 2.940229187011719e+02, 2.939270629882812e+02, 2.938273010253906e+02, 2.940178833007812e+02, 2.939433288574219e+02, 2.935901489257812e+02, 2.934300231933594e+02, 2.931516723632812e+02, 2.929937744140625e+02, 2.929823913574219e+02, 2.929653930664062e+02, 2.92866943359375e+02, 2.927868347167969e+02, 2.927658081054688e+02, 2.927911682128906e+02, 2.929588623046875e+02, 2.929910583496094e+02, 2.929512939453125e+02, 2.928732604980469e+02]
+flo.nor.air.vol.T=[2.931499938964844e+02, 2.923236694335938e+02, 2.922370300292969e+02, 2.921404724121094e+02, 2.920262145996094e+02, 2.91964599609375e+02, 2.919265747070312e+02, 2.918674621582031e+02, 2.917843627929688e+02, 2.917125244140625e+02, 2.917061157226562e+02, 2.923973999023438e+02, 2.926742553710938e+02, 2.923657531738281e+02, 2.923264770507812e+02, 2.924580078125e+02, 2.926125793457031e+02, 2.927825012207031e+02, 2.931235961914062e+02, 2.933893737792969e+02, 2.934606323242188e+02, 2.934989929199219e+02, 2.935341491699219e+02, 2.935749206542969e+02, 2.93601318359375e+02, 2.935987854003906e+02, 2.93515380859375e+02, 2.93500244140625e+02, 2.936360473632812e+02, 2.936286010742188e+02, 2.9361474609375e+02, 2.936465148925781e+02, 2.936772155761719e+02, 2.937094116210938e+02, 2.9373583984375e+02, 2.937665100097656e+02, 2.937342224121094e+02, 2.935593566894531e+02, 2.933275756835938e+02, 2.930075988769531e+02, 2.928245544433594e+02, 2.927562255859375e+02, 2.927376403808594e+02, 2.927446899414062e+02, 2.927662048339844e+02, 2.927014770507812e+02, 2.926108703613281e+02, 2.925502014160156e+02, 2.9248388671875e+02, 2.924487609863281e+02, 2.924164428710938e+02, 2.923691101074219e+02, 2.923337097167969e+02, 2.922691345214844e+02, 2.922268371582031e+02, 2.92200439453125e+02, 2.921553649902344e+02, 2.921444091796875e+02, 2.921244201660156e+02, 2.921121215820312e+02, 2.920338134765625e+02, 2.921839294433594e+02, 2.928174438476562e+02, 2.925589294433594e+02, 2.924342956542969e+02, 2.92501953125e+02, 2.926310729980469e+02, 2.927751770019531e+02, 2.931438598632812e+02, 2.934911193847656e+02, 2.93582275390625e+02, 2.936166381835938e+02, 2.936165161132812e+02, 2.936122436523438e+02, 2.936082763671875e+02, 2.936147155761719e+02, 2.935404357910156e+02, 2.93575927734375e+02, 2.938005981445312e+02, 2.938253173828125e+02, 2.938492736816406e+02, 2.938837890625e+02, 2.9390478515625e+02, 2.939146728515625e+02, 2.9391552734375e+02, 2.938915710449219e+02, 2.938091735839844e+02, 2.936108703613281e+02, 2.934005432128906e+02, 2.931439208984375e+02, 2.92978759765625e+02, 2.929473571777344e+02, 2.929105834960938e+02, 2.928617858886719e+02, 2.927733764648438e+02, 2.927168884277344e+02, 2.927907409667969e+02, 2.928083801269531e+02, 2.928477783203125e+02, 2.928076171875e+02, 2.926114196777344e+02]
+flo.wes.air.vol.T=[2.931499938964844e+02, 2.920885925292969e+02, 2.920011901855469e+02, 2.919342346191406e+02, 2.918894958496094e+02, 2.9185888671875e+02, 2.918584289550781e+02, 2.918037719726562e+02, 2.917080993652344e+02, 2.9163623046875e+02, 2.915909423828125e+02, 2.924892578125e+02, 2.927265319824219e+02, 2.923638916015625e+02, 2.923029174804688e+02, 2.924598999023438e+02, 2.92636474609375e+02, 2.928143920898438e+02, 2.931477355957031e+02, 2.933966064453125e+02, 2.934625549316406e+02, 2.932674865722656e+02, 2.934085998535156e+02, 2.935601501464844e+02, 2.934797668457031e+02, 2.934259948730469e+02, 2.933490295410156e+02, 2.933701477050781e+02, 2.935508117675781e+02, 2.935978088378906e+02, 2.936411743164062e+02, 2.93683349609375e+02, 2.93784912109375e+02, 2.938817443847656e+02, 2.938988952636719e+02, 2.939225158691406e+02, 2.938869323730469e+02, 2.937089538574219e+02, 2.934740905761719e+02, 2.931506042480469e+02, 2.9292626953125e+02, 2.928642883300781e+02, 2.928486328125e+02, 2.929026794433594e+02, 2.929122619628906e+02, 2.928516540527344e+02, 2.927093505859375e+02, 2.926546325683594e+02, 2.926111755371094e+02, 2.925881652832031e+02, 2.925664672851562e+02, 2.925067443847656e+02, 2.924488525390625e+02, 2.924028625488281e+02, 2.924114379882812e+02, 2.923794555664062e+02, 2.923004455566406e+02, 2.922520446777344e+02, 2.922825622558594e+02, 2.922621765136719e+02, 2.921543884277344e+02, 2.923351745605469e+02, 2.929581298828125e+02, 2.926500549316406e+02, 2.924568176269531e+02, 2.924870300292969e+02, 2.92654541015625e+02, 2.928011169433594e+02, 2.931759948730469e+02, 2.935270690917969e+02, 2.935915832519531e+02, 2.936205444335938e+02, 2.936267700195312e+02, 2.936289978027344e+02, 2.936316528320312e+02, 2.936480407714844e+02, 2.936279296875e+02, 2.936968383789062e+02, 2.939305725097656e+02, 2.939651489257812e+02, 2.939978942871094e+02, 2.940397338867188e+02, 2.940625e+02, 2.940706176757812e+02, 2.940686645507812e+02, 2.9404150390625e+02, 2.939548950195312e+02, 2.937505798339844e+02, 2.935391845703125e+02, 2.932816467285156e+02, 2.931131286621094e+02, 2.930746459960938e+02, 2.930322570800781e+02, 2.929945068359375e+02, 2.929291381835938e+02, 2.928944702148438e+02, 2.929292907714844e+02, 2.929823913574219e+02, 2.929880065917969e+02, 2.929364929199219e+02, 2.927870788574219e+02]
+flo.cor.air.vol.T=[2.931499938964844e+02, 2.928221130371094e+02, 2.927656555175781e+02, 2.927209167480469e+02, 2.926880493164062e+02, 2.926540832519531e+02, 2.926307067871094e+02, 2.925934753417969e+02, 2.9253466796875e+02, 2.924859313964844e+02, 2.924747619628906e+02, 2.931707458496094e+02, 2.930130615234375e+02, 2.929964904785156e+02, 2.927406616210938e+02, 2.9288916015625e+02, 2.930733947753906e+02, 2.932190551757812e+02, 2.935507507324219e+02, 2.937896118164062e+02, 2.938940124511719e+02, 2.939455871582031e+02, 2.940143432617188e+02, 2.940863647460938e+02, 2.941268005371094e+02, 2.941589965820312e+02, 2.940977783203125e+02, 2.941214294433594e+02, 2.943432922363281e+02, 2.944082336425781e+02, 2.944494018554688e+02, 2.94491943359375e+02, 2.9453662109375e+02, 2.945824279785156e+02, 2.946158447265625e+02, 2.946501159667969e+02, 2.946133422851562e+02, 2.944261169433594e+02, 2.941759033203125e+02, 2.9384033203125e+02, 2.937288818359375e+02, 2.936798400878906e+02, 2.936551208496094e+02, 2.93648681640625e+02, 2.936512756347656e+02, 2.936141357421875e+02, 2.93552001953125e+02, 2.935047302246094e+02, 2.934587707519531e+02, 2.934244995117188e+02, 2.933944702148438e+02, 2.9336181640625e+02, 2.933336486816406e+02, 2.932906799316406e+02, 2.932494201660156e+02, 2.932239379882812e+02, 2.931882934570312e+02, 2.93171142578125e+02, 2.931610412597656e+02, 2.931427917480469e+02, 2.930831298828125e+02, 2.931057739257812e+02, 2.9342578125e+02, 2.934360046386719e+02, 2.930919799804688e+02, 2.930154113769531e+02, 2.931553039550781e+02, 2.932649230957031e+02, 2.9371435546875e+02, 2.941557312011719e+02, 2.942514038085938e+02, 2.942960510253906e+02, 2.943167724609375e+02, 2.943324890136719e+02, 2.943613586425781e+02, 2.944173583984375e+02, 2.943668212890625e+02, 2.944075927734375e+02, 2.946466674804688e+02, 2.946887817382812e+02, 2.947218017578125e+02, 2.947655639648438e+02, 2.947935791015625e+02, 2.948040771484375e+02, 2.948074645996094e+02, 2.947694702148438e+02, 2.946777648925781e+02, 2.944697265625e+02, 2.942523803710938e+02, 2.939848022460938e+02, 2.93883056640625e+02, 2.938478393554688e+02, 2.938113403320312e+02, 2.937709045410156e+02, 2.937324829101562e+02, 2.937066650390625e+02, 2.936956787109375e+02, 2.937261352539062e+02, 2.937351379394531e+02, 2.937073059082031e+02, 2.936237182617188e+02]
+hvac.VAVBox[1].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.943920288085938e+02, 3.004012145996094e+02, 3.026377868652344e+02, 3.031502380371094e+02, 3.040638732910156e+02, 3.041410217285156e+02, 3.041297912597656e+02, 3.041443176269531e+02, 3.041687622070312e+02, 3.04179931640625e+02, 3.041752624511719e+02, 3.041852722167969e+02, 3.001132202148438e+02, 2.954622802734375e+02, 2.91203857421875e+02, 2.9119775390625e+02, 2.911659851074219e+02, 2.911556396484375e+02, 2.911521606445312e+02, 2.911486511230469e+02, 2.911486511230469e+02, 2.911492919921875e+02, 2.911495056152344e+02, 2.911494140625e+02, 2.911495361328125e+02, 2.911498413085938e+02, 2.911485900878906e+02, 2.911490173339844e+02, 2.911501770019531e+02, 2.911505737304688e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.989745788574219e+02, 3.016336364746094e+02, 2.978086547851562e+02, 2.9695068359375e+02, 2.999790649414062e+02, 3.020747375488281e+02, 3.032437438964844e+02, 3.028655395507812e+02, 3.009640197753906e+02, 2.987750854492188e+02, 2.964920654296875e+02, 2.943756713867188e+02, 2.923150634765625e+02, 2.911502380371094e+02, 2.911498413085938e+02, 2.911498107910156e+02, 2.911497802734375e+02, 2.911434936523438e+02, 2.911479797363281e+02, 2.911508178710938e+02, 2.911514892578125e+02, 2.911531982421875e+02, 2.911508178710938e+02, 2.911479187011719e+02, 2.911480102539062e+02, 2.911461791992188e+02, 2.911499328613281e+02, 2.911542358398438e+02, 2.911528625488281e+02, 2.9118408203125e+02, 2.9118408203125e+02, 2.9118408203125e+02, 2.9118408203125e+02, 2.9118408203125e+02, 2.9118408203125e+02, 2.9118408203125e+02, 2.9118408203125e+02, 2.9118408203125e+02, 2.9118408203125e+02, 2.9118408203125e+02]
+hvac.VAVBox[2].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.943920288085938e+02, 2.998371276855469e+02, 3.018308410644531e+02, 3.006318969726562e+02, 3.03536376953125e+02, 3.041398010253906e+02, 3.041329345703125e+02, 3.041498413085938e+02, 3.041763916015625e+02, 3.03539794921875e+02, 2.99314208984375e+02, 2.95565673828125e+02, 2.923439025878906e+02, 2.911199340820312e+02, 2.91203857421875e+02, 2.911978149414062e+02, 2.91166015625e+02, 2.911556396484375e+02, 2.911521911621094e+02, 2.911486511230469e+02, 2.911486511230469e+02, 2.911492919921875e+02, 2.911495056152344e+02, 2.911494140625e+02, 2.911495361328125e+02, 2.911498413085938e+02, 2.911485900878906e+02, 2.911490173339844e+02, 2.911501770019531e+02, 2.911505737304688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.987296142578125e+02, 3.013064575195312e+02, 2.97011474609375e+02, 2.96000732421875e+02, 2.996600341796875e+02, 3.023114929199219e+02, 3.038524780273438e+02, 3.034192504882812e+02, 3.011929016113281e+02, 2.98755126953125e+02, 2.962991943359375e+02, 2.938779296875e+02, 2.915940551757812e+02, 2.911502380371094e+02, 2.911498413085938e+02, 2.911498107910156e+02, 2.911497802734375e+02, 2.911435241699219e+02, 2.911479797363281e+02, 2.911508178710938e+02, 2.911514892578125e+02, 2.911531982421875e+02, 2.911508178710938e+02, 2.911479187011719e+02, 2.911480102539062e+02, 2.911461791992188e+02, 2.911499328613281e+02, 2.911542358398438e+02, 2.911528625488281e+02, 2.911719970703125e+02, 2.911719970703125e+02, 2.911719970703125e+02, 2.911719970703125e+02, 2.911719970703125e+02, 2.911719970703125e+02, 2.911719970703125e+02, 2.911719970703125e+02, 2.911719970703125e+02, 2.911719970703125e+02, 2.911719970703125e+02]
+hvac.VAVBox[3].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.943920288085938e+02, 3.00357177734375e+02, 3.025050659179688e+02, 3.024856567382812e+02, 3.040729675292969e+02, 3.04145263671875e+02, 3.04130859375e+02, 3.041375122070312e+02, 3.041552429199219e+02, 3.041658935546875e+02, 3.041643981933594e+02, 3.041651306152344e+02, 3.041650695800781e+02, 3.041670837402344e+02, 3.034206848144531e+02, 3.011835632324219e+02, 2.994627685546875e+02, 2.977188720703125e+02, 2.951548461914062e+02, 2.926818542480469e+02, 2.911486511230469e+02, 2.911492919921875e+02, 2.911495056152344e+02, 2.911494140625e+02, 2.911495361328125e+02, 2.911498413085938e+02, 2.911485900878906e+02, 2.911490173339844e+02, 2.911501770019531e+02, 2.911505737304688e+02, 2.923399047851562e+02, 2.923399047851562e+02, 2.923399047851562e+02, 2.923399047851562e+02, 2.923399047851562e+02, 2.923399047851562e+02, 2.923399047851562e+02, 2.923399047851562e+02, 2.923399047851562e+02, 2.923399047851562e+02, 2.923399047851562e+02, 2.923399047851562e+02, 2.923399047851562e+02, 2.923399047851562e+02, 2.923399047851562e+02, 2.923399047851562e+02, 2.923399047851562e+02, 2.923399047851562e+02, 2.923399047851562e+02, 2.923399047851562e+02, 2.923399047851562e+02, 2.991304626464844e+02, 3.020263061523438e+02, 2.996988220214844e+02, 3.010591125488281e+02, 3.041398315429688e+02, 3.041406555175781e+02, 3.041417236328125e+02, 3.041542358398438e+02, 3.041663818359375e+02, 3.041664123535156e+02, 3.030356750488281e+02, 3.007036437988281e+02, 2.983938598632812e+02, 2.961239929199219e+02, 2.937939147949219e+02, 2.9192236328125e+02, 2.911497802734375e+02, 2.911434936523438e+02, 2.911479797363281e+02, 2.911508178710938e+02, 2.911514892578125e+02, 2.911531982421875e+02, 2.911508178710938e+02, 2.911479187011719e+02, 2.911480102539062e+02, 2.911461791992188e+02, 2.911499328613281e+02, 2.911542358398438e+02, 2.911528625488281e+02, 2.9118408203125e+02, 2.9118408203125e+02, 2.9118408203125e+02, 2.9118408203125e+02, 2.9118408203125e+02, 2.9118408203125e+02, 2.9118408203125e+02, 2.9118408203125e+02, 2.9118408203125e+02, 2.9118408203125e+02, 2.9118408203125e+02]
+hvac.VAVBox[4].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.943920288085938e+02, 3.002679443359375e+02, 3.023760070800781e+02, 3.021179504394531e+02, 3.040556335449219e+02, 3.041398315429688e+02, 3.041288757324219e+02, 3.041372680664062e+02, 3.041564636230469e+02, 3.041675720214844e+02, 3.041664428710938e+02, 3.041564331054688e+02, 3.041647338867188e+02, 3.041696166992188e+02, 3.041662902832031e+02, 3.037857055664062e+02, 3.029175109863281e+02, 3.018268432617188e+02, 2.996550903320312e+02, 2.9741650390625e+02, 2.9499072265625e+02, 2.922556457519531e+02, 2.911495056152344e+02, 2.911494140625e+02, 2.911495361328125e+02, 2.911498413085938e+02, 2.911485900878906e+02, 2.911490173339844e+02, 2.911501770019531e+02, 2.911505737304688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.911730346679688e+02, 2.988866882324219e+02, 3.0175146484375e+02, 2.98655517578125e+02, 2.990574340820312e+02, 3.030531311035156e+02, 3.04130615234375e+02, 3.041400146484375e+02, 3.041566772460938e+02, 3.041726379394531e+02, 3.031387939453125e+02, 3.007789306640625e+02, 2.983951110839844e+02, 2.960132751464844e+02, 2.935609436035156e+02, 2.911498413085938e+02, 2.911498107910156e+02, 2.911497802734375e+02, 2.911435241699219e+02, 2.911479797363281e+02, 2.911508178710938e+02, 2.911514892578125e+02, 2.911531982421875e+02, 2.911508178710938e+02, 2.911479187011719e+02, 2.911480102539062e+02, 2.911461791992188e+02, 2.911499328613281e+02, 2.911542358398438e+02, 2.911528625488281e+02, 2.911719970703125e+02, 2.911719970703125e+02, 2.911719970703125e+02, 2.911719970703125e+02, 2.911719970703125e+02, 2.911719970703125e+02, 2.911719970703125e+02, 2.911719970703125e+02, 2.911719970703125e+02, 2.911719970703125e+02, 2.911719970703125e+02]
+hvac.VAVBox[5].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.943920288085938e+02, 2.9830712890625e+02, 2.975267333984375e+02, 2.945251770019531e+02, 2.918171691894531e+02, 2.943332214355469e+02, 2.950619506835938e+02, 2.946371459960938e+02, 2.924465942382812e+02, 2.902054443359375e+02, 2.90485595703125e+02, 2.907569274902344e+02, 2.909366149902344e+02, 2.911201782226562e+02, 2.91203857421875e+02, 2.9119775390625e+02, 2.911659851074219e+02, 2.911556396484375e+02, 2.911521606445312e+02, 2.911486511230469e+02, 2.911486511230469e+02, 2.911492919921875e+02, 2.911495056152344e+02, 2.911494140625e+02, 2.911495361328125e+02, 2.911498413085938e+02, 2.911485900878906e+02, 2.911490173339844e+02, 2.911501770019531e+02, 2.911505737304688e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.911852722167969e+02, 2.922525939941406e+02, 2.922527160644531e+02, 2.951333312988281e+02, 2.8927392578125e+02, 2.889542236328125e+02, 2.906105651855469e+02, 2.908931274414062e+02, 2.909312133789062e+02, 2.910799255371094e+02, 2.912080688476562e+02, 2.911938781738281e+02, 2.911670532226562e+02, 2.911520385742188e+02, 2.911502380371094e+02, 2.911498413085938e+02, 2.911498107910156e+02, 2.911497802734375e+02, 2.911434936523438e+02, 2.911479797363281e+02, 2.911508178710938e+02, 2.911514892578125e+02, 2.911531982421875e+02, 2.911508178710938e+02, 2.911479187011719e+02, 2.911480102539062e+02, 2.911461791992188e+02, 2.911499328613281e+02, 2.911542358398438e+02, 2.911528625488281e+02, 2.9118408203125e+02, 2.9118408203125e+02, 2.9118408203125e+02, 2.9118408203125e+02, 2.9118408203125e+02, 2.9118408203125e+02, 2.9118408203125e+02, 2.9118408203125e+02, 2.9118408203125e+02, 2.9118408203125e+02, 2.9118408203125e+02]
+hvac.VAVBox[1].vav.m_flow=[9.356216973052667e-13, 2.082084366028525e-10, 2.116085917602817e-10, 1.94375640583111e-10, 1.64127003654535e-10, 1.300127644432436e-10, 9.221053087760112e-11, 9.369258147096106e-11, 1.066898236423697e-10, 1.113793293705534e-10, 2.565468288958073e-02, 1.930488348007202e-01, 2.342523038387299e-01, 1.297700703144073e-01, 1.672939062118531e-01, 2.127782553434372e-01, 2.453843355178833e-01, 2.598979771137238e-01, 2.432635128498077e-01, 2.074168175458908e-01, 1.753443777561188e-01, 1.383871287107468e-01, 1.324429512023926e-01, 1.32460430264473e-01, 1.324493736028671e-01, 1.324419230222702e-01, 1.324389427900314e-01, 1.324399262666702e-01, 1.324497014284134e-01, 1.3245889544487e-01, 1.324573755264282e-01, 1.324550658464432e-01, 1.324517577886581e-01, 1.324487924575806e-01, 1.324480772018433e-01, 1.32447138428688e-01, 1.324459910392761e-01, 1.324452906847e-01, 1.324458420276642e-01, 1.324476450681686e-01, 1.456948867106789e-10, 1.803196064686929e-10, 9.284647356500031e-11, 9.873536016558049e-12, 4.467909603487336e-13, 8.044199334422686e-11, 1.400740079482432e-10, 1.764121487779491e-10, 2.001032672893643e-10, 1.802133303696607e-10, 1.669543253646211e-10, 1.687895795354777e-10, 1.178867281570462e-10, 1.902814988907764e-10, 1.711122354919326e-10, 1.67958355556941e-10, 1.973655405773659e-10, 1.191005627454453e-10, 8.865237016708605e-11, 9.249532390009918e-11, 3.276854898537351e-10, 7.827946543693542e-02, 2.447555214166641e-01, 1.295097917318344e-01, 1.324398219585419e-01, 1.323517858982086e-01, 1.323928087949753e-01, 1.324081271886826e-01, 1.324380040168762e-01, 1.324683427810669e-01, 1.324647814035416e-01, 1.324509680271149e-01, 1.324552595615387e-01, 1.324521154165268e-01, 1.324504911899567e-01, 1.324496865272522e-01, 1.324484795331955e-01, 1.32447138428688e-01, 1.324406117200851e-01, 1.32443904876709e-01, 1.324463784694672e-01, 1.324490904808044e-01, 1.324546635150909e-01, 1.324597150087357e-01, 1.324590444564819e-01, 1.324582993984222e-01, 1.324534267187119e-01, 1.324417144060135e-01, 1.324499547481537e-01, 1.324493288993835e-01, 1.259130716357859e-10, 1.159868590061564e-10, 1.167162894111229e-10, 1.332462890024644e-10, 2.390227737958384e-10, 3.565415740425237e-10, 2.696541323565782e-10, 2.865823724162997e-11, 5.095098146789935e-21, 4.12101290592215e-11, 9.926593574904885e-11]
+hvac.VAVBox[2].vav.m_flow=[8.884889894124337e-13, 1.9771977111116e-10, 2.009486327336774e-10, 1.845838065728245e-10, 1.558589785011222e-10, 1.234632673874358e-10, 8.756535080367556e-11, 8.897274583752336e-11, 1.013152339801593e-10, 1.057685050653845e-10, 2.436230890452862e-02, 1.833238452672958e-01, 2.224516570568085e-01, 9.689510613679886e-02, 9.902027249336243e-02, 1.306874752044678e-01, 1.520583480596542e-01, 1.591390073299408e-01, 1.376011520624161e-01, 9.910822659730911e-02, 9.909983724355698e-02, 9.910870343446732e-02, 9.910088777542114e-02, 9.911533445119858e-02, 9.910620003938675e-02, 9.910003840923309e-02, 9.909757971763611e-02, 9.909839183092117e-02, 9.910646826028824e-02, 9.91140678524971e-02, 9.911281615495682e-02, 9.911090880632401e-02, 9.910817444324493e-02, 9.910573065280914e-02, 9.910513460636139e-02, 9.910435229539871e-02, 9.91034135222435e-02, 9.910282492637634e-02, 9.910327941179276e-02, 9.910476952791214e-02, 1.383553965839113e-10, 1.712358588257246e-10, 8.816925661792041e-11, 9.376148295270337e-12, 4.24283492454075e-13, 7.638965848766333e-11, 1.330176663261184e-10, 1.675252436772467e-10, 1.900229001927656e-10, 1.711349395527861e-10, 1.585438724749366e-10, 1.602866589456298e-10, 1.11948089687175e-10, 1.806959165628896e-10, 1.624923251508648e-10, 1.594973181306971e-10, 1.874230909360012e-10, 1.131007787424929e-10, 8.418643560048622e-11, 8.783579419358034e-11, 3.111780833009448e-10, 7.433607429265976e-02, 2.324257642030716e-01, 9.668063372373581e-02, 9.909830987453461e-02, 9.902556985616684e-02, 9.905945509672165e-02, 9.907211363315582e-02, 9.909680485725403e-02, 9.912186861038208e-02, 9.911894053220749e-02, 9.91075187921524e-02, 9.911106526851654e-02, 9.910846501588821e-02, 9.910712391138077e-02, 9.910646826028824e-02, 9.910545498132706e-02, 9.910435974597931e-02, 9.909896552562714e-02, 9.910168498754501e-02, 9.910372644662857e-02, 9.910596162080765e-02, 9.911058098077774e-02, 9.911474585533142e-02, 9.911419451236725e-02, 9.91135835647583e-02, 9.910955280065536e-02, 9.909988194704056e-02, 9.910667687654495e-02, 9.910616278648376e-02, 1.195700899403462e-10, 1.101439217610078e-10, 1.108366107227532e-10, 1.265338944733685e-10, 2.26981794471115e-10, 3.385804969724404e-10, 2.560700818055039e-10, 2.721455526211169e-11, 1.443582841889186e-20, 3.913413690326273e-11, 9.426533165157736e-11]
+hvac.VAVBox[3].vav.m_flow=[9.356216973052667e-13, 2.082084366028525e-10, 2.116085917602817e-10, 1.94375640583111e-10, 1.64127003654535e-10, 1.300127644432436e-10, 9.221053087760112e-11, 9.369258147096106e-11, 1.066898236423697e-10, 1.113793293705534e-10, 2.565468288958073e-02, 1.930488348007202e-01, 2.342523038387299e-01, 1.297700703144073e-01, 1.493529677391053e-01, 1.821013689041138e-01, 2.096104174852371e-01, 2.308028787374497e-01, 2.321521937847137e-01, 2.180192917585373e-01, 2.011811286211014e-01, 1.833720058202744e-01, 1.648886650800705e-01, 1.456849575042725e-01, 1.324493736028671e-01, 1.324419230222702e-01, 1.324389427900314e-01, 1.324399262666702e-01, 1.324497014284134e-01, 1.3245889544487e-01, 1.324573755264282e-01, 1.324550658464432e-01, 1.324517577886581e-01, 1.324487924575806e-01, 1.324480772018433e-01, 1.32447138428688e-01, 1.324459910392761e-01, 1.324452906847e-01, 1.324458420276642e-01, 1.324476450681686e-01, 1.456948867106789e-10, 1.803196064686929e-10, 9.284647356500031e-11, 9.873536016558049e-12, 4.467909332436792e-13, 8.044199334422686e-11, 1.400740079482432e-10, 1.764121487779491e-10, 2.001032672893643e-10, 1.802133303696607e-10, 1.669543253646211e-10, 1.687895795354777e-10, 1.178867281570462e-10, 1.902814988907764e-10, 1.711122354919326e-10, 1.67958355556941e-10, 1.973655405773659e-10, 1.191005627454453e-10, 8.865237016708605e-11, 9.249532390009918e-11, 3.276854898537351e-10, 7.827946543693542e-02, 2.447555214166641e-01, 1.295097917318344e-01, 1.324398219585419e-01, 1.37907013297081e-01, 1.607613265514374e-01, 1.79523229598999e-01, 1.80052176117897e-01, 1.628474146127702e-01, 1.430599838495256e-01, 1.324509680271149e-01, 1.324552595615387e-01, 1.324521154165268e-01, 1.324504911899567e-01, 1.324496865272522e-01, 1.324484795331955e-01, 1.32447138428688e-01, 1.324406117200851e-01, 1.32443904876709e-01, 1.324463784694672e-01, 1.324490904808044e-01, 1.324546635150909e-01, 1.324597150087357e-01, 1.324590444564819e-01, 1.324582993984222e-01, 1.324534267187119e-01, 1.324417144060135e-01, 1.324499547481537e-01, 1.324493288993835e-01, 1.259130716357859e-10, 1.159868590061564e-10, 1.167162894111229e-10, 1.332462890024644e-10, 2.390227737958384e-10, 3.565415740425237e-10, 2.696541323565782e-10, 2.865823724162997e-11, -1.942796196646455e-20, 4.12101290592215e-11, 9.926593574904885e-11]
+hvac.VAVBox[4].vav.m_flow=[6.910469917652262e-13, 1.537820426555925e-10, 1.562933810150824e-10, 1.435651875159039e-10, 1.212236422354351e-10, 9.602698497479523e-11, 6.810638164544969e-11, 6.920101991436668e-11, 7.880073676913568e-11, 8.226438974467953e-11, 1.894846186041832e-02, 1.425852179527283e-01, 1.730179488658905e-01, 7.536286115646362e-02, 9.416159987449653e-02, 1.211604401469231e-01, 1.431691944599152e-01, 1.595776081085205e-01, 1.59484937787056e-01, 1.472510695457458e-01, 1.331092119216919e-01, 1.288313120603561e-01, 1.188935935497284e-01, 1.015732809901237e-01, 8.908511698246002e-02, 7.707781344652176e-02, 7.707589119672775e-02, 7.707652449607849e-02, 7.708281278610229e-02, 7.708872109651566e-02, 7.708774507045746e-02, 7.708626240491867e-02, 7.708413153886795e-02, 7.708223164081573e-02, 7.708176970481873e-02, 7.708116620779037e-02, 7.708042860031128e-02, 7.707997411489487e-02, 7.708033174276352e-02, 7.708148658275604e-02, 1.076097475016802e-10, 1.331834365014828e-10, 6.857608925159298e-11, 7.292559785210262e-12, 3.299982899787612e-13, 5.941418190769099e-11, 1.034581864622908e-10, 1.302974117489697e-10, 1.477955952067234e-10, 1.331049576114296e-10, 1.23311902355816e-10, 1.246674014021565e-10, 8.707073256841724e-11, 1.405412591859445e-10, 1.263829180198073e-10, 1.240534619473267e-10, 1.457735043786104e-10, 8.796727235527222e-11, 6.547833802938996e-11, 6.831673421414663e-11, 2.42027398122957e-10, 5.781694501638412e-02, 1.807755976915359e-01, 7.51960501074791e-02, 7.707646489143372e-02, 7.701988518238068e-02, 9.319952130317688e-02, 1.068761497735977e-01, 1.060847714543342e-01, 9.126006066799179e-02, 7.709250599145889e-02, 7.708362489938736e-02, 7.708638906478882e-02, 7.708436250686646e-02, 7.708331942558289e-02, 7.70828053355217e-02, 7.708202302455902e-02, 7.708116620779037e-02, 7.70769789814949e-02, 7.707908749580383e-02, 7.708067446947098e-02, 7.708241790533066e-02, 7.708600163459778e-02, 7.708925008773804e-02, 7.708881795406342e-02, 7.708834111690521e-02, 7.70852118730545e-02, 7.707768678665161e-02, 7.708296924829483e-02, 7.70825669169426e-02, 9.299896269743257e-11, 8.566749393201789e-11, 8.620625741029286e-11, 9.841524817311154e-11, 1.765413926158033e-10, 2.633404050378374e-10, 1.991656284339172e-10, 2.116687727871103e-11, 9.096947059326765e-21, 3.043765933741227e-11, 7.331748402839011e-11]
 hvac.VAVBox[5].vav.m_flow_turbulent=[1.618800044059753e+00, 1.618800044059753e+00]
-hvac.conAHU.VEffOutAir_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.030269980430603e+00, 8.113285899162288e-01, 1.066145658493042e+00, 1.10735809803009e+00, 1.10735809803009e+00, 8.564132452011108e-01, 8.598939776420593e-01, 8.264622688293457e-01, 9.180988073348999e-01, 9.516475796699524e-01, 9.212246537208557e-01, 8.999190330505371e-01, 1.012861132621765e+00, 1.012877106666565e+00, 1.012871503829956e+00, 1.012816667556763e+00, 1.012765049934387e+00, 1.012773513793945e+00, 7.548609972000122e-01, 7.548659443855286e-01, 7.548704147338867e-01, 7.548714876174927e-01, 7.548729181289673e-01, 7.548746466636658e-01, 7.548757195472717e-01, 7.548748850822449e-01, 7.548721432685852e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.030522584915161e+00, 1.012872576713562e+00, 1.021430492401123e+00, 9.298244714736938e-01, 9.564958810806274e-01, 9.557881951332091e-01, 9.287602305412295e-01, 1.025179743766785e+00, 1.012808203697205e+00, 1.01278555393219e+00, 1.012803077697754e+00, 1.01281213760376e+00, 8.90058696269989e-01, 7.548708915710449e-01, 7.548729181289673e-01, 7.548826932907104e-01, 7.548777461051941e-01, 7.54874050617218e-01, 7.548699975013733e-01, 7.5486159324646e-01, 7.548540234565735e-01, 7.548549771308899e-01, 7.548561096191406e-01, 7.54863440990448e-01, 7.548810839653015e-01, 7.548686861991882e-01, 7.548696398735046e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-hvac.conAHU.VOut_flow=[0e+00, 1.450268140156764e-17, 1.488433095567103e-17, 1.373938229336086e-17, 1.18311345228439e-17, 9.159587644120164e-18, 6.488041592577038e-18, 6.488041592577038e-18, 7.632990254887212e-18, 8.014639808990603e-18, 1.807000105102929e-09, 1.6231082256013e-08, 7.524546319359615e-09, 1.26895010471344e-02, 3.629356920719153e-01, 5.02859354019165e-01, 5.26607871055603e-01, 5.602064728736877e-01, 5.622431635856628e-01, 5.399333834648132e-01, 5.354297161102295e-01, 5.29197096824646e-01, 5.308278203010559e-01, 5.316123366355896e-01, 5.367046594619751e-01, 5.494071841239929e-01, 5.626535415649414e-01, 5.738241076469421e-01, 5.931630730628968e-01, 6.066967844963074e-01, 6.075206398963928e-01, 6.080942153930664e-01, 6.087964773178101e-01, 6.093935966491699e-01, 6.096233725547791e-01, 6.098754405975342e-01, 6.072767972946167e-01, 5.955086350440979e-01, 5.843145847320557e-01, 5.736097097396851e-01, 1.030453630643034e-17, 1.297608318515408e-17, 6.488041592577038e-18, 7.632990048092059e-19, 0e+00, 5.724742484370256e-18, 9.541237198223556e-18, 1.221278407694729e-17, 1.450268140156764e-17, 1.259443363105069e-17, 1.18311345228439e-17, 1.18311345228439e-17, 8.396289363093994e-18, 1.335773273925747e-17, 1.221278407694729e-17, 1.18311345228439e-17, 1.412103184746425e-17, 8.396289363093994e-18, 6.106392038473647e-18, 6.488041592577038e-18, 2.328061949158441e-17, 2.016469213828032e-09, 6.950133801808533e-09, 1.266053598374128e-02, 3.782664239406586e-01, 6.322739720344543e-01, 6.281194686889648e-01, 6.528927683830261e-01, 6.676866412162781e-01, 6.636479496955873e-01, 6.531264185905457e-01, 6.560866236686707e-01, 6.778191924095154e-01, 6.920167803764343e-01, 6.923473477363586e-01, 6.931056976318359e-01, 6.925962567329407e-01, 6.930550336837769e-01, 6.764081716537476e-01, 6.441153287887573e-01, 6.29021942615509e-01, 6.233599185943604e-01, 6.339188814163208e-01, 6.556219458580017e-01, 6.630936861038208e-01, 6.608123779296875e-01, 6.48219883441925e-01, 6.230072975158691e-01, 6.225088238716125e-01, 6.406834721565247e-01, 8.777938090016773e-18, 8.777938090016773e-18, 8.396289363093994e-18, 9.922886752326947e-18, 1.679257872618799e-17, 2.480721770799798e-17, 1.870082484234372e-17, 1.908247563721803e-18, 0e+00, 3.053196019236824e-18, 6.86969114668043e-18]
-hvac.conAHU.yOutDamPos=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.75835382938385e-01, 1e+00, 6.496965885162354e-01, 5.278732180595398e-01, 5.299660563468933e-01, 5.331858396530151e-01, 5.369718074798584e-01, 5.417128801345825e-01, 5.461169481277466e-01, 5.501656532287598e-01, 5.544849038124084e-01, 5.589040517807007e-01, 5.637564063072205e-01, 5.672775506973267e-01, 5.702939033508301e-01, 5.756245851516724e-01, 5.794413685798645e-01, 5.796771645545959e-01, 5.798451900482178e-01, 5.800519585609436e-01, 5.802277326583862e-01, 5.802948474884033e-01, 5.803690552711487e-01, 5.796161293983459e-01, 5.762688517570496e-01, 5.731485486030579e-01, 5.702127814292908e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.756268858909607e-01, 1e+00, 7.495158910751343e-01, 5.781067609786987e-01, 5.799664855003357e-01, 5.840731263160706e-01, 5.882073640823364e-01, 5.91267466545105e-01, 5.944073796272278e-01, 6.01610541343689e-01, 6.065763831138611e-01, 6.06698751449585e-01, 6.069734692573547e-01, 6.067917346954346e-01, 6.069599390029907e-01, 6.011098027229309e-01, 5.906082987785339e-01, 5.85999608039856e-01, 5.843125581741333e-01, 5.874878764152527e-01, 5.94247043132782e-01, 5.966582894325256e-01, 5.959097743034363e-01, 5.918769240379333e-01, 5.842071771621704e-01, 5.840677618980408e-01, 5.895651578903198e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-hvac.conAHU.eco.mod.uOutDamPosMin=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.75835382938385e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.756268858909607e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+hvac.conAHU.VEffOutAir_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.028363466262817e+00, 8.156611919403072e-01, 1.063836336135864e+00, 1.10735809803009e+00, 1.10735809803009e+00, 8.562930226325989e-01, 8.59771192073822e-01, 8.263910412788391e-01, 9.203189611434937e-01, 9.518139362335205e-01, 9.213715791702271e-01, 9.000375270843506e-01, 1.012860417366028e+00, 1.012877106666565e+00, 1.012871503829956e+00, 1.012816667556763e+00, 1.012765049934387e+00, 1.012773513793945e+00, 7.548609972000122e-01, 7.548659443855286e-01, 7.548704147338867e-01, 7.548714876174927e-01, 7.548729181289673e-01, 7.548746466636658e-01, 7.548757195472717e-01, 7.548748850822449e-01, 7.548721432685852e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.029937148094177e+00, 1.012871861457825e+00, 1.019364237785339e+00, 9.272530078887939e-01, 9.541703462600708e-01, 9.537968635559081e-01, 9.270271658897402e-01, 1.024148344993592e+00, 1.01280951499939e+00, 1.01278555393219e+00, 1.012803077697754e+00, 1.01281213760376e+00, 8.90058696269989e-01, 7.548708915710449e-01, 7.548729181289673e-01, 7.548826932907104e-01, 7.548777461051941e-01, 7.54874050617218e-01, 7.548699975013733e-01, 7.5486159324646e-01, 7.548540234565735e-01, 7.548549771308899e-01, 7.548561096191406e-01, 7.54863440990448e-01, 7.548810839653015e-01, 7.548686861991882e-01, 7.548696398735046e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+hvac.conAHU.VOut_flow=[0e+00, 1.450268140156764e-17, 1.488433095567103e-17, 1.373938229336086e-17, 1.144948496874051e-17, 9.159587644120164e-18, 6.488041592577038e-18, 6.488041592577038e-18, 7.632990254887212e-18, 8.014639808990603e-18, 1.806841010143501e-09, 1.623133982775471e-08, 7.493482279130603e-09, 1.245757006108761e-02, 3.633539676666266e-01, 5.019444823265076e-01, 5.259034037590027e-01, 5.598397254943848e-01, 5.620615482330322e-01, 5.398010015487671e-01, 5.353617072105408e-01, 5.29176652431488e-01, 5.309129953384399e-01, 5.316909551620483e-01, 5.367698073387146e-01, 5.494074821472168e-01, 5.626534223556519e-01, 5.738236904144287e-01, 5.931627154350282e-01, 6.06697678565979e-01, 6.075196266174316e-01, 6.080935001373291e-01, 6.087952256202698e-01, 6.093922853469849e-01, 6.096221208572388e-01, 6.098741888999939e-01, 6.072754859924316e-01, 5.955073237419128e-01, 5.843133330345154e-01, 5.736083984375e-01, 1.030453630643034e-17, 1.297608318515408e-17, 6.488041592577038e-18, 1.144948455515021e-18, 0e+00, 5.724742484370256e-18, 9.541237198223556e-18, 1.259443363105069e-17, 1.412103184746425e-17, 1.259443363105069e-17, 1.18311345228439e-17, 1.18311345228439e-17, 8.396289363093994e-18, 1.335773273925747e-17, 1.18311345228439e-17, 1.18311345228439e-17, 1.412103184746425e-17, 8.396289363093994e-18, 6.106392038473647e-18, 6.488041592577038e-18, 2.328061949158441e-17, 2.416028044294194e-09, 7.860636586087821e-09, 1.265583373606205e-02, 3.781639039516449e-01, 6.310336589813232e-01, 6.263253092765808e-01, 6.512539982795715e-01, 6.662611961364746e-01, 6.623976230621339e-01, 6.5252685546875e-01, 6.560623049736023e-01, 6.7779940366745e-01, 6.920007467269897e-01, 6.923375129699707e-01, 6.930966973304749e-01, 6.925908327102661e-01, 6.930524110794067e-01, 6.7640620470047e-01, 6.441134214401245e-01, 6.290199756622314e-01, 6.233582496643066e-01, 6.339172720909119e-01, 6.556205153465271e-01, 6.630922555923462e-01, 6.608110070228577e-01, 6.482183933258057e-01, 6.230055689811707e-01, 6.225072741508484e-01, 6.406821012496948e-01, 8.777938090016773e-18, 8.777938090016773e-18, 8.396289363093994e-18, 9.541237198223556e-18, 1.679257872618799e-17, 2.480721770799798e-17, 1.908247439644711e-17, 1.908247563721803e-18, 0e+00, 3.053196019236824e-18, 6.488041592577038e-18]
+hvac.conAHU.yOutDamPos=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.735192358493805e-01, 1e+00, 6.624168753623962e-01, 5.278306007385254e-01, 5.2994304895401e-01, 5.331717133522034e-01, 5.369635820388794e-01, 5.417106151580811e-01, 5.461151599884033e-01, 5.501640439033508e-01, 5.544835925102234e-01, 5.5890291929245e-01, 5.637563467025757e-01, 5.672775506973267e-01, 5.702938437461853e-01, 5.756244659423828e-01, 5.794416069984436e-01, 5.796768665313721e-01, 5.798449516296387e-01, 5.80051600933075e-01, 5.802273750305176e-01, 5.802944302558899e-01, 5.8036869764328e-01, 5.796157717704773e-01, 5.762684941291809e-01, 5.73148250579834e-01, 5.702124834060669e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.754930734634399e-01, 1e+00, 7.497653961181641e-01, 5.780814290046692e-01, 5.799444913864136e-01, 5.840563774108887e-01, 5.881964564323425e-01, 5.912584662437439e-01, 5.943998694419861e-01, 6.016037464141846e-01, 6.065706610679626e-01, 6.066951751708984e-01, 6.069701910018921e-01, 6.067898273468018e-01, 6.069589853286743e-01, 6.011091470718384e-01, 5.906077027320862e-01, 5.859990119934082e-01, 5.843120217323303e-01, 5.874873995780945e-01, 5.942466259002686e-01, 5.966578722000122e-01, 5.959093570709229e-01, 5.918764472007751e-01, 5.842066407203674e-01, 5.840672850608826e-01, 5.895647406578064e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+hvac.conAHU.eco.mod.uOutDamPosMin=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.735192358493805e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.754930734634399e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
 hvac.conAHU.eco.mod.uOutDamPosMax=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-hvac.conAHU.yRetDamPos=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.406394362449639e-01, 5.842009782791138e-01, 4.721267521381378e-01, 4.700339436531067e-01, 4.668141901493073e-01, 4.63028222322464e-01, 4.582870900630951e-01, 4.538830816745758e-01, 4.498343467712402e-01, 4.455150663852692e-01, 4.410959482192993e-01, 4.362435638904572e-01, 4.327224493026733e-01, 4.297060668468475e-01, 4.243753850460052e-01, 4.205586314201355e-01, 4.203228354454041e-01, 4.201548099517822e-01, 4.199480414390564e-01, 4.197722673416138e-01, 4.197051823139191e-01, 4.196309149265289e-01, 4.203838706016541e-01, 4.237311482429504e-01, 4.268514215946198e-01, 4.297871887683868e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 8.947869539260864e-01, 5.579513311386108e-01, 4.218932688236237e-01, 4.200334846973419e-01, 4.159268736839294e-01, 4.117926359176636e-01, 4.08732533454895e-01, 4.055926501750946e-01, 3.983894884586334e-01, 3.934235870838165e-01, 3.933012783527374e-01, 3.930265605449677e-01, 3.93208235502243e-01, 3.930400609970093e-01, 3.988902270793915e-01, 4.093917012214661e-01, 4.14000391960144e-01, 4.156874716281891e-01, 4.125121235847473e-01, 4.057529270648956e-01, 4.03341680765152e-01, 4.040901958942413e-01, 4.081230759620667e-01, 4.157928228378296e-01, 4.159322679042816e-01, 4.104348719120026e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+hvac.conAHU.yRetDamPos=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.385639429092401e-01, 5.959292650222778e-01, 4.721693694591522e-01, 4.7005695104599e-01, 4.66828316450119e-01, 4.630363881587982e-01, 4.582893550395966e-01, 4.538848400115967e-01, 4.498359262943268e-01, 4.455163776874542e-01, 4.4109708070755e-01, 4.362436234951019e-01, 4.327224791049957e-01, 4.297061860561371e-01, 4.243755042552948e-01, 4.205584228038788e-01, 4.203231334686279e-01, 4.201550185680389e-01, 4.199484288692474e-01, 4.197726547718048e-01, 4.197055399417877e-01, 4.196312725543976e-01, 4.203842282295227e-01, 4.237315356731415e-01, 4.268517792224884e-01, 4.297875463962555e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 8.948981165885925e-01, 5.582273006439209e-01, 4.219186007976532e-01, 4.200555086135864e-01, 4.159436225891113e-01, 4.118035435676575e-01, 4.087415337562561e-01, 4.056001305580139e-01, 3.983962535858154e-01, 3.934293389320374e-01, 3.933047950267792e-01, 3.930298089981079e-01, 3.932101726531982e-01, 3.930410444736481e-01, 3.98890882730484e-01, 4.093923270702362e-01, 4.140009880065918e-01, 4.156879484653473e-01, 4.125126004219055e-01, 4.057534039020538e-01, 4.033421576023102e-01, 4.040906429290771e-01, 4.081235527992249e-01, 4.157933294773102e-01, 4.159327149391174e-01, 4.10435289144516e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Obsolete_Templates_Plants_Controls_Utilities_Validation_SortWithIndices.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Obsolete_Templates_Plants_Controls_Utilities_Validation_SortWithIndices.txt
index 879f1f382c4..c1c1437fd64 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Obsolete_Templates_Plants_Controls_Utilities_Validation_SortWithIndices.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Obsolete_Templates_Plants_Controls_Utilities_Validation_SortWithIndices.txt
@@ -1,4 +1,4 @@
-last-generated=2024-04-02
+last-generated=2024-05-29
 statistics-simulation=
 {
   "linear": " ",
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Components_Chillers_Validation_Compression.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Components_Chillers_Validation_Compression.txt
new file mode 100644
index 00000000000..384930f6bd2
--- /dev/null
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Components_Chillers_Validation_Compression.txt
@@ -0,0 +1,41 @@
+last-generated=2024-06-14
+statistics-initialization=
+{
+  "linear": "0, 0",
+  "nonlinear": "1, 0, 0",
+  "numerical Jacobians": "0"
+}
+statistics-simulation=
+{
+  "linear": " ",
+  "nonlinear": " ",
+  "number of continuous time states": "13",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 8e+03]
+y1.y[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+chiAirCoo.bus.reqChiWat=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+chiWatCoo.bus.reqChiWat=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+chiWatCoo.bus.reqConWat=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+TRet.T=[2.931499938964844e+02, 2.834622497558594e+02, 2.841946411132812e+02, 2.847551574707031e+02, 2.850815124511719e+02, 2.851373596191406e+02, 2.849164733886719e+02, 2.844434814453125e+02, 2.837709350585938e+02, 2.829737243652344e+02, 2.821404724121094e+02, 2.813639221191406e+02, 2.807304382324219e+02, 2.803104858398438e+02, 2.801508178710938e+02, 2.802691650390625e+02, 2.806523742675781e+02, 2.812578125e+02, 2.820181579589844e+02, 2.828487548828125e+02, 2.836572570800781e+02, 2.843536987304688e+02, 2.848606262207031e+02, 2.851216125488281e+02, 2.851076354980469e+02, 2.848202514648438e+02, 2.842914428710938e+02, 2.835800170898438e+02, 2.8276513671875e+02, 2.819374694824219e+02, 2.811890258789062e+02, 2.806031494140625e+02, 2.802449645996094e+02, 2.801543273925781e+02, 2.803413391113281e+02, 2.8078515625e+02, 2.814364624023438e+02, 2.822227478027344e+02, 2.830565795898438e+02, 2.838451843261719e+02, 2.845008239746094e+02, 2.849505615234375e+02, 2.851443786621094e+02, 2.850606689453125e+02, 2.847088012695312e+02, 2.841278991699219e+02, 2.833825988769531e+02, 2.825557861328125e+02, 2.817394409179688e+02, 2.810244140625e+02, 2.804902038574219e+02, 2.801962890625e+02, 2.801753234863281e+02, 2.804296875e+02, 2.809310302734375e+02, 2.816235961914062e+02, 2.824303588867188e+02, 2.832615661621094e+02, 2.840247192382812e+02, 2.846349487304688e+02, 2.850243530273438e+02, 2.851496276855469e+02, 2.84996826171875e+02, 2.845829162597656e+02, 2.839540100097656e+02, 2.831800231933594e+02, 2.823470764160156e+02, 2.815478210449219e+02, 2.808711853027344e+02, 2.803924255371094e+02, 2.801648254394531e+02, 2.802137145996094e+02, 2.805335998535156e+02, 2.810889587402344e+02, 2.818179626464844e+02, 2.826395263671875e+02, 2.834622497558594e+02, 2.841946411132812e+02, 2.847551574707031e+02, 2.850815124511719e+02, 2.851373596191406e+02, 2.849164733886719e+02, 2.844434814453125e+02, 2.837709350585938e+02, 2.829737243652344e+02, 2.821404724121094e+02, 2.813639221191406e+02, 2.807304382324219e+02, 2.803104858398438e+02, 2.801508178710938e+02, 2.802691650390625e+02, 2.806523742675781e+02, 2.812578125e+02, 2.820181579589844e+02, 2.828487548828125e+02, 2.836572570800781e+02, 2.843536987304688e+02, 2.848606262207031e+02, 2.851216125488281e+02, 2.851076354980469e+02, 2.848202514648438e+02]
+TSup.T=[2.931499938964844e+02, 2.828559875488281e+02, 2.83906494140625e+02, 2.845541687011719e+02, 2.849717407226562e+02, 2.851297302246094e+02, 2.850117492675781e+02, 2.808200378417969e+02, 2.801965637207031e+02, 2.801532592773438e+02, 2.801502380371094e+02, 2.801500244140625e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.821477355957031e+02, 2.835134582519531e+02, 2.842612609863281e+02, 2.847935485839844e+02, 2.850848693847656e+02, 2.851051330566406e+02, 2.826919555664062e+02, 2.8032666015625e+02, 2.801622924804688e+02, 2.801508483886719e+02, 2.801500854492188e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.829996643066406e+02, 2.8391650390625e+02, 2.845548706054688e+02, 2.849717712402344e+02, 2.851297607421875e+02, 2.850117492675781e+02, 2.808200378417969e+02, 2.801965637207031e+02, 2.801532592773438e+02, 2.801502380371094e+02, 2.801500244140625e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02]
+chiAirCoo.bus.TSupSet=[2.801499938964844e+02, 2.801499938964844e+02]
+chiAirCoo.TChiWatSup_nominal=[2.801499938964844e+02, 2.801499938964844e+02]
+chiAirCoo.TChiWatRet_nominal=[2.851499938964844e+02, 2.851499938964844e+02]
+chiAirCoo.port_a2.m_flow=[3.585086059570312e+01, 3.585086059570312e+01]
+chiAirCoo.mChiWat_flow_nominal=[3.585086059570312e+01, 3.585086059570312e+01]
+chiAirCoo.chi.PLR2=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.641060352325439e-01, 6.653954982757568e-01, 5.036020874977112e-01, 3.432599604129791e-01, 2.025494277477264e-01, 1.500000059604645e-01, 1.500000059604645e-01, 1.500000059604645e-01, 1.500000059604645e-01, 1.500000059604645e-01, 1.794306039810181e-01, 3.150359392166138e-01, 4.70274031162262e-01, 6.318498253822327e-01, 7.835941910743713e-01, 9.072483777999878e-01, 9.812426567077637e-01, 9.847015142440796e-01, 9.130749702453613e-01, 7.854539155960083e-01, 6.28190815448761e-01, 4.626045227050781e-01, 3.056954741477966e-01, 1.719832569360733e-01, 1.500000059604645e-01, 1.500000059604645e-01, 1.500000059604645e-01, 1.500000059604645e-01, 1.500000059604645e-01, 2.109269648790359e-01, 3.524507582187653e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.128335237503052e-01, 7.329989075660706e-01, 5.860028862953186e-01, 4.219066500663757e-01, 2.695812880992889e-01, 1.500000059604645e-01, 1.500000059604645e-01, 1.500000059604645e-01, 1.500000059604645e-01, 1.500000059604645e-01, 1.500000059604645e-01, 2.441202104091644e-01, 3.909356594085693e-01, 5.512378811836243e-01, 7.100299000740051e-01, 8.501958847045898e-01, 9.519107341766357e-01, 9.926751255989075e-01, 9.575083255767822e-01, 8.545528054237366e-01, 7.090564966201782e-01, 5.453099608421326e-01, 3.820997774600983e-01, 2.351405024528503e-01, 1.500000059604645e-01, 1.500000059604645e-01, 1.500000059604645e-01, 1.500000059604645e-01, 1.500000059604645e-01, 1.499153822660446e-01, 2.788716554641724e-01, 4.302829802036285e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.641061544418335e-01, 6.653955578804016e-01, 5.036020874977112e-01, 3.432599604129791e-01, 2.025494277477264e-01, 1.500000059604645e-01, 1.500000059604645e-01, 1.500000059604645e-01, 1.500000059604645e-01, 1.500000059604645e-01, 1.794306933879852e-01, 3.150353729724884e-01, 4.702748954296112e-01, 6.318510770797729e-01, 7.835938334465027e-01, 9.072492122650146e-01, 9.812430143356323e-01, 9.847010374069214e-01, 9.130748510360718e-01]
+chiAirCoo.chi.COP=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.634376764297485e+00, 2.00670862197876e+00, 1.394009947776794e+00, 8.86890709400177e-01, 5.109038949012756e-01, 4.246087968349457e-01, 5.393638610839844e-01, 6.061857938766479e-01, 6.028828620910645e-01, 5.346912145614624e-01, 5.132202506065369e-01, 8.632082939147949e-01, 1.344995856285095e+00, 1.931948065757751e+00, 2.49912166595459e+00, 2.86378002166748e+00, 2.987771034240723e+00, 2.977136373519897e+00, 2.833318710327148e+00, 2.440587997436523e+00, 1.847248911857605e+00, 1.2544846534729e+00, 7.812792658805847e-01, 4.346707761287689e-01, 4.537217617034912e-01, 5.623370409011841e-01, 6.119457483291626e-01, 5.91472327709198e-01, 5.090347528457642e-01, 5.878621339797974e-01, 9.714606404304504e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.380428075790405e+00, 2.315927743911743e+00, 1.692986726760864e+00, 1.12351381778717e+00, 6.837482452392578e-01, 3.826496303081512e-01, 4.838781952857971e-01, 5.812983512878418e-01, 6.132568120956421e-01, 5.76154887676239e-01, 4.804339408874512e-01, 6.713318228721619e-01, 1.087933659553528e+00, 1.630157232284546e+00, 2.230249404907227e+00, 2.714555740356445e+00, 2.949851751327515e+00, 2.994280576705933e+00, 2.929497957229614e+00, 2.671372652053833e+00, 2.156694650650024e+00, 1.539935231208801e+00, 1.000832080841064e+00, 5.937715768814087e-01, 3.995530307292938e-01, 5.129073262214661e-01, 5.959599018096924e-01, 6.101964116096497e-01, 5.571479201316833e-01, 4.491117000579834e-01, 7.631648778915405e-01, 1.212554693222046e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.634377002716064e+00, 2.00670862197876e+00, 1.394009947776794e+00, 8.86890709400177e-01, 5.109038949012756e-01, 4.246091544628143e-01, 5.393639802932739e-01, 6.061858534812927e-01, 6.028828620910645e-01, 5.346906781196594e-01, 5.132197141647339e-01, 8.632104992866516e-01, 1.344994068145752e+00, 1.931947231292725e+00, 2.499121427536011e+00, 2.86378002166748e+00, 2.987770795822144e+00, 2.977136611938477e+00, 2.833318710327148e+00]
+datChiAirCoo.COP_nominal=[2.990000009536743e+00, 2.990000009536743e+00]
+TRet2.T=[2.931499938964844e+02, 2.830431213378906e+02, 2.840425415039062e+02, 2.848069763183594e+02, 2.852513427734375e+02, 2.853262329101562e+02, 2.850232849121094e+02, 2.84376220703125e+02, 2.8345703125e+02, 2.823679504394531e+02, 2.812301635742188e+02, 2.801702270507812e+02, 2.793060607910156e+02, 2.787337951660156e+02, 2.7851708984375e+02, 2.786800842285156e+02, 2.792046203613281e+02, 2.800323486328125e+02, 2.810711669921875e+02, 2.822055358886719e+02, 2.833092651367188e+02, 2.842595520019531e+02, 2.8495068359375e+02, 2.853057556152344e+02, 2.852853088378906e+02, 2.848915710449219e+02, 2.841683654785156e+02, 2.831961669921875e+02, 2.820830993652344e+02, 2.809530029296875e+02, 2.799316101074219e+02, 2.791325073242188e+02, 2.786446228027344e+02, 2.785222473144531e+02, 2.787789611816406e+02, 2.793861999511719e+02, 2.802764587402344e+02, 2.813506469726562e+02, 2.824893188476562e+02, 2.835657348632812e+02, 2.84460205078125e+02, 2.850731811523438e+02, 2.853364868164062e+02, 2.852208251953125e+02, 2.847390747070312e+02, 2.8394482421875e+02, 2.829264526367188e+02, 2.817971801757812e+02, 2.806827087402344e+02, 2.797070007324219e+02, 2.789785766601562e+02, 2.785785217285156e+02, 2.7855126953125e+02, 2.7889990234375e+02, 2.795856323242188e+02, 2.805321655273438e+02, 2.816342163085938e+02, 2.827691650390625e+02, 2.838107299804688e+02, 2.846430969238281e+02, 2.851736450195312e+02, 2.853433227539062e+02, 2.8513330078125e+02, 2.8456689453125e+02, 2.837071533203125e+02, 2.826497192382812e+02, 2.8151220703125e+02, 2.804211730957031e+02, 2.794979858398438e+02, 2.788453674316406e+02, 2.78535888671875e+02, 2.7860400390625e+02, 2.790421447753906e+02, 2.79801513671875e+02, 2.807976989746094e+02, 2.819198303222656e+02, 2.830431213378906e+02, 2.840425415039062e+02, 2.848069763183594e+02, 2.852513427734375e+02, 2.853262329101562e+02, 2.850232849121094e+02, 2.84376220703125e+02, 2.8345703125e+02, 2.823679504394531e+02, 2.812301635742188e+02, 2.801702270507812e+02, 2.793060607910156e+02, 2.787337951660156e+02, 2.7851708984375e+02, 2.786800842285156e+02, 2.792046203613281e+02, 2.800323486328125e+02, 2.810711669921875e+02, 2.822055358886719e+02, 2.833092651367188e+02, 2.842595520019531e+02, 2.8495068359375e+02, 2.853057556152344e+02, 2.852853088378906e+02, 2.848915710449219e+02]
+TSup2.T=[2.931499938964844e+02, 2.823876342773438e+02, 2.836613464355469e+02, 2.845337219238281e+02, 2.851019897460938e+02, 2.853163146972656e+02, 2.851538696289062e+02, 2.795890502929688e+02, 2.787710876464844e+02, 2.787142639160156e+02, 2.787102966308594e+02, 2.787100219726562e+02, 2.787099914550781e+02, 2.787099914550781e+02, 2.78564697265625e+02, 2.786002197265625e+02, 2.787021179199219e+02, 2.787094421386719e+02, 2.787099609375e+02, 2.787099914550781e+02, 2.787099914550781e+02, 2.787099914550781e+02, 2.787099914550781e+02, 2.787099914550781e+02, 2.787099914550781e+02, 2.787099914550781e+02, 2.787099914550781e+02, 2.787099914550781e+02, 2.787099914550781e+02, 2.787099914550781e+02, 2.787099914550781e+02, 2.787099914550781e+02, 2.786954956054688e+02, 2.785419921875e+02, 2.786517333984375e+02, 2.787059326171875e+02, 2.78709716796875e+02, 2.787099914550781e+02, 2.813086547851562e+02, 2.831171264648438e+02, 2.841336669921875e+02, 2.848592529296875e+02, 2.852557678222656e+02, 2.852820739746094e+02, 2.82044921875e+02, 2.789417724609375e+02, 2.787261047363281e+02, 2.787111206054688e+02, 2.787100830078125e+02, 2.787100219726562e+02, 2.787099914550781e+02, 2.786519470214844e+02, 2.785392761230469e+02, 2.786800842285156e+02, 2.787079162597656e+02, 2.787098693847656e+02, 2.787099914550781e+02, 2.787099914550781e+02, 2.787099914550781e+02, 2.787099914550781e+02, 2.787099914550781e+02, 2.787099914550781e+02, 2.787099914550781e+02, 2.787099914550781e+02, 2.787099914550781e+02, 2.787099914550781e+02, 2.787099914550781e+02, 2.787099914550781e+02, 2.787099914550781e+02, 2.787099914550781e+02, 2.786037292480469e+02, 2.785584106445312e+02, 2.786946411132812e+02, 2.787089233398438e+02, 2.787099304199219e+02, 2.787099914550781e+02, 2.824274291992188e+02, 2.836641235351562e+02, 2.845339050292969e+02, 2.851019897460938e+02, 2.853163452148438e+02, 2.851538696289062e+02, 2.795890502929688e+02, 2.787710876464844e+02, 2.787142639160156e+02, 2.787102966308594e+02, 2.787100219726562e+02, 2.787099914550781e+02, 2.787099914550781e+02, 2.785646667480469e+02, 2.786002197265625e+02, 2.787020874023438e+02, 2.787094421386719e+02, 2.787099609375e+02, 2.787099914550781e+02, 2.787099914550781e+02, 2.787099914550781e+02, 2.787099914550781e+02, 2.787099914550781e+02, 2.787099914550781e+02, 2.787099914550781e+02]
+chiWatCoo.bus.TSupSet=[2.787099914550781e+02, 2.787099914550781e+02]
+chiWatCoo.TChiWatSup_nominal=[2.787099914550781e+02, 2.787099914550781e+02]
+chiWatCoo.TChiWatRet_nominal=[2.855377807617188e+02, 2.855377807617188e+02]
+chiWatCoo.port_a2.m_flow=[5.047000122070312e+01, 5.047000122070312e+01]
+chiWatCoo.mChiWat_flow_nominal=[5.047000122070312e+01, 5.047000122070312e+01]
+chiWatCoo.port_a1.m_flow=[5.047000122070312e+01, 5.047000122070312e+01]
+chiWatCoo.mCon_flow_nominal=[5.047000122070312e+01, 5.047000122070312e+01]
+chiWatCoo.chi.PLR2=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.76334285736084e-01, 6.67954683303833e-01, 5.096346735954285e-01, 3.483995795249939e-01, 2.012598663568497e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.850325167179108e-01, 3.287149667739868e-01, 4.867644608020782e-01, 6.44640326499939e-01, 7.87040650844574e-01, 8.970817923545837e-01, 9.577881097793579e-01, 9.571424126625061e-01, 8.939360976219177e-01, 7.791064977645874e-01, 6.309800744056702e-01, 4.688635766506195e-01, 3.09733659029007e-01, 1.683192700147629e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 2.188129127025604e-01, 3.674460649490356e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.665042281150818e-01, 7.353318333625793e-01, 5.905969738960266e-01, 4.281773865222931e-01, 2.721761763095856e-01, 1.373296976089478e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.231043115258217e-01, 2.541714310646057e-01, 4.068484604358673e-01, 5.666481852531433e-01, 7.187931537628174e-01, 8.472080826759338e-01, 9.345465302467346e-01, 9.655120968818665e-01, 9.329281449317932e-01, 8.41919481754303e-01, 7.079619765281677e-01, 5.505447387695312e-01, 3.879655599594116e-01, 2.359484732151031e-01, 1.084891110658646e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.530557423830032e-01, 2.908811867237091e-01, 4.46696549654007e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.763342261314392e-01, 6.67954683303833e-01, 5.096346735954285e-01, 3.483995795249939e-01, 2.012598663568497e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.850326061248779e-01, 3.287149667739868e-01, 4.867644608020782e-01, 6.446403861045837e-01, 7.870407700538635e-01, 8.970816731452942e-01, 9.577881097793579e-01, 9.571424126625061e-01, 8.939360976219177e-01]
+chiWatCoo.chi.COP=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.47697639465332e+00, 7.083362102508545e+00, 6.621692180633545e+00, 5.260707378387451e+00, 3.169504165649414e+00, 1.546484708786011e+00, 1.72383189201355e+00, 6.399669647216797e-01, 6.408655047416687e-01, 1.699990272521973e+00, 3.144074678421021e+00, 5.433828353881836e+00, 6.923929214477539e+00, 7.345211505889893e+00, 7.194839000701904e+00, 6.924114227294922e+00, 6.741603374481201e+00, 6.712496280670166e+00, 6.830155372619629e+00, 7.008675575256348e+00, 7.005870819091797e+00, 6.375007152557373e+00, 4.777244091033936e+00, 2.635701656341553e+00, 1.590283155441284e+00, 6.370364427566528e-01, 6.400927305221558e-01, 1.783283352851868e+00, 1.656168699264526e+00, 3.733561992645264e+00, 5.912963390350342e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.958521842956543e+00, 7.176085948944092e+00, 6.937910556793213e+00, 6.067289352416992e+00, 4.256938934326172e+00, 2.128079175949097e+00, 1.636583089828491e+00, 6.389229297637939e-01, 6.402336955070496e-01, 1.766113758087158e+00, 2.047958850860596e+00, 4.325552940368652e+00, 6.324319362640381e+00, 7.243141174316406e+00, 7.307008743286133e+00, 7.056780815124512e+00, 6.815619468688965e+00, 6.706908702850342e+00, 6.755865573883057e+00, 6.922066688537598e+00, 7.053821086883545e+00, 6.800642013549805e+00, 5.693315505981445e+00, 3.715299367904663e+00, 1.657736301422119e+00, 1.681862831115723e+00, 6.396855115890503e-01, 6.404763460159302e-01, 1.737298727035522e+00, 2.576763391494751e+00, 4.899026870727539e+00, 6.661559581756592e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.476977348327637e+00, 7.083362579345703e+00, 6.621692180633545e+00, 5.260707378387451e+00, 3.169504165649414e+00, 1.546485781669617e+00, 1.723832130432129e+00, 6.399656534194946e-01, 6.408656239509583e-01, 1.699982643127441e+00, 3.144104242324829e+00, 5.433834552764893e+00, 6.923927783966064e+00, 7.345210075378418e+00, 7.194835186004639e+00, 6.924115657806396e+00, 6.741603851318359e+00, 6.712496280670166e+00, 6.830155372619629e+00]
+datChiWatCoo.COP_nominal=[6.610000133514404e+00, 6.610000133514404e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Components_Validation_Dampers.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Components_Validation_Dampers.txt
index 8f6fc40ceab..cba0711be99 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Components_Validation_Dampers.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Components_Validation_Dampers.txt
@@ -1,4 +1,4 @@
-last-generated=2024-04-03
+last-generated=2024-06-02
 statistics-initialization=
 {
   "nonlinear": "0, 1",
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Components_Validation_Fans.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Components_Validation_Fans.txt
index 5f6c93e96e0..a2705d7a085 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Components_Validation_Fans.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Components_Validation_Fans.txt
@@ -1,4 +1,4 @@
-last-generated=2024-04-03
+last-generated=2024-06-02
 statistics-initialization=
 {
   "nonlinear": "0, 1, 1, 0, 1, 0",
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Components_Validation_PumpMultipleRecord.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Components_Validation_PumpMultipleRecord.txt
index 7dd424a81f7..8184410220c 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Components_Validation_PumpMultipleRecord.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Components_Validation_PumpMultipleRecord.txt
@@ -1,4 +1,4 @@
-last-generated=2024-04-04
+last-generated=2024-06-02
 statistics-simulation=
 {
   "linear": " ",
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Components_Validation_Pumps.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Components_Validation_Pumps.txt
index a831371d4cf..c5112ec1a61 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Components_Validation_Pumps.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Components_Validation_Pumps.txt
@@ -1,4 +1,4 @@
-last-generated=2024-04-03
+last-generated=2024-06-02
 statistics-initialization=
 {
   "nonlinear": "2, 2, 2, 2",
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Components_Validation_Routing.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Components_Validation_Routing.txt
index 40fb7cf994e..12f8f8f117a 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Components_Validation_Routing.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Components_Validation_Routing.txt
@@ -1,4 +1,4 @@
-last-generated=2023-05-24
+last-generated=2024-06-02
 statistics-initialization=
 {
   "nonlinear": "1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0",
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Components_Validation_Sensors.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Components_Validation_Sensors.txt
index 4f36840016a..e90ecdb40a9 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Components_Validation_Sensors.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Components_Validation_Sensors.txt
@@ -1,4 +1,4 @@
-last-generated=2023-05-24
+last-generated=2024-06-02
 statistics-initialization=
 {
   "nonlinear": "0, 0, 0, 0",
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Components_Validation_Tanks.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Components_Validation_Tanks.txt
new file mode 100644
index 00000000000..440c2d9bef2
--- /dev/null
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Components_Validation_Tanks.txt
@@ -0,0 +1,14 @@
+last-generated=2024-06-02
+statistics-simulation=
+{
+  "linear": " ",
+  "nonlinear": " ",
+  "number of continuous time states": "2",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 5e+02]
+intFlo.y=[0e+00, 5.022167693823576e-03, 1.004433538764715e-02, 1.506650354713202e-02, 2.00886707752943e-02, 2.511083893477917e-02, 3.013300709426403e-02, 3.515517339110374e-02, 4.017734155058861e-02, 4.519950971007347e-02, 5.022167786955833e-02, 5.52438460290432e-02, 6.026601418852806e-02, 6.528817862272263e-02, 7.031034678220749e-02, 7.533251494169235e-02, 8.035468310117722e-02, 8.537685126066208e-02, 9.039901942014694e-02, 9.542118757963181e-02, 1.004433557391167e-01, 1.054655238986015e-01, 1.104876920580864e-01, 1.155098602175713e-01, 1.205320283770561e-01, 1.255541890859604e-01, 1.305763572454453e-01, 1.355985254049301e-01, 1.40620693564415e-01, 1.456428617238998e-01, 1.506650298833847e-01, 1.556871980428696e-01, 1.607093662023544e-01, 1.657315343618393e-01, 1.707537025213242e-01, 1.75775870680809e-01, 1.807980388402939e-01, 1.858202069997787e-01, 1.908423751592636e-01, 1.958645433187485e-01, 2.008867114782333e-01, 2.059088796377182e-01, 2.109310477972031e-01, 2.159532159566879e-01, 2.209753841161728e-01, 2.259975522756577e-01, 2.310197204351425e-01, 2.360418885946274e-01, 2.410640567541122e-01, 2.460862249135971e-01, 2.511083781719208e-01, 2.561305463314056e-01, 2.611527144908905e-01, 2.661748826503754e-01, 2.711970508098602e-01, 2.762192189693451e-01, 2.8124138712883e-01, 2.862635552883148e-01, 2.912857234477997e-01, 2.963078916072845e-01, 3.013300597667694e-01, 3.063522279262543e-01, 3.113743960857391e-01, 3.16396564245224e-01, 3.214187324047089e-01, 3.264409005641937e-01, 3.314630687236786e-01, 3.364852368831635e-01, 3.415074050426483e-01, 3.465295732021332e-01, 3.51551741361618e-01, 3.565739095211029e-01, 3.615960776805878e-01, 3.666182458400726e-01, 3.716404139995575e-01, 3.766625821590424e-01, 3.816847503185272e-01, 3.867069184780121e-01, 3.917290866374969e-01, 3.967512547969818e-01, 4.017734229564667e-01, 4.067955911159515e-01, 4.118177592754364e-01, 4.168399274349213e-01, 4.218620955944061e-01, 4.26884263753891e-01, 4.319064319133759e-01, 4.369286000728607e-01, 4.419507682323456e-01, 4.469729363918304e-01, 4.519951045513153e-01, 4.570172727108002e-01, 4.62039440870285e-01, 4.670616090297699e-01, 4.720837771892548e-01, 4.771059453487396e-01, 4.821281135082245e-01, 4.871502816677094e-01, 4.921724498271942e-01, 4.971946179866791e-01, 5.022167563438416e-01]
+tan.V=[6.026601418852806e-02, 6.026601418852806e-02]
+sou.T=[3.031499938964844e+02, 3.031499938964844e+02]
+tan.sta_b.T=[2.931499938964844e+02, 2.939495849609375e+02, 2.946852722167969e+02, 2.95362060546875e+02, 2.959847412109375e+02, 2.965576171875e+02, 2.970846862792969e+02, 2.975696105957031e+02, 2.980157775878906e+02, 2.9842626953125e+02, 2.98803955078125e+02, 2.991514892578125e+02, 2.994712219238281e+02, 2.99765380859375e+02, 3.000360107421875e+02, 3.002850036621094e+02, 3.005140686035156e+02, 3.007248229980469e+02, 3.009187316894531e+02, 3.010971374511719e+02, 3.012612915039062e+02, 3.014122924804688e+02, 3.0155126953125e+02, 3.016790771484375e+02, 3.017967224121094e+02, 3.019049377441406e+02, 3.020044860839844e+02, 3.020960693359375e+02, 3.021803283691406e+02, 3.022578735351562e+02, 3.023291931152344e+02, 3.023948059082031e+02, 3.024552001953125e+02, 3.025107421875e+02, 3.025618591308594e+02, 3.0260888671875e+02, 3.026521606445312e+02, 3.026919555664062e+02, 3.027285766601562e+02, 3.027622375488281e+02, 3.027932434082031e+02, 3.028217468261719e+02, 3.028479614257812e+02, 3.028721008300781e+02, 3.028943176269531e+02, 3.029147644042969e+02, 3.029335632324219e+02, 3.029508666992188e+02, 3.02966796875e+02, 3.029814453125e+02, 3.029949035644531e+02, 3.0300732421875e+02, 3.030187072753906e+02, 3.030292053222656e+02, 3.030388793945312e+02, 3.030477600097656e+02, 3.03055908203125e+02, 3.030634460449219e+02, 3.030703735351562e+02, 3.030767211914062e+02, 3.030825805664062e+02, 3.030879821777344e+02, 3.030929260253906e+02, 3.030975036621094e+02, 3.031016845703125e+02, 3.031055603027344e+02, 3.031091003417969e+02, 3.031123657226562e+02, 3.031153869628906e+02, 3.031181335449219e+02, 3.031206665039062e+02, 3.031230163574219e+02, 3.031251831054688e+02, 3.031271362304688e+02, 3.031289672851562e+02, 3.031306457519531e+02, 3.031321716308594e+02, 3.031336059570312e+02, 3.031349182128906e+02, 3.031361083984375e+02, 3.0313720703125e+02, 3.031382446289062e+02, 3.0313916015625e+02, 3.031400451660156e+02, 3.031408386230469e+02, 3.031415710449219e+02, 3.031422424316406e+02, 3.031428527832031e+02, 3.031434326171875e+02, 3.031439514160156e+02, 3.031444396972656e+02, 3.031448669433594e+02, 3.031452941894531e+02, 3.031456604003906e+02, 3.0314599609375e+02, 3.031463317871094e+02, 3.031466064453125e+02, 3.031468811035156e+02, 3.031471252441406e+02, 3.031473693847656e+02, 3.031475830078125e+02]
+noTan.sta_b.T=[3.031499938964844e+02, 3.031499938964844e+02]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Components_Validation_Valves.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Components_Validation_Valves.txt
index bdf0a3ecb19..49476510743 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Components_Validation_Valves.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Components_Validation_Valves.txt
@@ -1,4 +1,4 @@
-last-generated=2024-04-03
+last-generated=2024-06-02
 statistics-initialization=
 {
   "nonlinear": "0, 1, 1, 1, 1, 1",
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_HeatPumps_Validation_AirToWater.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_HeatPumps_Validation_AirToWater.txt
index b74e7aa82d9..336c1e2a45d 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_HeatPumps_Validation_AirToWater.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_HeatPumps_Validation_AirToWater.txt
@@ -1,16 +1,16 @@
-last-generated=2024-04-01
+last-generated=2024-06-12
 statistics-simulation=
 {
   "linear": " ",
   "nonlinear": " ",
-  "number of continuous time states": "36",
+  "number of continuous time states": "40",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 8.64e+04]
-ctl.chaStaHea.capReq.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.2e+01, 2.94e+02, 4.43625e+02, 6.9825e+02, 1.05e+03, 1.016400024414062e+03, 9.827999877929688e+02, 9.492000122070311e+02, 9.155999755859375e+02, 8.82e+02, 8.484000244140625e+02, 8.147999877929688e+02, 7.812000122070312e+02, 7.475999755859374e+02, 7.140000000000001e+02, 6.804000244140625e+02, 6.467999877929688e+02, 6.132000122070312e+02, 5.795999755859375e+02, 5.46e+02, 4.483500061035156e+02, 2.9925e+02, 1.113000030517578e+02, 1.029000015258789e+02, 1.89e+02, 3.013500061035156e+02, 3.885e+02, 3.811499938964844e+02, 4.872000122070312e+02, 4.4625e+02, 4.105499877929688e+02, 3.748500061035156e+02, 3.391499938964844e+02, 3.034500122070312e+02, 2.677499999999997e+02, 2.320500030517575e+02, 1.963500061035159e+02, 1.606499938964844e+02, 1.249499969482422e+02, 8.925e+01, 5.354999923706055e+01, 1.785000038146973e+01, 1.799999952316284e+00, 5.400000095367432e+00, 9e+00, 1.260000038146973e+01, 1.417500019073486e+01, 9.899999618530289e+00, 2.92499995231628e+00, 6.749999999999992e+00, 1.9125e+01, 3.420000076293945e+01, 5.197499847412109e+01, 7.244999694824219e+01, 9e+01, 1.032750015258789e+02, 1.109250030517578e+02, 1.185749969482422e+02, 1.262249984741211e+02, 1.33875e+02, 1.415249938964844e+02, 1.491750030517578e+02, 1.568249969482422e+02, 1.644750061035156e+02, 1.72125e+02, 1.797749938964844e+02, 1.874250030517578e+02, 1.950749969482422e+02, 2.027250061035156e+02, 2.10375e+02, 2.180249938964844e+02, 2.141999969482422e+02, 1.874250030517578e+02, 1.606499938964844e+02, 1.33875e+02, 1.070999984741211e+02, 8.032499694824219e+01, 5.354999923706055e+01, 2.677499961853027e+01, 0e+00]
-ctl.chaStaCoo.capReq.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.399999618530273e+00, 1.679999923706055e+01, 2.520000076293949e+01, 3.359999847412109e+01, 4.2e+01, 5.040000152587891e+01, 5.879999923706055e+01, 6.719999694824219e+01, 7.559999847412112e+01, 8.399999999999997e+01, 8.057279968261719e+01, 6.854399871826172e+01, 5.328960037231445e+01, 3.480960083007812e+01, 2.116799926757812e+01, 1.182719993591309e+01, 3.084480094909668e+01, 6.168960189819336e+01, 9.576000213623047e+01, 1.008000030517578e+02, 1.058399963378906e+02, 1.10879997253418e+02, 1.159199981689453e+02, 1.209599990844727e+02, 1.26e+02, 1.663200073242188e+02, 2.066399993896484e+02, 2.469600067138672e+02, 2.872799987792969e+02, 3.27600006103516e+02, 3.679200134277347e+02, 4.082399902343747e+02, 4.485599975585938e+02, 4.888800048828125e+02, 5.292000122070312e+02, 5.6952001953125e+02, 2.845920104980469e+02, 2.067599945068359e+02, 2.002799987792969e+02, 9.69e+02, 9.365999755859375e+02, 9.042000122070312e+02, 8.717999877929685e+02, 8.394000244140627e+02, 8.070000000000002e+02, 7.745999755859375e+02, 7.422000122070312e+02, 7.097999877929688e+02, 6.774000244140625e+02, 6.45e+02, 6.125999755859375e+02, 5.802000122070312e+02, 5.477999877929688e+02, 4.824143981933594e+02, 3.593519897460938e+02, 2.48731201171875e+02, 1.773168029785156e+02, 6.481439971923828e+01, 1.413599967956543e+01, 4.879199981689453e+01, 9.927839660644531e+01, 1.373231964111328e+02, 1.342799987792969e+02, 1.148399963378906e+02, 9.540000152587891e+01, 7.595999908447266e+01, 6.047999954223633e+01, 5.291999816894531e+01, 4.536000061035156e+01, 3.779999923706055e+01, 5.040000152587891e+01, 3.779999923706055e+01, 2.520000076293945e+01, 1.260000038146973e+01, 0e+00]
-capHea_nominal=[1.05e+03, 1.05e+03]
-capCoo_nominal=[1.05e+03, 1.05e+03]
+ctl.chaStaHea.capReq.QReq_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.04e+03, 1.251249375e+05, 2.5111440625e+05, 3.7712509375e+05, 5.03115625e+05, 5.11118375e+05, 4.9434159375e+05, 4.775272812499999e+05, 4.607225625e+05, 4.4391659375e+05, 4.27118e+05, 4.10316375e+05, 3.9351640625e+05, 3.767190312499999e+05, 3.599165937500001e+05, 3.4312225e+05, 3.2632725e+05, 3.0952184375e+05, 2.92717625e+05, 2.7591653125e+05, 2.591171875e+05, 2.42318578125e+05, 2.25529e+05, 2.0871775e+05, 1.91917984375e+05, 1.75116640625e+05, 1.5831778125e+05, 1.4151834375e+05, 1.247168125e+05, 1.079179140625e+05, 9.80598125e+04, 8.96583828125e+04, 8.12581171875e+04, 7.285884375e+04, 6.445828906249993e+04, 5.605888671874993e+04, 4.765851562500007e+04, 3.92579921875e+04, 3.0858546875e+04, 2.2458498046875e+04, 1.4058921875e+04, 5.66382763671875e+03, 5.87588134765625e+02, 2.38733935546875e+03, 4.18727001953125e+03, 5.987505859375e+03, 7.7875517578125e+03, 9.585496093750016e+03, 1.138682226562499e+04, 1.318739160156249e+04, 1.49871376953125e+04, 1.678745703125e+04, 1.8587296875e+04, 2.0387484375e+04, 2.2187546875e+04, 2.3987537109375e+04, 2.578679296875e+04, 2.758728515625e+04, 2.93874453125e+04, 3.118740234375e+04, 3.298748828125e+04, 3.47874609375e+04, 3.658751171875e+04, 3.8386765625e+04, 4.0186296875e+04, 4.198723828125e+04, 4.378716796875e+04, 4.558746484375e+04, 4.73872890625e+04, 4.91875e+04, 5.09874765625e+04, 5.149078515625e+04, 4.519584375e+04, 3.889440234375e+04, 3.2594259765625e+04, 2.629431640625e+04, 1.9996853515625e+04, 1.36943720703125e+04, 7.39373779296875e+03, 1.095623046875e+03]
+ctl.chaStaCoo.capReq.QReq_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.47040869140625e+03, 7.66459814453125e+03, 1.186818066406252e+04, 1.60693623046875e+04, 2.0270853515625e+04, 2.44705e+04, 2.8670904296875e+04, 3.28708984375e+04, 3.707024218750001e+04, 4.127084765624999e+04, 4.54694375e+04, 4.966819140625e+04, 5.386954296875e+04, 5.807059375e+04, 6.227086328125e+04, 6.6470703125e+04, 7.06703515625e+04, 7.486775e+04, 7.90705625e+04, 8.32705078125e+04, 8.747084375e+04, 9.16705546875e+04, 9.58704140625e+04, 1.00070796875e+05, 1.042705234375e+05, 1.32760765625e+05, 1.66366484375e+05, 1.99967515625e+05, 2.33564625e+05, 2.671668437500003e+05, 3.007644687500003e+05, 3.343659374999997e+05, 3.6796803125e+05, 4.015658125e+05, 4.35166e+05, 4.687643125e+05, 5.023446875e+05, 5.1971171875e+05, 5.035139375e+05, 4.873145625e+05, 4.711124375e+05, 4.5491203125e+05, 4.387305312499999e+05, 4.225185937500001e+05, 4.063134687500001e+05, 3.9011575e+05, 3.73912875e+05, 3.577143125e+05, 3.41512625e+05, 3.2531209375e+05, 3.0911215625e+05, 2.9291884375e+05, 2.767144375e+05, 2.60512984375e+05, 2.44313375e+05, 2.2811259375e+05, 2.11912859375e+05, 1.9571240625e+05, 1.7951909375e+05, 1.633233125e+05, 1.47114875e+05, 1.30915484375e+05, 1.147128359375e+05, 9.851440625e+04, 8.2312484375e+04, 6.6112703125e+04, 5.15024453125e+04, 4.519584375e+04, 3.889440234375e+04, 3.2594259765625e+04, 2.629431640625e+04, 1.9996853515625e+04, 1.36943720703125e+04, 7.39373779296875e+03, 1.095623046875e+03]
+capHea_nominal=[1.05e+06, 1.05e+06]
+capCoo_nominal=[1.05e+06, 1.05e+06]
 ctl.TOut=[2.78923828125e+02, 2.792105712890625e+02, 2.79501220703125e+02, 2.797954711914062e+02, 2.800930480957031e+02, 2.803936157226562e+02, 2.806969299316406e+02, 2.810026550292969e+02, 2.813104858398438e+02, 2.816201477050781e+02, 2.819313049316406e+02, 2.822436828613281e+02, 2.825569458007812e+02, 2.828707885742188e+02, 2.831849060058594e+02, 2.834989929199219e+02, 2.83812744140625e+02, 2.841258239746094e+02, 2.844379577636719e+02, 2.847488098144531e+02, 2.850580749511719e+02, 2.85365478515625e+02, 2.856706848144531e+02, 2.859734191894531e+02, 2.862733459472656e+02, 2.865701904296875e+02, 2.868636779785156e+02, 2.871535034179688e+02, 2.874393615722656e+02, 2.877209777832031e+02, 2.879981079101562e+02, 2.882704162597656e+02, 2.885377197265625e+02, 2.887996826171875e+02, 2.890560607910156e+02, 2.893066101074219e+02, 2.895510864257812e+02, 2.897892761230469e+02, 2.900208740234375e+02, 2.902456970214844e+02, 2.904635314941406e+02, 2.906741638183594e+02, 2.908773498535156e+02, 2.910729064941406e+02, 2.912606506347656e+02, 2.914403686523438e+02, 2.916119384765625e+02, 2.91775146484375e+02, 2.919298400878906e+02, 2.920758666992188e+02, 2.922130737304688e+02, 2.923413391113281e+02, 2.924605712890625e+02, 2.925705871582031e+02, 2.926712951660156e+02, 2.927626037597656e+02, 2.928444519042969e+02, 2.929167175292969e+02, 2.929793395996094e+02, 2.930322875976562e+02, 2.930754699707031e+02, 2.931088562011719e+02, 2.931323852539062e+02, 2.931460876464844e+02, 2.931499328613281e+02, 2.931439208984375e+02, 2.931280212402344e+02, 2.931022644042969e+02, 2.930667114257812e+02, 2.930213623046875e+02, 2.929662780761719e+02, 2.929014892578125e+02, 2.928270874023438e+02, 2.927431335449219e+02, 2.926497192382812e+02, 2.925469360351562e+02, 2.924348449707031e+02, 2.923136291503906e+02, 2.92183349609375e+02, 2.920441589355469e+02, 2.918962097167969e+02, 2.917395935058594e+02, 2.915745239257812e+02, 2.91401123046875e+02, 2.912196044921875e+02, 2.910301208496094e+02, 2.908328247070312e+02, 2.906279907226562e+02, 2.904157409667969e+02, 2.901963500976562e+02, 2.89969970703125e+02, 2.897369079589844e+02, 2.89497314453125e+02, 2.8925146484375e+02, 2.889995727539062e+02, 2.88741943359375e+02, 2.88478759765625e+02, 2.882103271484375e+02, 2.879369201660156e+02, 2.876587829589844e+02, 2.873761901855469e+02]
 ctl.TOutChiWatLck=[2.891499938964844e+02, 2.891499938964844e+02]
 ctl.TOutHeaWatLck=[2.941499938964844e+02, 2.941499938964844e+02]
@@ -18,37 +18,46 @@ ctl.nReqPlaHeaWat=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00
 ctl.nReqPlaChiWat=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00]
 ctl.enaHea.y1=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00]
 ctl.enaCoo.y1=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-ctl.idxStaHea.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 2e+00, 2e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 2e+00, 2e+00, 2e+00, 2e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00]
-ctl.idxStaCoo.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 1e+00, 1e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-ctl.y1Hp[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00]
-ctl.y1Hp[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-ctl.y1Hp[3]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-ctl.y1HeaHp[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00]
-ctl.y1HeaHp[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-ctl.y1HeaHp[3]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-ctl.y1PumHeaWatPri[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
-ctl.y1PumHeaWatPri[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-ctl.y1PumHeaWatPri[3]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctl.idxStaHea.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00]
+ctl.idxStaCoo.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctl.y1Hp[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctl.y1Hp[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00]
+ctl.y1Hp[3]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctl.y1HeaHp[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctl.y1HeaHp[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00]
+ctl.y1HeaHp[3]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctl.y1PumHeaWatPri[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctl.y1PumHeaWatPri[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+ctl.y1PumHeaWatPri[3]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
 ctl.y1PumHeaWatSec[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00]
 ctl.y1PumHeaWatSec[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
 ctl.y1PumHeaWatSec[3]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-ctl.y1PumChiWatPri[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-ctl.y1PumChiWatPri[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-ctl.y1PumChiWatPri[3]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctl.y1PumChiWatPri[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctl.y1PumChiWatPri[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctl.y1PumChiWatPri[3]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
 ctl.y1PumChiWatSec[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
 ctl.y1PumChiWatSec[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
 ctl.y1PumChiWatSec[3]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
 ctl.nReqResHeaWat=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 3e+00, 4e+00, 5e+00, 5e+00, 5e+00, 5e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
 ctl.nReqResChiWat=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 2e+00, 2e+00, 2e+00, 3e+00, 3e+00, 3e+00, 4e+00, 4e+00, 4e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-ctl.resHeaWat.TSupSet=[3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.216499938964844e+02, 3.221499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.221499938964844e+02, 3.201499938964844e+02, 3.171499938964844e+02, 3.171499938964844e+02, 3.111499938964844e+02, 3.081499938964844e+02, 3.051499938964844e+02, 3.041499938964844e+02, 2.991499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.221499938964844e+02, 3.191499938964844e+02, 3.161499938964844e+02, 3.131499938964844e+02, 3.101499938964844e+02, 3.071499938964844e+02, 3.041499938964844e+02, 3.011499938964844e+02, 2.991499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 3.231499938964844e+02]
-ctl.resChiWat.TSupSet=[2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.807900085449219e+02, 2.8175e+02, 2.827099914550781e+02, 2.836700134277344e+02, 2.843099975585938e+02, 2.855899963378906e+02, 2.862300109863281e+02, 2.871900024414062e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.865499877929688e+02, 2.841499938964844e+02, 2.841499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.804700012207031e+02, 2.814299926757812e+02, 2.823900146484375e+02, 2.830299987792969e+02, 2.843099975585938e+02, 2.849500122070312e+02, 2.859100036621094e+02, 2.868699951171875e+02, 2.878299865722656e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02]
+ctl.resHeaWat.TSupSet=[3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.216499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.221499938964844e+02, 3.201499938964844e+02, 3.171499938964844e+02, 3.141499938964844e+02, 3.111499938964844e+02, 3.081499938964844e+02, 3.051499938964844e+02, 3.021499938964844e+02, 2.991499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.221499938964844e+02, 3.191499938964844e+02, 3.161499938964844e+02, 3.131499938964844e+02, 3.101499938964844e+02, 3.071499938964844e+02, 3.041499938964844e+02, 3.011499938964844e+02, 2.991499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 3.231499938964844e+02]
+ctl.resChiWat.TSupSet=[2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.807900085449219e+02, 2.8175e+02, 2.827099914550781e+02, 2.836700134277344e+02, 2.846300048828125e+02, 2.855899963378906e+02, 2.862300109863281e+02, 2.871900024414062e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.865499877929688e+02, 2.841499938964844e+02, 2.8175e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.804700012207031e+02, 2.814299926757812e+02, 2.823900146484375e+02, 2.833500061035156e+02, 2.843099975585938e+02, 2.849500122070312e+02, 2.859100036621094e+02, 2.868699951171875e+02, 2.878299865722656e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02]
 ctl.THeaWatSup_nominal=[3.231499938964844e+02, 3.231499938964844e+02]
 ctl.THeaWatSupSet_min=[2.981499938964844e+02, 2.981499938964844e+02]
 ctl.TChiWatSup_nominal=[2.801499938964844e+02, 2.801499938964844e+02]
 ctl.TChiWatSupSet_max=[2.881499938964844e+02, 2.881499938964844e+02]
-ctl.dpHeaWatRemSet[1]=[5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 4.937880078125e+04, 4.751519921875e+04, 4.56516015625e+04, 4.3788e+04, 4.19243984375e+04, 4.006080078125e+04, 3.819719921875e+04, 3.63336015625e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 4.87576015625e+04, 4.6894e+04, 4.50303984375e+04, 4.316680078125e+04, 4.130319921875e+04, 3.94396015625e+04, 3.7576e+04, 3.57123984375e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 5e+04]
-ctl.dpChiWatRemSet[1]=[5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 4.81363984375e+04, 4.627280078125e+04, 4.440919921875e+04, 4.25456015625e+04, 4.0682e+04, 3.94396015625e+04, 3.7576e+04, 3.57123984375e+04, 3.447e+04, 3.447e+04, 3.47806015625e+04, 3.57123984375e+04, 3.664419921874969e+04, 3.850780078125e+04, 4.09926015625e+04, 4.471980078125e+04, 4.8447e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 4.87576015625e+04, 4.6894e+04, 4.50303984375e+04, 4.316680078125e+04, 4.19243984375e+04, 4.006080078125e+04, 3.819719921875e+04, 3.63336015625e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04]
+ctl.dpHeaWatRemSet[1]=[5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 4.937880078125e+04, 4.751519921875e+04, 4.56516015625e+04, 4.3788e+04, 4.19243984375e+04, 4.006080078125e+04, 3.819719921875e+04, 3.633360156250009e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 4.87576015625e+04, 4.6894e+04, 4.50303984375e+04, 4.316680078125e+04, 4.130319921875e+04, 3.94396015625e+04, 3.7576e+04, 3.57123984375e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 5e+04]
+ctl.dpChiWatRemSet[1]=[5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 4.81363984375e+04, 4.627280078125e+04, 4.440919921875e+04, 4.25456015625e+04, 4.0682e+04, 3.94396015625e+04, 3.7576e+04, 3.57123984375e+04, 3.447e+04, 3.447e+04, 3.47806015625e+04, 3.57123984375e+04, 3.664419921874996e+04, 3.695480078125e+04, 4.09926015625e+04, 4.471980078125e+04, 4.8447e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 4.87576015625e+04, 4.6894e+04, 4.50303984375e+04, 4.316680078125e+04, 4.19243984375e+04, 4.006080078125e+04, 3.819719921875e+04, 3.63336015625e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04]
 ctl.dpHeaWatRemSet_max[1]=[5e+04, 5e+04]
 ctl.dpHeaWatRemSet_min=[3.447e+04, 3.447e+04]
 ctl.dpChiWatRemSet_max[1]=[5e+04, 5e+04]
 ctl.dpChiWatRemSet_min=[3.447e+04, 3.447e+04]
+ctl.y1Hrc=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctl.y1CooHrc=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+ctl.y1PumChiWatHrc=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctl.y1PumHeaWatHrc=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctl.hrc.loaChiWat.QReq_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.9408173828125e+03, 1.53291962890625e+04, 2.373636132812504e+04, 3.2138724609375e+04, 4.054170703125e+04, 4.8941e+04, 5.734180859375e+04, 6.5741796875e+04, 7.414048437500003e+04, 8.254169531249997e+04, 9.0938875e+04, 9.93363828125e+04, 1.077390859375e+05, 1.161411875e+05, 1.245417265625e+05, 1.3294140625e+05, 1.41340703125e+05, 1.497355e+05, 1.58141125e+05, 1.66541015625e+05, 1.749416875e+05, 1.83341109375e+05, 1.91740828125e+05, 2.0014159375e+05, 2.08541046875e+05, 2.6552153125e+05, 3.3273296875e+05, 3.9993503125e+05, 4.6712925e+05, 5.343336875000006e+05, 6.015289375000006e+05, 6.687318749999994e+05, 7.359360625e+05, 8.03131625e+05, 8.70332e+05, 9.37528625e+05, 1.004689375e+06, 1.0394234375e+06, 1.007027875e+06, 9.74629125e+05, 9.42224875e+05, 9.098240625e+05, 8.774610624999998e+05, 8.450371875000002e+05, 8.126269375000002e+05, 7.802315e+05, 7.4782575e+05, 7.15428625e+05, 6.8302525e+05, 6.506241875e+05, 6.182243125e+05, 5.858376875e+05, 5.53428875e+05, 5.2102596875e+05, 4.8862675e+05, 4.562251875e+05, 4.2382571875e+05, 3.914248125e+05, 3.590381875e+05, 3.26646625e+05, 2.9422975e+05, 2.6183096875e+05, 2.29425671875e+05, 1.970288125e+05, 1.6462496875e+05, 1.3222540625e+05, 1.03004890625e+05, 9.03916875e+04, 7.77888046875e+04, 6.518851953125e+04, 5.25886328125e+04, 3.999370703125e+04, 2.7388744140625e+04, 1.47874755859375e+04, 2.19124609375e+03]
+ctl.hrc.loaHeaWat.QReq_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.008e+04, 2.50249875e+05, 5.022288125e+05, 7.542501875e+05, 1.00623125e+06, 1.02223675e+06, 9.886831875e+05, 9.550545624999999e+05, 9.21445125e+05, 8.878331875e+05, 8.54236e+05, 8.2063275e+05, 7.870328125e+05, 7.534380624999999e+05, 7.198331875000001e+05, 6.862445e+05, 6.526545e+05, 6.190436875e+05, 5.8543525e+05, 5.518330625e+05, 5.18234375e+05, 4.8463715625e+05, 4.51058e+05, 4.174355e+05, 3.8383596875e+05, 3.5023328125e+05, 3.166355625e+05, 2.830366875e+05, 2.49433625e+05, 2.15835828125e+05, 1.96119625e+05, 1.79316765625e+05, 1.62516234375e+05, 1.457176875e+05, 1.289165781249999e+05, 1.121177734374999e+05, 9.531703125000015e+04, 7.8515984375e+04, 6.171709375e+04, 4.491699609375e+04, 2.811784375e+04, 1.13276552734375e+04, 1.17517626953125e+03, 4.7746787109375e+03, 8.3745400390625e+03, 1.197501171875e+04, 1.5575103515625e+04, 1.917099218750003e+04, 2.277364453124997e+04, 2.637478320312497e+04, 2.9974275390625e+04, 3.35749140625e+04, 3.717459375e+04, 4.077496875e+04, 4.437509375e+04, 4.797507421875e+04, 5.15735859375e+04, 5.51745703125e+04, 5.8774890625e+04, 6.23748046875e+04, 6.59749765625e+04, 6.9574921875e+04, 7.31750234375e+04, 7.677353125e+04, 8.037259375e+04, 8.39744765625e+04, 8.75743359375e+04, 9.11749296875e+04, 9.4774578125e+04, 9.8375e+04, 1.01974953125e+05, 1.029815703125e+05, 9.03916875e+04, 7.77888046875e+04, 6.518851953125e+04, 5.25886328125e+04, 3.999370703125e+04, 2.7388744140625e+04, 1.47874755859375e+04, 2.19124609375e+03]
+ctl.capCooHrc_min=[1.0125e+05, 1.0125e+05]
+ctl.capHeaHrc_min=[1.575e+05, 1.575e+05]
+ctl.hrc.setMod.QEvaHea_flow.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.48e+03, 1.60874921875e+05, 3.22861375e+05, 4.84875125e+05, 6.468629375e+05, 6.571521875e+05, 6.355820625e+05, 6.139636249999999e+05, 5.923575625e+05, 5.70749875e+05, 5.491516875e+05, 5.27549625e+05, 5.0594965625e+05, 4.843530624999999e+05, 4.627499375000001e+05, 4.4115715625e+05, 4.1956359375e+05, 3.9795665625e+05, 3.7635121875e+05, 3.5474984375e+05, 3.3315065625e+05, 3.1155246875e+05, 2.89965875e+05, 2.6835140625e+05, 2.467516875e+05, 2.25149953125e+05, 2.035514375e+05, 1.8195215625e+05, 1.603501875e+05, 1.3875159375e+05, 1.260768984375e+05, 1.152750625e+05, 1.044747265625e+05, 9.367565625e+04, 8.287493749999991e+04, 7.207571093749991e+04, 6.127523437500009e+04, 5.04745625e+04, 3.96752734375e+04, 2.88752109375e+04, 1.8075755859375e+04, 7.28206396484375e+03, 7.55470458984375e+02, 3.069436279296875e+03, 5.3836328125e+03, 7.69822216796875e+03, 1.001256640625e+04, 1.232420996093752e+04, 1.464020019531248e+04, 1.695521679687498e+04, 1.926917578125e+04, 2.1583873046875e+04, 2.3897953125e+04, 2.621248046875e+04, 2.8526845703125e+04, 3.0841119140625e+04, 3.315444921875e+04, 3.54693671875e+04, 3.7783859375e+04, 4.009808984375e+04, 4.241248828125e+04, 4.4726734375e+04, 4.70410859375e+04, 4.93544140625e+04, 5.166809765625e+04, 5.398358984375e+04, 5.62977890625e+04, 5.8612453125e+04, 6.092651171875e+04, 6.324107421875e+04, 6.5555328125e+04, 6.62024375e+04, 5.810894140625e+04, 5.000708984375e+04, 4.190690625e+04, 3.380698046875e+04, 2.571023828125e+04, 1.760705078125e+04, 9.506234375e+03, 1.408658203125e+03]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_HeatRecoveryChillers_Validation_EnableAndModeControl.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_HeatRecoveryChillers_Validation_EnableAndModeControl.txt
new file mode 100644
index 00000000000..fb7d2d9ffd5
--- /dev/null
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_HeatRecoveryChillers_Validation_EnableAndModeControl.txt
@@ -0,0 +1,24 @@
+last-generated=2024-06-12
+statistics-simulation=
+{
+  "linear": " ",
+  "nonlinear": " ",
+  "number of continuous time states": "4",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 8.64e+04]
+ena.u1Coo=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+ena.u1Hea=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ena.QChiWatReq_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.40253173828125e+04, 3.1117716796875e+04, 4.826057421875007e+04, 6.54034296875e+04, 8.25462890625e+04, 9.98062265625e+04, 1.16832015625e+05, 1.33974859375e+05, 1.511177343750001e+05, 1.682605781249999e+05, 1.854034375e+05, 2.02719796875e+05, 2.19872296875e+05, 2.36983046875e+05, 2.53982390625e+05, 2.7119171875e+05, 2.8844765625e+05, 3.0559015625e+05, 3.22747625e+05, 3.3988028125e+05, 3.5699575e+05, 3.7401425e+05, 3.9111815625e+05, 4.083358125e+05, 4.2540353125e+05, 4.4254646875e+05, 4.5968921875e+05, 4.7699584375e+05, 4.9397496875e+05, 5.111177812500001e+05, 5.282606250000001e+05, 5.454034374999999e+05, 5.625463125e+05, 5.79689125e+05, 5.970163125e+05, 6.13975375e+05, 6.311179375e+05, 6.363928125e+05, 6.165560625e+05, 5.96724625e+05, 5.770934375e+05, 5.5723625e+05, 5.374204999999999e+05, 5.175840937500002e+05, 4.977470625000002e+05, 4.779104375e+05, 4.580738125e+05, 4.382371875e+05, 4.1840025e+05, 3.985635625e+05, 3.78726875e+05, 3.5889015625e+05, 3.3905346875e+05, 3.1921678125e+05, 2.993800625e+05, 2.79543375e+05, 2.59706640625e+05, 2.3986990625e+05, 2.198195625e+05, 2.001964375e+05, 1.801575e+05, 1.6050809375e+05, 1.40662390625e+05, 1.20848796875e+05, 1.010127421875e+05, 8.09219765625e+04, 6.297537109375e+04, 5.542285546875e+04, 4.771065234375e+04, 3.9996078125e+04, 3.2243861328125e+04, 2.45678203125e+04, 1.6853927734375e+04, 9.1398662109375e+03, 1.497344604492188e+03]
+ena.QHeaWatReq_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.6e+03, 2.3832084375e+05, 4.776259375e+05, 7.15648e+05, 9.567721875e+05, 9.781828125e+05, 9.515946875e+05, 9.249279999999999e+05, 8.982613125e+05, 8.715946875e+05, 8.44745875e+05, 8.182613125e+05, 7.91594625e+05, 7.649279999999999e+05, 7.382613125000001e+05, 7.11594625e+05, 6.84658125e+05, 6.579764375e+05, 6.313596875e+05, 6.049163125e+05, 5.781461875e+05, 5.513036875e+05, 5.246375625e+05, 4.9794815625e+05, 4.7129734375e+05, 4.4467328125e+05, 4.182000625e+05, 3.9159396875e+05, 3.6481096875e+05, 3.382611875e+05, 3.1159440625e+05, 2.84927875e+05, 2.58006453125e+05, 2.315945e+05, 2.049278749999998e+05, 1.782612656249998e+05, 1.515946562500002e+05, 1.24928e+05, 9.82613359375e+04, 7.130796875e+04, 4.492717578125e+04, 1.8261015625e+04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ena.capCoo_min=[1.92857140625e+05, 1.92857140625e+05]
+ena.capHea_min=[9e+04, 9e+04]
+setMod.QEvaHea_flow.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.1714287109375e+03, 1.5320625e+05, 3.0704525e+05, 4.600594375e+05, 6.150678125e+05, 6.288318125e+05, 6.117394375e+05, 5.945965624999999e+05, 5.774536875e+05, 5.60310875e+05, 5.430509375e+05, 5.26025125e+05, 5.0888228125e+05, 4.917394062499999e+05, 4.745965625000001e+05, 4.574536875e+05, 4.4013734375e+05, 4.2298484375e+05, 4.0587409375e+05, 3.8887475e+05, 3.716654375e+05, 3.544095e+05, 3.37267e+05, 3.2010953125e+05, 3.0297684375e+05, 2.85861375e+05, 2.6884290625e+05, 2.5173896875e+05, 2.3452134375e+05, 2.17453625e+05, 2.003106875e+05, 1.83167921875e+05, 1.65861296875e+05, 1.48882171875e+05, 1.317393593749999e+05, 1.145965312499999e+05, 9.745370312500015e+04, 8.03108515625e+04, 6.3168e+04, 4.584083984375e+04, 2.888175390625e+04, 1.17392236328125e+04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+TChiWatRet.y=[2.851499938964844e+02, 2.851499938964844e+02]
+ena.TChiWatHrcLvg=[2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.774972839355469e+02, 2.761499938964844e+02, 2.761499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.786167602539062e+02, 2.802583618164062e+02, 2.817666931152344e+02, 2.830396728515625e+02, 2.840159912109375e+02, 2.846759948730469e+02, 2.85037841796875e+02, 2.851497802734375e+02, 2.85080078125e+02, 2.849057006835938e+02, 2.847015380859375e+02, 2.84531005859375e+02, 2.844393920898438e+02, 2.844501647949219e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02]
+ena.TChiWatSup_min=[2.771499938964844e+02, 2.771499938964844e+02]
+THeaWatRet.y=[3.151499938964844e+02, 3.151499938964844e+02]
+ena.THeaWatHrcLvg=[3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.216470031738281e+02, 3.242403869628906e+02, 3.267190856933594e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.284540405273438e+02, 3.262587585449219e+02, 3.23736572265625e+02, 3.211526794433594e+02, 3.187788391113281e+02, 3.168646545410156e+02, 3.156114501953125e+02, 3.151509704589844e+02, 3.155316772460938e+02, 3.167135009765625e+02, 3.185722045898438e+02, 3.209122924804688e+02, 3.234876708984375e+02, 3.26027587890625e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.151499938964844e+02]
+ena.THeaWatSup_max=[3.281499938964844e+02, 3.281499938964844e+02]
+ena.y1=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+setMod.y1Coo=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_MinimumFlow_Validation_Controller.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_MinimumFlow_Validation_Controller.txt
new file mode 100644
index 00000000000..7d297201637
--- /dev/null
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_MinimumFlow_Validation_Controller.txt
@@ -0,0 +1,17 @@
+last-generated=2024-06-12
+statistics-simulation=
+{
+  "linear": " ",
+  "nonlinear": " ",
+  "number of continuous time states": "2",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 1e+03]
+u1EquValPum.y[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+u1EquValPum.y[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctlFloMinVal.VPriSet_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+VPri_flow.y=[0e+00, 3.747626207768917e-03, 7.362490985542536e-03, 1.071653608232737e-02, 1.36909419670701e-02, 1.618034020066261e-02, 1.809654012322426e-02, 1.937166415154934e-02, 1.996053382754326e-02, 1.984229311347008e-02, 1.902113109827042e-02, 1.752613298594952e-02, 1.541026495397091e-02, 1.274847984313965e-02, 9.635073132812977e-03, 6.180339958518744e-03, 2.506664721295238e-03, -1.255810377188027e-03, -4.973797593265772e-03, -8.515586145222187e-03, -1.175570487976074e-02, -4.579372704029083e-03, -6.88655860722065e-03, -8.595529943704605e-03, -9.645745158195496e-03, -9.999999776482582e-03, -9.645745158195496e-03, -8.595529943704605e-03, -6.88655860722065e-03, -4.579372704029083e-03, -1.75570510327816e-03, 1.484414213337004e-03, 5.02620218321681e-03, 8.744189515709877e-03, 1.250666473060846e-02, 1.618034020066261e-02, 1.963507384061813e-02, 2.274847961962223e-02, 2.541026473045349e-02, 2.75261327624321e-02, 2.9021130874753e-02, 6.184229254722595e-02, 6.196053326129913e-02, 6.137166172266006e-02, 6.009653955698013e-02, 5.818033963441849e-02, 5.56909404695034e-02, 5.271653458476067e-02, 4.936249181628227e-02, 4.574762657284737e-02, 4.199999943375587e-02, 3.825237229466438e-02, 3.463751077651978e-02, 3.128346428275108e-02, 2.830905839800835e-02, 2.581965923309326e-02, 2.390345931053162e-02, 2.262833714485168e-02, 2.203946560621262e-02, 2.21577063202858e-02, 2.297887019813061e-02, 1.247386634349823e-02, 1.458973530679941e-02, 1.72515194863081e-02, 2.036492712795734e-02, 2.381966076791286e-02, 2.749333530664444e-02, 3.12558114528656e-02, 3.497379645705223e-02, 3.851558640599251e-02, 4.175570607185364e-02, 4.457937180995941e-02, 4.688655957579613e-02, 4.859552904963493e-02, 4.964574426412582e-02, 5.000000074505806e-02, 4.964574426412582e-02, 4.859552904963493e-02, 4.688655957579613e-02, 4.457937180995941e-02, 4.175570607185364e-02, 8.515586145222187e-03, 4.973797593265772e-03, 1.255810377188027e-03, -2.506664721295238e-03, -6.180339958518744e-03, -9.635073132812977e-03, -1.274847984313965e-02, -1.541026495397091e-02, -1.752613298594952e-02, -1.902113109827042e-02, -1.984229311347008e-02, -1.996053382754326e-02, -1.937166415154934e-02, -1.809654012322426e-02, -1.618034020066261e-02, -1.36909419670701e-02, -1.071653608232737e-02, -7.362490985542536e-03, -3.747626207768917e-03, -1.469576190014977e-17]
+ctlFloMinPum.VPriSet_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+VPri_flow1.y=[0e+00, 3.747626207768917e-03, 7.362490985542536e-03, 1.071653608232737e-02, 1.36909419670701e-02, 1.618034020066261e-02, 1.809654012322426e-02, 1.937166415154934e-02, 1.996053382754326e-02, 1.984229311347008e-02, 1.902113109827042e-02, 1.752613298594952e-02, 1.541026495397091e-02, 1.274847984313965e-02, 9.635073132812977e-03, 6.180339958518744e-03, 2.506664721295238e-03, -1.255810377188027e-03, -4.973797593265772e-03, -8.515586145222187e-03, -1.175570487976074e-02, -4.579372704029083e-03, -6.88655860722065e-03, -8.595529943704605e-03, -9.645745158195496e-03, -9.999999776482582e-03, -9.645745158195496e-03, -8.595529943704605e-03, -6.88655860722065e-03, -4.579372704029083e-03, -1.75570510327816e-03, 1.484414213337004e-03, 5.02620218321681e-03, 8.744189515709877e-03, 1.250666473060846e-02, 1.618034020066261e-02, 1.963507384061813e-02, 2.274847961962223e-02, 2.541026473045349e-02, 2.75261327624321e-02, 2.9021130874753e-02, 6.184229254722595e-02, 6.196053326129913e-02, 6.137166172266006e-02, 6.009653955698013e-02, 5.818033963441849e-02, 5.56909404695034e-02, 5.271653458476067e-02, 4.936249181628227e-02, 4.574762657284737e-02, 4.199999943375587e-02, 3.825237229466438e-02, 3.463751077651978e-02, 3.128346428275108e-02, 2.830905839800835e-02, 2.581965923309326e-02, 2.390345931053162e-02, 2.262833714485168e-02, 2.203946560621262e-02, 2.21577063202858e-02, 2.297887019813061e-02, 1.247386634349823e-02, 1.458973530679941e-02, 1.72515194863081e-02, 2.036492712795734e-02, 2.381966076791286e-02, 2.749333530664444e-02, 3.12558114528656e-02, 3.497379645705223e-02, 3.851558640599251e-02, 4.175570607185364e-02, 4.457937180995941e-02, 4.688655957579613e-02, 4.859552904963493e-02, 4.964574426412582e-02, 5.000000074505806e-02, 4.964574426412582e-02, 4.859552904963493e-02, 4.688655957579613e-02, 4.457937180995941e-02, 4.175570607185364e-02, 8.515586145222187e-03, 4.973797593265772e-03, 1.255810377188027e-03, -2.506664721295238e-03, -6.180339958518744e-03, -9.635073132812977e-03, -1.274847984313965e-02, -1.541026495397091e-02, -1.752613298594952e-02, -1.902113109827042e-02, -1.984229311347008e-02, -1.996053382754326e-02, -1.937166415154934e-02, -1.809654012322426e-02, -1.618034020066261e-02, -1.36909419670701e-02, -1.071653608232737e-02, -7.362490985542536e-03, -3.747626207768917e-03, -1.469576190014977e-17]
+ctlFloMinVal.y=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.807455539703369e-01, 8.899442553520203e-01, 7.27868914604187e-01, 5.002542734146118e-01, 2.15166762471199e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.89137426787056e-05, 4.135070368647575e-02, 1.563930511474609e-01, 3.410749137401581e-01, 5.888528823852539e-01, 8.909429311752319e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.945380687713623e-01, 9.283472895622253e-01, 7.89530336856842e-01, 5.829796195030212e-01, 3.16027045249939e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+ctlFloMinPum.y=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.807455539703369e-01, 8.899442553520203e-01, 7.27868914604187e-01, 5.002542734146118e-01, 2.15166762471199e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.89137426787056e-05, 4.135070368647575e-02, 1.563930511474609e-01, 3.410749137401581e-01, 5.888528823852539e-01, 8.909429311752319e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.945380687713623e-01, 9.283472895622253e-01, 7.89530336856842e-01, 5.829796195030212e-01, 3.16027045249939e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_MinimumFlow_Validation_ControllerDualMode.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_MinimumFlow_Validation_ControllerDualMode.txt
new file mode 100644
index 00000000000..88a6ce0636a
--- /dev/null
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_MinimumFlow_Validation_ControllerDualMode.txt
@@ -0,0 +1,37 @@
+last-generated=2024-06-12
+statistics-simulation=
+{
+  "linear": " ",
+  "nonlinear": " ",
+  "number of continuous time states": "8",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 1e+03]
+u1EquValPum.y[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+u1EquValPum.y[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctlFloMinValCoo.VChiWatPriSet_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+VPriCoo_flow.y=[0e+00, 3.747626207768917e-03, 7.362490985542536e-03, 1.071653608232737e-02, 1.36909419670701e-02, 1.618034020066261e-02, 1.809654012322426e-02, 1.937166415154934e-02, 1.996053382754326e-02, 1.984229311347008e-02, 1.902113109827042e-02, 1.752613298594952e-02, 1.541026495397091e-02, 1.274847984313965e-02, 9.635073132812977e-03, 6.180339958518744e-03, 2.506664721295238e-03, -1.255810377188027e-03, -4.973797593265772e-03, -8.515586145222187e-03, -1.175570487976074e-02, -4.579372704029083e-03, -6.88655860722065e-03, -8.595529943704605e-03, -9.645745158195496e-03, -9.999999776482582e-03, -9.645745158195496e-03, -8.595529943704605e-03, -6.88655860722065e-03, -4.579372704029083e-03, -1.75570510327816e-03, 1.484414213337004e-03, 5.02620218321681e-03, 8.744189515709877e-03, 1.250666473060846e-02, 1.618034020066261e-02, 1.963507384061813e-02, 2.274847961962223e-02, 2.541026473045349e-02, 2.75261327624321e-02, 2.9021130874753e-02, 6.184229254722595e-02, 6.196053326129913e-02, 6.137166172266006e-02, 6.009653955698013e-02, 5.818033963441849e-02, 5.56909404695034e-02, 5.271653458476067e-02, 4.936249181628227e-02, 4.574762657284737e-02, 4.199999943375587e-02, 3.825237229466438e-02, 3.463751077651978e-02, 3.128346428275108e-02, 2.830905839800835e-02, 2.581965923309326e-02, 2.390345931053162e-02, 2.262833714485168e-02, 2.203946560621262e-02, 2.21577063202858e-02, 2.297887019813061e-02, 1.247386634349823e-02, 1.458973530679941e-02, 1.72515194863081e-02, 2.036492712795734e-02, 2.381966076791286e-02, 2.749333530664444e-02, 3.12558114528656e-02, 3.497379645705223e-02, 3.851558640599251e-02, 4.175570607185364e-02, 4.457937180995941e-02, 4.688655957579613e-02, 4.859552904963493e-02, 4.964574426412582e-02, 5.000000074505806e-02, 4.964574426412582e-02, 4.859552904963493e-02, 4.688655957579613e-02, 4.457937180995941e-02, 4.175570607185364e-02, 8.515586145222187e-03, 4.973797593265772e-03, 1.255810377188027e-03, -2.506664721295238e-03, -6.180339958518744e-03, -9.635073132812977e-03, -1.274847984313965e-02, -1.541026495397091e-02, -1.752613298594952e-02, -1.902113109827042e-02, -1.984229311347008e-02, -1.996053382754326e-02, -1.937166415154934e-02, -1.809654012322426e-02, -1.618034020066261e-02, -1.36909419670701e-02, -1.071653608232737e-02, -7.362490985542536e-03, -3.747626207768917e-03, -1.469576190014977e-17]
+ctlFloMinPumCoo.VChiWatPriSet_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+VPriCoo_flow1.y=[0e+00, 3.747626207768917e-03, 7.362490985542536e-03, 1.071653608232737e-02, 1.36909419670701e-02, 1.618034020066261e-02, 1.809654012322426e-02, 1.937166415154934e-02, 1.996053382754326e-02, 1.984229311347008e-02, 1.902113109827042e-02, 1.752613298594952e-02, 1.541026495397091e-02, 1.274847984313965e-02, 9.635073132812977e-03, 6.180339958518744e-03, 2.506664721295238e-03, -1.255810377188027e-03, -4.973797593265772e-03, -8.515586145222187e-03, -1.175570487976074e-02, -4.579372704029083e-03, -6.88655860722065e-03, -8.595529943704605e-03, -9.645745158195496e-03, -9.999999776482582e-03, -9.645745158195496e-03, -8.595529943704605e-03, -6.88655860722065e-03, -4.579372704029083e-03, -1.75570510327816e-03, 1.484414213337004e-03, 5.02620218321681e-03, 8.744189515709877e-03, 1.250666473060846e-02, 1.618034020066261e-02, 1.963507384061813e-02, 2.274847961962223e-02, 2.541026473045349e-02, 2.75261327624321e-02, 2.9021130874753e-02, 6.184229254722595e-02, 6.196053326129913e-02, 6.137166172266006e-02, 6.009653955698013e-02, 5.818033963441849e-02, 5.56909404695034e-02, 5.271653458476067e-02, 4.936249181628227e-02, 4.574762657284737e-02, 4.199999943375587e-02, 3.825237229466438e-02, 3.463751077651978e-02, 3.128346428275108e-02, 2.830905839800835e-02, 2.581965923309326e-02, 2.390345931053162e-02, 2.262833714485168e-02, 2.203946560621262e-02, 2.21577063202858e-02, 2.297887019813061e-02, 1.247386634349823e-02, 1.458973530679941e-02, 1.72515194863081e-02, 2.036492712795734e-02, 2.381966076791286e-02, 2.749333530664444e-02, 3.12558114528656e-02, 3.497379645705223e-02, 3.851558640599251e-02, 4.175570607185364e-02, 4.457937180995941e-02, 4.688655957579613e-02, 4.859552904963493e-02, 4.964574426412582e-02, 5.000000074505806e-02, 4.964574426412582e-02, 4.859552904963493e-02, 4.688655957579613e-02, 4.457937180995941e-02, 4.175570607185364e-02, 8.515586145222187e-03, 4.973797593265772e-03, 1.255810377188027e-03, -2.506664721295238e-03, -6.180339958518744e-03, -9.635073132812977e-03, -1.274847984313965e-02, -1.541026495397091e-02, -1.752613298594952e-02, -1.902113109827042e-02, -1.984229311347008e-02, -1.996053382754326e-02, -1.937166415154934e-02, -1.809654012322426e-02, -1.618034020066261e-02, -1.36909419670701e-02, -1.071653608232737e-02, -7.362490985542536e-03, -3.747626207768917e-03, -1.469576190014977e-17]
+ctlFloMinValCoo.yValChiWatMinByp=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.807494878768921e-01, 8.899519443511963e-01, 7.278771996498108e-01, 5.002626776695251e-01, 2.151686549186707e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.992714533116668e-05, 4.135214537382126e-02, 1.563964784145355e-01, 3.410757780075073e-01, 5.888505578041077e-01, 8.909403681755066e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.945386648178101e-01, 9.283437728881836e-01, 7.89512574672699e-01, 5.829567313194275e-01, 3.159967660903931e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+ctlFloMinPumCoo.yValChiWatMinByp=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.807494878768921e-01, 8.899519443511963e-01, 7.278771996498108e-01, 5.002626776695251e-01, 2.151686549186707e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.992714533116668e-05, 4.135214537382126e-02, 1.563964784145355e-01, 3.410757780075073e-01, 5.888505578041077e-01, 8.909403681755066e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.945386648178101e-01, 9.283437728881836e-01, 7.89512574672699e-01, 5.829567313194275e-01, 3.159967660903931e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+ctlFloMinValHea.VHeaWatPriSet_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+VPriHea_flow.y=[0e+00, 3.747626207768917e-03, 7.362490985542536e-03, 1.071653608232737e-02, 1.36909419670701e-02, 1.618034020066261e-02, 1.809654012322426e-02, 1.937166415154934e-02, 1.996053382754326e-02, 1.984229311347008e-02, 1.902113109827042e-02, 1.752613298594952e-02, 1.541026495397091e-02, 1.274847984313965e-02, 9.635073132812977e-03, 6.180339958518744e-03, 2.506664721295238e-03, -1.255810377188027e-03, -4.973797593265772e-03, -8.515586145222187e-03, -1.175570487976074e-02, -4.579372704029083e-03, -6.88655860722065e-03, -8.595529943704605e-03, -9.645745158195496e-03, -9.999999776482582e-03, -9.645745158195496e-03, -8.595529943704605e-03, -6.88655860722065e-03, -4.579372704029083e-03, -1.75570510327816e-03, 1.484414213337004e-03, 5.02620218321681e-03, 8.744189515709877e-03, 1.250666473060846e-02, 1.618034020066261e-02, 1.963507384061813e-02, 2.274847961962223e-02, 2.541026473045349e-02, 2.75261327624321e-02, 2.9021130874753e-02, 6.184229254722595e-02, 6.196053326129913e-02, 6.137166172266006e-02, 6.009653955698013e-02, 5.818033963441849e-02, 5.56909404695034e-02, 5.271653458476067e-02, 4.936249181628227e-02, 4.574762657284737e-02, 4.199999943375587e-02, 3.825237229466438e-02, 3.463751077651978e-02, 3.128346428275108e-02, 2.830905839800835e-02, 2.581965923309326e-02, 2.390345931053162e-02, 2.262833714485168e-02, 2.203946560621262e-02, 2.21577063202858e-02, 2.297887019813061e-02, 1.247386634349823e-02, 1.458973530679941e-02, 1.72515194863081e-02, 2.036492712795734e-02, 2.381966076791286e-02, 2.749333530664444e-02, 3.12558114528656e-02, 3.497379645705223e-02, 3.851558640599251e-02, 4.175570607185364e-02, 4.457937180995941e-02, 4.688655957579613e-02, 4.859552904963493e-02, 4.964574426412582e-02, 5.000000074505806e-02, 4.964574426412582e-02, 4.859552904963493e-02, 4.688655957579613e-02, 4.457937180995941e-02, 4.175570607185364e-02, 8.515586145222187e-03, 4.973797593265772e-03, 1.255810377188027e-03, -2.506664721295238e-03, -6.180339958518744e-03, -9.635073132812977e-03, -1.274847984313965e-02, -1.541026495397091e-02, -1.752613298594952e-02, -1.902113109827042e-02, -1.984229311347008e-02, -1.996053382754326e-02, -1.937166415154934e-02, -1.809654012322426e-02, -1.618034020066261e-02, -1.36909419670701e-02, -1.071653608232737e-02, -7.362490985542536e-03, -3.747626207768917e-03, -1.469576190014977e-17]
+ctlFloMinPumHea.VHeaWatPriSet_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+VPriHea_flow1.y=[0e+00, 3.747626207768917e-03, 7.362490985542536e-03, 1.071653608232737e-02, 1.36909419670701e-02, 1.618034020066261e-02, 1.809654012322426e-02, 1.937166415154934e-02, 1.996053382754326e-02, 1.984229311347008e-02, 1.902113109827042e-02, 1.752613298594952e-02, 1.541026495397091e-02, 1.274847984313965e-02, 9.635073132812977e-03, 6.180339958518744e-03, 2.506664721295238e-03, -1.255810377188027e-03, -4.973797593265772e-03, -8.515586145222187e-03, -1.175570487976074e-02, -4.579372704029083e-03, -6.88655860722065e-03, -8.595529943704605e-03, -9.645745158195496e-03, -9.999999776482582e-03, -9.645745158195496e-03, -8.595529943704605e-03, -6.88655860722065e-03, -4.579372704029083e-03, -1.75570510327816e-03, 1.484414213337004e-03, 5.02620218321681e-03, 8.744189515709877e-03, 1.250666473060846e-02, 1.618034020066261e-02, 1.963507384061813e-02, 2.274847961962223e-02, 2.541026473045349e-02, 2.75261327624321e-02, 2.9021130874753e-02, 6.184229254722595e-02, 6.196053326129913e-02, 6.137166172266006e-02, 6.009653955698013e-02, 5.818033963441849e-02, 5.56909404695034e-02, 5.271653458476067e-02, 4.936249181628227e-02, 4.574762657284737e-02, 4.199999943375587e-02, 3.825237229466438e-02, 3.463751077651978e-02, 3.128346428275108e-02, 2.830905839800835e-02, 2.581965923309326e-02, 2.390345931053162e-02, 2.262833714485168e-02, 2.203946560621262e-02, 2.21577063202858e-02, 2.297887019813061e-02, 1.247386634349823e-02, 1.458973530679941e-02, 1.72515194863081e-02, 2.036492712795734e-02, 2.381966076791286e-02, 2.749333530664444e-02, 3.12558114528656e-02, 3.497379645705223e-02, 3.851558640599251e-02, 4.175570607185364e-02, 4.457937180995941e-02, 4.688655957579613e-02, 4.859552904963493e-02, 4.964574426412582e-02, 5.000000074505806e-02, 4.964574426412582e-02, 4.859552904963493e-02, 4.688655957579613e-02, 4.457937180995941e-02, 4.175570607185364e-02, 8.515586145222187e-03, 4.973797593265772e-03, 1.255810377188027e-03, -2.506664721295238e-03, -6.180339958518744e-03, -9.635073132812977e-03, -1.274847984313965e-02, -1.541026495397091e-02, -1.752613298594952e-02, -1.902113109827042e-02, -1.984229311347008e-02, -1.996053382754326e-02, -1.937166415154934e-02, -1.809654012322426e-02, -1.618034020066261e-02, -1.36909419670701e-02, -1.071653608232737e-02, -7.362490985542536e-03, -3.747626207768917e-03, -1.469576190014977e-17]
+ctlFloMinValHea.yValHeaWatMinByp=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.807494878768921e-01, 8.899519443511963e-01, 7.278771996498108e-01, 5.002626776695251e-01, 2.151686549186707e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.992714533116668e-05, 4.135214537382126e-02, 1.563964784145355e-01, 3.410757780075073e-01, 5.888505578041077e-01, 8.909403681755066e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.945386648178101e-01, 9.283437728881836e-01, 7.89512574672699e-01, 5.829567313194275e-01, 3.159967660903931e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+ctlFloMinPumHea.yValHeaWatMinByp=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.807494878768921e-01, 8.899519443511963e-01, 7.278771996498108e-01, 5.002626776695251e-01, 2.151686549186707e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.992714533116668e-05, 4.135214537382126e-02, 1.563964784145355e-01, 3.410757780075073e-01, 5.888505578041077e-01, 8.909403681755066e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.945386648178101e-01, 9.283437728881836e-01, 7.89512574672699e-01, 5.829567313194275e-01, 3.159967660903931e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+u1HeaEqu.y[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+u1HeaEqu.y[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+u1ValHeaWat[1].y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+u1ValHeaWat[2].y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+u1ValChiWat[1].y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+u1ValChiWat[2].y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctlFloMinValHeaCoo.VHeaWatPriSet_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+VPriHeaCoo_flow.y=[0e+00, 3.747626207768917e-03, 7.362490985542536e-03, 1.071653608232737e-02, 1.36909419670701e-02, 1.618034020066261e-02, 1.809654012322426e-02, 1.937166415154934e-02, 1.996053382754326e-02, 1.984229311347008e-02, 1.902113109827042e-02, 1.752613298594952e-02, 1.541026495397091e-02, 1.274847984313965e-02, 9.635073132812977e-03, 6.180339958518744e-03, 2.506664721295238e-03, -1.255810377188027e-03, -4.973797593265772e-03, -8.515586145222187e-03, -1.175570487976074e-02, -1.457937248051167e-02, -1.688655838370323e-02, -1.859552972018719e-02, -1.964574493467808e-02, -1.999999955296516e-02, -1.964574493467808e-02, -1.859552972018719e-02, -1.688655838370323e-02, -1.457937248051167e-02, -1.175570487976074e-02, 1.484414213337004e-03, 5.02620218321681e-03, 8.744189515709877e-03, 1.250666473060846e-02, 1.618034020066261e-02, 1.963507384061813e-02, 2.274847961962223e-02, 2.541026473045349e-02, 2.75261327624321e-02, 2.9021130874753e-02, 2.984229475259781e-02, 2.996053546667099e-02, 2.937166392803192e-02, 2.809654176235199e-02, 2.61803399771452e-02, 2.369094267487526e-02, 2.071653679013252e-02, 1.736249029636383e-02, 1.37476259842515e-02, 9.999999776482582e-03, 2.62523740530014e-02, 2.26375088095665e-02, 1.928346417844296e-02, 1.630905829370022e-02, 1.381966006010771e-02, 1.190345920622349e-02, 1.062833704054356e-02, 1.003946550190449e-02, 1.015770621597767e-02, 1.097887009382248e-02, 1.247386634349823e-02, 1.458973530679941e-02, 1.72515194863081e-02, 2.036492712795734e-02, 2.381966076791286e-02, 2.749333530664444e-02, 3.12558114528656e-02, 3.497379645705223e-02, 3.851558640599251e-02, 4.175570607185364e-02, 4.457937180995941e-02, 4.688655957579613e-02, 4.859552904963493e-02, 4.964574426412582e-02, 5.000000074505806e-02, 4.964574426412582e-02, 4.859552904963493e-02, 4.688655957579613e-02, 4.457937180995941e-02, 4.175570607185364e-02, 8.515586145222187e-03, 4.973797593265772e-03, 1.255810377188027e-03, -2.506664721295238e-03, -6.180339958518744e-03, -9.635073132812977e-03, -1.274847984313965e-02, -1.541026495397091e-02, -1.752613298594952e-02, -1.902113109827042e-02, -1.984229311347008e-02, -1.996053382754326e-02, -1.937166415154934e-02, -1.809654012322426e-02, -1.618034020066261e-02, -1.36909419670701e-02, -1.071653608232737e-02, -7.362490985542536e-03, -3.747626207768917e-03, -1.469576190014977e-17]
+ctlFloMinPumHeaCoo.VHeaWatPriSet_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+VPriHeaCoo_flow1.y=[0e+00, 3.747626207768917e-03, 7.362490985542536e-03, 1.071653608232737e-02, 1.36909419670701e-02, 1.618034020066261e-02, 1.809654012322426e-02, 1.937166415154934e-02, 1.996053382754326e-02, 1.984229311347008e-02, 1.902113109827042e-02, 1.752613298594952e-02, 1.541026495397091e-02, 1.274847984313965e-02, 9.635073132812977e-03, 6.180339958518744e-03, 2.506664721295238e-03, -1.255810377188027e-03, -4.973797593265772e-03, -8.515586145222187e-03, -1.175570487976074e-02, -1.457937248051167e-02, -1.688655838370323e-02, -1.859552972018719e-02, -1.964574493467808e-02, -1.999999955296516e-02, -1.964574493467808e-02, -1.859552972018719e-02, -1.688655838370323e-02, -1.457937248051167e-02, -1.175570487976074e-02, 1.484414213337004e-03, 5.02620218321681e-03, 8.744189515709877e-03, 1.250666473060846e-02, 1.618034020066261e-02, 1.963507384061813e-02, 2.274847961962223e-02, 2.541026473045349e-02, 2.75261327624321e-02, 2.9021130874753e-02, 2.984229475259781e-02, 2.996053546667099e-02, 2.937166392803192e-02, 2.809654176235199e-02, 2.61803399771452e-02, 2.369094267487526e-02, 2.071653679013252e-02, 1.736249029636383e-02, 1.37476259842515e-02, 9.999999776482582e-03, 2.62523740530014e-02, 2.26375088095665e-02, 1.928346417844296e-02, 1.630905829370022e-02, 1.381966006010771e-02, 1.190345920622349e-02, 1.062833704054356e-02, 1.003946550190449e-02, 1.015770621597767e-02, 1.097887009382248e-02, 1.247386634349823e-02, 1.458973530679941e-02, 1.72515194863081e-02, 2.036492712795734e-02, 2.381966076791286e-02, 2.749333530664444e-02, 3.12558114528656e-02, 3.497379645705223e-02, 3.851558640599251e-02, 4.175570607185364e-02, 4.457937180995941e-02, 4.688655957579613e-02, 4.859552904963493e-02, 4.964574426412582e-02, 5.000000074505806e-02, 4.964574426412582e-02, 4.859552904963493e-02, 4.688655957579613e-02, 4.457937180995941e-02, 4.175570607185364e-02, 8.515586145222187e-03, 4.973797593265772e-03, 1.255810377188027e-03, -2.506664721295238e-03, -6.180339958518744e-03, -9.635073132812977e-03, -1.274847984313965e-02, -1.541026495397091e-02, -1.752613298594952e-02, -1.902113109827042e-02, -1.984229311347008e-02, -1.996053382754326e-02, -1.937166415154934e-02, -1.809654012322426e-02, -1.618034020066261e-02, -1.36909419670701e-02, -1.071653608232737e-02, -7.362490985542536e-03, -3.747626207768917e-03, -1.469576190014977e-17]
+ctlFloMinValHeaCoo.yValHeaWatMinByp=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.807495474815369e-01, 8.899519443511963e-01, 7.278771996498108e-01, 5.002626776695251e-01, 2.151686549186707e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.992714533116668e-05, 4.135214537382126e-02, 1.563964784145355e-01, 3.410757780075073e-01, 5.888505578041077e-01, 8.909403681755066e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.945386648178101e-01, 9.283437728881836e-01, 7.89512574672699e-01, 5.829567313194275e-01, 3.159967660903931e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+ctlFloMinPumHeaCoo.yValHeaWatMinByp=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.807495474815369e-01, 8.899519443511963e-01, 7.278771996498108e-01, 5.002626776695251e-01, 2.151686549186707e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.992714533116668e-05, 4.135214537382126e-02, 1.563964784145355e-01, 3.410757780075073e-01, 5.888505578041077e-01, 8.909403681755066e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.945386648178101e-01, 9.283437728881836e-01, 7.89512574672699e-01, 5.829567313194275e-01, 3.159967660903931e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+ctlFloMinValHeaCoo.yValChiWatMinByp=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 6.193491816520691e-01, 3.343935012817383e-01, 1.19072824716568e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+ctlFloMinPumHeaCoo.yValChiWatMinByp=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 6.193491816520691e-01, 3.343935012817383e-01, 1.19072824716568e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_MinimumFlow_Validation_Setpoint.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_MinimumFlow_Validation_Setpoint.txt
new file mode 100644
index 00000000000..680e561c9e5
--- /dev/null
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_MinimumFlow_Validation_Setpoint.txt
@@ -0,0 +1,16 @@
+last-generated=2024-06-12
+statistics-simulation=
+{
+  "linear": " ",
+  "nonlinear": " ",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 1e+03]
+u1Equ.y[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+u1Equ.y[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+setFloMin.ratFloMinEna[1].y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+setFloMin.ratFloMinEna[2].y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+setFloMin.maxRatFloMinEna.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+setFloMin.V_flow_min[1]=[9.999999776482582e-03, 9.999999776482582e-03]
+setFloMin.V_flow_min[2]=[2.999999932944775e-02, 2.999999932944775e-02]
+setFloMin.VPriSet_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 4.199999943375587e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 2.999999932944775e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Pumps_Generic_Validation_ControlDifferentialPressure.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Pumps_Generic_Validation_ControlDifferentialPressure.txt
index 53603a827d3..9ab9afc7eba 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Pumps_Generic_Validation_ControlDifferentialPressure.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Pumps_Generic_Validation_ControlDifferentialPressure.txt
@@ -1,4 +1,4 @@
-last-generated=2024-04-01
+last-generated=2024-06-12
 statistics-simulation=
 {
   "linear": " ",
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Pumps_Generic_Validation_ResetLocalDifferentialPressure.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Pumps_Generic_Validation_ResetLocalDifferentialPressure.txt
index bb8d8fb79ba..ba7bada29ae 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Pumps_Generic_Validation_ResetLocalDifferentialPressure.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Pumps_Generic_Validation_ResetLocalDifferentialPressure.txt
@@ -1,4 +1,4 @@
-last-generated=2024-04-01
+last-generated=2024-06-12
 statistics-simulation=
 {
   "linear": " ",
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Pumps_Generic_Validation_StagingHeadered.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Pumps_Generic_Validation_StagingHeadered.txt
index 65fdf50b689..17c1457c89e 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Pumps_Generic_Validation_StagingHeadered.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Pumps_Generic_Validation_StagingHeadered.txt
@@ -1,4 +1,4 @@
-last-generated=2024-04-02
+last-generated=2024-06-12
 statistics-simulation=
 {
   "linear": " ",
@@ -20,5 +20,5 @@ staPumPriDp.y1[1]=[0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00
 staPumPriDp.y1[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
 staPumPriDp.y1[3]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
 staPumSecDp.y1[1]=[0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-staPumSecDp.y1[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-staPumSecDp.y1[3]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+staPumSecDp.y1[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+staPumSecDp.y1[3]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Pumps_Generic_Validation_StagingHeaderedDeltaP.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Pumps_Generic_Validation_StagingHeaderedDeltaP.txt
index 2f3dc2ee882..be031a52344 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Pumps_Generic_Validation_StagingHeaderedDeltaP.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Pumps_Generic_Validation_StagingHeaderedDeltaP.txt
@@ -1,4 +1,4 @@
-last-generated=2024-04-01
+last-generated=2024-06-12
 statistics-simulation=
 {
   "linear": " ",
@@ -8,4 +8,12 @@ statistics-simulation=
 time=[0e+00, 8.4e+03]
 ratFlo.y[1]=[0e+00, 2.333333343267441e-02, 4.666666686534882e-02, 7.000000029802322e-02, 9.333333373069763e-02, 1.16666667163372e-01, 1.400000005960464e-01, 1.633333265781403e-01, 1.866666674613953e-01, 2.099999934434891e-01, 2.333333343267441e-01, 2.566666603088379e-01, 2.800000011920929e-01, 3.033333420753479e-01, 3.266666531562805e-01, 3.499999940395355e-01, 3.733333349227905e-01, 3.966666758060455e-01, 4.199999868869781e-01, 4.433333277702332e-01, 4.666666686534882e-01, 4.900000095367432e-01, 5.133333206176758e-01, 5.366666913032532e-01, 5.600000023841858e-01, 5.833333134651184e-01, 6.066666841506958e-01, 6.299999952316284e-01, 6.53333306312561e-01, 6.766666769981384e-01, 6.99999988079071e-01, 7.233333587646484e-01, 7.466666698455811e-01, 7.699999809265137e-01, 7.933333516120911e-01, 8.166666626930237e-01, 8.399999737739563e-01, 8.633333444595337e-01, 8.866666555404663e-01, 9.100000262260437e-01, 9.333333373069763e-01, 9.566666483879089e-01, 9.800000190734863e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.666666388511658e-01, 9.200000166893005e-01, 8.733333349227905e-01, 8.266666531562805e-01, 7.799999713897705e-01, 7.333333492279053e-01, 6.866666674613953e-01, 6.399999856948853e-01, 5.933333039283752e-01, 5.4666668176651e-01, 5e-01, 4.533333480358124e-01, 4.066666662693024e-01, 3.600000143051147e-01, 3.133333325386047e-01, 2.666666805744171e-01, 2.199999988079071e-01, 1.733333319425583e-01, 1.266666650772095e-01, 7.999999821186066e-02, 3.333333507180214e-02, 6.666666828095913e-03, 2.999999932944775e-02, 5.33333346247673e-02, 7.666666805744171e-02, 1.000000014901161e-01, 1.233333349227905e-01, 1.466666609048843e-01, 1.700000017881393e-01, 1.933333277702332e-01, 2.166666686534882e-01, 2.39999994635582e-01, 2.633333206176758e-01, 2.866666615009308e-01, 3.100000023841858e-01, 3.333333432674408e-01]
 enaLea.y[1]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-idxSta.y=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00]
+idxSta.y=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+staPum.preFaiSaf.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+staPum.preEff.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+staPumFaiSaf.dp[1]=[1.3e+05, 1.3e+05, 1.3e+05, 1.3e+05, 1.3e+05, 1.3e+05, 1.3e+05, 1.3e+05, 1.3e+05, 1.3e+05, 1.3e+05, 1.3e+05, 1.3e+05, 1.3e+05, 1.3e+05, 1.3e+05, 1.3e+05, 1.3e+05, 1.3e+05, 1.3e+05, 1.3e+05, 1.3e+05, 1.3e+05, 1.3e+05, 1.3e+05, 1.3e+05, 1.3e+05, 1.3e+05, 1.3e+05, 1.3e+05, 1.3e+05, 1.3e+05, 1.3e+05, 1.3e+05, 1.3e+05, 1.3e+05, 1.3e+05, 1.3e+05, 1.3e+05, 1.3e+05, 1.3e+05, 1.3e+05, 1.3e+05, 1.301333359375e+05, 1.310666640625e+05, 1.32e+05, 1.32933328125e+05, 1.33866671875e+05, 1.348e+05, 1.35733328125e+05, 1.36666671875e+05, 1.376e+05, 1.38533328125e+05, 1.39466671875e+05, 1.404e+05, 1.41333328125e+05, 1.42266671875e+05, 1.432e+05, 1.44133328125e+05, 1.45066671875e+05, 1.46e+05, 1.46933328125e+05, 1.47866671875e+05, 1.488e+05, 1.49733328125e+05, 1.5e+05, 1.5e+05, 1.5e+05, 1.5e+05, 1.5e+05, 1.5e+05, 1.5e+05, 1.5e+05, 1.5e+05, 1.5e+05, 1.5e+05, 1.5e+05, 1.5e+05, 1.5e+05, 1.5e+05, 1.5e+05, 1.5e+05, 1.5e+05, 1.5e+05, 1.5e+05, 1.5e+05, 1.3e+05, 1.3e+05, 1.3e+05, 1.3e+05, 1.3e+05, 1.3e+05, 1.3e+05, 1.3e+05, 1.3e+05, 1.3e+05, 1.3e+05, 1.3e+05, 1.3e+05, 1.3e+05, 1.3e+05]
+staPumFaiSaf.dpSet[1]=[1.5e+05, 1.5e+05]
+staPumFaiSaf.y=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.953333139419556e-01, 9.626666903495789e-01, 9.300000071525574e-01, 8.973333239555359e-01, 8.646666407585144e-01, 8.320000171661377e-01, 7.993333339691162e-01, 7.666666507720947e-01, 7.34000027179718e-01, 7.013333439826965e-01, 6.68666660785675e-01, 6.359999775886536e-01, 6.033333539962769e-01, 5.706666707992554e-01, 5.379999876022339e-01, 5.053333044052124e-01, 4.726666808128357e-01, 4.399999976158142e-01, 4.073333442211151e-01, 3.746666610240936e-01, 3.420000076293945e-01, 3.09333324432373e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+idxSta1.y=[1e+00, 1e+00, 1e+00, 1e+00, 2e+00, 2e+00, 2e+00, 2e+00, 3e+00, 3e+00, 3e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 2e+00, 2e+00, 2e+00, 3e+00, 3e+00, 3e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+staPumFaiSaf.preFaiSaf.y=[0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+staPumFaiSaf.preEff.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Pumps_Primary_Validation_DisableDedicated.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Pumps_Primary_Validation_DisableDedicated.txt
new file mode 100644
index 00000000000..80e8ca440bf
--- /dev/null
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Pumps_Primary_Validation_DisableDedicated.txt
@@ -0,0 +1,14 @@
+last-generated=2024-06-12
+statistics-simulation=
+{
+  "linear": " ",
+  "nonlinear": " ",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 3.6e+03]
+y1.y=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+y1EquLea.y=[0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+y1EquLea_actual.y=[0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+y1ReqEquLea.y=[0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+enaDed.y1=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+enaDedReq.y1=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Pumps_Primary_Validation_EnableLeadHeadered.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Pumps_Primary_Validation_EnableLeadHeadered.txt
index 99f3877a4de..e4a4af0bb63 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Pumps_Primary_Validation_EnableLeadHeadered.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Pumps_Primary_Validation_EnableLeadHeadered.txt
@@ -1,4 +1,4 @@
-last-generated=2024-04-02
+last-generated=2024-06-12
 statistics-simulation=
 {
   "linear": " ",
@@ -11,7 +11,7 @@ u1ValIso[1].y=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e
 u1ValIso[2].y=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
 enaParTwo.y1=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
 enaSerTwo.y1=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
-uValIso[1].y=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 8.500000238418579e-01, 6.99999988079071e-01, 5.50000011920929e-01, 4.000000059604645e-01, 2.5e-01, 1.000000014901161e-01, -9.438283817643368e-19, -2.672174657109853e-19, -1.088377330276656e-21, -1.015507282344387e-21, -3.838040229006357e-24, -7.984095734406464e-26, -4.880568020363703e-27, -3.469851684305258e-27, -2.059135733432812e-27, -6.484194936708696e-28, 0e+00, 0e+00, 0e+00, 0e+00, 1.500000059604645e-01, 3.00000011920929e-01, 4.49999988079071e-01, 6.000000238418579e-01, 7.5e-01, 8.999999761581421e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 8.500000238418579e-01, 6.99999988079071e-01, 5.50000011920929e-01, 4.000000059604645e-01, 2.5e-01, 1.000000014901161e-01, -5.545546625960115e-18, -2.695474111917579e-18, -4.815749802746044e-21, -4.581703733626853e-21, -4.347657664507662e-21, -4.113611595388471e-21, -3.879565122372497e-21, -3.645519053253306e-21, -3.411472984134115e-21, -3.177426915014924e-21, -2.943380643947342e-21, -2.709334574828151e-21, -2.47528850570896e-21, -2.241242234641377e-21, 1.500000059604645e-01, 3.00000011920929e-01, 4.49999988079071e-01, 6.000000238418579e-01, 7.5e-01, 8.999999761581421e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
-uValIso[2].y=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 8.500000238418579e-01, 6.99999988079071e-01, 5.50000011920929e-01, 4.000000059604639e-01, 2.5e-01, 1.000000014901161e-01, -9.588544277840923e-19, -3.32036605130956e-19, -1.010509766468278e-21, -9.484749565720476e-22, -7.715043475249963e-27, -1.799258643049971e-27, -5.549846244130479e-30, -9.230405555306867e-33, -1.535158170510631e-35, -2.362236644158017e-38, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.500000059604645e-01, 3.00000011920929e-01, 4.49999988079071e-01, 6.000000238418579e-01, 7.5e-01, 8.999999761581421e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 8.500000238418579e-01, 6.99999988079071e-01, 5.50000011920929e-01, 4.000000059604645e-01, 2.5e-01, 1.000000014901161e-01, -7.541860593982857e-19, -3.861283235300596e-19, -1.80705569656779e-20, -5.862428021303364e-22]
+uValIso[1].y=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 8.500000238418579e-01, 6.99999988079071e-01, 5.50000011920929e-01, 4.000000059604645e-01, 2.5e-01, 1.000000014901161e-01, -9.437871261312857e-19, -2.672022662672296e-19, -1.083619426167342e-21, -1.011064417726182e-21, -3.821248930208276e-24, -7.94916522004231e-26, -4.859215620256271e-27, -3.454671504483598e-27, -2.050127003524947e-27, -6.455826951592845e-28, 0e+00, 0e+00, 0e+00, 0e+00, 1.500000059604645e-01, 3.00000011920929e-01, 4.49999988079071e-01, 6.000000238418579e-01, 7.5e-01, 8.999999761581421e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 8.500000238418579e-01, 6.99999988079071e-01, 5.50000011920929e-01, 4.000000059604645e-01, 2.5e-01, 1.000000014901161e-01, -5.545546625960115e-18, -2.695474111917579e-18, -4.815749802746044e-21, -4.581703733626853e-21, -4.347657664507662e-21, -4.113611595388471e-21, -3.879565122372497e-21, -3.645519053253306e-21, -3.411472984134115e-21, -3.177426915014924e-21, -2.943380643947342e-21, -2.709334574828151e-21, -2.47528850570896e-21, -2.241242234641377e-21, 1.500000059604645e-01, 3.00000011920929e-01, 4.49999988079071e-01, 6.000000238418579e-01, 7.5e-01, 8.999999761581421e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+uValIso[2].y=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 8.500000238418579e-01, 6.99999988079071e-01, 5.50000011920929e-01, 4.000000059604639e-01, 2.5e-01, 1.000000014901161e-01, -9.589145017760789e-19, -3.320617048926682e-19, -1.016930412660955e-21, -9.545055394460854e-22, -7.764096140561528e-27, -1.810698666919631e-27, -5.585132891830299e-30, -9.289093580139608e-33, -1.54491899231556e-35, -2.377256041358344e-38, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.500000059604645e-01, 3.00000011920929e-01, 4.49999988079071e-01, 6.000000238418579e-01, 7.5e-01, 8.999999761581421e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 8.500000238418579e-01, 6.99999988079071e-01, 5.50000011920929e-01, 4.000000059604645e-01, 2.5e-01, 1.000000014901161e-01, -7.541861627958623e-19, -3.861283752288479e-19, -1.807056019685217e-20, -5.862428526174343e-22]
 enaParMod.y1=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
 enaSerMod.y1=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Pumps_Primary_Validation_VariableSpeed.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Pumps_Primary_Validation_VariableSpeed.txt
new file mode 100644
index 00000000000..4e5365d393e
--- /dev/null
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Pumps_Primary_Validation_VariableSpeed.txt
@@ -0,0 +1,70 @@
+last-generated=2024-06-12
+statistics-simulation=
+{
+  "linear": " ",
+  "nonlinear": " ",
+  "number of continuous time states": "9",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 5e+03]
+ctlPumPriHdrHea.u1PumHeaWatPri[1]=[0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+ctlPumPriHdrHea.u1PumHeaWatPri[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+ctlPumPriHdrHea.yPumHeaWatPriHdr=[0e+00, 0e+00, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01]
+ctlPumPriHdr.u1PumHeaWatPri[1]=[0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+ctlPumPriHdr.u1PumHeaWatPri[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+ctlPumPriHdr.u1PumChiWatPri[1]=[1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctlPumPriHdr.u1PumChiWatPri[2]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctlPumPriHdr.yPumHeaWatPriHdr=[0e+00, 0e+00, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01]
+ctlPumPriHdr.yPumChiWatPriHdr=[8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctlPumPriDedCom.u1PumHeaWatPri[1]=[0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+ctlPumPriDedCom.u1PumHeaWatPri[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+ctlPumPriDedCom.u1Hea[1]=[0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctlPumPriDedCom.u1Hea[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctlPumPriDedCom.yPumHeaWatPriDed[1]=[0e+00, 0e+00, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01]
+ctlPumPriDedCom.yPumHeaWatPriDed[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01]
+ctlPumPriDedSep.u1PumHeaWatPri[1]=[0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+ctlPumPriDedSep.u1PumHeaWatPri[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+ctlPumPriDedSep.u1PumChiWatPri[1]=[1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctlPumPriDedSep.u1PumChiWatPri[2]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctlPumPriDedSep.yPumHeaWatPriDed[1]=[0e+00, 0e+00, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01]
+ctlPumPriDedSep.yPumHeaWatPriDed[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01]
+ctlPumPriDedSep.yPumChiWatPriDed[1]=[8.999999761581421e-01, 8.999999761581421e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctlPumPriDedSep.yPumChiWatPriDed[2]=[8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctlPumPriHdrHeaDp.u1PumHeaWatPri[1]=[0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+ctlPumPriHdrHeaDp.u1PumHeaWatPri[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+ctlPumPriHdrHeaDp.dpHeaWatLocSet[1]=[3e+03, 3.375e+03, 3.75e+03, 4.125e+03, 4.5e+03, 4.875e+03, 5.25e+03, 5.625e+03, 6e+03, 6.375e+03, 6.75e+03, 7.125e+03, 7.5e+03, 7.875e+03, 8.25e+03, 8.625e+03, 9e+03, 9.375e+03, 9.75e+03, 1.0125e+04, 1.05e+04, 1.0875e+04, 1.125e+04, 1.1625e+04, 1.2e+04, 1.2375e+04, 1.275e+04, 1.3125e+04, 1.35e+04, 1.3875e+04, 1.425e+04, 1.4625e+04, 1.5e+04, 1.5375e+04, 1.575e+04, 1.6125e+04, 1.65e+04, 1.6875e+04, 1.725e+04, 1.7625e+04, 1.8e+04, 1.8375e+04, 1.875e+04, 1.9125e+04, 1.95e+04, 1.9875e+04, 2.025e+04, 2.0625e+04, 2.1e+04, 2.1375e+04, 2.175e+04, 2.2125e+04, 2.25e+04, 2.2875e+04, 2.325e+04, 2.3625e+04, 2.4e+04, 2.4375e+04, 2.475e+04, 2.5125e+04, 2.55e+04, 2.5875e+04, 2.625e+04, 2.6625e+04, 2.7e+04, 2.7375e+04, 2.775e+04, 2.8125e+04, 2.85e+04, 2.8875e+04, 2.925e+04, 2.9625e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04]
+ctlPumPriHdrHeaDp.dpHeaWatLocSet[2]=[1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 9.8333330078125e+03, 9.6666669921875e+03, 9.5e+03, 9.3333330078125e+03, 9.1666669921875e+03, 9e+03, 8.8333330078125e+03, 8.6666669921875e+03, 8.499999999999998e+03, 8.3333330078125e+03, 8.16666650390625e+03, 8e+03, 7.83333349609375e+03, 7.66666650390625e+03, 7.5e+03, 7.33333349609375e+03, 7.16666650390625e+03, 7e+03, 6.83333349609375e+03, 6.66666650390625e+03, 6.5e+03, 6.33333349609375e+03, 6.16666650390625e+03, 6e+03, 5.83333349609375e+03, 5.66666650390625e+03, 5.5e+03, 5.33333349609375e+03]
+ctlPumPriHdrHeaDp.dpHeaWatLoc=[3e+03, 3.139622802734375e+03, 3.280696533203125e+03, 3.424663818359375e+03, 3.572948974609375e+03, 3.72694970703125e+03, 3.888028564453125e+03, 4.05750439453125e+03, 4.23664404296875e+03, 4.42665576171875e+03, 4.6286796875e+03, 4.8437822265625e+03, 5.07294921875e+03, 5.31707958984375e+03, 5.576980468750001e+03, 5.853361328125e+03, 6.14683056640625e+03, 6.457890136718751e+03, 6.78693505859375e+03, 7.134248046875e+03, 7.5e+03, 7.884248046875e+03, 8.2869345703125e+03, 8.707890625e+03, 9.146830078125e+03, 9.603361328125e+03, 1.007698046875e+04, 1.05670791015625e+04, 1.107294921875e+04, 1.15937822265625e+04, 1.21286796875e+04, 1.267665625e+04, 1.323664453125e+04, 1.380750390625e+04, 1.43880283203125e+04, 1.497694921875e+04, 1.557294921875e+04, 1.61746640625e+04, 1.6780697265625e+04, 1.7389623046875e+04, 1.8e+04, 1.8610376953125e+04, 1.9219302734375e+04, 1.98253359375e+04, 2.042705078125e+04, 2.102305078125e+04, 2.1611970703125e+04, 2.219249609375e+04, 2.276335546875e+04, 2.332334375e+04, 2.38713203125e+04, 2.440621875e+04, 2.492705078125e+04, 2.5432919921875e+04, 2.592301953125e+04, 2.6396638671875e+04, 2.6853169921875e+04, 2.7292109375e+04, 2.7713064453125e+04, 2.8115751953125e+04, 2.85e+04, 2.8865751953125e+04, 2.9213064453125e+04, 2.9542109375e+04, 2.9853169921875e+04, 3.0146638671875e+04, 3.042301953125e+04, 3.0682919921875e+04, 3.092705078125e+04, 3.115621875e+04, 3.13713203125e+04, 3.157334375e+04, 3.176335546875e+04, 3.156749609375e+04, 3.1361970703125e+04, 3.114805078125e+04, 3.092705078125e+04, 3.07003359375e+04, 3.0469302734375e+04, 3.0235376953125e+04, 3e+04, 2.9764623046875e+04, 2.9530697265625e+04, 2.92996640625e+04, 2.907294921875e+04, 2.885194921875e+04, 2.8638029296875e+04, 2.843250390625e+04, 2.823664453125e+04, 2.805165625e+04, 2.78786796875e+04, 2.771878125e+04, 2.757294921875e+04, 2.7442080078125e+04, 2.732698046875e+04, 2.7228361328125e+04, 2.7146830078125e+04, 2.7082890625e+04, 2.7036935546875e+04, 2.7009248046875e+04, 2.7e+04]
+ctlPumPriHdrHeaDp.yPumHeaWatPriHdr=[0e+00, 0e+00, 3.19252222776413e-01, 8.588236570358276e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.973342418670654e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.027434468269348e-01, 1.360923945903782e-01, 1.888623386621475e-01, 2.607259452342987e-01, 3.51239413022995e-01, 4.598473310470581e-01, 5.858781337738037e-01, 7.285557985305786e-01, 8.869984149932861e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+ctlPumPriHdrDp.u1PumHeaWatPri[1]=[0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+ctlPumPriHdrDp.u1PumHeaWatPri[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+ctlPumPriHdrDp.u1PumChiWatPri[1]=[1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctlPumPriHdrDp.u1PumChiWatPri[2]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctlPumPriHdrDp.dpHeaWatRemSet[1]=[3e+03, 3.375e+03, 3.75e+03, 4.125e+03, 4.5e+03, 4.875e+03, 5.25e+03, 5.625e+03, 6e+03, 6.375e+03, 6.75e+03, 7.125e+03, 7.5e+03, 7.875e+03, 8.25e+03, 8.625e+03, 9e+03, 9.375e+03, 9.75e+03, 1.0125e+04, 1.05e+04, 1.0875e+04, 1.125e+04, 1.1625e+04, 1.2e+04, 1.2375e+04, 1.275e+04, 1.3125e+04, 1.35e+04, 1.3875e+04, 1.425e+04, 1.4625e+04, 1.5e+04, 1.5375e+04, 1.575e+04, 1.6125e+04, 1.65e+04, 1.6875e+04, 1.725e+04, 1.7625e+04, 1.8e+04, 1.8375e+04, 1.875e+04, 1.9125e+04, 1.95e+04, 1.9875e+04, 2.025e+04, 2.0625e+04, 2.1e+04, 2.1375e+04, 2.175e+04, 2.2125e+04, 2.25e+04, 2.2875e+04, 2.325e+04, 2.3625e+04, 2.4e+04, 2.4375e+04, 2.475e+04, 2.5125e+04, 2.55e+04, 2.5875e+04, 2.625e+04, 2.6625e+04, 2.7e+04, 2.7375e+04, 2.775e+04, 2.8125e+04, 2.85e+04, 2.8875e+04, 2.925e+04, 2.9625e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04]
+ctlPumPriHdrDp.dpHeaWatRemSet[2]=[1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 9.8333330078125e+03, 9.6666669921875e+03, 9.5e+03, 9.3333330078125e+03, 9.1666669921875e+03, 9e+03, 8.8333330078125e+03, 8.6666669921875e+03, 8.499999999999998e+03, 8.3333330078125e+03, 8.16666650390625e+03, 8e+03, 7.83333349609375e+03, 7.66666650390625e+03, 7.5e+03, 7.33333349609375e+03, 7.16666650390625e+03, 7e+03, 6.83333349609375e+03, 6.66666650390625e+03, 6.5e+03, 6.33333349609375e+03, 6.16666650390625e+03, 6e+03, 5.83333349609375e+03, 5.66666650390625e+03, 5.5e+03, 5.33333349609375e+03]
+ctlPumPriHdrDp.dpHeaWatRem[1]=[3e+03, 3.139622802734375e+03, 3.280696533203125e+03, 3.424663818359375e+03, 3.572948974609375e+03, 3.72694970703125e+03, 3.888028564453125e+03, 4.05750439453125e+03, 4.23664404296875e+03, 4.42665576171875e+03, 4.6286796875e+03, 4.8437822265625e+03, 5.07294921875e+03, 5.31707958984375e+03, 5.576980468750001e+03, 5.853361328125e+03, 6.14683056640625e+03, 6.457890136718751e+03, 6.78693505859375e+03, 7.134248046875e+03, 7.5e+03, 7.884248046875e+03, 8.2869345703125e+03, 8.707890625e+03, 9.146830078125e+03, 9.603361328125e+03, 1.007698046875e+04, 1.05670791015625e+04, 1.107294921875e+04, 1.15937822265625e+04, 1.21286796875e+04, 1.267665625e+04, 1.323664453125e+04, 1.380750390625e+04, 1.43880283203125e+04, 1.497694921875e+04, 1.557294921875e+04, 1.61746640625e+04, 1.6780697265625e+04, 1.7389623046875e+04, 1.8e+04, 1.8610376953125e+04, 1.9219302734375e+04, 1.98253359375e+04, 2.042705078125e+04, 2.102305078125e+04, 2.1611970703125e+04, 2.219249609375e+04, 2.276335546875e+04, 2.332334375e+04, 2.38713203125e+04, 2.440621875e+04, 2.492705078125e+04, 2.5432919921875e+04, 2.592301953125e+04, 2.6396638671875e+04, 2.6853169921875e+04, 2.7292109375e+04, 2.7713064453125e+04, 2.8115751953125e+04, 2.85e+04, 2.8865751953125e+04, 2.9213064453125e+04, 2.9542109375e+04, 2.9853169921875e+04, 3.0146638671875e+04, 3.042301953125e+04, 3.0682919921875e+04, 3.092705078125e+04, 3.115621875e+04, 3.13713203125e+04, 3.157334375e+04, 3.176335546875e+04, 3.156749609375e+04, 3.1361970703125e+04, 3.114805078125e+04, 3.092705078125e+04, 3.07003359375e+04, 3.0469302734375e+04, 3.0235376953125e+04, 3e+04, 2.9764623046875e+04, 2.9530697265625e+04, 2.92996640625e+04, 2.907294921875e+04, 2.885194921875e+04, 2.8638029296875e+04, 2.843250390625e+04, 2.823664453125e+04, 2.805165625e+04, 2.78786796875e+04, 2.771878125e+04, 2.757294921875e+04, 2.7442080078125e+04, 2.732698046875e+04, 2.7228361328125e+04, 2.7146830078125e+04, 2.7082890625e+04, 2.7036935546875e+04, 2.7009248046875e+04, 2.7e+04]
+ctlPumPriHdrDp.dpHeaWatRem[2]=[1e+04, 9.687130859375e+03, 9.3819658203125e+03, 9.0920185546875e+03, 8.8244296875e+03, 8.5857861328125e+03, 8.3819658203125e+03, 8.2179873046875e+03, 8.09788720703125e+03, 8.02462353515625e+03, 8e+03, 8.02462353515625e+03, 8.09788720703125e+03, 8.2179873046875e+03, 8.3819658203125e+03, 8.5857861328125e+03, 8.8244296875e+03, 9.0920185546875e+03, 9.3819658203125e+03, 9.687130859375e+03, 1e+04, 1.0312869140625e+04, 1.06180341796875e+04, 1.09079814453125e+04, 1.11755703125e+04, 1.14142138671875e+04, 1.16180341796875e+04, 1.17820126953125e+04, 1.190211328125e+04, 1.1975376953125e+04, 1.2e+04, 1.1975376953125e+04, 1.190211328125e+04, 1.17820126953125e+04, 1.16180341796875e+04, 1.14142138671875e+04, 1.11755703125e+04, 1.09079814453125e+04, 1.06180341796875e+04, 1.0312869140625e+04, 1e+04, 9.687130859375e+03, 9.3819658203125e+03, 9.0920185546875e+03, 8.8244296875e+03, 8.5857861328125e+03, 8.3819658203125e+03, 8.2179873046875e+03, 8.09788720703125e+03, 8.02462353515625e+03, 8e+03, 8.02462353515625e+03, 8.09788720703125e+03, 8.2179873046875e+03, 8.3819658203125e+03, 8.5857861328125e+03, 8.824429687500002e+03, 9.092018554687498e+03, 9.3819658203125e+03, 9.687130859375e+03, 1e+04, 1.0312869140625e+04, 1.06180341796875e+04, 1.09079814453125e+04, 1.11755703125e+04, 1.14142138671875e+04, 1.16180341796875e+04, 1.17820126953125e+04, 1.190211328125e+04, 1.1975376953125e+04, 1.2e+04, 1.1975376953125e+04, 1.190211328125e+04, 1.16153466796875e+04, 1.12847001953125e+04, 1.09142138671875e+04, 1.0508904296875e+04, 1.00746474609375e+04, 9.6180341796875e+03, 9.1462021484375e+03, 8.6666669921875e+03, 8.187130859374995e+03, 7.71529931640625e+03, 7.258685546875e+03, 6.8244296875e+03, 6.41911962890625e+03, 6.0486328125e+03, 5.71798681640625e+03, 5.43122021484375e+03, 5.1912900390625e+03, 5e+03, 4.85795654296875e+03, 4.7645537109375e+03, 4.71798681640625e+03, 4.71529931640625e+03, 4.752453125e+03, 4.8244296875e+03, 4.9253525390625e+03, 5.0486328125e+03, 5.187130859375e+03, 5.33333349609375e+03]
+ctlPumPriHdrDp.yPumHeaWatPriHdr=[0e+00, 0e+00, 1.30663201212883e-01, 2.233717739582062e-01, 3.371242880821228e-01, 4.691186845302582e-01, 6.161048412322998e-01, 7.744641304016116e-01, 9.402955770492554e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.973342418670654e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.035579368472099e-01, 1.479049175977712e-01, 2.172918021678925e-01, 3.100031018257141e-01, 4.237523972988129e-01, 5.557513833045959e-01, 7.027398347854614e-01, 8.61091673374176e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+ctlPumPriHdrDp.yPumChiWatPriHdr=[1.000000014901161e-01, 1.000000014901161e-01, 1.606058180332184e-01, 2.533143758773804e-01, 3.670669198036194e-01, 4.990613162517548e-01, 6.460474133491516e-01, 8.044067025184634e-01, 9.70238208770752e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.192701995372772e-01, 3.208416998386387e-01, 4.040876030921936e-01, 4.68494713306427e-01, 5.136643648147583e-01, 5.3932124376297e-01, 5.453054308891296e-01, 5.315800905227661e-01, 4.982269108295441e-01, 4.454578757286072e-01, 3.735953271389008e-01, 4.237842261791229e-01, 5.557790994644165e-01, 7.027654051780701e-01, 8.611239194869995e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.965290427207947e-01, 9.521759152412415e-01, 8.827790021896362e-01, 7.900919914245605e-01, 6.76346480846405e-01, 5.443516373634338e-01, 3.973657488822937e-01, 2.390072196722031e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctlPumPriDedComDp.u1PumHeaWatPri[1]=[0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+ctlPumPriDedComDp.u1PumHeaWatPri[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+ctlPumPriDedComDp.u1Hea[1]=[0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctlPumPriDedComDp.u1Hea[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctlPumPriDedComDp.dpHeaWatLocSet[1]=[3e+03, 3.375e+03, 3.75e+03, 4.125e+03, 4.5e+03, 4.875e+03, 5.25e+03, 5.625e+03, 6e+03, 6.375e+03, 6.75e+03, 7.125e+03, 7.5e+03, 7.875e+03, 8.25e+03, 8.625e+03, 9e+03, 9.375e+03, 9.75e+03, 1.0125e+04, 1.05e+04, 1.0875e+04, 1.125e+04, 1.1625e+04, 1.2e+04, 1.2375e+04, 1.275e+04, 1.3125e+04, 1.35e+04, 1.3875e+04, 1.425e+04, 1.4625e+04, 1.5e+04, 1.5375e+04, 1.575e+04, 1.6125e+04, 1.65e+04, 1.6875e+04, 1.725e+04, 1.7625e+04, 1.8e+04, 1.8375e+04, 1.875e+04, 1.9125e+04, 1.95e+04, 1.9875e+04, 2.025e+04, 2.0625e+04, 2.1e+04, 2.1375e+04, 2.175e+04, 2.2125e+04, 2.25e+04, 2.2875e+04, 2.325e+04, 2.3625e+04, 2.4e+04, 2.4375e+04, 2.475e+04, 2.5125e+04, 2.55e+04, 2.5875e+04, 2.625e+04, 2.6625e+04, 2.7e+04, 2.7375e+04, 2.775e+04, 2.8125e+04, 2.85e+04, 2.8875e+04, 2.925e+04, 2.9625e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04]
+ctlPumPriDedComDp.dpHeaWatLocSet[2]=[1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 9.8333330078125e+03, 9.6666669921875e+03, 9.5e+03, 9.3333330078125e+03, 9.1666669921875e+03, 9e+03, 8.8333330078125e+03, 8.6666669921875e+03, 8.499999999999998e+03, 8.3333330078125e+03, 8.16666650390625e+03, 8e+03, 7.83333349609375e+03, 7.66666650390625e+03, 7.5e+03, 7.33333349609375e+03, 7.16666650390625e+03, 7e+03, 6.83333349609375e+03, 6.66666650390625e+03, 6.5e+03, 6.33333349609375e+03, 6.16666650390625e+03, 6e+03, 5.83333349609375e+03, 5.66666650390625e+03, 5.5e+03, 5.33333349609375e+03]
+ctlPumPriDedComDp.dpHeaWatLoc=[3e+03, 3.139622802734375e+03, 3.280696533203125e+03, 3.424663818359375e+03, 3.572948974609375e+03, 3.72694970703125e+03, 3.888028564453125e+03, 4.05750439453125e+03, 4.23664404296875e+03, 4.42665576171875e+03, 4.6286796875e+03, 4.8437822265625e+03, 5.07294921875e+03, 5.31707958984375e+03, 5.576980468750001e+03, 5.853361328125e+03, 6.14683056640625e+03, 6.457890136718751e+03, 6.78693505859375e+03, 7.134248046875e+03, 7.5e+03, 7.884248046875e+03, 8.2869345703125e+03, 8.707890625e+03, 9.146830078125e+03, 9.603361328125e+03, 1.007698046875e+04, 1.05670791015625e+04, 1.107294921875e+04, 1.15937822265625e+04, 1.21286796875e+04, 1.267665625e+04, 1.323664453125e+04, 1.380750390625e+04, 1.43880283203125e+04, 1.497694921875e+04, 1.557294921875e+04, 1.61746640625e+04, 1.6780697265625e+04, 1.7389623046875e+04, 1.8e+04, 1.8610376953125e+04, 1.9219302734375e+04, 1.98253359375e+04, 2.042705078125e+04, 2.102305078125e+04, 2.1611970703125e+04, 2.219249609375e+04, 2.276335546875e+04, 2.332334375e+04, 2.38713203125e+04, 2.440621875e+04, 2.492705078125e+04, 2.5432919921875e+04, 2.592301953125e+04, 2.6396638671875e+04, 2.6853169921875e+04, 2.7292109375e+04, 2.7713064453125e+04, 2.8115751953125e+04, 2.85e+04, 2.8865751953125e+04, 2.9213064453125e+04, 2.9542109375e+04, 2.9853169921875e+04, 3.0146638671875e+04, 3.042301953125e+04, 3.0682919921875e+04, 3.092705078125e+04, 3.115621875e+04, 3.13713203125e+04, 3.157334375e+04, 3.176335546875e+04, 3.156749609375e+04, 3.1361970703125e+04, 3.114805078125e+04, 3.092705078125e+04, 3.07003359375e+04, 3.0469302734375e+04, 3.0235376953125e+04, 3e+04, 2.9764623046875e+04, 2.9530697265625e+04, 2.92996640625e+04, 2.907294921875e+04, 2.885194921875e+04, 2.8638029296875e+04, 2.843250390625e+04, 2.823664453125e+04, 2.805165625e+04, 2.78786796875e+04, 2.771878125e+04, 2.757294921875e+04, 2.7442080078125e+04, 2.732698046875e+04, 2.7228361328125e+04, 2.7146830078125e+04, 2.7082890625e+04, 2.7036935546875e+04, 2.7009248046875e+04, 2.7e+04]
+ctlPumPriDedComDp.dpChiWatLoc=[1e+04, 9.687130859375e+03, 9.3819658203125e+03, 9.0920185546875e+03, 8.8244296875e+03, 8.5857861328125e+03, 8.3819658203125e+03, 8.2179873046875e+03, 8.09788720703125e+03, 8.02462353515625e+03, 8e+03, 8.02462353515625e+03, 8.09788720703125e+03, 8.2179873046875e+03, 8.3819658203125e+03, 8.5857861328125e+03, 8.8244296875e+03, 9.0920185546875e+03, 9.3819658203125e+03, 9.687130859375e+03, 1e+04, 1.0312869140625e+04, 1.06180341796875e+04, 1.09079814453125e+04, 1.11755703125e+04, 1.14142138671875e+04, 1.16180341796875e+04, 1.17820126953125e+04, 1.190211328125e+04, 1.1975376953125e+04, 1.2e+04, 1.1975376953125e+04, 1.190211328125e+04, 1.17820126953125e+04, 1.16180341796875e+04, 1.14142138671875e+04, 1.11755703125e+04, 1.09079814453125e+04, 1.06180341796875e+04, 1.0312869140625e+04, 1e+04, 9.687130859375e+03, 9.3819658203125e+03, 9.0920185546875e+03, 8.8244296875e+03, 8.5857861328125e+03, 8.3819658203125e+03, 8.2179873046875e+03, 8.09788720703125e+03, 8.02462353515625e+03, 8e+03, 8.02462353515625e+03, 8.09788720703125e+03, 8.2179873046875e+03, 8.3819658203125e+03, 8.5857861328125e+03, 8.824429687500002e+03, 9.092018554687498e+03, 9.3819658203125e+03, 9.687130859375e+03, 1e+04, 1.0312869140625e+04, 1.06180341796875e+04, 1.09079814453125e+04, 1.11755703125e+04, 1.14142138671875e+04, 1.16180341796875e+04, 1.17820126953125e+04, 1.190211328125e+04, 1.1975376953125e+04, 1.2e+04, 1.1975376953125e+04, 1.190211328125e+04, 1.16153466796875e+04, 1.12847001953125e+04, 1.09142138671875e+04, 1.0508904296875e+04, 1.00746474609375e+04, 9.6180341796875e+03, 9.1462021484375e+03, 8.6666669921875e+03, 8.187130859374995e+03, 7.71529931640625e+03, 7.258685546875e+03, 6.8244296875e+03, 6.41911962890625e+03, 6.0486328125e+03, 5.71798681640625e+03, 5.43122021484375e+03, 5.1912900390625e+03, 5e+03, 4.85795654296875e+03, 4.7645537109375e+03, 4.71798681640625e+03, 4.71529931640625e+03, 4.752453125e+03, 4.8244296875e+03, 4.9253525390625e+03, 5.0486328125e+03, 5.187130859375e+03, 5.33333349609375e+03]
+ctlPumPriDedComDp.yPumHeaWatPriDed[1]=[0e+00, 0e+00, 3.19252222776413e-01, 8.588236570358276e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.186581492424011e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+ctlPumPriDedComDp.yPumHeaWatPriDed[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.692217528820038e-01, 4.376662075519562e-01, 6.011860370635986e-01, 7.557547688484192e-01, 8.975561857223511e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+ctlPumPriDedSepDp.u1PumHeaWatPri[1]=[0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+ctlPumPriDedSepDp.u1PumHeaWatPri[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+ctlPumPriDedSepDp.u1PumChiWatPri[1]=[1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctlPumPriDedSepDp.u1PumChiWatPri[2]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctlPumPriDedSepDp.dpHeaWatLocSet[1]=[3e+03, 3.375e+03, 3.75e+03, 4.125e+03, 4.5e+03, 4.875e+03, 5.25e+03, 5.625e+03, 6e+03, 6.375e+03, 6.75e+03, 7.125e+03, 7.5e+03, 7.875e+03, 8.25e+03, 8.625e+03, 9e+03, 9.375e+03, 9.75e+03, 1.0125e+04, 1.05e+04, 1.0875e+04, 1.125e+04, 1.1625e+04, 1.2e+04, 1.2375e+04, 1.275e+04, 1.3125e+04, 1.35e+04, 1.3875e+04, 1.425e+04, 1.4625e+04, 1.5e+04, 1.5375e+04, 1.575e+04, 1.6125e+04, 1.65e+04, 1.6875e+04, 1.725e+04, 1.7625e+04, 1.8e+04, 1.8375e+04, 1.875e+04, 1.9125e+04, 1.95e+04, 1.9875e+04, 2.025e+04, 2.0625e+04, 2.1e+04, 2.1375e+04, 2.175e+04, 2.2125e+04, 2.25e+04, 2.2875e+04, 2.325e+04, 2.3625e+04, 2.4e+04, 2.4375e+04, 2.475e+04, 2.5125e+04, 2.55e+04, 2.5875e+04, 2.625e+04, 2.6625e+04, 2.7e+04, 2.7375e+04, 2.775e+04, 2.8125e+04, 2.85e+04, 2.8875e+04, 2.925e+04, 2.9625e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04]
+ctlPumPriDedSepDp.dpHeaWatLocSet[2]=[1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 9.8333330078125e+03, 9.6666669921875e+03, 9.5e+03, 9.3333330078125e+03, 9.1666669921875e+03, 9e+03, 8.8333330078125e+03, 8.6666669921875e+03, 8.499999999999998e+03, 8.3333330078125e+03, 8.16666650390625e+03, 8e+03, 7.83333349609375e+03, 7.66666650390625e+03, 7.5e+03, 7.33333349609375e+03, 7.16666650390625e+03, 7e+03, 6.83333349609375e+03, 6.66666650390625e+03, 6.5e+03, 6.33333349609375e+03, 6.16666650390625e+03, 6e+03, 5.83333349609375e+03, 5.66666650390625e+03, 5.5e+03, 5.33333349609375e+03]
+ctlPumPriDedSepDp.dpHeaWatLoc=[3e+03, 3.139622802734375e+03, 3.280696533203125e+03, 3.424663818359375e+03, 3.572948974609375e+03, 3.72694970703125e+03, 3.888028564453125e+03, 4.05750439453125e+03, 4.23664404296875e+03, 4.42665576171875e+03, 4.6286796875e+03, 4.8437822265625e+03, 5.07294921875e+03, 5.31707958984375e+03, 5.576980468750001e+03, 5.853361328125e+03, 6.14683056640625e+03, 6.457890136718751e+03, 6.78693505859375e+03, 7.134248046875e+03, 7.5e+03, 7.884248046875e+03, 8.2869345703125e+03, 8.707890625e+03, 9.146830078125e+03, 9.603361328125e+03, 1.007698046875e+04, 1.05670791015625e+04, 1.107294921875e+04, 1.15937822265625e+04, 1.21286796875e+04, 1.267665625e+04, 1.323664453125e+04, 1.380750390625e+04, 1.43880283203125e+04, 1.497694921875e+04, 1.557294921875e+04, 1.61746640625e+04, 1.6780697265625e+04, 1.7389623046875e+04, 1.8e+04, 1.8610376953125e+04, 1.9219302734375e+04, 1.98253359375e+04, 2.042705078125e+04, 2.102305078125e+04, 2.1611970703125e+04, 2.219249609375e+04, 2.276335546875e+04, 2.332334375e+04, 2.38713203125e+04, 2.440621875e+04, 2.492705078125e+04, 2.5432919921875e+04, 2.592301953125e+04, 2.6396638671875e+04, 2.6853169921875e+04, 2.7292109375e+04, 2.7713064453125e+04, 2.8115751953125e+04, 2.85e+04, 2.8865751953125e+04, 2.9213064453125e+04, 2.9542109375e+04, 2.9853169921875e+04, 3.0146638671875e+04, 3.042301953125e+04, 3.0682919921875e+04, 3.092705078125e+04, 3.115621875e+04, 3.13713203125e+04, 3.157334375e+04, 3.176335546875e+04, 3.156749609375e+04, 3.1361970703125e+04, 3.114805078125e+04, 3.092705078125e+04, 3.07003359375e+04, 3.0469302734375e+04, 3.0235376953125e+04, 3e+04, 2.9764623046875e+04, 2.9530697265625e+04, 2.92996640625e+04, 2.907294921875e+04, 2.885194921875e+04, 2.8638029296875e+04, 2.843250390625e+04, 2.823664453125e+04, 2.805165625e+04, 2.78786796875e+04, 2.771878125e+04, 2.757294921875e+04, 2.7442080078125e+04, 2.732698046875e+04, 2.7228361328125e+04, 2.7146830078125e+04, 2.7082890625e+04, 2.7036935546875e+04, 2.7009248046875e+04, 2.7e+04]
+ctlPumPriDedSepDp.dpChiWatLoc=[1e+04, 9.687130859375e+03, 9.3819658203125e+03, 9.0920185546875e+03, 8.8244296875e+03, 8.5857861328125e+03, 8.3819658203125e+03, 8.2179873046875e+03, 8.09788720703125e+03, 8.02462353515625e+03, 8e+03, 8.02462353515625e+03, 8.09788720703125e+03, 8.2179873046875e+03, 8.3819658203125e+03, 8.5857861328125e+03, 8.8244296875e+03, 9.0920185546875e+03, 9.3819658203125e+03, 9.687130859375e+03, 1e+04, 1.0312869140625e+04, 1.06180341796875e+04, 1.09079814453125e+04, 1.11755703125e+04, 1.14142138671875e+04, 1.16180341796875e+04, 1.17820126953125e+04, 1.190211328125e+04, 1.1975376953125e+04, 1.2e+04, 1.1975376953125e+04, 1.190211328125e+04, 1.17820126953125e+04, 1.16180341796875e+04, 1.14142138671875e+04, 1.11755703125e+04, 1.09079814453125e+04, 1.06180341796875e+04, 1.0312869140625e+04, 1e+04, 9.687130859375e+03, 9.3819658203125e+03, 9.0920185546875e+03, 8.8244296875e+03, 8.5857861328125e+03, 8.3819658203125e+03, 8.2179873046875e+03, 8.09788720703125e+03, 8.02462353515625e+03, 8e+03, 8.02462353515625e+03, 8.09788720703125e+03, 8.2179873046875e+03, 8.3819658203125e+03, 8.5857861328125e+03, 8.824429687500002e+03, 9.092018554687498e+03, 9.3819658203125e+03, 9.687130859375e+03, 1e+04, 1.0312869140625e+04, 1.06180341796875e+04, 1.09079814453125e+04, 1.11755703125e+04, 1.14142138671875e+04, 1.16180341796875e+04, 1.17820126953125e+04, 1.190211328125e+04, 1.1975376953125e+04, 1.2e+04, 1.1975376953125e+04, 1.190211328125e+04, 1.16153466796875e+04, 1.12847001953125e+04, 1.09142138671875e+04, 1.0508904296875e+04, 1.00746474609375e+04, 9.6180341796875e+03, 9.1462021484375e+03, 8.6666669921875e+03, 8.187130859374995e+03, 7.71529931640625e+03, 7.258685546875e+03, 6.8244296875e+03, 6.41911962890625e+03, 6.0486328125e+03, 5.71798681640625e+03, 5.43122021484375e+03, 5.1912900390625e+03, 5e+03, 4.85795654296875e+03, 4.7645537109375e+03, 4.71798681640625e+03, 4.71529931640625e+03, 4.752453125e+03, 4.8244296875e+03, 4.9253525390625e+03, 5.0486328125e+03, 5.187130859375e+03, 5.33333349609375e+03]
+ctlPumPriDedSepDp.yPumHeaWatPriDed[1]=[0e+00, 0e+00, 3.19252222776413e-01, 8.588236570358276e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.027434468269348e-01, 1.360923945903782e-01, 1.888623386621475e-01, 2.607259452342987e-01, 3.51239413022995e-01, 4.598473310470581e-01, 5.858781337738037e-01, 7.285557985305786e-01, 8.869984149932861e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+ctlPumPriDedSepDp.yPumHeaWatPriDed[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.973342418670654e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.000000014901161e-01, 1.027434468269348e-01, 1.360923945903782e-01, 1.888623386621475e-01, 2.607259452342987e-01, 3.51239413022995e-01, 4.598473310470581e-01, 5.858781337738037e-01, 7.285557985305786e-01, 8.869984149932861e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+ctlPumPriDedSepDp.yPumChiWatPriDed[1]=[1.000000014901161e-01, 1.000000014901161e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.279818534851074e-01, 8.034607768058796e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctlPumPriDedSepDp.yPumChiWatPriDed[2]=[1.000000014901161e-01, 1.000000014901161e-01, 1.606058180332184e-01, 2.533143758773804e-01, 3.670669198036194e-01, 4.990613162517548e-01, 6.460474133491516e-01, 8.044067025184634e-01, 9.70238208770752e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Pumps_Primary_Validation_VariableSpeedNoDpControl.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Pumps_Primary_Validation_VariableSpeedNoDpControl.txt
deleted file mode 100644
index decad7ab0dd..00000000000
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Pumps_Primary_Validation_VariableSpeedNoDpControl.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-last-generated=2024-04-02
-statistics-simulation=
-{
-  "linear": " ",
-  "nonlinear": " ",
-  "numerical Jacobians": "0"
-}
-time=[0e+00, 9e+02]
-ctlPumPriHdrHea.u1PumHeaWatPri[1]=[0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-ctlPumPriHdrHea.u1PumHeaWatPri[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-ctlPumPriHdrHea.yPumHeaWatPriHdr=[0e+00, 0e+00, 0e+00, 0e+00, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-ctlPumPriHdr.u1PumHeaWatPri[1]=[0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-ctlPumPriHdr.u1PumHeaWatPri[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-ctlPumPriHdr.u1PumChiWatPri[1]=[1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
-ctlPumPriHdr.u1PumChiWatPri[2]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
-ctlPumPriHdr.yPumHeaWatPriHdr=[0e+00, 0e+00, 0e+00, 0e+00, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-ctlPumPriHdr.yPumChiWatPriHdr=[8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01]
-ctlPumPriDedCom.u1PumHeaWatPri[1]=[0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-ctlPumPriDedCom.u1PumHeaWatPri[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-ctlPumPriDedCom.u1Hea[1]=[1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
-ctlPumPriDedCom.u1Hea[2]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
-ctlPumPriDedCom.yPumHeaWatPriDed[1]=[0e+00, 0e+00, 0e+00, 0e+00, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-ctlPumPriDedCom.yPumHeaWatPriDed[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-ctlPumPriDedSep.u1PumHeaWatPri[1]=[0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-ctlPumPriDedSep.u1PumHeaWatPri[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-ctlPumPriDedSep.u1PumChiWatPri[1]=[1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
-ctlPumPriDedSep.u1PumChiWatPri[2]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
-ctlPumPriDedSep.yPumHeaWatPriDed[1]=[0e+00, 0e+00, 0e+00, 0e+00, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-ctlPumPriDedSep.yPumHeaWatPriDed[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-ctlPumPriDedSep.yPumChiWatPriDed[1]=[8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01]
-ctlPumPriDedSep.yPumChiWatPriDed[2]=[8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Setpoints_Validation_PlantReset.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Setpoints_Validation_PlantReset.txt
index f70a325231f..34aea324e45 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Setpoints_Validation_PlantReset.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Setpoints_Validation_PlantReset.txt
@@ -1,4 +1,4 @@
-last-generated=2024-04-02
+last-generated=2024-06-12
 statistics-simulation=
 {
   "linear": " ",
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_StagingRotation_Validation_EquipmentAvailability.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_StagingRotation_Validation_EquipmentAvailability.txt
index 97d4351c7e4..7aa6ecb4827 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_StagingRotation_Validation_EquipmentAvailability.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_StagingRotation_Validation_EquipmentAvailability.txt
@@ -1,4 +1,4 @@
-last-generated=2024-04-02
+last-generated=2024-06-12
 statistics-simulation=
 {
   "linear": " ",
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_StagingRotation_Validation_EquipmentEnable.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_StagingRotation_Validation_EquipmentEnable.txt
index 9983f0f7b25..da5829e9c13 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_StagingRotation_Validation_EquipmentEnable.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_StagingRotation_Validation_EquipmentEnable.txt
@@ -1,4 +1,4 @@
-last-generated=2024-04-02
+last-generated=2024-06-12
 statistics-simulation=
 {
   "linear": " ",
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_StagingRotation_Validation_EventSequencing.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_StagingRotation_Validation_EventSequencing.txt
index 91ad50928c4..59e621b1ee6 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_StagingRotation_Validation_EventSequencing.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_StagingRotation_Validation_EventSequencing.txt
@@ -1,4 +1,4 @@
-last-generated=2024-04-02
+last-generated=2024-06-12
 statistics-simulation=
 {
   "linear": " ",
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_StagingRotation_Validation_FailsafeCondition.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_StagingRotation_Validation_FailsafeCondition.txt
new file mode 100644
index 00000000000..3ea94ccef1d
--- /dev/null
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_StagingRotation_Validation_FailsafeCondition.txt
@@ -0,0 +1,22 @@
+last-generated=2024-06-12
+statistics-simulation=
+{
+  "linear": " ",
+  "nonlinear": " ",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 5e+03]
+faiSafHea.TSupSet=[3.331499938964844e+02, 3.331499938964844e+02]
+faiSafHea.TPriSup=[3.331499938964844e+02, 3.336726379394531e+02, 3.341895446777344e+02, 3.346950988769531e+02, 3.351836853027344e+02, 3.356499938964844e+02, 3.360889282226562e+02, 3.364956665039062e+02, 3.3686572265625e+02, 3.371950988769531e+02, 3.374801330566406e+02, 3.377177124023438e+02, 3.379052734375e+02, 3.380407409667969e+02, 3.381226196289062e+02, 3.381499938964844e+02, 3.381226196289062e+02, 3.380407409667969e+02, 3.379052734375e+02, 3.377177124023438e+02, 3.374801330566406e+02, 3.371950988769531e+02, 3.3686572265625e+02, 3.364956665039062e+02, 3.360889282226562e+02, 3.356499938964844e+02, 3.351836853027344e+02, 3.346950988769531e+02, 3.341895446777344e+02, 3.336726379394531e+02, 3.331499938964844e+02, 3.326273498535156e+02, 3.321104431152344e+02, 3.316049194335938e+02, 3.311163024902344e+02, 3.306499938964844e+02, 3.302110595703125e+02, 3.298043518066406e+02, 3.294342651367188e+02, 3.291049194335938e+02, 3.288198852539062e+02, 3.28582275390625e+02, 3.283947143554688e+02, 3.282592468261719e+02, 3.281773986816406e+02, 3.281499938964844e+02, 3.281773986816406e+02, 3.282592468261719e+02, 3.283947143554688e+02, 3.28582275390625e+02, 3.288198852539062e+02, 3.291049194335938e+02, 3.294342651367188e+02, 3.298043518066406e+02, 3.302110595703125e+02, 3.306499938964844e+02, 3.311163024902344e+02, 3.316049194335938e+02, 3.321104431152344e+02, 3.326273498535156e+02, 3.331499938964844e+02, 3.336726379394531e+02, 3.341895446777344e+02, 3.346950988769531e+02, 3.351836853027344e+02, 3.356499938964844e+02, 3.360889282226562e+02, 3.364956665039062e+02, 3.3686572265625e+02, 3.371950988769531e+02, 3.374801330566406e+02, 3.377177124023438e+02, 3.379052734375e+02, 3.380407409667969e+02, 3.381226196289062e+02, 3.381499938964844e+02, 3.381226196289062e+02, 3.380407409667969e+02, 3.379052734375e+02, 3.377177124023438e+02, 3.374801330566406e+02, 3.371950988769531e+02, 3.3686572265625e+02, 3.364956665039062e+02, 3.360889282226562e+02, 3.356499938964844e+02, 3.351836853027344e+02, 3.346950988769531e+02, 3.341895446777344e+02, 3.336726379394531e+02, 3.331499938964844e+02, 3.326273498535156e+02, 3.321104431152344e+02, 3.316049194335938e+02, 3.311163024902344e+02, 3.306499938964844e+02, 3.302110595703125e+02, 3.298043518066406e+02, 3.294342651367188e+02, 3.291049194335938e+02, 3.288198852539062e+02]
+faiSafHea.TSecSup=[3.380740356445312e+02, 3.37956298828125e+02, 3.377859191894531e+02, 3.375647277832031e+02, 3.372951965332031e+02, 3.36980224609375e+02, 3.36623291015625e+02, 3.362283020019531e+02, 3.357995910644531e+02, 3.353418579101562e+02, 3.34860107421875e+02, 3.34359619140625e+02, 3.338458557128906e+02, 3.333244934082031e+02, 3.328012084960938e+02, 3.322817687988281e+02, 3.317718200683594e+02, 3.312769775390625e+02, 3.308026428222656e+02, 3.303540344238281e+02, 3.299360656738281e+02, 3.295533142089844e+02, 3.292099609375e+02, 3.289097595214844e+02, 3.286560363769531e+02, 3.284515380859375e+02, 3.282985229492188e+02, 3.281986694335938e+02, 3.281530456542969e+02, 3.281621704101562e+02, 3.282259521484375e+02, 3.283436889648438e+02, 3.285140686035156e+02, 3.287352600097656e+02, 3.290048217773438e+02, 3.293197631835938e+02, 3.296766967773438e+02, 3.300716857910156e+02, 3.305003967285156e+02, 3.309581298828125e+02, 3.314399108886719e+02, 3.319403991699219e+02, 3.324541320800781e+02, 3.329754943847656e+02, 3.33498779296875e+02, 3.340182495117188e+02, 3.345281982421875e+02, 3.350230407714844e+02, 3.354973449707031e+02, 3.359459533691406e+02, 3.363639526367188e+02, 3.367467041015625e+02, 3.370900573730469e+02, 3.373902282714844e+02, 3.376439819335938e+02, 3.378484497070312e+02, 3.3800146484375e+02, 3.381013488769531e+02, 3.381469421386719e+02, 3.381378173828125e+02, 3.380740356445312e+02, 3.37956298828125e+02, 3.377859191894531e+02, 3.375647277832031e+02, 3.372951965332031e+02, 3.36980224609375e+02, 3.36623291015625e+02, 3.362283020019531e+02, 3.357995910644531e+02, 3.353418579101562e+02, 3.34860107421875e+02, 3.34359619140625e+02, 3.338458557128906e+02, 3.333244934082031e+02, 3.328012084960938e+02, 3.322817687988281e+02, 3.317718200683594e+02, 3.312769775390625e+02, 3.308026428222656e+02, 3.303540344238281e+02, 3.299360656738281e+02, 3.295533142089844e+02, 3.292099609375e+02, 3.289097595214844e+02, 3.286560363769531e+02, 3.284515380859375e+02, 3.282985229492188e+02, 3.281986694335938e+02, 3.281530456542969e+02, 3.281621704101562e+02, 3.282259521484375e+02, 3.283436889648438e+02, 3.285140686035156e+02, 3.287352600097656e+02, 3.290048217773438e+02, 3.293197631835938e+02, 3.296766967773438e+02, 3.300716857910156e+02, 3.305003967285156e+02, 3.309581298828125e+02, 3.314399108886719e+02]
+faiSafHea.reset=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+faiSafHea.y1=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+faiSafCoo.TSupSet=[2.801499938964844e+02, 2.801499938964844e+02]
+faiSafCoo.TPriSup=[2.801499938964844e+02, 2.804635925292969e+02, 2.807737426757812e+02, 2.810770568847656e+02, 2.813702087402344e+02, 2.816499938964844e+02, 2.819133605957031e+02, 2.821573791503906e+02, 2.823794250488281e+02, 2.825770568847656e+02, 2.827480773925781e+02, 2.82890625e+02, 2.83003173828125e+02, 2.830844421386719e+02, 2.831335754394531e+02, 2.831499938964844e+02, 2.831335754394531e+02, 2.830844421386719e+02, 2.83003173828125e+02, 2.82890625e+02, 2.827480773925781e+02, 2.825770568847656e+02, 2.823794250488281e+02, 2.821573791503906e+02, 2.819133605957031e+02, 2.816499938964844e+02, 2.813702087402344e+02, 2.810770568847656e+02, 2.807737426757812e+02, 2.804635925292969e+02, 2.801499938964844e+02, 2.7983642578125e+02, 2.795262756347656e+02, 2.792229614257812e+02, 2.789297790527344e+02, 2.786499938964844e+02, 2.783866577148438e+02, 2.781426086425781e+02, 2.779205627441406e+02, 2.777229614257812e+02, 2.775519104003906e+02, 2.774093627929688e+02, 2.772968444824219e+02, 2.772155456542969e+02, 2.771664428710938e+02, 2.771499938964844e+02, 2.771664428710938e+02, 2.772155456542969e+02, 2.772968444824219e+02, 2.774093627929688e+02, 2.775519104003906e+02, 2.777229614257812e+02, 2.779205627441406e+02, 2.781426086425781e+02, 2.783866577148438e+02, 2.786499938964844e+02, 2.789297790527344e+02, 2.792229614257812e+02, 2.795262756347656e+02, 2.7983642578125e+02, 2.801499938964844e+02, 2.804635925292969e+02, 2.807737426757812e+02, 2.810770568847656e+02, 2.813702087402344e+02, 2.816499938964844e+02, 2.819133605957031e+02, 2.821573791503906e+02, 2.823794250488281e+02, 2.825770568847656e+02, 2.827480773925781e+02, 2.82890625e+02, 2.83003173828125e+02, 2.830844421386719e+02, 2.831335754394531e+02, 2.831499938964844e+02, 2.831335754394531e+02, 2.830844421386719e+02, 2.83003173828125e+02, 2.82890625e+02, 2.827480773925781e+02, 2.825770568847656e+02, 2.823794250488281e+02, 2.821573791503906e+02, 2.819133605957031e+02, 2.816499938964844e+02, 2.813702087402344e+02, 2.810770568847656e+02, 2.807737426757812e+02, 2.804635925292969e+02, 2.801499938964844e+02, 2.7983642578125e+02, 2.795262756347656e+02, 2.792229614257812e+02, 2.789297790527344e+02, 2.786499938964844e+02, 2.783866577148438e+02, 2.781426086425781e+02, 2.779205627441406e+02, 2.777229614257812e+02, 2.775519104003906e+02]
+faiSafCoo.TSecSup=[2.831044311523438e+02, 2.830337829589844e+02, 2.829315490722656e+02, 2.82798828125e+02, 2.826371154785156e+02, 2.824481201171875e+02, 2.822339782714844e+02, 2.819969787597656e+02, 2.8173974609375e+02, 2.814651184082031e+02, 2.811760559082031e+02, 2.808757629394531e+02, 2.805675048828125e+02, 2.802546997070312e+02, 2.799407348632812e+02, 2.796290588378906e+02, 2.793230895996094e+02, 2.790261840820312e+02, 2.787415771484375e+02, 2.78472412109375e+02, 2.782216491699219e+02, 2.779919738769531e+02, 2.777859802246094e+02, 2.776058654785156e+02, 2.7745361328125e+02, 2.773309326171875e+02, 2.772391052246094e+02, 2.7717919921875e+02, 2.771518249511719e+02, 2.771573181152344e+02, 2.771955871582031e+02, 2.772662048339844e+02, 2.773684387207031e+02, 2.775011596679688e+02, 2.776628723144531e+02, 2.778518676757812e+02, 2.780660400390625e+02, 2.783030090332031e+02, 2.785602416992188e+02, 2.788348999023438e+02, 2.791239318847656e+02, 2.794242248535156e+02, 2.797324829101562e+02, 2.800452880859375e+02, 2.803592834472656e+02, 2.806709594726562e+02, 2.809768981933594e+02, 2.812738342285156e+02, 2.815584106445312e+02, 2.818275756835938e+02, 2.82078369140625e+02, 2.823080139160156e+02, 2.825140380859375e+02, 2.826941528320312e+02, 2.828463745117188e+02, 2.829690856933594e+02, 2.830608825683594e+02, 2.831208190917969e+02, 2.831481628417969e+02, 2.831427001953125e+02, 2.831044311523438e+02, 2.830337829589844e+02, 2.829315490722656e+02, 2.82798828125e+02, 2.826371154785156e+02, 2.824481201171875e+02, 2.822339782714844e+02, 2.819969787597656e+02, 2.8173974609375e+02, 2.814651184082031e+02, 2.811760559082031e+02, 2.808757629394531e+02, 2.805675048828125e+02, 2.802546997070312e+02, 2.799407348632812e+02, 2.796290588378906e+02, 2.793230895996094e+02, 2.790261840820312e+02, 2.787415771484375e+02, 2.78472412109375e+02, 2.782216491699219e+02, 2.779919738769531e+02, 2.777859802246094e+02, 2.776058654785156e+02, 2.7745361328125e+02, 2.773309326171875e+02, 2.772391052246094e+02, 2.7717919921875e+02, 2.771518249511719e+02, 2.771573181152344e+02, 2.771955871582031e+02, 2.772662048339844e+02, 2.773684387207031e+02, 2.775011596679688e+02, 2.776628723144531e+02, 2.778518676757812e+02, 2.780660400390625e+02, 2.783030090332031e+02, 2.785602416992188e+02, 2.788348999023438e+02, 2.791239318847656e+02]
+faiSafCoo.reset=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+faiSafCoo.y1=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+faiSafCooPri.TSupSet=[2.801499938964844e+02, 2.801499938964844e+02]
+faiSafCooPri.TPriSup=[2.801499938964844e+02, 2.804635925292969e+02, 2.807737426757812e+02, 2.810770568847656e+02, 2.813702087402344e+02, 2.816499938964844e+02, 2.819133605957031e+02, 2.821573791503906e+02, 2.823794250488281e+02, 2.825770568847656e+02, 2.827480773925781e+02, 2.82890625e+02, 2.83003173828125e+02, 2.830844421386719e+02, 2.831335754394531e+02, 2.831499938964844e+02, 2.831335754394531e+02, 2.830844421386719e+02, 2.83003173828125e+02, 2.82890625e+02, 2.827480773925781e+02, 2.825770568847656e+02, 2.823794250488281e+02, 2.821573791503906e+02, 2.819133605957031e+02, 2.816499938964844e+02, 2.813702087402344e+02, 2.810770568847656e+02, 2.807737426757812e+02, 2.804635925292969e+02, 2.801499938964844e+02, 2.7983642578125e+02, 2.795262756347656e+02, 2.792229614257812e+02, 2.789297790527344e+02, 2.786499938964844e+02, 2.783866577148438e+02, 2.781426086425781e+02, 2.779205627441406e+02, 2.777229614257812e+02, 2.775519104003906e+02, 2.774093627929688e+02, 2.772968444824219e+02, 2.772155456542969e+02, 2.771664428710938e+02, 2.771499938964844e+02, 2.771664428710938e+02, 2.772155456542969e+02, 2.772968444824219e+02, 2.774093627929688e+02, 2.775519104003906e+02, 2.777229614257812e+02, 2.779205627441406e+02, 2.781426086425781e+02, 2.783866577148438e+02, 2.786499938964844e+02, 2.789297790527344e+02, 2.792229614257812e+02, 2.795262756347656e+02, 2.7983642578125e+02, 2.801499938964844e+02, 2.804635925292969e+02, 2.807737426757812e+02, 2.810770568847656e+02, 2.813702087402344e+02, 2.816499938964844e+02, 2.819133605957031e+02, 2.821573791503906e+02, 2.823794250488281e+02, 2.825770568847656e+02, 2.827480773925781e+02, 2.82890625e+02, 2.83003173828125e+02, 2.830844421386719e+02, 2.831335754394531e+02, 2.831499938964844e+02, 2.831335754394531e+02, 2.830844421386719e+02, 2.83003173828125e+02, 2.82890625e+02, 2.827480773925781e+02, 2.825770568847656e+02, 2.823794250488281e+02, 2.821573791503906e+02, 2.819133605957031e+02, 2.816499938964844e+02, 2.813702087402344e+02, 2.810770568847656e+02, 2.807737426757812e+02, 2.804635925292969e+02, 2.801499938964844e+02, 2.7983642578125e+02, 2.795262756347656e+02, 2.792229614257812e+02, 2.789297790527344e+02, 2.786499938964844e+02, 2.783866577148438e+02, 2.781426086425781e+02, 2.779205627441406e+02, 2.777229614257812e+02, 2.775519104003906e+02]
+faiSafCooPri.reset=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+faiSafCooPri.y1=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_StagingRotation_Validation_LoadAverage.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_StagingRotation_Validation_LoadAverage.txt
new file mode 100644
index 00000000000..10e6e9826bf
--- /dev/null
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_StagingRotation_Validation_LoadAverage.txt
@@ -0,0 +1,17 @@
+last-generated=2024-06-12
+statistics-simulation=
+{
+  "linear": " ",
+  "nonlinear": " ",
+  "number of continuous time states": "2",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 2e+03]
+loaHea.TSupSet=[3.331499938964844e+02, 3.331499938964844e+02]
+loaHea.TRet=[3.331499938964844e+02, 3.32313232421875e+02, 3.314822998046875e+02, 3.306630859375e+02, 3.29861328125e+02, 3.290826416015625e+02, 3.283324584960938e+02, 3.276160888671875e+02, 3.269385070800781e+02, 3.263045349121094e+02, 3.257185668945312e+02, 3.251846923828125e+02, 3.247067260742188e+02, 3.242879638671875e+02, 3.239313659667969e+02, 3.236394348144531e+02, 3.234142150878906e+02, 3.232572631835938e+02, 3.231697387695312e+02, 3.231521911621094e+02, 3.232047729492188e+02, 3.233271179199219e+02, 3.235183715820312e+02, 3.237771911621094e+02, 3.241017150878906e+02, 3.2448974609375e+02, 3.249385070800781e+02, 3.254448547363281e+02, 3.260052795410156e+02, 3.266157836914062e+02, 3.272721557617188e+02, 3.279697265625e+02, 3.287036437988281e+02, 3.2946875e+02, 3.302596740722656e+02, 3.310708923339844e+02, 3.318966674804688e+02, 3.327312316894531e+02, 3.335687561035156e+02, 3.344033203125e+02, 3.352291259765625e+02, 3.360403137207031e+02, 3.368312377929688e+02, 3.375963439941406e+02, 3.383302612304688e+02, 3.390278625488281e+02, 3.396842041015625e+02, 3.402947387695312e+02, 3.408551330566406e+02, 3.413614807128906e+02, 3.418102416992188e+02, 3.421982727050781e+02, 3.425228271484375e+02, 3.427816162109375e+02, 3.429728698730469e+02, 3.4309521484375e+02, 3.431477966308594e+02, 3.431302795410156e+02, 3.43042724609375e+02, 3.428858032226562e+02, 3.426605529785156e+02, 3.423686218261719e+02, 3.420120239257812e+02, 3.415932922363281e+02, 3.411152954101562e+02, 3.405814514160156e+02, 3.399954833984375e+02, 3.393614807128906e+02, 3.386839294433594e+02, 3.37967529296875e+02, 3.372173767089844e+02, 3.364386596679688e+02, 3.356369018554688e+02, 3.348176879882812e+02, 3.339867858886719e+02, 3.331499938964844e+02, 3.32313232421875e+02, 3.314822998046875e+02, 3.306630859375e+02, 3.29861328125e+02, 3.290826416015625e+02, 3.283324584960938e+02, 3.276160888671875e+02, 3.269385070800781e+02, 3.263045349121094e+02, 3.257185668945312e+02, 3.251846923828125e+02, 3.247067260742188e+02, 3.242879638671875e+02, 3.239313659667969e+02, 3.236394348144531e+02, 3.234142150878906e+02, 3.232572631835938e+02, 3.231697387695312e+02, 3.231521911621094e+02, 3.232047729492188e+02, 3.233271179199219e+02, 3.235183715820312e+02, 3.237771911621094e+02, 3.241017150878906e+02, 3.2448974609375e+02]
+loaHea.V_flow=[1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 7.999999821186066e-02, 5.999999865889549e-02, 3.999999910593033e-02, 1.999999955296516e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+loaHea.QReq_flow=[0e+00, 1.75231484375e+05, 3.4985703125e+05, 5.232556875e+05, 6.948221875e+05, 8.6395975e+05, 1.0300816875e+06, 1.192615625e+06, 1.3510065e+06, 1.504718375e+06, 1.65323725e+06, 1.796072625e+06, 1.932760375e+06, 2.062865e+06, 2.1859815e+06, 2.30173675e+06, 2.55876375e+06, 2.79784125e+06, 3.017293e+06, 3.215579e+06, 3.391311e+06, 3.5432585e+06, 3.67035625e+06, 3.77170875e+06, 3.84660325e+06, 3.89451675e+06, 3.91511425e+06, 3.90825025e+06, 3.873974e+06, 3.81252575e+06, 3.72433525e+06, 3.61003125e+06, 3.4704015e+06, 3.30642675e+06, 3.1192565e+06, 2.910204e+06, 2.68073625e+06, 2.43246275e+06, 2.1671315e+06, 1.88660075e+06, 1.59283825e+06, 1.287899e+06, 9.739235625e+05, 6.531135e+05, 3.27717e+05, 2.66182689666748e+01, -3.2766521875e+05, -6.53059625e+05, -9.738693125e+05, -1.287844125e+06, -1.592784125e+06, -1.8865525e+06, -2.167089e+06, -2.43242875e+06, -2.68070575e+06, -2.91018175e+06, -3.1192425e+06, -3.30642125e+06, -3.47040525e+06, -3.61004075e+06, -3.72435675e+06, -3.7865425e+06, -3.772448e+06, -3.6861225e+06, -3.53285025e+06, -3.31904e+06, -3.07179825e+06, -2.81460775e+06, -2.5492725e+06, -2.277654e+06, -2.00165675e+06, -1.7232165e+06, -1.44428725e+06, -1.166825375e+06, -8.927784375e+05, -6.240695e+05, -3.8859003125e+05, -2.1170390625e+05, -9.0700578125e+04, -2.1748962890625e+04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+loaCoo.TSupSet=[2.801499938964844e+02, 2.801499938964844e+02]
+loaCoo.TRet=[2.801499938964844e+02, 2.797315979003906e+02, 2.79316162109375e+02, 2.789065551757812e+02, 2.785056762695312e+02, 2.781163024902344e+02, 2.777412414550781e+02, 2.77383056640625e+02, 2.770442504882812e+02, 2.767272644042969e+02, 2.764342651367188e+02, 2.761673583984375e+02, 2.759283752441406e+02, 2.75718994140625e+02, 2.755406799316406e+02, 2.753947143554688e+02, 2.752821044921875e+02, 2.752036437988281e+02, 2.751598815917969e+02, 2.751510925292969e+02, 2.751773986816406e+02, 2.752385559082031e+02, 2.753341979980469e+02, 2.754635925292969e+02, 2.756258544921875e+02, 2.758198852539062e+02, 2.760442504882812e+02, 2.762974243164062e+02, 2.7657763671875e+02, 2.768829040527344e+02, 2.772110595703125e+02, 2.775598754882812e+02, 2.779268188476562e+02, 2.783093872070312e+02, 2.78704833984375e+02, 2.791104431152344e+02, 2.795233459472656e+02, 2.799406127929688e+02, 2.80359375e+02, 2.807766723632812e+02, 2.811895446777344e+02, 2.815951538085938e+02, 2.819906311035156e+02, 2.823731689453125e+02, 2.827401428222656e+02, 2.830889282226562e+02, 2.834171142578125e+02, 2.837223510742188e+02, 2.840025634765625e+02, 2.842557373046875e+02, 2.844801330566406e+02, 2.846741333007812e+02, 2.848363952636719e+02, 2.849658203125e+02, 2.850614318847656e+02, 2.851226196289062e+02, 2.851488952636719e+02, 2.8514013671875e+02, 2.850963745117188e+02, 2.850178833007812e+02, 2.849052734375e+02, 2.847593078613281e+02, 2.845810241699219e+02, 2.843716430664062e+02, 2.841326599121094e+02, 2.8386572265625e+02, 2.835727233886719e+02, 2.832557373046875e+02, 2.829169616699219e+02, 2.825587768554688e+02, 2.821836853027344e+02, 2.817943420410156e+02, 2.813934631347656e+02, 2.809838562011719e+02, 2.805683898925781e+02, 2.801499938964844e+02, 2.797315979003906e+02, 2.79316162109375e+02, 2.789065551757812e+02, 2.785056762695312e+02, 2.781163024902344e+02, 2.777412414550781e+02, 2.77383056640625e+02, 2.770442504882812e+02, 2.767272644042969e+02, 2.764342651367188e+02, 2.761673583984375e+02, 2.759283752441406e+02, 2.75718994140625e+02, 2.755406799316406e+02, 2.753947143554688e+02, 2.752821044921875e+02, 2.752036437988281e+02, 2.751598815917969e+02, 2.751510925292969e+02, 2.751773986816406e+02, 2.752385559082031e+02, 2.753341979980469e+02, 2.754635925292969e+02, 2.756258544921875e+02, 2.758198852539062e+02]
+loaCoo.V_flow=[1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 7.999999821186066e-02, 5.999999865889549e-02, 3.999999910593033e-02, 1.999999955296516e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+loaCoo.QReq_flow=[0e+00, -8.76157421875e+04, -1.74928515625e+05, -2.6162784375e+05, -3.4741109375e+05, -4.31979875e+05, -5.1504084375e+05, -5.963078125e+05, -6.7550325e+05, -7.523591875e+05, -8.26618625e+05, -8.980363125e+05, -9.663801875e+05, -1.0314325e+06, -1.09299075e+06, -1.150868375e+06, -1.279381875e+06, -1.398920625e+06, -1.5086465e+06, -1.6077895e+06, -1.6956555e+06, -1.77162925e+06, -1.835178125e+06, -1.885854375e+06, -1.923301625e+06, -1.947258375e+06, -1.957557125e+06, -1.954125125e+06, -1.936987e+06, -1.906262875e+06, -1.862167625e+06, -1.805015625e+06, -1.73520075e+06, -1.653213375e+06, -1.55962825e+06, -1.455102e+06, -1.340368125e+06, -1.216231375e+06, -1.08356575e+06, -9.43300375e+05, -7.96419125e+05, -6.439495e+05, -4.8696178125e+05, -3.2655675e+05, -1.638585e+05, -1.33091344833374e+01, 1.63832609375e+05, 3.265298125e+05, 4.8693465625e+05, 6.439220625e+05, 7.963920625e+05, 9.4327625e+05, 1.0835445e+06, 1.216214375e+06, 1.340352875e+06, 1.455090875e+06, 1.55962125e+06, 1.653210625e+06, 1.735202625e+06, 1.805020375e+06, 1.862178375e+06, 1.89327125e+06, 1.886224e+06, 1.84306125e+06, 1.766425125e+06, 1.65952e+06, 1.535899125e+06, 1.407303875e+06, 1.27463625e+06, 1.138827e+06, 1.000828375e+06, 8.6160825e+05, 7.22143625e+05, 5.834126875e+05, 4.4638921875e+05, 3.1203475e+05, 1.94295015625e+05, 1.05851953125e+05, 4.53502890625e+04, 1.08744814453125e+04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_StagingRotation_Validation_SortRuntime.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_StagingRotation_Validation_SortRuntime.txt
index 057e34f10a5..12bdda355d4 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_StagingRotation_Validation_SortRuntime.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_StagingRotation_Validation_SortRuntime.txt
@@ -1,4 +1,4 @@
-last-generated=2024-04-02
+last-generated=2024-06-12
 statistics-simulation=
 {
   "linear": " ",
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_StagingRotation_Validation_StageAvailability.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_StagingRotation_Validation_StageAvailability.txt
index 77e9a3eb051..3e9e6370cb7 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_StagingRotation_Validation_StageAvailability.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_StagingRotation_Validation_StageAvailability.txt
@@ -1,4 +1,4 @@
-last-generated=2024-04-02
+last-generated=2024-06-12
 statistics-simulation=
 {
   "linear": " ",
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_StagingRotation_Validation_StageChangeCommand.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_StagingRotation_Validation_StageChangeCommand.txt
index be55bd2611b..5af6d57fd2c 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_StagingRotation_Validation_StageChangeCommand.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_StagingRotation_Validation_StageChangeCommand.txt
@@ -1,4 +1,4 @@
-last-generated=2024-04-04
+last-generated=2024-06-12
 statistics-simulation=
 {
   "linear": " ",
@@ -7,7 +7,7 @@ statistics-simulation=
   "numerical Jacobians": "0"
 }
 time=[0e+00, 2e+04]
-chaSta.capReq.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+04, 2.000000000000001e+04, 3e+04, 4e+04, 5e+04, 6e+04, 7e+04, 8e+04, 9.000000000000003e+04, 1e+05, 1.1e+05, 1.2e+05, 1.3e+05, 1.4e+05, 1.5e+05, 1.6e+05, 1.7e+05, 1.8e+05, 1.9e+05, 2e+05, 1.62e+05, 1.24e+05, 8.599999999999983e+04, 4.8e+04, 1e+04, 4.96e+04, 8.92e+04, 1.288e+05, 1.684000000000002e+05, 2.08e+05, 2.476e+05, 2.872e+05, 3.268e+05, 3.664e+05, 4.06e+05, 4.456e+05, 4.852e+05, 5.248e+05, 5.644e+05, 6.04e+05, 6.436e+05, 6.832e+05, 7.228e+05, 7.624e+05, 8.02e+05, 8.416e+05, 8.812e+05, 9.208e+05, 9.604e+05, 1e+06, 1e+06, 1e+06, 1e+06, 1e+06, 1e+06, 9.666666875e+05, 9.333333125e+05, 9e+05, 8.666666875e+05, 8.333333125e+05, 8e+05, 7.666666875e+05, 7.333333124999997e+05, 7.000000000000003e+05, 6.666666875e+05, 6.333333125e+05, 6e+05, 5.666666875e+05, 5.333333125e+05, 5e+05, 4.6666665625e+05, 4.3333334375e+05, 4e+05, 3.6666665625e+05, 3.3333334375e+05, 2.999999999999997e+05, 2.6666665625e+05, 2.33333328125e+05, 2e+05, 1.66666671875e+05, 1.33333328125e+05, 1e+05, 6.66666640625e+04, 3.333333203125e+04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+04, 2e+04, 3e+04, 4e+04, 5e+04]
+chaSta.capReq.QReq_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.333333251953125e+03, 1.246666699218751e+04, 2.2466666015625e+04, 3.2466666015625e+04, 4.246666796875e+04, 5.246666796875e+04, 6.246666796875e+04, 7.24666640625e+04, 8.246666406250003e+04, 9.2467546875e+04, 1.02467640625e+05, 1.12466734375e+05, 1.2249325e+05, 1.32466703125e+05, 1.424666875e+05, 1.52499859375e+05, 1.6249690625e+05, 1.724896875e+05, 1.82469765625e+05, 1.92486921875e+05, 1.86465984375e+05, 1.52626328125e+05, 1.146265078124998e+05, 7.6621984375e+04, 3.855922265625e+04, 2.6500775390625e+04, 5.939247265625e+04, 9.897309375e+04, 1.385734531250002e+05, 1.7826534375e+05, 2.177681875e+05, 2.57368125e+05, 2.96968125e+05, 3.365680625e+05, 3.761680625e+05, 4.157769375e+05, 4.5537778125e+05, 4.9496865625e+05, 5.34568375e+05, 5.742276875e+05, 6.13768125e+05, 6.5349975e+05, 6.9300025e+05, 7.32568e+05, 7.721813125e+05, 8.117813125e+05, 8.51498e+05, 8.91032625e+05, 9.306236875e+05, 9.70198e+05, 9.966814375000001e+05, 1e+06, 1e+06, 1e+06, 1e+06, 9.88857625e+05, 9.58354875e+05, 9.25109375e+05, 8.915765625e+05, 8.582018125e+05, 8.250570625e+05, 7.9173075e+05, 7.583126249999997e+05, 7.251085000000003e+05, 6.91776125e+05, 6.58443375e+05, 6.250250625e+05, 5.916685e+05, 5.583573125e+05, 5.25043125e+05, 4.91684375e+05, 4.582500625e+05, 4.25015875e+05, 3.917270625e+05, 3.5835028125e+05, 3.251106562499997e+05, 2.9166675e+05, 2.5834328125e+05, 2.25111109375e+05, 1.9175246875e+05, 1.58419140625e+05, 1.250013828125e+05, 9.16900859375e+04, 5.836433203125e+04, 2.5046224609375e+04, 2.728775390625e+03, 0e+00, 0e+00, 0e+00, 0e+00, 3.408951904296875e+03, 1.24926748046875e+04, 2.24695703125e+04, 3.2539109375e+04, 4.256813671875e+04]
 chaSta.capSta.y=[1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 4.5e+05, 4.5e+05, 4.5e+05, 4.5e+05, 4.5e+05, 4.5e+05, 4.5e+05, 4.5e+05, 4.5e+05, 4.5e+05, 4.5e+05, 4.5e+05, 4.5e+05, 4.5e+05, 4.5e+05, 4.5e+05, 4.5e+05, 4.5e+05, 4.5e+05, 4.5e+05, 4.5e+05, 4.5e+05, 4.5e+05, 4.5e+05, 4.5e+05, 4.5e+05, 5.5e+05, 5.5e+05, 5.5e+05, 5.5e+05, 9e+05, 9e+05, 9e+05, 9e+05, 9e+05, 9e+05, 9e+05, 9e+05, 9e+05, 1e+06, 1e+06, 1e+06, 1e+06, 1e+06, 1e+06, 1e+06, 1e+06, 1e+06, 1e+06, 1e+06, 1e+06, 9e+05, 9e+05, 9e+05, 9e+05, 9e+05, 9e+05, 9e+05, 9e+05, 9e+05, 9e+05, 5.5e+05, 5.5e+05, 5.5e+05, 5.5e+05, 4.5e+05, 4.5e+05, 4.5e+05, 4.5e+05, 4.5e+05, 4.5e+05, 4.5e+05, 4.5e+05, 4.5e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05]
 chaSta.capStaLow.y=[1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 4.5e+05, 4.5e+05, 4.5e+05, 4.5e+05, 5.5e+05, 5.5e+05, 5.5e+05, 5.5e+05, 5.5e+05, 5.5e+05, 5.5e+05, 5.5e+05, 5.5e+05, 9e+05, 9e+05, 9e+05, 9e+05, 9e+05, 9e+05, 9e+05, 9e+05, 9e+05, 9e+05, 9e+05, 9e+05, 5.5e+05, 5.5e+05, 5.5e+05, 5.5e+05, 5.5e+05, 5.5e+05, 5.5e+05, 5.5e+05, 5.5e+05, 5.5e+05, 4.5e+05, 4.5e+05, 4.5e+05, 4.5e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05]
 capHea_nominal=[1e+06, 1e+06]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_StagingRotation_Validation_StageCompletion.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_StagingRotation_Validation_StageCompletion.txt
index 361b588b00c..4ef3525d85e 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_StagingRotation_Validation_StageCompletion.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_StagingRotation_Validation_StageCompletion.txt
@@ -1,4 +1,4 @@
-last-generated=2024-04-02
+last-generated=2024-06-26
 statistics-simulation=
 {
   "linear": " ",
@@ -11,5 +11,5 @@ comSta.u1[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+
 comSta.u1[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
 comSta.u1_actual[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
 comSta.u1_actual[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-y1ComSta.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+y1ComSta.y=[1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
 comSta.y1=[0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_CountTrue.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_CountTrue.txt
index 5c31adb34cf..624b3f2818f 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_CountTrue.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_CountTrue.txt
@@ -1,4 +1,4 @@
-last-generated=2024-04-02
+last-generated=2024-06-12
 statistics-simulation=
 {
   "linear": " ",
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_FirstTrueIndex.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_FirstTrueIndex.txt
index 0b35071e0a5..da9e2b54253 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_FirstTrueIndex.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_FirstTrueIndex.txt
@@ -1,4 +1,4 @@
-last-generated=2024-04-02
+last-generated=2024-06-12
 statistics-simulation=
 {
   "linear": " ",
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_HoldReal.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_HoldReal.txt
index e42ccf4d1cf..77cadefc7f5 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_HoldReal.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_HoldReal.txt
@@ -1,4 +1,4 @@
-last-generated=2024-04-02
+last-generated=2024-06-12
 statistics-simulation=
 {
   "linear": " ",
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_LastTrueIndex.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_LastTrueIndex.txt
index 29608da707b..b2976344113 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_LastTrueIndex.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_LastTrueIndex.txt
@@ -1,4 +1,4 @@
-last-generated=2024-04-02
+last-generated=2024-06-12
 statistics-simulation=
 {
   "linear": " ",
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_MultiMaxInteger.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_MultiMaxInteger.txt
index ffe6b584880..be156d93ea8 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_MultiMaxInteger.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_MultiMaxInteger.txt
@@ -1,4 +1,4 @@
-last-generated=2024-04-02
+last-generated=2024-06-12
 statistics-simulation=
 {
   "linear": " ",
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_MultiMinInteger.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_MultiMinInteger.txt
index 2e773328dbe..796bc735a94 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_MultiMinInteger.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_MultiMinInteger.txt
@@ -1,4 +1,4 @@
-last-generated=2024-04-02
+last-generated=2024-06-12
 statistics-simulation=
 {
   "linear": " ",
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_PlaceholderInteger.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_PlaceholderInteger.txt
index 68ece4ee389..ee1f81713a3 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_PlaceholderInteger.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_PlaceholderInteger.txt
@@ -1,4 +1,4 @@
-last-generated=2024-04-02
+last-generated=2024-06-12
 statistics-simulation=
 {
   "linear": " ",
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_PlaceholderLogical.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_PlaceholderLogical.txt
index b54c5b4aac5..05de242b0ea 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_PlaceholderLogical.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_PlaceholderLogical.txt
@@ -1,4 +1,4 @@
-last-generated=2024-04-02
+last-generated=2024-06-12
 statistics-simulation=
 {
   "linear": " ",
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_PlaceholderReal.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_PlaceholderReal.txt
index 68ece4ee389..ee1f81713a3 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_PlaceholderReal.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_PlaceholderReal.txt
@@ -1,4 +1,4 @@
-last-generated=2024-04-02
+last-generated=2024-06-12
 statistics-simulation=
 {
   "linear": " ",
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_StageIndex.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_StageIndex.txt
index fb1522aaad9..a9f588c6fbd 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_StageIndex.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_StageIndex.txt
@@ -1,4 +1,4 @@
-last-generated=2024-04-02
+last-generated=2024-06-12
 statistics-simulation=
 {
   "linear": " ",
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_TimerWithReset.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_TimerWithReset.txt
index 2501889dc07..c00b86bf498 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_TimerWithReset.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_TimerWithReset.txt
@@ -1,4 +1,4 @@
-last-generated=2024-04-02
+last-generated=2024-06-12
 statistics-simulation=
 {
   "linear": " ",
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_TrueArrayConditional.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_TrueArrayConditional.txt
index 569c882adea..5cc5ddd85f5 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_TrueArrayConditional.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_TrueArrayConditional.txt
@@ -1,4 +1,4 @@
-last-generated=2024-04-02
+last-generated=2024-06-12
 statistics-simulation=
 {
   "linear": " ",
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_HeatPumps_Components_Validation_HeatRecoveryChiller.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_HeatPumps_Components_Validation_HeatRecoveryChiller.txt
new file mode 100644
index 00000000000..2ae47e0396b
--- /dev/null
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_HeatPumps_Components_Validation_HeatRecoveryChiller.txt
@@ -0,0 +1,25 @@
+last-generated=2024-06-01
+statistics-initialization=
+{
+  "nonlinear": "1, 1",
+  "numerical Jacobians": "0"
+}
+statistics-simulation=
+{
+  "linear": " ",
+  "nonlinear": "1, 1, 1",
+  "number of continuous time states": "16",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 1e+03]
+bus.hrc.y1=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+bus.hrc.y1Coo=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+bus.pumChiWatHrc.y1=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+bus.pumHeaWatHrc.y1=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+TChiWatLvg.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.787266235351562e+02, 2.787821655273438e+02, 2.791656494140625e+02, 2.794444274902344e+02, 2.796442565917969e+02, 2.797875366210938e+02, 2.798903198242188e+02, 2.799639892578125e+02, 2.800167236328125e+02, 2.800545043945312e+02, 2.800815734863281e+02, 2.801009521484375e+02, 2.801148681640625e+02, 2.801248168945312e+02, 2.801319580078125e+02, 2.801370849609375e+02, 2.801407470703125e+02, 2.801433410644531e+02, 2.801452331542969e+02, 2.801465759277344e+02, 2.801475524902344e+02, 2.801482543945312e+02, 2.801487426757812e+02, 2.801491088867188e+02, 2.801493530273438e+02, 2.801495361328125e+02, 2.80149658203125e+02, 2.801497497558594e+02, 2.801498413085938e+02, 2.801498718261719e+02, 2.8014990234375e+02, 2.8014990234375e+02, 2.801499328613281e+02, 2.801499328613281e+02, 2.801499633789062e+02, 2.801499633789062e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.809705810546875e+02, 2.811294555664062e+02, 2.81139404296875e+02, 2.811397399902344e+02, 2.811397399902344e+02, 2.811397094726562e+02, 2.811397399902344e+02, 2.811397399902344e+02, 2.811397094726562e+02, 2.811397399902344e+02]
+inlChiWat.T=[2.851499938964844e+02, 2.851499938964844e+02]
+TSupSet.y=[3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02]
+THeaWatLvg.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.995823669433594e+02, 3.053453674316406e+02, 3.101871948242188e+02, 3.137464294433594e+02, 3.163283386230469e+02, 3.181999816894531e+02, 3.195572814941406e+02, 3.205419311523438e+02, 3.212565307617188e+02, 3.217752075195312e+02, 3.221517333984375e+02, 3.224250793457031e+02, 3.226235656738281e+02, 3.227676696777344e+02, 3.22872314453125e+02, 3.229483337402344e+02, 3.230034790039062e+02, 3.230434875488281e+02, 3.230725708007812e+02, 3.230936889648438e+02, 3.231091003417969e+02, 3.231202697753906e+02, 3.231283874511719e+02, 3.231343078613281e+02, 3.231385803222656e+02, 3.231416931152344e+02, 3.231439819335938e+02, 3.231456298828125e+02, 3.231467895507812e+02, 3.231475219726562e+02, 3.231479797363281e+02, 3.231484069824219e+02, 3.231487121582031e+02, 3.231490173339844e+02, 3.231492919921875e+02, 3.231495056152344e+02, 3.231497192382812e+02, 3.231498107910156e+02, 3.231498718261719e+02, 3.2314990234375e+02, 3.2314990234375e+02, 3.231499328613281e+02, 3.231499633789062e+02, 3.231499633789062e+02, 3.231499633789062e+02, 3.231499633789062e+02, 3.231499633789062e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.218370971679688e+02, 3.215828857421875e+02, 3.215669555664062e+02, 3.215662536621094e+02, 3.215662536621094e+02, 3.215662841796875e+02, 3.215662536621094e+02, 3.215662536621094e+02, 3.215662841796875e+02, 3.215662536621094e+02]
+inlHeaWat.T=[3.151499938964844e+02, 3.151499938964844e+02]
+hrc.hrc.chi.PLR2=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.128765821456909e-01, 8.717986941337585e-01, 9.181938767433167e-01, 9.393351674079895e-01, 9.542293548583984e-01, 9.656819105148315e-01, 9.744504690170288e-01, 9.810910820960999e-01, 9.860609769821167e-01, 9.897570013999939e-01, 9.92489218711853e-01, 9.945021867752075e-01, 9.959803223609924e-01, 9.970633983612061e-01, 9.978560209274292e-01, 9.984356164932251e-01, 9.988587498664856e-01, 9.99167263507843e-01, 9.993922114372253e-01, 9.995564818382263e-01, 9.996766448020935e-01, 9.997643232345581e-01, 9.998281598091125e-01, 9.998746514320374e-01, 9.999086260795593e-01, 9.999334812164307e-01, 9.999516606330872e-01, 9.999649524688721e-01, 9.999743700027466e-01, 9.999805688858032e-01, 9.999845623970032e-01, 9.999879002571106e-01, 9.999902248382568e-01, 9.999926090240479e-01, 9.999948143959045e-01, 9.999966621398926e-01, 9.999982714653015e-01, 9.999991655349731e-01, 9.999996423721313e-01, 9.999998211860657e-01, 1.000000357627869e+00, 1.000000357627869e+00, 1.000000476837158e+00, 1.000000476837158e+00, 1.000000476837158e+00, 1.000000476837158e+00, 1.000000476837158e+00, 1.000000476837158e+00, 1.000000476837158e+00, 1.000000596046448e+00, 1.000000596046448e+00, 1.000000596046448e+00, 1.000000596046448e+00, 1.000000596046448e+00, 1.000000596046448e+00, 1.000000596046448e+00, 1.000000596046448e+00, 1.000000596046448e+00, 1.000000596046448e+00, 1.000000596046448e+00, 1.000000596046448e+00, 1.000000596046448e+00, 1.000000596046448e+00, 1.000000596046448e+00, 1.000000596046448e+00, 1.000000596046448e+00, 1.000000596046448e+00, 1.000000596046448e+00, 1.000000596046448e+00, 1.000000596046448e+00, 1.000000596046448e+00, 1.000000596046448e+00, 1.000000596046448e+00, 1.000000596046448e+00, 1.000000596046448e+00, 1.000000596046448e+00, 1.000000596046448e+00, 1.000000596046448e+00, 1.000000596046448e+00, 1.000000596046448e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+hrc.hrc.chi.COP=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.541592121124268e+00, 5.768168449401855e+00, 5.158600330352783e+00, 4.745250225067139e+00, 4.463953971862793e+00, 4.270288944244385e+00, 4.135333061218262e+00, 4.040326118469238e+00, 3.972885131835938e+00, 3.924721002578735e+00, 3.890159130096436e+00, 3.865275382995605e+00, 3.847312688827515e+00, 3.834322214126587e+00, 3.824911832809448e+00, 3.818089723587036e+00, 3.813143253326416e+00, 3.809556245803833e+00, 3.806952238082886e+00, 3.805057525634766e+00, 3.803677082061768e+00, 3.802673101425171e+00, 3.801944255828857e+00, 3.801414728164673e+00, 3.801029205322266e+00, 3.800748109817505e+00, 3.800543546676636e+00, 3.800395011901855e+00, 3.800289630889893e+00, 3.800222396850586e+00, 3.800179481506348e+00, 3.800141096115112e+00, 3.800114870071411e+00, 3.800087690353394e+00, 3.800061941146851e+00, 3.800041675567627e+00, 3.800024271011353e+00, 3.80001425743103e+00, 3.800009489059448e+00, 3.800007343292236e+00, 3.800005197525024e+00, 3.800003528594971e+00, 3.800002098083496e+00, 3.80000114440918e+00, 3.800000190734863e+00, 3.799999713897705e+00, 3.799999475479126e+00, 3.799998998641968e+00, 3.799998760223389e+00, 3.79999852180481e+00, 3.79999828338623e+00, 3.79999828338623e+00, 3.799998044967651e+00, 3.799998044967651e+00, 3.799997806549072e+00, 3.799997806549072e+00, 3.799997806549072e+00, 3.799997806549072e+00, 3.799997806549072e+00, 3.799997568130493e+00, 3.799997568130493e+00, 3.799997568130493e+00, 3.799997568130493e+00, 3.799997568130493e+00, 3.799997568130493e+00, 3.799997568130493e+00, 3.799997568130493e+00, 3.799997568130493e+00, 3.799997568130493e+00, 3.799997568130493e+00, 3.799997568130493e+00, 3.799997568130493e+00, 3.799997568130493e+00, 3.799997568130493e+00, 3.799997568130493e+00, 3.799997568130493e+00, 3.799997568130493e+00, 3.799997568130493e+00, 3.799997568130493e+00, 3.799997568130493e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_HeatPumps_Components_Validation_ValvesIsolation.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_HeatPumps_Components_Validation_ValvesIsolation.txt
index 5c2b917a703..e0679df60a0 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_HeatPumps_Components_Validation_ValvesIsolation.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_HeatPumps_Components_Validation_ValvesIsolation.txt
@@ -1,13 +1,13 @@
-last-generated=2024-04-02
+last-generated=2024-06-01
 statistics-initialization=
 {
-  "nonlinear": "4",
+  "nonlinear": "1, 1, 5",
   "numerical Jacobians": "0"
 }
 statistics-simulation=
 {
-  "linear": "0, 0",
-  "nonlinear": "4",
+  "linear": " ",
+  "nonlinear": "1, 1, 5",
   "number of continuous time states": "50",
   "numerical Jacobians": "0"
 }
@@ -16,24 +16,24 @@ valIsoCom.bus.valHeaWatHpInlIso[1].y1=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00,
 valIsoCom.bus.valHeaWatHpInlIso[2].y1=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
 valIsoCom.bus.valChiWatHpInlIso[1].y1=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
 valIsoCom.bus.valChiWatHpInlIso[2].y1=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
-valIsoCom.port_aHeaWat.m_flow=[2.805559051921591e-05, 2.805559051921591e-05, 2.805559051921591e-05, 2.805559051921591e-05, 2.805559051921591e-05, 2.805559051921591e-05, 2.805559051921591e-05, 2.805559051921591e-05, 2.805559051921591e-05, 2.805559051921591e-05, 2.805559051921591e-05, 2.805559051921591e-05, 2.805559051921591e-05, 2.805559051921591e-05, 2.805559051921591e-05, 2.805559051921591e-05, 2.805559051921591e-05, 2.805559051921591e-05, 2.805559051921591e-05, 2.805559051921591e-05, 2.805559051921591e-05, 2.907778930664062e+01, 2.983209228515625e+01, 2.987341117858887e+01, 2.98757266998291e+01, 2.987582969665527e+01, 2.987585258483887e+01, 2.98758487701416e+01, 2.987584495544434e+01, 2.987584495544434e+01, 2.98758487701416e+01, 2.987585067749023e+01, 2.987585067749023e+01, 2.987585258483887e+01, 2.98758544921875e+01, 2.987585258483887e+01, 2.987585067749023e+01, 2.987585067749023e+01, 2.98758487701416e+01, 2.98758487701416e+01, 2.98758487701416e+01, 2.98758487701416e+01, 2.98758487701416e+01, 2.98758487701416e+01, 2.98758487701416e+01, 2.987584686279297e+01, 2.987584686279297e+01, 2.98758487701416e+01, 2.98758487701416e+01, 2.98758487701416e+01, 2.98758487701416e+01, 2.98758487701416e+01, 2.98758487701416e+01, 2.98758487701416e+01, 2.98758487701416e+01, 2.98758487701416e+01, 2.98758487701416e+01, 2.98758487701416e+01, 2.98758487701416e+01, 2.98758487701416e+01, 2.98758487701416e+01, 9.360809326171875e+00, 6.460335105657578e-02, 1.754832337610424e-03, 5.526585664483719e-05, 3.214812386431731e-05, 3.117730011581443e-05, 3.112421472906135e-05, 3.112946797045879e-05, 3.113295679213479e-05, 3.113135244348086e-05, 3.113032289547846e-05, 3.112990088993683e-05, 3.113018465228379e-05, 3.113033380941488e-05, 3.113026832579635e-05, 3.113026832579635e-05, 3.113034108537249e-05, 3.113045022473671e-05, 3.113046113867313e-05, 3.113047569058836e-05, 3.113048660452478e-05, 3.113049388048239e-05, 3.113050115644e-05, 3.113050479441881e-05, 3.113050843239762e-05, 3.113050843239762e-05, 3.113050479441881e-05, 3.113050115644e-05, 3.113050115644e-05, 3.113051570835523e-05, 3.113053026027046e-05, 3.113054481218569e-05, 3.113055572612211e-05, 3.113056664005853e-05, 3.113057755399495e-05, 3.113058846793137e-05, 3.113059574388899e-05, 3.11306030198466e-05, 3.113061029580422e-05, 3.113061757176183e-05]
-hpCom[1].m_flow=[1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.453886985778809e+01, 1.49160213470459e+01, 1.493668079376221e+01, 1.493783855438232e+01, 1.493789005279541e+01, 1.493790245056152e+01, 1.493789958953857e+01, 1.493789768218994e+01, 1.493789863586426e+01, 1.493789958953857e+01, 1.493790054321289e+01, 1.493790054321289e+01, 1.493790149688721e+01, 1.493790245056152e+01, 1.493790149688721e+01, 1.493790054321289e+01, 1.493790054321289e+01, 1.493790054321289e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 4.68038272857666e+00, 3.228082880377769e-02, 2.363654518127441e+01, 2.388632774353027e+01, 2.38997688293457e+01, 2.390052223205566e+01, 2.390056800842285e+01, 2.390056419372559e+01, 2.390056037902832e+01, 2.390056228637695e+01, 2.390056419372559e+01, 2.390056419372559e+01, 2.390056419372559e+01, 2.390056419372559e+01, 2.390056419372559e+01, 2.390056419372559e+01, 2.390056419372559e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01]
-hpCom[2].m_flow=[1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.453886985778809e+01, 1.49160213470459e+01, 1.493668079376221e+01, 1.493783855438232e+01, 1.493789005279541e+01, 1.493790245056152e+01, 1.493789958953857e+01, 1.493789768218994e+01, 1.493789863586426e+01, 1.493789958953857e+01, 1.493790054321289e+01, 1.493790054321289e+01, 1.493790149688721e+01, 1.493790245056152e+01, 1.493790149688721e+01, 1.493790054321289e+01, 1.493790054321289e+01, 1.493790054321289e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 4.68038272857666e+00, 3.228082880377769e-02, 2.363654518127441e+01, 2.388632774353027e+01, 2.38997688293457e+01, 2.390052223205566e+01, 2.390056800842285e+01, 2.390056419372559e+01, 2.390056037902832e+01, 2.390056228637695e+01, 2.390056419372559e+01, 2.390056419372559e+01, 2.390056419372559e+01, 2.390056419372559e+01, 2.390056419372559e+01, 2.390056419372559e+01, 2.390056419372559e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01]
+valIsoCom.port_aHeaWat.m_flow=[1.972654368728399e-03, 1.972654368728399e-03, 1.972654368728399e-03, 1.972654368728399e-03, 1.972654368728399e-03, 1.972654368728399e-03, 1.972654368728399e-03, 1.972654368728399e-03, 1.972654368728399e-03, 1.972654368728399e-03, 1.972654368728399e-03, 1.972654368728399e-03, 1.972654368728399e-03, 1.972654368728399e-03, 1.972654368728399e-03, 1.972654368728399e-03, 1.972654368728399e-03, 1.972654368728399e-03, 1.972654368728399e-03, 1.972654368728399e-03, 1.972654368728399e-03, 2.948306274414062e+01, 2.98630428314209e+01, 2.988371849060059e+01, 2.98848762512207e+01, 2.988493537902832e+01, 2.988493919372559e+01, 2.988493728637695e+01, 2.988493537902832e+01, 2.988493537902832e+01, 2.988493728637695e+01, 2.988493728637695e+01, 2.988493728637695e+01, 2.988493728637695e+01, 2.988493728637695e+01, 2.988493728637695e+01, 2.988493728637695e+01, 2.988493728637695e+01, 2.988493728637695e+01, 2.988493728637695e+01, 2.988493728637695e+01, 2.988493728637695e+01, 2.988493728637695e+01, 2.988493728637695e+01, 2.988493728637695e+01, 2.988493728637695e+01, 2.988493728637695e+01, 2.988493728637695e+01, 2.988493728637695e+01, 2.988493728637695e+01, 2.988493728637695e+01, 2.988493728637695e+01, 2.988493728637695e+01, 2.988493728637695e+01, 2.988493728637695e+01, 2.988493728637695e+01, 2.988493728637695e+01, 2.988493728637695e+01, 2.988493728637695e+01, 2.988493728637695e+01, 2.988493728637695e+01, 1.672870063781738e+01, 1.39287269115448e+00, 1.22314564883709e-01, 3.886374412104487e-03, 2.260418375954032e-03, 2.191622741520405e-03, 2.189053921028972e-03, 2.18815915286541e-03, 2.188866725191474e-03, 2.188909333199263e-03, 2.188843442127109e-03, 2.188807353377342e-03, 2.188819227740169e-03, 2.188846468925476e-03, 2.188857644796371e-03, 2.188863698393106e-03, 2.188860205933452e-03, 2.188861602917314e-03, 2.188864862546325e-03, 2.188865561038256e-03, 2.188863465562463e-03, 2.18885880894959e-03, 2.188856014981866e-03, 2.188855549320579e-03, 2.188855316489935e-03, 2.188854850828648e-03, 2.18885438516736e-03, 2.188853919506073e-03, 2.188853919506073e-03, 2.188853686675429e-03, 2.188853686675429e-03, 2.188853686675429e-03, 2.188853686675429e-03, 2.188853686675429e-03, 2.188853686675429e-03, 2.188853686675429e-03, 2.188853919506073e-03, 2.188853686675429e-03, 2.188853453844786e-03, 2.188853221014142e-03]
+hpCom[1].m_flow=[8.301687776111066e-04, 8.301687776111066e-04, 8.301687776111066e-04, 8.301687776111066e-04, 8.301687776111066e-04, 8.301687776111066e-04, 8.301687776111066e-04, 8.301687776111066e-04, 8.301687776111066e-04, 8.301687776111066e-04, 8.301687776111066e-04, 8.301687776111066e-04, 8.301687776111066e-04, 8.301687776111066e-04, 8.301687776111066e-04, 8.301687776111066e-04, 8.301687776111066e-04, 8.301687776111066e-04, 8.301687776111066e-04, 8.301687776111066e-04, 8.301687776111066e-04, 1.473982048034668e+01, 1.49298038482666e+01, 1.494014167785645e+01, 1.494072151184082e+01, 1.494075012207031e+01, 1.494075202941895e+01, 1.494075107574463e+01, 1.494075012207031e+01, 1.494075012207031e+01, 1.494075107574463e+01, 1.494075107574463e+01, 1.494075107574463e+01, 1.494075107574463e+01, 1.494075107574463e+01, 1.494075107574463e+01, 1.494075107574463e+01, 1.494075107574463e+01, 1.494075107574463e+01, 1.494075107574463e+01, 1.494075107574463e+01, 1.494075107574463e+01, 1.494075107574463e+01, 1.494075107574463e+01, 1.494075107574463e+01, 1.494075107574463e+01, 1.494075107574463e+01, 1.494075107574463e+01, 1.494075107574463e+01, 1.494075107574463e+01, 1.494075107574463e+01, 1.494075107574463e+01, 1.494075107574463e+01, 1.494075107574463e+01, 1.494075107574463e+01, 1.494075107574463e+01, 1.494075107574463e+01, 1.494075107574463e+01, 1.494075107574463e+01, 1.494075107574463e+01, 1.494075107574463e+01, 8.36280632019043e+00, 6.949720978736877e-01, 2.372771644592285e+01, 2.389215469360352e+01, 2.389941787719727e+01, 2.389982032775879e+01, 2.389983749389648e+01, 2.389984321594238e+01, 2.389983940124512e+01, 2.389983749389648e+01, 2.389983940124512e+01, 2.389983940124512e+01, 2.389983940124512e+01, 2.389983940124512e+01, 2.389983940124512e+01, 2.389983940124512e+01, 2.389983940124512e+01, 2.389983940124512e+01, 2.389983940124512e+01, 2.389983940124512e+01, 2.389983940124512e+01, 2.389983940124512e+01, 2.389983940124512e+01, 2.389983940124512e+01, 2.389983940124512e+01, 2.389983940124512e+01, 2.389983940124512e+01, 2.389983940124512e+01, 2.389983940124512e+01, 2.389983940124512e+01, 2.389983940124512e+01, 2.389983940124512e+01, 2.389983940124512e+01, 2.389983940124512e+01, 2.389983940124512e+01, 2.389983940124512e+01, 2.389983940124512e+01, 2.389983940124512e+01, 2.389983940124512e+01, 2.389983940124512e+01]
+hpCom[2].m_flow=[8.301687776111066e-04, 8.301687776111066e-04, 8.301687776111066e-04, 8.301687776111066e-04, 8.301687776111066e-04, 8.301687776111066e-04, 8.301687776111066e-04, 8.301687776111066e-04, 8.301687776111066e-04, 8.301687776111066e-04, 8.301687776111066e-04, 8.301687776111066e-04, 8.301687776111066e-04, 8.301687776111066e-04, 8.301687776111066e-04, 8.301687776111066e-04, 8.301687776111066e-04, 8.301687776111066e-04, 8.301687776111066e-04, 8.301687776111066e-04, 8.301687776111066e-04, 1.473982048034668e+01, 1.49298038482666e+01, 1.494014167785645e+01, 1.494072151184082e+01, 1.494075012207031e+01, 1.494075202941895e+01, 1.494075107574463e+01, 1.494075012207031e+01, 1.494075012207031e+01, 1.494075107574463e+01, 1.494075107574463e+01, 1.494075107574463e+01, 1.494075107574463e+01, 1.494075107574463e+01, 1.494075107574463e+01, 1.494075107574463e+01, 1.494075107574463e+01, 1.494075107574463e+01, 1.494075107574463e+01, 1.494075107574463e+01, 1.494075107574463e+01, 1.494075107574463e+01, 1.494075107574463e+01, 1.494075107574463e+01, 1.494075107574463e+01, 1.494075107574463e+01, 1.494075107574463e+01, 1.494075107574463e+01, 1.494075107574463e+01, 1.494075107574463e+01, 1.494075107574463e+01, 1.494075107574463e+01, 1.494075107574463e+01, 1.494075107574463e+01, 1.494075107574463e+01, 1.494075107574463e+01, 1.494075107574463e+01, 1.494075107574463e+01, 1.494075107574463e+01, 1.494075107574463e+01, 8.36280632019043e+00, 6.949720978736877e-01, 2.372771644592285e+01, 2.389215469360352e+01, 2.389941787719727e+01, 2.389982032775879e+01, 2.389983749389648e+01, 2.389984321594238e+01, 2.389983940124512e+01, 2.389983749389648e+01, 2.389983940124512e+01, 2.389983940124512e+01, 2.389983940124512e+01, 2.389983940124512e+01, 2.389983940124512e+01, 2.389983940124512e+01, 2.389983940124512e+01, 2.389983940124512e+01, 2.389983940124512e+01, 2.389983940124512e+01, 2.389983940124512e+01, 2.389983940124512e+01, 2.389983940124512e+01, 2.389983940124512e+01, 2.389983940124512e+01, 2.389983940124512e+01, 2.389983940124512e+01, 2.389983940124512e+01, 2.389983940124512e+01, 2.389983940124512e+01, 2.389983940124512e+01, 2.389983940124512e+01, 2.389983940124512e+01, 2.389983940124512e+01, 2.389983940124512e+01, 2.389983940124512e+01, 2.389983940124512e+01, 2.389983940124512e+01, 2.389983940124512e+01, 2.389983940124512e+01]
 datHp.mHeaWatHp_flow_nominal=[1.493785858154297e+01, 1.493785858154297e+01]
-valIsoCom.port_aChiWat.m_flow=[-4.44183797299047e-06, -4.44183797299047e-06, -4.44183797299047e-06, -4.44183797299047e-06, -4.44183797299047e-06, -4.44183797299047e-06, -4.44183797299047e-06, -4.44183797299047e-06, -4.44183797299047e-06, -4.44183797299047e-06, -4.44183797299047e-06, -4.44183797299047e-06, -4.44183797299047e-06, -4.44183797299047e-06, -4.44183797299047e-06, -4.44183797299047e-06, -4.44183797299047e-06, -4.44183797299047e-06, -4.44183797299047e-06, -4.44183797299047e-06, -4.44183797299047e-06, -4.866123708779924e-05, -4.884227018919773e-05, -4.885218368144706e-05, -4.885274029220454e-05, -4.885276575805619e-05, -4.885277303401381e-05, -4.8852769396035e-05, -4.8852769396035e-05, -4.8852769396035e-05, -4.8852769396035e-05, -4.8852769396035e-05, -4.8852769396035e-05, -4.885277303401381e-05, -4.885277303401381e-05, -4.885277303401381e-05, -4.8852769396035e-05, -4.8852769396035e-05, -4.8852769396035e-05, -4.8852769396035e-05, -4.8852769396035e-05, -4.8852769396035e-05, -4.8852769396035e-05, -4.8852769396035e-05, -4.8852769396035e-05, -4.8852769396035e-05, -4.8852769396035e-05, -4.8852769396035e-05, -4.8852769396035e-05, -4.8852769396035e-05, -4.8852769396035e-05, -4.8852769396035e-05, -4.8852769396035e-05, -4.8852769396035e-05, -4.8852769396035e-05, -4.8852769396035e-05, -4.8852769396035e-05, -4.8852769396035e-05, -4.8852769396035e-05, -4.8852769396035e-05, -4.8852769396035e-05, -4.392912887851708e-05, -4.169091698713601e-05, 4.727133560180664e+01, 4.777259826660156e+01, 4.779950714111328e+01, 4.78010139465332e+01, 4.780110549926758e+01, 4.780109786987305e+01, 4.780109024047852e+01, 4.780109405517578e+01, 4.780109405517578e+01, 4.780109786987305e+01, 4.780109405517578e+01, 4.780109405517578e+01, 4.780109405517578e+01, 4.780109405517578e+01, 4.780109405517578e+01, 4.780109405517578e+01, 4.780109405517578e+01, 4.780109405517578e+01, 4.780109405517578e+01, 4.780109405517578e+01, 4.780109405517578e+01, 4.780109405517578e+01, 4.780109405517578e+01, 4.780109405517578e+01, 4.780109405517578e+01, 4.780109405517578e+01, 4.780109405517578e+01, 4.780109405517578e+01, 4.780109405517578e+01, 4.780109405517578e+01, 4.780109405517578e+01, 4.780109405517578e+01, 4.780109405517578e+01, 4.780109405517578e+01, 4.780109405517578e+01, 4.780109405517578e+01, 4.780109405517578e+01, 4.780109405517578e+01]
+valIsoCom.port_aChiWat.m_flow=[-3.123167844023556e-04, -3.123167844023556e-04, -3.123167844023556e-04, -3.123167844023556e-04, -3.123167844023556e-04, -3.123167844023556e-04, -3.123167844023556e-04, -3.123167844023556e-04, -3.123167844023556e-04, -3.123167844023556e-04, -3.123167844023556e-04, -3.123167844023556e-04, -3.123167844023556e-04, -3.123167844023556e-04, -3.123167844023556e-04, -3.123167844023556e-04, -3.123167844023556e-04, -3.123167844023556e-04, -3.123167844023556e-04, -3.123167844023556e-04, -3.123167844023556e-04, -3.421455388888717e-03, -3.434191923588514e-03, -3.434889717027545e-03, -3.434928832575679e-03, -3.434930695220828e-03, -3.434930928051472e-03, -3.434930928051472e-03, -3.434930695220828e-03, -3.434930695220828e-03, -3.434930695220828e-03, -3.434930928051472e-03, -3.434930928051472e-03, -3.434930928051472e-03, -3.434930928051472e-03, -3.434930928051472e-03, -3.434930928051472e-03, -3.434930928051472e-03, -3.434930928051472e-03, -3.434930928051472e-03, -3.434930928051472e-03, -3.434930928051472e-03, -3.434930928051472e-03, -3.434930928051472e-03, -3.434930928051472e-03, -3.434930928051472e-03, -3.434930928051472e-03, -3.434930928051472e-03, -3.434930928051472e-03, -3.434930928051472e-03, -3.434930928051472e-03, -3.434930928051472e-03, -3.434930928051472e-03, -3.434930928051472e-03, -3.434930928051472e-03, -3.434930928051472e-03, -3.434930928051472e-03, -3.434930928051472e-03, -3.434930928051472e-03, -3.434930928051472e-03, -3.434930928051472e-03, -3.088504308834672e-03, -2.928597619757056e-03, 4.73331184387207e+01, 4.778042221069336e+01, 4.779657745361328e+01, 4.779744720458984e+01, 4.77974853515625e+01, 4.77974967956543e+01, 4.779748916625977e+01, 4.779748916625977e+01, 4.779748916625977e+01, 4.779748916625977e+01, 4.779748916625977e+01, 4.779748916625977e+01, 4.779748916625977e+01, 4.779748916625977e+01, 4.779748916625977e+01, 4.779748916625977e+01, 4.779748916625977e+01, 4.779748916625977e+01, 4.779748916625977e+01, 4.779748916625977e+01, 4.779748916625977e+01, 4.779748916625977e+01, 4.779748916625977e+01, 4.779748916625977e+01, 4.779748916625977e+01, 4.779748916625977e+01, 4.779748916625977e+01, 4.779748916625977e+01, 4.779748916625977e+01, 4.779748916625977e+01, 4.779748916625977e+01, 4.779748916625977e+01, 4.779748916625977e+01, 4.779748916625977e+01, 4.779748916625977e+01, 4.779748916625977e+01, 4.779748916625977e+01, 4.779748916625977e+01]
 datHp.mChiWatHp_flow_nominal=[2.390057373046875e+01, 2.390057373046875e+01]
 valIsoHeaInl.bus.valHeaWatHpInlIso[1].y1=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
 valIsoHeaInl.bus.valHeaWatHpInlIso[2].y1=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-valIsoHeaInl.port_aHeaWat.m_flow=[9.261469131160993e-06, 9.261469131160993e-06, 9.261469131160993e-06, 9.261469131160993e-06, 9.261469131160993e-06, 9.261469131160993e-06, 9.261469131160993e-06, 9.261469131160993e-06, 9.261469131160993e-06, 9.261469131160993e-06, 9.261469131160993e-06, 9.261469131160993e-06, 9.261469131160993e-06, 9.261469131160993e-06, 9.261469131160993e-06, 9.261469131160993e-06, 9.261469131160993e-06, 9.261469131160993e-06, 9.261469131160993e-06, 9.261469131160993e-06, 9.261469131160993e-06, 2.945842361450195e+01, 2.985311698913574e+01, 2.987445831298828e+01, 2.987565422058105e+01, 2.987570762634277e+01, 2.987571907043457e+01, 2.987571716308594e+01, 2.98757152557373e+01, 2.98757152557373e+01, 2.987571716308594e+01, 2.987571907043457e+01, 2.987571716308594e+01, 2.987571907043457e+01, 2.987571907043457e+01, 2.987571907043457e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 1.401859378814697e+01, 1.247987225651741e-01, 5.199505831114948e-04, 1.643824361963198e-05, 9.564101674186531e-06, 9.275388038076926e-06, 9.259601938538253e-06, 9.261164450435899e-06, 9.262200364901219e-06, 9.26172378967749e-06, 9.261418199457694e-06, 9.261292689188849e-06, 9.261376362701412e-06, 9.261420927941799e-06, 9.26140091905836e-06, 9.261401828553062e-06, 9.261423656425904e-06, 9.261455488740467e-06, 9.261459126719274e-06, 9.261462764698081e-06, 9.261466402676888e-06, 9.261469131160993e-06, 9.261470950150397e-06, 9.261471859645098e-06, 9.2614727691398e-06, 9.2614727691398e-06, 9.2614727691398e-06, 9.261470950150397e-06, 9.261470950150397e-06, 9.261475497623906e-06, 9.261479135602713e-06, 9.261483683076221e-06, 9.261487321055029e-06, 9.261490049539134e-06, 9.261493687517941e-06, 9.261496416002046e-06, 9.261499144486152e-06, 9.261501872970257e-06, 9.261503691959661e-06, 9.261505510949064e-06]
-hpHea[1].m_flow=[4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 1.472921180725098e+01, 1.492655849456787e+01, 1.493722915649414e+01, 1.493782711029053e+01, 1.493785381317139e+01, 1.493785953521729e+01, 1.493785858154297e+01, 1.493785762786865e+01, 1.493785762786865e+01, 1.493785858154297e+01, 1.493785953521729e+01, 1.493785858154297e+01, 1.493785953521729e+01, 1.493785953521729e+01, 1.493785953521729e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 7.009296894073486e+00, 6.239936128258705e-02, 2.599752915557474e-04, 8.219121809815988e-06, 4.782050837093266e-06, 4.637694019038463e-06, 4.629800969269127e-06, 4.63058222521795e-06, 4.631100182450609e-06, 4.630861894838745e-06, 4.630709099728847e-06, 4.630646344594425e-06, 4.630688181350706e-06, 4.6307104639709e-06, 4.63070045952918e-06, 4.630700914276531e-06, 4.630711828212952e-06, 4.630727744370233e-06, 4.630729563359637e-06, 4.63073138234904e-06, 4.630733201338444e-06, 4.630734565580497e-06, 4.630735475075198e-06, 4.630735929822549e-06, 4.6307363845699e-06, 4.6307363845699e-06, 4.6307363845699e-06, 4.630735475075198e-06, 4.630735475075198e-06, 4.630737748811953e-06, 4.630739567801356e-06, 4.630741841538111e-06, 4.630743660527514e-06, 4.630745024769567e-06, 4.63074684375897e-06, 4.630748208001023e-06, 4.630749572243076e-06, 4.630750936485128e-06, 4.63075184597983e-06, 4.630752755474532e-06]
-hpHea[2].m_flow=[4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 1.472921180725098e+01, 1.492655849456787e+01, 1.493722915649414e+01, 1.493782711029053e+01, 1.493785381317139e+01, 1.493785953521729e+01, 1.493785858154297e+01, 1.493785762786865e+01, 1.493785762786865e+01, 1.493785858154297e+01, 1.493785953521729e+01, 1.493785858154297e+01, 1.493785953521729e+01, 1.493785953521729e+01, 1.493785953521729e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 7.009296894073486e+00, 6.239936128258705e-02, 2.599752915557474e-04, 8.219121809815988e-06, 4.782050837093266e-06, 4.637694019038463e-06, 4.629800969269127e-06, 4.63058222521795e-06, 4.631100182450609e-06, 4.630861894838745e-06, 4.630709099728847e-06, 4.630646344594425e-06, 4.630688181350706e-06, 4.6307104639709e-06, 4.63070045952918e-06, 4.630700914276531e-06, 4.630711828212952e-06, 4.630727744370233e-06, 4.630729563359637e-06, 4.63073138234904e-06, 4.630733201338444e-06, 4.630734565580497e-06, 4.630735475075198e-06, 4.630735929822549e-06, 4.6307363845699e-06, 4.6307363845699e-06, 4.6307363845699e-06, 4.630735475075198e-06, 4.630735475075198e-06, 4.630737748811953e-06, 4.630739567801356e-06, 4.630741841538111e-06, 4.630743660527514e-06, 4.630745024769567e-06, 4.63074684375897e-06, 4.630748208001023e-06, 4.630749572243076e-06, 4.630750936485128e-06, 4.63075184597983e-06, 4.630752755474532e-06]
+valIsoHeaInl.port_aHeaWat.m_flow=[6.511969259008765e-04, 6.511969259008765e-04, 6.511969259008765e-04, 6.511969259008765e-04, 6.511969259008765e-04, 6.511969259008765e-04, 6.511969259008765e-04, 6.511969259008765e-04, 6.511969259008765e-04, 6.511969259008765e-04, 6.511969259008765e-04, 6.511969259008765e-04, 6.511969259008765e-04, 6.511969259008765e-04, 6.511969259008765e-04, 6.511969259008765e-04, 6.511969259008765e-04, 6.511969259008765e-04, 6.511969259008765e-04, 6.511969259008765e-04, 6.511969259008765e-04, 2.966633605957031e+01, 2.986441421508789e+01, 2.987508773803711e+01, 2.987568473815918e+01, 2.98757152557373e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.98757152557373e+01, 2.98757152557373e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.04649829864502e+01, 1.930919766426086e+00, 3.653126209974289e-02, 1.155972946435213e-03, 6.724796839989722e-04, 6.520202732644975e-04, 6.512564141303301e-04, 6.509902887046337e-04, 6.512007676064968e-04, 6.51213398668915e-04, 6.511937826871872e-04, 6.511830724775791e-04, 6.511866231448948e-04, 6.511947140097618e-04, 6.511980318464339e-04, 6.511998362839222e-04, 6.511987885460258e-04, 6.511991959996521e-04, 6.512001855298877e-04, 6.512003601528704e-04, 6.511997780762613e-04, 6.511983228847384e-04, 6.511975661851466e-04, 6.511974497698247e-04, 6.511973333545029e-04, 6.511971587315202e-04, 6.511970423161983e-04, 6.511969259008765e-04, 6.511968676932156e-04, 6.511968676932156e-04, 6.511968094855547e-04, 6.511968094855547e-04, 6.511968094855547e-04, 6.511968094855547e-04, 6.511968676932156e-04, 6.511968676932156e-04, 6.511969259008765e-04, 6.511968094855547e-04, 6.511967512778938e-04, 6.511966930702329e-04]
+hpHea[1].m_flow=[3.255984629504383e-04, 3.255984629504383e-04, 3.255984629504383e-04, 3.255984629504383e-04, 3.255984629504383e-04, 3.255984629504383e-04, 3.255984629504383e-04, 3.255984629504383e-04, 3.255984629504383e-04, 3.255984629504383e-04, 3.255984629504383e-04, 3.255984629504383e-04, 3.255984629504383e-04, 3.255984629504383e-04, 3.255984629504383e-04, 3.255984629504383e-04, 3.255984629504383e-04, 3.255984629504383e-04, 3.255984629504383e-04, 3.255984629504383e-04, 3.255984629504383e-04, 1.483316802978516e+01, 1.493220710754395e+01, 1.493754386901855e+01, 1.493784236907959e+01, 1.493785762786865e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785762786865e+01, 1.493785762786865e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.02324914932251e+01, 9.654598832130432e-01, 1.826563104987144e-02, 5.779864732176065e-04, 3.362398419994861e-04, 3.260101366322488e-04, 3.25628207065165e-04, 3.254951443523169e-04, 3.256003838032484e-04, 3.256066993344575e-04, 3.255968913435936e-04, 3.255915362387896e-04, 3.255933115724474e-04, 3.255973570048809e-04, 3.255990159232169e-04, 3.255999181419611e-04, 3.255993942730129e-04, 3.255995979998261e-04, 3.256000927649438e-04, 3.256001800764352e-04, 3.255998890381306e-04, 3.255991614423692e-04, 3.255987830925733e-04, 3.255987248849124e-04, 3.255986666772515e-04, 3.255985793657601e-04, 3.255985211580992e-04, 3.255984629504383e-04, 3.255984338466078e-04, 3.255984338466078e-04, 3.255984047427773e-04, 3.255984047427773e-04, 3.255984047427773e-04, 3.255984047427773e-04, 3.255984338466078e-04, 3.255984338466078e-04, 3.255984629504383e-04, 3.255984047427773e-04, 3.255983756389469e-04, 3.255983465351164e-04]
+hpHea[2].m_flow=[3.255984629504383e-04, 3.255984629504383e-04, 3.255984629504383e-04, 3.255984629504383e-04, 3.255984629504383e-04, 3.255984629504383e-04, 3.255984629504383e-04, 3.255984629504383e-04, 3.255984629504383e-04, 3.255984629504383e-04, 3.255984629504383e-04, 3.255984629504383e-04, 3.255984629504383e-04, 3.255984629504383e-04, 3.255984629504383e-04, 3.255984629504383e-04, 3.255984629504383e-04, 3.255984629504383e-04, 3.255984629504383e-04, 3.255984629504383e-04, 3.255984629504383e-04, 1.483316802978516e+01, 1.493220710754395e+01, 1.493754386901855e+01, 1.493784236907959e+01, 1.493785762786865e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785762786865e+01, 1.493785762786865e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.02324914932251e+01, 9.654598832130432e-01, 1.826563104987144e-02, 5.779864732176065e-04, 3.362398419994861e-04, 3.260101366322488e-04, 3.25628207065165e-04, 3.254951443523169e-04, 3.256003838032484e-04, 3.256066993344575e-04, 3.255968913435936e-04, 3.255915362387896e-04, 3.255933115724474e-04, 3.255973570048809e-04, 3.255990159232169e-04, 3.255999181419611e-04, 3.255993942730129e-04, 3.255995979998261e-04, 3.256000927649438e-04, 3.256001800764352e-04, 3.255998890381306e-04, 3.255991614423692e-04, 3.255987830925733e-04, 3.255987248849124e-04, 3.255986666772515e-04, 3.255985793657601e-04, 3.255985211580992e-04, 3.255984629504383e-04, 3.255984338466078e-04, 3.255984338466078e-04, 3.255984047427773e-04, 3.255984047427773e-04, 3.255984047427773e-04, 3.255984047427773e-04, 3.255984338466078e-04, 3.255984338466078e-04, 3.255984629504383e-04, 3.255984047427773e-04, 3.255983756389469e-04, 3.255983465351164e-04]
 valIsoSep.bus.valHeaWatHpInlIso[1].y1=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
 valIsoSep.bus.valHeaWatHpInlIso[2].y1=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
 valIsoSep.bus.valChiWatHpInlIso[1].y1=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
 valIsoSep.bus.valChiWatHpInlIso[2].y1=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
 busPumHeaWatPri.y1[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
 busPumChiWatPri.y1[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
-valIsoSep.port_aHeaWat.m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.967548179626465e+01, 2.986505699157715e+01, 2.987512397766113e+01, 2.987568664550781e+01, 2.987571334838867e+01, 2.987571907043457e+01, 2.987571716308594e+01, 2.98757152557373e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571907043457e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 1.200422487107611e-11, 1.279291859688299e-16, -1.933296144942031e-28, 5.557737290687775e-35, -3.70515819379185e-35, 3.018669492911634e-35, 3.676946329372115e-35, -4.890056499422401e-36, 1.112487853618165e-34, -2.463836159323515e-35, 2.336882769434708e-35, -7.593693506311977e-35, -2.218157840001657e-35, 1.504632769052528e-36, -9.215875710446734e-36, 2.93403389965243e-35, 9.968192094972998e-35, 6.770847460736376e-36, 1.175494350822288e-35, 1.88079096131566e-37, -5.078135595552068e-36, 5.416677968589101e-35, 2.275757063191949e-35, 3.502973165450417e-36, -1.072050847949926e-35, -1.755013065777675e-35, 1.292103390423858e-34, 1.278937853694649e-35, 8.087401133657338e-36, 3.31959604672214e-35, -2.313372882418262e-35, 1.410593220986745e-35, -3.385423730368188e-36, -2.849398306393225e-35, 4.607937855223367e-36, 2.557875707389298e-35, 5.679988703173293e-35, 3.573502826499754e-36, -7.899322037525772e-36, -3.526483052466863e-36]
-hpSep[1].m_flow=[-0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, 1.483774089813232e+01, 1.493252849578857e+01, 1.493756198883057e+01, 1.493784332275391e+01, 1.493785667419434e+01, 1.493785953521729e+01, 1.493785858154297e+01, 1.493785762786865e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785953521729e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 6.002116772346744e-12, 6.424705861998956e-17, 2.381831741333008e+01, 2.3896240234375e+01, 2.390033149719238e+01, 2.390056037902832e+01, 2.390057563781738e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01]
-hpSep[2].m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.483774089813232e+01, 1.493252849578857e+01, 1.493756198883057e+01, 1.493784332275391e+01, 1.493785667419434e+01, 1.493785953521729e+01, 1.493785858154297e+01, 1.493785762786865e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785953521729e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 6.002108098729364e-12, 6.367609223909115e-17, 2.381831741333008e+01, 2.3896240234375e+01, 2.390033149719238e+01, 2.390056037902832e+01, 2.390057563781738e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01]
-valIsoSep.port_aChiWat.m_flow=[-0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, 6.817236483337054e-22, -6.041161334693668e-21, 4.763663482666016e+01, 4.779248046875e+01, 4.780066299438477e+01, 4.780112075805664e+01, 4.780115127563477e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01]
+valIsoSep.port_aHeaWat.m_flow=[-0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, 2.97399730682373e+01, 2.986847305297852e+01, 2.987531471252441e+01, 2.987569618225098e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.98757152557373e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 1.200975863896447e-11, 1.345526792138931e-16, -3.562098380339605e-15, 3.553467114607084e-15, -3.552636175285827e-15, 3.552530719683894e-15, 1.308402756675526e-19, -1.14645449291675e-19, -3.55275941857933e-15, -5.41116353572902e-20, 6.405331880676043e-20, 2.993768520597658e-19, 2.235233042140992e-19, 1.403587205243827e-19, -5.440549385483908e-19, -2.14494821698539e-19, 4.118180071906336e-20, -3.55289917901595e-15, 2.718085249058102e-19, 3.552945342311575e-15, -3.552638716384507e-15, 3.552841157259063e-15, -5.915396681270007e-20, 3.552731466492393e-15, 3.552935601432682e-15, -3.552565024518258e-15, 4.612312049698343e-19, -2.621485029172629e-19, -1.66922863339396e-19, -1.990509331471706e-19, 2.80318042059873e-19, -4.584216213958126e-20, 2.763110499256954e-19, 3.552402605950622e-15, 7.156197326902812e-20, -5.42086966011202e-20, -2.165840343566036e-19, 6.602402269594743e-23, -9.017210887244488e-20, -3.552617328802751e-15]
+hpSep[1].m_flow=[-0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, 1.486998653411865e+01, 1.493423652648926e+01, 1.493765735626221e+01, 1.493784809112549e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785762786865e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 6.004878885801368e-12, 6.604016781232281e-17, 2.38492546081543e+01, 2.389786720275879e+01, 2.390042304992676e+01, 2.390056610107422e+01, 2.390057373046875e+01, 2.390057563781738e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01]
+hpSep[2].m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.486998653411865e+01, 1.493423652648926e+01, 1.493765735626221e+01, 1.493784809112549e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785762786865e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 6.004880620524844e-12, 6.76561213872268e-17, 2.38492546081543e+01, 2.389786720275879e+01, 2.390042304992676e+01, 2.390056610107422e+01, 2.390057373046875e+01, 2.390057563781738e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01]
+valIsoSep.port_aChiWat.m_flow=[-0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, 5.140724847766992e-19, -8.563882565846985e-19, 4.769850921630859e+01, 4.779573440551758e+01, 4.780084609985352e+01, 4.780113220214844e+01, 4.78011474609375e+01, 4.780115127563477e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_HeatPumps_Validation_AirToWater.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_HeatPumps_Validation_AirToWater.txt
index a42204dfa66..76d1b2fa668 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_HeatPumps_Validation_AirToWater.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_HeatPumps_Validation_AirToWater.txt
@@ -1,19 +1,19 @@
-last-generated=2024-04-16
+last-generated=2024-06-29
 statistics-initialization=
 {
-  "nonlinear": "8, 4, 0, 4, 0",
+  "nonlinear": "4, 0, 3, 0, 7, 1, 1",
   "numerical Jacobians": "0"
 }
 statistics-simulation=
 {
   "linear": " ",
-  "nonlinear": "3, 7, 3, 1",
-  "number of continuous time states": "128",
+  "nonlinear": "3, 3, 7, 1, 1, 1, 1",
+  "number of continuous time states": "154",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 8.64e+04]
-pla.ctl.ctl.chaStaHea.capReq.y=[1.258794284086928e-12, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.738218875e+06, 1.395044875e+06, 2.15925075e+06, 1.408088874999999e+06, 1.612508625e+06, 1.50008725e+06, 1.428799e+06, 1.356448125e+06, 1.298150875e+06, 1.240637625e+06, 1.183244375e+06, 1.12594e+06, 1.068727375e+06, 1.0116113125e+06, 7.79978e+05, 6.89645375e+05, 4.6370609375e+05, 6.9958075e+05, 6.459871875e+05, 5.837309375e+05, 5.1896609375e+05, 4.43549375e+05, 2.43736203125e+05, 2.58046125e+05, 2.24217265625e+05, 1.94751125e+05, 1.7271053125e+05, 1.592018125e+05, 1.48163953125e+05, 1.379563125e+05, 1.280980312499999e+05, 1.190339374999999e+05, 1.112885156250001e+05, 1.02715125e+05, 9.3874875e+04, 8.50191875e+04, 7.6273234375e+04, 6.77122109375e+04, 5.940123046875e+04, 5.139734765625e+04, 4.3764953125e+04, 3.6575015625e+04, 2.999979296875e+04, 1.272487640380859e+00, 1.908457159996033e+00, 1.908457159996033e+00, 1.908457398414612e+00, 1.908457636833191e+00, 1.90845775604248e+00, 1.90845799446106e+00, 1.908458232879639e+00, 1.908458352088928e+00, 1.908458590507507e+00, 1.908458709716797e+00, 1.272305846214294e+00, 1.272305965423584e+00, 1.272305965423584e+00, 1.272306084632874e+00, 1.272306084632874e+00, 1.733322125e+06, 1.204532125e+06, 1.9518303125e+05, 1.01963375e+05, 7.68962109375e+04, 6.287693359375e+04, 5.489734375e+04, 5.10361640625e+04, 1.10550515625e+05, 8.767996875e+04, 7.177359375e+04, 6.67166484375e+04, 5.895090234375e+04, 5.121494921875e+04, 4.3714796875e+04, 3.65952578125e+04, 2.99598203125e+04]
-pla.ctl.ctl.chaStaCoo.capReq.y=[5.237759076755527e-30, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 0e+00, -0e+00, 2.072162628173828e-01, 2.072162628173828e-01, 4.144325256347656e-01, 6.216487884521484e-01, 6.216487884521484e-01, 6.216487884521484e-01, 6.216487884521484e-01, 6.216487884521484e-01, 6.216487884521484e-01, 6.216487884521484e-01, 6.216487884521484e-01, 6.216487884521484e-01, 6.216487884521484e-01, 6.216487884521484e-01, 6.216487884521484e-01, 4.14452463388443e-01, 1.446537625e+06, 7.168596875e+05, 2.37702328125e+05, 1.98810953125e+05, 1.9200734375e+05, 1.94089609375e+05, 2.00341609375e+05, 2.09135390625e+05, 2.1978353125e+05, 2.64065375e+05, 2.8702775e+05, 3.4537896875e+05, 4.1388971875e+05, 4.8443115625e+05, 6.120607499999986e+05, 6.204654375000007e+05, 6.924219374999998e+05, 7.6123575e+05, 8.279531875e+05, 8.988128125e+05, 9.655715625e+05, 1.0252150625e+06, 1.025217875e+06, 1.025217875e+06, 1.18901775e+06, 1.39353725e+06, 1.25993575e+06, 1.314249249999997e+06, 1.598960000000008e+06, 1.347974125000001e+06, 1.2842485e+06, 1.229854e+06, 1.17602275e+06, 1.122290875e+06, 1.068635875e+06, 1.01506125e+06, 9.287459375e+05, 8.53517875e+05, 8.64177625e+05, 7.164225625e+05, 6.672418125e+05, 6.06695e+05, 5.502411875e+05, 5.619501875e+05, 5.013804375e+05, 4.397754375e+05, 3.928755625e+05, 3.5279725e+05, 3.0261884375e+05, 2.5904590625e+05, 2.16440296875e+05, 1.7615953125e+05, 1.48169796875e+05, 1.27951359375e+05, 1.13483890625e+05, 9.97628046875e+04, 8.66303203125e+04, 7.4123625e+04, 6.232186328125e+04, 5.13290078125e+04]
+pla.ctl.ctl.chaStaHea.capReq.QReq_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.77874575e+06, 2.8002865e+06, 1.729352625e+06, 9.234851250000013e+05, 1.776029125e+06, 1.771642625e+06, 1.456927e+06, 1.361327125e+06, 1.306427875e+06, 1.249134375e+06, 1.19165025e+06, 1.134223375e+06, 1.077219375e+06, 1.0200716875e+06, 7.98397375e+05, 7.39671375e+05, 6.243294375e+05, 5.96013e+05, 2.239161865234375e+03, 5.471636875e+05, 2.2014653125e+05, 2.4964921875e+05, 1.1978178125e+05, 5.12244921875e+04, 1.7095326171875e+04, -2.3009646484375e+04, -9.270365625e+04, -2.48891578125e+05, -4.603666875e+05, -8.021954375e+05, -1.239319624999999e+06, -7.716956249999979e+05, -5.387507500000017e+05, -3.3966446875e+05, -1.6460521875e+05, -4.7279484375e+04, 2.664774609375e+04, 5.27949609375e+04, 5.531725390625e+04, 5.06738984375e+04, 4.405871875e+04, 3.714887890625e+04, 3.05656015625e+04, 9.675971249999993e+05, 2.234684705734233e+00, 2.467920303344727e+00, 2.467920780181885e+00, 2.467921018600464e+00, 2.467921495437622e+00, 2.46792197227478e+00, 2.467922449111938e+00, 2.467922925949097e+00, 2.467923164367676e+00, 2.467923879623413e+00, 1.645282745361328e+00, 1.645282864570618e+00, 1.645282983779907e+00, 1.645282983779907e+00, 1.645282983779907e+00, 3.4976259375e+05, 1.510461e+06, 1.52302265625e+05, 1.356069375e+05, 2.2977822265625e+04, -2.0445919921875e+04, -5.462671875e+04, -8.61050546875e+04, -1.129603671875e+05, -1.43325765625e+05, -1.459595e+05, -5.76924296875e+04, 3.838215087890625e+03, 3.44253828125e+04, 3.903930078125e+04, 3.561943359375e+04, 3.006092578125e+04]
+pla.ctl.ctl.chaStaCoo.capReq.QReq_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.852295637130737e-01, 1.570459127426147e+00, 2.355688810348511e+00, 2.355688810348511e+00, 2.355688810348511e+00, 2.355688810348511e+00, 2.355688810348511e+00, 2.355688810348511e+00, 2.355688810348511e+00, 2.355688810348511e+00, 2.355688810348511e+00, 2.355688810348511e+00, 2.355688810348511e+00, 2.355688810348511e+00, 2.355688810348511e+00, 2.255315065383911e+00, 4.81403375e+05, 1.1137565e+06, 5.092653125e+04, 1.00017859375e+05, -2.4314984375e+04, -7.918303125e+04, -1.0199303125e+05, -1.086221015625e+05, -1.075868359375e+05, -1.0336334375e+05, -7.08783515625e+04, -1.9850236328125e+04, -4.023021728515625e+03, -5.42269775390625e+02, 2.116417773437659e+04, 4.261441562500012e+05, 8.823062499999921e+05, 7.421918125e+05, 8.013676875e+05, 8.72236375e+05, 9.422829375e+05, 9.96962875e+05, 9.99975375e+05, 1.0000001875e+06, 1.032000375e+06, 1.35128825e+06, 1.404835875e+06, 1.464819375000001e+06, 1.715158124999989e+06, 1.391456375000002e+06, 1.30140975e+06, 1.245308125e+06, 1.191324375e+06, 1.137686375e+06, 1.08392425e+06, 1.0304260625e+06, 9.174298125e+05, 8.1354325e+05, 8.459324375e+05, 6.88420375e+05, 6.64907875e+05, 6.16774625e+05, 5.671120625e+05, 5.175619375e+05, 4.6797109375e+05, 6.272565234375e+04, 3.4153375e+05, 3.6579228125e+05, 3.263281875e+05, 2.8235175e+05, 2.38769734375e+05, 1.96652703125e+05, 1.62237078125e+05, 1.38411875e+05, 1.2105315625e+05, 1.068088984375e+05, 9.3399921875e+04, 8.0592328125e+04, 6.84324921875e+04, 5.702614453125e+04]
 pla.capHea_nominal=[1.5e+06, 1.5e+06]
 pla.capCoo_nominal=[1.5e+06, 1.5e+06]
 pla.ctl.ctl.TOut=[2.803500061035156e+02, 2.803500061035156e+02, 2.803500061035156e+02, 2.803500061035156e+02, 2.803500061035156e+02, 2.803500061035156e+02, 2.803500061035156e+02, 2.803500061035156e+02, 2.803500061035156e+02, 2.803271179199219e+02, 2.802250061035156e+02, 2.800760803222656e+02, 2.799192504882812e+02, 2.7978515625e+02, 2.796492004394531e+02, 2.795054016113281e+02, 2.793543701171875e+02, 2.79180419921875e+02, 2.78813232421875e+02, 2.783184814453125e+02, 2.778377685546875e+02, 2.775109558105469e+02, 2.773639221191406e+02, 2.773429870605469e+02, 2.774158020019531e+02, 2.775499877929688e+02, 2.778485717773438e+02, 2.783305358886719e+02, 2.788376770019531e+02, 2.792117004394531e+02, 2.792019348144531e+02, 2.7877197265625e+02, 2.782787170410156e+02, 2.780851745605469e+02, 2.784633483886719e+02, 2.791992797851562e+02, 2.800370483398438e+02, 2.807322387695312e+02, 2.811102294921875e+02, 2.814264221191406e+02, 2.817133483886719e+02, 2.819428405761719e+02, 2.820916748046875e+02, 2.822079772949219e+02, 2.8231982421875e+02, 2.824382629394531e+02, 2.825740051269531e+02, 2.827179870605469e+02, 2.828619995117188e+02, 2.830060119628906e+02, 2.831499938964844e+02, 2.832940063476562e+02, 2.8343798828125e+02, 2.835820007324219e+02, 2.837260131835938e+02, 2.838602600097656e+02, 2.839751892089844e+02, 2.840852355957031e+02, 2.842052307128906e+02, 2.844744567871094e+02, 2.851714477539062e+02, 2.860440063476562e+02, 2.868031921386719e+02, 2.872106018066406e+02, 2.873927917480469e+02, 2.87399169921875e+02, 2.872411193847656e+02, 2.869067993164062e+02, 2.861957397460938e+02, 2.853059692382812e+02, 2.845506896972656e+02, 2.842350158691406e+02, 2.842123718261719e+02, 2.842542419433594e+02, 2.842902526855469e+02, 2.8425e+02, 2.841355285644531e+02, 2.840062255859375e+02, 2.838777770996094e+02, 2.837659301757812e+02, 2.837106323242188e+02, 2.837308044433594e+02, 2.837696838378906e+02, 2.8376904296875e+02, 2.836132202148438e+02, 2.831749877929688e+02, 2.826317749023438e+02, 2.821800842285156e+02, 2.820187072753906e+02, 2.821926574707031e+02, 2.824796752929688e+02, 2.826370239257812e+02, 2.824471740722656e+02, 2.820820007324219e+02, 2.816693420410156e+02, 2.81257568359375e+02, 2.80894287109375e+02, 2.805807189941406e+02, 2.803024597167969e+02, 2.800590515136719e+02, 2.798500061035156e+02]
@@ -23,45 +23,52 @@ pla.ctl.ctl.nReqPlaHeaWat=[1e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+0
 pla.ctl.ctl.nReqPlaChiWat=[1e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01]
 pla.ctl.ctl.enaHea.y1=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
 pla.ctl.ctl.enaCoo.y1=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
-pla.ctl.ctl.idxStaHea.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 2e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
-pla.ctl.ctl.idxStaCoo.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+pla.ctl.ctl.idxStaHea.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 2e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 2e+00, 2e+00, 2e+00, 2e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+pla.ctl.ctl.idxStaCoo.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
 pla.ctl.ctl.y1Hp[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
-pla.ctl.ctl.y1Hp[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
-pla.ctl.ctl.y1Hp[3]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+pla.ctl.ctl.y1Hp[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+pla.ctl.ctl.y1Hp[3]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
 pla.ctl.ctl.y1HeaHp[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
-pla.ctl.ctl.y1HeaHp[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-pla.ctl.ctl.y1HeaHp[3]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+pla.ctl.ctl.y1HeaHp[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+pla.ctl.ctl.y1HeaHp[3]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
 pla.ctl.ctl.y1PumHeaWatPri[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
-pla.ctl.ctl.y1PumHeaWatPri[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
-pla.ctl.ctl.y1PumHeaWatPri[3]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+pla.ctl.ctl.y1PumHeaWatPri[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+pla.ctl.ctl.y1PumHeaWatPri[3]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
 pla.ctl.ctl.y1PumHeaWatSec[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
 pla.ctl.ctl.y1PumHeaWatSec[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
 pla.ctl.ctl.y1PumHeaWatSec[3]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
 pla.ctl.ctl.y1PumChiWatSec[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-pla.ctl.ctl.y1PumChiWatSec[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+pla.ctl.ctl.y1PumChiWatSec[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
 pla.ctl.ctl.y1PumChiWatSec[3]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
 pla.ctl.ctl.nReqResHeaWat=[1e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
 pla.ctl.ctl.nReqResChiWat=[1e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-dpHeaWatRem.y[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.019035546875e+04, 4.994772265625e+04, 4.992938671875e+04, 4.994034765625e+04, 4.99384609375e+04, 4.741953125e+04, 5.002693359375e+04, 5.001981640625e+04, 5.001912109375e+04, 5.00187578125e+04, 5.00183828125e+04, 5.001797265625e+04, 5.00175234375e+04, 5.001674609375e+04, 5.00159453125e+04, 5.00162421875e+04, 5.001988671875e+04, 5.001903515625e+04, 5.001809765625e+04, 5.001652734375e+04, 5.001485546875e+04, 5.0013453125e+04, 5.001208203125e+04, 5.00107109375e+04, 4.63125859375e+04, 4.50501640625e+04, 4.317498828125e+04, 4.130719921875e+04, 3.94449609375e+04, 3.7581859375e+04, 3.57201328125e+04, 3.4473046875e+04, 3.447319921875e+04, 3.447304296875e+04, 3.4473265625e+04, 3.44724765625e+04, 3.44722265625e+04, 3.447237890625e+04, 3.44720078125e+04, 3.447170703125e+04, 3.447162109375e+04, 3.44715625e+04, 3.44713359375e+04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.9609611328125e+04, 5.007026953125e+04, 5.0009453125e+04, 5.0002953125e+04, 5.000112109375e+04, 5.000033203125e+04, 4.999990234375e+04, 4.9999640625e+04, 4.99999140625e+04, 5.000084375e+04, 4.93841171875e+04, 4.751583203125e+04, 4.565595703125e+04, 4.379490234375e+04, 4.193424609375e+04, 4.008123046875e+04, 3.88200078125e+04]
-pla.bus.dpHeaWatRemSet[1]=[5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 4.627280078125e+04, 4.50303984375e+04, 4.316680078125e+04, 4.130319921875e+04, 3.94396015625e+04, 3.7576e+04, 3.57123984375e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 4.937880078125e+04, 4.751519921875e+04, 4.56516015625e+04, 4.3788e+04, 4.19243984375e+04, 4.006080078125e+04, 3.88183984375e+04]
-dpChiWatRem.y[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.627237890625e+04, 5.0071609375e+04, 5.000966015625e+04, 5.000171875e+04, 4.999914453125e+04, 4.999786328125e+04, 4.99970546875e+04, 4.99964765625e+04, 4.999601953125e+04, 4.9995625e+04, 4.935926171875e+04, 4.74794296875e+04, 4.5607703125e+04, 4.377408984375e+04, 4.25219453125e+04, 4.004271875e+04, 3.818495312500009e+04, 3.631321875e+04, 3.50575e+04, 3.4439328125e+04, 3.444573046875e+04, 3.75601171875e+04, 4.22172890625e+04, 4.686586328125e+04, 4.998576953125e+04, 4.99758515625e+04, 4.731867578125e+04, 4.863191015625004e+04, 5.00207265625e+04, 5.00182265625e+04, 5.001783984375e+04, 5.001752734375e+04, 5.001719140625e+04, 5.00168359375e+04, 5.001643359375e+04, 5.001575390625e+04, 5.00150390625e+04, 4.999158984375e+04, 5.00188515625e+04, 5.001811328125e+04, 5.0017328125e+04, 5.00163515625e+04, 5.001465625e+04, 5.00133515625e+04, 5.0012140625e+04, 4.876862890625e+04, 4.690468359375e+04, 4.691704296875e+04, 4.3191e+04, 4.13296171875e+04, 3.947559765625e+04, 3.8204234375e+04, 3.63379609375e+04, 3.44735859375e+04, 3.447212890625e+04, 3.447191015625e+04, 3.44717578125e+04, 3.447165234375e+04, 3.447158203125e+04, 3.447153515625e+04]
-pla.bus.dpChiWatRemSet[1]=[5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 4.937880078125e+04, 4.751519921875e+04, 4.56516015625e+04, 4.3788e+04, 4.25456015625e+04, 4.006080078125e+04, 3.819719921875009e+04, 3.63336015625e+04, 3.509119921875e+04, 3.447e+04, 3.447e+04, 3.7576e+04, 4.2235e+04, 4.6894e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 4.87576015625e+04, 4.6894e+04, 4.6894e+04, 4.316680078125e+04, 4.130319921875e+04, 3.94396015625e+04, 3.819719921875e+04, 3.63336015625e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04]
-pla.bus.VHeaWatPri_flow=[1.007309773032176e-20, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.494755875319242e-02, 1.494755875319242e-02, 2.98951156437397e-02, 4.48426716029644e-02, 4.48426716029644e-02, 4.48426716029644e-02, 4.48426716029644e-02, 4.48426716029644e-02, 4.48426716029644e-02, 4.48426716029644e-02, 4.48426716029644e-02, 4.48426716029644e-02, 4.48426716029644e-02, 4.48426716029644e-02, 4.48426716029644e-02, 2.98964586108923e-02, 2.989512495696545e-02, 2.989512495696545e-02, 2.989512495696545e-02, 2.989512495696545e-02, 2.989512495696545e-02, 2.989512495696545e-02, 2.989512495696545e-02, 1.494756620377302e-02, 1.494756620377302e-02, 1.494756620377302e-02, 1.494756620377302e-02, 1.494756620377302e-02, 1.494756620377302e-02, 1.494756620377302e-02, 1.494757458567619e-02, 1.494757458567619e-02, 1.494757458567619e-02, 1.494757458567619e-02, 1.494757458567619e-02, 1.494757458567619e-02, 1.494757458567619e-02, 1.494757458567619e-02, 1.494757458567619e-02, 1.494757458567619e-02, 1.494757458567619e-02, 1.494757458567619e-02, 1.494757458567619e-02, 1.21231167327096e-08, 1.818206030179681e-08, 1.818206030179681e-08, 1.818206030179681e-08, 1.818206030179681e-08, 1.818206030179681e-08, 1.818206030179681e-08, 1.818206030179681e-08, 1.818206030179681e-08, 1.818206030179681e-08, 1.818206030179681e-08, 1.212137323847173e-08, 1.212137323847173e-08, 1.212137323847173e-08, 1.212137323847173e-08, 1.212137323847173e-08, 1.488344930112362e-02, 1.494757458567619e-02, 1.494757458567619e-02, 1.494757458567619e-02, 1.494756620377302e-02, 1.494756620377302e-02, 1.494756620377302e-02, 1.494756620377302e-02, 1.494756620377302e-02, 1.494756620377302e-02, 1.494756620377302e-02, 1.494756620377302e-02, 1.494756620377302e-02, 1.494756620377302e-02, 1.494756620377302e-02, 1.494756620377302e-02, 1.494756620377302e-02]
-pla.bus.VHeaWatSec_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.27068979293108e-02, 2.392168715596199e-02, 2.869600057601929e-02, 3.370730578899386e-02, 3.866399452090263e-02, 3.979230672121048e-02, 3.867768123745918e-02, 3.693468496203423e-02, 3.535657748579979e-02, 3.378832712769508e-02, 3.222274780273438e-02, 3.065956570208073e-02, 2.909888699650764e-02, 2.754084765911102e-02, 2.59858276695013e-02, 2.444655075669289e-02, 2.288700267672539e-02, 2.134236879646778e-02, 1.980366930365562e-02, 1.827108487486839e-02, 1.674598641693592e-02, 1.523003354668617e-02, 1.372553128749132e-02, 1.223562471568584e-02, 1.058720424771309e-02, 9.211184456944466e-03, 8.223206736147404e-03, 7.594768889248371e-03, 7.069556042551994e-03, 6.578564643859863e-03, 6.101504899561403e-03, 5.678171291947362e-03, 5.300253629684452e-03, 4.886162932962179e-03, 4.461185541003942e-03, 4.036272875964642e-03, 3.617116017267108e-03, 3.207257250323892e-03, 2.809646306559443e-03, 2.427103230729699e-03, 2.062753541395068e-03, 1.720024738460779e-03, 1.41066825017333e-03, -3.800257969453625e-21, -3.800257969453625e-21, -3.800257969453625e-21, -3.800257969453625e-21, -3.800257969453625e-21, -3.800257969453625e-21, -3.800257969453625e-21, -3.800257969453625e-21, -3.800257969453625e-21, -3.800257969453625e-21, -3.800257969453625e-21, -3.800257969453625e-21, -3.800257969453625e-21, -3.800257969453625e-21, -3.800257969453625e-21, -3.800257969453625e-21, 2.319440059363842e-02, 7.944194599986076e-03, 5.20489364862442e-03, 4.297798499464989e-03, 3.927465062588453e-03, 3.789354115724564e-03, 3.773604519665241e-03, 3.829773981124163e-03, 3.909375984221697e-03, 3.8022689986974e-03, 3.530575893819332e-03, 3.167125163599849e-03, 2.791740465909243e-03, 2.418982796370983e-03, 2.058098092675209e-03, 1.715816208161414e-03, 1.408181851729751e-03]
+pla.bus.dpHeaWatRem[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.410127734375e+04, 4.888466015625e+04, 4.847309765625e+04, 4.8223e+04, 4.799937890625e+04, 4.741290625e+04, 5.18578359375e+04, 5.063012890625e+04, 5.0589625e+04, 5.057491015625e+04, 5.054705078125e+04, 5.051994921875e+04, 5.049282421875e+04, 5.046580859375e+04, 5.043887109375e+04, 5.044538671875e+04, 5.038501171875e+04, 5.035833984375e+04, 5.033165234375e+04, 5.030489453125e+04, 5.027833984375e+04, 5.025184375e+04, 5.022544140625e+04, 4.858748828125e+04, 4.6781234375e+04, 4.5208125e+04, 4.328458203125e+04, 4.141716796875e+04, 3.956944140625e+04, 3.77327109375e+04, 3.590617578124999e+04, 3.45137265625e+04, 3.44902421875e+04, 3.449000390625e+04, 3.448879296875e+04, 3.448727734375e+04, 3.448573046875e+04, 3.448425390625e+04, 3.448287890625e+04, 3.448160546875e+04, 3.44804296875e+04, 3.447932421875e+04, 3.447751171875e+04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.1152326171875e+04, 5.106141796875e+04, 5.0079453125e+04, 5.00249921875e+04, 5.000950390625e+04, 5.000278125e+04, 4.999916015625e+04, 4.99969296875e+04, 4.999837109375e+04, 5.000659765625e+04, 4.94626328125e+04, 4.763594140625e+04, 4.580219140625e+04, 4.3982453125e+04, 4.217446484375e+04, 4.038006640625e+04, 3.8870203125e+04]
+pla.bus.dpHeaWatRemSet[1]=[5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 4.81363984375e+04, 4.627280078125e+04, 4.50303984375e+04, 4.316680078125e+04, 4.130319921875e+04, 3.94396015625e+04, 3.7576e+04, 3.57123984375e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 4.937880078125e+04, 4.751519921875e+04, 4.56516015625e+04, 4.3788e+04, 4.19243984375e+04, 4.006080078125e+04, 3.88183984375e+04]
+pla.bus.dpChiWatRem[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.75090234375e+04, 5.096047265625e+04, 5.00741796875e+04, 5.0013e+04, 4.99931015625e+04, 4.998331640625e+04, 4.9977453125e+04, 4.99735234375e+04, 4.9970625e+04, 4.9968265625e+04, 4.930906640625e+04, 4.73756953125e+04, 4.54623203125e+04, 4.358175390625e+04, 4.172502343749999e+04, 3.988437890624999e+04, 3.835914453125e+04, 3.64649375e+04, 3.455721875e+04, 3.384484375e+04, 3.38465390625e+04, 3.6430515625e+04, 4.11259140625e+04, 4.559148046875e+04, 4.936926171875e+04, 4.922812890625e+04, 4.731867578125e+04, 4.863259765625004e+04, 5.137516796875002e+04, 5.053485546875e+04, 5.055619921875e+04, 5.05338359375e+04, 5.050969921875e+04, 5.04858203125e+04, 5.046205078125e+04, 5.043830859375e+04, 5.041466015625e+04, 5.043539453125e+04, 5.036751953125e+04, 5.03438359375e+04, 5.032039453125e+04, 5.029690234375e+04, 5.027346484375e+04, 5.025013671875e+04, 5.0226859375e+04, 4.905479296875e+04, 4.830719140625e+04, 4.5343140625e+04, 4.34928046875e+04, 4.16696953125e+04, 3.986083984375e+04, 3.829705078125e+04, 3.64242734375e+04, 3.457087890625e+04, 3.4485234375e+04, 3.44835e+04, 3.4482109375e+04, 3.4480859375e+04, 3.447971484375e+04, 3.44786328125e+04]
+pla.bus.dpChiWatRemSet[1]=[5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 4.937880078125e+04, 4.751519921875e+04, 4.56516015625e+04, 4.3788e+04, 4.19243984375e+04, 4.006080078125e+04, 3.88183984375e+04, 3.63336015625e+04, 3.509119921875e+04, 3.447e+04, 3.447e+04, 3.7576e+04, 4.2235e+04, 4.6894e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 4.87576015625e+04, 4.81363984375e+04, 4.50303984375e+04, 4.316680078125e+04, 4.130319921875e+04, 3.94396015625e+04, 3.819719921875e+04, 3.63336015625e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04]
+pla.bus.VHeaWatPri_flow=[1.865244718421856e-19, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 1.497315056622028e-02, 2.994629554450512e-02, 4.491943493485451e-02, 4.491943493485451e-02, 4.491943493485451e-02, 4.491943493485451e-02, 4.491943493485451e-02, 4.491943493485451e-02, 4.491943493485451e-02, 4.491943493485451e-02, 4.491943493485451e-02, 4.491943493485451e-02, 4.491943493485451e-02, 4.491943493485451e-02, 4.491943493485451e-02, 2.994629926979542e-02, 2.994631044566631e-02, 2.994631044566631e-02, 2.994631044566631e-02, 1.497316267341375e-02, 1.497316267341375e-02, 1.497316267341375e-02, 1.497316267341375e-02, 1.497316267341375e-02, 1.497316267341375e-02, 1.497316267341375e-02, 1.497316267341375e-02, 1.497316267341375e-02, 1.497316267341375e-02, 1.497316267341375e-02, 1.497316267341375e-02, 1.497316267341375e-02, 1.497317478060722e-02, 1.497317478060722e-02, 1.497317478060722e-02, 1.497317478060722e-02, 1.497317478060722e-02, 1.497317478060722e-02, 1.497317478060722e-02, 1.497317478060722e-02, 1.497317478060722e-02, 1.497317478060722e-02, 1.497317478060722e-02, 1.579333108736591e-08, 2.367643325840163e-08, 2.367643148204479e-08, 2.367643148204479e-08, 2.367643148204479e-08, 2.367643148204479e-08, 2.367643148204479e-08, 2.367643148204479e-08, 2.367643148204479e-08, 2.367643148204479e-08, 2.367643148204479e-08, 1.578428765469653e-08, 1.578428765469653e-08, 1.578428765469653e-08, 1.578428765469653e-08, 1.578428765469653e-08, 1.494970731437206e-02, 1.497317478060722e-02, 1.497317478060722e-02, 1.497316267341375e-02, 1.497316267341375e-02, 1.497316267341375e-02, 1.497316267341375e-02, 1.497316267341375e-02, 1.497316267341375e-02, 1.497316267341375e-02, 1.497316267341375e-02, 1.497316267341375e-02, 1.497316267341375e-02, 1.497316267341375e-02, 1.497316267341375e-02, 1.497316267341375e-02, 1.497316267341375e-02]
+pla.bus.VHeaWatSec_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.105181850492954e-02, 2.357085980474949e-02, 2.863243594765663e-02, 3.366930037736895e-02, 3.861019015312195e-02, 3.979333117604256e-02, 3.90976294875145e-02, 3.683535754680634e-02, 3.535116836428642e-02, 3.378405049443244e-02, 3.221845999360085e-02, 3.06556448340416e-02, 2.909528091549873e-02, 2.753754332661629e-02, 2.598270960152149e-02, 2.443823963403702e-02, 2.288263104856014e-02, 2.133966609835625e-02, 1.980121806263924e-02, 1.826881431043148e-02, 1.674382016062737e-02, 1.522794552147388e-02, 1.372353360056877e-02, 1.212595123797655e-02, 1.063165720552206e-02, 9.20577347278595e-03, 8.212953805923462e-03, 7.586515974253416e-03, 7.063789758831263e-03, 6.575755309313536e-03, 6.102121900767084e-03, 5.668927915394304e-03, 5.295129492878917e-03, 4.883739165961742e-03, 4.459918010979891e-03, 4.035592544823885e-03, 3.616735571995378e-03, 3.207038156688213e-03, 2.809480996802449e-03, 2.42697331123054e-03, 2.062643645331264e-03, 1.719930209219456e-03, 1.410575583577156e-03, -2.440411614559269e-21, -2.440411614559269e-21, -2.440411614559269e-21, -2.440411614559269e-21, -2.440411614559269e-21, -2.440411614559269e-21, -2.440411614559269e-21, -2.440411614559269e-21, -2.440411614559269e-21, -2.440411614559269e-21, -2.440411614559269e-21, -2.440411614559269e-21, -2.440411614559269e-21, -2.440411614559269e-21, -2.440411614559269e-21, -2.440411614559269e-21, 2.309976331889629e-02, 7.514740340411663e-03, 5.050808656960726e-03, 4.227088764309883e-03, 3.889430314302444e-03, 3.767221933230758e-03, 3.760238876566291e-03, 3.821586025878787e-03, 3.90447024255991e-03, 3.799641504883766e-03, 3.530925139784813e-03, 3.167705843225121e-03, 2.792498096823692e-03, 2.420549979433417e-03, 2.060684375464916e-03, 1.719324267469347e-03, 1.406680443324149e-03]
+datAll.pla.ctl.VHeaWatPri_flow_nominal=[4.501225799322128e-02, 4.501225799322128e-02]
 datAll.pla.ctl.VHeaWatSec_flow_nominal=[4.092023521661758e-02, 4.092023521661758e-02]
-pla.bus.VChiWatPri_flow=[9.672343819892275e-38, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 0e+00, -0e+00, 3.826573280463208e-09, 3.826573280463208e-09, 7.653146560926416e-09, 1.147972028547883e-08, 1.147972028547883e-08, 1.147972028547883e-08, 1.147972028547883e-08, 1.147972028547883e-08, 1.147972028547883e-08, 1.147972028547883e-08, 1.147972028547883e-08, 1.147972028547883e-08, 1.147972028547883e-08, 1.147972028547883e-08, 1.147972028547883e-08, 7.653514266792172e-09, 2.460986562073231e-02, 2.461194060742855e-02, 2.461194060742855e-02, 2.461194060742855e-02, 2.461194060742855e-02, 2.461194060742855e-02, 2.461194060742855e-02, 2.46119350194931e-02, 2.46119350194931e-02, 2.46119350194931e-02, 2.46119350194931e-02, 2.46119350194931e-02, 2.46119350194931e-02, 2.46119350194931e-02, 4.922386258840561e-02, 4.922386631369591e-02, 4.922386631369591e-02, 4.922386631369591e-02, 4.922386631369591e-02, 4.922386631369591e-02, 4.922386631369591e-02, 4.922386631369591e-02, 4.922386631369591e-02, 4.922386631369591e-02, 4.922386631369591e-02, 4.922386631369591e-02, 4.922386631369591e-02, 4.922386258840561e-02, 7.383578270673752e-02, 7.383579015731812e-02, 7.383579015731812e-02, 7.383579015731812e-02, 7.383579015731812e-02, 7.383579015731812e-02, 7.383579015731812e-02, 7.383579015731812e-02, 7.383579015731812e-02, 7.383579015731812e-02, 4.922385886311531e-02, 4.922385886311531e-02, 4.922385886311531e-02, 4.922385886311531e-02, 4.922385886311531e-02, 4.922386631369591e-02, 4.922386631369591e-02, 4.922386631369591e-02, 4.922386631369591e-02, 2.46119350194931e-02, 2.46119350194931e-02, 2.46119350194931e-02, 2.46119350194931e-02, 2.46119350194931e-02, 2.46119350194931e-02, 2.46119350194931e-02, 2.46119350194931e-02, 2.46119350194931e-02, 2.46119350194931e-02, 2.46119350194931e-02, 2.46119350194931e-02, 2.46119350194931e-02]
-pla.bus.VChiWatSec_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.629713505506516e-02, 1.420788839459419e-02, 1.059874333441257e-02, 9.734702296555042e-03, 9.71598457545042e-03, 1.00599518045783e-02, 1.057787332683802e-02, 1.117941550910473e-02, 1.181855890899897e-02, 1.24723082408309e-02, 1.412912458181381e-02, 1.693749986588955e-02, 2.02526580542326e-02, 2.362732402980328e-02, 2.710490301251415e-02, 2.998653426766399e-02, 3.337686136364937e-02, 3.650804236531258e-02, 3.995518013834953e-02, 4.332899302244186e-02, 4.652867838740349e-02, 5.052775517106056e-02, 5.388190969824791e-02, 5.709837377071381e-02, 5.967693030834198e-02, 6.247546523809433e-02, 6.369265913963318e-02, 6.336653977632521e-02, 6.073924899101259e-02, 5.830694362521174e-02, 5.594902113080025e-02, 5.359744653105736e-02, 5.124913528561592e-02, 4.890400916337967e-02, 4.656219109892845e-02, 4.422387853264809e-02, 4.188943654298782e-02, 3.957917168736458e-02, 3.723634779453278e-02, 3.491450473666191e-02, 3.26010137796402e-02, 3.029523603618145e-02, 2.799851261079311e-02, 2.5712875649333e-02, 2.344073355197906e-02, 2.10537500679493e-02, 1.876022480428219e-02, 1.671113818883896e-02, 1.430535223335028e-02, 1.219859533011913e-02, 1.014020759612322e-02, 8.298836648464203e-03, 7.012711837887764e-03, 6.063510198146105e-03, 5.378038622438908e-03, 4.722222685813904e-03, 4.09470172598958e-03, 3.497552126646042e-03, 2.934713382273912e-03, 2.411283319815993e-03]
+pla.bus.VChiWatPri_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.450049502693673e-08, 2.900099005387347e-08, 4.350148685716704e-08, 4.350148685716704e-08, 4.350148685716704e-08, 4.350148685716704e-08, 4.350148685716704e-08, 4.350148685716704e-08, 4.350148685716704e-08, 4.350148685716704e-08, 4.350148685716704e-08, 4.350148685716704e-08, 4.350148685716704e-08, 4.350148685716704e-08, 4.350148685716704e-08, 2.900099893565766e-08, 2.400492317974567e-02, 2.400657162070274e-02, 2.400657162070274e-02, 2.400655671954155e-02, 2.400655671954155e-02, 2.400655671954155e-02, 2.400655671954155e-02, 2.400655671954155e-02, 2.400655671954155e-02, 2.400655671954155e-02, 2.400655671954155e-02, 2.400655671954155e-02, 2.400655671954155e-02, 2.400655671954155e-02, 2.400655671954155e-02, 2.400655671954155e-02, 4.801309481263161e-02, 4.801309481263161e-02, 4.801309481263161e-02, 4.801309481263161e-02, 4.801309481263161e-02, 4.801309481263161e-02, 4.801309481263161e-02, 4.801309481263161e-02, 4.801309481263161e-02, 4.801309481263161e-02, 4.801309481263161e-02, 4.801307618618011e-02, 7.201959937810898e-02, 7.201960682868958e-02, 7.201960682868958e-02, 7.201960682868958e-02, 7.201960682868958e-02, 7.201960682868958e-02, 7.201960682868958e-02, 7.201960682868958e-02, 7.201960682868958e-02, 7.201960682868958e-02, 4.801307246088982e-02, 4.801307246088982e-02, 4.801307246088982e-02, 4.801307246088982e-02, 4.801307246088982e-02, 4.801309481263161e-02, 4.801309481263161e-02, 4.801309481263161e-02, 2.400655671954155e-02, 2.400655671954155e-02, 2.400655671954155e-02, 2.400655671954155e-02, 2.400655671954155e-02, 2.400655671954155e-02, 2.400655671954155e-02, 2.400655671954155e-02, 2.400655671954155e-02, 2.400655671954155e-02, 2.400655671954155e-02, 2.400655671954155e-02, 2.400655671954155e-02, 2.400655671954155e-02]
+pla.bus.VChiWatSec_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.613633289933205e-02, 1.34904645383358e-02, 1.03467395529151e-02, 9.629151783883572e-03, 9.667436592280865e-03, 1.0037194006145e-02, 1.056734099984169e-02, 1.117464993149042e-02, 1.181642711162567e-02, 1.247136853635311e-02, 1.412355899810791e-02, 1.69189814478159e-02, 2.023060619831085e-02, 2.362433262169361e-02, 2.695966511964801e-02, 3.022818639874461e-02, 3.355985134840009e-02, 3.645257279276848e-02, 3.984498232603073e-02, 4.32923398911953e-02, 4.653023183345795e-02, 5.05569726228714e-02, 5.394956469535828e-02, 5.705570429563522e-02, 5.98704032599926e-02, 6.243451684713364e-02, 6.369265913963318e-02, 6.336636841297148e-02, 6.067254394292835e-02, 5.824863910675051e-02, 5.594447255134583e-02, 5.359109863638878e-02, 5.124321207404137e-02, 4.889851436018944e-02, 4.655709117650986e-02, 4.421916604042053e-02, 4.188499972224236e-02, 3.957657516002655e-02, 3.722887486219406e-02, 3.491054102778435e-02, 3.259748592972755e-02, 3.029191307723522e-02, 2.79954057186842e-02, 2.570987306535244e-02, 2.343784272670746e-02, 2.104800194501877e-02, 1.888486556708813e-02, 1.648149639368057e-02, 1.433584932237864e-02, 1.221860386431217e-02, 1.016275584697723e-02, 8.287086151540279e-03, 7.002836558967829e-03, 6.056470330804586e-03, 5.369849037379026e-03, 4.717425908893347e-03, 4.091775044798851e-03, 3.495688550174236e-03, 2.933473791927099e-03, 2.410436980426311e-03]
+datAll.pla.ctl.VChiWatPri_flow_nominal=[7.201961427927017e-02, 7.201961427927017e-02]
 datAll.pla.ctl.VChiWatSec_flow_nominal=[6.547237932682037e-02, 6.547237932682037e-02]
-pla.hp.hp[1].hp.PLR=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 7.113388180732721e-01, 8.197328448295593e-01, 7.587156295776367e-01, 7.290744185447693e-01, 6.983977556228638e-01, 6.710326671600342e-01, 6.374410390853881e-01, 6.00588083267212e-01, 5.636855959892273e-01, 5.290902853012085e-01, 4.979304671287537e-01, 3.770880103111267e-01, 0e+00, 1e+00, 1e+00, 3.752968609333038e-01, 3.066294491291046e-01, 2.90405660867691e-01, 2.885490357875824e-01, 2.933740019798279e-01, 3.018896281719208e-01, 3.122657537460327e-01, 3.690943121910095e-01, 3.977571725845337e-01, 4.746553003787994e-01, 5.635239481925964e-01, 6.535659432411194e-01, 4.349082410335528e-01, 4.32482779026032e-01, 4.806352853775023e-01, 5.260821580886841e-01, 5.698549747467041e-01, 6.187641620635986e-01, 6.659283041954041e-01, 7.087083458900452e-01, 7.11086094379425e-01, 7.121535539627075e-01, 8.260886669158936e-01, 9.931967854499817e-01, 9.325844645500183e-01, 9.999999999999991e-01, 8.409478068351778e-01, 7.110815644264226e-01, 6.780248880386353e-01, 6.513825654983521e-01, 6.252351999282837e-01, 5.989060401916504e-01, 5.720027685165405e-01, 5.445915460586548e-01, 4.967239499092102e-01, 4.491490721702576e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 2.833462059497833e-01, 1.389729827642441e-01, 1.024796068668365e-01, 8.279170840978622e-02, 7.169155031442642e-02, 6.540237367153168e-02, 1.478535979986191e-01, 1.167747899889946e-01, 1.005468592047691e-01, 9.516428411006927e-02, 8.466219156980515e-02, 7.40029439330101e-02, 6.352165341377258e-02, 5.343592166900635e-02, 4.38891313970089e-02]
-pla.hp.hp[2].hp.PLR=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 7.113388180732721e-01, 8.197328448295593e-01, 7.587156295776367e-01, 7.290744185447693e-01, 6.983977556228638e-01, 6.710326671600342e-01, 6.374410390853881e-01, 6.00588083267212e-01, 5.636855959892273e-01, 5.290902853012085e-01, 4.979304671287537e-01, 3.770880103111267e-01, 4.656138718128204e-01, 3.240569233894348e-01, 4.966585040092468e-01, 4.554415047168732e-01, 4.082226455211639e-01, 3.595183789730072e-01, 3.04851770401001e-01, 1.65391206741333e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.349082112312304e-01, 4.32482779026032e-01, 4.806352853775023e-01, 5.260821580886841e-01, 5.698549747467041e-01, 6.187641620635986e-01, 6.659283041954041e-01, 7.087083458900452e-01, 7.11086094379425e-01, 7.121535539627075e-01, 8.260886669158936e-01, 9.931967854499817e-01, 9.325844645500183e-01, 9.999999999999991e-01, 8.409478068351778e-01, 7.110815644264226e-01, 6.780248880386353e-01, 6.513825654983521e-01, 6.252351999282837e-01, 5.989060401916504e-01, 5.720027685165405e-01, 5.445915460586548e-01, 4.967239499092102e-01, 4.491490721702576e-01, 6.612727046012878e-01, 5.35692572593689e-01, 4.928664863109589e-01, 4.438030421733856e-01, 3.982727825641632e-01, 4.011670351028442e-01, 3.525660932064056e-01, 3.086113035678864e-01, 2.757651507854462e-01, 4.832163453102112e-01, 4.188123047351837e-01, 3.622855544090271e-01, 3.054287135601044e-01, 2.496859580278397e-01, 2.100804299116135e-01, 1.813410371541977e-01, 1.606491357088089e-01, 1.411672830581665e-01, 1.225820779800415e-01, 1.049113944172859e-01, 8.825310319662094e-02, 7.274230569601059e-02]
-pla.hp.hp[3].hp.PLR=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.113388180732721e-01, 8.197328448295593e-01, 7.587156295776367e-01, 7.290744185447693e-01, 6.983977556228638e-01, 6.710326671600342e-01, 6.374410390853881e-01, 6.00588083267212e-01, 5.636855959892273e-01, 5.290902853012085e-01, 4.979304671287537e-01, 3.770880103111267e-01, 4.656138718128204e-01, 3.240569233894348e-01, 4.966585040092468e-01, 4.554415047168732e-01, 4.082226455211639e-01, 3.595183789730072e-01, 3.04851770401001e-01, 1.65391206741333e-01, 3.570818901062012e-01, 3.101485073566437e-01, 2.689316868782043e-01, 2.376659512519836e-01, 2.185408920049667e-01, 2.029924541711807e-01, 1.886816918849945e-01, 1.749517172574996e-01, 1.622058451175689e-01, 1.514919847249986e-01, 1.396424472332001e-01, 1.271640807390213e-01, 1.140115112066269e-01, 1.010032519698143e-01, 8.87102335691452e-02, 7.740301638841629e-02, 6.683884561061859e-02, 5.694959685206413e-02, 4.774283990263939e-02, 3.936440497636795e-02, 0e+00, 8.409476280212435e-01, 7.110815644264226e-01, 6.780248880386353e-01, 6.513825654983521e-01, 6.252351999282837e-01, 5.989060401916504e-01, 5.720027685165405e-01, 5.445915460586548e-01, 4.967239499092102e-01, 4.491490721702576e-01, 6.612727046012878e-01, 5.35692572593689e-01, 4.928664863109589e-01, 4.438030421733856e-01, 3.982727825641632e-01, 4.011670351028442e-01, 3.525660932064056e-01, 3.086113035678864e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-pla.bus.THeaWatSupSet=[3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.211499938964844e+02, 3.201499938964844e+02, 3.171499938964844e+02, 3.191499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.211499938964844e+02, 3.191499938964844e+02, 3.151499938964844e+02, 3.131499938964844e+02, 3.101499938964844e+02, 3.071499938964844e+02, 3.041499938964844e+02, 3.011499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.201499938964844e+02, 3.171499938964844e+02, 3.141499938964844e+02, 3.111499938964844e+02, 3.081499938964844e+02, 3.051499938964844e+02, 3.031499938964844e+02, 3.001499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02]
-pla.bus.THeaWatPriSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 3.055133666992188e+02, 3.09009521484375e+02, 3.131914367675781e+02, 3.171499938964844e+02, 3.191256103515625e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.212217407226562e+02, 3.179152221679688e+02, 3.159583129882812e+02, 3.13150146484375e+02, 3.101505737304688e+02, 3.071518249511719e+02, 3.041559753417969e+02, 3.011696472167969e+02, 2.982141723632812e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.979535522460938e+02, 2.979535522460938e+02, 2.979535522460938e+02, 2.979535522460938e+02, 2.979535522460938e+02, 2.979535522460938e+02, 2.979535522460938e+02, 2.979535522460938e+02, 2.979535522460938e+02, 2.979535522460938e+02, 2.979535522460938e+02, 2.979535522460938e+02, 2.979535522460938e+02, 2.979535522460938e+02, 2.979535522460938e+02, 2.979535522460938e+02, 2.933735656738281e+02, 3.135010070800781e+02, 3.201606140136719e+02, 3.171797790527344e+02, 3.142301330566406e+02, 3.113530578613281e+02, 3.086184997558594e+02, 3.060284118652344e+02, 3.031508178710938e+02, 3.001526184082031e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02]
-pla.bus.THeaWatSecSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 3.016728515625e+02, 3.050049133300781e+02, 3.129789123535156e+02, 3.171499938964844e+02, 3.190147705078125e+02, 3.231499633789062e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.21406982421875e+02, 3.169868774414062e+02, 3.164731750488281e+02, 3.131581420898438e+02, 3.101680603027344e+02, 3.071890258789062e+02, 3.042329406738281e+02, 3.013215942382812e+02, 2.984884338378906e+02, 2.981460266113281e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499633789062e+02, 2.981499633789062e+02, 2.981499633789062e+02, 2.981499633789062e+02, 2.981499633789062e+02, 2.981499633789062e+02, 2.981499633789062e+02, 2.981499633789062e+02, 2.981499633789062e+02, 2.981499633789062e+02, 2.981499633789062e+02, 2.981499633789062e+02, 2.981499633789062e+02, 2.981499633789062e+02, 2.981499633789062e+02, 2.981499633789062e+02, 2.958172607421875e+02, 3.1180712890625e+02, 3.204019470214844e+02, 3.175479736328125e+02, 3.147180480957031e+02, 3.1191943359375e+02, 3.091109313964844e+02, 3.062209167480469e+02, 3.032622680664062e+02, 3.003167724609375e+02, 2.981591796875e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02]
-pla.bus.THeaWatPriRet=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.952333068847656e+02, 2.98744873046875e+02, 3.028106689453125e+02, 3.096117858886719e+02, 3.105174255371094e+02, 3.151192932128906e+02, 3.155009155273438e+02, 3.158882446289062e+02, 3.162003479003906e+02, 3.165082397460938e+02, 3.168154907226562e+02, 3.171222839355469e+02, 3.174285583496094e+02, 3.177343444824219e+02, 3.169743957519531e+02, 3.136122131347656e+02, 3.114263305664062e+02, 3.075321960449219e+02, 3.049625549316406e+02, 3.024624938964844e+02, 2.999825744628906e+02, 2.975881958007812e+02, 2.961927490234375e+02, 2.940056457519531e+02, 2.945489501953125e+02, 2.950221862792969e+02, 2.953761901855469e+02, 2.955931396484375e+02, 2.957704162597656e+02, 2.959343566894531e+02, 2.960926818847656e+02, 2.962382507324219e+02, 2.963626403808594e+02, 2.965003356933594e+02, 2.96642333984375e+02, 2.967845458984375e+02, 2.969250183105469e+02, 2.970625e+02, 2.971959838867188e+02, 2.973245239257812e+02, 2.974471130371094e+02, 2.975625915527344e+02, 2.976681823730469e+02, 2.979518432617188e+02, 2.979518432617188e+02, 2.979518432617188e+02, 2.979518432617188e+02, 2.979518432617188e+02, 2.979518432617188e+02, 2.979518127441406e+02, 2.979518127441406e+02, 2.979518127441406e+02, 2.979518127441406e+02, 2.979518127441406e+02, 2.979518127441406e+02, 2.979518127441406e+02, 2.979518127441406e+02, 2.979518127441406e+02, 2.979518127441406e+02, 2.951920471191406e+02, 3.038046264648438e+02, 3.170152587890625e+02, 3.155124206542969e+02, 3.129150085449219e+02, 3.101401672363281e+02, 3.07268310546875e+02, 3.04330322265625e+02, 3.0137451171875e+02, 2.987418212890625e+02, 2.969972839355469e+02, 2.970784912109375e+02, 2.972032165527344e+02, 2.973274536132812e+02, 2.974479064941406e+02, 2.97562255859375e+02, 2.976688232421875e+02]
-pla.bus.THeaWatSecRet=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.954781494140625e+02, 2.989821472167969e+02, 3.025788879394531e+02, 3.071948547363281e+02, 3.095608825683594e+02, 3.141005249023438e+02, 3.143046875e+02, 3.143474731445312e+02, 3.14349853515625e+02, 3.143500061035156e+02, 3.143500061035156e+02, 3.143500061035156e+02, 3.143500061035156e+02, 3.143500061035156e+02, 3.135062561035156e+02, 3.100057067871094e+02, 3.094124755859375e+02, 3.051549987792969e+02, 3.021720581054688e+02, 2.992724304199219e+02, 2.963900146484375e+02, 2.937135620117188e+02, 2.931816711425781e+02, 2.931517944335938e+02, 2.931500854492188e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931499938964844e+02, 3.001830749511719e+02, 3.108709106445312e+02, 3.094364013671875e+02, 3.0666162109375e+02, 3.038128662109375e+02, 3.009473266601562e+02, 2.980517578125e+02, 2.951416931152344e+02, 2.933062744140625e+02, 2.931587829589844e+02, 2.931504821777344e+02, 2.931500244140625e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
+pla.hp.hp[1].hp.PLR=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 7.493994235992432e-01, 5.046688914299027e-01, 9.395202994346619e-01, 8.308655023574829e-01, 7.361950874328613e-01, 6.958365440368652e-01, 6.702591180801392e-01, 6.366987824440001e-01, 5.998532176017762e-01, 5.629667639732361e-01, 5.283845663070679e-01, 4.972338676452637e-01, 3.519511222839355e-01, 0e+00, 1e+00, 1e+00, 8.305707788203165e-10, 1.897909641265869e-01, 8.033954612685079e-10, 7.977219995680684e-10, 7.877861696314881e-10, 7.759370368454199e-10, 7.634438081716155e-10, 7.50961848261511e-10, 7.393197165583842e-10, 7.344965746725052e-10, 7.337226937131902e-10, 7.342929597697889e-10, 4.330656677485194e-02, 6.115763187408458e-01, 5.559351444244418e-01, 5.17298698425293e-01, 5.595977306365967e-01, 6.08832836151123e-01, 6.572022438049316e-01, 6.904711127281189e-01, 6.935885548591614e-01, 6.94636344909668e-01, 8.058203458786011e-01, 1e+00, 9.81123149394989e-01, 1e+00, 9.16035652160648e-01, 7.184257507324224e-01, 6.800223588943481e-01, 6.531340479850769e-01, 6.270869970321655e-01, 6.008751392364502e-01, 5.740857720375061e-01, 5.467832684516907e-01, 4.877229332923889e-01, 4.31880921125412e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 2.747324407100677e-01, 1.557693630456924e-01, 7.056185975670815e-03, 7.175854910279611e-10, 7.114735467439459e-10, 7.068726159964456e-10, 7.061471407610043e-10, 7.075062757877504e-10, 7.098066023836225e-10, 7.129447032738767e-10, 1.571651920676231e-02, 5.191310122609138e-02, 5.612799897789955e-02, 5.066557601094246e-02, 4.260919615626335e-02]
+pla.hp.hp[2].hp.PLR=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 7.493994235992432e-01, 5.046688914299027e-01, 9.395202994346619e-01, 8.308655023574829e-01, 7.361950874328613e-01, 6.958365440368652e-01, 6.702591180801392e-01, 6.366987824440001e-01, 5.998532176017762e-01, 5.629667639732361e-01, 5.283845663070679e-01, 4.972338676452637e-01, 3.519511222839355e-01, 5.748004913330078e-01, 3.045288324356079e-01, 3.479597866535187e-01, 2.339392900466919e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.559351444244418e-01, 5.17298698425293e-01, 5.595977306365967e-01, 6.08832836151123e-01, 6.572022438049316e-01, 6.904711127281189e-01, 6.935885548591614e-01, 6.94636344909668e-01, 8.058203458786011e-01, 1e+00, 9.81123149394989e-01, 1e+00, 9.16035652160648e-01, 7.184257507324224e-01, 6.800223588943481e-01, 6.531340479850769e-01, 6.270869970321655e-01, 6.008751392364502e-01, 5.740857720375061e-01, 5.467832684516907e-01, 4.877229332923889e-01, 4.31880921125412e-01, 6.538190841674805e-01, 5.121169090270996e-01, 4.74981963634491e-01, 4.279738366603851e-01, 3.820440173149109e-01, 3.826804757118225e-01, 3.359459042549133e-01, 1.359730958938599e-01, 4.901649653911591e-01, 4.915009737014771e-01, 4.392610788345337e-01, 3.825299441814423e-01, 3.251407146453857e-01, 2.682558596134186e-01, 2.229607254266739e-01, 1.909644454717636e-01, 1.674961894750595e-01, 1.475932151079178e-01, 1.287954747676849e-01, 1.108812242746353e-01, 9.392163157463074e-02, 7.80453234910965e-02]
+pla.hp.hp[3].hp.PLR=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.493994235992432e-01, 5.046688914299027e-01, 9.395202994346619e-01, 8.308655023574829e-01, 7.361950874328613e-01, 6.958365440368652e-01, 6.702591180801392e-01, 6.366987824440001e-01, 5.998532176017762e-01, 5.629667639732361e-01, 5.283845663070679e-01, 4.972338676452637e-01, 3.519511222839355e-01, 5.748004913330078e-01, 3.045288324356079e-01, 3.479597866535187e-01, 2.339392900466919e-01, 7.196228504180908e-01, 3.294642865657806e-01, 3.436272740364075e-01, 1.090305596590042e-01, 6.144743412733078e-02, 1.045391894876957e-02, 6.915257810824471e-10, 6.913997707691522e-10, 6.927249329713447e-10, 6.952768916157481e-10, 7.002847746129248e-10, 7.066635610009085e-10, 6.95233648428939e-10, 6.899620319522626e-10, 6.852056144701635e-10, 6.793975382279882e-10, 6.703470556423952e-10, 4.408884793519974e-02, 7.059814035892487e-02, 7.127805054187775e-02, 6.445511430501938e-02, 5.575472488999367e-02, 4.69476617872715e-02, 3.877396136522293e-02, 0e+00, 9.160354733467136e-01, 7.184257507324224e-01, 6.800223588943481e-01, 6.531340479850769e-01, 6.270869970321655e-01, 6.008751392364502e-01, 5.740857720375061e-01, 5.467832684516907e-01, 4.877229332923889e-01, 4.31880921125412e-01, 6.538190841674805e-01, 5.121169090270996e-01, 4.74981963634491e-01, 4.279738366603851e-01, 3.820440173149109e-01, 3.826804757118225e-01, 3.359459042549133e-01, 1.359730958938599e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+pla.bus.THeaWatSupSet=[3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.201499938964844e+02, 3.151499938964844e+02, 3.191499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.211499938964844e+02, 3.191499938964844e+02, 3.151499938964844e+02, 3.131499938964844e+02, 3.101499938964844e+02, 3.091499938964844e+02, 3.041499938964844e+02, 3.011499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.201499938964844e+02, 3.171499938964844e+02, 3.141499938964844e+02, 3.111499938964844e+02, 3.081499938964844e+02, 3.051499938964844e+02, 3.031499938964844e+02, 3.001499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02]
+pla.bus.THeaWatPriSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 3.055013732910156e+02, 3.119782104492188e+02, 3.201498107910156e+02, 3.151528930664062e+02, 3.191244201660156e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.212206726074219e+02, 3.190214538574219e+02, 3.159385681152344e+02, 3.13150146484375e+02, 3.102474060058594e+02, 3.091499633789062e+02, 3.041710205078125e+02, 3.012074584960938e+02, 2.982994079589844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.985556335449219e+02, 2.997723693847656e+02, 3.023118286132812e+02, 3.058164978027344e+02, 3.114369812011719e+02, 3.185115661621093e+02, 3.102485656738281e+02, 3.065643920898438e+02, 3.033992004394531e+02, 3.006261901855469e+02, 2.988108215332031e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499633789062e+02, 2.981499633789062e+02, 2.981499633789062e+02, 2.980760498046875e+02, 2.980760498046875e+02, 2.980760498046875e+02, 2.980760498046875e+02, 2.980760498046875e+02, 2.980760498046875e+02, 2.980760498046875e+02, 2.980760498046875e+02, 2.980760498046875e+02, 2.980760498046875e+02, 2.980760498046875e+02, 2.980760498046875e+02, 2.980760498046875e+02, 2.980760498046875e+02, 2.980760498046875e+02, 2.980760498046875e+02, 2.931205444335938e+02, 3.111405944824219e+02, 3.201605224609375e+02, 3.171795654296875e+02, 3.142806091308594e+02, 3.120093078613281e+02, 3.09672119140625e+02, 3.072926940917969e+02, 3.048393249511719e+02, 3.024566955566406e+02, 3.003754577636719e+02, 2.989988098144531e+02, 2.981505432128906e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02]
+pla.bus.THeaWatSecSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.981926879882812e+02, 3.082713012695312e+02, 3.185001831054688e+02, 3.160874328613281e+02, 3.170976867675781e+02, 3.225311279296875e+02, 3.231330871582031e+02, 3.231495361328125e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.222309875488281e+02, 3.189791870117188e+02, 3.182791442871094e+02, 3.142256774902344e+02, 3.115134887695312e+02, 3.077965393066406e+02, 3.062522277832031e+02, 3.03822021484375e+02, 3.010462646484375e+02, 2.990320129394531e+02, 2.9841650390625e+02, 2.983369140625e+02, 2.988730773925781e+02, 3.004721984863281e+02, 3.030048522949219e+02, 3.070361022949219e+02, 3.128636474609376e+02, 3.12980712890625e+02, 3.095990905761719e+02, 3.062294006347656e+02, 3.031474914550781e+02, 3.006335754394531e+02, 2.989908142089844e+02, 2.984043273925781e+02, 2.982269592285156e+02, 2.981733093261719e+02, 2.981570434570312e+02, 2.981521301269531e+02, 2.98150634765625e+02, 2.981502380371094e+02, 2.981502380371094e+02, 2.981502380371094e+02, 2.981502380371094e+02, 2.981502380371094e+02, 2.981502380371094e+02, 2.981502380371094e+02, 2.981502380371094e+02, 2.981502380371094e+02, 2.981502380371094e+02, 2.981502380371094e+02, 2.981502380371094e+02, 2.981502380371094e+02, 2.981502380371094e+02, 2.981502380371094e+02, 2.981502380371094e+02, 2.965430297851562e+02, 3.038822021484375e+02, 3.150368347167969e+02, 3.175166625976562e+02, 3.162741394042969e+02, 3.140454406738281e+02, 3.117214965820312e+02, 3.093748779296875e+02, 3.069758911132812e+02, 3.045538024902344e+02, 3.022495422363281e+02, 3.003804931640625e+02, 2.99033935546875e+02, 2.984177856445312e+02, 2.982311706542969e+02, 2.981746215820312e+02, 2.98157470703125e+02]
+pla.bus.THeaWatPriRet=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.952294616699219e+02, 3.018915710449219e+02, 3.123721923828125e+02, 3.09751953125e+02, 3.091780700683594e+02, 3.143895568847656e+02, 3.154364929199219e+02, 3.159274597167969e+02, 3.16220458984375e+02, 3.165275573730469e+02, 3.168342895507812e+02, 3.171404724121094e+02, 3.174461669921875e+02, 3.177513427734375e+02, 3.172763977050781e+02, 3.123003234863281e+02, 3.116755065917969e+02, 3.101142272949219e+02, 3.06931396484375e+02, 3.019266052246094e+02, 3.002882995605469e+02, 2.971079406738281e+02, 2.968560791015625e+02, 2.974092102050781e+02, 2.980488891601562e+02, 2.987111511230469e+02, 3.000136413574219e+02, 3.02600341796875e+02, 3.063193664550781e+02, 3.121711120605469e+02, 3.185341491699217e+02, 3.098084716796874e+02, 3.062019653320312e+02, 3.030785522460938e+02, 3.003767395019531e+02, 2.986589050292969e+02, 2.975942687988281e+02, 2.972793579101562e+02, 2.972709655761719e+02, 2.97354736328125e+02, 2.974628601074219e+02, 2.975733337402344e+02, 2.976761474609375e+02, 2.98126708984375e+02, 2.98126708984375e+02, 2.98126708984375e+02, 2.98126708984375e+02, 2.98126708984375e+02, 2.98126708984375e+02, 2.981266784667969e+02, 2.981266784667969e+02, 2.981266784667969e+02, 2.981266784667969e+02, 2.981266784667969e+02, 2.981266784667969e+02, 2.981266784667969e+02, 2.981266784667969e+02, 2.981266784667969e+02, 2.981266479492188e+02, 2.934148559570312e+02, 3.023992614746094e+02, 3.168056030273438e+02, 3.154093322753906e+02, 3.14009521484375e+02, 3.117547912597656e+02, 3.094180297851562e+02, 3.070313415527344e+02, 3.045741271972656e+02, 3.022098388671875e+02, 3.0019482421875e+02, 2.9887744140625e+02, 2.979503173828125e+02, 2.975665893554688e+02, 2.975285034179688e+02, 2.975931396484375e+02, 2.976835021972656e+02]
+pla.bus.THeaWatSecRet=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.953192443847656e+02, 3.003041687011719e+02, 3.089826049804688e+02, 3.075648498535156e+02, 3.079622802734375e+02, 3.133782958984375e+02, 3.142955932617188e+02, 3.14346923828125e+02, 3.143498229980469e+02, 3.143499755859375e+02, 3.143500061035156e+02, 3.143500061035156e+02, 3.143500061035156e+02, 3.143500061035156e+02, 3.136145935058594e+02, 3.104847412109375e+02, 3.0951611328125e+02, 3.097633361816406e+02, 3.038226928710938e+02, 3.038143310546875e+02, 3.002049255371094e+02, 2.970538330078125e+02, 2.964627380371094e+02, 2.969658508300781e+02, 2.978660278320312e+02, 2.990309448242188e+02, 3.010888671875e+02, 3.048427429199219e+02, 3.103503112792969e+02, 3.192186279296875e+02, 3.253117065429683e+02, 3.042901916503906e+02, 2.997239074707032e+02, 2.963193359375e+02, 2.936492614746094e+02, 2.931811218261719e+02, 2.931519470214844e+02, 2.931501159667969e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 3.068037414550781e+02, 3.196866760253906e+02, 3.100147705078125e+02, 3.073547973632812e+02, 3.047053527832031e+02, 3.023075561523438e+02, 2.999445190429688e+02, 2.975199584960938e+02, 2.950920104980469e+02, 2.933746337890625e+02, 2.931645812988281e+02, 2.931509704589844e+02, 2.931500549316406e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
 pla.bus.TChiWatSupSet=[2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.811099853515625e+02, 2.820700073242188e+02, 2.830299987792969e+02, 2.83989990234375e+02, 2.849500122070312e+02, 2.859100036621094e+02, 2.868699951171875e+02, 2.87510009765625e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.873500061035156e+02, 2.849500122070312e+02, 2.833500061035156e+02, 2.809500122070312e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.804700012207031e+02, 2.814299926757812e+02, 2.8175e+02, 2.833500061035156e+02, 2.843099975585938e+02, 2.852699890136719e+02, 2.862300109863281e+02, 2.868699951171875e+02, 2.878299865722656e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02]
-pla.bus.TChiWatPriSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.915420532226562e+02, 2.812734985351562e+02, 2.811098022460938e+02, 2.820693664550781e+02, 2.830278625488281e+02, 2.839828796386719e+02, 2.849266052246094e+02, 2.858369445800781e+02, 2.866724243164062e+02, 2.875099792480469e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.88152587890625e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.874651184082031e+02, 2.854646301269531e+02, 2.833500061035156e+02, 2.810612182617188e+02, 2.801533508300782e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.804700012207031e+02, 2.814299621582031e+02, 2.8175e+02, 2.833476867675781e+02, 2.842955627441406e+02, 2.851905822753906e+02, 2.859424743652344e+02, 2.868699951171875e+02, 2.878299865722656e+02, 2.881499938964844e+02, 2.882510986328125e+02, 2.881500244140625e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02]
-pla.bus.TChiWatSecSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.946083068847656e+02, 2.821069946289062e+02, 2.810708923339844e+02, 2.820111083984375e+02, 2.829419250488281e+02, 2.838599243164062e+02, 2.847622680664062e+02, 2.856518249511719e+02, 2.865492248535156e+02, 2.874876708984375e+02, 2.881488952636719e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.883235473632812e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.882727661132812e+02, 2.885780944824219e+02, 2.88833984375e+02, 2.8871142578125e+02, 2.869765319824219e+02, 2.847655029296875e+02, 2.825459289550781e+02, 2.802392578125001e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.804693908691406e+02, 2.81427978515625e+02, 2.817500305175781e+02, 2.832932739257812e+02, 2.841885070800781e+02, 2.85038818359375e+02, 2.859113159179688e+02, 2.868682861328125e+02, 2.878261413574219e+02, 2.881499938964844e+02, 2.881553649902344e+02, 2.881506652832031e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02]
-pla.bus.TChiWatPriRet=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.942607421875e+02, 2.871422729492188e+02, 2.834285583496094e+02, 2.840092163085938e+02, 2.8490283203125e+02, 2.858831481933594e+02, 2.869041442871094e+02, 2.879499206542969e+02, 2.890137634277344e+02, 2.90085693359375e+02, 2.909496765136719e+02, 2.915188293457031e+02, 2.921871032714844e+02, 2.928751525878906e+02, 2.911350402832031e+02, 2.91176025390625e+02, 2.915269470214844e+02, 2.91862548828125e+02, 2.921879272460938e+02, 2.925335083007812e+02, 2.928591003417969e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931488647460938e+02, 2.917463073730469e+02, 2.894947204589844e+02, 2.87359619140625e+02, 2.853487548828125e+02, 2.8453271484375e+02, 2.843255310058594e+02, 2.84148681640625e+02, 2.839736633300781e+02, 2.837989501953125e+02, 2.8362451171875e+02, 2.834503173828125e+02, 2.834896850585938e+02, 2.84205078125e+02, 2.85964599609375e+02, 2.86843994140625e+02, 2.875641479492188e+02, 2.882288513183594e+02, 2.889135437011719e+02, 2.896106262207031e+02, 2.902752380371094e+02, 2.902947998046875e+02, 2.900660705566406e+02, 2.915911865234375e+02, 2.911017456054688e+02, 2.906767272949219e+02, 2.902611694335938e+02, 2.898682556152344e+02, 2.895952453613281e+02, 2.893980407714844e+02, 2.892569274902344e+02, 2.891230773925781e+02, 2.889949951171875e+02, 2.888730163574219e+02, 2.887579040527344e+02, 2.886506652832031e+02]
-pla.bus.TChiWatSecRet=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.951005554199219e+02, 2.891943359375e+02, 2.865514526367188e+02, 2.87279541015625e+02, 2.881900939941406e+02, 2.891069946289062e+02, 2.90020751953125e+02, 2.909332580566406e+02, 2.918516845703125e+02, 2.927826538085938e+02, 2.931285705566406e+02, 2.931488037109375e+02, 2.931499328613281e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931431884765625e+02, 2.9168212890625e+02, 2.894212341308594e+02, 2.872768249511719e+02, 2.86299560546875e+02, 2.8568798828125e+02, 2.85652099609375e+02, 2.856501159667969e+02, 2.856499938964844e+02, 2.856499938964844e+02, 2.856499938964844e+02, 2.856499938964844e+02, 2.858027954101562e+02, 2.866371154785156e+02, 2.872953796386719e+02, 2.883856201171875e+02, 2.893705749511719e+02, 2.902843933105469e+02, 2.912059936523438e+02, 2.921395874023438e+02, 2.929870300292969e+02, 2.931408386230469e+02, 2.931494750976562e+02, 2.931499633789062e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
+pla.bus.TChiWatPriSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.915145568847656e+02, 2.836084289550781e+02, 2.810466003417969e+02, 2.820692749023438e+02, 2.8266748046875e+02, 2.830749206542969e+02, 2.83787109375e+02, 2.846530456542969e+02, 2.855908203125e+02, 2.865569458007812e+02, 2.875066223144531e+02, 2.8797412109375e+02, 2.881155700683594e+02, 2.881455688476562e+02, 2.881500244140625e+02, 2.881500244140625e+02, 2.881502380371094e+02, 2.881500244140625e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.874732971191406e+02, 2.855247192382812e+02, 2.833573608398438e+02, 2.815216674804688e+02, 2.801543884277344e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.804700012207031e+02, 2.814299621582031e+02, 2.8175e+02, 2.833473205566406e+02, 2.842940063476562e+02, 2.851863708496094e+02, 2.859407653808594e+02, 2.868699951171875e+02, 2.878300170898438e+02, 2.881500244140625e+02, 2.881500244140625e+02, 2.881500244140625e+02, 2.881500244140625e+02, 2.881500244140625e+02, 2.881500244140625e+02, 2.881500244140625e+02, 2.881500244140625e+02, 2.881500244140625e+02, 2.881500244140625e+02, 2.881500244140625e+02, 2.881500244140625e+02, 2.881500244140625e+02, 2.881500244140625e+02, 2.881500244140625e+02]
+pla.bus.TChiWatSecSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.939991455078125e+02, 2.838115539550781e+02, 2.810886840820312e+02, 2.820645751953125e+02, 2.826611938476562e+02, 2.830531005859375e+02, 2.837578430175781e+02, 2.846197814941406e+02, 2.855551147460938e+02, 2.865198974609375e+02, 2.874781799316406e+02, 2.879646301269531e+02, 2.881132507324219e+02, 2.881452026367188e+02, 2.882468872070312e+02, 2.891661682128906e+02, 2.881509704589844e+02, 2.881500244140625e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.883963623046875e+02, 2.886966552734375e+02, 2.889390563964844e+02, 2.886767578125e+02, 2.870506286621094e+02, 2.849059753417969e+02, 2.830409851074219e+02, 2.801593627929688e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.804700012207031e+02, 2.81429931640625e+02, 2.8175e+02, 2.833412475585938e+02, 2.842675170898438e+02, 2.851119689941406e+02, 2.859151306152344e+02, 2.868699951171875e+02, 2.878299865722656e+02, 2.881500244140625e+02, 2.881500244140625e+02, 2.881500244140625e+02, 2.881500244140625e+02, 2.881500244140625e+02, 2.881500244140625e+02, 2.881500244140625e+02, 2.881500244140625e+02, 2.881500244140625e+02, 2.881500244140625e+02, 2.881500244140625e+02, 2.881500244140625e+02, 2.881500244140625e+02, 2.881500244140625e+02, 2.881500244140625e+02]
+pla.bus.TChiWatPriRet=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.932894897460938e+02, 2.89967041015625e+02, 2.808065490722656e+02, 2.833109741210938e+02, 2.826891784667969e+02, 2.831335144042969e+02, 2.838619995117188e+02, 2.847340087890625e+02, 2.856752319335938e+02, 2.866454467773438e+02, 2.875746459960938e+02, 2.879969787597656e+02, 2.881211242675781e+02, 2.881464233398438e+02, 2.884888610839844e+02, 2.926768798828125e+02, 2.921539306640625e+02, 2.918962707519531e+02, 2.92216796875e+02, 2.925755004882812e+02, 2.929195861816406e+02, 2.931441040039062e+02, 2.931499633789062e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.9212255859375e+02, 2.900418395996094e+02, 2.8807958984375e+02, 2.860259094238281e+02, 2.847033386230469e+02, 2.844539184570312e+02, 2.842701110839844e+02, 2.840905151367188e+02, 2.839114074707031e+02, 2.837325744628906e+02, 2.835539855957031e+02, 2.835125732421875e+02, 2.841662292480469e+02, 2.860337219238281e+02, 2.867665710449219e+02, 2.875186157226562e+02, 2.8819384765625e+02, 2.888717956542969e+02, 2.895520324707031e+02, 2.902167663574219e+02, 2.891842041015625e+02, 2.917742309570312e+02, 2.917506713867188e+02, 2.913377685546875e+02, 2.908973999023438e+02, 2.904635314941406e+02, 2.900469970703125e+02, 2.897245178222656e+02, 2.894988708496094e+02, 2.893346557617188e+02, 2.891943359375e+02, 2.890613098144531e+02, 2.889342956542969e+02, 2.888139343261719e+02, 2.887012634277344e+02]
+pla.bus.TChiWatSecRet=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.954566040039062e+02, 2.833136291503906e+02, 2.804064025878906e+02, 2.845069580078125e+02, 2.830245361328125e+02, 2.839743957519531e+02, 2.849076843261719e+02, 2.858039855957031e+02, 2.86642333984375e+02, 2.875098876953125e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.909069824218751e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931490783691406e+02, 2.917226257324219e+02, 2.895734558105469e+02, 2.876756286621094e+02, 2.862526245117188e+02, 2.857074890136719e+02, 2.856531982421875e+02, 2.856501770019531e+02, 2.856500244140625e+02, 2.856499938964844e+02, 2.856499938964844e+02, 2.856499938964844e+02, 2.857834167480469e+02, 2.866011657714844e+02, 2.872694091796875e+02, 2.88357666015625e+02, 2.893193969726562e+02, 2.902413024902344e+02, 2.91169189453125e+02, 2.920942687988281e+02, 2.920760192871094e+02, 2.92975341796875e+02, 2.931493530273438e+02, 2.931499633789062e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
+pla.bus.hrc.y1=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+pla.bus.hrc.y1Coo=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+pla.hrc.hrc.chi.PLR2=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.841175436973572e-01, 0e+00, 6.821112036705017e-01, 3.064384758472443e-01, 2.652655839920044e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.913625538349152e-01, 3.534784018993378e-01, 4.774852991104126e-01, 5.976095795631409e-01, 7.502925992012024e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.980444192886353e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+pla.bus.TChiWatRetUpsHrc=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.955391235351562e+02, 2.904940795898438e+02, 2.867487487792969e+02, 2.872470703125e+02, 2.880436706542969e+02, 2.88405029296875e+02, 2.890269165039062e+02, 2.898428649902344e+02, 2.907563171386719e+02, 2.917125854492188e+02, 2.926848754882812e+02, 2.931208801269531e+02, 2.931483764648438e+02, 2.9314990234375e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931438293457031e+02, 2.916852416992188e+02, 2.895259704589844e+02, 2.87633544921875e+02, 2.861356811523438e+02, 2.857032470703125e+02, 2.856529541015625e+02, 2.856501770019531e+02, 2.856500244140625e+02, 2.856499938964844e+02, 2.856499938964844e+02, 2.856499938964844e+02, 2.858023376464844e+02, 2.866363220214844e+02, 2.872671813964844e+02, 2.884141235351562e+02, 2.893710021972656e+02, 2.90283447265625e+02, 2.91205322265625e+02, 2.921388549804688e+02, 2.929866333007812e+02, 2.931408081054688e+02, 2.931494750976562e+02, 2.931499633789062e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
+pla.bus.THeaWatRetUpsHrc=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.954760437011719e+02, 3.006047973632812e+02, 3.092037963867188e+02, 3.074686279296875e+02, 3.081247863769531e+02, 3.134437561035156e+02, 3.1429931640625e+02, 3.1434716796875e+02, 3.14349853515625e+02, 3.143500061035156e+02, 3.143500061035156e+02, 3.143500061035156e+02, 3.143500061035156e+02, 3.143500061035156e+02, 3.135061340332031e+02, 3.10395263671875e+02, 3.092682189941406e+02, 3.051466064453125e+02, 3.024813842773438e+02, 3.00330810546875e+02, 2.96668212890625e+02, 2.93754638671875e+02, 2.931839904785156e+02, 2.931519165039062e+02, 2.931501159667969e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.932078857421875e+02, 2.956826477050781e+02, 3.005314025878906e+02, 3.072241516113282e+02, 3.033242187499999e+02, 2.990586242675782e+02, 2.957109985351562e+02, 2.933992004394531e+02, 2.931640014648438e+02, 2.931507873535156e+02, 2.931500549316406e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.991109008789062e+02, 3.109552001953125e+02, 3.094413757324219e+02, 3.066828002929688e+02, 3.0408203125e+02, 3.017157592773438e+02, 2.993525390625e+02, 2.969236145019531e+02, 2.945028991699219e+02, 2.932390747070312e+02, 2.93155029296875e+02, 2.931502685546875e+02, 2.931500244140625e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_Guideline36Spring.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_Guideline36Spring.txt
index 374664d7aae..fd70c6495ea 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_Guideline36Spring.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_Guideline36Spring.txt
@@ -1,4 +1,4 @@
-last-generated=2024-06-04
+last-generated=2024-06-27
 statistics-initialization=
 {
   "linear": "0",
@@ -13,25 +13,25 @@ statistics-simulation=
   "numerical Jacobians": "0"
 }
 time=[7.344e+06, 7.776e+06]
-flo.sou.TAir=[2.931499938964844e+02, 2.942518005371094e+02, 2.940142517089844e+02, 2.94004638671875e+02, 2.940405578613281e+02, 2.938414001464844e+02, 2.948139953613281e+02, 2.952901000976562e+02, 2.956340637207031e+02, 2.960728454589844e+02, 2.967015991210938e+02, 2.969202880859375e+02, 2.9677490234375e+02, 2.965321350097656e+02, 2.956677551269531e+02, 2.953677978515625e+02, 2.957159118652344e+02, 2.957244567871094e+02, 2.953482971191406e+02, 2.952844543457031e+02, 2.948212890625e+02, 2.946593017578125e+02, 2.943446044921875e+02, 2.94142578125e+02, 2.94034912109375e+02, 2.938398132324219e+02, 2.951175842285156e+02, 2.955911865234375e+02, 2.957947387695312e+02, 2.960782165527344e+02, 2.957382507324219e+02, 2.962989196777344e+02, 2.962835998535156e+02, 2.963830871582031e+02, 2.952289428710938e+02, 2.945657043457031e+02, 2.946719970703125e+02, 2.947386169433594e+02, 2.943573608398438e+02, 2.942354736328125e+02, 2.9367529296875e+02, 2.936774291992188e+02, 2.932246398925781e+02, 2.932254028320312e+02, 2.932410583496094e+02, 2.933031616210938e+02, 2.944398803710938e+02, 2.949767150878906e+02, 2.954196166992188e+02, 2.958232116699219e+02, 2.9580126953125e+02, 2.963072509765625e+02, 2.964844970703125e+02, 2.959389343261719e+02, 2.94743896484375e+02, 2.941639709472656e+02, 2.937038269042969e+02, 2.935302124023438e+02, 2.931795043945312e+02, 2.929072265625e+02, 2.925633544921875e+02, 2.924517517089844e+02, 2.92049560546875e+02, 2.919580993652344e+02, 2.92232421875e+02, 2.932914428710938e+02, 2.940993957519531e+02, 2.942129516601562e+02, 2.942314758300781e+02, 2.947012023925781e+02, 2.946330261230469e+02, 2.950075988769531e+02, 2.950848999023438e+02, 2.949538879394531e+02, 2.938915710449219e+02, 2.932795715332031e+02, 2.92618408203125e+02, 2.918196716308594e+02, 2.916906433105469e+02, 2.914554748535156e+02, 2.912203369140625e+02, 2.909005737304688e+02, 2.906961975097656e+02, 2.9108642578125e+02, 2.932967224121094e+02, 2.930474548339844e+02, 2.9377490234375e+02, 2.934341735839844e+02, 2.934924011230469e+02, 2.937361755371094e+02, 2.938057250976562e+02, 2.940539855957031e+02, 2.935741882324219e+02, 2.935567932128906e+02, 2.931085510253906e+02, 2.929783630371094e+02, 2.914246215820312e+02, 2.915162048339844e+02, 2.911137390136719e+02, 2.909371643066406e+02, 2.906827392578125e+02]
-flo.eas.TAir=[2.931499938964844e+02, 2.943607177734375e+02, 2.941254577636719e+02, 2.9408349609375e+02, 2.941084594726562e+02, 2.939563598632812e+02, 2.952052612304688e+02, 2.955888061523438e+02, 2.958816528320312e+02, 2.962846984863281e+02, 2.961318664550781e+02, 2.962108154296875e+02, 2.962127990722656e+02, 2.960614318847656e+02, 2.953103637695312e+02, 2.950506286621094e+02, 2.954169921875e+02, 2.954703063964844e+02, 2.951476745605469e+02, 2.947302856445312e+02, 2.948985595703125e+02, 2.947747192382812e+02, 2.944292907714844e+02, 2.939411010742188e+02, 2.93808349609375e+02, 2.938201599121094e+02, 2.951687316894531e+02, 2.955244445800781e+02, 2.957059631347656e+02, 2.959212646484375e+02, 2.954237365722656e+02, 2.957197875976562e+02, 2.960868225097656e+02, 2.957644958496094e+02, 2.950110168457031e+02, 2.944849243164062e+02, 2.945781860351562e+02, 2.946477661132812e+02, 2.943169250488281e+02, 2.93897216796875e+02, 2.935617370605469e+02, 2.937859497070312e+02, 2.931438598632812e+02, 2.933635559082031e+02, 2.931993713378906e+02, 2.932549133300781e+02, 2.944266052246094e+02, 2.9494677734375e+02, 2.953578491210938e+02, 2.956845397949219e+02, 2.955903015136719e+02, 2.960727233886719e+02, 2.962575988769531e+02, 2.954399108886719e+02, 2.941080627441406e+02, 2.937167663574219e+02, 2.935766296386719e+02, 2.932333374023438e+02, 2.930461730957031e+02, 2.927940979003906e+02, 2.924325561523438e+02, 2.92408203125e+02, 2.925010070800781e+02, 2.916656494140625e+02, 2.918818359375e+02, 2.935294494628906e+02, 2.938166198730469e+02, 2.935456848144531e+02, 2.933368530273438e+02, 2.9363818359375e+02, 2.935228576660156e+02, 2.93846435546875e+02, 2.939425964355469e+02, 2.936954040527344e+02, 2.931281433105469e+02, 2.931543273925781e+02, 2.920583190917969e+02, 2.91599365234375e+02, 2.913486633300781e+02, 2.91207763671875e+02, 2.909976196289062e+02, 2.906690368652344e+02, 2.903882141113281e+02, 2.906227111816406e+02, 2.928739929199219e+02, 2.930084228515625e+02, 2.939721984863281e+02, 2.932311096191406e+02, 2.938916625976562e+02, 2.942246704101562e+02, 2.941202087402344e+02, 2.943849792480469e+02, 2.944619445800781e+02, 2.943881225585938e+02, 2.932728881835938e+02, 2.931341552734375e+02, 2.918410339355469e+02, 2.916276550292969e+02, 2.908737487792969e+02, 2.907048950195312e+02, 2.904671936035156e+02]
-flo.nor.TAir=[2.931499938964844e+02, 2.944277954101562e+02, 2.942029724121094e+02, 2.941694946289062e+02, 2.941812744140625e+02, 2.940569763183594e+02, 2.950948791503906e+02, 2.955167846679688e+02, 2.958139953613281e+02, 2.961620788574219e+02, 2.96035888671875e+02, 2.961139831542969e+02, 2.960927124023438e+02, 2.959610290527344e+02, 2.95212158203125e+02, 2.950011291503906e+02, 2.9538916015625e+02, 2.954670715332031e+02, 2.952782897949219e+02, 2.949298095703125e+02, 2.948929138183594e+02, 2.947760620117188e+02, 2.945750732421875e+02, 2.942435302734375e+02, 2.937456665039062e+02, 2.935557861328125e+02, 2.950379638671875e+02, 2.95468994140625e+02, 2.954435119628906e+02, 2.95675537109375e+02, 2.955196533203125e+02, 2.957717895507812e+02, 2.956101379394531e+02, 2.962076721191406e+02, 2.95086181640625e+02, 2.945099487304688e+02, 2.945525207519531e+02, 2.9470849609375e+02, 2.944474487304688e+02, 2.941045532226562e+02, 2.938964233398438e+02, 2.93645751953125e+02, 2.935393981933594e+02, 2.933162231445312e+02, 2.9336572265625e+02, 2.933574523925781e+02, 2.944525451660156e+02, 2.949387817382812e+02, 2.953424377441406e+02, 2.956788940429688e+02, 2.955834655761719e+02, 2.960719604492188e+02, 2.962697448730469e+02, 2.956948852539062e+02, 2.944246826171875e+02, 2.9413916015625e+02, 2.941560363769531e+02, 2.93158447265625e+02, 2.928224182128906e+02, 2.925720825195312e+02, 2.921932373046875e+02, 2.921567687988281e+02, 2.918478393554688e+02, 2.915712585449219e+02, 2.917450866699219e+02, 2.933017272949219e+02, 2.939558410644531e+02, 2.94140625e+02, 2.941197204589844e+02, 2.939062194824219e+02, 2.93957275390625e+02, 2.940413208007812e+02, 2.941367797851562e+02, 2.939085693359375e+02, 2.936510925292969e+02, 2.930814819335938e+02, 2.925189514160156e+02, 2.925960998535156e+02, 2.919107055664062e+02, 2.91829833984375e+02, 2.916651916503906e+02, 2.913892211914062e+02, 2.909985656738281e+02, 2.912325439453125e+02, 2.933930358886719e+02, 2.933450317382812e+02, 2.938006591796875e+02, 2.936648864746094e+02, 2.939733276367188e+02, 2.943131103515625e+02, 2.942134399414062e+02, 2.944901123046875e+02, 2.945656433105469e+02, 2.94489013671875e+02, 2.933674926757812e+02, 2.931277465820312e+02, 2.92344970703125e+02, 2.91990234375e+02, 2.914568481445312e+02, 2.91254638671875e+02, 2.909719848632812e+02]
-flo.wes.TAir=[2.931499938964844e+02, 2.945223693847656e+02, 2.942899780273438e+02, 2.942921447753906e+02, 2.942726440429688e+02, 2.940980834960938e+02, 2.950139770507812e+02, 2.951942749023438e+02, 2.957775573730469e+02, 2.959187622070312e+02, 2.958677368164062e+02, 2.960164489746094e+02, 2.963088073730469e+02, 2.96389404296875e+02, 2.954437255859375e+02, 2.95381591796875e+02, 2.955928649902344e+02, 2.9562255859375e+02, 2.953897094726562e+02, 2.950204467773438e+02, 2.948876647949219e+02, 2.947523803710938e+02, 2.942259521484375e+02, 2.9426513671875e+02, 2.942348022460938e+02, 2.941430969238281e+02, 2.9509716796875e+02, 2.955281066894531e+02, 2.957311096191406e+02, 2.959422912597656e+02, 2.955986022949219e+02, 2.961285095214844e+02, 2.961756591796875e+02, 2.963316040039062e+02, 2.952019958496094e+02, 2.945416564941406e+02, 2.947306823730469e+02, 2.947003784179688e+02, 2.942121887207031e+02, 2.938545227050781e+02, 2.93493408203125e+02, 2.934443359375e+02, 2.930549621582031e+02, 2.930410461425781e+02, 2.930809020996094e+02, 2.930502014160156e+02, 2.942101745605469e+02, 2.948584289550781e+02, 2.952794189453125e+02, 2.956333618164062e+02, 2.955498046875e+02, 2.960603942871094e+02, 2.960413818359375e+02, 2.958511962890625e+02, 2.947389526367188e+02, 2.941790771484375e+02, 2.940502014160156e+02, 2.938433227539062e+02, 2.935429077148438e+02, 2.932601318359375e+02, 2.929456787109375e+02, 2.927792663574219e+02, 2.925358581542969e+02, 2.923004455566406e+02, 2.923827209472656e+02, 2.937028503417969e+02, 2.940659790039062e+02, 2.941471557617188e+02, 2.94127685546875e+02, 2.945350341796875e+02, 2.944406433105469e+02, 2.948615417480469e+02, 2.950089416503906e+02, 2.949461364746094e+02, 2.939334411621094e+02, 2.933101501464844e+02, 2.931208190917969e+02, 2.924385986328125e+02, 2.918880004882812e+02, 2.917533569335938e+02, 2.915511779785156e+02, 2.912576904296875e+02, 2.909193115234375e+02, 2.912815856933594e+02, 2.93544921875e+02, 2.937546691894531e+02, 2.93741455078125e+02, 2.9359716796875e+02, 2.939134521484375e+02, 2.939386596679688e+02, 2.93636962890625e+02, 2.93698486328125e+02, 2.937110290527344e+02, 2.933810424804688e+02, 2.930087585449219e+02, 2.932338562011719e+02, 2.912120056152344e+02, 2.911712341308594e+02, 2.906649475097656e+02, 2.905157775878906e+02, 2.902961730957031e+02]
-flo.cor.TAir=[2.931499938964844e+02, 2.947085876464844e+02, 2.944820861816406e+02, 2.944397583007812e+02, 2.944443054199219e+02, 2.943189086914062e+02, 2.952685241699219e+02, 2.956892395019531e+02, 2.960123291015625e+02, 2.963190002441406e+02, 2.962754516601562e+02, 2.963987731933594e+02, 2.963377990722656e+02, 2.961873779296875e+02, 2.954172058105469e+02, 2.952353820800781e+02, 2.9566015625e+02, 2.95765380859375e+02, 2.955457458496094e+02, 2.9526171875e+02, 2.95140625e+02, 2.950243530273438e+02, 2.947120361328125e+02, 2.944979858398438e+02, 2.942648620605469e+02, 2.9413134765625e+02, 2.953308715820312e+02, 2.958145141601562e+02, 2.959176635742188e+02, 2.961094970703125e+02, 2.957645874023438e+02, 2.9621044921875e+02, 2.962149658203125e+02, 2.964538269042969e+02, 2.954117736816406e+02, 2.948006591796875e+02, 2.94952392578125e+02, 2.950171813964844e+02, 2.946920471191406e+02, 2.944110412597656e+02, 2.940693664550781e+02, 2.940016784667969e+02, 2.936591186523438e+02, 2.936202087402344e+02, 2.935947570800781e+02, 2.936109619140625e+02, 2.946942138671875e+02, 2.952221984863281e+02, 2.956065979003906e+02, 2.959126281738281e+02, 2.95776611328125e+02, 2.962748718261719e+02, 2.964566955566406e+02, 2.960120544433594e+02, 2.948049011230469e+02, 2.943713989257812e+02, 2.942803649902344e+02, 2.938338012695312e+02, 2.935406494140625e+02, 2.932779846191406e+02, 2.929423522949219e+02, 2.928543701171875e+02, 2.925734558105469e+02, 2.923194580078125e+02, 2.923816528320312e+02, 2.935729064941406e+02, 2.944408569335938e+02, 2.944308166503906e+02, 2.943106689453125e+02, 2.945057983398438e+02, 2.944218139648438e+02, 2.947158813476562e+02, 2.948136901855469e+02, 2.946628723144531e+02, 2.93975830078125e+02, 2.935427856445312e+02, 2.930587158203125e+02, 2.925823669433594e+02, 2.922903442382812e+02, 2.92109130859375e+02, 2.918943786621094e+02, 2.916085815429688e+02, 2.913472595214844e+02, 2.914310913085938e+02, 2.936342163085938e+02, 2.932184448242188e+02, 2.942257690429688e+02, 2.939205017089844e+02, 2.941414184570312e+02, 2.943857421875e+02, 2.942860412597656e+02, 2.945604858398438e+02, 2.943698120117188e+02, 2.942889099121094e+02, 2.935816345214844e+02, 2.933213500976562e+02, 2.922751159667969e+02, 2.92176513671875e+02, 2.917010192871094e+02, 2.915051574707031e+02, 2.912328796386719e+02]
+flo.sou.TAir=[2.931499938964844e+02, 2.942518005371094e+02, 2.940142517089844e+02, 2.94004638671875e+02, 2.940405578613281e+02, 2.938414001464844e+02, 2.948141174316406e+02, 2.952901000976562e+02, 2.956340942382812e+02, 2.960728454589844e+02, 2.967015686035156e+02, 2.969202880859375e+02, 2.9677490234375e+02, 2.965321350097656e+02, 2.956677551269531e+02, 2.953677978515625e+02, 2.957159729003906e+02, 2.957244567871094e+02, 2.953482971191406e+02, 2.952844543457031e+02, 2.948212890625e+02, 2.946593017578125e+02, 2.943445739746094e+02, 2.94142578125e+02, 2.94034912109375e+02, 2.938398132324219e+02, 2.951177062988281e+02, 2.955912170410156e+02, 2.957947387695312e+02, 2.960781860351562e+02, 2.957383422851562e+02, 2.962989196777344e+02, 2.962835998535156e+02, 2.963831481933594e+02, 2.952289733886719e+02, 2.94565673828125e+02, 2.946720275878906e+02, 2.947385864257812e+02, 2.943573303222656e+02, 2.942354431152344e+02, 2.9367529296875e+02, 2.936774291992188e+02, 2.932246398925781e+02, 2.932254028320312e+02, 2.932410583496094e+02, 2.932660522460938e+02, 2.944244689941406e+02, 2.949864196777344e+02, 2.954228820800781e+02, 2.9582861328125e+02, 2.958042907714844e+02, 2.963097229003906e+02, 2.965027770996094e+02, 2.959795532226562e+02, 2.947296752929688e+02, 2.941712341308594e+02, 2.937062072753906e+02, 2.935320739746094e+02, 2.931811218261719e+02, 2.929087219238281e+02, 2.92564697265625e+02, 2.924530029296875e+02, 2.920506896972656e+02, 2.919591369628906e+02, 2.920897216796875e+02, 2.933274841308594e+02, 2.941010131835938e+02, 2.942149047851562e+02, 2.942333068847656e+02, 2.947025756835938e+02, 2.946341857910156e+02, 2.950085754394531e+02, 2.950857849121094e+02, 2.949546508789062e+02, 2.938925170898438e+02, 2.932800903320312e+02, 2.926189575195312e+02, 2.918202514648438e+02, 2.91691162109375e+02, 2.914559936523438e+02, 2.912207946777344e+02, 2.909010009765625e+02, 2.906965637207031e+02, 2.909440612792969e+02, 2.933694763183594e+02, 2.931763000488281e+02, 2.937714538574219e+02, 2.934387817382812e+02, 2.9349072265625e+02, 2.937356567382812e+02, 2.938055419921875e+02, 2.940538940429688e+02, 2.9357421875e+02, 2.93556884765625e+02, 2.931084899902344e+02, 2.929783630371094e+02, 2.914248962402344e+02, 2.915162963867188e+02, 2.911138000488281e+02, 2.90937255859375e+02, 2.906828002929688e+02]
+flo.eas.TAir=[2.931499938964844e+02, 2.943606872558594e+02, 2.941254272460938e+02, 2.9408349609375e+02, 2.941084594726562e+02, 2.939563598632812e+02, 2.952054748535156e+02, 2.955888366699219e+02, 2.958816833496094e+02, 2.962846984863281e+02, 2.961318359375e+02, 2.962108154296875e+02, 2.962127990722656e+02, 2.960614318847656e+02, 2.953104553222656e+02, 2.950506286621094e+02, 2.954171142578125e+02, 2.954703063964844e+02, 2.951476745605469e+02, 2.947302856445312e+02, 2.948985595703125e+02, 2.947746887207031e+02, 2.944292907714844e+02, 2.939411010742188e+02, 2.93808349609375e+02, 2.938201293945312e+02, 2.951689147949219e+02, 2.955244750976562e+02, 2.957059936523438e+02, 2.959212341308594e+02, 2.954237976074219e+02, 2.957197875976562e+02, 2.960868530273438e+02, 2.957645263671875e+02, 2.95010986328125e+02, 2.944848937988281e+02, 2.945782470703125e+02, 2.946477355957031e+02, 2.943169250488281e+02, 2.93897216796875e+02, 2.935617370605469e+02, 2.937859191894531e+02, 2.931438293457031e+02, 2.93363525390625e+02, 2.931993713378906e+02, 2.931679077148438e+02, 2.9441650390625e+02, 2.949568481445312e+02, 2.953612976074219e+02, 2.956897277832031e+02, 2.955934143066406e+02, 2.960752563476562e+02, 2.962755432128906e+02, 2.954825744628906e+02, 2.940953063964844e+02, 2.937236938476562e+02, 2.935790405273438e+02, 2.932351684570312e+02, 2.930478210449219e+02, 2.927956237792969e+02, 2.924338989257812e+02, 2.924094543457031e+02, 2.925021667480469e+02, 2.916666870117188e+02, 2.917328186035156e+02, 2.934412536621094e+02, 2.938174133300781e+02, 2.935469360351562e+02, 2.93338134765625e+02, 2.9363916015625e+02, 2.935237426757812e+02, 2.938472290039062e+02, 2.939432983398438e+02, 2.93696044921875e+02, 2.931281433105469e+02, 2.93154296875e+02, 2.920586547851562e+02, 2.915998840332031e+02, 2.9134912109375e+02, 2.912082214355469e+02, 2.909980163574219e+02, 2.9066943359375e+02, 2.903885498046875e+02, 2.9054296875e+02, 2.929259033203125e+02, 2.93119384765625e+02, 2.939667053222656e+02, 2.932366333007812e+02, 2.938904418945312e+02, 2.942244873046875e+02, 2.941203308105469e+02, 2.943851928710938e+02, 2.94462158203125e+02, 2.943883666992188e+02, 2.932731018066406e+02, 2.931341247558594e+02, 2.918411560058594e+02, 2.916278076171875e+02, 2.908739624023438e+02, 2.907050476074219e+02, 2.904673767089844e+02]
+flo.nor.TAir=[2.931499938964844e+02, 2.944277954101562e+02, 2.942030029296875e+02, 2.941694946289062e+02, 2.941812744140625e+02, 2.940569763183594e+02, 2.950948486328125e+02, 2.955167846679688e+02, 2.958139953613281e+02, 2.961620788574219e+02, 2.96035888671875e+02, 2.961139831542969e+02, 2.960927124023438e+02, 2.959610290527344e+02, 2.952121276855469e+02, 2.950011291503906e+02, 2.9538916015625e+02, 2.954670715332031e+02, 2.952782897949219e+02, 2.949298095703125e+02, 2.948928833007812e+02, 2.947760620117188e+02, 2.945750427246094e+02, 2.942435302734375e+02, 2.937456665039062e+02, 2.935557861328125e+02, 2.950379333496094e+02, 2.95468994140625e+02, 2.954435119628906e+02, 2.95675537109375e+02, 2.955196533203125e+02, 2.957717895507812e+02, 2.956101379394531e+02, 2.962076416015625e+02, 2.95086181640625e+02, 2.945099792480469e+02, 2.945525207519531e+02, 2.9470849609375e+02, 2.944474487304688e+02, 2.941045532226562e+02, 2.938964538574219e+02, 2.93645751953125e+02, 2.935393981933594e+02, 2.933162231445312e+02, 2.9336572265625e+02, 2.933244934082031e+02, 2.944441528320312e+02, 2.949486389160156e+02, 2.953457946777344e+02, 2.956839294433594e+02, 2.955865173339844e+02, 2.96074462890625e+02, 2.962878723144531e+02, 2.957361450195312e+02, 2.9441162109375e+02, 2.941461181640625e+02, 2.941581420898438e+02, 2.9316015625e+02, 2.92823974609375e+02, 2.925734558105469e+02, 2.921945190429688e+02, 2.92157958984375e+02, 2.918489074707031e+02, 2.915722961425781e+02, 2.916242065429688e+02, 2.933084411621094e+02, 2.939536437988281e+02, 2.9414111328125e+02, 2.941204528808594e+02, 2.939070434570312e+02, 2.939579467773438e+02, 2.940419311523438e+02, 2.941373596191406e+02, 2.939091186523438e+02, 2.936514892578125e+02, 2.930815124511719e+02, 2.925194091796875e+02, 2.925964050292969e+02, 2.919110717773438e+02, 2.918302307128906e+02, 2.9166552734375e+02, 2.913895568847656e+02, 2.909989013671875e+02, 2.911096801757812e+02, 2.934256286621094e+02, 2.929584045410156e+02, 2.938005981445312e+02, 2.936707153320312e+02, 2.939719848632812e+02, 2.943127746582031e+02, 2.942134094238281e+02, 2.944901733398438e+02, 2.945657653808594e+02, 2.944891967773438e+02, 2.9336767578125e+02, 2.931277160644531e+02, 2.923450927734375e+02, 2.919903869628906e+02, 2.9145703125e+02, 2.912548217773438e+02, 2.909721374511719e+02]
+flo.wes.TAir=[2.931499938964844e+02, 2.945224304199219e+02, 2.942900085449219e+02, 2.942921447753906e+02, 2.942726440429688e+02, 2.940981140136719e+02, 2.950138854980469e+02, 2.951942749023438e+02, 2.957775573730469e+02, 2.959187316894531e+02, 2.958677368164062e+02, 2.960164489746094e+02, 2.963088073730469e+02, 2.96389404296875e+02, 2.954436645507812e+02, 2.953816223144531e+02, 2.955928344726562e+02, 2.9562255859375e+02, 2.953897399902344e+02, 2.950204772949219e+02, 2.948876647949219e+02, 2.947523803710938e+02, 2.942259216308594e+02, 2.942651672363281e+02, 2.942347717285156e+02, 2.941431274414062e+02, 2.950970764160156e+02, 2.955281066894531e+02, 2.957311096191406e+02, 2.959423217773438e+02, 2.955985412597656e+02, 2.961285095214844e+02, 2.961756591796875e+02, 2.963315734863281e+02, 2.952019958496094e+02, 2.945416870117188e+02, 2.947306823730469e+02, 2.947003784179688e+02, 2.942121887207031e+02, 2.938545227050781e+02, 2.93493408203125e+02, 2.934443359375e+02, 2.930549621582031e+02, 2.930410461425781e+02, 2.930809020996094e+02, 2.930228576660156e+02, 2.94195068359375e+02, 2.948680114746094e+02, 2.95282470703125e+02, 2.956381225585938e+02, 2.955526123046875e+02, 2.960627136230469e+02, 2.960586853027344e+02, 2.958908386230469e+02, 2.947256469726562e+02, 2.941861267089844e+02, 2.94052490234375e+02, 2.938451538085938e+02, 2.935445556640625e+02, 2.932615966796875e+02, 2.929471130371094e+02, 2.927805480957031e+02, 2.925369873046875e+02, 2.923015441894531e+02, 2.922288208007812e+02, 2.937557983398438e+02, 2.940677795410156e+02, 2.941490478515625e+02, 2.941294860839844e+02, 2.945367736816406e+02, 2.944420166015625e+02, 2.948627014160156e+02, 2.950099487304688e+02, 2.949469909667969e+02, 2.939342041015625e+02, 2.933108215332031e+02, 2.931215515136719e+02, 2.924392700195312e+02, 2.918886108398438e+02, 2.917539367675781e+02, 2.915516967773438e+02, 2.912581787109375e+02, 2.909197387695312e+02, 2.911336364746094e+02, 2.935345764160156e+02, 2.929509582519531e+02, 2.937495727539062e+02, 2.936039123535156e+02, 2.939127807617188e+02, 2.939387817382812e+02, 2.9363720703125e+02, 2.936987609863281e+02, 2.937113037109375e+02, 2.933813781738281e+02, 2.930087585449219e+02, 2.932337951660156e+02, 2.912123413085938e+02, 2.911715087890625e+02, 2.906652221679688e+02, 2.905159912109375e+02, 2.902964172363281e+02]
+flo.cor.TAir=[2.931499938964844e+02, 2.947086181640625e+02, 2.944820861816406e+02, 2.944397583007812e+02, 2.944443054199219e+02, 2.943189086914062e+02, 2.952683715820312e+02, 2.956892395019531e+02, 2.960123291015625e+02, 2.963190002441406e+02, 2.962754211425781e+02, 2.963987731933594e+02, 2.963377990722656e+02, 2.961873779296875e+02, 2.95417236328125e+02, 2.952354125976562e+02, 2.956600646972656e+02, 2.957654113769531e+02, 2.955457458496094e+02, 2.9526171875e+02, 2.951405944824219e+02, 2.950243835449219e+02, 2.947120361328125e+02, 2.944980163574219e+02, 2.942648620605469e+02, 2.9413134765625e+02, 2.953307189941406e+02, 2.958144836425781e+02, 2.959176635742188e+02, 2.961094970703125e+02, 2.957645568847656e+02, 2.9621044921875e+02, 2.962149658203125e+02, 2.96453857421875e+02, 2.954117431640625e+02, 2.948006591796875e+02, 2.949523620605469e+02, 2.950171813964844e+02, 2.946920471191406e+02, 2.944110412597656e+02, 2.940693969726562e+02, 2.940016479492188e+02, 2.936591186523438e+02, 2.936202087402344e+02, 2.935947570800781e+02, 2.935865783691406e+02, 2.946832885742188e+02, 2.952317199707031e+02, 2.95609619140625e+02, 2.959183654785156e+02, 2.957795715332031e+02, 2.962772827148438e+02, 2.964755554199219e+02, 2.960562438964844e+02, 2.947912292480469e+02, 2.943786315917969e+02, 2.942827453613281e+02, 2.938356323242188e+02, 2.935422973632812e+02, 2.932794799804688e+02, 2.929437255859375e+02, 2.928556213378906e+02, 2.925745849609375e+02, 2.92320556640625e+02, 2.922611083984375e+02, 2.935832214355469e+02, 2.944406433105469e+02, 2.9443212890625e+02, 2.943119201660156e+02, 2.945068359375e+02, 2.944227294921875e+02, 2.947166748046875e+02, 2.948144226074219e+02, 2.946635437011719e+02, 2.939762878417969e+02, 2.935431213378906e+02, 2.930592956542969e+02, 2.925829467773438e+02, 2.922908325195312e+02, 2.921096496582031e+02, 2.918948364257812e+02, 2.916089782714844e+02, 2.9134765625e+02, 2.9132373046875e+02, 2.937080993652344e+02, 2.932012634277344e+02, 2.94225830078125e+02, 2.939266662597656e+02, 2.941401672363281e+02, 2.943856201171875e+02, 2.942861938476562e+02, 2.945607299804688e+02, 2.943700561523438e+02, 2.942892150878906e+02, 2.935819091796875e+02, 2.933215637207031e+02, 2.922755126953125e+02, 2.921767578125e+02, 2.917012939453125e+02, 2.9150537109375e+02, 2.912330932617188e+02]
 hvac.TZonSet[1].TCooSet=[3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02]
 hvac.TZonSet[1].THeaSet=[2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02]
-hvac.fanSup.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.621593475341797e-01, 3.046397268772125e-01, 3.050566911697388e-01, 3.00453782081604e-01, 3.012813925743103e-01, 3.02350640296936e-01, 3.014130592346191e-01, 3.030804991722107e-01, 3.011135160923004e-01, 3.010886907577515e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.623462677001953e-01, 3.049411177635193e-01, 3.047096431255341e-01, 3.004977703094482e-01, 3.012484610080719e-01, 3.014520704746246e-01, 3.016365766525269e-01, 3.017139434814453e-01, 3.015846908092499e-01, 3.015652596950531e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.412079334259033e-01, 2.738633155822754e-01, 3.051111102104187e-01, 3.032630681991577e-01, 3.007001876831055e-01, 3.013338148593903e-01, 3.015822768211365e-01, 3.015322983264923e-01, 3.015077412128448e-01, 3.01438182592392e-01, 3.017248511314392e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.128272354602814e-01, 3.033983111381531e-01, 2.835887670516968e-01, 3.054104447364807e-01, 3.026190996170044e-01, 3.003063797950745e-01, 3.013795912265778e-01, 3.015655875205994e-01, 3.015499413013458e-01, 3.0158931016922e-01, 3.019299507141113e-01, 3.015898466110229e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.932908147573471e-01, 4.556164741516113e-01, 2.799632847309113e-01, 3.073515295982361e-01, 3.06749701499939e-01, 3.002643585205078e-01, 3.008608520030975e-01, 3.015637993812561e-01, 3.016895055770874e-01, 3.015410006046295e-01, 3.015746772289276e-01, 3.016996383666992e-01, 3.136773109436035e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-hvac.VAVBox[5].vav.y_actual=[1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.724461913108826e-01, 6.904550790786743e-01, 6.462990045547485e-01, 6.490709185600281e-01, 6.52013897895813e-01, 6.458005905151367e-01, 6.457749009132385e-01, 6.485351324081421e-01, 6.462972164154053e-01, 6.488084197044373e-01, 6.366928288828862e-17, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.717963218688965e-01, 6.863148808479309e-01, 6.444534659385681e-01, 6.482348442077637e-01, 6.508299708366394e-01, 6.507869958877563e-01, 6.501391530036926e-01, 6.504166126251221e-01, 6.489003300666809e-01, 6.496233940124512e-01, 1.617887026867775e-17, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.560595571994781e-01, 6.732268333435059e-01, 6.714154481887817e-01, 6.440800428390503e-01, 6.479161381721497e-01, 6.493750214576721e-01, 6.489534378051758e-01, 6.492507457733154e-01, 6.493229269981384e-01, 6.51049017906189e-01, 6.500763893127441e-01, 7.867348554960838e-17, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 0e+00, 4.261985421180725e-01, 1.527116149663925e-01, 6.745774149894714e-01, 6.633923053741455e-01, 6.433779001235962e-01, 6.492668390274048e-01, 6.521162986755371e-01, 6.514816880226135e-01, 6.516136527061462e-01, 6.515596508979797e-01, 6.503340601921082e-01, 6.490375995635986e-01, 2.044526190025374e-18, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 6.125887036323547e-01, 3.987981081008911e-01, 1.607957184314728e-01, 6.853299736976624e-01, 6.414278149604797e-01, 6.466428637504578e-01, 6.528117060661316e-01, 6.519969701766968e-01, 6.508395671844482e-01, 6.511942148208618e-01, 6.513200998306274e-01, 6.512209177017212e-01, 6.733075976371765e-01, 1.316021193514716e-18, 0e+00, -0e+00, -0e+00, -0e+00]
-hvac.VAVBox[1].vav.y_actual=[1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.72446608543396e-01, 6.904555559158325e-01, 6.462993621826172e-01, 6.490712761878967e-01, 6.520143151283264e-01, 6.458010077476501e-01, 6.457752585411072e-01, 6.485354900360107e-01, 6.462975740432739e-01, 6.488088369369507e-01, 6.366932259295802e-17, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.717967391014099e-01, 6.863153576850891e-01, 6.444538235664368e-01, 6.482352614402771e-01, 6.508303880691528e-01, 6.507874131202698e-01, 6.501395106315613e-01, 6.504170298576355e-01, 6.489007472991943e-01, 6.496238112449646e-01, 1.617888184920632e-17, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 2.560595571994781e-01, 6.732273101806641e-01, 6.714158654212952e-01, 6.440804600715637e-01, 6.479164958000183e-01, 6.493754386901855e-01, 6.489538550376892e-01, 6.492511630058289e-01, 6.493233442306519e-01, 6.510494351387024e-01, 6.500768065452576e-01, 7.867353187172269e-17, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 0e+00, 4.909475147724152e-01, 3.229160308837891e-01, 6.776407361030579e-01, 6.634693145751953e-01, 6.433796286582947e-01, 6.49267315864563e-01, 6.521167159080505e-01, 6.51482105255127e-01, 6.516140699386597e-01, 6.515600681304932e-01, 6.503344774246216e-01, 6.490380167961121e-01, 2.044527430796293e-18, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 7.987908720970154e-01, 4.437265694141388e-01, 6.540557742118835e-01, 6.943394541740417e-01, 6.415979266166687e-01, 6.466462016105652e-01, 6.528121829032898e-01, 6.519973874092102e-01, 6.508399844169617e-01, 6.511946320533752e-01, 6.513205170631409e-01, 6.512212753295898e-01, 6.868093609809875e-01, 1.509985534581356e-18, 0e+00, -0e+00, -0e+00, -0e+00]
-hvac.VAVBox[2].vav.y_actual=[1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.59711217880249e-01, 5.768916606903076e-01, 5.455541014671326e-01, 5.478202700614929e-01, 5.500791072845459e-01, 5.452793836593628e-01, 5.452622771263123e-01, 5.474046468734741e-01, 5.4566890001297e-01, 5.476165413856506e-01, 5.373651463636411e-17, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.592309236526489e-01, 5.740923285484314e-01, 5.441480875015259e-01, 5.471725463867188e-01, 5.491724610328674e-01, 5.491392612457275e-01, 5.486395359039307e-01, 5.488508939743042e-01, 5.476860404014587e-01, 5.482432842254639e-01, 1.365500325343555e-17, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.560595571994781e-01, 5.638753175735474e-01, 5.63981294631958e-01, 5.439097881317139e-01, 5.469260811805725e-01, 5.480526089668274e-01, 5.477262139320374e-01, 5.47956109046936e-01, 5.48012912273407e-01, 5.493409633636475e-01, 5.485901236534119e-01, 6.640462359021367e-17, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 6.870181560516357e-01, 5.119040012359619e-01, 5.710743069648743e-01, 5.583901405334473e-01, 5.433791279792786e-01, 5.479736924171448e-01, 5.50156831741333e-01, 5.496706366539001e-01, 5.497723817825317e-01, 5.497304797172546e-01, 5.487849116325378e-01, 5.47793447971344e-01, 1.725139244411885e-18, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 8.380186557769775e-01, 4.644365608692169e-01, 7.805056571960449e-01, 6.563911437988281e-01, 5.431851744651794e-01, 5.459575653076172e-01, 5.506948232650757e-01, 5.500637292861938e-01, 5.491763949394226e-01, 5.494511723518372e-01, 5.495472550392151e-01, 5.49470067024231e-01, 5.660235285758972e-01, 1.104739205938818e-18, 0e+00, -0e+00, -0e+00, -0e+00]
-hvac.VAVBox[3].vav.y_actual=[1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.72446608543396e-01, 6.904555559158325e-01, 6.462993621826172e-01, 6.490712761878967e-01, 6.520143151283264e-01, 6.458010077476501e-01, 6.457752585411072e-01, 6.485354900360107e-01, 6.462975740432739e-01, 6.488088369369507e-01, 6.366932259295802e-17, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.717967391014099e-01, 6.863153576850891e-01, 6.444538235664368e-01, 6.482352614402771e-01, 6.508303880691528e-01, 6.507874131202698e-01, 6.501395106315613e-01, 6.504170298576355e-01, 6.489007472991943e-01, 6.496238112449646e-01, 1.61788801948451e-17, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.560595571994781e-01, 6.732273101806641e-01, 6.714158654212952e-01, 6.440804600715637e-01, 6.479164958000183e-01, 6.493754386901855e-01, 6.489538550376892e-01, 6.492511630058289e-01, 6.493233442306519e-01, 6.510494351387024e-01, 6.500768065452576e-01, 7.867353187172269e-17, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 0e+00, 7.049412727355957e-01, 5.405534505844116e-01, 6.889285445213318e-01, 6.637539863586426e-01, 6.43384575843811e-01, 6.492673754692078e-01, 6.521167159080505e-01, 6.51482105255127e-01, 6.516140699386597e-01, 6.515600681304932e-01, 6.503344774246216e-01, 6.490380167961121e-01, 2.044527430796293e-18, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 7.037038207054138e-01, 4.40165102481842e-01, 6.301756501197815e-01, 6.942503452301025e-01, 6.41596257686615e-01, 6.466461420059204e-01, 6.528121829032898e-01, 6.519973874092102e-01, 6.508399844169617e-01, 6.511946320533752e-01, 6.513205170631409e-01, 6.512212753295898e-01, 6.733080744743347e-01, 1.316022020695328e-18, 0e+00, -0e+00, -0e+00, -0e+00]
-hvac.VAVBox[4].vav.y_actual=[1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.59711217880249e-01, 5.768916606903076e-01, 5.455541014671326e-01, 5.478202700614929e-01, 5.500791072845459e-01, 5.452793836593628e-01, 5.452622771263123e-01, 5.474046468734741e-01, 5.4566890001297e-01, 5.476165413856506e-01, 5.373651463636411e-17, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.592309236526489e-01, 5.740923285484314e-01, 5.441480875015259e-01, 5.471725463867188e-01, 5.491724610328674e-01, 5.491392612457275e-01, 5.486395359039307e-01, 5.488508939743042e-01, 5.476860404014587e-01, 5.482432842254639e-01, 1.365500325343555e-17, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.560595571994781e-01, 5.638753175735474e-01, 5.63981294631958e-01, 5.439097881317139e-01, 5.469260811805725e-01, 5.480526089668274e-01, 5.477262139320374e-01, 5.47956109046936e-01, 5.48012912273407e-01, 5.493409633636475e-01, 5.485901236534119e-01, 6.640462359021367e-17, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 4.2613884806633e-01, 3.252999782562256e-01, 5.693792700767517e-01, 5.583577156066895e-01, 5.433785915374756e-01, 5.479736924171448e-01, 5.50156831741333e-01, 5.496706366539001e-01, 5.497723817825317e-01, 5.497304797172546e-01, 5.487849116325378e-01, 5.47793447971344e-01, 1.725139244411885e-18, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 7.112559676170349e-01, 3.244894742965698e-01, 6.384677886962891e-01, 5.818569660186768e-01, 5.419220924377441e-01, 5.459355711936951e-01, 5.506944060325623e-01, 5.500637292861938e-01, 5.491763949394226e-01, 5.494511723518372e-01, 5.495472550392151e-01, 5.49470067024231e-01, 6.786063313484192e-01, 1.431515045771513e-18, 0e+00, -0e+00, -0e+00, -0e+00]
-hvac.damOut.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.542738258838654e-01, 7.344569563865662e-01, 9.552119374275208e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.540497422218323e-01, 7.341877222061157e-01, 9.553396105766296e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.353055655956268e-01, 7.895528674125671e-01, 9.864115118980408e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.402824878692627e-01, 8.539691567420959e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.736668109893799e-01, 8.75096321105957e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-hvac.VAVBox[1].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.913840942382812e+02, 2.911033935546875e+02, 2.909839477539062e+02, 2.911192932128906e+02, 2.899033203125e+02, 2.871707763671875e+02, 2.862330932617188e+02, 2.855311889648438e+02, 2.876746215820312e+02, 2.904339294433594e+02, 2.912236022949219e+02, 2.912236022949219e+02, 2.912236022949219e+02, 2.912236022949219e+02, 2.912236022949219e+02, 2.912236022949219e+02, 2.912236022949219e+02, 2.912236022949219e+02, 2.912236022949219e+02, 2.912236022949219e+02, 2.91195068359375e+02, 2.913098449707031e+02, 2.9114306640625e+02, 2.902205505371094e+02, 2.898688659667969e+02, 2.90792724609375e+02, 2.911115112304688e+02, 2.913117065429688e+02, 2.911600952148438e+02, 2.911025390625e+02, 2.912890014648438e+02, 2.912890014648438e+02, 2.912890014648438e+02, 2.912890014648438e+02, 2.912890014648438e+02, 2.912890014648438e+02, 2.912890014648438e+02, 2.912890014648438e+02, 2.912890014648438e+02, 3.006282348632812e+02, 2.922716979980469e+02, 2.9114404296875e+02, 2.911447143554688e+02, 2.911249084472656e+02, 2.911508178710938e+02, 2.911509094238281e+02, 2.916791687011719e+02, 2.893001708984375e+02, 2.901407470703125e+02, 2.90977783203125e+02, 2.91122314453125e+02, 2.91122314453125e+02, 2.91122314453125e+02, 2.91122314453125e+02, 2.91122314453125e+02, 2.91122314453125e+02, 2.91122314453125e+02, 2.91122314453125e+02, 3.017958374023438e+02, 2.995386657714844e+02, 2.933390502929688e+02, 2.908175659179688e+02, 2.890733337402344e+02, 2.905823669433594e+02, 2.90965576171875e+02, 2.910634765625e+02, 2.910394897460938e+02, 2.910915222167969e+02, 2.908976135253906e+02, 2.90947021484375e+02, 2.906954040527344e+02, 2.906954040527344e+02, 2.906954040527344e+02, 2.906954040527344e+02, 2.906954040527344e+02, 2.906954040527344e+02, 2.906954040527344e+02, 3.003382568359375e+02, 3.05866943359375e+02, 3.04794677734375e+02, 2.926242065429688e+02, 2.903591918945312e+02, 2.90486572265625e+02, 2.908725280761719e+02, 2.911497192382812e+02, 2.908704223632812e+02, 2.909871826171875e+02, 2.909629516601562e+02, 2.963741149902344e+02, 3.04129638671875e+02, 2.914144287109375e+02, 2.914144287109375e+02, 2.914144287109375e+02, 2.914144287109375e+02, 2.914144287109375e+02]
-hvac.VAVBox[2].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.913828430175781e+02, 2.91103759765625e+02, 2.909837036132812e+02, 2.911192016601562e+02, 2.89905517578125e+02, 2.871714172363281e+02, 2.8623388671875e+02, 2.855303955078125e+02, 2.87673828125e+02, 2.904393310546875e+02, 2.911916809082031e+02, 2.911916809082031e+02, 2.911916809082031e+02, 2.911916809082031e+02, 2.911916809082031e+02, 2.911916809082031e+02, 2.911916809082031e+02, 2.911916809082031e+02, 2.911916809082031e+02, 2.911916809082031e+02, 2.911948852539062e+02, 2.913100891113281e+02, 2.9114306640625e+02, 2.902220153808594e+02, 2.898682250976562e+02, 2.907923278808594e+02, 2.911115417480469e+02, 2.913116149902344e+02, 2.911600952148438e+02, 2.911024780273438e+02, 2.912563171386719e+02, 2.912563171386719e+02, 2.912563171386719e+02, 2.912563171386719e+02, 2.912563171386719e+02, 2.912563171386719e+02, 2.912563171386719e+02, 2.912563171386719e+02, 2.912563171386719e+02, 3.004827270507812e+02, 2.922691955566406e+02, 2.911441040039062e+02, 2.911447143554688e+02, 2.911247253417969e+02, 2.911508178710938e+02, 2.911509094238281e+02, 2.91679931640625e+02, 2.893014831542969e+02, 2.901397705078125e+02, 2.909776916503906e+02, 2.910887756347656e+02, 2.910887756347656e+02, 2.910887756347656e+02, 2.910887756347656e+02, 2.910887756347656e+02, 2.910887756347656e+02, 2.910887756347656e+02, 2.910887756347656e+02, 3.015482788085938e+02, 3.063582458496094e+02, 2.941776123046875e+02, 2.908187866210938e+02, 2.890722351074219e+02, 2.905821228027344e+02, 2.909654846191406e+02, 2.910634155273438e+02, 2.910396728515625e+02, 2.910914001464844e+02, 2.971602172851562e+02, 3.017326965332031e+02, 2.961971130371094e+02, 2.961971130371094e+02, 2.961971130371094e+02, 2.961971130371094e+02, 2.961971130371094e+02, 2.961971130371094e+02, 2.961971130371094e+02, 3.013092346191406e+02, 3.048070373535156e+02, 3.041531677246094e+02, 2.988028564453125e+02, 2.90360595703125e+02, 2.904859924316406e+02, 2.908724060058594e+02, 2.911498107910156e+02, 2.908703918457031e+02, 2.909870910644531e+02, 2.909630126953125e+02, 2.900853881835938e+02, 2.941606140136719e+02, 2.920526428222656e+02, 2.920526428222656e+02, 2.920526428222656e+02, 2.920526428222656e+02, 2.920526428222656e+02]
-hvac.VAVBox[3].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.913840942382812e+02, 2.911033935546875e+02, 2.909839477539062e+02, 2.911192932128906e+02, 2.899033203125e+02, 2.871707763671875e+02, 2.862330932617188e+02, 2.855311889648438e+02, 2.876746215820312e+02, 2.904339294433594e+02, 2.912236022949219e+02, 2.912236022949219e+02, 2.912236022949219e+02, 2.912236022949219e+02, 2.912236022949219e+02, 2.912236022949219e+02, 2.912236022949219e+02, 2.912236022949219e+02, 2.912236022949219e+02, 2.912236022949219e+02, 2.91195068359375e+02, 2.913098449707031e+02, 2.9114306640625e+02, 2.902205505371094e+02, 2.898688659667969e+02, 2.90792724609375e+02, 2.911115112304688e+02, 2.913117065429688e+02, 2.911600952148438e+02, 2.911025390625e+02, 2.912890014648438e+02, 2.912890014648438e+02, 2.912890014648438e+02, 2.912890014648438e+02, 2.912890014648438e+02, 2.912890014648438e+02, 2.912890014648438e+02, 2.912890014648438e+02, 2.912890014648438e+02, 3.007431945800781e+02, 2.922716979980469e+02, 2.9114404296875e+02, 2.911447143554688e+02, 2.911249084472656e+02, 2.911508178710938e+02, 2.911509094238281e+02, 2.916791687011719e+02, 2.893001708984375e+02, 2.901407470703125e+02, 2.90977783203125e+02, 2.91122314453125e+02, 2.91122314453125e+02, 2.91122314453125e+02, 2.91122314453125e+02, 2.91122314453125e+02, 2.91122314453125e+02, 2.91122314453125e+02, 2.91122314453125e+02, 3.015362854003906e+02, 3.069035034179688e+02, 2.970242004394531e+02, 2.908175659179688e+02, 2.890733337402344e+02, 2.905823669433594e+02, 2.90965576171875e+02, 2.910634765625e+02, 2.910394897460938e+02, 2.910915222167969e+02, 2.908976135253906e+02, 2.935763244628906e+02, 2.921036682128906e+02, 2.921036682128906e+02, 2.921036682128906e+02, 2.921036682128906e+02, 2.921036682128906e+02, 2.921036682128906e+02, 2.921036682128906e+02, 3.006026306152344e+02, 3.063911743164062e+02, 2.970657043457031e+02, 2.926242065429688e+02, 2.903591918945312e+02, 2.90486572265625e+02, 2.908725280761719e+02, 2.911497192382812e+02, 2.908704223632812e+02, 2.909871826171875e+02, 2.909629516601562e+02, 2.900841674804688e+02, 2.930913696289062e+02, 2.905649108886719e+02, 2.905649108886719e+02, 2.905649108886719e+02, 2.905649108886719e+02, 2.905649108886719e+02]
-hvac.VAVBox[4].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.913828430175781e+02, 2.91103759765625e+02, 2.909837036132812e+02, 2.911192016601562e+02, 2.89905517578125e+02, 2.871714172363281e+02, 2.8623388671875e+02, 2.855303955078125e+02, 2.87673828125e+02, 2.904393310546875e+02, 2.911916809082031e+02, 2.911916809082031e+02, 2.911916809082031e+02, 2.911916809082031e+02, 2.911916809082031e+02, 2.911916809082031e+02, 2.911916809082031e+02, 2.911916809082031e+02, 2.911916809082031e+02, 2.911916809082031e+02, 2.911948852539062e+02, 2.913100891113281e+02, 2.9114306640625e+02, 2.902220153808594e+02, 2.898682250976562e+02, 2.907923278808594e+02, 2.911115417480469e+02, 2.913116149902344e+02, 2.911600952148438e+02, 2.911024780273438e+02, 2.9125634765625e+02, 2.9125634765625e+02, 2.9125634765625e+02, 2.9125634765625e+02, 2.9125634765625e+02, 2.9125634765625e+02, 2.9125634765625e+02, 2.9125634765625e+02, 2.9125634765625e+02, 3.00521240234375e+02, 2.922691955566406e+02, 2.911441040039062e+02, 2.911447143554688e+02, 2.911247253417969e+02, 2.911508178710938e+02, 2.911509094238281e+02, 2.91679931640625e+02, 2.893014831542969e+02, 2.901397705078125e+02, 2.909776916503906e+02, 2.910888061523438e+02, 2.910888061523438e+02, 2.910888061523438e+02, 2.910888061523438e+02, 2.910888061523438e+02, 2.910888061523438e+02, 2.910888061523438e+02, 2.910888061523438e+02, 3.020601806640625e+02, 2.995389709472656e+02, 2.933377075195312e+02, 2.908187866210938e+02, 2.890722351074219e+02, 2.905821228027344e+02, 2.909654846191406e+02, 2.910634155273438e+02, 2.910396728515625e+02, 2.910914001464844e+02, 2.908975524902344e+02, 2.909468078613281e+02, 2.910099182128906e+02, 2.910099182128906e+02, 2.910099182128906e+02, 2.910099182128906e+02, 2.910099182128906e+02, 2.910099182128906e+02, 2.910099182128906e+02, 3.004199829101562e+02, 2.957411804199219e+02, 3.014879150390625e+02, 2.926241760253906e+02, 2.903606262207031e+02, 2.904859924316406e+02, 2.908724060058594e+02, 2.911498107910156e+02, 2.908703918457031e+02, 2.909870910644531e+02, 2.909630126953125e+02, 3.028333129882812e+02, 3.041577758789062e+02, 2.919365539550781e+02, 2.919365539550781e+02, 2.919365539550781e+02, 2.919365539550781e+02, 2.919365539550781e+02]
-hvac.VAVBox[5].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.913840942382812e+02, 2.911033935546875e+02, 2.909839477539062e+02, 2.911192932128906e+02, 2.899033203125e+02, 2.871707763671875e+02, 2.862330932617188e+02, 2.855311889648438e+02, 2.876746215820312e+02, 2.904339294433594e+02, 2.912236022949219e+02, 2.912236022949219e+02, 2.912236022949219e+02, 2.912236022949219e+02, 2.912236022949219e+02, 2.912236022949219e+02, 2.912236022949219e+02, 2.912236022949219e+02, 2.912236022949219e+02, 2.912236022949219e+02, 2.91195068359375e+02, 2.913098449707031e+02, 2.9114306640625e+02, 2.902205505371094e+02, 2.898688659667969e+02, 2.90792724609375e+02, 2.911115112304688e+02, 2.913117065429688e+02, 2.911600952148438e+02, 2.911025390625e+02, 2.912890319824219e+02, 2.912890319824219e+02, 2.912890319824219e+02, 2.912890319824219e+02, 2.912890319824219e+02, 2.912890319824219e+02, 2.912890319824219e+02, 2.912890319824219e+02, 2.912890319824219e+02, 3.008663940429688e+02, 2.922716979980469e+02, 2.9114404296875e+02, 2.911447143554688e+02, 2.911249084472656e+02, 2.911508178710938e+02, 2.911509094238281e+02, 2.916791687011719e+02, 2.893001708984375e+02, 2.901407470703125e+02, 2.90977783203125e+02, 2.91122314453125e+02, 2.91122314453125e+02, 2.91122314453125e+02, 2.91122314453125e+02, 2.91122314453125e+02, 2.91122314453125e+02, 2.91122314453125e+02, 2.91122314453125e+02, 3.020289001464844e+02, 2.994736328125e+02, 2.933390502929688e+02, 2.908175659179688e+02, 2.890733337402344e+02, 2.905823669433594e+02, 2.90965576171875e+02, 2.910634765625e+02, 2.910394897460938e+02, 2.910915222167969e+02, 2.908976135253906e+02, 2.90947021484375e+02, 2.903614196777344e+02, 2.903614196777344e+02, 2.903614196777344e+02, 2.903614196777344e+02, 2.903614196777344e+02, 2.903614196777344e+02, 2.903614196777344e+02, 3.004349975585938e+02, 3.053637390136719e+02, 2.962489624023438e+02, 2.926242065429688e+02, 2.903591918945312e+02, 2.90486572265625e+02, 2.908725280761719e+02, 2.911497192382812e+02, 2.908704223632812e+02, 2.909871826171875e+02, 2.909629516601562e+02, 2.900841674804688e+02, 2.895577392578125e+02, 2.891529541015625e+02, 2.891529541015625e+02, 2.891529541015625e+02, 2.891529541015625e+02, 2.891529541015625e+02]
-hvac.res.EFan=[0e+00, 3.45810860835627e-07, 3.45810860835627e-07, 3.45810860835627e-07, 3.45810860835627e-07, 3.45810860835627e-07, 3.232205078125e+03, 7.09593701171875e+03, 1.09510654296875e+04, 1.4807857421875e+04, 1.866509375e+04, 2.2521859375e+04, 2.6378720703125e+04, 3.0235537109375e+04, 3.409230859375e+04, 3.7949453125e+04, 4.117012109375e+04, 4.117012109375e+04, 4.117012109375e+04, 4.117012109375e+04, 4.117012109375e+04, 4.117012109375e+04, 4.117012109375e+04, 4.117012109375e+04, 4.117012109375e+04, 4.117012109375e+04, 4.4401421875e+04, 4.826494140625e+04, 5.212010546875e+04, 5.5976984375e+04, 5.983419140625e+04, 6.369116796875e+04, 6.75481015625e+04, 7.14050703125e+04, 7.5261921875e+04, 7.91188984375e+04, 8.23394765625e+04, 8.23394765625e+04, 8.23394765625e+04, 8.23394765625e+04, 8.23394765625e+04, 8.23394765625e+04, 8.23394765625e+04, 8.23394765625e+04, 8.23394765625e+04, 8.23466796875e+04, 8.59603125e+04, 8.98209453125e+04, 9.3676578125e+04, 9.753359375e+04, 1.0139071875e+05, 1.052476796875e+05, 1.09104640625e+05, 1.12961578125e+05, 1.1681859375e+05, 1.20675515625e+05, 1.238960625e+05, 1.238960625e+05, 1.238960625e+05, 1.238960625e+05, 1.238960625e+05, 1.238960625e+05, 1.238960625e+05, 1.238960625e+05, 1.24119453125e+05, 1.282201171875e+05, 1.32092046875e+05, 1.359505625e+05, 1.398064375e+05, 1.43663546875e+05, 1.4752078125e+05, 1.5137771875e+05, 1.55234671875e+05, 1.59091609375e+05, 1.62948515625e+05, 1.668053125e+05, 1.70025953125e+05, 1.70025953125e+05, 1.70025953125e+05, 1.70025953125e+05, 1.70025953125e+05, 1.70025953125e+05, 1.70025953125e+05, 1.7019321875e+05, 1.7596340625e+05, 1.79834640625e+05, 1.8369715625e+05, 1.8755146875e+05, 1.9140821875e+05, 1.95265609375e+05, 1.99122609375e+05, 2.02979515625e+05, 2.0683646875e+05, 2.1069340625e+05, 2.1455034375e+05, 2.18405921875e+05, 2.2162390625e+05, 2.2162390625e+05, 2.2162390625e+05, 2.2162390625e+05, 2.2162390625e+05]
-hvac.res.EHea=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.173762573242188e+03, 1.0288767578125e+04, 2.356741015625e+04, 3.72949453125e+04, 4.9652375e+04, 6.24235234375e+04, 7.33206015625e+04, 7.33206015625e+04, 7.33206015625e+04, 7.33206015625e+04, 7.33206015625e+04, 7.33206015625e+04, 7.33206015625e+04, 7.33206015625e+04, 7.33206015625e+04, 7.3406140625e+04, 7.51629453125e+04, 7.51629453125e+04, 7.51629453125e+04, 7.51629453125e+04, 7.51629453125e+04, 7.51629453125e+04, 7.51629453125e+04, 7.51629453125e+04, 8.0365734375e+04, 9.67390625e+04, 1.130731640625e+05, 1.130731640625e+05, 1.130731640625e+05, 1.130731640625e+05, 1.130731640625e+05, 1.130731640625e+05, 1.130731640625e+05, 1.130731640625e+05, 1.146333203125e+05, 1.560315625e+05, 1.71470703125e+05, 1.715828125e+05, 1.72241859375e+05, 1.839869375e+05, 2.0485728125e+05, 2.28844e+05, 2.5413965625e+05, 2.8161140625e+05, 3.11699125e+05, 3.4558696875e+05, 3.7940421875e+05, 3.7940421875e+05, 3.7940421875e+05, 3.7940421875e+05, 3.7940421875e+05, 3.7940421875e+05, 3.7940421875e+05, 3.80827375e+05, 4.5456615625e+05, 4.9913615625e+05, 5.27687125e+05, 5.286146875e+05, 5.312875e+05, 5.395156875e+05, 5.508890625e+05, 5.638705e+05, 5.814295625e+05, 6.020760625e+05, 6.33078625e+05, 6.88054625e+05, 7.435575625e+05, 7.435575625e+05, 7.435575625e+05, 7.435575625e+05, 7.435575625e+05]
-hvac.res.ECoo=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -5.9772578125e+03, -2.252914453125e+04, -3.690426171875e+04, -4.754584375e+04, -5.961813671875e+04, -8.85247421875e+04, -1.272756171875e+05, -1.7608115625e+05, -2.1325971875e+05, -2.34143234375e+05, -2.39438421875e+05, -2.39438421875e+05, -2.39438421875e+05, -2.39438421875e+05, -2.39438421875e+05, -2.39438421875e+05, -2.39438421875e+05, -2.39438421875e+05, -2.39438421875e+05, -2.39438421875e+05, -2.43148671875e+05, -2.548358125e+05, -2.623413125e+05, -2.63786e+05, -2.63786e+05, -2.63786e+05, -2.63786e+05, -2.63786e+05, -2.63786e+05, -2.63786e+05, -2.63786e+05, -2.63786e+05, -2.63786e+05, -2.63786e+05, -2.63786e+05, -2.63786e+05, -2.63786e+05, -2.63786e+05, -2.63786e+05, -2.63786e+05, -2.68042e+05, -2.7601225e+05, -2.823230625e+05, -2.854540625e+05, -2.88265125e+05, -2.9201840625e+05, -2.9537196875e+05, -2.9537196875e+05, -2.9537196875e+05, -2.9537196875e+05, -2.9537196875e+05, -2.9537196875e+05, -2.9537196875e+05, -2.9537196875e+05, -2.9537196875e+05, -2.9537196875e+05, -2.9537196875e+05, -2.9537196875e+05, -2.9537196875e+05, -2.9537196875e+05, -2.9537196875e+05, -2.9655728125e+05, -2.957636875e+05, -2.9627890625e+05, -2.963385e+05, -2.963385e+05, -2.963385e+05, -2.963385e+05, -2.963385e+05, -2.963385e+05, -2.963385e+05, -2.963385e+05, -2.963385e+05, -2.963385e+05, -2.963385e+05, -2.963385e+05, -2.963385e+05, -2.963385e+05, -2.963385e+05, -2.963385e+05, -2.963385e+05, -2.963385e+05, -2.963385e+05, -2.963385e+05, -2.963385e+05, -2.963385e+05, -2.963385e+05, -2.963385e+05, -2.963385e+05, -2.963385e+05, -2.963385e+05, -2.963385e+05, -2.963385e+05, -2.963385e+05, -2.963385e+05]
+hvac.fanSup.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.621593475341797e-01, 3.046397268772125e-01, 3.050566911697388e-01, 3.00453782081604e-01, 3.012813925743103e-01, 3.02350640296936e-01, 3.014130592346191e-01, 3.030804991722107e-01, 3.011135160923004e-01, 3.010886907577515e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.623462677001953e-01, 3.049409985542297e-01, 3.047096431255341e-01, 3.004977703094482e-01, 3.012484610080719e-01, 3.014520704746246e-01, 3.016365766525269e-01, 3.017139434814453e-01, 3.015846908092499e-01, 3.015652596950531e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.406688988208771e-01, 2.648160457611084e-01, 3.05846631526947e-01, 3.043275773525238e-01, 3.005095422267914e-01, 3.012706339359283e-01, 3.015973567962646e-01, 3.015320301055908e-01, 3.015055954456329e-01, 3.014380931854248e-01, 3.017248809337616e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.087157815694809e-01, 3.059493899345398e-01, 2.83586710691452e-01, 3.052448034286499e-01, 3.026316463947296e-01, 3.003165423870087e-01, 3.01377534866333e-01, 3.015651702880859e-01, 3.015501797199249e-01, 3.015893399715424e-01, 3.019298911094666e-01, 3.015898168087006e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.906788498163223e-01, 4.601015448570251e-01, 2.830487191677094e-01, 3.082466721534729e-01, 3.063690364360809e-01, 3.002376556396484e-01, 3.008885383605957e-01, 3.015613257884979e-01, 3.016872704029083e-01, 3.01541268825531e-01, 3.015747368335724e-01, 3.016995787620544e-01, 3.136665523052216e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+hvac.VAVBox[5].vav.y_actual=[1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.724461913108826e-01, 6.904550790786743e-01, 6.462990045547485e-01, 6.490709185600281e-01, 6.52013897895813e-01, 6.458005905151367e-01, 6.457749009132385e-01, 6.485351324081421e-01, 6.462972164154053e-01, 6.488084197044373e-01, 6.365603476359797e-17, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.717963218688965e-01, 6.863147616386414e-01, 6.444535255432129e-01, 6.482348442077637e-01, 6.508299708366394e-01, 6.507869958877563e-01, 6.501391530036926e-01, 6.504166126251221e-01, 6.489003300666809e-01, 6.496233940124512e-01, 1.61784914199572e-17, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 1.124165803194046e-01, 6.790064573287964e-01, 6.823914647102356e-01, 6.427842974662781e-01, 6.473290920257568e-01, 6.49554431438446e-01, 6.489799022674561e-01, 6.492375731468201e-01, 6.493242383003235e-01, 6.510503888130188e-01, 6.500763297080994e-01, 7.866236824217567e-17, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 3.154920935630798e-01, 1.559108346700668e-01, 6.732583045959473e-01, 6.634346842765808e-01, 6.434831023216248e-01, 6.492487788200378e-01, 6.521105170249939e-01, 6.514836549758911e-01, 6.516137719154358e-01, 6.515594720840454e-01, 6.503340601921082e-01, 6.490375995635986e-01, 1.93540597118345e-18, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 5.032883882522583e-01, 4.073444604873657e-01, 2.334088236093521e-01, 6.839746236801147e-01, 6.410233974456787e-01, 6.469239592552185e-01, 6.528070569038391e-01, 6.519771814346313e-01, 6.508428454399109e-01, 6.511955261230469e-01, 6.513198018074036e-01, 6.512208580970764e-01, 6.732949018478394e-01, 1.318460445743558e-18, 0e+00, -0e+00, -0e+00, -0e+00]
+hvac.VAVBox[1].vav.y_actual=[1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.724466681480408e-01, 6.904555559158325e-01, 6.462993621826172e-01, 6.490712761878967e-01, 6.520143151283264e-01, 6.458010077476501e-01, 6.457752585411072e-01, 6.485354900360107e-01, 6.462975740432739e-01, 6.488088369369507e-01, 6.365607446826737e-17, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.717967987060547e-01, 6.863152384757996e-01, 6.444539427757263e-01, 6.482352614402771e-01, 6.508303284645081e-01, 6.507874131202698e-01, 6.501395106315613e-01, 6.504170298576355e-01, 6.489007472991943e-01, 6.496238112449646e-01, 1.617850134612455e-17, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.124165803194046e-01, 6.790068745613098e-01, 6.823919415473938e-01, 6.427847146987915e-01, 6.473294496536255e-01, 6.495547890663147e-01, 6.489803194999695e-01, 6.492379903793335e-01, 6.493246555328369e-01, 6.510508060455322e-01, 6.500767469406128e-01, 7.866241456428997e-17, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 4.243124127388e-01, 3.252795040607452e-01, 6.762588620185852e-01, 6.635097861289978e-01, 6.434848308563232e-01, 6.492491960525513e-01, 6.521109342575073e-01, 6.514840126037598e-01, 6.516141891479492e-01, 6.515598893165588e-01, 6.503344774246216e-01, 6.490380167961121e-01, 1.935407211954369e-18, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 6.779674291610718e-01, 4.461662173271179e-01, 6.482394337654114e-01, 6.910102963447571e-01, 6.411539316177368e-01, 6.469265818595886e-01, 6.528074741363525e-01, 6.519775986671448e-01, 6.508432626724243e-01, 6.511959433555603e-01, 6.51320219039917e-01, 6.512212753295898e-01, 6.867943406105042e-01, 1.512783576400893e-18, 0e+00, -0e+00, -0e+00, -0e+00]
+hvac.VAVBox[2].vav.y_actual=[1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.597112774848938e-01, 5.768916010856628e-01, 5.455541014671326e-01, 5.478202700614929e-01, 5.500791072845459e-01, 5.452793836593628e-01, 5.452622771263123e-01, 5.474046468734741e-01, 5.4566890001297e-01, 5.476165413856506e-01, 5.372533446320484e-17, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.592309832572937e-01, 5.740922689437866e-01, 5.441481471061707e-01, 5.471725463867188e-01, 5.491724610328674e-01, 5.491392612457275e-01, 5.486395359039307e-01, 5.488508939743042e-01, 5.476860404014587e-01, 5.482432842254639e-01, 1.36546839617191e-17, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.124165803194046e-01, 5.651941299438477e-01, 5.713365077972412e-01, 5.428654551506042e-01, 5.464692115783691e-01, 5.481911897659302e-01, 5.477464199066162e-01, 5.479459762573242e-01, 5.480139255523682e-01, 5.493420362472534e-01, 5.485900640487671e-01, 6.639524005334487e-17, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 6.033969521522522e-01, 5.063297152519226e-01, 5.698837637901306e-01, 5.584304332733154e-01, 5.434614419937134e-01, 5.479597449302673e-01, 5.501524209976196e-01, 5.496721267700195e-01, 5.497724413871765e-01, 5.497303605079651e-01, 5.487849116325378e-01, 5.47793447971344e-01, 1.633065253440725e-18, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 7.088005542755127e-01, 4.654555320739746e-01, 7.559719681739807e-01, 6.527846455574036e-01, 5.428284406661987e-01, 5.461759567260742e-01, 5.506908297538757e-01, 5.500486493110657e-01, 5.491788983345032e-01, 5.494521856307983e-01, 5.49547016620636e-01, 5.494700074195862e-01, 5.660143494606018e-01, 1.106786581352463e-18, 0e+00, -0e+00, -0e+00, -0e+00]
+hvac.VAVBox[3].vav.y_actual=[1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.724466681480408e-01, 6.904555559158325e-01, 6.462993621826172e-01, 6.490712761878967e-01, 6.520143151283264e-01, 6.458010077476501e-01, 6.457752585411072e-01, 6.485354900360107e-01, 6.462975740432739e-01, 6.488088369369507e-01, 6.365607446826737e-17, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.717967987060547e-01, 6.863152384757996e-01, 6.444539427757263e-01, 6.482352614402771e-01, 6.508303284645081e-01, 6.507874131202698e-01, 6.501395106315613e-01, 6.504170298576355e-01, 6.489007472991943e-01, 6.496238112449646e-01, 1.617850134612455e-17, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 1.124165803194046e-01, 6.790068745613098e-01, 6.823919415473938e-01, 6.427847146987915e-01, 6.473294496536255e-01, 6.495547890663147e-01, 6.489803194999695e-01, 6.492379903793335e-01, 6.493246555328369e-01, 6.510508060455322e-01, 6.500767469406128e-01, 7.866241456428997e-17, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 6.155861020088196e-01, 5.379016399383545e-01, 6.87085747718811e-01, 6.637815833091736e-01, 6.434895992279053e-01, 6.492493152618408e-01, 6.521109342575073e-01, 6.514840126037598e-01, 6.516141891479492e-01, 6.515598893165588e-01, 6.503344774246216e-01, 6.490380167961121e-01, 1.935407211954369e-18, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 6.088151335716248e-01, 4.417798221111298e-01, 6.294885873794556e-01, 6.905343532562256e-01, 6.411451101303101e-01, 6.469264030456543e-01, 6.528074741363525e-01, 6.519775986671448e-01, 6.508432626724243e-01, 6.511959433555603e-01, 6.51320219039917e-01, 6.512212753295898e-01, 6.732953190803528e-01, 1.318461376321747e-18, 0e+00, -0e+00, -0e+00, -0e+00]
+hvac.VAVBox[4].vav.y_actual=[1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.597112774848938e-01, 5.768916010856628e-01, 5.455541014671326e-01, 5.478202700614929e-01, 5.500791072845459e-01, 5.452793836593628e-01, 5.452622771263123e-01, 5.474046468734741e-01, 5.4566890001297e-01, 5.476165413856506e-01, 5.372533446320484e-17, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.592309832572937e-01, 5.740922689437866e-01, 5.441481471061707e-01, 5.471725463867188e-01, 5.491724610328674e-01, 5.491392612457275e-01, 5.486395359039307e-01, 5.488508939743042e-01, 5.476860404014587e-01, 5.482432842254639e-01, 1.36546839617191e-17, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 1.124165803194046e-01, 5.651941299438477e-01, 5.713365077972412e-01, 5.428654551506042e-01, 5.464692115783691e-01, 5.481911897659302e-01, 5.477464199066162e-01, 5.479459762573242e-01, 5.480139255523682e-01, 5.493420362472534e-01, 5.485900640487671e-01, 6.639524005334487e-17, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 3.14927875995636e-01, 3.271894454956055e-01, 5.683454871177673e-01, 5.584010481834412e-01, 5.434609055519104e-01, 5.479597449302673e-01, 5.501524209976196e-01, 5.496721267700195e-01, 5.497724413871765e-01, 5.497303605079651e-01, 5.487849116325378e-01, 5.47793447971344e-01, 1.633065253440725e-18, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 6.257990598678589e-01, 3.254335522651672e-01, 6.167689561843872e-01, 5.791810750961304e-01, 5.415856242179871e-01, 5.46154260635376e-01, 5.506904125213623e-01, 5.500486493110657e-01, 5.491788983345032e-01, 5.494521856307983e-01, 5.49547016620636e-01, 5.494700074195862e-01, 6.785287857055664e-01, 1.434025952520918e-18, 0e+00, -0e+00, -0e+00, -0e+00]
+hvac.damOut.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.54273796081543e-01, 7.344569563865662e-01, 9.552119374275208e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.540497124195099e-01, 7.341874837875366e-01, 9.553394913673401e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.034143388271332e-01, 7.684679627418518e-01, 9.737130999565125e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.407950282096863e-01, 8.543412089347839e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.702258348464966e-01, 8.734638690948486e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+hvac.VAVBox[1].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.913840942382812e+02, 2.911033935546875e+02, 2.909839477539062e+02, 2.911192932128906e+02, 2.899033203125e+02, 2.871707763671875e+02, 2.862330932617188e+02, 2.855311889648438e+02, 2.876746215820312e+02, 2.904339599609375e+02, 2.912234191894531e+02, 2.912234191894531e+02, 2.912234191894531e+02, 2.912234191894531e+02, 2.912234191894531e+02, 2.912234191894531e+02, 2.912234191894531e+02, 2.912234191894531e+02, 2.912234191894531e+02, 2.912234191894531e+02, 2.911950988769531e+02, 2.913098449707031e+02, 2.9114306640625e+02, 2.902205505371094e+02, 2.898688659667969e+02, 2.90792724609375e+02, 2.911115112304688e+02, 2.913117065429688e+02, 2.911600952148438e+02, 2.911025390625e+02, 2.912890014648438e+02, 2.912890014648438e+02, 2.912890014648438e+02, 2.912890014648438e+02, 2.912890014648438e+02, 2.912890014648438e+02, 2.912890014648438e+02, 2.912890014648438e+02, 2.912890014648438e+02, 2.921864013671875e+02, 2.921788024902344e+02, 2.911636047363281e+02, 2.911441650390625e+02, 2.911305847167969e+02, 2.911506042480469e+02, 2.911508178710938e+02, 2.916963806152344e+02, 2.895962219238281e+02, 2.900762634277344e+02, 2.910109558105469e+02, 2.911220397949219e+02, 2.911220397949219e+02, 2.911220397949219e+02, 2.911220397949219e+02, 2.911220397949219e+02, 2.911220397949219e+02, 2.911220397949219e+02, 2.911220397949219e+02, 3.023235473632812e+02, 2.995072326660156e+02, 2.933391418457031e+02, 2.908147277832031e+02, 2.890758666992188e+02, 2.905832824707031e+02, 2.909657897949219e+02, 2.910635681152344e+02, 2.910395202636719e+02, 2.910915222167969e+02, 2.908978881835938e+02, 2.909471130371094e+02, 2.90694580078125e+02, 2.90694580078125e+02, 2.90694580078125e+02, 2.90694580078125e+02, 2.90694580078125e+02, 2.90694580078125e+02, 2.90694580078125e+02, 3.012058410644531e+02, 3.062425537109375e+02, 3.052791442871094e+02, 2.926219787597656e+02, 2.903899841308594e+02, 2.904725036621094e+02, 2.90868896484375e+02, 2.911484985351562e+02, 2.90869873046875e+02, 2.909869995117188e+02, 2.90962890625e+02, 2.963730773925781e+02, 3.04129638671875e+02, 2.914144897460938e+02, 2.914144897460938e+02, 2.914144897460938e+02, 2.914144897460938e+02, 2.914144897460938e+02]
+hvac.VAVBox[2].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.913828430175781e+02, 2.91103759765625e+02, 2.909837036132812e+02, 2.911192016601562e+02, 2.899055480957031e+02, 2.871714172363281e+02, 2.8623388671875e+02, 2.855303955078125e+02, 2.87673828125e+02, 2.904393615722656e+02, 2.911915893554688e+02, 2.911915893554688e+02, 2.911915893554688e+02, 2.911915893554688e+02, 2.911915893554688e+02, 2.911915893554688e+02, 2.911915893554688e+02, 2.911915893554688e+02, 2.911915893554688e+02, 2.911915893554688e+02, 2.911948852539062e+02, 2.913100891113281e+02, 2.9114306640625e+02, 2.902220153808594e+02, 2.898682250976562e+02, 2.907923278808594e+02, 2.911115417480469e+02, 2.913116149902344e+02, 2.911600952148438e+02, 2.911024780273438e+02, 2.912563171386719e+02, 2.912563171386719e+02, 2.912563171386719e+02, 2.912563171386719e+02, 2.912563171386719e+02, 2.912563171386719e+02, 2.912563171386719e+02, 2.912563171386719e+02, 2.912563171386719e+02, 2.92155029296875e+02, 2.921758117675781e+02, 2.911637878417969e+02, 2.911441345214844e+02, 2.911306457519531e+02, 2.911506042480469e+02, 2.911508178710938e+02, 2.916971740722656e+02, 2.895975036621094e+02, 2.900750427246094e+02, 2.910108947753906e+02, 2.910885009765625e+02, 2.910885009765625e+02, 2.910885009765625e+02, 2.910885009765625e+02, 2.910885009765625e+02, 2.910885009765625e+02, 2.910885009765625e+02, 2.910885009765625e+02, 3.020278015136719e+02, 3.06118896484375e+02, 2.941732177734375e+02, 2.908159790039062e+02, 2.890747985839844e+02, 2.905830688476562e+02, 2.909656677246094e+02, 2.910635070800781e+02, 2.910397033691406e+02, 2.910914306640625e+02, 2.971502990722656e+02, 3.017273559570312e+02, 2.961955261230469e+02, 2.961955261230469e+02, 2.961955261230469e+02, 2.961955261230469e+02, 2.961955261230469e+02, 2.961955261230469e+02, 2.961955261230469e+02, 3.021612243652344e+02, 3.044105834960938e+02, 3.041722412109375e+02, 2.987680969238281e+02, 2.903914184570312e+02, 2.90471923828125e+02, 2.908687438964844e+02, 2.911485900878906e+02, 2.908698425292969e+02, 2.909869079589844e+02, 2.909629516601562e+02, 2.900855407714844e+02, 2.941589965820312e+02, 2.920520935058594e+02, 2.920520935058594e+02, 2.920520935058594e+02, 2.920520935058594e+02, 2.920520935058594e+02]
+hvac.VAVBox[3].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.913840942382812e+02, 2.911033935546875e+02, 2.909839477539062e+02, 2.911192932128906e+02, 2.899033203125e+02, 2.871707763671875e+02, 2.862330932617188e+02, 2.855311889648438e+02, 2.876746215820312e+02, 2.904339599609375e+02, 2.912234191894531e+02, 2.912234191894531e+02, 2.912234191894531e+02, 2.912234191894531e+02, 2.912234191894531e+02, 2.912234191894531e+02, 2.912234191894531e+02, 2.912234191894531e+02, 2.912234191894531e+02, 2.912234191894531e+02, 2.911950988769531e+02, 2.913098449707031e+02, 2.9114306640625e+02, 2.902205505371094e+02, 2.898688659667969e+02, 2.90792724609375e+02, 2.911115112304688e+02, 2.913117065429688e+02, 2.911600952148438e+02, 2.911025390625e+02, 2.912890014648438e+02, 2.912890014648438e+02, 2.912890014648438e+02, 2.912890014648438e+02, 2.912890014648438e+02, 2.912890014648438e+02, 2.912890014648438e+02, 2.912890014648438e+02, 2.912890014648438e+02, 2.921864013671875e+02, 2.921788024902344e+02, 2.911636047363281e+02, 2.911441650390625e+02, 2.911305847167969e+02, 2.911506042480469e+02, 2.911508178710938e+02, 2.916963806152344e+02, 2.895962219238281e+02, 2.900762634277344e+02, 2.910109558105469e+02, 2.911220397949219e+02, 2.911220397949219e+02, 2.911220397949219e+02, 2.911220397949219e+02, 2.911220397949219e+02, 2.911220397949219e+02, 2.911220397949219e+02, 2.911220397949219e+02, 3.020143127441406e+02, 3.069683227539062e+02, 2.970060729980469e+02, 2.908147277832031e+02, 2.890758666992188e+02, 2.905832824707031e+02, 2.909657897949219e+02, 2.910635681152344e+02, 2.910395202636719e+02, 2.910915222167969e+02, 2.908978881835938e+02, 2.935719909667969e+02, 2.921029968261719e+02, 2.921029968261719e+02, 2.921029968261719e+02, 2.921029968261719e+02, 2.921029968261719e+02, 2.921029968261719e+02, 2.921029968261719e+02, 3.014799194335938e+02, 3.064228210449219e+02, 3.007341918945312e+02, 2.926219482421875e+02, 2.903899841308594e+02, 2.904725036621094e+02, 2.90868896484375e+02, 2.911484985351562e+02, 2.90869873046875e+02, 2.909869995117188e+02, 2.90962890625e+02, 2.900843200683594e+02, 2.930894165039062e+02, 2.90564697265625e+02, 2.90564697265625e+02, 2.90564697265625e+02, 2.90564697265625e+02, 2.90564697265625e+02]
+hvac.VAVBox[4].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.913828430175781e+02, 2.91103759765625e+02, 2.909837036132812e+02, 2.911192016601562e+02, 2.899055480957031e+02, 2.871714172363281e+02, 2.8623388671875e+02, 2.855303955078125e+02, 2.87673828125e+02, 2.904393615722656e+02, 2.911915893554688e+02, 2.911915893554688e+02, 2.911915893554688e+02, 2.911915893554688e+02, 2.911915893554688e+02, 2.911915893554688e+02, 2.911915893554688e+02, 2.911915893554688e+02, 2.911915893554688e+02, 2.911915893554688e+02, 2.911948852539062e+02, 2.913100891113281e+02, 2.9114306640625e+02, 2.902220153808594e+02, 2.898682250976562e+02, 2.907923278808594e+02, 2.911115417480469e+02, 2.913116149902344e+02, 2.911600952148438e+02, 2.911024780273438e+02, 2.9125634765625e+02, 2.9125634765625e+02, 2.9125634765625e+02, 2.9125634765625e+02, 2.9125634765625e+02, 2.9125634765625e+02, 2.9125634765625e+02, 2.9125634765625e+02, 2.9125634765625e+02, 2.921549987792969e+02, 2.921758117675781e+02, 2.911637878417969e+02, 2.911441345214844e+02, 2.911306457519531e+02, 2.911506042480469e+02, 2.911508178710938e+02, 2.916971740722656e+02, 2.895975036621094e+02, 2.900750427246094e+02, 2.910108947753906e+02, 2.910885314941406e+02, 2.910885314941406e+02, 2.910885314941406e+02, 2.910885314941406e+02, 2.910885314941406e+02, 2.910885314941406e+02, 2.910885314941406e+02, 2.910885314941406e+02, 3.027448120117188e+02, 2.995074768066406e+02, 2.933377990722656e+02, 2.908159790039062e+02, 2.890747985839844e+02, 2.905830688476562e+02, 2.909656677246094e+02, 2.910635070800781e+02, 2.910397033691406e+02, 2.910914306640625e+02, 2.908978271484375e+02, 2.909468994140625e+02, 2.910081787109375e+02, 2.910081787109375e+02, 2.910081787109375e+02, 2.910081787109375e+02, 2.910081787109375e+02, 2.910081787109375e+02, 2.910081787109375e+02, 3.012790222167969e+02, 2.957332153320312e+02, 3.034097290039062e+02, 2.926219482421875e+02, 2.903914489746094e+02, 2.90471923828125e+02, 2.908687438964844e+02, 2.911485900878906e+02, 2.908698425292969e+02, 2.909869079589844e+02, 2.909629516601562e+02, 3.028280639648438e+02, 3.041577453613281e+02, 2.919376831054688e+02, 2.919376831054688e+02, 2.919376831054688e+02, 2.919376831054688e+02, 2.919376831054688e+02]
+hvac.VAVBox[5].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.913840942382812e+02, 2.911033935546875e+02, 2.909839477539062e+02, 2.911192932128906e+02, 2.899033203125e+02, 2.871707763671875e+02, 2.862330932617188e+02, 2.855311889648438e+02, 2.876746215820312e+02, 2.904339599609375e+02, 2.912234191894531e+02, 2.912234191894531e+02, 2.912234191894531e+02, 2.912234191894531e+02, 2.912234191894531e+02, 2.912234191894531e+02, 2.912234191894531e+02, 2.912234191894531e+02, 2.912234191894531e+02, 2.912234191894531e+02, 2.911950988769531e+02, 2.913098449707031e+02, 2.9114306640625e+02, 2.902205505371094e+02, 2.898688659667969e+02, 2.90792724609375e+02, 2.911115112304688e+02, 2.913117065429688e+02, 2.911600952148438e+02, 2.911025390625e+02, 2.912890319824219e+02, 2.912890319824219e+02, 2.912890319824219e+02, 2.912890319824219e+02, 2.912890319824219e+02, 2.912890319824219e+02, 2.912890319824219e+02, 2.912890319824219e+02, 2.912890319824219e+02, 2.921864624023438e+02, 2.921788024902344e+02, 2.911636047363281e+02, 2.911441650390625e+02, 2.911305847167969e+02, 2.911506042480469e+02, 2.911508178710938e+02, 2.916963806152344e+02, 2.895962219238281e+02, 2.900762634277344e+02, 2.910109558105469e+02, 2.911220397949219e+02, 2.911220397949219e+02, 2.911220397949219e+02, 2.911220397949219e+02, 2.911220397949219e+02, 2.911220397949219e+02, 2.911220397949219e+02, 2.911220397949219e+02, 3.027489624023438e+02, 2.994481201171875e+02, 2.933391418457031e+02, 2.908147277832031e+02, 2.890758666992188e+02, 2.905832824707031e+02, 2.909657897949219e+02, 2.910635681152344e+02, 2.910395202636719e+02, 2.910915222167969e+02, 2.908978881835938e+02, 2.909471130371094e+02, 2.903614807128906e+02, 2.903614807128906e+02, 2.903614807128906e+02, 2.903614807128906e+02, 2.903614807128906e+02, 2.903614807128906e+02, 2.903614807128906e+02, 3.01424560546875e+02, 3.055635681152344e+02, 2.962435607910156e+02, 2.926219787597656e+02, 2.903899841308594e+02, 2.904725036621094e+02, 2.90868896484375e+02, 2.911484985351562e+02, 2.90869873046875e+02, 2.909869995117188e+02, 2.90962890625e+02, 2.900843200683594e+02, 2.895579528808594e+02, 2.891530151367188e+02, 2.891530151367188e+02, 2.891530151367188e+02, 2.891530151367188e+02, 2.891530151367188e+02]
+hvac.res.EFan=[0e+00, 3.457945183527045e-07, 3.457945183527045e-07, 3.457945183527045e-07, 3.457945183527045e-07, 3.457945183527045e-07, 3.232205078125e+03, 7.09593701171875e+03, 1.09510654296875e+04, 1.4807857421875e+04, 1.866509375e+04, 2.2521859375e+04, 2.6378720703125e+04, 3.0235537109375e+04, 3.409230859375e+04, 3.7949453125e+04, 4.117012109375e+04, 4.117012109375e+04, 4.117012109375e+04, 4.117012109375e+04, 4.117012109375e+04, 4.117012109375e+04, 4.117012109375e+04, 4.117012109375e+04, 4.117012109375e+04, 4.117012109375e+04, 4.4401421875e+04, 4.826494140625e+04, 5.212010546875e+04, 5.5976984375e+04, 5.983419140625e+04, 6.369116796875e+04, 6.75481015625e+04, 7.14050703125e+04, 7.5261921875e+04, 7.91188984375e+04, 8.23394765625e+04, 8.23394765625e+04, 8.23394765625e+04, 8.23394765625e+04, 8.23394765625e+04, 8.23394765625e+04, 8.23394765625e+04, 8.23394765625e+04, 8.23394765625e+04, 8.2339640625e+04, 8.57740703125e+04, 8.963659375e+04, 9.34917578125e+04, 9.7348703125e+04, 1.012058828125e+05, 1.050628515625e+05, 1.089198046875e+05, 1.127767421875e+05, 1.16633765625e+05, 1.204906796875e+05, 1.23711234375e+05, 1.23711234375e+05, 1.23711234375e+05, 1.23711234375e+05, 1.23711234375e+05, 1.23711234375e+05, 1.23711234375e+05, 1.23711234375e+05, 1.23850390625e+05, 1.279780234375e+05, 1.31849484375e+05, 1.357080625e+05, 1.39563953125e+05, 1.434210625e+05, 1.47278296875e+05, 1.51135234375e+05, 1.549921875e+05, 1.58849125e+05, 1.6270603125e+05, 1.66562828125e+05, 1.6978346875e+05, 1.6978346875e+05, 1.6978346875e+05, 1.6978346875e+05, 1.6978346875e+05, 1.6978346875e+05, 1.6978346875e+05, 1.69902703125e+05, 1.75528328125e+05, 1.79399046875e+05, 1.83260609375e+05, 1.871149375e+05, 1.9097175e+05, 1.94829140625e+05, 1.98686125e+05, 2.02543046875e+05, 2.06399984375e+05, 2.102569375e+05, 2.14113875e+05, 2.179694375e+05, 2.211874375e+05, 2.211874375e+05, 2.211874375e+05, 2.211874375e+05, 2.211874375e+05]
+hvac.res.EHea=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.173757568359375e+03, 1.028875390625e+04, 2.35674140625e+04, 3.729492578125e+04, 4.965234765625e+04, 6.242350390625e+04, 7.3320578125e+04, 7.3320578125e+04, 7.3320578125e+04, 7.3320578125e+04, 7.3320578125e+04, 7.3320578125e+04, 7.3320578125e+04, 7.3320578125e+04, 7.3320578125e+04, 7.33248125e+04, 7.52395390625e+04, 7.52395390625e+04, 7.52395390625e+04, 7.52395390625e+04, 7.52395390625e+04, 7.52395390625e+04, 7.52395390625e+04, 7.52395390625e+04, 8.04976640625e+04, 9.72769921875e+04, 1.13612265625e+05, 1.13612265625e+05, 1.13612265625e+05, 1.13612265625e+05, 1.13612265625e+05, 1.13612265625e+05, 1.13612265625e+05, 1.13612265625e+05, 1.146036484375e+05, 1.56979734375e+05, 1.723498125e+05, 1.7246090625e+05, 1.73126640625e+05, 1.84888046875e+05, 2.057633125e+05, 2.297515e+05, 2.5504709375e+05, 2.8251809375e+05, 3.1260153125e+05, 3.464835e+05, 3.8029265625e+05, 3.8029265625e+05, 3.8029265625e+05, 3.8029265625e+05, 3.8029265625e+05, 3.8029265625e+05, 3.8029265625e+05, 3.8130565625e+05, 4.5509834375e+05, 5.0002709375e+05, 5.2887475e+05, 5.297926875e+05, 5.323666875e+05, 5.40531125e+05, 5.518751875e+05, 5.648440625e+05, 5.823978125e+05, 6.030420625e+05, 6.34041375e+05, 6.890110625e+05, 7.445099375e+05, 7.445099375e+05, 7.445099375e+05, 7.445099375e+05, 7.445099375e+05]
+hvac.res.ECoo=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -5.97726025390625e+03, -2.25290625e+04, -3.690417578125e+04, -4.75457578125e+04, -5.9618015625e+04, -8.85246015625e+04, -1.272754921875e+05, -1.7608103125e+05, -2.13259640625e+05, -2.341431875e+05, -2.39438390625e+05, -2.39438390625e+05, -2.39438390625e+05, -2.39438390625e+05, -2.39438390625e+05, -2.39438390625e+05, -2.39438390625e+05, -2.39438390625e+05, -2.39438390625e+05, -2.39438390625e+05, -2.4314865625e+05, -2.54835796875e+05, -2.623413125e+05, -2.63786e+05, -2.63786e+05, -2.63786e+05, -2.63786e+05, -2.63786e+05, -2.63786e+05, -2.63786e+05, -2.63786e+05, -2.63786e+05, -2.63786e+05, -2.63786e+05, -2.63786e+05, -2.63786e+05, -2.63786e+05, -2.63786e+05, -2.63786e+05, -2.63786e+05, -2.6856696875e+05, -2.7523328125e+05, -2.822808125e+05, -2.8579021875e+05, -2.88824375e+05, -2.926776875e+05, -2.959774375e+05, -2.9621315625e+05, -2.9632946875e+05, -2.96614e+05, -2.9658465625e+05, -2.9658465625e+05, -2.9658465625e+05, -2.9658465625e+05, -2.9658465625e+05, -2.9658465625e+05, -2.9658465625e+05, -2.9658465625e+05, -2.9658465625e+05, -2.9658465625e+05, -2.9658465625e+05, -2.9775759375e+05, -2.969664375e+05, -2.9748096875e+05, -2.97540375e+05, -2.97540375e+05, -2.97540375e+05, -2.97540375e+05, -2.97540375e+05, -2.97540375e+05, -2.97540375e+05, -2.97540375e+05, -2.97540375e+05, -2.97540375e+05, -2.97540375e+05, -2.97540375e+05, -2.97540375e+05, -2.97540375e+05, -2.97540375e+05, -2.97540375e+05, -2.97540375e+05, -2.97540375e+05, -2.97540375e+05, -2.97540375e+05, -2.97540375e+05, -2.97540375e+05, -2.97540375e+05, -2.97540375e+05, -2.97540375e+05, -2.97540375e+05, -2.97540375e+05, -2.97540375e+05, -2.97540375e+05, -2.97540375e+05, -2.97540375e+05]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_Guideline36Summer.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_Guideline36Summer.txt
index 1d7af5dd4d2..6996393611e 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_Guideline36Summer.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_Guideline36Summer.txt
@@ -1,4 +1,4 @@
-last-generated=2024-03-23
+last-generated=2024-06-27
 statistics-initialization=
 {
   "linear": "0",
@@ -8,30 +8,30 @@ statistics-initialization=
 statistics-simulation=
 {
   "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0",
-  "nonlinear": "5, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 1",
+  "nonlinear": "5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1",
   "number of continuous time states": "94",
   "numerical Jacobians": "0"
 }
 time=[1.6848e+07, 1.728e+07]
-flo.sou.TAir=[2.931499938964844e+02, 2.971488342285156e+02, 2.970904846191406e+02, 2.971393432617188e+02, 2.971708374023438e+02, 2.973715209960938e+02, 2.960903015136719e+02, 2.963770446777344e+02, 2.966582336425781e+02, 2.968568115234375e+02, 2.969085083007812e+02, 2.970073852539062e+02, 2.971823425292969e+02, 2.971570739746094e+02, 2.970684509277344e+02, 2.967265930175781e+02, 2.98019287109375e+02, 2.980212707519531e+02, 2.981596069335938e+02, 2.983078308105469e+02, 2.984050598144531e+02, 2.98318603515625e+02, 2.983051452636719e+02, 2.983106079101562e+02, 2.98298828125e+02, 2.974028930664062e+02, 2.9666650390625e+02, 2.966728820800781e+02, 2.9682177734375e+02, 2.969424133300781e+02, 2.9711767578125e+02, 2.971631469726562e+02, 2.971306457519531e+02, 2.971387939453125e+02, 2.971786804199219e+02, 2.970838317871094e+02, 2.985569458007812e+02, 2.988447265625e+02, 2.989735107421875e+02, 2.98980712890625e+02, 2.991301879882812e+02, 2.991422424316406e+02, 2.991198425292969e+02, 2.990957336425781e+02, 2.956469421386719e+02, 2.970759582519531e+02, 2.979975280761719e+02, 2.983571472167969e+02, 2.986758728027344e+02, 2.990056457519531e+02, 2.991374206542969e+02, 2.993533325195312e+02, 2.99387939453125e+02, 2.995101318359375e+02, 2.987188720703125e+02, 2.980447387695312e+02, 3.000171508789062e+02, 3.002728576660156e+02, 3.00316650390625e+02, 3.00226318359375e+02, 3.001732482910156e+02, 3.000767211914062e+02, 3.000093078613281e+02, 2.971092224121094e+02, 2.972830200195312e+02, 2.971499328613281e+02, 2.981148681640625e+02, 2.982740173339844e+02, 2.987023315429688e+02, 2.991179504394531e+02, 2.992443237304688e+02, 2.995338439941406e+02, 2.996026306152344e+02, 2.995534057617188e+02, 2.989526672363281e+02, 2.9839501953125e+02, 3.002760314941406e+02, 3.00459716796875e+02, 3.004801330566406e+02, 3.004254455566406e+02, 3.003442077636719e+02, 3.002889709472656e+02, 3.001663208007812e+02, 2.975650939941406e+02, 2.973158874511719e+02, 2.971589660644531e+02, 2.98091552734375e+02, 2.9834130859375e+02, 2.987803344726562e+02, 2.992686462402344e+02, 2.99393798828125e+02, 2.995188598632812e+02, 2.996377563476562e+02, 2.998189697265625e+02, 2.99336181640625e+02, 2.98670654296875e+02, 3.002952575683594e+02, 3.003683166503906e+02, 3.003975524902344e+02, 3.003070068359375e+02, 3.002548217773438e+02]
-flo.eas.TAir=[2.931499938964844e+02, 2.971684265136719e+02, 2.97109619140625e+02, 2.970796813964844e+02, 2.973669738769531e+02, 2.969353332519531e+02, 2.967883911132812e+02, 2.969532165527344e+02, 2.971699829101562e+02, 2.970716552734375e+02, 2.968973388671875e+02, 2.969721374511719e+02, 2.971185302734375e+02, 2.971464233398438e+02, 2.968911743164062e+02, 2.966604614257812e+02, 2.980807189941406e+02, 2.981101684570312e+02, 2.983236999511719e+02, 2.984344482421875e+02, 2.985226135253906e+02, 2.984579162597656e+02, 2.984412231445312e+02, 2.984230346679688e+02, 2.985397644042969e+02, 2.97317626953125e+02, 2.971984558105469e+02, 2.972479553222656e+02, 2.970129699707031e+02, 2.971020812988281e+02, 2.971531677246094e+02, 2.97161376953125e+02, 2.971424560546875e+02, 2.971964416503906e+02, 2.971748657226562e+02, 2.971352844238281e+02, 2.986807556152344e+02, 2.989608154296875e+02, 2.990980529785156e+02, 2.991845703125e+02, 2.99310302734375e+02, 2.993259887695312e+02, 2.993144836425781e+02, 2.992805480957031e+02, 2.957418823242188e+02, 2.9711279296875e+02, 2.98273193359375e+02, 2.987899169921875e+02, 2.989341735839844e+02, 2.988336791992188e+02, 2.988339233398438e+02, 2.989750366210938e+02, 2.99032470703125e+02, 2.991209411621094e+02, 2.983773803710938e+02, 2.977041015625e+02, 3.002583312988281e+02, 3.003590698242188e+02, 3.004259643554688e+02, 3.003563842773438e+02, 3.002993469238281e+02, 3.002339477539062e+02, 3.0015234375e+02, 2.96630859375e+02, 2.971543579101562e+02, 2.971923522949219e+02, 2.981713256835938e+02, 2.987290954589844e+02, 2.989787902832031e+02, 2.989302978515625e+02, 2.989097595214844e+02, 2.991405944824219e+02, 2.992342529296875e+02, 2.9913720703125e+02, 2.985766296386719e+02, 2.980388793945312e+02, 3.003837280273438e+02, 3.005351257324219e+02, 3.005956726074219e+02, 3.005383911132812e+02, 3.004615173339844e+02, 3.003876037597656e+02, 3.002905578613281e+02, 2.970851745605469e+02, 2.972499084472656e+02, 2.971772766113281e+02, 2.983594665527344e+02, 2.985196838378906e+02, 2.987686462402344e+02, 2.9901806640625e+02, 2.990723571777344e+02, 2.990970458984375e+02, 2.992330017089844e+02, 2.994129943847656e+02, 2.990055541992188e+02, 2.983725280761719e+02, 3.004640502929688e+02, 3.004188232421875e+02, 3.005097351074219e+02, 3.004615783691406e+02, 3.003959045410156e+02]
-flo.nor.TAir=[2.931499938964844e+02, 2.971585998535156e+02, 2.972338256835938e+02, 2.971536865234375e+02, 2.972750549316406e+02, 2.972530822753906e+02, 2.960952453613281e+02, 2.963033142089844e+02, 2.964967346191406e+02, 2.966547241210938e+02, 2.965212707519531e+02, 2.966139221191406e+02, 2.967634887695312e+02, 2.968624267578125e+02, 2.965803527832031e+02, 2.963473510742188e+02, 2.977628173828125e+02, 2.97920166015625e+02, 2.980868225097656e+02, 2.982206420898438e+02, 2.983236389160156e+02, 2.98254150390625e+02, 2.982366333007812e+02, 2.982514343261719e+02, 2.983349609375e+02, 2.974189758300781e+02, 2.966344299316406e+02, 2.966083374023438e+02, 2.966956481933594e+02, 2.966794738769531e+02, 2.967792358398438e+02, 2.968854370117188e+02, 2.970077819824219e+02, 2.969882202148438e+02, 2.9706982421875e+02, 2.970567932128906e+02, 2.984124450683594e+02, 2.98680419921875e+02, 2.988209838867188e+02, 2.989180908203125e+02, 2.990690002441406e+02, 2.991034851074219e+02, 2.991044616699219e+02, 2.990842895507812e+02, 2.9565869140625e+02, 2.970710754394531e+02, 2.979652404785156e+02, 2.982936096191406e+02, 2.985703735351562e+02, 2.988157958984375e+02, 2.988893737792969e+02, 2.991122436523438e+02, 2.992071838378906e+02, 2.993654479980469e+02, 2.985871887207031e+02, 2.979717102050781e+02, 2.999245910644531e+02, 3.001611022949219e+02, 3.002248229980469e+02, 3.001666564941406e+02, 3.001185913085938e+02, 3.000666809082031e+02, 2.99994873046875e+02, 2.97077392578125e+02, 2.97294189453125e+02, 2.971416931152344e+02, 2.980973205566406e+02, 2.982136535644531e+02, 2.985978393554688e+02, 2.989175415039062e+02, 2.989779357910156e+02, 2.992781982421875e+02, 2.994161376953125e+02, 2.994061279296875e+02, 2.988150939941406e+02, 2.983339538574219e+02, 3.001163940429688e+02, 3.003454284667969e+02, 3.003971252441406e+02, 3.003514709472656e+02, 3.00286376953125e+02, 3.002199096679688e+02, 3.001318359375e+02, 2.975262451171875e+02, 2.973232421875e+02, 2.971530151367188e+02, 2.98117919921875e+02, 2.982820739746094e+02, 2.986876220703125e+02, 2.991202697753906e+02, 2.992027893066406e+02, 2.993134155273438e+02, 2.994771118164062e+02, 2.99693359375e+02, 2.992218933105469e+02, 2.985872192382812e+02, 3.001838073730469e+02, 3.00300537109375e+02, 3.003493957519531e+02, 3.002478637695312e+02, 3.001687622070312e+02]
-flo.wes.TAir=[2.931499938964844e+02, 2.974620361328125e+02, 2.975399780273438e+02, 2.974747924804688e+02, 2.975080261230469e+02, 2.969397277832031e+02, 2.962789001464844e+02, 2.965131225585938e+02, 2.967060241699219e+02, 2.968628540039062e+02, 2.967489929199219e+02, 2.968954162597656e+02, 2.972220153808594e+02, 2.972021179199219e+02, 2.969674072265625e+02, 2.967186584472656e+02, 2.980852966308594e+02, 2.981891479492188e+02, 2.983428955078125e+02, 2.984690246582031e+02, 2.985538635253906e+02, 2.984956359863281e+02, 2.984780883789062e+02, 2.98444091796875e+02, 2.984332580566406e+02, 2.97407470703125e+02, 2.968350830078125e+02, 2.969247741699219e+02, 2.971000671386719e+02, 2.970271911621094e+02, 2.971677551269531e+02, 2.972024536132812e+02, 2.973364868164062e+02, 2.971863708496094e+02, 2.973620300292969e+02, 2.970663757324219e+02, 2.990622863769531e+02, 2.990121459960938e+02, 2.992087707519531e+02, 2.992794494628906e+02, 2.99402587890625e+02, 2.994186096191406e+02, 2.994053344726562e+02, 2.9936181640625e+02, 2.956640319824219e+02, 2.970877685546875e+02, 2.979035949707031e+02, 2.979391784667969e+02, 2.981921691894531e+02, 2.984506225585938e+02, 2.985721740722656e+02, 2.988009033203125e+02, 2.992995910644531e+02, 2.996795043945312e+02, 2.989287414550781e+02, 2.981155395507812e+02, 3.00425048828125e+02, 3.004658508300781e+02, 3.00517333984375e+02, 3.004343872070312e+02, 3.003706970214844e+02, 3.002875366210938e+02, 3.002039489746094e+02, 2.967222900390625e+02, 2.971233520507812e+02, 2.971809387207031e+02, 2.979585266113281e+02, 2.977581787109375e+02, 2.981387634277344e+02, 2.984829711914062e+02, 2.985879821777344e+02, 2.989241027832031e+02, 2.995448303222656e+02, 2.998167114257812e+02, 2.99323486328125e+02, 2.986175842285156e+02, 3.006663208007812e+02, 3.006873474121094e+02, 3.007204895019531e+02, 3.006531372070312e+02, 3.0056396484375e+02, 3.004902038574219e+02, 3.003837890625e+02, 2.972227783203125e+02, 2.971922912597656e+02, 2.971727905273438e+02, 2.9785791015625e+02, 2.978700866699219e+02, 2.982772827148438e+02, 2.987437744140625e+02, 2.98872314453125e+02, 2.989605407714844e+02, 2.995329895019531e+02, 2.999518432617188e+02, 2.995630187988281e+02, 2.98612060546875e+02, 3.005814819335938e+02, 3.005515747070312e+02, 3.005702514648438e+02, 3.004625854492188e+02, 3.004091491699219e+02]
-flo.cor.TAir=[2.931499938964844e+02, 2.972122802734375e+02, 2.972682189941406e+02, 2.972667846679688e+02, 2.973027038574219e+02, 2.972079467773438e+02, 2.960500183105469e+02, 2.962004699707031e+02, 2.963760375976562e+02, 2.964674682617188e+02, 2.963538208007812e+02, 2.964400634765625e+02, 2.966213989257812e+02, 2.966654052734375e+02, 2.964528198242188e+02, 2.962205810546875e+02, 2.976503295898438e+02, 2.978416137695312e+02, 2.980057983398438e+02, 2.981297912597656e+02, 2.982256469726562e+02, 2.982063293457031e+02, 2.982064819335938e+02, 2.982073364257812e+02, 2.9822998046875e+02, 2.972864685058594e+02, 2.964693908691406e+02, 2.96444580078125e+02, 2.964787292480469e+02, 2.964859008789062e+02, 2.966005249023438e+02, 2.966524353027344e+02, 2.967131042480469e+02, 2.966952819824219e+02, 2.967809448242188e+02, 2.966983642578125e+02, 2.9829541015625e+02, 2.985346374511719e+02, 2.987007141113281e+02, 2.987841796875e+02, 2.989522705078125e+02, 2.989970397949219e+02, 2.99010498046875e+02, 2.990039367675781e+02, 2.955267028808594e+02, 2.971189575195312e+02, 2.978191833496094e+02, 2.980805358886719e+02, 2.983182678222656e+02, 2.985315551757812e+02, 2.985928955078125e+02, 2.988065185546875e+02, 2.988916320800781e+02, 2.990731201171875e+02, 2.982904663085938e+02, 2.976420593261719e+02, 2.9977734375e+02, 3.000108642578125e+02, 3.000907592773438e+02, 3.000435791015625e+02, 3.000014343261719e+02, 2.999511413574219e+02, 2.998937683105469e+02, 2.968174133300781e+02, 2.972757873535156e+02, 2.971634216308594e+02, 2.979776306152344e+02, 2.979941101074219e+02, 2.983465576171875e+02, 2.986405944824219e+02, 2.987008056640625e+02, 2.989956359863281e+02, 2.991296997070312e+02, 2.991376342773438e+02, 2.98560302734375e+02, 2.980204772949219e+02, 3.000018615722656e+02, 3.002052917480469e+02, 3.002681579589844e+02, 3.002320861816406e+02, 3.001733703613281e+02, 3.001258850097656e+02, 3.000478820800781e+02, 2.972860717773438e+02, 2.972680358886719e+02, 2.971661376953125e+02, 2.980318603515625e+02, 2.980282897949219e+02, 2.983863525390625e+02, 2.987989501953125e+02, 2.988830261230469e+02, 2.989888916015625e+02, 2.991490173339844e+02, 2.993921813964844e+02, 2.989317932128906e+02, 2.982716674804688e+02, 3.000216979980469e+02, 3.001614074707031e+02, 3.002096557617188e+02, 3.001504516601562e+02, 3.000978393554688e+02]
+flo.sou.TAir=[2.931499938964844e+02, 2.971488037109375e+02, 2.970904846191406e+02, 2.971393432617188e+02, 2.971708374023438e+02, 2.974063720703125e+02, 2.960850219726562e+02, 2.963773498535156e+02, 2.966580505371094e+02, 2.968565368652344e+02, 2.969082946777344e+02, 2.970072021484375e+02, 2.971823425292969e+02, 2.971571350097656e+02, 2.970684204101562e+02, 2.967264709472656e+02, 2.980191650390625e+02, 2.980211791992188e+02, 2.981595153808594e+02, 2.983077392578125e+02, 2.984049682617188e+02, 2.983185424804688e+02, 2.983050842285156e+02, 2.98310546875e+02, 2.982999267578125e+02, 2.974026794433594e+02, 2.966804809570312e+02, 2.9667236328125e+02, 2.968237915039062e+02, 2.969786682128906e+02, 2.971132202148438e+02, 2.971643676757812e+02, 2.971300354003906e+02, 2.97138916015625e+02, 2.971786193847656e+02, 2.97083984375e+02, 2.985570983886719e+02, 2.988449096679688e+02, 2.989736938476562e+02, 2.989808654785156e+02, 2.991303405761719e+02, 2.991423645019531e+02, 2.991199645996094e+02, 2.990958557128906e+02, 2.956447448730469e+02, 2.970949401855469e+02, 2.980350341796875e+02, 2.983704833984375e+02, 2.986813354492188e+02, 2.990097045898438e+02, 2.991408081054688e+02, 2.99356201171875e+02, 2.993904418945312e+02, 2.995122680664062e+02, 2.987208862304688e+02, 2.980465698242188e+02, 3.000195617675781e+02, 3.002750244140625e+02, 3.003187255859375e+02, 3.002282409667969e+02, 3.001750793457031e+02, 3.00078369140625e+02, 3.000108642578125e+02, 2.971263732910156e+02, 2.972859802246094e+02, 2.97150146484375e+02, 2.981152954101562e+02, 2.982747192382812e+02, 2.987029724121094e+02, 2.991185302734375e+02, 2.99244873046875e+02, 2.995343017578125e+02, 2.996030578613281e+02, 2.995537719726562e+02, 2.989530334472656e+02, 2.983953552246094e+02, 3.002764282226562e+02, 3.004601135253906e+02, 3.004804992675781e+02, 3.004258117675781e+02, 3.003445434570312e+02, 3.002892761230469e+02, 3.001666259765625e+02, 2.975871276855469e+02, 2.973202209472656e+02, 2.971607666015625e+02, 2.980914916992188e+02, 2.983416137695312e+02, 2.987806396484375e+02, 2.992689208984375e+02, 2.9939404296875e+02, 2.995191040039062e+02, 2.996379699707031e+02, 2.998191528320312e+02, 2.993363647460938e+02, 2.986708374023438e+02, 3.002954406738281e+02, 3.003684997558594e+02, 3.003977355957031e+02, 3.003071594238281e+02, 3.002549743652344e+02]
+flo.eas.TAir=[2.931499938964844e+02, 2.971689147949219e+02, 2.971096801757812e+02, 2.970797119140625e+02, 2.973670349121094e+02, 2.969737854003906e+02, 2.967791442871094e+02, 2.969533386230469e+02, 2.971698913574219e+02, 2.970714111328125e+02, 2.968970947265625e+02, 2.96971923828125e+02, 2.971183166503906e+02, 2.971463317871094e+02, 2.968910522460938e+02, 2.966602783203125e+02, 2.980811767578125e+02, 2.981100769042969e+02, 2.983236083984375e+02, 2.984343566894531e+02, 2.985224914550781e+02, 2.984577941894531e+02, 2.984411315917969e+02, 2.984229736328125e+02, 2.985404968261719e+02, 2.973540344238281e+02, 2.972004699707031e+02, 2.972578430175781e+02, 2.96905517578125e+02, 2.971376647949219e+02, 2.971561279296875e+02, 2.971617126464844e+02, 2.971420593261719e+02, 2.97196533203125e+02, 2.971748657226562e+02, 2.9713525390625e+02, 2.9868212890625e+02, 2.989615173339844e+02, 2.990986938476562e+02, 2.991851196289062e+02, 2.993108520507812e+02, 2.993264770507812e+02, 2.9931494140625e+02, 2.992809448242188e+02, 2.957081909179688e+02, 2.971309204101562e+02, 2.983616333007812e+02, 2.98807861328125e+02, 2.9894189453125e+02, 2.988395690917969e+02, 2.988388366699219e+02, 2.989792175292969e+02, 2.990361328125e+02, 2.991241760253906e+02, 2.983800048828125e+02, 2.977065734863281e+02, 3.002623596191406e+02, 3.003618469238281e+02, 3.004285888671875e+02, 3.003588256835938e+02, 3.003015747070312e+02, 3.002359924316406e+02, 3.001542663574219e+02, 2.966475830078125e+02, 2.971530151367188e+02, 2.97192626953125e+02, 2.981732788085938e+02, 2.987298889160156e+02, 2.989795532226562e+02, 2.989309997558594e+02, 2.989103698730469e+02, 2.991411437988281e+02, 2.992347106933594e+02, 2.991376953125e+02, 2.985767211914062e+02, 2.980391845703125e+02, 3.003851928710938e+02, 3.005356140136719e+02, 3.005960998535156e+02, 3.005387878417969e+02, 3.004618835449219e+02, 3.00387939453125e+02, 3.002908935546875e+02, 2.971075134277344e+02, 2.972590637207031e+02, 2.971769104003906e+02, 2.983642272949219e+02, 2.985199890136719e+02, 2.987689514160156e+02, 2.990183715820312e+02, 2.990726013183594e+02, 2.990972290039062e+02, 2.992332153320312e+02, 2.994132080078125e+02, 2.990055541992188e+02, 2.9837255859375e+02, 3.004650268554688e+02, 3.004190368652344e+02, 3.005099182128906e+02, 3.004617614746094e+02, 3.003960571289062e+02]
+flo.nor.TAir=[2.931499938964844e+02, 2.97158447265625e+02, 2.972337951660156e+02, 2.971536560058594e+02, 2.972750244140625e+02, 2.973009338378906e+02, 2.960909729003906e+02, 2.963038635253906e+02, 2.964967346191406e+02, 2.966546325683594e+02, 2.965211791992188e+02, 2.966138305664062e+02, 2.967633666992188e+02, 2.968624267578125e+02, 2.965803527832031e+02, 2.963473205566406e+02, 2.977625427246094e+02, 2.979200744628906e+02, 2.980867614746094e+02, 2.982205810546875e+02, 2.983235778808594e+02, 2.982540893554688e+02, 2.982366027832031e+02, 2.982514038085938e+02, 2.983358154296875e+02, 2.974235534667969e+02, 2.966487121582031e+02, 2.966075439453125e+02, 2.967003479003906e+02, 2.967139892578125e+02, 2.967744140625e+02, 2.968856811523438e+02, 2.970085144042969e+02, 2.96988525390625e+02, 2.970700988769531e+02, 2.970570068359375e+02, 2.984124450683594e+02, 2.986806030273438e+02, 2.988211669921875e+02, 2.989182739257812e+02, 2.990691528320312e+02, 2.991036376953125e+02, 2.991046142578125e+02, 2.990844421386719e+02, 2.956574401855469e+02, 2.970903625488281e+02, 2.979907836914062e+02, 2.983066711425781e+02, 2.985759887695312e+02, 2.988199462890625e+02, 2.98892822265625e+02, 2.991151733398438e+02, 2.99209716796875e+02, 2.9936767578125e+02, 2.985892944335938e+02, 2.979735717773438e+02, 2.999266052246094e+02, 3.00163330078125e+02, 3.002269592285156e+02, 3.001686706542969e+02, 3.001204833984375e+02, 3.000684204101562e+02, 2.999964904785156e+02, 2.97094482421875e+02, 2.972966003417969e+02, 2.971419372558594e+02, 2.980969848632812e+02, 2.982143249511719e+02, 2.985984802246094e+02, 2.989181518554688e+02, 2.989784545898438e+02, 2.992786865234375e+02, 2.994165649414062e+02, 2.99406494140625e+02, 2.988155517578125e+02, 2.983343200683594e+02, 3.00116455078125e+02, 3.003458251953125e+02, 3.003974914550781e+02, 3.003518371582031e+02, 3.002867126464844e+02, 3.002202453613281e+02, 3.001321105957031e+02, 2.975482788085938e+02, 2.973277282714844e+02, 2.971550598144531e+02, 2.9811767578125e+02, 2.982823791503906e+02, 2.986879272460938e+02, 2.991205444335938e+02, 2.992030334472656e+02, 2.993136291503906e+02, 2.99477294921875e+02, 2.996935119628906e+02, 2.992221069335938e+02, 2.9858740234375e+02, 3.001836853027344e+02, 3.003007202148438e+02, 3.003495788574219e+02, 3.002480163574219e+02, 3.001689147949219e+02]
+flo.wes.TAir=[2.931499938964844e+02, 2.974619750976562e+02, 2.975399780273438e+02, 2.974747924804688e+02, 2.975079956054688e+02, 2.969978942871094e+02, 2.962705383300781e+02, 2.9651318359375e+02, 2.967055969238281e+02, 2.968624572753906e+02, 2.967486572265625e+02, 2.968951416015625e+02, 2.972220458984375e+02, 2.972019653320312e+02, 2.969674682617188e+02, 2.967185363769531e+02, 2.98085205078125e+02, 2.981889953613281e+02, 2.983427429199219e+02, 2.984689025878906e+02, 2.985537414550781e+02, 2.984955444335938e+02, 2.984779968261719e+02, 2.984440002441406e+02, 2.984346923828125e+02, 2.974172668457031e+02, 2.968521118164062e+02, 2.969244995117188e+02, 2.971001892089844e+02, 2.970713195800781e+02, 2.971668395996094e+02, 2.972028503417969e+02, 2.973377075195312e+02, 2.971866760253906e+02, 2.973623962402344e+02, 2.970666198730469e+02, 2.99062744140625e+02, 2.990123596191406e+02, 2.992090148925781e+02, 2.992796936035156e+02, 2.994027709960938e+02, 2.994188232421875e+02, 2.99405517578125e+02, 2.993619995117188e+02, 2.956230163574219e+02, 2.9710693359375e+02, 2.978782043457031e+02, 2.979511413574219e+02, 2.981952819824219e+02, 2.98452880859375e+02, 2.985739135742188e+02, 2.988023986816406e+02, 2.9930126953125e+02, 2.996810913085938e+02, 2.989302673339844e+02, 2.981168823242188e+02, 3.004271240234375e+02, 3.004677734375e+02, 3.005191650390625e+02, 3.004361267089844e+02, 3.00372314453125e+02, 3.002890319824219e+02, 3.002053527832031e+02, 2.967373962402344e+02, 2.971190795898438e+02, 2.971821899414062e+02, 2.979579772949219e+02, 2.977587890625e+02, 2.981392822265625e+02, 2.984834594726562e+02, 2.985884094238281e+02, 2.989244689941406e+02, 2.995451965332031e+02, 2.998170471191406e+02, 2.993238220214844e+02, 2.986178894042969e+02, 3.006666870117188e+02, 3.006877136230469e+02, 3.007208557128906e+02, 3.006534729003906e+02, 3.005642700195312e+02, 3.00490478515625e+02, 3.003840637207031e+02, 2.972446899414062e+02, 2.971958312988281e+02, 2.971731262207031e+02, 2.978555603027344e+02, 2.978704223632812e+02, 2.982775573730469e+02, 2.987440490722656e+02, 2.9887255859375e+02, 2.989607543945312e+02, 2.995331726074219e+02, 2.999519958496094e+02, 2.995631713867188e+02, 2.986122131347656e+02, 3.005816650390625e+02, 3.005517578125e+02, 3.005704040527344e+02, 3.004627380371094e+02, 3.004093017578125e+02]
+flo.cor.TAir=[2.931499938964844e+02, 2.972122192382812e+02, 2.972682189941406e+02, 2.972667846679688e+02, 2.973027038574219e+02, 2.972542724609375e+02, 2.960418701171875e+02, 2.962006225585938e+02, 2.963757934570312e+02, 2.964671630859375e+02, 2.963535766601562e+02, 2.964398498535156e+02, 2.966212768554688e+02, 2.966653442382812e+02, 2.964527587890625e+02, 2.96220458984375e+02, 2.976499938964844e+02, 2.978414916992188e+02, 2.980056762695312e+02, 2.981296691894531e+02, 2.982255249023438e+02, 2.982062377929688e+02, 2.982063903808594e+02, 2.982072448730469e+02, 2.982311706542969e+02, 2.9727783203125e+02, 2.964830017089844e+02, 2.964462585449219e+02, 2.96468994140625e+02, 2.965260314941406e+02, 2.96596923828125e+02, 2.96653076171875e+02, 2.967135620117188e+02, 2.96695556640625e+02, 2.967811584472656e+02, 2.966985473632812e+02, 2.982956848144531e+02, 2.98534912109375e+02, 2.987009887695312e+02, 2.987844543457031e+02, 2.989525146484375e+02, 2.989972534179688e+02, 2.990107116699219e+02, 2.99004150390625e+02, 2.955109252929688e+02, 2.971417541503906e+02, 2.978291320800781e+02, 2.980948791503906e+02, 2.983239440917969e+02, 2.985356750488281e+02, 2.985963745117188e+02, 2.988094482421875e+02, 2.988941040039062e+02, 2.990752258300781e+02, 2.982924499511719e+02, 2.976438903808594e+02, 2.997796020507812e+02, 3.000131530761719e+02, 3.000929565429688e+02, 3.00045654296875e+02, 3.000033569335938e+02, 2.999529113769531e+02, 2.998954467773438e+02, 2.968348083496094e+02, 2.97274658203125e+02, 2.971629638671875e+02, 2.979779663085938e+02, 2.979948425292969e+02, 2.983472290039062e+02, 2.986412048339844e+02, 2.987013549804688e+02, 2.989961242675781e+02, 2.99130126953125e+02, 2.991380004882812e+02, 2.985607299804688e+02, 2.980208435058594e+02, 3.000020751953125e+02, 3.002056884765625e+02, 3.002685546875e+02, 3.002324829101562e+02, 3.001737060546875e+02, 3.00126220703125e+02, 3.000481872558594e+02, 2.973086547851562e+02, 2.972693481445312e+02, 2.9716650390625e+02, 2.980321350097656e+02, 2.980286254882812e+02, 2.983866577148438e+02, 2.987992248535156e+02, 2.988832702636719e+02, 2.989891357421875e+02, 2.991492309570312e+02, 2.993923645019531e+02, 2.989319763183594e+02, 2.982718505859375e+02, 3.000216979980469e+02, 3.001615905761719e+02, 3.002098388671875e+02, 3.00150634765625e+02, 3.000979919433594e+02]
 hvac.TZonSet[1].TCooSet=[3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02]
 hvac.TZonSet[1].THeaSet=[2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02]
-hvac.fanSup.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.720249593257904e-01, 3.385133743286133e-01, 2.931900322437286e-01, 3.032422363758087e-01, 3.063399791717529e-01, 3.032086789608002e-01, 3.031823933124542e-01, 3.068248629570007e-01, 3.414949178695679e-01, 3.440666496753693e-01, 3.00455778837204e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.530483216047287e-01, 4.226331412792206e-01, 3.045966029167175e-01, 3.394297957420349e-01, 3.465162813663483e-01, 3.281815052032471e-01, 3.037332892417908e-01, 3.196571469306946e-01, 3.530568778514862e-01, 4.293164312839508e-01, 3.961372077465057e-01, 3.697693943977356e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.134951829910278e-01, 3.112649917602539e-01, 4.314609169960022e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.597331404685974e-01, 4.327360689640045e-01, 3.223090767860413e-01, 5.530421733856201e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.855688691139221e-01, 4.746844172477722e-01, 3.39695543050766e-01, 6.051127314567566e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-hvac.VAVBox[5].vav.y_actual=[1e+00, -0e+00, -0e+00, -0e+00, -0e+00, 6.173828840255737e-01, 5.454221367835999e-01, 6.434695720672607e-01, 6.586399674415588e-01, 6.489063501358032e-01, 6.473278403282166e-01, 6.501170992851257e-01, 6.611840724945068e-01, 7.0734703540802e-01, 6.252371072769165e-01, 6.283407807350159e-01, 2.090388030016246e-19, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 1.909989565610886e-01, 1.750159859657288e-01, 6.575449109077454e-01, 6.873360276222229e-01, 6.593191623687744e-01, 6.168035864830017e-01, 6.440592408180237e-01, 6.716516613960266e-01, 7.057815790176392e-01, 5.653911232948303e-01, 5.732524394989014e-01, 5.882961750030518e-01, 1.987863697680032e-18, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, 5.731949210166931e-01, 4.548889398574829e-01, 6.945341229438782e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.271481940084194e-19, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 1e+00, 3.908333480358124e-01, 5.645139217376709e-01, 5.922463536262512e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.489991521659851e-19, -0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 1e+00, 3.71610552072525e-01, 5.793265700340271e-01, 5.79582691192627e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1.710288586531385e-19, 0e+00, 0e+00, 0e+00, 0e+00]
-hvac.VAVBox[1].vav.y_actual=[1e+00, -0e+00, -0e+00, -0e+00, -0e+00, 5.272731781005859e-01, 5.445833802223206e-01, 6.43458366394043e-01, 6.586401462554932e-01, 6.489067673683167e-01, 6.4732825756073e-01, 6.501175165176392e-01, 6.916379332542419e-01, 8.623199462890625e-01, 6.407234072685242e-01, 6.285337209701538e-01, 2.090410777483091e-19, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 2.026190906763077e-01, 2.317573726177216e-01, 6.588206887245178e-01, 6.873762011528015e-01, 6.593204736709595e-01, 6.168039441108704e-01, 6.440596580505371e-01, 6.991335153579712e-01, 7.94720470905304e-01, 5.682237148284912e-01, 5.920532941818237e-01, 5.891663432121277e-01, 1.987943107018837e-18, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, 6.507795453071594e-01, 5.420276522636414e-01, 7.744529247283936e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.271481940084194e-19, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 1e+00, 4.669311940670013e-01, 6.735017895698547e-01, 6.556875705718994e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.489991521659851e-19, -0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 1e+00, 4.46723610162735e-01, 6.951079964637756e-01, 6.465941667556763e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1.710288586531385e-19, 0e+00, 0e+00, 0e+00, 0e+00]
-hvac.VAVBox[2].vav.y_actual=[1e+00, -0e+00, -0e+00, -0e+00, -0e+00, 9.070120453834534e-01, 4.68731164932251e-01, 5.429611802101135e-01, 5.643301010131836e-01, 5.504712462425232e-01, 5.465186834335327e-01, 5.486264228820801e-01, 5.571298003196716e-01, 6.009697318077087e-01, 5.289404988288879e-01, 5.310138463973999e-01, 1.763410900951365e-19, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 2.41902768611908e-01, 3.850986957550049e-01, 8.444077968597412e-01, 1e+00, 1e+00, 5.602819323539734e-01, 5.801599025726318e-01, 6.304535865783691e-01, 7.130299210548401e-01, 5.310854911804199e-01, 5.597833395004272e-01, 5.373526215553284e-01, 1.688684981226367e-18, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.497517585754395e-01, 5.467649698257446e-01, 8.553982377052307e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.271481940084194e-19, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 1e+00, 4.26167368888855e-01, 6.85596764087677e-01, 7.312452793121338e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.489991521659851e-19, -0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 1e+00, 4.072486162185669e-01, 7.209271788597107e-01, 7.048041224479675e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1.710288586531385e-19, 0e+00, 0e+00, 0e+00, 0e+00]
-hvac.VAVBox[3].vav.y_actual=[1e+00, -0e+00, -0e+00, -0e+00, -0e+00, 6.872322559356689e-01, 5.47967255115509e-01, 6.435050368309021e-01, 6.586410999298096e-01, 6.489067673683167e-01, 6.4732825756073e-01, 6.501175165176392e-01, 6.611844897270203e-01, 7.07347571849823e-01, 6.252375245094299e-01, 6.283411383628845e-01, 2.090389322485953e-19, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 2.079565972089767e-01, 2.686534821987152e-01, 6.594922542572021e-01, 6.873971223831177e-01, 6.593208909034729e-01, 6.168039441108704e-01, 6.440596580505371e-01, 6.7165207862854e-01, 7.057820558547974e-01, 5.65391480922699e-01, 5.7325279712677e-01, 5.882964730262756e-01, 1.987864938450951e-18, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.487588286399841e-01, 5.510364174842834e-01, 7.653457522392273e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.271481940084194e-19, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 1e+00, 4.655740261077881e-01, 6.91383957862854e-01, 6.479339003562927e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.489991521659851e-19, -0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 1e+00, 4.455059766769409e-01, 7.188546657562256e-01, 6.359295845031738e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1.710288586531385e-19, 0e+00, 0e+00, 0e+00, 0e+00]
-hvac.VAVBox[4].vav.y_actual=[1e+00, -0e+00, -0e+00, -0e+00, -0e+00, 6.904382705688477e-01, 4.6137934923172e-01, 5.428325533866882e-01, 5.550857186317444e-01, 5.476581454277039e-01, 5.46469509601593e-01, 5.486255884170532e-01, 6.268005967140198e-01, 1e+00, 5.758334994316101e-01, 5.317501425743103e-01, 1.763492714283825e-19, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 2.254661321640015e-01, 2.273923605680466e-01, 5.538033843040466e-01, 5.753932595252991e-01, 5.55437445640564e-01, 5.221769213676453e-01, 5.701119303703308e-01, 6.481254100799561e-01, 1e+00, 1e+00, 1e+00, 1e+00, 2.422539044565676e-18, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, 5.733148455619812e-01, 4.959995448589325e-01, 7.075345516204834e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.271481940084194e-19, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 1e+00, 4.265831410884857e-01, 6.002438068389893e-01, 6.064480543136597e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.489991521659851e-19, -0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 1e+00, 4.143446981906891e-01, 6.18157684803009e-01, 5.936586856842041e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1.710288586531385e-19, 0e+00, 0e+00, 0e+00, 0e+00]
+hvac.fanSup.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.697503864765167e-01, 3.404299020767212e-01, 2.930605113506317e-01, 3.031800985336304e-01, 3.063422441482544e-01, 3.032113313674927e-01, 3.031818866729736e-01, 3.068116009235382e-01, 3.414638638496399e-01, 3.440412878990173e-01, 3.004555702209473e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.62344828248024e-01, 4.295051395893097e-01, 3.012441396713257e-01, 3.392390608787537e-01, 3.576570749282837e-01, 3.152950406074524e-01, 3.047941327095032e-01, 3.199936747550964e-01, 3.53188157081604e-01, 4.294396340847015e-01, 3.96218329668045e-01, 3.698241412639618e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.3043053150177e-01, 3.218172192573547e-01, 4.006677567958832e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.582990527153015e-01, 4.329458177089691e-01, 3.224967122077942e-01, 5.533484816551208e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.807031631469727e-01, 4.725458920001984e-01, 3.39605301618576e-01, 6.057319045066833e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+hvac.VAVBox[5].vav.y_actual=[1e+00, -0e+00, 0e+00, 0e+00, 0e+00, 6.055161356925964e-01, 5.440924763679504e-01, 6.428635120391846e-01, 6.587818264961243e-01, 6.489390134811401e-01, 6.473239660263062e-01, 6.501156091690063e-01, 6.611468195915222e-01, 7.073289752006531e-01, 6.252382397651672e-01, 6.283527612686157e-01, 2.156804817090572e-19, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 1.794084310531616e-01, 1.709365248680115e-01, 6.597865223884583e-01, 6.905271410942078e-01, 6.284286379814148e-01, 6.132348775863647e-01, 6.50033175945282e-01, 6.702777743339539e-01, 7.058862447738647e-01, 5.653672218322754e-01, 5.732535719871521e-01, 5.882847905158997e-01, 1.970218074057898e-18, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, 5.803964138031006e-01, 4.334554970264435e-01, 8.4229975938797e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.282329379842061e-19, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 1e+00, 3.910457789897919e-01, 5.647331476211548e-01, 5.921633839607239e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.477136100965011e-19, -0e+00, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 3.71785044670105e-01, 5.793085098266602e-01, 5.792663097381592e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1.712214237148014e-19, 0e+00, 0e+00, 0e+00, 0e+00]
+hvac.VAVBox[1].vav.y_actual=[1e+00, -0e+00, 0e+00, 0e+00, 0e+00, 5.106614232063293e-01, 5.431517958641052e-01, 6.428510546684265e-01, 6.587819457054138e-01, 6.489394307136536e-01, 6.473243832588196e-01, 6.501160264015198e-01, 6.914727091789246e-01, 8.620966076850891e-01, 6.4070725440979e-01, 6.285455822944641e-01, 2.156828210792271e-19, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.91665381193161e-01, 2.229495495557785e-01, 6.609505414962769e-01, 6.905659437179565e-01, 6.28429651260376e-01, 6.132352352142334e-01, 6.500335931777954e-01, 6.969119906425476e-01, 7.963576912879944e-01, 5.682321786880493e-01, 5.921651124954224e-01, 5.891594886779785e-01, 1.970297069806396e-18, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, 6.570544838905334e-01, 5.191909074783325e-01, 9.91234302520752e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.282329379842061e-19, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 1e+00, 4.667235314846039e-01, 6.737586259841919e-01, 6.556376218795776e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.477136100965011e-19, -0e+00, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 4.470245242118835e-01, 6.949456930160522e-01, 6.462457776069641e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1.712214237148014e-19, 0e+00, 0e+00, 0e+00, 0e+00]
+hvac.VAVBox[2].vav.y_actual=[1e+00, -0e+00, 0e+00, 0e+00, 0e+00, 8.97204577922821e-01, 4.679902791976929e-01, 5.424596667289734e-01, 5.643543601036072e-01, 5.50467312335968e-01, 5.46515166759491e-01, 5.486252903938293e-01, 5.571014881134033e-01, 6.009398698806763e-01, 5.289402008056641e-01, 5.310239195823669e-01, 1.819438816519907e-19, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 2.336889058351517e-01, 3.76433402299881e-01, 8.757339715957642e-01, 1e+00, 1e+00, 5.637125372886658e-01, 5.830672979354858e-01, 6.300458908081055e-01, 7.144342064857483e-01, 5.31457781791687e-01, 5.601490139961243e-01, 5.376259088516235e-01, 1.673829954798257e-18, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, 5.592082738876343e-01, 5.250458121299744e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.282329896829944e-19, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 1e+00, 4.266657531261444e-01, 6.857723593711853e-01, 7.312247157096863e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.477136100965011e-19, -0e+00, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 4.077829122543335e-01, 7.208754420280457e-01, 7.043522596359253e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1.712214237148014e-19, 0e+00, 0e+00, 0e+00, 0e+00]
+hvac.VAVBox[3].vav.y_actual=[1e+00, -0e+00, 0e+00, 0e+00, 0e+00, 6.73408031463623e-01, 5.465564727783203e-01, 6.428976058959961e-01, 6.587828993797302e-01, 6.489394307136536e-01, 6.473243832588196e-01, 6.501160264015198e-01, 6.611472368240356e-01, 7.073295116424561e-01, 6.252385973930359e-01, 6.283531785011292e-01, 2.156806109560279e-19, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 1.974586397409439e-01, 2.58951872587204e-01, 6.616131067276001e-01, 6.905877590179443e-01, 6.284300088882446e-01, 6.132352352142334e-01, 6.500335931777954e-01, 6.702782511711121e-01, 7.058867216110229e-01, 5.653675198554993e-01, 5.73253870010376e-01, 5.882851481437683e-01, 1.970219108033663e-18, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, 6.553145051002502e-01, 5.280537605285645e-01, 9.808582067489624e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.282329379842061e-19, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 1e+00, 4.65394526720047e-01, 6.916600465774536e-01, 6.478604674339294e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.477136100965011e-19, -0e+00, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 4.457539021968842e-01, 7.186373472213745e-01, 6.355440020561218e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1.712214237148014e-19, 0e+00, 0e+00, 0e+00, 0e+00]
+hvac.VAVBox[4].vav.y_actual=[1e+00, -0e+00, 0e+00, 0e+00, 0e+00, 6.825190782546997e-01, 4.603792130947113e-01, 5.42326807975769e-01, 5.55192768573761e-01, 5.476828217506409e-01, 5.464664697647095e-01, 5.486243963241577e-01, 6.266552805900574e-01, 1e+00, 5.757690668106079e-01, 5.317592024803162e-01, 1.819523214791782e-19, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 2.159428149461746e-01, 2.188086360692978e-01, 5.551573634147644e-01, 5.774732232093811e-01, 5.314221978187561e-01, 5.187332034111023e-01, 5.731797814369202e-01, 6.469709277153015e-01, 1e+00, 1e+00, 1e+00, 1e+00, 2.402613711175345e-18, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, 5.835921764373779e-01, 4.755514562129974e-01, 8.671650886535645e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.282329896829944e-19, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 1e+00, 4.271704256534576e-01, 6.002539992332458e-01, 6.063767671585083e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.477136100965011e-19, -0e+00, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 4.150193929672241e-01, 6.182426810264587e-01, 5.933610200881958e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1.712214237148014e-19, 0e+00, 0e+00, 0e+00, 0e+00]
 hvac.damOut.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-hvac.VAVBox[1].TSup=[2.931499938964844e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.894163208007812e+02, 2.852168273925781e+02, 2.853668518066406e+02, 2.85887939453125e+02, 2.860963134765625e+02, 2.864668273925781e+02, 2.867906188964844e+02, 2.870096130371094e+02, 2.8773193359375e+02, 2.875172729492188e+02, 2.862868957519531e+02, 2.864781494140625e+02, 2.864781494140625e+02, 2.864781494140625e+02, 2.864781494140625e+02, 2.864781494140625e+02, 2.864781494140625e+02, 2.864781494140625e+02, 2.864781494140625e+02, 2.86541015625e+02, 2.845290832519531e+02, 2.860519409179688e+02, 2.86896728515625e+02, 2.872807922363281e+02, 2.871041564941406e+02, 2.86927001953125e+02, 2.875053100585938e+02, 2.881181640625e+02, 2.886089477539062e+02, 2.883871154785156e+02, 2.876546630859375e+02, 2.873762817382812e+02, 2.873762817382812e+02, 2.873762817382812e+02, 2.873762817382812e+02, 2.873762817382812e+02, 2.873762817382812e+02, 2.873762817382812e+02, 2.873762817382812e+02, 2.884548034667969e+02, 2.851038208007812e+02, 2.877890625e+02, 2.937384643554688e+02, 2.937927551269531e+02, 2.940797119140625e+02, 2.944173889160156e+02, 2.941339111328125e+02, 2.941396789550781e+02, 2.941976623535156e+02, 2.938414001464844e+02, 2.932702941894531e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.88996337890625e+02, 2.848204345703125e+02, 2.8512158203125e+02, 2.883201904296875e+02, 2.929265441894531e+02, 2.934717102050781e+02, 2.940345764160156e+02, 2.944160766601562e+02, 2.944441528320312e+02, 2.944433898925781e+02, 2.941808166503906e+02, 2.942019653320312e+02, 2.938905944824219e+02, 2.931437683105469e+02, 2.931437683105469e+02, 2.931437683105469e+02, 2.931437683105469e+02, 2.931437683105469e+02, 2.931437683105469e+02, 2.931437683105469e+02, 2.893143005371094e+02, 2.847931213378906e+02, 2.850978698730469e+02, 2.88756103515625e+02, 2.93139404296875e+02, 2.935314331054688e+02, 2.943312377929688e+02, 2.947601013183594e+02, 2.941665344238281e+02, 2.943858032226562e+02, 2.948462829589844e+02, 2.95221923828125e+02, 2.946428833007812e+02, 2.9404443359375e+02, 2.9404443359375e+02, 2.9404443359375e+02, 2.9404443359375e+02, 2.9404443359375e+02]
-hvac.VAVBox[2].TSup=[2.931499938964844e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.894176025390625e+02, 2.852170104980469e+02, 2.853668212890625e+02, 2.858875427246094e+02, 2.860963745117188e+02, 2.864665832519531e+02, 2.867905883789062e+02, 2.870093078613281e+02, 2.877313842773438e+02, 2.8751806640625e+02, 2.862872314453125e+02, 2.864446716308594e+02, 2.864446716308594e+02, 2.864446716308594e+02, 2.864446716308594e+02, 2.864446716308594e+02, 2.864446716308594e+02, 2.864446716308594e+02, 2.864446716308594e+02, 2.865478515625e+02, 2.845286865234375e+02, 2.860523071289062e+02, 2.868969116210938e+02, 2.872808837890625e+02, 2.871043090820312e+02, 2.869268798828125e+02, 2.875051879882812e+02, 2.881181030273438e+02, 2.886092834472656e+02, 2.883872375488281e+02, 2.876549072265625e+02, 2.8734130859375e+02, 2.8734130859375e+02, 2.8734130859375e+02, 2.8734130859375e+02, 2.8734130859375e+02, 2.8734130859375e+02, 2.8734130859375e+02, 2.8734130859375e+02, 2.884561767578125e+02, 2.851038208007812e+02, 2.877892761230469e+02, 2.937384643554688e+02, 2.937927551269531e+02, 2.940797119140625e+02, 2.944173889160156e+02, 2.941339111328125e+02, 2.941396789550781e+02, 2.941976623535156e+02, 2.938414001464844e+02, 2.932702941894531e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.88996337890625e+02, 2.848203125e+02, 2.8512158203125e+02, 2.883209838867188e+02, 2.929265441894531e+02, 2.934717102050781e+02, 2.940345764160156e+02, 2.944160766601562e+02, 2.944441528320312e+02, 2.944433898925781e+02, 2.941808166503906e+02, 2.942019653320312e+02, 2.938905944824219e+02, 2.931437377929688e+02, 2.931437377929688e+02, 2.931437377929688e+02, 2.931437377929688e+02, 2.931437377929688e+02, 2.931437377929688e+02, 2.931437377929688e+02, 2.893143005371094e+02, 2.847929992675781e+02, 2.850978698730469e+02, 2.887567443847656e+02, 2.93139404296875e+02, 2.935314331054688e+02, 2.943312377929688e+02, 2.947601013183594e+02, 2.941665344238281e+02, 2.943858032226562e+02, 2.948462829589844e+02, 2.95221923828125e+02, 2.946428833007812e+02, 2.9404443359375e+02, 2.9404443359375e+02, 2.9404443359375e+02, 2.9404443359375e+02, 2.9404443359375e+02]
-hvac.VAVBox[3].TSup=[2.931499938964844e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.894173583984375e+02, 2.852168273925781e+02, 2.853668518066406e+02, 2.85887939453125e+02, 2.860963134765625e+02, 2.864668273925781e+02, 2.867906188964844e+02, 2.870095520019531e+02, 2.877317504882812e+02, 2.875173645019531e+02, 2.862868957519531e+02, 2.864781188964844e+02, 2.864781188964844e+02, 2.864781188964844e+02, 2.864781188964844e+02, 2.864781188964844e+02, 2.864781188964844e+02, 2.864781188964844e+02, 2.864781188964844e+02, 2.865436096191406e+02, 2.845289001464844e+02, 2.860519714355469e+02, 2.86896728515625e+02, 2.872807922363281e+02, 2.871041564941406e+02, 2.86927001953125e+02, 2.875052795410156e+02, 2.881181030273438e+02, 2.886089477539062e+02, 2.883871765136719e+02, 2.876546630859375e+02, 2.873762512207031e+02, 2.873762512207031e+02, 2.873762512207031e+02, 2.873762512207031e+02, 2.873762512207031e+02, 2.873762512207031e+02, 2.873762512207031e+02, 2.873762512207031e+02, 2.88454833984375e+02, 2.851038208007812e+02, 2.877890319824219e+02, 2.937384643554688e+02, 2.937927551269531e+02, 2.940797119140625e+02, 2.944173889160156e+02, 2.941339111328125e+02, 2.941396789550781e+02, 2.941976623535156e+02, 2.938414001464844e+02, 2.932702941894531e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.88996337890625e+02, 2.848204345703125e+02, 2.8512158203125e+02, 2.88320068359375e+02, 2.929265441894531e+02, 2.934717102050781e+02, 2.940345764160156e+02, 2.944160766601562e+02, 2.944441528320312e+02, 2.944433898925781e+02, 2.941808166503906e+02, 2.942019653320312e+02, 2.938905944824219e+02, 2.931437377929688e+02, 2.931437377929688e+02, 2.931437377929688e+02, 2.931437377929688e+02, 2.931437377929688e+02, 2.931437377929688e+02, 2.931437377929688e+02, 2.893143005371094e+02, 2.847931213378906e+02, 2.850978698730469e+02, 2.887559509277344e+02, 2.93139404296875e+02, 2.935314331054688e+02, 2.943312377929688e+02, 2.947601013183594e+02, 2.941665344238281e+02, 2.943858032226562e+02, 2.948462829589844e+02, 2.95221923828125e+02, 2.946428833007812e+02, 2.9404443359375e+02, 2.9404443359375e+02, 2.9404443359375e+02, 2.9404443359375e+02, 2.9404443359375e+02]
-hvac.VAVBox[4].TSup=[2.931499938964844e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.894173583984375e+02, 2.852170104980469e+02, 2.853668212890625e+02, 2.858874816894531e+02, 2.860963745117188e+02, 2.864665832519531e+02, 2.867905883789062e+02, 2.870094909667969e+02, 2.877319946289062e+02, 2.875176696777344e+02, 2.862872314453125e+02, 2.864446716308594e+02, 2.864446716308594e+02, 2.864446716308594e+02, 2.864446716308594e+02, 2.864446716308594e+02, 2.864446716308594e+02, 2.864446716308594e+02, 2.864446716308594e+02, 2.865370788574219e+02, 2.845291137695312e+02, 2.860513610839844e+02, 2.868964233398438e+02, 2.872806701660156e+02, 2.871044616699219e+02, 2.869268493652344e+02, 2.875052490234375e+02, 2.881181945800781e+02, 2.886078186035156e+02, 2.8838671875e+02, 2.876541442871094e+02, 2.874242858886719e+02, 2.874242858886719e+02, 2.874242858886719e+02, 2.874242858886719e+02, 2.874242858886719e+02, 2.874242858886719e+02, 2.874242858886719e+02, 2.874242858886719e+02, 2.884557800292969e+02, 2.851037292480469e+02, 2.877887268066406e+02, 2.937384643554688e+02, 2.937927551269531e+02, 2.940797119140625e+02, 2.944173889160156e+02, 2.941339111328125e+02, 2.941396789550781e+02, 2.941976623535156e+02, 2.938414001464844e+02, 2.932702941894531e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.88996337890625e+02, 2.848203125e+02, 2.851215209960938e+02, 2.883193664550781e+02, 2.929265441894531e+02, 2.934717102050781e+02, 2.940345764160156e+02, 2.944160766601562e+02, 2.944441528320312e+02, 2.944433898925781e+02, 2.941808166503906e+02, 2.942019653320312e+02, 2.938905944824219e+02, 2.931437683105469e+02, 2.931437683105469e+02, 2.931437683105469e+02, 2.931437683105469e+02, 2.931437683105469e+02, 2.931437683105469e+02, 2.931437683105469e+02, 2.893143005371094e+02, 2.847930297851562e+02, 2.850978088378906e+02, 2.887552185058594e+02, 2.93139404296875e+02, 2.935314331054688e+02, 2.943312377929688e+02, 2.947601013183594e+02, 2.941665344238281e+02, 2.943858032226562e+02, 2.948462829589844e+02, 2.95221923828125e+02, 2.946428833007812e+02, 2.9404443359375e+02, 2.9404443359375e+02, 2.9404443359375e+02, 2.9404443359375e+02, 2.9404443359375e+02]
-hvac.VAVBox[5].TSup=[2.931499938964844e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.894171142578125e+02, 2.852168273925781e+02, 2.853668518066406e+02, 2.85887939453125e+02, 2.860963134765625e+02, 2.864668273925781e+02, 2.867906188964844e+02, 2.870095520019531e+02, 2.877317504882812e+02, 2.875173645019531e+02, 2.862868957519531e+02, 2.864781188964844e+02, 2.864781188964844e+02, 2.864781188964844e+02, 2.864781188964844e+02, 2.864781188964844e+02, 2.864781188964844e+02, 2.864781188964844e+02, 2.864781188964844e+02, 2.8653515625e+02, 2.845296325683594e+02, 2.860519409179688e+02, 2.86896728515625e+02, 2.872807922363281e+02, 2.871041564941406e+02, 2.86927001953125e+02, 2.875052795410156e+02, 2.881181030273438e+02, 2.886089477539062e+02, 2.883871765136719e+02, 2.876546630859375e+02, 2.873762512207031e+02, 2.873762512207031e+02, 2.873762512207031e+02, 2.873762512207031e+02, 2.873762512207031e+02, 2.873762512207031e+02, 2.873762512207031e+02, 2.873762512207031e+02, 2.884557800292969e+02, 2.851036071777344e+02, 2.877886657714844e+02, 2.937384643554688e+02, 2.937927551269531e+02, 2.940797119140625e+02, 2.944173889160156e+02, 2.941339111328125e+02, 2.941396789550781e+02, 2.941976623535156e+02, 2.938414001464844e+02, 2.932702941894531e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.88996337890625e+02, 2.848201904296875e+02, 2.851214904785156e+02, 2.883190612792969e+02, 2.929265441894531e+02, 2.934717102050781e+02, 2.940345764160156e+02, 2.944160766601562e+02, 2.944441528320312e+02, 2.944433898925781e+02, 2.941808166503906e+02, 2.942019653320312e+02, 2.938905944824219e+02, 2.931437377929688e+02, 2.931437377929688e+02, 2.931437377929688e+02, 2.931437377929688e+02, 2.931437377929688e+02, 2.931437377929688e+02, 2.931437377929688e+02, 2.893143005371094e+02, 2.847928466796875e+02, 2.850977783203125e+02, 2.887549438476562e+02, 2.93139404296875e+02, 2.935314331054688e+02, 2.943312377929688e+02, 2.947601013183594e+02, 2.941665344238281e+02, 2.943858032226562e+02, 2.948462829589844e+02, 2.95221923828125e+02, 2.946428833007812e+02, 2.9404443359375e+02, 2.9404443359375e+02, 2.9404443359375e+02, 2.9404443359375e+02, 2.9404443359375e+02]
-hvac.res.EFan=[0e+00, -3.679045335047704e-08, -3.679045335047704e-08, -3.679045335047704e-08, -3.679045335047704e-08, 6.2663671875e+02, 4.61117041015625e+03, 8.4694697265625e+03, 1.232763671875e+04, 1.61832431640625e+04, 2.00392890625e+04, 2.3895826171875e+04, 2.775205859375e+04, 3.160621875e+04, 3.547030078125e+04, 3.93253359375e+04, 4.2546734375e+04, 4.2546734375e+04, 4.2546734375e+04, 4.2546734375e+04, 4.2546734375e+04, 4.2546734375e+04, 4.2546734375e+04, 4.2546734375e+04, 4.25512734375e+04, 4.717125e+04, 5.10303046875e+04, 5.488444921875e+04, 5.874353125e+04, 6.2601703125e+04, 6.64567109375e+04, 7.03111171875e+04, 7.41675078125e+04, 7.81441484375e+04, 8.2127109375e+04, 8.60862734375e+04, 8.931440625e+04, 8.931440625e+04, 8.931440625e+04, 8.931440625e+04, 8.931440625e+04, 8.931440625e+04, 8.931440625e+04, 8.931440625e+04, 9.256765625e+04, 9.7684375e+04, 1.016964921875e+05, 1.140110859375e+05, 1.33530046875e+05, 1.53048390625e+05, 1.7256678125e+05, 1.9208521875e+05, 2.1160375e+05, 2.31122953125e+05, 2.5064203125e+05, 2.7016084375e+05, 2.8644990625e+05, 2.8644990625e+05, 2.8644990625e+05, 2.8644990625e+05, 2.8644990625e+05, 2.8644990625e+05, 2.8644990625e+05, 2.8843253125e+05, 2.97039125e+05, 3.00905125e+05, 3.0640846875e+05, 3.19217625e+05, 3.3873640625e+05, 3.5825509375e+05, 3.777736875e+05, 3.9729228125e+05, 4.1681090625e+05, 4.3632959375e+05, 4.55848125e+05, 4.7536659375e+05, 4.9165515625e+05, 4.9165515625e+05, 4.9165515625e+05, 4.9165515625e+05, 4.9165515625e+05, 4.9165515625e+05, 4.9165515625e+05, 4.9331184375e+05, 5.0250915625e+05, 5.0640465625e+05, 5.125865e+05, 5.25841125e+05, 5.45359375e+05, 5.648774375e+05, 5.843955625e+05, 6.03914125e+05, 6.234326875e+05, 6.429505625e+05, 6.624693125e+05, 6.81988e+05, 6.9827675e+05, 6.9827675e+05, 6.9827675e+05, 6.9827675e+05, 6.9827675e+05]
+hvac.VAVBox[1].TSup=[2.931499938964844e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.892630004882812e+02, 2.852102661132812e+02, 2.853652038574219e+02, 2.858875122070312e+02, 2.860964050292969e+02, 2.864668579101562e+02, 2.867906188964844e+02, 2.870092468261719e+02, 2.877314758300781e+02, 2.875169067382812e+02, 2.862869262695312e+02, 2.864781799316406e+02, 2.864781799316406e+02, 2.864781799316406e+02, 2.864781799316406e+02, 2.864781799316406e+02, 2.864781799316406e+02, 2.864781799316406e+02, 2.864781799316406e+02, 2.865452880859375e+02, 2.845127563476562e+02, 2.860192260742188e+02, 2.868981323242188e+02, 2.873639526367188e+02, 2.869197082519531e+02, 2.869568481445312e+02, 2.875070190429688e+02, 2.881204833984375e+02, 2.88610595703125e+02, 2.88388427734375e+02, 2.876554260253906e+02, 2.873769226074219e+02, 2.873769226074219e+02, 2.873769226074219e+02, 2.873769226074219e+02, 2.873769226074219e+02, 2.873769226074219e+02, 2.873769226074219e+02, 2.873769226074219e+02, 2.885782775878906e+02, 2.850791320800781e+02, 2.875189819335938e+02, 2.937385864257812e+02, 2.937927551269531e+02, 2.940797119140625e+02, 2.944173889160156e+02, 2.941339111328125e+02, 2.941396789550781e+02, 2.941976623535156e+02, 2.938414001464844e+02, 2.932702941894531e+02, 2.928578796386719e+02, 2.928578796386719e+02, 2.928578796386719e+02, 2.928578796386719e+02, 2.928578796386719e+02, 2.928578796386719e+02, 2.928578796386719e+02, 2.890252990722656e+02, 2.848202514648438e+02, 2.851210327148438e+02, 2.883229064941406e+02, 2.929265441894531e+02, 2.934717102050781e+02, 2.940345764160156e+02, 2.944160766601562e+02, 2.944441528320312e+02, 2.944433898925781e+02, 2.941808166503906e+02, 2.942019653320312e+02, 2.938905944824219e+02, 2.931437683105469e+02, 2.931437683105469e+02, 2.931437683105469e+02, 2.931437683105469e+02, 2.931437683105469e+02, 2.931437683105469e+02, 2.931437683105469e+02, 2.893343505859375e+02, 2.84787353515625e+02, 2.850970153808594e+02, 2.887606506347656e+02, 2.93139404296875e+02, 2.935314331054688e+02, 2.943312377929688e+02, 2.947601013183594e+02, 2.941665344238281e+02, 2.943858032226562e+02, 2.948462829589844e+02, 2.95221923828125e+02, 2.946428833007812e+02, 2.9404443359375e+02, 2.9404443359375e+02, 2.9404443359375e+02, 2.9404443359375e+02, 2.9404443359375e+02]
+hvac.VAVBox[2].TSup=[2.931499938964844e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.892692260742188e+02, 2.852104187011719e+02, 2.853651733398438e+02, 2.858871154785156e+02, 2.860964660644531e+02, 2.864666137695312e+02, 2.867905578613281e+02, 2.870089416503906e+02, 2.877309265136719e+02, 2.875176696777344e+02, 2.862872619628906e+02, 2.864447021484375e+02, 2.864447021484375e+02, 2.864447021484375e+02, 2.864447021484375e+02, 2.864447021484375e+02, 2.864447021484375e+02, 2.864447021484375e+02, 2.864447021484375e+02, 2.865567016601562e+02, 2.84510986328125e+02, 2.860196228027344e+02, 2.868983154296875e+02, 2.873639221191406e+02, 2.869197387695312e+02, 2.869567565917969e+02, 2.875068969726562e+02, 2.881204528808594e+02, 2.886109313964844e+02, 2.883885498046875e+02, 2.876556701660156e+02, 2.873419799804688e+02, 2.873419799804688e+02, 2.873419799804688e+02, 2.873419799804688e+02, 2.873419799804688e+02, 2.873419799804688e+02, 2.873419799804688e+02, 2.873419799804688e+02, 2.88579345703125e+02, 2.850791320800781e+02, 2.875189819335938e+02, 2.937385864257812e+02, 2.937927551269531e+02, 2.940797119140625e+02, 2.944173889160156e+02, 2.941339111328125e+02, 2.941396789550781e+02, 2.941976623535156e+02, 2.938414001464844e+02, 2.932702941894531e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.890252990722656e+02, 2.848201599121094e+02, 2.851210327148438e+02, 2.8832373046875e+02, 2.929265441894531e+02, 2.934717102050781e+02, 2.940345764160156e+02, 2.944160766601562e+02, 2.944441528320312e+02, 2.944433898925781e+02, 2.941808166503906e+02, 2.942019653320312e+02, 2.938905944824219e+02, 2.931437377929688e+02, 2.931437377929688e+02, 2.931437377929688e+02, 2.931437377929688e+02, 2.931437377929688e+02, 2.931437377929688e+02, 2.931437377929688e+02, 2.893343505859375e+02, 2.847872314453125e+02, 2.850970153808594e+02, 2.887613220214844e+02, 2.93139404296875e+02, 2.935314331054688e+02, 2.943312377929688e+02, 2.947601013183594e+02, 2.941665344238281e+02, 2.943858032226562e+02, 2.948462829589844e+02, 2.95221923828125e+02, 2.946428833007812e+02, 2.940444641113281e+02, 2.940444641113281e+02, 2.940444641113281e+02, 2.940444641113281e+02, 2.940444641113281e+02]
+hvac.VAVBox[3].TSup=[2.931499938964844e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.892679138183594e+02, 2.852102355957031e+02, 2.853652038574219e+02, 2.858875122070312e+02, 2.860964050292969e+02, 2.864668579101562e+02, 2.867906188964844e+02, 2.870092163085938e+02, 2.877312927246094e+02, 2.875169677734375e+02, 2.862869262695312e+02, 2.864781494140625e+02, 2.864781494140625e+02, 2.864781494140625e+02, 2.864781494140625e+02, 2.864781494140625e+02, 2.864781494140625e+02, 2.864781494140625e+02, 2.864781494140625e+02, 2.865487670898438e+02, 2.845120544433594e+02, 2.860192260742188e+02, 2.868981323242188e+02, 2.873639526367188e+02, 2.869197082519531e+02, 2.869568481445312e+02, 2.875069580078125e+02, 2.881204528808594e+02, 2.886106262207031e+02, 2.883884887695312e+02, 2.876554260253906e+02, 2.873769226074219e+02, 2.873769226074219e+02, 2.873769226074219e+02, 2.873769226074219e+02, 2.873769226074219e+02, 2.873769226074219e+02, 2.873769226074219e+02, 2.873769226074219e+02, 2.885782775878906e+02, 2.850791320800781e+02, 2.875189514160156e+02, 2.937385864257812e+02, 2.937927551269531e+02, 2.940797119140625e+02, 2.944173889160156e+02, 2.941339111328125e+02, 2.941396789550781e+02, 2.941976623535156e+02, 2.938414001464844e+02, 2.932702941894531e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.890252990722656e+02, 2.848202514648438e+02, 2.851210327148438e+02, 2.883228149414062e+02, 2.929265441894531e+02, 2.934717102050781e+02, 2.940345764160156e+02, 2.944160766601562e+02, 2.944441528320312e+02, 2.944433898925781e+02, 2.941808166503906e+02, 2.942019653320312e+02, 2.938905944824219e+02, 2.931437683105469e+02, 2.931437683105469e+02, 2.931437683105469e+02, 2.931437683105469e+02, 2.931437683105469e+02, 2.931437683105469e+02, 2.931437683105469e+02, 2.893343505859375e+02, 2.84787353515625e+02, 2.850970153808594e+02, 2.88760498046875e+02, 2.93139404296875e+02, 2.935314331054688e+02, 2.943312377929688e+02, 2.947601013183594e+02, 2.941665344238281e+02, 2.943858032226562e+02, 2.948462829589844e+02, 2.95221923828125e+02, 2.946428833007812e+02, 2.9404443359375e+02, 2.9404443359375e+02, 2.9404443359375e+02, 2.9404443359375e+02, 2.9404443359375e+02]
+hvac.VAVBox[4].TSup=[2.931499938964844e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.892680358886719e+02, 2.8521044921875e+02, 2.853651733398438e+02, 2.858870544433594e+02, 2.860964660644531e+02, 2.864666137695312e+02, 2.867905578613281e+02, 2.870091247558594e+02, 2.877315368652344e+02, 2.875172729492188e+02, 2.862872619628906e+02, 2.864447021484375e+02, 2.864447021484375e+02, 2.864447021484375e+02, 2.864447021484375e+02, 2.864447021484375e+02, 2.864447021484375e+02, 2.864447021484375e+02, 2.864447021484375e+02, 2.865431518554688e+02, 2.845128479003906e+02, 2.860185241699219e+02, 2.868978271484375e+02, 2.873639831542969e+02, 2.869197692871094e+02, 2.869567260742188e+02, 2.875069274902344e+02, 2.881205139160156e+02, 2.886094665527344e+02, 2.883880310058594e+02, 2.876549377441406e+02, 2.874250793457031e+02, 2.874250793457031e+02, 2.874250793457031e+02, 2.874250793457031e+02, 2.874250793457031e+02, 2.874250793457031e+02, 2.874250793457031e+02, 2.874250793457031e+02, 2.885790100097656e+02, 2.850789794921875e+02, 2.875187072753906e+02, 2.937385864257812e+02, 2.937927551269531e+02, 2.940797119140625e+02, 2.944173889160156e+02, 2.941339111328125e+02, 2.941396789550781e+02, 2.941976623535156e+02, 2.938414001464844e+02, 2.932702941894531e+02, 2.928578796386719e+02, 2.928578796386719e+02, 2.928578796386719e+02, 2.928578796386719e+02, 2.928578796386719e+02, 2.928578796386719e+02, 2.928578796386719e+02, 2.890252990722656e+02, 2.848201599121094e+02, 2.851210021972656e+02, 2.883221130371094e+02, 2.929265441894531e+02, 2.934717102050781e+02, 2.940345764160156e+02, 2.944160766601562e+02, 2.944441528320312e+02, 2.944433898925781e+02, 2.941808166503906e+02, 2.942019653320312e+02, 2.938905944824219e+02, 2.931437683105469e+02, 2.931437683105469e+02, 2.931437683105469e+02, 2.931437683105469e+02, 2.931437683105469e+02, 2.931437683105469e+02, 2.931437683105469e+02, 2.893343505859375e+02, 2.847872619628906e+02, 2.850969543457031e+02, 2.887597961425781e+02, 2.93139404296875e+02, 2.935314331054688e+02, 2.943312377929688e+02, 2.947601013183594e+02, 2.941665344238281e+02, 2.943858032226562e+02, 2.948462829589844e+02, 2.95221923828125e+02, 2.946428833007812e+02, 2.9404443359375e+02, 2.9404443359375e+02, 2.9404443359375e+02, 2.9404443359375e+02, 2.9404443359375e+02]
+hvac.VAVBox[5].TSup=[2.931499938964844e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.892666931152344e+02, 2.852102661132812e+02, 2.853652038574219e+02, 2.858875122070312e+02, 2.860964050292969e+02, 2.864668579101562e+02, 2.867906188964844e+02, 2.870092163085938e+02, 2.877312927246094e+02, 2.875169677734375e+02, 2.862869262695312e+02, 2.864781494140625e+02, 2.864781494140625e+02, 2.864781494140625e+02, 2.864781494140625e+02, 2.864781494140625e+02, 2.864781494140625e+02, 2.864781494140625e+02, 2.864781494140625e+02, 2.865374450683594e+02, 2.845143737792969e+02, 2.860191955566406e+02, 2.868981323242188e+02, 2.873639526367188e+02, 2.869197082519531e+02, 2.869568481445312e+02, 2.875069580078125e+02, 2.881204528808594e+02, 2.886106262207031e+02, 2.883884887695312e+02, 2.876554260253906e+02, 2.873768920898438e+02, 2.873768920898438e+02, 2.873768920898438e+02, 2.873768920898438e+02, 2.873768920898438e+02, 2.873768920898438e+02, 2.873768920898438e+02, 2.873768920898438e+02, 2.885790405273438e+02, 2.850787963867188e+02, 2.875186462402344e+02, 2.937385864257812e+02, 2.937927551269531e+02, 2.940797119140625e+02, 2.944173889160156e+02, 2.941339111328125e+02, 2.941396789550781e+02, 2.941976623535156e+02, 2.938414001464844e+02, 2.932702941894531e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.890252990722656e+02, 2.848200073242188e+02, 2.851209716796875e+02, 2.883218078613281e+02, 2.929265441894531e+02, 2.934717102050781e+02, 2.940345764160156e+02, 2.944160766601562e+02, 2.944441528320312e+02, 2.944433898925781e+02, 2.941808166503906e+02, 2.942019653320312e+02, 2.938905944824219e+02, 2.931437377929688e+02, 2.931437377929688e+02, 2.931437377929688e+02, 2.931437377929688e+02, 2.931437377929688e+02, 2.931437377929688e+02, 2.931437377929688e+02, 2.893343505859375e+02, 2.847870788574219e+02, 2.85096923828125e+02, 2.887594909667969e+02, 2.93139404296875e+02, 2.935314331054688e+02, 2.943312377929688e+02, 2.947601013183594e+02, 2.941665344238281e+02, 2.943858032226562e+02, 2.948462829589844e+02, 2.95221923828125e+02, 2.946428833007812e+02, 2.9404443359375e+02, 2.9404443359375e+02, 2.9404443359375e+02, 2.9404443359375e+02, 2.9404443359375e+02]
+hvac.res.EFan=[0e+00, -3.692482053452295e-08, -3.692482053452295e-08, -3.692482053452295e-08, -3.692482053452295e-08, 5.908140869140625e+02, 4.5829189453125e+03, 8.441169921875e+03, 1.2299388671875e+04, 1.6155e+04, 2.0011044921875e+04, 2.386758203125e+04, 2.772381640625e+04, 3.1577974609375e+04, 3.544203515625e+04, 3.929706640625e+04, 4.251846484375e+04, 4.251846484375e+04, 4.251846484375e+04, 4.251846484375e+04, 4.251846484375e+04, 4.251846484375e+04, 4.251846484375e+04, 4.251846484375e+04, 4.2523046875e+04, 4.715806640625e+04, 5.101895703125e+04, 5.487321484375e+04, 5.874649609375e+04, 6.260458203125e+04, 6.6460234375e+04, 7.0314421875e+04, 7.417084375e+04, 7.8147921875e+04, 8.213121875e+04, 8.6090609375e+04, 8.9318765625e+04, 8.9318765625e+04, 8.9318765625e+04, 8.9318765625e+04, 8.9318765625e+04, 8.9318765625e+04, 8.9318765625e+04, 8.9318765625e+04, 9.256046875e+04, 9.78618984375e+04, 1.017314453125e+05, 1.156327578125e+05, 1.35151703125e+05, 1.546700625e+05, 1.74188453125e+05, 1.93706890625e+05, 2.1322540625e+05, 2.32744625e+05, 2.52263703125e+05, 2.7178253125e+05, 2.8807159375e+05, 2.8807159375e+05, 2.8807159375e+05, 2.8807159375e+05, 2.8807159375e+05, 2.8807159375e+05, 2.8807159375e+05, 2.9001371875e+05, 2.986409375e+05, 3.025070625e+05, 3.0801540625e+05, 3.208270625e+05, 3.403458125e+05, 3.5986453125e+05, 3.79383125e+05, 3.989016875e+05, 4.1842034375e+05, 4.3793903125e+05, 4.574575625e+05, 4.7697603125e+05, 4.9326459375e+05, 4.9326459375e+05, 4.9326459375e+05, 4.9326459375e+05, 4.9326459375e+05, 4.9326459375e+05, 4.9326459375e+05, 4.9487890625e+05, 5.040684375e+05, 5.0796259375e+05, 5.1415428125e+05, 5.27414125e+05, 5.46932375e+05, 5.664504375e+05, 5.859685625e+05, 6.05487125e+05, 6.250056875e+05, 6.445235625e+05, 6.640423125e+05, 6.83561e+05, 6.9984975e+05, 6.9984975e+05, 6.9984975e+05, 6.9984975e+05, 6.9984975e+05]
 hvac.res.EHea=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-hvac.res.ECoo=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -4.27798779296875e+03, -1.016898046875e+05, -2.107711875e+05, -3.4946428125e+05, -5.0467653125e+05, -6.588695625e+05, -8.234481875e+05, -9.946395625e+05, -1.1817615e+06, -1.384642e+06, -1.554558625e+06, -1.687297e+06, -1.687297e+06, -1.687297e+06, -1.687297e+06, -1.687297e+06, -1.687297e+06, -1.687297e+06, -1.687297e+06, -1.687297e+06, -1.775715625e+06, -1.914657375e+06, -2.085083625e+06, -2.268895e+06, -2.4545585e+06, -2.62614925e+06, -2.80657275e+06, -3.00532e+06, -3.2215265e+06, -3.43766325e+06, -3.64947875e+06, -3.808438e+06, -3.808438e+06, -3.808438e+06, -3.808438e+06, -3.808438e+06, -3.808438e+06, -3.808438e+06, -3.808438e+06, -3.87255725e+06, -3.95828975e+06, -4.14705225e+06, -4.455841e+06, -4.8092555e+06, -5.1659975e+06, -5.5300715e+06, -5.8898355e+06, -6.2390555e+06, -6.60172e+06, -6.9478e+06, -7.289143e+06, -7.5679835e+06, -7.5679835e+06, -7.5679835e+06, -7.5679835e+06, -7.5679835e+06, -7.5679835e+06, -7.5679835e+06, -7.6121945e+06, -7.7461805e+06, -7.8297105e+06, -8.0411705e+06, -8.3348905e+06, -8.671806e+06, -9.021377e+06, -9.385387e+06, -9.750582e+06, -1.0122674e+07, -1.0473891e+07, -1.0836626e+07, -1.1195711e+07, -1.1490088e+07, -1.1490088e+07, -1.1490088e+07, -1.1490088e+07, -1.1490088e+07, -1.1490088e+07, -1.1490088e+07, -1.1525529e+07, -1.1667792e+07, -1.1755752e+07, -1.1976253e+07, -1.2279863e+07, -1.2626705e+07, -1.2979047e+07, -1.3358788e+07, -1.3727374e+07, -1.4080345e+07, -1.444183e+07, -1.4833637e+07, -1.523004e+07, -1.5553456e+07, -1.5553456e+07, -1.5553456e+07, -1.5553456e+07, -1.5553456e+07]
+hvac.res.ECoo=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -4.14902001953125e+03, -1.021195078125e+05, -2.1122528125e+05, -3.4985865625e+05, -5.0506940625e+05, -6.5926475e+05, -8.2384325e+05, -9.95031375e+05, -1.182138e+06, -1.385005375e+06, -1.554919e+06, -1.687658375e+06, -1.687658375e+06, -1.687658375e+06, -1.687658375e+06, -1.687658375e+06, -1.687658375e+06, -1.687658375e+06, -1.687658375e+06, -1.687658375e+06, -1.777239e+06, -1.913531125e+06, -2.083617125e+06, -2.27196475e+06, -2.45255925e+06, -2.62366925e+06, -2.804547e+06, -3.003337e+06, -3.21961375e+06, -3.43579225e+06, -3.6476405e+06, -3.8066165e+06, -3.8066165e+06, -3.8066165e+06, -3.8066165e+06, -3.8066165e+06, -3.8066165e+06, -3.8066165e+06, -3.8066165e+06, -3.86984975e+06, -3.95626175e+06, -4.133172e+06, -4.453421e+06, -4.8068345e+06, -5.1635765e+06, -5.5276505e+06, -5.8874145e+06, -6.2366345e+06, -6.599299e+06, -6.945379e+06, -7.286722e+06, -7.5655625e+06, -7.5655625e+06, -7.5655625e+06, -7.5655625e+06, -7.5655625e+06, -7.5655625e+06, -7.5655625e+06, -7.609152e+06, -7.7435025e+06, -7.8271335e+06, -8.0387065e+06, -8.332455e+06, -8.66937e+06, -9.018941e+06, -9.382952e+06, -9.748146e+06, -1.0120238e+07, -1.0471455e+07, -1.083419e+07, -1.1193275e+07, -1.1487652e+07, -1.1487652e+07, -1.1487652e+07, -1.1487652e+07, -1.1487652e+07, -1.1487652e+07, -1.1487652e+07, -1.1522484e+07, -1.1664983e+07, -1.1753018e+07, -1.1973653e+07, -1.227731e+07, -1.2624151e+07, -1.2976493e+07, -1.3356234e+07, -1.372482e+07, -1.4077791e+07, -1.4439276e+07, -1.4831083e+07, -1.5227486e+07, -1.5550902e+07, -1.5550902e+07, -1.5550902e+07, -1.5550902e+07, -1.5550902e+07]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_Guideline36Winter.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_Guideline36Winter.txt
index dac723d8030..7195050b536 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_Guideline36Winter.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_Guideline36Winter.txt
@@ -1,4 +1,4 @@
-last-generated=2024-06-04
+last-generated=2024-06-27
 statistics-initialization=
 {
   "linear": "0",
@@ -13,25 +13,25 @@ statistics-simulation=
   "numerical Jacobians": "0"
 }
 time=[4.32e+05, 8.64e+05]
-flo.sou.TAir=[2.931499938964844e+02, 2.918912658691406e+02, 2.915414428710938e+02, 2.911961975097656e+02, 2.935709533691406e+02, 2.929722290039062e+02, 2.931817016601562e+02, 2.935193786621094e+02, 2.943905334472656e+02, 2.941788330078125e+02, 2.934953308105469e+02, 2.933656005859375e+02, 2.932240295410156e+02, 2.93184326171875e+02, 2.932581176757812e+02, 2.931311950683594e+02, 2.907152404785156e+02, 2.906598205566406e+02, 2.902557678222656e+02, 2.895426025390625e+02, 2.888842468261719e+02, 2.887334289550781e+02, 2.885149536132812e+02, 2.914051208496094e+02, 2.918213500976562e+02, 2.919488220214844e+02, 2.918606262207031e+02, 2.928575134277344e+02, 2.935619201660156e+02, 2.93182373046875e+02, 2.932454223632812e+02, 2.932027587890625e+02, 2.930998840332031e+02, 2.93056640625e+02, 2.926227722167969e+02, 2.9215380859375e+02, 2.893583984375e+02, 2.893813171386719e+02, 2.889794921875e+02, 2.886670532226562e+02, 2.884507446289062e+02, 2.88305908203125e+02, 2.878608093261719e+02, 2.907008666992188e+02, 2.912019348144531e+02, 2.914241333007812e+02, 2.911778869628906e+02, 2.919226379394531e+02, 2.926571960449219e+02, 2.931673583984375e+02, 2.933896789550781e+02, 2.928771667480469e+02, 2.927492065429688e+02, 2.929152221679688e+02, 2.927387390136719e+02, 2.92440185546875e+02, 2.896714782714844e+02, 2.891948852539062e+02, 2.887060546875e+02, 2.881258850097656e+02, 2.880490417480469e+02, 2.87852294921875e+02, 2.875233459472656e+02, 2.91426513671875e+02, 2.922760314941406e+02, 2.927362976074219e+02, 2.919202270507812e+02, 2.928383483886719e+02, 2.932500915527344e+02, 2.931683349609375e+02, 2.932173767089844e+02, 2.934270629882812e+02, 2.934383239746094e+02, 2.932438049316406e+02, 2.93154296875e+02, 2.931811828613281e+02, 2.915699157714844e+02, 2.912070007324219e+02, 2.911700134277344e+02, 2.9097802734375e+02, 2.901295471191406e+02, 2.899180297851562e+02, 2.899991455078125e+02, 2.933594055175781e+02, 2.92787841796875e+02, 2.925409240722656e+02, 2.930424499511719e+02, 2.932783203125e+02, 2.944571228027344e+02, 2.951905822753906e+02, 2.957407531738281e+02, 2.960155944824219e+02, 2.960448608398438e+02, 2.9584423828125e+02, 2.951583557128906e+02, 2.936423950195312e+02, 2.932265930175781e+02, 2.927285766601562e+02, 2.92278564453125e+02, 2.917832336425781e+02, 2.914183044433594e+02]
-flo.eas.TAir=[2.931499938964844e+02, 2.918328552246094e+02, 2.913310852050781e+02, 2.914444274902344e+02, 2.930054626464844e+02, 2.929412841796875e+02, 2.932753295898438e+02, 2.933260803222656e+02, 2.936965026855469e+02, 2.93164794921875e+02, 2.931952514648438e+02, 2.930741271972656e+02, 2.931900634765625e+02, 2.932205505371094e+02, 2.931316223144531e+02, 2.931358032226562e+02, 2.908370361328125e+02, 2.906790771484375e+02, 2.903252563476562e+02, 2.897118835449219e+02, 2.890037536621094e+02, 2.88803955078125e+02, 2.885221252441406e+02, 2.915525207519531e+02, 2.920653686523438e+02, 2.922018737792969e+02, 2.92085205078125e+02, 2.932255554199219e+02, 2.93252685546875e+02, 2.92985107421875e+02, 2.928998718261719e+02, 2.927212829589844e+02, 2.927410278320312e+02, 2.927099609375e+02, 2.920974426269531e+02, 2.918489990234375e+02, 2.89265625e+02, 2.89177490234375e+02, 2.887522583007812e+02, 2.88373779296875e+02, 2.881986083984375e+02, 2.877722778320312e+02, 2.876849060058594e+02, 2.906933898925781e+02, 2.913099975585938e+02, 2.915586853027344e+02, 2.9129052734375e+02, 2.922020263671875e+02, 2.924081726074219e+02, 2.922444458007812e+02, 2.921553039550781e+02, 2.921178588867188e+02, 2.920884094238281e+02, 2.922272644042969e+02, 2.921810302734375e+02, 2.920921325683594e+02, 2.894093627929688e+02, 2.890461730957031e+02, 2.885774536132812e+02, 2.881586303710938e+02, 2.879534301757812e+02, 2.878642883300781e+02, 2.87599609375e+02, 2.914449157714844e+02, 2.924675903320312e+02, 2.929520874023438e+02, 2.923769226074219e+02, 2.932731628417969e+02, 2.932173461914062e+02, 2.931849060058594e+02, 2.931712646484375e+02, 2.933299255371094e+02, 2.931777954101562e+02, 2.931329650878906e+02, 2.931437072753906e+02, 2.931629333496094e+02, 2.912839660644531e+02, 2.909725646972656e+02, 2.906961669921875e+02, 2.904494934082031e+02, 2.898046264648438e+02, 2.895269775390625e+02, 2.900078430175781e+02, 2.934615478515625e+02, 2.9254345703125e+02, 2.935260925292969e+02, 2.931424865722656e+02, 2.931566467285156e+02, 2.939075927734375e+02, 2.940413513183594e+02, 2.942004089355469e+02, 2.944252624511719e+02, 2.945553588867188e+02, 2.945686340332031e+02, 2.942767028808594e+02, 2.931150512695312e+02, 2.924556274414062e+02, 2.921792907714844e+02, 2.916071166992188e+02, 2.911979064941406e+02, 2.907852478027344e+02]
-flo.nor.TAir=[2.931499938964844e+02, 2.924403381347656e+02, 2.919325866699219e+02, 2.915895080566406e+02, 2.928294982910156e+02, 2.932698059082031e+02, 2.926865234375e+02, 2.931692810058594e+02, 2.932222900390625e+02, 2.931569519042969e+02, 2.931038818359375e+02, 2.933169250488281e+02, 2.932613525390625e+02, 2.9314501953125e+02, 2.931340026855469e+02, 2.930213928222656e+02, 2.904002685546875e+02, 2.904099731445312e+02, 2.901719055175781e+02, 2.892454223632812e+02, 2.885898132324219e+02, 2.883495788574219e+02, 2.881746520996094e+02, 2.913062438964844e+02, 2.917586364746094e+02, 2.919061279296875e+02, 2.918312377929688e+02, 2.923080749511719e+02, 2.917012023925781e+02, 2.914923095703125e+02, 2.924063720703125e+02, 2.92232177734375e+02, 2.920999755859375e+02, 2.921593933105469e+02, 2.913507690429688e+02, 2.915290832519531e+02, 2.887541809082031e+02, 2.890711669921875e+02, 2.886015319824219e+02, 2.881863098144531e+02, 2.881522216796875e+02, 2.879243469238281e+02, 2.877591552734375e+02, 2.904403076171875e+02, 2.909854125976562e+02, 2.912329406738281e+02, 2.909989624023438e+02, 2.912052001953125e+02, 2.913304748535156e+02, 2.915440979003906e+02, 2.917233581542969e+02, 2.916765441894531e+02, 2.916501159667969e+02, 2.918336486816406e+02, 2.918204956054688e+02, 2.917440185546875e+02, 2.895030212402344e+02, 2.891138916015625e+02, 2.88697265625e+02, 2.883143615722656e+02, 2.881021728515625e+02, 2.8803369140625e+02, 2.877981262207031e+02, 2.911445922851562e+02, 2.920469665527344e+02, 2.925264892578125e+02, 2.920263671875e+02, 2.929396667480469e+02, 2.932109069824219e+02, 2.932236022949219e+02, 2.931856994628906e+02, 2.933396911621094e+02, 2.931834106445312e+02, 2.931357421875e+02, 2.931468811035156e+02, 2.931693115234375e+02, 2.914867858886719e+02, 2.911302795410156e+02, 2.908982543945312e+02, 2.906774597167969e+02, 2.902747802734375e+02, 2.899268798828125e+02, 2.9008251953125e+02, 2.9316357421875e+02, 2.928727722167969e+02, 2.933038330078125e+02, 2.928821716308594e+02, 2.933912658691406e+02, 2.931473388671875e+02, 2.934957885742188e+02, 2.940592041015625e+02, 2.943047180175781e+02, 2.944493713378906e+02, 2.944962158203125e+02, 2.942273254394531e+02, 2.930968627929688e+02, 2.92556396484375e+02, 2.922670288085938e+02, 2.918681640625e+02, 2.914708557128906e+02, 2.910967102050781e+02]
-flo.wes.TAir=[2.931499938964844e+02, 2.915510559082031e+02, 2.911672668457031e+02, 2.908944091796875e+02, 2.931470031738281e+02, 2.936437072753906e+02, 2.932620544433594e+02, 2.931771850585938e+02, 2.931410827636719e+02, 2.932146606445312e+02, 2.931008911132812e+02, 2.933157348632812e+02, 2.932986145019531e+02, 2.932359924316406e+02, 2.931309509277344e+02, 2.931327514648438e+02, 2.910444946289062e+02, 2.902111511230469e+02, 2.898226318359375e+02, 2.896852722167969e+02, 2.891651000976562e+02, 2.885693359375e+02, 2.882198181152344e+02, 2.914757080078125e+02, 2.920253601074219e+02, 2.921705627441406e+02, 2.920567932128906e+02, 2.924766845703125e+02, 2.924522705078125e+02, 2.923955383300781e+02, 2.924736938476562e+02, 2.926250915527344e+02, 2.932947387695312e+02, 2.932108154296875e+02, 2.922297973632812e+02, 2.91866455078125e+02, 2.893764953613281e+02, 2.888533020019531e+02, 2.884498596191406e+02, 2.88431640625e+02, 2.879984436035156e+02, 2.876929931640625e+02, 2.874354553222656e+02, 2.906920776367188e+02, 2.913208618164062e+02, 2.915744018554688e+02, 2.913104248046875e+02, 2.914550170898438e+02, 2.91560791015625e+02, 2.917001953125e+02, 2.919783935546875e+02, 2.919700012207031e+02, 2.922724304199219e+02, 2.929285278320312e+02, 2.923558959960938e+02, 2.920190124511719e+02, 2.892903747558594e+02, 2.88938720703125e+02, 2.887048034667969e+02, 2.879352722167969e+02, 2.876437377929688e+02, 2.876097717285156e+02, 2.873137512207031e+02, 2.914543762207031e+02, 2.924616394042969e+02, 2.929552612304688e+02, 2.922846069335938e+02, 2.926637573242188e+02, 2.928952331542969e+02, 2.938079833984375e+02, 2.930890197753906e+02, 2.934134521484375e+02, 2.932522888183594e+02, 2.931246337890625e+02, 2.930834045410156e+02, 2.932930297851562e+02, 2.910242614746094e+02, 2.907289428710938e+02, 2.905568237304688e+02, 2.903716735839844e+02, 2.8969189453125e+02, 2.894032592773438e+02, 2.896483154296875e+02, 2.934458618164062e+02, 2.930397338867188e+02, 2.935335083007812e+02, 2.931527099609375e+02, 2.928690795898438e+02, 2.932015686035156e+02, 2.93657958984375e+02, 2.940620422363281e+02, 2.944194641113281e+02, 2.947572937011719e+02, 2.947754821777344e+02, 2.94234375e+02, 2.931446533203125e+02, 2.923676452636719e+02, 2.921480407714844e+02, 2.915048828125e+02, 2.910916442871094e+02, 2.906816711425781e+02]
-flo.cor.TAir=[2.931499938964844e+02, 2.926636962890625e+02, 2.9222607421875e+02, 2.919517517089844e+02, 2.934149475097656e+02, 2.933684997558594e+02, 2.932369995117188e+02, 2.937687377929688e+02, 2.939355163574219e+02, 2.937380981445312e+02, 2.936229248046875e+02, 2.936507263183594e+02, 2.935899353027344e+02, 2.935559997558594e+02, 2.935168762207031e+02, 2.93095703125e+02, 2.913752136230469e+02, 2.911847229003906e+02, 2.908607788085938e+02, 2.902139282226562e+02, 2.896024475097656e+02, 2.893015441894531e+02, 2.890570068359375e+02, 2.920863647460938e+02, 2.924894104003906e+02, 2.926301879882812e+02, 2.925650939941406e+02, 2.931650695800781e+02, 2.929713745117188e+02, 2.9276708984375e+02, 2.932142944335938e+02, 2.930708618164062e+02, 2.930652465820312e+02, 2.931324157714844e+02, 2.924533386230469e+02, 2.923598022460938e+02, 2.897388916015625e+02, 2.897849731445312e+02, 2.893703002929688e+02, 2.890560913085938e+02, 2.888721313476562e+02, 2.886192626953125e+02, 2.883843383789062e+02, 2.912619323730469e+02, 2.917713317871094e+02, 2.920118408203125e+02, 2.917844543457031e+02, 2.920747985839844e+02, 2.922180786132812e+02, 2.924564208984375e+02, 2.926361083984375e+02, 2.925228271484375e+02, 2.924931945800781e+02, 2.926943359375e+02, 2.926583557128906e+02, 2.925493774414062e+02, 2.900945129394531e+02, 2.897196044921875e+02, 2.893200073242188e+02, 2.888398742675781e+02, 2.886419067382812e+02, 2.885431518554688e+02, 2.882727966308594e+02, 2.919185180664062e+02, 2.927881774902344e+02, 2.93260498046875e+02, 2.926794738769531e+02, 2.935262145996094e+02, 2.933069458007812e+02, 2.934137878417969e+02, 2.934671936035156e+02, 2.936880187988281e+02, 2.93656494140625e+02, 2.936195068359375e+02, 2.9356201171875e+02, 2.931600646972656e+02, 2.919360656738281e+02, 2.916020812988281e+02, 2.914118347167969e+02, 2.911875915527344e+02, 2.90643798828125e+02, 2.903607482910156e+02, 2.905002746582031e+02, 2.938415222167969e+02, 2.930567321777344e+02, 2.932218017578125e+02, 2.932177429199219e+02, 2.935024108886719e+02, 2.938929748535156e+02, 2.943537902832031e+02, 2.948098754882812e+02, 2.950735473632812e+02, 2.952105102539062e+02, 2.952080078125e+02, 2.948401489257812e+02, 2.935589294433594e+02, 2.931316223144531e+02, 2.928215942382812e+02, 2.923763427734375e+02, 2.919848327636719e+02, 2.916190490722656e+02]
+flo.sou.TAir=[2.931499938964844e+02, 2.918912353515625e+02, 2.915414428710938e+02, 2.911961669921875e+02, 2.934687194824219e+02, 2.930002136230469e+02, 2.931819458007812e+02, 2.935192565917969e+02, 2.943908081054688e+02, 2.941788024902344e+02, 2.934949035644531e+02, 2.933651123046875e+02, 2.932236938476562e+02, 2.931837768554688e+02, 2.932586975097656e+02, 2.931307983398438e+02, 2.907150268554688e+02, 2.9065966796875e+02, 2.90255615234375e+02, 2.8954248046875e+02, 2.888841247558594e+02, 2.887332763671875e+02, 2.885148620605469e+02, 2.9141552734375e+02, 2.918187561035156e+02, 2.919473571777344e+02, 2.918594055175781e+02, 2.928564758300781e+02, 2.935612487792969e+02, 2.932349548339844e+02, 2.932457580566406e+02, 2.932018432617188e+02, 2.930993957519531e+02, 2.930572204589844e+02, 2.926231689453125e+02, 2.921538696289062e+02, 2.893578796386719e+02, 2.893811340332031e+02, 2.889793090820312e+02, 2.886669006347656e+02, 2.884505920410156e+02, 2.883057556152344e+02, 2.878606872558594e+02, 2.907063293457031e+02, 2.911987915039062e+02, 2.9142236328125e+02, 2.911764526367188e+02, 2.9192138671875e+02, 2.926560668945312e+02, 2.931663818359375e+02, 2.933931274414062e+02, 2.928775024414062e+02, 2.927489013671875e+02, 2.92914794921875e+02, 2.927383422851562e+02, 2.924397888183594e+02, 2.896705017089844e+02, 2.891944580078125e+02, 2.887056274414062e+02, 2.881255187988281e+02, 2.880486755371094e+02, 2.878519592285156e+02, 2.875230407714844e+02, 2.914309997558594e+02, 2.922734680175781e+02, 2.927349548339844e+02, 2.919192199707031e+02, 2.928375244140625e+02, 2.9324951171875e+02, 2.931684265136719e+02, 2.932170104980469e+02, 2.934269409179688e+02, 2.934381408691406e+02, 2.932436218261719e+02, 2.931543579101562e+02, 2.931813049316406e+02, 2.915697021484375e+02, 2.912067260742188e+02, 2.911697692871094e+02, 2.909778137207031e+02, 2.901293334960938e+02, 2.899178466796875e+02, 2.899989624023438e+02, 2.933555603027344e+02, 2.927938842773438e+02, 2.927398071289062e+02, 2.930426635742188e+02, 2.932796325683594e+02, 2.944564208984375e+02, 2.951897583007812e+02, 2.957401428222656e+02, 2.960152587890625e+02, 2.960446472167969e+02, 2.958441162109375e+02, 2.951582641601562e+02, 2.936422729492188e+02, 2.932264709472656e+02, 2.927284545898438e+02, 2.922784118652344e+02, 2.917831420898438e+02, 2.91418212890625e+02]
+flo.eas.TAir=[2.931499938964844e+02, 2.91832763671875e+02, 2.913310852050781e+02, 2.914443969726562e+02, 2.930145263671875e+02, 2.930265197753906e+02, 2.932728576660156e+02, 2.933255004882812e+02, 2.93696533203125e+02, 2.931646423339844e+02, 2.931947631835938e+02, 2.93074462890625e+02, 2.932002563476562e+02, 2.932205200195312e+02, 2.931316833496094e+02, 2.931355895996094e+02, 2.908366088867188e+02, 2.906788940429688e+02, 2.903250732421875e+02, 2.897117004394531e+02, 2.890035705566406e+02, 2.888037719726562e+02, 2.885220031738281e+02, 2.91536376953125e+02, 2.920625e+02, 2.922001037597656e+02, 2.920837097167969e+02, 2.932245178222656e+02, 2.932529602050781e+02, 2.929845275878906e+02, 2.929004211425781e+02, 2.927206115722656e+02, 2.927405700683594e+02, 2.927102966308594e+02, 2.920974731445312e+02, 2.918486938476562e+02, 2.892644348144531e+02, 2.891771850585938e+02, 2.88751953125e+02, 2.8837353515625e+02, 2.881983642578125e+02, 2.877720336914062e+02, 2.876846923828125e+02, 2.906831359863281e+02, 2.913068542480469e+02, 2.915569152832031e+02, 2.912890625e+02, 2.922007446289062e+02, 2.924070434570312e+02, 2.922434692382812e+02, 2.921551208496094e+02, 2.921175537109375e+02, 2.920879821777344e+02, 2.92226806640625e+02, 2.921805114746094e+02, 2.920917053222656e+02, 2.89407958984375e+02, 2.890456848144531e+02, 2.885769958496094e+02, 2.88158203125e+02, 2.879530334472656e+02, 2.878639221191406e+02, 2.875993041992188e+02, 2.914264526367188e+02, 2.924649353027344e+02, 2.929505310058594e+02, 2.92375732421875e+02, 2.932726135253906e+02, 2.932178649902344e+02, 2.931849670410156e+02, 2.931713256835938e+02, 2.933297424316406e+02, 2.931778259277344e+02, 2.931329956054688e+02, 2.931437072753906e+02, 2.931632690429688e+02, 2.91283447265625e+02, 2.909722900390625e+02, 2.906959228515625e+02, 2.904492492675781e+02, 2.898044128417969e+02, 2.895267639160156e+02, 2.900076293945312e+02, 2.934615173339844e+02, 2.925428771972656e+02, 2.935837707519531e+02, 2.9314111328125e+02, 2.93145263671875e+02, 2.939060363769531e+02, 2.940403442382812e+02, 2.9419970703125e+02, 2.944248962402344e+02, 2.945550842285156e+02, 2.945684204101562e+02, 2.942765502929688e+02, 2.931149597167969e+02, 2.924554748535156e+02, 2.921792297363281e+02, 2.916070251464844e+02, 2.911978149414062e+02, 2.907851867675781e+02]
+flo.nor.TAir=[2.931499938964844e+02, 2.924403686523438e+02, 2.919326171875e+02, 2.915895080566406e+02, 2.928353271484375e+02, 2.931351623535156e+02, 2.926871948242188e+02, 2.931692199707031e+02, 2.932223815917969e+02, 2.931569519042969e+02, 2.931065368652344e+02, 2.933169860839844e+02, 2.932612609863281e+02, 2.931445007324219e+02, 2.931340942382812e+02, 2.930215759277344e+02, 2.90400146484375e+02, 2.904098205566406e+02, 2.901718139648438e+02, 2.892453308105469e+02, 2.885897216796875e+02, 2.883494567871094e+02, 2.881745300292969e+02, 2.912854614257812e+02, 2.917551574707031e+02, 2.91904052734375e+02, 2.918295593261719e+02, 2.923065490722656e+02, 2.917001953125e+02, 2.914927978515625e+02, 2.924071655273438e+02, 2.922313232421875e+02, 2.920993957519531e+02, 2.92160400390625e+02, 2.913508911132812e+02, 2.915288696289062e+02, 2.887539978027344e+02, 2.890708618164062e+02, 2.886012268066406e+02, 2.881860656738281e+02, 2.881519775390625e+02, 2.879241027832031e+02, 2.877589721679688e+02, 2.904425354003906e+02, 2.909821472167969e+02, 2.912311096191406e+02, 2.909974975585938e+02, 2.912038269042969e+02, 2.913292846679688e+02, 2.915430603027344e+02, 2.917234191894531e+02, 2.9167626953125e+02, 2.916496887207031e+02, 2.918331298828125e+02, 2.918200378417969e+02, 2.917435913085938e+02, 2.895025939941406e+02, 2.891134643554688e+02, 2.886968688964844e+02, 2.883139953613281e+02, 2.88101806640625e+02, 2.880333557128906e+02, 2.877978210449219e+02, 2.911377258300781e+02, 2.920440979003906e+02, 2.925249328613281e+02, 2.920252075195312e+02, 2.929387512207031e+02, 2.93210205078125e+02, 2.932232360839844e+02, 2.93185791015625e+02, 2.933394775390625e+02, 2.931834106445312e+02, 2.931357421875e+02, 2.931468811035156e+02, 2.931692199707031e+02, 2.914867858886719e+02, 2.911300659179688e+02, 2.908980102539062e+02, 2.9067724609375e+02, 2.902745971679688e+02, 2.899266967773438e+02, 2.900823364257812e+02, 2.931649169921875e+02, 2.928751220703125e+02, 2.932390441894531e+02, 2.928857727050781e+02, 2.933893737792969e+02, 2.931474914550781e+02, 2.934951171875e+02, 2.940586547851562e+02, 2.943043518066406e+02, 2.944491882324219e+02, 2.9449609375e+02, 2.94227294921875e+02, 2.930968627929688e+02, 2.925563354492188e+02, 2.922670288085938e+02, 2.918681335449219e+02, 2.914707946777344e+02, 2.910967102050781e+02]
+flo.wes.TAir=[2.931499938964844e+02, 2.915511169433594e+02, 2.911672973632812e+02, 2.908944091796875e+02, 2.930877990722656e+02, 2.935755920410156e+02, 2.932667541503906e+02, 2.931773681640625e+02, 2.931409301757812e+02, 2.932131652832031e+02, 2.931011352539062e+02, 2.933157958984375e+02, 2.932986755371094e+02, 2.932335815429688e+02, 2.931310119628906e+02, 2.931321105957031e+02, 2.9104443359375e+02, 2.902109375e+02, 2.89822509765625e+02, 2.896851196289062e+02, 2.891649780273438e+02, 2.885691833496094e+02, 2.882196655273438e+02, 2.914367370605469e+02, 2.920220031738281e+02, 2.921683654785156e+02, 2.920550537109375e+02, 2.924750061035156e+02, 2.924509887695312e+02, 2.923946228027344e+02, 2.924740905761719e+02, 2.926242065429688e+02, 2.932940979003906e+02, 2.932212219238281e+02, 2.922303466796875e+02, 2.918666076660156e+02, 2.893769226074219e+02, 2.888531494140625e+02, 2.884496765136719e+02, 2.884314575195312e+02, 2.879982604980469e+02, 2.876928100585938e+02, 2.87435302734375e+02, 2.90671630859375e+02, 2.913174438476562e+02, 2.915724182128906e+02, 2.913088989257812e+02, 2.914535827636719e+02, 2.915595397949219e+02, 2.916990966796875e+02, 2.919782104492188e+02, 2.919697570800781e+02, 2.9227197265625e+02, 2.929280090332031e+02, 2.9235546875e+02, 2.920185852050781e+02, 2.892904357910156e+02, 2.889382934570312e+02, 2.887044067382812e+02, 2.879349060058594e+02, 2.876433715820312e+02, 2.876094360351562e+02, 2.873134765625e+02, 2.914419555664062e+02, 2.924588623046875e+02, 2.929536437988281e+02, 2.92283447265625e+02, 2.92662841796875e+02, 2.928944702148438e+02, 2.93808349609375e+02, 2.930888977050781e+02, 2.934134216308594e+02, 2.932522888183594e+02, 2.931246643066406e+02, 2.930834045410156e+02, 2.932930297851562e+02, 2.910245666503906e+02, 2.907287292480469e+02, 2.905566101074219e+02, 2.903714599609375e+02, 2.896917419433594e+02, 2.89403076171875e+02, 2.896481323242188e+02, 2.934375610351562e+02, 2.930371398925781e+02, 2.936014709472656e+02, 2.931501159667969e+02, 2.928692321777344e+02, 2.932018432617188e+02, 2.936571655273438e+02, 2.940614013671875e+02, 2.944190063476562e+02, 2.947570495605469e+02, 2.947753295898438e+02, 2.942343139648438e+02, 2.931445617675781e+02, 2.923676452636719e+02, 2.921480102539062e+02, 2.915048522949219e+02, 2.910915832519531e+02, 2.90681640625e+02]
+flo.cor.TAir=[2.931499938964844e+02, 2.926637268066406e+02, 2.922261047363281e+02, 2.919517517089844e+02, 2.934100341796875e+02, 2.933642883300781e+02, 2.932367858886719e+02, 2.937685546875e+02, 2.939356079101562e+02, 2.937378540039062e+02, 2.936233215332031e+02, 2.936506042480469e+02, 2.935899047851562e+02, 2.935551147460938e+02, 2.935169982910156e+02, 2.930943908691406e+02, 2.913752136230469e+02, 2.911846008300781e+02, 2.908606872558594e+02, 2.902138366699219e+02, 2.896023559570312e+02, 2.893014221191406e+02, 2.89056884765625e+02, 2.920838928222656e+02, 2.924865417480469e+02, 2.926284790039062e+02, 2.925636596679688e+02, 2.931636962890625e+02, 2.929704895019531e+02, 2.927733764648438e+02, 2.932150268554688e+02, 2.930700378417969e+02, 2.93064697265625e+02, 2.931334533691406e+02, 2.924535522460938e+02, 2.923596496582031e+02, 2.89739013671875e+02, 2.897847595214844e+02, 2.893700561523438e+02, 2.890558776855469e+02, 2.888719177246094e+02, 2.886190490722656e+02, 2.883841552734375e+02, 2.912629699707031e+02, 2.917680053710938e+02, 2.920099792480469e+02, 2.917829895019531e+02, 2.920733947753906e+02, 2.922168884277344e+02, 2.924553833007812e+02, 2.926368713378906e+02, 2.925226745605469e+02, 2.924927673339844e+02, 2.926937866210938e+02, 2.926579284667969e+02, 2.925489196777344e+02, 2.900945434570312e+02, 2.897191772460938e+02, 2.893196105957031e+02, 2.888395080566406e+02, 2.886415405273438e+02, 2.885428161621094e+02, 2.882724914550781e+02, 2.919158630371094e+02, 2.927853088378906e+02, 2.932589416503906e+02, 2.926783447265625e+02, 2.935254821777344e+02, 2.933062438964844e+02, 2.9341357421875e+02, 2.934669799804688e+02, 2.936874084472656e+02, 2.936563720703125e+02, 2.936194458007812e+02, 2.935619812011719e+02, 2.931598510742188e+02, 2.919363098144531e+02, 2.916018371582031e+02, 2.914115905761719e+02, 2.911873779296875e+02, 2.906436157226562e+02, 2.903605651855469e+02, 2.905000915527344e+02, 2.93841552734375e+02, 2.930610656738281e+02, 2.934646301269531e+02, 2.932158203125e+02, 2.935028381347656e+02, 2.938926696777344e+02, 2.9435302734375e+02, 2.948092956542969e+02, 2.950731506347656e+02, 2.952102966308594e+02, 2.952079162597656e+02, 2.948401184082031e+02, 2.935589294433594e+02, 2.931315612792969e+02, 2.928215942382812e+02, 2.923763427734375e+02, 2.919847717285156e+02, 2.916190490722656e+02]
 hvac.TZonSet[1].TCooSet=[3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02]
 hvac.TZonSet[1].THeaSet=[2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02]
-hvac.fanSup.y=[0e+00, 0e+00, 0e+00, 0e+00, 5.946614742279053e-01, 2.816871702671051e-01, 3.092028200626373e-01, 3.312495052814484e-01, 2.999966144561768e-01, 2.998457849025726e-01, 3.020692467689514e-01, 3.019421100616455e-01, 3.016010522842407e-01, 3.017100989818573e-01, 3.015052676200867e-01, 3.017157912254333e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.609789371490479e-01, 1e+00, 1e+00, 8.93288791179657e-01, 5.661268830299377e-01, 3.471052646636963e-01, 3.586970865726471e-01, 3.828598856925964e-01, 3.931703567504883e-01, 3.884978592395782e-01, 3.650525510311127e-01, 3.641246855258942e-01, 3.966059386730194e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.613938450813293e-01, 1e+00, 1e+00, 8.93288791179657e-01, 5.662902593612671e-01, 3.586054742336273e-01, 3.892601430416107e-01, 4.056278467178345e-01, 3.908695578575134e-01, 3.84130597114563e-01, 3.978137671947479e-01, 4.050892889499664e-01, 4.028278887271881e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.60678768157959e-01, 1e+00, 1e+00, 8.932546973228455e-01, 5.591095685958862e-01, 3.21673721075058e-01, 3.305168449878693e-01, 3.02591860294342e-01, 3.077055811882019e-01, 3.02596241235733e-01, 3.012721836566925e-01, 3.018129765987396e-01, 3.072162866592407e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.594306468963623e-01, 4.58598792552948e-01, 4.082912504673004e-01, 3.41717004776001e-01, 3.443391919136047e-01, 2.982412576675415e-01, 2.994203269481659e-01, 3.022397458553314e-01, 3.017049729824066e-01, 3.015328049659729e-01, 3.015599846839905e-01, 3.015967905521393e-01, 3.015550673007965e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-hvac.VAVBox[5].vav.y_actual=[1e+00, 0e+00, -0e+00, -0e+00, 2.045596987009048e-01, 1.146051585674286e-01, 7.211034297943115e-01, 6.441674828529358e-01, 6.325595378875732e-01, 6.525152325630188e-01, 6.508557200431824e-01, 6.48665726184845e-01, 6.49313747882843e-01, 6.486014723777771e-01, 6.490941047668457e-01, 6.497205495834351e-01, 1.015405147349163e-18, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 3.06595116853714e-01, 4.190017282962799e-01, 7.010881900787354e-01, 7.964309453964233e-01, 8.317179679870605e-01, 7.949355244636536e-01, 7.688896656036377e-01, 7.141657471656799e-01, 8.008919358253479e-01, 8.653979301452637e-01, 9.79038151718269e-19, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 3.065972924232483e-01, 4.195817112922668e-01, 7.213304042816162e-01, 8.524200320243835e-01, 8.062035441398621e-01, 7.491657137870789e-01, 7.818190455436707e-01, 8.189291954040527e-01, 7.944258451461792e-01, 7.7543044090271e-01, 1.052516605531354e-18, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 1e+00, 1e+00, 1e+00, 3.066527247428894e-01, 3.825614154338837e-01, 6.21126115322113e-01, 6.531082987785339e-01, 6.335394382476807e-01, 6.575421690940857e-01, 6.465981602668762e-01, 6.514612436294556e-01, 6.521514058113098e-01, 6.577578186988831e-01, 1.144679828611094e-18, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 9.812089204788208e-01, 4.379282295703888e-01, 5.720792412757874e-01, 6.58843994140625e-01, 6.243401765823364e-01, 6.287604570388794e-01, 6.549229621887207e-01, 6.504281759262085e-01, 6.481776833534241e-01, 6.484949588775635e-01, 6.486778259277344e-01, 6.48586630821228e-01, 6.487026214599609e-01, 5.772553110185515e-18, 0e+00, -0e+00, 0e+00, 0e+00]
-hvac.VAVBox[1].vav.y_actual=[1e+00, 0e+00, -0e+00, -0e+00, 4.402031004428864e-01, 6.528965830802917e-01, 7.636814713478088e-01, 6.463227272033691e-01, 6.325893998146057e-01, 6.525161266326904e-01, 6.508561372756958e-01, 6.486661434173584e-01, 6.493141651153564e-01, 6.486018896102905e-01, 6.490945219993591e-01, 6.497209668159485e-01, 1.073458854087242e-18, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 3.06595116853714e-01, 4.195572137832642e-01, 6.466902494430542e-01, 6.831252574920654e-01, 6.994099617004395e-01, 6.757605671882629e-01, 6.627131104469299e-01, 6.336497068405151e-01, 7.261335849761963e-01, 8.559871315956116e-01, 9.771031694703543e-19, -0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 1e+00, 1e+00, 1e+00, 3.065972924232483e-01, 4.195817112922668e-01, 7.213304042816162e-01, 8.521581292152405e-01, 7.060028910636902e-01, 6.51018500328064e-01, 7.299333214759827e-01, 8.147094249725342e-01, 7.886791229248047e-01, 7.75098443031311e-01, 1.052476900861952e-18, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 1e+00, 1e+00, 1e+00, 3.067131340503693e-01, 4.174819886684418e-01, 7.014390230178833e-01, 6.56379222869873e-01, 6.335863471031189e-01, 6.575435400009155e-01, 6.465985774993896e-01, 6.51461660861969e-01, 6.521518230438232e-01, 6.577582359313965e-01, 1.144680655791706e-18, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 1e+00, 5.598212480545044e-01, 6.814783215522766e-01, 7.473403811454773e-01, 6.373053789138794e-01, 6.289215683937073e-01, 6.549263596534729e-01, 6.504286527633667e-01, 6.481781005859375e-01, 6.484953761100769e-01, 6.486782431602478e-01, 6.485869884490967e-01, 6.487030386924744e-01, 5.772556418907965e-18, 0e+00, -0e+00, 0e+00, 0e+00]
-hvac.VAVBox[2].vav.y_actual=[1e+00, 0e+00, -0e+00, -0e+00, 4.457990527153015e-01, 6.487315893173218e-01, 7.205609083175659e-01, 5.468098521232605e-01, 5.346809029579163e-01, 5.504705905914307e-01, 5.491834878921509e-01, 5.475029945373535e-01, 5.480055809020996e-01, 5.474544167518616e-01, 5.478362441062927e-01, 5.483188033103943e-01, 1.089158948908652e-18, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, 1e+00, 1e+00, 1e+00, 3.06595116853714e-01, 4.168191254138947e-01, 5.857508778572083e-01, 6.487920880317688e-01, 8.183829784393311e-01, 7.937642931938171e-01, 7.68825888633728e-01, 7.229286432266235e-01, 8.012853264808655e-01, 8.654563426971436e-01, 9.790503526323041e-19, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 3.065972924232483e-01, 4.195817112922668e-01, 7.213304042816162e-01, 8.524200320243835e-01, 8.062035441398621e-01, 7.491657137870789e-01, 7.818190455436707e-01, 8.189291954040527e-01, 7.944258451461792e-01, 7.7543044090271e-01, 1.052516605531354e-18, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 1e+00, 1e+00, 1e+00, 3.067131340503693e-01, 3.684451282024384e-01, 5.217722058296204e-01, 5.506404638290405e-01, 5.354638695716858e-01, 5.542405843734741e-01, 5.458981990814209e-01, 5.496624708175659e-01, 5.501832365989685e-01, 5.544043779373169e-01, 1.020214789020852e-18, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 1e+00, 4.893398880958557e-01, 6.855228543281555e-01, 7.373061180114746e-01, 5.390843152999878e-01, 5.315030813217163e-01, 5.523081421852112e-01, 5.488495230674744e-01, 5.471263527870178e-01, 5.473729968070984e-01, 5.475141406059265e-01, 5.474433898925781e-01, 5.475333333015442e-01, 4.872127308752141e-18, 0e+00, -0e+00, 0e+00, 0e+00]
-hvac.VAVBox[3].vav.y_actual=[1e+00, 0e+00, -0e+00, -0e+00, 4.59808349609375e-01, 6.610480546951294e-01, 8.522574901580811e-01, 6.703282594680786e-01, 6.329193711280823e-01, 6.525221467018127e-01, 6.508562564849854e-01, 6.486661434173584e-01, 6.493141651153564e-01, 6.486018896102905e-01, 6.490945219993591e-01, 6.516487598419189e-01, 1.182717315489039e-18, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 3.06595116853714e-01, 4.195572137832642e-01, 7.01092541217804e-01, 7.964311838150024e-01, 8.343174457550049e-01, 7.951298952102661e-01, 7.689002752304077e-01, 7.229310274124146e-01, 8.012853860855103e-01, 8.654564023017883e-01, 9.790503526323041e-19, -0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 1e+00, 1e+00, 1e+00, 3.065972924232483e-01, 4.195817112922668e-01, 7.213304042816162e-01, 8.524200320243835e-01, 8.062035441398621e-01, 7.491657137870789e-01, 7.818190455436707e-01, 8.189291954040527e-01, 7.944258451461792e-01, 7.7543044090271e-01, 1.052516605531354e-18, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 1e+00, 1e+00, 1e+00, 3.067131340503693e-01, 4.174819886684418e-01, 7.009611129760742e-01, 6.62866473197937e-01, 6.336787939071655e-01, 6.575453877449036e-01, 6.465986371040344e-01, 6.51461660861969e-01, 6.521518230438232e-01, 6.577582359313965e-01, 1.198463112039292e-18, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 1e+00, 6.821370124816895e-01, 1e+00, 7.48527467250824e-01, 6.556394696235657e-01, 6.291488409042358e-01, 6.54930591583252e-01, 6.504287123680115e-01, 6.481781005859375e-01, 6.484953761100769e-01, 6.486782431602478e-01, 6.485869884490967e-01, 6.487030386924744e-01, 5.772556418907965e-18, 0e+00, -0e+00, 0e+00, 0e+00]
-hvac.VAVBox[4].vav.y_actual=[1e+00, 0e+00, -0e+00, -0e+00, 3.419880568981171e-01, 6.65105938911438e-01, 7.254040837287903e-01, 5.489055514335632e-01, 5.347148180007935e-01, 5.504711866378784e-01, 5.491834878921509e-01, 5.475029945373535e-01, 5.480055809020996e-01, 5.474544167518616e-01, 5.478362441062927e-01, 5.483188033103943e-01, 1.127416879419842e-18, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 3.06595116853714e-01, 4.195572137832642e-01, 7.01092541217804e-01, 7.964311838150024e-01, 8.343174457550049e-01, 7.951298952102661e-01, 7.481315732002258e-01, 5.423749089241028e-01, 7.61637806892395e-01, 8.59927773475647e-01, 9.779061550499902e-19, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 3.065972924232483e-01, 4.195817112922668e-01, 7.213304042816162e-01, 8.524200320243835e-01, 8.062035441398621e-01, 7.491657137870789e-01, 7.818190455436707e-01, 8.189291954040527e-01, 7.944258451461792e-01, 7.7543044090271e-01, 1.052516605531354e-18, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 1e+00, 1e+00, 1e+00, 3.067131340503693e-01, 4.174819886684418e-01, 7.025452256202698e-01, 6.393887400627136e-01, 5.508208274841309e-01, 5.785344243049622e-01, 5.46318531036377e-01, 5.496699810028076e-01, 5.501834154129028e-01, 5.768496990203857e-01, 1.26000193749321e-18, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 1e+00, 4.928219616413116e-01, 6.839438080787659e-01, 7.328083515167236e-01, 5.48664391040802e-01, 5.316542387008667e-01, 5.523108839988708e-01, 5.488495826721191e-01, 5.471263527870178e-01, 5.473729968070984e-01, 5.475141406059265e-01, 5.474433898925781e-01, 5.475333333015442e-01, 4.872127308752141e-18, 0e+00, -0e+00, 0e+00, 0e+00]
-hvac.damOut.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.780644416809082e-01, 9.047847390174866e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.90573912858963e-01, 8.375797867774963e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.905739724636078e-01, 8.374778032302856e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.919001758098602e-01, 8.471666574478149e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.874451398849487e-01, 9.170516729354858e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-hvac.VAVBox[1].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.940321044921875e+02, 3.023760375976562e+02, 3.041305236816406e+02, 2.898220825195312e+02, 2.880269470214844e+02, 2.850493469238281e+02, 2.846656799316406e+02, 2.839359436035156e+02, 2.845569458007812e+02, 2.84953857421875e+02, 2.906392517089844e+02, 2.987110290527344e+02, 2.847205200195312e+02, 2.847205200195312e+02, 2.847205200195312e+02, 2.847205200195312e+02, 2.847205200195312e+02, 2.847205200195312e+02, 2.847205200195312e+02, 2.992807922363281e+02, 2.977381591796875e+02, 2.976910095214844e+02, 3.041517944335938e+02, 3.039268493652344e+02, 3.034773254394531e+02, 2.844201965332031e+02, 2.844122009277344e+02, 2.850967102050781e+02, 2.85375244140625e+02, 2.933914184570312e+02, 3.009381713867188e+02, 2.997149658203125e+02, 2.849937438964844e+02, 2.849937438964844e+02, 2.849937438964844e+02, 2.849937438964844e+02, 2.849937438964844e+02, 2.849937438964844e+02, 2.849937438964844e+02, 2.988273010253906e+02, 2.972947387695312e+02, 2.974202575683594e+02, 3.04152099609375e+02, 3.036708374023438e+02, 3.026874389648438e+02, 3.014254150390625e+02, 2.999247436523438e+02, 2.878273620605469e+02, 3.018557434082031e+02, 3.015735473632812e+02, 3.015621032714844e+02, 3.016794128417969e+02, 2.887569274902344e+02, 2.887569274902344e+02, 2.887569274902344e+02, 2.887569274902344e+02, 2.887569274902344e+02, 2.887569274902344e+02, 2.887569274902344e+02, 3.004101867675781e+02, 2.992807922363281e+02, 2.995442810058594e+02, 3.04149658203125e+02, 3.040452575683594e+02, 3.040245056152344e+02, 2.982039184570312e+02, 2.892539978027344e+02, 2.895512390136719e+02, 2.900813293457031e+02, 2.899855041503906e+02, 2.9366845703125e+02, 3.016213073730469e+02, 2.918312072753906e+02, 2.918312072753906e+02, 2.918312072753906e+02, 2.918312072753906e+02, 2.918312072753906e+02, 2.918312072753906e+02, 2.918312072753906e+02, 3.021380615234375e+02, 3.04039306640625e+02, 3.030753784179688e+02, 3.041329040527344e+02, 2.902912292480469e+02, 2.906987609863281e+02, 2.910485534667969e+02, 2.911779479980469e+02, 2.912489929199219e+02, 2.911312255859375e+02, 2.910403442382812e+02, 2.906620788574219e+02, 2.893164978027344e+02, 2.88704345703125e+02, 2.88704345703125e+02, 2.88704345703125e+02, 2.88704345703125e+02, 2.88704345703125e+02]
-hvac.VAVBox[2].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.979806518554688e+02, 3.032020263671875e+02, 3.041328125e+02, 2.8982177734375e+02, 2.880288696289062e+02, 2.850501708984375e+02, 2.90541259765625e+02, 2.860742492675781e+02, 2.845898132324219e+02, 2.923251037597656e+02, 2.930718383789062e+02, 3.027146606445312e+02, 2.844920043945312e+02, 2.844920043945312e+02, 2.844920043945312e+02, 2.844920043945312e+02, 2.844920043945312e+02, 2.844920043945312e+02, 2.844920043945312e+02, 2.992807922363281e+02, 2.977381591796875e+02, 2.976910095214844e+02, 3.041517944335938e+02, 3.040014953613281e+02, 3.041561889648438e+02, 3.033363647460938e+02, 3.008494567871094e+02, 3.009437866210938e+02, 3.011666259765625e+02, 3.010037536621094e+02, 2.998899230957031e+02, 2.996435546875e+02, 2.849783935546875e+02, 2.849783935546875e+02, 2.849783935546875e+02, 2.849783935546875e+02, 2.849783935546875e+02, 2.849783935546875e+02, 2.849783935546875e+02, 2.988273010253906e+02, 2.972947387695312e+02, 2.974202575683594e+02, 3.04152099609375e+02, 3.036708374023438e+02, 3.026874389648438e+02, 3.014235534667969e+02, 3.009118041992188e+02, 3.010850219726562e+02, 3.011646423339844e+02, 3.015357055664062e+02, 3.015022583007812e+02, 3.016756286621094e+02, 2.887565612792969e+02, 2.887565612792969e+02, 2.887565612792969e+02, 2.887565612792969e+02, 2.887565612792969e+02, 2.887565612792969e+02, 2.887565612792969e+02, 3.004101867675781e+02, 2.992807922363281e+02, 2.995442810058594e+02, 3.04149658203125e+02, 3.042090759277344e+02, 3.013978576660156e+02, 2.973088684082031e+02, 2.963691101074219e+02, 2.948621215820312e+02, 2.925547485351562e+02, 2.919845886230469e+02, 2.934400939941406e+02, 3.022164611816406e+02, 2.946038513183594e+02, 2.946038513183594e+02, 2.946038513183594e+02, 2.946038513183594e+02, 2.946038513183594e+02, 2.946038513183594e+02, 2.946038513183594e+02, 3.021380615234375e+02, 2.990675048828125e+02, 3.063020324707031e+02, 3.041247253417969e+02, 2.9082080078125e+02, 2.906986083984375e+02, 2.910484313964844e+02, 2.911779174804688e+02, 2.912490234375e+02, 2.911311645507812e+02, 2.910404663085938e+02, 2.906625671386719e+02, 2.918110046386719e+02, 2.921498107910156e+02, 2.921498107910156e+02, 2.921498107910156e+02, 2.921498107910156e+02, 2.921498107910156e+02]
-hvac.VAVBox[3].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.994076538085938e+02, 3.063582153320312e+02, 3.041301879882812e+02, 2.940128479003906e+02, 2.984493713378906e+02, 2.953776245117188e+02, 2.857682800292969e+02, 2.913316345214844e+02, 2.919233703613281e+02, 2.9140380859375e+02, 2.92805419921875e+02, 3.013902282714844e+02, 2.834498596191406e+02, 2.834498596191406e+02, 2.834498596191406e+02, 2.834498596191406e+02, 2.834498596191406e+02, 2.834498596191406e+02, 2.834498596191406e+02, 2.992807922363281e+02, 2.977381591796875e+02, 2.976910095214844e+02, 3.041517944335938e+02, 3.039268493652344e+02, 3.024454345703125e+02, 3.009279479980469e+02, 3.007083740234375e+02, 3.009293518066406e+02, 3.011657409667969e+02, 3.010037231445312e+02, 2.998899230957031e+02, 2.996435546875e+02, 2.849783630371094e+02, 2.849783630371094e+02, 2.849783630371094e+02, 2.849783630371094e+02, 2.849783630371094e+02, 2.849783630371094e+02, 2.849783630371094e+02, 2.988273010253906e+02, 2.972947387695312e+02, 2.974202575683594e+02, 3.04152099609375e+02, 3.036708374023438e+02, 3.026874389648438e+02, 3.014235534667969e+02, 3.009118041992188e+02, 3.010850219726562e+02, 3.011646423339844e+02, 3.015357055664062e+02, 3.015022583007812e+02, 3.016756286621094e+02, 2.887565307617188e+02, 2.887565307617188e+02, 2.887565307617188e+02, 2.887565307617188e+02, 2.887565307617188e+02, 2.887565307617188e+02, 2.887565307617188e+02, 3.004101867675781e+02, 2.992807922363281e+02, 2.995442810058594e+02, 3.04149658203125e+02, 3.040452575683594e+02, 3.040319519042969e+02, 3.004057312011719e+02, 2.976581115722656e+02, 2.961568298339844e+02, 2.933425903320312e+02, 2.922736206054688e+02, 2.933739013671875e+02, 3.023711242675781e+02, 2.922456665039062e+02, 2.922456665039062e+02, 2.922456665039062e+02, 2.922456665039062e+02, 2.922456665039062e+02, 2.922456665039062e+02, 2.922456665039062e+02, 3.021380615234375e+02, 3.039776000976562e+02, 3.041647338867188e+02, 3.041338500976562e+02, 2.976813049316406e+02, 2.917087707519531e+02, 2.910485534667969e+02, 2.911779479980469e+02, 2.912489929199219e+02, 2.911312255859375e+02, 2.910403442382812e+02, 2.906620788574219e+02, 2.923596801757812e+02, 2.906272277832031e+02, 2.906272277832031e+02, 2.906272277832031e+02, 2.906272277832031e+02, 2.906272277832031e+02]
-hvac.VAVBox[4].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.938187255859375e+02, 3.070776672363281e+02, 3.041308288574219e+02, 2.941285705566406e+02, 2.880288696289062e+02, 2.903790283203125e+02, 2.953436279296875e+02, 2.919758911132812e+02, 2.91307861328125e+02, 2.914462890625e+02, 2.933479919433594e+02, 3.036048583984375e+02, 2.840014953613281e+02, 2.840014953613281e+02, 2.840014953613281e+02, 2.840014953613281e+02, 2.840014953613281e+02, 2.840014953613281e+02, 2.840014953613281e+02, 2.992807922363281e+02, 2.977381591796875e+02, 2.976910095214844e+02, 3.041517944335938e+02, 3.039268493652344e+02, 3.024454345703125e+02, 3.009279479980469e+02, 3.007083740234375e+02, 3.009293518066406e+02, 3.014312133789062e+02, 3.0152880859375e+02, 3.003865661621094e+02, 2.996847229003906e+02, 2.849873962402344e+02, 2.849873962402344e+02, 2.849873962402344e+02, 2.849873962402344e+02, 2.849873962402344e+02, 2.849873962402344e+02, 2.849873962402344e+02, 2.988273010253906e+02, 2.972947387695312e+02, 2.974202575683594e+02, 3.04152099609375e+02, 3.036708374023438e+02, 3.026874389648438e+02, 3.014235534667969e+02, 3.009118041992188e+02, 3.010850219726562e+02, 3.011646423339844e+02, 3.015357055664062e+02, 3.015022583007812e+02, 3.016756286621094e+02, 2.887565612792969e+02, 2.887565612792969e+02, 2.887565612792969e+02, 2.887565612792969e+02, 2.887565612792969e+02, 2.887565612792969e+02, 2.887565612792969e+02, 3.004101867675781e+02, 2.992807922363281e+02, 2.995442810058594e+02, 3.04149658203125e+02, 3.040452575683594e+02, 3.040081787109375e+02, 3.037250671386719e+02, 3.041381530761719e+02, 3.022458801269531e+02, 2.994469299316406e+02, 2.941203308105469e+02, 2.994629516601562e+02, 3.035610046386719e+02, 2.916312561035156e+02, 2.916312561035156e+02, 2.916312561035156e+02, 2.916312561035156e+02, 2.916312561035156e+02, 2.916312561035156e+02, 2.916312561035156e+02, 3.021380615234375e+02, 3.059530029296875e+02, 3.063229064941406e+02, 3.041253356933594e+02, 2.932280578613281e+02, 2.931399841308594e+02, 2.910484313964844e+02, 2.911779174804688e+02, 2.912490234375e+02, 2.911311645507812e+02, 2.910404663085938e+02, 2.906625671386719e+02, 2.917074279785156e+02, 2.919819030761719e+02, 2.919819030761719e+02, 2.919819030761719e+02, 2.919819030761719e+02, 2.919819030761719e+02]
-hvac.VAVBox[5].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.937676086425781e+02, 2.957471008300781e+02, 2.920342712402344e+02, 2.898220825195312e+02, 2.880269470214844e+02, 2.850493469238281e+02, 2.846656799316406e+02, 2.839359436035156e+02, 2.845569458007812e+02, 2.84953857421875e+02, 2.843458557128906e+02, 2.891200561523438e+02, 2.846188049316406e+02, 2.846188049316406e+02, 2.846188049316406e+02, 2.846188049316406e+02, 2.846188049316406e+02, 2.846188049316406e+02, 2.846188049316406e+02, 2.992807922363281e+02, 2.977381591796875e+02, 2.976910095214844e+02, 3.041517944335938e+02, 3.039421081542969e+02, 3.024454956054688e+02, 3.00927978515625e+02, 3.00730224609375e+02, 3.00931396484375e+02, 3.011658630371094e+02, 3.0114501953125e+02, 2.99894287109375e+02, 2.996439819335938e+02, 2.849785461425781e+02, 2.849785461425781e+02, 2.849785461425781e+02, 2.849785461425781e+02, 2.849785461425781e+02, 2.849785461425781e+02, 2.849785461425781e+02, 2.988273010253906e+02, 2.972947387695312e+02, 2.974202575683594e+02, 3.04152099609375e+02, 3.036708374023438e+02, 3.026874389648438e+02, 3.014235534667969e+02, 3.009118041992188e+02, 3.010850219726562e+02, 3.011646423339844e+02, 3.015357055664062e+02, 3.015022583007812e+02, 3.016756286621094e+02, 2.887566223144531e+02, 2.887566223144531e+02, 2.887566223144531e+02, 2.887566223144531e+02, 2.887566223144531e+02, 2.887566223144531e+02, 2.887566223144531e+02, 3.004101867675781e+02, 2.992807922363281e+02, 2.995442810058594e+02, 3.041494140625e+02, 3.042025756835938e+02, 2.893543395996094e+02, 2.882271118164062e+02, 2.892539978027344e+02, 2.895512390136719e+02, 2.900813293457031e+02, 2.899855041503906e+02, 2.892330932617188e+02, 2.889882202148438e+02, 2.895492248535156e+02, 2.895492248535156e+02, 2.895492248535156e+02, 2.895492248535156e+02, 2.895492248535156e+02, 2.895492248535156e+02, 2.895492248535156e+02, 3.021749877929688e+02, 3.034573669433594e+02, 3.038735656738281e+02, 2.969598693847656e+02, 2.902911987304688e+02, 2.906987609863281e+02, 2.910485534667969e+02, 2.911779479980469e+02, 2.912489929199219e+02, 2.911312255859375e+02, 2.910403442382812e+02, 2.906620788574219e+02, 2.893164978027344e+02, 2.877332763671875e+02, 2.877332763671875e+02, 2.877332763671875e+02, 2.877332763671875e+02, 2.877332763671875e+02]
-hvac.res.EFan=[0e+00, -2.193046952925215e-07, -2.193046952925215e-07, -2.193046952925215e-07, 3.45585498046875e+03, 7.42553369140625e+03, 1.12898583984375e+04, 1.51441337890625e+04, 1.899895703125e+04, 2.2856982421875e+04, 2.6714017578125e+04, 3.05707890625e+04, 3.442769140625e+04, 3.82845859375e+04, 4.21415234375e+04, 4.599847265625e+04, 4.921798828125e+04, 4.921798828125e+04, 4.921798828125e+04, 4.921798828125e+04, 4.921798828125e+04, 4.921798828125e+04, 4.921798828125e+04, 5.1239875e+04, 7.0138265625e+04, 8.9687953125e+04, 1.037383359375e+05, 1.107934296875e+05, 1.148126953125e+05, 1.18676640625e+05, 1.22566109375e+05, 1.264943984375e+05, 1.30426109375e+05, 1.3432940625e+05, 1.38200984375e+05, 1.42110671875e+05, 1.45433828125e+05, 1.45433828125e+05, 1.45433828125e+05, 1.45433828125e+05, 1.45433828125e+05, 1.45433828125e+05, 1.45433828125e+05, 1.4746771875e+05, 1.66367640625e+05, 1.8591725e+05, 1.99967640625e+05, 2.07022921875e+05, 2.1105e+05, 2.14944234375e+05, 2.189055625e+05, 2.22861921875e+05, 2.26778265625e+05, 2.307098125e+05, 2.3467753125e+05, 2.386521875e+05, 2.419635625e+05, 2.419635625e+05, 2.419635625e+05, 2.419635625e+05, 2.419635625e+05, 2.419635625e+05, 2.419635625e+05, 2.43999484375e+05, 2.6289709375e+05, 2.8244721875e+05, 2.9648140625e+05, 3.0352365625e+05, 3.0749809375e+05, 3.1135159375e+05, 3.15205875e+05, 3.19061875e+05, 3.22917625e+05, 3.26774625e+05, 3.306315625e+05, 3.344876875e+05, 3.37706625e+05, 3.37706625e+05, 3.37706625e+05, 3.37706625e+05, 3.37706625e+05, 3.37706625e+05, 3.37706625e+05, 3.39687875e+05, 3.494165e+05, 3.5342215625e+05, 3.57301375e+05, 3.6116596875e+05, 3.650213125e+05, 3.68879875e+05, 3.72736875e+05, 3.7659365625e+05, 3.8045059375e+05, 3.8430753125e+05, 3.8816446875e+05, 3.9202140625e+05, 3.9524203125e+05, 3.9524203125e+05, 3.9524203125e+05, 3.9524203125e+05, 3.9524203125e+05]
-hvac.res.EHea=[0e+00, 0e+00, 0e+00, 0e+00, 5.434841796875e+04, 1.02095625e+05, 1.46372e+05, 1.971739375e+05, 2.360133125e+05, 2.7940346875e+05, 3.2687015625e+05, 3.822565e+05, 4.319533125e+05, 4.78161e+05, 5.28587375e+05, 6.131138125e+05, 7.117755625e+05, 7.117755625e+05, 7.117755625e+05, 7.117755625e+05, 7.117755625e+05, 7.117755625e+05, 7.117755625e+05, 7.553045e+05, 9.2337475e+05, 1.091446375e+06, 1.2106855e+06, 1.314174625e+06, 1.42673475e+06, 1.542762875e+06, 1.66005375e+06, 1.77819575e+06, 1.893968125e+06, 2.008402875e+06, 2.1351995e+06, 2.27927025e+06, 2.40124725e+06, 2.40124725e+06, 2.40124725e+06, 2.40124725e+06, 2.40124725e+06, 2.40124725e+06, 2.40124725e+06, 2.4460815e+06, 2.617699e+06, 2.78880775e+06, 2.910493e+06, 3.01674175e+06, 3.13204e+06, 3.25896075e+06, 3.39206125e+06, 3.518001e+06, 3.647232e+06, 3.7786875e+06, 3.90935675e+06, 4.0397515e+06, 4.1476195e+06, 4.1476195e+06, 4.1476195e+06, 4.1476195e+06, 4.1476195e+06, 4.1476195e+06, 4.1476195e+06, 4.186109e+06, 4.3426035e+06, 4.496891e+06, 4.593407e+06, 4.675401e+06, 4.7534695e+06, 4.8322145e+06, 4.889209e+06, 4.9435315e+06, 4.9851445e+06, 5.0206565e+06, 5.060288e+06, 5.125224e+06, 5.1924705e+06, 5.1924705e+06, 5.1924705e+06, 5.1924705e+06, 5.1924705e+06, 5.1924705e+06, 5.1924705e+06, 5.2265045e+06, 5.3198895e+06, 5.394953e+06, 5.450656e+06, 5.506413e+06, 5.527807e+06, 5.5516e+06, 5.5763595e+06, 5.6008235e+06, 5.624964e+06, 5.6496155e+06, 5.6768465e+06, 5.7078045e+06, 5.747718e+06, 5.747718e+06, 5.747718e+06, 5.747718e+06, 5.747718e+06]
+hvac.fanSup.y=[0e+00, 0e+00, 0e+00, 0e+00, 6.019414663314819e-01, 2.818122506141663e-01, 3.0939120054245e-01, 3.314042687416077e-01, 2.999809682369232e-01, 2.998400330543518e-01, 3.020712435245514e-01, 3.019424080848694e-01, 3.016009926795959e-01, 3.017101883888245e-01, 3.015052974224091e-01, 3.017150163650513e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.578675746917725e-01, 1e+00, 1e+00, 8.93288791179657e-01, 5.66134512424469e-01, 3.471721410751343e-01, 3.587355315685272e-01, 3.828733861446381e-01, 3.931641280651093e-01, 3.884958922863007e-01, 3.651162385940552e-01, 3.641700148582458e-01, 3.966013491153717e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.581093907356262e-01, 1e+00, 1e+00, 8.93288791179657e-01, 5.662902593612671e-01, 3.586054742336273e-01, 3.892602026462555e-01, 4.056567251682281e-01, 3.90890508890152e-01, 3.841307461261749e-01, 3.978141248226166e-01, 4.050953984260559e-01, 4.028319418430328e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.580380439758301e-01, 1e+00, 1e+00, 8.932561874389648e-01, 5.59123158454895e-01, 3.216735422611237e-01, 3.305576145648956e-01, 3.026034235954285e-01, 3.077169060707092e-01, 3.025966286659241e-01, 3.012713491916656e-01, 3.018130362033844e-01, 3.072211742401123e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.577834725379944e-01, 4.588371515274048e-01, 4.05887633562088e-01, 3.42713475227356e-01, 3.437524139881134e-01, 2.981516718864441e-01, 2.994560599327087e-01, 3.022383749485016e-01, 3.017012774944305e-01, 3.015329539775848e-01, 3.015600740909576e-01, 3.015967011451721e-01, 3.015550673007965e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+hvac.VAVBox[5].vav.y_actual=[1e+00, 0e+00, -0e+00, -0e+00, 2.197125107049942e-01, 1.167140826582909e-01, 7.218130826950073e-01, 6.440486907958984e-01, 6.324976086616516e-01, 6.525318622589111e-01, 6.508587002754211e-01, 6.486641764640808e-01, 6.493138074874878e-01, 6.486015319824219e-01, 6.490940451622009e-01, 6.497140526771545e-01, 1.013607373685355e-18, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, 1e+00, 1e+00, 1e+00, 3.06595116853714e-01, 4.190585017204285e-01, 7.011455893516541e-01, 7.963771820068359e-01, 8.316669464111328e-01, 7.948905825614929e-01, 7.689166069030762e-01, 7.145081758499146e-01, 8.007651567459106e-01, 8.652240037918091e-01, 9.326639250367086e-19, -0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 1e+00, 1e+00, 1e+00, 3.065973222255707e-01, 4.195817112922668e-01, 7.213304042816162e-01, 8.524212837219238e-01, 8.063243627548218e-01, 7.491343021392822e-01, 7.818053960800171e-01, 8.189277052879333e-01, 7.944451570510864e-01, 7.754244208335876e-01, 1.053116208077879e-18, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 3.066563606262207e-01, 3.82651299238205e-01, 6.211298108100891e-01, 6.531729102134705e-01, 6.335163712501526e-01, 6.575430035591125e-01, 6.465896964073181e-01, 6.51461660861969e-01, 6.521520018577576e-01, 6.577667593955994e-01, 1.138741498993576e-18, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 9.717816710472107e-01, 4.386608600616455e-01, 5.379099249839783e-01, 6.566776037216187e-01, 6.232849359512329e-01, 6.291444301605225e-01, 6.549488306045532e-01, 6.503998041152954e-01, 6.481809616088867e-01, 6.484971046447754e-01, 6.486775279045105e-01, 6.485865712165833e-01, 6.487026810646057e-01, 5.763391257720877e-18, 0e+00, -0e+00, 0e+00, 0e+00]
+hvac.VAVBox[1].vav.y_actual=[1e+00, 0e+00, -0e+00, -0e+00, 4.702034294605255e-01, 6.454307436943054e-01, 7.651348114013672e-01, 6.462658643722534e-01, 6.325282454490662e-01, 6.525328159332275e-01, 6.508591175079346e-01, 6.486645340919495e-01, 6.493142247200012e-01, 6.486019492149353e-01, 6.490944623947144e-01, 6.49714469909668e-01, 1.071547032896479e-18, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, 1e+00, 1e+00, 1e+00, 3.06595116853714e-01, 4.195613265037537e-01, 6.469764113426208e-01, 6.830968260765076e-01, 6.993697285652161e-01, 6.757393479347229e-01, 6.627333164215088e-01, 6.336991190910339e-01, 7.260100245475769e-01, 8.558315634727478e-01, 9.308259297156158e-19, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 3.065973222255707e-01, 4.195817112922668e-01, 7.213304042816162e-01, 8.521842956542969e-01, 7.063333988189697e-01, 6.509991884231567e-01, 7.300500869750977e-01, 8.147152662277222e-01, 7.887501120567322e-01, 7.750953435897827e-01, 1.053076813601206e-18, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 1e+00, 1e+00, 1e+00, 3.067133724689484e-01, 4.174858331680298e-01, 7.014539241790771e-01, 6.564514636993408e-01, 6.335633993148804e-01, 6.575443744659424e-01, 6.465901136398315e-01, 6.514620780944824e-01, 6.52152419090271e-01, 6.577671766281128e-01, 1.138742222776612e-18, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 1e+00, 5.617546439170837e-01, 6.956172585487366e-01, 7.435092329978943e-01, 6.358104944229126e-01, 6.293006539344788e-01, 6.549521088600159e-01, 6.504002809524536e-01, 6.481813788414001e-01, 6.484975218772888e-01, 6.486778855323792e-01, 6.485869884490967e-01, 6.487030982971191e-01, 5.763394980033634e-18, 0e+00, -0e+00, 0e+00, 0e+00]
+hvac.VAVBox[2].vav.y_actual=[1e+00, 0e+00, -0e+00, -0e+00, 4.537002146244049e-01, 6.538504958152771e-01, 7.20761239528656e-01, 5.467146635055542e-01, 5.346290469169617e-01, 5.504832863807678e-01, 5.491856932640076e-01, 5.475017428398132e-01, 5.480056405067444e-01, 5.474544763565063e-01, 5.478361845016479e-01, 5.483137965202332e-01, 1.087295931374029e-18, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, 1e+00, 1e+00, 1e+00, 3.06595116853714e-01, 4.168921113014221e-01, 5.861231088638306e-01, 6.490883231163025e-01, 8.18362832069397e-01, 7.937231659889221e-01, 7.688530087471008e-01, 7.230062484741211e-01, 8.011473417282104e-01, 8.652806878089905e-01, 9.326751953725546e-19, -0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 1e+00, 1e+00, 1e+00, 3.065973222255707e-01, 4.195817112922668e-01, 7.213304042816162e-01, 8.524212837219238e-01, 8.063243627548218e-01, 7.491343021392822e-01, 7.818053960800171e-01, 8.189277052879333e-01, 7.944451570510864e-01, 7.754244208335876e-01, 1.053116208077879e-18, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 1e+00, 1e+00, 1e+00, 3.067133724689484e-01, 3.685039281845093e-01, 5.217724442481995e-01, 5.506888031959534e-01, 5.354450941085815e-01, 5.542411804199219e-01, 5.458916425704956e-01, 5.496628284454346e-01, 5.501837134361267e-01, 5.544111132621765e-01, 1.015023920484352e-18, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 1e+00, 4.895135760307312e-01, 6.990687847137451e-01, 7.327450513839722e-01, 5.381065607070923e-01, 5.318164825439453e-01, 5.523278117179871e-01, 5.488277673721313e-01, 5.471289157867432e-01, 5.473746657371521e-01, 5.475138425827026e-01, 5.474433302879333e-01, 5.47533392906189e-01, 4.864394824385996e-18, 0e+00, -0e+00, 0e+00, 0e+00]
+hvac.VAVBox[3].vav.y_actual=[1e+00, 0e+00, -0e+00, -0e+00, 4.672060012817383e-01, 6.555298566818237e-01, 8.541932702064514e-01, 6.703046560287476e-01, 6.328582763671875e-01, 6.525387763977051e-01, 6.508592367172241e-01, 6.486645340919495e-01, 6.493142247200012e-01, 6.486019492149353e-01, 6.490944623947144e-01, 6.515614986419678e-01, 1.180578950208013e-18, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, 1e+00, 1e+00, 1e+00, 3.06595116853714e-01, 4.195613265037537e-01, 7.011493444442749e-01, 7.96377420425415e-01, 8.342382907867432e-01, 7.95082688331604e-01, 7.689270377159119e-01, 7.230085730552673e-01, 8.011474609375e-01, 8.652806878089905e-01, 9.326751953725546e-19, -0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 1e+00, 1e+00, 1e+00, 3.065973222255707e-01, 4.195817112922668e-01, 7.213304042816162e-01, 8.524212837219238e-01, 8.063243627548218e-01, 7.491343021392822e-01, 7.818053960800171e-01, 8.189277052879333e-01, 7.944451570510864e-01, 7.754244208335876e-01, 1.053116208077879e-18, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 1e+00, 1e+00, 1e+00, 3.067133724689484e-01, 4.174858331680298e-01, 7.010025382041931e-01, 6.630107164382935e-01, 6.336568593978882e-01, 6.575462222099304e-01, 6.465901732444763e-01, 6.514620780944824e-01, 6.52152419090271e-01, 6.577671766281128e-01, 1.192361517648371e-18, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 1e+00, 6.82692289352417e-01, 1e+00, 7.447229623794556e-01, 6.539205312728882e-01, 6.295260190963745e-01, 6.549562811851501e-01, 6.504003405570984e-01, 6.481813788414001e-01, 6.484975218772888e-01, 6.486778855323792e-01, 6.485869884490967e-01, 6.487030982971191e-01, 5.763394980033634e-18, 0e+00, -0e+00, 0e+00, 0e+00]
+hvac.VAVBox[4].vav.y_actual=[1e+00, 0e+00, -0e+00, -0e+00, 4.186302423477173e-01, 6.616690754890442e-01, 7.27643609046936e-01, 5.487908124923706e-01, 5.34662663936615e-01, 5.504838824272156e-01, 5.491856932640076e-01, 5.475017428398132e-01, 5.480056405067444e-01, 5.474544763565063e-01, 5.478361845016479e-01, 5.483137965202332e-01, 1.125475900112486e-18, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 3.06595116853714e-01, 4.195613265037537e-01, 7.011493444442749e-01, 7.96377420425415e-01, 8.342382907867432e-01, 7.95082688331604e-01, 7.483766078948975e-01, 5.424597263336182e-01, 7.614525556564331e-01, 8.597567081451416e-01, 9.315871426743177e-19, -0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 1e+00, 1e+00, 1e+00, 3.065973222255707e-01, 4.195817112922668e-01, 7.213304042816162e-01, 8.524212837219238e-01, 8.063243627548218e-01, 7.491343021392822e-01, 7.818053960800171e-01, 8.189277052879333e-01, 7.944451570510864e-01, 7.754244208335876e-01, 1.053116208077879e-18, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 1e+00, 1e+00, 1e+00, 3.067133724689484e-01, 4.174858331680298e-01, 7.02549159526825e-01, 6.396594643592834e-01, 5.508912801742554e-01, 5.785806179046631e-01, 5.463127493858337e-01, 5.496703386306763e-01, 5.501838326454163e-01, 5.768910646438599e-01, 1.253465659690393e-18, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 1e+00, 4.929947555065155e-01, 6.975510120391846e-01, 7.280742526054382e-01, 5.477272868156433e-01, 5.319685935974121e-01, 5.523305535316467e-01, 5.488278269767761e-01, 5.471289157867432e-01, 5.473746657371521e-01, 5.475138425827026e-01, 5.474433302879333e-01, 5.47533392906189e-01, 4.864394824385996e-18, 0e+00, -0e+00, 0e+00, 0e+00]
+hvac.damOut.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.782426595687866e-01, 9.046007394790649e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.90573912858963e-01, 8.375718593597412e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.905739724636078e-01, 8.374778032302856e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.918419420719147e-01, 8.471137285232544e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.74981689453125e-01, 9.11467432975769e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+hvac.VAVBox[1].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 3.04269287109375e+02, 3.002547302246094e+02, 3.041302490234375e+02, 2.898238525390625e+02, 2.8802978515625e+02, 2.85050048828125e+02, 2.846643371582031e+02, 2.839349670410156e+02, 2.845555725097656e+02, 2.849530029296875e+02, 2.906410217285156e+02, 2.987040710449219e+02, 2.847207641601562e+02, 2.847207641601562e+02, 2.847207641601562e+02, 2.847207641601562e+02, 2.847207641601562e+02, 2.847207641601562e+02, 2.847207641601562e+02, 2.993073425292969e+02, 2.977365417480469e+02, 2.976900024414062e+02, 3.041517944335938e+02, 3.039262390136719e+02, 3.034724426269531e+02, 2.844229431152344e+02, 2.8441357421875e+02, 2.850968322753906e+02, 2.853749084472656e+02, 2.933925170898438e+02, 3.009389953613281e+02, 2.997156677246094e+02, 2.849944458007812e+02, 2.849944458007812e+02, 2.849944458007812e+02, 2.849944458007812e+02, 2.849944458007812e+02, 2.849944458007812e+02, 2.849944458007812e+02, 2.988615417480469e+02, 2.9729296875e+02, 2.974192504882812e+02, 3.04152099609375e+02, 3.0367041015625e+02, 3.026871643066406e+02, 3.014250183105469e+02, 2.999769592285156e+02, 2.878198852539062e+02, 3.018548278808594e+02, 3.015736999511719e+02, 3.015617065429688e+02, 3.01679443359375e+02, 2.887569885253906e+02, 2.887569885253906e+02, 2.887569885253906e+02, 2.887569885253906e+02, 2.887569885253906e+02, 2.887569885253906e+02, 2.887569885253906e+02, 3.004344482421875e+02, 2.992793273925781e+02, 2.9954345703125e+02, 3.04149658203125e+02, 3.040455322265625e+02, 3.040245666503906e+02, 2.982060852050781e+02, 2.892542724609375e+02, 2.895509643554688e+02, 2.900814208984375e+02, 2.899854736328125e+02, 2.93670166015625e+02, 3.0162255859375e+02, 2.918316955566406e+02, 2.918316955566406e+02, 2.918316955566406e+02, 2.918316955566406e+02, 2.918316955566406e+02, 2.918316955566406e+02, 2.918316955566406e+02, 3.021480407714844e+02, 3.040376586914062e+02, 3.029828796386719e+02, 3.041333618164062e+02, 2.902774658203125e+02, 2.906894836425781e+02, 2.910433044433594e+02, 2.911744384765625e+02, 2.912474365234375e+02, 2.911306762695312e+02, 2.910401611328125e+02, 2.906622314453125e+02, 2.893165588378906e+02, 2.88705078125e+02, 2.88705078125e+02, 2.88705078125e+02, 2.88705078125e+02, 2.88705078125e+02]
+hvac.VAVBox[2].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.979839172363281e+02, 3.040290832519531e+02, 3.041322937011719e+02, 2.898235473632812e+02, 2.8803173828125e+02, 2.850509033203125e+02, 2.905465087890625e+02, 2.860615844726562e+02, 2.846366882324219e+02, 2.923685302734375e+02, 2.930726928710938e+02, 3.027101135253906e+02, 2.844911804199219e+02, 2.844911804199219e+02, 2.844911804199219e+02, 2.844911804199219e+02, 2.844911804199219e+02, 2.844911804199219e+02, 2.844911804199219e+02, 2.993073425292969e+02, 2.977365417480469e+02, 2.976900024414062e+02, 3.041517944335938e+02, 3.039989929199219e+02, 3.041562805175781e+02, 3.033304138183594e+02, 3.00849609375e+02, 3.009440002441406e+02, 3.011669311523438e+02, 3.010045776367188e+02, 2.998902587890625e+02, 2.996443176269531e+02, 2.849791564941406e+02, 2.849791564941406e+02, 2.849791564941406e+02, 2.849791564941406e+02, 2.849791564941406e+02, 2.849791564941406e+02, 2.849791564941406e+02, 2.988615417480469e+02, 2.9729296875e+02, 2.974192504882812e+02, 3.04152099609375e+02, 3.0367041015625e+02, 3.026871643066406e+02, 3.0142333984375e+02, 3.009132385253906e+02, 3.010859985351562e+02, 3.011657104492188e+02, 3.015359191894531e+02, 3.015024108886719e+02, 3.016756896972656e+02, 2.887566223144531e+02, 2.887566223144531e+02, 2.887566223144531e+02, 2.887566223144531e+02, 2.887566223144531e+02, 2.887566223144531e+02, 2.887566223144531e+02, 3.004344482421875e+02, 2.992793273925781e+02, 2.9954345703125e+02, 3.04149658203125e+02, 3.042090454101562e+02, 3.014125671386719e+02, 2.973155212402344e+02, 2.963755187988281e+02, 2.948712463378906e+02, 2.925590515136719e+02, 2.919881286621094e+02, 2.934427490234375e+02, 3.022174682617188e+02, 2.946019287109375e+02, 2.946019287109375e+02, 2.946019287109375e+02, 2.946019287109375e+02, 2.946019287109375e+02, 2.946019287109375e+02, 2.946019287109375e+02, 3.021480407714844e+02, 2.990690307617188e+02, 3.061818237304688e+02, 3.041244201660156e+02, 2.906913146972656e+02, 2.906893615722656e+02, 2.910431518554688e+02, 2.911744079589844e+02, 2.912474670410156e+02, 2.91130615234375e+02, 2.91040283203125e+02, 2.906627502441406e+02, 2.918112182617188e+02, 2.921503295898438e+02, 2.921503295898438e+02, 2.921503295898438e+02, 2.921503295898438e+02, 2.921503295898438e+02]
+hvac.VAVBox[3].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.989417724609375e+02, 3.058045349121094e+02, 3.041303100585938e+02, 2.940110473632812e+02, 2.984528503417969e+02, 2.95381103515625e+02, 2.856929626464844e+02, 2.913338928222656e+02, 2.919280395507812e+02, 2.914076538085938e+02, 2.928072814941406e+02, 3.013911743164062e+02, 2.834504089355469e+02, 2.834504089355469e+02, 2.834504089355469e+02, 2.834504089355469e+02, 2.834504089355469e+02, 2.834504089355469e+02, 2.834504089355469e+02, 2.993073425292969e+02, 2.977365417480469e+02, 2.976900024414062e+02, 3.041517944335938e+02, 3.039262390136719e+02, 3.024457092285156e+02, 3.009295654296875e+02, 3.007090454101562e+02, 3.009296264648438e+02, 3.01166015625e+02, 3.010045471191406e+02, 2.998902587890625e+02, 2.996443176269531e+02, 2.849791259765625e+02, 2.849791259765625e+02, 2.849791259765625e+02, 2.849791259765625e+02, 2.849791259765625e+02, 2.849791259765625e+02, 2.849791259765625e+02, 2.988615417480469e+02, 2.9729296875e+02, 2.974192504882812e+02, 3.04152099609375e+02, 3.0367041015625e+02, 3.026871643066406e+02, 3.0142333984375e+02, 3.009132385253906e+02, 3.010859985351562e+02, 3.011657104492188e+02, 3.015359191894531e+02, 3.015024108886719e+02, 3.016756896972656e+02, 2.88756591796875e+02, 2.88756591796875e+02, 2.88756591796875e+02, 2.88756591796875e+02, 2.88756591796875e+02, 2.88756591796875e+02, 2.88756591796875e+02, 3.004344482421875e+02, 2.992793273925781e+02, 2.9954345703125e+02, 3.04149658203125e+02, 3.040455322265625e+02, 3.040315856933594e+02, 3.004116821289062e+02, 2.976634521484375e+02, 2.961670227050781e+02, 2.933468933105469e+02, 2.922771606445312e+02, 2.933764953613281e+02, 3.023735656738281e+02, 2.922443542480469e+02, 2.922443542480469e+02, 2.922443542480469e+02, 2.922443542480469e+02, 2.922443542480469e+02, 2.922443542480469e+02, 2.922443542480469e+02, 3.021480407714844e+02, 3.039769897460938e+02, 3.041361694335938e+02, 3.041343688964844e+02, 2.976860656738281e+02, 2.917159118652344e+02, 2.910433044433594e+02, 2.911744384765625e+02, 2.912474365234375e+02, 2.911306762695312e+02, 2.910401611328125e+02, 2.906622314453125e+02, 2.923597412109375e+02, 2.906272583007812e+02, 2.906272583007812e+02, 2.906272583007812e+02, 2.906272583007812e+02, 2.906272583007812e+02]
+hvac.VAVBox[4].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.947091369628906e+02, 3.069169921875e+02, 3.041315612792969e+02, 2.941383361816406e+02, 2.8803173828125e+02, 2.90378173828125e+02, 2.953531494140625e+02, 2.919799499511719e+02, 2.913146362304688e+02, 2.914374694824219e+02, 2.93352783203125e+02, 3.036040344238281e+02, 2.840009765625e+02, 2.840009765625e+02, 2.840009765625e+02, 2.840009765625e+02, 2.840009765625e+02, 2.840009765625e+02, 2.840009765625e+02, 2.993073425292969e+02, 2.977365417480469e+02, 2.976900024414062e+02, 3.041517944335938e+02, 3.039262390136719e+02, 3.024457092285156e+02, 3.009295654296875e+02, 3.007090454101562e+02, 3.009296264648438e+02, 3.014284973144531e+02, 3.014721984863281e+02, 3.00387939453125e+02, 2.996855163574219e+02, 2.849881286621094e+02, 2.849881286621094e+02, 2.849881286621094e+02, 2.849881286621094e+02, 2.849881286621094e+02, 2.849881286621094e+02, 2.849881286621094e+02, 2.988615417480469e+02, 2.9729296875e+02, 2.974192504882812e+02, 3.04152099609375e+02, 3.0367041015625e+02, 3.026871643066406e+02, 3.0142333984375e+02, 3.009132385253906e+02, 3.010859985351562e+02, 3.011657104492188e+02, 3.015359191894531e+02, 3.015024108886719e+02, 3.016756896972656e+02, 2.887566223144531e+02, 2.887566223144531e+02, 2.887566223144531e+02, 2.887566223144531e+02, 2.887566223144531e+02, 2.887566223144531e+02, 2.887566223144531e+02, 3.004344482421875e+02, 2.992793273925781e+02, 2.9954345703125e+02, 3.04149658203125e+02, 3.040455322265625e+02, 3.040083923339844e+02, 3.037410278320312e+02, 3.041381225585938e+02, 3.022529907226562e+02, 2.99450927734375e+02, 2.941237487792969e+02, 2.994656677246094e+02, 3.03564453125e+02, 2.916310729980469e+02, 2.916310729980469e+02, 2.916310729980469e+02, 2.916310729980469e+02, 2.916310729980469e+02, 2.916310729980469e+02, 2.916310729980469e+02, 3.021480407714844e+02, 3.059423217773438e+02, 3.062007446289062e+02, 3.041248779296875e+02, 2.932167663574219e+02, 2.931494445800781e+02, 2.910431518554688e+02, 2.911744079589844e+02, 2.912474670410156e+02, 2.91130615234375e+02, 2.91040283203125e+02, 2.906627502441406e+02, 2.917068176269531e+02, 2.919820861816406e+02, 2.919820861816406e+02, 2.919820861816406e+02, 2.919820861816406e+02, 2.919820861816406e+02]
+hvac.VAVBox[5].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.935503845214844e+02, 2.95747802734375e+02, 2.920314331054688e+02, 2.898238525390625e+02, 2.8802978515625e+02, 2.85050048828125e+02, 2.846643371582031e+02, 2.839349670410156e+02, 2.845555725097656e+02, 2.849530029296875e+02, 2.843457336425781e+02, 2.891107788085938e+02, 2.846192932128906e+02, 2.846192932128906e+02, 2.846192932128906e+02, 2.846192932128906e+02, 2.846192932128906e+02, 2.846192932128906e+02, 2.846192932128906e+02, 2.993073425292969e+02, 2.977365417480469e+02, 2.976900024414062e+02, 3.041517944335938e+02, 3.039400329589844e+02, 3.024457702636719e+02, 3.009295654296875e+02, 3.007306518554688e+02, 3.00931640625e+02, 3.011661376953125e+02, 3.011414184570312e+02, 2.998945007324219e+02, 2.996447448730469e+02, 2.849792785644531e+02, 2.849792785644531e+02, 2.849792785644531e+02, 2.849792785644531e+02, 2.849792785644531e+02, 2.849792785644531e+02, 2.849792785644531e+02, 2.988615417480469e+02, 2.9729296875e+02, 2.974192504882812e+02, 3.04152099609375e+02, 3.0367041015625e+02, 3.026871643066406e+02, 3.0142333984375e+02, 3.009132385253906e+02, 3.010859985351562e+02, 3.011657104492188e+02, 3.015359191894531e+02, 3.015024108886719e+02, 3.016756896972656e+02, 2.887566833496094e+02, 2.887566833496094e+02, 2.887566833496094e+02, 2.887566833496094e+02, 2.887566833496094e+02, 2.887566833496094e+02, 2.887566833496094e+02, 3.004344482421875e+02, 2.992793273925781e+02, 2.9954345703125e+02, 3.041494445800781e+02, 3.042024536132812e+02, 2.893545227050781e+02, 2.882264404296875e+02, 2.892542724609375e+02, 2.895509643554688e+02, 2.900814208984375e+02, 2.899854736328125e+02, 2.892330627441406e+02, 2.889880676269531e+02, 2.895509338378906e+02, 2.895509338378906e+02, 2.895509338378906e+02, 2.895509338378906e+02, 2.895509338378906e+02, 2.895509338378906e+02, 2.895509338378906e+02, 3.022061767578125e+02, 3.035075988769531e+02, 2.951099853515625e+02, 2.968547668457031e+02, 2.902774658203125e+02, 2.906894836425781e+02, 2.910433044433594e+02, 2.911744384765625e+02, 2.912474365234375e+02, 2.911306762695312e+02, 2.910401611328125e+02, 2.906622314453125e+02, 2.893165588378906e+02, 2.877337036132812e+02, 2.877337036132812e+02, 2.877337036132812e+02, 2.877337036132812e+02, 2.877337036132812e+02]
+hvac.res.EFan=[0e+00, -1.653271368695641e-07, -1.653271368695641e-07, -1.653271368695641e-07, 3.361611083984375e+03, 7.3439375e+03, 1.12082734375e+04, 1.50625908203125e+04, 1.8917416015625e+04, 2.2775447265625e+04, 2.6632482421875e+04, 3.0489251953125e+04, 3.434615625e+04, 3.820305078125e+04, 4.2059984375e+04, 4.59169375e+04, 4.9136453125e+04, 4.9136453125e+04, 4.9136453125e+04, 4.9136453125e+04, 4.9136453125e+04, 4.9136453125e+04, 4.9136453125e+04, 5.106703515625e+04, 6.9951890625e+04, 8.95015859375e+04, 1.0355196875e+05, 1.1060709375e+05, 1.146264453125e+05, 1.184904375e+05, 1.223799453125e+05, 1.263082421875e+05, 1.302399296875e+05, 1.3414328125e+05, 1.38014953125e+05, 1.4192465625e+05, 1.45247765625e+05, 1.45247765625e+05, 1.45247765625e+05, 1.45247765625e+05, 1.45247765625e+05, 1.45247765625e+05, 1.45247765625e+05, 1.4718509375e+05, 1.6607078125e+05, 1.85620390625e+05, 1.9967078125e+05, 2.067260625e+05, 2.10753140625e+05, 2.14647375e+05, 2.18608734375e+05, 2.22565203125e+05, 2.26481578125e+05, 2.30413109375e+05, 2.3438084375e+05, 2.38355515625e+05, 2.41666890625e+05, 2.41666890625e+05, 2.41666890625e+05, 2.41666890625e+05, 2.41666890625e+05, 2.41666890625e+05, 2.41666890625e+05, 2.436261875e+05, 2.6251240625e+05, 2.820625e+05, 2.960973125e+05, 3.0313959375e+05, 3.0711403125e+05, 3.1096753125e+05, 3.1482184375e+05, 3.1867784375e+05, 3.225335625e+05, 3.263905625e+05, 3.3024753125e+05, 3.3410365625e+05, 3.3732259375e+05, 3.3732259375e+05, 3.3732259375e+05, 3.3732259375e+05, 3.3732259375e+05, 3.3732259375e+05, 3.3732259375e+05, 3.3925865625e+05, 3.4898396875e+05, 3.5298640625e+05, 3.568671875e+05, 3.6073178125e+05, 3.6458715625e+05, 3.684456875e+05, 3.723026875e+05, 3.7615946875e+05, 3.8001640625e+05, 3.8387334375e+05, 3.8773028125e+05, 3.9158721875e+05, 3.9480784375e+05, 3.9480784375e+05, 3.9480784375e+05, 3.9480784375e+05, 3.9480784375e+05]
+hvac.res.EHea=[0e+00, 0e+00, 0e+00, 0e+00, 5.361861328125e+04, 1.018841875e+05, 1.46215359375e+05, 1.9706340625e+05, 2.35903375e+05, 2.792940625e+05, 3.2677959375e+05, 3.821749375e+05, 4.3188578125e+05, 4.78097125e+05, 5.28533e+05, 6.130875e+05, 7.1175125e+05, 7.1175125e+05, 7.1175125e+05, 7.1175125e+05, 7.1175125e+05, 7.1175125e+05, 7.1175125e+05, 7.54585625e+05, 9.226598125e+05, 1.090741125e+06, 1.20998825e+06, 1.31348425e+06, 1.426067875e+06, 1.542165875e+06, 1.659476375e+06, 1.7776155e+06, 1.89338725e+06, 2.007850375e+06, 2.13466575e+06, 2.27873075e+06, 2.400703e+06, 2.400703e+06, 2.400703e+06, 2.400703e+06, 2.400703e+06, 2.400703e+06, 2.400703e+06, 2.44469575e+06, 2.61631875e+06, 2.7874375e+06, 2.90913025e+06, 3.015385e+06, 3.13068575e+06, 3.2576085e+06, 3.390717e+06, 3.51666575e+06, 3.64589225e+06, 3.77734425e+06, 3.90801275e+06, 4.03840725e+06, 4.14627525e+06, 4.14627525e+06, 4.14627525e+06, 4.14627525e+06, 4.14627525e+06, 4.14627525e+06, 4.14627525e+06, 4.1843675e+06, 4.340869e+06, 4.4951645e+06, 4.5916955e+06, 4.6736945e+06, 4.751782e+06, 4.8305495e+06, 4.887564e+06, 4.9419e+06, 4.983523e+06, 5.019043e+06, 5.058682e+06, 5.1236255e+06, 5.190877e+06, 5.190877e+06, 5.190877e+06, 5.190877e+06, 5.190877e+06, 5.190877e+06, 5.190877e+06, 5.2247615e+06, 5.3181945e+06, 5.393618e+06, 5.4493245e+06, 5.504519e+06, 5.525571e+06, 5.54918e+06, 5.573843e+06, 5.598267e+06, 5.6223925e+06, 5.647039e+06, 5.674268e+06, 5.7052265e+06, 5.745142e+06, 5.745142e+06, 5.745142e+06, 5.745142e+06, 5.745142e+06]
 hvac.res.ECoo=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/Scripts/BuildingsPy/conf.yml b/Buildings/Resources/Scripts/BuildingsPy/conf.yml
index 1d95bf13ce4..8c6daf593d4 100644
--- a/Buildings/Resources/Scripts/BuildingsPy/conf.yml
+++ b/Buildings/Resources/Scripts/BuildingsPy/conf.yml
@@ -347,6 +347,10 @@
   openmodelica:
     comment: Translation failed.
     translate: false
+- model_name: Buildings.Templates.Components.Chillers.Validation.Compression
+  openmodelica:
+    comment: Translation failed.
+    translate: false
 - model_name: Buildings.Templates.Components.HeatPumps.Validation.HeatPumpEquationFit
   openmodelica:
     comment: 'CalledProcessError: Command ''[''omc'', ''Buildings.Templates.Components.HeatPumps.Validation.HeatPumpEquationFit_translate.mos'']'' returned non-zero exit status 2.'
@@ -359,7 +363,19 @@
   openmodelica:
     comment: Translation failed.
     translate: false
-- model_name: Buildings.Templates.Plants.Controls.Pumps.Primary.Validation.VariableSpeedNoDpControl
+- model_name: Buildings.Templates.Plants.Controls.HeatPumps.Validation.AirToWater
+  openmodelica:
+    comment: Translation failed.
+    translate: false
+- model_name: Buildings.Templates.Plants.Controls.MinimumFlow.Validation.ControllerDualMode
+  openmodelica:
+    comment: Translation failed.
+    translate: false
+- model_name: Buildings.Templates.Plants.Controls.Pumps.Generic.Validation.StagingHeadered
+  openmodelica:
+    comment: Translation failed.
+    translate: false
+- model_name: Buildings.Templates.Plants.Controls.Pumps.Primary.Validation.VariableSpeed
   openmodelica:
     comment: 'CalledProcessError: Command ''[''omc'', ''Buildings.Templates.Plants.Controls.Pumps.Primary.Validation.VariableSpeedNoDpControl_translate.mos'']'' returned non-zero exit status 2.'
     translate: false
@@ -367,6 +383,10 @@
   openmodelica:
     comment: Translation failed.
     translate: false
+- model_name: Buildings.Templates.Plants.HeatPumps.Components.Validation.HeatRecoveryChiller
+  openmodelica:
+    comment: Translation failed.
+    translate: false
 - model_name: Buildings.Templates.Plants.HeatPumps.Components.Validation.PumpsPrimaryDedicated
   openmodelica:
     comment: Translation failed.
@@ -375,16 +395,13 @@
   openmodelica:
     comment: Translation failed.
     translate: false
-  optimica:
-    comment: See https://github.com/lbl-srg/modelica-buildings/issues/3759
-    simulate: false
 - model_name: Buildings.Templates.Plants.HeatPumps.Validation.AirToWater
+  optimica:
+    comment: False positive warning "missing each", but the model can be simulated successfully [Modelon - 1173].
+    translate: false
   openmodelica:
     comment: Translation failed.
     translate: false
-  optimica:
-    comment: See https://github.com/lbl-srg/modelica-buildings/issues/3759
-    translate: false
 - model_name: Buildings.Templates.ZoneEquipment.Validation.VAVBoxCoolingOnly
   openmodelica:
     comment: Translation failed.
diff --git a/Buildings/Resources/Scripts/Conversion/ConvertBuildings_from_11_to_12.0.0.mos b/Buildings/Resources/Scripts/Conversion/ConvertBuildings_from_11_to_12.0.0.mos
index 93fe2e8f8bd..7a05f1688f2 100644
--- a/Buildings/Resources/Scripts/Conversion/ConvertBuildings_from_11_to_12.0.0.mos
+++ b/Buildings/Resources/Scripts/Conversion/ConvertBuildings_from_11_to_12.0.0.mos
@@ -5,6 +5,13 @@ clear
 
 convertClear();
 
+// Conversion for https://github.com/lbl-srg/modelica-buildings/issues/3787
+convertModifiers("Buildings.Controls.OBC.CDL.Logical.TrueHold",
+                 {"duration", "falseHoldDuration"},
+                 {"trueHoldDuration=%duration%", "final falseHoldDuration=0"})
+convertClass("Buildings.Controls.OBC.CDL.Logical.TrueHold",
+             "Buildings.Controls.OBC.CDL.Logical.TrueFalseHold")
+
 // Conversion for https://github.com/lbl-srg/modelica-buildings/issues/3809
 convertClass("Buildings.Templates.Plants.Controls.Utilities.SortWithIndices",
              "Buildings.Controls.OBC.CDL.Reals.Sort");
diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Logical/Validation/TrueHold.mos b/Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Logical/Validation/TrueHold.mos
similarity index 81%
rename from Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Logical/Validation/TrueHold.mos
rename to Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Logical/Validation/TrueHold.mos
index 2278d93a18a..0905feb958c 100644
--- a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Logical/Validation/TrueHold.mos
+++ b/Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Logical/Validation/TrueHold.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Controls.OBC.CDL.Logical.Validation.TrueHold", stopTime=15000.0, method="Cvode", tolerance=1e-06, resultFile="TrueHold");
+simulateModel("Buildings.Obsolete.Controls.OBC.CDL.Logical.Validation.TrueHold", stopTime=15000.0, method="Cvode", tolerance=1e-06, resultFile="TrueHold");
 createPlot(id=1, position={37, 75, 723, 422}, y={"truHol.u", "truHol.y"}, range={0.0, 260.0, -0.5, 1.5}, grid=true, colors={{28,108,200}, {28,108,200}});
 createPlot(id=2, position={41, 551, 725, 578}, y={"booPul1.y", "truHol1.y"}, range={0.0, 260.0, -0.2, 1.2000000000000002}, grid=true, colors={{28,108,200}, {28,108,200}});
 createPlot(id=3, position={785, 74, 698, 428}, y={"truHol2.u", "truHol2.y"}, range={0.0, 15000.0, -0.2, 1.2000000000000002}, grid=true, colors={{28,108,200}, {238,46,47}});
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/Components/Chillers/Validation/Compression.mos b/Buildings/Resources/Scripts/Dymola/Templates/Components/Chillers/Validation/Compression.mos
new file mode 100644
index 00000000000..d5bcf92197d
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Templates/Components/Chillers/Validation/Compression.mos
@@ -0,0 +1,64 @@
+simulateModel("Buildings.Templates.Components.Chillers.Validation.Compression",
+    method="cvode",
+    tolerance=1e-6,
+    startTime=0.0,
+    stopTime=8000.0,
+    resultFile="Compression");
+createPlot(
+    id=1,
+    position={5, 5, 300, 400},
+    y={"y1.y[1]"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=1,
+    subPlot=2,
+    y={"chiAirCoo.bus.reqChiWat", "chiWatCoo.bus.reqChiWat", "chiWatCoo.bus.reqConWat"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=2,
+    position={310, 5, 300, 600},
+    subPlot=1,
+    y={"TRet.T", "TSup.T", "chiAirCoo.bus.TSupSet", "chiAirCoo.TChiWatSup_nominal", "chiAirCoo.TChiWatRet_nominal"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=2,
+    subPlot=2,
+    y={"chiAirCoo.port_a2.m_flow", "chiAirCoo.mChiWat_flow_nominal"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=2,
+    subPlot=3,
+    y={"chiAirCoo.chi.PLR2", "chiAirCoo.chi.COP", "datChiAirCoo.COP_nominal"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=3,
+    position={615, 5, 300, 600},
+    subPlot=1,
+    y={"TRet2.T", "TSup2.T", "chiWatCoo.bus.TSupSet", "chiWatCoo.TChiWatSup_nominal", "chiWatCoo.TChiWatRet_nominal"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=3,
+    subPlot=2,
+    y={"chiWatCoo.port_a2.m_flow", "chiWatCoo.mChiWat_flow_nominal", "chiWatCoo.port_a1.m_flow", "chiWatCoo.mCon_flow_nominal"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=3,
+    subPlot=3,
+    y={"chiWatCoo.chi.PLR2", "chiWatCoo.chi.COP", "datChiWatCoo.COP_nominal"},
+    autoscale=true,
+    grid=true
+);
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/Components/Validation/Tanks.mos b/Buildings/Resources/Scripts/Dymola/Templates/Components/Validation/Tanks.mos
new file mode 100644
index 00000000000..cecfbd1df00
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Templates/Components/Validation/Tanks.mos
@@ -0,0 +1,19 @@
+simulateModel("Buildings.Templates.Components.Validation.Tanks",
+    method="cvode",
+    tolerance=1e-6,
+    stopTime=500.0,
+    resultFile="Tanks");
+createPlot(
+    id=1,
+    position={5, 5, 300, 400},
+    y={"intFlo.y", "tan.V"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=1,
+    subPlot=2,
+    y={"sou.T", "tan.sta_b.T", "noTan.sta_b.T"},
+    autoscale=true,
+    grid=true
+);
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/HeatPumps/Validation/AirToWater.mos b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/HeatPumps/Validation/AirToWater.mos
index 9c7d052f9f1..aa77cb20743 100644
--- a/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/HeatPumps/Validation/AirToWater.mos
+++ b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/HeatPumps/Validation/AirToWater.mos
@@ -6,7 +6,7 @@ simulateModel("Buildings.Templates.Plants.Controls.HeatPumps.Validation.AirToWat
 createPlot(
     id=1,
     position={5, 5, 300, 500},
-    y={"ctl.chaStaHea.capReq.y", "ctl.chaStaCoo.capReq.y", "capHea_nominal", "capCoo_nominal"},
+    y={"ctl.chaStaHea.capReq.QReq_flow", "ctl.chaStaCoo.capReq.QReq_flow", "capHea_nominal", "capCoo_nominal"},
     autoscale=true,
     grid=true,
     timeUnit="h"
@@ -109,4 +109,21 @@ createPlot(
     autoscale=true,
     grid=true,
     timeUnit="h"
-);
\ No newline at end of file
+);
+createPlot(
+    id=6,
+    position={15, 15, 300, 400},
+    subPlot=1,
+    y={"ctl.y1Hrc", "ctl.y1CooHrc", "ctl.y1PumChiWatHrc", "ctl.y1PumHeaWatHrc"},
+    autoscale=true,
+    grid=true,
+    timeUnit="h"
+);
+createPlot(
+    id=6,
+    subPlot=2,
+    y={"ctl.hrc.loaChiWat.QReq_flow", "ctl.hrc.loaHeaWat.QReq_flow", "ctl.capCooHrc_min", "ctl.capHeaHrc_min", "ctl.hrc.setMod.QEvaHea_flow.y"},
+    autoscale=true,
+    grid=true,
+    timeUnit="h"
+);
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/HeatRecoveryChillers/Validation/EnableAndModeControl.mos b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/HeatRecoveryChillers/Validation/EnableAndModeControl.mos
new file mode 100644
index 00000000000..1b44bec1995
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/HeatRecoveryChillers/Validation/EnableAndModeControl.mos
@@ -0,0 +1,56 @@
+simulateModel("Buildings.Templates.Plants.Controls.HeatRecoveryChillers.Validation.EnableAndModeControl",
+    method="cvode",
+    tolerance=1e-6,
+    stopTime=86400.0,
+    resultFile="EnableAndModeControl");
+createPlot(
+    id=1,
+    subPlot=1,
+    position={5, 5, 300, 400},
+    y={"ena.u1Coo", "ena.u1Hea"},
+    autoscale=true,
+    grid=true,
+    timeUnit="min"
+);
+createPlot(
+    id=1,
+    subPlot=2,
+    y={"ena.QChiWatReq_flow", "ena.QHeaWatReq_flow", "ena.capCoo_min", "ena.capHea_min", "setMod.QEvaHea_flow.y"},
+    autoscale=true,
+    grid=true,
+    timeUnit="min"
+);
+createPlot(
+    id=2,
+    subPlot=1,
+    position={315, 5, 300, 400},
+    y={"TChiWatRet.y", "ena.TChiWatHrcLvg", "ena.TChiWatSup_min"},
+    autoscale=true,
+    grid=true,
+    timeUnit="min"
+);
+createPlot(
+    id=2,
+    subPlot=2,
+    y={"THeaWatRet.y","ena.THeaWatHrcLvg", "ena.THeaWatSup_max"},
+    autoscale=true,
+    grid=true,
+    timeUnit="min"
+);
+createPlot(
+    id=3,
+    subPlot=1,
+    position={620, 5, 300, 400},
+    y={"ena.y1"},
+    autoscale=true,
+    grid=true,
+    timeUnit="min"
+);
+createPlot(
+    id=3,
+    subPlot=2,
+    y={"setMod.y1Coo"},
+    autoscale=true,
+    grid=true,
+    timeUnit="min"
+);
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/MinimumFlow/Validation/Controller.mos b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/MinimumFlow/Validation/Controller.mos
new file mode 100644
index 00000000000..556a89eb5b5
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/MinimumFlow/Validation/Controller.mos
@@ -0,0 +1,27 @@
+simulateModel("Buildings.Templates.Plants.Controls.MinimumFlow.Validation.Controller",
+    method="cvode",
+    tolerance=1e-6,
+    stopTime=1000.0,
+    resultFile="MinimumFlowController");
+createPlot(
+    id=1,
+    subPlot=1,
+    position={5, 5, 400, 500},
+    y={"u1EquValPum.y[1]", "u1EquValPum.y[2]"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=1,
+    subPlot=2,
+    y={"ctlFloMinVal.VPriSet_flow", "VPri_flow.y", "ctlFloMinPum.VPriSet_flow", "VPri_flow1.y"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=1,
+    subPlot=3,
+    y={"ctlFloMinVal.y", "ctlFloMinPum.y"},
+    autoscale=true,
+    grid=true
+);
\ No newline at end of file
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/MinimumFlow/Validation/ControllerDualMode.mos b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/MinimumFlow/Validation/ControllerDualMode.mos
new file mode 100644
index 00000000000..3ef6767a2e7
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/MinimumFlow/Validation/ControllerDualMode.mos
@@ -0,0 +1,78 @@
+simulateModel("Buildings.Templates.Plants.Controls.MinimumFlow.Validation.ControllerDualMode",
+    method="cvode",
+    tolerance=1e-6,
+    stopTime=1000.0,
+    resultFile="MinimumFlowControllerDualMode");
+createPlot(
+    id=1,
+    subPlot=1,
+    position={5, 5, 400, 500},
+    y={"u1EquValPum.y[1]", "u1EquValPum.y[2]"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=1,
+    subPlot=2,
+    y={"ctlFloMinValCoo.VChiWatPriSet_flow", "VPriCoo_flow.y", "ctlFloMinPumCoo.VChiWatPriSet_flow", "VPriCoo_flow1.y"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=1,
+    subPlot=3,
+    y={"ctlFloMinValCoo.yValChiWatMinByp", "ctlFloMinPumCoo.yValChiWatMinByp"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=2,
+    subPlot=1,
+    position={415, 5, 400, 400},
+    y={"ctlFloMinValHea.VHeaWatPriSet_flow", "VPriHea_flow.y", "ctlFloMinPumHea.VHeaWatPriSet_flow", "VPriHea_flow1.y"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=2,
+    subPlot=2,
+    y={"ctlFloMinValHea.yValHeaWatMinByp", "ctlFloMinPumHea.yValHeaWatMinByp"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=3,
+    subPlot=1,
+    position={820, 5, 400, 600},
+    y={"u1EquValPum.y[1]", "u1EquValPum.y[2]", "u1HeaEqu.y[1]", "u1HeaEqu.y[2]"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=3,
+    subPlot=2,
+    y={"u1ValHeaWat[1].y", "u1ValHeaWat[2].y", "u1ValChiWat[1].y", "u1ValChiWat[2].y"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=3,
+    subPlot=3,
+    y={"ctlFloMinValHeaCoo.VHeaWatPriSet_flow", "VPriHeaCoo_flow.y", "ctlFloMinPumHeaCoo.VHeaWatPriSet_flow", "VPriHeaCoo_flow1.y"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=3,
+    subPlot=4,
+    y={"ctlFloMinValHeaCoo.yValHeaWatMinByp", "ctlFloMinPumHeaCoo.yValHeaWatMinByp"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=3,
+    subPlot=5,
+    y={"ctlFloMinValHeaCoo.yValChiWatMinByp", "ctlFloMinPumHeaCoo.yValChiWatMinByp"},
+    autoscale=true,
+    grid=true
+);
\ No newline at end of file
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/MinimumFlow/Validation/Setpoint.mos b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/MinimumFlow/Validation/Setpoint.mos
new file mode 100644
index 00000000000..3b5ab5c5a3c
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/MinimumFlow/Validation/Setpoint.mos
@@ -0,0 +1,27 @@
+simulateModel("Buildings.Templates.Plants.Controls.MinimumFlow.Validation.Setpoint",
+    method="cvode",
+    tolerance=1e-6,
+    stopTime=1000.0,
+    resultFile="MinimumFlowSetpoint");
+createPlot(
+    id=1,
+    subPlot=1,
+    position={5, 5, 400, 500},
+    y={"u1Equ.y[1]", "u1Equ.y[2]"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=1,
+    subPlot=2,
+    y={"setFloMin.ratFloMinEna[1].y", "setFloMin.ratFloMinEna[2].y", "setFloMin.maxRatFloMinEna.y"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=1,
+    subPlot=3,
+    y={"setFloMin.V_flow_min[1]", "setFloMin.V_flow_min[2]", "setFloMin.VPriSet_flow"},
+    autoscale=true,
+    grid=true
+);
\ No newline at end of file
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Pumps/Generic/Validation/StagingHeaderedDeltaP.mos b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Pumps/Generic/Validation/StagingHeaderedDeltaP.mos
index c191d4fc52c..4b989a6c32d 100644
--- a/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Pumps/Generic/Validation/StagingHeaderedDeltaP.mos
+++ b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Pumps/Generic/Validation/StagingHeaderedDeltaP.mos
@@ -6,7 +6,7 @@ simulateModel("Buildings.Templates.Plants.Controls.Pumps.Generic.Validation.Stag
 createPlot(
     id=1,
     subPlot=1,
-    position={5, 5, 400, 400},
+    position={5, 5, 400, 500},
     y={"ratFlo.y[1]", "enaLea.y[1]"},
     autoscale=true,
     grid=true,
@@ -20,3 +20,44 @@ createPlot(
     grid=true,
     timeUnit="min"
 );
+createPlot(
+    id=1,
+    subPlot=3,
+    y={"staPum.preFaiSaf.y", "staPum.preEff.y"},
+    autoscale=true,
+    grid=true,
+    timeUnit="min"
+);
+createPlot(
+    id=2,
+    subPlot=1,
+    position={415, 5, 400, 600},
+    y={"staPumFaiSaf.dp[1]", "staPumFaiSaf.dpSet[1]"},
+    autoscale=true,
+    grid=true,
+    timeUnit="min"
+);
+createPlot(
+    id=2,
+    subPlot=2,
+    y={"staPumFaiSaf.y"},
+    autoscale=true,
+    grid=true,
+    timeUnit="min"
+);
+createPlot(
+    id=2,
+    subPlot=3,
+    y={"idxSta1.y"},
+    autoscale=true,
+    grid=true,
+    timeUnit="min"
+);
+createPlot(
+    id=2,
+    subPlot=4,
+    y={"staPumFaiSaf.preFaiSaf.y", "staPumFaiSaf.preEff.y"},
+    autoscale=true,
+    grid=true,
+    timeUnit="min"
+);
\ No newline at end of file
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Pumps/Primary/Validation/DisableDedicated.mos b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Pumps/Primary/Validation/DisableDedicated.mos
new file mode 100644
index 00000000000..ad1d5005f13
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Pumps/Primary/Validation/DisableDedicated.mos
@@ -0,0 +1,22 @@
+simulateModel("Buildings.Templates.Plants.Controls.Pumps.Primary.Validation.DisableDedicated",
+    method="cvode",
+    tolerance=1e-6,
+    stopTime=3600.0,
+    resultFile="DisableDedicated");
+createPlot(
+    id=1,
+    subPlot=1,
+    position={5, 5, 400, 400},
+    y={"y1.y", "y1EquLea.y", "y1EquLea_actual.y", "y1ReqEquLea.y"},
+    autoscale=true,
+    grid=true,
+    timeUnit="min"
+);
+createPlot(
+    id=1,
+    subPlot=2,
+    y={"enaDed.y1", "enaDedReq.y1"},
+    autoscale=true,
+    grid=true,
+    timeUnit="min"
+);
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Pumps/Primary/Validation/VariableSpeed.mos b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Pumps/Primary/Validation/VariableSpeed.mos
new file mode 100644
index 00000000000..c3f29912a9d
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Pumps/Primary/Validation/VariableSpeed.mos
@@ -0,0 +1,153 @@
+simulateModel("Buildings.Templates.Plants.Controls.Pumps.Primary.Validation.VariableSpeed",
+    method="cvode",
+    tolerance=1e-6,
+    stopTime=5000.0,
+    resultFile="PumpsPrimaryVariableSpeed");
+createPlot(
+    id=1,
+    subPlot=1,
+    position={5, 5, 300, 400},
+    y={"ctlPumPriHdrHea.u1PumHeaWatPri[1]", "ctlPumPriHdrHea.u1PumHeaWatPri[2]"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=1,
+    subPlot=2,
+    y={"ctlPumPriHdrHea.yPumHeaWatPriHdr"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=2,
+    subPlot=1,
+    position={315, 5, 300, 400},
+    y={"ctlPumPriHdr.u1PumHeaWatPri[1]", "ctlPumPriHdr.u1PumHeaWatPri[2]", "ctlPumPriHdr.u1PumChiWatPri[1]", "ctlPumPriHdr.u1PumChiWatPri[2]"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=2,
+    subPlot=2,
+    y={"ctlPumPriHdr.yPumHeaWatPriHdr", "ctlPumPriHdr.yPumChiWatPriHdr"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=3,
+    subPlot=1,
+    position={620, 5, 300, 400},
+    y={"ctlPumPriDedCom.u1PumHeaWatPri[1]", "ctlPumPriDedCom.u1PumHeaWatPri[2]", "ctlPumPriDedCom.u1Hea[1]", "ctlPumPriDedCom.u1Hea[2]"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=3,
+    subPlot=2,
+    y={"ctlPumPriDedCom.yPumHeaWatPriDed[1]", "ctlPumPriDedCom.yPumHeaWatPriDed[2]"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=4,
+    subPlot=1,
+    position={925, 5, 300, 400},
+    y={"ctlPumPriDedSep.u1PumHeaWatPri[1]", "ctlPumPriDedSep.u1PumHeaWatPri[2]", "ctlPumPriDedSep.u1PumChiWatPri[1]", "ctlPumPriDedSep.u1PumChiWatPri[2]"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=4,
+    subPlot=2,
+    y={"ctlPumPriDedSep.yPumHeaWatPriDed[1]", "ctlPumPriDedSep.yPumHeaWatPriDed[2]","ctlPumPriDedSep.yPumChiWatPriDed[1]", "ctlPumPriDedSep.yPumChiWatPriDed[2]"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=5,
+    subPlot=1,
+    position={30, 30, 300, 500},
+    y={"ctlPumPriHdrHeaDp.u1PumHeaWatPri[1]", "ctlPumPriHdrHeaDp.u1PumHeaWatPri[2]"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=5,
+    subPlot=2,
+    y={"ctlPumPriHdrHeaDp.dpHeaWatLocSet[1]", "ctlPumPriHdrHeaDp.dpHeaWatLocSet[2]", "ctlPumPriHdrHeaDp.dpHeaWatLoc"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=5,
+    subPlot=3,
+    y={"ctlPumPriHdrHeaDp.yPumHeaWatPriHdr"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=6,
+    subPlot=1,
+    position={335, 30, 300, 500},
+    y={"ctlPumPriHdrDp.u1PumHeaWatPri[1]", "ctlPumPriHdrDp.u1PumHeaWatPri[2]", "ctlPumPriHdrDp.u1PumChiWatPri[1]", "ctlPumPriHdrDp.u1PumChiWatPri[2]"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=6,
+    subPlot=2,
+    y={"ctlPumPriHdrDp.dpHeaWatRemSet[1]", "ctlPumPriHdrDp.dpHeaWatRemSet[2]", "ctlPumPriHdrDp.dpHeaWatRem[1]", "ctlPumPriHdrDp.dpHeaWatRem[2]"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=6,
+    subPlot=3,
+    y={"ctlPumPriHdrDp.yPumHeaWatPriHdr", "ctlPumPriHdrDp.yPumChiWatPriHdr"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=7,
+    subPlot=1,
+    position={640, 30, 300, 500},
+    y={"ctlPumPriDedComDp.u1PumHeaWatPri[1]", "ctlPumPriDedComDp.u1PumHeaWatPri[2]", "ctlPumPriDedComDp.u1Hea[1]", "ctlPumPriDedComDp.u1Hea[2]"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=7,
+    subPlot=2,
+    y={"ctlPumPriDedComDp.dpHeaWatLocSet[1]", "ctlPumPriDedComDp.dpHeaWatLocSet[2]", "ctlPumPriDedComDp.dpHeaWatLoc", "ctlPumPriDedComDp.dpChiWatLoc"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=7,
+    subPlot=3,
+    y={"ctlPumPriDedComDp.yPumHeaWatPriDed[1]", "ctlPumPriDedComDp.yPumHeaWatPriDed[2]"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=8,
+    subPlot=1,
+    position={945, 30, 300, 500},
+    y={"ctlPumPriDedSepDp.u1PumHeaWatPri[1]", "ctlPumPriDedSepDp.u1PumHeaWatPri[2]", "ctlPumPriDedSepDp.u1PumChiWatPri[1]", "ctlPumPriDedSepDp.u1PumChiWatPri[2]"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=8,
+    subPlot=2,
+    y={"ctlPumPriDedSepDp.dpHeaWatLocSet[1]", "ctlPumPriDedSepDp.dpHeaWatLocSet[2]", "ctlPumPriDedSepDp.dpHeaWatLoc", "ctlPumPriDedSepDp.dpChiWatLoc"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=8,
+    subPlot=3,
+    y={"ctlPumPriDedSepDp.yPumHeaWatPriDed[1]", "ctlPumPriDedSepDp.yPumHeaWatPriDed[2]", "ctlPumPriDedSepDp.yPumChiWatPriDed[1]", "ctlPumPriDedSepDp.yPumChiWatPriDed[2]"},
+    autoscale=true,
+    grid=true
+);
\ No newline at end of file
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Pumps/Primary/Validation/VariableSpeedNoDpControl.mos b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Pumps/Primary/Validation/VariableSpeedNoDpControl.mos
deleted file mode 100644
index 3a32beddc67..00000000000
--- a/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Pumps/Primary/Validation/VariableSpeedNoDpControl.mos
+++ /dev/null
@@ -1,65 +0,0 @@
-simulateModel("Buildings.Templates.Plants.Controls.Pumps.Primary.Validation.VariableSpeedNoDpControl",
-    method="cvode",
-    tolerance=1e-6,
-    stopTime=900.0,
-    resultFile="VariableSpeedNoDpControl");
-createPlot(
-    id=1,
-    subPlot=1,
-    position={5, 5, 300, 400},
-    y={"ctlPumPriHdrHea.u1PumHeaWatPri[1]", "ctlPumPriHdrHea.u1PumHeaWatPri[2]"},
-    autoscale=true,
-    grid=true
-);
-createPlot(
-    id=1,
-    subPlot=2,
-    y={"ctlPumPriHdrHea.yPumHeaWatPriHdr"},
-    autoscale=true,
-    grid=true
-);
-createPlot(
-    id=2,
-    subPlot=1,
-    position={315, 5, 300, 400},
-    y={"ctlPumPriHdr.u1PumHeaWatPri[1]", "ctlPumPriHdr.u1PumHeaWatPri[2]", "ctlPumPriHdr.u1PumChiWatPri[1]", "ctlPumPriHdr.u1PumChiWatPri[2]"},
-    autoscale=true,
-    grid=true
-);
-createPlot(
-    id=2,
-    subPlot=2,
-    y={"ctlPumPriHdr.yPumHeaWatPriHdr", "ctlPumPriHdr.yPumChiWatPriHdr"},
-    autoscale=true,
-    grid=true
-);
-createPlot(
-    id=3,
-    subPlot=1,
-    position={620, 5, 300, 400},
-    y={"ctlPumPriDedCom.u1PumHeaWatPri[1]", "ctlPumPriDedCom.u1PumHeaWatPri[2]", "ctlPumPriDedCom.u1Hea[1]", "ctlPumPriDedCom.u1Hea[2]"},
-    autoscale=true,
-    grid=true
-);
-createPlot(
-    id=3,
-    subPlot=2,
-    y={"ctlPumPriDedCom.yPumHeaWatPriDed[1]", "ctlPumPriDedCom.yPumHeaWatPriDed[2]"},
-    autoscale=true,
-    grid=true
-);
-createPlot(
-    id=4,
-    subPlot=1,
-    position={925, 5, 300, 400},
-    y={"ctlPumPriDedSep.u1PumHeaWatPri[1]", "ctlPumPriDedSep.u1PumHeaWatPri[2]", "ctlPumPriDedSep.u1PumChiWatPri[1]", "ctlPumPriDedSep.u1PumChiWatPri[2]"},
-    autoscale=true,
-    grid=true
-);
-createPlot(
-    id=4,
-    subPlot=2,
-    y={"ctlPumPriDedSep.yPumHeaWatPriDed[1]", "ctlPumPriDedSep.yPumHeaWatPriDed[2]","ctlPumPriDedSep.yPumChiWatPriDed[1]", "ctlPumPriDedSep.yPumChiWatPriDed[2]"},
-    autoscale=true,
-    grid=true
-);
\ No newline at end of file
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/StagingRotation/Validation/FailsafeCondition.mos b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/StagingRotation/Validation/FailsafeCondition.mos
new file mode 100644
index 00000000000..db493de0e11
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/StagingRotation/Validation/FailsafeCondition.mos
@@ -0,0 +1,56 @@
+simulateModel("Buildings.Templates.Plants.Controls.StagingRotation.Validation.FailsafeCondition",
+    method="cvode",
+    tolerance=1e-6,
+    stopTime=5000.0,
+    resultFile="FailsafeCondition");
+createPlot(
+    id=1,
+    position={5, 5, 300, 500},
+    subPlot=1,
+    y={"faiSafHea.TSupSet", "faiSafHea.TPriSup", "faiSafHea.TSecSup"},
+    autoscale=true,
+    grid=true,
+    timeUnit="min"
+);
+createPlot(
+    id=1,
+    subPlot=2,
+    y={"faiSafHea.reset", "faiSafHea.y1"},
+    autoscale=true,
+    grid=true,
+    timeUnit="min"
+);
+createPlot(
+    id=2,
+    position={315, 5, 300, 500},
+    subPlot=1,
+    y={"faiSafCoo.TSupSet", "faiSafCoo.TPriSup", "faiSafCoo.TSecSup"},
+    autoscale=true,
+    grid=true,
+    timeUnit="min"
+);
+createPlot(
+    id=2,
+    subPlot=2,
+    y={"faiSafCoo.reset", "faiSafCoo.y1"},
+    autoscale=true,
+    grid=true,
+    timeUnit="min"
+);
+createPlot(
+    id=3,
+    position={620, 5, 300, 500},
+    subPlot=1,
+    y={"faiSafCooPri.TSupSet", "faiSafCooPri.TPriSup"},
+    autoscale=true,
+    grid=true,
+    timeUnit="min"
+);
+createPlot(
+    id=3,
+    subPlot=2,
+    y={"faiSafCooPri.reset", "faiSafCooPri.y1"},
+    autoscale=true,
+    grid=true,
+    timeUnit="min"
+);
\ No newline at end of file
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/StagingRotation/Validation/LoadAverage.mos b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/StagingRotation/Validation/LoadAverage.mos
new file mode 100644
index 00000000000..ee0912c3b7c
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/StagingRotation/Validation/LoadAverage.mos
@@ -0,0 +1,55 @@
+simulateModel("Buildings.Templates.Plants.Controls.StagingRotation.Validation.LoadAverage",
+    method="cvode",
+    tolerance=1e-6,
+    stopTime=2000.0,
+    resultFile="LoadAverage");
+createPlot(
+    id=1,
+    position={5, 5, 300, 500},
+    subPlot=1,
+    y={"loaHea.TSupSet", "loaHea.TRet"},
+    autoscale=true,
+    grid=true,
+    timeUnit="min"
+);
+createPlot(
+    id=1,
+    subPlot=2,
+    y={"loaHea.V_flow"},
+    autoscale=true,
+    grid=true,
+    timeUnit="min"
+);
+createPlot(
+    id=1,
+    subPlot=3,
+    y={"loaHea.QReq_flow"},
+    autoscale=true,
+    grid=true,
+    timeUnit="min"
+);
+createPlot(
+    id=2,
+    position={315, 5, 300, 500},
+    subPlot=1,
+    y={"loaCoo.TSupSet", "loaCoo.TRet"},
+    autoscale=true,
+    grid=true,
+    timeUnit="min"
+);
+createPlot(
+    id=2,
+    subPlot=2,
+    y={"loaCoo.V_flow"},
+    autoscale=true,
+    grid=true,
+    timeUnit="min"
+);
+createPlot(
+    id=2,
+    subPlot=3,
+    y={"loaCoo.QReq_flow"},
+    autoscale=true,
+    grid=true,
+    timeUnit="min"
+);
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/StagingRotation/Validation/StageChangeCommand.mos b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/StagingRotation/Validation/StageChangeCommand.mos
index 4a77cfe0bca..0b798ca017e 100644
--- a/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/StagingRotation/Validation/StageChangeCommand.mos
+++ b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/StagingRotation/Validation/StageChangeCommand.mos
@@ -7,7 +7,7 @@ createPlot(
     id=1,
     position={5, 5, 300, 600},
     subPlot=1,
-    y={"chaSta.capReq.y", "chaSta.capSta.y", "chaSta.capStaLow.y", "capHea_nominal"},
+    y={"chaSta.capReq.QReq_flow", "chaSta.capSta.y", "chaSta.capStaLow.y", "capHea_nominal"},
     autoscale=true,
     grid=true,
     timeUnit="min"
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/Plants/HeatPumps/Components/Validation/HeatRecoveryChiller.mos b/Buildings/Resources/Scripts/Dymola/Templates/Plants/HeatPumps/Components/Validation/HeatRecoveryChiller.mos
new file mode 100644
index 00000000000..4bbe4927a67
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Templates/Plants/HeatPumps/Components/Validation/HeatRecoveryChiller.mos
@@ -0,0 +1,34 @@
+simulateModel("Buildings.Templates.Plants.HeatPumps.Components.Validation.HeatRecoveryChiller",
+    method="cvode",
+    tolerance=1e-6,
+    startTime=0.0,
+    stopTime=1000.0,
+    resultFile="HeatRecoveryChiller");
+createPlot(
+    id=1,
+    position={5, 5, 300, 600},
+    y={"bus.hrc.y1", "bus.hrc.y1Coo", "bus.pumChiWatHrc.y1", "bus.pumHeaWatHrc.y1"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=1,
+    subPlot=2,
+    y={"TChiWatLvg.T", "inlChiWat.T", "TSupSet.y"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=1,
+    subPlot=3,
+    y={"THeaWatLvg.T", "inlHeaWat.T", "TSupSet.y"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=1,
+    subPlot=4,
+    y={"hrc.hrc.chi.PLR2", "hrc.hrc.chi.COP"},
+    autoscale=true,
+    grid=true
+);
\ No newline at end of file
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/Plants/HeatPumps/Validation/AirToWater.mos b/Buildings/Resources/Scripts/Dymola/Templates/Plants/HeatPumps/Validation/AirToWater.mos
index 3cba92dd9a6..6bd96eef8a4 100644
--- a/Buildings/Resources/Scripts/Dymola/Templates/Plants/HeatPumps/Validation/AirToWater.mos
+++ b/Buildings/Resources/Scripts/Dymola/Templates/Plants/HeatPumps/Validation/AirToWater.mos
@@ -7,7 +7,7 @@ simulateModel("Buildings.Templates.Plants.HeatPumps.Validation.AirToWater",
 createPlot(
     id=1,
     position={5, 5, 300, 500},
-    y={"pla.ctl.ctl.chaStaHea.capReq.y", "pla.ctl.ctl.chaStaCoo.capReq.y", "pla.capHea_nominal", "pla.capCoo_nominal"},
+    y={"pla.ctl.ctl.chaStaHea.capReq.QReq_flow", "pla.ctl.ctl.chaStaCoo.capReq.QReq_flow", "pla.capHea_nominal", "pla.capCoo_nominal"},
     autoscale=true,
     grid=true,
     timeUnit="h"
@@ -90,7 +90,7 @@ createPlot(
 createPlot(
     id=5,
     subPlot=2,
-    y={"dpHeaWatRem.y[1]", "pla.bus.dpHeaWatRemSet[1]", "dpChiWatRem.y[1]", "pla.bus.dpHeaWatRemSet[1]", "pla.bus.dpChiWatRemSet[1]"},
+    y={"pla.bus.dpHeaWatRem[1]", "pla.bus.dpHeaWatRemSet[1]", "pla.bus.dpChiWatRem[1]", "pla.bus.dpChiWatRemSet[1]"},
     autoscale=true,
     grid=true,
     timeUnit="h"
@@ -98,7 +98,7 @@ createPlot(
 createPlot(
     id=6,
     position={40, 40, 300, 600},
-    y={"pla.bus.VHeaWatPri_flow", "pla.bus.VHeaWatSec_flow", "datAll.pla.ctl.VHeaWatSec_flow_nominal"},
+    y={"pla.bus.VHeaWatPri_flow", "pla.bus.VHeaWatSec_flow", "datAll.pla.ctl.VHeaWatPri_flow_nominal", "datAll.pla.ctl.VHeaWatSec_flow_nominal"},
     autoscale=true,
     grid=true,
     timeUnit="h"
@@ -106,7 +106,7 @@ createPlot(
 createPlot(
     id=6,
     subPlot=2,
-    y={"pla.bus.VChiWatPri_flow", "pla.bus.VChiWatSec_flow", "datAll.pla.ctl.VChiWatSec_flow_nominal"},
+    y={"pla.bus.VChiWatPri_flow", "pla.bus.VChiWatSec_flow", "datAll.pla.ctl.VChiWatPri_flow_nominal", "datAll.pla.ctl.VChiWatSec_flow_nominal"},
     autoscale=true,
     grid=true,
     timeUnit="h"
@@ -134,4 +134,28 @@ createPlot(
     autoscale=true,
     grid=true,
     timeUnit="h"
+);
+createPlot(
+    id=8,
+    position={650, 40, 300, 600},
+    y={"pla.bus.hrc.y1", "pla.bus.hrc.y1Coo", "pla.hrc.hrc.chi.PLR2"},
+    autoscale=true,
+    grid=true,
+    timeUnit="h"
+);
+createPlot(
+    id=8,
+    subPlot=2,
+    y={"pla.bus.TChiWatRetUpsHrc", "pla.bus.TChiWatSecRet", "pla.bus.TChiWatSecSup"},
+    autoscale=true,
+    grid=true,
+    timeUnit="h"
+);
+createPlot(
+    id=8,
+    subPlot=3,
+    y={"pla.bus.THeaWatRetUpsHrc", "pla.bus.THeaWatSecRet", "pla.bus.THeaWatSecSup"},
+    autoscale=true,
+    grid=true,
+    timeUnit="h"
 );
\ No newline at end of file
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Logical.Validation.TrueHold.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Obsolete.Controls.OBC.CDL.Logical.Validation.TrueHold.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Logical.Validation.TrueHold.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Obsolete.Controls.OBC.CDL.Logical.Validation.TrueHold.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Components.Chillers.Validation.Compression.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Components.Chillers.Validation.Compression.mos
new file mode 100644
index 00000000000..6bd386974de
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Components.Chillers.Validation.Compression.mos
@@ -0,0 +1,29 @@
+compareVars :=
+  {
+    "y1.y[1]",
+    "chiAirCoo.bus.reqChiWat",
+    "chiWatCoo.bus.reqChiWat",
+    "chiWatCoo.bus.reqConWat",
+    "TRet.T",
+    "TSup.T",
+    "chiAirCoo.bus.TSupSet",
+    "chiAirCoo.TChiWatSup_nominal",
+    "chiAirCoo.TChiWatRet_nominal",
+    "chiAirCoo.port_a2.m_flow",
+    "chiAirCoo.mChiWat_flow_nominal",
+    "chiAirCoo.chi.PLR2",
+    "chiAirCoo.chi.COP",
+    "datChiAirCoo.COP_nominal",
+    "TRet2.T",
+    "TSup2.T",
+    "chiWatCoo.bus.TSupSet",
+    "chiWatCoo.TChiWatSup_nominal",
+    "chiWatCoo.TChiWatRet_nominal",
+    "chiWatCoo.port_a2.m_flow",
+    "chiWatCoo.mChiWat_flow_nominal",
+    "chiWatCoo.port_a1.m_flow",
+    "chiWatCoo.mCon_flow_nominal",
+    "chiWatCoo.chi.PLR2",
+    "chiWatCoo.chi.COP",
+    "datChiWatCoo.COP_nominal"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Components.Validation.Tanks.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Components.Validation.Tanks.mos
new file mode 100644
index 00000000000..9324f8d04dd
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Components.Validation.Tanks.mos
@@ -0,0 +1,8 @@
+compareVars :=
+  {
+    "intFlo.y",
+    "tan.V",
+    "sou.T",
+    "tan.sta_b.T",
+    "noTan.sta_b.T"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.HeatPumps.Validation.AirToWater.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.HeatPumps.Validation.AirToWater.mos
index fbf8b1cfdcd..74c0ce9356b 100644
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.HeatPumps.Validation.AirToWater.mos
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.HeatPumps.Validation.AirToWater.mos
@@ -1,7 +1,7 @@
 compareVars :=
   {
-    "ctl.chaStaHea.capReq.y",
-    "ctl.chaStaCoo.capReq.y",
+    "ctl.chaStaHea.capReq.QReq_flow",
+    "ctl.chaStaCoo.capReq.QReq_flow",
     "capHea_nominal",
     "capCoo_nominal",
     "ctl.TOut",
@@ -44,5 +44,14 @@ compareVars :=
     "ctl.dpHeaWatRemSet_max[1]",
     "ctl.dpHeaWatRemSet_min",
     "ctl.dpChiWatRemSet_max[1]",
-    "ctl.dpChiWatRemSet_min"
+    "ctl.dpChiWatRemSet_min",
+    "ctl.y1Hrc",
+    "ctl.y1CooHrc",
+    "ctl.y1PumChiWatHrc",
+    "ctl.y1PumHeaWatHrc",
+    "ctl.hrc.loaChiWat.QReq_flow",
+    "ctl.hrc.loaHeaWat.QReq_flow",
+    "ctl.capCooHrc_min",
+    "ctl.capHeaHrc_min",
+    "ctl.hrc.setMod.QEvaHea_flow.y"
   };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.HeatRecoveryChillers.Validation.EnableAndModeControl.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.HeatRecoveryChillers.Validation.EnableAndModeControl.mos
new file mode 100644
index 00000000000..8811134c475
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.HeatRecoveryChillers.Validation.EnableAndModeControl.mos
@@ -0,0 +1,18 @@
+compareVars :=
+  {
+    "ena.u1Coo",
+    "ena.u1Hea",
+    "ena.QChiWatReq_flow",
+    "ena.QHeaWatReq_flow",
+    "ena.capCoo_min",
+    "ena.capHea_min",
+    "setMod.QEvaHea_flow.y",
+    "TChiWatRet.y",
+    "ena.TChiWatHrcLvg",
+    "ena.TChiWatSup_min",
+    "THeaWatRet.y",
+    "ena.THeaWatHrcLvg",
+    "ena.THeaWatSup_max",
+    "ena.y1",
+    "setMod.y1Coo"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.MinimumFlow.Validation.Controller.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.MinimumFlow.Validation.Controller.mos
new file mode 100644
index 00000000000..10a3a668303
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.MinimumFlow.Validation.Controller.mos
@@ -0,0 +1,11 @@
+compareVars :=
+  {
+    "u1EquValPum.y[1]",
+    "u1EquValPum.y[2]",
+    "ctlFloMinVal.VPriSet_flow",
+    "VPri_flow.y",
+    "ctlFloMinPum.VPriSet_flow",
+    "VPri_flow1.y",
+    "ctlFloMinVal.y",
+    "ctlFloMinPum.y"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.MinimumFlow.Validation.ControllerDualMode.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.MinimumFlow.Validation.ControllerDualMode.mos
new file mode 100644
index 00000000000..958e0b09bad
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.MinimumFlow.Validation.ControllerDualMode.mos
@@ -0,0 +1,33 @@
+compareVars :=
+  {
+    "u1EquValPum.y[1]",
+    "u1EquValPum.y[2]",
+    "ctlFloMinValCoo.VChiWatPriSet_flow",
+    "VPriCoo_flow.y",
+    "ctlFloMinPumCoo.VChiWatPriSet_flow",
+    "VPriCoo_flow1.y",
+    "ctlFloMinValCoo.yValChiWatMinByp",
+    "ctlFloMinPumCoo.yValChiWatMinByp",
+    "ctlFloMinValHea.VHeaWatPriSet_flow",
+    "VPriHea_flow.y",
+    "ctlFloMinPumHea.VHeaWatPriSet_flow",
+    "VPriHea_flow1.y",
+    "ctlFloMinValHea.yValHeaWatMinByp",
+    "ctlFloMinPumHea.yValHeaWatMinByp",
+    "u1EquValPum.y[1]",
+    "u1EquValPum.y[2]",
+    "u1HeaEqu.y[1]",
+    "u1HeaEqu.y[2]",
+    "u1ValHeaWat[1].y",
+    "u1ValHeaWat[2].y",
+    "u1ValChiWat[1].y",
+    "u1ValChiWat[2].y",
+    "ctlFloMinValHeaCoo.VHeaWatPriSet_flow",
+    "VPriHeaCoo_flow.y",
+    "ctlFloMinPumHeaCoo.VHeaWatPriSet_flow",
+    "VPriHeaCoo_flow1.y",
+    "ctlFloMinValHeaCoo.yValHeaWatMinByp",
+    "ctlFloMinPumHeaCoo.yValHeaWatMinByp",
+    "ctlFloMinValHeaCoo.yValChiWatMinByp",
+    "ctlFloMinPumHeaCoo.yValChiWatMinByp"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.MinimumFlow.Validation.Setpoint.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.MinimumFlow.Validation.Setpoint.mos
new file mode 100644
index 00000000000..3adfd853922
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.MinimumFlow.Validation.Setpoint.mos
@@ -0,0 +1,11 @@
+compareVars :=
+  {
+    "u1Equ.y[1]",
+    "u1Equ.y[2]",
+    "setFloMin.ratFloMinEna[1].y",
+    "setFloMin.ratFloMinEna[2].y",
+    "setFloMin.maxRatFloMinEna.y",
+    "setFloMin.V_flow_min[1]",
+    "setFloMin.V_flow_min[2]",
+    "setFloMin.VPriSet_flow"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Pumps.Generic.Validation.StagingHeaderedDeltaP.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Pumps.Generic.Validation.StagingHeaderedDeltaP.mos
index f9bc5dd37cd..8b6145661c9 100644
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Pumps.Generic.Validation.StagingHeaderedDeltaP.mos
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Pumps.Generic.Validation.StagingHeaderedDeltaP.mos
@@ -2,5 +2,13 @@ compareVars :=
   {
     "ratFlo.y[1]",
     "enaLea.y[1]",
-    "idxSta.y"
+    "idxSta.y",
+    "staPum.preFaiSaf.y",
+    "staPum.preEff.y",
+    "staPumFaiSaf.dp[1]",
+    "staPumFaiSaf.dpSet[1]",
+    "staPumFaiSaf.y",
+    "idxSta1.y",
+    "staPumFaiSaf.preFaiSaf.y",
+    "staPumFaiSaf.preEff.y"
   };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Pumps.Primary.Validation.DisableDedicated.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Pumps.Primary.Validation.DisableDedicated.mos
new file mode 100644
index 00000000000..ddf0c4759e5
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Pumps.Primary.Validation.DisableDedicated.mos
@@ -0,0 +1,9 @@
+compareVars :=
+  {
+    "y1.y",
+    "y1EquLea.y",
+    "y1EquLea_actual.y",
+    "y1ReqEquLea.y",
+    "enaDed.y1",
+    "enaDedReq.y1"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Pumps.Primary.Validation.VariableSpeed.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Pumps.Primary.Validation.VariableSpeed.mos
new file mode 100644
index 00000000000..1a6c2890029
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Pumps.Primary.Validation.VariableSpeed.mos
@@ -0,0 +1,64 @@
+compareVars :=
+  {
+    "ctlPumPriHdrHea.u1PumHeaWatPri[1]",
+    "ctlPumPriHdrHea.u1PumHeaWatPri[2]",
+    "ctlPumPriHdrHea.yPumHeaWatPriHdr",
+    "ctlPumPriHdr.u1PumHeaWatPri[1]",
+    "ctlPumPriHdr.u1PumHeaWatPri[2]",
+    "ctlPumPriHdr.u1PumChiWatPri[1]",
+    "ctlPumPriHdr.u1PumChiWatPri[2]",
+    "ctlPumPriHdr.yPumHeaWatPriHdr",
+    "ctlPumPriHdr.yPumChiWatPriHdr",
+    "ctlPumPriDedCom.u1PumHeaWatPri[1]",
+    "ctlPumPriDedCom.u1PumHeaWatPri[2]",
+    "ctlPumPriDedCom.u1Hea[1]",
+    "ctlPumPriDedCom.u1Hea[2]",
+    "ctlPumPriDedCom.yPumHeaWatPriDed[1]",
+    "ctlPumPriDedCom.yPumHeaWatPriDed[2]",
+    "ctlPumPriDedSep.u1PumHeaWatPri[1]",
+    "ctlPumPriDedSep.u1PumHeaWatPri[2]",
+    "ctlPumPriDedSep.u1PumChiWatPri[1]",
+    "ctlPumPriDedSep.u1PumChiWatPri[2]",
+    "ctlPumPriDedSep.yPumHeaWatPriDed[1]",
+    "ctlPumPriDedSep.yPumHeaWatPriDed[2]",
+    "ctlPumPriDedSep.yPumChiWatPriDed[1]",
+    "ctlPumPriDedSep.yPumChiWatPriDed[2]",
+    "ctlPumPriHdrHeaDp.u1PumHeaWatPri[1]",
+    "ctlPumPriHdrHeaDp.u1PumHeaWatPri[2]",
+    "ctlPumPriHdrHeaDp.dpHeaWatLocSet[1]",
+    "ctlPumPriHdrHeaDp.dpHeaWatLocSet[2]",
+    "ctlPumPriHdrHeaDp.dpHeaWatLoc",
+    "ctlPumPriHdrHeaDp.yPumHeaWatPriHdr",
+    "ctlPumPriHdrDp.u1PumHeaWatPri[1]",
+    "ctlPumPriHdrDp.u1PumHeaWatPri[2]",
+    "ctlPumPriHdrDp.u1PumChiWatPri[1]",
+    "ctlPumPriHdrDp.u1PumChiWatPri[2]",
+    "ctlPumPriHdrDp.dpHeaWatRemSet[1]",
+    "ctlPumPriHdrDp.dpHeaWatRemSet[2]",
+    "ctlPumPriHdrDp.dpHeaWatRem[1]",
+    "ctlPumPriHdrDp.dpHeaWatRem[2]",
+    "ctlPumPriHdrDp.yPumHeaWatPriHdr",
+    "ctlPumPriHdrDp.yPumChiWatPriHdr",
+    "ctlPumPriDedComDp.u1PumHeaWatPri[1]",
+    "ctlPumPriDedComDp.u1PumHeaWatPri[2]",
+    "ctlPumPriDedComDp.u1Hea[1]",
+    "ctlPumPriDedComDp.u1Hea[2]",
+    "ctlPumPriDedComDp.dpHeaWatLocSet[1]",
+    "ctlPumPriDedComDp.dpHeaWatLocSet[2]",
+    "ctlPumPriDedComDp.dpHeaWatLoc",
+    "ctlPumPriDedComDp.dpChiWatLoc",
+    "ctlPumPriDedComDp.yPumHeaWatPriDed[1]",
+    "ctlPumPriDedComDp.yPumHeaWatPriDed[2]",
+    "ctlPumPriDedSepDp.u1PumHeaWatPri[1]",
+    "ctlPumPriDedSepDp.u1PumHeaWatPri[2]",
+    "ctlPumPriDedSepDp.u1PumChiWatPri[1]",
+    "ctlPumPriDedSepDp.u1PumChiWatPri[2]",
+    "ctlPumPriDedSepDp.dpHeaWatLocSet[1]",
+    "ctlPumPriDedSepDp.dpHeaWatLocSet[2]",
+    "ctlPumPriDedSepDp.dpHeaWatLoc",
+    "ctlPumPriDedSepDp.dpChiWatLoc",
+    "ctlPumPriDedSepDp.yPumHeaWatPriDed[1]",
+    "ctlPumPriDedSepDp.yPumHeaWatPriDed[2]",
+    "ctlPumPriDedSepDp.yPumChiWatPriDed[1]",
+    "ctlPumPriDedSepDp.yPumChiWatPriDed[2]"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Pumps.Primary.Validation.VariableSpeedNoDpControl.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Pumps.Primary.Validation.VariableSpeedNoDpControl.mos
deleted file mode 100644
index c72bd48f2d3..00000000000
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Pumps.Primary.Validation.VariableSpeedNoDpControl.mos
+++ /dev/null
@@ -1,26 +0,0 @@
-compareVars :=
-  {
-    "ctlPumPriHdrHea.u1PumHeaWatPri[1]",
-    "ctlPumPriHdrHea.u1PumHeaWatPri[2]",
-    "ctlPumPriHdrHea.yPumHeaWatPriHdr",
-    "ctlPumPriHdr.u1PumHeaWatPri[1]",
-    "ctlPumPriHdr.u1PumHeaWatPri[2]",
-    "ctlPumPriHdr.u1PumChiWatPri[1]",
-    "ctlPumPriHdr.u1PumChiWatPri[2]",
-    "ctlPumPriHdr.yPumHeaWatPriHdr",
-    "ctlPumPriHdr.yPumChiWatPriHdr",
-    "ctlPumPriDedCom.u1PumHeaWatPri[1]",
-    "ctlPumPriDedCom.u1PumHeaWatPri[2]",
-    "ctlPumPriDedCom.u1Hea[1]",
-    "ctlPumPriDedCom.u1Hea[2]",
-    "ctlPumPriDedCom.yPumHeaWatPriDed[1]",
-    "ctlPumPriDedCom.yPumHeaWatPriDed[2]",
-    "ctlPumPriDedSep.u1PumHeaWatPri[1]",
-    "ctlPumPriDedSep.u1PumHeaWatPri[2]",
-    "ctlPumPriDedSep.u1PumChiWatPri[1]",
-    "ctlPumPriDedSep.u1PumChiWatPri[2]",
-    "ctlPumPriDedSep.yPumHeaWatPriDed[1]",
-    "ctlPumPriDedSep.yPumHeaWatPriDed[2]",
-    "ctlPumPriDedSep.yPumChiWatPriDed[1]",
-    "ctlPumPriDedSep.yPumChiWatPriDed[2]"
-  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.StagingRotation.Validation.FailsafeCondition.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.StagingRotation.Validation.FailsafeCondition.mos
new file mode 100644
index 00000000000..0d19c497b99
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.StagingRotation.Validation.FailsafeCondition.mos
@@ -0,0 +1,17 @@
+compareVars :=
+  {
+    "faiSafHea.TSupSet",
+    "faiSafHea.TPriSup",
+    "faiSafHea.TSecSup",
+    "faiSafHea.reset",
+    "faiSafHea.y1",
+    "faiSafCoo.TSupSet",
+    "faiSafCoo.TPriSup",
+    "faiSafCoo.TSecSup",
+    "faiSafCoo.reset",
+    "faiSafCoo.y1",
+    "faiSafCooPri.TSupSet",
+    "faiSafCooPri.TPriSup",
+    "faiSafCooPri.reset",
+    "faiSafCooPri.y1"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.StagingRotation.Validation.LoadAverage.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.StagingRotation.Validation.LoadAverage.mos
new file mode 100644
index 00000000000..e343fff53b2
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.StagingRotation.Validation.LoadAverage.mos
@@ -0,0 +1,11 @@
+compareVars :=
+  {
+    "loaHea.TSupSet",
+    "loaHea.TRet",
+    "loaHea.V_flow",
+    "loaHea.QReq_flow",
+    "loaCoo.TSupSet",
+    "loaCoo.TRet",
+    "loaCoo.V_flow",
+    "loaCoo.QReq_flow"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.StagingRotation.Validation.StageChangeCommand.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.StagingRotation.Validation.StageChangeCommand.mos
index f4f67d4ff3d..db3f2da1ac4 100644
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.StagingRotation.Validation.StageChangeCommand.mos
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.StagingRotation.Validation.StageChangeCommand.mos
@@ -1,6 +1,6 @@
 compareVars :=
   {
-    "chaSta.capReq.y",
+    "chaSta.capReq.QReq_flow",
     "chaSta.capSta.y",
     "chaSta.capStaLow.y",
     "capHea_nominal",
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.HeatPumps.Components.Validation.HeatRecoveryChiller.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.HeatPumps.Components.Validation.HeatRecoveryChiller.mos
new file mode 100644
index 00000000000..8ecf0759815
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.HeatPumps.Components.Validation.HeatRecoveryChiller.mos
@@ -0,0 +1,15 @@
+compareVars :=
+  {
+    "bus.hrc.y1",
+    "bus.hrc.y1Coo",
+    "bus.pumChiWatHrc.y1",
+    "bus.pumHeaWatHrc.y1",
+    "TChiWatLvg.T",
+    "inlChiWat.T",
+    "TSupSet.y",
+    "THeaWatLvg.T",
+    "inlHeaWat.T",
+    "TSupSet.y",
+    "hrc.hrc.chi.PLR2",
+    "hrc.hrc.chi.COP"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.HeatPumps.Validation.AirToWater.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.HeatPumps.Validation.AirToWater.mos
index ceb60a193f5..75d099c9bbe 100644
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.HeatPumps.Validation.AirToWater.mos
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.HeatPumps.Validation.AirToWater.mos
@@ -1,7 +1,7 @@
 compareVars :=
   {
-    "pla.ctl.ctl.chaStaHea.capReq.y",
-    "pla.ctl.ctl.chaStaCoo.capReq.y",
+    "pla.ctl.ctl.chaStaHea.capReq.QReq_flow",
+    "pla.ctl.ctl.chaStaCoo.capReq.QReq_flow",
     "pla.capHea_nominal",
     "pla.capCoo_nominal",
     "pla.ctl.ctl.TOut",
@@ -30,16 +30,17 @@ compareVars :=
     "pla.ctl.ctl.y1PumChiWatSec[3]",
     "pla.ctl.ctl.nReqResHeaWat",
     "pla.ctl.ctl.nReqResChiWat",
-    "dpHeaWatRem.y[1]",
-    "pla.bus.dpHeaWatRemSet[1]",
-    "dpChiWatRem.y[1]",
+    "pla.bus.dpHeaWatRem[1]",
     "pla.bus.dpHeaWatRemSet[1]",
+    "pla.bus.dpChiWatRem[1]",
     "pla.bus.dpChiWatRemSet[1]",
     "pla.bus.VHeaWatPri_flow",
     "pla.bus.VHeaWatSec_flow",
+    "datAll.pla.ctl.VHeaWatPri_flow_nominal",
     "datAll.pla.ctl.VHeaWatSec_flow_nominal",
     "pla.bus.VChiWatPri_flow",
     "pla.bus.VChiWatSec_flow",
+    "datAll.pla.ctl.VChiWatPri_flow_nominal",
     "datAll.pla.ctl.VChiWatSec_flow_nominal",
     "pla.hp.hp[1].hp.PLR",
     "pla.hp.hp[2].hp.PLR",
@@ -53,5 +54,14 @@ compareVars :=
     "pla.bus.TChiWatPriSup",
     "pla.bus.TChiWatSecSup",
     "pla.bus.TChiWatPriRet",
-    "pla.bus.TChiWatSecRet"
+    "pla.bus.TChiWatSecRet",
+    "pla.bus.hrc.y1",
+    "pla.bus.hrc.y1Coo",
+    "pla.hrc.hrc.chi.PLR2",
+    "pla.bus.TChiWatRetUpsHrc",
+    "pla.bus.TChiWatSecRet",
+    "pla.bus.TChiWatSecSup",
+    "pla.bus.THeaWatRetUpsHrc",
+    "pla.bus.THeaWatSecRet",
+    "pla.bus.THeaWatSecSup"
   };
diff --git a/Buildings/Resources/Scripts/travis/Makefile b/Buildings/Resources/Scripts/travis/Makefile
index 47e63a0c442..e1beca50272 100644
--- a/Buildings/Resources/Scripts/travis/Makefile
+++ b/Buildings/Resources/Scripts/travis/Makefile
@@ -174,7 +174,7 @@ test-optimica:
 	  python3 ../bin/runUnitTests.py --batch --single-package $(PACKAGE) --tool optimica --skip-verification -n $(NPROC))
 
 test-templates-dymola:
-	(cd $(ROOT)/Buildings && ../Buildings/Resources/Scripts/travis/templates/checkandrun.sh --checksum --tool Dymola)
+	(cd $(ROOT)/Buildings && ../Buildings/Resources/Scripts/travis/templates/checkandrun.sh --checksum --tool Dymola --cover 0.3)
 
 test-templates-optimica:
-	(cd $(ROOT)/Buildings && ../Buildings/Resources/Scripts/travis/templates/checkandrun.sh --checksum --tool Optimica)
+	(cd $(ROOT)/Buildings && ../Buildings/Resources/Scripts/travis/templates/checkandrun.sh --checksum --tool Optimica --cover 0.3)
diff --git a/Buildings/Resources/Scripts/travis/templates/AirHandlersFans.checksum b/Buildings/Resources/Scripts/travis/templates/AirHandlersFans.checksum
index 3c71bb07d2b..126bdf710de 100644
--- a/Buildings/Resources/Scripts/travis/templates/AirHandlersFans.checksum
+++ b/Buildings/Resources/Scripts/travis/templates/AirHandlersFans.checksum
@@ -1 +1 @@
-fd7661952d04322c883930bfdccc0026
+61dd66e8bce6a205795d7b6fef4a9e1d
diff --git a/Buildings/Resources/Scripts/travis/templates/Plants.HeatPumps.checksum b/Buildings/Resources/Scripts/travis/templates/Plants.HeatPumps.checksum
new file mode 100644
index 00000000000..a8b4fbdf4c9
--- /dev/null
+++ b/Buildings/Resources/Scripts/travis/templates/Plants.HeatPumps.checksum
@@ -0,0 +1 @@
+694ce57cff84d749f4b7d60d39f44b39
diff --git a/Buildings/Resources/Scripts/travis/templates/Plants.HeatPumps.py b/Buildings/Resources/Scripts/travis/templates/Plants.HeatPumps.py
new file mode 100755
index 00000000000..821fda80435
--- /dev/null
+++ b/Buildings/Resources/Scripts/travis/templates/Plants.HeatPumps.py
@@ -0,0 +1,149 @@
+#!/usr/bin/env python
+# coding: utf-8
+
+"""Generate combinations and run simulations.
+
+This script shall be run from the directory `modelica-buildings/Buildings`,
+i.e., where the top-level `package.mo` file can be found.
+
+Args:
+    - See docstring of core.py for the optional positional arguments of this script.
+
+Returns:
+    - 0 if all simulations succeed.
+    - 1 otherwise.
+
+Details:
+    The script performs the following tasks.
+    - Generate all possible combinations of class modifications based on a set of
+      parameter bindings and redeclare statements provided in `MODIF_GRID`.
+    - Exclude the combinations based on a match with the patterns provided in `EXCLUDE`.
+    - This allows excluding unsupported configurations.
+    - Exclude the class modifications based on a match with the patterns provided in `REMOVE_MODIF`,
+      and prune the resulting duplicated combinations.
+    - This allows reducing the number of simulations by excluding class modifications that
+      yield the same model, i.e., modifications to parameters that are not used (disabled) in
+      the given configuration.
+    - For the remaining combinations: run the corresponding simulations for the models in `MODELS`.
+"""
+
+import core
+
+MODELS = [
+    'Buildings.Templates.Plants.HeatPumps.Validation.AirToWater',
+]
+
+# See docstring of `generate_combinations` function for the structure of MODIF_GRID.
+# Tested modifications should at least cover the options specified at:
+# https://github.com/lbl-srg/ctrl-flow-dev/blob/main/server/scripts/sequence-doc/src/version/Current%20G36%20Decisions/Guideline%2036-2021%20(mappings).csv
+MODIF_GRID = {
+    'Buildings.Templates.Plants.HeatPumps.Validation.AirToWater': {
+        'have_chiWat': [  # Parameter declared at top level with final binding in template instance.
+            'true',
+            'false',
+        ],
+        'pla__have_hrc_select': [
+            'true',
+            'false',
+        ],
+        'pla__typDis_select1': [
+            'Buildings.Templates.Plants.HeatPumps.Types.Distribution.Variable1Only',
+            'Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Variable2',
+        ],
+        'pla__typArrPumPri': [
+            'Buildings.Templates.Components.Types.PumpArrangement.Dedicated',
+            'Buildings.Templates.Components.Types.PumpArrangement.Headered',
+        ],
+        'pla__typPumHeaWatPri_select1': [  # typPumChiWatPri_select1=typPumHeaWatPri_select1 by default in the template.
+            'Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Constant',
+            'Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Variable',
+        ],
+        'pla__have_pumChiWatPriDed_select': [
+            'true',
+            'false',
+        ],
+        'pla__ctl__have_senTHeaWatPriRet_select': [  # have_senTChiWatPriRet_select=have_senTHeaWatPriRet_select by default in the template.
+            'true',
+            'false',
+        ],
+        'pla__ctl__have_senTHeaWatSecRet_select': [  # have_senTChiWatSecRet_select=have_senTHeaWatSecRet_select by default in the template.
+            'true',
+            'false',
+        ],
+        'pla__ctl__have_senDpHeaWatRemWir': [  # have_senDpChiWatRemWir=have_senDpHeaWatRemWir by default in the template.
+            'true',
+            'false',
+        ],
+        'pla__ctl__have_senVHeaWatPri_select': [  # have_senVChiWatPri_select=have_senVHeaWatPri_select by default in the template.
+            'true',
+            'false',
+        ],
+    },
+}
+
+# See docstring of `prune_modifications` function for the structure of EXCLUDE.
+EXCLUDE = {
+    'Buildings.Templates.Plants.HeatPumps.Validation.AirToWater': [
+        [
+            'have_chiWat=false',
+            'have_hrc_select=true',
+        ],
+    ],
+}
+
+# See docstring of `prune_modifications` function for the structure of REMOVE_MODIF.
+REMOVE_MODIF = {
+    'Buildings.Templates.Plants.HeatPumps.Validation.AirToWater': [
+        (
+            [
+                'Buildings.Templates.Plants.HeatPumps.Types.Distribution.Variable1Only',
+            ],
+            [
+                'typPumHeaWatPri_select1',
+            ],
+        ),
+        (
+            [
+                'have_chiWat=true',
+                'typArrPumPri=Buildings.Templates.Components.Types.PumpArrangement.Headered',
+            ],
+            [
+                'have_pumChiWatPriDed_select',
+            ],
+        ),
+        (
+            [
+                'have_chiWat=false',
+            ],
+            [
+                'typPumChiWatPri_select1',
+                'have_pumChiWatPriDed_select',
+            ],
+        ),
+        (
+            [
+                'Buildings.Templates.Plants.HeatPumps.Types.Distribution.Variable1Only',
+            ],
+            [
+                'have_senVHeaWatPri_select',
+                'have_senTHeaWatSecRet_select',
+            ],
+        ),
+        (
+            [
+                'have_hrc_select=true',
+            ],
+            [
+                'have_senVHeaWatPri_select',
+                'have_senTHeaWatPriRet_select',
+                'have_senTHeaWatSecRet_select',
+            ],
+        ),
+    ]
+}
+
+
+if __name__ == '__main__':
+    core.main(
+        models=MODELS, modif_grid=MODIF_GRID, exclude=EXCLUDE, remove_modif=REMOVE_MODIF
+    )
diff --git a/Buildings/Resources/Scripts/travis/templates/VAVBox.py b/Buildings/Resources/Scripts/travis/templates/VAVBox.py
index 55bbddb2418..f5e7488b3dc 100755
--- a/Buildings/Resources/Scripts/travis/templates/VAVBox.py
+++ b/Buildings/Resources/Scripts/travis/templates/VAVBox.py
@@ -27,7 +27,7 @@
     - For the remaining combinations: run the corresponding simulations for the models in `MODELS`.
 """
 
-from core import *
+import core
 
 MODELS = [
     'Buildings.Templates.ZoneEquipment.Validation.VAVBoxCoolingOnly',
@@ -74,4 +74,6 @@
 
 
 if __name__ == '__main__':
-    main(models=MODELS, modif_grid=MODIF_GRID, exclude=EXCLUDE, remove_modif=REMOVE_MODIF)
+    core.main(
+        models=MODELS, modif_grid=MODIF_GRID, exclude=EXCLUDE, remove_modif=REMOVE_MODIF
+    )
diff --git a/Buildings/Resources/Scripts/travis/templates/VAVMultiZone.py b/Buildings/Resources/Scripts/travis/templates/VAVMultiZone.py
index 96f05cc6377..a3dacd6d12f 100755
--- a/Buildings/Resources/Scripts/travis/templates/VAVMultiZone.py
+++ b/Buildings/Resources/Scripts/travis/templates/VAVMultiZone.py
@@ -27,7 +27,7 @@
     - For the remaining combinations: run the corresponding simulations for the models in `MODELS`.
 """
 
-from core import *
+import core
 
 MODELS = [
     'Buildings.Templates.AirHandlersFans.Validation.VAVMultiZone',
@@ -268,4 +268,6 @@
 
 
 if __name__ == '__main__':
-    main(models=MODELS, modif_grid=MODIF_GRID, exclude=EXCLUDE, remove_modif=REMOVE_MODIF)
+    core.main(
+        models=MODELS, modif_grid=MODIF_GRID, exclude=EXCLUDE, remove_modif=REMOVE_MODIF
+    )
diff --git a/Buildings/Resources/Scripts/travis/templates/checkandrun.sh b/Buildings/Resources/Scripts/travis/templates/checkandrun.sh
index 6c0861a640b..fbe1e256e20 100755
--- a/Buildings/Resources/Scripts/travis/templates/checkandrun.sh
+++ b/Buildings/Resources/Scripts/travis/templates/checkandrun.sh
@@ -48,7 +48,7 @@ while [[ "$1" != "" ]]; do
         SIMULATOR="$1"
       else
         echo "$0: $1 is not a valid Modelica tool, only Dymola and Optimica are allowed." >&2
-        exit
+        exit 1
       fi
       ;;
     --cover )
@@ -57,7 +57,7 @@ while [[ "$1" != "" ]]; do
         FRACTION_TEST_COVERAGE=$1
       else
         echo "$0: $1 is not a valid fraction of test coverage, it must be within ]0, 1]." >&2
-        exit
+        exit 1
       fi
       ;;
     * )
@@ -68,7 +68,7 @@ while [[ "$1" != "" ]]; do
         echo "     --skip disables all simulations (use this option to simply update the checksums locally)."
         echo "     --tool allows specifying the Modelica tool to be used, defaulting to Dymola."
         echo "     --cover allows specifying the fraction of test coverage, defaulting to 1."
-        exit
+        exit 1
        ;;
   esac
   shift
@@ -83,6 +83,8 @@ declare -A checksum_dirs=(
   ["ZoneEquipment"]="Templates/ZoneEquipment
                      Controls/OBC/ASHRAE/G36/TerminalUnits/CoolingOnly
                      Controls/OBC/ASHRAE/G36/TerminalUnits/Reheat"
+  ["Plants.HeatPumps"]="Templates/Plants/HeatPumps
+                        Templates/Plants/Controls"
 )
 # Declare the python script that must be run for each template package.
 # Each key is a Modelica package name under Buildings.Templates (with . as separator).
@@ -90,6 +92,7 @@ declare -A checksum_dirs=(
 declare -A test_script=(
   ["AirHandlersFans"]="./Resources/Scripts/travis/templates/VAVMultiZone.py"
   ["ZoneEquipment"]="./Resources/Scripts/travis/templates/VAVBox.py"
+  ["Plants.HeatPumps"]="./Resources/Scripts/travis/templates/Plants.HeatPumps.py"
 )
 
 for type in "${!test_script[@]}"; do
diff --git a/Buildings/Resources/Scripts/travis/templates/core.py b/Buildings/Resources/Scripts/travis/templates/core.py
index d68987ac0d7..868927e7d4c 100644
--- a/Buildings/Resources/Scripts/travis/templates/core.py
+++ b/Buildings/Resources/Scripts/travis/templates/core.py
@@ -12,7 +12,7 @@
 import random
 import re
 import sys
-from math import ceil, floor
+from math import ceil
 
 # For CPU- and I/O-heavy jobs, we prefer multiprocessing.Pool because it provides better process isolation.
 from multiprocessing import Pool
@@ -422,7 +422,7 @@ class modifications of the combination (concatenated).
             modif=[''.join(el[1]) for el in combinations],
         )
     )
-    indices_to_pop = df_model_modif[df_model_modif.duplicated() == True].index.tolist()
+    indices_to_pop = df_model_modif[df_model_modif.duplicated()].index.tolist()
     combinations = [
         el for idx, el in enumerate(combinations) if idx not in indices_to_pop
     ]
@@ -457,7 +457,6 @@ def report_clean(combinations, results):
         pd.DataFrame
     """
     try:
-        os.unlink('tmp_func.py')
         os.unlink('unitTestsTemplates.log')
     except FileNotFoundError:
         pass
diff --git a/Buildings/Templates/Components/Actuators/Valve.mo b/Buildings/Templates/Components/Actuators/Valve.mo
index d7caac83624..cfad64f3d84 100644
--- a/Buildings/Templates/Components/Actuators/Valve.mo
+++ b/Buildings/Templates/Components/Actuators/Valve.mo
@@ -522,16 +522,12 @@ equation
   annotation (
   Icon(graphics={
     Line(
-      points={{-100,0},{-40,0}},
-      color={0,0,0},
-      thickness=5),
-    Line(
-      points={{40,0},{100,0}},
+      points={{-100,0},{100,0}},
       color={0,0,0},
       thickness=5),
     Line(
       visible=is_thrWay,
-      points={{0,-100},{0,-40}},
+      points={{0,-100},{0,0}},
       color={0,0,0},
       thickness=5),
     Bitmap(
diff --git a/Buildings/Templates/Components/Chillers/Compression.mo b/Buildings/Templates/Components/Chillers/Compression.mo
new file mode 100644
index 00000000000..c81395a95cb
--- /dev/null
+++ b/Buildings/Templates/Components/Chillers/Compression.mo
@@ -0,0 +1,143 @@
+within Buildings.Templates.Components.Chillers;
+model Compression
+  "Compression chiller"
+  extends Buildings.Templates.Components.Interfaces.PartialChiller;
+  Buildings.Fluid.Chillers.ElectricReformulatedEIR chi(
+    redeclare final package Medium1=MediumCon,
+    redeclare final package Medium2=MediumChiWat,
+    final m1_flow_nominal=mCon_flow_nominal,
+    final m2_flow_nominal=mChiWat_flow_nominal,
+    final dp1_nominal=if have_dpCon then dpCon_nominal else 0,
+    final dp2_nominal=if have_dpChiWat then dpChiWat_nominal else 0,
+    final have_switchover=have_switchover,
+    final per=dat.perSca,
+    final tau1=tau,
+    final tau2=tau,
+    final energyDynamics=energyDynamics,
+    final allowFlowReversal1=allowFlowReversal1,
+    final allowFlowReversal2=allowFlowReversal2,
+    final show_T=show_T,
+    final m1_flow_small=m1_flow_small,
+    final m2_flow_small=m2_flow_small)
+    "Chiller"
+    annotation (Placement(transformation(extent={{-10,-64},{10,-44}})));
+  Controls.StatusEmulator y1_actual
+    "Compute chiller status"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=90,
+      origin={60,0})));
+  Buildings.Controls.OBC.CDL.Routing.BooleanExtractSignal reqConWat(
+    final nin=1,
+    final nout=1,
+    final extract={1})
+    if typ == Buildings.Templates.Components.Types.Chiller.WaterCooled
+    "Compute CW request"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=90,
+      origin={-60,80})));
+  Buildings.Controls.OBC.CDL.Logical.Not off
+    "Return true if status is off"
+    annotation (Placement(transformation(extent={{40,10},{20,30}})));
+  Buildings.Controls.OBC.CDL.Logical.TrueDelay delOff(
+    delayTime=180)
+    "Delay off status"
+    annotation (Placement(transformation(extent={{-10,10},{-30,30}})));
+  Buildings.Controls.OBC.CDL.Logical.Not reqFlo
+    "Compute flow request"
+    annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=-90,
+      origin={-40,50})));
+equation
+  connect(port_a1, chi.port_a1)
+    annotation (Line(points={{-100,60},{-80,60},{-80,-48},{-10,-48}},color={0,127,255}));
+  connect(chi.port_b1, port_b1)
+    annotation (Line(points={{10,-48},{80,-48},{80,60},{100,60}},color={0,127,255}));
+  connect(port_b2, chi.port_b2)
+    annotation (Line(points={{-100,-60},{-10,-60}},color={0,127,255}));
+  connect(chi.port_a2, port_a2)
+    annotation (Line(points={{10,-60},{100,-60}},color={0,127,255}));
+  connect(bus.y1, chi.on)
+    annotation (Line(points={{0,100},{0,-20},{-20,-20},{-20,-51},{-12,-51}},
+      color={255,204,51},thickness=0.5));
+  connect(bus.TSupSet, chi.TSet)
+    annotation (Line(points={{0,100},{0,-20},{-20,-20},{-20,-57},{-12,-57}},
+      color={255,204,51},thickness=0.5));
+  connect(bus.y1Coo, chi.coo)
+    annotation (Line(points={{0,100},{0,-20},{-8,-20},{-8,-40}},color={255,204,51},thickness=0.5));
+  connect(bus.y1, y1_actual.y1)
+    annotation (Line(points={{0,100},{0,-20},{60,-20},{60,-12}},color={255,204,51},thickness=0.5));
+  connect(y1_actual.y1_actual, bus.y1_actual)
+    annotation (Line(points={{60,12},{60,94},{0,94},{0,100}},color={255,0,255}));
+  connect(reqConWat.y[1], bus.reqConWat)
+    annotation (Line(points={{-60,92},{-60,96},{0,96},{0,100}},color={255,0,255}));
+  connect(y1_actual.y1_actual, off.u)
+    annotation (Line(points={{60,12},{60,20},{42,20}},color={255,0,255}));
+  connect(off.y, delOff.u)
+    annotation (Line(points={{18,20},{-8,20}},color={255,0,255}));
+  connect(delOff.y, reqFlo.u)
+    annotation (Line(points={{-32,20},{-40,20},{-40,38}},color={255,0,255}));
+  connect(reqFlo.y, bus.reqChiWat)
+    annotation (Line(points={{-40,62},{-40,94},{0,94},{0,100}},color={255,0,255}));
+  connect(reqFlo.y, reqConWat.u[1])
+    annotation (Line(points={{-40,62},{-40,64},{-60,64},{-60,68}},color={255,0,255}));
+  annotation (
+    defaultComponentName="chi",
+    Documentation(
+      info="<html>
+<p>
+Model of an electric compression chiller based on the reformulated DOE-2.1 model
+<a href=\"modelica://Buildings.Fluid.Chillers.ElectricReformulatedEIR\">
+Buildings.Fluid.Chillers.ElectricReformulatedEIR</a>.
+</p>
+<h4>Control points</h4>
+<p>
+The following input and output points are available.
+</p>
+<ul>
+<li>
+On/off command <code>y1</code>: 
+DO signal
+</li>
+<li>
+(Only if <code>have_switchover=true</code>) Operating mode command <code>y1Coo</code>: 
+DO signal, true for cooling, false for heating
+</li>
+<li>
+Supply temperature setpoint <code>TSupSet</code>:
+AO signal corresponding to
+<ul>
+<li>CHW supply temperature setpoint if
+<code>have_switchover=false</code> or if 
+<code>have_switchover=true</code> and <code>y1Coo=true</code>, or
+</li>
+<li>HW supply temperature setpoint if
+<code>have_switchover=true</code> and <code>y1Coo=false</code>.
+</li>
+</ul>
+</li>
+<li>
+Chiller status <code>y1_actual</code>: DI signal
+</li>
+<li>
+CHW request <code>reqChiWat</code>: DI signal
+</li>
+<li>
+(Only if <code>typ=Buildings.Templates.Components.Types.Chiller.WaterCooled</code>) 
+CW request <code>reqConWat</code>: DI signal
+</li>
+</ul>
+<h4>Model parameters</h4>
+<p>
+The design parameters and the chiller performance data are specified with an instance of
+<a href=\"modelica://Buildings.Templates.Components.Data.Chiller\">
+Buildings.Templates.Components.Data.Chiller</a>.
+The documentation of this record class provides further details on how to 
+properly parameterize the model.
+</p>
+</html>",
+      revisions="<html>
+<ul>
+<li>
+November 18, 2022, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end Compression;
diff --git a/Buildings/Templates/Components/Chillers/Validation/Compression.mo b/Buildings/Templates/Components/Chillers/Validation/Compression.mo
new file mode 100644
index 00000000000..29cf049ea89
--- /dev/null
+++ b/Buildings/Templates/Components/Chillers/Validation/Compression.mo
@@ -0,0 +1,295 @@
+within Buildings.Templates.Components.Chillers.Validation;
+model Compression
+  "Validation model for compression chiller component"
+  extends Modelica.Icons.Example;
+  replaceable package MediumLiq=Buildings.Media.Water
+    constrainedby Modelica.Media.Interfaces.PartialMedium
+    "CHW or CW medium";
+  replaceable package MediumAir=Buildings.Media.Air
+    constrainedby Modelica.Media.Interfaces.PartialMedium
+    "Air medium";
+  parameter Modelica.Fluid.Types.Dynamics energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial
+    "Type of energy balance: dynamic (3 initialization options) or steady state"
+    annotation (Evaluate=true,
+    Dialog(tab="Dynamics",group="Conservation equations"));
+  parameter Data.Chiller datChiAirCoo(
+    final typ=chiAirCoo.typ,
+    final use_datDes=true,
+    mChiWat_flow_nominal=datChiAirCoo.cap_nominal / abs(datChiAirCoo.TChiWatSup_nominal -
+      Buildings.Templates.Data.Defaults.TChiWatRet) / datChiAirCoo.cpChiWat_default,
+    cap_nominal=750E3,
+    COP_nominal=Buildings.Templates.Data.Defaults.COPChiAirCoo,
+    dpChiWat_nominal=Buildings.Templates.Data.Defaults.dpChiWatChi,
+    TChiWatSup_nominal=Buildings.Templates.Data.Defaults.TChiWatSup,
+    TConEnt_nominal=Buildings.Templates.Data.Defaults.TOutChi,
+    PLR_min=0.15,
+    per(
+      capFunT={0.0, 0.1, - 0.0023814154, 0.0628316481, - 0.0009644649, -
+        0.0011249224},
+      EIRFunT={0.0, 0.0071530312, - 0.0004553574, 0.0188175079, 0.0002623276, -
+        0.0012881189},
+      EIRFunPLR={- 5.497250E-01, 5.035076E-02, - 1.927855E-05, 1.678371E+00, -
+        1.535993E+00, - 4.944902E-02, 0.000000E+00, 1.396972E+00, 0.000000E+00, 0.000000E+00},
+      PLRMax=1.15,
+      etaMotor=1.0))
+    "Air-cooled chiller parameters – Parameterization based on design conditions and direct assignment of performance curves"
+    annotation (Placement(transformation(extent={{40,80},{60,100}})));
+  parameter Buildings.Templates.Components.Data.Chiller datChiWatCoo(
+    final typ=chiWatCoo.typ,
+    final use_datDes=false,
+    dpChiWat_nominal=Buildings.Templates.Data.Defaults.dpChiWatChi,
+    dpCon_nominal=Buildings.Templates.Data.Defaults.dpConWatChi,
+    redeclare Buildings.Fluid.Chillers.Data.ElectricReformulatedEIR.ReformEIRChiller_Trane_CVHE_1442kW_6_61COP_VSD per)
+    "Water-cooled chiller parameters – Parameterization based on rating conditions specified in the sub-record per"
+    annotation (Placement(transformation(extent={{40,-40},{60,-20}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant TChiWatSupSet(
+    k=datChiAirCoo.TChiWatSup_nominal,
+    y(final unit="K",
+      displayUnit="degC"))
+    "CHWST setpoint"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,
+      origin={-110,80})));
+  Buildings.Templates.Components.Chillers.Compression chiAirCoo(
+    redeclare final package MediumChiWat=MediumLiq,
+    redeclare final package MediumCon=MediumAir,
+    final typ=Buildings.Templates.Components.Types.Chiller.AirCooled,
+    show_T=true,
+    final dat=datChiAirCoo,
+    final energyDynamics=energyDynamics)
+    "Air-cooled chiller"
+    annotation (Placement(transformation(extent={{40,16},{20,36}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.TimeTable y1(
+    table=[
+      0, 0;
+      0.5, 1],
+    timeScale=1000,
+    period=3000)
+    "Heat pump Enable signal"
+    annotation (Placement(transformation(extent={{-120,110},{-100,130}})));
+  Fluid.Sensors.TemperatureTwoPort TSup(
+    redeclare final package Medium=MediumLiq,
+    final m_flow_nominal=datChiAirCoo.mChiWat_flow_nominal)
+    "Supply temperature"
+    annotation (Placement(transformation(extent={{50,10},{70,30}})));
+  Fluid.Sources.Boundary_pT supChiWat(
+    redeclare final package Medium=MediumLiq,
+    p=Buildings.Templates.Data.Defaults.pChiWat_rel_nominal + 101325,
+    nPorts=2)
+    "Boundary condition at distribution system supply"
+    annotation (Placement(transformation(extent={{130,10},{110,30}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Sin TChiWatRet(
+    amplitude=(datChiAirCoo.TChiWatRet_nominal - datChiAirCoo.TChiWatSup_nominal) /
+      2,
+    freqHz=2 / 3000,
+    y(final unit="K",
+      displayUnit="degC"),
+    offset=datChiAirCoo.TChiWatSup_nominal +(datChiAirCoo.TChiWatRet_nominal -
+      datChiAirCoo.TChiWatSup_nominal) / 2,
+    startTime=0)
+    "CHW return temperature value"
+    annotation (Placement(transformation(extent={{-120,14},{-100,34}})));
+  Fluid.Sources.Boundary_pT retChiWat(
+    redeclare final package Medium=MediumLiq,
+    p=supChiWat.p + chiAirCoo.dpChiWat_nominal,
+    use_T_in=true,
+    nPorts=1)
+    "Boundary conditions of CHW at chiller inlet"
+    annotation (Placement(transformation(extent={{-70,10},{-50,30}})));
+  Fluid.Sensors.TemperatureTwoPort TRet(
+    redeclare final package Medium=MediumLiq,
+    final m_flow_nominal=datChiAirCoo.mChiWat_flow_nominal)
+    "Return temperature"
+    annotation (Placement(transformation(extent={{-30,10},{-10,30}})));
+  Buildings.Templates.Components.Chillers.Compression chiWatCoo(
+    redeclare final package MediumChiWat=MediumLiq,
+    redeclare final package MediumCon=MediumLiq,
+    final typ=Buildings.Templates.Components.Types.Chiller.WaterCooled,
+    show_T=true,
+    final dat=datChiWatCoo,
+    have_dpChiWat=false,
+    have_dpCon=false,
+    final energyDynamics=energyDynamics)
+    "Water-cooled chiller - CHW/CW pressure drops computed externally"
+    annotation (Placement(transformation(extent={{40,-104},{20,-84}})));
+  Fluid.Sensors.TemperatureTwoPort TRet2(
+    redeclare final package Medium=MediumLiq,
+    final m_flow_nominal=datChiAirCoo.mChiWat_flow_nominal)
+    "Return temperature"
+    annotation (Placement(transformation(extent={{-30,-110},{-10,-90}})));
+  Fluid.Sensors.TemperatureTwoPort TSup2(
+    redeclare final package Medium=MediumLiq,
+    final m_flow_nominal=datChiAirCoo.mChiWat_flow_nominal)
+    "Supply temperature"
+    annotation (Placement(transformation(extent={{50,-110},{70,-90}})));
+  Fluid.Sources.Boundary_pT supConWat(
+    redeclare final package Medium=MediumLiq,
+    p=retConWat.p + chiWatCoo.dpCon_nominal,
+    T=datChiWatCoo.TConEnt_nominal,
+    nPorts=1)
+    "Boundary conditions of CW at chiller inlet"
+    annotation (Placement(transformation(extent={{130,-70},{110,-50}})));
+  Fluid.Sources.Boundary_pT retConWat(
+    redeclare final package Medium=MediumLiq,
+    p=Buildings.Templates.Data.Defaults.pChiWat_rel_nominal + 101325,
+    nPorts=1)
+    "Boundary condition of CW at chiller outlet"
+    annotation (Placement(transformation(extent={{-70,-70},{-50,-50}})));
+  Fluid.FixedResistances.PressureDrop resChiWat(
+    redeclare final package Medium=MediumLiq,
+    final m_flow_nominal=datChiWatCoo.mChiWat_flow_nominal,
+    final dp_nominal=datChiWatCoo.dpChiWat_nominal)
+    "CHW pressure drop computed externally"
+    annotation (Placement(transformation(extent={{-10,-110},{10,-90}})));
+  Fluid.FixedResistances.PressureDrop resConWat(
+    redeclare final package Medium=MediumLiq,
+    final m_flow_nominal=datChiWatCoo.mCon_flow_nominal,
+    final dp_nominal=datChiWatCoo.dpCon_nominal)
+    "CW pressure drop computed externally"
+    annotation (Placement(transformation(extent={{90,-70},{70,-50}})));
+  Fluid.Sources.Boundary_pT sinAir(
+    redeclare final package Medium=MediumAir,
+    nPorts=1)
+    "Air sink"
+    annotation (Placement(transformation(extent={{-70,50},{-50,70}})));
+  Fluid.Sources.MassFlowSource_T souAir(
+    redeclare final package Medium=MediumAir,
+    m_flow=datChiAirCoo.mCon_flow_nominal,
+    T=datChiAirCoo.TConEnt_nominal,
+    nPorts=1)
+    "Air source"
+    annotation (Placement(transformation(extent={{130,50},{110,70}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Sin TChiWatRet1(
+    amplitude=(datChiWatCoo.TChiWatRet_nominal - datChiWatCoo.TChiWatSup_nominal) /
+      2,
+    freqHz=2 / 3000,
+    y(final unit="K",
+      displayUnit="degC"),
+    offset=datChiWatCoo.TChiWatSup_nominal +(datChiAirCoo.TChiWatRet_nominal -
+      datChiWatCoo.TChiWatSup_nominal) / 2,
+    startTime=0)
+    "CHW return temperature value"
+    annotation (Placement(transformation(extent={{-120,-106},{-100,-86}})));
+  Fluid.Sources.Boundary_pT retChiWat1(
+    redeclare final package Medium=MediumLiq,
+    p=supChiWat.p + chiAirCoo.dpChiWat_nominal,
+    use_T_in=true,
+    nPorts=1)
+    "Boundary conditions of CHW at chiller inlet"
+    annotation (Placement(transformation(extent={{-70,-110},{-50,-90}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant TChiWatSupSet1(
+    k=datChiWatCoo.TChiWatSup_nominal,
+    y(final unit="K",
+      displayUnit="degC"))
+    "CHWST setpoint"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,
+      origin={-110,-40})));
+protected
+  Interfaces.Bus bus
+    "Chiller control bus"
+    annotation (Placement(transformation(extent={{-20,60},{20,100}}),
+      iconTransformation(extent={{-276,6},{-236,46}})));
+  Interfaces.Bus bus2
+    "Chiller control bus"
+    annotation (Placement(transformation(extent={{-20,-60},{20,-20}}),
+      iconTransformation(extent={{-276,6},{-236,46}})));
+initial equation
+  Modelica.Utilities.Streams.print("Coef at rating conditions = " + String(Buildings.Utilities.Math.Functions.biquadratic(
+    a=datChiWatCoo.per.capFunT,
+    x1=Modelica.Units.Conversions.to_degC(datChiWatCoo.per.TEvaLvg_nominal),
+    x2=Modelica.Units.Conversions.to_degC(datChiWatCoo.per.TConLvg_nominal))));
+equation
+  connect(TSup.port_b, supChiWat.ports[1])
+    annotation (Line(points={{70,20},{110,20},{110,19}},color={0,127,255}));
+  connect(y1.y[1], bus.y1)
+    annotation (Line(points={{-98,120},{0,120},{0,80}},color={255,0,255}));
+  connect(bus, chiAirCoo.bus)
+    annotation (Line(points={{0,80},{30,80},{30,36}},color={255,204,51},thickness=0.5));
+  connect(retChiWat.ports[1], TRet.port_a)
+    annotation (Line(points={{-50,20},{-40,20},{-40,20},{-30,20}},color={0,127,255}));
+  connect(TSup2.port_b, supChiWat.ports[2])
+    annotation (Line(points={{70,-100},{100,-100},{100,20},{110,20},{110,21}},
+      color={0,127,255}));
+  connect(bus2, chiWatCoo.bus)
+    annotation (Line(points={{0,-40},{30,-40},{30,-84}},color={255,204,51},thickness=0.5));
+  connect(y1.y[1], bus2.y1)
+    annotation (Line(points={{-98,120},{0,120},{0,-40}},color={255,0,255}));
+  connect(TRet2.port_b, resChiWat.port_a)
+    annotation (Line(points={{-10,-100},{-10,-100}},color={0,127,255}));
+  connect(supConWat.ports[1], resConWat.port_a)
+    annotation (Line(points={{110,-60},{90,-60}},color={0,127,255}));
+  connect(TRet.port_b, chiAirCoo.port_a2)
+    annotation (Line(points={{-10,20},{20,20}},color={0,127,255}));
+  connect(chiAirCoo.port_b2, TSup.port_a)
+    annotation (Line(points={{40,20},{50,20}},color={0,127,255}));
+  connect(chiWatCoo.port_b2, TSup2.port_a)
+    annotation (Line(points={{40,-100},{50,-100}},color={0,127,255}));
+  connect(resChiWat.port_b, chiWatCoo.port_a2)
+    annotation (Line(points={{10,-100},{20,-100}},color={0,127,255}));
+  connect(resConWat.port_b, chiWatCoo.port_a1)
+    annotation (Line(points={{70,-60},{40,-60},{40,-88}},color={0,127,255}));
+  connect(chiWatCoo.port_b1, retConWat.ports[1])
+    annotation (Line(points={{20,-88},{20,-60},{-50,-60}},color={0,127,255}));
+  connect(TChiWatRet.y, retChiWat.T_in)
+    annotation (Line(points={{-98,24},{-72,24}},color={0,0,127}));
+  connect(TChiWatSupSet.y, bus.TSupSet)
+    annotation (Line(points={{-98,80},{0,80}},color={0,0,127}));
+  connect(sinAir.ports[1], chiAirCoo.port_b1)
+    annotation (Line(points={{-50,60},{20,60},{20,32}},color={0,127,255}));
+  connect(souAir.ports[1], chiAirCoo.port_a1)
+    annotation (Line(points={{110,60},{40,60},{40,32}},color={0,127,255}));
+  connect(TChiWatRet1.y, retChiWat1.T_in)
+    annotation (Line(points={{-98,-96},{-72,-96}},color={0,0,127}));
+  connect(retChiWat1.ports[1], TRet2.port_a)
+    annotation (Line(points={{-50,-100},{-30,-100}},color={0,127,255}));
+  connect(TChiWatSupSet1.y, bus2.TSupSet)
+    annotation (Line(points={{-98,-40},{0,-40}},color={0,0,127}));
+  annotation (
+    Diagram(
+      coordinateSystem(
+        extent={{-140,-140},{140,140}})),
+    __Dymola_Commands(
+      file=
+        "modelica://Buildings/Resources/Scripts/Dymola/Templates/Components/Chillers/Validation/Compression.mos"
+        "Simulate and plot"),
+    experiment(
+      Tolerance=1e-6,
+      StartTime=0.0,
+      StopTime=8000.0),
+    Documentation(
+      info="<html>
+<p>
+This model validates the model
+<a href=\"modelica://Buildings.Templates.Components.Chillers.Compression\">
+Buildings.Templates.Components.Chillers.Compression</a>
+in a configuration in which the chiller is exposed
+to a constant differential pressure and a varying
+return temperature.
+</p>
+<p>
+The chiller model is configured to represent either an air-cooled
+chiller (component <code>chiAirCoo</code>) or a water-cooled
+chiller (component <code>chiWatCoo</code>).
+</p>
+<p>
+Regarding the parameterization logic described in the documentation of 
+<a href=\"modelica://Buildings.Templates.Components.Chillers.Compression\">
+Buildings.Templates.Components.Chillers.Compression</a>:
+The air-cooled chiller component is parameterized using the 
+specified design conditions (<code>datChiAirCoo.use_datDes=true</code>)
+and a direct assignment of the performance curves
+<code>per.capFunT</code>, <code>per.EIRFunT</code> and <code>per.EIRFunPLR</code>.
+The water-cooled chiller component is parameterized using the 
+rating conditions specified in the redeclared performance record
+(<code>datChiWatCoo.use_datDes=false</code>) and no direct assignment
+of the design parameters.
+</p>
+</html>",
+      revisions="<html>
+<ul>
+<li>
+May 31, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end Compression;
diff --git a/Buildings/Templates/Components/Chillers/Validation/package.mo b/Buildings/Templates/Components/Chillers/Validation/package.mo
new file mode 100644
index 00000000000..f04db53974b
--- /dev/null
+++ b/Buildings/Templates/Components/Chillers/Validation/package.mo
@@ -0,0 +1,10 @@
+within Buildings.Templates.Components.Chillers;
+package Validation
+  "Package with validation models"
+  extends Modelica.Icons.ExamplesPackage;
+  annotation (Documentation(info="<html>
+<p>
+This package contains validation models.
+</p>
+</html>"));
+end Validation;
diff --git a/Buildings/Templates/Components/Chillers/Validation/package.order b/Buildings/Templates/Components/Chillers/Validation/package.order
new file mode 100644
index 00000000000..d336b6ea332
--- /dev/null
+++ b/Buildings/Templates/Components/Chillers/Validation/package.order
@@ -0,0 +1 @@
+Compression
diff --git a/Buildings/Templates/Components/Chillers/package.mo b/Buildings/Templates/Components/Chillers/package.mo
new file mode 100644
index 00000000000..db8cff17dad
--- /dev/null
+++ b/Buildings/Templates/Components/Chillers/package.mo
@@ -0,0 +1,10 @@
+within Buildings.Templates.Components;
+package Chillers
+  "Chiller models"
+  extends Modelica.Icons.VariantsPackage;
+  annotation (Documentation(info="<html>
+<p>
+This package contains models for chillers.
+</p>
+</html>"));
+end Chillers;
diff --git a/Buildings/Templates/Components/Chillers/package.order b/Buildings/Templates/Components/Chillers/package.order
new file mode 100644
index 00000000000..9bb5de2bd41
--- /dev/null
+++ b/Buildings/Templates/Components/Chillers/package.order
@@ -0,0 +1,2 @@
+Compression
+Validation
diff --git a/Buildings/Templates/Components/Controls/StatusEmulator.mo b/Buildings/Templates/Components/Controls/StatusEmulator.mo
index d5748ff650d..0b5a03851a7 100644
--- a/Buildings/Templates/Components/Controls/StatusEmulator.mo
+++ b/Buildings/Templates/Components/Controls/StatusEmulator.mo
@@ -19,18 +19,19 @@ block StatusEmulator "Block that emulates the status of an equipment"
   Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1_actual
     "Equipment status" annotation (Placement(transformation(extent={{100,-20},{140,
             20}}), iconTransformation(extent={{100,-20},{140,20}})));
-  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea(final realTrue=1,
-      final realFalse=0) "Convert to real"
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea(
+    final realTrue=1,
+    final realFalse=0)
+    "Convert to real"
     annotation (Placement(transformation(extent={{-70,-10},{-50,10}})));
-  Fluid.BaseClasses.ActuatorFilter fil(
+  Buildings.Fluid.BaseClasses.ActuatorFilter fil(
     final f=fCut,
     final initType=initType,
     final y_start=y_start)
     "Filter signal"
     annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
-
   Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr(final t=yLim)
-    "Compare filtered signal to zero to trigger true status"
+    "Compare filtered signal to threshold to trigger true status"
     annotation (Placement(transformation(extent={{50,-10},{70,10}})));
 protected
   final parameter Modelica.Units.SI.Frequency fCut=5/(2*Modelica.Constants.pi*
@@ -66,15 +67,15 @@ the current on/off state as reported by the hardware itself.
 The implementation is based on
 <a href=\"modelica://Buildings.Fluid.BaseClasses.ActuatorFilter\">
 Buildings.Fluid.BaseClasses.ActuatorFilter</a>
-and the model is configured with <code>yLim=0.5</code> so that 
-the delay between the on command and the on status is 
+and the model is configured with <code>yLim=0.5</code> so that
+the delay between the on command and the on status is
 equal to the delay between the off command and the off status
 (about <i>2</i>&nbsp;s with the default parameter settings).
-Note that this delay may not be representative of the actual 
+Note that this delay may not be representative of the actual
 dynamics of certain equipment such as chillers or heat pumps.
-In addition, this block uses the equipment command signal to 
-generate the status signal, which in turn can lead to inconsistencies 
-with certain equipment that run cyclically at low load and 
+In addition, this block uses the equipment command signal to
+generate the status signal, which in turn can lead to inconsistencies
+with certain equipment that run cyclically at low load and
 where the status then comes and goes.
 </p>
 </html>", revisions="<html>
diff --git a/Buildings/Templates/Components/Data/Chiller.mo b/Buildings/Templates/Components/Data/Chiller.mo
new file mode 100644
index 00000000000..b90430f553e
--- /dev/null
+++ b/Buildings/Templates/Components/Data/Chiller.mo
@@ -0,0 +1,273 @@
+within Buildings.Templates.Components.Data;
+record Chiller
+  "Record for chiller model"
+  extends Modelica.Icons.Record;
+  parameter Boolean use_datDes=true
+    "Set to true to use specified design conditions, false to use data from performance record"
+    annotation (Evaluate=true,
+    __ctrlFlow(enable=false));
+  parameter Buildings.Templates.Components.Types.Chiller typ
+    "Type of chiller"
+    annotation (Evaluate=true,
+    Dialog(group="Configuration",
+      enable=false));
+  parameter Modelica.Units.SI.SpecificHeatCapacity cpChiWat_default=Buildings.Utilities.Psychrometrics.Constants.cpWatLiq
+    "CHW default specific heat capacity"
+    annotation (Dialog(group="Configuration",
+      enable=false));
+  parameter Modelica.Units.SI.SpecificHeatCapacity cpCon_default=if typ ==
+    Buildings.Templates.Components.Types.Chiller.AirCooled then Buildings.Utilities.Psychrometrics.Constants.cpAir
+    else Buildings.Utilities.Psychrometrics.Constants.cpWatLiq
+    "Condenser cooling fluid default specific heat capacity"
+    annotation (Dialog(group="Configuration",
+      enable=false));
+  parameter Modelica.Units.SI.MassFlowRate mChiWat_flow_nominal(
+    start=if not use_datDes then per.mEva_flow_nominal else 1E-3,
+    final min=0)
+    "CHW mass flow rate"
+    annotation (Dialog(group="Nominal condition",
+      enable=typ<>Buildings.Templates.Components.Types.Chiller.None and use_datDes));
+  parameter Modelica.Units.SI.MassFlowRate mCon_flow_nominal(
+    start=if not use_datDes then per.mCon_flow_nominal elseif typ == Buildings.Templates.Components.Types.Chiller.AirCooled
+      then Buildings.Templates.Data.Defaults.mAirFloByCapChi * abs(cap_nominal)
+      else 1E-3,
+    final min=0)
+    "Condenser cooling fluid (e.g. CW) mass flow rate"
+    annotation (Dialog(group="Nominal condition",
+      enable=typ==Buildings.Templates.Components.Types.Chiller.WaterCooled and use_datDes));
+  parameter Modelica.Units.SI.HeatFlowRate cap_nominal(
+    start=if not use_datDes then abs(per.QEva_flow_nominal) else 1E-3)
+    "Cooling capacity"
+    annotation (Dialog(group="Nominal condition",
+      enable=typ<>Buildings.Templates.Components.Types.Chiller.None and use_datDes));
+  final parameter Modelica.Units.SI.HeatFlowRate QCon_flow_nominal(
+    final min=0)=abs(cap_nominal) *(1 / COP_nominal + 1)
+    "Condenser heat flow rate"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Real COP_nominal(
+    start=if not use_datDes then per.COP_nominal else Buildings.Templates.Data.Defaults.COPChiAirCoo,
+    final min=1,
+    final unit="1")
+    "Cooling COP"
+    annotation (Dialog(group="Nominal condition",
+      enable=typ<>Buildings.Templates.Components.Types.Chiller.None and use_datDes));
+  parameter Modelica.Units.SI.PressureDifference dpChiWat_nominal(
+    final min=0,
+    start=if typ == Buildings.Templates.Components.Types.Chiller.None then 0
+      else Buildings.Templates.Data.Defaults.dpChiWatChi)
+    "CHW pressure drop"
+    annotation (Dialog(group="Nominal condition",
+      enable=typ<>Buildings.Templates.Components.Types.Chiller.None));
+  parameter Modelica.Units.SI.PressureDifference dpCon_nominal(
+    final min=0,
+    start=if typ == Buildings.Templates.Components.Types.Chiller.WaterCooled
+      then Buildings.Templates.Data.Defaults.dpConWatChi elseif typ == Buildings.Templates.Components.Types.Chiller.AirCooled
+      then Buildings.Templates.Data.Defaults.dpAirChi else 0)
+    "Condenser cooling fluid pressure drop"
+    annotation (Dialog(group="Nominal condition",
+      enable=typ==Buildings.Templates.Components.Types.Chiller.WaterCooled));
+  parameter Modelica.Units.SI.Temperature TChiWatSup_nominal(
+    start=if not use_datDes then per.TEvaLvg_nominal else Buildings.Templates.Data.Defaults.TChiWatSup,
+    final min=260)
+    "CHW supply temperature"
+    annotation (Dialog(group="Nominal condition",
+      enable=typ<>Buildings.Templates.Components.Types.Chiller.None and use_datDes));
+  final parameter Modelica.Units.SI.Temperature TChiWatRet_nominal(
+    final min=260)=if typ == Buildings.Templates.Components.Types.Chiller.None
+    then TChiWatSup_nominal else TChiWatSup_nominal + abs(cap_nominal) /
+    cpChiWat_default / mChiWat_flow_nominal
+    "CHW return temperature"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.Temperature TChiWatSup_min(
+    start=if not use_datDes then per.TEvaLvgMin else Buildings.Templates.Data.Defaults.TChiWatSup_min)=
+    Buildings.Templates.Data.Defaults.TChiWatSup_min
+    "Minimum CHW supply temperature"
+    annotation (Dialog(group="Operating limits",
+      enable=typ<>Buildings.Templates.Components.Types.Chiller.None and use_datDes));
+  parameter Modelica.Units.SI.Temperature TChiWatSup_max(
+    start=if not use_datDes then per.TEvaLvgMax else Buildings.Templates.Data.Defaults.TChiWatSup_max)=
+    Buildings.Templates.Data.Defaults.TChiWatSup_max
+    "Maximum CHW supply temperature"
+    annotation (Dialog(group="Operating limits",
+      enable=typ<>Buildings.Templates.Components.Types.Chiller.None and use_datDes));
+  parameter Modelica.Units.SI.Temperature TConEnt_nominal(
+    final min=273.15,
+    start=if not use_datDes then per.TConLvg_nominal - QCon_flow_nominal /
+      mCon_flow_nominal / cpCon_default else Buildings.Templates.Data.Defaults.TConEnt_max)
+    "Condenser entering fluid temperature (CW or air)"
+    annotation (Dialog(group="Nominal condition",
+      enable=typ<>Buildings.Templates.Components.Types.Chiller.None and use_datDes));
+  // The following parameter is not declared as final to allow parameterization
+  // based on leaving CHW temperature.
+  parameter Modelica.Units.SI.Temperature TConLvg_nominal=if not use_datDes then per.TConLvg_nominal
+    else TConEnt_nominal + QCon_flow_nominal / mCon_flow_nominal / cpCon_default
+    "Condenser leaving fluid temperature (CW or air)"
+    annotation (Dialog(group="Nominal condition",
+      enable=typ<>Buildings.Templates.Components.Types.Chiller.None and use_datDes));
+  parameter Modelica.Units.SI.Temperature TConLvg_min(
+    start=if not use_datDes then per.TConLvgMin else Buildings.Templates.Data.Defaults.TConLvg_min,
+    final min=273.15)=Buildings.Templates.Data.Defaults.TConLvg_min
+    "Minimum condenser leaving fluid temperature (CW or air)"
+    annotation (Dialog(group="Operating limits",
+      enable=typ<>Buildings.Templates.Components.Types.Chiller.None and use_datDes));
+  parameter Modelica.Units.SI.Temperature TConLvg_max(
+    start=if not use_datDes then per.TConLvgMax else Buildings.Templates.Data.Defaults.TConLvg_max,
+    final min=273.15)=Buildings.Templates.Data.Defaults.TConLvg_max
+    "Maximum condenser leaving fluid temperature (CW or air)"
+    annotation (Dialog(group="Operating limits",
+      enable=typ<>Buildings.Templates.Components.Types.Chiller.None and use_datDes));
+  parameter Real PLRUnl_min(
+    start=if not use_datDes then per.PLRMinUnl else 0,
+    final min=PLR_min,
+    final max=1)=PLR_min
+    "Minimum unloading ratio (before engaging hot gas bypass, if any)"
+    annotation (Dialog(enable=typ<>Buildings.Templates.Components.Types.Chiller.None
+      and use_datDes));
+  parameter Real PLR_min(
+    start=if not use_datDes then per.PLRMin else 0,
+    final min=0,
+    final max=1)=0.15
+    "Minimum part load ratio before cycling"
+    annotation (Dialog(enable=typ<>Buildings.Templates.Components.Types.Chiller.None
+      and use_datDes));
+  replaceable parameter Buildings.Fluid.Chillers.Data.ElectricReformulatedEIR.Generic per(
+    TConLvg_nominal=if use_datDes then TConLvg_nominal else 273.15,
+    TConLvgMin=if use_datDes then TConLvg_min else 273.15,
+    TConLvgMax=if use_datDes then TConLvg_max else 273.15,
+    COP_nominal=if use_datDes then COP_nominal else 1.1,
+    QEva_flow_nominal=if use_datDes then - abs(cap_nominal) else 1E-3,
+    TEvaLvg_nominal=if use_datDes then TChiWatSup_nominal else 273.15,
+    TEvaLvgMin=if use_datDes then TChiWatSup_nominal else 273.15,
+    TEvaLvgMax=if use_datDes then TChiWatSup_max else 273.15,
+    PLRMin=if use_datDes then PLR_min else 0,
+    PLRMinUnl=if use_datDes then PLRUnl_min else 0,
+    PLRMax=1.0,
+    etaMotor=1.0,
+    mEva_flow_nominal=if use_datDes then mChiWat_flow_nominal else 1E-3,
+    mCon_flow_nominal=if use_datDes then mCon_flow_nominal else 1E-3,
+    capFunT={1, 0, 0, 0, 0, 0},
+    EIRFunT={1, 0, 0, 0, 0, 0},
+    EIRFunPLR={1, 0, 0, 0, 0, 0, 0, 0, 0, 0})
+    constrainedby Buildings.Fluid.Chillers.Data.ElectricReformulatedEIR.Generic
+    "Chiller performance data"
+    annotation (choicesAllMatching=true,
+    Dialog(enable=typ<>Buildings.Templates.Components.Types.Chiller.None and use_datDes));
+  final parameter Real COPPer_nominal(
+    final min=0,
+    final unit="1")=if typ == Buildings.Templates.Components.Types.Chiller.None
+    then per.COP_nominal else per.COP_nominal / Buildings.Utilities.Math.Functions.biquadratic(
+    a=per.EIRFunT,
+    x1=Modelica.Units.Conversions.to_degC(TChiWatSup_nominal),
+    x2=Modelica.Units.Conversions.to_degC(TConLvg_nominal)) / Buildings.Utilities.Math.Functions.bicubic(
+    a=per.EIRFunPLR,
+    x1=Modelica.Units.Conversions.to_degC(TConLvg_nominal),
+    x2=1)
+    "Cooling COP computed from performance record"
+    annotation (Dialog(group="Nominal condition"));
+  final parameter Modelica.Units.SI.HeatFlowRate capPer_flow_nominal=if typ ==
+    Buildings.Templates.Components.Types.Chiller.None then abs(per.QEva_flow_nominal)
+    else abs(per.QEva_flow_nominal) * Buildings.Utilities.Math.Functions.biquadratic(
+    a=per.capFunT,
+    x1=Modelica.Units.Conversions.to_degC(TChiWatSup_nominal),
+    x2=Modelica.Units.Conversions.to_degC(TConLvg_nominal))
+    "Cooling capacity computed from performance record"
+    annotation (Dialog(group="Nominal condition"));
+  final parameter Buildings.Fluid.Chillers.Data.ElectricReformulatedEIR.Generic perSca(
+    final COP_nominal=per.COP_nominal * COP_nominal / COPPer_nominal,
+    final QEva_flow_nominal=per.QEva_flow_nominal * abs(cap_nominal) /
+      capPer_flow_nominal,
+    final EIRFunPLR=per.EIRFunPLR,
+    final EIRFunT=per.EIRFunT,
+    final PLRMax=per.PLRMax,
+    final PLRMin=per.PLRMin,
+    final PLRMinUnl=per.PLRMinUnl,
+    final TConLvgMax=per.TConLvgMax,
+    final TConLvgMin=per.TConLvgMin,
+    final TConLvg_nominal=per.TConLvg_nominal,
+    final TEvaLvgMax=per.TEvaLvgMax,
+    final TEvaLvgMin=per.TEvaLvgMin,
+    final TEvaLvg_nominal=per.TEvaLvg_nominal,
+    final capFunT=per.capFunT,
+    final etaMotor=per.etaMotor,
+    final mCon_flow_nominal=per.mCon_flow_nominal,
+    final mEva_flow_nominal=per.mEva_flow_nominal)
+    "Chiller performance data scaled to specified design capacity and COP"
+    annotation (choicesAllMatching=true);
+  annotation (
+    defaultComponentPrefixes="parameter",
+    defaultComponentName="datChi",
+    Documentation(
+      info="<html>
+<p>
+This record provides the set of sizing and operating parameters for
+the classes within
+<a href=\"modelica://Buildings.Templates.Components.Chillers\">
+Buildings.Templates.Components.Chillers</a>.
+It is composed of a set of parameters corresponding to the design
+(selection) conditions and a sub-record <code>per</code> corresponding
+to the rating conditions at which the performance curves are calculated.
+</p>
+<p>
+The record allows two different parameterization logics, depending
+on the value of the parameter <code>use_datDes</code>.
+(The user can refer to the valiation model
+<a href=\"modelica://Buildings.Templates.Components.Chillers.Validation.Compression\">
+Buildings.Templates.Components.Chillers.Validation.Compression</a>
+for an illustration of these two logics.)
+</p>
+<ul>
+<li>
+If <code>use_datDes=true</code> &ndash; default setting that should be
+used in most cases: The performance data specified in the sub-record
+<code>per</code> are \"translated\" so that the capacity and <i>COP</i>
+calculated at design conditions match the design values
+<code>cap_nominal</code> and <code>COP_nominal</code>.
+The performance data that result from this translation are stored in
+the sub-record <code>perSca</code> which is ultimately used by the chiller models within
+<a href=\"modelica://Buildings.Templates.Components.Chillers\">
+Buildings.Templates.Components.Chillers</a>.<br/>
+Note that the performance data can be specified either by redeclaring
+the sub-record <code>per</code>, or by simply assigning the performance
+curves <code>per.capFunT</code>, <code>per.EIRFunT</code> and <code>per.EIRFunPLR</code>
+in case these curves were calculated based on the design conditions.
+To support the latter, the design conditions are propagated \"down\" to
+the sub-record <code>per</code> but these bindings do not persist
+after redeclaration so that a record at different rating conditions can
+also be used.
+</li>
+<li>
+If <code>use_datDes=false</code> &ndash; non-default setting that should only be
+used if the rating conditions match the design conditions:
+The rating conditions specified in the sub-record
+<code>per</code> are propagated \"up\" (via the <code>start</code> attribute)
+and used as design conditions.
+The sub-record <code>perSca</code> which is ultimately used by the chiller models within
+<a href=\"modelica://Buildings.Templates.Components.Chillers\">
+Buildings.Templates.Components.Chillers</a>
+is then identical to the sub-record <code>per</code>.
+When using this logic, no assignment shall be made for the design
+parameters, except for the design pressure drops <code>dp*_nominal</code>.
+</li>
+</ul>
+<p>
+note that placeholders values are assigned to the performance curves,
+the reference source temperature and the input power in
+cooling mode to avoid assigning these parameters in case of non-reversible
+heat pumps.
+These values are unrealistic and must be overwritten for reversible heat pumps, which
+is always the case when redeclaring or
+reassigning the performance record <code>per</code>.
+Models that use this record will issue a warning if these placeholders values
+are not overwritten in case of reversible heat pumps.
+</p>
+<p>
+Note that placeholders values are assigned to the chiller performance curves
+(<code>per.capFunT</code> , <code>per.EIRFunT</code> and <code>per.EIRFunPLR</code>)
+to avoid assigning these parameters if
+<code>typ=Buildings.Templates.Components.Types.Chiller.None</code>.
+If the chiller type is not <code>None</code> these values are unrealistic
+and must be overwritten, which is always the case when redeclaring or
+reassigning the performance record <code>per</code>.
+</p>
+</html>"));
+end Chiller;
diff --git a/Buildings/Templates/Components/Data/Coil.mo b/Buildings/Templates/Components/Data/Coil.mo
index bfb0e77d730..e643f84592a 100644
--- a/Buildings/Templates/Components/Data/Coil.mo
+++ b/Buildings/Templates/Components/Data/Coil.mo
@@ -123,7 +123,10 @@ the maximum value from the performance data record.
     annotation(choicesAllMatching=true, Dialog(
       enable=typ==Buildings.Templates.Components.Types.Coil.EvaporatorMultiStage or
       typ==Buildings.Templates.Components.Types.Coil.EvaporatorVariableSpeed));
-  annotation (Documentation(info="<html>
+  annotation (
+  defaultComponentPrefixes = "parameter",
+  defaultComponentName="datCoi",
+  Documentation(info="<html>
 <p>
 This record provides the set of sizing parameters for
 the classes within
diff --git a/Buildings/Templates/Components/Data/Damper.mo b/Buildings/Templates/Components/Data/Damper.mo
index 5e20cd44588..d0be65d6e8d 100644
--- a/Buildings/Templates/Components/Data/Damper.mo
+++ b/Buildings/Templates/Components/Data/Damper.mo
@@ -29,7 +29,10 @@ record Damper "Record for damper model"
     "Air pressure drop of fixed elements in series with damper"
     annotation (
       Dialog(group="Mechanical", enable=false));
-  annotation (Documentation(info="<html>
+  annotation (
+  defaultComponentPrefixes = "parameter",
+  defaultComponentName="datDam",
+  Documentation(info="<html>
 <p>
 This record provides the set of sizing parameters for
 the class
diff --git a/Buildings/Templates/Components/Data/Fan.mo b/Buildings/Templates/Components/Data/Fan.mo
index ea896de7270..8e18a418962 100644
--- a/Buildings/Templates/Components/Data/Fan.mo
+++ b/Buildings/Templates/Components/Data/Fan.mo
@@ -37,7 +37,10 @@ record Fan "Record for fan model"
       choicesAllMatching=true,
       Dialog(enable=typ <> Buildings.Templates.Components.Types.Fan.None),
       Placement(transformation(extent={{-90,-88},{-70,-68}})));
-  annotation (Documentation(info="<html>
+  annotation (
+  defaultComponentPrefixes = "parameter",
+  defaultComponentName="datFan",
+  Documentation(info="<html>
 <p>
 This record provides the set of sizing parameters for
 the classes within
diff --git a/Buildings/Templates/Components/Data/HeatPump.mo b/Buildings/Templates/Components/Data/HeatPump.mo
index 0ac75bdbb64..9a80ba95c88 100644
--- a/Buildings/Templates/Components/Data/HeatPump.mo
+++ b/Buildings/Templates/Components/Data/HeatPump.mo
@@ -156,7 +156,7 @@ record HeatPump "Record for heat pump model"
 
 annotation (
   defaultComponentPrefixes="parameter",
-  defaultComponentName="dat",
+  defaultComponentName="datHp",
   Documentation(info="<html>
 <p>
 This record provides the set of sizing and operating parameters for
diff --git a/Buildings/Templates/Components/Data/PumpMultiple.mo b/Buildings/Templates/Components/Data/PumpMultiple.mo
index 8db05d478a8..97bbdb3f141 100644
--- a/Buildings/Templates/Components/Data/PumpMultiple.mo
+++ b/Buildings/Templates/Components/Data/PumpMultiple.mo
@@ -41,6 +41,7 @@ record PumpMultiple "Record for multiple-pump models"
     annotation(Dialog(enable=false));
 
   annotation (
+  defaultComponentPrefixes = "parameter",
   defaultComponentName="datPum", Documentation(info="<html>
 <p>
 This record provides the set of sizing and operating parameters for 
diff --git a/Buildings/Templates/Components/Data/PumpSingle.mo b/Buildings/Templates/Components/Data/PumpSingle.mo
index 4442b7755b2..bec7711352c 100644
--- a/Buildings/Templates/Components/Data/PumpSingle.mo
+++ b/Buildings/Templates/Components/Data/PumpSingle.mo
@@ -20,8 +20,10 @@ record PumpSingle "Record for single pump model"
       enable=typ<>Buildings.Templates.Components.Types.Pump.None));
   replaceable parameter Buildings.Fluid.Movers.Data.Generic per(
     pressure(
-      V_flow={0, 1, 2} * m_flow_nominal / rho_default,
-      dp={1.14, 1, 0.42} * dp_nominal))
+      V_flow=if typ<>Buildings.Templates.Components.Types.Pump.None then
+      {0, 1, 2} * m_flow_nominal / rho_default else {0,0,0},
+      dp=if typ<>Buildings.Templates.Components.Types.Pump.None then
+      {1.14, 1, 0.42} * dp_nominal else {0,0,0}))
     constrainedby Buildings.Fluid.Movers.Data.Generic
     "Performance data"
     annotation(Dialog(enable=typ<>Buildings.Templates.Components.Types.Pump.None));
@@ -32,6 +34,7 @@ record PumpSingle "Record for single pump model"
     annotation(Dialog(enable=false));
 
   annotation (
+  defaultComponentPrefixes = "parameter",
   defaultComponentName="datPum", Documentation(info="<html>
 <p>
 This record provides the set of sizing and operating parameters for 
diff --git a/Buildings/Templates/Components/Data/Valve.mo b/Buildings/Templates/Components/Data/Valve.mo
index 30344da1004..3f5f1591d3b 100644
--- a/Buildings/Templates/Components/Data/Valve.mo
+++ b/Buildings/Templates/Components/Data/Valve.mo
@@ -33,7 +33,10 @@ record Valve "Record for valve model"
       enable=typ==Buildings.Templates.Components.Types.Valve.ThreeWayTwoPosition or
         typ==Buildings.Templates.Components.Types.Valve.ThreeWayModulating));
 
-  annotation (Documentation(info="<html>
+  annotation (
+  defaultComponentPrefixes = "parameter",
+  defaultComponentName="datVal",
+  Documentation(info="<html>
 <p>
 This record provides the set of sizing parameters for
 the class
diff --git a/Buildings/Templates/Components/Data/package.order b/Buildings/Templates/Components/Data/package.order
index 4c65b6dc152..8eee7a71d44 100644
--- a/Buildings/Templates/Components/Data/package.order
+++ b/Buildings/Templates/Components/Data/package.order
@@ -1,3 +1,4 @@
+Chiller
 Coil
 Damper
 Fan
diff --git a/Buildings/Templates/Components/HeatPumps/Validation/HeatPumpEquationFit.mo b/Buildings/Templates/Components/HeatPumps/Validation/HeatPumpEquationFit.mo
index d61e7670dae..946c76e98d5 100644
--- a/Buildings/Templates/Components/HeatPumps/Validation/HeatPumpEquationFit.mo
+++ b/Buildings/Templates/Components/HeatPumps/Validation/HeatPumpEquationFit.mo
@@ -58,7 +58,7 @@ model HeatPumpEquationFit
         coeP={-5.8086010402,1.6894933858,5.1167787436,0,0},
         TRefLoa=Buildings.Templates.Data.Defaults.TChiWatRet,
         TRefSou=Buildings.Templates.Data.Defaults.TOutHpCoo)))
-    "Reversible AWHP parameters parameters"
+    "Reversible AWHP parameters"
     annotation (Placement(transformation(extent={{120,22},{140,42}})));
 
   Buildings.Controls.OBC.CDL.Reals.Sources.Constant TChiWatSupSet(k=datHpAw.TChiWatSup_nominal,
@@ -152,6 +152,7 @@ model HeatPumpEquationFit
     annotation (Placement(transformation(extent={{50,-10},{70,10}})));
   AirToWater hpAwNrv(
     is_rev=false,
+    redeclare final package MediumHeaWat = Medium,
     final energyDynamics=energyDynamics,
     final dat=datHpAwNrv) "Non reversible AWHP"
     annotation (Placement(transformation(extent={{100,70},{120,90}})));
@@ -169,8 +170,8 @@ model HeatPumpEquationFit
     redeclare final package MediumHeaWat = Medium,
     final dat=datHpWw,
     final energyDynamics=energyDynamics,
-    have_preDroChiHeaWat=false,
-    have_preDroSou=false)
+    have_dpChiHeaWat=false,
+    have_dpSou=false)
     "Reversible WWHP - CHW/HW and source fluid pressure drops computed externally"
     annotation (Placement(transformation(extent={{100,-90},{120,-70}})));
   parameter Data.HeatPump datHpWw(
@@ -204,7 +205,7 @@ model HeatPumpEquationFit
         coeP={-5.8086010402,1.6894933858,5.1167787436,0,0},
         TRefLoa=Buildings.Templates.Data.Defaults.TChiWatRet,
         TRefSou=Buildings.Templates.Data.Defaults.TSouHpCoo)))
-    "Reversible WWHP parameters parameters"
+    "Reversible WWHP parameters"
     annotation (Placement(transformation(extent={{120,-60},{140,-40}})));
 
   Fluid.Sensors.TemperatureTwoPort TRet2(redeclare final package Medium =
@@ -404,7 +405,7 @@ equation
 This model validates the models
 <a href=\"modelica://Buildings.Templates.Components.HeatPumps.AirToWater\">
 Buildings.Templates.Components.HeatPumps.AirToWater</a>
-and 
+and
 <a href=\"modelica://Buildings.Templates.Components.HeatPumps.WaterToWater\">
 Buildings.Templates.Components.HeatPumps.WaterToWater</a>
 in a configuration in which the heat pump components are exposed
diff --git a/Buildings/Templates/Components/Interfaces/PartialChiller.mo b/Buildings/Templates/Components/Interfaces/PartialChiller.mo
new file mode 100644
index 00000000000..4de7eeb6af4
--- /dev/null
+++ b/Buildings/Templates/Components/Interfaces/PartialChiller.mo
@@ -0,0 +1,119 @@
+within Buildings.Templates.Components.Interfaces;
+partial model PartialChiller
+  "Interface class for chiller models"
+  extends Buildings.Fluid.Interfaces.PartialFourPortInterface(
+    redeclare final package Medium1=MediumCon,
+    redeclare final package Medium2=MediumChiWat,
+    final m1_flow_nominal=mCon_flow_nominal,
+    final m2_flow_nominal=mChiWat_flow_nominal);
+  replaceable package MediumChiWat=Buildings.Media.Water
+    constrainedby Modelica.Media.Interfaces.PartialMedium
+    "CHW medium"
+    annotation (__ctrlFlow(enable=false));
+  replaceable package MediumCon=Buildings.Media.Water
+    constrainedby Modelica.Media.Interfaces.PartialMedium
+    "Medium model for condenser cooling fluid"
+    annotation (__ctrlFlow(enable=false));
+  parameter Buildings.Templates.Components.Types.Chiller typ
+    "Type of chiller"
+    annotation (Evaluate=true,
+    Dialog(group="Configuration",
+      enable=false));
+  parameter Boolean have_switchover=false
+    "Set to true for heat recovery chiller with built-in switchover"
+    annotation (Evaluate=true,
+    Dialog(group="Configuration",
+      enable=false));
+  parameter Buildings.Templates.Components.Data.Chiller dat(
+    typ=typ,
+    cpChiWat_default=cpChiWat_default,
+    cpCon_default=cpCon_default)
+    "Design and operating parameters"
+    annotation (Placement(transformation(extent={{70,80},{90,100}})),
+    __ctrlFlow(enable=false));
+  final parameter Modelica.Units.SI.MassFlowRate mChiWat_flow_nominal=dat.mChiWat_flow_nominal
+    "CHW mass flow rate";
+  final parameter Modelica.Units.SI.MassFlowRate mCon_flow_nominal=dat.mCon_flow_nominal
+    "Condenser cooling fluid mass flow rate";
+  final parameter Modelica.Units.SI.HeatFlowRate cap_nominal=dat.cap_nominal
+    "Cooling capacity";
+  final parameter Modelica.Units.SI.PressureDifference dpChiWat_nominal=dat.dpChiWat_nominal
+    "CHW pressure drop";
+  final parameter Modelica.Units.SI.PressureDifference dpCon_nominal=dat.dpCon_nominal
+    "Condenser cooling fluid pressure drop";
+  final parameter Modelica.Units.SI.Temperature TChiWatSup_nominal=dat.TChiWatSup_nominal
+    "CHW supply temperature";
+  final parameter Modelica.Units.SI.Temperature TChiWatRet_nominal=dat.TChiWatRet_nominal
+    "CHW return temperature";
+  final parameter Modelica.Units.SI.Temperature TConEnt_nominal=dat.TConEnt_nominal
+    "Condenser entering fluid temperature";
+  final parameter Modelica.Units.SI.Temperature TConLvg_nominal=dat.TConLvg_nominal
+    "Condenser leaving fluid temperature";
+  parameter Boolean have_dpChiWat=true
+    "Set to true for CHW pressure drop computed by this model, false for external computation"
+    annotation (Evaluate=true,
+    Dialog(tab="Assumptions"));
+  parameter Boolean have_dpCon=true
+    "Set to true for condenser cooling fluid pressure drop computed by this model, false for external computation"
+    annotation (Evaluate=true,
+    Dialog(tab="Assumptions",
+      enable=typ==Buildings.Templates.Components.Types.Chiller.WaterCooled));
+  parameter Modelica.Units.SI.Time tau=30
+    "Time constant at nominal flow, used if energy or mass balance is dynamic"
+    annotation (Dialog(tab="Dynamics",group="Nominal condition",
+      enable=energyDynamics<>Modelica.Fluid.Types.Dynamics.SteadyState),
+    __ctrlFlow(enable=false));
+  parameter Modelica.Fluid.Types.Dynamics energyDynamics=Modelica.Fluid.Types.Dynamics.DynamicFreeInitial
+    "Type of energy balance: dynamic (3 initialization options) or steady state"
+    annotation (Evaluate=true,
+    Dialog(tab="Dynamics",group="Conservation equations"),
+    __ctrlFlow(enable=false));
+  final parameter MediumChiWat.SpecificHeatCapacity cpChiWat_default=
+    MediumChiWat.specificHeatCapacityCp(staChiWat_default)
+    "CHW default specific heat capacity";
+  final parameter MediumChiWat.ThermodynamicState staChiWat_default=MediumChiWat.setState_pTX(
+    T=TChiWatSup_nominal,
+    p=MediumChiWat.p_default,
+    X=MediumChiWat.X_default)
+    "CHW default state";
+  final parameter MediumCon.SpecificHeatCapacity cpCon_default=MediumCon.specificHeatCapacityCp(staCon_default)
+    "Condenser cooling fluid default specific heat capacity";
+  final parameter MediumCon.ThermodynamicState staCon_default=MediumCon.setState_pTX(
+    T=TConEnt_nominal,
+    p=MediumCon.p_default,
+    X=MediumCon.X_default)
+    "Condenser cooling fluid default state";
+  Buildings.Templates.Components.Interfaces.Bus bus
+    "Control bus"
+    annotation (Placement(transformation(extent={{-20,80},{20,120}}),
+      iconTransformation(extent={{-20,80},{20,120}})));
+  annotation (
+    Documentation(
+      info="<html>
+<p>
+This partial class provides a standard interface for chiller models.
+</p>
+</html>",
+      revisions="<html>
+<ul>
+<li>
+November 18, 2022, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    Icon(
+      graphics={
+        Rectangle(
+          extent={{100,60},{-100,-60}},
+          lineColor={0,0,0},
+          lineThickness=1),
+        Bitmap(
+          extent={{-20,60},{20,100}},
+          fileName=
+            "modelica://Buildings/Resources/Images/Templates/Components/Boilers/ControllerOnboard.svg"),
+        Text(
+          extent={{-60,20},{60,-20}},
+          textColor={0,0,0},
+          textString="CHI")}));
+end PartialChiller;
diff --git a/Buildings/Templates/Components/Interfaces/PartialHeatPump.mo b/Buildings/Templates/Components/Interfaces/PartialHeatPump.mo
index 95f88a90d38..2fdcdd7a3a0 100644
--- a/Buildings/Templates/Components/Interfaces/PartialHeatPump.mo
+++ b/Buildings/Templates/Components/Interfaces/PartialHeatPump.mo
@@ -17,7 +17,7 @@ model PartialHeatPump
   final package MediumChiWat=MediumHeaWat
     "CHW medium";
   /*
-  Derived classes representing AWHP shall use: 
+  Derived classes representing AWHP shall use:
   redeclare final package MediumSou = MediumAir
   */
   replaceable package MediumSou=Buildings.Media.Water
@@ -119,16 +119,16 @@ model PartialHeatPump
   parameter Boolean allowFlowReversalSou = true
     "Source side flow reversal: false to simplify equations, assuming, but not enforcing, no flow reversal"
     annotation(Dialog(tab="Assumptions",
-    enable=Buildings.Templates.Components.Types.HeatPump.WaterToWater), Evaluate=true);
-  parameter Boolean have_preDroChiHeaWat=true
+    enable=typ==Buildings.Templates.Components.Types.HeatPump.WaterToWater), Evaluate=true);
+  parameter Boolean have_dpChiHeaWat=true
     "Set to true for CHW/HW pressure drop computed by this model, false for external computation"
     annotation (Evaluate=true,
     Dialog(tab="Assumptions"));
-  parameter Boolean have_preDroSou=true
+  parameter Boolean have_dpSou=true
     "Set to true for source fluid pressure drop computed by this model, false for external computation"
     annotation (Evaluate=true,
     Dialog(tab="Assumptions",
-    enable=Buildings.Templates.Components.Types.HeatPump.WaterToWater));
+    enable=typ==Buildings.Templates.Components.Types.HeatPump.WaterToWater));
 
   final parameter MediumHeaWat.SpecificHeatCapacity cpHeaWat_default=
     MediumHeaWat.specificHeatCapacityCp(staHeaWat_default)
@@ -181,8 +181,9 @@ model PartialHeatPump
     "Weather bus"
     annotation (Placement(transformation(extent={{-60,-160},{-20,-120}}),
         iconTransformation(extent={{-80,80},{-40,120}})));
-  Fluid.Sources.Outside air(redeclare final package Medium = MediumAir, nPorts=
-        2)
+  Fluid.Sources.Outside air(
+    redeclare final package Medium = MediumAir,
+    nPorts=2)
     if typ == Buildings.Templates.Components.Types.HeatPump.AirToWater
     "Outdoor air" annotation (Placement(transformation(
         extent={{10,-10},{-10,10}},
diff --git a/Buildings/Templates/Components/Interfaces/PartialHeatPumpEquationFit.mo b/Buildings/Templates/Components/Interfaces/PartialHeatPumpEquationFit.mo
index d96af2a33bc..090a57e1c84 100644
--- a/Buildings/Templates/Components/Interfaces/PartialHeatPumpEquationFit.mo
+++ b/Buildings/Templates/Components/Interfaces/PartialHeatPumpEquationFit.mo
@@ -5,8 +5,8 @@ model PartialHeatPumpEquationFit
     final typMod=Buildings.Templates.Components.Types.HeatPumpModel.EquationFit);
 
   final parameter Buildings.Fluid.HeatPumps.Data.EquationFitReversible.Generic datPerFit(
-    dpHeaSou_nominal = if have_preDroSou then dat.perFit.dpHeaSou_nominal else 0,
-    dpHeaLoa_nominal = if have_preDroChiHeaWat then dat.perFit.dpHeaLoa_nominal else 0,
+    dpHeaSou_nominal = if have_dpSou then dat.perFit.dpHeaSou_nominal else 0,
+    dpHeaLoa_nominal = if have_dpChiHeaWat then dat.perFit.dpHeaLoa_nominal else 0,
     hea(
       TRefLoa = dat.perFit.hea.TRefLoa,
       TRefSou = dat.perFit.hea.TRefSou,
@@ -152,9 +152,9 @@ equation
 This is a model for an air-to-water heat pump where the capacity
 and drawn power are computed based on the equation fit method.
 The model can be configured with the parameter <code>is_rev</code>
-to represent either a non-reversible heat pump (heating only) or a 
+to represent either a non-reversible heat pump (heating only) or a
 reversible heat pump.
-This model uses 
+This model uses
 <a href=\"modelica://Buildings.Fluid.HeatPumps.EquationFitReversible\">
 Buildings.Fluid.HeatPumps.EquationFitReversible</a>,
 which the user may refer to for the modeling assumptions.
@@ -171,7 +171,7 @@ DO signal, with a dimensionality of zero
 <li>For reversible heat pumps only (<code>is_rev=true</code>),
 Heat pump operating mode command signal <code>y1Hea</code>:
 DO signal, with a dimensionality of zero<br/>
-(<code>y1Hea=true</code> for heating mode, 
+(<code>y1Hea=true</code> for heating mode,
 <code>y1Hea=false</code> for cooling mode)
 </li>
 <li>
diff --git a/Buildings/Templates/Components/Interfaces/PartialPump.mo b/Buildings/Templates/Components/Interfaces/PartialPump.mo
index 1d1ab7160c3..9e17c4a7bd7 100644
--- a/Buildings/Templates/Components/Interfaces/PartialPump.mo
+++ b/Buildings/Templates/Components/Interfaces/PartialPump.mo
@@ -17,11 +17,11 @@ model PartialPump "Base class for all pump models"
     "Set to true to include a check valve in pump line"
     annotation (Evaluate=true, Dialog(group="Configuration",
     enable=typ<>Buildings.Templates.Components.Types.Pump.None),
-    __Linkage(enable=false));
+    __ctrlFlow(enable=false));
 
   parameter Boolean addPowerToMedium=false
     "Set to false to avoid any power (=heat and flow work) being added to medium (may give simpler equations)"
-    annotation(__Linkage(enable=false));
+    annotation(__ctrlFlow(enable=false));
 
   parameter Modelica.Units.SI.Time tau=1
     "Time constant of fluid volume for nominal flow, used if energy or mass balance is dynamic"
@@ -29,15 +29,15 @@ model PartialPump "Base class for all pump models"
       tab="Dynamics",
       group="Nominal condition",
       enable=energyDynamics<>Modelica.Fluid.Types.Dynamics.SteadyState),
-      __Linkage(enable=false));
+      __ctrlFlow(enable=false));
   parameter Modelica.Fluid.Types.Dynamics energyDynamics=
     Modelica.Fluid.Types.Dynamics.DynamicFreeInitial
     "Type of energy balance: dynamic (3 initialization options) or steady state"
     annotation(Evaluate=true, Dialog(tab = "Dynamics", group="Conservation equations"),
-      __Linkage(enable=false));
+      __ctrlFlow(enable=false));
   parameter Boolean allowFlowReversal = true
     "= false to simplify equations, assuming, but not enforcing, no flow reversal"
-    annotation(Dialog(tab="Assumptions"), Evaluate=true, __Linkage(enable=false));
+    annotation(Dialog(tab="Assumptions"), Evaluate=true, __ctrlFlow(enable=false));
 
   parameter Integer text_rotation = 0
     "Text rotation angle in icon layer"
diff --git a/Buildings/Templates/Components/Interfaces/PartialSensor.mo b/Buildings/Templates/Components/Interfaces/PartialSensor.mo
index bc8a979f99b..eb104d51ab8 100644
--- a/Buildings/Templates/Components/Interfaces/PartialSensor.mo
+++ b/Buildings/Templates/Components/Interfaces/PartialSensor.mo
@@ -16,10 +16,9 @@ partial model PartialSensor "Interface class for sensor"
   parameter Boolean text_flip = false
     "True to flip text horizontally in icon layer"
     annotation(Dialog(tab="Graphics", enable=false));
-  parameter Buildings.Templates.Components.Types.IconPipe icon_pipe =
-    Buildings.Templates.Components.Types.IconPipe.None
-    "Pipe symbol"
-    annotation(Dialog(tab="Graphics", enable=false));
+  parameter Buildings.Templates.Components.Types.IntegrationPoint icon_pipe=
+      Buildings.Templates.Components.Types.IntegrationPoint.None "Pipe symbol"
+    annotation (Dialog(tab="Graphics", enable=false));
 
   Buildings.Controls.OBC.CDL.Interfaces.RealOutput y if have_sen
     "Connector for measured value"
@@ -47,14 +46,14 @@ equation
   annotation (
     Icon(coordinateSystem(preserveAspectRatio=false),
     graphics={Line(
-        visible=icon_pipe<>Buildings.Templates.Components.Types.IconPipe.None
+        visible=icon_pipe<>Buildings.Templates.Components.Types.IntegrationPoint.None
         or (not have_sen) and (not isDifPreSen),
         points={{-100,0},{100,0}},
-        color=if icon_pipe==Buildings.Templates.Components.Types.IconPipe.None
+        color=if icon_pipe==Buildings.Templates.Components.Types.IntegrationPoint.None
         then {28,108,200} else {0,0,0},
-        thickness=if icon_pipe==Buildings.Templates.Components.Types.IconPipe.None
+        thickness=if icon_pipe==Buildings.Templates.Components.Types.IntegrationPoint.None
         then 1 else 5,
-        pattern=if icon_pipe==Buildings.Templates.Components.Types.IconPipe.Return
+        pattern=if icon_pipe==Buildings.Templates.Components.Types.IntegrationPoint.Return
         then LinePattern.Dash else LinePattern.Solid)}),
     Diagram(coordinateSystem(preserveAspectRatio=false)),
     Documentation(info="<html>
diff --git a/Buildings/Templates/Components/Interfaces/package.order b/Buildings/Templates/Components/Interfaces/package.order
index c90cefc1586..9c616040c18 100644
--- a/Buildings/Templates/Components/Interfaces/package.order
+++ b/Buildings/Templates/Components/Interfaces/package.order
@@ -1,4 +1,5 @@
 Bus
+PartialChiller
 PartialCoil
 PartialFan
 PartialHeatPump
diff --git a/Buildings/Templates/Components/Routing/Junction.mo b/Buildings/Templates/Components/Routing/Junction.mo
index d7831a4cce2..5bf73c756d7 100644
--- a/Buildings/Templates/Components/Routing/Junction.mo
+++ b/Buildings/Templates/Components/Routing/Junction.mo
@@ -4,42 +4,41 @@ model Junction "Flow splitter with fixed resistance at each port"
   annotation (
     IconMap(primitivesVisible = false));
 
-  parameter Buildings.Templates.Components.Types.IconPipe icon_pipe1 =
-    Buildings.Templates.Components.Types.IconPipe.Supply
-    "Pipe symbol - Branch 1"
-    annotation(Dialog(tab="Graphics", enable=false));
-  parameter Buildings.Templates.Components.Types.IconPipe icon_pipe2 = icon_pipe1
-    "Pipe symbol - Branch 2"
-    annotation(Dialog(tab="Graphics", enable=false));
-  parameter Buildings.Templates.Components.Types.IconPipe icon_pipe3 = icon_pipe1
-    "Pipe symbol - Branch 3"
-    annotation(Dialog(tab="Graphics", enable=false));
+  parameter Buildings.Templates.Components.Types.IntegrationPoint icon_pipe1=
+      Buildings.Templates.Components.Types.IntegrationPoint.Supply
+    "Pipe symbol - Branch 1" annotation (Dialog(tab="Graphics", enable=false));
+  parameter Buildings.Templates.Components.Types.IntegrationPoint icon_pipe2=
+      icon_pipe1 "Pipe symbol - Branch 2"
+    annotation (Dialog(tab="Graphics", enable=false));
+  parameter Buildings.Templates.Components.Types.IntegrationPoint icon_pipe3=
+      icon_pipe1 "Pipe symbol - Branch 3"
+    annotation (Dialog(tab="Graphics", enable=false));
   annotation (Icon(graphics={
   Line(
     points={{-100,0},{0,0}},
     color={0,0,0},
     thickness=5,
-    pattern=if icon_pipe1==Buildings.Templates.Components.Types.IconPipe.Supply then
-    LinePattern.Solid elseif icon_pipe1==Buildings.Templates.Components.Types.IconPipe.Return
+    pattern=if icon_pipe1==Buildings.Templates.Components.Types.IntegrationPoint.Supply then
+    LinePattern.Solid elseif icon_pipe1==Buildings.Templates.Components.Types.IntegrationPoint.Return
     then LinePattern.Dash else LinePattern.None),
   Line(
     points={{0,0},{100,0}},
     color={0,0,0},
     thickness=5,
-    pattern=if icon_pipe2==Buildings.Templates.Components.Types.IconPipe.Supply then
-    LinePattern.Solid elseif icon_pipe2==Buildings.Templates.Components.Types.IconPipe.Return
+    pattern=if icon_pipe2==Buildings.Templates.Components.Types.IntegrationPoint.Supply then
+    LinePattern.Solid elseif icon_pipe2==Buildings.Templates.Components.Types.IntegrationPoint.Return
     then LinePattern.Dash else LinePattern.None),
   Line(
     points={{0,0},{0,-100}},
     color={0,0,0},
     thickness=5,
-    pattern=if icon_pipe3==Buildings.Templates.Components.Types.IconPipe.Supply then
-    LinePattern.Solid elseif icon_pipe3==Buildings.Templates.Components.Types.IconPipe.Return
+    pattern=if icon_pipe3==Buildings.Templates.Components.Types.IntegrationPoint.Supply then
+    LinePattern.Solid elseif icon_pipe3==Buildings.Templates.Components.Types.IntegrationPoint.Return
     then LinePattern.Dash else LinePattern.None)}), Documentation(info="<html>
 <p>
-This is a model of a flow junction with an optional fixed resistance 
+This is a model of a flow junction with an optional fixed resistance
 in each flow leg and an optional mixing volume at the junction.
-This model is identical to 
+This model is identical to
 <a href=\"modelica://Buildings.Fluid.FixedResistances.Junction\">
 Buildings.Fluid.FixedResistances.Junction</a>
 except for the icon which has been changed for better integration
diff --git a/Buildings/Templates/Components/Routing/MultipleToMultiple.mo b/Buildings/Templates/Components/Routing/MultipleToMultiple.mo
index c94efade48e..317d6b33198 100644
--- a/Buildings/Templates/Components/Routing/MultipleToMultiple.mo
+++ b/Buildings/Templates/Components/Routing/MultipleToMultiple.mo
@@ -50,8 +50,8 @@ model MultipleToMultiple
     "Offset in y-direction between inlet and outlet in icon layer";
   constant Integer icon_dy = 100
     "Distance in y-direction between each branch in icon layer";
-  constant Buildings.Templates.Components.Types.IconPipe icon_pipe =
-    Buildings.Templates.Components.Types.IconPipe.Supply
+  constant Buildings.Templates.Components.Types.IntegrationPoint icon_pipe=
+      Buildings.Templates.Components.Types.IntegrationPoint.Supply
     "Pipe symbol";
 
   Modelica.Fluid.Interfaces.FluidPorts_a ports_a[nPorts_a](
@@ -163,85 +163,85 @@ equation
           textString="%name"),
     Line( points={{-100, 0}, {100, 0}},
           color={0,127,255},
-          visible=icon_pipe==Buildings.Templates.Components.Types.IconPipe.None),
+          visible=icon_pipe==Buildings.Templates.Components.Types.IntegrationPoint.None),
     Line( points={{icon_xinl, 0}, {0,0}},
           color={0,0,0},
           thickness=5,
-          visible=icon_pipe<>Buildings.Templates.Components.Types.IconPipe.None,
-          pattern=if icon_pipe==Buildings.Templates.Components.Types.IconPipe.Supply
+          visible=icon_pipe<>Buildings.Templates.Components.Types.IntegrationPoint.None,
+          pattern=if icon_pipe==Buildings.Templates.Components.Types.IntegrationPoint.Supply
           then LinePattern.Solid else LinePattern.Dash),
-    Line( visible=nPorts_a>=2 and icon_pipe<>Buildings.Templates.Components.Types.IconPipe.None,
+    Line( visible=nPorts_a>=2 and icon_pipe<>Buildings.Templates.Components.Types.IntegrationPoint.None,
           points={{icon_xinl, icon_dy}, {0,icon_dy}},
           color={0,0,0},
           thickness=5,
-          pattern=if icon_pipe==Buildings.Templates.Components.Types.IconPipe.Supply
+          pattern=if icon_pipe==Buildings.Templates.Components.Types.IntegrationPoint.Supply
           then LinePattern.Solid else LinePattern.Dash),
-    Line( visible=nPorts_a>=3 and icon_pipe<>Buildings.Templates.Components.Types.IconPipe.None,
+    Line( visible=nPorts_a>=3 and icon_pipe<>Buildings.Templates.Components.Types.IntegrationPoint.None,
           points={{icon_xinl, 2*icon_dy}, {0, 2*icon_dy}},
           color={0,0,0},
           thickness=5,
-          pattern=if icon_pipe==Buildings.Templates.Components.Types.IconPipe.Supply
+          pattern=if icon_pipe==Buildings.Templates.Components.Types.IntegrationPoint.Supply
           then LinePattern.Solid else LinePattern.Dash),
-    Line( visible=nPorts_a>=4 and icon_pipe<>Buildings.Templates.Components.Types.IconPipe.None,
+    Line( visible=nPorts_a>=4 and icon_pipe<>Buildings.Templates.Components.Types.IntegrationPoint.None,
           points={{icon_xinl, 3*icon_dy}, {0, 3*icon_dy}},
           color={0,0,0},
           thickness=5,
-          pattern=if icon_pipe==Buildings.Templates.Components.Types.IconPipe.Supply
+          pattern=if icon_pipe==Buildings.Templates.Components.Types.IntegrationPoint.Supply
           then LinePattern.Solid else LinePattern.Dash),
-    Line( visible=nPorts_a>=5 and icon_pipe<>Buildings.Templates.Components.Types.IconPipe.None,
+    Line( visible=nPorts_a>=5 and icon_pipe<>Buildings.Templates.Components.Types.IntegrationPoint.None,
           points={{icon_xinl, 4*icon_dy}, {0, 4*icon_dy}},
           color={0,0,0},
           thickness=5,
-          pattern=if icon_pipe==Buildings.Templates.Components.Types.IconPipe.Supply
+          pattern=if icon_pipe==Buildings.Templates.Components.Types.IntegrationPoint.Supply
           then LinePattern.Solid else LinePattern.Dash),
-    Line( visible=nPorts_a>=6 and icon_pipe<>Buildings.Templates.Components.Types.IconPipe.None,
+    Line( visible=nPorts_a>=6 and icon_pipe<>Buildings.Templates.Components.Types.IntegrationPoint.None,
           points={{icon_xinl, 5*icon_dy}, {0, 5*icon_dy}},
           color={0,0,0},
           thickness=5,
-          pattern=if icon_pipe==Buildings.Templates.Components.Types.IconPipe.Supply
+          pattern=if icon_pipe==Buildings.Templates.Components.Types.IntegrationPoint.Supply
           then LinePattern.Solid else LinePattern.Dash),
     Line( points={{0, icon_offset}, {icon_xout,icon_offset}},
           color={0,0,0},
           thickness=5,
-          visible=icon_pipe<>Buildings.Templates.Components.Types.IconPipe.None,
-          pattern=if icon_pipe==Buildings.Templates.Components.Types.IconPipe.Supply
+          visible=icon_pipe<>Buildings.Templates.Components.Types.IntegrationPoint.None,
+          pattern=if icon_pipe==Buildings.Templates.Components.Types.IntegrationPoint.Supply
           then LinePattern.Solid else LinePattern.Dash),
-    Line( visible=nPorts_b>=2 and icon_pipe<>Buildings.Templates.Components.Types.IconPipe.None,
+    Line( visible=nPorts_b>=2 and icon_pipe<>Buildings.Templates.Components.Types.IntegrationPoint.None,
           points={{0, icon_offset + 1*icon_dy}, {icon_xout,icon_offset + 1*icon_dy}},
           color={0,0,0},
           thickness=5,
-          pattern=if icon_pipe==Buildings.Templates.Components.Types.IconPipe.Supply
+          pattern=if icon_pipe==Buildings.Templates.Components.Types.IntegrationPoint.Supply
           then LinePattern.Solid else LinePattern.Dash),
-    Line( visible=nPorts_b>=3 and icon_pipe<>Buildings.Templates.Components.Types.IconPipe.None,
+    Line( visible=nPorts_b>=3 and icon_pipe<>Buildings.Templates.Components.Types.IntegrationPoint.None,
           points={{0, icon_offset + 2*icon_dy}, {icon_xout,icon_offset + 2*icon_dy}},
           color={0,0,0},
           thickness=5,
-          pattern=if icon_pipe==Buildings.Templates.Components.Types.IconPipe.Supply
+          pattern=if icon_pipe==Buildings.Templates.Components.Types.IntegrationPoint.Supply
           then LinePattern.Solid else LinePattern.Dash),
-    Line( visible=nPorts_b>=4 and icon_pipe<>Buildings.Templates.Components.Types.IconPipe.None,
+    Line( visible=nPorts_b>=4 and icon_pipe<>Buildings.Templates.Components.Types.IntegrationPoint.None,
           points={{0, icon_offset + 3*icon_dy}, {icon_xout,icon_offset + 3*icon_dy}},
           color={0,0,0},
           thickness=5,
-          pattern=if icon_pipe==Buildings.Templates.Components.Types.IconPipe.Supply
+          pattern=if icon_pipe==Buildings.Templates.Components.Types.IntegrationPoint.Supply
           then LinePattern.Solid else LinePattern.Dash),
-    Line( visible=nPorts_b>=5 and icon_pipe<>Buildings.Templates.Components.Types.IconPipe.None,
+    Line( visible=nPorts_b>=5 and icon_pipe<>Buildings.Templates.Components.Types.IntegrationPoint.None,
           points={{0, icon_offset + 4*icon_dy}, {icon_xout,icon_offset + 4*icon_dy}},
           color={0,0,0},
           thickness=5,
-          pattern=if icon_pipe==Buildings.Templates.Components.Types.IconPipe.Supply
+          pattern=if icon_pipe==Buildings.Templates.Components.Types.IntegrationPoint.Supply
           then LinePattern.Solid else LinePattern.Dash),
-    Line( visible=nPorts_b>=6 and icon_pipe<>Buildings.Templates.Components.Types.IconPipe.None,
+    Line( visible=nPorts_b>=6 and icon_pipe<>Buildings.Templates.Components.Types.IntegrationPoint.None,
           points={{0, icon_offset + 5*icon_dy}, {icon_xout,icon_offset + 5*icon_dy}},
           color={0,0,0},
           thickness=5,
-          pattern=if icon_pipe==Buildings.Templates.Components.Types.IconPipe.Supply
+          pattern=if icon_pipe==Buildings.Templates.Components.Types.IntegrationPoint.Supply
           then LinePattern.Solid else LinePattern.Dash),
-    Line( visible=icon_pipe<>Buildings.Templates.Components.Types.IconPipe.None and
+    Line( visible=icon_pipe<>Buildings.Templates.Components.Types.IntegrationPoint.None and
           max(nPorts_a, nPorts_b)>=2 and have_comLeg,
           points={{0, 0}, {0, icon_offset + (max(nPorts_a, nPorts_b)-1)*icon_dy}},
           color={0,0,0},
           thickness=5,
-          pattern=if icon_pipe==Buildings.Templates.Components.Types.IconPipe.Supply
+          pattern=if icon_pipe==Buildings.Templates.Components.Types.IntegrationPoint.Supply
           then LinePattern.Solid else LinePattern.Dash)}),
     Diagram(
     coordinateSystem(preserveAspectRatio=false)),
diff --git a/Buildings/Templates/Components/Routing/MultipleToSingle.mo b/Buildings/Templates/Components/Routing/MultipleToSingle.mo
index a42b8bcda4e..55bbe95ec67 100644
--- a/Buildings/Templates/Components/Routing/MultipleToSingle.mo
+++ b/Buildings/Templates/Components/Routing/MultipleToSingle.mo
@@ -39,9 +39,8 @@ model MultipleToSingle "Multiple inlet port, single outlet ports"
     "Offset in y-direction between inlet and outlet in icon layer";
   constant Integer icon_dy = 100
     "Distance in y-direction between each branch in icon layer";
-  constant Buildings.Templates.Components.Types.IconPipe icon_pipe =
-    Buildings.Templates.Components.Types.IconPipe.None
-    "Pipe symbol";
+  constant Buildings.Templates.Components.Types.IntegrationPoint icon_pipe=
+      Buildings.Templates.Components.Types.IntegrationPoint.None "Pipe symbol";
 
   Modelica.Fluid.Interfaces.FluidPorts_a ports_a[nPorts](
     redeclare each final package Medium = Medium,
@@ -110,61 +109,61 @@ equation
           textString="%name"),
     Line( points={{-100, 0}, {100, 0}},
           color={0,127,255},
-          visible=icon_pipe==Buildings.Templates.Components.Types.IconPipe.None),
+          visible=icon_pipe==Buildings.Templates.Components.Types.IntegrationPoint.None),
     Line( points={{-100, icon_offset}, {0, icon_offset}, {0,0}, {100,0}},
           color={0,0,0},
           thickness=5,
-          visible=icon_pipe<>Buildings.Templates.Components.Types.IconPipe.None,
-          pattern=if icon_pipe==Buildings.Templates.Components.Types.IconPipe.Supply
+          visible=icon_pipe<>Buildings.Templates.Components.Types.IntegrationPoint.None,
+          pattern=if icon_pipe==Buildings.Templates.Components.Types.IntegrationPoint.Supply
           then LinePattern.Solid else LinePattern.Dash),
-    Line( visible=nPorts>=2 and icon_pipe<>Buildings.Templates.Components.Types.IconPipe.None,
+    Line( visible=nPorts>=2 and icon_pipe<>Buildings.Templates.Components.Types.IntegrationPoint.None,
           points=if icon_offset*icon_dy>=0 then
             {{0,icon_offset},{0,icon_offset+icon_dy},{-100,icon_offset+icon_dy}}
             elseif icon_offset>0 and icon_offset+icon_dy<0 or icon_offset<0 and icon_offset+icon_dy>0 then
             {{0,0},{0,icon_offset+icon_dy},{-100,icon_offset+icon_dy}}
             else {{0,icon_offset+icon_dy},{-100,icon_offset+icon_dy}},
           color={0,0,0},
-          pattern=if icon_pipe==Buildings.Templates.Components.Types.IconPipe.Supply
+          pattern=if icon_pipe==Buildings.Templates.Components.Types.IntegrationPoint.Supply
           then LinePattern.Solid else LinePattern.Dash,
           thickness=5),
-    Line( visible=nPorts>=3 and icon_pipe<>Buildings.Templates.Components.Types.IconPipe.None,
+    Line( visible=nPorts>=3 and icon_pipe<>Buildings.Templates.Components.Types.IntegrationPoint.None,
           points=if icon_offset*icon_dy>=0 then
             {{0, icon_offset+icon_dy},{0, icon_offset+2*icon_dy},{-100, icon_offset+2*icon_dy}}
             elseif icon_offset>0 and icon_offset+2*icon_dy<0 or icon_offset<0 and icon_offset+2*icon_dy>0 then
             {{0, 0},{0, icon_offset+2*icon_dy},{-100, icon_offset+2*icon_dy}}
             else {{0, icon_offset+2*icon_dy},{-100, icon_offset+2*icon_dy}},
           color={0,0,0},
-          pattern=if icon_pipe==Buildings.Templates.Components.Types.IconPipe.Supply
+          pattern=if icon_pipe==Buildings.Templates.Components.Types.IntegrationPoint.Supply
           then LinePattern.Solid else LinePattern.Dash,
           thickness=5),
-    Line( visible=nPorts>=4 and icon_pipe<>Buildings.Templates.Components.Types.IconPipe.None,
+    Line( visible=nPorts>=4 and icon_pipe<>Buildings.Templates.Components.Types.IntegrationPoint.None,
           points=if icon_offset*icon_dy>=0 then
             {{0, icon_offset+2*icon_dy},{0, icon_offset+3*icon_dy},{-100, icon_offset+3*icon_dy}}
             elseif icon_offset>0 and icon_offset+3*icon_dy<0 or icon_offset<0 and icon_offset+3*icon_dy>0 then
             {{0, 0},{0, icon_offset+3*icon_dy},{-100, icon_offset+3*icon_dy}}
             else {{0, icon_offset+3*icon_dy},{-100, icon_offset+3*icon_dy}},
           color={0,0,0},
-          pattern=if icon_pipe==Buildings.Templates.Components.Types.IconPipe.Supply
+          pattern=if icon_pipe==Buildings.Templates.Components.Types.IntegrationPoint.Supply
           then LinePattern.Solid else LinePattern.Dash,
           thickness=5),
-    Line( visible=nPorts>=5 and icon_pipe<>Buildings.Templates.Components.Types.IconPipe.None,
+    Line( visible=nPorts>=5 and icon_pipe<>Buildings.Templates.Components.Types.IntegrationPoint.None,
           points=if icon_offset*icon_dy>=0 then
             {{0, icon_offset+3*icon_dy},{0, icon_offset+4*icon_dy},{-100, icon_offset+4*icon_dy}}
             elseif icon_offset>0 and icon_offset+4*icon_dy<0 or icon_offset<0 and icon_offset+4*icon_dy>0 then
             {{0, 0},{0, icon_offset+4*icon_dy},{-100, icon_offset+4*icon_dy}}
             else {{0, icon_offset+4*icon_dy},{-100, icon_offset+4*icon_dy}},
           color={0,0,0},
-          pattern=if icon_pipe==Buildings.Templates.Components.Types.IconPipe.Supply
+          pattern=if icon_pipe==Buildings.Templates.Components.Types.IntegrationPoint.Supply
           then LinePattern.Solid else LinePattern.Dash,
           thickness=5),
-    Line( visible=nPorts>=6 and icon_pipe<>Buildings.Templates.Components.Types.IconPipe.None,
+    Line( visible=nPorts>=6 and icon_pipe<>Buildings.Templates.Components.Types.IntegrationPoint.None,
           points=if icon_offset*icon_dy>=0 then
             {{0, icon_offset+4*icon_dy},{0, icon_offset+5*icon_dy},{-100, icon_offset+5*icon_dy}}
             elseif icon_offset>0 and icon_offset+5*icon_dy<0 or icon_offset<0 and icon_offset+5*icon_dy>0 then
             {{0, 0},{0, icon_offset+5*icon_dy},{-100, icon_offset+5*icon_dy}}
             else {{0, icon_offset+5*icon_dy},{-100, icon_offset+5*icon_dy}},
           color={0,0,0},
-          pattern=if icon_pipe==Buildings.Templates.Components.Types.IconPipe.Supply
+          pattern=if icon_pipe==Buildings.Templates.Components.Types.IntegrationPoint.Supply
           then LinePattern.Solid else LinePattern.Dash,
           thickness=5)}),
     Diagram(
diff --git a/Buildings/Templates/Components/Routing/PassThroughFluid.mo b/Buildings/Templates/Components/Routing/PassThroughFluid.mo
index cd00c5dcfd0..233e1e103f0 100644
--- a/Buildings/Templates/Components/Routing/PassThroughFluid.mo
+++ b/Buildings/Templates/Components/Routing/PassThroughFluid.mo
@@ -4,10 +4,9 @@ model PassThroughFluid "Direct fluid pass-through"
     annotation (
     IconMap(primitivesVisible = false));
 
-  parameter Buildings.Templates.Components.Types.IconPipe icon_pipe =
-    Buildings.Templates.Components.Types.IconPipe.Supply
-    "Pipe symbol"
-    annotation(Dialog(tab="Graphics", enable=false));
+  parameter Buildings.Templates.Components.Types.IntegrationPoint icon_pipe=
+      Buildings.Templates.Components.Types.IntegrationPoint.Supply
+    "Pipe symbol" annotation (Dialog(tab="Graphics", enable=false));
 
 equation
   connect(port_a, port_b) annotation (Line(points={{-100,0},{0,0},{0,0},{100,0}},
@@ -20,8 +19,8 @@ equation
     points={{-100,0},{100,0}},
     color={0,0,0},
     thickness=5,
-    visible=icon_pipe<>Buildings.Templates.Components.Types.IconPipe.None,
-    pattern=if icon_pipe==Buildings.Templates.Components.Types.IconPipe.Supply then
+    visible=icon_pipe<>Buildings.Templates.Components.Types.IntegrationPoint.None,
+    pattern=if icon_pipe==Buildings.Templates.Components.Types.IntegrationPoint.Supply then
     LinePattern.Solid else LinePattern.Dash)}),
     Documentation(info="<html>
 <p>
diff --git a/Buildings/Templates/Components/Routing/SingleToMultiple.mo b/Buildings/Templates/Components/Routing/SingleToMultiple.mo
index 6bfd895ae96..a711d582408 100644
--- a/Buildings/Templates/Components/Routing/SingleToMultiple.mo
+++ b/Buildings/Templates/Components/Routing/SingleToMultiple.mo
@@ -39,9 +39,8 @@ model SingleToMultiple "Single inlet port, multiple outlet ports"
     "Offset in y-direction between inlet and outlet in icon layer";
   constant Integer icon_dy = 100
     "Distance in y-direction between each branch in icon layer";
-  constant Buildings.Templates.Components.Types.IconPipe icon_pipe =
-    Buildings.Templates.Components.Types.IconPipe.None
-    "Pipe symbol";
+  constant Buildings.Templates.Components.Types.IntegrationPoint icon_pipe=
+      Buildings.Templates.Components.Types.IntegrationPoint.None "Pipe symbol";
 
   Modelica.Fluid.Interfaces.FluidPort_a port_a(
     redeclare final package Medium = Medium,
@@ -113,61 +112,61 @@ equation
           textString="%name"),
     Line( points={{-100, 0}, {100, 0}},
           color={0,127,255},
-          visible=icon_pipe==Buildings.Templates.Components.Types.IconPipe.None),
+          visible=icon_pipe==Buildings.Templates.Components.Types.IntegrationPoint.None),
     Line( points={{-100,0},{0,0},{0,icon_offset},{100,icon_offset}},
           color={0,0,0},
           thickness=5,
-          visible=icon_pipe<>Buildings.Templates.Components.Types.IconPipe.None,
-          pattern=if icon_pipe==Buildings.Templates.Components.Types.IconPipe.Supply
+          visible=icon_pipe<>Buildings.Templates.Components.Types.IntegrationPoint.None,
+          pattern=if icon_pipe==Buildings.Templates.Components.Types.IntegrationPoint.Supply
           then LinePattern.Solid else LinePattern.Dash),
-    Line( visible=nPorts>=2 and icon_pipe<>Buildings.Templates.Components.Types.IconPipe.None,
+    Line( visible=nPorts>=2 and icon_pipe<>Buildings.Templates.Components.Types.IntegrationPoint.None,
           points=if icon_offset*icon_dy>=0 then
             {{0, icon_offset}, {0,icon_offset+icon_dy}, {100,icon_offset+icon_dy}}
             elseif icon_offset>0 and icon_offset+icon_dy<0 or icon_offset<0 and icon_offset+icon_dy>0 then
             {{0, 0}, {0, icon_offset+icon_dy}, {100, icon_offset+icon_dy}}
             else {{0, icon_offset+icon_dy}, {100, icon_offset+icon_dy}},
           color={0,0,0},
-          pattern=if icon_pipe==Buildings.Templates.Components.Types.IconPipe.Supply
+          pattern=if icon_pipe==Buildings.Templates.Components.Types.IntegrationPoint.Supply
           then LinePattern.Solid else LinePattern.Dash,
           thickness=5),
-    Line( visible=nPorts>=3 and icon_pipe<>Buildings.Templates.Components.Types.IconPipe.None,
+    Line( visible=nPorts>=3 and icon_pipe<>Buildings.Templates.Components.Types.IntegrationPoint.None,
           points=if icon_offset*icon_dy>=0 then
             {{0, icon_offset+icon_dy},{0, icon_offset+2*icon_dy},{100, icon_offset+2*icon_dy}}
             elseif icon_offset>0 and icon_offset+2*icon_dy<0 or icon_offset<0 and icon_offset+2*icon_dy>0 then
             {{0, 0},{0, icon_offset+2*icon_dy},{100, icon_offset+2*icon_dy}}
             else {{0, icon_offset+2*icon_dy},{100, icon_offset+2*icon_dy}},
           color={0,0,0},
-          pattern=if icon_pipe==Buildings.Templates.Components.Types.IconPipe.Supply
+          pattern=if icon_pipe==Buildings.Templates.Components.Types.IntegrationPoint.Supply
           then LinePattern.Solid else LinePattern.Dash,
           thickness=5),
-    Line( visible=nPorts>=4 and icon_pipe<>Buildings.Templates.Components.Types.IconPipe.None,
+    Line( visible=nPorts>=4 and icon_pipe<>Buildings.Templates.Components.Types.IntegrationPoint.None,
           points=if icon_offset*icon_dy>=0 then
             {{0, icon_offset+2*icon_dy},{0, icon_offset+3*icon_dy},{100, icon_offset+3*icon_dy}}
             elseif icon_offset>0 and icon_offset+3*icon_dy<0 or icon_offset<0 and icon_offset+3*icon_dy>0 then
             {{0, 0},{0, icon_offset+3*icon_dy},{100, icon_offset+3*icon_dy}}
             else {{0, icon_offset+3*icon_dy},{100, icon_offset+3*icon_dy}},
           color={0,0,0},
-          pattern=if icon_pipe==Buildings.Templates.Components.Types.IconPipe.Supply
+          pattern=if icon_pipe==Buildings.Templates.Components.Types.IntegrationPoint.Supply
           then LinePattern.Solid else LinePattern.Dash,
           thickness=5),
-    Line( visible=nPorts>=5 and icon_pipe<>Buildings.Templates.Components.Types.IconPipe.None,
+    Line( visible=nPorts>=5 and icon_pipe<>Buildings.Templates.Components.Types.IntegrationPoint.None,
           points=if icon_offset*icon_dy>=0 then
             {{0, icon_offset+3*icon_dy},{0, icon_offset+4*icon_dy},{100, icon_offset+4*icon_dy}}
             elseif icon_offset>0 and icon_offset+4*icon_dy<0 or icon_offset<0 and icon_offset+4*icon_dy>0 then
             {{0, 0},{0, icon_offset+4*icon_dy},{100, icon_offset+4*icon_dy}}
             else {{0, icon_offset+4*icon_dy},{100, icon_offset+4*icon_dy}},
           color={0,0,0},
-          pattern=if icon_pipe==Buildings.Templates.Components.Types.IconPipe.Supply
+          pattern=if icon_pipe==Buildings.Templates.Components.Types.IntegrationPoint.Supply
           then LinePattern.Solid else LinePattern.Dash,
           thickness=5),
-    Line( visible=nPorts>=6 and icon_pipe<>Buildings.Templates.Components.Types.IconPipe.None,
+    Line( visible=nPorts>=6 and icon_pipe<>Buildings.Templates.Components.Types.IntegrationPoint.None,
           points=if icon_offset*icon_dy>=0 then
             {{0, icon_offset+4*icon_dy},{0, icon_offset+5*icon_dy},{100, icon_offset+5*icon_dy}}
             elseif icon_offset>0 and icon_offset+5*icon_dy<0 or icon_offset<0 and icon_offset+5*icon_dy>0 then
             {{0, 0},{0, icon_offset+5*icon_dy},{100, icon_offset+5*icon_dy}}
             else {{0, icon_offset+5*icon_dy},{100, icon_offset+5*icon_dy}},
           color={0,0,0},
-          pattern=if icon_pipe==Buildings.Templates.Components.Types.IconPipe.Supply
+          pattern=if icon_pipe==Buildings.Templates.Components.Types.IntegrationPoint.Supply
           then LinePattern.Solid else LinePattern.Dash,
           thickness=5)}),
     Diagram(
diff --git a/Buildings/Templates/Components/Tanks/Buffer.mo b/Buildings/Templates/Components/Tanks/Buffer.mo
new file mode 100644
index 00000000000..eb1f9a88f0e
--- /dev/null
+++ b/Buildings/Templates/Components/Tanks/Buffer.mo
@@ -0,0 +1,94 @@
+within Buildings.Templates.Components.Tanks;
+model Buffer
+  "Buffer tank"
+  extends Buildings.Fluid.Interfaces.PartialTwoPortInterface;
+  parameter Boolean have_tan=true
+    "Set to true for tank, false for direct pass through"
+    annotation (Evaluate=true,
+    Dialog(group="Configuration"));
+  parameter Modelica.Units.SI.Volume V(
+    start=0)
+    "Volume"
+    annotation (Dialog(enable=have_tan));
+  // Assumptions
+  parameter Modelica.Fluid.Types.Dynamics energyDynamics=Modelica.Fluid.Types.Dynamics.DynamicFreeInitial
+    "Type of energy balance: dynamic (3 initialization options) or steady state"
+    annotation (Evaluate=true,
+    Dialog(tab="Dynamics",group="Conservation equations"));
+  parameter Buildings.Templates.Components.Types.IntegrationPoint icon_pipe=
+    Buildings.Templates.Components.Types.IntegrationPoint.None
+    "Pipe symbol"
+    annotation (Dialog(tab="Graphics",
+      enable=false));
+  Buildings.Fluid.MixingVolumes.MixingVolume vol(
+    redeclare final package Medium=Medium,
+    final V=V,
+    final m_flow_nominal=m_flow_nominal,
+    final m_flow_small=m_flow_small,
+    final energyDynamics=energyDynamics,
+    final massDynamics=energyDynamics,
+    final mSenFac=1,
+    final allowFlowReversal=allowFlowReversal,
+    nPorts=2)
+    if have_tan
+    "Tank"
+    annotation (Placement(transformation(extent={{-10,0},{10,20}})));
+  Buildings.Templates.Components.Routing.PassThroughFluid pas(
+    redeclare final package Medium=Medium,
+    final allowFlowReversal=allowFlowReversal)
+    if not have_tan
+    "Direct pass through"
+    annotation (Placement(transformation(extent={{-10,-30},{10,-10}})));
+equation
+  connect(port_a, vol.ports[1])
+    annotation (Line(points={{-100,0},{-1,0}},color={0,127,255}));
+  connect(vol.ports[2], port_b)
+    annotation (Line(points={{1,0},{100,0}},color={0,127,255}));
+  connect(port_a, pas.port_a)
+    annotation (Line(points={{-100,0},{-20,0},{-20,-20},{-10,-20}},color={0,127,255}));
+  connect(pas.port_b, port_b)
+    annotation (Line(points={{10,-20},{20,-20},{20,0},{100,0}},color={0,127,255}));
+  annotation (
+    defaultComponentName="tan",
+    Icon(
+      graphics={
+        Line(
+          points={{-100,0},{100,0}},
+          color={0,0,0},
+          thickness=4,
+          visible=not have_tan and icon_pipe==Buildings.Templates.Components.Types.IntegrationPoint.Supply),
+        Line(
+          points={{-100,0},{100,0}},
+          color={0,0,0},
+          thickness=4,
+          visible=not have_tan and icon_pipe==Buildings.Templates.Components.Types.IntegrationPoint.Return,
+          pattern=LinePattern.Dash),
+        Line(
+          points={{-100,0},{100,0}},
+          color={0,127,255},
+          visible=not have_tan and icon_pipe==Buildings.Templates.Components.Types.IntegrationPoint.None),
+        Rectangle(
+          extent={{-100,160},{100,-100}},
+          lineColor={0,0,0},
+          lineThickness=1,
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          visible=have_tan)}),
+    Documentation(
+      info="<html>
+<p>
+Model of a buffer tank based on the instantaneously mixed volume model
+<a href=\"modelica://Buildings.Fluid.MixingVolumes.MixingVolume\">
+Buildings.Fluid.MixingVolumes.MixingVolume</a>.
+Manufacturers recommend tank designs that promote mixing (e.g., with
+inside baffle plates) because a fully mixed tank yields an effective 
+buffer time greater than a stratified tank.
+The validation model 
+<a href=\"modelica://Buildings.Templates.Components.Validation.Tanks\">
+Buildings.Templates.Components.Validation.Tanks</a>
+shows that achieving the supply temperature at the tank outlet requires 
+circulating a fluid volume several times greater than the tank's actual 
+volume.
+</p>
+</html>"));
+end Buffer;
diff --git a/Buildings/Templates/Components/Tanks/package.mo b/Buildings/Templates/Components/Tanks/package.mo
new file mode 100644
index 00000000000..b198210456e
--- /dev/null
+++ b/Buildings/Templates/Components/Tanks/package.mo
@@ -0,0 +1,12 @@
+within Buildings.Templates.Components;
+package Tanks
+  "Tank models"
+  extends Modelica.Icons.VariantsPackage;
+  annotation (
+    Documentation(
+      info="<html>
+<p>
+This package contains models for storage and buffer tanks.
+</p>
+</html>"));
+end Tanks;
diff --git a/Buildings/Templates/Components/Tanks/package.order b/Buildings/Templates/Components/Tanks/package.order
new file mode 100644
index 00000000000..40591c64672
--- /dev/null
+++ b/Buildings/Templates/Components/Tanks/package.order
@@ -0,0 +1 @@
+Buffer
diff --git a/Buildings/Templates/Components/Types.mo b/Buildings/Templates/Components/Types.mo
index b2e5f8e32c1..457fcc8ff6a 100644
--- a/Buildings/Templates/Components/Types.mo
+++ b/Buildings/Templates/Components/Types.mo
@@ -4,6 +4,8 @@ package Types "Package with type definitions"
   type Chiller = enumeration(
       AirCooled
       "Air-cooled compression chiller",
+      None
+      "No chiller",
       WaterCooled
       "Water-cooled compression chiller")
     "Enumeration to specify the type of chiller";
@@ -77,14 +79,13 @@ package Types "Package with type definitions"
       EquationFit
       "Heat pump model based on the equation fit method")
     "Enumeration to specify the heat pump model";
-  type IconPipe = enumeration(
+  type IntegrationPoint = enumeration(
       None
-      "No line",
+      "None",
       Return
-      "Return pipe - Dashed line",
+      "Return side",
       Supply
-      "Supply pipe - Solid line")
-    "Enumeration to specify the pipe symbol";
+      "Supply side") "Enumeration to specify the integration point of equipment";
   type Pump = enumeration(
       None
       "No pump",
diff --git a/Buildings/Templates/Components/Validation/Tanks.mo b/Buildings/Templates/Components/Validation/Tanks.mo
new file mode 100644
index 00000000000..c1bd4f375b9
--- /dev/null
+++ b/Buildings/Templates/Components/Validation/Tanks.mo
@@ -0,0 +1,87 @@
+within Buildings.Templates.Components.Validation;
+model Tanks
+  "Validation model for tank components"
+  extends Modelica.Icons.Example;
+  replaceable package Medium=Buildings.Media.Water
+    constrainedby Modelica.Media.Interfaces.PartialMedium
+    "Liquid medium";
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1
+    "Nominal mass flow rate";
+  parameter Modelica.Units.SI.Volume V=60 * m_flow_nominal / Modelica.Media.Water.ConstantPropertyLiquidWater.d_const
+    "Tank volume";
+  Fluid.Sources.MassFlowSource_T sou(
+    redeclare final package Medium=Medium,
+    final m_flow=m_flow_nominal,
+    T=303.15,
+    nPorts=1)
+    "Fluid source"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,
+      origin={-80,0})));
+  Buildings.Templates.Components.Tanks.Buffer tan(
+    redeclare final package Medium=Medium,
+    final m_flow_nominal=m_flow_nominal,
+    show_T=true,
+    final V=V,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial)
+    "Tank"
+    annotation (Placement(transformation(extent={{0,-10},{20,10}})));
+  Fluid.Sources.Boundary_pT sin(
+    redeclare final package Medium=Medium,
+    nPorts=2)
+    "Fluid sink"
+    annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0,
+      origin={70,0})));
+  Fluid.Sensors.VolumeFlowRate senVolFlo(
+    redeclare final package Medium=Medium,
+    final m_flow_nominal=m_flow_nominal)
+    "Volume flow rate"
+    annotation (Placement(transformation(extent={{-50,-10},{-30,10}})));
+  Buildings.Utilities.Math.IntegratorWithReset intFlo
+    "Volume flow rate integrated over time"
+    annotation (Placement(transformation(extent={{-20,50},{0,70}})));
+  Fluid.Sources.MassFlowSource_T sou1(
+    redeclare final package Medium=Medium,
+    final m_flow=m_flow_nominal,
+    T=303.15,
+    nPorts=1)
+    "Fluid source"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,
+      origin={-80,-60})));
+  Buildings.Templates.Components.Tanks.Buffer noTan(
+    redeclare final package Medium=Medium,
+    final m_flow_nominal=m_flow_nominal,
+    show_T=true,
+    have_tan=false,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial)
+    "No tank – Direct fluid pass through"
+    annotation (Placement(transformation(extent={{0,-70},{20,-50}})));
+equation
+  connect(senVolFlo.port_b, tan.port_a)
+    annotation (Line(points={{-30,0},{0,0}},color={0,127,255}));
+  connect(senVolFlo.V_flow, intFlo.u)
+    annotation (Line(points={{-40,11},{-40,60},{-22,60}},color={0,0,127}));
+  connect(tan.port_b, sin.ports[1])
+    annotation (Line(points={{20,0},{40,0},{40,-1},{60,-1}},color={0,127,255}));
+  connect(sou.ports[1], senVolFlo.port_a)
+    annotation (Line(points={{-70,0},{-50,0}},color={0,127,255}));
+  connect(sou1.ports[1], noTan.port_a)
+    annotation (Line(points={{-70,-60},{0,-60}},color={0,127,255}));
+  connect(noTan.port_b, sin.ports[2])
+    annotation (Line(points={{20,-60},{40,-60},{40,1},{60,1}},color={0,127,255}));
+  annotation (
+    __Dymola_Commands(
+      file=
+        "modelica://Buildings/Resources/Scripts/Dymola/Templates/Components/Validation/Tanks.mos"
+        "Simulate and plot"),
+    experiment(
+      Tolerance=1e-6,
+      StopTime=500),
+    Documentation(
+      info="<html>
+<p> 
+This model validates the models within 
+<a href=\"modelica://Buildings.Templates.Components.Tanks\">
+Buildings.Templates.Components.Tanks</a>.
+</p>
+</html>"));
+end Tanks;
diff --git a/Buildings/Templates/Components/Validation/package.order b/Buildings/Templates/Components/Validation/package.order
index 1c996f732a4..186ae648b53 100644
--- a/Buildings/Templates/Components/Validation/package.order
+++ b/Buildings/Templates/Components/Validation/package.order
@@ -5,4 +5,5 @@ PumpMultipleRecord
 Pumps
 Routing
 Sensors
+Tanks
 Valves
diff --git a/Buildings/Templates/Components/package.order b/Buildings/Templates/Components/package.order
index fcbf4ac61e6..02bffb65379 100644
--- a/Buildings/Templates/Components/package.order
+++ b/Buildings/Templates/Components/package.order
@@ -1,4 +1,5 @@
 Actuators
+Chillers
 Coils
 Controls
 Fans
@@ -6,6 +7,7 @@ HeatPumps
 Pumps
 Routing
 Sensors
+Tanks
 Data
 Types
 Validation
diff --git a/Buildings/Templates/Data/Defaults.mo b/Buildings/Templates/Data/Defaults.mo
index 31727c09285..06438de3b5c 100644
--- a/Buildings/Templates/Data/Defaults.mo
+++ b/Buildings/Templates/Data/Defaults.mo
@@ -4,6 +4,8 @@ package Defaults
   extends Modelica.Icons.MaterialPropertiesPackage;
   constant Modelica.Units.SI.Temperature TChiWatSup=7 + 273.15
     "CHW supply temperature (AHRI 551/591)";
+  constant Modelica.Units.SI.Temperature TChiWatSup_min=3.3 + 273.15
+    "Minimum CHW supply temperature (typical)";
   constant Modelica.Units.SI.Temperature TChiWatSup_max=16 + 273.15
     "Maximum CHW supply temperature (typical)";
   constant Modelica.Units.SI.Temperature TChiWatRet=12 + 273.15
@@ -18,6 +20,10 @@ package Defaults
     "Minimum condenser entering fluid temperature (air or water)";
   constant Modelica.Units.SI.Temperature TConEnt_max=45 + 273.15
     "Maximum condenser entering fluid temperature (air or water)";
+  constant Modelica.Units.SI.Temperature TConLvg_min=16 + 273.15
+    "Minimum condenser leaving fluid temperature (air or water)";
+  constant Modelica.Units.SI.Temperature TConLvg_max=50 + 273.15
+    "Maximum condenser leaving fluid temperature (air or water)";
   constant Modelica.Units.SI.Temperature TChiWatEcoEnt=18 + 273.15
     "WSE entering CHW temperature";
   constant Modelica.Units.SI.Temperature TChiWatEcoLvg=11 + 273.15
diff --git a/Buildings/Templates/Plants/Controls/HeatPumps/AirToWater.mo b/Buildings/Templates/Plants/Controls/HeatPumps/AirToWater.mo
index 2048e9d1a06..16d36ac0aba 100644
--- a/Buildings/Templates/Plants/Controls/HeatPumps/AirToWater.mo
+++ b/Buildings/Templates/Plants/Controls/HeatPumps/AirToWater.mo
@@ -9,6 +9,17 @@ block AirToWater
     "Set to true for plants that provide CHW"
     annotation (Evaluate=true,
     Dialog(group="Plant configuration"));
+  parameter Boolean is_priOnl=false
+    "Set to true for primary-only plant"
+    annotation(Evaluate=true,
+    Dialog(group="Plant configuration"));
+  parameter Boolean have_hrc_select(start=false)=false
+    "Set to true for plants with sidestream heat recovery chiller"
+    annotation (Dialog(group="Plant configuration", enable=have_heaWat and have_chiWat));
+  final parameter Boolean have_hrc=if have_heaWat and have_chiWat then have_hrc_select
+    else false
+    "Set to true for plants with sidestream heat recovery chiller"
+    annotation (Evaluate=true);
   parameter Boolean have_valHpInlIso
     "Set to true for plants with isolation valves at heat pump inlet"
     annotation (Evaluate=true,
@@ -36,34 +47,32 @@ block AirToWater
     "Set to true for headered primary pumps, false for dedicated pumps"
     annotation (Evaluate=true,
     Dialog(group="Plant configuration"));
-  parameter Boolean have_pumHeaWatPriVar(start=true)=true
+  parameter Boolean have_pumHeaWatPriVar_select(start=true)=true
     "Set to true for variable speed primary HW pumps, false for constant speed pumps"
     annotation (Evaluate=true,
-    Dialog(group="Plant configuration", enable=have_heaWat));
-  parameter Boolean have_pumChiWatPriVar(start=true)=true
+    Dialog(group="Plant configuration", enable=have_pumHeaWatPri and not is_priOnl));
+  parameter Boolean have_pumChiWatPriVar_select(start=true)=true
     "Set to true for variable speed primary CHW pumps, false for constant speed pumps"
     annotation (Evaluate=true,
-    Dialog(group="Plant configuration", enable=have_chiWat and
-    (have_pumPriHdr or have_pumChiWatPriDed)));
-  // Only constant primary is supported for AWHP.
-  final parameter Boolean have_pumPriCtlDp=false
-    "Set to true for primary headered variable speed pumps using ∆p pump speed control"
+    Dialog(group="Plant configuration", enable=have_pumChiWatPri and not is_priOnl));
+  final parameter Boolean have_pumHeaWatPriVar=
+    have_pumHeaWatPri and (is_priOnl or have_pumHeaWatPriVar_select)
+    "Set to true for variable speed primary HW pumps, false for constant speed pumps"
+    annotation (Evaluate=true);
+  final parameter Boolean have_pumChiWatPriVar=
+    have_pumChiWatPri and (is_priOnl or have_pumChiWatPriVar_select)
+    "Set to true for variable speed primary CHW pumps, false for constant speed pumps"
+    annotation (Evaluate=true);
+  final parameter Boolean have_pumPriCtlDp=is_priOnl
+    "Set to true for primary variable speed pumps using ∆p pump speed control"
     annotation (Evaluate=true,
     Dialog(group="Plant configuration"));
-  parameter Boolean have_pumHeaWatSec_select(start=false)
-    "Set to true for plants with secondary HW pumps"
-    annotation (Evaluate=true,
-    Dialog(enable=have_heaWat,group="Plant configuration"));
   final parameter Boolean have_pumHeaWatSec=
-    if have_heaWat then have_pumHeaWatSec_select else false
+    have_heaWat and not is_priOnl
     "Set to true for plants with secondary HW pumps"
     annotation (Evaluate=true);
-  parameter Boolean have_pumChiWatSec_select(start=false)
-    "Set to true for plants with secondary CHW pumps"
-    annotation (Evaluate=true,
-    Dialog(enable=have_chiWat,group="Plant configuration"));
   final parameter Boolean have_pumChiWatSec=
-    if have_chiWat then have_pumChiWatSec_select else false
+    have_chiWat and not is_priOnl
     "Set to true for plants with secondary CHW pumps"
     annotation (Evaluate=true);
   // Only headered arrangements are supported for secondary pumps.
@@ -73,16 +82,9 @@ block AirToWater
     Dialog(group="Plant configuration"));
   // Only ∆p controlled variable speed pumps are supported for secondary pumps.
   final parameter Boolean have_pumSecCtlDp=have_pumHeaWatSec or have_pumChiWatSec
-    "Set to true for secondary headered variable speed pumps using ∆p pump speed control"
+    "Set to true for secondary variable speed pumps using ∆p pump speed control"
     annotation (Evaluate=true,
     Dialog(group="Plant configuration"));
-  // RFE(AntoineGautier): Add option for sidestream HRC. Always excluded for now.
-  final parameter Boolean have_hrc(
-    start=false)=false
-    "Set to true for plants with a sidestream heat recovery chiller"
-    annotation (Evaluate=true,
-    Dialog(group="Plant configuration",
-    enable=have_heaWat and have_chiWat));
   parameter Boolean have_senVHeaWatPri_select(start=false)
     "Set to true for plants with primary HW flow sensor"
     annotation (Evaluate=true,
@@ -136,25 +138,42 @@ block AirToWater
   final parameter Boolean have_senTChiWatSecSup=have_pumChiWatSec
     "Set to true for plants with secondary CHW supply temperature sensor"
     annotation (Evaluate=true, Dialog(group="Sensors"));
-  parameter Boolean have_senTHeaWatSecRet(start=false)
+  // Following return temperature sensors are:
+  // - optional for primary-secondary plants without HRC,
+  // - required for plants with HRC: downstream of HRC.
+  parameter Boolean have_senTHeaWatSecRet_select(start=false)=false
     "Set to true for plants with secondary HW return temperature sensor"
-    annotation (Evaluate=true, Dialog(group="Sensors", enable=have_pumHeaWatSec));
-  parameter Boolean have_senTChiWatSecRet(start=false)
+    annotation (Evaluate=true, Dialog(group="Sensors",
+      enable=have_pumHeaWatSec and not have_hrc));
+  parameter Boolean have_senTChiWatSecRet_select(start=false)=false
+    "Set to true for plants with secondary CHW return temperature sensor"
+    annotation (Evaluate=true, Dialog(group="Sensors",
+    enable=have_pumChiWatSec and not have_hrc));
+  final parameter Boolean have_senTHeaWatSecRet=
+    if have_hrc then true
+    elseif not have_pumHeaWatSec then false
+    else have_senTHeaWatSecRet_select
+    "Set to true for plants with secondary HW return temperature sensor"
+    annotation (Evaluate=true);
+  final parameter Boolean have_senTChiWatSecRet(start=false)=
+    if have_hrc then true
+    elseif not have_pumChiWatSec then false
+    else have_senTChiWatSecRet_select
     "Set to true for plants with secondary CHW return temperature sensor"
-    annotation (Evaluate=true, Dialog(group="Sensors", enable=have_pumChiWatSec));
-  parameter Integer nHp(final min=1)
+    annotation (Evaluate=true);
+  parameter Integer nHp(min=1)
     "Number of heat pumps"
     annotation (Evaluate=true,
     Dialog(group="Plant configuration"));
   parameter Integer nPumHeaWatPri(
-    final min=if have_pumHeaWatPri then 1 else 0,
+    min=if have_pumHeaWatPri then 1 else 0,
     start=0)=nHp
     "Number of primary HW pumps"
     annotation (Evaluate=true,
     Dialog(group="Plant configuration",
       enable=have_pumHeaWatPri));
   parameter Integer nPumChiWatPri(
-    final min=if have_pumChiWatPri then 1 else 0,
+    min=if have_pumChiWatPri then 1 else 0,
     start=if have_pumChiWatPri then nHp else 0)=if have_pumChiWatPri then nHp
      else 0
     "Number of primary CHW pumps"
@@ -162,178 +181,228 @@ block AirToWater
     Dialog(group="Plant configuration",
       enable=have_pumChiWatPri));
   parameter Integer nPumHeaWatSec(
-    final min=if have_pumHeaWatSec then 1 else 0,
+    min=if have_pumHeaWatSec then 1 else 0,
     start=0)=nHp
     "Number of secondary HW pumps"
     annotation (Evaluate=true,
     Dialog(group="Plant configuration",
       enable=have_pumHeaWatSec));
   parameter Integer nPumChiWatSec(
-    final min=if have_pumChiWatSec then 1 else 0,
+    min=if have_pumChiWatSec then 1 else 0,
     start=0)=nHp
     "Number of secondary CHW pumps"
     annotation (Evaluate=true,
     Dialog(group="Plant configuration",
       enable=have_pumChiWatSec));
-  parameter Boolean have_senDpHeaWatRemWir(start=true)=true
+  parameter Boolean have_senDpHeaWatRemWir(start=false)=false
     "Set to true for remote HW differential pressure sensor(s) hardwired to plant or pump controller"
     annotation (Evaluate=true,
     Dialog(group="Sensors",
-      enable=have_heaWat and have_pumHeaWatSec));
-  parameter Integer nSenDpHeaWatRem(final min=if have_heaWat and have_pumHeaWatSec
-         then 1 else 0, start=0)
+      enable=have_heaWat));
+  parameter Integer nSenDpHeaWatRem(
+    final min=if have_heaWat then 1 else 0,
+    start=0)
     "Number of remote HW differential pressure sensors used for HW pump speed control"
     annotation (Evaluate=true,
     Dialog(group="Sensors",
       enable=have_heaWat and have_pumHeaWatSec));
-  parameter Boolean have_senDpChiWatRemWir(start=true)=true
+  parameter Boolean have_senDpChiWatRemWir(start=false)=false
     "Set to true for remote CHW differential pressure sensor(s) hardwired to plant or pump controller"
     annotation (Evaluate=true,
     Dialog(group="Sensors",
-      enable=have_chiWat and have_pumChiWatSec));
-  parameter Integer nSenDpChiWatRem(final min=if have_chiWat and have_pumChiWatSec
-         then 1 else 0, start=0)
+      enable=have_chiWat));
+  parameter Integer nSenDpChiWatRem(
+    final min=if have_chiWat then 1 else 0,
+    start=0)
     "Number of remote CHW differential pressure sensors used for CHW pump speed control"
     annotation (Evaluate=true,
     Dialog(group="Sensors",
-      enable=have_chiWat and have_pumChiWatSec));
+      enable=have_chiWat));
   parameter Real THeaWatSup_nominal(
-    final min=273.15,
+    min=273.15,
     start=50 + 273.15,
-    final unit="K",
+    unit="K",
     displayUnit="degC")
     "Design HW supply temperature (maximum setpoint)"
     annotation (Dialog(group="Information provided by designer",
       enable=have_heaWat));
   parameter Real THeaWatSupSet_min(
-    final min=273.15,
+    min=273.15,
     start=25 + 273.15,
-    final unit="K",
+    unit="K",
     displayUnit="degC")
     "Minimum value to which the HW supply temperature can be reset"
     annotation (Dialog(group="Information provided by designer",
       enable=have_heaWat));
   parameter Real TOutHeaWatLck(
-    final min=273.15,
+    min=273.15,
     start=21 + 273.15,
-    final unit="K",
+    unit="K",
     displayUnit="degC")=294.15
     "Outdoor air lockout temperature above which the HW loop is prevented from operating"
     annotation (Dialog(group="Information provided by designer",
       enable=have_heaWat));
   parameter Real capHeaHp_nominal[nHp](
-    final min=fill(0, nHp),
+    min=fill(0, nHp),
     start=fill(1, nHp),
-    final unit=fill("W", nHp))
-    "Design heating capacity - Each heat pump"
+    unit=fill("W", nHp))
+    "Design heat pump heating capacity - Each heat pump"
     annotation (Dialog(group="Information provided by designer",
       enable=have_heaWat));
+  parameter Real VHeaWatHp_flow_nominal[nHp](
+    final min=fill(0, nHp),
+    start=fill(1E-6, nHp),
+    final unit=fill("m3/s", nHp))
+    "Design heat pump HW volume flow rate - Each heat pump"
+    annotation (Evaluate=true,
+    Dialog(group="Information provided by designer",
+      enable=have_heaWat and is_priOnl));
+  parameter Real VHeaWatHp_flow_min[nHp](
+    final min=fill(0, nHp),
+    start=fill(0, nHp),
+    final unit=fill("m3/s", nHp))
+    "Minimum heat pump HW volume flow rate - Each heat pump"
+    annotation (Evaluate=true,
+    Dialog(group="Information provided by designer",
+      enable=have_heaWat and is_priOnl));
+  parameter Real VHeaWatPri_flow_nominal(
+    min=0,
+    start=sum(VHeaWatHp_flow_nominal),
+    unit="m3/s")=sum(VHeaWatHp_flow_nominal)
+    "Primary HW volume flow rate"
+    annotation (Evaluate=true,
+    Dialog(group="Information provided by designer",
+      enable=have_heaWat and is_priOnl and have_pumPriHdr));
   parameter Real VHeaWatSec_flow_nominal(
-    final min=0,
+    min=0,
     start=1E-6,
-    final unit="m3/s")
+    unit="m3/s")
     "Design secondary HW volume flow rate"
     annotation (Evaluate=true,
     Dialog(group="Information provided by designer",
       enable=have_heaWat and have_pumHeaWatSec and have_pumSecCtlDp));
   parameter Real dpHeaWatRemSet_max[nSenDpHeaWatRem](
-    final min=fill(0, nSenDpHeaWatRem),
+    min=fill(0, nSenDpHeaWatRem),
     start=fill(5E4, nSenDpHeaWatRem),
-    final unit=fill("Pa", nSenDpHeaWatRem))
+    unit=fill("Pa", nSenDpHeaWatRem))
     "Maximum HW differential pressure setpoint - Remote sensor"
     annotation (Dialog(group=
       "Information provided by testing, adjusting, and balancing contractor",
       enable=have_heaWat and have_pumHeaWatSec));
   parameter Real dpHeaWatRemSet_min(
-    final min=0,
+    min=0,
     start=5*6894,
-    final unit="Pa")=5*6894
+    unit="Pa")=5*6894
     "Minimum value to which the HW differential pressure can be reset - Remote sensor"
     annotation (Dialog(group=
       "Information provided by designer",
       enable=have_heaWat and have_pumHeaWatSec));
   parameter Real yPumHeaWatPriSet(
-    final max=1,
-    final min=0,
+    max=2,
+    min=0,
     start=1,
-    final unit="1")
+    unit="1")
     "Primary pump speed providing design heat pump flow in heating mode"
     annotation (Dialog(group=
       "Information provided by testing, adjusting, and balancing contractor",
       enable=have_heaWat and have_pumHeaWatPriVar));
   parameter Real TChiWatSup_nominal(
-    final min=273.15,
+    min=273.15,
     start=7 + 273.15,
-    final unit="K",
+    unit="K",
     displayUnit="degC")
     "Design CHW supply temperature (minimum setpoint)"
     annotation (Dialog(group="Information provided by designer",
       enable=have_chiWat));
   parameter Real TChiWatSupSet_max(
-    final min=273.15,
+    min=273.15,
     start=15 + 273.15,
-    final unit="K",
+    unit="K",
     displayUnit="degC")
     "Maximum value to which the CHW supply temperature can be reset"
     annotation (Dialog(group="Information provided by designer",
       enable=have_chiWat));
   parameter Real TOutChiWatLck(
-    final min=273.15,
+    min=273.15,
     start=16 + 273.15,
-    final unit="K",
+    unit="K",
     displayUnit="degC")=289.15
     "Outdoor air lockout temperature below which the CHW loop is prevented from operating"
     annotation (Dialog(group="Information provided by designer",
       enable=have_chiWat));
   parameter Real capCooHp_nominal[nHp](
-    final min=fill(0, nHp),
+    min=fill(0, nHp),
     start=fill(1, nHp),
-    final unit=fill("W", nHp))
-    "Design cooling capacity - Each heat pump"
+    unit=fill("W", nHp))
+    "Design heat pump cooling capacity - Each heat pump"
     annotation (Dialog(group="Information provided by designer",
       enable=have_chiWat));
-  parameter Real VChiWatSec_flow_nominal(
+  parameter Real VChiWatHp_flow_nominal[nHp](
+    final min=fill(0, nHp),
+    start=fill(1E-6, nHp),
+    final unit=fill("m3/s", nHp))
+    "Design heat pump CHW volume flow rate - Each heat pump"
+    annotation (Evaluate=true,
+    Dialog(group="Information provided by designer",
+      enable=have_chiWat and is_priOnl));
+  parameter Real VChiWatHp_flow_min[nHp](
+    final min=fill(0, nHp),
+    start=fill(0, nHp),
+    final unit=fill("m3/s", nHp))
+    "Minimum heat pump CHW volume flow rate - Each heat pump"
+    annotation (Evaluate=true,
+    Dialog(group="Information provided by designer",
+      enable=have_chiWat and is_priOnl));
+  parameter Real VChiWatPri_flow_nominal(
     final min=0,
+    start=sum(VChiWatHp_flow_nominal),
+    final unit="m3/s")=sum(VChiWatHp_flow_nominal)
+    "Primary CHW volume flow rate"
+    annotation (Evaluate=true,
+    Dialog(group="Information provided by designer",
+      enable=have_chiWat and is_priOnl and have_pumPriHdr));
+  parameter Real VChiWatSec_flow_nominal(
+    min=0,
     start=1E-6,
-    final unit="m3/s")
+    unit="m3/s")
     "Design secondary CHW volume flow rate"
     annotation (Evaluate=true,
     Dialog(group="Information provided by designer",
-      enable=have_chiWat and have_pumChiWatSec and have_pumSecCtlDp));
+      enable=have_pumChiWatSec and have_pumSecCtlDp));
   parameter Real dpChiWatRemSet_max[nSenDpChiWatRem](
-    final min=fill(0, nSenDpChiWatRem),
+    min=fill(0, nSenDpChiWatRem),
     start=fill(5E4, nSenDpChiWatRem),
-    final unit=fill("Pa", nSenDpChiWatRem))
+    unit=fill("Pa", nSenDpChiWatRem))
     "Maximum CHW differential pressure setpoint - Remote sensor"
     annotation (Dialog(group=
       "Information provided by testing, adjusting, and balancing contractor",
-      enable=have_chiWat and have_pumChiWatSec));
+      enable=have_pumChiWatSec));
   parameter Real dpChiWatRemSet_min(
-    final min=0,
+    min=0,
     start=5*6894,
-    final unit="Pa")=5*6894
+    unit="Pa")=5*6894
     "Minimum value to which the CHW differential pressure can be reset - Remote sensor"
     annotation (Dialog(group=
       "Information provided by designer",
-      enable=have_chiWat and have_pumChiWatSec));
+      enable=have_pumChiWatSec));
   parameter Real yPumChiWatPriSet(
-    final max=1,
-    final min=0,
+    max=2,
+    min=0,
     start=1,
-    final unit="1")
+    unit="1")
     "Primary pump speed providing design heat pump flow in cooling mode"
     annotation (Dialog(group=
       "Information provided by testing, adjusting, and balancing contractor",
       enable=have_chiWat and have_pumChiWatPriVar));
   parameter Real cp_default(
-    final min=0,
-    final unit="J/(kg.K)")=4184
+    min=0,
+    unit="J/(kg.K)")=4184
     "Default specific heat capacity used to compute required capacity"
     annotation (Evaluate=true,
     Dialog(group="Information provided by designer"));
   parameter Real rho_default(
-    final min=0,
-    final unit="kg/m3")=996
+    min=0,
+    unit="kg/m3")=996
     "Default density used to compute required capacity"
     annotation (Evaluate=true,
     Dialog(group="Information provided by designer"));
@@ -347,25 +416,25 @@ block AirToWater
   parameter Real schCoo[:, 2](start=[0,1; 24*3600,1])=[0,1; 24*3600,1]
     "Cooling mode enable schedule"
     annotation (Dialog(enable=not have_inpSch,group="Plant enable"));
-  parameter Integer nReqIgnHeaWat(final min=0)=0
+  parameter Integer nReqIgnHeaWat(min=0)=0
     "Number of ignored HW plant requests"
     annotation (Dialog(tab="Advanced",group="Plant enable"));
-  parameter Integer nReqIgnChiWat(final min=0)=0
+  parameter Integer nReqIgnChiWat(min=0)=0
     "Number of ignored CHW plant requests"
     annotation (Dialog(tab="Advanced",group="Plant enable"));
   parameter Real dTOutLck(
-    final min=0,
-    final unit="K")=0.5
+    min=0,
+    unit="K")=0.5
     "Hysteresis for outdoor air lockout temperature"
     annotation (Dialog(tab="Advanced",group="Plant enable"));
   parameter Real dtRunEna(
-    final min=0,
-    final unit="s")=15*60
+    min=0,
+    unit="s")=15*60
     "Minimum runtime of enable and disable states"
     annotation (Dialog(tab="Advanced",group="Plant enable"));
   parameter Real dtReqDis(
-    final min=0,
-    final unit="s")=3*60
+    min=0,
+    unit="s")=3*60
     "Runtime with low number of request before disabling"
     annotation (Dialog(tab="Advanced",group="Plant enable"));
   parameter Real staEqu[:, nHp](
@@ -379,228 +448,367 @@ block AirToWater
     "Number of stages"
     annotation (Evaluate=true);
   final parameter Integer nEquAlt(
-    final min=0)=max({sum({(if staEqu[i, j] > 0 and staEqu[i, j] < 1 then 1 else 0) for j in 1:nHp}) for i in 1:nSta})
+    final min=0)=if nHp==1 then 1 else
+    max({sum({(if staEqu[i, j] > 0 and staEqu[i, j] < 1 then 1 else 0) for j in 1:nHp}) for i in 1:nSta})
     "Number of lead/lag alternate equipment"
     annotation (Evaluate=true);
-  parameter Integer idxEquAlt[nEquAlt](
-    each final min=1)
+  parameter Integer idxEquAlt[nEquAlt](final min=fill(1, nEquAlt))
     "Indices of lead/lag alternate equipment"
     annotation (Evaluate=true,
     Dialog(group="Equipment staging and rotation"));
+  parameter Real plrSta(
+    max=1,
+    min=0,
+    start=0.9,
+    unit="1")=0.9
+    "Staging part load ratio"
+    annotation (Dialog(group="Equipment staging and rotation"));
+  parameter Real dTHea(
+    min=0,
+    unit="K")=2.5
+    "Delta-T triggering stage up command for heating appplications (>0)"
+    annotation (Dialog(tab="Advanced",group="Equipment staging and rotation",
+    enable=have_heaWat));
+  parameter Real dTCoo(
+    min=0,
+    unit="K")=1
+    "Delta-T triggering stage up command for cooling applications (>0)"
+    annotation (Dialog(tab="Advanced",group="Equipment staging and rotation",
+    enable=have_chiWat));
   parameter Real dtVal(
-    final min=0,
+    min=0,
     start=90,
-    final unit="s")=90
+    unit="s")=90
     "Nominal valve timing"
     annotation (Dialog(tab="Advanced",group="Equipment staging and rotation",
       enable=have_valHpInlIso or have_valHpOutIso));
-  parameter Real dtHp(
-    final min=0,
-    final unit="s")=180
-    annotation (Dialog(tab="Advanced",group="Equipment staging and rotation"));
-  parameter Real plrSta(
-    final max=1,
-    final min=0,
-    start=0.9,
-    final unit="1")=0.9
-    "Staging part load ratio"
-    annotation (Dialog(group="Equipment staging and rotation"));
   parameter Real dtRunSta(
-    final min=0,
-    final unit="s",
+    min=0,
+    unit="s",
     displayUnit="min")=900
     "Minimum runtime of each stage"
     annotation (Dialog(tab="Advanced",group="Equipment staging and rotation"));
   parameter Real dtOff(
-    final min=0,
-    final unit="s")=900
+    min=0,
+    unit="s")=900
     "Off time required before equipment is deemed available again"
     annotation (Dialog(tab="Advanced",group="Equipment staging and rotation"));
+  parameter Real dtOffHp(
+    min=0,
+    unit="s")=180
+    "Heat pump internal shutdown cycle timing (before closing isolation valves or disabling primary pumps)"
+    annotation (Dialog(tab="Advanced",group="Equipment staging and rotation"));
+  parameter Real dtPri(
+    min=0,
+    unit="s")=900
+    "Runtime with high primary-setpoint Delta-T before staging up"
+    annotation (Dialog(tab="Advanced",group="Equipment staging and rotation"));
+  parameter Real dtSec(
+    min=0,
+    start=600,
+    unit="s")=600
+    "Runtime with high secondary-primary and secondary-setpoint Delta-T before staging up"
+    annotation (Dialog(tab="Advanced",group="Equipment staging and rotation",
+    enable=have_pumHeaWatSec or have_pumChiWatSec));
   parameter Real dtRunPumSta(
-    final min=0,
+    min=0,
     start=600,
-    final unit="s")=600
-    "Runtime before triggering stage command"
+    unit="s")=600
+    "Runtime before triggering stage change command based on efficiency condition"
+    annotation (Dialog(tab="Advanced",group="Pump staging",
+      enable=have_pumPriHdr and have_pumPriCtlDp or have_pumSecHdr and have_pumSecCtlDp));
+  parameter Real dtRunFaiSafPumSta(
+    min=0,
+    start=300,
+    unit="s")=300
+    "Runtime before triggering stage change command based on failsafe condition"
+    annotation (Dialog(tab="Advanced",group="Pump staging",
+      enable=have_pumPriHdr and have_pumPriCtlDp or have_pumSecHdr and have_pumSecCtlDp));
+  parameter Real dtRunFaiSafLowYPumSta(
+    min=0,
+    start=600,
+    unit="s")=dtRunPumSta
+    "Runtime before triggering stage change command based on low pump speed failsafe condition"
     annotation (Dialog(tab="Advanced",group="Pump staging",
       enable=have_pumPriHdr and have_pumPriCtlDp or have_pumSecHdr and have_pumSecCtlDp));
   parameter Real dVOffUpPumSta(
-    final max=1,
-    final min=0,
+    max=1,
+    min=0,
     start=0.03,
-    final unit="1")=0.03
+    unit="1")=0.03
     "Stage up flow point offset"
     annotation (Dialog(tab="Advanced",group="Pump staging",
       enable=have_pumPriHdr and have_pumPriCtlDp or have_pumSecHdr and have_pumSecCtlDp));
   parameter Real dVOffDowPumSta(
-    final max=1,
-    final min=0,
+    max=1,
+    min=0,
     start=0.03,
-    final unit="1")=dVOffUpPumSta
+    unit="1")=dVOffUpPumSta
     "Stage down flow point offset"
     annotation (Dialog(tab="Advanced",group="Pump staging",
       enable=have_pumPriHdr and have_pumPriCtlDp or have_pumSecHdr and have_pumSecCtlDp));
+  parameter Real dpOffPumSta(
+    min=0,
+    start=1E4,
+    unit="Pa")=1E4
+    "Stage change ∆p point offset (>0)"
+    annotation (Dialog(tab="Advanced",group="Pump staging",
+      enable=have_pumPriHdr and have_pumPriCtlDp or have_pumSecHdr and have_pumSecCtlDp));
+  parameter Real yUpPumSta(
+    min=0,
+    start=0.99,
+    unit="1")=0.99
+    "Stage up pump speed point"
+    annotation (Dialog(tab="Advanced",group="Pump staging",
+      enable=have_pumPriHdr and have_pumPriCtlDp or have_pumSecHdr and have_pumSecCtlDp));
+  parameter Real yDowPumSta(
+    min=0,
+    start=0.4,
+    unit="1")=0.4
+    "Stage down pump speed point"
+    annotation (Dialog(tab="Advanced",group="Pump staging",
+      enable=have_pumPriHdr and have_pumPriCtlDp or have_pumSecHdr and have_pumSecCtlDp));
   parameter Real dtHol(
-    final min=0,
-    final unit="s")=900
+    min=0,
+    unit="s")=900
     "Minimum hold time during stage change"
     annotation (Dialog(tab="Advanced",group="Plant reset",
-      enable=have_heaWat and have_pumHeaWatSec or have_chiWat and have_pumChiWatSec));
+      enable=have_heaWat and have_pumHeaWatSec or have_pumChiWatSec));
   parameter Real resDpHeaWat_max(
-    final max=1,
-    final min=0,
-    final unit="1")=0.5
+    max=1,
+    min=0,
+    unit="1")=0.5
     "Upper limit of plant reset interval for HW differential pressure reset"
     annotation (Dialog(tab="Advanced",group="Plant reset",
       enable=have_heaWat and have_pumHeaWatSec));
   parameter Real resTHeaWatSup_min(
-    final max=1,
-    final min=0,
-    final unit="1")=resDpHeaWat_max
+    max=1,
+    min=0,
+    unit="1")=resDpHeaWat_max
     "Lower limit of plant reset interval for HW supply temperature reset"
     annotation (Dialog(tab="Advanced",group="Plant reset",
       enable=have_heaWat and have_pumHeaWatSec));
   parameter Real resDpChiWat_max(
-    final max=1,
-    final min=0,
-    final unit="1")=0.5
+    max=1,
+    min=0,
+    unit="1")=0.5
     "Upper limit of plant reset interval for CHW differential pressure reset"
     annotation (Dialog(tab="Advanced",group="Plant reset",
-      enable=have_chiWat and have_pumChiWatSec));
+      enable=have_pumChiWatSec));
   parameter Real resTChiWatSup_min(
-    final max=1,
-    final min=0,
-    final unit="1")=resDpChiWat_max
+    max=1,
+    min=0,
+    unit="1")=resDpChiWat_max
     "Lower limit of plant reset interval for CHW supply temperature reset"
     annotation (Dialog(tab="Advanced",group="Plant reset",
-      enable=have_chiWat and have_pumChiWatSec));
+      enable=have_pumChiWatSec));
   parameter Real res_init(
-    final max=1,
-    final min=0,
-    final unit="1")=1
+    max=1,
+    min=0,
+    unit="1")=1
     "Initial reset value"
     annotation (Dialog(tab="Advanced",group="Plant reset",
-      enable=have_heaWat and have_pumHeaWatSec or have_chiWat and have_pumChiWatSec));
+      enable=have_heaWat and have_pumHeaWatSec or have_pumChiWatSec));
   parameter Real res_min(
-    final max=1,
-    final min=0,
-    final unit="1")=0
+    max=1,
+    min=0,
+    unit="1")=0
     "Minimum reset value"
     annotation (Dialog(tab="Advanced",group="Plant reset",
-      enable=have_heaWat and have_pumHeaWatSec or have_chiWat and have_pumChiWatSec));
+      enable=have_heaWat and have_pumHeaWatSec or have_pumChiWatSec));
   parameter Real res_max(
-    final max=1,
-    final min=0,
-    final unit="1")=1
+    max=1,
+    min=0,
+    unit="1")=1
     "Maximum reset value"
     annotation (Dialog(tab="Advanced",group="Plant reset",
-      enable=have_heaWat and have_pumHeaWatSec or have_chiWat and have_pumChiWatSec));
+      enable=have_heaWat and have_pumHeaWatSec or have_pumChiWatSec));
   parameter Real dtDel(
-    final min=100*1E-15,
-    final unit="s")=900
+    min=100*1E-15,
+    unit="s")=900
     "Delay time before the reset begins"
     annotation (Dialog(tab="Advanced",group="Plant reset",
-      enable=have_heaWat and have_pumHeaWatSec or have_chiWat and have_pumChiWatSec));
+      enable=have_heaWat and have_pumHeaWatSec or have_pumChiWatSec));
   parameter Real dtResHeaWat(
-    final min=1E-3,
-    final unit="s")=300
+    min=1E-3,
+    unit="s")=300
     "Reset period for HW plant reset"
     annotation (Dialog(tab="Advanced",group="Plant reset",
       enable=have_heaWat and have_pumHeaWatSec));
-  parameter Integer nReqResIgnHeaWat(final min=0)=2
+  parameter Integer nReqResIgnHeaWat(min=0)=2
     "Number of ignored requests for HW plant reset"
     annotation (Dialog(tab="Advanced",group="Plant reset",
       enable=have_heaWat and have_pumHeaWatSec));
   parameter Real triHeaWat(
-    final max=0,
-    final unit="1")=-0.02
+    max=0,
+    unit="1")=-0.02
     "Trim amount for HW plant reset"
     annotation (Dialog(tab="Advanced",group="Plant reset",
       enable=have_heaWat and have_pumHeaWatSec));
   parameter Real rspHeaWat(
-    final min=0,
-    final unit="1")=0.03
+    min=0,
+    unit="1")=0.03
     "Respond amount for HW plant reset"
     annotation (Dialog(tab="Advanced",group="Plant reset",
       enable=have_heaWat and have_pumHeaWatSec));
   parameter Real rspHeaWat_max(
-    final min=0,
-    final unit="1")=0.07
+    min=0,
+    unit="1")=0.07
     "Maximum response per reset period for HW plant reset"
     annotation (Dialog(tab="Advanced",group="Plant reset",
       enable=have_heaWat and have_pumHeaWatSec));
   parameter Real dtResChiWat(
-    final min=1E-3,
-    final unit="s")=300
+    min=1E-3,
+    unit="s")=300
     "Reset period for CHW plant reset"
     annotation (Dialog(tab="Advanced",group="Plant reset",
-      enable=have_chiWat and have_pumChiWatSec));
-  parameter Integer nReqResIgnChiWat(final min=0)=2
+      enable=have_pumChiWatSec));
+  parameter Integer nReqResIgnChiWat(min=0)=2
     "Number of ignored requests for CHW plant reset"
     annotation (Dialog(tab="Advanced",group="Plant reset",
-      enable=have_chiWat and have_pumChiWatSec));
+      enable=have_pumChiWatSec));
   parameter Real triChiWat(
-    final max=0,
-    final unit="1")=-0.02
+    max=0,
+    unit="1")=-0.02
     "Trim amount for CHW plant reset"
     annotation (Dialog(tab="Advanced",group="Plant reset",
-      enable=have_chiWat and have_pumChiWatSec));
+      enable=have_pumChiWatSec));
   parameter Real rspChiWat(
-    final min=0,
-    final unit="1")=0.03
+    min=0,
+    unit="1")=0.03
     "Respond amount for CHW plant reset"
     annotation (Dialog(tab="Advanced",group="Plant reset",
-      enable=have_chiWat and have_pumChiWatSec));
+      enable=have_pumChiWatSec));
   parameter Real rspChiWat_max(
-    final min=0,
-    final unit="1")=0.07
+    min=0,
+    unit="1")=0.07
     "Maximum response per reset period for CHW plant reset"
     annotation (Dialog(tab="Advanced",group="Plant reset",
-      enable=have_chiWat and have_pumChiWatSec));
-  parameter Real yPumHeaWatSec_min(
-    final max=1,
-    final min=0,
+      enable=have_pumChiWatSec));
+  parameter Real yPumHeaWatPri_min(
+    max=1,
+    min=0,
     start=0.1,
-    final unit="1")=0.1
-    "Minimum pump speed"
-    annotation (Dialog(tab="Advanced",group="Secondary HW pumps",
-      enable=have_pumHeaWatSec));
-  parameter Real kPumHeaWatSec(
-    final min=100*Buildings.Controls.OBC.CDL.Constants.eps,
+    unit="1")=0.1
+    "Minimum primary HW pump speed"
+    annotation(Dialog(tab="Advanced",group="Pump control",
+    enable=have_heaWat and have_pumPriCtlDp));
+  parameter Real kCtlDpHeaWat(
+    min=100*Buildings.Controls.OBC.CDL.Constants.eps,
     start=1)=1
-    "Gain of controller"
-    annotation (Dialog(tab="Advanced",group="Secondary HW pumps",
-      enable=have_pumHeaWatSec));
-  parameter Real TiPumHeaWatSec(
-    final min=100*Buildings.Controls.OBC.CDL.Constants.eps,
+    "Gain of controller for HW loop ∆p control"
+    annotation (Dialog(tab="Advanced", group="Loop differential pressure", enable=have_heaWat));
+  parameter Real TiCtlDpHeaWat(
+    min=100*Buildings.Controls.OBC.CDL.Constants.eps,
     start=60,
-    final unit="s")=60
-    "Time constant of integrator block"
-    annotation (Dialog(tab="Advanced",group="Secondary HW pumps",
+    unit="s")=60
+    "Time constant of integrator block for HW loop ∆p control"
+    annotation (Dialog(tab="Advanced", group="Loop differential pressure", enable=have_heaWat));
+  parameter Real yPumChiWatPri_min(
+    max=1,
+    min=0,
+    start=0.1,
+    unit="1")=0.1
+    "Minimum primary CHW pump speed"
+    annotation(Dialog(tab="Advanced",group="Pump control",
+      enable=have_pumChiWatPri and have_pumPriCtlDp));
+  parameter Real kCtlDpChiWat(
+    min=100*Buildings.Controls.OBC.CDL.Constants.eps,
+    start=1)=1
+    "Gain of controller for CHW loop ∆p control"
+    annotation (Dialog(tab="Advanced", group="Loop differential pressure", enable=have_chiWat));
+  parameter Real TiCtlDpChiWat(
+    min=100*Buildings.Controls.OBC.CDL.Constants.eps,
+    start=60,
+    unit="s")=60
+    "Time constant of integrator block for CHW loop ∆p control"
+    annotation (Dialog(tab="Advanced", group="Loop differential pressure", enable=have_chiWat));
+  parameter Real yPumHeaWatSec_min(
+    max=1,
+    min=0,
+    start=0.1,
+    unit="1")=0.1
+    "Minimum secondary HW pump speed"
+    annotation (Dialog(tab="Advanced",group="Pump control",
       enable=have_pumHeaWatSec));
   parameter Real yPumChiWatSec_min(
-    final max=1,
-    final min=0,
+    max=1,
+    min=0,
     start=0.1,
-    final unit="1")=0.1
-    "Minimum pump speed"
-    annotation (Dialog(tab="Advanced",group="Secondary CHW pumps",
+    unit="1")=0.1
+    "Minimum secondary CHW pump speed"
+    annotation (Dialog(tab="Advanced",group="Pump control",
       enable=have_pumChiWatSec));
-  parameter Real kPumChiWatSec(
-    final min=100*Buildings.Controls.OBC.CDL.Constants.eps,
+  parameter Real kValMinByp(
+    min=0,
     start=1)=1
     "Gain of controller"
-    annotation (Dialog(tab="Advanced",group="Secondary CHW pumps",
-      enable=have_pumChiWatSec));
-  parameter Real TiPumChiWatSec(
-    final min=100*Buildings.Controls.OBC.CDL.Constants.eps,
-    start=60,
-    final unit="s")=60
+    annotation (Dialog(tab="Advanced",group="Minimum flow control",
+      enable=is_priOnl));
+  parameter Modelica.Units.SI.Time TiValMinByp(
+    min=Buildings.Controls.OBC.CDL.Constants.small,
+    start=0.5)=60
     "Time constant of integrator block"
-    annotation (Dialog(tab="Advanced",group="Secondary CHW pumps",
-      enable=have_pumChiWatSec));
+    annotation (Dialog(tab="Advanced",group="Minimum flow control",
+      enable=is_priOnl));
+  // Sidestream HRC parameters
+  parameter Boolean have_reqFloHrc(start=false)=false
+    "Set to true if HRC provides flow request point via network interface"
+    annotation (Evaluate=true,
+      Dialog(tab="Advanced", group="Sidestream HRC", enable=have_hrc));
+  parameter Real TChiWatSupHrc_min(
+    min=273.15,
+    start=4 + 273.15,
+    unit="K",
+    displayUnit="degC")
+    "Sidestream HRC – Minimum allowable CHW supply temperature"
+    annotation (Dialog(group="Information provided by designer", enable=have_hrc));
+  parameter Real THeaWatSupHrc_max(
+    min=273.15,
+    start=60 + 273.15,
+    unit="K",
+    displayUnit="degC")
+    "Sidestream HRC – Maximum allowable HW supply temperature"
+    annotation (Dialog(group="Information provided by designer", enable=have_hrc));
+  parameter Real COPHeaHrc_nominal(
+    min=1.1,
+    start=2.8,
+    unit="1")
+    "Sidestream HRC – Heating COP at design heating conditions"
+    annotation (Dialog(group="Information provided by designer", enable=have_hrc));
+  parameter Real capCooHrc_min(
+    min=0,
+    start=0,
+    unit="W")
+    "Sidestream HRC – Minimum cooling capacity below which cycling occurs"
+    annotation (Dialog(group="Information provided by designer", enable=have_hrc));
+  parameter Real capHeaHrc_min(
+    min=0,
+    start=0,
+    unit="W")
+    "Sidestream HRC – Minimum heating capacity below which cycling occurs"
+    annotation (Dialog(group="Information provided by designer", enable=have_hrc));
+  parameter Real dtLoaHrc(
+    min=0,
+    start=600,
+    unit="s")=600
+    "Runtime with sufficient load before enabling"
+    annotation(Dialog(tab="Advanced", group="Sidestream HRC", enable=have_hrc));
+  parameter Real dtTem1Hrc(
+    min=0,
+    start=180,
+    unit="s")=180
+    "Runtime with first temperature threshold exceeded before disabling"
+    annotation(Dialog(tab="Advanced", group="Sidestream HRC", enable=have_hrc));
+  parameter Real dtTem2Hrc(
+    min=0,
+    start=60,
+    unit="s")=60
+    "Runtime with second temperature threshold exceeded before disabling"
+    annotation(Dialog(tab="Advanced", group="Sidestream HRC", enable=have_hrc));
   Buildings.Controls.OBC.CDL.Logical.Sources.Constant u1AvaHp[nHp](each k=true)
     "Heat pump available signal – Block does not handle faulted equipment yet"
-    annotation (Placement(transformation(extent={{-250,250},{-230,270}}),
+    annotation (Placement(transformation(extent={{-230,250},{-210,270}}),
         iconTransformation(extent={{-240,220},{-200,260}})));
   Buildings.Controls.OBC.CDL.Interfaces.IntegerInput nReqPlaHeaWat
     if have_heaWat
@@ -612,13 +820,13 @@ block AirToWater
     final quantity="ThermodynamicTemperature",
     displayUnit="degC")
     "Outdoor air temperature"
-    annotation (Placement(transformation(extent={{-300,60},{-260,100}}),
-      iconTransformation(extent={{-240,20},{-200,60}})));
+    annotation (Placement(transformation(extent={{-300,100},{-260,140}}),
+      iconTransformation(extent={{-240,40},{-200,80}})));
   Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1SchHea
     if have_heaWat and have_inpSch
     "Heating mode enable via schedule"
     annotation (Placement(transformation(extent={{-300,360},{-260,400}}),
-      iconTransformation(extent={{-240,300},{-200,340}})));
+      iconTransformation(extent={{-240,322},{-200,362}})));
   Buildings.Controls.OBC.CDL.Interfaces.IntegerInput nReqPlaChiWat
     if have_chiWat
     "Number of CHW plant requests" annotation (Placement(transformation(extent=
@@ -628,208 +836,306 @@ block AirToWater
     if have_chiWat and have_inpSch
     "Cooling mode enable via schedule"
     annotation (Placement(transformation(extent={{-300,340},{-260,380}}),
-      iconTransformation(extent={{-240,280},{-200,320}})));
+      iconTransformation(extent={{-240,302},{-200,342}})));
   Buildings.Controls.OBC.CDL.Interfaces.IntegerInput nReqResHeaWat
     if have_heaWat
     "Sum of HW reset requests of all heating loads served"
-    annotation (Placement(transformation(extent={{-300,-360},{-260,-320}}),
+    annotation (Placement(transformation(extent={{-300,-380},{-260,-340}}),
       iconTransformation(extent={{-240,80},{-200,120}})));
   Buildings.Controls.OBC.CDL.Interfaces.IntegerInput nReqResChiWat
     if have_chiWat
     "Sum of CHW reset requests of all heating loads served"
-    annotation (Placement(transformation(extent={{-300,-380},{-260,-340}}),
+    annotation (Placement(transformation(extent={{-300,-400},{-260,-360}}),
       iconTransformation(extent={{-240,60},{-200,100}})));
   Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1PumHeaWatPri_actual[nPumHeaWatPri]
-    if have_heaWat and have_pumHeaWatPri
+    if have_pumHeaWatPri
     "Primary HW pump status"
     annotation (Placement(transformation(extent={{-300,180},{-260,220}}),
-      iconTransformation(extent={{-240,220},{-200,260}})));
+      iconTransformation(extent={{-240,262},{-200,302}})));
   Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1PumChiWatPri_actual[nPumChiWatPri]
-    if have_chiWat and have_pumChiWatPri
+    if have_pumChiWatPri
     "Primary CHW pump status"
     annotation (Placement(transformation(extent={{-300,160},{-260,200}}),
-      iconTransformation(extent={{-240,200},{-200,240}})));
+      iconTransformation(extent={{-240,242},{-200,282}})));
   Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1PumHeaWatSec_actual[nPumHeaWatSec]
-    if have_heaWat and have_pumHeaWatSec
+    if have_pumHeaWatSec
     "Secondary HW pump status"
     annotation (Placement(transformation(extent={{-300,140},{-260,180}}),
-      iconTransformation(extent={{-240,180},{-200,220}})));
+      iconTransformation(extent={{-240,222},{-200,262}})));
   Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1PumChiWatSec_actual[nPumChiWatSec]
-    if have_chiWat and have_pumChiWatSec
+    if have_pumChiWatSec
     "Secondary CHW pump status"
     annotation (Placement(transformation(extent={{-300,120},{-260,160}}),
-      iconTransformation(extent={{-240,160},{-200,200}})));
+      iconTransformation(extent={{-240,202},{-200,242}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput THeaWatPriRet(
     final unit="K",
     displayUnit="degC") if have_heaWat and have_senTHeaWatPriRet
     "Primary HW return temperature"
-    annotation (Placement(transformation(extent={{-300,20},{-260,60}}),
-      iconTransformation(extent={{-240,-20},{-200,20}})));
+    annotation (Placement(transformation(extent={{-300,60},{-260,100}}),
+      iconTransformation(extent={{-240,0},{-200,40}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput VHeaWatPri_flow(
     final unit="m3/s") if have_heaWat and have_senVHeaWatPri
     "Primary HW volume flow rate"
-    annotation (Placement(transformation(extent={{-300,0},{-260,40}}),
-      iconTransformation(extent={{-240,-40},{-200,0}})));
+    annotation (Placement(transformation(extent={{-300,40},{-260,80}}),
+      iconTransformation(extent={{-240,-20},{-200,20}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput dpHeaWatLoc(
     final unit="Pa")
     if have_heaWat and not have_senDpHeaWatRemWir
     "Local HW differential pressure"
-    annotation (Placement(transformation(extent={{-300,-260},{-260,-220}}),
-      iconTransformation(extent={{-240,-280},{-200,-240}})));
+    annotation (Placement(transformation(extent={{-300,-240},{-260,-200}}),
+      iconTransformation(extent={{-240,-300},{-200,-260}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput dpHeaWatLocSet[nSenDpHeaWatRem](
     each final unit="Pa")
     if have_heaWat and not have_senDpHeaWatRemWir
     "Local HW differential pressure setpoint output from each of the remote loops"
-    annotation (Placement(transformation(extent={{-300,-240},{-260,-200}}),
-      iconTransformation(extent={{-240,-260},{-200,-220}})));
+    annotation (Placement(transformation(extent={{-300,-220},{-260,-180}}),
+      iconTransformation(extent={{-240,-280},{-200,-240}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput dpHeaWatRem[nSenDpHeaWatRem](
-    each final unit="Pa")
-    if have_heaWat and have_senDpHeaWatRemWir
+    each final unit="Pa") if have_heaWat and have_senDpHeaWatRemWir
     "Remote HW differential pressure"
-    annotation (Placement(transformation(extent={{-300,-220},{-260,-180}}),
-      iconTransformation(extent={{-240,-240},{-200,-200}})));
+    annotation (Placement(transformation(extent={{-300,-200},{-260,-160}}),
+      iconTransformation(extent={{-240,-260},{-200,-220}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput dpChiWatLoc(
     final unit="Pa")
     if have_chiWat and not have_senDpChiWatRemWir
     "Local CHW differential pressure"
-    annotation (Placement(transformation(extent={{-300,-320},{-260,-280}}),
-      iconTransformation(extent={{-240,-340},{-200,-300}})));
+    annotation (Placement(transformation(extent={{-300,-300},{-260,-260}}),
+      iconTransformation(extent={{-240,-360},{-200,-320}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput dpChiWatLocSet[nSenDpChiWatRem](
     each final unit="Pa")
     if have_chiWat and not have_senDpChiWatRemWir
     "Local CHW differential pressure setpoint output from each of the remote loops"
-    annotation (Placement(transformation(extent={{-300,-300},{-260,-260}}),
-      iconTransformation(extent={{-240,-320},{-200,-280}})));
+    annotation (Placement(transformation(extent={{-300,-280},{-260,-240}}),
+      iconTransformation(extent={{-240,-340},{-200,-300}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput dpChiWatRem[nSenDpChiWatRem](
-    each final unit="Pa")
-    if have_chiWat and have_senDpChiWatRemWir
+    each final unit="Pa") if have_chiWat and have_senDpChiWatRemWir
     "Remote CHW differential pressure"
-    annotation (Placement(transformation(extent={{-300,-280},{-260,-240}}),
-      iconTransformation(extent={{-240,-300},{-200,-260}})));
+    annotation (Placement(transformation(extent={{-300,-260},{-260,-220}}),
+      iconTransformation(extent={{-240,-320},{-200,-280}})));
   Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1ValHeaWatHpInlIso[nHp]
     if have_heaWat and have_valHpInlIso
     "Heat pump inlet HW inlet isolation valve command" annotation (Placement(
-        transformation(extent={{260,300},{300,340}}), iconTransformation(extent
-          ={{200,180},{240,220}})));
+        transformation(extent={{260,300},{300,340}}), iconTransformation(extent={{200,260},
+            {240,300}})));
   Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1ValHeaWatHpOutIso[nHp]
     if have_heaWat and have_valHpOutIso
     "Heat pump outlet HW isolation valve command" annotation (Placement(
-        transformation(extent={{260,280},{300,320}}), iconTransformation(extent
-          ={{200,160},{240,200}})));
+        transformation(extent={{260,280},{300,320}}), iconTransformation(extent={{200,240},
+            {240,280}})));
   Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1ValChiWatHpInlIso[nHp]
     if have_chiWat and have_valHpInlIso
     "Heat pump inlet CHW isolation valve command" annotation (Placement(
-        transformation(extent={{260,260},{300,300}}), iconTransformation(extent
-          ={{200,140},{240,180}})));
+        transformation(extent={{260,260},{300,300}}), iconTransformation(extent={{200,220},
+            {240,260}})));
   Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1ValChiWatHpOutIso[nHp]
     if have_chiWat and have_valHpOutIso
     "Heat pump outlet CHW isolation valve command" annotation (Placement(
-        transformation(extent={{260,240},{300,280}}), iconTransformation(extent
-          ={{200,120},{240,160}})));
+        transformation(extent={{260,240},{300,280}}), iconTransformation(extent={{200,200},
+            {240,240}})));
   Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1PumHeaWatPri[nPumHeaWatPri]
     if have_pumHeaWatPri
     "Primary HW pump start command"
     annotation (Placement(transformation(extent={{260,180},{300,220}}),
-      iconTransformation(extent={{200,80},{240,120}})));
+      iconTransformation(extent={{200,160},{240,200}})));
   Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1PumChiWatPri[nPumChiWatPri]
     if have_pumChiWatPri and have_chiWat
     "Primary CHW pump start command"
     annotation (Placement(transformation(extent={{260,160},{300,200}}),
-      iconTransformation(extent={{200,60},{240,100}})));
+      iconTransformation(extent={{200,140},{240,180}})));
   Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1PumHeaWatSec[nPumHeaWatSec]
     if have_pumHeaWatSec
     "Secondary HW pump start command"
     annotation (Placement(transformation(extent={{260,140},{300,180}}),
-      iconTransformation(extent={{200,20},{240,60}})));
+      iconTransformation(extent={{200,100},{240,140}})));
   Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1PumChiWatSec[nPumChiWatSec]
-    if have_pumChiWatSec and have_chiWat
+    if have_pumChiWatSec
     "Secondary CHW pump start command"
     annotation (Placement(transformation(extent={{260,120},{300,160}}),
-      iconTransformation(extent={{200,0},{240,40}})));
+      iconTransformation(extent={{200,80},{240,120}})));
   Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1Hp[nHp]
     "Heat pump enable command"
     annotation (Placement(transformation(extent={{260,360},{300,400}}),
-      iconTransformation(extent={{200,240},{240,280}})));
+      iconTransformation(extent={{200,320},{240,360}})));
   Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1HeaHp[nHp]
     if have_heaWat and have_chiWat
     "Heat pump heating/cooling mode command: true=heating, false=cooling"
     annotation (Placement(transformation(extent={{260,340},{300,380}}),
-      iconTransformation(extent={{200,220},{240,260}})));
+      iconTransformation(extent={{200,300},{240,340}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealOutput dpHeaWatRemSet[nSenDpHeaWatRem](
     each final min=0,
     each final unit="Pa") if have_heaWat
     "HW differential pressure setpoint"
     annotation (Placement(transformation(extent={{260,-80},{300,-40}}),
-      iconTransformation(extent={{200,-180},{240,-140}})));
+      iconTransformation(extent={{200,-160},{240,-120}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealOutput dpChiWatRemSet[nSenDpChiWatRem](
     each final min=0,
     each final unit="Pa") if have_chiWat
     "CHW differential pressure setpoint"
     annotation (Placement(transformation(extent={{260,-100},{300,-60}}),
-      iconTransformation(extent={{200,-200},{240,-160}})));
+      iconTransformation(extent={{200,-180},{240,-140}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealOutput yPumHeaWatPriHdr(
-    final unit="1")
-    if have_heaWat and have_pumHeaWatPriVar and have_pumPriHdr
+    final unit="1") if have_pumHeaWatPriVar and have_pumPriHdr
     "Primary headered HW pump speed command"
     annotation (Placement(transformation(extent={{260,80},{300,120}}),
-      iconTransformation(extent={{200,-40},{240,0}})));
+      iconTransformation(extent={{200,40},{240,80}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealOutput yPumChiWatPriHdr(
-    final unit="1") if have_chiWat and have_pumChiWatPri and
-    have_pumChiWatPriVar and have_pumPriHdr
+    final unit="1") if have_pumChiWatPriVar and have_pumPriHdr
     "Primary headered CHW pump speed command"
     annotation (Placement(transformation(extent={{260,60},{300,100}}),
-      iconTransformation(extent={{200,-60},{240,-20}})));
+      iconTransformation(extent={{200,20},{240,60}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealOutput yPumHeaWatSec(
     final unit="1")
-    if have_heaWat and have_pumHeaWatSec
+    if have_pumHeaWatSec
     "Primary HW pump speed command"
     annotation (Placement(transformation(extent={{260,-20},{300,20}}),
-      iconTransformation(extent={{200,-120},{240,-80}})));
+      iconTransformation(extent={{200,-40},{240,0}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealOutput yPumChiWatSec(
-    final unit="1")
-    if have_chiWat and have_pumChiWatSec
+    final unit="1") if have_pumChiWatSec
     "Primary CHW pump speed command"
     annotation (Placement(transformation(extent={{260,-40},{300,0}}),
-      iconTransformation(extent={{200,-140},{240,-100}})));
+      iconTransformation(extent={{200,-60},{240,-20}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealOutput TChiWatSupSet(
     final unit="K",
     displayUnit="degC") if have_chiWat
     "CHW supply temperature setpoint"
     annotation (Placement(transformation(extent={{260,-200},{300,-160}}),
-      iconTransformation(extent={{200,-280},{240,-240}})));
+      iconTransformation(extent={{200,-240},{240,-200}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealOutput THeaWatSupSet(
     final unit="K",
     displayUnit="degC") if have_heaWat
     "HW supply temperature setpoint"
     annotation (Placement(transformation(extent={{260,-180},{300,-140}}),
-      iconTransformation(extent={{200,-260},{240,-220}})));
+      iconTransformation(extent={{200,-220},{240,-180}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput TChiWatPriRet(
     final unit="K",
     displayUnit="degC") if have_chiWat and have_senTChiWatPriRet
     "Primary CHW return temperature"
-    annotation (Placement(transformation(extent={{-300,-40},{-260,0}}),
-      iconTransformation(extent={{-240,-80},{-200,-40}})));
+    annotation (Placement(transformation(extent={{-300,0},{-260,40}}),
+      iconTransformation(extent={{-240,-60},{-200,-20}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput VChiWatPri_flow(
     final unit="m3/s") if have_chiWat and have_senVChiWatPri
     "Primary CHW volume flow rate"
-    annotation (Placement(transformation(extent={{-300,-60},{-260,-20}}),
-      iconTransformation(extent={{-240,-100},{-200,-60}})));
+    annotation (Placement(transformation(extent={{-300,-20},{-260,20}}),
+      iconTransformation(extent={{-240,-80},{-200,-40}})));
   Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1Hp_actual[nHp]
     "Heat pump status"
     annotation (Placement(transformation(extent={{-300,280},{-260,320}}),
-      iconTransformation(extent={{-240,240},{-200,280}})));
+      iconTransformation(extent={{-240,282},{-200,322}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealOutput yPumHeaWatPriDed[nPumHeaWatPri](
-    each final unit="1")
-    if have_heaWat and have_pumHeaWatPriVar and not have_pumPriHdr
+    each final unit="1") if have_pumHeaWatPriVar and not have_pumPriHdr
     "Primary dedicated HW pump speed command"
     annotation (Placement(transformation(extent={{260,40},{300,80}}),
-      iconTransformation(extent={{200,-80},{240,-40}})));
+      iconTransformation(extent={{200,0},{240,40}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealOutput yPumChiWatPriDed[nPumChiWatPri](
-    each final unit="1")
-    if have_chiWat and have_pumChiWatPriDed and have_pumChiWatPriVar
+    each final unit="1") if have_pumChiWatPriVar and have_pumChiWatPriDed
     "Primary dedicated CHW pump speed command"
     annotation (Placement(transformation(extent={{260,20},{300,60}}),
-      iconTransformation(extent={{200,-100},{240,-60}})));
+      iconTransformation(extent={{200,-20},{240,20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput THeaWatSecRet(
+    final unit="K",
+    displayUnit="degC") if have_heaWat and have_senTHeaWatSecRet
+    "Secondary HW return temperature"
+    annotation (Placement(transformation(extent={{-300,-60},{-260,-20}}),
+      iconTransformation(extent={{-240,-120},{-200,-80}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput VHeaWatSec_flow(
+    final unit="m3/s") if have_heaWat and have_senVHeaWatSec
+    "Secondary HW volume flow rate"
+    annotation (Placement(transformation(extent={{-300,-100},{-260,-60}}),
+      iconTransformation(extent={{-240,-160},{-200,-120}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TChiWatSecRet(
+    final unit="K",
+    displayUnit="degC") if have_chiWat and have_senTChiWatSecRet
+    "Secondary CHW return temperature"
+    annotation (Placement(transformation(extent={{-300,-140},{-260,-100}}),
+      iconTransformation(extent={{-240,-200},{-200,-160}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput VChiWatSec_flow(
+    final unit="m3/s") if have_chiWat and have_senVChiWatSec
+    "Secondary CHW volume flow rate"
+    annotation (Placement(transformation(extent={{-300,-180},{-260,-140}}),
+      iconTransformation(extent={{-240,-240},{-200,-200}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput TSupSet[nHp](
+    each final unit="K",
+    each final quantity="ThermodynamicTemperature",
+    each displayUnit="degC")
+    "Active HP supply temperature setpoint"
+    annotation (Placement(transformation(extent={{260,-140},{300,-100}}),
+        iconTransformation(extent={{200,-200},{240,-160}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput THeaWatPriSup(final unit="K",
+      displayUnit="degC") if have_heaWat "Primary HW supply temperature"
+    annotation (Placement(transformation(extent={{-300,80},{-260,120}}),
+        iconTransformation(extent={{-240,20},{-200,60}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TChiWatPriSup(final unit="K",
+      displayUnit="degC") if have_chiWat "Primary CHW return temperature"
+    annotation (Placement(transformation(extent={{-300,20},{-260,60}}),
+        iconTransformation(extent={{-240,-40},{-200,0}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput THeaWatSecSup(final unit="K",
+      displayUnit="degC") if have_heaWat and have_senTHeaWatSecSup
+    "Secondary HW supply temperature" annotation (Placement(transformation(
+          extent={{-300,-40},{-260,0}}),   iconTransformation(extent={{-240,
+            -100},{-200,-60}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TChiWatSecSup(final unit="K",
+      displayUnit="degC") if have_chiWat and have_senTChiWatSecSup
+    "Secondary CHW return temperature" annotation (Placement(transformation(
+          extent={{-300,-120},{-260,-80}}),  iconTransformation(extent={{-240,
+            -180},{-200,-140}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1Hrc if have_hrc
+    "Sidestream HRC enable command" annotation (Placement(transformation(extent={{260,
+            -300},{300,-260}}),      iconTransformation(extent={{200,-280},{240,
+            -240}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1CooHrc if have_hrc
+    "Sidestream HRC mode command: true for cooling, false for heating"
+    annotation (Placement(transformation(extent={{260,-320},{300,-280}}),
+        iconTransformation(extent={{200,-300},{240,-260}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1PumChiWatHrc if
+    have_hrc
+    "Sidestream HRC CHW pump enable command" annotation (Placement(
+        transformation(extent={{260,-380},{300,-340}}), iconTransformation(
+          extent={{200,-320},{240,-280}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1PumHeaWatHrc if
+    have_hrc
+    "Sidestream HRC HW pump enable command" annotation (Placement(
+        transformation(extent={{260,-400},{300,-360}}), iconTransformation(
+          extent={{200,-340},{240,-300}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput TSupSetHrc(final unit="K",
+      displayUnit="degC") if have_hrc
+                          "Sidestream HRC active supply temperature setpoint"
+    annotation (Placement(transformation(extent={{260,-340},{300,-300}}),
+        iconTransformation(extent={{200,-360},{240,-320}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TChiWatRetUpsHrc(final unit="K",
+      displayUnit="degC") if have_hrc "CHW return temperature upstream of HRC"
+    annotation (Placement(transformation(extent={{-300,-160},{-260,-120}}),
+        iconTransformation(extent={{-240,-220},{-200,-180}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput THeaWatRetUpsHrc(final unit="K",
+      displayUnit="degC") if have_hrc "HW return temperature upstream of HRC"
+    annotation (Placement(transformation(extent={{-300,-80},{-260,-40}}),
+        iconTransformation(extent={{-240,-140},{-200,-100}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1Hrc_actual if have_hrc
+    "HRC status"
+    annotation (Placement(transformation(extent={{-300,-320},{-260,-280}}),
+      iconTransformation(extent={{-240,182},{-200,222}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1ReqFloChiWat
+    if have_hrc and have_reqFloHrc
+                   "CHW flow request from HRC" annotation (Placement(
+        transformation(extent={{-300,-340},{-260,-300}}),
+                                                        iconTransformation(
+          extent={{-240,162},{-200,202}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1ReqFloConWat
+    if have_hrc and have_reqFloHrc
+                   "CW flow request from HRC" annotation (Placement(
+        transformation(extent={{-300,-360},{-260,-320}}),
+                                                        iconTransformation(
+          extent={{-240,142},{-200,182}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yValHeaWatMinByp(final unit="1")
+    if have_heaWat and is_priOnl
+    "HW minimum flow bypass valve command" annotation (Placement(transformation(
+          extent={{260,-240},{300,-200}}), iconTransformation(extent={{200,-100},
+            {240,-60}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yValChiWatMinByp(final unit="1")
+    if have_chiWat and is_priOnl
+    "CHW minimum flow bypass valve command" annotation (Placement(
+        transformation(extent={{260,-260},{300,-220}}), iconTransformation(
+          extent={{200,-120},{240,-80}})));
+
   Enabling.Enable enaHea(
     final typ=Buildings.Templates.Plants.Controls.Types.Application.Heating,
     final TOutLck=TOutHeaWatLck,
@@ -854,7 +1160,7 @@ block AirToWater
     "Evaluate heating stage availability"
     annotation (Placement(transformation(extent={{-110,320},{-90,340}})));
   StagingRotation.EquipmentEnable enaEquHea(
-    final staEqu=staEqu)
+    final staEqu=staEqu, final nEquAlt=nEquAlt)
     if have_heaWat
     "Compute enable command for equipment in heating mode"
     annotation (Placement(transformation(extent={{40,350},{60,370}})));
@@ -868,7 +1174,8 @@ block AirToWater
     each final have_pumHeaWatSec=have_pumHeaWatSec,
     each final have_pumChiWatSec=have_pumChiWatSec,
     each final dtVal=dtVal,
-    each final dtOff=dtHp) "Event sequencing"
+    each final dtOff=dtOffHp)
+    "Event sequencing"
     annotation (Placement(transformation(extent={{140,284},{160,312}})));
   StagingRotation.StageAvailability avaStaCoo(
     final staEqu=staEqu)
@@ -876,14 +1183,18 @@ block AirToWater
     "Evaluate cooling stage availability"
     annotation (Placement(transformation(extent={{-110,60},{-90,80}})));
   StagingRotation.StageChangeCommand chaStaHea(
+    typ=Buildings.Templates.Plants.Controls.Types.Application.Heating,
+    final have_pumSec=have_pumHeaWatSec,
     final have_inpPlrSta=false,
     final plrSta=plrSta,
     final staEqu=staEqu,
     final capEqu=capHeaHp_nominal,
     final dtRun=dtRunSta,
     final cp_default=cp_default,
-    final rho_default=rho_default)
-    if have_heaWat
+    final rho_default=rho_default,
+    final dT=dTHea,
+    final dtPri=dtPri,
+    final dtSec=dtSec) if have_heaWat
     "Generate heating stage transition command"
     annotation (Placement(transformation(extent={{-40,308},{-20,332}})));
   StagingRotation.SortRuntime sorRunTimHea(
@@ -905,14 +1216,18 @@ block AirToWater
     "Cooling mode enable"
     annotation (Placement(transformation(extent={{-110,90},{-90,110}})));
   StagingRotation.StageChangeCommand chaStaCoo(
+    final typ=Buildings.Templates.Plants.Controls.Types.Application.Cooling,
+    final have_pumSec=have_pumChiWatSec,
     final have_inpPlrSta=false,
     final plrSta=plrSta,
     final staEqu=staEqu,
     final capEqu=capCooHp_nominal,
     final dtRun=dtRunSta,
     final cp_default=cp_default,
-    final rho_default=rho_default)
-    if have_chiWat
+    final rho_default=rho_default,
+    final dT=dTCoo,
+    final dtPri=dtPri,
+    final dtSec=dtSec) if have_chiWat
     "Generate cooling stage transition command"
     annotation (Placement(transformation(extent={{-40,50},{-20,74}})));
   Utilities.StageIndex idxStaCoo(
@@ -922,7 +1237,7 @@ block AirToWater
     "Compute cooling stage index"
     annotation (Placement(transformation(extent={{-10,90},{10,110}})));
   StagingRotation.EquipmentEnable enaEquCoo(
-    final staEqu=staEqu)
+    final staEqu=staEqu, final nEquAlt=nEquAlt)
     if have_chiWat
     "Compute enable command for equipment in cooling mode"
     annotation (Placement(transformation(extent={{40,90},{60,110}})));
@@ -944,28 +1259,44 @@ block AirToWater
     annotation (Placement(transformation(extent={{-40,20},{-20,40}})));
   Pumps.Generic.StagingHeadered staPumHeaWatPri(
     final is_pri=true,
+    final is_ctlDp=have_pumPriCtlDp,
     final have_valInlIso=have_valHpInlIso,
     final have_valOutIso=have_valHpOutIso,
     final nEqu=nHp,
     final nPum=nPumHeaWatPri,
     final is_hdr=have_pumPriHdr,
-    final is_ctlDp=have_pumPriCtlDp,
     final dtRun=dtRunPumSta,
     final dVOffUp=dVOffUpPumSta,
-    final dVOffDow=dVOffDowPumSta) if have_pumHeaWatPri
+    final dVOffDow=dVOffDowPumSta,
+    final nSenDp=if have_senDpHeaWatRemWir then nSenDpHeaWatRem else 1,
+    final V_flow_nominal=VHeaWatPri_flow_nominal,
+    final dtRunFaiSaf=dtRunFaiSafPumSta,
+    final dtRunFaiSafLowY=dtRunFaiSafLowYPumSta,
+    final dpOff=dpOffPumSta,
+    final yUp=yUpPumSta,
+    final yDow=yDowPumSta)
+    if have_pumHeaWatPri
     "Primary HW pump staging"
     annotation (Placement(transformation(extent={{140,190},{160,210}})));
   Pumps.Generic.StagingHeadered staPumChiWatPri(
     final is_pri=true,
+    final is_ctlDp=have_pumPriCtlDp,
     final have_valInlIso=have_valHpInlIso,
     final have_valOutIso=have_valHpOutIso,
     final nEqu=nHp,
     final nPum=nPumChiWatPri,
     final is_hdr=have_pumPriHdr,
-    final is_ctlDp=have_pumPriCtlDp,
     final dtRun=dtRunPumSta,
     final dVOffUp=dVOffUpPumSta,
-    final dVOffDow=dVOffDowPumSta) if have_pumChiWatPri and have_chiWat
+    final dVOffDow=dVOffDowPumSta,
+    final nSenDp=if have_senDpChiWatRemWir then nSenDpChiWatRem else 1,
+    final V_flow_nominal=VChiWatPri_flow_nominal,
+    final dtRunFaiSaf=dtRunFaiSafPumSta,
+    final dtRunFaiSafLowY=dtRunFaiSafLowYPumSta,
+    final dpOff=dpOffPumSta,
+    final yUp=yUpPumSta,
+    final yDow=yDowPumSta)
+    if have_pumChiWatPri
     "Primary CHW pump staging"
     annotation (Placement(transformation(extent={{190,170},{210,190}})));
   Pumps.Generic.StagingHeadered staPumChiWatSec(
@@ -974,10 +1305,17 @@ block AirToWater
     final nPum=nPumChiWatSec,
     final is_hdr=have_pumSecHdr,
     final is_ctlDp=have_pumSecCtlDp,
+    final nSenDp=if have_senDpChiWatRemWir then nSenDpChiWatRem else 1,
     final V_flow_nominal=VChiWatSec_flow_nominal,
     final dtRun=dtRunPumSta,
+    final dtRunFaiSaf=dtRunFaiSafPumSta,
+    final dtRunFaiSafLowY=dtRunFaiSafLowYPumSta,
     final dVOffUp=dVOffUpPumSta,
-    final dVOffDow=dVOffDowPumSta) if have_pumChiWatSec and have_chiWat
+    final dVOffDow=dVOffDowPumSta,
+    final dpOff=dpOffPumSta,
+    final yUp=yUpPumSta,
+    final yDow=yDowPumSta)
+    if have_pumChiWatSec
     "Secondary CHW pump staging"
     annotation (Placement(transformation(extent={{190,130},{210,150}})));
   Pumps.Generic.StagingHeadered staPumHeaWatSec(
@@ -986,50 +1324,35 @@ block AirToWater
     final nPum=nPumHeaWatSec,
     final is_hdr=have_pumSecHdr,
     final is_ctlDp=have_pumSecCtlDp,
+    final nSenDp=if have_senDpHeaWatRemWir then nSenDpHeaWatRem else 1,
     final V_flow_nominal=VHeaWatSec_flow_nominal,
     final dtRun=dtRunPumSta,
+    final dtRunFaiSaf=dtRunFaiSafPumSta,
+    final dtRunFaiSafLowY=dtRunFaiSafLowYPumSta,
     final dVOffUp=dVOffUpPumSta,
-    final dVOffDow=dVOffDowPumSta) if have_pumHeaWatSec
+    final dVOffDow=dVOffDowPumSta,
+    final dpOff=dpOffPumSta,
+    final yUp=yUpPumSta,
+    final yDow=yDowPumSta)
+    if have_pumHeaWatSec
     "Secondary HW pump staging"
     annotation (Placement(transformation(extent={{140,150},{160,170}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput THeaWatSecRet(
-    final unit="K",
-    displayUnit="degC") if have_heaWat and have_senTHeaWatSecRet
-    "Secondary HW return temperature"
-    annotation (Placement(transformation(extent={{-300,-100},{-260,-60}}),
-      iconTransformation(extent={{-240,-140},{-200,-100}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput VHeaWatSec_flow(
-    final unit="m3/s") if have_heaWat and have_senVHeaWatSec
-    "Secondary HW volume flow rate"
-    annotation (Placement(transformation(extent={{-300,-120},{-260,-80}}),
-      iconTransformation(extent={{-240,-160},{-200,-120}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput TChiWatSecRet(
-    final unit="K",
-    displayUnit="degC") if have_chiWat and have_senTChiWatSecRet
-    "Secondary CHW return temperature"
-    annotation (Placement(transformation(extent={{-300,-160},{-260,-120}}),
-      iconTransformation(extent={{-240,-200},{-200,-160}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput VChiWatSec_flow(
-    final unit="m3/s") if have_chiWat and have_senVChiWatSec
-    "Secondary CHW volume flow rate"
-    annotation (Placement(transformation(extent={{-300,-180},{-260,-140}}),
-      iconTransformation(extent={{-240,-220},{-200,-180}})));
-  Utilities.PlaceholderReal THeaWatRet(have_inp=have_heaWat and
-        have_senTHeaWatPriRet,
-      have_inpPh=true) if have_heaWat "Select HW return temperature sensor"
+  Utilities.PlaceholderReal THeaWatRet(final have_inp=have_senTHeaWatPriRet,
+      final have_inpPh=true)
+                       if have_heaWat "Select HW return temperature sensor"
     annotation (Placement(transformation(extent={{-230,30},{-210,50}})));
-  Utilities.PlaceholderReal VHeaWat_flow(have_inp=have_heaWat and
-        have_senVHeaWatPri,
-      have_inpPh=true) if have_heaWat "Select HW flow sensor"
-    annotation (Placement(transformation(extent={{-200,10},{-180,30}})));
-  Utilities.PlaceholderReal TChiWatRet(have_inp=have_chiWat and
-        have_senTChiWatPriRet,
-      have_inpPh=true) if have_chiWat "Select CHW return temperature sensor"
+  Utilities.PlaceholderReal VHeaWatSta_flow(final have_inp=have_senVHeaWatPri,
+      final have_inpPh=true) if have_heaWat
+    "For staging logic select primary flow sensor if both primary and secondary sensors available"
+    annotation (Placement(transformation(extent={{-190,10},{-170,30}})));
+  Utilities.PlaceholderReal TChiWatRet(final have_inp=have_senTChiWatPriRet,
+      final have_inpPh=true)
+                       if have_chiWat "Select CHW return temperature sensor"
     annotation (Placement(transformation(extent={{-230,-30},{-210,-10}})));
-  Utilities.PlaceholderReal VChiWat_flow(have_inp=have_chiWat and
-        have_senVChiWatPri,
-      have_inpPh=true) if have_chiWat "Select CHW flow sensor"
-    annotation (Placement(transformation(extent={{-200,-50},{-180,-30}})));
+  Utilities.PlaceholderReal VChiWatSta_flow(final have_inp=have_senVChiWatPri,
+      final have_inpPh=true) if have_chiWat
+    "For staging logic select primary flow sensor if both primary and secondary sensors available"
+    annotation (Placement(transformation(extent={{-190,-52},{-170,-32}})));
   Buildings.Controls.OBC.CDL.Logical.Pre y1HpPre[nHp]
     "Left-limit of command signal to break algebraic loop"
     annotation (Placement(transformation(extent={{200,370},{180,390}})));
@@ -1061,7 +1384,7 @@ block AirToWater
     final rsp=rspHeaWat,
     final rsp_max=rspHeaWat_max,
     final tri=triHeaWat) if have_heaWat "HW plant reset"
-    annotation (Placement(transformation(extent={{90,230},{110,250}})));
+    annotation (Placement(transformation(extent={{50,230},{70,250}})));
   Setpoints.PlantReset resChiWat(
     final TSup_nominal=TChiWatSup_nominal,
     final TSupSetLim=TChiWatSupSet_max,
@@ -1080,27 +1403,38 @@ block AirToWater
     final rsp=rspChiWat,
     final rsp_max=rspChiWat_max,
     final tri=triChiWat) if have_chiWat "CHW plant reset"
-    annotation (Placement(transformation(extent={{90,-50},{110,-30}})));
-  Pumps.Primary.VariableSpeedNoDpControl ctlPumPri(
+    annotation (Placement(transformation(extent={{50,-50},{70,-30}})));
+  Pumps.Primary.VariableSpeed ctlPumPri(
     final have_heaWat=have_heaWat,
     final have_chiWat=have_chiWat,
+    final have_pumPriCtlDp=have_pumPriCtlDp,
     final have_pumChiWatPriDed=have_pumChiWatPriDed,
     final have_pumPriHdr=have_pumPriHdr,
     final nEqu=nHp,
     final nPumHeaWatPri=nPumHeaWatPri,
     final nPumChiWatPri=nPumChiWatPri,
     final yPumHeaWatPriSet=yPumHeaWatPriSet,
-    final yPumChiWatPriSet=yPumChiWatPriSet)
+    final yPumChiWatPriSet=yPumChiWatPriSet,
+    final have_senDpChiWatRemWir=have_senDpChiWatRemWir,
+    final have_senDpHeaWatRemWir=have_senDpHeaWatRemWir,
+    final kCtlDpChiWat=kCtlDpChiWat,
+    final kCtlDpHeaWat=kCtlDpHeaWat,
+    final nSenDpChiWatRem=nSenDpChiWatRem,
+    final nSenDpHeaWatRem=nSenDpHeaWatRem,
+    final TiCtlDpChiWat=TiCtlDpChiWat,
+    final TiCtlDpHeaWat=TiCtlDpHeaWat,
+    final yPumChiWatPri_min=yPumChiWatPri_min,
+    final yPumHeaWatPri_min=yPumHeaWatPri_min)
+    if have_pumHeaWatPriVar or have_pumChiWatPriVar
     "Primary pump speed control"
-    annotation (Placement(transformation(extent={{190,70},{210,90}})));
+    annotation (Placement(transformation(extent={{190,70},{210,98}})));
   Pumps.Generic.ControlDifferentialPressure ctlPumHeaWatSec(
     final have_senDpRemWir=have_senDpHeaWatRemWir,
-    nPum=nPumHeaWatSec,
+    final nPum=nPumHeaWatSec,
     final nSenDpRem=nSenDpHeaWatRem,
     final y_min=yPumHeaWatSec_min,
-    final k=kPumHeaWatSec,
-    final Ti=TiPumHeaWatSec)
-    if have_pumHeaWatSec
+    final k=kCtlDpHeaWat,
+    final Ti=TiCtlDpHeaWat) if have_pumHeaWatSec and have_pumSecCtlDp
     "Secondary HW pump speed control"
     annotation (Placement(transformation(extent={{140,-10},{160,10}})));
   Pumps.Generic.ControlDifferentialPressure ctlPumChiWatSec(
@@ -1108,17 +1442,10 @@ block AirToWater
     final nPum=nPumChiWatSec,
     final nSenDpRem=nSenDpChiWatRem,
     final y_min=yPumChiWatSec_min,
-    final k=kPumChiWatSec,
-    final Ti=TiPumChiWatSec) if have_chiWat and have_pumChiWatSec
+    final k=kCtlDpChiWat,
+    final Ti=TiCtlDpChiWat) if have_pumChiWatSec and have_pumSecCtlDp
     "Secondary CHW pump speed control"
     annotation (Placement(transformation(extent={{190,-30},{210,-10}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealOutput TSupSet[nHp](
-    each final unit="K",
-    each final quantity="ThermodynamicTemperature",
-    each displayUnit="degC")
-    "Active HP supply temperature setpoint"
-    annotation (Placement(transformation(extent={{260,-140},{300,-100}}),
-        iconTransformation(extent={{200,-240},{240,-200}})));
   Buildings.Controls.OBC.CDL.Reals.Switch swiTSupSet[nHp]
     if have_heaWat and have_chiWat
     "Select supply temperature setpoint based on operating mode"
@@ -1129,40 +1456,73 @@ block AirToWater
   Buildings.Controls.OBC.CDL.Routing.RealScalarReplicator repTHeaWatSupSet(final
       nout=nHp) if have_heaWat "Replicate HWST setpoint"
     annotation (Placement(transformation(extent={{150,-110},{170,-90}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput THeaWatPriSup(final unit="K",
-      displayUnit="degC") if have_heaWat "Primary HW supply temperature"
-    annotation (Placement(transformation(extent={{-300,40},{-260,80}}),
-        iconTransformation(extent={{-240,0},{-200,40}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput TChiWatPriSup(final unit="K",
-      displayUnit="degC") if have_chiWat "Primary CHW return temperature"
-    annotation (Placement(transformation(extent={{-300,-20},{-260,20}}),
-        iconTransformation(extent={{-240,-60},{-200,-20}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput THeaWatSecSup(final unit="K",
-      displayUnit="degC") if have_chiWat and have_senTHeaWatSecSup
-    "Secondary HW supply temperature" annotation (Placement(transformation(
-          extent={{-300,-80},{-260,-40}}), iconTransformation(extent={{-240,-120},
-            {-200,-80}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput TChiWatSecSup(final unit="K",
-      displayUnit="degC") if have_chiWat and have_senTChiWatSecSup
-    "Secondary CHW return temperature" annotation (Placement(transformation(
-          extent={{-300,-140},{-260,-100}}), iconTransformation(extent={{-240,-180},
-            {-200,-140}})));
   Buildings.Controls.OBC.CDL.Routing.RealExtractSignal pasTHeaWatSupSet(final nin
       =nHp,                                                             final
       nout=nHp) if have_heaWat and not have_chiWat
     "Direct pass through for HWST setpoint"
-    annotation (Placement(transformation(extent={{220,-110},{240,-90}})));
+    annotation (Placement(transformation(extent={{214,-110},{234,-90}})));
   Buildings.Controls.OBC.CDL.Routing.RealExtractSignal pasTChiWatSupSet(final nin
       =nHp, final nout=nHp) if have_chiWat and not have_heaWat
     "Direct pass through for CHWST setpoint"
-    annotation (Placement(transformation(extent={{220,-150},{240,-130}})));
+    annotation (Placement(transformation(extent={{214,-150},{234,-130}})));
+  HeatRecoveryChillers.Controller hrc(
+    final COPHea_nominal=COPHeaHrc_nominal,
+    final TChiWatSup_min=TChiWatSupHrc_min,
+    final THeaWatSup_max=THeaWatSupHrc_max,
+    final capCoo_min=capCooHrc_min,
+    final capHea_min=capHeaHrc_min,
+    final cp_default=cp_default,
+    final dtLoa=dtLoaHrc,
+    final dtRun=dtRunEna,
+    final dtTem1=dtTem1Hrc,
+    final dtTem2=dtTem2Hrc,
+    final have_reqFlo=have_reqFloHrc,
+    final rho_default=rho_default) if have_hrc
+    "Sidestream heat recovery chiller control"
+    annotation (Placement(transformation(extent={{200,-320},{220,-288}})));
+  Buildings.Controls.OBC.CDL.Routing.RealExtractSignal pasDpHeaWatRemSet(final
+      nin=nSenDpHeaWatRem, final nout=nSenDpHeaWatRem)
+    if have_heaWat and have_senDpHeaWatRemWir
+    "Direct pass through for HW ∆p setpoint"
+    annotation (Placement(transformation(extent={{90,110},{110,130}})));
+  Buildings.Controls.OBC.CDL.Routing.RealExtractSignal pasDpChiWatRemSet(final
+      nin=nSenDpChiWatRem, final nout=nSenDpChiWatRem)
+    if have_chiWat and have_senDpChiWatRemWir
+    "Direct pass through for CHW ∆p setpoint"
+    annotation (Placement(transformation(extent={{90,50},{110,70}})));
+  MinimumFlow.ControllerDualMode ctlFloMin(
+    final have_chiWat=have_chiWat,
+    final have_heaWat=have_heaWat,
+    final have_pumChiWatPri=have_pumChiWatPri,
+    final have_valInlIso=have_valHpInlIso,
+    final have_valOutIso=have_valHpOutIso,
+    final k=kValMinByp,
+    final nEnaChiWat=if have_valHpInlIso or have_valHpOutIso then nHp
+      elseif have_pumChiWatPri then nPumChiWatPri else nPumHeaWatPri,
+    final nEnaHeaWat=if have_valHpInlIso or have_valHpOutIso then nHp else nPumHeaWatPri,
+    final nEqu=nHp,
+    final Ti=TiValMinByp,
+    final VChiWat_flow_min=VChiWatHp_flow_min,
+    final VChiWat_flow_nominal=VChiWatHp_flow_nominal,
+    final VHeaWat_flow_min=VHeaWatHp_flow_min,
+    final VHeaWat_flow_nominal=VHeaWatHp_flow_nominal) if is_priOnl
+    "CHW/HW minimum flow bypass valve controller"
+    annotation (Placement(transformation(extent={{202,-242},{222,-218}})));
+  Utilities.PlaceholderReal VHeaWatLoa_flow(final have_inp=is_priOnl, final
+      have_inpPh=true) if have_heaWat
+    "For HRC logic select either primary or secondary sensor depending on plant configuration"
+    annotation (Placement(transformation(extent={{-140,-70},{-120,-50}})));
+  Utilities.PlaceholderReal VChiWatLoa_flow(final have_inp=is_priOnl, final
+      have_inpPh=true) if have_chiWat
+    "For HRC logic select either primary or secondary sensor depending on plant configuration"
+    annotation (Placement(transformation(extent={{-140,-110},{-120,-90}})));
 equation
   connect(u1SchHea, enaHea.u1Sch)
     annotation (Line(points={{-280,380},{-180,380},{-180,364},{-112,364}},color={255,0,255}));
   connect(nReqPlaHeaWat, enaHea.nReqPla) annotation (Line(points={{-280,340},{-178,
           340},{-178,360},{-112,360}}, color={255,127,0}));
   connect(TOut, enaHea.TOut)
-    annotation (Line(points={{-280,80},{-170,80},{-170,356},{-112,356}},color={0,0,127}));
+    annotation (Line(points={{-280,120},{-170,120},{-170,356},{-112,356}}, color={0,0,127}));
   connect(enaHea.y1, idxStaHea.u1Lea)
     annotation (Line(points={{-88,360},{-56,360},{-56,366},{-12,366}},color={255,0,255}));
   connect(avaStaHea.y1, idxStaHea.u1AvaSta)
@@ -1195,7 +1555,8 @@ equation
   connect(nReqPlaChiWat, enaCoo.nReqPla) annotation (Line(points={{-280,320},{-182,
           320},{-182,100},{-112,100}}, color={255,127,0}));
   connect(TOut, enaCoo.TOut)
-    annotation (Line(points={{-280,80},{-170,80},{-170,96},{-112,96}},color={0,0,127}));
+    annotation (Line(points={{-280,120},{-170,120},{-170,96},{-112,96}},
+                                                                      color={0,0,127}));
   connect(u1SchCoo, enaCoo.u1Sch)
     annotation (Line(points={{-280,360},{-180,360},{-180,104},{-112,104}},color={255,0,255}));
   connect(avaStaCoo.y1, chaStaCoo.u1AvaSta)
@@ -1241,12 +1602,12 @@ equation
   connect(staPumChiWatPri.y1_actual, seqEve.u1PumChiWatPri_actual) annotation (
       Line(points={{212,186},{220,186},{220,262},{122,262},{122,296},{138,296}},
         color={255,0,255}));
-  connect(seqEve.y1PumChiWatPri, staPumChiWatPri.u1Pum) annotation (Line(points
-        ={{162,288},{178,288},{178,178},{188,178}}, color={255,0,255}));
+  connect(seqEve.y1PumChiWatPri, staPumChiWatPri.u1Pum) annotation (Line(points={{162,288},
+          {178,288},{178,182},{188,182}},           color={255,0,255}));
   connect(u1PumChiWatPri_actual, staPumChiWatPri.u1Pum_actual)
-    annotation (Line(points={{-280,180},{170,180},{170,176},{188,176}},color={255,0,255}));
+    annotation (Line(points={{-280,180},{170,180},{170,180},{188,180}},color={255,0,255}));
   connect(u1PumHeaWatPri_actual, staPumHeaWatPri.u1Pum_actual)
-    annotation (Line(points={{-280,200},{128,200},{128,196},{138,196}},color={255,0,255}));
+    annotation (Line(points={{-280,200},{128,200},{128,200},{138,200}},color={255,0,255}));
   connect(staPumHeaWatPri.y1_actual, seqEve.u1PumHeaWatPri_actual) annotation (
       Line(points={{162,206},{164,206},{164,260},{120,260},{120,298},{138,298}},
         color={255,0,255}));
@@ -1255,69 +1616,68 @@ equation
   connect(staPumChiWatSec.y1, y1PumChiWatSec)
     annotation (Line(points={{212,140},{280,140}},color={255,0,255}));
   connect(u1PumHeaWatSec_actual, staPumHeaWatSec.u1Pum_actual)
-    annotation (Line(points={{-280,160},{120,160},{120,156},{138,156}},color={255,0,255}));
+    annotation (Line(points={{-280,160},{120,160},{120,160},{138,160}},color={255,0,255}));
   connect(u1PumChiWatSec_actual, staPumChiWatSec.u1Pum_actual)
-    annotation (Line(points={{-280,140},{180,140},{180,136},{188,136}},color={255,0,255}));
+    annotation (Line(points={{-280,140},{180,140},{180,140},{188,140}},color={255,0,255}));
   connect(staPumHeaWatPri.y1, y1PumHeaWatPri)
     annotation (Line(points={{162,200},{216,200},{216,200},{280,200}},color={255,0,255}));
   connect(staPumChiWatSec.y1_actual, seqEve.u1PumChiWatSec_actual) annotation (
       Line(points={{212,146},{222,146},{222,266},{126,266},{126,290},{138,290}},
         color={255,0,255}));
-  connect(seqEve.y1PumHeaWatPri, staPumHeaWatPri.u1Pum) annotation (Line(points
-        ={{162,290},{162,220},{130,220},{130,198},{138,198}}, color={255,0,255}));
+  connect(seqEve.y1PumHeaWatPri, staPumHeaWatPri.u1Pum) annotation (Line(points={{162,290},
+          {162,220},{130,220},{130,202},{138,202}},           color={255,0,255}));
   connect(staPumHeaWatSec.y1_actual, seqEve.u1PumHeaWatSec_actual) annotation (
       Line(points={{162,166},{166,166},{166,264},{124,264},{124,292},{138,292}},
         color={255,0,255}));
   connect(VHeaWatSec_flow, staPumHeaWatSec.V_flow)
-    annotation (Line(points={{-280,-100},{-156,-100},{-156,152},{138,152}},color={0,0,127}));
+    annotation (Line(points={{-280,-80},{-156,-80},{-156,158},{138,158}},  color={0,0,127}));
   connect(VChiWatSec_flow, staPumChiWatSec.V_flow)
-    annotation (Line(points={{-280,-160},{-154,-160},{-154,132},{188,132}},color={0,0,127}));
+    annotation (Line(points={{-280,-160},{-154,-160},{-154,138},{188,138}},color={0,0,127}));
   connect(THeaWatPriRet, THeaWatRet.u)
-    annotation (Line(points={{-280,40},{-232,40}},color={0,0,127}));
+    annotation (Line(points={{-280,80},{-240,80},{-240,40},{-232,40}},
+                                                  color={0,0,127}));
   connect(THeaWatRet.y, chaStaHea.TRet)
     annotation (Line(points={{-208,40},{-168,40},{-168,306},{-50,306},{-50,314},{-42,314}},
       color={0,0,127}));
-  connect(THeaWatSecRet, THeaWatRet.uPh) annotation (Line(points={{-280,-80},{-240,
-          -80},{-240,34},{-232,34}}, color={0,0,127}));
-  connect(VHeaWatPri_flow, VHeaWat_flow.u)
-    annotation (Line(points={{-280,20},{-202,20}},color={0,0,127}));
-  connect(VHeaWat_flow.y, chaStaHea.V_flow)
-    annotation (Line(points={{-178,20},{-166,20},{-166,304},{-48,304},{-48,312},{-42,312}},
-      color={0,0,127}));
-  connect(VHeaWatSec_flow, VHeaWat_flow.uPh) annotation (Line(points={{-280,-100},
-          {-206,-100},{-206,14},{-202,14}}, color={0,0,127}));
+  connect(THeaWatSecRet, THeaWatRet.uPh) annotation (Line(points={{-280,-40},{-240,
+          -40},{-240,34},{-232,34}}, color={0,0,127}));
+  connect(VHeaWatPri_flow, VHeaWatSta_flow.u) annotation (Line(points={{-280,60},
+          {-244,60},{-244,20},{-192,20}}, color={0,0,127}));
+  connect(VHeaWatSta_flow.y, chaStaHea.V_flow) annotation (Line(points={{-168,20},
+          {-166,20},{-166,304},{-48,304},{-48,312},{-42,312}}, color={0,0,127}));
+  connect(VHeaWatSec_flow, VHeaWatSta_flow.uPh) annotation (Line(points={{-280,-80},
+          {-200,-80},{-200,14},{-192,14}}, color={0,0,127}));
   connect(TChiWatPriRet, TChiWatRet.u)
-    annotation (Line(points={{-280,-20},{-232,-20}},color={0,0,127}));
+    annotation (Line(points={{-280,20},{-246,20},{-246,-20},{-232,-20}},
+                                                    color={0,0,127}));
   connect(TChiWatRet.y, chaStaCoo.TRet)
     annotation (Line(points={{-208,-20},{-164,-20},{-164,48},{-50,48},{-50,56},{-42,56}},
       color={0,0,127}));
-  connect(TChiWatSecRet, TChiWatRet.uPh) annotation (Line(points={{-280,-140},{-238,
-          -140},{-238,-26},{-232,-26}},      color={0,0,127}));
-  connect(VChiWatPri_flow, VChiWat_flow.u)
-    annotation (Line(points={{-280,-40},{-202,-40}},color={0,0,127}));
-  connect(VChiWat_flow.y, chaStaCoo.V_flow)
-    annotation (Line(points={{-178,-40},{-162,-40},{-162,38},{-48,38},{-48,54},{-42,54}},
-      color={0,0,127}));
-  connect(VChiWatSec_flow, VChiWat_flow.uPh) annotation (Line(points={{-280,-160},
-          {-204,-160},{-204,-46},{-202,-46}}, color={0,0,127}));
+  connect(TChiWatSecRet, TChiWatRet.uPh) annotation (Line(points={{-280,-120},{-238,
+          -120},{-238,-26},{-232,-26}},      color={0,0,127}));
+  connect(VChiWatPri_flow, VChiWatSta_flow.u) annotation (Line(points={{-280,0},
+          {-204,0},{-204,-42},{-192,-42}}, color={0,0,127}));
+  connect(VChiWatSta_flow.y, chaStaCoo.V_flow) annotation (Line(points={{-168,-42},
+          {-162,-42},{-162,38},{-48,38},{-48,54},{-42,54}}, color={0,0,127}));
+  connect(VChiWatSec_flow, VChiWatSta_flow.uPh) annotation (Line(points={{-280,-160},
+          {-204,-160},{-204,-48},{-192,-48}}, color={0,0,127}));
   connect(enaHea.y1, staPumHeaWatSec.u1Pla)
-    annotation (Line(points={{-88,360},{-80,360},{-80,162},{128,162},{128,168},
-          {138,168}},
+    annotation (Line(points={{-88,360},{-82,360},{-82,168},{138,168}},
       color={255,0,255}));
   connect(enaCoo.y1, staPumChiWatSec.u1Pla)
-    annotation (Line(points={{-88,100},{-80,100},{-80,138},{186,138},{186,148},
+    annotation (Line(points={{-88,100},{-80,100},{-80,142},{170,142},{170,148},
           {188,148}},
       color={255,0,255}));
   connect(seqEve.y1ValHeaWatInlIso, staPumHeaWatPri.u1ValInlIso) annotation (
-      Line(points={{162,300},{170,300},{170,216},{134,216},{134,204},{138,204}},
+      Line(points={{162,300},{170,300},{170,216},{134,216},{134,206},{138,206}},
         color={255,0,255}));
   connect(seqEve.y1ValHeaWatOutIso, staPumHeaWatPri.u1ValOutIso) annotation (
-      Line(points={{162,298},{168,298},{168,218},{132,218},{132,202},{138,202}},
+      Line(points={{162,298},{168,298},{168,218},{132,218},{132,204},{138,204}},
         color={255,0,255}));
   connect(seqEve.y1ValChiWatInlIso, staPumChiWatPri.u1ValInlIso) annotation (
-      Line(points={{162,296},{182,296},{182,184},{188,184}}, color={255,0,255}));
+      Line(points={{162,296},{182,296},{182,186},{188,186}}, color={255,0,255}));
   connect(seqEve.y1ValChiWatOutIso, staPumChiWatPri.u1ValOutIso) annotation (
-      Line(points={{162,294},{180,294},{180,182},{188,182}}, color={255,0,255}));
+      Line(points={{162,294},{180,294},{180,184},{188,184}}, color={255,0,255}));
   connect(u1Hp_actual, sorRunTimHea.u1Run)
     annotation (Line(points={{-280,300},{-60,300},{-60,296},{-42,296}},color={255,0,255}));
   connect(u1Hp_actual, sorRunTimCoo.u1Run)
@@ -1330,7 +1690,7 @@ equation
     annotation (Line(points={{12,100},{20,100},{20,-12},{-46,-12},{-46,4},{-42,4}},
       color={255,127,0}));
   connect(comStaCoo.y1, chaStaCoo.u1StaPro)
-    annotation (Line(points={{-18,-6},{-10,-6},{-10,48},{-46,48},{-46,64},{-42,64}},
+    annotation (Line(points={{-18,-6},{-10,-6},{-10,48},{-46,48},{-46,66},{-42,66}},
       color={255,0,255}));
   connect(u1Hp_actual, comStaCoo.u1_actual)
     annotation (Line(points={{-280,300},{-60,300},{-60,-4},{-42,-4}},color={255,0,255}));
@@ -1344,117 +1704,275 @@ equation
   connect(y1HpPre.y, comStaHea.u1)
     annotation (Line(points={{178,380},{-60,380},{-60,260},{-42,260}},color={255,0,255}));
   connect(comStaHea.y1, chaStaHea.u1StaPro)
-    annotation (Line(points={{-18,254},{-10,254},{-10,306},{-44,306},{-44,322},{-42,322}},
+    annotation (Line(points={{-18,254},{-10,254},{-10,306},{-44,306},{-44,324},{
+          -42,324}},
       color={255,0,255}));
   connect(resHeaWat.dpSet, dpHeaWatRemSet)
-    annotation (Line(points={{112,246},{242,246},{242,-60},{280,-60}},color={0,0,127}));
+    annotation (Line(points={{72,246},{240,246},{240,-60},{280,-60}}, color={0,0,127}));
   connect(resChiWat.dpSet, dpChiWatRemSet)
-    annotation (Line(points={{112,-34},{238,-34},{238,-80},{280,-80}},color={0,0,127}));
+    annotation (Line(points={{72,-34},{238,-34},{238,-80},{280,-80}}, color={0,0,127}));
   connect(nReqResHeaWat,resHeaWat.nReqRes)
-    annotation (Line(points={{-280,-340},{76,-340},{76,246},{88,246}},color={255,127,0}));
+    annotation (Line(points={{-280,-360},{30,-360},{30,246},{48,246}},color={255,127,0}));
   connect(nReqResChiWat,resChiWat.nReqRes)
-    annotation (Line(points={{-280,-360},{80,-360},{80,-34},{88,-34}},color={255,127,0}));
+    annotation (Line(points={{-280,-380},{40,-380},{40,-34},{48,-34}},color={255,127,0}));
   connect(enaCoo.y1, resChiWat.u1Ena)
-    annotation (Line(points={{-88,100},{-80,100},{-80,-40},{88,-40}},color={255,0,255}));
+    annotation (Line(points={{-88,100},{-80,100},{-80,-40},{48,-40}},color={255,0,255}));
   connect(enaHea.y1, resHeaWat.u1Ena)
-    annotation (Line(points={{-88,360},{-80,360},{-80,240},{88,240}},color={255,0,255}));
+    annotation (Line(points={{-88,360},{-82,360},{-82,240},{48,240}},color={255,0,255}));
   connect(comStaHea.y1, resHeaWat.u1StaPro)
-    annotation (Line(points={{-18,254},{-10,254},{-10,234},{88,234}},color={255,0,255}));
+    annotation (Line(points={{-18,254},{-10,254},{-10,234},{48,234}},color={255,0,255}));
   connect(comStaCoo.y1, resChiWat.u1StaPro)
-    annotation (Line(points={{-18,-6},{-10,-6},{-10,-46},{88,-46}},color={255,0,255}));
+    annotation (Line(points={{-18,-6},{-10,-6},{-10,-46},{48,-46}},color={255,0,255}));
   connect(resChiWat.TSupSet, chaStaCoo.TSupSet)
-    annotation (Line(points={{112,-46},{116,-46},{116,-20},{-52,-20},{-52,58},{-42,
-          58}},
+    annotation (Line(points={{72,-46},{116,-46},{116,-20},{-52,-20},{-52,62},{
+          -42,62}},
       color={0,0,127}));
   connect(resHeaWat.TSupSet, chaStaHea.TSupSet)
-    annotation (Line(points={{112,234},{118,234},{118,220},{-52,220},{-52,316},{
-          -42,316}},
+    annotation (Line(points={{72,234},{118,234},{118,220},{-52,220},{-52,320},{
+          -42,320}},
       color={0,0,127}));
   connect(ctlPumPri.yPumHeaWatPriHdr, yPumHeaWatPriHdr)
-    annotation (Line(points={{212,86},{222,86},{222,100},{280,100}},color={0,0,127}));
+    annotation (Line(points={{212,84},{220,84},{220,100},{280,100}},color={0,0,127}));
   connect(ctlPumPri.yPumChiWatPriHdr, yPumChiWatPriHdr)
-    annotation (Line(points={{212,82},{220,82},{220,80},{280,80}},color={0,0,127}));
+    annotation (Line(points={{212,80},{280,80}},                  color={0,0,127}));
   connect(ctlPumPri.yPumHeaWatPriDed, yPumHeaWatPriDed)
-    annotation (Line(points={{212,78},{220,78},{220,60},{280,60},{280,60}},color={0,0,127}));
+    annotation (Line(points={{212,76},{222,76},{222,60},{280,60}},         color={0,0,127}));
   connect(ctlPumPri.yPumChiWatPriDed, yPumChiWatPriDed)
-    annotation (Line(points={{212,74},{216,74},{216,40},{280,40}},color={0,0,127}));
+    annotation (Line(points={{212,72},{220,72},{220,40},{280,40}},color={0,0,127}));
   connect(staPumHeaWatPri.y1, ctlPumPri.u1PumHeaWatPri)
-    annotation (Line(points={{162,200},{172,200},{172,86},{188,86}},color={255,0,255}));
+    annotation (Line(points={{162,200},{172,200},{172,96},{188,96}},color={255,0,255}));
   connect(staPumChiWatPri.y1, ctlPumPri.u1PumChiWatPri)
-    annotation (Line(points={{212,180},{220,180},{220,100},{184,100},{184,80},{188,
-          80}},
+    annotation (Line(points={{212,180},{220,180},{220,120},{186,120},{186,82},{
+          188,82}},
       color={255,0,255}));
   connect(seqEve.y1Hea, ctlPumPri.u1Hea) annotation (Line(points={{162,308},{
-          174,308},{174,74},{188,74}}, color={255,0,255}));
+          174,308},{174,84},{188,84}}, color={255,0,255}));
   connect(ctlPumHeaWatSec.y, yPumHeaWatSec)
-    annotation (Line(points={{161.8,0},{280,0}},                  color={0,0,127}));
+    annotation (Line(points={{162,0},{280,0}},                    color={0,0,127}));
   connect(ctlPumChiWatSec.y, yPumChiWatSec)
-    annotation (Line(points={{211.8,-20},{280,-20}},                color={0,0,127}));
+    annotation (Line(points={{212,-20},{280,-20}},                  color={0,0,127}));
   connect(u1PumHeaWatSec_actual, ctlPumHeaWatSec.y1_actual)
     annotation (Line(points={{-280,160},{120,160},{120,8},{138,8}},  color={255,0,255}));
   connect(u1PumChiWatSec_actual, ctlPumChiWatSec.y1_actual)
-    annotation (Line(points={{-280,140},{180,140},{180,-12},{188,-12}},
+    annotation (Line(points={{-280,140},{170,140},{170,-12},{188,-12}},
                                                                    color={255,0,255}));
   connect(resChiWat.dpSet, ctlPumChiWatSec.dpRemSet)
-    annotation (Line(points={{112,-34},{178,-34},{178,-16},{188,-16}},
+    annotation (Line(points={{72,-34},{178,-34},{178,-16},{188,-16}},
                                                                   color={0,0,127}));
   connect(dpHeaWatRem, ctlPumHeaWatSec.dpRem)
-    annotation (Line(points={{-280,-200},{130,-200},{130,0},{138,0}},  color={0,0,127}));
+    annotation (Line(points={{-280,-180},{130,-180},{130,0},{138,0}},  color={0,0,127}));
   connect(resHeaWat.dpSet, ctlPumHeaWatSec.dpRemSet)
-    annotation (Line(points={{112,246},{122,246},{122,4},{138,4}},  color={0,0,127}));
+    annotation (Line(points={{72,246},{122,246},{122,4},{138,4}},   color={0,0,127}));
   connect(dpHeaWatLoc, ctlPumHeaWatSec.dpLoc)
-    annotation (Line(points={{-280,-240},{134,-240},{134,-8},{138,-8}},color={0,0,127}));
+    annotation (Line(points={{-280,-220},{134,-220},{134,-8},{138,-8}},color={0,0,127}));
   connect(dpHeaWatLocSet, ctlPumHeaWatSec.dpLocSet)
-    annotation (Line(points={{-280,-220},{132,-220},{132,-4},{138,-4}},color={0,0,127}));
+    annotation (Line(points={{-280,-200},{132,-200},{132,-4},{138,-4}},color={0,0,127}));
   connect(dpChiWatRem, ctlPumChiWatSec.dpRem)
-    annotation (Line(points={{-280,-260},{180,-260},{180,-20},{188,-20}},
+    annotation (Line(points={{-280,-240},{180,-240},{180,-20},{188,-20}},
                                                                      color={0,0,127}));
   connect(dpChiWatLocSet, ctlPumChiWatSec.dpLocSet)
-    annotation (Line(points={{-280,-280},{182,-280},{182,-24},{188,-24}},
+    annotation (Line(points={{-280,-260},{182,-260},{182,-24},{188,-24}},
                                                                        color={0,0,127}));
   connect(dpChiWatLoc, ctlPumChiWatSec.dpLoc)
-    annotation (Line(points={{-280,-300},{184,-300},{184,-28},{188,-28}},
+    annotation (Line(points={{-280,-280},{184,-280},{184,-28},{188,-28}},
                                                                        color={0,0,127}));
-  connect(u1AvaHp.y, avaEquHeaCoo.u1Ava) annotation (Line(points={{-228,260},{
-          -200,260},{-200,220},{-154,220}}, color={255,0,255}));
+  connect(u1AvaHp.y, avaEquHeaCoo.u1Ava) annotation (Line(points={{-208,260},{-200,
+          260},{-200,220},{-154,220}},      color={255,0,255}));
   connect(repTChiWatSupSet.y, swiTSupSet.u3) annotation (Line(points={{172,-140},
           {178,-140},{178,-128},{188,-128}}, color={0,0,127}));
   connect(repTHeaWatSupSet.y, swiTSupSet.u1) annotation (Line(points={{172,-100},
           {178,-100},{178,-112},{188,-112}}, color={0,0,127}));
-  connect(resChiWat.TSupSet, repTChiWatSupSet.u) annotation (Line(points={{112,-46},
+  connect(resChiWat.TSupSet, repTChiWatSupSet.u) annotation (Line(points={{72,-46},
           {116,-46},{116,-140},{148,-140}}, color={0,0,127}));
-  connect(resHeaWat.TSupSet, repTHeaWatSupSet.u) annotation (Line(points={{112,234},
+  connect(resHeaWat.TSupSet, repTHeaWatSupSet.u) annotation (Line(points={{72,234},
           {118,234},{118,-100},{148,-100}}, color={0,0,127}));
-  connect(seqEve.y1Hea, swiTSupSet.u2) annotation (Line(points={{162,308},{176,
-          308},{176,-120},{188,-120}}, color={255,0,255}));
+  connect(seqEve.y1Hea, swiTSupSet.u2) annotation (Line(points={{162,308},{174,
+          308},{174,-120},{188,-120}}, color={255,0,255}));
   connect(swiTSupSet.y, TSupSet) annotation (Line(points={{212,-120},{242,-120},
           {242,-120},{280,-120}}, color={0,0,127}));
-  connect(pasTChiWatSupSet.y, TSupSet) annotation (Line(points={{242,-140},{250,
+  connect(pasTChiWatSupSet.y, TSupSet) annotation (Line(points={{236,-140},{250,
           -140},{250,-120},{280,-120}}, color={0,0,127}));
-  connect(pasTHeaWatSupSet.y, TSupSet) annotation (Line(points={{242,-100},{250,
+  connect(pasTHeaWatSupSet.y, TSupSet) annotation (Line(points={{236,-100},{250,
           -100},{250,-120},{280,-120}}, color={0,0,127}));
   connect(repTChiWatSupSet.y, pasTChiWatSupSet.u)
-    annotation (Line(points={{172,-140},{218,-140}}, color={0,0,127}));
+    annotation (Line(points={{172,-140},{212,-140}}, color={0,0,127}));
   connect(repTHeaWatSupSet.y, pasTHeaWatSupSet.u)
-    annotation (Line(points={{172,-100},{218,-100}}, color={0,0,127}));
-  connect(resChiWat.TSupSet, TChiWatSupSet) annotation (Line(points={{112,-46},
-          {116,-46},{116,-180},{280,-180}}, color={0,0,127}));
-  connect(resHeaWat.TSupSet, THeaWatSupSet) annotation (Line(points={{112,234},
-          {118,234},{118,-160},{280,-160}}, color={0,0,127}));
+    annotation (Line(points={{172,-100},{212,-100}}, color={0,0,127}));
+  connect(resChiWat.TSupSet, TChiWatSupSet) annotation (Line(points={{72,-46},{
+          116,-46},{116,-162},{188,-162},{188,-180},{280,-180}},
+                                            color={0,0,127}));
+  connect(resHeaWat.TSupSet, THeaWatSupSet) annotation (Line(points={{72,234},{
+          118,234},{118,-160},{280,-160}},  color={0,0,127}));
+  connect(hrc.y1, y1Hrc) annotation (Line(points={{222,-296},{240,-296},{240,-280},
+          {280,-280}}, color={255,0,255}));
+  connect(hrc.y1Coo, y1CooHrc)
+    annotation (Line(points={{222,-300},{280,-300}}, color={255,0,255}));
+  connect(hrc.TSupSet, TSupSetHrc) annotation (Line(points={{222,-304},{240,-304},
+          {240,-320},{280,-320}}, color={0,0,127}));
+  connect(hrc.y1PumChiWat, y1PumChiWatHrc) annotation (Line(points={{222,-308},{
+          236,-308},{236,-360},{280,-360}}, color={255,0,255}));
+  connect(hrc.y1PumHeaWat, y1PumHeaWatHrc) annotation (Line(points={{222,-312},{
+          232,-312},{232,-380},{280,-380}}, color={255,0,255}));
+  connect(TChiWatSupSet, hrc.TChiWatSupSet) annotation (Line(points={{280,-180},
+          {188,-180},{188,-302},{198,-302}}, color={0,0,127}));
+  connect(THeaWatSupSet, hrc.THeaWatSupSet) annotation (Line(points={{280,-160},
+          {186,-160},{186,-312},{198,-312}}, color={0,0,127}));
+  connect(enaCoo.y1, hrc.u1Coo) annotation (Line(points={{-88,100},{-80,100},{-80,
+          -290},{198,-290}}, color={255,0,255}));
+  connect(enaHea.y1, hrc.u1Hea) annotation (Line(points={{-88,360},{-82,360},{-82,
+          -292},{198,-292}}, color={255,0,255}));
+  connect(TChiWatRetUpsHrc, hrc.TChiWatRetUpsHrc) annotation (Line(points={{-280,
+          -140},{-242,-140},{-242,-306},{198,-306}}, color={0,0,127}));
+  connect(THeaWatRetUpsHrc, hrc.THeaWatRetUpsHrc) annotation (Line(points={{-280,
+          -60},{-246,-60},{-246,-316},{198,-316}}, color={0,0,127}));
+  connect(THeaWatSecRet, hrc.THeaWatHrcLvg) annotation (Line(points={{-280,-40},
+          {-240,-40},{-240,-314},{198,-314}}, color={0,0,127}));
+  connect(TChiWatSecRet, hrc.TChiWatHrcLvg) annotation (Line(points={{-280,-120},
+          {-238,-120},{-238,-304},{198,-304}}, color={0,0,127}));
+  connect(u1Hrc_actual, hrc.u1Hrc_actual) annotation (Line(points={{-280,-300},{
+          190,-300},{190,-294},{198,-294}}, color={255,0,255}));
+  connect(u1ReqFloChiWat, hrc.u1ReqFloChiWat) annotation (Line(points={{-280,-320},
+          {192,-320},{192,-296},{198,-296}}, color={255,0,255}));
+  connect(u1ReqFloConWat, hrc.u1ReqFloConWat) annotation (Line(points={{-280,-340},
+          {194,-340},{194,-298},{198,-298}}, color={255,0,255}));
+  connect(TChiWatPriSup, chaStaCoo.TPriSup) annotation (Line(points={{-280,40},{
+          -242,40},{-242,60},{-42,60}}, color={0,0,127}));
+  connect(THeaWatSecSup, chaStaHea.TSecSup) annotation (Line(points={{-280,-20},
+          {-250,-20},{-250,316},{-42,316}}, color={0,0,127}));
+  connect(TChiWatSecSup, chaStaCoo.TSecSup) annotation (Line(points={{-280,-100},
+          {-248,-100},{-248,58},{-42,58}}, color={0,0,127}));
+  connect(THeaWatPriSup, chaStaHea.TPriSup) annotation (Line(points={{-280,100},
+          {-252,100},{-252,318},{-42,318}}, color={0,0,127}));
+  connect(ctlPumHeaWatSec.y, staPumHeaWatSec.y) annotation (Line(points={{162,0},
+          {166,0},{166,148},{136,148},{136,152},{138,152}},    color={0,0,127}));
+  connect(ctlPumChiWatSec.y, staPumChiWatSec.y) annotation (Line(points={{212,-20},
+          {218,-20},{218,126},{186,126},{186,132},{188,132}},      color={0,0,127}));
+  connect(ctlPumHeaWatSec.dpLocSetMax, staPumHeaWatSec.dpSet[1]) annotation (Line(
+        points={{162,-4},{164,-4},{164,146},{132,146},{132,156},{138,156}},
+        color={0,0,127}));
+  connect(ctlPumChiWatSec.dpLocSetMax, staPumChiWatSec.dpSet[1]) annotation (Line(
+        points={{212,-24},{216,-24},{216,124},{182,124},{182,136},{188,136}},
+        color={0,0,127}));
+  connect(dpHeaWatLoc, staPumHeaWatSec.dp[1]) annotation (Line(points={{-280,-220},
+          {134,-220},{134,154},{138,154}}, color={0,0,127}));
+  connect(dpChiWatLoc, staPumChiWatSec.dp[1]) annotation (Line(points={{-280,-280},
+          {184,-280},{184,134},{188,134}}, color={0,0,127}));
+  connect(dpChiWatRem, staPumChiWatSec.dp) annotation (Line(points={{-280,-240},
+          {180,-240},{180,134},{188,134}}, color={0,0,127}));
+  connect(dpHeaWatRem, staPumHeaWatSec.dp) annotation (Line(points={{-280,-180},
+          {130,-180},{130,154},{138,154}}, color={0,0,127}));
+  connect(resHeaWat.dpSet, pasDpHeaWatRemSet.u) annotation (Line(points={{72,
+          246},{82,246},{82,120},{88,120}}, color={0,0,127}));
+  connect(pasDpHeaWatRemSet.y, staPumHeaWatSec.dpSet) annotation (Line(points={
+          {112,120},{126,120},{126,156},{138,156}}, color={0,0,127}));
+  connect(pasDpChiWatRemSet.y, staPumChiWatSec.dpSet) annotation (Line(points={{112,60},
+          {128,60},{128,136},{188,136}},          color={0,0,127}));
+  connect(resChiWat.dpSet, pasDpChiWatRemSet.u) annotation (Line(points={{72,-34},
+          {80,-34},{80,60},{88,60}},      color={0,0,127}));
+  connect(resChiWat.dpSet, ctlPumPri.dpChiWatRemSet) annotation (Line(points={{
+          72,-34},{178,-34},{178,78},{188,78}}, color={0,0,127}));
+  connect(resHeaWat.dpSet, ctlPumPri.dpHeaWatRemSet) annotation (Line(points={{
+          72,246},{122,246},{122,92},{188,92}}, color={0,0,127}));
+  connect(dpHeaWatRem, ctlPumPri.dpHeaWatRem) annotation (Line(points={{-280,
+          -180},{130,-180},{130,90},{188,90}}, color={0,0,127}));
+  connect(dpHeaWatLocSet, ctlPumPri.dpHeaWatLocSet) annotation (Line(points={{
+          -280,-200},{132,-200},{132,88},{188,88}}, color={0,0,127}));
+  connect(dpHeaWatLoc, ctlPumPri.dpHeaWatLoc) annotation (Line(points={{-280,
+          -220},{134,-220},{134,86},{188,86}}, color={0,0,127}));
+  connect(pasDpHeaWatRemSet.y, staPumHeaWatPri.dpSet) annotation (Line(points={
+          {112,120},{126,120},{126,196},{138,196}}, color={0,0,127}));
+  connect(pasDpChiWatRemSet.y, staPumChiWatPri.dpSet) annotation (Line(points={
+          {112,60},{128,60},{128,176},{188,176}}, color={0,0,127}));
+  connect(ctlPumPri.dpChiWatLocSetMax, staPumChiWatPri.dpSet[1]) annotation (
+      Line(points={{212,92},{214,92},{214,108},{168,108},{168,176},{188,176}},
+        color={0,0,127}));
+  connect(ctlPumPri.dpHeaWatLocSetMax, staPumHeaWatPri.dpSet[1]) annotation (
+      Line(points={{212,96},{212,106},{124,106},{124,196},{138,196}}, color={0,
+          0,127}));
+  connect(dpHeaWatRem, staPumHeaWatPri.dp) annotation (Line(points={{-280,-180},
+          {130,-180},{130,194},{138,194}}, color={0,0,127}));
+  connect(dpChiWatRem, staPumChiWatPri.dp) annotation (Line(points={{-280,-240},
+          {182,-240},{182,174},{188,174}}, color={0,0,127}));
+  connect(dpHeaWatLoc, staPumHeaWatPri.dp[1]) annotation (Line(points={{-280,
+          -220},{134,-220},{134,194},{138,194}}, color={0,0,127}));
+  connect(dpChiWatLoc, staPumChiWatPri.dp[1]) annotation (Line(points={{-280,
+          -280},{184,-280},{184,174},{188,174}}, color={0,0,127}));
+  connect(dpChiWatLoc, ctlPumPri.dpChiWatLoc) annotation (Line(points={{-280,
+          -280},{184,-280},{184,72},{188,72}}, color={0,0,127}));
+  connect(VChiWatPri_flow, staPumChiWatPri.V_flow) annotation (Line(points={{
+          -280,0},{-254,0},{-254,178},{188,178}}, color={0,0,127}));
+  connect(VHeaWatPri_flow, staPumHeaWatPri.V_flow) annotation (Line(points={{
+          -280,60},{-244,60},{-244,198},{138,198}}, color={0,0,127}));
+  connect(u1PumHeaWatPri_actual, ctlPumPri.u1PumHeaWatPri_actual) annotation (
+      Line(points={{-280,200},{116,200},{116,94},{188,94}}, color={255,0,255}));
+  connect(u1PumChiWatPri_actual, ctlPumPri.u1PumChiWatPri_actual) annotation (
+      Line(points={{-280,180},{114,180},{114,80},{188,80}},
+        color={255,0,255}));
+  connect(dpChiWatRem, ctlPumPri.dpChiWatRem) annotation (Line(points={{-280,
+          -240},{180,-240},{180,76},{188,76}}, color={0,0,127}));
+  connect(dpChiWatLocSet, ctlPumPri.dpChiWatLocSet) annotation (Line(points={{
+          -280,-260},{182,-260},{182,74},{188,74}}, color={0,0,127}));
+  connect(ctlFloMin.yValHeaWatMinByp, yValHeaWatMinByp)
+    annotation (Line(points={{224,-230},{252,-230},{252,-220},{280,-220}},
+                                                     color={0,0,127}));
+  connect(ctlFloMin.yValChiWatMinByp, yValChiWatMinByp) annotation (Line(points={{224,
+          -234},{252,-234},{252,-240},{280,-240}},      color={0,0,127}));
+  connect(y1Hp, ctlFloMin.u1Equ) annotation (Line(points={{280,380},{238,380},{238,
+          -198},{190,-198},{190,-220},{200,-220}}, color={255,0,255}));
+  connect(y1HeaHp, ctlFloMin.u1HeaEqu) annotation (Line(points={{280,360},{240,360},
+          {240,-200},{192,-200},{192,-222},{200,-222}}, color={255,0,255}));
+  connect(y1ValHeaWatHpInlIso, ctlFloMin.u1ValHeaWatInlIso) annotation (Line(
+        points={{280,320},{242,320},{242,-202},{194,-202},{194,-224},{200,-224}},
+        color={255,0,255}));
+  connect(y1ValHeaWatHpOutIso, ctlFloMin.u1ValHeaWatOutIso) annotation (Line(
+        points={{280,300},{242,300},{242,-202},{194,-202},{194,-226},{200,-226}},
+        color={255,0,255}));
+  connect(y1ValChiWatHpInlIso, ctlFloMin.u1ValChiWatInlIso) annotation (Line(
+        points={{280,280},{244,280},{244,-204},{196,-204},{196,-228},{200,-228}},
+        color={255,0,255}));
+  connect(y1ValChiWatHpOutIso, ctlFloMin.u1ValChiWatOutIso) annotation (Line(
+        points={{280,260},{264,260},{264,262},{246,262},{246,-206},{198,-206},{198,
+          -230},{200,-230}}, color={255,0,255}));
+  connect(u1PumHeaWatPri_actual, ctlFloMin.u1PumHeaWatPri_actual) annotation (
+      Line(points={{-280,200},{116,200},{116,-232},{200,-232}}, color={255,0,255}));
+  connect(u1PumChiWatPri_actual, ctlFloMin.u1PumChiWatPri_actual) annotation (
+      Line(points={{-280,180},{114,180},{114,-234},{200,-234}}, color={255,0,255}));
+  connect(VHeaWatPri_flow, ctlFloMin.VHeaWatPri_flow) annotation (Line(points={{-280,60},
+          {-244,60},{-244,-236},{200,-236}},          color={0,0,127}));
+  connect(VChiWatPri_flow, ctlFloMin.VChiWatPri_flow) annotation (Line(points={{-280,0},
+          {-254,0},{-254,-238},{200,-238}},         color={0,0,127}));
+  connect(ctlPumPri.yPumHeaWatPriHdr, staPumHeaWatPri.y) annotation (Line(
+        points={{212,84},{220,84},{220,110},{136,110},{136,192},{138,192}},
+        color={0,0,127}));
+  connect(ctlPumPri.yPumChiWatPriHdr, staPumChiWatPri.y) annotation (Line(
+        points={{212,80},{222,80},{222,112},{178,112},{178,172},{188,172}},
+        color={0,0,127}));
+  connect(VHeaWatSec_flow, VHeaWatLoa_flow.uPh) annotation (Line(points={{-280,-80},
+          {-156,-80},{-156,-66},{-142,-66}}, color={0,0,127}));
+  connect(VHeaWatPri_flow, VHeaWatLoa_flow.u) annotation (Line(points={{-280,60},
+          {-244,60},{-244,-60},{-142,-60}}, color={0,0,127}));
+  connect(VChiWatSec_flow, VChiWatLoa_flow.uPh) annotation (Line(points={{-280,-160},
+          {-154,-160},{-154,-106},{-142,-106}}, color={0,0,127}));
+  connect(VChiWatPri_flow, VChiWatLoa_flow.u) annotation (Line(points={{-280,0},
+          {-254,0},{-254,-100},{-142,-100}}, color={0,0,127}));
+  connect(VChiWatLoa_flow.y, hrc.VChiWatLoa_flow) annotation (Line(points={{-118,
+          -100},{-100,-100},{-100,-308},{198,-308}}, color={0,0,127}));
+  connect(VHeaWatLoa_flow.y, hrc.VHeaWatLoa_flow) annotation (Line(points={{-118,
+          -60},{-98,-60},{-98,-318},{198,-318}}, color={0,0,127}));
   annotation (
     defaultComponentName="ctl",
     Icon(
       coordinateSystem(
         preserveAspectRatio=true,
-        extent={{-200,-340},{200,340}}),
+        extent={{-200,-360},{200,360}}),
       graphics={
         Rectangle(
-          extent={{-200,340},{200,-340}},
+          extent={{-200,360},{200,-360}},
           lineColor={0,0,0},
           fillColor={255,255,255},
           fillPattern=FillPattern.Solid),
         Text(
-          extent={{-150,390},{150,350}},
+          extent={{-150,410},{150,370}},
           textString="%name",
           textColor={0,0,255})}),
     Diagram(
@@ -1463,9 +1981,9 @@ equation
     Documentation(
       info="<html>
 <p>
-This block implements the sequence of operation for plants with 
+This block implements the sequence of operation for plants with
 air-to-water heat pumps.
-Most parts of the sequence of operation are similar to that 
+Most parts of the sequence of operation are similar to that
 described in ASHRAE, 2021 for chiller plants.
 </p>
 <p>
@@ -1482,21 +2000,40 @@ Cooling-only
 <td>
 </td>
 </tr>
+<tr><td>Heat recovery</td>
+<td>
+Without sidestream heat recovery chiller<br/>
+With sidestream heat recovery chiller
+</td>
+<td>
+This option is only available for heating and cooling plants.
+When selected, the plant controller incorporates logic to manage a chiller 
+and its associated dedicated primary CHW and CW pumps. 
+The chiller is considered connected in a sidestream configuration to both 
+the CHW return and the HW return.
+</td>
+</tr>
 <tr><td>Type of distribution</td>
 <td>
+Variable primary-only<br/>
 Constant primary-variable secondary centralized
 </td>
 <td>
-\"Centralized secondary pumps\" refers to configurations with a single 
+It is assumed that the HW and the CHW loops have the
+same type of distribution, as specified by this parameter.<br/>
+Most AWHPs on the market use a reverse cycle for defrosting.
+This requires maximum primary flow during defrost cycles.
+Consequently, variable primary plants commonly adopt a high
+minimum flow setpoint, typically close to the design flow rate,
+effectively operating akin to constant primary plants but with
+variable speed pumps controlling the loop differential pressure.
+While the flow rate directed towards the loads varies,
+the bypass valve control loop ensures a constant primary flow
+for a given number of staged units.<br/>
+\"Centralized secondary pumps\" refers to configurations with a single
 group of secondary pumps that is typically integrated into the plant.<br/>
-Distributed secondary pumps with multiple secondary loops served 
-by dedicated secondary pumps are currently not supported.<br/>
-Options are limited to constant primary distributions because most 
-AWHPs on the market use a reverse cycle for defrosting.
-This requires maximum primary flow during defrost cycles and hinders
-variable primary distributions.<br/>
-An option for constant primary-only distributions with ∆p-controlled
-variable speed pumps will be added in a next release. 
+Distributed secondary pumps with multiple secondary loops served
+by dedicated secondary pumps are currently not supported.
 </td>
 </tr>
 <tr><td>Type of primary pump arrangement</td>
@@ -1504,7 +2041,7 @@ variable speed pumps will be added in a next release.
 Dedicated<br/>
 Headered
 </td>
-<td>It is assumed that the HW and the CHW loops have the 
+<td>It is assumed that the HW and the CHW loops have the
 same type of primary pump arrangement, as specified by this parameter.
 </td>
 </tr>
@@ -1513,11 +2050,12 @@ same type of primary pump arrangement, as specified by this parameter.
 False<br/>
 True
 </td>
-<td>This option is only available for heating and cooling plants 
+<td>This option is only available for heating and cooling plants
 with dedicated primary pumps.
 If this option is not selected, each AWHP uses
-a common dedicated primary pump for HW and CHW. 
-Otherwise, each AWHP relies on a separate dedicated HW pump 
+a common dedicated primary pump for HW and CHW –
+this pump is then denoted as the primary HW pump.
+Otherwise, each AWHP relies on a separate dedicated HW pump
 and a separate dedicated CHW pump.
 </td>
 </tr>
@@ -1529,10 +2067,11 @@ Constant speed
 <td>
 For constant primary-variable secondary distributions, the variable
 speed primary pumps are commanded at fixed speeds, determined during the
-Testing, Adjusting and Balancing phase to provide design AWHP flow in 
+Testing, Adjusting and Balancing phase to provide design AWHP flow in
 heating and cooling modes.
-The same intent is achieved with constant speed primary pumps through the 
-use of balancing valves.
+The same intent is achieved with constant speed primary pumps through the
+use of balancing valves.<br/>
+This parameter is only available for constant primary-variable secondary plants.
 </td>
 </tr>
 <tr><td>Type of primary CHW pumps</td>
@@ -1545,8 +2084,8 @@ Constant speed
 </table>
 <h4>Details</h4>
 <p>
-A staging matrix <code>staEqu</code> is required as a parameter. 
-See the documentation of 
+A staging matrix <code>staEqu</code> is required as a parameter.
+See the documentation of
 <a href=\"modelica://Buildings.Templates.Plants.Controls.StagingRotation.EquipmentEnable\">
 Buildings.Templates.Plants.Controls.StagingRotation.EquipmentEnable</a>
 for the associated definition and requirements.
@@ -1574,6 +2113,13 @@ for HVAC Systems. Atlanta, GA.
 </html>", revisions="<html>
 <ul>
 <li>
+May 31, 2024, by Antoine Gautier:<br/>
+Added sidestream heat recovery chiller, primary-only pumping and
+failsafe staging conditions.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3808\">#3808</a>.
+</li>
+<li>
 March 29, 2024, by Antoine Gautier:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Templates/Plants/Controls/HeatPumps/Validation/AirToWater.mo b/Buildings/Templates/Plants/Controls/HeatPumps/Validation/AirToWater.mo
index 075e68506d6..889045f28e5 100644
--- a/Buildings/Templates/Plants/Controls/HeatPumps/Validation/AirToWater.mo
+++ b/Buildings/Templates/Plants/Controls/HeatPumps/Validation/AirToWater.mo
@@ -14,8 +14,9 @@ model AirToWater
     displayUnit="degC")=315.15
     "Design HW return temperature"
     annotation (Dialog(group="Nominal condition"));
-  parameter Real VHeaWat_flow_nominal(unit="m3/s")=capHea_nominal/abs(
-    THeaWatSup_nominal - THeaWatRet_nominal)/ctl.cp_default/ctl.rho_default
+  parameter Real VHeaWat_flow_nominal(
+    unit="m3/s")=capHea_nominal / abs(THeaWatSup_nominal - THeaWatRet_nominal) /
+    ctl.cp_default / ctl.rho_default
     "Design HW volume flow rate"
     annotation (Dialog(group="Nominal condition"));
   final parameter Real capCoo_nominal(
@@ -32,25 +33,26 @@ model AirToWater
     displayUnit="degC")=285.15
     "Design CHW return temperature"
     annotation (Dialog(group="Nominal condition"));
-  parameter Real VChiWat_flow_nominal(unit="m3/s")=capHea_nominal/abs(
-    TChiWatSup_nominal - TChiWatRet_nominal)/ctl.cp_default/ctl.rho_default
+  parameter Real VChiWat_flow_nominal(
+    unit="m3/s")=capCoo_nominal / abs(TChiWatSup_nominal - TChiWatRet_nominal) /
+    ctl.cp_default / ctl.rho_default
     "Design CHW volume flow rate"
     annotation (Dialog(group="Nominal condition"));
   Buildings.Templates.Plants.Controls.HeatPumps.AirToWater ctl(
     have_heaWat=true,
     have_chiWat=true,
+    have_hrc_select=true,
     have_valHpInlIso=true,
     have_valHpOutIso=true,
     have_pumChiWatPriDed_select=true,
-    have_pumHeaWatSec_select=true,
     have_pumPriHdr=false,
-    have_pumChiWatSec_select=true,
+    is_priOnl=false,
+    have_pumHeaWatPriVar_select=false,
+    have_pumChiWatPriVar_select=false,
     have_senVHeaWatPri_select=false,
     have_senVChiWatPri_select=false,
     have_senTHeaWatPriRet_select=false,
     have_senTChiWatPriRet_select=false,
-    have_senTHeaWatSecRet=true,
-    have_senTChiWatSecRet=false,
     nHp=3,
     have_senDpHeaWatRemWir=false,
     nSenDpHeaWatRem=1,
@@ -58,19 +60,32 @@ model AirToWater
     nSenDpChiWatRem=1,
     final THeaWatSup_nominal=THeaWatSup_nominal,
     THeaWatSupSet_min=298.15,
+    VHeaWatHp_flow_nominal=1.1 * fill(VHeaWat_flow_nominal / ctl.nHp, ctl.nHp),
+    VHeaWatHp_flow_min=0.6 * ctl.VHeaWatHp_flow_nominal,
     final VHeaWatSec_flow_nominal=VHeaWat_flow_nominal,
-    capHeaHp_nominal=fill(350, ctl.nHp),
+    capHeaHp_nominal=fill(350E3, ctl.nHp),
     dpHeaWatRemSet_max={5E4},
     final TChiWatSup_nominal=TChiWatSup_nominal,
     TChiWatSupSet_max=288.15,
+    VChiWatHp_flow_nominal=1.1 * fill(VChiWat_flow_nominal / ctl.nHp, ctl.nHp),
+    VChiWatHp_flow_min=0.6 * ctl.VChiWatHp_flow_nominal,
     final VChiWatSec_flow_nominal=VChiWat_flow_nominal,
-    capCooHp_nominal=fill(350, ctl.nHp),
+    capCooHp_nominal=fill(350E3, ctl.nHp),
     yPumHeaWatPriSet=0.8,
     yPumChiWatPriSet=0.7,
     dpChiWatRemSet_max={5E4},
-    staEqu=[1/3,1/3,1/3; 2/3,2/3,2/3; 1,1,1],
-    idxEquAlt={1,2,3}) "Plant controller"
-    annotation (Placement(transformation(extent={{0,0},{40,68}})));
+    staEqu=[
+      1 / 3, 1 / 3, 1 / 3;
+      2 / 3, 2 / 3, 2 / 3;
+      1, 1, 1],
+    idxEquAlt={1, 2, 3},
+    TChiWatSupHrc_min=277.15,
+    THeaWatSupHrc_max=333.15,
+    COPHeaHrc_nominal=2.8,
+    capCooHrc_min=ctl.capHeaHrc_min *(1 - 1 / ctl.COPHeaHrc_nominal),
+    capHeaHrc_min=0.3 * 0.5 * sum(ctl.capHeaHp_nominal))
+    "Plant controller"
+    annotation (Placement(transformation(extent={{0,-22},{40,50}})));
   Buildings.Controls.OBC.CDL.Reals.Sources.TimeTable ratV_flow(
     table=[
       0, 0, 0;
@@ -82,244 +97,295 @@ model AirToWater
       24, 0, 0],
     timeScale=3600)
     "Source signal for volume flow rate ratio – Index 1 for HW, 2 for CHW"
-    annotation (Placement(transformation(extent={{-160,-30},{-140,-10}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant THeaWatRet(
-    final k=THeaWatRet_nominal) "HWRT"
-    annotation (Placement(transformation(extent={{-150,50},{-130,70}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant TChiWatRet(
-    final k=TChiWatRet_nominal) "CHWRT"
-    annotation (Placement(transformation(extent={{-150,10},{-130,30}})));
+    annotation (Placement(transformation(extent={{-160,-50},{-140,-30}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant dTHeaWat(
+    final k=(THeaWatRet_nominal - THeaWatSup_nominal) *(if ctl.have_hrc then 0.5
+      else 1))
+    "HW Delta-T"
+    annotation (Placement(transformation(extent={{-190,150},{-170,170}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant dTChiWat(
+    final k=(TChiWatRet_nominal - TChiWatSup_nominal) *(if ctl.have_hrc then 0.5
+      else 1))
+    "CHW Delta-T"
+    annotation (Placement(transformation(extent={{-150,130},{-130,150}})));
   Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter VHeaWat_flow(
     final k=VHeaWat_flow_nominal)
     "Scale by design flow"
-    annotation (Placement(transformation(extent={{-110,-10},{-90,10}})));
+    annotation (Placement(transformation(extent={{-110,-30},{-90,-10}})));
   Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter VChiWat_flow(
     final k=VChiWat_flow_nominal)
     "Scale by design flow"
-    annotation (Placement(transformation(extent={{-80,-30},{-60,-10}})));
+    annotation (Placement(transformation(extent={{-80,-50},{-60,-30}})));
   Components.Controls.StatusEmulator y1Hp_actual[ctl.nHp]
     "HP status"
-    annotation (Placement(transformation(extent={{70,70},{90,90}})));
+    annotation (Placement(transformation(extent={{70,50},{90,70}})));
   Components.Controls.StatusEmulator y1PumHeaWatPri_actual1[ctl.nPumHeaWatPri]
     if ctl.have_heaWat and ctl.have_pumHeaWatPri
     "Primary HW pump status"
-    annotation (Placement(transformation(extent={{100,50},{120,70}})));
+    annotation (Placement(transformation(extent={{100,30},{120,50}})));
   Components.Controls.StatusEmulator y1PumChiWatPri_actual[ctl.nPumChiWatPri]
     if ctl.have_chiWat and ctl.have_pumChiWatPri
     "Primary CHW pump status"
-    annotation (Placement(transformation(extent={{70,30},{90,50}})));
+    annotation (Placement(transformation(extent={{70,10},{90,30}})));
   Components.Controls.StatusEmulator y1PumHeaWatSec_actual[ctl.nPumHeaWatSec]
     if ctl.have_heaWat and ctl.have_pumHeaWatSec
     "Secondary HW pump status"
-    annotation (Placement(transformation(extent={{100,10},{120,30}})));
+    annotation (Placement(transformation(extent={{100,-10},{120,10}})));
   Components.Controls.StatusEmulator y1PumChiWatSec_actual[ctl.nPumChiWatSec]
     if ctl.have_chiWat and ctl.have_pumChiWatSec
     "Secondary CHW pump status"
-    annotation (Placement(transformation(extent={{70,-10},{90,10}})));
+    annotation (Placement(transformation(extent={{70,-30},{90,-10}})));
   Buildings.Controls.OBC.CDL.Reals.Sources.Sin TOut(
     amplitude=10,
     freqHz=0.5 / 24 / 3600,
     phase=- 0.43633231299858,
     offset=10 + 273.15)
     "OAT"
-    annotation (Placement(transformation(extent={{-160,110},{-140,130}})));
+    annotation (Placement(transformation(extent={{-190,82},{-170,102}})));
   Buildings.Controls.OBC.CDL.Reals.GreaterThreshold isDemHea(
     t=1E-2,
     h=0.5E-2)
     "Return true if heating demand"
-    annotation (Placement(transformation(extent={{-110,170},{-90,190}})));
+    annotation (Placement(transformation(extent={{-110,100},{-90,120}})));
   Buildings.Controls.OBC.CDL.Reals.GreaterThreshold isDemCoo(
     t=1E-2,
     h=0.5E-2)
     "Return true if cooling demand"
-    annotation (Placement(transformation(extent={{-110,130},{-90,150}})));
+    annotation (Placement(transformation(extent={{-110,60},{-90,80}})));
   Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger reqPlaHeaWat
     "Generate HW plant request"
-    annotation (Placement(transformation(extent={{-80,170},{-60,190}})));
+    annotation (Placement(transformation(extent={{-80,100},{-60,120}})));
   Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger reqPlaChiWat
     "Generate CHW plant request"
-    annotation (Placement(transformation(extent={{-80,130},{-60,150}})));
+    annotation (Placement(transformation(extent={{-80,60},{-60,80}})));
   Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai[2](
     each k=5)
     "Use fraction of flow rate as a proxy for plant reset request"
-    annotation (Placement(transformation(extent={{-108,90},{-88,110}})));
+    annotation (Placement(transformation(extent={{-108,30},{-88,50}})));
   Buildings.Controls.OBC.CDL.Conversions.RealToInteger reqResHeaWat
     "Generate HW reset request"
-    annotation (Placement(transformation(extent={{-80,90},{-60,110}})));
+    annotation (Placement(transformation(extent={{-80,30},{-60,50}})));
   Buildings.Controls.OBC.CDL.Conversions.RealToInteger reqResChiWat
     "Generate CHW reset request"
-    annotation (Placement(transformation(extent={{-80,60},{-60,80}})));
+    annotation (Placement(transformation(extent={{-80,0},{-60,20}})));
   Buildings.Controls.OBC.CDL.Reals.Sources.Sin sin[1](
     amplitude=0.1 * ctl.dpHeaWatRemSet_max,
     freqHz={4 / 8000},
     each phase=3.1415926535898)
     if ctl.have_heaWat
     "Source signal used to generate measurement values"
-    annotation (Placement(transformation(extent={{-160,-76},{-140,-56}})));
+    annotation (Placement(transformation(extent={{-160,-96},{-140,-76}})));
   Buildings.Controls.OBC.CDL.Reals.Add dpHeaWatRem[1]
     if ctl.have_heaWat
     "Differential pressure at remote location"
-    annotation (Placement(transformation(extent={{-80,-70},{-60,-50}})));
+    annotation (Placement(transformation(extent={{-80,-90},{-60,-70}})));
   Buildings.Controls.OBC.CDL.Reals.Add dpChiWatRem[1]
     if ctl.have_chiWat
     "Differential pressure at remote location"
-    annotation (Placement(transformation(extent={{-80,-110},{-60,-90}})));
-  Pumps.Generic.ResetLocalDifferentialPressure resDpHeaWatLoc[1](each
-      dpLocSet_max=20E4)
+    annotation (Placement(transformation(extent={{-80,-130},{-60,-110}})));
+  Pumps.Generic.ResetLocalDifferentialPressure resDpHeaWatLoc[1](
+    each dpLocSet_max=20E4)
     if ctl.have_heaWat
     "Local HW DP reset"
-    annotation (Placement(transformation(extent={{-40,-130},{-20,-110}})));
-  Pumps.Generic.ResetLocalDifferentialPressure resDpChiWatLoc[1](each
-      dpLocSet_max=15E4)
+    annotation (Placement(transformation(extent={{-40,-150},{-20,-130}})));
+  Pumps.Generic.ResetLocalDifferentialPressure resDpChiWatLoc[1](
+    each dpLocSet_max=15E4)
     if ctl.have_chiWat
     "Local CHW DP reset"
-    annotation (Placement(transformation(extent={{-40,-170},{-20,-150}})));
+    annotation (Placement(transformation(extent={{-40,-190},{-20,-170}})));
   Buildings.Controls.OBC.CDL.Reals.Sources.Sin sin1[1](
     amplitude=0.1 * ctl.dpChiWatRemSet_max,
     freqHz={3 / 8000},
     each phase=3.1415926535898)
     "Source signal used to generate measurement values"
-    annotation (Placement(transformation(extent={{-160,-116},{-140,-96}})));
-  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter dpHeaWatLoc(final k=4)
+    annotation (Placement(transformation(extent={{-160,-136},{-140,-116}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter dpHeaWatLoc(
+    final k=4)
     if ctl.have_heaWat
     "Differential pressure local to the plant"
-    annotation (Placement(transformation(extent={{-80,-150},{-60,-130}})));
-  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter dpChiWatLoc(final k=3)
+    annotation (Placement(transformation(extent={{-80,-170},{-60,-150}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter dpChiWatLoc(
+    final k=3)
     if ctl.have_chiWat
     "Differential pressure local to the plant"
-    annotation (Placement(transformation(extent={{-80,-190},{-60,-170}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant THeaWatSup(final k=
-        THeaWatSup_nominal) "HWST"
-    annotation (Placement(transformation(extent={{-180,70},{-160,90}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant TChiWatSup(final k=
-        TChiWatSup_nominal) "CHWST"
-    annotation (Placement(transformation(extent={{-180,30},{-160,50}})));
+    annotation (Placement(transformation(extent={{-80,-210},{-60,-190}})));
+  Components.Controls.StatusEmulator y1Hrc_actual
+    if ctl.have_hrc
+    "Sidestream HRC status"
+    annotation (Placement(transformation(extent={{100,-50},{120,-30}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant dTHeaWatUpsHrc(
+    final k=THeaWatRet_nominal - THeaWatSup_nominal)
+    "HW Delta-T as measured upstream of HRC"
+    annotation (Placement(transformation(extent={{-190,190},{-170,210}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant dTChiWatUpsHrc(
+    final k=TChiWatRet_nominal - TChiWatSup_nominal)
+    "CHW Delta-T as measured upstream of HRC"
+    annotation (Placement(transformation(extent={{-150,170},{-130,190}})));
+  Buildings.Controls.OBC.CDL.Reals.Add THeaWatRet
+    if ctl.have_heaWat
+    "HWRT"
+    annotation (Placement(transformation(extent={{-80,150},{-60,170}})));
+  Buildings.Controls.OBC.CDL.Reals.Add THeaWatRetUpsHrc
+    if ctl.have_heaWat
+    "HWRT upstream of HRC"
+    annotation (Placement(transformation(extent={{-80,190},{-60,210}})));
+  Buildings.Controls.OBC.CDL.Reals.Add TChiWatRet
+    if ctl.have_chiWat
+    "CHWRT"
+    annotation (Placement(transformation(extent={{-110,130},{-90,150}})));
+  Buildings.Controls.OBC.CDL.Reals.Add TChiWatRetUpsHrc
+    if ctl.have_chiWat
+    "CHWRT upstream of HRC"
+    annotation (Placement(transformation(extent={{-110,170},{-90,190}})));
 equation
   connect(ratV_flow.y[1], VHeaWat_flow.u)
-    annotation (Line(points={{-138,-20},{-120,-20},{-120,0},{-112,0}},color={0,0,127}));
+    annotation (Line(points={{-138,-40},{-120,-40},{-120,-20},{-112,-20}},color={0,0,127}));
   connect(ratV_flow.y[2], VChiWat_flow.u)
-    annotation (Line(points={{-138,-20},{-82,-20}},color={0,0,127}));
+    annotation (Line(points={{-138,-40},{-82,-40}},color={0,0,127}));
   connect(ctl.y1Hp, y1Hp_actual.y1)
-    annotation (Line(points={{42,60},{58,60},{58,80},{68,80}},color={255,0,255}));
+    annotation (Line(points={{42,48},{58,48},{58,60},{68,60}},color={255,0,255}));
   connect(y1Hp_actual.y1_actual, ctl.u1Hp_actual)
-    annotation (Line(points={{92,80},{100,80},{100,100},{-4,100},{-4,60},{-2,60}},
+    annotation (Line(points={{92,60},{100,60},{100,80},{-4,80},{-4,44.2},{-2,44.2}},
       color={255,0,255}));
   connect(ctl.y1PumHeaWatPri, y1PumHeaWatPri_actual1.y1)
-    annotation (Line(points={{42,44},{60,44},{60,60},{98,60}},color={255,0,255}));
+    annotation (Line(points={{42,32},{60,32},{60,40},{98,40}},color={255,0,255}));
   connect(ctl.y1PumChiWatPri, y1PumChiWatPri_actual.y1)
-    annotation (Line(points={{42,42},{60,42},{60,40},{68,40}},color={255,0,255}));
+    annotation (Line(points={{42,30},{60,30},{60,20},{68,20}},color={255,0,255}));
   connect(ctl.y1PumHeaWatSec, y1PumHeaWatSec_actual.y1)
-    annotation (Line(points={{42,38},{60,38},{60,20},{98,20}},color={255,0,255}));
+    annotation (Line(points={{42,26},{60,26},{60,0},{98,0}},color={255,0,255}));
   connect(ctl.y1PumChiWatSec, y1PumChiWatSec_actual.y1)
-    annotation (Line(points={{42,36},{58,36},{58,0},{68,0}},color={255,0,255}));
+    annotation (Line(points={{42,24},{58,24},{58,-20},{68,-20}},color={255,0,255}));
   connect(y1PumHeaWatPri_actual1.y1_actual, ctl.u1PumHeaWatPri_actual)
-    annotation (Line(points={{122,60},{134,60},{134,102},{-6,102},{-6,58},{-2,
-          58}},
+    annotation (Line(points={{122,40},{134,40},{134,82},{-6,82},{-6,42.2},{-2,42.2}},
       color={255,0,255}));
   connect(y1PumHeaWatSec_actual.y1_actual, ctl.u1PumHeaWatSec_actual)
-    annotation (Line(points={{122,20},{138,20},{138,106},{-10,106},{-10,54},{-2,
-          54}},
+    annotation (Line(points={{122,0},{138,0},{138,86},{-10,86},{-10,38.2},{-2,38.2}},
       color={255,0,255}));
   connect(y1PumChiWatPri_actual.y1_actual, ctl.u1PumChiWatPri_actual)
-    annotation (Line(points={{92,40},{136,40},{136,104},{-8,104},{-8,56},{-2,56}},
+    annotation (Line(points={{92,20},{136,20},{136,84},{-8,84},{-8,40.2},{-2,40.2}},
       color={255,0,255}));
   connect(y1PumChiWatSec_actual.y1_actual, ctl.u1PumChiWatSec_actual)
-    annotation (Line(points={{92,0},{140,0},{140,108},{-12,108},{-12,52},{-2,52}},
+    annotation (Line(points={{92,-20},{140,-20},{140,88},{-12,88},{-12,36.2},{-2,36.2}},
       color={255,0,255}));
   connect(TOut.y, ctl.TOut)
-    annotation (Line(points={{-138,120},{-122,120},{-122,38},{-2,38}},  color={0,0,127}));
+    annotation (Line(points={{-168,92},{-20,92},{-20,20},{-2,20}},color={0,0,127}));
   connect(ratV_flow.y[1], isDemHea.u)
-    annotation (Line(points={{-138,-20},{-120,-20},{-120,180},{-112,180}},color={0,0,127}));
+    annotation (Line(points={{-138,-40},{-120,-40},{-120,110},{-112,110}},color={0,0,127}));
   connect(ratV_flow.y[2], isDemCoo.u)
-    annotation (Line(points={{-138,-20},{-120,-20},{-120,140},{-112,140}},color={0,0,127}));
+    annotation (Line(points={{-138,-40},{-120,-40},{-120,70},{-112,70}},color={0,0,127}));
   connect(isDemCoo.y, reqPlaChiWat.u)
-    annotation (Line(points={{-88,140},{-82,140}},color={255,0,255}));
+    annotation (Line(points={{-88,70},{-82,70}},color={255,0,255}));
   connect(isDemHea.y, reqPlaHeaWat.u)
-    annotation (Line(points={{-88,180},{-82,180}},color={255,0,255}));
-  connect(reqPlaHeaWat.y, ctl.nReqPlaHeaWat) annotation (Line(points={{-58,180},
-          {-40,180},{-40,48},{-2,48}}, color={255,127,0}));
-  connect(reqPlaChiWat.y, ctl.nReqPlaChiWat) annotation (Line(points={{-58,140},
-          {-40,140},{-40,46},{-2,46}}, color={255,127,0}));
-  connect(THeaWatRet.y, ctl.THeaWatSecRet)
-    annotation (Line(points={{-128,60},{-100,60},{-100,22},{-2,22}},  color={0,0,127}));
-  connect(THeaWatRet.y, ctl.THeaWatPriRet)
-    annotation (Line(points={{-128,60},{-100,60},{-100,34},{-2,34}},  color={0,0,127}));
-  connect(TChiWatRet.y, ctl.TChiWatSecRet)
-    annotation (Line(points={{-128,20},{-28,20},{-28,16},{-2,16}},color={0,0,127}));
-  connect(TChiWatRet.y, ctl.TChiWatPriRet)
-    annotation (Line(points={{-128,20},{-28,20},{-28,28},{-2,28}},    color={0,0,127}));
+    annotation (Line(points={{-88,110},{-82,110}},color={255,0,255}));
+  connect(reqPlaHeaWat.y, ctl.nReqPlaHeaWat)
+    annotation (Line(points={{-58,110},{-40,110},{-40,28},{-2,28}},color={255,127,0}));
+  connect(reqPlaChiWat.y, ctl.nReqPlaChiWat)
+    annotation (Line(points={{-58,70},{-40,70},{-40,26},{-2,26}},color={255,127,0}));
   connect(VHeaWat_flow.y, ctl.VHeaWatPri_flow)
-    annotation (Line(points={{-88,0},{-26,0},{-26,32},{-2,32}},    color={0,0,127}));
+    annotation (Line(points={{-88,-20},{-26,-20},{-26,14},{-2,14}},color={0,0,127}));
   connect(VHeaWat_flow.y, ctl.VHeaWatSec_flow)
-    annotation (Line(points={{-88,0},{-26,0},{-26,20},{-2,20}},color={0,0,127}));
+    annotation (Line(points={{-88,-20},{-26,-20},{-26,0},{-2,0}},color={0,0,127}));
   connect(VChiWat_flow.y, ctl.VChiWatPri_flow)
-    annotation (Line(points={{-58,-20},{-24,-20},{-24,26},{-2,26}},    color={0,0,127}));
+    annotation (Line(points={{-58,-40},{-24,-40},{-24,8},{-2,8}},color={0,0,127}));
   connect(VChiWat_flow.y, ctl.VChiWatSec_flow)
-    annotation (Line(points={{-58,-20},{-22,-20},{-22,14},{-2,14}},color={0,0,127}));
+    annotation (Line(points={{-58,-40},{-22,-40},{-22,-8},{-2,-8}},color={0,0,127}));
   connect(ratV_flow.y, gai.u)
-    annotation (Line(points={{-138,-20},{-120,-20},{-120,100},{-110,100}},
-                                                                        color={0,0,127}));
+    annotation (Line(points={{-138,-40},{-120,-40},{-120,40},{-110,40}},color={0,0,127}));
   connect(gai[1].y, reqResHeaWat.u)
-    annotation (Line(points={{-86,100},{-82,100}},
-                                                color={0,0,127}));
+    annotation (Line(points={{-86,40},{-82,40}},color={0,0,127}));
   connect(gai[2].y, reqResChiWat.u)
-    annotation (Line(points={{-86,100},{-84,100},{-84,70},{-82,70}},
-                                                                  color={0,0,127}));
-  connect(reqResHeaWat.y,ctl.nReqResHeaWat)
-    annotation (Line(points={{-58,100},{-38,100},{-38,44},{-2,44}},
-                                                                 color={255,127,0}));
-  connect(reqResChiWat.y,ctl.nReqResChiWat)
-    annotation (Line(points={{-58,70},{-36,70},{-36,42},{-2,42}},color={255,127,0}));
+    annotation (Line(points={{-86,40},{-84,40},{-84,10},{-82,10}},color={0,0,127}));
+  connect(reqResHeaWat.y, ctl.nReqResHeaWat)
+    annotation (Line(points={{-58,40},{-42,40},{-42,24},{-2,24}},color={255,127,0}));
+  connect(reqResChiWat.y, ctl.nReqResChiWat)
+    annotation (Line(points={{-58,10},{-40,10},{-40,22},{-2,22}},color={255,127,0}));
   connect(sin.y, dpHeaWatRem.u2)
-    annotation (Line(points={{-138,-66},{-82,-66}},color={0,0,127}));
+    annotation (Line(points={{-138,-86},{-82,-86}},color={0,0,127}));
   connect(dpChiWatRem.y, ctl.dpChiWatRem)
-    annotation (Line(points={{-58,-100},{-18,-100},{-18,6},{-2,6}},color={0,0,127}));
+    annotation (Line(points={{-58,-120},{-18,-120},{-18,-16},{-2,-16}},color={0,0,127}));
   connect(dpHeaWatRem.y, ctl.dpHeaWatRem)
-    annotation (Line(points={{-58,-60},{-20,-60},{-20,12},{-2,12}},color={0,0,127}));
+    annotation (Line(points={{-58,-80},{-20,-80},{-20,-10},{-2,-10}},color={0,0,127}));
   connect(ctl.dpHeaWatRemSet, dpHeaWatRem.u1)
-    annotation (Line(points={{42,18},{50,18},{50,-40},{-100,-40},{-100,-54},{
-          -82,-54}},
+    annotation (Line(points={{42,0},{50,0},{50,-60},{-100,-60},{-100,-74},{-82,-74}},
       color={0,0,127}));
   connect(ctl.dpChiWatRemSet, dpChiWatRem.u1)
-    annotation (Line(points={{42,16},{48,16},{48,-80},{-90,-80},{-90,-94},{-82,
-          -94}},
+    annotation (Line(points={{42,-2},{48,-2},{48,-100},{-90,-100},{-90,-114},{-82,-114}},
       color={0,0,127}));
   connect(sin1.y, dpChiWatRem.u2)
-    annotation (Line(points={{-138,-106},{-82,-106}},color={0,0,127}));
+    annotation (Line(points={{-138,-126},{-82,-126}},color={0,0,127}));
   connect(dpHeaWatRem[1].y, dpHeaWatLoc.u)
-    annotation (Line(points={{-58,-60},{-52,-60},{-52,-120},{-86,-120},{-86,-140},{-82,-140}},
+    annotation (Line(points={{-58,-80},{-52,-80},{-52,-140},{-86,-140},{-86,-160},{-82,-160}},
       color={0,0,127}));
   connect(ctl.dpHeaWatRemSet, resDpHeaWatLoc.dpRemSet)
-    annotation (Line(points={{42,18},{50,18},{50,-40},{-100,-40},{-100,-114},{
-          -42,-114}},
+    annotation (Line(points={{42,0},{50,0},{50,-60},{-100,-60},{-100,-134},{-42,-134}},
       color={0,0,127}));
   connect(dpChiWatRem[1].y, dpChiWatLoc.u)
-    annotation (Line(points={{-58,-100},{-54,-100},{-54,-160},{-90,-160},{-90,-180},{-82,-180}},
+    annotation (Line(points={{-58,-120},{-54,-120},{-54,-180},{-90,-180},{-90,-200},{-82,-200}},
       color={0,0,127}));
   connect(ctl.dpChiWatRemSet, resDpChiWatLoc.dpRemSet)
-    annotation (Line(points={{42,16},{47.9167,16},{47.9167,-80},{-90,-80},{-90,
-          -154},{-42,-154}},
+    annotation (Line(points={{42,-2},{47.9167,-2},{47.9167,-100},{-90,-100},{-90,-174},{-42,-174}},
       color={0,0,127}));
   connect(dpHeaWatRem.y, resDpHeaWatLoc.dpRem)
-    annotation (Line(points={{-58,-60},{-52,-60},{-52,-126},{-42,-126}},color={0,0,127}));
+    annotation (Line(points={{-58,-80},{-52,-80},{-52,-146},{-42,-146}},color={0,0,127}));
   connect(dpChiWatRem.y, resDpChiWatLoc.dpRem)
-    annotation (Line(points={{-58,-100},{-54,-100},{-54,-166},{-42,-166}},color={0,0,127}));
+    annotation (Line(points={{-58,-120},{-54,-120},{-54,-186},{-42,-186}},color={0,0,127}));
   connect(resDpChiWatLoc.dpLocSet, ctl.dpChiWatLocSet)
-    annotation (Line(points={{-18.2,-160},{-14,-160},{-14,4},{-2,4}},color={0,0,127}));
+    annotation (Line(points={{-18.2,-180},{-14,-180},{-14,-18},{-2,-18}},color={0,0,127}));
   connect(dpChiWatLoc.y, ctl.dpChiWatLoc)
-    annotation (Line(points={{-58,-180},{-12,-180},{-12,2},{-2,2}},color={0,0,127}));
+    annotation (Line(points={{-58,-200},{-12,-200},{-12,-20},{-2,-20}},color={0,0,127}));
   connect(dpHeaWatLoc.y, ctl.dpHeaWatLoc)
-    annotation (Line(points={{-58,-140},{-16,-140},{-16,8},{-2,8}},color={0,0,127}));
+    annotation (Line(points={{-58,-160},{-16,-160},{-16,-14},{-2,-14}},color={0,0,127}));
   connect(resDpHeaWatLoc.dpLocSet, ctl.dpHeaWatLocSet)
-    annotation (Line(points={{-18.2,-120},{-10,-120},{-10,10},{-2,10}},color={0,0,127}));
-  connect(TChiWatSup.y, ctl.TChiWatPriSup) annotation (Line(points={{-158,40},{
-          -102,40},{-102,30},{-2,30}}, color={0,0,127}));
-  connect(THeaWatSup.y, ctl.THeaWatPriSup) annotation (Line(points={{-158,80},{
-          -98,80},{-98,36},{-2,36}}, color={0,0,127}));
-  connect(TChiWatSup.y, ctl.TChiWatSecSup) annotation (Line(points={{-158,40},{
-          -102,40},{-102,18},{-2,18}}, color={0,0,127}));
-  connect(THeaWatSup.y, ctl.THeaWatSecSup) annotation (Line(points={{-158,80},{
-          -98,80},{-98,24},{-2,24}}, color={0,0,127}));
+    annotation (Line(points={{-18.2,-140},{-10,-140},{-10,-12},{-2,-12}},color={0,0,127}));
+  connect(ctl.y1Hrc, y1Hrc_actual.y1)
+    annotation (Line(points={{42,-12},{56,-12},{56,-40},{98,-40}},color={255,0,255}));
+  connect(y1Hrc_actual.y1_actual, ctl.u1Hrc_actual)
+    annotation (Line(points={{122,-40},{142,-40},{142,90},{-14,90},{-14,34.2},{-2,34.2}},
+      color={255,0,255}));
+  connect(ctl.TChiWatSupSet, ctl.TChiWatSecSup)
+    annotation (Line(points={{42,-8},{44,-8},{44,-30},{-32,-30},{-32,-2},{-2,-2}},
+      color={0,0,127}));
+  connect(ctl.TChiWatSupSet, ctl.TChiWatPriSup)
+    annotation (Line(points={{42,-8},{44,-8},{44,-30},{-32,-30},{-32,12},{-2,12}},
+      color={0,0,127}));
+  connect(ctl.THeaWatSupSet, ctl.THeaWatPriSup)
+    annotation (Line(points={{42,-6},{46,-6},{46,-32},{-34,-32},{-34,18},{-2,18}},
+      color={0,0,127}));
+  connect(ctl.THeaWatSupSet, ctl.THeaWatSecSup)
+    annotation (Line(points={{42,-6},{46,-6},{46,-32},{-34,-32},{-34,6},{-2,6}},
+      color={0,0,127}));
+  connect(ctl.THeaWatSupSet, THeaWatRet.u1)
+    annotation (Line(points={{42,-6},{46,-6},{46,176},{-86,176},{-86,166},{-82,166}},
+      color={0,0,127}));
+  connect(dTHeaWat.y, THeaWatRet.u2)
+    annotation (Line(points={{-168,160},{-86,160},{-86,154},{-82,154}},color={0,0,127}));
+  connect(ctl.TChiWatSupSet, TChiWatRet.u2)
+    annotation (Line(points={{42,-8},{44,-8},{44,126},{-120,126},{-120,134},{-112,134}},
+      color={0,0,127}));
+  connect(dTChiWat.y, TChiWatRet.u1)
+    annotation (Line(points={{-128,140},{-124,140},{-124,146},{-112,146}},color={0,0,127}));
+  connect(dTChiWatUpsHrc.y, TChiWatRetUpsHrc.u1)
+    annotation (Line(points={{-128,180},{-124,180},{-124,186},{-112,186}},color={0,0,127}));
+  connect(TChiWatRetUpsHrc.u2, ctl.TChiWatSupSet)
+    annotation (Line(points={{-112,174},{-120,174},{-120,126},{44,126},{44,-8},{42,-8}},
+      color={0,0,127}));
+  connect(THeaWatRetUpsHrc.u2, ctl.THeaWatSupSet)
+    annotation (Line(points={{-82,194},{-86,194},{-86,176},{46,176},{46,-6},{42,-6}},
+      color={0,0,127}));
+  connect(dTHeaWatUpsHrc.y, THeaWatRetUpsHrc.u1)
+    annotation (Line(points={{-168,200},{-100,200},{-100,206},{-82,206}},color={0,0,127}));
+  connect(THeaWatRet.y, ctl.THeaWatPriRet)
+    annotation (Line(points={{-58,160},{-26,160},{-26,16},{-2,16}},color={0,0,127}));
+  connect(THeaWatRet.y, ctl.THeaWatSecRet)
+    annotation (Line(points={{-58,160},{-26,160},{-26,4},{-2,4}},color={0,0,127}));
+  connect(TChiWatRet.y, ctl.TChiWatSecRet)
+    annotation (Line(points={{-88,140},{-28,140},{-28,-4},{-2,-4}},color={0,0,127}));
+  connect(TChiWatRet.y, ctl.TChiWatPriRet)
+    annotation (Line(points={{-88,140},{-28,140},{-28,10},{-2,10}},color={0,0,127}));
+  connect(TChiWatRetUpsHrc.y, ctl.TChiWatRetUpsHrc)
+    annotation (Line(points={{-88,180},{-30,180},{-30,-6},{-2,-6}},color={0,0,127}));
+  connect(THeaWatRetUpsHrc.y, ctl.THeaWatRetUpsHrc)
+    annotation (Line(points={{-58,200},{-22,200},{-22,2},{-2,2}},color={0,0,127}));
   annotation (
     __Dymola_Commands(
       file=
@@ -329,6 +395,8 @@ equation
       StopTime=86400.0,
       Tolerance=1e-06),
     Icon(
+      coordinateSystem(
+        extent={{-100,-100},{100,100}}),
       graphics={
         Ellipse(
           lineColor={75,138,73},
@@ -344,26 +412,31 @@ equation
     Diagram(
       coordinateSystem(
         extent={{-200,-240},{200,240}})),
-    Documentation(revisions="<html>
+    Documentation(
+      revisions="<html>
 <ul>
 <li>
 March 29, 2024, by Antoine Gautier:<br/>
 First implementation.
 </li>
 </ul>
-</html>", info="<html>
+</html>",
+      info="<html>
 <p>
 This model validates
 <a href=\"modelica://Buildings.Templates.Plants.Controls.HeatPumps.AirToWater\">
 Buildings.Templates.Plants.Controls.HeatPumps.AirToWater</a>
 in a configuration with three equally sized lead/lag alternate
-heat pumps.
+heat pumps and a sidestream heat recovery chiller.
 </p>
 <p>
 Simulating this model shows how the controller responds to a varying load by 
 </p>
 <ul>
 <li>
+enabling the sidestream HRC in cooling mode,
+</li>
+<li>
 staging or unstaging the AWHPs and associated primary pumps,
 </li>
 <li>
diff --git a/Buildings/Templates/Plants/Controls/HeatPumps/Validation/package.mo b/Buildings/Templates/Plants/Controls/HeatPumps/Validation/package.mo
index d1394bc2049..3dd88dc0aa7 100644
--- a/Buildings/Templates/Plants/Controls/HeatPumps/Validation/package.mo
+++ b/Buildings/Templates/Plants/Controls/HeatPumps/Validation/package.mo
@@ -1,5 +1,6 @@
 within Buildings.Templates.Plants.Controls.HeatPumps;
-package Validation "Collection of validation models"
+package Validation
+  "Collection of validation models"
   annotation (
     Icon(
       graphics={
@@ -19,7 +20,9 @@ package Validation "Collection of validation models"
         Rectangle(
           lineColor={128,128,128},
           extent={{-100.0,-100.0},{100.0,100.0}},
-          radius=25.0)}), Documentation(info="<html>
+          radius=25.0)}),
+    Documentation(
+      info="<html>
 <p>
 This package contains validation models.
 </p>
diff --git a/Buildings/Templates/Plants/Controls/HeatRecoveryChillers/Controller.mo b/Buildings/Templates/Plants/Controls/HeatRecoveryChillers/Controller.mo
new file mode 100644
index 00000000000..b3e7117dfee
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/HeatRecoveryChillers/Controller.mo
@@ -0,0 +1,314 @@
+within Buildings.Templates.Plants.Controls.HeatRecoveryChillers;
+block Controller
+  "Sidestream heat recovery chiller controller"
+  parameter Boolean have_reqFlo=false
+    "Set to true if HRC provides flow request point via network interface"
+    annotation (Evaluate=true);
+  parameter Real TChiWatSup_min(
+    min=273.15,
+    start=4 + 273.15,
+    unit="K",
+    displayUnit="degC")
+    "Minimum allowable CHW supply temperature"
+    annotation (Dialog(group="Information provided by designer"));
+  parameter Real THeaWatSup_max(
+    min=273.15,
+    start=60 + 273.15,
+    unit="K",
+    displayUnit="degC")
+    "Maximum allowable HW supply temperature"
+    annotation (Dialog(group="Information provided by designer"));
+  parameter Real COPHea_nominal(
+    min=1.1,
+    unit="1")
+    "Heating COP at design heating conditions"
+    annotation (Dialog(group="Information provided by designer"));
+  parameter Real capCoo_min(
+    min=0,
+    unit="W")
+    "Minimum cooling capacity below which cycling occurs"
+    annotation (Dialog(group="Information provided by designer"));
+  parameter Real capHea_min(
+    min=0,
+    unit="W")
+    "Minimum heating capacity below which cycling occurs"
+    annotation (Dialog(group="Information provided by designer"));
+  parameter Real cp_default(
+    min=0,
+    unit="J/(kg.K)")
+    "Default specific heat capacity used to compute required capacity";
+  parameter Real rho_default(
+    min=0,
+    unit="kg/m3")
+    "Default fluid density used to compute required capacity";
+  parameter Real dtMea(
+    min=0,
+    unit="s")=300
+    "Duration used to compute the moving average of required capacity";
+  parameter Real dtRun(
+    min=0,
+    unit="s")=15 * 60
+    "Minimum runtime of enable and disable states";
+  parameter Real dtLoa(
+    min=0,
+    unit="s")=10 * 60
+    "Runtime with sufficient load before enabling";
+  parameter Real dtTem1(
+    min=0,
+    unit="s")=3 * 60
+    "Runtime with first temperature threshold exceeded before disabling";
+  parameter Real dtTem2(
+    min=0,
+    unit="s")=1 * 60
+    "Runtime with second temperature threshold exceeded before disabling";
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TChiWatRetUpsHrc(
+    final unit="K",
+    displayUnit="degC")
+    "CHW return temperature upstream of HRC"
+    annotation (Placement(transformation(extent={{-160,-20},{-120,20}}),
+      iconTransformation(extent={{-140,-40},{-100,0}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TChiWatSupSet(
+    final unit="K",
+    displayUnit="degC")
+    "Active CHW supply temperature setpoint"
+    annotation (Placement(transformation(extent={{-160,60},{-120,100}}),
+      iconTransformation(extent={{-140,0},{-100,40}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput VChiWatLoa_flow(
+    final unit="m3/s")
+    "CHW volume flow rate distributed to the loads"
+    annotation (Placement(transformation(extent={{-160,-60},{-120,-20}}),
+      iconTransformation(extent={{-140,-60},{-100,-20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput THeaWatRetUpsHrc(
+    final unit="K",
+    displayUnit="degC")
+    "HW return temperature upstream of HRC"
+    annotation (Placement(transformation(extent={{-160,-180},{-120,-140}}),
+      iconTransformation(extent={{-140,-140},{-100,-100}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput THeaWatSupSet(
+    final unit="K",
+    displayUnit="degC")
+    "Active HW supply temperature setpoint"
+    annotation (Placement(transformation(extent={{-160,-100},{-120,-60}}),
+      iconTransformation(extent={{-140,-100},{-100,-60}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput VHeaWatLoa_flow(
+    final unit="m3/s")
+    "HW volume flow rate distributed to the loads"
+    annotation (Placement(transformation(extent={{-160,-220},{-120,-180}}),
+      iconTransformation(extent={{-140,-160},{-100,-120}})));
+  StagingRotation.LoadAverage loaChiWat(
+    final typ=Buildings.Templates.Plants.Controls.Types.Application.Cooling,
+    final cp_default=cp_default,
+    final rho_default=rho_default,
+    final dtMea=dtMea)
+    "CHW load"
+    annotation (Placement(transformation(extent={{-90,-10},{-70,10}})));
+  StagingRotation.LoadAverage loaHeaWat(
+    final typ=Buildings.Templates.Plants.Controls.Types.Application.Heating,
+    final cp_default=cp_default,
+    final rho_default=rho_default,
+    final dtMea=dtMea)
+    "HW load"
+    annotation (Placement(transformation(extent={{-90,-170},{-70,-150}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TChiWatHrcLvg(
+    final unit="K",
+    displayUnit="degC")
+    "HRC leaving CHW temperature"
+    annotation (Placement(transformation(extent={{-160,20},{-120,60}}),
+      iconTransformation(extent={{-140,-20},{-100,20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput THeaWatHrcLvg(
+    final unit="K",
+    displayUnit="degC")
+    "HRC leaving HW temperature"
+    annotation (Placement(transformation(extent={{-160,-140},{-120,-100}}),
+      iconTransformation(extent={{-140,-120},{-100,-80}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1Coo
+    "Cooling plant enable"
+    annotation (Placement(transformation(extent={{-160,180},{-120,220}}),
+      iconTransformation(extent={{-140,120},{-100,160}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1Hea
+    "Heating plant enable"
+    annotation (Placement(transformation(extent={{-160,160},{-120,200}}),
+      iconTransformation(extent={{-140,100},{-100,140}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1Hrc_actual
+    "HRC status"
+    annotation (Placement(transformation(extent={{-160,140},{-120,180}}),
+      iconTransformation(extent={{-140,80},{-100,120}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1ReqFloChiWat
+    if have_reqFlo
+    "CHW flow request from HRC"
+    annotation (Placement(transformation(extent={{-160,120},{-120,160}}),
+      iconTransformation(extent={{-140,60},{-100,100}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1ReqFloConWat
+    if have_reqFlo
+    "CW flow request from HRC"
+    annotation (Placement(transformation(extent={{-160,100},{-120,140}}),
+      iconTransformation(extent={{-140,40},{-100,80}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1
+    "Enable command"
+    annotation (Placement(transformation(extent={{120,-20},{160,20}}),
+      iconTransformation(extent={{100,60},{140,100}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1Coo
+    "Mode command: true for cooling, false for heating"
+    annotation (Placement(transformation(extent={{120,-60},{160,-20}}),
+      iconTransformation(extent={{100,20},{140,60}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1PumChiWat
+    "HRC CHW pump enable command"
+    annotation (Placement(transformation(extent={{120,100},{160,140}}),
+      iconTransformation(extent={{100,-60},{140,-20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1PumHeaWat
+    "HRC HW pump enable command"
+    annotation (Placement(transformation(extent={{120,60},{160,100}}),
+      iconTransformation(extent={{100,-100},{140,-60}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput TSupSet(
+    final unit="K",
+    displayUnit="degC")
+    "Active supply temperature setpoint"
+    annotation (Placement(transformation(extent={{120,-100},{160,-60}}),
+      iconTransformation(extent={{100,-20},{140,20}})));
+  Enable ena(
+    final TChiWatSup_min=TChiWatSup_min,
+    final THeaWatSup_max=THeaWatSup_max,
+    final capCoo_min=capCoo_min,
+    final capHea_min=capHea_min,
+    final dtLoa=dtLoa,
+    final dtRun=dtRun,
+    final dtTem1=dtTem1,
+    final dtTem2=dtTem2)
+    "Compute enable command"
+    annotation (Placement(transformation(extent={{-30,-10},{-10,10}})));
+  ModeControl setMod(
+    final COPHea_nominal=COPHea_nominal)
+    "Set mode"
+    annotation (Placement(transformation(extent={{30,-70},{50,-50}})));
+  Pumps.Primary.DisableDedicated pumChiWat(
+    final have_reqFlo=have_reqFlo)
+    "CHW pump control"
+    annotation (Placement(transformation(extent={{30,110},{50,130}})));
+  Pumps.Primary.DisableDedicated pumHeaWat(
+    final have_reqFlo=have_reqFlo)
+    "HW pump control"
+    annotation (Placement(transformation(extent={{30,70},{50,90}})));
+  Buildings.Controls.OBC.CDL.Logical.Pre preMod
+    "Previous mode setting"
+    annotation (Placement(transformation(extent={{50,-30},{30,-10}})));
+equation
+  connect(TChiWatSupSet, loaChiWat.TSupSet)
+    annotation (Line(points={{-140,80},{-100,80},{-100,6},{-92,6}},color={0,0,127}));
+  connect(TChiWatRetUpsHrc, loaChiWat.TRet)
+    annotation (Line(points={{-140,0},{-92,0}},color={0,0,127}));
+  connect(VChiWatLoa_flow, loaChiWat.V_flow)
+    annotation (Line(points={{-140,-40},{-98,-40},{-98,-6},{-92,-6}},color={0,0,127}));
+  connect(THeaWatSupSet, loaHeaWat.TSupSet)
+    annotation (Line(points={{-140,-80},{-100,-80},{-100,-154},{-92,-154}},color={0,0,127}));
+  connect(THeaWatRetUpsHrc, loaHeaWat.TRet)
+    annotation (Line(points={{-140,-160},{-92,-160}},color={0,0,127}));
+  connect(VHeaWatLoa_flow, loaHeaWat.V_flow)
+    annotation (Line(points={{-140,-200},{-100,-200},{-100,-166},{-92,-166}},
+      color={0,0,127}));
+  connect(u1Coo, ena.u1Coo)
+    annotation (Line(points={{-140,200},{-40,200},{-40,8},{-32,8}},color={255,0,255}));
+  connect(u1Hea, ena.u1Hea)
+    annotation (Line(points={{-140,180},{-42,180},{-42,6},{-32,6}},color={255,0,255}));
+  connect(u1Hrc_actual, ena.u1Hrc_actual)
+    annotation (Line(points={{-140,160},{-44,160},{-44,4},{-32,4}},color={255,0,255}));
+  connect(loaChiWat.QReq_flow, ena.QChiWatReq_flow)
+    annotation (Line(points={{-68,0},{-60,0},{-60,-2},{-32,-2}},color={0,0,127}));
+  connect(loaHeaWat.QReq_flow, ena.QHeaWatReq_flow)
+    annotation (Line(points={{-68,-160},{-64,-160},{-64,-4},{-32,-4}},color={0,0,127}));
+  connect(TChiWatHrcLvg, ena.TChiWatHrcLvg)
+    annotation (Line(points={{-140,40},{-62,40},{-62,-6},{-32,-6}},color={0,0,127}));
+  connect(THeaWatHrcLvg, ena.THeaWatHrcLvg)
+    annotation (Line(points={{-140,-120},{-62,-120},{-62,-8},{-32,-8}},color={0,0,127}));
+  connect(loaChiWat.QReq_flow, setMod.QChiWatReq_flow)
+    annotation (Line(points={{-68,0},{-60,0},{-60,-56},{28,-56}},color={0,0,127}));
+  connect(loaHeaWat.QReq_flow, setMod.QHeaWatReq_flow)
+    annotation (Line(points={{-68,-160},{-64,-160},{-64,-60},{28,-60}},color={0,0,127}));
+  connect(TChiWatSupSet, setMod.TChiWatSupSet)
+    annotation (Line(points={{-140,80},{-100,80},{-100,-64},{28,-64}},color={0,0,127}));
+  connect(THeaWatSupSet, setMod.THeaWatSupSet)
+    annotation (Line(points={{-140,-80},{-100,-80},{-100,-68},{28,-68}},color={0,0,127}));
+  connect(setMod.y1Coo, y1Coo)
+    annotation (Line(points={{52,-60},{60,-60},{60,-40},{140,-40}},color={255,0,255}));
+  connect(setMod.TSupSet, TSupSet)
+    annotation (Line(points={{52,-66},{60,-66},{60,-80},{140,-80}},color={0,0,127}));
+  connect(ena.y1, y1)
+    annotation (Line(points={{-8,0},{140,0}},color={255,0,255}));
+  connect(ena.y1SetMod, setMod.u1SetMod)
+    annotation (Line(points={{-8,-6},{0,-6},{0,-52},{28,-52}},color={255,0,255}));
+  connect(ena.y1, pumChiWat.u1)
+    annotation (Line(points={{-8,0},{0,0},{0,128},{28,128}},color={255,0,255}));
+  connect(ena.y1, pumChiWat.u1Equ)
+    annotation (Line(points={{-8,0},{0,0},{0,124},{28,124}},color={255,0,255}));
+  connect(u1ReqFloChiWat, pumChiWat.u1ReqFlo)
+    annotation (Line(points={{-140,140},{20,140},{20,116},{28,116}},color={255,0,255}));
+  connect(u1Hrc_actual, pumChiWat.u1Equ_actual)
+    annotation (Line(points={{-140,160},{22,160},{22,120},{28,120}},color={255,0,255}));
+  connect(ena.y1, pumHeaWat.u1)
+    annotation (Line(points={{-8,0},{0,0},{0,88},{28,88}},color={255,0,255}));
+  connect(ena.y1, pumHeaWat.u1Equ)
+    annotation (Line(points={{-8,0},{0,0},{0,84},{28,84}},color={255,0,255}));
+  connect(u1ReqFloConWat, pumHeaWat.u1ReqFlo)
+    annotation (Line(points={{-140,120},{18,120},{18,76},{28,76}},color={255,0,255}));
+  connect(u1Hrc_actual, pumHeaWat.u1Equ_actual)
+    annotation (Line(points={{-140,160},{22,160},{22,80},{28,80}},color={255,0,255}));
+  connect(pumHeaWat.y1, y1PumHeaWat)
+    annotation (Line(points={{52,80},{140,80}},color={255,0,255}));
+  connect(pumChiWat.y1, y1PumChiWat)
+    annotation (Line(points={{52,120},{140,120}},color={255,0,255}));
+  connect(setMod.y1Coo, preMod.u)
+    annotation (Line(points={{52,-60},{60,-60},{60,-20},{52,-20}},color={255,0,255}));
+  connect(preMod.y, ena.u1CooHrc)
+    annotation (Line(points={{28,-20},{-40,-20},{-40,2},{-32,2}},color={255,0,255}));
+  annotation (
+    Diagram(
+      coordinateSystem(
+        extent={{-120,-220},{120,220}})),
+    defaultComponentName="ctlHrc",
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=true,
+        extent={{-100,-160},{100,160}}),
+      graphics={
+        Rectangle(
+          extent={{-100,160},{100,-160}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Text(
+          extent={{-150,210},{150,170}},
+          textString="%name",
+          textColor={0,0,255})}),
+    Documentation(
+      info="<html>
+<p>
+The control sequence consists of the following parts.
+</p>
+<ul>
+<li>Heat recovery chiller enable logic: Refer to
+<a href=\"modelica://Buildings.Templates.Plants.Controls.HeatRecoveryChillers.Enable\">
+Buildings.Templates.Plants.Controls.HeatRecoveryChillers.Enable</a>.
+</li>
+<li>Heat recovery chiller CHW and HW pump control:
+The logic assumes constant speed pumps.
+The pumps are enabled as described in
+<a href=\"modelica://Buildings.Templates.Plants.Controls.HeatRecoveryChillers.Enable\">
+Buildings.Templates.Plants.Controls.HeatRecoveryChillers.Enable</a>
+and disabled as described in
+<a href=\"modelica://Buildings.Templates.Plants.Controls.Pumps.Primary.DisableDedicated\">
+Buildings.Templates.Plants.Controls.Pumps.Primary.DisableDedicated</a>.
+</li>
+<li>Heat recovery chiller mode control and setpoint selection: Refer to
+<a href=\"modelica://Buildings.Templates.Plants.Controls.HeatRecoveryChillers.ModeControl\">
+Buildings.Templates.Plants.Controls.HeatRecoveryChillers.ModeControl</a>.
+</li>
+</ul>
+</html>",
+      revisions="<html>
+<ul>
+<li>
+May 31, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end Controller;
diff --git a/Buildings/Templates/Plants/Controls/HeatRecoveryChillers/Enable.mo b/Buildings/Templates/Plants/Controls/HeatRecoveryChillers/Enable.mo
new file mode 100644
index 00000000000..3dd04ae958b
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/HeatRecoveryChillers/Enable.mo
@@ -0,0 +1,422 @@
+within Buildings.Templates.Plants.Controls.HeatRecoveryChillers;
+block Enable
+  "Heat recovery chiller and HRC CHW and HW pumps enable"
+  parameter Real TChiWatSup_min(
+    final min=273.15,
+    start=4 + 273.15,
+    final unit="K",
+    displayUnit="degC")
+    "Minimum allowable CHW supply temperature"
+    annotation (Dialog(group="Information provided by designer"));
+  parameter Real THeaWatSup_max(
+    final min=273.15,
+    start=60 + 273.15,
+    final unit="K",
+    displayUnit="degC")
+    "Maximum allowable HW supply temperature"
+    annotation (Dialog(group="Information provided by designer"));
+  parameter Real capCoo_min(
+    final min=0,
+    final unit="W")
+    "Minimum cooling capacity below which cycling occurs"
+    annotation (Dialog(group="Information provided by designer"));
+  parameter Real capHea_min(
+    final min=0,
+    final unit="W")
+    "Minimum heating capacity below which cycling occurs"
+    annotation (Dialog(group="Information provided by designer"));
+  parameter Real dtRun(
+    final min=0,
+    final unit="s")=15 * 60
+    "Minimum runtime of enable and disable states";
+  parameter Real dtLoa(
+    final min=0,
+    final unit="s")=10 * 60
+    "Runtime with sufficient load before enabling";
+  parameter Real dtTem1(
+    final min=0,
+    final unit="s")=3 * 60
+    "Runtime with first temperature threshold exceeded before disabling";
+  parameter Real dtTem2(
+    final min=0,
+    final unit="s")=1 * 60
+    "Runtime with second temperature threshold exceeded before disabling";
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1Coo
+    "Cooling plant enable"
+    annotation (Placement(transformation(extent={{-240,140},{-200,180}}),
+      iconTransformation(extent={{-140,60},{-100,100}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1Hea
+    "Heating plant enable"
+    annotation (Placement(transformation(extent={{-240,80},{-200,120}}),
+      iconTransformation(extent={{-140,40},{-100,80}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1Hrc_actual
+    "HRC status"
+    annotation (Placement(transformation(extent={{-240,40},{-200,80}}),
+      iconTransformation(extent={{-140,20},{-100,60}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput QChiWatReq_flow(
+    final unit="W")
+    "CHW load"
+    annotation (Placement(transformation(extent={{-240,-60},{-200,-20}}),
+      iconTransformation(extent={{-140,-40},{-100,0}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput QHeaWatReq_flow(
+    final unit="W")
+    "HW load"
+    annotation (Placement(transformation(extent={{-240,-100},{-200,-60}}),
+      iconTransformation(extent={{-140,-60},{-100,-20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TChiWatHrcLvg(
+    final unit="K",
+    displayUnit="degC")
+    "HRC leaving CHW temperature"
+    annotation (Placement(transformation(extent={{-240,-160},{-200,-120}}),
+      iconTransformation(extent={{-140,-80},{-100,-40}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput THeaWatHrcLvg(
+    final unit="K",
+    displayUnit="degC")
+    "HRC leaving HW temperature"
+    annotation (Placement(transformation(extent={{-240,-220},{-200,-180}}),
+      iconTransformation(extent={{-140,-100},{-100,-60}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1CooHrc
+    "HRC control mode command: true for cooling, false for heating"
+    annotation (Placement(transformation(extent={{-240,0},{-200,40}}),
+      iconTransformation(extent={{-140,0},{-100,40}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1
+    "Enable command"
+    annotation (Placement(transformation(extent={{200,-20},{240,20}}),
+      iconTransformation(extent={{100,-20},{140,20}})));
+  Buildings.Controls.OBC.CDL.Logical.Pre preEna
+    "Left limit (in discrete-time) of enable signal"
+    annotation (Placement(transformation(extent={{-150,190},{-130,210}})));
+  Buildings.Controls.OBC.CDL.Logical.Timer timCooEna(
+    final t=dtRun)
+    "Return true if cooling plant has been enabled for specified duration"
+    annotation (Placement(transformation(extent={{-180,158},{-160,178}})));
+  Buildings.Controls.OBC.CDL.Logical.Not dis
+    "Return true if disabled"
+    annotation (Placement(transformation(extent={{-70,190},{-50,210}})));
+  Buildings.Controls.OBC.CDL.Logical.Timer runDis(
+    final t=dtRun)
+    "Return true if system has been disabled for specified duration"
+    annotation (Placement(transformation(extent={{-30,190},{-10,210}})));
+  Buildings.Controls.OBC.CDL.Logical.Timer timHeaEna(
+    final t=dtRun)
+    "Return true if heating plant has been enabled for specified duration"
+    annotation (Placement(transformation(extent={{-180,98},{-160,118}})));
+  Buildings.Controls.OBC.CDL.Reals.GreaterThreshold higLoaCoo(
+    final t=capCoo_min,
+    h=1E-4 * capCoo_min)
+    "Compare CHW load to cycling limit (hysteresis is to avoid chattering with some simulators)"
+    annotation (Placement(transformation(extent={{-180,-50},{-160,-30}})));
+  Buildings.Controls.OBC.CDL.Reals.GreaterThreshold higLoaHea(
+    final t=capHea_min,
+    h=1E-4 * capHea_min)
+    "Compare HW load to cycling limit (hysteresis is to avoid chattering with some simulators)"
+    annotation (Placement(transformation(extent={{-180,-90},{-160,-70}})));
+  Buildings.Controls.OBC.CDL.Reals.LessThreshold lowTChiWatLvg1(
+    final t=TChiWatSup_min + 1)
+    "Return true if first temperature limit exceeded"
+    annotation (Placement(transformation(extent={{-180,-150},{-160,-130}})));
+  Buildings.Controls.OBC.CDL.Reals.GreaterThreshold higTHeaWatLvg1(
+    final t=THeaWatSup_max - 1.5)
+    "Return true if first temperature limit exceeded"
+    annotation (Placement(transformation(extent={{-180,-210},{-160,-190}})));
+  Buildings.Controls.OBC.CDL.Reals.GreaterThreshold higTHeaWatLvg2(
+    final t=THeaWatSup_max)
+    "Return true if second temperature limit exceeded"
+    annotation (Placement(transformation(extent={{-140,-230},{-120,-210}})));
+  Buildings.Controls.OBC.CDL.Reals.LessThreshold lowTChiWatLvg2(
+    final t=TChiWatSup_min)
+    "Return true if second temperature limit exceeded"
+    annotation (Placement(transformation(extent={{-140,-170},{-120,-150}})));
+  Buildings.Controls.OBC.CDL.Logical.Timer timTHeaWatLvg1(
+    final t=dtTem1)
+    "Return true if threshold exceeded for specified duration"
+    annotation (Placement(transformation(extent={{-90,-202},{-70,-182}})));
+  Buildings.Controls.OBC.CDL.Logical.Timer timTHeaWatLvg2(
+    final t=dtTem2)
+    "Return true if threshold exceeded for specified duration"
+    annotation (Placement(transformation(extent={{-50,-230},{-30,-210}})));
+  Buildings.Controls.OBC.CDL.Logical.Timer timTChiWatLvg1(
+    final t=dtTem1)
+    "Return true if threshold exceeded for specified duration"
+    annotation (Placement(transformation(extent={{-90,-142},{-70,-122}})));
+  Buildings.Controls.OBC.CDL.Logical.Timer timTChiWatLvg2(
+    final t=dtTem2)
+    "Return true if threshold exceeded for specified duration"
+    annotation (Placement(transformation(extent={{-50,-170},{-30,-150}})));
+  Buildings.Controls.OBC.CDL.Logical.Timer timLoaCoo(
+    final t=dtLoa)
+    "Return true if threshold exceeded for specified duration"
+    annotation (Placement(transformation(extent={{-32,-50},{-12,-30}})));
+  Buildings.Controls.OBC.CDL.Logical.Timer timLoaHea(
+    final t=dtLoa)
+    "Return true if threshold exceeded for specified duration"
+    annotation (Placement(transformation(extent={{-32,-90},{-12,-70}})));
+  Buildings.Controls.OBC.CDL.Logical.MultiAnd allEna(
+    nin=5)
+    "All enable conditions met"
+    annotation (Placement(transformation(extent={{30,-10},{50,10}})));
+  Buildings.Controls.OBC.CDL.Logical.MultiOr anyDis(
+    nin=5)
+    "Any disable condition met"
+    annotation (Placement(transformation(extent={{70,-110},{90,-90}})));
+  Buildings.Controls.OBC.CDL.Logical.Not disCoo
+    "Return true if cooling plant disabled"
+    annotation (Placement(transformation(extent={{-180,130},{-160,150}})));
+  Buildings.Controls.OBC.CDL.Logical.Not disHea
+    "Return true if heating plant disabled"
+    annotation (Placement(transformation(extent={{-180,70},{-160,90}})));
+  Buildings.Controls.OBC.CDL.Reals.LessThreshold lowLoaCoo(
+    final t=capCoo_min,
+    h=1E-4 * capCoo_min)
+    "Compare CHW load to cycling limit (hysteresis is to avoid chattering with some simulators)"
+    annotation (Placement(transformation(extent={{-110,-70},{-90,-50}})));
+  Buildings.Controls.OBC.CDL.Reals.LessThreshold lowLoaHea(
+    final t=capHea_min,
+    h=1E-4 * capHea_min)
+    "Compare HW load to cycling limit (hysteresis is to avoid chattering with some simulators)"
+    annotation (Placement(transformation(extent={{-110,-110},{-90,-90}})));
+  Buildings.Controls.OBC.CDL.Logical.Or anyLowLoa
+    "Any low load condition met"
+    annotation (Placement(transformation(extent={{-70,-70},{-50,-50}})));
+  Buildings.Controls.OBC.CDL.Logical.FallingEdge off
+    "Return true when HRC cycles off"
+    annotation (Placement(transformation(extent={{-110,50},{-90,70}})));
+  Buildings.Controls.OBC.CDL.Logical.And anyLowLoaAndOff
+    "Any low load condition met and HRC cycles off"
+    annotation (Placement(transformation(extent={{-30,50},{-10,70}})));
+  Buildings.Controls.OBC.CDL.Logical.And enaAndCoo
+    "HRC enabled in cooling mode"
+    annotation (Placement(transformation(extent={{-110,10},{-90,30}})));
+  Buildings.Controls.OBC.CDL.Logical.And enaAndHea
+    "HRC enabled in heating mode"
+    annotation (Placement(transformation(extent={{-110,-30},{-90,-10}})));
+  Buildings.Controls.OBC.CDL.Logical.Not hea
+    "True if heating control mode"
+    annotation (Placement(transformation(extent={{-180,-10},{-160,10}})));
+  Buildings.Controls.OBC.CDL.Logical.Or anyTChiWatLvg
+    "Any leaving CHW temperature condition met"
+    annotation (Placement(transformation(extent={{-10,-150},{10,-130}})));
+  Buildings.Controls.OBC.CDL.Logical.Or anyTHeaWatLvg
+    "Any leaving HW temperature condition met"
+    annotation (Placement(transformation(extent={{-10,-210},{10,-190}})));
+  Buildings.Controls.OBC.CDL.Logical.And anyTChiWatLvgAndHea
+    "Any leaving CHW temperature condition met and HRC enabled in heating mode"
+    annotation (Placement(transformation(extent={{32,-150},{52,-130}})));
+  Buildings.Controls.OBC.CDL.Logical.And anyTHeaWatLvgAndCoo
+    "Any leaving HW temperature condition met and HRC enabled in cooling mode"
+    annotation (Placement(transformation(extent={{30,-210},{50,-190}})));
+  Buildings.Controls.OBC.CDL.Logical.Latch enaDis
+    "Maintain true signal until disable condition met"
+    annotation (Placement(transformation(extent={{110,-50},{130,-30}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1SetMod
+    "Enable mode setting"
+    annotation (Placement(transformation(extent={{200,-60},{240,-20}}),
+      iconTransformation(extent={{100,-80},{140,-40}})));
+  Buildings.Controls.OBC.CDL.Logical.TrueDelay truDel(
+    delayTime=5)
+    "Delay so that mode setting is enabled prior to enabling the HRC"
+    annotation (Placement(transformation(extent={{150,-10},{170,10}})));
+  Buildings.Controls.OBC.CDL.Logical.Edge edg
+    "Enable mode setting just before enabling the HRC"
+    annotation (Placement(transformation(extent={{150,-50},{170,-30}})));
+equation
+  connect(preEna.y, dis.u)
+    annotation (Line(points={{-128,200},{-72,200}},color={255,0,255}));
+  connect(dis.y, runDis.u)
+    annotation (Line(points={{-48,200},{-32,200}},color={255,0,255}));
+  connect(u1Coo, timCooEna.u)
+    annotation (Line(points={{-220,160},{-190,160},{-190,168},{-182,168}},color={255,0,255}));
+  connect(u1Hea, timHeaEna.u)
+    annotation (Line(points={{-220,100},{-190,100},{-190,108},{-182,108}},color={255,0,255}));
+  connect(y1, preEna.u)
+    annotation (Line(points={{220,0},{180,0},{180,220},{-160,220},{-160,200},{-152,200}},
+      color={255,0,255}));
+  connect(QChiWatReq_flow, higLoaCoo.u)
+    annotation (Line(points={{-220,-40},{-182,-40}},color={0,0,127}));
+  connect(QHeaWatReq_flow, higLoaHea.u)
+    annotation (Line(points={{-220,-80},{-182,-80}},color={0,0,127}));
+  connect(TChiWatHrcLvg, lowTChiWatLvg1.u)
+    annotation (Line(points={{-220,-140},{-182,-140}},color={0,0,127}));
+  connect(THeaWatHrcLvg, higTHeaWatLvg1.u)
+    annotation (Line(points={{-220,-200},{-182,-200}},color={0,0,127}));
+  connect(TChiWatHrcLvg, lowTChiWatLvg2.u)
+    annotation (Line(points={{-220,-140},{-190,-140},{-190,-160},{-142,-160}},
+      color={0,0,127}));
+  connect(THeaWatHrcLvg, higTHeaWatLvg2.u)
+    annotation (Line(points={{-220,-200},{-190,-200},{-190,-220},{-142,-220}},
+      color={0,0,127}));
+  connect(higTHeaWatLvg1.y, timTHeaWatLvg1.u)
+    annotation (Line(points={{-158,-200},{-100,-200},{-100,-192},{-92,-192}},
+      color={255,0,255}));
+  connect(higTHeaWatLvg2.y, timTHeaWatLvg2.u)
+    annotation (Line(points={{-118,-220},{-52,-220}},color={255,0,255}));
+  connect(lowTChiWatLvg1.y, timTChiWatLvg1.u)
+    annotation (Line(points={{-158,-140},{-100,-140},{-100,-132},{-92,-132}},
+      color={255,0,255}));
+  connect(lowTChiWatLvg2.y, timTChiWatLvg2.u)
+    annotation (Line(points={{-118,-160},{-52,-160}},color={255,0,255}));
+  connect(higLoaCoo.y, timLoaCoo.u)
+    annotation (Line(points={{-158,-40},{-34,-40}},color={255,0,255}));
+  connect(higLoaHea.y, timLoaHea.u)
+    annotation (Line(points={{-158,-80},{-34,-80}},color={255,0,255}));
+  connect(timCooEna.passed, allEna.u[1])
+    annotation (Line(points={{-158,160},{0,160},{0,-2.8},{28,-2.8}},color={255,0,255}));
+  connect(timHeaEna.passed, allEna.u[2])
+    annotation (Line(points={{-158,100},{-2,100},{-2,-1.4},{28,-1.4}},color={255,0,255}));
+  connect(runDis.passed, allEna.u[3])
+    annotation (Line(points={{-8,192},{2,192},{2,0},{28,0}},color={255,0,255}));
+  connect(timLoaCoo.passed, allEna.u[4])
+    annotation (Line(points={{-10,-48},{-2,-48},{-2,1.4},{28,1.4}},color={255,0,255}));
+  connect(timLoaHea.passed, allEna.u[5])
+    annotation (Line(points={{-10,-88},{0,-88},{0,2.8},{28,2.8}},color={255,0,255}));
+  connect(u1Coo, disCoo.u)
+    annotation (Line(points={{-220,160},{-190,160},{-190,140},{-182,140}},color={255,0,255}));
+  connect(u1Hea, disHea.u)
+    annotation (Line(points={{-220,100},{-190,100},{-190,80},{-182,80}},color={255,0,255}));
+  connect(disCoo.y, anyDis.u[1])
+    annotation (Line(points={{-158,140},{60,140},{60,-102.8},{68,-102.8}},color={255,0,255}));
+  connect(disHea.y, anyDis.u[2])
+    annotation (Line(points={{-158,80},{58,80},{58,-101.4},{68,-101.4}},color={255,0,255}));
+  connect(QChiWatReq_flow, lowLoaCoo.u)
+    annotation (Line(points={{-220,-40},{-190,-40},{-190,-60},{-112,-60}},color={0,0,127}));
+  connect(QChiWatReq_flow, lowLoaHea.u)
+    annotation (Line(points={{-220,-40},{-190,-40},{-190,-100},{-112,-100}},
+      color={0,0,127}));
+  connect(lowLoaCoo.y, anyLowLoa.u1)
+    annotation (Line(points={{-88,-60},{-72,-60}},color={255,0,255}));
+  connect(lowLoaHea.y, anyLowLoa.u2)
+    annotation (Line(points={{-88,-100},{-80,-100},{-80,-68},{-72,-68}},color={255,0,255}));
+  connect(off.y, anyLowLoaAndOff.u1)
+    annotation (Line(points={{-88,60},{-32,60}},color={255,0,255}));
+  connect(anyLowLoa.y, anyLowLoaAndOff.u2)
+    annotation (Line(points={{-48,-60},{-40,-60},{-40,52},{-32,52}},color={255,0,255}));
+  connect(anyLowLoaAndOff.y, anyDis.u[3])
+    annotation (Line(points={{-8,60},{56,60},{56,-100},{68,-100}},color={255,0,255}));
+  connect(u1CooHrc, hea.u)
+    annotation (Line(points={{-220,20},{-190,20},{-190,0},{-182,0}},color={255,0,255}));
+  connect(u1CooHrc, enaAndCoo.u2)
+    annotation (Line(points={{-220,20},{-150,20},{-150,12},{-112,12}},color={255,0,255}));
+  connect(hea.y, enaAndHea.u2)
+    annotation (Line(points={{-158,0},{-130,0},{-130,-28},{-112,-28}},color={255,0,255}));
+  connect(timTHeaWatLvg1.passed, anyTHeaWatLvg.u1)
+    annotation (Line(points={{-68,-200},{-12,-200}},color={255,0,255}));
+  connect(timTChiWatLvg1.passed, anyTChiWatLvg.u1)
+    annotation (Line(points={{-68,-140},{-12,-140}},color={255,0,255}));
+  connect(timTChiWatLvg2.passed, anyTChiWatLvg.u2)
+    annotation (Line(points={{-28,-168},{-20,-168},{-20,-148},{-12,-148}},color={255,0,255}));
+  connect(timTHeaWatLvg2.passed, anyTHeaWatLvg.u2)
+    annotation (Line(points={{-28,-228},{-20,-228},{-20,-208},{-12,-208}},color={255,0,255}));
+  connect(anyTChiWatLvg.y, anyTChiWatLvgAndHea.u2)
+    annotation (Line(points={{12,-140},{16,-140},{16,-148},{30,-148}},color={255,0,255}));
+  connect(anyTChiWatLvgAndHea.y, anyDis.u[4])
+    annotation (Line(points={{54,-140},{58,-140},{58,-98.6},{68,-98.6}},color={255,0,255}));
+  connect(anyTHeaWatLvgAndCoo.y, anyDis.u[5])
+    annotation (Line(points={{52,-200},{60,-200},{60,-97.2},{68,-97.2}},color={255,0,255}));
+  connect(allEna.y, enaDis.u)
+    annotation (Line(points={{52,0},{100,0},{100,-40},{108,-40}},color={255,0,255}));
+  connect(anyDis.y, enaDis.clr)
+    annotation (Line(points={{92,-100},{100,-100},{100,-46},{108,-46}},color={255,0,255}));
+  connect(enaDis.y, truDel.u)
+    annotation (Line(points={{132,-40},{140,-40},{140,0},{148,0}},color={255,0,255}));
+  connect(truDel.y, y1)
+    annotation (Line(points={{172,0},{190,0},{190,0},{220,0}},color={255,0,255}));
+  connect(enaDis.y, edg.u)
+    annotation (Line(points={{132,-40},{148,-40}},color={255,0,255}));
+  connect(edg.y, y1SetMod)
+    annotation (Line(points={{172,-40},{220,-40}},color={255,0,255}));
+  connect(u1Hrc_actual, off.u)
+    annotation (Line(points={{-220,60},{-112,60}},color={255,0,255}));
+  connect(preEna.y, enaAndCoo.u1)
+    annotation (Line(points={{-128,200},{-120,200},{-120,20},{-112,20}},color={255,0,255}));
+  connect(preEna.y, enaAndHea.u1)
+    annotation (Line(points={{-128,200},{-120,200},{-120,-20},{-112,-20}},color={255,0,255}));
+  connect(enaAndCoo.y, anyTHeaWatLvgAndCoo.u1)
+    annotation (Line(points={{-88,20},{22,20},{22,-200},{28,-200}},color={255,0,255}));
+  connect(anyTHeaWatLvg.y, anyTHeaWatLvgAndCoo.u2)
+    annotation (Line(points={{12,-200},{20,-200},{20,-208},{28,-208}},color={255,0,255}));
+  connect(enaAndHea.y, anyTChiWatLvgAndHea.u1)
+    annotation (Line(points={{-88,-20},{20,-20},{20,-140},{30,-140}},color={255,0,255}));
+  annotation (
+    defaultComponentName="ena",
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=true,
+        extent={{-100,-100},{100,100}}),
+      graphics={
+        Rectangle(
+          extent={{-100,100},{100,-100}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Text(
+          extent={{-150,150},{150,110}},
+          textString="%name",
+          textColor={0,0,255})}),
+    Documentation(
+      info="<html>
+<p>
+The available CHW load <code>QChiWatReq_flow</code> is calculated based on secondary
+CHW temperature immediately upstream of the heat recovery chiller, 
+active CHW supply temperature setpoint and secondary CHW loop flow. 
+</p>
+<p>
+The available HW load <code>QHeaWatReq_flow</code> is calculated based on secondary
+HW temperature immediately upstream of the heat recovery chiller, 
+active HW supply temperature setpoint and secondary HW loop flow. 
+</p>
+<p>
+The available CHW and HW loads used in logic are rolling averages 
+over a period of <code>dtMea</code>
+of instantaneous values sampled at minimum once every <i>30</i>&nbsp;s.
+</p>
+<p>
+The heat recovery chiller is enabled when all of the following are true:
+</p>
+<ul>
+<li>CHW plant has been enabled for <code>dtRun</code>.</li>
+<li><code>QChiWatReq_flow &gt;&nbsp;capCooHrc_min</code> for <code>dtLoa</code>.</li>
+<li>HW plant has been enabled for <code>dtRun</code>.</li>
+<li><code>QHeaWatReq_flow &gt;&nbsp;capHeaHrc_min</code> for <code>dtLoa</code>.</li>
+<li>HRC has been disabled for at least <code>dtRun</code>.</li>
+</ul>
+<p>
+The heat recovery chiller is disabled when any of the following are true:
+</p>
+<ul>
+<li>CHW plant is disabled.</li>
+<li>HW plant is disabled.</li>
+<li>
+The heat recovery chiller cycles off (chiller is enabled but status changes from Run to Off) 
+under low load conditions and either <code>QChiWatReq_flow&nbsp;&lt;&nbsp;capCooHrc_min</code> 
+or <code>QHeaWatReq_flow&nbsp;&lt;&nbsp;capHeaHrc_min</code>.
+</li>
+<li>
+If the HRC is in heating mode and CHW supply temperature leaving the 
+heat recovery chiller as measured either through the chiller’s network interface 
+or immediately downstream of the chiller is <code>&lt;&nbsp;TChiWatSupSet_min&nbsp;+&nbsp;1</code> 
+for <code>dtTem1</code> or <code>&lt;&nbsp;TChiWatSupSet_min</code> for <code>dtTem2</code>.
+</li>
+<li>
+If the HRC is in cooling mode and HW supply temperature leaving the 
+heat recovery chiller as measured either through the chiller’s network interface 
+or immediately downstream of the chiller is <code>&gt;&nbsp;THeaWatSupSet_max&nbsp;-&nbsp;1.5</code> 
+for <code>dtTem1</code> or <code>&gt;&nbsp;THeaWatSupSet_max</code> for <code>dtTem2</code>.
+</li>
+</ul>
+<h4>Pump control</h4>
+<p>
+Sidestream HRC HW and CHW pumps are enabled when the heat recovery chiller is enabled.
+</p>
+</html>",
+      revisions="<html>
+<ul>
+<li>
+May 31, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    Diagram(
+      coordinateSystem(
+        extent={{-200,-240},{200,240}})));
+end Enable;
diff --git a/Buildings/Templates/Plants/Controls/HeatRecoveryChillers/ModeControl.mo b/Buildings/Templates/Plants/Controls/HeatRecoveryChillers/ModeControl.mo
new file mode 100644
index 00000000000..66eb470044c
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/HeatRecoveryChillers/ModeControl.mo
@@ -0,0 +1,138 @@
+within Buildings.Templates.Plants.Controls.HeatRecoveryChillers;
+block ModeControl
+  "Mode control and setpoint selection"
+  parameter Real COPHea_nominal(
+    final min=1.1,
+    final unit="1")
+    "Heating COP at design heating conditions"
+    annotation (Dialog(group="Information provided by designer"));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1SetMod
+    "Enable mode setting"
+    annotation (Placement(transformation(extent={{-140,20},{-100,60}}),
+      iconTransformation(extent={{-140,60},{-100,100}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput QChiWatReq_flow(
+    final unit="W")
+    "CHW load"
+    annotation (Placement(transformation(extent={{-140,-20},{-100,20}}),
+      iconTransformation(extent={{-140,20},{-100,60}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput QHeaWatReq_flow(
+    final unit="W")
+    "HW load"
+    annotation (Placement(transformation(extent={{-140,-40},{-100,0}}),
+      iconTransformation(extent={{-140,-20},{-100,20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TChiWatSupSet(
+    final unit="K",
+    displayUnit="degC")
+    "Active CHW supply temperature setpoint"
+    annotation (Placement(transformation(extent={{-140,-80},{-100,-40}}),
+      iconTransformation(extent={{-140,-60},{-100,-20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput THeaWatSupSet(
+    final unit="K",
+    displayUnit="degC")
+    "Active HW supply temperature setpoint"
+    annotation (Placement(transformation(extent={{-140,-100},{-100,-60}}),
+      iconTransformation(extent={{-140,-100},{-100,-60}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1Coo
+    "Mode command: true for cooling, false for heating"
+    annotation (Placement(transformation(extent={{100,-20},{140,20}}),
+      iconTransformation(extent={{100,-20},{140,20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput TSupSet(
+    final unit="K",
+    displayUnit="degC")
+    "Active supply temperature setpoint"
+    annotation (Placement(transformation(extent={{100,-80},{140,-40}}),
+      iconTransformation(extent={{100,-80},{140,-40}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter QEvaHea_flow(
+    final k=1 - 1 / COPHea_nominal)
+    "Compute evaporator heat flow rate in heating mode"
+    annotation (Placement(transformation(extent={{-88,-30},{-68,-10}})));
+  Buildings.Controls.OBC.CDL.Reals.Less les
+    "True (cooling) if CHW load lower than evaporator heat flow rate in heating mode"
+    annotation (Placement(transformation(extent={{-50,-10},{-30,10}})));
+  Buildings.Controls.OBC.CDL.Reals.Switch selTSupSet
+    "Select supply temperature setpoint"
+    annotation (Placement(transformation(extent={{50,-70},{70,-50}})));
+  Buildings.Controls.OBC.CDL.Logical.Switch setMod
+    "Set mode if mode setting enabled, otherwise reuse previous mode"
+    annotation (Placement(transformation(extent={{-10,50},{10,30}})));
+  Buildings.Controls.OBC.CDL.Logical.Pre preMod
+    "Previous mode setting"
+    annotation (Placement(transformation(extent={{60,50},{40,70}})));
+equation
+  connect(QHeaWatReq_flow, QEvaHea_flow.u)
+    annotation (Line(points={{-120,-20},{-90,-20}},color={0,0,127}));
+  connect(QChiWatReq_flow, les.u1)
+    annotation (Line(points={{-120,0},{-52,0}},color={0,0,127}));
+  connect(QEvaHea_flow.y, les.u2)
+    annotation (Line(points={{-66,-20},{-60,-20},{-60,-8},{-52,-8}},color={0,0,127}));
+  connect(TChiWatSupSet, selTSupSet.u1)
+    annotation (Line(points={{-120,-60},{20,-60},{20,-52},{48,-52}},color={0,0,127}));
+  connect(THeaWatSupSet, selTSupSet.u3)
+    annotation (Line(points={{-120,-80},{40,-80},{40,-68},{48,-68}},color={0,0,127}));
+  connect(selTSupSet.y, TSupSet)
+    annotation (Line(points={{72,-60},{120,-60}},color={0,0,127}));
+  connect(u1SetMod, setMod.u2)
+    annotation (Line(points={{-120,40},{-12,40}},color={255,0,255}));
+  connect(setMod.y, y1Coo)
+    annotation (Line(points={{12,40},{40,40},{40,0},{120,0}},color={255,0,255}));
+  connect(les.y, setMod.u1)
+    annotation (Line(points={{-28,0},{-20,0},{-20,32},{-12,32}},color={255,0,255}));
+  connect(y1Coo, preMod.u)
+    annotation (Line(points={{120,0},{80,0},{80,60},{62,60}},color={255,0,255}));
+  connect(preMod.y, setMod.u3)
+    annotation (Line(points={{38,60},{-20,60},{-20,48},{-12,48}},color={255,0,255}));
+  connect(y1Coo, selTSupSet.u2)
+    annotation (Line(points={{120,0},{40,0},{40,-60},{48,-60}},color={255,0,255}));
+  annotation (
+    defaultComponentName="setMod",
+    Documentation(
+      info="<html>
+<h4>Mode control</h4>
+<p>
+If the following equation is true prior to enabling the HRC, set the 
+control mode to heating. Otherwise, set the control mode to cooling.
+</p>
+<p>
+<code>QChiWatReq_flow > QHeaWat_flow * (1 - 1 / COPHea_nominal)</code>
+</p>
+<p>
+Write mode via the chiller’s BACnet interface prior to sending the chiller 
+an enable command.
+</p>
+<h4>Setpoint</h4>
+<p>
+When the control mode is cooling, the active setpoint shall be 
+the CHW supply temperature setpoint.
+When the control mode is heating, the active setpoint shall be 
+the HW supply temperature setpoint.
+</p>
+<h4>Details</h4>
+<p>
+The condition \"prior to enabling the HRC\" is evaluated in the block
+<a href=\"modelica://Buildings.Templates.Plants.Controls.HeatRecoveryChillers.Enable\">
+Buildings.Templates.Plants.Controls.HeatRecoveryChillers.Enable</a>.
+</p>
+</html>",
+      revisions="<html>
+<ul>
+<li>
+May 31, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=true,
+        extent={{-100,-100},{100,100}}),
+      graphics={
+        Rectangle(
+          extent={{-100,100},{100,-100}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Text(
+          extent={{-150,150},{150,110}},
+          textString="%name",
+          textColor={0,0,255})}));
+end ModeControl;
diff --git a/Buildings/Templates/Plants/Controls/HeatRecoveryChillers/Validation/EnableAndModeControl.mo b/Buildings/Templates/Plants/Controls/HeatRecoveryChillers/Validation/EnableAndModeControl.mo
new file mode 100644
index 00000000000..47648ee5e87
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/HeatRecoveryChillers/Validation/EnableAndModeControl.mo
@@ -0,0 +1,352 @@
+within Buildings.Templates.Plants.Controls.HeatRecoveryChillers.Validation;
+model EnableAndModeControl
+  "Validation model for sidestream HRC enable and mode control"
+  parameter Real cp_default(
+    final min=0,
+    final unit="J/(kg.K)")=4184
+    "Default specific heat capacity used to compute required capacity";
+  parameter Real rho_default(
+    final min=0,
+    final unit="kg/m3")=996
+    "Default fluid density used to compute required capacity";
+  parameter Real COPHea_nominal(
+    final min=1.1,
+    final unit="1")=2.8
+    "Heating COP at design heating conditions"
+    annotation (Dialog(group="Information provided by designer"));
+  parameter Real capHea_nominal(
+    final unit="W")=1E6
+    "Installed heating capacity"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Real THeaWatSup_nominal(
+    unit="K",
+    displayUnit="degC")=323.15
+    "Design HW supply temperature"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Real THeaWatRet_nominal(
+    unit="K",
+    displayUnit="degC")=315.15
+    "Design HW return temperature"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Real VHeaWat_flow_nominal(
+    unit="m3/s")=capHea_nominal / abs(THeaWatSup_nominal - THeaWatRet_nominal) /
+    cp_default / rho_default
+    "Design HW volume flow rate"
+    annotation (Dialog(group="Nominal condition"));
+  final parameter Real capCoo_nominal(
+    final unit="W")=capHea_nominal *(1 - 1 / COPHea_nominal)
+    "Installed cooling capacity"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Real TChiWatSup_nominal(
+    unit="K",
+    displayUnit="degC")=280.15
+    "Design CHW supply temperature"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Real TChiWatRet_nominal(
+    unit="K",
+    displayUnit="degC")=285.15
+    "Design CHW return temperature"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Real VChiWat_flow_nominal(
+    unit="m3/s")=capCoo_nominal / abs(TChiWatSup_nominal - TChiWatRet_nominal) /
+    cp_default / rho_default
+    "Design CHW volume flow rate"
+    annotation (Dialog(group="Nominal condition"));
+  Buildings.Controls.OBC.CDL.Reals.Sources.TimeTable ratV_flow(
+    table=[
+      0, 0, 0;
+      5, 0, 0;
+      6, 1, 0;
+      15, 0, 1;
+      22, 0, 0.1;
+      24, 0, 0],
+    timeScale=3600)
+    "Source signal for volume flow rate ratio – Index 1 for HW, 2 for CHW"
+    annotation (Placement(transformation(extent={{-150,-80},{-130,-60}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant THeaWatRet(
+    final k=THeaWatRet_nominal,
+    y(
+      final unit="K",
+      displayUnit="degC"))
+    "HWRT"
+    annotation (Placement(transformation(extent={{-120,50},{-100,70}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant TChiWatRet(
+    final k=TChiWatRet_nominal,
+    y(
+      final unit="K",
+      displayUnit="degC"))
+    "CHWRT"
+    annotation (Placement(transformation(extent={{-120,-10},{-100,10}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter VHeaWat_flow(
+    final k=VHeaWat_flow_nominal)
+    "Scale by design flow"
+    annotation (Placement(transformation(extent={{-110,-50},{-90,-30}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter VChiWat_flow(
+    final k=VChiWat_flow_nominal)
+    "Scale by design flow"
+    annotation (Placement(transformation(extent={{-110,-110},{-90,-90}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant THeaWatSup(
+    final k=THeaWatSup_nominal,
+    y(
+      final unit="K",
+      displayUnit="degC"))
+    "HWST"
+    annotation (Placement(transformation(extent={{-150,70},{-130,90}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant TChiWatSup(
+    final k=TChiWatSup_nominal,
+    y(
+      final unit="K",
+      displayUnit="degC"))
+    "CHWST"
+    annotation (Placement(transformation(extent={{-150,10},{-130,30}})));
+  Buildings.Controls.OBC.CDL.Reals.GreaterThreshold u1Hea
+    "Compute heating plant enable signal"
+    annotation (Placement(transformation(extent={{-30,-70},{-10,-50}})));
+  Buildings.Controls.OBC.CDL.Reals.GreaterThreshold u1Coo
+    "Compute cooling plant enable signal"
+    annotation (Placement(transformation(extent={{-30,-110},{-10,-90}})));
+  StagingRotation.LoadAverage loaChiWat(
+    typ=Buildings.Templates.Plants.Controls.Types.Application.Cooling,
+    final cp_default=cp_default,
+    final rho_default=rho_default)
+    "Available CHW load"
+    annotation (Placement(transformation(extent={{-30,-10},{-10,10}})));
+  Buildings.Templates.Plants.Controls.HeatRecoveryChillers.Enable ena(
+    TChiWatSup_min=277.15,
+    THeaWatSup_max=328.15,
+    capCoo_min=0.3 * capCoo_nominal,
+    capHea_min=0.3 * 0.3 * capHea_nominal)
+    annotation (Placement(transformation(extent={{30,20},{50,40}})));
+  StagingRotation.LoadAverage loaHeaWat(
+    typ=Buildings.Templates.Plants.Controls.Types.Application.Heating,
+    final cp_default=cp_default,
+    final rho_default=rho_default)
+    "Available HW load"
+    annotation (Placement(transformation(extent={{-30,50},{-10,70}})));
+  Components.Controls.StatusEmulator sta
+    "Emulate HRC status"
+    annotation (Placement(transformation(extent={{70,30},{90,50}})));
+  ModeControl setMod(
+    COPHea_nominal=2.8)
+    "Set mode"
+    annotation (Placement(transformation(extent={{70,-30},{90,-10}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Sin dTHeaWat(
+    amplitude=THeaWatSup_nominal - THeaWatRet_nominal,
+    freqHz=3 / 50000,
+    offset=(THeaWatSup_nominal - THeaWatRet_nominal))
+    "HW Delta_T across HRC condenser"
+    annotation (Placement(transformation(extent={{-150,110},{-130,130}})));
+  Buildings.Controls.OBC.CDL.Reals.Add THeaWatHrcLvg
+    "HRC leaving HWT"
+    annotation (Placement(transformation(extent={{-80,90},{-60,110}})));
+  Buildings.Controls.OBC.CDL.Reals.Divide ratFlo
+    "Flow ratio"
+    annotation (Placement(transformation(extent={{-72,-150},{-52,-130}})));
+  Buildings.Controls.OBC.CDL.Reals.Multiply dTRatFlo
+    "HW Delta-T times flow ratio"
+    annotation (Placement(transformation(extent={{-30,110},{-10,130}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter dTChiWat(
+    k=-(1 - 1 / COPHea_nominal))
+    "HRC leaving CHWT"
+    annotation (Placement(transformation(extent={{0,110},{20,130}})));
+  Buildings.Controls.OBC.CDL.Logical.Pre preMod
+    "Previous mode setting"
+    annotation (Placement(transformation(extent={{50,-70},{30,-50}})));
+  Buildings.Controls.OBC.CDL.Reals.Max bou
+    "Bound to avoid division by zero"
+    annotation (Placement(transformation(extent={{-110,-150},{-90,-130}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant cst(
+    k=1E-4)
+    "Constant"
+    annotation (Placement(transformation(extent={{-150,-150},{-130,-130}})));
+  Buildings.Controls.OBC.CDL.Reals.Max bou1
+    "Bound to avoid unrealistic values"
+    annotation (Placement(transformation(extent={{60,110},{80,130}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant cst1(
+    k=3 + 273.15)
+    "Constant"
+    annotation (Placement(transformation(extent={{30,80},{50,100}})));
+  Buildings.Controls.OBC.CDL.Reals.Add TChiWatHrcLvg
+    "HRC leaving CHWT"
+    annotation (Placement(transformation(extent={{30,110},{50,130}})));
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal staToReal
+    "Convert status to real"
+    annotation (Placement(transformation(extent={{-60,130},{-80,150}})));
+  Buildings.Controls.OBC.CDL.Reals.Multiply dTEna
+    "Non-zero HW Delta-T when HRC on"
+    annotation (Placement(transformation(extent={{-110,110},{-90,130}})));
+  Buildings.Controls.OBC.CDL.Logical.MultiAnd mulAnd(
+    nin=3)
+    "Make status come and go at low load"
+    annotation (Placement(transformation(extent={{110,30},{130,50}})));
+  Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greLoaChiWat(
+    final t=ena.capCoo_min)
+    "True if load greater than minimum before cycling"
+    annotation (Placement(transformation(extent={{30,-150},{50,-130}})));
+  Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greLoaHeaWat(
+    final t=ena.capHea_min)
+    "True if load greater than minimum before cycling"
+    annotation (Placement(transformation(extent={{30,-110},{50,-90}})));
+equation
+  connect(ratV_flow.y[1], VHeaWat_flow.u)
+    annotation (Line(points={{-128,-70},{-120,-70},{-120,-40},{-112,-40}},color={0,0,127}));
+  connect(ratV_flow.y[2], VChiWat_flow.u)
+    annotation (Line(points={{-128,-70},{-120,-70},{-120,-100},{-112,-100}},
+      color={0,0,127}));
+  connect(VHeaWat_flow.y, u1Hea.u)
+    annotation (Line(points={{-88,-40},{-80,-40},{-80,-60},{-32,-60}},color={0,0,127}));
+  connect(VChiWat_flow.y, u1Coo.u)
+    annotation (Line(points={{-88,-100},{-32,-100}},color={0,0,127}));
+  connect(TChiWatSup.y, loaChiWat.TSupSet)
+    annotation (Line(points={{-128,20},{-50,20},{-50,6},{-32,6}},color={0,0,127}));
+  connect(TChiWatRet.y, loaChiWat.TRet)
+    annotation (Line(points={{-98,0},{-32,0}},color={0,0,127}));
+  connect(THeaWatSup.y, loaHeaWat.TSupSet)
+    annotation (Line(points={{-128,80},{-42,80},{-42,66},{-32,66}},color={0,0,127}));
+  connect(THeaWatRet.y, loaHeaWat.TRet)
+    annotation (Line(points={{-98,60},{-32,60}},color={0,0,127}));
+  connect(VHeaWat_flow.y, loaHeaWat.V_flow)
+    annotation (Line(points={{-88,-40},{-80,-40},{-80,54},{-32,54}},color={0,0,127}));
+  connect(loaChiWat.QReq_flow, ena.QChiWatReq_flow)
+    annotation (Line(points={{-8,0},{16,0},{16,28},{28,28}},color={0,0,127}));
+  connect(loaHeaWat.QReq_flow, ena.QHeaWatReq_flow)
+    annotation (Line(points={{-8,60},{8,60},{8,26},{28,26}},color={0,0,127}));
+  connect(VChiWat_flow.y, loaChiWat.V_flow)
+    annotation (Line(points={{-88,-100},{-70,-100},{-70,-6},{-32,-6}},color={0,0,127}));
+  connect(u1Hea.y, ena.u1Hea)
+    annotation (Line(points={{-8,-60},{12,-60},{12,36},{28,36}},color={255,0,255}));
+  connect(u1Coo.y, ena.u1Coo)
+    annotation (Line(points={{-8,-100},{10,-100},{10,38},{28,38}},color={255,0,255}));
+  connect(ena.y1, sta.y1)
+    annotation (Line(points={{52,30},{60,30},{60,40},{68,40}},color={255,0,255}));
+  connect(ena.y1SetMod, setMod.u1SetMod)
+    annotation (Line(points={{52,24},{60,24},{60,-12},{68,-12}},color={255,0,255}));
+  connect(loaChiWat.QReq_flow, setMod.QChiWatReq_flow)
+    annotation (Line(points={{-8,0},{16,0},{16,-16},{68,-16}},color={0,0,127}));
+  connect(loaHeaWat.QReq_flow, setMod.QHeaWatReq_flow)
+    annotation (Line(points={{-8,60},{8,60},{8,-20},{68,-20}},color={0,0,127}));
+  connect(TChiWatSup.y, setMod.TChiWatSupSet)
+    annotation (Line(points={{-128,20},{-50,20},{-50,-24},{68,-24}},color={0,0,127}));
+  connect(THeaWatSup.y, setMod.THeaWatSupSet)
+    annotation (Line(points={{-128,80},{-42,80},{-42,-28},{68,-28}},color={0,0,127}));
+  connect(THeaWatRet.y, THeaWatHrcLvg.u2)
+    annotation (Line(points={{-98,60},{-86,60},{-86,94},{-82,94}},color={0,0,127}));
+  connect(THeaWatHrcLvg.y, ena.THeaWatHrcLvg)
+    annotation (Line(points={{-58,100},{-40,100},{-40,22},{28,22}},color={0,0,127}));
+  connect(VHeaWat_flow.y, ratFlo.u1)
+    annotation (Line(points={{-88,-40},{-80,-40},{-80,-134},{-74,-134}},color={0,0,127}));
+  connect(dTRatFlo.y, dTChiWat.u)
+    annotation (Line(points={{-8,120},{-2,120}},color={0,0,127}));
+  connect(setMod.y1Coo, preMod.u)
+    annotation (Line(points={{92,-20},{96,-20},{96,-60},{52,-60}},color={255,0,255}));
+  connect(preMod.y, ena.u1CooHrc)
+    annotation (Line(points={{28,-60},{20,-60},{20,32},{28,32}},color={255,0,255}));
+  connect(VChiWat_flow.y, bou.u1)
+    annotation (Line(points={{-88,-100},{-70,-100},{-70,-120},{-120,-120},{-120,-134},{-112,-134}},
+      color={0,0,127}));
+  connect(cst.y, bou.u2)
+    annotation (Line(points={{-128,-140},{-122,-140},{-122,-146},{-112,-146}},
+      color={0,0,127}));
+  connect(bou.y, ratFlo.u2)
+    annotation (Line(points={{-88,-140},{-82,-140},{-82,-146},{-74,-146}},color={0,0,127}));
+  connect(ratFlo.y, dTRatFlo.u2)
+    annotation (Line(points={{-50,-140},{-40,-140},{-40,114},{-32,114}},color={0,0,127}));
+  connect(TChiWatRet.y, TChiWatHrcLvg.u2)
+    annotation (Line(points={{-98,0},{-66,0},{-66,86},{20,86},{20,114},{28,114}},
+      color={0,0,127}));
+  connect(bou1.y, ena.TChiWatHrcLvg)
+    annotation (Line(points={{82,120},{90,120},{90,62},{18,62},{18,24},{28,24}},
+      color={0,0,127}));
+  connect(dTChiWat.y, TChiWatHrcLvg.u1)
+    annotation (Line(points={{22,120},{26,120},{26,126},{28,126}},color={0,0,127}));
+  connect(dTHeaWat.y, dTEna.u2)
+    annotation (Line(points={{-128,120},{-120,120},{-120,114},{-112,114}},color={0,0,127}));
+  connect(staToReal.y, dTEna.u1)
+    annotation (Line(points={{-82,140},{-120,140},{-120,126},{-112,126}},color={0,0,127}));
+  connect(dTEna.y, THeaWatHrcLvg.u1)
+    annotation (Line(points={{-88,120},{-86,120},{-86,106},{-82,106}},color={0,0,127}));
+  connect(dTEna.y, dTRatFlo.u1)
+    annotation (Line(points={{-88,120},{-40,120},{-40,126},{-32,126}},color={0,0,127}));
+  connect(TChiWatHrcLvg.y, bou1.u1)
+    annotation (Line(points={{52,120},{56,120},{56,126},{58,126}},color={0,0,127}));
+  connect(cst1.y, bou1.u2)
+    annotation (Line(points={{52,90},{56,90},{56,114},{58,114}},color={0,0,127}));
+  connect(sta.y1_actual, mulAnd.u[1])
+    annotation (Line(points={{92,40},{96,40},{96,37.6667},{108,37.6667}},color={255,0,255}));
+  connect(loaChiWat.QReq_flow, greLoaChiWat.u)
+    annotation (Line(points={{-8,0},{0,0},{0,-140},{28,-140}},color={0,0,127}));
+  connect(loaHeaWat.QReq_flow, greLoaHeaWat.u)
+    annotation (Line(points={{-8,60},{8,60},{8,-100},{28,-100}},color={0,0,127}));
+  connect(greLoaHeaWat.y, mulAnd.u[2])
+    annotation (Line(points={{52,-100},{98,-100},{98,40},{108,40}},color={255,0,255}));
+  connect(greLoaChiWat.y, mulAnd.u[3])
+    annotation (Line(points={{52,-140},{100,-140},{100,42.3333},{108,42.3333}},
+      color={255,0,255}));
+  connect(mulAnd.y, ena.u1Hrc_actual)
+    annotation (Line(points={{132,40},{140,40},{140,60},{20,60},{20,34},{28,34}},
+      color={255,0,255}));
+  connect(mulAnd.y, staToReal.u)
+    annotation (Line(points={{132,40},{140,40},{140,140},{-58,140}},color={255,0,255}));
+  annotation (
+    __Dymola_Commands(
+      file=
+        "modelica://Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/HeatRecoveryChillers/Validation/EnableAndModeControl.mos"
+        "Simulate and plot"),
+    experiment(
+      StopTime=86400.0,
+      Tolerance=1e-06),
+    Icon(
+      graphics={
+        Ellipse(
+          lineColor={75,138,73},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          extent={{-100,-100},{100,100}}),
+        Polygon(
+          lineColor={0,0,255},
+          fillColor={75,138,73},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          points={{-36,60},{64,0},{-36,-60},{-36,60}})}),
+    Diagram(
+      coordinateSystem(
+        extent={{-180,-180},{180,180}})),
+    Documentation(
+      info="<html>
+<p>
+This model validates
+<a href=\"modelica://Buildings.Templates.Plants.Controls.HeatRecoveryChillers.Enable\">
+Buildings.Templates.Plants.Controls.HeatRecoveryChillers.Enable</a>
+and 
+<a href=\"modelica://Buildings.Templates.Plants.Controls.HeatRecoveryChillers.ModeControl\">
+Buildings.Templates.Plants.Controls.HeatRecoveryChillers.ModeControl</a>.
+Consequently, it also validates
+<a href=\"modelica://Buildings.Templates.Plants.Controls.HeatRecoveryChillers.Controller\">
+Buildings.Templates.Plants.Controls.HeatRecoveryChillers.Controller</a>,
+which is composed of the two former blocks.
+</p>
+<p>
+The validation uses varying ∆T for HW across the HRC condenser 
+and CHW across the HRC evaporator.
+The model verifies that:
+</p>
+<ul>
+<li>
+The HRC is effectively disabled when it is controlled in cooling mode 
+and the leaving HW temperature is high.
+</li>
+<li>
+The HRC control mode switches from cooling to heating when the 
+cooling load exceeds the calculated evaporator heat flow rate in heating mode.
+</li>
+</ul>
+</html>",
+      revisions="<html>
+<ul>
+<li>
+May 31, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end EnableAndModeControl;
diff --git a/Buildings/Templates/Plants/Controls/HeatRecoveryChillers/Validation/package.mo b/Buildings/Templates/Plants/Controls/HeatRecoveryChillers/Validation/package.mo
new file mode 100644
index 00000000000..985054fb5e9
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/HeatRecoveryChillers/Validation/package.mo
@@ -0,0 +1,30 @@
+within Buildings.Templates.Plants.Controls.HeatRecoveryChillers;
+package Validation
+  "Collection of validation models"
+  annotation (
+    Icon(
+      graphics={
+        Rectangle(
+          lineColor={200,200,200},
+          fillColor={248,248,248},
+          fillPattern=FillPattern.HorizontalCylinder,
+          extent={{-100.0,-100.0},{100.0,100.0}},
+          radius=25.0),
+        Polygon(
+          origin={8.0,14.0},
+          lineColor={78,138,73},
+          fillColor={78,138,73},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          points={{-58.0,46.0},{42.0,-14.0},{-58.0,-74.0},{-58.0,46.0}}),
+        Rectangle(
+          lineColor={128,128,128},
+          extent={{-100.0,-100.0},{100.0,100.0}},
+          radius=25.0)}),
+    Documentation(
+      info="<html>
+<p>
+This package contains validation models.
+</p>
+</html>"));
+end Validation;
diff --git a/Buildings/Templates/Plants/Controls/HeatRecoveryChillers/Validation/package.order b/Buildings/Templates/Plants/Controls/HeatRecoveryChillers/Validation/package.order
new file mode 100644
index 00000000000..2a638dad074
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/HeatRecoveryChillers/Validation/package.order
@@ -0,0 +1 @@
+EnableAndModeControl
diff --git a/Buildings/Templates/Plants/Controls/HeatRecoveryChillers/package.mo b/Buildings/Templates/Plants/Controls/HeatRecoveryChillers/package.mo
new file mode 100644
index 00000000000..f28e70a1834
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/HeatRecoveryChillers/package.mo
@@ -0,0 +1,46 @@
+within Buildings.Templates.Plants.Controls;
+package HeatRecoveryChillers
+  "Package of sequences for heat recovery chillers"
+  annotation (
+    Icon(
+      graphics={
+        Rectangle(
+          lineColor={200,200,200},
+          fillColor={248,248,248},
+          fillPattern=FillPattern.HorizontalCylinder,
+          extent={{-100.0,-100.0},{100.0,100.0}},
+          radius=25.0),
+        Ellipse(
+          origin={10.0,10.0},
+          lineColor={128,128,128},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          extent={{-80.0,0.0},{-20.0,60.0}}),
+        Ellipse(
+          origin={10.0,10.0},
+          fillColor={128,128,128},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          extent={{0.0,0.0},{60.0,60.0}}),
+        Ellipse(
+          origin={10.0,10.0},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          extent={{0.0,-80.0},{60.0,-20.0}}),
+        Ellipse(
+          origin={10.0,10.0},
+          fillColor={76,76,76},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          extent={{-80.0,-80.0},{-20.0,-20.0}}),
+        Rectangle(
+          lineColor={128,128,128},
+          extent={{-100.0,-100.0},{100.0,100.0}},
+          radius=25.0)}),
+    Documentation(
+      info="<html>
+<p>
+This package contains control sequences for heat recovery chillers.
+</p>
+</html>"));
+end HeatRecoveryChillers;
diff --git a/Buildings/Templates/Plants/Controls/HeatRecoveryChillers/package.order b/Buildings/Templates/Plants/Controls/HeatRecoveryChillers/package.order
new file mode 100644
index 00000000000..923d68695ec
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/HeatRecoveryChillers/package.order
@@ -0,0 +1,4 @@
+Controller
+Enable
+ModeControl
+Validation
diff --git a/Buildings/Templates/Plants/Controls/MinimumFlow/Controller.mo b/Buildings/Templates/Plants/Controls/MinimumFlow/Controller.mo
new file mode 100644
index 00000000000..2acb6ce2776
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/MinimumFlow/Controller.mo
@@ -0,0 +1,195 @@
+within Buildings.Templates.Plants.Controls.MinimumFlow;
+block Controller
+  "Minimum flow bypass valve controller"
+  parameter Boolean have_valInlIso
+    "Set to true to enable control loop based on inlet isolation valve command"
+    annotation (Evaluate=true);
+  parameter Boolean have_valOutIso
+    "Set to true to enable control loop based on outlet isolation valve command"
+    annotation (Evaluate=true);
+  parameter Integer nEqu(
+    final min=1)=0
+    "Number of plant equipment"
+    annotation (Evaluate=true,
+    Dialog(connectorSizing=true),HideResult=true);
+  parameter Integer nEna(
+    final min=1)=0
+    "Number of enable signals – Valve command or pump status"
+    annotation (Evaluate=true,
+    Dialog(connectorSizing=true),HideResult=true);
+  parameter Real V_flow_nominal[:](
+    each final unit="m3/s")
+    "Design flow rate – Each unit";
+  parameter Real V_flow_min[:](
+    each final unit="m3/s")
+    "Minimum flow rate – Each unit";
+  parameter Real k(
+    min=0)=1
+    "Gain of controller";
+  parameter Modelica.Units.SI.Time Ti(
+    min=Buildings.Controls.OBC.CDL.Constants.small)=0.5
+    "Time constant of integrator block";
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput VPri_flow(
+    final unit="m3/s")
+    "Primary volume flow rate"
+    annotation (Placement(transformation(extent={{-140,-100},{-100,-60}}),
+      iconTransformation(extent={{-140,-100},{-100,-60}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1PumPri_actual[nEna]
+    if not have_valInlIso and not have_valOutIso
+    "Primary pump status"
+    annotation (Placement(transformation(extent={{-140,-60},{-100,-20}}),
+      iconTransformation(extent={{-140,-60},{-100,-20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1ValInlIso[nEna]
+    if have_valInlIso
+    "Inlet isolation valve command"
+    annotation (Placement(transformation(extent={{-140,20},{-100,60}}),
+      iconTransformation(extent={{-140,20},{-100,60}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1ValOutIso[nEna]
+    if have_valOutIso
+    "Outlet isolation valve command"
+    annotation (Placement(transformation(extent={{-140,-20},{-100,20}}),
+      iconTransformation(extent={{-140,-20},{-100,20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y(
+    final unit="1")
+    "Valve command"
+    annotation (Placement(transformation(extent={{100,-20},{140,20}}),
+      iconTransformation(extent={{100,-20},{140,20}})));
+  Utilities.PIDWithEnable ctl(
+    final k=k,
+    final Ti=Ti,
+    final reverseActing=true,
+    y_reset=1,
+    y_neutral=1)
+    "PI controller"
+    annotation (Placement(transformation(extent={{30,-10},{50,10}})));
+  Buildings.Controls.OBC.CDL.Logical.MultiOr anyValInlIso(
+    final nin=nEna)
+    if have_valInlIso
+    "True if any valve commanded open"
+    annotation (Placement(transformation(extent={{-90,30},{-70,50}})));
+  Buildings.Controls.OBC.CDL.Logical.MultiOr anyValOutIso(
+    final nin=nEna)
+    if have_valOutIso
+    "True if any valve commanded open"
+    annotation (Placement(transformation(extent={{-90,-10},{-70,10}})));
+  Buildings.Controls.OBC.CDL.Logical.MultiOr anyPumPri(
+    final nin=nEna)
+    if not have_valInlIso and not have_valOutIso
+    "True if any pump proven on"
+    annotation (Placement(transformation(extent={{-90,-50},{-70,-30}})));
+  Utilities.PlaceholderLogical phValInlIso(
+    final have_inp=have_valInlIso,
+    u_internal=false)
+    "Placeholder signal"
+    annotation (Placement(transformation(extent={{-50,30},{-30,50}})));
+  Utilities.PlaceholderLogical phValOutIso(
+    final have_inp=have_valOutIso,
+    u_internal=false)
+    "Placeholder signal"
+    annotation (Placement(transformation(extent={{-50,-10},{-30,10}})));
+  Utilities.PlaceholderLogical phPrumPri(
+    final have_inp=not have_valInlIso and not have_valOutIso,
+    u_internal=false)
+    "Placeholder signal"
+    annotation (Placement(transformation(extent={{-50,-50},{-30,-30}})));
+  Buildings.Controls.OBC.CDL.Logical.MultiOr any(
+    nin=3)
+    "True if any enable condition met"
+    annotation (Placement(transformation(extent={{-10,-30},{10,-10}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1Equ[nEqu]
+    "Equipment enable command"
+    annotation (Placement(transformation(extent={{-140,60},{-100,100}}),
+      iconTransformation(extent={{-140,60},{-100,100}})));
+  Setpoint setFloMin(
+    final V_flow_nominal=V_flow_nominal,
+    final V_flow_min=V_flow_min,
+    nEqu=nEqu)
+    "Calculate minimum flow setpoint"
+    annotation (Placement(transformation(extent={{-10,70},{10,90}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput VPriSet_flow(
+    final unit="m3/s")
+    "Primary flow setpoint"
+    annotation (Placement(transformation(extent={{100,60},{140,100}}),
+      iconTransformation(extent={{100,40},{140,80}})));
+equation
+  connect(anyValInlIso.u, u1ValInlIso)
+    annotation (Line(points={{-92,40},{-120,40}},color={255,0,255}));
+  connect(anyValOutIso.u, u1ValOutIso)
+    annotation (Line(points={{-92,0},{-120,0}},color={255,0,255}));
+  connect(anyPumPri.u, u1PumPri_actual)
+    annotation (Line(points={{-92,-40},{-120,-40}},color={255,0,255}));
+  connect(VPri_flow, ctl.u_m)
+    annotation (Line(points={{-120,-80},{40,-80},{40,-12}},color={0,0,127}));
+  connect(anyValInlIso.y, phValInlIso.u)
+    annotation (Line(points={{-68,40},{-52,40}},color={255,0,255}));
+  connect(anyValOutIso.y, phValOutIso.u)
+    annotation (Line(points={{-68,0},{-52,0}},color={255,0,255}));
+  connect(anyPumPri.y, phPrumPri.u)
+    annotation (Line(points={{-68,-40},{-52,-40}},color={255,0,255}));
+  connect(phValInlIso.y, any.u[1])
+    annotation (Line(points={{-28,40},{-18,40},{-18,-22.3333},{-12,-22.3333}},
+      color={255,0,255}));
+  connect(phValOutIso.y, any.u[2])
+    annotation (Line(points={{-28,0},{-20,0},{-20,-20},{-12,-20}},color={255,0,255}));
+  connect(phPrumPri.y, any.u[3])
+    annotation (Line(points={{-28,-40},{-16,-40},{-16,-17.6667},{-12,-17.6667}},
+      color={255,0,255}));
+  connect(any.y, ctl.uEna)
+    annotation (Line(points={{12,-20},{36,-20},{36,-12}},color={255,0,255}));
+  connect(ctl.y, y)
+    annotation (Line(points={{52,0},{120,0}},color={0,0,127}));
+  connect(u1Equ, setFloMin.u1)
+    annotation (Line(points={{-120,80},{-12,80}},color={255,0,255}));
+  connect(setFloMin.VPriSet_flow, ctl.u_s)
+    annotation (Line(points={{12,80},{20,80},{20,0},{28,0}},color={0,0,127}));
+  connect(setFloMin.VPriSet_flow, VPriSet_flow)
+    annotation (Line(points={{12,80},{120,80}},color={0,0,127}));
+  annotation (
+    defaultComponentName="ctlFloMin",
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=true,
+        extent={{-100,-100},{100,100}}),
+      graphics={
+        Rectangle(
+          extent={{-100,100},{100,-100}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Text(
+          extent={{-150,150},{150,110}},
+          textString="%name",
+          textColor={0,0,255})}),
+    Documentation(
+      revisions="<html>
+<ul>
+<li>
+May 31, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>",
+      info="<html>
+<p>
+The minimum flow bypass valve is modulated based on a reverse acting control loop 
+to maintain the primary flow rate at setpoint.
+The setpoint is calculated as described in 
+<a href=\"modelica://Buildings.Templates.Plants.Controls.MinimumFlow.Setpoint\">
+Buildings.Templates.Plants.Controls.MinimumFlow.Setpoint</a>.
+</p>
+<p>
+<b>When using isolation valve command signals</b>
+(<code>have_valInlIso=true</code> or <code>have_valOutIso=true</code>):
+When any valve is commanded open, the bypass valve control loop is enabled. 
+The valve is opened <i>100&nbsp;%</i> otherwise. 
+When enabled, the bypass valve loop shall be biased to start with the valve <i>100&nbsp;%</i> open.
+</p>
+<p>
+<b>Otherwise</b>
+(<code>have_valInlIso=false</code> and <code>have_valOutIso=false</code>):
+When any primary pump is proven on, the bypass valve control loop is enabled. 
+The valve is opened <i>100&nbsp;%</i> otherwise. 
+When enabled, the bypass valve loop shall be biased to start with the valve <i>100&nbsp;%</i> open.
+</p>
+</html>"));
+end Controller;
diff --git a/Buildings/Templates/Plants/Controls/MinimumFlow/ControllerDualMode.mo b/Buildings/Templates/Plants/Controls/MinimumFlow/ControllerDualMode.mo
new file mode 100644
index 00000000000..03c21495e36
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/MinimumFlow/ControllerDualMode.mo
@@ -0,0 +1,359 @@
+within Buildings.Templates.Plants.Controls.MinimumFlow;
+block ControllerDualMode
+  "CHW and/or HW minimum flow bypass valve controller"
+  parameter Boolean have_heaWat
+    "Set to true for plants that provide HW"
+    annotation (Evaluate=true);
+  parameter Boolean have_chiWat
+    "Set to true for plants that provide CHW"
+    annotation (Evaluate=true);
+  parameter Boolean have_pumChiWatPri(
+    start=not have_heaWat)
+    "Set to true for plants with separate primary CHW pumps"
+    annotation (Evaluate=true,
+    Dialog(enable=have_heaWat and have_chiWat));
+  parameter Boolean have_valInlIso
+    "Set to true to enable control loop based on inlet isolation valve command"
+    annotation (Evaluate=true);
+  parameter Boolean have_valOutIso
+    "Set to true to enable control loop based on outlet isolation valve command"
+    annotation (Evaluate=true);
+  parameter Integer nEqu=0
+    "Number of plant equipment"
+    annotation (Evaluate=true,
+    Dialog(connectorSizing=true),HideResult=true);
+  parameter Integer nEnaHeaWat=0
+    "Number of enable signals for HW loop – Valve command or pump status"
+    annotation (Evaluate=true,
+    Dialog(connectorSizing=true),HideResult=true);
+  parameter Integer nEnaChiWat=nEnaChiWat
+    "Number of enable signals for CHW loop – Valve command or pump status"
+    annotation (Evaluate=true,
+    Dialog(connectorSizing=true),HideResult=true);
+  parameter Real VHeaWat_flow_nominal[nEqu](
+    start=fill(0, nEqu),
+    unit=fill("m3/s", nEqu))
+    "Design HW flow rate – Each unit"
+    annotation (Dialog(enable=have_heaWat));
+  parameter Real VHeaWat_flow_min[nEqu](
+    start=fill(0, nEqu),
+    unit=fill("m3/s", nEqu))
+    "Minimum HW flow rate – Each unit"
+    annotation (Dialog(enable=have_heaWat));
+  parameter Real VChiWat_flow_nominal[nEqu](
+    start=fill(0, nEqu),
+    unit=fill("m3/s", nEqu))
+    "Design CHW flow rate – Each unit"
+    annotation (Dialog(enable=have_chiWat));
+  parameter Real VChiWat_flow_min[nEqu](
+    start=fill(0, nEqu),
+    unit=fill("m3/s", nEqu))
+    "Minimum CHW flow rate – Each unit"
+    annotation (Dialog(enable=have_chiWat));
+  parameter Real k(
+    min=0)=1
+    "Gain of controller";
+  parameter Modelica.Units.SI.Time Ti(
+    min=Buildings.Controls.OBC.CDL.Constants.small)=0.5
+    "Time constant of integrator block";
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput VChiWatPri_flow(
+    final unit="m3/s")
+    if have_chiWat
+    "Primary CHW volume flow rate"
+    annotation (Placement(transformation(extent={{-140,-140},{-100,-100}}),
+      iconTransformation(extent={{-140,-100},{-100,-60}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput VHeaWatPri_flow(
+    final unit="m3/s")
+    if have_heaWat
+    "Primary HW volume flow rate"
+    annotation (Placement(transformation(extent={{-140,-120},{-100,-80}}),
+      iconTransformation(extent={{-140,-80},{-100,-40}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1PumHeaWatPri_actual[nEnaHeaWat]
+    if have_heaWat and not
+                          (have_valInlIso or have_valOutIso)
+    "Primary HW pump status"
+    annotation (Placement(transformation(extent={{-140,-60},{-100,-20}}),
+      iconTransformation(extent={{-140,-40},{-100,0}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1ValHeaWatInlIso[nEnaHeaWat]
+    if have_heaWat and have_valInlIso
+    "Equipment inlet HW isolation valve command"
+    annotation (Placement(transformation(extent={{-140,60},{-100,100}}),
+      iconTransformation(extent={{-140,40},{-100,80}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1ValHeaWatOutIso[nEnaHeaWat]
+    if have_heaWat and have_valOutIso
+    "Equipment outlet HW isolation valve command"
+    annotation (Placement(transformation(extent={{-140,40},{-100,80}}),
+      iconTransformation(extent={{-140,20},{-100,60}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yValHeaWatMinByp(
+    final unit="1")
+    if have_heaWat
+    "HW minimum flow bypass valve command"
+    annotation (Placement(transformation(extent={{100,40},{140,80}}),
+      iconTransformation(extent={{100,-20},{140,20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1Equ[nEqu]
+    "Equipment enable command"
+    annotation (Placement(transformation(extent={{-140,100},{-100,140}}),
+      iconTransformation(extent={{-140,80},{-100,120}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput VHeaWatPriSet_flow(
+    final unit="m3/s")
+    if have_heaWat
+    "Primary HW flow setpoint"
+    annotation (Placement(transformation(extent={{100,80},{140,120}}),
+      iconTransformation(extent={{100,80},{140,120}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1HeaEqu[nEqu]
+    if have_heaWat and have_chiWat
+    "Equipment heating/cooling mode command"
+    annotation (Placement(transformation(extent={{-140,80},{-100,120}}),
+      iconTransformation(extent={{-140,60},{-100,100}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1PumChiWatPri_actual[nEnaChiWat]
+    if have_chiWat and have_pumChiWatPri and not have_valInlIso and not have_valOutIso
+    "Primary CHW pump status"
+    annotation (Placement(transformation(extent={{-140,-80},{-100,-40}}),
+      iconTransformation(extent={{-140,-60},{-100,-20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1ValChiWatInlIso[nEnaChiWat]
+    if have_chiWat and have_valInlIso
+    "Equipment inlet CHW isolation valve command"
+    annotation (Placement(transformation(extent={{-140,0},{-100,40}}),
+      iconTransformation(extent={{-140,0},{-100,40}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1ValChiWatOutIso[nEnaChiWat]
+    if have_chiWat and have_valOutIso
+    "Equipment uutlet CHW isolation valve command"
+    annotation (Placement(transformation(extent={{-140,-20},{-100,20}}),
+      iconTransformation(extent={{-140,-20},{-100,20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yValChiWatMinByp(
+    final unit="1")
+    if have_chiWat
+    "CHW minimum flow bypass valve command"
+    annotation (Placement(transformation(extent={{100,-80},{140,-40}}),
+      iconTransformation(extent={{100,-60},{140,-20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput VChiWatPriSet_flow(
+    final unit="m3/s")
+    if have_chiWat
+    "Primary CHW flow setpoint"
+    annotation (Placement(transformation(extent={{100,-40},{140,0}}),
+      iconTransformation(extent={{100,40},{140,80}})));
+  Controller ctlFloMinHeaWat(
+    final have_valInlIso=have_valInlIso,
+    final have_valOutIso=have_valOutIso,
+    final V_flow_nominal=VHeaWat_flow_nominal,
+    final V_flow_min=VHeaWat_flow_min,
+    final k=k,
+    final Ti=Ti,
+    final nEqu=nEqu,
+    final nEna=nEnaHeaWat)
+    if have_heaWat
+    "HW minimum flow control"
+    annotation (Placement(transformation(extent={{50,70},{70,90}})));
+  Controller ctlFloMinChiWat(
+    final have_valInlIso=have_valInlIso,
+    final have_valOutIso=have_valOutIso,
+    final V_flow_nominal=VChiWat_flow_nominal,
+    final V_flow_min=VChiWat_flow_min,
+    final k=k,
+    final Ti=Ti,
+    final nEqu=nEqu,
+    final nEna=nEnaChiWat)
+    if have_chiWat
+    "CHW minimum flow control"
+    annotation (Placement(transformation(extent={{50,-50},{70,-30}})));
+  Utilities.PlaceholderLogical phHeaCoo[nEqu](
+    each final have_inp=have_heaWat and have_chiWat,
+    each final have_inpPh=false,
+    each final u_internal=have_heaWat)
+    "Placeholder signal for single mode applications"
+    annotation (Placement(transformation(extent={{-90,90},{-70,110}})));
+  Buildings.Controls.OBC.CDL.Logical.Not u1Coo[nEqu]
+    "True if cooling mode"
+    annotation (Placement(transformation(extent={{-50,90},{-30,110}})));
+  Buildings.Controls.OBC.CDL.Logical.And onAndHea[nEqu]
+    if have_heaWat
+    "True if commanded on in heating mode"
+    annotation (Placement(transformation(extent={{10,90},{30,110}})));
+  Buildings.Controls.OBC.CDL.Logical.And onAndCoo[nEqu]
+    if have_chiWat
+    "True if commanded on in cooling mode"
+    annotation (Placement(transformation(extent={{10,-30},{30,-10}})));
+  Utilities.PlaceholderLogical phPumChiWatPri[nEnaChiWat](
+    each final have_inp=have_heaWat and have_chiWat and not have_pumChiWatPri,
+    each final have_inpPh=true)
+    if have_chiWat and not
+                          (have_valInlIso or have_valOutIso)
+    "Use CHW pump signal in case the plant does not have common CHW and HW dedicated pumps"
+    annotation (Placement(transformation(extent={{10,-70},{30,-50}})));
+  Buildings.Controls.OBC.CDL.Logical.And pumOnAndCoo[nEqu]
+    if have_heaWat and have_chiWat and not have_pumChiWatPri and not
+                                                                    (have_valInlIso
+      or have_valOutIso)
+    "True if pump proven on and equipment in cooling mode – Case with common CHW and HW dedicated pumps"
+    annotation (Placement(transformation(extent={{-50,-70},{-30,-50}})));
+  Buildings.Controls.OBC.CDL.Logical.And pumOnAndHea[nEqu]
+    if have_heaWat and have_chiWat and not have_pumChiWatPri and not
+                                                                    (have_valInlIso
+      or have_valOutIso)
+    "True if pump proven on and equipment in heating mode – Case with common CHW and HW dedicated pumps"
+    annotation (Placement(transformation(extent={{-50,30},{-30,50}})));
+  Utilities.PlaceholderLogical phPumHeaWatPri[nEnaHeaWat](
+    each final have_inp=have_heaWat and have_chiWat and not have_pumChiWatPri,
+    each final have_inpPh=true)
+    if have_heaWat and not
+                          (have_valInlIso or have_valOutIso)
+    "Use HW pump signal in case the plant does not have common CHW and HW dedicated pumps"
+    annotation (Placement(transformation(extent={{10,30},{30,50}})));
+equation
+  connect(ctlFloMinHeaWat.y, yValHeaWatMinByp)
+    annotation (Line(points={{72,80},{80,80},{80,60},{120,60}},color={0,0,127}));
+  connect(ctlFloMinHeaWat.VPriSet_flow, VHeaWatPriSet_flow)
+    annotation (Line(points={{72,86},{80,86},{80,100},{120,100}},color={0,0,127}));
+  connect(ctlFloMinChiWat.y, yValChiWatMinByp)
+    annotation (Line(points={{72,-40},{80,-40},{80,-60},{120,-60}},color={0,0,127}));
+  connect(ctlFloMinChiWat.VPriSet_flow, VChiWatPriSet_flow)
+    annotation (Line(points={{72,-34},{80,-34},{80,-20},{120,-20}},color={0,0,127}));
+  connect(u1HeaEqu, phHeaCoo.u)
+    annotation (Line(points={{-120,100},{-92,100}},color={255,0,255}));
+  connect(phHeaCoo.y, u1Coo.u)
+    annotation (Line(points={{-68,100},{-52,100}},color={255,0,255}));
+  connect(u1Equ, onAndHea.u1)
+    annotation (Line(points={{-120,120},{0,120},{0,100},{8,100}},color={255,0,255}));
+  connect(onAndHea.y, ctlFloMinHeaWat.u1Equ)
+    annotation (Line(points={{32,100},{40,100},{40,88},{48,88}},color={255,0,255}));
+  connect(onAndCoo.y, ctlFloMinChiWat.u1Equ)
+    annotation (Line(points={{32,-20},{40,-20},{40,-32},{48,-32}},color={255,0,255}));
+  connect(u1ValHeaWatInlIso, ctlFloMinHeaWat.u1ValInlIso)
+    annotation (Line(points={{-120,80},{40,80},{40,84},{48,84}},color={255,0,255}));
+  connect(u1ValHeaWatOutIso, ctlFloMinHeaWat.u1ValOutIso)
+    annotation (Line(points={{-120,60},{42,60},{42,80},{48,80}},color={255,0,255}));
+  connect(VChiWatPri_flow, ctlFloMinChiWat.VPri_flow)
+    annotation (Line(points={{-120,-120},{40,-120},{40,-48},{48,-48}},color={0,0,127}));
+  connect(u1ValChiWatInlIso, ctlFloMinChiWat.u1ValInlIso)
+    annotation (Line(points={{-120,20},{-84,20},{-84,-36},{48,-36}},color={255,0,255}));
+  connect(u1ValChiWatOutIso, ctlFloMinChiWat.u1ValOutIso)
+    annotation (Line(points={{-120,0},{-72,0},{-72,-40},{48,-40}},color={255,0,255}));
+  connect(VHeaWatPri_flow, ctlFloMinHeaWat.VPri_flow)
+    annotation (Line(points={{-120,-100},{-76,-100},{-76,72},{48,72}},color={0,0,127}));
+  connect(u1Equ, onAndCoo.u1)
+    annotation (Line(points={{-120,120},{0,120},{0,-20},{8,-20}},color={255,0,255}));
+  connect(u1Coo.y, onAndCoo.u2)
+    annotation (Line(points={{-28,100},{-20,100},{-20,-28},{8,-28}},color={255,0,255}));
+  connect(phPumChiWatPri.y, ctlFloMinChiWat.u1PumPri_actual)
+    annotation (Line(points={{32,-60},{36,-60},{36,-44},{48,-44}},color={255,0,255}));
+  connect(u1Coo.y, pumOnAndCoo.u1)
+    annotation (Line(points={{-28,100},{-20,100},{-20,-28},{-60,-28},{-60,-60},{-52,-60}},
+      color={255,0,255}));
+  connect(u1PumHeaWatPri_actual, pumOnAndCoo.u2)
+    annotation (Line(points={{-120,-40},{-80,-40},{-80,-68},{-52,-68}},color={255,0,255}));
+  connect(phHeaCoo.y, onAndHea.u2)
+    annotation (Line(points={{-68,100},{-60,100},{-60,86},{4,86},{4,92},{8,92}},
+      color={255,0,255}));
+  connect(u1PumHeaWatPri_actual, pumOnAndHea.u2)
+    annotation (Line(points={{-120,-40},{-80,-40},{-80,32},{-52,32}},color={255,0,255}));
+  connect(phHeaCoo.y, pumOnAndHea.u1)
+    annotation (Line(points={{-68,100},{-60,100},{-60,40},{-52,40}},color={255,0,255}));
+  connect(phPumHeaWatPri.y, ctlFloMinHeaWat.u1PumPri_actual)
+    annotation (Line(points={{32,40},{44,40},{44,76},{48,76}},color={255,0,255}));
+  connect(pumOnAndHea.y, phPumHeaWatPri.u)
+    annotation (Line(points={{-28,40},{8,40}},color={255,0,255}));
+  connect(u1PumHeaWatPri_actual, phPumHeaWatPri.uPh)
+    annotation (Line(points={{-120,-40},{-80,-40},{-80,20},{4,20},{4,34},{8,34}},
+      color={255,0,255}));
+  connect(pumOnAndCoo.y, phPumChiWatPri.u)
+    annotation (Line(points={{-28,-60},{8,-60}},color={255,0,255}));
+  connect(u1PumChiWatPri_actual, phPumChiWatPri.uPh)
+    annotation (Line(points={{-120,-60},{-90,-60},{-90,-80},{0,-80},{0,-66},{8,-66}},
+      color={255,0,255}));
+  annotation (
+    defaultComponentName="ctlFloMin",
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=true,
+        extent={{-100,-120},{100,120}}),
+      graphics={
+        Rectangle(
+          extent={{-100,120},{100,-120}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Text(
+          extent={{-150,170},{150,130}},
+          textString="%name",
+          textColor={0,0,255})}),
+    Documentation(
+      revisions="<html>
+<ul>
+<li>
+May 31, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>",
+      info="<html>
+<h4>HW minimum flow</h4>
+<p>
+The HW minimum flow bypass valve is modulated based on a reverse acting control loop 
+to maintain the primary HW flow rate at setpoint.
+The setpoint is calculated as described in 
+<a href=\"modelica://Buildings.Templates.Plants.Controls.MinimumFlow.Setpoint\">
+Buildings.Templates.Plants.Controls.MinimumFlow.Setpoint</a>
+using the number of units commanded on <i>in heating mode</i> at each stage.
+</p>
+<p>
+<b>When using isolation valve command signals</b>
+(<code>have_valInlIso=true</code> or <code>have_valOutIso=true</code>):
+When any HW isolation valve is commanded open, the HW bypass valve control loop is enabled. 
+The valve is opened <i>100&nbsp;%</i> otherwise. 
+When enabled, the HW bypass valve loop shall be biased to start with the valve <i>100&nbsp;%</i> open.
+</p>
+<p>
+<b>Otherwise</b>
+(<code>have_valInlIso=false</code> and <code>have_valOutIso=false</code>):
+</p>
+<ul>
+<li><b>For heating and cooling plants with common dedicated CHW and HW pumps</b>:
+When any primary pump is proven on and the associated heat pump is commanded in 
+heating mode, the HW bypass valve control loop is enabled. 
+The valve is opened <i>100&nbsp;%</i> otherwise. 
+When enabled, the HW bypass valve loop shall be biased to start with the valve <i>100&nbsp;%</i> open.
+</li>
+<li><b>For any other plants</b>:
+When any primary HW pump is proven on, the HW bypass valve control loop is enabled. 
+The valve is opened <i>100&nbsp;%</i> otherwise. 
+When enabled, the HW bypass valve loop shall be biased to start with the valve <i>100&nbsp;%</i> open.
+</li>
+</ul>
+<h4>CHW minimum flow</h4>
+<p>
+The CHW minimum flow bypass valve is modulated based on a reverse acting control loop 
+to maintain the primary CHW flow rate at setpoint.
+The setpoint is calculated as described in 
+<a href=\"modelica://Buildings.Templates.Plants.Controls.MinimumFlow.Setpoint\">
+Buildings.Templates.Plants.Controls.MinimumFlow.Setpoint</a>
+using the number of units commanded on <i>in cooling mode</i> at each stage.
+</p>
+<p>
+<b>When using isolation valve command signals</b>
+(<code>have_valInlIso=true</code> or <code>have_valOutIso=true</code>):
+When any CHW isolation valve is commanded open, the CHW bypass valve control loop is enabled. 
+The valve is opened <i>100&nbsp;%</i> otherwise. 
+When enabled, the CHW bypass valve loop shall be biased to start with the valve <i>100&nbsp;%</i> open.
+</p>
+<p>
+<b>Otherwise</b>
+(<code>have_valInlIso=false</code> and <code>have_valOutIso=false</code>):
+</p>
+<ul>
+<li><b>For heating and cooling plants with common dedicated CHW and HW pumps</b>:
+When any primary pump is proven on and the associated heat pump is commanded in 
+cooling mode, the CHW bypass valve control loop is enabled. 
+The valve is opened <i>100&nbsp;%</i> otherwise. 
+When enabled, the CHW bypass valve loop shall be biased to start with the valve <i>100&nbsp;%</i> open.
+</li>
+<li><b>For any other plants</b>:
+When any primary CHW pump is proven on, the CHW bypass valve control loop is enabled. 
+The valve is opened <i>100&nbsp;%</i> otherwise. 
+When enabled, the CHW bypass valve loop shall be biased to start with the valve <i>100&nbsp;%</i> open.
+</li>
+</ul>
+</html>"),
+    Diagram(
+      coordinateSystem(
+        extent={{-100,-140},{100,140}})));
+end ControllerDualMode;
diff --git a/Buildings/Templates/Plants/Controls/MinimumFlow/Setpoint.mo b/Buildings/Templates/Plants/Controls/MinimumFlow/Setpoint.mo
new file mode 100644
index 00000000000..c82d9941d35
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/MinimumFlow/Setpoint.mo
@@ -0,0 +1,136 @@
+within Buildings.Templates.Plants.Controls.MinimumFlow;
+block Setpoint
+  "Minimum flow setpoint calculation"
+  parameter Integer nEqu(
+    final min=1)=0
+    "Number of plant equipment"
+    annotation (Evaluate=true,
+    Dialog(connectorSizing=true),HideResult=true);
+  parameter Real V_flow_nominal[:](
+    each final unit="m3/s")
+    "Design flow rate – Each unit";
+  parameter Real V_flow_min[:](
+    each final unit="m3/s")
+    "Minimum flow rate – Each unit";
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1[nEqu]
+    "Equipment enable command"
+    annotation (Placement(transformation(extent={{-140,-20},{-100,20}}),
+      iconTransformation(extent={{-140,-20},{-100,20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput VPriSet_flow(
+    final unit="m3/s")
+    "Primary flow setpoint"
+    annotation (Placement(transformation(extent={{100,-20},{140,20}}),
+      iconTransformation(extent={{100,-20},{140,20}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant floMin[nEqu](
+    final k=V_flow_min)
+    "Minimum flow rate"
+    annotation (Placement(transformation(extent={{-90,50},{-70,70}})));
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea[nEqu](
+    each final realTrue=1,
+    each final realFalse=0)
+    "Convert to real signal"
+    annotation (Placement(transformation(extent={{-90,-10},{-70,10}})));
+  Buildings.Controls.OBC.CDL.Reals.Multiply floMinEna[nEqu]
+    "Minimum flow for enabled equipment"
+    annotation (Placement(transformation(extent={{-50,-10},{-30,10}})));
+  Buildings.Controls.OBC.CDL.Reals.Divide ratFloMinEna[nEqu]
+    "Minimum flow ratio for enabled equipment"
+    annotation (Placement(transformation(extent={{-8,-10},{12,10}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant floDes[nEqu](
+    final k=V_flow_nominal)
+    "Design flow rate"
+    annotation (Placement(transformation(extent={{-90,-70},{-70,-50}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiMax maxRatFloMinEna(
+    nin=nEqu)
+    "Maximum of minimum flow ratio for enabled equipment"
+    annotation (Placement(transformation(extent={{30,-10},{50,10}})));
+  Buildings.Controls.OBC.CDL.Reals.Multiply floDesEqu[nEqu]
+    "Design flow for enabled equipment"
+    annotation (Placement(transformation(extent={{-50,-50},{-30,-30}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiSum sumFloDesEna(
+    nin=nEqu)
+    "Sum of design flow for enabled equipment"
+    annotation (Placement(transformation(extent={{30,-50},{50,-30}})));
+  Buildings.Controls.OBC.CDL.Reals.Multiply floMinSet
+    "Minimum flow setpoint"
+    annotation (Placement(transformation(extent={{70,-10},{90,10}})));
+equation
+  connect(u1, booToRea.u)
+    annotation (Line(points={{-120,0},{-92,0}},color={255,0,255}));
+  connect(booToRea.y, floMinEna.u2)
+    annotation (Line(points={{-68,0},{-60,0},{-60,-6},{-52,-6}},color={0,0,127}));
+  connect(floMin.y, floMinEna.u1)
+    annotation (Line(points={{-68,60},{-60,60},{-60,6},{-52,6}},color={0,0,127}));
+  connect(floDes.y, ratFloMinEna.u2)
+    annotation (Line(points={{-68,-60},{-20,-60},{-20,-6},{-10,-6}},color={0,0,127}));
+  connect(floMinEna.y, ratFloMinEna.u1)
+    annotation (Line(points={{-28,0},{-20,0},{-20,6},{-10,6}},color={0,0,127}));
+  connect(ratFloMinEna.y, maxRatFloMinEna.u)
+    annotation (Line(points={{14,0},{28,0}},color={0,0,127}));
+  connect(booToRea.y, floDesEqu.u1)
+    annotation (Line(points={{-68,0},{-60,0},{-60,-34},{-52,-34}},color={0,0,127}));
+  connect(floDes.y, floDesEqu.u2)
+    annotation (Line(points={{-68,-60},{-60,-60},{-60,-46},{-52,-46}},color={0,0,127}));
+  connect(maxRatFloMinEna.y, floMinSet.u1)
+    annotation (Line(points={{52,0},{60,0},{60,6},{68,6}},color={0,0,127}));
+  connect(floMinSet.y, VPriSet_flow)
+    annotation (Line(points={{92,0},{120,0}},color={0,0,127}));
+  connect(floDesEqu.y, sumFloDesEna.u)
+    annotation (Line(points={{-28,-40},{28,-40}},color={0,0,127}));
+  connect(sumFloDesEna.y, floMinSet.u2)
+    annotation (Line(points={{52,-40},{60,-40},{60,-6},{68,-6}},color={0,0,127}));
+  annotation (
+    defaultComponentName="setFloMin",
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=true,
+        extent={{-100,-100},{100,100}}),
+      graphics={
+        Rectangle(
+          extent={{-100,100},{100,-100}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Text(
+          extent={{-150,150},{150,110}},
+          textString="%name",
+          textColor={0,0,255})}),
+    Documentation(
+      revisions="<html>
+<ul>
+<li>
+May 31, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>",
+      info="<html>
+<p>
+The minimum flow setpoint is determined as follows, to provide minimum flow 
+through all operating units.
+</p>
+<ol>
+<li>
+For the units commanded on in the stage, calculate 
+the highest ratio of minimum flow rate to design flow rate.
+</li>
+<li>
+Calculate the minimum flow setpoint as the highest minimum flow ratio 
+multiplied by the sum of the design flow rates for the operating equipment.
+</li>
+</ol>
+<h4>Details</h4>
+<p>
+For plants consisting of identical units, the minimum flow setpoint is
+the minimum flow of each unit multiplied by the number of units 
+enabled in the stage. 
+</p>
+<p>
+If the units have different minimum flow to design flow ratios, just maintaining 
+the sum of the minimum flows will not satisfy the equipment with the highest 
+relative minimum flows. 
+Note that this also requires that equipment be balanced to distribute flow 
+proportional to their design flow.
+</p>
+</html>"));
+end Setpoint;
diff --git a/Buildings/Templates/Plants/Controls/MinimumFlow/Validation/Controller.mo b/Buildings/Templates/Plants/Controls/MinimumFlow/Validation/Controller.mo
new file mode 100644
index 00000000000..f8ffbc42fec
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/MinimumFlow/Validation/Controller.mo
@@ -0,0 +1,107 @@
+within Buildings.Templates.Plants.Controls.MinimumFlow.Validation;
+model Controller
+  "Validation model for the minimum flow bypass valve controller"
+  Buildings.Templates.Plants.Controls.MinimumFlow.Controller ctlFloMinPum(
+    have_valInlIso=false,
+    have_valOutIso=false,
+    V_flow_nominal={0.02, 0.05},
+    V_flow_min={0.01, 0.03},
+    nEna=2,
+    nEqu=2)
+    "Valve controller enabled by primary pump status"
+    annotation (Placement(transformation(extent={{20,-50},{40,-30}})));
+  Buildings.Templates.Plants.Controls.MinimumFlow.Controller ctlFloMinVal(
+    have_valInlIso=true,
+    have_valOutIso=false,
+    V_flow_nominal={0.02, 0.05},
+    V_flow_min={0.01, 0.03},
+    nEna=2,
+    nEqu=2)
+    "Valve controller enabled by isolation valve command"
+    annotation (Placement(transformation(extent={{20,30},{40,50}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.TimeTable u1EquValPum(
+    table=[
+      0, 0, 0;
+      1, 1, 0;
+      2, 1, 1;
+      3, 0, 1;
+      4, 0, 0],
+    timeScale=200,
+    period=900)
+    "Source signal for equipment or valve command or pump status"
+    annotation (Placement(transformation(extent={{-80,30},{-60,50}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Sin dVPri_flow(
+    amplitude=sum(ctlFloMinVal.V_flow_min) / 2,
+    freqHz=3 / 1000)
+    "Source signal for primary flow rate variation around setpoint"
+    annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
+  Buildings.Controls.OBC.CDL.Reals.Add VPri_flow1
+    "Primary flow rate"
+    annotation (Placement(transformation(extent={{-30,-50},{-10,-30}})));
+  Buildings.Controls.OBC.CDL.Reals.Add VPri_flow
+    "Primary flow rate"
+    annotation (Placement(transformation(extent={{-30,10},{-10,30}})));
+equation
+  connect(u1EquValPum.y[1:2], ctlFloMinVal.u1ValInlIso[1:2])
+    annotation (Line(points={{-58,40},{0,40},{0,44.5},{18,44.5}},color={255,0,255}));
+  connect(u1EquValPum.y[1:2], ctlFloMinPum.u1PumPri_actual[1:2])
+    annotation (Line(points={{-58,40},{0,40},{0,-43.5},{18,-43.5}},color={255,0,255}));
+  connect(u1EquValPum.y[1:2], ctlFloMinVal.u1Equ[1:2])
+    annotation (Line(points={{-58,40},{0,40},{0,48.5},{18,48.5}},color={255,0,255}));
+  connect(u1EquValPum.y[1:2], ctlFloMinPum.u1Equ[1:2])
+    annotation (Line(points={{-58,40},{0,40},{0,-31.5},{18,-31.5}},color={255,0,255}));
+  connect(dVPri_flow.y, VPri_flow1.u2)
+    annotation (Line(points={{-58,0},{-40,0},{-40,-46},{-32,-46}},color={0,0,127}));
+  connect(VPri_flow1.y, ctlFloMinPum.VPri_flow)
+    annotation (Line(points={{-8,-40},{10,-40},{10,-48},{18,-48}},color={0,0,127}));
+  connect(ctlFloMinPum.VPriSet_flow, VPri_flow1.u1)
+    annotation (Line(points={{42,-34},{50,-34},{50,-20},{-36,-20},{-36,-34},{-32,-34}},
+      color={0,0,127}));
+  connect(ctlFloMinVal.VPriSet_flow, VPri_flow.u1)
+    annotation (Line(points={{42,46},{50,46},{50,60},{-40,60},{-40,26},{-32,26}},
+      color={0,0,127}));
+  connect(dVPri_flow.y, VPri_flow.u2)
+    annotation (Line(points={{-58,0},{-40,0},{-40,14},{-32,14}},color={0,0,127}));
+  connect(VPri_flow.y, ctlFloMinVal.VPri_flow)
+    annotation (Line(points={{-8,20},{10,20},{10,32},{18,32}},color={0,0,127}));
+  annotation (
+    __Dymola_Commands(
+      file=
+        "modelica://Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/MinimumFlow/Validation/Controller.mos"
+        "Simulate and plot"),
+    experiment(
+      StopTime=1000.0,
+      Tolerance=1e-06),
+    Icon(
+      graphics={
+        Ellipse(
+          lineColor={75,138,73},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          extent={{-100,-100},{100,100}}),
+        Polygon(
+          lineColor={0,0,255},
+          fillColor={75,138,73},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          points={{-36,60},{64,0},{-36,-60},{-36,60}})}),
+    Documentation(
+      info="<html>
+<p>
+This model validates
+<a href=\"modelica://Buildings.Templates.Plants.Controls.MinimumFlow.Controller\">
+Buildings.Templates.Plants.Controls.MinimumFlow.Controller</a>
+in two configurations: one where the bypass valve controller is enabled
+with the isolation valve command (component <code>ctlFloMinVal</code>), and 
+another where it is enabled with the primary pump status (component <code>ctlFloMinPum</code>).
+</p>
+</html>",
+      revisions="<html>
+<ul>
+<li>
+May 31, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end Controller;
diff --git a/Buildings/Templates/Plants/Controls/MinimumFlow/Validation/ControllerDualMode.mo b/Buildings/Templates/Plants/Controls/MinimumFlow/Validation/ControllerDualMode.mo
new file mode 100644
index 00000000000..69c09064a0a
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/MinimumFlow/Validation/ControllerDualMode.mo
@@ -0,0 +1,273 @@
+within Buildings.Templates.Plants.Controls.MinimumFlow.Validation;
+model ControllerDualMode
+  "Validation model for the dual mode minimum flow bypass valve controller"
+  Buildings.Templates.Plants.Controls.MinimumFlow.ControllerDualMode ctlFloMinPumCoo(
+    have_heaWat=false,
+    have_chiWat=true,
+    have_valInlIso=false,
+    have_valOutIso=false,
+    VChiWat_flow_nominal={0.02, 0.05},
+    VChiWat_flow_min={0.01, 0.03},
+    nEqu=2,
+    nEnaChiWat=2)
+    "Valve controller enabled by primary pump status – Cooling-only application"
+    annotation (Placement(transformation(extent={{-90,-70},{-70,-50}})));
+  Buildings.Templates.Plants.Controls.MinimumFlow.ControllerDualMode ctlFloMinValCoo(
+    have_heaWat=false,
+    have_chiWat=true,
+    have_valInlIso=true,
+    have_valOutIso=false,
+    VChiWat_flow_nominal={0.02, 0.05},
+    VChiWat_flow_min={0.01, 0.03},
+    nEqu=2,
+    nEnaChiWat=2)
+    "Valve controller enabled by isolation valve command – Cooling-only application"
+    annotation (Placement(transformation(extent={{-90,10},{-70,30}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.TimeTable u1EquValPum(
+    table=[
+      0, 0, 0;
+      1, 1, 0;
+      2, 1, 1;
+      3, 0, 1;
+      4, 0, 0],
+    timeScale=200,
+    period=900)
+    "Source signal for equipment or valve command or pump status"
+    annotation (Placement(transformation(extent={{-190,50},{-170,70}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Sin dVPri_flow(
+    amplitude=sum(ctlFloMinValCoo.VChiWat_flow_min) / 2,
+    freqHz=3 / 1000)
+    "Source signal for primary flow rate variation around setpoint"
+    annotation (Placement(transformation(extent={{-190,-30},{-170,-10}})));
+  Buildings.Controls.OBC.CDL.Reals.Add VPriCoo_flow1
+    "Primary flow rate"
+    annotation (Placement(transformation(extent={{-140,-70},{-120,-50}})));
+  Buildings.Controls.OBC.CDL.Reals.Add VPriCoo_flow
+    "Primary flow rate"
+    annotation (Placement(transformation(extent={{-140,-10},{-120,10}})));
+  Buildings.Templates.Plants.Controls.MinimumFlow.ControllerDualMode ctlFloMinPumHea(
+    have_heaWat=true,
+    have_chiWat=false,
+    have_valInlIso=false,
+    have_valOutIso=false,
+    VHeaWat_flow_nominal={0.02, 0.05},
+    VHeaWat_flow_min={0.01, 0.03},
+    nEqu=2,
+    nEnaChiWat=2,
+    nEnaHeaWat=2)
+    "Valve controller enabled by primary pump status – Heating-only application"
+    annotation (Placement(transformation(extent={{0,-70},{20,-50}})));
+  Buildings.Templates.Plants.Controls.MinimumFlow.ControllerDualMode ctlFloMinValHea(
+    have_heaWat=true,
+    have_chiWat=false,
+    have_valInlIso=true,
+    have_valOutIso=false,
+    VHeaWat_flow_nominal={0.02, 0.05},
+    VHeaWat_flow_min={0.01, 0.03},
+    nEqu=2,
+    nEnaChiWat=2,
+    nEnaHeaWat=2)
+    "Valve controller enabled by isolation valve command – Heating-only application"
+    annotation (Placement(transformation(extent={{0,10},{20,30}})));
+  Buildings.Controls.OBC.CDL.Reals.Add VPriHea_flow1
+    "Primary flow rate"
+    annotation (Placement(transformation(extent={{-50,-70},{-30,-50}})));
+  Buildings.Controls.OBC.CDL.Reals.Add VPriHea_flow
+    "Primary flow rate"
+    annotation (Placement(transformation(extent={{-50,-10},{-30,10}})));
+  Buildings.Templates.Plants.Controls.MinimumFlow.ControllerDualMode ctlFloMinPumHeaCoo(
+    have_heaWat=true,
+    have_chiWat=true,
+    have_pumChiWatPri=false,
+    have_valInlIso=false,
+    have_valOutIso=false,
+    VHeaWat_flow_nominal={0.02, 0.05},
+    VHeaWat_flow_min={0.01, 0.03},
+    VChiWat_flow_nominal={0.02, 0.05},
+    VChiWat_flow_min={0.01, 0.03},
+    nEqu=2,
+    nEnaChiWat=2,
+    nEnaHeaWat=2)
+    "Valve controller enabled by primary pump status – Heating and cooling application"
+    annotation (Placement(transformation(extent={{100,-70},{120,-50}})));
+  Buildings.Templates.Plants.Controls.MinimumFlow.ControllerDualMode ctlFloMinValHeaCoo(
+    have_heaWat=true,
+    have_chiWat=true,
+    have_pumChiWatPri=false,
+    have_valInlIso=true,
+    have_valOutIso=false,
+    VHeaWat_flow_nominal={0.02, 0.05},
+    VHeaWat_flow_min={0.01, 0.03},
+    VChiWat_flow_nominal={0.02, 0.05},
+    VChiWat_flow_min={0.01, 0.03},
+    nEqu=2,
+    nEnaChiWat=2,
+    nEnaHeaWat=2)
+    "Valve controller enabled by isolation valve command – Heating and cooling application"
+    annotation (Placement(transformation(extent={{100,10},{120,30}})));
+  Buildings.Controls.OBC.CDL.Reals.Add VPriHeaCoo_flow1
+    "Primary flow rate"
+    annotation (Placement(transformation(extent={{50,-70},{70,-50}})));
+  Buildings.Controls.OBC.CDL.Reals.Add VPriHeaCoo_flow
+    "Primary flow rate"
+    annotation (Placement(transformation(extent={{50,-10},{70,10}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.TimeTable u1HeaEqu(
+    table=[
+      0, 0, 0;
+      1.5, 1, 0;
+      2.5, 0, 1],
+    timeScale=200,
+    period=900)
+    "Source signal for equipment heating/cooling mode command or pump status"
+    annotation (Placement(transformation(extent={{190,-30},{170,-10}})));
+  Buildings.Controls.OBC.CDL.Logical.And u1ValChiWat[2]
+    "Source signal for CHW isolation valves"
+    annotation (Placement(transformation(extent={{150,-10},{130,10}})));
+  Buildings.Controls.OBC.CDL.Logical.And u1ValHeaWat[2]
+    "Source signal for HW isolation valves"
+    annotation (Placement(transformation(extent={{150,-50},{130,-30}})));
+  Buildings.Controls.OBC.CDL.Logical.Not u1CooEqu[2]
+    "True if equipment is commanded in cooling mode"
+    annotation (Placement(transformation(extent={{190,10},{170,30}})));
+equation
+  connect(u1EquValPum.y[1:2], ctlFloMinValCoo.u1Equ[1:2])
+    annotation (Line(points={{-168,60},{-110,60},{-110,28.75},{-92,28.75}},color={255,0,255}));
+  connect(u1EquValPum.y[1:2], ctlFloMinPumCoo.u1Equ[1:2])
+    annotation (Line(points={{-168,60},{-110,60},{-110,-51.25},{-92,-51.25}},
+      color={255,0,255}));
+  connect(dVPri_flow.y, VPriCoo_flow1.u2)
+    annotation (Line(points={{-168,-20},{-150,-20},{-150,-66},{-142,-66}},color={0,0,127}));
+  connect(dVPri_flow.y, VPriCoo_flow.u2)
+    annotation (Line(points={{-168,-20},{-150,-20},{-150,-6},{-142,-6}},color={0,0,127}));
+  connect(ctlFloMinPumCoo.VChiWatPriSet_flow, VPriCoo_flow1.u1)
+    annotation (Line(points={{-68,-55},{-64,-55},{-64,-40},{-146,-40},{-146,-54},{-142,-54}},
+      color={0,0,127}));
+  connect(ctlFloMinValCoo.VChiWatPriSet_flow, VPriCoo_flow.u1)
+    annotation (Line(points={{-68,25},{-66,25},{-66,40},{-150,40},{-150,6},{-142,6}},
+      color={0,0,127}));
+  connect(VPriCoo_flow.y, ctlFloMinValCoo.VChiWatPri_flow)
+    annotation (Line(points={{-118,0},{-100,0},{-100,13.3333},{-92,13.3333}},
+      color={0,0,127}));
+  connect(VPriCoo_flow1.y, ctlFloMinPumCoo.VChiWatPri_flow)
+    annotation (Line(points={{-118,-60},{-100,-60},{-100,-66.6667},{-92,-66.6667}},
+      color={0,0,127}));
+  connect(u1EquValPum.y[1:2], ctlFloMinValCoo.u1ValChiWatInlIso[1:2])
+    annotation (Line(points={{-168,60},{-110,60},{-110,22.0833},{-92,22.0833}},
+      color={255,0,255}));
+  connect(u1EquValPum.y[1:2], ctlFloMinPumCoo.u1PumChiWatPri_actual[1:2])
+    annotation (Line(points={{-168,60},{-110,60},{-110,-62.9167},{-92,-62.9167}},
+      color={255,0,255}));
+  connect(u1EquValPum.y[1:2], ctlFloMinValHea.u1Equ[1:2])
+    annotation (Line(points={{-168,60},{-20,60},{-20,28.75},{-2,28.75}},color={255,0,255}));
+  connect(u1EquValPum.y[1:2], ctlFloMinPumHea.u1Equ[1:2])
+    annotation (Line(points={{-168,60},{-20,60},{-20,-51.25},{-2,-51.25}},color={255,0,255}));
+  connect(dVPri_flow.y, VPriHea_flow.u2)
+    annotation (Line(points={{-168,-20},{-60,-20},{-60,-6},{-52,-6}},color={0,0,127}));
+  connect(dVPri_flow.y, VPriHea_flow1.u2)
+    annotation (Line(points={{-168,-20},{-60,-20},{-60,-66},{-52,-66}},color={0,0,127}));
+  connect(ctlFloMinPumHea.VHeaWatPriSet_flow, VPriHea_flow1.u1)
+    annotation (Line(points={{22,-51.6667},{24,-51.6667},{24,-40},{-56,-40},{-56,-54},{-52,-54}},
+      color={0,0,127}));
+  connect(ctlFloMinValHea.VHeaWatPriSet_flow, VPriHea_flow.u1)
+    annotation (Line(points={{22,28.3333},{24,28.3333},{24,40},{-60,40},{-60,6},{-52,6}},
+      color={0,0,127}));
+  connect(VPriHea_flow1.y, ctlFloMinPumHea.VHeaWatPri_flow)
+    annotation (Line(points={{-28,-60},{-10,-60},{-10,-65},{-2,-65}},color={0,0,127}));
+  connect(VPriHea_flow.y, ctlFloMinValHea.VHeaWatPri_flow)
+    annotation (Line(points={{-28,0},{-10,0},{-10,15},{-2,15}},color={0,0,127}));
+  connect(u1EquValPum.y[1:2], ctlFloMinValHea.u1ValHeaWatInlIso[1:2])
+    annotation (Line(points={{-168,60},{-20,60},{-20,25.4167},{-2,25.4167}},
+      color={255,0,255}));
+  connect(u1EquValPum.y[1:2], ctlFloMinPumHea.u1PumHeaWatPri_actual[1:2])
+    annotation (Line(points={{-168,60},{-20,60},{-20,-61.25},{-2,-61.25}},color={255,0,255}));
+  connect(u1EquValPum.y[1:2], ctlFloMinPumHeaCoo.u1Equ[1:2])
+    annotation (Line(points={{-168,60},{80,60},{80,-51.25},{98,-51.25}},color={255,0,255}));
+  connect(ctlFloMinPumHeaCoo.VHeaWatPriSet_flow, VPriHeaCoo_flow1.u1)
+    annotation (Line(points={{122,-51.6667},{124,-51.6667},{124,-44},{44,-44},{44,-54},{48,-54}},
+      color={0,0,127}));
+  connect(ctlFloMinValHeaCoo.VHeaWatPriSet_flow, VPriHeaCoo_flow.u1)
+    annotation (Line(points={{122,28.3333},{124,28.3333},{124,40},{40,40},{40,6},{48,6}},
+      color={0,0,127}));
+  connect(VPriHeaCoo_flow1.y, ctlFloMinPumHeaCoo.VHeaWatPri_flow)
+    annotation (Line(points={{72,-60},{90,-60},{90,-65},{98,-65}},color={0,0,127}));
+  connect(VPriHeaCoo_flow.y, ctlFloMinValHeaCoo.VHeaWatPri_flow)
+    annotation (Line(points={{72,0},{90,0},{90,15},{98,15}},color={0,0,127}));
+  connect(u1EquValPum.y[1:2], ctlFloMinValHeaCoo.u1Equ)
+    annotation (Line(points={{-168,60},{80,60},{80,28.3333},{98,28.3333}},color={255,0,255}));
+  connect(u1EquValPum.y[1:2], ctlFloMinPumHeaCoo.u1PumHeaWatPri_actual[1:2])
+    annotation (Line(points={{-168,60},{80,60},{80,-61.25},{98,-61.25}},color={255,0,255}));
+  connect(dVPri_flow.y, VPriHeaCoo_flow.u2)
+    annotation (Line(points={{-168,-20},{40,-20},{40,-6},{48,-6}},color={0,0,127}));
+  connect(dVPri_flow.y, VPriHeaCoo_flow1.u2)
+    annotation (Line(points={{-168,-20},{40,-20},{40,-66},{48,-66}},color={0,0,127}));
+  connect(VPriHeaCoo_flow.y, ctlFloMinValHeaCoo.VChiWatPri_flow)
+    annotation (Line(points={{72,0},{90,0},{90,13.3333},{98,13.3333}},color={0,0,127}));
+  connect(VPriHeaCoo_flow1.y, ctlFloMinPumHeaCoo.VChiWatPri_flow)
+    annotation (Line(points={{72,-60},{90,-60},{90,-66.6667},{98,-66.6667}},
+      color={0,0,127}));
+  connect(u1HeaEqu.y[1:2], ctlFloMinValHeaCoo.u1HeaEqu[1:2])
+    annotation (Line(points={{168,-20},{90,-20},{90,27.0833},{98,27.0833}},color={255,0,255}));
+  connect(u1HeaEqu.y[1:2], ctlFloMinPumHeaCoo.u1HeaEqu[1:2])
+    annotation (Line(points={{168,-20},{90,-20},{90,-52.9167},{98,-52.9167}},
+      color={255,0,255}));
+  connect(u1EquValPum.y[1:2], u1ValChiWat[1:2].u1)
+    annotation (Line(points={{-168,60},{160,60},{160,0},{152,0}},color={255,0,255}));
+  connect(u1EquValPum.y[1:2], u1ValHeaWat[1:2].u1)
+    annotation (Line(points={{-168,60},{160,60},{160,-40},{152,-40}},color={255,0,255}));
+  connect(u1HeaEqu.y[1:2], u1ValHeaWat[1:2].u2)
+    annotation (Line(points={{168,-20},{164,-20},{164,-48},{152,-48}},color={255,0,255}));
+  connect(u1HeaEqu.y[1:2], u1CooEqu.u)
+    annotation (Line(points={{168,-20},{164,-20},{164,0},{196,0},{196,20},{192,20}},
+      color={255,0,255}));
+  connect(u1CooEqu.y, u1ValChiWat.u2)
+    annotation (Line(points={{168,20},{156,20},{156,-8},{152,-8}},color={255,0,255}));
+  connect(u1ValChiWat.y, ctlFloMinValHeaCoo.u1ValChiWatInlIso)
+    annotation (Line(points={{128,0},{92,0},{92,21.6667},{98,21.6667}},color={255,0,255}));
+  connect(u1ValHeaWat.y, ctlFloMinValHeaCoo.u1ValHeaWatInlIso)
+    annotation (Line(points={{128,-40},{94,-40},{94,25},{98,25}},color={255,0,255}));
+  annotation (
+    __Dymola_Commands(
+      file=
+        "modelica://Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/MinimumFlow/Validation/ControllerDualMode.mos"
+        "Simulate and plot"),
+    experiment(
+      StopTime=1000.0,
+      Tolerance=1e-06),
+    Icon(
+      graphics={
+        Ellipse(
+          lineColor={75,138,73},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          extent={{-100,-100},{100,100}}),
+        Polygon(
+          lineColor={0,0,255},
+          fillColor={75,138,73},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          points={{-36,60},{64,0},{-36,-60},{-36,60}})}),
+    Documentation(
+      info="<html>
+<p>
+This model validates
+<a href=\"modelica://Buildings.Templates.Plants.Controls.MinimumFlow.ControllerDualMode\">
+Buildings.Templates.Plants.Controls.MinimumFlow.ControllerDualMode</a>
+for cooling-only (components <code>*Coo</code>), heating-only (components <code>*Hea</code>) 
+and heating and cooling applications (components <code>*HeaCoo</code>), 
+and for two plant configurations: one where the bypass valve controller is enabled
+with the isolation valve command (components <code>ctlFloMinVal*</code>), and 
+another where it is enabled with the primary pump status (components <code>ctlFloMinPum*</code>).
+</p>
+</html>",
+      revisions="<html>
+<ul>
+<li>
+May 31, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    Diagram(
+      coordinateSystem(
+        extent={{-200,-100},{200,100}})));
+end ControllerDualMode;
diff --git a/Buildings/Templates/Plants/Controls/MinimumFlow/Validation/Setpoint.mo b/Buildings/Templates/Plants/Controls/MinimumFlow/Validation/Setpoint.mo
new file mode 100644
index 00000000000..e03f865c305
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/MinimumFlow/Validation/Setpoint.mo
@@ -0,0 +1,62 @@
+within Buildings.Templates.Plants.Controls.MinimumFlow.Validation;
+model Setpoint
+  "Validation model for the minimum flow setpoint calculation"
+  Buildings.Controls.OBC.CDL.Logical.Sources.TimeTable u1Equ(
+    table=[
+      0, 0, 0;
+      1, 1, 0;
+      2, 1, 1;
+      3, 0, 1;
+      4, 0, 0],
+    timeScale=200,
+    period=900)
+    "Source signal for equipment enable command"
+    annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
+  Buildings.Templates.Plants.Controls.MinimumFlow.Setpoint setFloMin(
+    V_flow_nominal={0.02, 0.05},
+    V_flow_min={0.01, 0.03},
+    nEqu=2)
+    "Minimum flow setpoint calculation"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
+equation
+  connect(u1Equ.y[1:2], setFloMin.u1[1:2])
+    annotation (Line(points={{-58,0},{-36,0},{-36,0.5},{-12,0.5}},color={255,0,255}));
+  annotation (
+    __Dymola_Commands(
+      file=
+        "modelica://Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/MinimumFlow/Validation/Setpoint.mos"
+        "Simulate and plot"),
+    experiment(
+      StopTime=1000.0,
+      Tolerance=1e-06),
+    Icon(
+      graphics={
+        Ellipse(
+          lineColor={75,138,73},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          extent={{-100,-100},{100,100}}),
+        Polygon(
+          lineColor={0,0,255},
+          fillColor={75,138,73},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          points={{-36,60},{64,0},{-36,-60},{-36,60}})}),
+    Documentation(
+      info="<html>
+<p>
+This model validates
+<a href=\"modelica://Buildings.Templates.Plants.Controls.MinimumFlow.Setpoint\">
+Buildings.Templates.Plants.Controls.MinimumFlow.Setpoint</a>
+in a configuration with two equipment with different minimum flow ratios.
+</p>
+</html>",
+      revisions="<html>
+<ul>
+<li>
+May 31, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end Setpoint;
diff --git a/Buildings/Templates/Plants/Controls/MinimumFlow/Validation/package.mo b/Buildings/Templates/Plants/Controls/MinimumFlow/Validation/package.mo
new file mode 100644
index 00000000000..42b9efc1c48
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/MinimumFlow/Validation/package.mo
@@ -0,0 +1,30 @@
+within Buildings.Templates.Plants.Controls.MinimumFlow;
+package Validation
+  "Collection of validation models"
+  annotation (
+    Icon(
+      graphics={
+        Rectangle(
+          lineColor={200,200,200},
+          fillColor={248,248,248},
+          fillPattern=FillPattern.HorizontalCylinder,
+          extent={{-100.0,-100.0},{100.0,100.0}},
+          radius=25.0),
+        Polygon(
+          origin={8.0,14.0},
+          lineColor={78,138,73},
+          fillColor={78,138,73},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          points={{-58.0,46.0},{42.0,-14.0},{-58.0,-74.0},{-58.0,46.0}}),
+        Rectangle(
+          lineColor={128,128,128},
+          extent={{-100.0,-100.0},{100.0,100.0}},
+          radius=25.0)}),
+    Documentation(
+      info="<html>
+<p>
+This package contains validation models.
+</p>
+</html>"));
+end Validation;
diff --git a/Buildings/Templates/Plants/Controls/MinimumFlow/Validation/package.order b/Buildings/Templates/Plants/Controls/MinimumFlow/Validation/package.order
new file mode 100644
index 00000000000..94ba676e9ea
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/MinimumFlow/Validation/package.order
@@ -0,0 +1,3 @@
+Controller
+ControllerDualMode
+Setpoint
diff --git a/Buildings/Templates/Plants/Controls/MinimumFlow/package.mo b/Buildings/Templates/Plants/Controls/MinimumFlow/package.mo
new file mode 100644
index 00000000000..cb52769971d
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/MinimumFlow/package.mo
@@ -0,0 +1,46 @@
+within Buildings.Templates.Plants.Controls;
+package MinimumFlow
+  "Package of sequences for minimum flow bypass valve"
+  annotation (
+    Icon(
+      graphics={
+        Rectangle(
+          lineColor={200,200,200},
+          fillColor={248,248,248},
+          fillPattern=FillPattern.HorizontalCylinder,
+          extent={{-100.0,-100.0},{100.0,100.0}},
+          radius=25.0),
+        Ellipse(
+          origin={10.0,10.0},
+          lineColor={128,128,128},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          extent={{-80.0,0.0},{-20.0,60.0}}),
+        Ellipse(
+          origin={10.0,10.0},
+          fillColor={128,128,128},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          extent={{0.0,0.0},{60.0,60.0}}),
+        Ellipse(
+          origin={10.0,10.0},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          extent={{0.0,-80.0},{60.0,-20.0}}),
+        Ellipse(
+          origin={10.0,10.0},
+          fillColor={76,76,76},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          extent={{-80.0,-80.0},{-20.0,-20.0}}),
+        Rectangle(
+          lineColor={128,128,128},
+          extent={{-100.0,-100.0},{100.0,100.0}},
+          radius=25.0)}),
+    Documentation(
+      info="<html>
+<p>
+This package contains control sequences for the HW or CHW minimum flow bypass valve.
+</p>
+</html>"));
+end MinimumFlow;
diff --git a/Buildings/Templates/Plants/Controls/MinimumFlow/package.order b/Buildings/Templates/Plants/Controls/MinimumFlow/package.order
new file mode 100644
index 00000000000..61002aa6105
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/MinimumFlow/package.order
@@ -0,0 +1,4 @@
+Controller
+ControllerDualMode
+Setpoint
+Validation
diff --git a/Buildings/Templates/Plants/Controls/Pumps/Generic/ControlDifferentialPressure.mo b/Buildings/Templates/Plants/Controls/Pumps/Generic/ControlDifferentialPressure.mo
index f731cf30b09..8eba5dc5e07 100644
--- a/Buildings/Templates/Plants/Controls/Pumps/Generic/ControlDifferentialPressure.mo
+++ b/Buildings/Templates/Plants/Controls/Pumps/Generic/ControlDifferentialPressure.mo
@@ -20,7 +20,7 @@ block ControlDifferentialPressure
   final parameter Real y_max(
     final unit="1",
     final min=0,
-    final max=1)=1
+    final max=2)=1
     "Maximum pump speed";
   parameter Real k(
     min=100 * Buildings.Controls.OBC.CDL.Constants.eps)=1
@@ -54,8 +54,7 @@ block ControlDifferentialPressure
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}}),
       iconTransformation(extent={{-140,-20},{-100,20}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput dpLocSet[nSenDpRem](
-    each final unit="Pa")
-    if not have_senDpRemWir
+    each final unit="Pa") if not have_senDpRemWir
     "Local differential pressure setpoint"
     annotation (Placement(transformation(extent={{-140,-60},{-100,-20}}),
       iconTransformation(extent={{-140,-60},{-100,-20}})));
@@ -63,7 +62,7 @@ block ControlDifferentialPressure
     final unit="1")
     "Pump speed command"
     annotation (Placement(transformation(extent={{100,-20},{140,20}}),
-      iconTransformation(extent={{98,-20},{138,20}})));
+      iconTransformation(extent={{100,-20},{140,20}})));
   Buildings.Controls.OBC.CDL.Logical.MultiOr anyOn(
     final nin=nPum)
     "Return true when any pump is proven on"
@@ -104,6 +103,10 @@ block ControlDifferentialPressure
     if have_senDpRemWir
     "Maximum control loop output"
     annotation (Placement(transformation(extent={{40,30},{60,50}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput dpLocSetMax(final unit="Pa")
+    if not have_senDpRemWir "Maximum local differential pressure setpoint"
+    annotation (Placement(transformation(extent={{100,-40},{140,0}}),
+        iconTransformation(extent={{100,-60},{140,-20}})));
 protected
   parameter Real dpSca(
     final unit="Pa",
@@ -135,6 +138,8 @@ equation
     annotation (Line(points={{12,-40},{80,-40},{80,0},{120,0}},color={0,0,127}));
   connect(maxY.y, y)
     annotation (Line(points={{62,40},{80,40},{80,0},{120,0}},color={0,0,127}));
+  connect(maxSet.y, dpLocSetMax) annotation (Line(points={{-68,-40},{-40,-40},{
+          -40,-20},{120,-20}}, color={0,0,127}));
   annotation (
     defaultComponentName="ctlDp",
     Icon(
diff --git a/Buildings/Templates/Plants/Controls/Pumps/Generic/StagingHeadered.mo b/Buildings/Templates/Plants/Controls/Pumps/Generic/StagingHeadered.mo
index add1f3d443d..1b5f1147a1d 100644
--- a/Buildings/Templates/Plants/Controls/Pumps/Generic/StagingHeadered.mo
+++ b/Buildings/Templates/Plants/Controls/Pumps/Generic/StagingHeadered.mo
@@ -9,7 +9,7 @@ block StagingHeadered "Generic staging logic for headered pumps"
     annotation (Evaluate=true,
     Dialog(enable=nPum > 0));
   parameter Boolean is_ctlDp(start=false)
-    "Set to true for headered variable speed pumps using ∆p pump speed control"
+    "Set to true for variable speed pumps using ∆p pump speed control"
     annotation (Evaluate=true,
     Dialog(enable=is_hdr));
   parameter Boolean have_valInlIso(start=false)
@@ -26,6 +26,10 @@ block StagingHeadered "Generic staging logic for headered pumps"
   parameter Integer nPum
     "Number of pumps"
     annotation (Evaluate=true);
+  parameter Integer nSenDp(final min=1, start=1)
+    "Number of hardwired ∆p sensors"
+    annotation (Evaluate=true,
+      Dialog(enable=is_hdr and is_ctlDp));
   parameter Real V_flow_nominal(
     min=1E-6,
     start=1E-6,
@@ -36,7 +40,19 @@ block StagingHeadered "Generic staging logic for headered pumps"
     min=0,
     start=600,
     unit="s")=600
-    "Runtime before triggering stage command"
+    "Runtime before triggering stage change command based on efficiency condition"
+    annotation (Dialog(enable=is_hdr and is_ctlDp));
+  parameter Real dtRunFaiSaf(
+    final min=0,
+    final unit="s",
+    start=300)=300
+    "Runtime before triggering stage change command based on failsafe condition"
+    annotation (Dialog(enable=is_hdr and is_ctlDp));
+  parameter Real dtRunFaiSafLowY(
+    min=0,
+    start=600,
+    unit="s")=dtRun
+    "Runtime before triggering stage change command based on low pump speed failsafe condition"
     annotation (Dialog(enable=is_hdr and is_ctlDp));
   parameter Real dVOffUp(
     max=1,
@@ -52,6 +68,24 @@ block StagingHeadered "Generic staging logic for headered pumps"
     unit="1")=dVOffUp
     "Stage down flow point offset"
     annotation (Dialog(enable=is_hdr and is_ctlDp));
+  parameter Real dpOff(
+    final min=0,
+    final unit="Pa",
+    start=1E4)=1E4
+    "Stage change ∆p point offset (>0)"
+    annotation (Dialog(enable=is_hdr and is_ctlDp));
+  parameter Real yUp(
+    final min=0,
+    final unit="1",
+    start=0.99)=0.99
+    "Stage up pump speed point"
+    annotation (Dialog(enable=is_hdr and is_ctlDp));
+  parameter Real yDow(
+    final min=0,
+    final unit="1",
+    start=0.4)=0.4
+    "Stage down pump speed point"
+    annotation (Dialog(enable=is_hdr and is_ctlDp));
   final parameter Real staPum[nPum, nPum](
     each unit="1",
     each min=0,
@@ -61,52 +95,57 @@ block StagingHeadered "Generic staging logic for headered pumps"
   Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1Pum[nEqu]
     if is_pri and (not is_hdr or is_hdr and not is_ctlDp)
     "Pump command from equipment enable logic"
-    annotation (Placement(transformation(extent={{-200,80},{-160,120}}),
-      iconTransformation(extent={{-140,-40},{-100,0}})));
+    annotation (Placement(transformation(extent={{-200,100},{-160,140}}),
+      iconTransformation(extent={{-140,0},{-100,40}})));
   Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1Pum_actual[nPum]
     "Pump status – Hardware point"
-    annotation (Placement(transformation(extent={{-200,0},{-160,40}}),
-      iconTransformation(extent={{-140,-60},{-100,-20}})));
+    annotation (Placement(transformation(extent={{-200,20},{-160,60}}),
+      iconTransformation(extent={{-140,-20},{-100,20}})));
   Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1[nPum]
     "Pump command – Hardware point"
     annotation (Placement(transformation(extent={{160,-80},{200,-40}}),
       iconTransformation(extent={{100,-20},{140,20}})));
   Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1_actual[nEqu]
     "Pump status to equipment enable logic"
-    annotation (Placement(transformation(extent={{160,40},{200,80}}),
+    annotation (Placement(transformation(extent={{160,60},{200,100}}),
       iconTransformation(extent={{100,40},{140,80}})));
   Utilities.StageIndex nPumHdrDp(
     final have_inpAva=false,
-    final nSta=nPum,
-    final dtRun=dtRun)
+    final nSta=nPum)
     if is_hdr and is_ctlDp
     "Compute number of pumps to be staged on – Headered pumps using ∆p control"
-    annotation (Placement(transformation(extent={{-10,-30},{10,-10}})));
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
   Generic.StagingHeaderedDeltaP staHdrDp(
-    final nPum=nPum,
+    final nSenDp=nSenDp,
     final V_flow_nominal=V_flow_nominal,
-    final dtRun=dtRun,
+    final dVOffDow=dVOffDow,
     final dVOffUp=dVOffUp,
-    final dVOffDow=dVOffDow)
+    final dpOff=dpOff,
+    final dtRun=dtRun,
+    final dtRunFaiSaf=dtRunFaiSaf,
+    final dtRunFaiSafLowY=dtRunFaiSafLowY,
+    final nPum=nPum,
+    final yDow=yDow,
+    final yUp=yUp)
     if is_hdr and is_ctlDp
     "Stage headered variable speed pumps using ∆p control"
-    annotation (Placement(transformation(extent={{-130,-30},{-110,-10}})));
+    annotation (Placement(transformation(extent={{-130,-10},{-110,10}})));
   StagingRotation.SortRuntime sorRunTimHdr(
     nin=nPum)
     if is_hdr
     "Sort by increasing staging runtime"
-    annotation (Placement(transformation(extent={{-10,10},{10,30}})));
+    annotation (Placement(transformation(extent={{-10,30},{10,50}})));
   Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger booToInt[nEqu](
     each final integerTrue=1,
     each final integerFalse=0)
     if is_pri and is_hdr and not is_ctlDp
     "Convert to integer"
-    annotation (Placement(transformation(extent={{-140,90},{-120,110}})));
+    annotation (Placement(transformation(extent={{-140,110},{-120,130}})));
   Buildings.Controls.OBC.CDL.Integers.MultiSum nPumHdrPriNotDp0(
     nin=nEqu)
     if is_pri and is_hdr and not is_ctlDp
     "Compute number of pumps to be staged on – Headered primary pumps not using ∆p control"
-    annotation (Placement(transformation(extent={{-100,90},{-80,110}})));
+    annotation (Placement(transformation(extent={{-100,110},{-80,130}})));
   Buildings.Controls.OBC.CDL.Logical.Sources.Constant u1Ava[nPum](
     each final k=true)
     if is_hdr
@@ -116,39 +155,39 @@ block StagingHeadered "Generic staging logic for headered pumps"
     final unit="m3/s")
     if is_hdr and is_ctlDp
     "Flow rate"
-    annotation (Placement(transformation(extent={{-200,-40},{-160,0}}),
-      iconTransformation(extent={{-140,-100},{-100,-60}})));
+    annotation (Placement(transformation(extent={{-200,-20},{-160,20}}),
+      iconTransformation(extent={{-140,-40},{-100,0}})));
   Buildings.Controls.OBC.CDL.Routing.BooleanExtractSignal sigPumPriDed(final nin
       =nEqu, final nout=nPum)
     if is_pri and not is_hdr
     "Extract dedicated primary pump command signal assuming nEqu=nPum"
-    annotation (Placement(transformation(extent={{-10,-150},{10,-130}})));
+    annotation (Placement(transformation(extent={{-10,-170},{10,-150}})));
   Buildings.Controls.OBC.CDL.Routing.BooleanExtractSignal y1Ded_actual(
     nin=nPum,
     nout=nEqu)
     if not is_hdr
     "Extract dedicated pump status assuming nEqu=nPum"
-    annotation (Placement(transformation(extent={{70,70},{90,90}})));
+    annotation (Placement(transformation(extent={{70,90},{90,110}})));
   Buildings.Controls.OBC.CDL.Routing.BooleanExtractor y1LeaHdr_actual(
     final nin=nPum)
     if is_hdr
     "Lead headered pump status"
-    annotation (Placement(transformation(extent={{30,30},{50,50}})));
+    annotation (Placement(transformation(extent={{30,50},{50,70}})));
   Buildings.Controls.OBC.CDL.Routing.BooleanScalarReplicator booScaRep(
     final nout=nEqu)
     if is_hdr
     "Replicate signal"
-    annotation (Placement(transformation(extent={{70,30},{90,50}})));
+    annotation (Placement(transformation(extent={{70,50},{90,70}})));
   Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1ValInlIso[nEqu]
     if is_pri and is_hdr and have_valInlIso
     "Equipment inlet isolation valve command"
-    annotation (Placement(transformation(extent={{-200,-100},{-160,-60}}),
-      iconTransformation(extent={{-140,20},{-100,60}})));
+    annotation (Placement(transformation(extent={{-200,-120},{-160,-80}}),
+      iconTransformation(extent={{-140,40},{-100,80}})));
   Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1ValOutIso[nEqu]
     if is_pri and is_hdr and have_valOutIso
     "Equipment outlet isolation valve command"
     annotation (Placement(transformation(extent={{-200,-140},{-160,-100}}),
-      iconTransformation(extent={{-140,0},{-100,40}})));
+      iconTransformation(extent={{-140,20},{-100,60}})));
   Primary.EnableLeadHeadered enaLeaHdrPri(
     final typCon=Buildings.Templates.Plants.Controls.Types.EquipmentConnection.Parallel,
     final typValIso=Buildings.Templates.Plants.Controls.Types.Actuator.TwoPosition,
@@ -167,7 +206,7 @@ block StagingHeadered "Generic staging logic for headered pumps"
   Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1Pla
     if not is_pri and is_hdr
     "Plant enable signal"
-    annotation (Placement(transformation(extent={{-200,120},{-160,160}}),
+    annotation (Placement(transformation(extent={{-200,140},{-160,180}}),
       iconTransformation(extent={{-140,60},{-100,100}})));
   Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger booToInt1(
     final integerTrue=1,
@@ -179,50 +218,60 @@ block StagingHeadered "Generic staging logic for headered pumps"
   Buildings.Controls.OBC.CDL.Integers.Multiply nPumHdrPriNotDp
     if is_pri and is_hdr and not is_ctlDp
     "Reset number of enabled pumps to zero if lead pump disabled"
-    annotation (Placement(transformation(extent={{-10,90},{10,110}})));
+    annotation (Placement(transformation(extent={{-10,110},{10,130}})));
   StagingRotation.EquipmentEnable enaHdr(
     final staEqu=staPum)
     if is_hdr
     "Enable headered pumps"
-    annotation (Placement(transformation(extent={{50,-30},{70,-10}})));
+    annotation (Placement(transformation(extent={{50,-10},{70,10}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput y(final unit="1")
+    if is_hdr and is_ctlDp
+    "Pump speed command" annotation (Placement(transformation(extent={{-200,-80},
+            {-160,-40}}), iconTransformation(extent={{-140,-100},{-100,-60}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput dp[nSenDp](each final unit=
+        "Pa") if is_hdr and is_ctlDp "Loop differential pressure" annotation (
+      Placement(transformation(extent={{-200,-60},{-160,-20}}),
+        iconTransformation(extent={{-140,-80},{-100,-40}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput dpSet[nSenDp](each final unit
+      ="Pa") if is_hdr and is_ctlDp "Loop differential pressure setpoint"
+    annotation (Placement(transformation(extent={{-200,-40},{-160,0}}),
+        iconTransformation(extent={{-140,-60},{-100,-20}})));
 equation
   connect(u1Pum_actual, staHdrDp.u1_actual)
-    annotation (Line(points={{-180,20},{-152,20},{-152,-14},{-132,-14}},
-                                                                    color={255,0,255}));
+    annotation (Line(points={{-180,40},{-152,40},{-152,8},{-132,8}},color={255,0,255}));
   connect(staHdrDp.y1Up, nPumHdrDp.u1Up)
-    annotation (Line(points={{-108,-14},{-100,-14},{-100,-18},{-12,-18}},
-                                                                   color={255,0,255}));
+    annotation (Line(points={{-108,6},{-100,6},{-100,2},{-12,2}},  color={255,0,255}));
   connect(staHdrDp.y1Dow, nPumHdrDp.u1Dow)
-    annotation (Line(points={{-108,-26},{-100,-26},{-100,-22},{-12,-22}},
-                                                                       color={255,0,255}));
+    annotation (Line(points={{-108,-6},{-100,-6},{-100,-2},{-12,-2}},  color={255,0,255}));
   connect(u1Pum, booToInt.u)
-    annotation (Line(points={{-180,100},{-142,100}},color={255,0,255}));
+    annotation (Line(points={{-180,120},{-142,120}},color={255,0,255}));
   connect(booToInt.y, nPumHdrPriNotDp0.u)
-    annotation (Line(points={{-118,100},{-102,100}},color={255,127,0}));
+    annotation (Line(points={{-118,120},{-102,120}},color={255,127,0}));
   connect(u1Ava.y, sorRunTimHdr.u1Ava)
-    annotation (Line(points={{12,-100},{20,-100},{20,-60},{-18,-60},{-18,14},{
-          -12,14}},                                                color={255,0,255}));
+    annotation (Line(points={{12,-100},{20,-100},{20,-20},{-18,-20},{-18,34},{-12,
+          34}},                                                    color={255,0,255}));
   connect(V_flow, staHdrDp.V_flow)
-    annotation (Line(points={{-180,-20},{-146,-20},{-146,-26},{-132,-26}},
-                                                                    color={0,0,127}));
+    annotation (Line(points={{-180,0},{-142,0},{-142,4},{-132,4}},  color={0,0,127}));
   connect(u1Pum, sigPumPriDed.u)
-    annotation (Line(points={{-180,100},{-156,100},{-156,-140},{-12,-140}},
+    annotation (Line(points={{-180,120},{-156,120},{-156,-160},{-12,-160}},
       color={255,0,255}));
   connect(u1Pum_actual, y1Ded_actual.u)
-    annotation (Line(points={{-180,20},{-152,20},{-152,80},{68,80}},color={255,0,255}));
+    annotation (Line(points={{-180,40},{-152,40},{-152,100},{68,100}},
+                                                                    color={255,0,255}));
   connect(y1Ded_actual.y, y1_actual)
-    annotation (Line(points={{92,80},{140,80},{140,60},{180,60}},color={255,0,255}));
+    annotation (Line(points={{92,100},{140,100},{140,80},{180,80}},
+                                                                 color={255,0,255}));
   connect(u1Pum_actual, y1LeaHdr_actual.u)
-    annotation (Line(points={{-180,20},{-152,20},{-152,40},{28,40}},color={255,0,255}));
+    annotation (Line(points={{-180,40},{-152,40},{-152,60},{28,60}},color={255,0,255}));
   connect(y1LeaHdr_actual.y, booScaRep.u)
-    annotation (Line(points={{52,40},{68,40}},color={255,0,255}));
+    annotation (Line(points={{52,60},{68,60}},color={255,0,255}));
   connect(booScaRep.y, y1_actual)
-    annotation (Line(points={{92,40},{140,40},{140,60},{180,60}},color={255,0,255}));
+    annotation (Line(points={{92,60},{140,60},{140,80},{180,80}},color={255,0,255}));
   connect(u1ValInlIso, phValInlIso.u)
-    annotation (Line(points={{-180,-80},{-132,-80}}, color={255,0,255}));
+    annotation (Line(points={{-180,-100},{-152,-100},{-152,-80},{-132,-80}},
+                                                     color={255,0,255}));
   connect(enaLeaHdrPri.y1, nPumHdrDp.u1Lea)
-    annotation (Line(points={{-48,-100},{-20,-100},{-20,-14},{-12,-14}},
-                                                                      color={255,0,255}));
+    annotation (Line(points={{-48,-100},{-20,-100},{-20,6},{-12,6}},  color={255,0,255}));
   connect(phValInlIso.y, enaLeaHdrPri.u1ValIso[1:nEqu]) annotation (Line(points={{-108,
           -80},{-80,-80},{-80,-100},{-72,-100}},     color={255,0,255}));
   connect(phValOutIso.y, enaLeaHdrPri.u1ValIso[nEqu + 1:2*nEqu])
@@ -231,38 +280,43 @@ equation
   connect(u1ValOutIso, phValOutIso.u)
     annotation (Line(points={{-180,-120},{-132,-120}},
                                                      color={255,0,255}));
-  connect(u1ValOutIso, phValInlIso.uPh) annotation (Line(points={{-180,-120},{
-          -146,-120},{-146,-86},{-132,-86}},
-                                       color={255,0,255}));
-  connect(u1ValInlIso, phValOutIso.uPh) annotation (Line(points={{-180,-80},{
-          -152,-80},{-152,-126},{-132,-126}},
+  connect(u1ValOutIso, phValInlIso.uPh) annotation (Line(points={{-180,-120},{-148,
+          -120},{-148,-86},{-132,-86}},color={255,0,255}));
+  connect(u1ValInlIso, phValOutIso.uPh) annotation (Line(points={{-180,-100},{-152,
+          -100},{-152,-126},{-132,-126}},
                                        color={255,0,255}));
   connect(u1Pla, nPumHdrDp.u1Lea)
-    annotation (Line(points={{-180,140},{-20,140},{-20,-14},{-12,-14}},color={255,0,255}));
+    annotation (Line(points={{-180,160},{-20,160},{-20,6},{-12,6}},    color={255,0,255}));
   connect(enaLeaHdrPri.y1, booToInt1.u)
     annotation (Line(points={{-48,-100},{-40,-100},{-40,-62}},
                                                            color={255,0,255}));
   connect(nPumHdrPriNotDp0.y, nPumHdrPriNotDp.u1)
-    annotation (Line(points={{-78,100},{-60,100},{-60,106},{-12,106}},color={255,127,0}));
+    annotation (Line(points={{-78,120},{-60,120},{-60,126},{-12,126}},color={255,127,0}));
   connect(booToInt1.y, nPumHdrPriNotDp.u2)
-    annotation (Line(points={{-40,-38},{-40,94},{-12,94}},  color={255,127,0}));
+    annotation (Line(points={{-40,-38},{-40,114},{-12,114}},color={255,127,0}));
   connect(sorRunTimHdr.yIdx[1], y1LeaHdr_actual.index)
-    annotation (Line(points={{12,14},{40,14},{40,28}},color={255,127,0}));
+    annotation (Line(points={{12,34},{40,34},{40,48}},color={255,127,0}));
   connect(u1Pum_actual, sorRunTimHdr.u1Run)
-    annotation (Line(points={{-180,20},{-16,20},{-16,26},{-12,26}},color={255,0,255}));
+    annotation (Line(points={{-180,40},{-16,40},{-16,46},{-12,46}},color={255,0,255}));
   connect(enaHdr.y1, y1)
-    annotation (Line(points={{72,-20},{140,-20},{140,-60},{180,-60}},color={255,0,255}));
+    annotation (Line(points={{72,0},{140,0},{140,-60},{180,-60}},    color={255,0,255}));
   connect(nPumHdrDp.y, enaHdr.uSta)
-    annotation (Line(points={{12,-20},{48,-20}},color={255,127,0}));
+    annotation (Line(points={{12,0},{48,0}},    color={255,127,0}));
   connect(nPumHdrPriNotDp.y, enaHdr.uSta)
-    annotation (Line(points={{12,100},{20,100},{20,-20},{48,-20}},color={255,127,0}));
+    annotation (Line(points={{12,120},{20,120},{20,0},{48,0}},    color={255,127,0}));
   connect(u1Ava.y, enaHdr.u1Ava)
-    annotation (Line(points={{12,-100},{20,-100},{20,-26},{48,-26}},
+    annotation (Line(points={{12,-100},{20,-100},{20,-6},{48,-6}},
       color={255,0,255}));
   connect(sorRunTimHdr.yIdx, enaHdr.uIdxAltSor)
-    annotation (Line(points={{12,14},{40,14},{40,-14},{48,-14}},color={255,127,0}));
-  connect(sigPumPriDed.y, y1) annotation (Line(points={{12,-140},{140,-140},{
-          140,-60},{180,-60}}, color={255,0,255}));
+    annotation (Line(points={{12,34},{40,34},{40,6},{48,6}},    color={255,127,0}));
+  connect(sigPumPriDed.y, y1) annotation (Line(points={{12,-160},{140,-160},{140,
+          -60},{180,-60}},     color={255,0,255}));
+  connect(dpSet, staHdrDp.dpSet) annotation (Line(points={{-180,-20},{-140,-20},
+          {-140,0},{-132,0}}, color={0,0,127}));
+  connect(dp, staHdrDp.dp) annotation (Line(points={{-180,-40},{-138,-40},{-138,
+          -4},{-132,-4}}, color={0,0,127}));
+  connect(y, staHdrDp.y) annotation (Line(points={{-180,-60},{-136,-60},{-136,-8},
+          {-132,-8}}, color={0,0,127}));
   annotation (
     defaultComponentName="staPum",
     Icon(
@@ -281,7 +335,7 @@ equation
           textColor={0,0,255})}),
     Diagram(
       coordinateSystem(
-        extent={{-160,-160},{160,160}})),
+        extent={{-160,-180},{160,180}})),
     Documentation(
       info="<html>
 <h5>Plants with headered primary pumps that are not controlled to maintain differential pressure or flow setpoint</h5>
@@ -330,20 +384,26 @@ Buildings.Templates.Plants.Controls.Pumps.Generic.StagingHeaderedDeltaP</a>.
 </p>
 <h4>Details</h4>
 <p>
-At its current stage of development, this block contains no
-logic for handling faulted equipment. 
-It is therefore assumed that all pumps are available at all times.
-</p>
-<p>
 To simplify integration into the plant controller this block also
 serves as a pass-through for the dedicated primary pump command signal 
 that is generated in
 <a href=\"modelica://Buildings.Templates.Plants.Controls.StagingRotation.EventSequencing\">
 Buildings.Templates.Plants.Controls.StagingRotation.EventSequencing</a>.
+For this purpose, the block includes the parameter <code>is_hdr</code> to
+specify whether the pumps are headered or dedicated.
+</p>
+<p>
+At its current stage of development, this block contains no
+logic for handling faulted equipment. 
+It is therefore assumed that all pumps are available at all times.
 </p>
 </html>", revisions="<html>
 <ul>
 <li>
+May 31, 2024, by Antoine Gautier:<br/>
+Added failsafe conditions for headered variable speed pumps using ∆p pump speed control.
+</li>
+<li>
 March 29, 2024, by Antoine Gautier:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Templates/Plants/Controls/Pumps/Generic/StagingHeaderedDeltaP.mo b/Buildings/Templates/Plants/Controls/Pumps/Generic/StagingHeaderedDeltaP.mo
index 3775466401a..c10f638340e 100644
--- a/Buildings/Templates/Plants/Controls/Pumps/Generic/StagingHeaderedDeltaP.mo
+++ b/Buildings/Templates/Plants/Controls/Pumps/Generic/StagingHeaderedDeltaP.mo
@@ -1,127 +1,311 @@
 within Buildings.Templates.Plants.Controls.Pumps.Generic;
 block StagingHeaderedDeltaP
   "Staging logic for headered variable speed pumps using ∆p pump speed control"
-  parameter Integer nPum(
-    final min=1)
+  parameter Integer nPum(final min=1)
     "Number of pumps that operate at design conditions"
     annotation (Evaluate=true);
-  parameter Real V_flow_nominal(
-    final min=1E-6,
-    final unit="m3/s")
+  parameter Integer nSenDp(final min=1)
+    "Number of hardwired ∆p sensors"
+    annotation (Evaluate=true);
+  parameter Real V_flow_nominal(min=1E-6, unit="m3/s")
     "Design flow rate";
   parameter Real dtRun(
-    final min=0,
-    final unit="s")=10 * 60
-    "Runtime before triggering stage command";
+    min=0,
+    unit="s")=10*60
+    "Runtime before triggering stage change command based on efficiency condition";
+  parameter Real dtRunFaiSaf(
+    min=0,
+    unit="s")=5*60
+    "Runtime before triggering stage change command based on failsafe condition";
+  parameter Real dtRunFaiSafLowY(
+    min=0,
+    unit="s")=dtRun
+    "Runtime before triggering stage change command based on low pump speed failsafe condition";
   parameter Real dVOffUp(
-    final min=0,
-    final max=1,
-    final unit="1")=0.03
-    "Stage up flow point offset";
+    max=1,
+    min=0,
+    unit="1")=0.03
+    "Stage up flow point offset (>0)";
   parameter Real dVOffDow(
-    final min=0,
-    final max=1,
-    final unit="1")=dVOffUp
-    "Stage down flow point offset";
+    max=1,
+    min=0,
+    unit="1")=dVOffUp
+    "Stage down flow point offset (>0)";
+  parameter Real dpOff(
+    min=0,
+    unit="Pa")=1E4
+    "Stage change ∆p point offset (>0)";
+  parameter Real yUp(
+    min=0,
+    unit="1")=0.99
+    "Stage up pump speed point";
+  parameter Real yDow(
+    min=0,
+    unit="1")=0.4
+    "Stage down pump speed point";
   Buildings.Controls.OBC.CDL.Interfaces.RealInput V_flow(
-    final unit="m3/s")
-    "Flow rate"
-    annotation (Placement(transformation(extent={{-160,-20},{-120,20}}),
-      iconTransformation(extent={{-140,-80},{-100,-40}})));
+    final unit="m3/s") "Flow rate"
+    annotation (Placement(transformation(extent={{-200,40},{-160,80}}),
+      iconTransformation(extent={{-140,20},{-100,60}})));
   Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1Up
     "Stage up command"
-    annotation (Placement(transformation(extent={{120,20},{160,60}}),
+    annotation (Placement(transformation(extent={{160,40},{200,80}}),
       iconTransformation(extent={{100,40},{140,80}})));
   Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1Dow
     "Stage down command"
-    annotation (Placement(transformation(extent={{120,-60},{160,-20}}),
+    annotation (Placement(transformation(extent={{160,0},{200,40}}),
       iconTransformation(extent={{100,-80},{140,-40}})));
   Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1_actual[nPum]
     "Pump status"
-    annotation (Placement(transformation(extent={{-160,80},{-120,120}}),
-      iconTransformation(extent={{-140,40},{-100,80}})));
+    annotation (Placement(transformation(extent={{-200,140},{-160,180}}),
+      iconTransformation(extent={{-140,60},{-100,100}})));
   Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter norV(
     final k=1 / V_flow_nominal)
     "Normalize to design value"
-    annotation (Placement(transformation(extent={{-60,-10},{-40,10}})));
+    annotation (Placement(transformation(extent={{-120,50},{-100,70}})));
   Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter norN(
     final k=1 / nPum)
     "Normalize to design value"
-    annotation (Placement(transformation(extent={{-60,30},{-40,50}})));
+    annotation (Placement(transformation(extent={{-120,90},{-100,110}})));
   Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea[nPum]
     "Convert to real value"
-    annotation (Placement(transformation(extent={{-90,90},{-70,110}})));
-  Buildings.Controls.OBC.CDL.Reals.Greater gre
+    annotation (Placement(transformation(extent={{-150,150},{-130,170}})));
+  Buildings.Controls.OBC.CDL.Reals.Greater higV
     "Compare to stage up flow point"
-    annotation (Placement(transformation(extent={{30,-10},{50,10}})));
-  Buildings.Controls.OBC.CDL.Reals.Less les
-    "Compare to stage down flow point"
-    annotation (Placement(transformation(extent={{30,-50},{50,-30}})));
+    annotation (Placement(transformation(extent={{-30,50},{-10,70}})));
+  Buildings.Controls.OBC.CDL.Reals.Less lowV "Compare to stage down flow point"
+    annotation (Placement(transformation(extent={{-30,10},{-10,30}})));
   Buildings.Controls.OBC.CDL.Reals.AddParameter poiDow(
     p=- 1 / nPum - dVOffDow)
     "Calculate stage down flow point"
-    annotation (Placement(transformation(extent={{-20,10},{0,30}})));
+    annotation (Placement(transformation(extent={{-80,70},{-60,90}})));
   Buildings.Controls.OBC.CDL.Reals.AddParameter poiUp(
     p=- dVOffUp)
     "Calculate stage up flow point"
-    annotation (Placement(transformation(extent={{-20,50},{0,70}})));
-  Buildings.Templates.Plants.Controls.Utilities.TimerWithReset runUp(
-    final t=dtRun)
+    annotation (Placement(transformation(extent={{-80,110},{-60,130}})));
+  Buildings.Templates.Plants.Controls.Utilities.TimerWithReset timHigV(final t=
+        dtRun)
     "Return true if stage up condition is true for specified duration"
-    annotation (Placement(transformation(extent={{70,-10},{90,10}})));
-  Buildings.Templates.Plants.Controls.Utilities.TimerWithReset runDow(
-    final t=dtRun)
+    annotation (Placement(transformation(extent={{10,50},{30,70}})));
+  Buildings.Templates.Plants.Controls.Utilities.TimerWithReset timLowV(final t=
+        dtRun)
     "Return true if stage down condition is true for specified duration"
-    annotation (Placement(transformation(extent={{70,-50},{90,-30}})));
+    annotation (Placement(transformation(extent={{10,10},{30,30}})));
   Buildings.Controls.OBC.CDL.Logical.Change cha[nPum]
     "Return true when pump status changes"
-    annotation (Placement(transformation(extent={{-90,-70},{-70,-50}})));
+    annotation (Placement(transformation(extent={{-148,10},{-128,30}})));
   Buildings.Controls.OBC.CDL.Reals.MultiSum nOpe(
     nin=nPum)
     "Return number of operating pumps"
-    annotation (Placement(transformation(extent={{-60,90},{-40,110}})));
+    annotation (Placement(transformation(extent={{-120,150},{-100,170}})));
   Buildings.Controls.OBC.CDL.Logical.MultiOr anyCha(
     nin=nPum)
     "Return true when any pump status changes"
-    annotation (Placement(transformation(extent={{-50,-70},{-30,-50}})));
+    annotation (Placement(transformation(extent={{-108,10},{-88,30}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput y(final unit="1")
+    "Pump speed command" annotation (Placement(transformation(extent={{-200,-40},
+            {-160,0}}),   iconTransformation(extent={{-140,-100},{-100,-60}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput dp[nSenDp](each final unit="Pa")
+    "Loop differential pressure" annotation (Placement(transformation(extent={{-200,
+            -100},{-160,-60}}), iconTransformation(extent={{-140,-60},{-100,-20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput dpSet[nSenDp](each final unit
+      ="Pa") "Loop differential pressure setpoint" annotation (Placement(
+        transformation(extent={{-200,-160},{-160,-120}}), iconTransformation(
+          extent={{-140,-20},{-100,20}})));
+  Buildings.Controls.OBC.CDL.Reals.GreaterThreshold higY(final t=yUp)
+    "True if pump speed command exceeds high limit"
+    annotation (Placement(transformation(extent={{-110,-30},{-90,-10}})));
+  Utilities.TimerWithReset timHigY(final t=dtRunFaiSaf)
+                                                     "Timer"
+    annotation (Placement(transformation(extent={{-70,-30},{-50,-10}})));
+  Buildings.Controls.OBC.CDL.Reals.Subtract delDpSet[nSenDp]
+    "Difference between dp measurement and setpoint"
+    annotation (Placement(transformation(extent={{-150,-130},{-130,-110}})));
+  Buildings.Controls.OBC.CDL.Reals.LessThreshold lowDp[nSenDp](each final t=-
+        dpOff)
+    "True if dp < setpoint - dpOff"
+    annotation (Placement(transformation(extent={{-110,-130},{-90,-110}})));
+  Utilities.TimerWithReset timLowDp[nSenDp](each final t=dtRunFaiSaf)
+                                                                 "Timer"
+    annotation (Placement(transformation(extent={{-70,-130},{-50,-110}})));
+  Buildings.Controls.OBC.CDL.Logical.And higYAndLowDp
+    "Return true when pump status changes"
+    annotation (Placement(transformation(extent={{10,-70},{30,-50}})));
+  Buildings.Controls.OBC.CDL.Logical.Or effOrFailSafUp
+    "True if efficiency OR failsafe condition met"
+    annotation (Placement(transformation(extent={{90,50},{110,70}})));
+  Buildings.Controls.OBC.CDL.Reals.LessThreshold lowY(final t=yDow)
+    "True if pump speed command is less than low limit"
+    annotation (Placement(transformation(extent={{-110,-70},{-90,-50}})));
+  Utilities.TimerWithReset timLowY(final t=dtRunFaiSafLowY)
+                                                     "Timer"
+    annotation (Placement(transformation(extent={{-70,-70},{-50,-50}})));
+  Utilities.TimerWithReset timHigDp[nSenDp](each final t=dtRunFaiSaf)
+                                                                 "Timer"
+    annotation (Placement(transformation(extent={{-70,-170},{-50,-150}})));
+  Buildings.Controls.OBC.CDL.Reals.GreaterThreshold higDp[nSenDp](each final t=
+        -dpOff)
+               "True if dp > setpoint - dpOff"
+    annotation (Placement(transformation(extent={{-110,-170},{-90,-150}})));
+  Buildings.Controls.OBC.CDL.Logical.Latch lckEff
+    "Lock efficiency condition true signal until failsafe condition true"
+    annotation (Placement(transformation(extent={{50,-90},{70,-70}})));
+  Buildings.Controls.OBC.CDL.Logical.Latch lckFaiSaf
+    "Lock failsafe condition true signal until efficiency condition true"
+    annotation (Placement(transformation(extent={{50,-130},{70,-110}})));
+  Buildings.Controls.OBC.CDL.Logical.Pre preEff
+    "True if lag pump staged on based on efficiency condition"
+    annotation (Placement(transformation(extent={{70,-50},{50,-30}})));
+  Buildings.Controls.OBC.CDL.Logical.Pre preFaiSaf
+    "True if lag pump staged on based on failsafe condition"
+    annotation (Placement(transformation(extent={{70,-170},{50,-150}})));
+  Buildings.Controls.OBC.CDL.Logical.And staDowAndPreEff
+    "Stage down efficiency condition met and lag pump staged on based on efficiency condition"
+    annotation (Placement(transformation(extent={{50,10},{70,30}})));
+  Buildings.Controls.OBC.CDL.Logical.MultiAnd staDowAndPreFaiSaf(nin=3)
+    "Stage down failsafe condition met and lag pump staged on based on failsafe condition"
+    annotation (Placement(transformation(extent={{10,-110},{30,-90}})));
+  Buildings.Controls.OBC.CDL.Logical.Or effOrFailSafDow
+    "True if efficiency OR failsafe condition met"
+    annotation (Placement(transformation(extent={{90,10},{110,30}})));
+  Buildings.Controls.OBC.CDL.Logical.Edge edgUp
+    "Trigger stage up command when the conditions are met"
+    annotation (Placement(transformation(extent={{120,50},{140,70}})));
+  Buildings.Controls.OBC.CDL.Logical.Edge edgDow
+    "Trigger stage down command when the conditions are met"
+    annotation (Placement(transformation(extent={{120,10},{140,30}})));
+  Buildings.Controls.OBC.CDL.Logical.MultiAnd allLowDp(nin=nSenDp)
+    "True if condition met for all sensors"
+    annotation (Placement(transformation(extent={{-30,-130},{-10,-110}})));
+  Buildings.Controls.OBC.CDL.Logical.MultiAnd allHigDp(nin=nSenDp)
+    "True if condition met for all sensors"
+    annotation (Placement(transformation(extent={{-30,-170},{-10,-150}})));
+  Buildings.Controls.OBC.CDL.Routing.BooleanScalarReplicator booScaRep(final
+      nout=nSenDp) "Replicate signal" annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=-90,
+        origin={-80,-90})));
 equation
   connect(norN.y, poiDow.u)
-    annotation (Line(points={{-38,40},{-30,40},{-30,20},{-22,20}},color={0,0,127}));
+    annotation (Line(points={{-98,100},{-90,100},{-90,80},{-82,80}},
+                                                                  color={0,0,127}));
   connect(norN.y, poiUp.u)
-    annotation (Line(points={{-38,40},{-30,40},{-30,60},{-22,60}},color={0,0,127}));
-  connect(norV.y, gre.u1)
-    annotation (Line(points={{-38,0},{28,0}},color={0,0,127}));
-  connect(poiUp.y, gre.u2)
-    annotation (Line(points={{2,60},{20,60},{20,-8},{28,-8}},color={0,0,127}));
-  connect(poiDow.y, les.u2)
-    annotation (Line(points={{2,20},{10,20},{10,-48},{28,-48}},color={0,0,127}));
-  connect(norV.y, les.u1)
-    annotation (Line(points={{-38,0},{0,0},{0,-40},{28,-40}},color={0,0,127}));
-  connect(les.y, runDow.u)
-    annotation (Line(points={{52,-40},{68,-40}},color={255,0,255}));
+    annotation (Line(points={{-98,100},{-90,100},{-90,120},{-82,120}},
+                                                                  color={0,0,127}));
+  connect(norV.y, higV.u1)
+    annotation (Line(points={{-98,60},{-32,60}}, color={0,0,127}));
+  connect(poiUp.y, higV.u2) annotation (Line(points={{-58,120},{-40,120},{-40,52},
+          {-32,52}}, color={0,0,127}));
+  connect(poiDow.y, lowV.u2) annotation (Line(points={{-58,80},{-50,80},{-50,12},
+          {-32,12}}, color={0,0,127}));
+  connect(norV.y, lowV.u1) annotation (Line(points={{-98,60},{-60,60},{-60,20},{
+          -32,20}}, color={0,0,127}));
+  connect(lowV.y, timLowV.u)
+    annotation (Line(points={{-8,20},{8,20}},  color={255,0,255}));
   connect(V_flow, norV.u)
-    annotation (Line(points={{-140,0},{-62,0}},color={0,0,127}));
-  connect(gre.y, runUp.u)
-    annotation (Line(points={{52,0},{68,0}},color={255,0,255}));
-  connect(runUp.passed, y1Up)
-    annotation (Line(points={{92,-8},{100,-8},{100,40},{140,40}},color={255,0,255}));
-  connect(runDow.passed, y1Dow)
-    annotation (Line(points={{92,-48},{100,-48},{100,-40},{140,-40}},color={255,0,255}));
+    annotation (Line(points={{-180,60},{-122,60}},
+                                               color={0,0,127}));
+  connect(higV.y, timHigV.u)
+    annotation (Line(points={{-8,60},{8,60}},  color={255,0,255}));
   connect(booToRea.y, nOpe.u)
-    annotation (Line(points={{-68,100},{-62,100}},color={0,0,127}));
+    annotation (Line(points={{-128,160},{-122,160}},
+                                                  color={0,0,127}));
   connect(u1_actual, booToRea.u)
-    annotation (Line(points={{-140,100},{-92,100}},color={255,0,255}));
+    annotation (Line(points={{-180,160},{-152,160}},
+                                                   color={255,0,255}));
   connect(u1_actual, cha.u)
-    annotation (Line(points={{-140,100},{-100,100},{-100,-60},{-92,-60}},color={255,0,255}));
+    annotation (Line(points={{-180,160},{-156,160},{-156,20},{-150,20}}, color={255,0,255}));
   connect(nOpe.y, norN.u)
-    annotation (Line(points={{-38,100},{-30,100},{-30,70},{-70,70},{-70,40},{-62,40}},
+    annotation (Line(points={{-98,160},{-90,160},{-90,130},{-130,130},{-130,100},
+          {-122,100}},
       color={0,0,127}));
   connect(cha.y, anyCha.u)
-    annotation (Line(points={{-68,-60},{-52,-60}},color={255,0,255}));
-  connect(anyCha.y, runUp.reset)
-    annotation (Line(points={{-28,-60},{60,-60},{60,-8},{68,-8}},color={255,0,255}));
-  connect(anyCha.y, runDow.reset)
-    annotation (Line(points={{-28,-60},{60,-60},{60,-48},{68,-48}},color={255,0,255}));
+    annotation (Line(points={{-126,20},{-110,20}},color={255,0,255}));
+  connect(anyCha.y, timHigV.reset) annotation (Line(points={{-86,20},{-80,20},{
+          -80,40},{0,40},{0,52},{8,52}},
+                    color={255,0,255}));
+  connect(anyCha.y, timLowV.reset) annotation (Line(points={{-86,20},{-80,20},{
+          -80,0},{0,0},{0,12},{8,12}},
+                    color={255,0,255}));
+  connect(higY.y, timHigY.u)
+    annotation (Line(points={{-88,-20},{-72,-20}}, color={255,0,255}));
+  connect(y, higY.u)
+    annotation (Line(points={{-180,-20},{-112,-20}},color={0,0,127}));
+  connect(anyCha.y, timHigY.reset) annotation (Line(points={{-86,20},{-80,20},{
+          -80,-28},{-72,-28}},
+                           color={255,0,255}));
+  connect(dp, delDpSet.u1) annotation (Line(points={{-180,-80},{-156,-80},{-156,
+          -114},{-152,-114}}, color={0,0,127}));
+  connect(dpSet, delDpSet.u2) annotation (Line(points={{-180,-140},{-156,-140},{
+          -156,-126},{-152,-126}}, color={0,0,127}));
+  connect(delDpSet.y, lowDp.u)
+    annotation (Line(points={{-128,-120},{-112,-120}},color={0,0,127}));
+  connect(lowDp.y, timLowDp.u)
+    annotation (Line(points={{-88,-120},{-72,-120}}, color={255,0,255}));
+  connect(timHigY.passed, higYAndLowDp.u1) annotation (Line(points={{-48,-28},{
+          2,-28},{2,-60},{8,-60}}, color={255,0,255}));
+  connect(timHigV.passed, effOrFailSafUp.u1) annotation (Line(points={{32,52},{36,
+          52},{36,60},{88,60}},  color={255,0,255}));
+  connect(higYAndLowDp.y, effOrFailSafUp.u2) annotation (Line(points={{32,-60},{
+          40,-60},{40,52},{88,52}},  color={255,0,255}));
+  connect(y, lowY.u) annotation (Line(points={{-180,-20},{-120,-20},{-120,-60},
+          {-112,-60}},
+                     color={0,0,127}));
+  connect(lowY.y, timLowY.u)
+    annotation (Line(points={{-88,-60},{-72,-60}}, color={255,0,255}));
+  connect(anyCha.y, timLowY.reset) annotation (Line(points={{-86,20},{-80,20},{
+          -80,-68},{-72,-68}},
+                           color={255,0,255}));
+  connect(higDp.y, timHigDp.u)
+    annotation (Line(points={{-88,-160},{-72,-160}}, color={255,0,255}));
+  connect(delDpSet.y, higDp.u) annotation (Line(points={{-128,-120},{-120,-120},
+          {-120,-160},{-112,-160}},color={0,0,127}));
+  connect(higYAndLowDp.y, lckEff.clr) annotation (Line(points={{32,-60},{40,-60},
+          {40,-86},{48,-86}}, color={255,0,255}));
+  connect(timHigV.passed, lckEff.u) annotation (Line(points={{32,52},{36,52},{36,
+          -80},{48,-80}}, color={255,0,255}));
+  connect(higYAndLowDp.y, lckFaiSaf.u) annotation (Line(points={{32,-60},{40,-60},
+          {40,-120},{48,-120}}, color={255,0,255}));
+  connect(timHigV.passed, lckFaiSaf.clr) annotation (Line(points={{32,52},{36,52},
+          {36,-126},{48,-126}}, color={255,0,255}));
+  connect(lckFaiSaf.y, preFaiSaf.u) annotation (Line(points={{72,-120},{80,-120},
+          {80,-160},{72,-160}},  color={255,0,255}));
+  connect(lckEff.y, preEff.u) annotation (Line(points={{72,-80},{76,-80},{76,-40},
+          {72,-40}}, color={255,0,255}));
+  connect(preEff.y, staDowAndPreEff.u2) annotation (Line(points={{48,-40},{46,-40},
+          {46,12},{48,12}}, color={255,0,255}));
+  connect(timLowV.passed, staDowAndPreEff.u1) annotation (Line(points={{32,12},{
+          44,12},{44,20},{48,20}}, color={255,0,255}));
+  connect(timLowY.passed, staDowAndPreFaiSaf.u[1]) annotation (Line(points={{-48,-68},
+          {6,-68},{6,-102.333},{8,-102.333}},      color={255,0,255}));
+  connect(preFaiSaf.y, staDowAndPreFaiSaf.u[2]) annotation (Line(points={{48,-160},
+          {4,-160},{4,-100},{8,-100}},         color={255,0,255}));
+  connect(staDowAndPreEff.y, effOrFailSafDow.u1)
+    annotation (Line(points={{72,20},{88,20}},  color={255,0,255}));
+  connect(staDowAndPreFaiSaf.y, effOrFailSafDow.u2) annotation (Line(points={{32,-100},
+          {80,-100},{80,12},{88,12}},          color={255,0,255}));
+  connect(effOrFailSafUp.y, edgUp.u)
+    annotation (Line(points={{112,60},{118,60}}, color={255,0,255}));
+  connect(edgUp.y, y1Up)
+    annotation (Line(points={{142,60},{180,60}}, color={255,0,255}));
+  connect(effOrFailSafDow.y, edgDow.u)
+    annotation (Line(points={{112,20},{118,20}}, color={255,0,255}));
+  connect(edgDow.y, y1Dow)
+    annotation (Line(points={{142,20},{180,20}}, color={255,0,255}));
+  connect(timLowDp.passed, allLowDp.u) annotation (Line(points={{-48,-128},{-40,
+          -128},{-40,-120},{-32,-120}}, color={255,0,255}));
+  connect(timHigDp.passed, allHigDp.u) annotation (Line(points={{-48,-168},{-40,
+          -168},{-40,-160},{-32,-160}}, color={255,0,255}));
+  connect(allLowDp.y, higYAndLowDp.u2) annotation (Line(points={{-8,-120},{0,-120},
+          {0,-68},{8,-68}}, color={255,0,255}));
+  connect(allHigDp.y, staDowAndPreFaiSaf.u[3]) annotation (Line(points={{-8,-160},
+          {2,-160},{2,-97.6667},{8,-97.6667}}, color={255,0,255}));
+  connect(anyCha.y, booScaRep.u) annotation (Line(points={{-86,20},{-80,20},{
+          -80,-78},{-80,-78},{-80,-78}}, color={255,0,255}));
+  connect(booScaRep.y, timLowDp.reset) annotation (Line(points={{-80,-102},{-80,
+          -128},{-72,-128}}, color={255,0,255}));
+  connect(booScaRep.y, timHigDp.reset) annotation (Line(points={{-80,-102},{-80,
+          -168},{-72,-168}}, color={255,0,255}));
   annotation (
     defaultComponentName="staPum",
     Icon(
@@ -152,19 +336,29 @@ Pumps are assumed to be equally sized.
 <i>FR = V_flow / V_flow_nominal</i>
 </p>
 <p>
-The next lag pump is enabled whenever the following is true for 
-<code>dtRun</code>:
-</p>
-<p>
-<i>FR &gt; nPum_actual / nPum − dVOffUp</i>
-</p>
-<p>
-The last lag pump is disabled whenever the following is true for 
-<code>dtRun</code>:
-</p>
-<p>
-<i>FR &lt; (nPum_actual - 1) / nPum − dVOffDow</i>
+The next lag pump is enabled whenever either:
 </p>
+<ul>
+<li>Efficiency condition:
+<i>FR &gt; nPum_actual / nPum − dVOffUp</i> is true for <code>dtRun</code>; or
+</li>
+<li>Failsafe condition:
+Pump speed command &gt; <code>yUp</code> for <code>dtRunFaiSaf</code>
+and loop ∆p &lt; setpoint – <code>dpOff</code> for <code>dtRunFaiSaf</code>
+for all hardwired differential pressure sensors.
+</li>
+</ul>
+<p>The last lag pump is disabled whenever either:</p>
+<ul>
+<li>The lag pump was staged on based on the efficiency condition and 
+<i>FR &lt; (nPum_actual - 1) / nPum − dVOffDow</i> is true for <code>dtRun</code>; or
+</li>
+<li>The lag pump was staged on based on the failsafe condition, 
+pump speed command &lt; <code>yDow</code> for <code>dtRunFaiSafLowY</code>
+and loop ∆p &gt; setpoint – <code>dpOff</code> for <code>dtRunFaiSaf</code>
+for all hardwired differential pressure sensors.
+</li>
+</ul>
 <p>
 If desired, the stage down flow point <code>dVOffDow</code> can be
 offset slightly below the stage up point <code>dVOffUp</code> to
@@ -175,7 +369,8 @@ The timers are reset to zero when the status of a pump changes.
 This is necessary to ensure the minimum pump runtime with rapidly changing loads.
 </p>
 <h4>Details</h4>
-<p>This logic is prescribed in ASHRAE, 2021 for:</p>
+<p>The staging logic based on the efficiency condition (excluding the failsafe condition) 
+is prescribed in ASHRAE, 2021 for:</p>
 <ul>
 <li>
 headered variable speed primary pumps in primary-only chiller
@@ -197,17 +392,6 @@ i.e., the number of pumps matches the number of chillers or boilers.
 The actual logic for generating the pump enable commands is part of the
 staging event sequencing.
 </p>
-<p>
-A \"if\" condition is used to generate the stage up and down command as opposed
-to a \"when\" condition. This means that the command remains true as long as the
-condition is verified. This is necessary, for example, if no higher stage is 
-available when a stage up command is triggered. Using a \"when\" condition &ndash;
-which is only valid at the point in time at which the condition becomes true &ndash; 
-would prevent the plant from staging when a higher stage becomes available again.
-To avoid multiple consecutive stage changes, the block that receives the stage up
-and down command and computes the stage index must enforce a minimum stage runtime
-of <code>dtRun</code>.
-</p>
 <h4>References</h4>
 <ul>
 <li id=\"ASHRAE2021\">
@@ -219,6 +403,11 @@ for HVAC Systems. Atlanta, GA.
 ", revisions="<html>
 <ul>
 <li>
+May 31, 2024, by Antoine Gautier:<br/>
+Added failsafe conditions and refactored to generate a stage change command
+at the exact time when the conditions are met.
+</li>
+<li>
 March 29, 2024, by Antoine Gautier:<br/>
 First implementation.
 </li>
@@ -226,5 +415,5 @@ First implementation.
 </html>"),
     Diagram(
       coordinateSystem(
-        extent={{-120,-120},{120,120}})));
+        extent={{-160,-180},{160,180}})));
 end StagingHeaderedDeltaP;
diff --git a/Buildings/Templates/Plants/Controls/Pumps/Generic/Validation/StagingHeadered.mo b/Buildings/Templates/Plants/Controls/Pumps/Generic/Validation/StagingHeadered.mo
index 177119415fb..c4419470619 100644
--- a/Buildings/Templates/Plants/Controls/Pumps/Generic/Validation/StagingHeadered.mo
+++ b/Buildings/Templates/Plants/Controls/Pumps/Generic/Validation/StagingHeadered.mo
@@ -15,6 +15,7 @@ model StagingHeadered
     have_valOutIso=true,
     final nEqu=nEqu,
     final nPum=nPum,
+    nSenDp=1,
     final V_flow_nominal=V_flow_nominal)
     "Pump staging – Headered primary pumps with ∆p control"
     annotation (Placement(transformation(extent={{0,-50},{20,-30}})));
@@ -50,8 +51,9 @@ model StagingHeadered
     have_valOutIso=true,
     final nEqu=nEqu,
     final nPum=nPum,
+    nSenDp=1,
     final V_flow_nominal=V_flow_nominal)
-    "Pump staging – Headered primary pumps with ∆p control"
+    "Pump staging – Headered secondary pumps with ∆p control"
     annotation (Placement(transformation(extent={{0,-90},{20,-70}})));
   Buildings.Templates.Plants.Controls.Pumps.Generic.StagingHeadered staPumPriNoDp(
     is_pri=true,
@@ -75,11 +77,17 @@ model StagingHeadered
     final V_flow_nominal=V_flow_nominal)
     "Pump staging – Dedicated primary pumps"
     annotation (Placement(transformation(extent={{0,30},{20,50}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant dpSet(k=Buildings.Templates.Data.Defaults.dpChiWatLocSet_max)
+    "Loop differential pressure setpoint"
+    annotation (Placement(transformation(extent={{-110,-50},{-90,-30}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant yPum(k=0.6)
+    "Pump speed command"
+    annotation (Placement(transformation(extent={{-110,-90},{-90,-70}})));
 equation
   connect(ratFlo.y[1],VPri_flow. u)
     annotation (Line(points={{-88,0},{-70,0}},color={0,0,127}));
   connect(VPri_flow.y, staPumPriDp.V_flow) annotation (Line(points={{-46,0},{-40,
-          0},{-40,-48},{-2,-48}}, color={0,0,127}));
+          0},{-40,-42},{-2,-42}}, color={0,0,127}));
   connect(booToRea.y,zerOrdHol. u)
     annotation (Line(points={{58,80},{52,80}},
                                              color={0,0,127}));
@@ -88,27 +96,39 @@ equation
   connect(staPumPriDp.y1, booToRea.u) annotation (Line(points={{22,-40},{100,-40},
           {100,80},{82,80}}, color={255,0,255}));
   connect(greThr.y, staPumPriDp.u1Pum_actual) annotation (Line(points={{-2,80},{
-          -20,80},{-20,-44},{-2,-44}}, color={255,0,255}));
+          -20,80},{-20,-40},{-2,-40}}, color={255,0,255}));
   connect(u1.y, staPumPriDp.u1ValInlIso) annotation (Line(points={{-88,40},{-30,
-          40},{-30,-36},{-2,-36}}, color={255,0,255}));
+          40},{-30,-34},{-2,-34}}, color={255,0,255}));
   connect(u1.y, staPumPriDp.u1ValOutIso) annotation (Line(points={{-88,40},{-30,
-          40},{-30,-38},{-2,-38}}, color={255,0,255}));
+          40},{-30,-36},{-2,-36}}, color={255,0,255}));
   connect(u1.y[1], staPumSecDp.u1Pla) annotation (Line(points={{-88,40},{-30,40},
           {-30,-72},{-2,-72}}, color={255,0,255}));
   connect(greThr.y, staPumSecDp.u1Pum_actual) annotation (Line(points={{-2,80},{
-          -20,80},{-20,-84},{-2,-84}}, color={255,0,255}));
+          -20,80},{-20,-80},{-2,-80}}, color={255,0,255}));
   connect(VPri_flow.y, staPumSecDp.V_flow) annotation (Line(points={{-46,0},{-40,
-          0},{-40,-88},{-2,-88}}, color={0,0,127}));
+          0},{-40,-82},{-2,-82}}, color={0,0,127}));
   connect(u1.y, staPumPriNoDp.u1ValInlIso) annotation (Line(points={{-88,40},{-30,
-          40},{-30,4},{-2,4}}, color={255,0,255}));
+          40},{-30,6},{-2,6}}, color={255,0,255}));
   connect(u1.y, staPumPriNoDp.u1Pum) annotation (Line(points={{-88,40},{-30,40},
-          {-30,-2},{-2,-2}}, color={255,0,255}));
+          {-30,2},{-2,2}},   color={255,0,255}));
   connect(greThr.y, staPumPriNoDp.u1Pum_actual) annotation (Line(points={{-2,80},
-          {-20,80},{-20,-4},{-2,-4}}, color={255,0,255}));
+          {-20,80},{-20,0},{-2,0}},   color={255,0,255}));
   connect(u1.y, staPumPriDed.u1Pum) annotation (Line(points={{-88,40},{-30,40},{
-          -30,38},{-2,38}}, color={255,0,255}));
+          -30,42},{-2,42}}, color={255,0,255}));
   connect(greThr.y, staPumPriDed.u1Pum_actual) annotation (Line(points={{-2,80},
-          {-20,80},{-20,36},{-2,36}}, color={255,0,255}));
+          {-20,80},{-20,40},{-2,40}}, color={255,0,255}));
+  connect(yPum.y, staPumPriDp.y) annotation (Line(points={{-88,-80},{-60,-80},{-60,
+          -48},{-2,-48}}, color={0,0,127}));
+  connect(yPum.y, staPumSecDp.y) annotation (Line(points={{-88,-80},{-60,-80},{-60,
+          -88},{-2,-88}}, color={0,0,127}));
+  connect(dpSet.y, staPumPriDp.dp[1]) annotation (Line(points={{-88,-40},{-80,-40},
+          {-80,-46},{-2,-46}}, color={0,0,127}));
+  connect(dpSet.y, staPumPriDp.dpSet[1]) annotation (Line(points={{-88,-40},{-80,-40},
+          {-80,-44},{-2,-44}}, color={0,0,127}));
+  connect(dpSet.y, staPumSecDp.dp[1]) annotation (Line(points={{-88,-40},{-80,-40},
+          {-80,-86},{-2,-86}}, color={0,0,127}));
+  connect(dpSet.y, staPumSecDp.dpSet[1]) annotation (Line(points={{-88,-40},{-80,-40},
+          {-80,-84},{-2,-84}}, color={0,0,127}));
   annotation (
     __Dymola_Commands(
       file=
diff --git a/Buildings/Templates/Plants/Controls/Pumps/Generic/Validation/StagingHeaderedDeltaP.mo b/Buildings/Templates/Plants/Controls/Pumps/Generic/Validation/StagingHeaderedDeltaP.mo
index 2811f125c7a..3c788a44151 100644
--- a/Buildings/Templates/Plants/Controls/Pumps/Generic/Validation/StagingHeaderedDeltaP.mo
+++ b/Buildings/Templates/Plants/Controls/Pumps/Generic/Validation/StagingHeaderedDeltaP.mo
@@ -11,73 +11,161 @@ model StagingHeaderedDeltaP
       1, 1;
       1.5, 1;
       2, 0],
-    timeScale=3600)
-    "Flow ratio to design value"
-    annotation (Placement(transformation(extent={{-110,-10},{-90,10}})));
+    timeScale=3600) "Flow ratio to design value"
+    annotation (Placement(transformation(extent={{-110,50},{-90,70}})));
   Buildings.Controls.OBC.CDL.Logical.Sources.TimeTable enaLea(
     table=[
       0, 1;
       8000, 0],
     period=8400)
     "Lead pump enable signal"
-    annotation (Placement(transformation(extent={{-110,30},{-90,50}})));
+    annotation (Placement(transformation(extent={{-110,110},{-90,130}})));
   Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter VPri_flow(
     final k=V_flow_nominal)
     "Flow rate"
-    annotation (Placement(transformation(extent={{-40,-10},{-20,10}})));
+    annotation (Placement(transformation(extent={{-80,50},{-60,70}})));
   Buildings.Templates.Plants.Controls.Pumps.Generic.StagingHeaderedDeltaP staPum(
     final nPum=nPum,
+    nSenDp=1,
     final V_flow_nominal=V_flow_nominal)
-    "Pump staging"
-    annotation (Placement(transformation(extent={{0,-10},{20,10}})));
+    "Pump staging triggered by efficiency conditions only"
+    annotation (Placement(transformation(extent={{10,50},{30,70}})));
   Utilities.StageIndex idxSta(
     have_inpAva=false,
-    final nSta=nPum,
-    final dtRun=staPum.dtRun)
+    final nSta=nPum)
     "Calculate stage index = number of enabled pumps"
-    annotation (Placement(transformation(extent={{50,-10},{70,10}})));
+    annotation (Placement(transformation(extent={{50,50},{70,70}})));
   Buildings.Controls.OBC.CDL.Integers.GreaterEqualThreshold y1[nPum](
     final t={i for i in 1:nPum})
     "Pump command"
-    annotation (Placement(transformation(extent={{62,50},{42,70}})));
+    annotation (Placement(transformation(extent={{70,90},{50,110}})));
   Buildings.Controls.OBC.CDL.Routing.IntegerScalarReplicator rep(
     nout=nPum)
     "Replicate signal"
-    annotation (Placement(transformation(extent={{92,50},{72,70}})));
+    annotation (Placement(transformation(extent={{100,90},{80,110}})));
   Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea[nPum]
     "Convert command signal to real value"
-    annotation (Placement(transformation(extent={{32,50},{12,70}})));
+    annotation (Placement(transformation(extent={{30,90},{10,110}})));
   Buildings.Controls.OBC.CDL.Discrete.ZeroOrderHold zerOrdHol[nPum](
     each samplePeriod=1)
     "Hold signal value"
-    annotation (Placement(transformation(extent={{2,50},{-18,70}})));
+    annotation (Placement(transformation(extent={{0,90},{-20,110}})));
   Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr[nPum]
     "Compare to zero to compute equipment status"
-    annotation (Placement(transformation(extent={{-28,50},{-48,70}})));
+    annotation (Placement(transformation(extent={{-30,90},{-50,110}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant dpSet(k=Buildings.Templates.Data.Defaults.dpChiWatLocSet_max)
+    "Loop differential pressure setpoint"
+    annotation (Placement(transformation(extent={{-50,30},{-30,50}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant yPum(k=0.6)
+    "Pump speed command"
+    annotation (Placement(transformation(extent={{-110,10},{-90,30}})));
+  Buildings.Templates.Plants.Controls.Pumps.Generic.StagingHeaderedDeltaP staPumFaiSaf(
+    final nPum=nPum,
+    nSenDp=1,
+    final V_flow_nominal=V_flow_nominal,
+    dVOffUp=0) "Pump staging triggered by failsafe conditions only"
+    annotation (Placement(transformation(extent={{10,-70},{30,-50}})));
+  Utilities.StageIndex idxSta1(have_inpAva=false, final nSta=nPum)
+    "Calculate stage index = number of enabled pumps"
+    annotation (Placement(transformation(extent={{50,-70},{70,-50}})));
+  Buildings.Controls.OBC.CDL.Integers.GreaterEqualThreshold y2[nPum](final t={i
+        for i in 1:nPum})
+    "Pump command"
+    annotation (Placement(transformation(extent={{70,-30},{50,-10}})));
+  Buildings.Controls.OBC.CDL.Routing.IntegerScalarReplicator rep1(nout=nPum)
+    "Replicate signal"
+    annotation (Placement(transformation(extent={{100,-30},{80,-10}})));
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea1
+                                                               [nPum]
+    "Convert command signal to real value"
+    annotation (Placement(transformation(extent={{30,-30},{10,-10}})));
+  Buildings.Controls.OBC.CDL.Discrete.ZeroOrderHold zerOrdHol1
+                                                             [nPum](each
+      samplePeriod=1)
+    "Hold signal value"
+    annotation (Placement(transformation(extent={{-10,-30},{-30,-10}})));
+  Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr1
+                                                          [nPum]
+    "Compare to zero to compute equipment status"
+    annotation (Placement(transformation(extent={{-40,-30},{-60,-10}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiSum mulSum(k=fill(1/nPum*V_flow_nominal*
+        0.99, nPum), nin=nPum)
+    "Compute nPum_actual / nPum * V_flow_nominal * 0.99"
+    annotation (Placement(transformation(extent={{-100,-70},{-80,-50}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.TimeTable dp(
+    table=[0,-2*staPumFaiSaf.dpOff; 1,-2*staPumFaiSaf.dpOff; 1.5,0; 2,0],
+    offset={dpSet.k},
+    timeScale=3600) "Loop differential pressure"
+    annotation (Placement(transformation(extent={{-70,-90},{-50,-70}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.TimeTable yPum1(table=[0,1; 1,1; 1.5,
+        0.3; 2,0.3], timeScale=3600) "Pump speed command"
+    annotation (Placement(transformation(extent={{-40,-110},{-20,-90}})));
 equation
   connect(ratFlo.y[1], VPri_flow.u)
-    annotation (Line(points={{-88,0},{-42,0}},color={0,0,127}));
+    annotation (Line(points={{-88,60},{-82,60}},
+                                              color={0,0,127}));
   connect(VPri_flow.y, staPum.V_flow)
-    annotation (Line(points={{-18,0},{-10,0},{-10,-6},{-2,-6}},color={0,0,127}));
+    annotation (Line(points={{-58,60},{-4,60},{-4,64},{8,64}}, color={0,0,127}));
   connect(staPum.y1Up, idxSta.u1Up)
-    annotation (Line(points={{22,6},{40,6},{40,2},{48,2}},color={255,0,255}));
+    annotation (Line(points={{32,66},{36,66},{36,62},{48,62}},
+                                                          color={255,0,255}));
   connect(staPum.y1Dow, idxSta.u1Dow)
-    annotation (Line(points={{22,-6},{40,-6},{40,-2},{48,-2}},color={255,0,255}));
+    annotation (Line(points={{32,54},{36,54},{36,58},{48,58}},color={255,0,255}));
   connect(rep.y, y1.u)
-    annotation (Line(points={{70,60},{64,60}},color={255,127,0}));
+    annotation (Line(points={{78,100},{72,100}},
+                                              color={255,127,0}));
   connect(enaLea.y[1], idxSta.u1Lea)
-    annotation (Line(points={{-88,40},{40,40},{40,6},{48,6}},color={255,0,255}));
+    annotation (Line(points={{-88,120},{40,120},{40,66},{48,66}},
+                                                             color={255,0,255}));
   connect(idxSta.y, rep.u)
-    annotation (Line(points={{72,0},{100,0},{100,60},{94,60}},color={255,127,0}));
+    annotation (Line(points={{72,60},{110,60},{110,100},{102,100}},
+                                                              color={255,127,0}));
   connect(y1.y, booToRea.u)
-    annotation (Line(points={{40,60},{34,60}},color={255,0,255}));
+    annotation (Line(points={{48,100},{32,100}},
+                                              color={255,0,255}));
   connect(booToRea.y, zerOrdHol.u)
-    annotation (Line(points={{10,60},{4,60}},color={0,0,127}));
+    annotation (Line(points={{8,100},{2,100}},
+                                             color={0,0,127}));
   connect(zerOrdHol.y, greThr.u)
-    annotation (Line(points={{-20,60},{-26,60}},color={0,0,127}));
+    annotation (Line(points={{-22,100},{-28,100}},
+                                                color={0,0,127}));
   connect(greThr.y, staPum.u1_actual)
-    annotation (Line(points={{-50,60},{-60,60},{-60,20},{-10,20},{-10,6},{-2,6}},
+    annotation (Line(points={{-52,100},{-60,100},{-60,68},{8,68}},
       color={255,0,255}));
+  connect(dpSet.y, staPum.dpSet[1]) annotation (Line(points={{-28,40},{-2,40},{-2,60},
+          {8,60}}, color={0,0,127}));
+  connect(dpSet.y, staPum.dp[1]) annotation (Line(points={{-28,40},{-2,40},{-2,56},
+          {8,56}}, color={0,0,127}));
+  connect(yPum.y, staPum.y)
+    annotation (Line(points={{-88,20},{0,20},{0,52},{8,52}}, color={0,0,127}));
+  connect(staPumFaiSaf.y1Up, idxSta1.u1Up) annotation (Line(points={{32,-54},{40,
+          -54},{40,-58},{48,-58}}, color={255,0,255}));
+  connect(rep1.y, y2.u)
+    annotation (Line(points={{78,-20},{72,-20}}, color={255,127,0}));
+  connect(enaLea.y[1], idxSta1.u1Lea) annotation (Line(points={{-88,120},{40,120},
+          {40,-54},{48,-54}}, color={255,0,255}));
+  connect(idxSta1.y, rep1.u) annotation (Line(points={{72,-60},{110,-60},{110,-20},
+          {102,-20}}, color={255,127,0}));
+  connect(y2.y, booToRea1.u)
+    annotation (Line(points={{48,-20},{32,-20}}, color={255,0,255}));
+  connect(booToRea1.y, zerOrdHol1.u)
+    annotation (Line(points={{8,-20},{-8,-20}}, color={0,0,127}));
+  connect(zerOrdHol1.y, greThr1.u)
+    annotation (Line(points={{-32,-20},{-38,-20}}, color={0,0,127}));
+  connect(greThr1.y, staPumFaiSaf.u1_actual) annotation (Line(points={{-62,-20},
+          {-70,-20},{-70,-52},{8,-52}}, color={255,0,255}));
+  connect(zerOrdHol1.y, mulSum.u) annotation (Line(points={{-32,-20},{-36,-20},{
+          -36,-40},{-110,-40},{-110,-60},{-102,-60}}, color={0,0,127}));
+  connect(dp.y[1], staPumFaiSaf.dp[1]) annotation (Line(points={{-48,-80},{-2,-80},
+          {-2,-64},{8,-64}}, color={0,0,127}));
+  connect(dpSet.y, staPumFaiSaf.dpSet[1]) annotation (Line(points={{-28,40},{-2,40},
+          {-2,-60},{8,-60}}, color={0,0,127}));
+  connect(yPum1.y[1], staPumFaiSaf.y) annotation (Line(points={{-18,-100},{0,-100},
+          {0,-68},{8,-68}}, color={0,0,127}));
+  connect(staPumFaiSaf.y1Dow, idxSta1.u1Dow) annotation (Line(points={{32,-66},{
+          40,-66},{40,-62},{48,-62}}, color={255,0,255}));
+  connect(mulSum.y, staPumFaiSaf.V_flow) annotation (Line(points={{-78,-60},{-4,
+          -60},{-4,-56},{8,-56}}, color={0,0,127}));
   annotation (
     __Dymola_Commands(
       file=
@@ -130,7 +218,7 @@ First implementation.
           points={{-36,60},{64,0},{-36,-60},{-36,60}})}),
     Diagram(
       coordinateSystem(
-        extent={{-120,-100},{120,100}}),
+        extent={{-120,-140},{120,140}}),
       graphics={
         Polygon(
           points={{214,66},{214,66}},
diff --git a/Buildings/Templates/Plants/Controls/Pumps/Primary/DisableDedicated.mo b/Buildings/Templates/Plants/Controls/Pumps/Primary/DisableDedicated.mo
new file mode 100644
index 00000000000..b41cd778a23
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Pumps/Primary/DisableDedicated.mo
@@ -0,0 +1,142 @@
+within Buildings.Templates.Plants.Controls.Pumps.Primary;
+block DisableDedicated
+  "Pump disable for plants with dedicated primary pumps"
+  parameter Boolean have_reqFlo=false
+    "Set to true if plant equipment provides flow request point via network interface"
+    annotation (Evaluate=true);
+  parameter Real dtOff(
+    min=0,
+    unit="s")=if not have_reqFlo then 3 * 60 else 10 * 60
+    "Runtime with lead equipment proven off before disabling";
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1ReqFlo
+    if have_reqFlo
+    "Flow request from equipment"
+    annotation (Placement(transformation(extent={{-140,-60},{-100,-20}}),
+      iconTransformation(extent={{-140,-60},{-100,-20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1
+    "Enable signal from system enable logic"
+    annotation (Placement(transformation(extent={{-140,60},{-100,100}}),
+      iconTransformation(extent={{-140,60},{-100,100}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1Equ
+    "Equipment enable signal"
+    annotation (Placement(transformation(extent={{-140,20},{-100,60}}),
+      iconTransformation(extent={{-140,20},{-100,60}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1Equ_actual
+    "Equipment status"
+    annotation (Placement(transformation(extent={{-140,-20},{-100,20}}),
+      iconTransformation(extent={{-140,-20},{-100,20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1
+    "Lead pump enable signal"
+    annotation (Placement(transformation(extent={{100,-20},{140,20}}),
+      iconTransformation(extent={{100,-20},{140,20}})));
+  Buildings.Controls.OBC.CDL.Logical.Latch lat
+    "Clear enable signal if disable conditions are met"
+    annotation (Placement(transformation(extent={{72,-10},{92,10}})));
+  Buildings.Controls.OBC.CDL.Logical.Not dis
+    "Return true if lead equipment is disabled"
+    annotation (Placement(transformation(extent={{-80,30},{-60,50}})));
+  Buildings.Controls.OBC.CDL.Logical.Not off
+    "Return true if lead equipment is proven off"
+    annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.Constant fal(
+    final k=false)
+    if not have_reqFlo
+    "Placeholder constant"
+    annotation (Placement(transformation(extent={{-80,-90},{-60,-70}})));
+  Buildings.Controls.OBC.CDL.Logical.Or offOrNotReq
+    "Return true if lead equipment proven off OR not requesting flow"
+    annotation (Placement(transformation(extent={{-10,-70},{10,-50}})));
+  Buildings.Controls.OBC.CDL.Logical.Timer timOff(
+    final t=dtOff)
+    "Return true if lead equipment is proven off for specified duration"
+    annotation (Placement(transformation(extent={{-50,-10},{-30,10}})));
+  Buildings.Controls.OBC.CDL.Logical.And disAndOffOrNotReq
+    "Return true if lead equipment disbaled AND (proven off OR not requesting flow)"
+    annotation (Placement(transformation(extent={{30,-70},{50,-50}})));
+  Buildings.Controls.OBC.CDL.Logical.Edge edg
+    "Trigger true signal when disable conditions turn true"
+    annotation (Placement(transformation(extent={{60,-70},{80,-50}})));
+  Buildings.Controls.OBC.CDL.Logical.Not noReq
+    if have_reqFlo
+    "Return true if no flow request"
+    annotation (Placement(transformation(extent={{-80,-50},{-60,-30}})));
+  Utilities.Initialization ini(
+    final yIni=false)
+    "Force false clear signal at initial time"
+    annotation (Placement(transformation(extent={{40,-30},{60,-10}})));
+equation
+  connect(lat.y, y1)
+    annotation (Line(points={{94,0},{120,0}},color={255,0,255}));
+  connect(u1, lat.u)
+    annotation (Line(points={{-120,80},{40,80},{40,0},{70,0}},color={255,0,255}));
+  connect(u1Equ, dis.u)
+    annotation (Line(points={{-120,40},{-82,40}},color={255,0,255}));
+  connect(u1Equ_actual, off.u)
+    annotation (Line(points={{-120,0},{-82,0}},color={255,0,255}));
+  connect(fal.y, offOrNotReq.u2)
+    annotation (Line(points={{-58,-80},{-40,-80},{-40,-68},{-12,-68}},color={255,0,255}));
+  connect(off.y, timOff.u)
+    annotation (Line(points={{-58,0},{-52,0}},color={255,0,255}));
+  connect(timOff.passed, offOrNotReq.u1)
+    annotation (Line(points={{-28,-8},{-20,-8},{-20,-60},{-12,-60}},color={255,0,255}));
+  connect(u1ReqFlo, noReq.u)
+    annotation (Line(points={{-120,-40},{-82,-40}},color={255,0,255}));
+  connect(noReq.y, offOrNotReq.u2)
+    annotation (Line(points={{-58,-40},{-40,-40},{-40,-68},{-12,-68}},color={255,0,255}));
+  connect(dis.y, disAndOffOrNotReq.u1)
+    annotation (Line(points={{-58,40},{20,40},{20,-60},{28,-60}},color={255,0,255}));
+  connect(offOrNotReq.y, disAndOffOrNotReq.u2)
+    annotation (Line(points={{12,-60},{14,-60},{14,-68},{28,-68}},color={255,0,255}));
+  connect(disAndOffOrNotReq.y, edg.u)
+    annotation (Line(points={{52,-60},{58,-60}},color={255,0,255}));
+  connect(edg.y, ini.u)
+    annotation (Line(points={{82,-60},{88,-60},{88,-40},{30,-40},{30,-20},{38,-20}},
+      color={255,0,255}));
+  connect(ini.y, lat.clr)
+    annotation (Line(points={{62,-20},{66,-20},{66,-6},{70,-6}},color={255,0,255}));
+  annotation (
+    defaultComponentName="enaDed",
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=true,
+        extent={{-100,-100},{100,100}}),
+      graphics={
+        Rectangle(
+          extent={{-100,100},{100,-100}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Text(
+          extent={{-150,150},{150,110}},
+          textString="%name",
+          textColor={0,0,255})}),
+    Documentation(
+      info="<html>
+<p>
+The pump is disabled when the associated plant equipment is disabled and:
+</p>
+<ul>
+<li>
+if the equipment has a flow request network point
+(<code>have_req=true</code>): either the equipment has been proven 
+off for <code>dtOff</code> or is not requesting flow.
+</li>
+<li>
+otherwise (<code>have_req=false</code>): the equipment has been 
+proven off for <code>dtOff</code>.
+</li>
+</ul>
+<p>
+When the flow request point is available, the default value for the pump
+disable delay <code>dtOff</code> is increased from <i>3</i>&nbsp;min
+to <i>10</i>&nbsp;min to ensure that flow is not cut off too soon.
+</p>
+<h4>Details</h4>
+<p>Used in Guideline 36 for disabling
+dedicated primary pumps in chiller and boiler plants.
+</p>
+<p>
+The enable signal <code>u1</code> is yielded by the staging event sequencing logic.
+</p>
+</html>"));
+end DisableDedicated;
diff --git a/Buildings/Templates/Plants/Controls/Pumps/Primary/Validation/DisableDedicated.mo b/Buildings/Templates/Plants/Controls/Pumps/Primary/Validation/DisableDedicated.mo
new file mode 100644
index 00000000000..d985395aa3f
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Pumps/Primary/Validation/DisableDedicated.mo
@@ -0,0 +1,88 @@
+within Buildings.Templates.Plants.Controls.Pumps.Primary.Validation;
+model DisableDedicated
+  "Validation model for dedicated primary pump disable logic"
+  Buildings.Controls.OBC.CDL.Logical.Sources.Pulse y1(
+    period=60 * 30)
+    "Lead pump enable"
+    annotation (Placement(transformation(extent={{-80,50},{-60,70}})));
+  Buildings.Templates.Plants.Controls.Pumps.Primary.DisableDedicated enaDed
+    "Command dedicated pumps – Without flow request"
+    annotation (Placement(transformation(extent={{40,30},{60,50}})));
+  Buildings.Templates.Plants.Controls.Pumps.Primary.DisableDedicated enaDedReq(
+    have_reqFlo=true)
+    "Command dedicated pumps – With flow request"
+    annotation (Placement(transformation(extent={{40,-50},{60,-30}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.Pulse y1ReqEquLea(
+    period=y1EquLea.period + 4 * 60,
+    shift=y1EquLea.shift)
+    "Lead equipment flow request"
+    annotation (Placement(transformation(extent={{-80,-70},{-60,-50}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.Pulse y1EquLea(
+    period=y1.period,
+    shift=60)
+    "Lead equipment enable"
+    annotation (Placement(transformation(extent={{-80,10},{-60,30}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.Pulse y1EquLea_actual(
+    period=y1EquLea.period,
+    shift=y1EquLea.shift + 60)
+    "Lead equipment status"
+    annotation (Placement(transformation(extent={{-80,-30},{-60,-10}})));
+equation
+  connect(y1.y, enaDed.u1)
+    annotation (Line(points={{-58,60},{0,60},{0,48},{38,48}},color={255,0,255}));
+  connect(y1.y, enaDedReq.u1)
+    annotation (Line(points={{-58,60},{0,60},{0,-32},{38,-32}},color={255,0,255}));
+  connect(y1ReqEquLea.y, enaDedReq.u1ReqFlo)
+    annotation (Line(points={{-58,-60},{20,-60},{20,-44},{38,-44}},color={255,0,255}));
+  connect(y1EquLea.y, enaDed.u1Equ)
+    annotation (Line(points={{-58,20},{20,20},{20,44},{38,44}},color={255,0,255}));
+  connect(y1EquLea.y, enaDedReq.u1Equ)
+    annotation (Line(points={{-58,20},{20,20},{20,-36},{38,-36}},color={255,0,255}));
+  connect(y1EquLea_actual.y, enaDedReq.u1Equ_actual)
+    annotation (Line(points={{-58,-20},{30,-20},{30,-40},{38,-40}},color={255,0,255}));
+  connect(y1EquLea_actual.y, enaDed.u1Equ_actual)
+    annotation (Line(points={{-58,-20},{30,-20},{30,40},{38,40}},color={255,0,255}));
+  annotation (
+    __Dymola_Commands(
+      file=
+        "modelica://Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Pumps/Primary/Validation/DisableDedicated.mos"
+        "Simulate and plot"),
+    experiment(
+      StopTime=3600.0,
+      Tolerance=1e-06),
+    Documentation(
+      info="<html>
+<p>
+This model validates
+<a href=\"modelica://Buildings.Templates.Plants.Controls.Pumps.Primary.DisableDedicated\">
+Buildings.Templates.Plants.Controls.Pumps.Primary.DisableDedicated</a>
+in a configuration with a flow request software point or not.
+</p>
+</html>",
+      revisions="<html>
+<ul>
+<li>
+XXXX, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    Icon(
+      graphics={
+        Ellipse(
+          lineColor={75,138,73},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          extent={{-100,-100},{100,100}}),
+        Polygon(
+          lineColor={0,0,255},
+          fillColor={75,138,73},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          points={{-36,60},{64,0},{-36,-60},{-36,60}})}),
+    Diagram(
+      graphics={
+        Polygon(
+          points={{214,66},{214,66}},
+          lineColor={28,108,200})}));
+end DisableDedicated;
diff --git a/Buildings/Templates/Plants/Controls/Pumps/Primary/Validation/VariableSpeed.mo b/Buildings/Templates/Plants/Controls/Pumps/Primary/Validation/VariableSpeed.mo
new file mode 100644
index 00000000000..1e0e9e92b12
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Pumps/Primary/Validation/VariableSpeed.mo
@@ -0,0 +1,309 @@
+within Buildings.Templates.Plants.Controls.Pumps.Primary.Validation;
+model VariableSpeed
+  "Validation model for the control logic of variable speed primary pumps"
+  Buildings.Templates.Plants.Controls.Pumps.Primary.VariableSpeed ctlPumPriHdrHea(
+    have_heaWat=true,
+    have_chiWat=false,
+    have_pumPriCtlDp=false,
+    have_pumPriHdr=true,
+    nPumHeaWatPri=2,
+    yPumHeaWatPriSet=0.8)
+    "Headered primary pumps without Δp control – Heating-only plant"
+    annotation (Placement(transformation(extent={{0,32},{20,60}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.TimeTable u1(
+    table=[
+      0, 0, 0;
+      0.1, 1, 0;
+      0.5, 1, 1;
+      1, 1, 1;
+      1.5, 1, 1;
+      2, 0, 1;
+      2.5, 0, 0;
+      3, 0, 0],
+    timeScale=800,
+    period=3500)
+    "Command signal – Plant, equipment or isolation valve depending on tested configuration"
+    annotation (Placement(transformation(extent={{-100,-30},{-80,-10}})));
+  Buildings.Templates.Plants.Controls.Pumps.Primary.VariableSpeed ctlPumPriHdr(
+    have_heaWat=true,
+    have_chiWat=true,
+    have_pumPriCtlDp=false,
+    have_pumPriHdr=true,
+    nEqu=2,
+    nPumHeaWatPri=2,
+    nPumChiWatPri=2,
+    yPumHeaWatPriSet=0.8,
+    yPumChiWatPriSet=0.9)
+    "Headered primary pumps without Δp control – Heating and cooling plant"
+    annotation (Placement(transformation(extent={{0,-8},{20,20}})));
+  Buildings.Controls.OBC.CDL.Logical.Not u1Coo[2]
+    "Opposite signal to generate cooling system commands"
+    annotation (Placement(transformation(extent={{-50,-30},{-30,-10}})));
+  Buildings.Templates.Plants.Controls.Pumps.Primary.VariableSpeed ctlPumPriDedCom(
+    have_heaWat=true,
+    have_chiWat=true,
+    have_pumPriCtlDp=false,
+    have_pumChiWatPriDed=false,
+    have_pumPriHdr=false,
+    nEqu=2,
+    nPumHeaWatPri=2,
+    yPumHeaWatPriSet=0.8,
+    yPumChiWatPriSet=0.9)
+    "Common dedicated primary pumps without Δp control – Heating and cooling plant"
+    annotation (Placement(transformation(extent={{0,-60},{20,-32}})));
+  Buildings.Templates.Plants.Controls.Pumps.Primary.VariableSpeed ctlPumPriDedSep(
+    have_heaWat=true,
+    have_chiWat=true,
+    have_pumPriCtlDp=false,
+    have_pumChiWatPriDed=true,
+    have_pumPriHdr=false,
+    nEqu=2,
+    nPumHeaWatPri=2,
+    nPumChiWatPri=2,
+    yPumHeaWatPriSet=0.8,
+    yPumChiWatPriSet=0.9)
+    "Separate dedicated primary pumps without Δp control – Heating and cooling plant"
+    annotation (Placement(transformation(extent={{0,-108},{20,-80}})));
+  Buildings.Templates.Plants.Controls.Pumps.Primary.VariableSpeed ctlPumPriHdrHeaDp(
+    have_heaWat=true,
+    have_chiWat=false,
+    have_pumPriCtlDp=true,
+    have_pumPriHdr=true,
+    nPumHeaWatPri=2,
+    yPumHeaWatPriSet=0.8,
+    have_senDpHeaWatRemWir=false,
+    nSenDpHeaWatRem=2)
+    "Headered primary pumps with Δp control – Heating-only plant"
+    annotation (Placement(transformation(extent={{70,32},{90,60}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.TimeTable ratDp(
+    table=[
+      0, 0.1, 0.5;
+      1, 1, 0.5;
+      1.5, 1, 0.2;
+      2, 0.1, 0.1],
+    timeScale=3600)
+    "Differential pressure ratio to design value"
+    annotation (Placement(transformation(extent={{-100,110},{-80,130}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter dpSet[2](
+    k={3E4, 2E4})
+    "Differential pressure setpoint"
+    annotation (Placement(transformation(extent={{-60,110},{-40,130}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Sin sin[2](
+    amplitude=0.1 * dpSet.k,
+    freqHz={2 / 8000, 4 / 8000},
+    each phase=3.1415926535898)
+    "Source signal used to generate measurement values"
+    annotation (Placement(transformation(extent={{-100,50},{-80,70}})));
+  Buildings.Controls.OBC.CDL.Reals.Add dp[2]
+    "Differential pressure"
+    annotation (Placement(transformation(extent={{-60,70},{-40,90}})));
+  Buildings.Templates.Plants.Controls.Pumps.Primary.VariableSpeed ctlPumPriHdrDp(
+    have_heaWat=true,
+    have_chiWat=true,
+    have_pumPriCtlDp=true,
+    have_pumPriHdr=true,
+    nEqu=2,
+    nPumHeaWatPri=2,
+    nPumChiWatPri=2,
+    yPumHeaWatPriSet=0.8,
+    yPumChiWatPriSet=0.9,
+    have_senDpHeaWatRemWir=true,
+    nSenDpHeaWatRem=2,
+    have_senDpChiWatRemWir=true,
+    nSenDpChiWatRem=2)
+    "Headered primary pumps with Δp control – Heating and cooling plant"
+    annotation (Placement(transformation(extent={{70,-8},{90,20}})));
+  Buildings.Templates.Plants.Controls.Pumps.Primary.VariableSpeed ctlPumPriDedComDp(
+    have_heaWat=true,
+    have_chiWat=true,
+    have_pumPriCtlDp=true,
+    have_pumChiWatPriDed=false,
+    have_pumPriHdr=false,
+    nEqu=2,
+    nPumHeaWatPri=2,
+    yPumHeaWatPriSet=0.8,
+    yPumChiWatPriSet=0.9,
+    have_senDpHeaWatRemWir=false,
+    nSenDpHeaWatRem=2,
+    have_senDpChiWatRemWir=false,
+    nSenDpChiWatRem=2)
+    "Common dedicated primary pumps with Δp control – Heating and cooling plant"
+    annotation (Placement(transformation(extent={{70,-60},{90,-32}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.TimeTable u1Hea(
+    table=[0,0,0; 0.1,1,0; 0.5,1,0; 1,0,0; 1.5,0,1; 2,0,1; 2.5,0,0; 3,0,0],
+    timeScale=600,
+    period=5000)
+    "Heating mode command signal"
+    annotation (Placement(transformation(extent={{-100,-130},{-80,-110}})));
+  Buildings.Templates.Plants.Controls.Pumps.Primary.VariableSpeed ctlPumPriDedSepDp(
+    have_heaWat=true,
+    have_chiWat=true,
+    have_pumPriCtlDp=true,
+    have_pumChiWatPriDed=true,
+    have_pumPriHdr=false,
+    nEqu=2,
+    nPumHeaWatPri=2,
+    nPumChiWatPri=2,
+    yPumHeaWatPriSet=0.8,
+    yPumChiWatPriSet=0.9,
+    have_senDpHeaWatRemWir=false,
+    nSenDpHeaWatRem=2,
+    have_senDpChiWatRemWir=false,
+    nSenDpChiWatRem=2)
+    "Separate dedicated primary pumps with Δp control – Heating and cooling plant"
+    annotation (Placement(transformation(extent={{70,-108},{90,-80}})));
+equation
+  connect(u1.y, u1Coo.u)
+    annotation (Line(points={{-78,-20},{-52,-20}},color={255,0,255}));
+  connect(u1Coo.y, ctlPumPriHdr.u1PumChiWatPri)
+    annotation (Line(points={{-28,-20},{-20,-20},{-20,4},{-2,4}},color={255,0,255}));
+  connect(u1.y, ctlPumPriHdr.u1PumHeaWatPri)
+    annotation (Line(points={{-78,-20},{-60,-20},{-60,18},{-2,18}},color={255,0,255}));
+  connect(u1.y, ctlPumPriDedCom.u1PumHeaWatPri)
+    annotation (Line(points={{-78,-20},{-60,-20},{-60,-34},{-2,-34}},color={255,0,255}));
+  connect(u1.y, ctlPumPriDedSep.u1PumHeaWatPri)
+    annotation (Line(points={{-78,-20},{-60,-20},{-60,-82},{-2,-82}},color={255,0,255}));
+  connect(u1.y, ctlPumPriHdrHea.u1PumHeaWatPri)
+    annotation (Line(points={{-78,-20},{-60,-20},{-60,58},{-2,58}},color={255,0,255}));
+  connect(u1.y, ctlPumPriHdrHeaDp.u1PumHeaWatPri)
+    annotation (Line(points={{-78,-20},{-60,-20},{-60,66},{40,66},{40,58},{68,58}},
+      color={255,0,255}));
+  connect(u1.y, ctlPumPriHdrHeaDp.u1PumHeaWatPri_actual)
+    annotation (Line(points={{-78,-20},{-60,-20},{-60,66},{40,66},{40,56},{68,56}},
+      color={255,0,255}));
+  connect(ratDp.y, dpSet.u)
+    annotation (Line(points={{-78,120},{-62,120}},color={0,0,127}));
+  connect(sin.y, dp.u2)
+    annotation (Line(points={{-78,60},{-70,60},{-70,74},{-62,74}},color={0,0,127}));
+  connect(dpSet.y, dp.u1)
+    annotation (Line(points={{-38,120},{-30,120},{-30,100},{-70,100},{-70,86},{-62,86}},
+      color={0,0,127}));
+  connect(dpSet[1:2].y, ctlPumPriHdrHeaDp.dpHeaWatLocSet)
+    annotation (Line(points={{-38,120},{60,120},{60,50},{68,50}},color={0,0,127}));
+  connect(dp[1].y, ctlPumPriHdrHeaDp.dpHeaWatLoc)
+    annotation (Line(points={{-38,80},{58,80},{58,48},{68,48}},color={0,0,127}));
+  connect(u1.y, ctlPumPriHdrDp.u1PumHeaWatPri)
+    annotation (Line(points={{-78,-20},{-60,-20},{-60,26},{40,26},{40,18},{68,18}},
+      color={255,0,255}));
+  connect(u1.y, ctlPumPriHdrDp.u1PumHeaWatPri_actual)
+    annotation (Line(points={{-78,-20},{-60,-20},{-60,26},{40,26},{40,16},{68,16}},
+      color={255,0,255}));
+  connect(u1Coo.y, ctlPumPriHdrDp.u1PumChiWatPri)
+    annotation (Line(points={{-28,-20},{40,-20},{40,4},{68,4}},color={255,0,255}));
+  connect(u1Coo.y, ctlPumPriHdrDp.u1PumChiWatPri_actual)
+    annotation (Line(points={{-28,-20},{40,-20},{40,2},{68,2}},color={255,0,255}));
+  connect(dpSet.y, ctlPumPriHdrDp.dpHeaWatRemSet)
+    annotation (Line(points={{-38,120},{60,120},{60,14},{68,14}},color={0,0,127}));
+  connect(dp.y, ctlPumPriHdrDp.dpHeaWatRem)
+    annotation (Line(points={{-38,80},{58,80},{58,12},{68,12}},color={0,0,127}));
+  connect(dp.y, ctlPumPriHdrDp.dpChiWatRem)
+    annotation (Line(points={{-38,80},{58,80},{58,-2},{68,-2}},color={0,0,127}));
+  connect(dpSet.y, ctlPumPriHdrDp.dpChiWatRemSet)
+    annotation (Line(points={{-38,120},{60,120},{60,0},{68,0}},color={0,0,127}));
+  connect(u1.y, ctlPumPriDedComDp.u1PumHeaWatPri)
+    annotation (Line(points={{-78,-20},{-60,-20},{-60,-70},{40,-70},{40,-34},{68,-34}},
+      color={255,0,255}));
+  connect(u1.y, ctlPumPriDedComDp.u1PumHeaWatPri_actual)
+    annotation (Line(points={{-78,-20},{-60,-20},{-60,-70},{40,-70},{40,-36},{68,-36}},
+      color={255,0,255}));
+  connect(dp[1].y, ctlPumPriDedComDp.dpHeaWatLoc)
+    annotation (Line(points={{-38,80},{58,80},{58,-44},{68,-44}},color={0,0,127}));
+  connect(dp[2].y, ctlPumPriDedComDp.dpChiWatLoc)
+    annotation (Line(points={{-38,80},{58,80},{58,-58},{68,-58}},color={0,0,127}));
+  connect(dpSet.y, ctlPumPriDedComDp.dpHeaWatLocSet)
+    annotation (Line(points={{-38,120},{60,120},{60,-42},{68,-42}},color={0,0,127}));
+  connect(dpSet.y, ctlPumPriDedComDp.dpChiWatLocSet)
+    annotation (Line(points={{-38,120},{60,120},{60,-56},{68,-56}},color={0,0,127}));
+  connect(u1Hea.y, ctlPumPriDedComDp.u1Hea)
+    annotation (Line(points={{-78,-120},{42,-120},{42,-46},{68,-46}},color={255,0,255}));
+  connect(dpSet.y, ctlPumPriDedSepDp.dpHeaWatLocSet)
+    annotation (Line(points={{-38,120},{60,120},{60,-90},{68,-90}},color={0,0,127}));
+  connect(dpSet.y, ctlPumPriDedSepDp.dpChiWatLocSet)
+    annotation (Line(points={{-38,120},{60,120},{60,-104},{68,-104}},color={0,0,127}));
+  connect(dp[2].y, ctlPumPriDedSepDp.dpChiWatLoc)
+    annotation (Line(points={{-38,80},{58,80},{58,-106},{68,-106}},color={0,0,127}));
+  connect(dp[1].y, ctlPumPriDedSepDp.dpHeaWatLoc)
+    annotation (Line(points={{-38,80},{57.8788,80},{57.8788,-92},{68,-92}},color={0,0,127}));
+  connect(u1.y, ctlPumPriDedSepDp.u1PumHeaWatPri)
+    annotation (Line(points={{-78,-20},{-60,-20},{-60,-70},{40,-70},{40,-82},{68,-82}},
+      color={255,0,255}));
+  connect(u1.y, ctlPumPriDedSepDp.u1PumHeaWatPri_actual)
+    annotation (Line(points={{-78,-20},{-60,-20},{-60,-70},{40,-70},{40,-84},{68,-84}},
+      color={255,0,255}));
+  connect(u1Coo.y, ctlPumPriDedSepDp.u1PumChiWatPri)
+    annotation (Line(points={{-28,-20},{-20,-20},{-20,-72},{38,-72},{38,-96},{68,-96}},
+      color={255,0,255}));
+  connect(u1Coo.y, ctlPumPriDedSepDp.u1PumChiWatPri_actual)
+    annotation (Line(points={{-28,-20},{-20,-20},{-20,-72},{38,-72},{38,-98},{68,-98}},
+      color={255,0,255}));
+  connect(u1Hea.y, ctlPumPriDedCom.u1Hea) annotation (Line(points={{-78,-120},{
+          -10,-120},{-10,-46},{-2,-46}}, color={255,0,255}));
+  connect(u1Coo.y, ctlPumPriDedSep.u1PumChiWatPri) annotation (Line(points={{
+          -28,-20},{-20,-20},{-20,-96},{-2,-96}}, color={255,0,255}));
+  annotation (
+    __Dymola_Commands(
+      file=
+        "modelica://Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Pumps/Primary/Validation/VariableSpeed.mos"
+        "Simulate and plot"),
+    experiment(
+      StopTime=5000.0,
+      Tolerance=1e-06),
+    Documentation(
+      info="<html>
+<p>
+This model validates
+<a href=\"modelica://Buildings.Templates.Plants.Controls.Pumps.Primary.VariableSpeed\">
+Buildings.Templates.Plants.Controls.Pumps.Primary.VariableSpeed</a>
+with two plant equipment and two primary pumps and for the following configurations.
+</p>
+<ul>
+<li>
+Heating-only plant with headered primary pumps (components <code>ctlPumPriHdrHea*</code>)
+</li>
+<li>
+Heating and cooling plant with headered primary pumps (components <code>ctlPumPriHdr*</code>)
+</li>
+<li>
+Heating and cooling plant with common dedicated primary pumps (components <code>ctlPumPriDedCom*</code>)
+</li>
+<li>
+Heating and cooling plant with separate dedicated primary pumps (components <code>ctlPumPriDedSep*</code>)
+</li>
+<li>
+Primary pumps commanded at fixed speed (component names as listed above, without a suffix) or Δp-controlled (components <code>*Dp</code>)
+</li>
+</ul>
+</html>",
+      revisions="<html>
+<ul>
+<li>
+May 31, 2024, by Antoine Gautier:<br/>
+Added test for ∆p-controlled primary pumps.
+</li>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    Icon(
+      graphics={
+        Ellipse(
+          lineColor={75,138,73},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          extent={{-100,-100},{100,100}}),
+        Polygon(
+          lineColor={0,0,255},
+          fillColor={75,138,73},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          points={{-36,60},{64,0},{-36,-60},{-36,60}})}),
+    Diagram(
+      coordinateSystem(
+        extent={{-120,-140},{120,140}}),
+      graphics={
+        Polygon(
+          points={{214,66},{214,66}},
+          lineColor={28,108,200})}));
+end VariableSpeed;
diff --git a/Buildings/Templates/Plants/Controls/Pumps/Primary/Validation/VariableSpeedNoDpControl.mo b/Buildings/Templates/Plants/Controls/Pumps/Primary/Validation/VariableSpeedNoDpControl.mo
deleted file mode 100644
index 397ff499750..00000000000
--- a/Buildings/Templates/Plants/Controls/Pumps/Primary/Validation/VariableSpeedNoDpControl.mo
+++ /dev/null
@@ -1,129 +0,0 @@
-within Buildings.Templates.Plants.Controls.Pumps.Primary.Validation;
-model VariableSpeedNoDpControl
-  "Validation model for the control logic of variable speed primary pumps without ∆p control"
-  Buildings.Templates.Plants.Controls.Pumps.Primary.VariableSpeedNoDpControl
-    ctlPumPriHdrHea(
-    have_heaWat=true,
-    have_chiWat=false,
-    have_pumPriHdr=true,
-    nPumHeaWatPri=2,
-    yPumHeaWatPriSet=0.8) "Headered primary pumps – Heating-only plant"
-    annotation (Placement(transformation(extent={{20,50},{40,70}})));
-  Buildings.Controls.OBC.CDL.Logical.Sources.TimeTable u1(
-    table=[0,0,0; 0.1,1,0; 0.5,1,1; 1,1,1; 1.5,1,1; 2,0,1; 2.5,0,0; 3,0,0],
-    timeScale=300,
-    period=900)
-    "Command signal – Plant, equipment or isolation valve depending on tested configuration"
-    annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
-  Buildings.Templates.Plants.Controls.Pumps.Primary.VariableSpeedNoDpControl ctlPumPriHdr(
-    have_heaWat=true,
-    have_chiWat=true,
-    have_pumPriHdr=true,
-    nEqu=2,
-    nPumHeaWatPri=2,
-    nPumChiWatPri=2,
-    yPumHeaWatPriSet=0.8,
-    yPumChiWatPriSet=0.9)
-    "Headered primary pumps – Heating and cooling plant"
-    annotation (Placement(transformation(extent={{20,10},{40,30}})));
-  Buildings.Controls.OBC.CDL.Logical.Not u1Coo[2]
-    "Opposite signal to generate cooling system commands"
-    annotation (Placement(transformation(extent={{-30,-10},{-10,10}})));
-  Buildings.Templates.Plants.Controls.Pumps.Primary.VariableSpeedNoDpControl ctlPumPriDedCom(
-    have_heaWat=true,
-    have_chiWat=true,
-    have_pumChiWatPriDed=false,
-    have_pumPriHdr=false,
-    nEqu=2,
-    nPumHeaWatPri=2,
-    yPumHeaWatPriSet=0.8,
-    yPumChiWatPriSet=0.9)
-    "Common dedicated primary pumps – Heating and cooling plant"
-    annotation (Placement(transformation(extent={{20,-30},{40,-10}})));
-  Buildings.Templates.Plants.Controls.Pumps.Primary.VariableSpeedNoDpControl ctlPumPriDedSep(
-    have_heaWat=true,
-    have_chiWat=true,
-    have_pumChiWatPriDed=true,
-    have_pumPriHdr=false,
-    nEqu=2,
-    nPumHeaWatPri=2,
-    nPumChiWatPri=2,
-    yPumHeaWatPriSet=0.8,
-    yPumChiWatPriSet=0.9)
-    "Separate dedicated primary pumps – Heating and cooling plant"
-    annotation (Placement(transformation(extent={{20,-70},{40,-50}})));
-equation
-  connect(u1.y,ctlPumPriHdrHea. u1PumHeaWatPri) annotation (Line(points={{-58,0},
-          {-40,0},{-40,66},{18,66}}, color={255,0,255}));
-  connect(u1.y, u1Coo.u)
-    annotation (Line(points={{-58,0},{-32,0}}, color={255,0,255}));
-  connect(u1Coo.y, ctlPumPriHdr.u1PumChiWatPri)
-    annotation (Line(points={{-8,0},{0,0},{0,20},{18,20}}, color={255,0,255}));
-  connect(u1.y, ctlPumPriHdr.u1PumHeaWatPri) annotation (Line(points={{-58,0},{-40,
-          0},{-40,26},{18,26}}, color={255,0,255}));
-  connect(u1.y, ctlPumPriDedCom.u1PumHeaWatPri) annotation (Line(points={{-58,0},
-          {-40,0},{-40,-14},{18,-14}}, color={255,0,255}));
-  connect(u1Coo.y, ctlPumPriDedCom.u1Hea) annotation (Line(points={{-8,0},{0,0},
-          {0,-26},{18,-26}}, color={255,0,255}));
-  connect(u1.y, ctlPumPriDedSep.u1PumHeaWatPri) annotation (Line(points={{-58,0},
-          {-40,0},{-40,-54},{18,-54}},          color={255,0,255}));
-  connect(u1Coo.y, ctlPumPriDedSep.u1PumChiWatPri) annotation (Line(points={{-8,
-          0},{0,0},{0,-60},{18,-60}}, color={255,0,255}));
-  annotation (
-    __Dymola_Commands(
-      file=
-        "modelica://Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Pumps/Primary/Validation/VariableSpeedNoDpControl.mos"
-        "Simulate and plot"),
-    experiment(
-      StopTime=900.0,
-      Tolerance=1e-06),
-    Documentation(
-      info="<html>
-<p>
-This model validates
-<a href=\"modelica://Buildings.Templates.Plants.Controls.Pumps.Primary.VariableSpeedNoDpControl\">
-Buildings.Templates.Plants.Controls.Pumps.Primary.VariableSpeedNoDpControl</a>
-with two plant equipment and two primary pumps and for the following configurations.
-</p>
-<ul>
-<li>
-Heating-only plant with headered primary pumps (component <code>ctlPumPriHdrHea</code>)
-</li>
-<li>
-Heating and cooling plant with headered primary pumps (component <code>ctlPumPriHdr</code>)
-</li>
-<li>
-Heating and cooling plant with common dedicated primary pumps (component <code>ctlPumPriDedCom</code>)
-</li>
-<li>
-Heating and cooling plant with separate dedicated primary pumps (component <code>ctlPumPriDedSep</code>)
-</li>
-</ul>
-</html>",
-      revisions="<html>
-<ul>
-<li>
-March 29, 2024, by Antoine Gautier:<br/>
-First implementation.
-</li>
-</ul>
-</html>"),
-    Icon(
-      graphics={
-        Ellipse(
-          lineColor={75,138,73},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid,
-          extent={{-100,-100},{100,100}}),
-        Polygon(
-          lineColor={0,0,255},
-          fillColor={75,138,73},
-          pattern=LinePattern.None,
-          fillPattern=FillPattern.Solid,
-          points={{-36,60},{64,0},{-36,-60},{-36,60}})}),
-    Diagram(
-      graphics={
-        Polygon(
-          points={{214,66},{214,66}},
-          lineColor={28,108,200})}));
-end VariableSpeedNoDpControl;
diff --git a/Buildings/Templates/Plants/Controls/Pumps/Primary/Validation/package.order b/Buildings/Templates/Plants/Controls/Pumps/Primary/Validation/package.order
index 7de919ee9d0..40414099439 100644
--- a/Buildings/Templates/Plants/Controls/Pumps/Primary/Validation/package.order
+++ b/Buildings/Templates/Plants/Controls/Pumps/Primary/Validation/package.order
@@ -1,2 +1,3 @@
+DisableDedicated
 EnableLeadHeadered
-VariableSpeedNoDpControl
+VariableSpeed
diff --git a/Buildings/Templates/Plants/Controls/Pumps/Primary/VariableSpeed.mo b/Buildings/Templates/Plants/Controls/Pumps/Primary/VariableSpeed.mo
new file mode 100644
index 00000000000..e96e5936844
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Pumps/Primary/VariableSpeed.mo
@@ -0,0 +1,649 @@
+within Buildings.Templates.Plants.Controls.Pumps.Primary;
+block VariableSpeed
+  "Variable speed primary pumps"
+  parameter Boolean have_heaWat
+    "Set to true for plants that provide HW"
+    annotation (Evaluate=true,
+    Dialog(group="Plant configuration"));
+  parameter Boolean have_chiWat
+    "Set to true for plants that provide CHW"
+    annotation (Evaluate=true,
+    Dialog(group="Plant configuration"));
+  parameter Boolean have_pumPriCtlDp
+    "Set to true for primary variable speed pumps using ∆p pump speed control"
+    annotation (Evaluate=true,
+    Dialog(group="Plant configuration"));
+  final parameter Boolean have_pumHeaWatPri=have_heaWat
+    "Set to true for plants with primary HW pumps"
+    annotation (Evaluate=true);
+  parameter Boolean have_pumChiWatPriDed(
+    start=false)
+    "Set to true for plants with separate dedicated primary CHW pumps"
+    annotation (Evaluate=true,
+    Dialog(group="Plant configuration",
+      enable=have_chiWat and not have_pumPriHdr));
+  final parameter Boolean have_pumChiWatPri=have_chiWat and (have_pumPriHdr or have_pumChiWatPriDed)
+    "Set to true for plants with separate primary CHW pumps"
+    annotation (Evaluate=true);
+  parameter Boolean have_pumPriHdr
+    "Set to true for headered primary pumps, false for dedicated pumps"
+    annotation (Evaluate=true,
+    Dialog(group="Plant configuration"));
+  parameter Integer nEqu(
+    start=0)
+    "Number of equipment"
+    annotation (Evaluate=true,
+    Dialog(group="Plant configuration",
+      enable=have_heaWat and have_chiWat));
+  parameter Integer nPumHeaWatPri
+    "Number of primary HW pumps"
+    annotation (Evaluate=true,
+    Dialog(group="Plant configuration"));
+  parameter Integer nPumChiWatPri(
+    start=if have_pumChiWatPri then nEqu else 0)
+    "Number of primary CHW pumps"
+    annotation (Evaluate=true,
+    Dialog(group="Plant configuration",
+      enable=have_pumChiWatPri));
+  parameter Real yPumHeaWatPriSet(
+    max=2,
+    min=0,
+    start=1,
+    unit="1")
+    "Primary pump speed providing design heat pump flow in heating mode"
+    annotation (Dialog(group=
+      "Information provided by testing, adjusting, and balancing contractor",
+      enable=have_heaWat and not have_pumPriCtlDp));
+  parameter Real yPumChiWatPriSet(
+    max=2,
+    min=0,
+    start=1,
+    unit="1")
+    "Primary pump speed providing design heat pump flow in cooling mode"
+    annotation (Dialog(group=
+      "Information provided by testing, adjusting, and balancing contractor",
+      enable=have_chiWat and not have_pumPriCtlDp));
+  parameter Boolean have_senDpHeaWatRemWir(
+    start=false)
+    "Set to true for remote HW differential pressure sensor(s) hardwired to controller"
+    annotation (Evaluate=true,
+    Dialog(group="Plant configuration",
+      enable=have_heaWat and have_pumPriCtlDp));
+  parameter Integer nSenDpHeaWatRem(
+    start=0)
+    "Number of remote HW differential pressure sensors used for pump speed control"
+    annotation (Evaluate=true,
+    Dialog(group="Plant configuration",
+      enable=have_heaWat and have_pumPriCtlDp));
+  parameter Real yPumHeaWatPri_min(
+    max=1,
+    min=0,
+    start=0.1,
+    unit="1")=0.1
+    "Minimum primary HW pump speed"
+    annotation (Dialog(group=
+      "Information provided by testing, adjusting, and balancing contractor",
+      enable=have_heaWat and have_pumPriCtlDp));
+  parameter Real kCtlDpHeaWat(
+    min=100 * Buildings.Controls.OBC.CDL.Constants.eps,
+    start=1)=1
+    "Gain of controller for HW loop ∆p control"
+    annotation (Dialog(group="Control gains",
+      enable=have_heaWat and have_pumPriCtlDp));
+  parameter Real TiCtlDpHeaWat(
+    min=100 * Buildings.Controls.OBC.CDL.Constants.eps,
+    start=60,
+    unit="s")=60
+    "Time constant of integrator block for HW loop ∆p control"
+    annotation (Dialog(group="Control gains",
+      enable=have_heaWat and have_pumPriCtlDp));
+  parameter Boolean have_senDpChiWatRemWir(
+    start=false)
+    "Set to true for remote CHW differential pressure sensor(s) hardwired to controller"
+    annotation (Evaluate=true,
+    Dialog(group="Plant configuration",
+      enable=have_chiWat and have_pumPriCtlDp));
+  parameter Integer nSenDpChiWatRem(
+    start=0)
+    "Number of remote CHW differential pressure sensors used for pump speed control"
+    annotation (Evaluate=true,
+    Dialog(group="Plant configuration",
+      enable=have_chiWat and have_pumPriCtlDp));
+  parameter Real yPumChiWatPri_min(
+    max=1,
+    min=0,
+    start=0.1,
+    unit="1")=0.1
+    "Minimum primary CHW pump speed"
+    annotation (Dialog(group=
+      "Information provided by testing, adjusting, and balancing contractor",
+      enable=have_pumChiWatPri and have_pumPriCtlDp));
+  parameter Real kCtlDpChiWat(
+    min=100 * Buildings.Controls.OBC.CDL.Constants.eps,
+    start=1)=1
+    "Gain of controller for CHW loop ∆p control"
+    annotation (Dialog(group="Control gains",
+      enable=have_chiWat and have_pumPriCtlDp));
+  parameter Real TiCtlDpChiWat(
+    min=100 * Buildings.Controls.OBC.CDL.Constants.eps,
+    start=60,
+    unit="s")=60
+    "Time constant of integrator block for CHW loop ∆p control"
+    annotation (Dialog(group="Control gains",
+      enable=have_chiWat and have_pumPriCtlDp));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1PumHeaWatPri[nPumHeaWatPri]
+    if have_pumHeaWatPri
+    "Primary HW pump start command"
+    annotation (Placement(transformation(extent={{-240,-80},{-200,-40}}),
+      iconTransformation(extent={{-140,100},{-100,140}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yPumHeaWatPriHdr
+    if have_pumHeaWatPri and have_pumPriHdr
+    "Headered primary HW pump speed command"
+    annotation (Placement(transformation(extent={{200,80},{240,120}}),
+      iconTransformation(extent={{100,-20},{140,20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1PumChiWatPri[nPumChiWatPri]
+    if have_pumChiWatPri
+    "Primary CHW pump start command"
+    annotation (Placement(transformation(extent={{-240,-100},{-200,-60}}),
+      iconTransformation(extent={{-140,-40},{-100,0}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yPumChiWatPriHdr
+    if have_pumChiWatPri and have_pumPriHdr
+    "Headered primary CHW pump speed command"
+    annotation (Placement(transformation(extent={{200,40},{240,80}}),
+      iconTransformation(extent={{100,-60},{140,-20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yPumHeaWatPriDed[nPumHeaWatPri]
+    if have_pumHeaWatPri and not have_pumPriHdr
+    "Dedicated primary HW pump speed command"
+    annotation (Placement(transformation(extent={{200,-100},{240,-60}}),
+      iconTransformation(extent={{100,-100},{140,-60}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yPumChiWatPriDed[nPumChiWatPri]
+    if have_pumChiWatPri and not have_pumPriHdr
+    "Dedicated primary CHW pump speed command"
+    annotation (Placement(transformation(extent={{200,-200},{240,-160}}),
+      iconTransformation(extent={{100,-140},{140,-100}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1Hea[nEqu]
+    if have_heaWat and have_chiWat and not have_pumChiWatPri
+    "Heating/cooling mode command"
+    annotation (Placement(transformation(extent={{-240,-180},{-200,-140}}),
+      iconTransformation(extent={{-140,-20},{-100,20}})));
+  Buildings.Controls.OBC.CDL.Reals.Switch setPumChiWatPriDed[nPumChiWatPri]
+    if have_pumChiWatPri and not have_pumPriHdr
+    "Set prescribed speed when pump is enabled"
+    annotation (Placement(transformation(extent={{170,-190},{190,-170}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant zer(
+    final k=0)
+    "Constant"
+    annotation (Placement(transformation(extent={{-10,-210},{10,-190}})));
+  Buildings.Controls.OBC.CDL.Reals.Switch setPumHeaWatPriDed[nPumHeaWatPri]
+    if have_pumHeaWatPri and not have_pumPriHdr
+    "Set prescribed speed when pump is enabled"
+    annotation (Placement(transformation(extent={{170,-90},{190,-70}})));
+  Buildings.Controls.OBC.CDL.Routing.RealScalarReplicator rep(
+    nout=nPumHeaWatPri)
+    if have_pumHeaWatPri
+    "Replicate signal"
+    annotation (Placement(transformation(extent={{50,-130},{70,-110}})));
+  Buildings.Controls.OBC.CDL.Routing.RealScalarReplicator rep1(
+    nout=nPumChiWatPri)
+    if have_pumChiWatPri
+    "Replicate signal"
+    annotation (Placement(transformation(extent={{50,-170},{70,-150}})));
+  Buildings.Controls.OBC.CDL.Routing.RealScalarReplicator rep2(
+    nout=nPumChiWatPri)
+    if have_pumChiWatPri
+    "Replicate signal"
+    annotation (Placement(transformation(extent={{50,-210},{70,-190}})));
+  Buildings.Controls.OBC.CDL.Reals.Switch setPumChiWatPriHdr
+    if have_pumChiWatPri and have_pumPriHdr
+    "Set prescribed speed when pump is enabled"
+    annotation (Placement(transformation(extent={{170,50},{190,70}})));
+  Buildings.Controls.OBC.CDL.Reals.Switch setPumHeaWatPriHdr
+    if have_pumHeaWatPri and have_pumPriHdr
+    "Set prescribed speed when pump is enabled"
+    annotation (Placement(transformation(extent={{170,90},{190,110}})));
+  Buildings.Controls.OBC.CDL.Logical.MultiOr anyPumChiWatPri(
+    nin=nPumChiWatPri)
+    if have_pumChiWatPri
+    "Return true if any pump is enabled"
+    annotation (Placement(transformation(extent={{-10,50},{10,70}})));
+  Buildings.Controls.OBC.CDL.Logical.MultiOr anyPumHeaWatPri(
+    nin=nPumHeaWatPri)
+    if have_pumHeaWatPri
+    "Return true if any pump is enabled"
+    annotation (Placement(transformation(extent={{-10,90},{10,110}})));
+  Buildings.Controls.OBC.CDL.Reals.Switch selSpeHea[nPumHeaWatPri]
+    if have_heaWat and have_chiWat and not have_pumChiWatPri and not have_pumPriHdr
+    "Select prescribed pump speed depending on heating/cooling mode – Case with common CHW and HW dedicated pumps"
+    annotation (Placement(transformation(extent={{90,-70},{110,-50}})));
+  Buildings.Controls.OBC.CDL.Routing.RealScalarReplicator rep3(
+    nout=nPumHeaWatPri)
+    if have_heaWat
+    "Replicate signal"
+    annotation (Placement(transformation(extent={{50,-30},{70,-10}})));
+  Buildings.Controls.OBC.CDL.Routing.RealScalarReplicator rep4(
+    nout=nPumHeaWatPri)
+    if have_heaWat and have_chiWat and not have_pumChiWatPri and not have_pumPriHdr
+    "Replicate signal"
+    annotation (Placement(transformation(extent={{50,-90},{70,-70}})));
+  Utilities.PlaceholderReal ph[nPumHeaWatPri](
+    each final have_inp=have_heaWat and have_chiWat and not have_pumChiWatPri
+      and not have_pumPriHdr,
+    each final have_inpPh=true)
+    if have_pumHeaWatPri and not have_pumPriHdr
+    "Always use HW pump speed in case of separate dedicated CHW pumps "
+    annotation (Placement(transformation(extent={{132,-70},{152,-50}})));
+  Generic.ControlDifferentialPressure ctlDpHeaWat(
+    final have_senDpRemWir=have_senDpHeaWatRemWir,
+    final k=kCtlDpHeaWat,
+    final nPum=nPumHeaWatPri,
+    final nSenDpRem=nSenDpHeaWatRem,
+    final Ti=TiCtlDpHeaWat,
+    final y_min=yPumHeaWatPri_min)
+    if have_heaWat and have_pumPriCtlDp
+    "HW loop ∆p control"
+    annotation (Placement(transformation(extent={{-20,214},{0,234}})));
+  Utilities.PlaceholderReal phSpePumHeaWatPri(
+    final have_inp=have_pumPriCtlDp,
+    final have_inpPh=false,
+    final u_internal=yPumHeaWatPriSet)
+    if have_heaWat
+    "Replace with fixed speed"
+    annotation (Placement(transformation(extent={{12,190},{32,210}})));
+  Generic.ControlDifferentialPressure ctlDpChiWat(
+    final have_senDpRemWir=have_senDpChiWatRemWir,
+    final k=kCtlDpChiWat,
+    final nPum=if have_pumChiWatPri then nPumChiWatPri else nPumHeaWatPri,
+    final nSenDpRem=nSenDpChiWatRem,
+    final Ti=TiCtlDpChiWat,
+    final y_min=if have_pumChiWatPri then yPumChiWatPri_min else yPumHeaWatPri_min)
+    if have_chiWat and have_pumPriCtlDp
+    "CHW loop ∆p control"
+    annotation (Placement(transformation(extent={{-20,154},{0,174}})));
+  Utilities.PlaceholderReal phSpePumChiWatPri(
+    final have_inp=have_pumPriCtlDp,
+    final have_inpPh=false,
+    final u_internal=yPumChiWatPriSet)
+    if have_chiWat
+    "Replace with fixed speed"
+    annotation (Placement(transformation(extent={{10,130},{30,150}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1PumHeaWatPri_actual[nPumHeaWatPri]
+    if have_pumHeaWatPri and have_pumPriCtlDp
+    "Primary HW pump status"
+    annotation (Placement(transformation(extent={{-240,180},{-200,220}}),
+      iconTransformation(extent={{-140,80},{-100,120}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1PumChiWatPri_actual[nPumChiWatPri]
+    if have_pumChiWatPri and have_pumPriCtlDp
+    "Primary CHW pump status"
+    annotation (Placement(transformation(extent={{-240,160},{-200,200}}),
+      iconTransformation(extent={{-140,-60},{-100,-20}})));
+  Buildings.Controls.OBC.CDL.Logical.Not u1Coo[nEqu]
+    if have_heaWat and have_chiWat and not have_pumChiWatPri
+    "Return true if cooling mode command"
+    annotation (Placement(transformation(extent={{-190,-150},{-170,-130}})));
+  Buildings.Controls.OBC.CDL.Logical.And u1CooAndOn[nPumHeaWatPri]
+    if have_heaWat and have_chiWat and not have_pumChiWatPri and have_pumPriCtlDp
+    "Return true if cooling mode command and pump proven on"
+    annotation (Placement(transformation(extent={{-90,110},{-70,130}})));
+  Utilities.PlaceholderLogical phPumChiWatPriSta[if have_pumChiWatPri then nPumChiWatPri
+    else nPumHeaWatPri](
+    each final have_inp=have_pumChiWatPri,
+    each final have_inpPh=true)
+    if have_chiWat and have_pumPriCtlDp
+    "Replace with common dedicated pump signal"
+    annotation (Placement(transformation(extent={{-50,130},{-30,150}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput dpChiWatLoc(
+    final unit="Pa")
+    if have_chiWat and have_pumPriCtlDp and not have_senDpChiWatRemWir
+    "Local CHW differential pressure"
+    annotation (Placement(transformation(extent={{-240,-40},{-200,0}}),
+      iconTransformation(extent={{-140,-140},{-100,-100}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput dpChiWatLocSet[nSenDpChiWatRem](
+    each final unit="Pa")
+    if have_chiWat and have_pumPriCtlDp and not have_senDpChiWatRemWir
+    "Local CHW differential pressure setpoint output from each of the remote loops"
+    annotation (Placement(transformation(extent={{-240,-20},{-200,20}}),
+      iconTransformation(extent={{-140,-120},{-100,-80}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput dpChiWatRem[nSenDpChiWatRem](
+    each final unit="Pa")
+    if have_chiWat and have_pumPriCtlDp and have_senDpChiWatRemWir
+    "Remote CHW differential pressure"
+    annotation (Placement(transformation(extent={{-240,0},{-200,40}}),
+      iconTransformation(extent={{-140,-100},{-100,-60}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput dpHeaWatLoc(
+    final unit="Pa")
+    if have_heaWat and have_pumPriCtlDp and not have_senDpHeaWatRemWir
+    "Local HW differential pressure"
+    annotation (Placement(transformation(extent={{-240,40},{-200,80}}),
+      iconTransformation(extent={{-140,0},{-100,40}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput dpHeaWatLocSet[nSenDpHeaWatRem](
+    each final unit="Pa")
+    if have_heaWat and have_pumPriCtlDp and not have_senDpHeaWatRemWir
+    "Local HW differential pressure setpoint output from each of the remote loops"
+    annotation (Placement(transformation(extent={{-240,60},{-200,100}}),
+      iconTransformation(extent={{-140,20},{-100,60}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput dpHeaWatRem[nSenDpHeaWatRem](
+    each final unit="Pa")
+    if have_heaWat and have_pumPriCtlDp and have_senDpHeaWatRemWir
+    "Remote HW differential pressure"
+    annotation (Placement(transformation(extent={{-240,80},{-200,120}}),
+      iconTransformation(extent={{-140,40},{-100,80}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput dpHeaWatRemSet[nSenDpHeaWatRem](
+    each final unit="Pa")
+    if have_heaWat and have_pumPriCtlDp and have_senDpHeaWatRemWir
+    "Remote HW differential pressure setpoint"
+    annotation (Placement(transformation(extent={{-240,100},{-200,140}}),
+      iconTransformation(extent={{-140,60},{-100,100}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput dpChiWatRemSet[nSenDpChiWatRem](
+    each final unit="Pa")
+    if have_chiWat and have_pumPriCtlDp and have_senDpChiWatRemWir
+    "Remote CHW differential pressure setpoint"
+    annotation (Placement(transformation(extent={{-240,20},{-200,60}}),
+      iconTransformation(extent={{-140,-80},{-100,-40}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput dpHeaWatLocSetMax(
+    final unit="Pa")
+    if have_heaWat and have_pumPriCtlDp and not have_senDpHeaWatRemWir
+    "Maximum HW local differential pressure setpoint"
+    annotation (Placement(transformation(extent={{200,200},{240,240}}),
+      iconTransformation(extent={{100,100},{140,140}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput dpChiWatLocSetMax(
+    final unit="Pa")
+    if have_chiWat and have_pumPriCtlDp and not have_senDpChiWatRemWir
+    "Maximum CHW local differential pressure setpoint"
+    annotation (Placement(transformation(extent={{200,140},{240,180}}),
+      iconTransformation(extent={{100,60},{140,100}})));
+  Buildings.Controls.OBC.CDL.Logical.Latch latCoo[nPumHeaWatPri]
+    if have_heaWat and have_chiWat and not have_pumChiWatPri
+    "Latch signal until pump is re-enabled with equipment commanded to alternative mode"
+    annotation (Placement(transformation(extent={{-120,-130},{-100,-110}})));
+  Buildings.Controls.OBC.CDL.Logical.Edge edgU1PumHeaWatPri[nPumHeaWatPri]
+    if have_heaWat and have_chiWat and not have_pumChiWatPri
+    "Return true exactly when the pump is enabled"
+    annotation (Placement(transformation(extent={{-190,-110},{-170,-90}})));
+  Buildings.Controls.OBC.CDL.Logical.And edgU1Coo[nPumHeaWatPri]
+    if have_heaWat and have_chiWat and not have_pumChiWatPri
+    "Return true if equipment commanded in cooling mode when the pump is enabled"
+    annotation (Placement(transformation(extent={{-152,-130},{-132,-110}})));
+  Buildings.Controls.OBC.CDL.Logical.And edgU1AndHea[nPumHeaWatPri]
+    if have_heaWat and have_chiWat and not have_pumChiWatPri
+    "Return true if equipment commanded in heating mode when the pump is enabled"
+    annotation (Placement(transformation(extent={{-152,-170},{-132,-150}})));
+  Buildings.Controls.OBC.CDL.Logical.Latch latHea[nPumHeaWatPri]
+    if have_heaWat and have_chiWat and not have_pumChiWatPri
+    "Latch signal until pump is re-enabled with equipment commanded to alternative mode"
+    annotation (Placement(transformation(extent={{-120,-170},{-100,-150}})));
+  Buildings.Controls.OBC.CDL.Logical.And u1HeaAndOn[nPumHeaWatPri]
+    if have_heaWat and have_chiWat and not have_pumChiWatPri and have_pumPriCtlDp
+    "Return true if heating mode command and pump proven on"
+    annotation (Placement(transformation(extent={{-90,170},{-70,190}})));
+  Utilities.PlaceholderLogical phPumHeaWatPriSta[nPumHeaWatPri](
+    each final have_inp=have_chiWat and have_pumChiWatPri or not have_chiWat,
+    each final have_inpPh=true)
+    if have_heaWat and have_pumPriCtlDp
+    "Replace with common dedicated pump signal"
+    annotation (Placement(transformation(extent={{-50,190},{-30,210}})));
+equation
+  connect(u1PumChiWatPri, setPumChiWatPriDed.u2)
+    annotation (Line(points={{-220,-80},{-18,-80},{-18,-180},{168,-180}},color={255,0,255}));
+  connect(setPumChiWatPriDed.y, yPumChiWatPriDed)
+    annotation (Line(points={{192,-180},{220,-180}},color={0,0,127}));
+  connect(setPumHeaWatPriDed.y, yPumHeaWatPriDed)
+    annotation (Line(points={{192,-80},{220,-80}},color={0,0,127}));
+  connect(zer.y, rep.u)
+    annotation (Line(points={{12,-200},{30,-200},{30,-120},{48,-120}},color={0,0,127}));
+  connect(zer.y, rep2.u)
+    annotation (Line(points={{12,-200},{48,-200}},color={0,0,127}));
+  connect(setPumHeaWatPriHdr.y, yPumHeaWatPriHdr)
+    annotation (Line(points={{192,100},{220,100}},color={0,0,127}));
+  connect(setPumChiWatPriHdr.y, yPumChiWatPriHdr)
+    annotation (Line(points={{192,60},{220,60}},color={0,0,127}));
+  connect(rep2.y, setPumChiWatPriDed.u3)
+    annotation (Line(points={{72,-200},{160,-200},{160,-188},{168,-188}},color={0,0,127}));
+  connect(rep1.y, setPumChiWatPriDed.u1)
+    annotation (Line(points={{72,-160},{160,-160},{160,-172},{168,-172}},color={0,0,127}));
+  connect(zer.y, setPumChiWatPriHdr.u3)
+    annotation (Line(points={{12,-200},{30,-200},{30,52},{168,52}},color={0,0,127}));
+  connect(rep.y, setPumHeaWatPriDed.u3)
+    annotation (Line(points={{72,-120},{160,-120},{160,-88},{168,-88}},color={0,0,127}));
+  connect(zer.y, setPumHeaWatPriHdr.u3)
+    annotation (Line(points={{12,-200},{30,-200},{30,92},{168,92}},color={0,0,127}));
+  connect(u1PumChiWatPri, anyPumChiWatPri.u)
+    annotation (Line(points={{-220,-80},{-18,-80},{-18,60},{-12,60}},color={255,0,255}));
+  connect(u1PumHeaWatPri, anyPumHeaWatPri.u)
+    annotation (Line(points={{-220,-60},{-20,-60},{-20,100},{-12,100}},color={255,0,255}));
+  connect(anyPumHeaWatPri.y, setPumHeaWatPriHdr.u2)
+    annotation (Line(points={{12,100},{168,100}},color={255,0,255}));
+  connect(anyPumChiWatPri.y, setPumChiWatPriHdr.u2)
+    annotation (Line(points={{12,60},{168,60}},color={255,0,255}));
+  connect(u1PumHeaWatPri, setPumHeaWatPriDed.u2)
+    annotation (Line(points={{-220,-60},{-20,-60},{-20,-100},{140,-100},{140,-80},{168,-80}},
+      color={255,0,255}));
+  connect(rep3.y, selSpeHea.u1)
+    annotation (Line(points={{72,-20},{80,-20},{80,-52},{88,-52}},color={0,0,127}));
+  connect(ph.y, setPumHeaWatPriDed.u1)
+    annotation (Line(points={{154,-60},{158,-60},{158,-72},{168,-72}},color={0,0,127}));
+  connect(selSpeHea.y, ph.u)
+    annotation (Line(points={{112,-60},{130,-60}},color={0,0,127}));
+  connect(u1Hea, u1Coo.u)
+    annotation (Line(points={{-220,-160},{-196,-160},{-196,-140},{-192,-140}},
+      color={255,0,255}));
+  connect(u1PumChiWatPri_actual, phPumChiWatPriSta.u)
+    annotation (Line(points={{-220,180},{-120,180},{-120,140},{-52,140}},color={255,0,255}));
+  connect(phPumChiWatPriSta.y, ctlDpChiWat.y1_actual)
+    annotation (Line(points={{-28,140},{-26,140},{-26,172},{-22,172}},color={255,0,255}));
+  connect(dpHeaWatRemSet, ctlDpHeaWat.dpRemSet)
+    annotation (Line(points={{-220,120},{-180,120},{-180,228},{-22,228}},color={0,0,127}));
+  connect(dpHeaWatRem, ctlDpHeaWat.dpRem)
+    annotation (Line(points={{-220,100},{-176,100},{-176,224},{-22,224}},color={0,0,127}));
+  connect(dpHeaWatLocSet, ctlDpHeaWat.dpLocSet)
+    annotation (Line(points={{-220,80},{-172,80},{-172,220},{-22,220}},color={0,0,127}));
+  connect(dpHeaWatLoc, ctlDpHeaWat.dpLoc)
+    annotation (Line(points={{-220,60},{-168,60},{-168,216},{-22,216}},color={0,0,127}));
+  connect(dpChiWatRemSet, ctlDpChiWat.dpRemSet)
+    annotation (Line(points={{-220,40},{-164,40},{-164,168},{-22,168}},color={0,0,127}));
+  connect(dpChiWatRem, ctlDpChiWat.dpRem)
+    annotation (Line(points={{-220,20},{-160,20},{-160,164},{-22,164}},color={0,0,127}));
+  connect(dpChiWatLocSet, ctlDpChiWat.dpLocSet)
+    annotation (Line(points={{-220,0},{-156,0},{-156,160},{-22,160}},color={0,0,127}));
+  connect(dpChiWatLoc, ctlDpChiWat.dpLoc)
+    annotation (Line(points={{-220,-20},{-152,-20},{-152,156},{-22,156}},color={0,0,127}));
+  connect(ctlDpHeaWat.dpLocSetMax, dpHeaWatLocSetMax)
+    annotation (Line(points={{2,220},{220,220}},color={0,0,127}));
+  connect(ctlDpChiWat.dpLocSetMax, dpChiWatLocSetMax)
+    annotation (Line(points={{2,160},{220,160}},color={0,0,127}));
+  connect(rep3.y, ph.uPh)
+    annotation (Line(points={{72,-20},{120,-20},{120,-66},{130,-66}},color={0,0,127}));
+  connect(rep4.y, selSpeHea.u3)
+    annotation (Line(points={{72,-80},{80,-80},{80,-68},{88,-68}},color={0,0,127}));
+  connect(u1PumHeaWatPri, edgU1PumHeaWatPri.u)
+    annotation (Line(points={{-220,-60},{-196,-60},{-196,-100},{-192,-100}},
+      color={255,0,255}));
+  connect(u1Hea, edgU1AndHea.u2)
+    annotation (Line(points={{-220,-160},{-196,-160},{-196,-168},{-154,-168}},
+      color={255,0,255}));
+  connect(u1PumHeaWatPri_actual, u1HeaAndOn.u1)
+    annotation (Line(points={{-220,200},{-100,200},{-100,180},{-92,180}},color={255,0,255}));
+  connect(edgU1AndHea.y, latHea.u)
+    annotation (Line(points={{-130,-160},{-122,-160}},color={255,0,255}));
+  connect(phSpePumChiWatPri.y, setPumChiWatPriHdr.u1)
+    annotation (Line(points={{32,140},{40,140},{40,68},{168,68}},color={0,0,127}));
+  connect(ctlDpHeaWat.y, phSpePumHeaWatPri.u)
+    annotation (Line(points={{2,224},{6,224},{6,200},{10,200}},color={0,0,127}));
+  connect(ctlDpChiWat.y, phSpePumChiWatPri.u)
+    annotation (Line(points={{2,164},{6,164},{6,140},{8,140}},color={0,0,127}));
+  connect(phSpePumHeaWatPri.y, setPumHeaWatPriHdr.u1)
+    annotation (Line(points={{34,200},{42,200},{42,108},{168,108}},color={0,0,127}));
+  connect(phSpePumHeaWatPri.y, rep3.u)
+    annotation (Line(points={{34,200},{42,200},{42,-20},{48,-20}},color={0,0,127}));
+  connect(phSpePumChiWatPri.y, rep4.u)
+    annotation (Line(points={{32,140},{40,140},{40,-80},{48,-80}},color={0,0,127}));
+  connect(u1CooAndOn.y, phPumChiWatPriSta.uPh)
+    annotation (Line(points={{-68,120},{-60,120},{-60,134},{-52,134}},color={255,0,255}));
+  connect(phPumHeaWatPriSta.y, ctlDpHeaWat.y1_actual)
+    annotation (Line(points={{-28,200},{-26,200},{-26,232},{-22,232}},color={255,0,255}));
+  connect(u1HeaAndOn.y, phPumHeaWatPriSta.uPh)
+    annotation (Line(points={{-68,180},{-60,180},{-60,194},{-52,194}},color={255,0,255}));
+  connect(u1PumHeaWatPri_actual, phPumHeaWatPriSta.u)
+    annotation (Line(points={{-220,200},{-52,200}},color={255,0,255}));
+  connect(latCoo.y, u1CooAndOn.u2)
+    annotation (Line(points={{-98,-120},{-96,-120},{-96,112},{-92,112}},color={255,0,255}));
+  connect(latHea.y, selSpeHea.u2)
+    annotation (Line(points={{-98,-160},{0,-160},{0,-60},{88,-60}},color={255,0,255}));
+  connect(latHea.y, u1HeaAndOn.u2)
+    annotation (Line(points={{-98,-160},{-98,172},{-92,172}},color={255,0,255}));
+  connect(phSpePumChiWatPri.y, rep1.u)
+    annotation (Line(points={{32,140},{40,140},{40,-160},{48,-160}},color={0,0,127}));
+  connect(u1PumHeaWatPri_actual, u1CooAndOn.u1)
+    annotation (Line(points={{-220,200},{-100,200},{-100,120},{-92,120}},color={255,0,255}));
+  connect(u1Coo.y, edgU1Coo.u2)
+    annotation (Line(points={{-168,-140},{-164,-140},{-164,-128},{-154,-128}},
+      color={255,0,255}));
+  connect(edgU1PumHeaWatPri.y, edgU1Coo.u1)
+    annotation (Line(points={{-168,-100},{-160,-100},{-160,-120},{-154,-120}},
+      color={255,0,255}));
+  connect(edgU1PumHeaWatPri.y, edgU1AndHea.u1)
+    annotation (Line(points={{-168,-100},{-160,-100},{-160,-160},{-154,-160}},
+      color={255,0,255}));
+  connect(edgU1Coo.y, latCoo.u)
+    annotation (Line(points={{-130,-120},{-122,-120}},color={255,0,255}));
+  connect(edgU1AndHea.y, latCoo.clr)
+    annotation (Line(points={{-130,-160},{-126,-160},{-126,-126},{-122,-126}},
+      color={255,0,255}));
+  connect(edgU1Coo.y, latHea.clr)
+    annotation (Line(points={{-130,-120},{-128,-120},{-128,-166},{-122,-166}},
+      color={255,0,255}));
+  annotation (
+    defaultComponentName="ctlPumPri",
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=true,
+        extent={{-100,-140},{100,140}}),
+      graphics={
+        Rectangle(
+          extent={{-100,140},{100,-140}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Text(
+          extent={{-150,190},{150,150}},
+          textString="%name",
+          textColor={0,0,255})}),
+    Diagram(
+      coordinateSystem(
+        extent={{-200,-240},{200,240}}),
+      graphics={
+        Rectangle(
+          extent={{-198,-84},{-22,-218}},
+          lineColor={0,0,0},
+          fillColor={215,215,215},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None),
+        Text(
+          extent={{-196,-180},{-60,-200}},
+          textColor={0,0,255},
+          horizontalAlignment=TextAlignment.Left,
+          textString="Latch operating mode of associated
+HP when the pump is enabled")}),
+    Documentation(
+      info="<html>
+<h4>Plants with variable speed primary pumps that are not controlled to maintain differential pressure or flow setpoint</h4>
+<h5>
+Heating-only plants
+</h5>
+<p>
+When commanded on, the primary HW pumps are commanded at a fixed
+speed <code>yPumHeaWatPriSet</code>, as determined during the Testing, Adjusting,
+and Balancing phase to provide the design heat pump flow.
+</p>
+<h5>
+Cooling-only plants
+</h5>
+<p>
+When commanded on, the primary CHW pumps are commanded at a fixed
+speed <code>yPumChiWatPriSet</code>, as determined during the Testing, Adjusting,
+and Balancing phase to provide the design heat pump flow.
+</p>
+<h5>
+Heating and cooling plants with common primary CHW and HW pumps
+</h5>
+<p>
+When commanded on, the primary pumps are commanded at a fixed
+speed <code>yPumHeaWatPriSet</code> in heating mode or
+<code>yPumChiWatPriSet</code> in cooling mode, as determined during the
+Testing, Adjusting, and Balancing phase to provide the design heat pump flow
+in heating mode or cooling mode.
+The operating mode of the associated heat pump is determined and 
+latched at the time the pump is enabled.
+</p>
+<h5>
+Heating and cooling plants with separate primary CHW and HW pumps
+</h5>
+<p>
+When commanded on, the primary HW pumps are commanded at a fixed
+speed <code>yPumHeaWatPriSet</code>.
+When commanded on, the primary CHW pumps are commanded at a fixed
+speed <code>yPumChiWatPriSet</code>.
+The pump speed <code>yPumHeaWatPriSet</code> or <code>yPumChiWatPriSet</code>
+is determined during the Testing, Adjusting, and Balancing phase to provide
+the design heat pump flow in heating mode or cooling mode.
+</p>
+<h4>Plants with variable speed primary pumps that are controlled to maintain differential pressure or flow setpoint</h4>
+<h5>
+Heating-only plants
+</h5>
+<p>
+The pumps are controlled as described in
+<a href=\"modelica://Buildings.Templates.Plants.Controls.Pumps.Generic.ControlDifferentialPressure\">
+Buildings.Templates.Plants.Controls.Pumps.Generic.ControlDifferentialPressure</a>.
+The \"pump proven on\" condition is evaluated based on the primary HW pump status.
+</p>
+<h5>
+Cooling-only plants
+</h5>
+<p>
+The pumps are controlled as described in
+<a href=\"modelica://Buildings.Templates.Plants.Controls.Pumps.Generic.ControlDifferentialPressure\">
+Buildings.Templates.Plants.Controls.Pumps.Generic.ControlDifferentialPressure</a>.
+The \"pump proven on\" condition is evaluated based on the primary CHW pump status.
+</p>
+<h5>
+Heating and cooling plants with common primary CHW and HW pumps
+</h5>
+<p>
+The pumps are controlled as described in
+<a href=\"modelica://Buildings.Templates.Plants.Controls.Pumps.Generic.ControlDifferentialPressure\">
+Buildings.Templates.Plants.Controls.Pumps.Generic.ControlDifferentialPressure</a>.
+For the HW loop, the \"pump proven on\" condition is evaluated based on the status
+of the primary pumps associated with heat pumps that are commanded in 
+heating mode.
+For the CHW loop, the \"pump proven on\" condition is evaluated based on the status
+of the primary pumps associated with heat pumps that are commanded in 
+cooling mode.
+The operating mode of the associated heat pump is determined and 
+latched at the time the pump is enabled.
+</p>
+<h5>
+Heating and cooling plants with separate primary CHW and HW pumps
+</h5>
+<p>
+The pumps are controlled as described in
+<a href=\"modelica://Buildings.Templates.Plants.Controls.Pumps.Generic.ControlDifferentialPressure\">
+Buildings.Templates.Plants.Controls.Pumps.Generic.ControlDifferentialPressure</a>.
+For the HW loop, the \"pump proven on\" condition is evaluated based on the status
+of the primary HW pumps.
+For the CHW loop, the \"pump proven on\" condition is evaluated based on the status
+of the primary CHW pumps.
+</p>
+</html>",
+      revisions="<html>
+<ul>
+<li>
+May 31, 2024, by Antoine Gautier:<br/>
+Added logic for ∆p-controlled primary pumps and latching of HP operating mode.
+</li>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end VariableSpeed;
diff --git a/Buildings/Templates/Plants/Controls/Pumps/Primary/VariableSpeedNoDpControl.mo b/Buildings/Templates/Plants/Controls/Pumps/Primary/VariableSpeedNoDpControl.mo
deleted file mode 100644
index 6001958af8c..00000000000
--- a/Buildings/Templates/Plants/Controls/Pumps/Primary/VariableSpeedNoDpControl.mo
+++ /dev/null
@@ -1,281 +0,0 @@
-within Buildings.Templates.Plants.Controls.Pumps.Primary;
-block VariableSpeedNoDpControl
-  "Variable speed primary pumps without differential pressure control"
-  parameter Boolean have_heaWat
-    "Set to true for plants that provide HW"
-    annotation (Evaluate=true,
-    Dialog(group="Plant configuration"));
-  parameter Boolean have_chiWat
-    "Set to true for plants that provide CHW"
-    annotation (Evaluate=true,
-    Dialog(group="Plant configuration"));
-  final parameter Boolean have_pumHeaWatPri=have_heaWat
-    "Set to true for plants with primary HW pumps"
-    annotation (Evaluate=true);
-  parameter Boolean have_pumChiWatPriDed(start=false)
-    "Set to true for plants with separate dedicated primary CHW pumps"
-    annotation (Evaluate=true,
-    Dialog(group="Plant configuration",
-      enable=have_chiWat and not have_pumPriHdr));
-  final parameter Boolean have_pumChiWatPri=
-    have_chiWat and (have_pumPriHdr or have_pumChiWatPriDed)
-    "Set to true for plants with separate primary CHW pumps"
-    annotation (Evaluate=true);
-  parameter Boolean have_pumPriHdr
-    "Set to true for headered primary pumps, false for dedicated pumps"
-    annotation (Evaluate=true,
-    Dialog(group="Plant configuration"));
-  parameter Integer nEqu(start=0)
-    "Number of equipment"
-    annotation (Evaluate=true,
-    Dialog(group="Plant configuration",
-      enable=have_heaWat and have_chiWat));
-  parameter Integer nPumHeaWatPri
-    "Number of primary HW pumps"
-    annotation (Evaluate=true,
-    Dialog(group="Plant configuration"));
-  parameter Integer nPumChiWatPri(start=if have_chiWat and have_pumChiWatPri
-         then nEqu else 0)
-    "Number of primary CHW pumps"
-    annotation (Evaluate=true,
-    Dialog(group="Plant configuration",
-      enable=have_pumChiWatPri));
-  parameter Real yPumHeaWatPriSet(
-    max=1,
-    min=0,
-    start=1,
-    unit="1")
-    "Primary pump speed providing design heat pump flow in heating mode"
-    annotation (Dialog(group=
-      "Information provided by testing, adjusting, and balancing contractor",
-      enable=have_heaWat));
-  parameter Real yPumChiWatPriSet(
-    max=1,
-    min=0,
-    start=1,
-    unit="1")
-    "Primary pump speed providing design heat pump flow in cooling mode"
-    annotation (Dialog(group=
-      "Information provided by testing, adjusting, and balancing contractor",
-      enable=have_chiWat));
-  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1PumHeaWatPri[nPumHeaWatPri]
-    if have_heaWat and have_pumHeaWatPri
-    "Primary HW pump start command"
-    annotation (Placement(transformation(extent={{-180,40},{-140,80}}),
-      iconTransformation(extent={{-140,40},{-100,80}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yPumHeaWatPriHdr
-    if have_heaWat and have_pumHeaWatPri and have_pumPriHdr
-    "Headered primary HW pump speed command"
-    annotation (Placement(transformation(extent={{140,80},{180,120}}),
-      iconTransformation(extent={{100,40},{140,80}})));
-  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1PumChiWatPri[nPumChiWatPri]
-    if have_chiWat and have_pumChiWatPri
-    "Primary CHW pump start command"
-    annotation (Placement(transformation(extent={{-180,-20},{-140,20}}),
-      iconTransformation(extent={{-140,-20},{-100,20}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yPumChiWatPriHdr
-    if have_chiWat and have_pumChiWatPri and have_pumPriHdr
-    "Headered primary CHW pump speed command"
-    annotation (Placement(transformation(extent={{140,40},{180,80}}),
-      iconTransformation(extent={{100,0},{140,40}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yPumHeaWatPriDed[nPumHeaWatPri]
-    if have_heaWat and have_pumHeaWatPri and not have_pumPriHdr
-    "Dedicated primary HW pump speed command"
-    annotation (Placement(transformation(extent={{140,-80},{180,-40}}),
-      iconTransformation(extent={{100,-40},{140,0}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yPumChiWatPriDed[nPumChiWatPri]
-    if have_chiWat and have_pumChiWatPri and not have_pumPriHdr
-    "Dedicated primary CHW pump speed command"
-    annotation (Placement(transformation(extent={{140,-120},{180,-80}}),
-      iconTransformation(extent={{100,-80},{140,-40}})));
-  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1Hea[nEqu] if have_heaWat
-     and have_chiWat and not have_pumChiWatPriDed and not have_pumPriHdr
-    "Heating/cooling mode command"
-    annotation (Placement(transformation(extent={{-180,-80},{-140,-40}}),
-      iconTransformation(extent={{-140,-80},{-100,-40}})));
-  Buildings.Controls.OBC.CDL.Reals.Switch setPumChiWatPriDed[nPumChiWatPri]
-    if have_chiWat and have_pumChiWatPri and not have_pumPriHdr
-    "Set prescribed speed when pump is enabled"
-    annotation (Placement(transformation(extent={{110,-110},{130,-90}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant zer(
-    final k=0)
-    "Constant"
-    annotation (Placement(transformation(extent={{-110,-90},{-90,-70}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant spePumChiWatPri(
-    final k=yPumChiWatPriSet)
-    if have_chiWat
-    "Constant"
-    annotation (Placement(transformation(extent={{-110,-130},{-90,-110}})));
-  Buildings.Controls.OBC.CDL.Reals.Switch setPumHeaWatPriDed[nPumHeaWatPri]
-    if have_heaWat and have_pumHeaWatPri and not have_pumPriHdr
-    "Set prescribed speed when pump is enabled"
-    annotation (Placement(transformation(extent={{110,-70},{130,-50}})));
-  Buildings.Controls.OBC.CDL.Routing.RealScalarReplicator rep(
-    nout=nPumHeaWatPri)
-    if have_heaWat and have_pumHeaWatPri
-    "Replicate signal"
-    annotation (Placement(transformation(extent={{-60,-30},{-40,-10}})));
-  Buildings.Controls.OBC.CDL.Routing.RealScalarReplicator rep1(
-    nout=nPumChiWatPri)
-    if have_chiWat and have_pumChiWatPri
-    "Replicate signal"
-    annotation (Placement(transformation(extent={{-60,-130},{-40,-110}})));
-  Buildings.Controls.OBC.CDL.Routing.RealScalarReplicator rep2(
-    nout=nPumChiWatPri)
-    if have_chiWat and have_pumChiWatPri
-    "Replicate signal"
-    annotation (Placement(transformation(extent={{-60,-90},{-40,-70}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant spePumHeaWatPri(
-    final k=yPumHeaWatPriSet)
-    if have_heaWat and have_pumHeaWatPri
-    "Constant"
-    annotation (Placement(transformation(extent={{-110,110},{-90,130}})));
-  Buildings.Controls.OBC.CDL.Reals.Switch setPumChiWatPriHdr
-    if have_chiWat and have_pumChiWatPri and have_pumPriHdr
-    "Set prescribed speed when pump is enabled"
-    annotation (Placement(transformation(extent={{110,50},{130,70}})));
-  Buildings.Controls.OBC.CDL.Reals.Switch setPumHeaWatPriHdr
-    if have_heaWat and have_pumHeaWatPri and have_pumPriHdr
-    "Set prescribed speed when pump is enabled"
-    annotation (Placement(transformation(extent={{110,90},{130,110}})));
-  Buildings.Controls.OBC.CDL.Logical.MultiOr anyPumChiWatPri(
-    nin=nPumChiWatPri)
-    if have_chiWat and have_pumChiWatPri
-    "Return true if any pump is enabled"
-    annotation (Placement(transformation(extent={{-110,-10},{-90,10}})));
-  Buildings.Controls.OBC.CDL.Logical.MultiOr anyPumHeaWatPri(
-    nin=nPumHeaWatPri)
-    if have_heaWat and have_pumHeaWatPri
-    "Return true if any pump is enabled"
-    annotation (Placement(transformation(extent={{-110,50},{-90,70}})));
-  Buildings.Controls.OBC.CDL.Reals.Switch selSpeHea[nPumHeaWatPri] if
-    have_heaWat and have_chiWat and not have_pumChiWatPri and not
-    have_pumPriHdr
-    "Select prescribed pump speed depending on heating/cooling mode – Case with common CHW and HW dedicated pumps"
-    annotation (Placement(transformation(extent={{40,-50},{60,-30}})));
-  Buildings.Controls.OBC.CDL.Routing.RealScalarReplicator rep3(
-    nout=nPumHeaWatPri)
-    if have_heaWat and have_pumHeaWatPri
-    "Replicate signal"
-    annotation (Placement(transformation(extent={{-60,20},{-40,40}})));
-  Buildings.Controls.OBC.CDL.Routing.RealScalarReplicator rep4(
-    nout=nPumHeaWatPri) if have_heaWat and have_chiWat and not
-    have_pumChiWatPri and not have_pumPriHdr
-    "Replicate signal"
-    annotation (Placement(transformation(extent={{-30,2},{-10,22}})));
-  Utilities.PlaceholderReal ph[nPumHeaWatPri](
-    each final have_inp=have_heaWat and have_chiWat and not have_pumChiWatPri
-         and not have_pumPriHdr,
-    each final have_inpPh=false,
-    each final u_internal=yPumHeaWatPriSet)
-    if have_heaWat and have_pumHeaWatPri and not have_pumPriHdr
-    "Always use HW pump speed in case of separate dedicated CHW pumps "
-    annotation (Placement(transformation(extent={{70,-50},{90,-30}})));
-equation
-  connect(u1PumChiWatPri, setPumChiWatPriDed.u2)
-    annotation (Line(points={{-160,0},{-126,0},{-126,-100},{108,-100}},color={255,0,255}));
-  connect(setPumChiWatPriDed.y, yPumChiWatPriDed)
-    annotation (Line(points={{132,-100},{160,-100}},color={0,0,127}));
-  connect(setPumHeaWatPriDed.y, yPumHeaWatPriDed)
-    annotation (Line(points={{132,-60},{160,-60}},color={0,0,127}));
-  connect(zer.y, rep.u)
-    annotation (Line(points={{-88,-80},{-70,-80},{-70,-20},{-62,-20}},color={0,0,127}));
-  connect(spePumChiWatPri.y, rep1.u)
-    annotation (Line(points={{-88,-120},{-62,-120}},color={0,0,127}));
-  connect(zer.y, rep2.u)
-    annotation (Line(points={{-88,-80},{-62,-80}},color={0,0,127}));
-  connect(setPumHeaWatPriHdr.y, yPumHeaWatPriHdr)
-    annotation (Line(points={{132,100},{160,100}},color={0,0,127}));
-  connect(setPumChiWatPriHdr.y, yPumChiWatPriHdr)
-    annotation (Line(points={{132,60},{160,60}},color={0,0,127}));
-  connect(rep2.y, setPumChiWatPriDed.u3)
-    annotation (Line(points={{-38,-80},{-20,-80},{-20,-108},{108,-108}},color={0,0,127}));
-  connect(rep1.y, setPumChiWatPriDed.u1)
-    annotation (Line(points={{-38,-120},{80,-120},{80,-92},{108,-92}},color={0,0,127}));
-  connect(zer.y, setPumChiWatPriHdr.u3)
-    annotation (Line(points={{-88,-80},{-70,-80},{-70,52},{108,52}},color={0,0,127}));
-  connect(rep.y, setPumHeaWatPriDed.u3)
-    annotation (Line(points={{-38,-20},{-20,-20},{-20,-68},{108,-68}},color={0,0,127}));
-  connect(zer.y, setPumHeaWatPriHdr.u3)
-    annotation (Line(points={{-88,-80},{-70,-80},{-70,92},{108,92}},color={0,0,127}));
-  connect(spePumChiWatPri.y, setPumChiWatPriHdr.u1)
-    annotation (Line(points={{-88,-120},{-80,-120},{-80,68},{108,68}},color={0,0,127}));
-  connect(u1PumChiWatPri, anyPumChiWatPri.u)
-    annotation (Line(points={{-160,0},{-112,0}},color={255,0,255}));
-  connect(u1PumHeaWatPri, anyPumHeaWatPri.u)
-    annotation (Line(points={{-160,60},{-136,60},{-136,60},{-112,60}},color={255,0,255}));
-  connect(anyPumHeaWatPri.y, setPumHeaWatPriHdr.u2)
-    annotation (Line(points={{-88,60},{60,60},{60,100},{108,100}},color={255,0,255}));
-  connect(spePumHeaWatPri.y, setPumHeaWatPriHdr.u1)
-    annotation (Line(points={{-88,120},{40,120},{40,108},{108,108}},color={0,0,127}));
-  connect(anyPumChiWatPri.y, setPumChiWatPriHdr.u2)
-    annotation (Line(points={{-88,0},{80,0},{80,60},{108,60}},color={255,0,255}));
-  connect(u1PumHeaWatPri, setPumHeaWatPriDed.u2)
-    annotation (Line(points={{-160,60},{-120,60},{-120,-60},{108,-60}},color={255,0,255}));
-  connect(u1Hea, selSpeHea.u2)
-    annotation (Line(points={{-160,-60},{-132,-60},{-132,-40},{38,-40}},color={255,0,255}));
-  connect(spePumHeaWatPri.y, rep3.u)
-    annotation (Line(points={{-88,120},{-84,120},{-84,30},{-62,30}},
-      color={0,0,127}));
-  connect(rep3.y, selSpeHea.u1)
-    annotation (Line(points={{-38,30},{30,30},{30,-32},{38,-32}},color={0,0,127}));
-  connect(rep4.y, selSpeHea.u3)
-    annotation (Line(points={{-8,12},{20,12},{20,-48},{38,-48}},color={0,0,127}));
-  connect(spePumChiWatPri.y, rep4.u)
-    annotation (Line(points={{-88,-120},{-80,-120},{-80,12},{-32,12}},color={0,0,127}));
-  connect(ph.y, setPumHeaWatPriDed.u1) annotation (Line(points={{92,-40},{100,-40},
-          {100,-52},{108,-52}}, color={0,0,127}));
-  connect(selSpeHea.y, ph.u)
-    annotation (Line(points={{62,-40},{68,-40}}, color={0,0,127}));
-  annotation (
-    defaultComponentName="ctlPumPri",
-    Icon(
-      coordinateSystem(
-        preserveAspectRatio=true,
-        extent={{-100,-100},{100,100}}),
-      graphics={
-        Rectangle(
-          extent={{-100,100},{100,-100}},
-          lineColor={0,0,0},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Text(
-          extent={{-150,150},{150,110}},
-          textString="%name",
-          textColor={0,0,255})}),
-    Diagram(
-      coordinateSystem(
-        extent={{-140,-140},{140,140}})),
-    Documentation(info="<html>
-<h5>
-Heating-only plants with variable speed primary pumps that are not controlled to maintain differential pressure or flow setpoint
-</h5>
-<p>
-When commanded on, the primary HW pumps are commanded at a fixed
-speed <code>yPumHeaWatPriSet</code>, as determined during the Testing, Adjusting, 
-and Balancing phase to provide the design heat pump flow.
-</p>
-<h5>
-Heating and cooling plants with common variable speed primary pumps that are not controlled to maintain differential pressure or flow setpoint
-</h5>
-<p>
-When commanded on, the primary pumps are commanded at a fixed
-speed <code>yPumHeaWatPriSet</code> in heating mode or 
-<code>yPumChiWatPriSet</code> in cooling mode, as determined during the
-Testing, Adjusting, and Balancing phase to provide the design heat pump flow
-in heating mode or cooling mode.
-</p>
-<h5>
-Heating and cooling plants with separate variable speed primary pumps that are not controlled to maintain differential pressure or flow setpoint
-</h5>
-<p>
-When commanded on, the primary HW pumps are commanded at a fixed
-speed <code>yPumHeaWatPriSet</code>.
-When commanded on, the primary CHW pumps are commanded at a fixed
-speed <code>yPumChiWatPriSet</code>.
-The pump speed <code>yPumHeaWatPriSet</code> or <code>yPumChiWatPriSet</code> 
-is determined during the Testing, Adjusting, and Balancing phase to provide 
-the design heat pump flow in heating mode or cooling mode.
-</p>
-</html>"));
-end VariableSpeedNoDpControl;
diff --git a/Buildings/Templates/Plants/Controls/Pumps/Primary/package.order b/Buildings/Templates/Plants/Controls/Pumps/Primary/package.order
index f1ce062b461..d6b372074fb 100644
--- a/Buildings/Templates/Plants/Controls/Pumps/Primary/package.order
+++ b/Buildings/Templates/Plants/Controls/Pumps/Primary/package.order
@@ -1,3 +1,4 @@
+DisableDedicated
 EnableLeadHeadered
-VariableSpeedNoDpControl
+VariableSpeed
 Validation
diff --git a/Buildings/Templates/Plants/Controls/Setpoints/PlantReset.mo b/Buildings/Templates/Plants/Controls/Setpoints/PlantReset.mo
index b62059f874e..4466c34424f 100644
--- a/Buildings/Templates/Plants/Controls/Setpoints/PlantReset.mo
+++ b/Buildings/Templates/Plants/Controls/Setpoints/PlantReset.mo
@@ -121,8 +121,8 @@ block PlantReset
     final triAmo=tri)
     "Compute plant reset with trim and respond logic "
     annotation (Placement(transformation(extent={{-50,90},{-30,110}})));
-  Buildings.Controls.OBC.CDL.Logical.TrueHold truHol(
-    final duration=dtHol)
+  Buildings.Controls.OBC.CDL.Logical.TrueFalseHold truHol(
+    final falseHoldDuration=0, final trueHoldDuration=dtHol)
     "Hold true value of input signal for given time"
     annotation (Placement(transformation(extent={{-130,30},{-110,50}})));
   Buildings.Controls.OBC.CDL.Discrete.TriggeredSampler triSam
diff --git a/Buildings/Templates/Plants/Controls/StagingRotation/EquipmentAvailability.mo b/Buildings/Templates/Plants/Controls/StagingRotation/EquipmentAvailability.mo
index c22062208e8..33c9cbea75e 100644
--- a/Buildings/Templates/Plants/Controls/StagingRotation/EquipmentAvailability.mo
+++ b/Buildings/Templates/Plants/Controls/StagingRotation/EquipmentAvailability.mo
@@ -235,5 +235,12 @@ If a heat pump is commanded enabled in either heating or cooling mode,
 it is removed from the staging order of the opposite mode until it has 
 been off for <code>dtOff</code>.
 </p>
+</html>", revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
 </html>"));
 end EquipmentAvailability;
diff --git a/Buildings/Templates/Plants/Controls/StagingRotation/EquipmentEnable.mo b/Buildings/Templates/Plants/Controls/StagingRotation/EquipmentEnable.mo
index b98bbce7707..da6f58b8b9c 100644
--- a/Buildings/Templates/Plants/Controls/StagingRotation/EquipmentEnable.mo
+++ b/Buildings/Templates/Plants/Controls/StagingRotation/EquipmentEnable.mo
@@ -7,8 +7,8 @@ block EquipmentEnable
     each max=1)
     "Staging matrix – Equipment required for each stage"
     annotation (Evaluate=true);
-  final parameter Integer nEquAlt=max({sum({(if staEqu[i, j] > 0 and staEqu[i, j] < 1
-    then 1 else 0) for j in 1:nEqu}) for i in 1:nSta})
+  parameter Integer nEquAlt=if nEqu==1 then 1 else
+    max({sum({(if staEqu[i, j] > 0 and staEqu[i, j] < 1 then 1 else 0) for j in 1:nEqu}) for i in 1:nSta})
     "Number of lead/lag alternate equipment"
     annotation (Evaluate=true);
   final parameter Integer nSta=size(staEqu, 1)
@@ -304,5 +304,12 @@ However, when a lead/lag alternate equipment becomes unavailable and another
 lead/lag alternate equipment can be enabled to meet the number of required
 equipment, then the state of the enable signals is updated.
 </p>
+</html>", revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
 </html>"));
 end EquipmentEnable;
diff --git a/Buildings/Templates/Plants/Controls/StagingRotation/FailsafeCondition.mo b/Buildings/Templates/Plants/Controls/StagingRotation/FailsafeCondition.mo
new file mode 100644
index 00000000000..9e62c78c28a
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/StagingRotation/FailsafeCondition.mo
@@ -0,0 +1,254 @@
+within Buildings.Templates.Plants.Controls.StagingRotation;
+block FailsafeCondition
+  "Evaluate failsafe stage up condition"
+  parameter Buildings.Templates.Plants.Controls.Types.Application typ
+    "Type of application"
+    annotation (Evaluate=true);
+  parameter Boolean have_pumSec
+    "Set to true for primary-secondary distribution, false for primary-only"
+    annotation (Evaluate=true);
+  parameter Real dT(
+    final min=0,
+    final unit="K")
+    "Delta-T triggering stage up command (>0)";
+  parameter Real dtPri(
+    final min=0,
+    final unit="s")=900
+    "Runtime with high primary-setpoint Delta-T before staging up";
+  parameter Real dtSec(
+    final min=0,
+    final unit="s",
+    start=600)=600
+    "Runtime with high secondary-primary and secondary-setpoint Delta-T before staging up"
+    annotation (Dialog(enable=have_pumSec));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TSecSup(
+    final unit="K",
+    displayUnit="degC")
+    if have_pumSec
+    "Secondary supply temperature"
+    annotation (Placement(transformation(extent={{-180,-80},{-140,-40}}),
+      iconTransformation(extent={{-140,-60},{-100,-20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TPriSup(
+    final unit="K",
+    displayUnit="degC")
+    "Primary supply temperature"
+    annotation (Placement(transformation(extent={{-178,-20},{-138,20}}),
+      iconTransformation(extent={{-140,-20},{-100,20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TSupSet(
+    final unit="K",
+    displayUnit="degC")
+    "Supply temperature setpoint"
+    annotation (Placement(transformation(extent={{-178,40},{-138,80}}),
+      iconTransformation(extent={{-140,20},{-100,60}})));
+  Buildings.Controls.OBC.CDL.Reals.Subtract dTSecPri
+    if have_pumSec
+    "Secondary-primary ∆T"
+    annotation (Placement(transformation(extent={{-110,-90},{-90,-70}})));
+  Buildings.Controls.OBC.CDL.Reals.Subtract dTPriSet
+    "Primary-setpoint ∆T"
+    annotation (Placement(transformation(extent={{-110,30},{-90,50}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter polHeaCoo(
+    final k=if typ == Buildings.Templates.Plants.Controls.Types.Application.Cooling
+      then - 1 else 1)
+    "Polarity depending on heating or cooling application"
+    annotation (Placement(transformation(extent={{-80,30},{-60,50}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter polHeaCoo1(
+    final k=if typ == Buildings.Templates.Plants.Controls.Types.Application.Cooling
+      then - 1 else 1)
+    if have_pumSec
+    "Polarity depending on heating or cooling application"
+    annotation (Placement(transformation(extent={{-80,-90},{-60,-70}})));
+  Buildings.Controls.OBC.CDL.Reals.LessThreshold lesPriSet(
+    final t=- dT,
+    final h=0.1 * dT)
+    "True if Delta-T less than threshold"
+    annotation (Placement(transformation(extent={{-50,30},{-30,50}})));
+  Buildings.Controls.OBC.CDL.Reals.LessThreshold lesSecPri(
+    final t=- dT,
+    final h=0.1 * dT)
+    if have_pumSec
+    "True if Delta-T less than threshold"
+    annotation (Placement(transformation(extent={{-50,-90},{-30,-70}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput reset
+    "Reset timers to zero at completion of stage change"
+    annotation (Placement(transformation(extent={{-178,80},{-138,120}}),
+      iconTransformation(extent={{-140,60},{-100,100}})));
+  Utilities.TimerWithReset timPriSet(
+    final t=dtPri)
+    "Timer"
+    annotation (Placement(transformation(extent={{-10,30},{10,50}})));
+  Utilities.TimerWithReset timSecPri(
+    final t=dtSec)
+    if have_pumSec
+    "Timer"
+    annotation (Placement(transformation(extent={{-10,-90},{10,-70}})));
+  Buildings.Controls.OBC.CDL.Logical.Or any
+    "Any criterion met"
+    annotation (Placement(transformation(extent={{112,-10},{132,10}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1
+    "Failsafe stage up condition met"
+    annotation (Placement(transformation(extent={{140,-20},{180,20}}),
+      iconTransformation(extent={{100,-20},{140,20}})));
+  Utilities.PlaceholderLogical ph(
+    final have_inp=have_pumSec,
+    final have_inpPh=false,
+    final u_internal=false)
+    "Placeholder signal"
+    annotation (Placement(transformation(extent={{70,-70},{90,-50}})));
+  Buildings.Controls.OBC.CDL.Reals.Subtract dTSecSet
+    if have_pumSec
+    "Secondary-setpoint ∆T"
+    annotation (Placement(transformation(extent={{-110,-50},{-90,-30}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter polHeaCoo2(
+    final k=if typ == Buildings.Templates.Plants.Controls.Types.Application.Cooling
+      then - 1 else 1)
+    if have_pumSec
+    "Polarity depending on heating or cooling application"
+    annotation (Placement(transformation(extent={{-80,-50},{-60,-30}})));
+  Buildings.Controls.OBC.CDL.Reals.LessThreshold lesSecSet(
+    final t=- dT,
+    final h=0.1 * dT)
+    if have_pumSec
+    "True if Delta-T less than threshold"
+    annotation (Placement(transformation(extent={{-50,-50},{-30,-30}})));
+  Utilities.TimerWithReset timSecSet(
+    final t=dtSec)
+    if have_pumSec
+    "Timer"
+    annotation (Placement(transformation(extent={{-10,-50},{10,-30}})));
+  Buildings.Controls.OBC.CDL.Logical.And allSec
+    if have_pumSec
+    "All criteria on secondary temperature met"
+    annotation (Placement(transformation(extent={{28,-70},{48,-50}})));
+equation
+  connect(TPriSup, dTPriSet.u1)
+    annotation (Line(points={{-158,0},{-120,0},{-120,46},{-112,46}},color={0,0,127}));
+  connect(TSupSet, dTPriSet.u2)
+    annotation (Line(points={{-158,60},{-130,60},{-130,34},{-112,34}},color={0,0,127}));
+  connect(TSecSup, dTSecPri.u1)
+    annotation (Line(points={{-160,-60},{-124,-60},{-124,-74},{-112,-74}},color={0,0,127}));
+  connect(TPriSup, dTSecPri.u2)
+    annotation (Line(points={{-158,0},{-120,0},{-120,-86},{-112,-86}},color={0,0,127}));
+  connect(dTPriSet.y, polHeaCoo.u)
+    annotation (Line(points={{-88,40},{-82,40}},color={0,0,127}));
+  connect(dTSecPri.y, polHeaCoo1.u)
+    annotation (Line(points={{-88,-80},{-82,-80}},color={0,0,127}));
+  connect(polHeaCoo1.y, lesSecPri.u)
+    annotation (Line(points={{-58,-80},{-52,-80}},color={0,0,127}));
+  connect(polHeaCoo.y, lesPriSet.u)
+    annotation (Line(points={{-58,40},{-52,40}},color={0,0,127}));
+  connect(lesPriSet.y, timPriSet.u)
+    annotation (Line(points={{-28,40},{-12,40}},color={255,0,255}));
+  connect(reset, timPriSet.reset)
+    annotation (Line(points={{-158,100},{-20,100},{-20,32},{-12,32}},color={255,0,255}));
+  connect(lesSecPri.y, timSecPri.u)
+    annotation (Line(points={{-28,-80},{-12,-80}},color={255,0,255}));
+  connect(reset, timSecPri.reset)
+    annotation (Line(points={{-158,100},{-20,100},{-20,-88},{-12,-88}},color={255,0,255}));
+  connect(any.y, y1)
+    annotation (Line(points={{134,0},{160,0}},color={255,0,255}));
+  connect(dTSecSet.y, polHeaCoo2.u)
+    annotation (Line(points={{-88,-40},{-82,-40}},color={0,0,127}));
+  connect(polHeaCoo2.y, lesSecSet.u)
+    annotation (Line(points={{-58,-40},{-52,-40}},color={0,0,127}));
+  connect(lesSecSet.y, timSecSet.u)
+    annotation (Line(points={{-28,-40},{-12,-40}},color={255,0,255}));
+  connect(reset, timSecSet.reset)
+    annotation (Line(points={{-158,100},{-20,100},{-20,-48},{-12,-48}},color={255,0,255}));
+  connect(reset, timSecPri.reset)
+    annotation (Line(points={{-158,100},{-20,100},{-20,-88},{-12,-88}},color={255,0,255}));
+  connect(TSecSup, dTSecSet.u1)
+    annotation (Line(points={{-160,-60},{-124,-60},{-124,-34},{-112,-34}},color={0,0,127}));
+  connect(TSupSet, dTSecSet.u2)
+    annotation (Line(points={{-158,60},{-130,60},{-130,-46},{-112,-46}},color={0,0,127}));
+  connect(timSecSet.passed, allSec.u1)
+    annotation (Line(points={{12,-48},{20,-48},{20,-60},{26,-60}},color={255,0,255}));
+  connect(timSecPri.passed, allSec.u2)
+    annotation (Line(points={{12,-88},{20,-88},{20,-68},{26,-68}},color={255,0,255}));
+  connect(allSec.y, ph.u)
+    annotation (Line(points={{50,-60},{68,-60}},color={255,0,255}));
+  connect(timPriSet.passed, any.u1)
+    annotation (Line(points={{12,32},{100,32},{100,0},{110,0}},color={255,0,255}));
+  connect(ph.y, any.u2)
+    annotation (Line(points={{92,-60},{100,-60},{100,-8},{110,-8}},color={255,0,255}));
+  annotation (
+    defaultComponentName="faiSaf",
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=true,
+        extent={{-100,-100},{100,100}}),
+      graphics={
+        Rectangle(
+          extent={{-100,100},{100,-100}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Text(
+          extent={{-150,150},{150,110}},
+          textString="%name",
+          textColor={0,0,255})}),
+    Diagram(
+      coordinateSystem(
+        extent={{-140,-120},{140,120}})),
+    Documentation(
+      info="<html>
+<p>
+For heating applications with primary-secondary distribution:
+The failsafe stage up condition evaluates to true if either of the following is true.
+</p>
+<ul>
+<li>
+Secondary HW supply temperature &lt; primary HW supply temperature - <code>dT</code>
+for a period of <code>dtSec</code> and secondary HW supply temperature
+&lt; setpoint – <code>dT</code> for <code>dtSec</code>.
+</li>
+<li>
+Primary HW supply temperature &lt; setpoint - <code>dT</code> for 
+<code>dtPri</code>.
+</li>
+</ul>
+<p>
+For heating applications with primary-only distribution:
+The failsafe stage up condition evaluates to true if the following is true.
+</p>
+<ul>
+<li>
+Primary HW supply temperature &lt; setpoint - <code>dT</code> for 
+<code>dtPri</code>.
+</li>
+</ul>
+<p>
+For cooling applications with primary-secondary distribution:
+The failsafe stage up condition evaluates to true if either of the following is true.
+</p>
+<ul>
+<li>
+Secondary CHW supply temperature &gt; primary CHW supply temperature + <code>dT</code>
+for a period of <code>dtSec</code> and secondary CHW supply temperature
+&lt; setpoint + <code>dT</code> for <code>dtSec</code>.
+</li>
+<li>
+Primary CHW supply temperature &gt; setpoint + <code>dT</code> for 
+<code>dtPri</code>.
+</li>
+</ul>
+<p>
+For cooling applications with primary-only distribution:
+The failsafe stage up condition evaluates to true if the following is true.
+</p>
+<ul>
+<li>
+Primary CHW supply temperature &gt; setpoint + <code>dT</code> for 
+<code>dtPri</code>.
+</li>
+</ul>
+</html>",
+      revisions="<html>
+<ul>
+<li>
+May 31, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end FailsafeCondition;
diff --git a/Buildings/Templates/Plants/Controls/StagingRotation/LoadAverage.mo b/Buildings/Templates/Plants/Controls/StagingRotation/LoadAverage.mo
new file mode 100644
index 00000000000..4970f4bdd89
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/StagingRotation/LoadAverage.mo
@@ -0,0 +1,129 @@
+within Buildings.Templates.Plants.Controls.StagingRotation;
+block LoadAverage
+  "Compute the rolling average of the load on a system"
+  parameter Buildings.Templates.Plants.Controls.Types.Application typ
+    "Type of application"
+    annotation (Evaluate=true);
+  parameter Real cp_default(
+    final min=0,
+    final unit="J/(kg.K)")
+    "Default specific heat capacity used to compute required capacity";
+  parameter Real rho_default(
+    final min=0,
+    final unit="kg/m3")
+    "Default fluid density used to compute required capacity";
+  parameter Real dtMea(
+    final min=0,
+    final unit="s")=300
+    "Duration used to compute the moving average of required capacity";
+  Buildings.Controls.OBC.CDL.Reals.Subtract delT(
+    y(
+      final unit="K"))
+    "Compute ∆T"
+    annotation (Placement(transformation(extent={{-70,-10},{-50,10}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter capFlo(
+    y(
+      final unit="W/K"),
+    final k=rho_default * cp_default)
+    "Compute capacity flow rate"
+    annotation (Placement(transformation(extent={{-70,-50},{-50,-30}})));
+  Buildings.Controls.OBC.CDL.Reals.Multiply capReq
+    "Compute required capacity"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
+  Buildings.Controls.OBC.CDL.Reals.MovingAverage movAve(
+    delta=dtMea)
+    "Compute moving average"
+    annotation (Placement(transformation(extent={{70,-10},{90,10}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TRet(
+    final unit="K",
+    displayUnit="degC")
+    "Return temperature"
+    annotation (Placement(transformation(extent={{-140,-20},{-100,20}}),
+      iconTransformation(extent={{-140,-20},{-100,20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TSupSet(
+    final unit="K",
+    displayUnit="degC")
+    "Active supply temperature setpoint"
+    annotation (Placement(transformation(extent={{-140,20},{-100,60}}),
+      iconTransformation(extent={{-140,40},{-100,80}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput V_flow(
+    final unit="m3/s")
+    "Volume flow rate"
+    annotation (Placement(transformation(extent={{-140,-60},{-100,-20}}),
+      iconTransformation(extent={{-140,-80},{-100,-40}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput QReq_flow(
+    final unit="W")
+    "Load"
+    annotation (Placement(transformation(extent={{100,-20},{140,20}}),
+      iconTransformation(extent={{100,-20},{140,20}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter polHeaCoo(
+    final k=if typ == Buildings.Templates.Plants.Controls.Types.Application.Cooling
+      then - 1 else 1)
+    "Polarity depending on heating or cooling application"
+    annotation (Placement(transformation(extent={{30,-10},{50,10}})));
+equation
+  connect(capFlo.y, capReq.u2)
+    annotation (Line(points={{-48,-40},{-20,-40},{-20,-6},{-12,-6}},color={0,0,127}));
+  connect(TSupSet, delT.u1)
+    annotation (Line(points={{-120,40},{-80,40},{-80,6},{-72,6}},color={0,0,127}));
+  connect(TRet, delT.u2)
+    annotation (Line(points={{-120,0},{-80,0},{-80,-6},{-72,-6}},color={0,0,127}));
+  connect(V_flow, capFlo.u)
+    annotation (Line(points={{-120,-40},{-72,-40}},color={0,0,127}));
+  connect(movAve.y, QReq_flow)
+    annotation (Line(points={{92,0},{120,0}},color={0,0,127}));
+  connect(delT.y, capReq.u1)
+    annotation (Line(points={{-48,0},{-20,0},{-20,6},{-12,6}},color={0,0,127}));
+  connect(capReq.y, polHeaCoo.u)
+    annotation (Line(points={{12,0},{28,0}},color={0,0,127}));
+  connect(polHeaCoo.y, movAve.u)
+    annotation (Line(points={{52,0},{68,0}},color={0,0,127}));
+  annotation (
+    defaultComponentName="loa",
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=true,
+        extent={{-100,-100},{100,100}}),
+      graphics={
+        Rectangle(
+          extent={{-100,100},{100,-100}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Text(
+          extent={{-150,150},{150,110}},
+          textString="%name",
+          textColor={0,0,255})}),
+    Documentation(
+      info="<html>
+<p>
+This block computes the load on a system based on the return temperature, 
+active supply temperature setpoint and measured flow through the associated 
+circuit flow meter, using the following equation.
+</p>
+<ul>
+<li>For cooling applications:
+<code>Q_flow = V_flow * rho_default * cp_default * (TSupSet - TRet)</code>
+</li>
+<li>For cooling applications:
+<code>Q_flow = V_flow * rho_default * cp_default * (TRet - TSupSet)</code>
+</li>
+<li>
+For all applications: <code>Q_flow</code> less than or equal to zero means
+that there is no actual load on the system. 
+</li>
+</ul>
+<p>
+The output load <code>QReq_flow</code> is the rolling average of <code>Q_flow</code>
+over a period of <code>dtMea</code>.
+</p>
+</html>",
+      revisions="<html>
+<ul>
+<li>
+May 31, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end LoadAverage;
diff --git a/Buildings/Templates/Plants/Controls/StagingRotation/StageAvailability.mo b/Buildings/Templates/Plants/Controls/StagingRotation/StageAvailability.mo
index 398f600f4ab..76248bfebd8 100644
--- a/Buildings/Templates/Plants/Controls/StagingRotation/StageAvailability.mo
+++ b/Buildings/Templates/Plants/Controls/StagingRotation/StageAvailability.mo
@@ -154,5 +154,12 @@ at that stage.
 <p>
 Otherwise, the stage is deemed unavailable.
 </p>
+</html>", revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
 </html>"));
 end StageAvailability;
diff --git a/Buildings/Templates/Plants/Controls/StagingRotation/StageChangeCommand.mo b/Buildings/Templates/Plants/Controls/StagingRotation/StageChangeCommand.mo
index 3eef5577daf..df3f8bea389 100644
--- a/Buildings/Templates/Plants/Controls/StagingRotation/StageChangeCommand.mo
+++ b/Buildings/Templates/Plants/Controls/StagingRotation/StageChangeCommand.mo
@@ -1,14 +1,20 @@
 within Buildings.Templates.Plants.Controls.StagingRotation;
 block StageChangeCommand
   "Generate stage change command"
+  parameter Buildings.Templates.Plants.Controls.Types.Application typ
+    "Type of application"
+    annotation (Evaluate=true);
+  parameter Boolean have_pumSec
+    "Set to true for primary-secondary distribution, false for primary-only"
+    annotation (Evaluate=true);
   parameter Boolean have_inpPlrSta=false
     "Set to true to use an input signal for SPLR, false to use a parameter"
     annotation (Evaluate=true);
   parameter Real plrSta(
-    final max=1,
-    final min=0,
+    max=1,
+    min=0,
     start=0.9,
-    final unit="1")=0.9
+    unit="1")=0.9
     "Staging part load ratio"
     annotation (Dialog(enable=not have_inpPlrSta));
   final parameter Real traStaEqu[nEqu, nSta]={{staEqu[i, j] for i in 1:nSta} for j in 1:nEqu}
@@ -29,36 +35,44 @@ block StageChangeCommand
     each final unit="W")
     "Design capacity of each equipment";
   parameter Real dtRun(
-    final min=0,
-    final unit="s")=900
+    min=0,
+    unit="s")=900
     "Runtime with exceeded staging part load ratio before staging event is triggered";
   parameter Real dtMea(
-    final min=0,
-    final unit="s")=300
+    min=0,
+    unit="s")=300
     "Duration used to compute the moving average of required capacity";
-  parameter Real cp_default(
-    final min=0,
-    final unit="J/(kg.K)")
+  parameter Real cp_default(min=0, unit="J/(kg.K)")
     "Default specific heat capacity used to compute required capacity";
-  parameter Real rho_default(
-    final min=0,
-    final unit="kg/m3")
+  parameter Real rho_default(min=0, unit="kg/m3")
     "Default density used to compute required capacity";
+  parameter Real dT(min=0, unit="K")
+    "Delta-T triggering stage up command (>0)";
+  parameter Real dtPri(
+    min=0,
+    unit="s")=900
+    "Runtime with high primary-setpoint Delta-T before staging up";
+  parameter Real dtSec(
+    min=0,
+    start=600,
+    unit="s")=600
+    "Runtime with high secondary-primary and secondary-setpoint Delta-T before staging up"
+    annotation(Dialog(enable=have_pumSec));
   Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1AvaSta[nSta]
     "Stage available signal"
-    annotation (Placement(transformation(extent={{-240,60},{-200,100}}),
+    annotation (Placement(transformation(extent={{-240,40},{-200,80}}),
       iconTransformation(extent={{-140,40},{-100,80}})));
   Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1StaPro
     "Staging process in progress"
-    annotation (Placement(transformation(extent={{-240,-40},{-200,0}}),
-      iconTransformation(extent={{-140,0},{-100,40}})));
+    annotation (Placement(transformation(extent={{-240,0},{-200,40}}),
+      iconTransformation(extent={{-140,20},{-100,60}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput uPlrSta(
     final unit="1",
     final min=0,
     final max=1)
     if have_inpPlrSta
     "Input signal for staging part load ratio"
-    annotation (Placement(transformation(extent={{-240,-200},{-200,-160}}),
+    annotation (Placement(transformation(extent={{-240,-240},{-200,-200}}),
       iconTransformation(extent={{-140,-120},{-100,-80}})));
   // We allow the stage index to be zero, e.g., when the plant is disabled.
   Buildings.Controls.OBC.CDL.Interfaces.IntegerInput uSta(
@@ -69,20 +83,18 @@ block StageChangeCommand
       iconTransformation(extent={{-140,80},{-100,120}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput TRet(
     final unit="K",
-    displayUnit="degC")
-    "Return temperature used to compute required capacity"
-    annotation (Placement(transformation(extent={{-240,-120},{-200,-80}}),
+    displayUnit="degC") "Return temperature used to compute required capacity"
+    annotation (Placement(transformation(extent={{-240,-160},{-200,-120}}),
       iconTransformation(extent={{-140,-80},{-100,-40}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput TSupSet(
     final unit="K",
     displayUnit="degC")
     "Active supply temperature setpoint used to compute required capacity"
-    annotation (Placement(transformation(extent={{-240,-80},{-200,-40}}),
-      iconTransformation(extent={{-140,-60},{-100,-20}})));
+    annotation (Placement(transformation(extent={{-240,-100},{-200,-60}}),
+      iconTransformation(extent={{-140,-20},{-100,20}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput V_flow(
-    final unit="m3/s")
-    "Volume flow rate used to compute required capacity"
-    annotation (Placement(transformation(extent={{-240,-160},{-200,-120}}),
+    final unit="m3/s") "Volume flow rate used to compute required capacity"
+    annotation (Placement(transformation(extent={{-240,-200},{-200,-160}}),
       iconTransformation(extent={{-140,-100},{-100,-60}})));
   Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1Up
     "Stage up command"
@@ -92,26 +104,10 @@ block StageChangeCommand
     "Stage down command"
     annotation (Placement(transformation(extent={{200,-100},{240,-60}}),
       iconTransformation(extent={{100,-60},{140,-20}})));
-  Buildings.Controls.OBC.CDL.Reals.Subtract delT(
-    y(final unit="K"))
-    "Compute ∆T"
-    annotation (Placement(transformation(extent={{-170,-90},{-150,-70}})));
-  Buildings.Controls.OBC.CDL.Reals.Abs absDelT(
-    y(final unit="K"))
-    "Compute absolute value of ∆T"
-    annotation (Placement(transformation(extent={{-130,-90},{-110,-70}})));
-  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter capFlo(
-    y(final unit="W/K"),
-    final k=rho_default * cp_default)
-    "Compute capacity flow rate"
-    annotation (Placement(transformation(extent={{-130,-150},{-110,-130}})));
-  Buildings.Controls.OBC.CDL.Reals.Multiply capReq
-    "Compute required capacity"
-    annotation (Placement(transformation(extent={{-90,-90},{-70,-70}})));
   Buildings.Controls.OBC.CDL.Reals.Sources.Constant traMatStaEqu[nEqu, nSta](
     final k=traStaEqu)
     "Transpose of staging matrix"
-    annotation (Placement(transformation(extent={{-70,210},{-50,230}})));
+    annotation (Placement(transformation(extent={{-80,210},{-60,230}})));
   Buildings.Controls.OBC.CDL.Routing.RealExtractor reqEquSta[nEqu](
     each final nin=nSta)
     "Extract equipment required at given stage"
@@ -119,39 +115,35 @@ block StageChangeCommand
   Buildings.Controls.OBC.CDL.Routing.IntegerScalarReplicator intScaRep(
     final nout=nEqu)
     "Replicate signal"
-    annotation (Placement(transformation(extent={{-104,190},{-84,210}})));
+    annotation (Placement(transformation(extent={{-110,190},{-90,210}})));
   Buildings.Controls.OBC.CDL.Reals.Multiply capEquSta[nEqu]
     "Capacity of each equipment required at given stage"
     annotation (Placement(transformation(extent={{30,210},{50,230}})));
   Buildings.Controls.OBC.CDL.Reals.Sources.Constant capEquPar[nEqu](
     final k=capEqu)
     "Capacity of each equipment"
-    annotation (Placement(transformation(extent={{-70,150},{-50,170}})));
+    annotation (Placement(transformation(extent={{-80,150},{-60,170}})));
   Buildings.Controls.OBC.CDL.Reals.MultiSum capSta(
     nin=nEqu)
     "Compute nominal capacity of active stage"
     annotation (Placement(transformation(extent={{70,210},{90,230}})));
   Buildings.Controls.OBC.CDL.Reals.Greater gre(h=1E-4*min(capEqu))
     "Compare OPLR to SPLR (hysteresis is to avoid chattering with some simulators)"
-    annotation (Placement(transformation(extent={{60,-70},{80,-50}})));
-  Buildings.Controls.OBC.CDL.Reals.MovingAverage movAve(
-    delta=dtMea)
-    "Compute moving average"
-    annotation (Placement(transformation(extent={{-50,-90},{-30,-70}})));
+    annotation (Placement(transformation(extent={{-90,-110},{-70,-90}})));
   Buildings.Templates.Plants.Controls.Utilities.TimerWithReset timUp(
     final t=dtRun)
     "Timer"
-    annotation (Placement(transformation(extent={{110,-70},{130,-50}})));
+    annotation (Placement(transformation(extent={{-50,-110},{-30,-90}})));
   Buildings.Controls.OBC.CDL.Reals.Less les(h=1E-4*min(capEqu))
     "Compare OPLR to SPLR (hysteresis is to avoid chattering with some simulators)"
-    annotation (Placement(transformation(extent={{60,-130},{80,-110}})));
+    annotation (Placement(transformation(extent={{-90,-150},{-70,-130}})));
   Buildings.Templates.Plants.Controls.Utilities.TimerWithReset timDow(
     final t=dtRun)
     "Timer"
-    annotation (Placement(transformation(extent={{110,-130},{130,-110}})));
+    annotation (Placement(transformation(extent={{-50,-150},{-30,-130}})));
   Utilities.HoldReal hol(final dtHol=dtRun)
     "Hold value of required capacity at stage change"
-    annotation (Placement(transformation(extent={{20,-70},{40,-50}})));
+    annotation (Placement(transformation(extent={{-130,-110},{-110,-90}})));
   Buildings.Controls.OBC.CDL.Integers.Max maxInt
     "Maximum between stage index and 1"
     annotation (Placement(transformation(extent={{-140,190},{-120,210}})));
@@ -167,6 +159,7 @@ block StageChangeCommand
     "Return true if stage index lower than active stage index"
     annotation (Placement(transformation(extent={{-150,90},{-130,110}})));
   Buildings.Controls.OBC.CDL.Logical.And idxStaLesActAva[nSta]
+    "Return true if stage index lower than active stage index and stage available"
     annotation (Placement(transformation(extent={{-110,70},{-90,90}})));
   Buildings.Controls.OBC.CDL.Routing.IntegerScalarReplicator intScaRep1(
     final nout=nSta)
@@ -175,7 +168,7 @@ block StageChangeCommand
   Utilities.LastTrueIndex idxLasTru(
     nin=nSta)
     "Index of next available lower stage"
-    annotation (Placement(transformation(extent={{-70,70},{-50,90}})));
+    annotation (Placement(transformation(extent={{-80,70},{-60,90}})));
   Buildings.Controls.OBC.CDL.Integers.Max maxInt1
     "Maximum between stage index and 1"
     annotation (Placement(transformation(extent={{-30,110},{-10,130}})));
@@ -205,40 +198,62 @@ block StageChangeCommand
     annotation (Placement(transformation(extent={{110,170},{130,190}})));
   Buildings.Controls.OBC.CDL.Reals.Multiply splTimCapSta
     "SPLR times capacity of active stage"
-    annotation (Placement(transformation(extent={{20,-130},{40,-110}})));
+    annotation (Placement(transformation(extent={{-130,-150},{-110,-130}})));
   Buildings.Controls.OBC.CDL.Reals.Multiply splTimCapStaLow
     "SPLR times capacity of next available lower stage"
-    annotation (Placement(transformation(extent={{20,-170},{40,-150}})));
+    annotation (Placement(transformation(extent={{-130,-190},{-110,-170}})));
   Utilities.PlaceholderReal parPlrSta(
     final have_inp=have_inpPlrSta,
     final have_inpPh=false,
     final u_internal=plrSta) "Parameter value for SPLR"
-    annotation (Placement(transformation(extent={{-180,-190},{-160,-170}})));
+    annotation (Placement(transformation(extent={{-190,-230},{-170,-210}})));
   Buildings.Controls.OBC.CDL.Logical.FallingEdge endStaPro
     "True when staging process terminates"
-    annotation (Placement(transformation(extent={{20,-30},{40,-10}})));
+    annotation (Placement(transformation(extent={{-130,10},{-110,30}})));
+  LoadAverage capReq(
+    final typ=typ,
+    final cp_default=cp_default,
+    final rho_default=rho_default,
+    final dtMea=dtMea) "Compute required capacity"
+    annotation (Placement(transformation(extent={{-170,-110},{-150,-90}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TPriSup(final unit="K",
+      displayUnit="degC") "Primary supply temperature" annotation (Placement(
+        transformation(extent={{-240,-40},{-200,0}}), iconTransformation(extent={{-140,
+            -40},{-100,0}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TSecSup(final unit="K",
+      displayUnit="degC") if have_pumSec
+                          "Secondary supply temperature" annotation (Placement(
+        transformation(extent={{-240,-60},{-200,-20}}), iconTransformation(
+          extent={{-140,-60},{-100,-20}})));
+  FailsafeCondition faiSaf(
+    final typ=typ,
+    final have_pumSec=have_pumSec,
+    final dT=dT,
+    final dtPri=dtPri,
+    final dtSec=dtSec) "Failsafe stage up condition "
+    annotation (Placement(transformation(extent={{-90,-30},{-70,-10}})));
+  Buildings.Controls.OBC.CDL.Logical.Or  effOrFaiSaf
+    "Efficiency OR failsafe condition met"
+    annotation (Placement(transformation(extent={{10,-70},{30,-50}})));
+  Buildings.Controls.OBC.CDL.Logical.Not notFaiSaf
+    "Failsafe stage up condition is not true"
+    annotation (Placement(transformation(extent={{-50,-50},{-30,-30}})));
+  Buildings.Controls.OBC.CDL.Logical.And effAndNotFaiSaf
+    "Efficiency condition met AND failsafe stage up condition is not true"
+    annotation (Placement(transformation(extent={{10,-150},{30,-130}})));
 equation
-  connect(delT.y, absDelT.u)
-    annotation (Line(points={{-148,-80},{-132,-80}},color={0,0,127}));
-  connect(absDelT.y, capReq.u1)
-    annotation (Line(points={{-108,-80},{-100,-80},{-100,-74},{-92,-74}}, color={0,0,127}));
-  connect(capFlo.y, capReq.u2)
-    annotation (Line(points={{-108,-140},{-100,-140},{-100,-86},{-92,-86}},
-      color={0,0,127}));
   connect(intScaRep.y, reqEquSta.index)
-    annotation (Line(points={{-82,200},{0,200},{0,208}},color={255,127,0}));
+    annotation (Line(points={{-88,200},{0,200},{0,208}},color={255,127,0}));
   connect(traMatStaEqu.y, reqEquSta.u)
-    annotation (Line(points={{-48,220},{-12,220}},color={0,0,127}));
+    annotation (Line(points={{-58,220},{-12,220}},color={0,0,127}));
   connect(reqEquSta.y, capEquSta.u1)
     annotation (Line(points={{12,220},{20,220},{20,226},{28,226}},color={0,0,127}));
   connect(capEquPar.y, capEquSta.u2)
-    annotation (Line(points={{-48,160},{20,160},{20,214},{28,214}},color={0,0,127}));
+    annotation (Line(points={{-58,160},{20,160},{20,214},{28,214}},color={0,0,127}));
   connect(capEquSta.y, capSta.u)
     annotation (Line(points={{52,220},{68,220}},color={0,0,127}));
-  connect(movAve.y, hol.u)
-    annotation (Line(points={{-28,-80},{-10,-80},{-10,-66},{18,-66}}, color={0,0,127}));
   connect(intScaRep.u, maxInt.y)
-    annotation (Line(points={{-106,200},{-118,200}},color={255,127,0}));
+    annotation (Line(points={{-112,200},{-118,200}},color={255,127,0}));
   connect(idxSta.y, idxStaLesAct.u1)
     annotation (Line(points={{-158,140},{-154,140},{-154,100},{-152,100}},color={255,127,0}));
   connect(uSta, intScaRep1.u)
@@ -248,11 +263,11 @@ equation
   connect(idxStaLesAct.y, idxStaLesActAva.u1)
     annotation (Line(points={{-128,100},{-120,100},{-120,80},{-112,80}},color={255,0,255}));
   connect(u1AvaSta, idxStaLesActAva.u2)
-    annotation (Line(points={{-220,80},{-126,80},{-126,72},{-112,72}},color={255,0,255}));
+    annotation (Line(points={{-220,60},{-120,60},{-120,72},{-112,72}},color={255,0,255}));
   connect(idxStaLesActAva.y, idxLasTru.u1)
-    annotation (Line(points={{-88,80},{-72,80}},color={255,0,255}));
+    annotation (Line(points={{-88,80},{-82,80}},color={255,0,255}));
   connect(idxLasTru.y, maxInt1.u2)
-    annotation (Line(points={{-48,80},{-44,80},{-44,114},{-32,114}},color={255,127,0}));
+    annotation (Line(points={{-58,80},{-44,80},{-44,114},{-32,114}},color={255,127,0}));
   connect(one.y, maxInt1.u1)
     annotation (Line(points={{-158,180},{-40,180},{-40,126},{-32,126}},color={255,127,0}));
   connect(maxInt1.y, intScaRep2.u)
@@ -264,15 +279,15 @@ equation
   connect(intScaRep2.y, reqEquStaLow.index)
     annotation (Line(points={{32,120},{40,120},{40,140},{0,140},{0,168}},color={255,127,0}));
   connect(traMatStaEqu.y, reqEquStaLow.u)
-    annotation (Line(points={{-48,220},{-20,220},{-20,180},{-12,180}},color={0,0,127}));
+    annotation (Line(points={{-58,220},{-20,220},{-20,180},{-12,180}},color={0,0,127}));
   connect(reqEquStaLow.y, capEquStaLow.u2)
     annotation (Line(points={{12,180},{16,180},{16,174},{28,174}},color={0,0,127}));
   connect(capEquPar.y, capEquStaLow.u1)
-    annotation (Line(points={{-48,160},{20,160},{20,186},{28,186}},color={0,0,127}));
+    annotation (Line(points={{-58,160},{20,160},{20,186},{28,186}},color={0,0,127}));
   connect(capEquStaLow.y, capStaLow.u)
     annotation (Line(points={{52,180},{68,180}},color={0,0,127}));
   connect(idxLasTru.y, minInt.u2)
-    annotation (Line(points={{-48,80},{-44,80},{-44,74},{-32,74}},color={255,127,0}));
+    annotation (Line(points={{-58,80},{-44,80},{-44,74},{-32,74}},color={255,127,0}));
   connect(one.y, minInt.u1)
     annotation (Line(points={{-158,180},{-40,180},{-40,86},{-32,86}},color={255,127,0}));
   connect(minInt.y, intToRea.u)
@@ -282,56 +297,83 @@ equation
   connect(intToRea.y, setZer.u2)
     annotation (Line(points={{32,80},{100,80},{100,174},{108,174}},color={0,0,127}));
   connect(hol.y, gre.u1)
-    annotation (Line(points={{42,-60},{58,-60}},color={0,0,127}));
+    annotation (Line(points={{-108,-100},{-92,-100}},
+                                                color={0,0,127}));
   connect(splTimCapSta.y, gre.u2)
-    annotation (Line(points={{42,-120},{44,-120},{44,-68},{58,-68}},color={0,0,127}));
+    annotation (Line(points={{-108,-140},{-106,-140},{-106,-108},{-92,-108}},
+                                                                    color={0,0,127}));
   connect(capSta.y, splTimCapSta.u2)
-    annotation (Line(points={{92,220},{184,220},{184,-140},{10,-140},{10,-126},
-          {18,-126}},
+    annotation (Line(points={{92,220},{136,220},{136,-160},{-136,-160},{-136,-146},
+          {-132,-146}},
       color={0,0,127}));
   connect(setZer.y, splTimCapStaLow.u2)
-    annotation (Line(points={{132,180},{180,180},{180,-180},{10,-180},{10,-166},
-          {18,-166}},
+    annotation (Line(points={{132,180},{140,180},{140,-200},{-136,-200},{-136,-186},
+          {-132,-186}},
       color={0,0,127}));
   connect(splTimCapStaLow.y, les.u2)
-    annotation (Line(points={{42,-160},{50,-160},{50,-128},{58,-128}},color={0,0,127}));
+    annotation (Line(points={{-108,-180},{-100,-180},{-100,-148},{-92,-148}},
+                                                                      color={0,0,127}));
   connect(hol.y, les.u1)
-    annotation (Line(points={{42,-60},{50,-60},{50,-120},{58,-120}},color={0,0,127}));
+    annotation (Line(points={{-108,-100},{-100,-100},{-100,-140},{-92,-140}},
+                                                                    color={0,0,127}));
   connect(gre.y, timUp.u)
-    annotation (Line(points={{82,-60},{108,-60}},
+    annotation (Line(points={{-68,-100},{-52,-100}},
                                                 color={255,0,255}));
   connect(les.y, timDow.u)
-    annotation (Line(points={{82,-120},{108,-120}},
+    annotation (Line(points={{-68,-140},{-52,-140}},
                                                   color={255,0,255}));
   connect(uPlrSta, parPlrSta.u)
-    annotation (Line(points={{-220,-180},{-182,-180}}, color={0,0,127}));
-  connect(parPlrSta.y, splTimCapSta.u1) annotation (Line(points={{-158,-180},{
-          -40,-180},{-40,-114},{18,-114}},
+    annotation (Line(points={{-220,-220},{-192,-220}}, color={0,0,127}));
+  connect(parPlrSta.y, splTimCapSta.u1) annotation (Line(points={{-168,-220},{-140,
+          -220},{-140,-134},{-132,-134}},
                                         color={0,0,127}));
-  connect(parPlrSta.y, splTimCapStaLow.u1) annotation (Line(points={{-158,-180},
-          {-40,-180},{-40,-154},{18,-154}},  color={0,0,127}));
+  connect(parPlrSta.y, splTimCapStaLow.u1) annotation (Line(points={{-168,-220},
+          {-140,-220},{-140,-174},{-132,-174}},
+                                             color={0,0,127}));
   connect(u1StaPro, hol.u1)
-    annotation (Line(points={{-220,-20},{-10,-20},{-10,-60},{18,-60}}, color={255,0,255}));
-  connect(u1StaPro, endStaPro.u)
-    annotation (Line(points={{-220,-20},{18,-20}}, color={255,0,255}));
+    annotation (Line(points={{-220,20},{-140,20},{-140,-100},{-132,-100}},
+                                                                       color={255,0,255}));
   connect(endStaPro.y, timUp.reset)
-    annotation (Line(points={{42,-20},{90,-20},{90,-68},{108,-68}},
+    annotation (Line(points={{-108,20},{-60,20},{-60,-108},{-52,-108}},
                                                                   color={255,0,255}));
   connect(endStaPro.y, timDow.reset)
-    annotation (Line(points={{42,-20},{90,-20},{90,-128},{108,-128}},
+    annotation (Line(points={{-108,20},{-60,20},{-60,-148},{-52,-148}},
                                                                     color={255,0,255}));
-  connect(timUp.passed, y1Up) annotation (Line(points={{132,-68},{140,-68},{140,
+  connect(TSupSet, capReq.TSupSet) annotation (Line(points={{-220,-80},{-180,-80},
+          {-180,-94},{-172,-94}},      color={0,0,127}));
+  connect(TRet, capReq.TRet)
+    annotation (Line(points={{-220,-140},{-192,-140},{-192,-100},{-172,-100}},
+                                                       color={0,0,127}));
+  connect(V_flow, capReq.V_flow) annotation (Line(points={{-220,-180},{-180,-180},
+          {-180,-106},{-172,-106}},       color={0,0,127}));
+  connect(capReq.QReq_flow, hol.u) annotation (Line(points={{-148,-100},{-144,-100},
+          {-144,-106},{-132,-106}},
+                             color={0,0,127}));
+  connect(u1StaPro, endStaPro.u)
+    annotation (Line(points={{-220,20},{-132,20}}, color={255,0,255}));
+  connect(TPriSup, faiSaf.TPriSup)
+    annotation (Line(points={{-220,-20},{-92,-20}}, color={0,0,127}));
+  connect(endStaPro.y, faiSaf.reset) annotation (Line(points={{-108,20},{-100,20},
+          {-100,-12},{-92,-12}}, color={255,0,255}));
+  connect(TSecSup, faiSaf.TSecSup) annotation (Line(points={{-220,-40},{-100,-40},
+          {-100,-24},{-92,-24}}, color={0,0,127}));
+  connect(TSupSet, faiSaf.TSupSet) annotation (Line(points={{-220,-80},{-180,-80},
+          {-180,-16},{-92,-16}}, color={0,0,127}));
+  connect(faiSaf.y1, effOrFaiSaf.u1) annotation (Line(points={{-68,-20},{0,-20},
+          {0,-60},{8,-60}},   color={255,0,255}));
+  connect(timUp.passed, effOrFaiSaf.u2) annotation (Line(points={{-28,-108},{0,
+          -108},{0,-68},{8,-68}},   color={255,0,255}));
+  connect(effOrFaiSaf.y, y1Up) annotation (Line(points={{32,-60},{180,-60},{180,
           80},{220,80}}, color={255,0,255}));
-  connect(timDow.passed, y1Dow) annotation (Line(points={{132,-128},{140,-128},
-          {140,-80},{220,-80}},color={255,0,255}));
-  connect(TSupSet, delT.u1) annotation (Line(points={{-220,-60},{-180,-60},{
-          -180,-74},{-172,-74}}, color={0,0,127}));
-  connect(TRet, delT.u2) annotation (Line(points={{-220,-100},{-180,-100},{-180,
-          -86},{-172,-86}}, color={0,0,127}));
-  connect(V_flow, capFlo.u) annotation (Line(points={{-220,-140},{-132,-140}},
-                                   color={0,0,127}));
-  connect(capReq.y, movAve.u)
-    annotation (Line(points={{-68,-80},{-52,-80}}, color={0,0,127}));
+  connect(faiSaf.y1, notFaiSaf.u) annotation (Line(points={{-68,-20},{-56,-20},
+          {-56,-40},{-52,-40}}, color={255,0,255}));
+  connect(timDow.passed, effAndNotFaiSaf.u2)
+    annotation (Line(points={{-28,-148},{8,-148}}, color={255,0,255}));
+  connect(notFaiSaf.y, effAndNotFaiSaf.u1) annotation (Line(points={{-28,-40},{
+          -20,-40},{-20,-140},{8,-140}},
+                                     color={255,0,255}));
+  connect(effAndNotFaiSaf.y, y1Dow) annotation (Line(points={{32,-140},{180,
+          -140},{180,-80},{220,-80}}, color={255,0,255}));
   annotation (
     defaultComponentName="chaSta",
     Icon(
@@ -414,7 +456,7 @@ A stage up command is triggered if any of the following is true:
 </p>
 <ul>
 <li>
-Availability Condition: The equipment necessary to operate the 
+Availability condition: The equipment necessary to operate the 
 current stage is unavailable. 
 The availability condition is not subject to the minimum stage runtime requirement.
 (This condition is implemented in
@@ -422,16 +464,24 @@ The availability condition is not subject to the minimum stage runtime requireme
 Buildings.Templates.Plants.Controls.Utilities.StageIndex</a>.)
 </li>
 <li>
-Efficiency Condition: Current stage <i>OPLR &gt; plrSta</i> for a duration of <code>dtRun</code>.
+Efficiency condition: Current stage <i>OPLR &gt; plrSta</i> for a duration of <code>dtRun</code>.
+</li>
+<li>
+Failsafe condition: see 
+<a href=\"modelica://Buildings.Templates.Plants.Controls.StagingRotation.FailsafeCondition\">
+Buildings.Templates.Plants.Controls.StagingRotation.FailsafeCondition</a>.
 </li>
 </ul>
 <p>
-A stage down command is triggered if the following is true:
+A stage down command is triggered if both of the following are true:
 </p>
 <ul>
 <li>
 Next available lower stage <i>OPLR &lt; plrSta</i> for a duration of <code>dtRun</code>.
 </li>
+<li>
+The failsafe stage up condition is not true.
+</li>
 </ul>
 <h4>
 Details
@@ -454,5 +504,16 @@ To avoid multiple consecutive stage changes, the block that receives the stage u
 and down command and computes the stage index must enforce a minimum stage runtime
 of <code>dtRun</code>.
 </p>
+</html>", revisions="<html>
+<ul>
+<li>
+May 31, 2024, by Antoine Gautier:<br/>
+Refactored using <code>LoadAverage</code> block and added failsafe condition.
+</li>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
 </html>"));
 end StageChangeCommand;
diff --git a/Buildings/Templates/Plants/Controls/StagingRotation/StageCompletion.mo b/Buildings/Templates/Plants/Controls/StagingRotation/StageCompletion.mo
index 502f90bad01..40bf0f914f6 100644
--- a/Buildings/Templates/Plants/Controls/StagingRotation/StageCompletion.mo
+++ b/Buildings/Templates/Plants/Controls/StagingRotation/StageCompletion.mo
@@ -53,10 +53,8 @@ block StageCompletion
   Buildings.Controls.OBC.CDL.Logical.And chaAndMat
     "True if enable command changed and equipment status matches command"
     annotation (Placement(transformation(extent={{30,50},{50,70}})));
-  Buildings.Controls.OBC.CDL.Logical.TrueFalseHold holAnyCha(
-    trueHoldDuration=1,
-    falseHoldDuration=0)
-    "Hold signal to guard against concomitant stage change and command change"
+  Buildings.Controls.OBC.CDL.Logical.Pre           preAnyCha
+    "Left-limit of signal to guard against concomitant stage change and command change"
     annotation (Placement(transformation(extent={{-50,50},{-30,70}})));
   Buildings.Controls.OBC.CDL.Interfaces.IntegerInput uSta
     "Stage index"
@@ -98,9 +96,9 @@ equation
   connect(allTru.y, chaAndMat.u2)
     annotation (Line(points={{52,0},{60,0},{60,40},{20,40},{20,52},{28,52}},
       color={255,0,255}));
-  connect(anyCha.y, holAnyCha.u)
+  connect(anyCha.y,preAnyCha. u)
     annotation (Line(points={{-68,60},{-52,60}},color={255,0,255}));
-  connect(holAnyCha.y, lckAnyCha.u)
+  connect(preAnyCha.y, lckAnyCha.u)
     annotation (Line(points={{-28,60},{-12,60}},color={255,0,255}));
   connect(chaSta.y, lckChaSta.u)
     annotation (Line(points={{-108,100},{28,100}},color={255,0,255}));
@@ -154,5 +152,17 @@ the successful completion of the stage change is confirmed.
 The output signal <code>y1</code> is true during the entire time in which
 the stage change is in progress.
 </p>
+</html>", revisions="<html>
+<ul>
+<li>
+June 26, 2024, by Antoine Gautier:<br/>
+Replaced <code>hold</code> with <code>pre</code> to guard against concomitant stage change and command change.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3787\">#3787</a>.
+</li>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
 </html>"));
 end StageCompletion;
diff --git a/Buildings/Templates/Plants/Controls/StagingRotation/Validation/FailsafeCondition.mo b/Buildings/Templates/Plants/Controls/StagingRotation/Validation/FailsafeCondition.mo
new file mode 100644
index 00000000000..dd600b3d4e5
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/StagingRotation/Validation/FailsafeCondition.mo
@@ -0,0 +1,134 @@
+within Buildings.Templates.Plants.Controls.StagingRotation.Validation;
+model FailsafeCondition
+  "Validation model for failsafe staging logic"
+  Buildings.Templates.Plants.Controls.StagingRotation.FailsafeCondition faiSafHea(
+    typ=Buildings.Templates.Plants.Controls.Types.Application.Heating,
+    have_pumSec=true,
+    dT=2.5)
+    "Failsafe stage up condition for heating applications"
+    annotation (Placement(transformation(extent={{40,10},{60,30}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant THeaWatSupSet(
+    k=60 + 273.15)
+    "HWST setpoint"
+    annotation (Placement(transformation(extent={{-80,30},{-60,50}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Sin THeaWatPriSup(
+    amplitude=5,
+    freqHz=1 / 3000,
+    offset=THeaWatSupSet.k)
+    "PHWST"
+    annotation (Placement(transformation(extent={{-50,10},{-30,30}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Sin THeaWatSecSup(
+    amplitude=5,
+    freqHz=1 / 3000,
+    phase=1.7453292519943,
+    offset=THeaWatSupSet.k)
+    "SHWST"
+    annotation (Placement(transformation(extent={{-20,-10},{0,10}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.Pulse booPul(
+    width=1 / 2000,
+    period=2000,
+    shift=100)
+    "Reset"
+    annotation (Placement(transformation(extent={{-80,70},{-60,90}})));
+  Buildings.Templates.Plants.Controls.StagingRotation.FailsafeCondition faiSafCooPri(
+    typ=Buildings.Templates.Plants.Controls.Types.Application.Cooling,
+    have_pumSec=false,
+    dT=1)
+    "Failsafe stage up condition – Cooling application, primary-only"
+    annotation (Placement(transformation(extent={{40,-30},{60,-10}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant TChiWatSupSet(
+    k=7 + 273.15)
+    "CHWST setpoint"
+    annotation (Placement(transformation(extent={{-80,-30},{-60,-10}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Sin TChiWatPriSup(
+    amplitude=3,
+    freqHz=1 / 3000,
+    offset=TChiWatSupSet.k)
+    "PCHWST"
+    annotation (Placement(transformation(extent={{-50,-50},{-30,-30}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Sin TChiWatSecSup(
+    amplitude=3,
+    freqHz=1 / 3000,
+    phase=1.7453292519943,
+    offset=TChiWatSupSet.k)
+    "SCHWST"
+    annotation (Placement(transformation(extent={{-20,-70},{0,-50}})));
+  Buildings.Templates.Plants.Controls.StagingRotation.FailsafeCondition faiSafCoo(
+    typ=Buildings.Templates.Plants.Controls.Types.Application.Cooling,
+    have_pumSec=true,
+    dT=1)
+    "Failsafe stage up condition – Cooling application"
+    annotation (Placement(transformation(extent={{40,-70},{60,-50}})));
+equation
+  connect(THeaWatSupSet.y, faiSafHea.TSupSet)
+    annotation (Line(points={{-58,40},{10,40},{10,24},{38,24}},color={0,0,127}));
+  connect(THeaWatPriSup.y, faiSafHea.TPriSup)
+    annotation (Line(points={{-28,20},{6,20},{6,20},{38,20}},color={0,0,127}));
+  connect(THeaWatSecSup.y, faiSafHea.TSecSup)
+    annotation (Line(points={{2,0},{6,0},{6,16},{38,16}},color={0,0,127}));
+  connect(booPul.y, faiSafHea.reset)
+    annotation (Line(points={{-58,80},{20,80},{20,28},{38,28}},color={255,0,255}));
+  connect(TChiWatSupSet.y, faiSafCooPri.TSupSet)
+    annotation (Line(points={{-58,-20},{10,-20},{10,-16},{38,-16}},color={0,0,127}));
+  connect(TChiWatPriSup.y, faiSafCooPri.TPriSup)
+    annotation (Line(points={{-28,-40},{16,-40},{16,-20},{38,-20}},color={0,0,127}));
+  connect(booPul.y, faiSafCooPri.reset)
+    annotation (Line(points={{-58,80},{20,80},{20,-12},{38,-12}},color={255,0,255}));
+  connect(TChiWatSupSet.y, faiSafCoo.TSupSet)
+    annotation (Line(points={{-58,-20},{10,-20},{10,-56},{38,-56}},color={0,0,127}));
+  connect(booPul.y, faiSafCoo.reset)
+    annotation (Line(points={{-58,80},{20,80},{20,-52},{38,-52}},color={255,0,255}));
+  connect(TChiWatPriSup.y, faiSafCoo.TPriSup)
+    annotation (Line(points={{-28,-40},{16,-40},{16,-60},{38,-60}},color={0,0,127}));
+  connect(TChiWatSecSup.y, faiSafCoo.TSecSup)
+    annotation (Line(points={{2,-60},{6,-60},{6,-64},{38,-64}},color={0,0,127}));
+  annotation (
+    __Dymola_Commands(
+      file=
+        "modelica://Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/StagingRotation/Validation/FailsafeCondition.mos"
+        "Simulate and plot"),
+    experiment(
+      StopTime=5000.0,
+      Tolerance=1e-06),
+    Icon(
+      graphics={
+        Ellipse(
+          lineColor={75,138,73},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          extent={{-100,-100},{100,100}}),
+        Polygon(
+          lineColor={0,0,255},
+          fillColor={75,138,73},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          points={{-36,60},{64,0},{-36,-60},{-36,60}})}),
+    Documentation(
+      revisions="<html>
+<ul>
+<li>
+May 31, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>",
+      info="<html>
+<p>
+This model validates 
+<a href=\"modelica://Buildings.Templates.Plants.Controls.StagingRotation.FailsafeCondition\">
+Buildings.Templates.Plants.Controls.StagingRotation.FailsafeCondition</a>
+for the following configurations.
+</p>
+<ul>
+<li>
+Heating plant with primary-secondary distribution (component <code>faiSafHea</code>)
+</li>
+<li>
+Cooling plant with primary-only distribution (component <code>faiSafCoo</code>)
+</li>
+<li>
+Cooling plant with primary-only distribution (component <code>faiSafCooPri</code>)
+</li>
+</ul>
+</html>"));
+end FailsafeCondition;
diff --git a/Buildings/Templates/Plants/Controls/StagingRotation/Validation/LoadAverage.mo b/Buildings/Templates/Plants/Controls/StagingRotation/Validation/LoadAverage.mo
new file mode 100644
index 00000000000..edfd4b88289
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/StagingRotation/Validation/LoadAverage.mo
@@ -0,0 +1,96 @@
+within Buildings.Templates.Plants.Controls.StagingRotation.Validation;
+model LoadAverage
+  "Validation model for heating and cooling load calculation"
+  Buildings.Templates.Plants.Controls.StagingRotation.LoadAverage loaHea(
+    typ=Buildings.Templates.Plants.Controls.Types.Application.Heating,
+    cp_default=4186,
+    rho_default=1000)
+    "Calculate heating load"
+    annotation (Placement(transformation(extent={{40,10},{60,30}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant THeaWatSupSet(
+    k=60 + 273.15)
+    "HWST setpoint"
+    annotation (Placement(transformation(extent={{-80,30},{-60,50}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Sin THeaWatRet(
+    amplitude=10,
+    freqHz=2 / 3000,
+    phase=3.1415926535898,
+    offset=THeaWatSupSet.k)
+    "HWRT"
+    annotation (Placement(transformation(extent={{-50,10},{-30,30}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Ramp V_flow(
+    height=- 0.1,
+    duration=100,
+    offset=0.1,
+    startTime=1200)
+    "Volume flow rate"
+    annotation (Placement(transformation(extent={{-20,-10},{0,10}})));
+  Buildings.Templates.Plants.Controls.StagingRotation.LoadAverage loaCoo(
+    typ=Buildings.Templates.Plants.Controls.Types.Application.Cooling,
+    cp_default=4186,
+    rho_default=1000)
+    "Calculate cooling load"
+    annotation (Placement(transformation(extent={{40,-30},{60,-10}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant TChiWatSupSet(
+    k=7 + 273.15)
+    "CHWST setpoint"
+    annotation (Placement(transformation(extent={{-80,-30},{-60,-10}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Sin TChiWatRet(
+    amplitude=5,
+    freqHz=2 / 3000,
+    phase=3.1415926535898,
+    offset=TChiWatSupSet.k)
+    "CHWRT"
+    annotation (Placement(transformation(extent={{-50,-50},{-30,-30}})));
+equation
+  connect(THeaWatSupSet.y, loaHea.TSupSet)
+    annotation (Line(points={{-58,40},{20,40},{20,26},{38,26}},color={0,0,127}));
+  connect(TChiWatSupSet.y, loaCoo.TSupSet)
+    annotation (Line(points={{-58,-20},{10,-20},{10,-14},{38,-14}},color={0,0,127}));
+  connect(THeaWatRet.y, loaHea.TRet)
+    annotation (Line(points={{-28,20},{38,20}},color={0,0,127}));
+  connect(V_flow.y, loaHea.V_flow)
+    annotation (Line(points={{2,0},{20,0},{20,14},{38,14}},color={0,0,127}));
+  connect(TChiWatRet.y, loaCoo.TRet)
+    annotation (Line(points={{-28,-40},{30,-40},{30,-20},{38,-20}},color={0,0,127}));
+  connect(V_flow.y, loaCoo.V_flow)
+    annotation (Line(points={{2,0},{20,0},{20,-26},{38,-26}},color={0,0,127}));
+  annotation (
+    __Dymola_Commands(
+      file=
+        "modelica://Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/StagingRotation/Validation/LoadAverage.mos"
+        "Simulate and plot"),
+    experiment(
+      StopTime=2000.0,
+      Tolerance=1e-06),
+    Icon(
+      graphics={
+        Ellipse(
+          lineColor={75,138,73},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          extent={{-100,-100},{100,100}}),
+        Polygon(
+          lineColor={0,0,255},
+          fillColor={75,138,73},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          points={{-36,60},{64,0},{-36,-60},{-36,60}})}),
+    Documentation(
+      revisions="<html>
+<ul>
+<li>
+May 31, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>",
+      info="<html>
+<p>
+This model validates 
+<a href=\"modelica://Buildings.Templates.Plants.Controls.StagingRotation.LoadAverage\">
+Buildings.Templates.Plants.Controls.StagingRotation.LoadAverage</a>
+for heating and cooling applications.
+</p>
+</html>"));
+end LoadAverage;
diff --git a/Buildings/Templates/Plants/Controls/StagingRotation/Validation/SortRuntime.mo b/Buildings/Templates/Plants/Controls/StagingRotation/Validation/SortRuntime.mo
index 88174ac9745..e0a07210cc8 100644
--- a/Buildings/Templates/Plants/Controls/StagingRotation/Validation/SortRuntime.mo
+++ b/Buildings/Templates/Plants/Controls/StagingRotation/Validation/SortRuntime.mo
@@ -3,11 +3,11 @@ model SortRuntime "Validation model for equipment runtime sorting logic"
   Buildings.Templates.Plants.Controls.StagingRotation.SortRuntime sorRunTim(
     nin=3)
     "Sort runtime"
-    annotation (Placement(transformation(extent={{-40,-10},{-20,10}})));
+    annotation (Placement(transformation(extent={{-48,-10},{-28,10}})));
   Utilities.TrueArrayConditional u1Ena(
     nin=3)
     "Equipment enable signal"
-    annotation (Placement(transformation(extent={{0,-10},{20,10}})));
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
   Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea[3]
     "Convert command signal to real value"
     annotation (Placement(transformation(extent={{60,-10},{80,10}})));
@@ -27,23 +27,23 @@ model SortRuntime "Validation model for equipment runtime sorting logic"
     timeScale=1,
     period=3000)
     "Equipment available signal"
-    annotation (Placement(transformation(extent={{-130,-110},{-110,-90}})));
+    annotation (Placement(transformation(extent={{-150,-110},{-130,-90}})));
   Utilities.StageIndex idxSta(
     nSta=3,
     dtRun=60)
-    annotation (Placement(transformation(extent={{-40,30},{-20,50}})));
+    annotation (Placement(transformation(extent={{-48,30},{-28,50}})));
   Buildings.Controls.OBC.CDL.Logical.Sources.Constant u1Lea(
     k=true)
     "Lead equipment enable signal"
-    annotation (Placement(transformation(extent={{-130,90},{-110,110}})));
+    annotation (Placement(transformation(extent={{-150,90},{-130,110}})));
   Buildings.Controls.OBC.CDL.Logical.Sources.SampleTrigger upPul(
     period=60)
     "Stage up command pulse"
-    annotation (Placement(transformation(extent={{-130,-30},{-110,-10}})));
+    annotation (Placement(transformation(extent={{-150,-30},{-130,-10}})));
   Buildings.Controls.OBC.CDL.Logical.Sources.SampleTrigger dowPul(
     period=60)
     "Stage down command pulse"
-    annotation (Placement(transformation(extent={{-130,-70},{-110,-50}})));
+    annotation (Placement(transformation(extent={{-150,-70},{-130,-50}})));
   Buildings.Controls.OBC.CDL.Logical.Sources.TimeTable booTimTab(
     table=[
       0, 0, 0;
@@ -51,55 +51,61 @@ model SortRuntime "Validation model for equipment runtime sorting logic"
       300, 0, 1],
     period=500)
     "Signal to inhibit up and down commands"
-    annotation (Placement(transformation(extent={{-130,10},{-110,30}})));
+    annotation (Placement(transformation(extent={{-150,10},{-130,30}})));
   Buildings.Controls.OBC.CDL.Logical.And up
     "Stage up command"
-    annotation (Placement(transformation(extent={{-80,-30},{-60,-10}})));
+    annotation (Placement(transformation(extent={{-100,-30},{-80,-10}})));
   Buildings.Controls.OBC.CDL.Logical.And dow
     "Stage up command"
-    annotation (Placement(transformation(extent={{-80,-70},{-60,-50}})));
+    annotation (Placement(transformation(extent={{-100,-70},{-80,-50}})));
   Buildings.Controls.OBC.CDL.Logical.Sources.Constant u1AvaSta[3](
     each k=true)
     "Stage available signal"
-    annotation (Placement(transformation(extent={{-130,50},{-110,70}})));
+    annotation (Placement(transformation(extent={{-150,50},{-130,70}})));
   Buildings.Controls.OBC.CDL.Logical.And run[3]
     "Returns true if equipment is enabled and available"
     annotation (Placement(transformation(extent={{30,-10},{50,10}})));
 equation
   connect(sorRunTim.yIdx, u1Ena.uIdx)
-    annotation (Line(points={{-18,-6},{-12,-6},{-12,-6},{-2,-6}},color={255,127,0}));
+    annotation (Line(points={{-26,-6},{-12,-6}},                 color={255,127,0}));
   connect(booToRea.y, zerOrdHol.u)
     annotation (Line(points={{82,0},{88,0}},color={0,0,127}));
   connect(zerOrdHol.y, greThr.u)
     annotation (Line(points={{112,0},{118,0}},color={0,0,127}));
   connect(greThr.y, sorRunTim.u1Run)
-    annotation (Line(points={{142,0},{150,0},{150,20},{-46,20},{-46,6},{-42,6}},
+    annotation (Line(points={{142,0},{150,0},{150,20},{-66,20},{-66,6},{-50,6}},
       color={255,0,255}));
   connect(u1AvaEqu.y[1:3], sorRunTim.u1Ava[1:3])
-    annotation (Line(points={{-108,-100},{-46,-100},{-46,-6},{-42,-6},{-42,-5.33333}},
+    annotation (Line(points={{-128,-100},{-66,-100},{-66,-6},{-50,-6},{-50,
+          -5.33333}},
       color={255,0,255}));
   connect(u1Lea.y, idxSta.u1Lea)
-    annotation (Line(points={{-108,100},{-50,100},{-50,46},{-42,46}},color={255,0,255}));
+    annotation (Line(points={{-128,100},{-70,100},{-70,46},{-50,46}},color={255,0,255}));
   connect(upPul.y, up.u2)
-    annotation (Line(points={{-108,-20},{-100,-20},{-100,-28},{-82,-28}},color={255,0,255}));
+    annotation (Line(points={{-128,-20},{-120,-20},{-120,-28},{-102,-28}},
+                                                                         color={255,0,255}));
   connect(booTimTab.y[2], dow.u1)
-    annotation (Line(points={{-108,20},{-90,20},{-90,-60},{-82,-60}},color={255,0,255}));
+    annotation (Line(points={{-128,20},{-110,20},{-110,-60},{-102,-60}},
+                                                                     color={255,0,255}));
   connect(booTimTab.y[1], up.u1)
-    annotation (Line(points={{-108,20},{-90,20},{-90,-20},{-82,-20}},color={255,0,255}));
+    annotation (Line(points={{-128,20},{-110,20},{-110,-20},{-102,-20}},
+                                                                     color={255,0,255}));
   connect(dowPul.y, dow.u2)
-    annotation (Line(points={{-108,-60},{-100,-60},{-100,-68},{-82,-68}},color={255,0,255}));
+    annotation (Line(points={{-128,-60},{-120,-60},{-120,-68},{-102,-68}},
+                                                                         color={255,0,255}));
   connect(up.y, idxSta.u1Up)
-    annotation (Line(points={{-58,-20},{-50,-20},{-50,42},{-42,42}},color={255,0,255}));
+    annotation (Line(points={{-78,-20},{-70,-20},{-70,42},{-50,42}},color={255,0,255}));
   connect(dow.y, idxSta.u1Dow)
-    annotation (Line(points={{-58,-60},{-48,-60},{-48,38},{-42,38}},color={255,0,255}));
+    annotation (Line(points={{-78,-60},{-68,-60},{-68,38},{-50,38}},color={255,0,255}));
   connect(u1AvaSta.y, idxSta.u1AvaSta)
-    annotation (Line(points={{-108,60},{-52,60},{-52,34},{-42,34}},color={255,0,255}));
+    annotation (Line(points={{-128,60},{-72,60},{-72,34},{-50,34}},color={255,0,255}));
   connect(idxSta.y, u1Ena.u)
-    annotation (Line(points={{-18,40},{-10,40},{-10,0},{-2,0}},color={255,127,0}));
+    annotation (Line(points={{-26,40},{-14,40},{-14,0},{-12,0}},
+                                                               color={255,127,0}));
   connect(u1Ena.y1, run.u1)
-    annotation (Line(points={{22,0},{28,0}},color={255,0,255}));
+    annotation (Line(points={{12,0},{28,0}},color={255,0,255}));
   connect(u1AvaEqu.y[1:3], run.u2)
-    annotation (Line(points={{-108,-100},{24,-100},{24,-8},{28,-8}},color={255,0,255}));
+    annotation (Line(points={{-128,-100},{20,-100},{20,-8},{28,-8}},color={255,0,255}));
   connect(run.y, booToRea.u)
     annotation (Line(points={{52,0},{58,0}},color={255,0,255}));
   annotation (
diff --git a/Buildings/Templates/Plants/Controls/StagingRotation/Validation/StageChangeCommand.mo b/Buildings/Templates/Plants/Controls/StagingRotation/Validation/StageChangeCommand.mo
index 00122f80dd9..d0bb11b0234 100644
--- a/Buildings/Templates/Plants/Controls/StagingRotation/Validation/StageChangeCommand.mo
+++ b/Buildings/Templates/Plants/Controls/StagingRotation/Validation/StageChangeCommand.mo
@@ -45,17 +45,14 @@ model StageChangeCommand "Validation model for stage change logic"
     "Source signal for volume flow rate ratio"
     annotation (Placement(transformation(extent={{-130,-50},{-110,-30}})));
   Buildings.Templates.Plants.Controls.StagingRotation.StageChangeCommand chaSta(
+    typ=Buildings.Templates.Plants.Controls.Types.Application.Heating,
+    have_pumSec=false,
     plrSta=0.9,
-    staEqu=[
-      1, 0, 0;
-      0, 1 / 2, 1 / 2;
-      1, 1 / 2, 1 / 2;
-      0, 1, 1;
-      1, 1, 1],
-    capEqu=1E3 * {100, 450, 450},
+    staEqu=[1,0,0; 0,1/2,1/2; 1,1/2,1/2; 0,1,1; 1,1,1],
+    capEqu=1E3*{100,450,450},
     cp_default=cp_default,
-    rho_default=rho_default)
-    "Generate stage change command"
+    rho_default=rho_default,
+    dT=2.5) "Generate stage change command"
     annotation (Placement(transformation(extent={{-50,-12},{-30,12}})));
   Buildings.Controls.OBC.CDL.Reals.Sources.Constant TSupSet(
     final k=THeaWatSup_nominal)
@@ -77,10 +74,12 @@ model StageChangeCommand "Validation model for stage change logic"
     each k=true)
     "Stage available signal"
     annotation (Placement(transformation(extent={{-130,-90},{-110,-70}})));
-  Buildings.Controls.OBC.CDL.Logical.TrueHold      y1UpHol(duration=1)
+  Buildings.Controls.OBC.CDL.Logical.TrueFalseHold y1UpHol(
+    final falseHoldDuration=0, trueHoldDuration=1)
     "Hold stage up command for plotting"
     annotation (Placement(transformation(extent={{0,30},{20,50}})));
-  Buildings.Controls.OBC.CDL.Logical.TrueHold      y1DowHol(duration=1)
+  Buildings.Controls.OBC.CDL.Logical.TrueFalseHold y1DowHol(
+    final falseHoldDuration=0, trueHoldDuration=1)
     "Hold stage down command for plotting"
     annotation (Placement(transformation(extent={{0,-50},{20,-30}})));
   Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter V_flow(
@@ -109,9 +108,9 @@ model StageChangeCommand "Validation model for stage change logic"
     annotation (Placement(transformation(extent={{-30,50},{-50,70}})));
 equation
   connect(TRet.y, chaSta.TRet)
-    annotation (Line(points={{-108,0},{-100,0},{-100,-6},{-52,-6}},color={0,0,127}));
+    annotation (Line(points={{-108,0},{-104,0},{-104,-6},{-52,-6}},color={0,0,127}));
   connect(TSupSet.y, chaSta.TSupSet)
-    annotation (Line(points={{-108,40},{-100,40},{-100,-4},{-52,-4}},color={0,0,127}));
+    annotation (Line(points={{-108,40},{-100,40},{-100,0},{-52,0}},  color={0,0,127}));
   connect(chaSta.y1Up, idxSta.u1Up)
     annotation (Line(points={{-28,4},{-20,4},{-20,2},{-2,2}},color={255,0,255}));
   connect(chaSta.y1Dow, idxSta.u1Dow)
@@ -142,13 +141,15 @@ equation
   connect(enaEqu.y1, staEqu.y1)
     annotation (Line(points={{82,0},{98,0}},color={255,0,255}));
   connect(comSta.y1, chaSta.u1StaPro)
-    annotation (Line(points={{-52,54},{-58,54},{-58,2},{-52,2}},color={255,0,255}));
+    annotation (Line(points={{-52,54},{-58,54},{-58,4},{-52,4}},color={255,0,255}));
   connect(enaEqu.y1, comSta.u1)
     annotation (Line(points={{82,0},{90,0},{90,60},{-28,60},{-28,60}},color={255,0,255}));
   connect(staEqu.y1_actual, comSta.u1_actual)
     annotation (Line(points={{122,0},{130,0},{130,56},{-28,56}},color={255,0,255}));
   connect(idxSta.y, comSta.uSta)
     annotation (Line(points={{22,0},{40,0},{40,64},{-28,64}},color={255,127,0}));
+  connect(TSupSet.y, chaSta.TPriSup) annotation (Line(points={{-108,40},{-100,
+          40},{-100,-2},{-52,-2}}, color={0,0,127}));
   annotation (
     __Dymola_Commands(
       file=
@@ -175,15 +176,15 @@ equation
         extent={{-140,-120},{140,120}})),
     Documentation(info="<html>
 <p>
-This model validates 
+This model validates
 <a href=\"modelica://Buildings.Templates.Plants.Controls.StagingRotation.StageChangeCommand\">
 Buildings.Templates.Plants.Controls.StagingRotation.StageChangeCommand</a>
-in a configuration with one small unit and two large equally sized 
+in a configuration with one small unit and two large equally sized
 units (component <code>avaStaOneTwo</code>).
 In response to a varying flow rate, the variation of the
 required capacity <code>chaSta.capReq.y</code> triggers stage change
 events.
-The block 
+The block
 <a href=\"modelica://Buildings.Templates.Plants.Controls.Utilities.StageIndex\">
 Buildings.Templates.Plants.Controls.Utilities.StageIndex</a>
 is used to illustrate how these events translate into
diff --git a/Buildings/Templates/Plants/Controls/StagingRotation/Validation/StageCompletion.mo b/Buildings/Templates/Plants/Controls/StagingRotation/Validation/StageCompletion.mo
index 9ac6eee1833..9f6fc35346f 100644
--- a/Buildings/Templates/Plants/Controls/StagingRotation/Validation/StageCompletion.mo
+++ b/Buildings/Templates/Plants/Controls/StagingRotation/Validation/StageCompletion.mo
@@ -17,7 +17,8 @@ model StageCompletion "Validation model for the evaluation of stage completion"
     period=1800)
     "Source for Boolean signals"
     annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
-  Buildings.Controls.OBC.CDL.Logical.TrueHold      y1ComSta(duration=1)
+  Buildings.Controls.OBC.CDL.Logical.TrueFalseHold y1ComSta(
+    final falseHoldDuration=0, trueHoldDuration=1)
     "Hold stage completion signal for plotting"
     annotation (Placement(transformation(extent={{60,-10},{80,10}})));
   Buildings.Controls.OBC.CDL.Integers.Sources.TimeTable idxSta(
@@ -29,7 +30,12 @@ model StageCompletion "Validation model for the evaluation of stage completion"
     period=1800)
     "Stage index"
     annotation (Placement(transformation(extent={{-80,30},{-60,50}})));
+initial equation
+  Modelica.Utilities.Streams.print("At initialization: comSta.y1End = " + String(comSta.y1End));
 equation
+  when initial() then
+    Modelica.Utilities.Streams.print("When initial(): comSta.y1End = " + String(comSta.y1End));
+  end when;
   connect(comSta.y1End, y1ComSta.u)
     annotation (Line(points={{42,6},{50,6},{50,0},{58,0}},color={255,0,255}));
   connect(booTimTab.y[1:2], comSta.u1[1:2])
@@ -61,15 +67,15 @@ equation
           points={{-36,60},{64,0},{-36,-60},{-36,60}})}),
     Documentation(info="<html>
 <p>
-This model validates 
+This model validates
 <a href=\"modelica://Buildings.Templates.Plants.Controls.StagingRotation.StageCompletion\">
 Buildings.Templates.Plants.Controls.StagingRotation.StageCompletion</a>
-in a configuration with one small unit and two large equally sized 
+in a configuration with one small unit and two large equally sized
 units (component <code>avaStaOneTwo</code>).
 In response to a varying flow rate, the variation of the
 required capacity <code>chaSta.capReq.y</code> triggers stage change
 events.
-The block 
+The block
 <a href=\"modelica://Buildings.Templates.Plants.Controls.Utilities.StageIndex\">
 Buildings.Templates.Plants.Controls.Utilities.StageIndex</a>
 is used to illustrate how these events translate into
diff --git a/Buildings/Templates/Plants/Controls/StagingRotation/Validation/package.order b/Buildings/Templates/Plants/Controls/StagingRotation/Validation/package.order
index fb6e2c8e0f6..2168520c454 100644
--- a/Buildings/Templates/Plants/Controls/StagingRotation/Validation/package.order
+++ b/Buildings/Templates/Plants/Controls/StagingRotation/Validation/package.order
@@ -1,6 +1,8 @@
 EquipmentAvailability
 EquipmentEnable
 EventSequencing
+FailsafeCondition
+LoadAverage
 SortRuntime
 StageAvailability
 StageChangeCommand
diff --git a/Buildings/Templates/Plants/Controls/StagingRotation/package.order b/Buildings/Templates/Plants/Controls/StagingRotation/package.order
index b55032749c8..6561336e223 100644
--- a/Buildings/Templates/Plants/Controls/StagingRotation/package.order
+++ b/Buildings/Templates/Plants/Controls/StagingRotation/package.order
@@ -1,6 +1,8 @@
 EquipmentAvailability
 EquipmentEnable
 EventSequencing
+FailsafeCondition
+LoadAverage
 SortRuntime
 StageAvailability
 StageChangeCommand
diff --git a/Buildings/Templates/Plants/Controls/Utilities/HoldReal.mo b/Buildings/Templates/Plants/Controls/Utilities/HoldReal.mo
index db9edb53a0f..834d1eb6347 100644
--- a/Buildings/Templates/Plants/Controls/Utilities/HoldReal.mo
+++ b/Buildings/Templates/Plants/Controls/Utilities/HoldReal.mo
@@ -21,33 +21,25 @@ block HoldReal "Hold value of real signal based on timer and Boolean signal"
   Buildings.Controls.OBC.CDL.Reals.Switch swi
     "Switch between actual and fixed value"
     annotation (Placement(transformation(extent={{70,-10},{90,10}})));
-  Buildings.Controls.OBC.CDL.Logical.TrueHold truHol(
-    final duration=dtHol) if dtHol > 0
+  Buildings.Controls.OBC.CDL.Logical.TrueFalseHold truHol(
+    final falseHoldDuration=0, final trueHoldDuration=dtHol)
     "Hold true value of input signal for given time"
-    annotation (Placement(transformation(extent={{-10,10},{10,30}})));
-  PlaceholderLogical ph(have_inp=dtHol > 0, final have_inpPh=true)
-    "Placeholder signal in case of zero minimum hold time"
-    annotation (Placement(transformation(extent={{30,-10},{50,10}})));
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
 equation
   connect(u, triSam.u)
     annotation (Line(points={{-120,-40},{-60,-40},{-60,60},{-12,60}},color={0,0,127}));
   connect(swi.y, y)
     annotation (Line(points={{92,0},{120,0}},color={0,0,127}));
   connect(u1, triSam.trigger)
-    annotation (Line(points={{-120,0},{-40,0},{-40,40},{0,40},{0,48}},color={255,0,255}));
+    annotation (Line(points={{-120,0},{-40,0},{-40,20},{0,20},{0,48}},color={255,0,255}));
   connect(u1, truHol.u)
-    annotation (Line(points={{-120,0},{-40,0},{-40,20},{-12,20}},
-                                               color={255,0,255}));
+    annotation (Line(points={{-120,0},{-12,0}},color={255,0,255}));
   connect(triSam.y, swi.u1)
     annotation (Line(points={{12,60},{60,60},{60,8},{68,8}},color={0,0,127}));
   connect(u, swi.u3)
     annotation (Line(points={{-120,-40},{60,-40},{60,-8},{68,-8}},color={0,0,127}));
-  connect(truHol.y, ph.u) annotation (Line(points={{12,20},{20,20},{20,0},{28,0}},
-        color={255,0,255}));
-  connect(u1, ph.uPh) annotation (Line(points={{-120,0},{-40,0},{-40,-6},{28,-6}},
-        color={255,0,255}));
-  connect(ph.y, swi.u2)
-    annotation (Line(points={{52,0},{68,0}}, color={255,0,255}));
+  connect(truHol.y, swi.u2)
+    annotation (Line(points={{12,0},{68,0}}, color={255,0,255}));
   annotation (
     defaultComponentName="hol",
     Icon(
@@ -67,12 +59,17 @@ equation
     Documentation(
       info="<html>
 <p>
-Holds input value fixed at its last value while the Boolean signal 
+Holds input value fixed at its last value while the Boolean signal
 <code>u1</code> is true, and for at least the hold time <code>dtHol</code>.
 </p>
 </html>", revisions="<html>
 <ul>
 <li>
+June 26, 2024, by Antoine Gautier:<br/>
+Removed unnecessary conditional pass-through block following the refactoring of the hold block.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3787\">#3787</a>.
+</li>
+<li>
 March 29, 2024, by Antoine Gautier:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Templates/Plants/Controls/Utilities/Initialization.mo b/Buildings/Templates/Plants/Controls/Utilities/Initialization.mo
new file mode 100644
index 00000000000..b6d0587a194
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Utilities/Initialization.mo
@@ -0,0 +1,44 @@
+within Buildings.Templates.Plants.Controls.Utilities;
+block Initialization
+  "Force signal value at initial time"
+  parameter Boolean yIni=false
+    "Initial value";
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u
+    "Input"
+    annotation (Placement(transformation(extent={{-140,-20},{-100,20}}),
+      iconTransformation(extent={{-140,-20},{-100,20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y
+    "Output"
+    annotation (Placement(transformation(extent={{100,-20},{140,20}}),
+      iconTransformation(extent={{100,-20},{140,20}})));
+equation
+  y=if initial() then yIni else u;
+  annotation (
+    __cdl(
+      extensionBlock=true),
+    defaultComponentName="ini",
+    Documentation(
+      info="<html>
+<p>
+At initial time, this block returns the
+value specified by the parameter <code>y1Ini</code>, which
+is set to <code>false</code> by default.
+Otherwise, this block returns the
+value of the input value, i.e., it acts as a direct pass-through.
+</p>
+</html>"),
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=true,
+        extent={{-100,-100},{100,100}}),
+      graphics={
+        Rectangle(
+          extent={{-100,100},{100,-100}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Text(
+          extent={{-150,150},{150,110}},
+          textString="%name",
+          textColor={0,0,255})}));
+end Initialization;
diff --git a/Buildings/Templates/Plants/Controls/Utilities/Validation/StageIndex.mo b/Buildings/Templates/Plants/Controls/Utilities/Validation/StageIndex.mo
index 6330fec213f..a563183c8b8 100644
--- a/Buildings/Templates/Plants/Controls/Utilities/Validation/StageIndex.mo
+++ b/Buildings/Templates/Plants/Controls/Utilities/Validation/StageIndex.mo
@@ -55,10 +55,12 @@ model StageIndex
   Buildings.Controls.OBC.CDL.Logical.And u1Dow
     "Stage down command"
     annotation (Placement(transformation(extent={{-40,-30},{-20,-10}})));
-  Buildings.Controls.OBC.CDL.Logical.TrueHold      u1UpHol(duration=0.1)
+  Buildings.Controls.OBC.CDL.Logical.TrueFalseHold u1UpHol(final
+      falseHoldDuration=0, trueHoldDuration=0.1)
     "Hold stage up command for plotting"
     annotation (Placement(transformation(extent={{0,90},{20,110}})));
-  Buildings.Controls.OBC.CDL.Logical.TrueHold      u1DowHol(duration=0.1)
+  Buildings.Controls.OBC.CDL.Logical.TrueFalseHold u1DowHol(final
+      falseHoldDuration=0, trueHoldDuration=0.1)
     "Hold stage down command for plotting"
     annotation (Placement(transformation(extent={{0,-110},{20,-90}})));
 equation
diff --git a/Buildings/Templates/Plants/Controls/Utilities/package.order b/Buildings/Templates/Plants/Controls/Utilities/package.order
index 37161e99b1f..1adacf1a32c 100644
--- a/Buildings/Templates/Plants/Controls/Utilities/package.order
+++ b/Buildings/Templates/Plants/Controls/Utilities/package.order
@@ -1,6 +1,7 @@
 CountTrue
 FirstTrueIndex
 HoldReal
+Initialization
 LastTrueIndex
 MultiMaxInteger
 MultiMinInteger
diff --git a/Buildings/Templates/Plants/Controls/package.order b/Buildings/Templates/Plants/Controls/package.order
index 07c7d33a37e..48f0437700d 100644
--- a/Buildings/Templates/Plants/Controls/package.order
+++ b/Buildings/Templates/Plants/Controls/package.order
@@ -1,5 +1,7 @@
 Enabling
 HeatPumps
+HeatRecoveryChillers
+MinimumFlow
 Pumps
 Setpoints
 StagingRotation
diff --git a/Buildings/Templates/Plants/HeatPumps/AirToWater.mo b/Buildings/Templates/Plants/HeatPumps/AirToWater.mo
index 5bda80564b4..3bc560d33da 100644
--- a/Buildings/Templates/Plants/HeatPumps/AirToWater.mo
+++ b/Buildings/Templates/Plants/HeatPumps/AirToWater.mo
@@ -4,20 +4,79 @@ model AirToWater
   extends Buildings.Templates.Plants.HeatPumps.Interfaces.PartialHeatPumpPlant(
     redeclare final package MediumChiWat=MediumHeaWat,
     redeclare final package MediumSou=MediumAir,
-    redeclare Buildings.Templates.Plants.HeatPumps.Components.Controls.AirToWater ctl,
+    redeclare Buildings.Templates.Plants.HeatPumps.Components.Controls.AirToWater ctl(ctl(
+      final yPumHeaWatPriSet=yPumHeaWatPriSet,
+      final yPumChiWatPriSet=yPumChiWatPriSet)),
     final typ=Buildings.Templates.Components.Types.HeatPump.AirToWater,
     final is_rev=have_chiWat,
     final cfg(
       final typMod=hp.typMod));
+  parameter Boolean is_dpBalYPumSetCal(start=false)=false
+    "Set to true to automatically size balancing valves or evaluate pump speed providing design flow"
+    annotation(Evaluate=true, Dialog(tab="Advanced",
+      enable=typDis==Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Variable2));
+  // The check valve pressure drop is scaled for configurations with common dedicated CHW and HW pumps.
+  final parameter Modelica.Units.SI.PressureDifference dpValCheHeaWat_nominal=
+    dat.dpValCheHeaWat_nominal * (hp.mHeaWatHp_flow_nominal / max(dat.pumHeaWatPri.m_flow_nominal))^2
+    "Primary HW pump check valve pressure drop at design HW flow rate";
+  final parameter Modelica.Units.SI.PressureDifference dpValCheChiWat_nominal=
+    if have_chiWat then (
+    if typPumChiWatPri==Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.None
+    then dat.dpValCheHeaWat_nominal * (hp.mChiWatHp_flow_nominal / max(dat.pumHeaWatPri.m_flow_nominal))^2
+    else dat.dpValCheChiWat_nominal)
+    else 0
+    "Primary (CHW or common HW and CHW) pump check valve pressure drop at design CHW flow rate";
+  final parameter Modelica.Units.SI.PressureDifference dpBalHeaWatHp_nominal=
+    if is_dpBalYPumSetCal
+      and typPumHeaWatPri==Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Constant
+    then Buildings.Templates.Utilities.computeBalancingPressureDrop(
+      m_flow_nominal=hp.mHeaWatHp_flow_nominal,
+      dp_nominal=hp.dpHeaWatHp_nominal + max(valIso.dpValveHeaWat_nominal) * (
+        (if have_valHpInlIso then 1 else 0) + (if have_valHpOutIso then 1 else 0))
+        + dpValCheHeaWat_nominal,
+      datPum=dat.pumHeaWatPriSin[1])
+    else dat.dpBalHeaWatHp_nominal
+    "HP HW balancing valve pressure drop at design HW flow";
+  final parameter Modelica.Units.SI.PressureDifference dpBalChiWatHp_nominal=
+    if is_dpBalYPumSetCal
+      and (typPumChiWatPri==Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Constant
+      or have_chiWat and not have_pumChiWatPriDed and
+      typPumHeaWatPri==Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Constant)
+    then Buildings.Templates.Utilities.computeBalancingPressureDrop(
+      m_flow_nominal=hp.mChiWatHp_flow_nominal,
+      dp_nominal=hp.dpChiWatHp_nominal + max(valIso.dpValveChiWat_nominal) * (
+        (if have_valHpInlIso then 1 else 0) + (if have_valHpOutIso then 1 else 0))
+        + dpValCheChiWat_nominal,
+      datPum=if cfg.typPumChiWatPri==Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Constant
+        then dat.pumChiWatPriSin[1] else dat.pumHeaWatPriSin[1])
+    else dat.dpBalChiWatHp_nominal
+    "HP CHW balancing valve pressure drop at design CHW flow";
+  final parameter Real yPumHeaWatPriSet(
+    final fixed=false,
+    final max=2,
+    final min=0,
+    start=1,
+    final unit="1")
+    "Primary pump speed providing design heat pump flow in heating mode"
+    annotation (Dialog(group="Information provided by testing, adjusting, and balancing contractor"));
+  final parameter Real yPumChiWatPriSet(
+    final fixed=false,
+    final max=2,
+    final min=0,
+    start=1,
+    final unit="1")
+    "Primary pump speed providing design heat pump flow in cooling mode"
+    annotation (Dialog(group="Information provided by testing, adjusting, and balancing contractor"));
   // Heat pumps, dedicated primary pumps and isolation valves
+  // The handling of HP pressure drop is accounted for within the isolation valve component.
   Buildings.Templates.Plants.HeatPumps.Components.HeatPumpGroups.AirToWater hp(
     redeclare final package MediumHeaWat=MediumHeaWat,
     redeclare final package MediumAir=MediumAir,
     final nHp=nHp,
     final is_rev=is_rev,
     final energyDynamics=energyDynamics,
-    final have_preDroChiHeaWat=false,
-    final have_preDroSou=false,
+    final have_dpChiHeaWatHp=false,
+    final have_dpSou=false,
     final dat=dat.hp,
     final allowFlowReversal=allowFlowReversal,
     final allowFlowReversalSou=false)
@@ -32,6 +91,10 @@ model AirToWater
     final have_pumChiWatPriVar=have_pumChiWatPriVar,
     final datPumHeaWat=dat.pumHeaWatPri,
     final datPumChiWat=dat.pumChiWatPri,
+    final dpValCheHeaWat_nominal=fill(dat.dpValCheHeaWat_nominal,
+      pumPri.nPum),
+    final dpValCheChiWat_nominal=fill(dat.dpValCheChiWat_nominal,
+      if have_pumChiWatPriDed then pumPri.nPum else 0),
     final energyDynamics=energyDynamics,
     final allowFlowReversal=allowFlowReversal)
     "Dedicated primary pumps"
@@ -45,9 +108,12 @@ model AirToWater
     final have_pumChiWatPriDed=have_pumChiWatPriDed,
     final mHeaWatHp_flow_nominal=fill(dat.hp.mHeaWatHp_flow_nominal, nHp),
     final dpHeaWatHp_nominal=fill(dat.hp.dpHeaWatHp_nominal, nHp),
+    final dpBalHeaWatHp_nominal=fill(dpBalHeaWatHp_nominal, nHp),
     final mChiWatHp_flow_nominal=fill(dat.hp.mChiWatHp_flow_nominal, nHp),
+    final dpBalChiWatHp_nominal=fill(dpBalChiWatHp_nominal, nHp),
     final energyDynamics=energyDynamics,
-    final allowFlowReversal=allowFlowReversal)
+    final allowFlowReversal=allowFlowReversal,
+    linearized=linearized)
     "Heat pump isolation valves"
     annotation (Placement(transformation(extent={{-540,-50},{-60,90}})));
   // Primary CHW loop
@@ -55,6 +121,7 @@ model AirToWater
     final energyDynamics=energyDynamics,
     redeclare final package Medium=MediumChiWat,
     final dat=dat.pumChiWatPri,
+    final dpValChe_nominal=fill(dpValCheChiWat_nominal, nPumChiWatPri),
     final nPum=nPumChiWatPri,
     final have_var=have_pumChiWatPriVar,
     final have_varCom=true,
@@ -63,48 +130,44 @@ model AirToWater
     "Headered primary CHW pumps"
     annotation (Placement(transformation(extent={{-20,70},{0,90}})));
   Buildings.Templates.Components.Routing.SingleToMultiple inlPumChiWatPri(
-    redeclare final package Medium=MediumChiWat,
+    redeclare final package Medium = MediumChiWat,
     final nPorts=nPumChiWatPri,
     final m_flow_nominal=mChiWatPri_flow_nominal,
     final energyDynamics=energyDynamics,
     final allowFlowReversal=allowFlowReversal,
-    final icon_pipe=Buildings.Templates.Components.Types.IconPipe.Supply,
-    final icon_dy=300)
-    if have_chiWat and typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Headered
+    final icon_pipe=Buildings.Templates.Components.Types.IntegrationPoint.Supply,
+    final icon_dy=300) if have_chiWat and typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Headered
     "Primary CHW pumps inlet manifold"
     annotation (Placement(transformation(extent={{-40,70},{-20,90}})));
   Buildings.Templates.Components.Routing.MultipleToSingle outPumChiWatPri(
-    redeclare final package Medium=MediumChiWat,
+    redeclare final package Medium = MediumChiWat,
     final nPorts=nPumChiWatPri,
     final m_flow_nominal=mChiWatPri_flow_nominal,
     final energyDynamics=energyDynamics,
     final allowFlowReversal=allowFlowReversal,
-    final icon_pipe=Buildings.Templates.Components.Types.IconPipe.Supply,
-    final icon_dy=300)
-    if have_chiWat and typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Headered
+    final icon_pipe=Buildings.Templates.Components.Types.IntegrationPoint.Supply,
+    final icon_dy=300) if have_chiWat and typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Headered
     "Primary CHW pumps outlet manifold"
     annotation (Placement(transformation(extent={{0,70},{20,90}})));
   Buildings.Templates.Components.Routing.PassThroughFluid supChiWatPri(
-    redeclare final package Medium=MediumChiWat,
-    final icon_pipe=Buildings.Templates.Components.Types.IconPipe.Supply,
+    redeclare final package Medium = MediumChiWat,
+    final icon_pipe=Buildings.Templates.Components.Types.IntegrationPoint.Supply,
     final allowFlowReversal=allowFlowReversal) if have_chiWat and typArrPumPri
      == Buildings.Templates.Components.Types.PumpArrangement.Dedicated
     "Primary CHW supply pipe - Plant with dedicated primary CHW pumps"
     annotation (Placement(transformation(extent={{-20,70},{0,90}})));
   Buildings.Templates.Components.Sensors.VolumeFlowRate VChiWatPri_flow(
-    redeclare final package Medium=MediumChiWat,
+    redeclare final package Medium = MediumChiWat,
     final m_flow_nominal=mChiWatPri_flow_nominal,
     final allowFlowReversal=allowFlowReversal,
     final have_sen=ctl.have_senVChiWatPri,
     final text_flip=false,
     final typ=Buildings.Templates.Components.Types.SensorVolumeFlowRate.FlowMeter,
-    icon_pipe=Buildings.Templates.Components.Types.IconPipe.Supply)
-    if have_chiWat
-    "Primary CHW volume flow rate"
+    icon_pipe=Buildings.Templates.Components.Types.IntegrationPoint.Supply)
+    if have_chiWat "Primary CHW volume flow rate"
     annotation (Placement(transformation(extent={{20,70},{40,90}})));
   Buildings.Templates.Components.Routing.Junction junChiWatBypSup(
     redeclare final package Medium=MediumChiWat,
-    final tau=tau,
     final m_flow_nominal=mChiWatPri_flow_nominal * {1, - 1, - 1},
     final energyDynamics=energyDynamics,
     dp_nominal=fill(0, 3),
@@ -116,47 +179,81 @@ model AirToWater
       else Modelica.Fluid.Types.PortFlowDirection.Leaving) if have_chiWat
     "Fluid junction"
     annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,
-      origin={100,80})));
+      origin={180,80})));
   Buildings.Templates.Components.Sensors.Temperature TChiWatPriSup(
-    redeclare final package Medium=MediumChiWat,
+    redeclare final package Medium = MediumChiWat,
     final have_sen=true,
     final m_flow_nominal=mChiWatPri_flow_nominal,
     final typ=Buildings.Templates.Components.Types.SensorTemperature.InWell,
-    final icon_pipe=Buildings.Templates.Components.Types.IconPipe.Supply,
+    final icon_pipe=Buildings.Templates.Components.Types.IntegrationPoint.Supply,
     final allowFlowReversal=allowFlowReversal) if have_chiWat
-    "Primary CHW supply temperature"
-    annotation (Placement(transformation(
+    "Primary CHW supply temperature" annotation (Placement(transformation(
         extent={{-10,-10},{10,10}},
         rotation=0,
         origin={60,80})));
   Buildings.Templates.Components.Routing.Junction junChiWatBypRet(
-    redeclare final package Medium=MediumChiWat,
-    final tau=tau,
-    final m_flow_nominal=mChiWatPri_flow_nominal * {1, - 1, 1},
+    redeclare final package Medium = MediumChiWat,
+    final m_flow_nominal=mChiWatPri_flow_nominal*{1,-1,1},
     final energyDynamics=energyDynamics,
     dp_nominal=fill(0, 3),
     final portFlowDirection_1=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
-      else Modelica.Fluid.Types.PortFlowDirection.Entering,
+         else Modelica.Fluid.Types.PortFlowDirection.Entering,
     final portFlowDirection_2=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
-      else Modelica.Fluid.Types.PortFlowDirection.Leaving,
+         else Modelica.Fluid.Types.PortFlowDirection.Leaving,
     final portFlowDirection_3=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
-      else Modelica.Fluid.Types.PortFlowDirection.Entering,
-    icon_pipe1=Buildings.Templates.Components.Types.IconPipe.Return,
-    icon_pipe3=Buildings.Templates.Components.Types.IconPipe.Supply)
-    if have_chiWat
-    "Fluid junction"
-    annotation (Placement(transformation(extent={{10,10},{-10,-10}},rotation=0,
-      origin={100,0})));
+         else Modelica.Fluid.Types.PortFlowDirection.Entering,
+    icon_pipe1=Buildings.Templates.Components.Types.IntegrationPoint.Return,
+    icon_pipe3=Buildings.Templates.Components.Types.IntegrationPoint.Supply)
+    if have_chiWat "Fluid junction" annotation (Placement(transformation(
+        extent={{10,10},{-10,-10}},
+        rotation=0,
+        origin={180,0})));
   Buildings.Templates.Components.Sensors.Temperature TChiWatPriRet(
-    redeclare final package Medium=MediumChiWat,
+    redeclare final package Medium = MediumChiWat,
     final have_sen=ctl.have_senTChiWatPriRet,
     final m_flow_nominal=mChiWatPri_flow_nominal,
     final typ=Buildings.Templates.Components.Types.SensorTemperature.InWell,
-    final icon_pipe=Buildings.Templates.Components.Types.IconPipe.Return,
+    final icon_pipe=Buildings.Templates.Components.Types.IntegrationPoint.Return,
     final allowFlowReversal=allowFlowReversal) if have_chiWat
-    "Primary CHW return temperature"
-    annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0,
-      origin={60,0})));
+    "Primary CHW return temperature" annotation (Placement(transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=0,
+        origin={60,0})));
+  Buildings.Templates.Components.Actuators.Valve valChiWatMinByp(
+    redeclare final package Medium=MediumChiWat,
+    final dat=dat.valChiWatMinByp,
+    final typ=if have_valChiWatMinByp then Buildings.Templates.Components.Types.Valve.TwoWayModulating
+      else Buildings.Templates.Components.Types.Valve.None,
+    final chaTwo=Buildings.Templates.Components.Types.ValveCharacteristicTwoWay.Linear,
+    final allowFlowReversal=allowFlowReversal,
+    final energyDynamics=energyDynamics,
+    linearized=linearized,
+    from_dp=true)
+    if have_valChiWatMinByp or have_bypChiWatFix
+    "CHW minimum flow bypass valve or fixed bypass depending on type of distribution"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},
+        rotation=-90,
+        origin={180,40})));
+  Buildings.Templates.Components.Tanks.Buffer tanChiWatSup(
+    redeclare final package Medium = MediumChiWat,
+    final have_tan=typTanChiWat == Buildings.Templates.Components.Types.IntegrationPoint.Supply,
+    final V=dat.VTanChiWat,
+    final m_flow_nominal=mChiWatPri_flow_nominal,
+    final icon_pipe=Buildings.Templates.Components.Types.IntegrationPoint.Supply,
+    final energyDynamics=energyDynamics,
+    final allowFlowReversal=allowFlowReversal) if have_chiWat
+                                               "CHW buffer tank"
+    annotation (Placement(transformation(extent={{120,70},{140,90}})));
+  Buildings.Templates.Components.Tanks.Buffer tanChiWatRet(
+    redeclare final package Medium = MediumChiWat,
+    final have_tan=typTanChiWat == Buildings.Templates.Components.Types.IntegrationPoint.Return,
+    final V=dat.VTanChiWat,
+    final m_flow_nominal=mChiWatPri_flow_nominal,
+    final icon_pipe=Buildings.Templates.Components.Types.IntegrationPoint.Return,
+    final energyDynamics=energyDynamics,
+    final allowFlowReversal=allowFlowReversal) if have_chiWat
+                                               "CHW buffer tank"
+    annotation (Placement(transformation(extent={{140,-10},{120,10}})));
   // Secondary CHW loop
   Buildings.Templates.Components.Pumps.Multiple pumChiWatSec(
     final energyDynamics=energyDynamics,
@@ -167,83 +264,90 @@ model AirToWater
     final have_varCom=true,
     final dat=dat.pumChiWatSec) if have_chiWat and typPumChiWatSec == Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.Centralized
     "Secondary CHW pumps"
-    annotation (Placement(transformation(extent={{170,70},{190,90}})));
+    annotation (Placement(transformation(extent={{250,70},{270,90}})));
   Buildings.Templates.Components.Routing.SingleToMultiple inlPumChiWatSec(
-    redeclare final package Medium=MediumChiWat,
+    redeclare final package Medium = MediumChiWat,
     final nPorts=nPumChiWatSec,
     final m_flow_nominal=mChiWat_flow_nominal,
     final energyDynamics=energyDynamics,
     final allowFlowReversal=allowFlowReversal,
-    final icon_pipe=Buildings.Templates.Components.Types.IconPipe.Supply,
-    final icon_dy=300) if
-    have_chiWat and typPumChiWatSec == Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.Centralized
+    final icon_pipe=Buildings.Templates.Components.Types.IntegrationPoint.Supply,
+    final icon_dy=300) if have_chiWat and typPumChiWatSec == Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.Centralized
     "Secondary CHW pumps inlet manifold"
-    annotation (Placement(transformation(extent={{150,70},{170,90}})));
+    annotation (Placement(transformation(extent={{230,70},{250,90}})));
   Buildings.Templates.Components.Routing.MultipleToSingle outPumChiWatSec(
-    redeclare final package Medium=MediumChiWat,
+    redeclare final package Medium = MediumChiWat,
     final nPorts=nPumChiWatSec,
     final m_flow_nominal=mChiWat_flow_nominal,
     final energyDynamics=energyDynamics,
     final allowFlowReversal=allowFlowReversal,
-    final icon_pipe=Buildings.Templates.Components.Types.IconPipe.Supply,
-    final icon_dy=300) if
-    have_chiWat and typPumChiWatSec == Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.Centralized
+    final icon_pipe=Buildings.Templates.Components.Types.IntegrationPoint.Supply,
+    final icon_dy=300) if have_chiWat and typPumChiWatSec == Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.Centralized
     "Secondary CHW pumps outlet manifold"
-    annotation (Placement(transformation(extent={{190,70},{210,90}})));
+    annotation (Placement(transformation(extent={{270,70},{290,90}})));
   Buildings.Templates.Components.Routing.PassThroughFluid supChiWatSec(
-    redeclare final package Medium=MediumChiWat,
-    final icon_pipe=Buildings.Templates.Components.Types.IconPipe.Supply,
+    redeclare final package Medium = MediumChiWat,
+    final icon_pipe=Buildings.Templates.Components.Types.IntegrationPoint.Supply,
     final allowFlowReversal=allowFlowReversal) if have_chiWat and
     typPumChiWatSec <> Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.Centralized
     "Secondary CHW supply pipe - Plant without secondary CHW pumps"
-    annotation (Placement(transformation(extent={{170,70},{190,90}})));
+    annotation (Placement(transformation(extent={{250,70},{270,90}})));
   Buildings.Templates.Components.Sensors.VolumeFlowRate VChiWatSec_flow(
-    redeclare final package Medium=MediumChiWat,
+    redeclare final package Medium = MediumChiWat,
     final m_flow_nominal=mChiWat_flow_nominal,
     final allowFlowReversal=allowFlowReversal,
     final have_sen=ctl.have_senVChiWatSec,
     final text_flip=false,
     final typ=Buildings.Templates.Components.Types.SensorVolumeFlowRate.FlowMeter,
-    final icon_pipe=Buildings.Templates.Components.Types.IconPipe.Supply)
-    if have_chiWat
-    "Secondary CHW volume flow rate"
-    annotation (Placement(transformation(extent={{208,70},{228,90}})));
+    final icon_pipe=Buildings.Templates.Components.Types.IntegrationPoint.Supply)
+    if have_chiWat "Secondary CHW volume flow rate"
+    annotation (Placement(transformation(extent={{288,70},{308,90}})));
   Buildings.Templates.Components.Sensors.Temperature TChiWatSecSup(
-    redeclare final package Medium=MediumChiWat,
+    redeclare final package Medium = MediumChiWat,
     final have_sen=ctl.have_senTChiWatSecSup,
     final m_flow_nominal=mChiWat_flow_nominal,
     final typ=Buildings.Templates.Components.Types.SensorTemperature.InWell,
-    final icon_pipe=Buildings.Templates.Components.Types.IconPipe.Supply,
+    final icon_pipe=Buildings.Templates.Components.Types.IntegrationPoint.Supply,
     final allowFlowReversal=allowFlowReversal) if have_chiWat
-    "Secondary CHW supply temperature"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,
-      origin={140,80})));
+    "Secondary CHW supply temperature" annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={220,80})));
   Buildings.Templates.Components.Sensors.Temperature TChiWatSecRet(
-    redeclare final package Medium=MediumChiWat,
+    redeclare final package Medium = MediumChiWat,
     final have_sen=ctl.have_senTChiWatSecRet,
     final m_flow_nominal=mChiWat_flow_nominal,
     final typ=Buildings.Templates.Components.Types.SensorTemperature.InWell,
-    final icon_pipe=Buildings.Templates.Components.Types.IconPipe.Return,
+    final icon_pipe=Buildings.Templates.Components.Types.IntegrationPoint.Return,
     final allowFlowReversal=allowFlowReversal) if have_chiWat
-    "Secondary CHW return temperature"
-    annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0,
-      origin={140,0})));
+    "Secondary CHW return temperature" annotation (Placement(transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=0,
+        origin={320,0})));
+  Buildings.Templates.Components.Sensors.DifferentialPressure dpChiWatLoc(
+    redeclare final package Medium = MediumChiWat,
+    text_rotation=90) if have_chiWat and not ctl.have_senDpChiWatRemWir
+    "Local CHW ∆p sensor"
+    annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=-90,
+        origin={560.5,40})));
   // Primary HW loop
   Buildings.Templates.Components.Routing.SingleToMultiple inlPumHeaWatPri(
-    redeclare final package Medium=MediumHeaWat,
+    redeclare final package Medium = MediumHeaWat,
     final nPorts=nPumHeaWatPri,
     final m_flow_nominal=mHeaWatPri_flow_nominal,
     final energyDynamics=energyDynamics,
     final allowFlowReversal=allowFlowReversal,
-    final icon_pipe=Buildings.Templates.Components.Types.IconPipe.Supply,
-    final icon_dy=300)
-    if have_heaWat and typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Headered
+    final icon_pipe=Buildings.Templates.Components.Types.IntegrationPoint.Supply,
+    final icon_dy=300) if have_heaWat and typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Headered
     "Primary HW pumps inlet manifold"
     annotation (Placement(transformation(extent={{-40,-290},{-20,-270}})));
   Buildings.Templates.Components.Pumps.Multiple pumHeaWatPri(
     final energyDynamics=energyDynamics,
     redeclare final package Medium=MediumHeaWat,
     final dat=dat.pumHeaWatPri,
+    final dpValChe_nominal=fill(dpValCheHeaWat_nominal, nPumHeaWatPri),
     final nPum=nPumHeaWatPri,
     final have_var=have_pumHeaWatPriVar,
     final have_varCom=true,
@@ -252,36 +356,34 @@ model AirToWater
     "Headered primary HW pumps"
     annotation (Placement(transformation(extent={{-20,-290},{0,-270}})));
   Buildings.Templates.Components.Routing.MultipleToSingle outPumHeaWatPri(
-    redeclare final package Medium=MediumHeaWat,
+    redeclare final package Medium = MediumHeaWat,
     final nPorts=nPumHeaWatPri,
     final m_flow_nominal=mHeaWatPri_flow_nominal,
     final energyDynamics=energyDynamics,
     final allowFlowReversal=allowFlowReversal,
-    final icon_pipe=Buildings.Templates.Components.Types.IconPipe.Supply,
-    final icon_dy=300)
-    if have_heaWat and typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Headered
+    final icon_pipe=Buildings.Templates.Components.Types.IntegrationPoint.Supply,
+    final icon_dy=300) if have_heaWat and typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Headered
     "Primary HW pumps outlet manifold"
     annotation (Placement(transformation(extent={{0,-290},{20,-270}})));
   Buildings.Templates.Components.Routing.PassThroughFluid supHeaWatPri(
-    redeclare final package Medium=MediumHeaWat,
-    final icon_pipe=Buildings.Templates.Components.Types.IconPipe.Supply,
+    redeclare final package Medium = MediumHeaWat,
+    final icon_pipe=Buildings.Templates.Components.Types.IntegrationPoint.Supply,
     final allowFlowReversal=allowFlowReversal) if have_heaWat and typArrPumPri
      == Buildings.Templates.Components.Types.PumpArrangement.Dedicated
     "Primary HW supply pipe - Plant with dedicated primary HW pumps"
     annotation (Placement(transformation(extent={{-20,-290},{0,-270}})));
   Buildings.Templates.Components.Sensors.VolumeFlowRate VHeaWatPri_flow(
-    redeclare final package Medium=MediumHeaWat,
+    redeclare final package Medium = MediumHeaWat,
     final m_flow_nominal=mHeaWatPri_flow_nominal,
     final allowFlowReversal=allowFlowReversal,
     final have_sen=ctl.have_senVHeaWatPri,
     final text_flip=false,
     final typ=Buildings.Templates.Components.Types.SensorVolumeFlowRate.FlowMeter,
-    icon_pipe=Buildings.Templates.Components.Types.IconPipe.Supply)
+    icon_pipe=Buildings.Templates.Components.Types.IntegrationPoint.Supply)
     "Primary HW volume flow rate"
     annotation (Placement(transformation(extent={{20,-290},{40,-270}})));
   Buildings.Templates.Components.Routing.Junction junHeaWatBypSup(
     redeclare final package Medium=MediumHeaWat,
-    final tau=tau,
     final m_flow_nominal=mHeaWatPri_flow_nominal * {1, - 1, - 1},
     final energyDynamics=energyDynamics,
     dp_nominal=fill(0, 3),
@@ -293,52 +395,82 @@ model AirToWater
       else Modelica.Fluid.Types.PortFlowDirection.Leaving) if have_heaWat
     "Fluid junction"
     annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,
-      origin={100,-280})));
+      origin={180,-280})));
   Buildings.Templates.Components.Sensors.Temperature THeaWatPriSup(
-    redeclare final package Medium=MediumHeaWat,
+    redeclare final package Medium = MediumHeaWat,
     final have_sen=true,
     final m_flow_nominal=mHeaWatPri_flow_nominal,
     final typ=Buildings.Templates.Components.Types.SensorTemperature.InWell,
-    final icon_pipe=Buildings.Templates.Components.Types.IconPipe.Supply,
-    final allowFlowReversal=allowFlowReversal)
-    "Primary HW supply temperature"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,
-      origin={60,-280})));
+    final icon_pipe=Buildings.Templates.Components.Types.IntegrationPoint.Supply,
+    final allowFlowReversal=allowFlowReversal) "Primary HW supply temperature"
+    annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={60,-280})));
   Buildings.Templates.Components.Sensors.Temperature THeaWatPriRet(
     redeclare final package Medium = MediumHeaWat,
     final have_sen=ctl.have_senTHeaWatPriRet,
     final m_flow_nominal=mHeaWatPri_flow_nominal,
     final typ=Buildings.Templates.Components.Types.SensorTemperature.InWell,
-    final icon_pipe=Buildings.Templates.Components.Types.IconPipe.Return,
-    final allowFlowReversal=allowFlowReversal)
-    "Primary HW return temperature"
-    annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0,
-      origin={60,-360})));
+    final icon_pipe=Buildings.Templates.Components.Types.IntegrationPoint.Return,
+    final allowFlowReversal=allowFlowReversal) "Primary HW return temperature"
+    annotation (Placement(transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=0,
+        origin={60,-360})));
   Buildings.Templates.Components.Routing.Junction junHeaWatBypRet(
-    redeclare final package Medium=MediumHeaWat,
-    final tau=tau,
-    final m_flow_nominal=mHeaWatPri_flow_nominal * {1, - 1, 1},
+    redeclare final package Medium = MediumHeaWat,
+    final m_flow_nominal=mHeaWatPri_flow_nominal*{1,-1,1},
     final energyDynamics=energyDynamics,
     dp_nominal=fill(0, 3),
     final portFlowDirection_1=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
-      else Modelica.Fluid.Types.PortFlowDirection.Entering,
+         else Modelica.Fluid.Types.PortFlowDirection.Entering,
     final portFlowDirection_2=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
-      else Modelica.Fluid.Types.PortFlowDirection.Leaving,
+         else Modelica.Fluid.Types.PortFlowDirection.Leaving,
     final portFlowDirection_3=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
-      else Modelica.Fluid.Types.PortFlowDirection.Entering,
-    icon_pipe1=Buildings.Templates.Components.Types.IconPipe.Return,
-    icon_pipe3=Buildings.Templates.Components.Types.IconPipe.Supply)
-    if have_heaWat
-    "Fluid junction"
-    annotation (Placement(transformation(extent={{10,10},{-10,-10}},rotation=0,
-      origin={100,-360})));
-  Buildings.Fluid.Sources.Boundary_pT bouHeaWat(
-    redeclare final package Medium=MediumHeaWat,
-    p=Buildings.Templates.Data.Defaults.pHeaWat_rel_nominal + 101325,
-    nPorts=1) if have_heaWat
-    "Pressure boundary condition to mimic expansion tank"
-    annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=90,
-      origin={20,-340})));
+         else Modelica.Fluid.Types.PortFlowDirection.Entering,
+    icon_pipe1=Buildings.Templates.Components.Types.IntegrationPoint.Return,
+    icon_pipe3=Buildings.Templates.Components.Types.IntegrationPoint.Supply)
+    if have_heaWat "Fluid junction" annotation (Placement(transformation(
+        extent={{10,10},{-10,-10}},
+        rotation=0,
+        origin={180,-360})));
+  Buildings.Templates.Components.Actuators.Valve valHeaWatMinByp(
+    redeclare final package Medium = MediumHeaWat,
+    final dat=dat.valHeaWatMinByp,
+    final typ=if have_valHeaWatMinByp then Buildings.Templates.Components.Types.Valve.TwoWayModulating
+         else Buildings.Templates.Components.Types.Valve.None,
+    final chaTwo=Buildings.Templates.Components.Types.ValveCharacteristicTwoWay.Linear,
+    final allowFlowReversal=allowFlowReversal,
+    final energyDynamics=energyDynamics,
+    linearized=linearized,
+    from_dp=true)
+    if have_valHeaWatMinByp or have_bypHeaWatFix
+    "HW minimum flow bypass valve or fixed bypass depending on type of distribution"
+    annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=-90,
+        origin={180,-320})));
+  Buildings.Templates.Components.Tanks.Buffer tanHeaWatSup(
+    redeclare final package Medium = MediumHeaWat,
+    final have_tan=typTanHeaWat == Buildings.Templates.Components.Types.IntegrationPoint.Supply,
+    final V=dat.VTanHeaWat,
+    final m_flow_nominal=mHeaWatPri_flow_nominal,
+    final icon_pipe=Buildings.Templates.Components.Types.IntegrationPoint.Supply,
+    final energyDynamics=energyDynamics,
+    final allowFlowReversal=allowFlowReversal) if have_heaWat
+                                               "HW buffer tank"
+    annotation (Placement(transformation(extent={{120,-290},{140,-270}})));
+  Buildings.Templates.Components.Tanks.Buffer tanHeaWatRet(
+    redeclare final package Medium = MediumHeaWat,
+    final have_tan=typTanHeaWat == Buildings.Templates.Components.Types.IntegrationPoint.Return,
+    final V=dat.VTanHeaWat,
+    final m_flow_nominal=mHeaWatPri_flow_nominal,
+    final icon_pipe=Buildings.Templates.Components.Types.IntegrationPoint.Return,
+    final energyDynamics=energyDynamics,
+    final allowFlowReversal=allowFlowReversal) if have_heaWat
+                                               "HW buffer tank"
+    annotation (Placement(transformation(extent={{140,-370},{120,-350}})));
   // Secondary HW loop
   Buildings.Templates.Components.Pumps.Multiple pumHeaWatSec(
     final energyDynamics=energyDynamics,
@@ -350,76 +482,255 @@ model AirToWater
     final dat=dat.pumHeaWatSec)
     if typPumHeaWatSec == Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.Centralized
     "Secondary HW pumps"
-    annotation (Placement(transformation(extent={{170,-290},{190,-270}})));
+    annotation (Placement(transformation(extent={{250,-290},{270,-270}})));
   Buildings.Templates.Components.Routing.SingleToMultiple inlPumHeaWatSec(
-    redeclare final package Medium=MediumHeaWat,
+    redeclare final package Medium = MediumHeaWat,
     final nPorts=nPumHeaWatSec,
     final m_flow_nominal=mHeaWat_flow_nominal,
     final energyDynamics=energyDynamics,
     final allowFlowReversal=allowFlowReversal,
-    final icon_pipe=Buildings.Templates.Components.Types.IconPipe.Supply,
-    final icon_dy=300)
-    if typPumHeaWatSec == Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.Centralized
+    final icon_pipe=Buildings.Templates.Components.Types.IntegrationPoint.Supply,
+    final icon_dy=300) if typPumHeaWatSec == Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.Centralized
     "Secondary HW pumps inlet manifold"
-    annotation (Placement(transformation(extent={{150,-290},{170,-270}})));
+    annotation (Placement(transformation(extent={{230,-290},{250,-270}})));
   Buildings.Templates.Components.Routing.MultipleToSingle outPumHeaWatSec(
-    redeclare final package Medium=MediumHeaWat,
+    redeclare final package Medium = MediumHeaWat,
     final nPorts=nPumHeaWatSec,
     final m_flow_nominal=mHeaWat_flow_nominal,
     final energyDynamics=energyDynamics,
     final allowFlowReversal=allowFlowReversal,
-    final icon_pipe=Buildings.Templates.Components.Types.IconPipe.Supply,
-    final icon_dy=300)
-    if typPumHeaWatSec == Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.Centralized
+    final icon_pipe=Buildings.Templates.Components.Types.IntegrationPoint.Supply,
+    final icon_dy=300) if typPumHeaWatSec == Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.Centralized
     "Secondary HW pumps outlet manifold"
-    annotation (Placement(transformation(extent={{190,-290},{210,-270}})));
+    annotation (Placement(transformation(extent={{270,-290},{290,-270}})));
   Buildings.Templates.Components.Routing.PassThroughFluid supHeaWatSec(
-    redeclare final package Medium=MediumHeaWat,
-    final icon_pipe=Buildings.Templates.Components.Types.IconPipe.Supply,
+    redeclare final package Medium = MediumHeaWat,
+    final icon_pipe=Buildings.Templates.Components.Types.IntegrationPoint.Supply,
     final allowFlowReversal=allowFlowReversal) if have_heaWat and
     typPumHeaWatSec <> Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.Centralized
     "Secondary HW supply pipe - Plant without secondary HW pumps"
-    annotation (Placement(transformation(extent={{170,-290},{190,-270}})));
+    annotation (Placement(transformation(extent={{250,-290},{270,-270}})));
   Buildings.Templates.Components.Sensors.VolumeFlowRate VHeaWatSec_flow(
-    redeclare final package Medium=MediumHeaWat,
+    redeclare final package Medium = MediumHeaWat,
     final m_flow_nominal=mHeaWat_flow_nominal,
     final allowFlowReversal=allowFlowReversal,
     final have_sen=ctl.have_senVHeaWatSec,
     final text_flip=false,
     final typ=Buildings.Templates.Components.Types.SensorVolumeFlowRate.FlowMeter,
-    final icon_pipe=Buildings.Templates.Components.Types.IconPipe.Supply)
+    final icon_pipe=Buildings.Templates.Components.Types.IntegrationPoint.Supply)
     "Secondary HW volume flow rate"
-    annotation (Placement(transformation(extent={{210,-290},{230,-270}})));
+    annotation (Placement(transformation(extent={{290,-290},{310,-270}})));
   Buildings.Templates.Components.Sensors.Temperature THeaWatSecSup(
-    redeclare final package Medium=MediumHeaWat,
+    redeclare final package Medium = MediumHeaWat,
     final have_sen=ctl.have_senTHeaWatSecSup,
     final m_flow_nominal=mHeaWat_flow_nominal,
     final typ=Buildings.Templates.Components.Types.SensorTemperature.InWell,
-    final icon_pipe=Buildings.Templates.Components.Types.IconPipe.Supply,
+    final icon_pipe=Buildings.Templates.Components.Types.IntegrationPoint.Supply,
     final allowFlowReversal=allowFlowReversal)
-    "Secondary HW supply temperature"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,
-      origin={140,-280})));
+    "Secondary HW supply temperature" annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={220,-280})));
   Buildings.Templates.Components.Sensors.Temperature THeaWatSecRet(
-    redeclare final package Medium=MediumHeaWat,
+    redeclare final package Medium = MediumHeaWat,
     final have_sen=ctl.have_senTHeaWatSecRet,
     final m_flow_nominal=mHeaWat_flow_nominal,
     final typ=Buildings.Templates.Components.Types.SensorTemperature.InWell,
-    final icon_pipe=Buildings.Templates.Components.Types.IconPipe.Return,
+    final icon_pipe=Buildings.Templates.Components.Types.IntegrationPoint.Return,
     final allowFlowReversal=allowFlowReversal)
-    "Secondary HW return temperature"
-    annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0,
-      origin={140,-360})));
+    "Secondary HW return temperature" annotation (Placement(transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=0,
+        origin={320,-360})));
+  Buildings.Templates.Components.Sensors.DifferentialPressure dpHeaWatLoc(
+    redeclare final package Medium = MediumHeaWat,
+    text_rotation=90) if have_heaWat and not ctl.have_senDpHeaWatRemWir
+    "Local HW ∆p sensor"
+    annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=-90,
+        origin={560.5,-320})));
+  Components.HeatRecoveryChiller hrc(
+    redeclare final package MediumChiWat=MediumChiWat,
+    redeclare final package MediumHeaWat=MediumHeaWat,
+    final allowFlowReversal1=allowFlowReversal,
+    final allowFlowReversal2=allowFlowReversal,
+    final show_T=show_T,
+    final datPumChiWat=dat.pumChiWatHrc,
+    final datPumHeaWat=dat.pumHeaWatHrc,
+    final datHrc=dat.hrc,
+    final energyDynamics=energyDynamics) if have_hrc
+    "Sidestream heat recovery chiller"
+    annotation (Placement(transformation(extent={{380,-184},{500,-64}})));
+  Buildings.Templates.Components.Routing.Junction junHeaWatHrcEnt(
+    redeclare final package Medium = MediumHeaWat,
+    final m_flow_nominal=mHeaWat_flow_nominal*{1,-1,-1},
+    final energyDynamics=energyDynamics,
+    dp_nominal=fill(0, 3),
+    final portFlowDirection_1=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+         else Modelica.Fluid.Types.PortFlowDirection.Entering,
+    final portFlowDirection_2=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+         else Modelica.Fluid.Types.PortFlowDirection.Leaving,
+    final portFlowDirection_3=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+         else Modelica.Fluid.Types.PortFlowDirection.Leaving,
+    icon_pipe1=Buildings.Templates.Components.Types.IntegrationPoint.Return,
+    icon_pipe3=if have_hrc then Buildings.Templates.Components.Types.IntegrationPoint.Return
+    else Buildings.Templates.Components.Types.IntegrationPoint.None)
+    if have_heaWat "Fluid junction" annotation (Placement(transformation(
+        extent={{10,10},{-10,-10}},
+        rotation=0,
+        origin={500,-360})));
+  Buildings.Templates.Components.Routing.Junction junHeaWatHrcLvg(
+    redeclare final package Medium = MediumHeaWat,
+    final m_flow_nominal=mHeaWat_flow_nominal*{1,-1,1},
+    final energyDynamics=energyDynamics,
+    dp_nominal=fill(0, 3),
+    final portFlowDirection_1=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+         else Modelica.Fluid.Types.PortFlowDirection.Entering,
+    final portFlowDirection_2=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+         else Modelica.Fluid.Types.PortFlowDirection.Leaving,
+    final portFlowDirection_3=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+         else Modelica.Fluid.Types.PortFlowDirection.Entering,
+    icon_pipe1=Buildings.Templates.Components.Types.IntegrationPoint.Return,
+    icon_pipe3=if have_hrc then Buildings.Templates.Components.Types.IntegrationPoint.Supply
+    else Buildings.Templates.Components.Types.IntegrationPoint.None)
+    if have_heaWat "Fluid junction" annotation (Placement(transformation(
+        extent={{10,10},{-10,-10}},
+        rotation=0,
+        origin={380,-360})));
+  Buildings.Templates.Components.Routing.Junction junChiWatHrcEnt(
+    redeclare final package Medium = MediumChiWat,
+    final m_flow_nominal=mChiWat_flow_nominal*{1,-1,-1},
+    final energyDynamics=energyDynamics,
+    dp_nominal=fill(0, 3),
+    final portFlowDirection_1=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+         else Modelica.Fluid.Types.PortFlowDirection.Entering,
+    final portFlowDirection_2=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+         else Modelica.Fluid.Types.PortFlowDirection.Leaving,
+    final portFlowDirection_3=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+         else Modelica.Fluid.Types.PortFlowDirection.Leaving,
+    icon_pipe1=Buildings.Templates.Components.Types.IntegrationPoint.Return,
+    icon_pipe3=if have_hrc then Buildings.Templates.Components.Types.IntegrationPoint.Return
+    else Buildings.Templates.Components.Types.IntegrationPoint.None)
+    if have_chiWat "Fluid junction" annotation (Placement(transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=0,
+        origin={500,0})));
+  Buildings.Templates.Components.Routing.Junction junChiWatHrcLvg(
+    redeclare final package Medium = MediumChiWat,
+    final m_flow_nominal=mChiWat_flow_nominal*{1,-1,1},
+    final energyDynamics=energyDynamics,
+    dp_nominal=fill(0, 3),
+    final portFlowDirection_1=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+         else Modelica.Fluid.Types.PortFlowDirection.Entering,
+    final portFlowDirection_2=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+         else Modelica.Fluid.Types.PortFlowDirection.Leaving,
+    final portFlowDirection_3=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+         else Modelica.Fluid.Types.PortFlowDirection.Entering,
+    icon_pipe1=Buildings.Templates.Components.Types.IntegrationPoint.Return,
+    icon_pipe3=if have_hrc then Buildings.Templates.Components.Types.IntegrationPoint.Supply
+    else Buildings.Templates.Components.Types.IntegrationPoint.None)
+    if have_chiWat "Fluid junction" annotation (Placement(transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=0,
+        origin={380,0})));
+  Buildings.Templates.Components.Sensors.Temperature TChiWatRetUpsHrc(
+    redeclare final package Medium = MediumChiWat,
+    final have_sen=have_hrc,
+    final m_flow_nominal=mChiWat_flow_nominal,
+    final typ=Buildings.Templates.Components.Types.SensorTemperature.InWell,
+    final icon_pipe=Buildings.Templates.Components.Types.IntegrationPoint.Return,
+    final allowFlowReversal=allowFlowReversal) if have_chiWat
+    "CHW return temperature upstream of HRC" annotation (Placement(
+        transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=0,
+        origin={540,0})));
+  Buildings.Templates.Components.Sensors.Temperature THeaWatRetUpsHrc(
+    redeclare final package Medium = MediumHeaWat,
+    final have_sen=have_hrc,
+    final m_flow_nominal=mHeaWat_flow_nominal,
+    final typ=Buildings.Templates.Components.Types.SensorTemperature.InWell,
+    final icon_pipe=Buildings.Templates.Components.Types.IntegrationPoint.Return,
+    final allowFlowReversal=allowFlowReversal)
+    "HW return temperature upstream of HRC" annotation (Placement(
+        transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=0,
+        origin={540,-360})));
+  Fluid.Sources.Boundary_pT bouHeaWat(
+    redeclare final package Medium = MediumHeaWat,
+    p=Buildings.Templates.Data.Defaults.pHeaWat_rel_nominal + 101325,
+    nPorts=1) if have_heaWat
+    "Pressure boundary condition mimicking expansion tank" annotation (
+      Placement(transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=90,
+        origin={0,-340})));
+initial equation
+  // Calculation of pump speed providing design flow.
+  if is_dpBalYPumSetCal
+    and have_heaWat
+    and typDis==Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Variable2
+    and typPumHeaWatPri==Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Variable then
+    0=Buildings.Templates.Utilities.computeBalancingPressureDrop(
+      m_flow_nominal=hp.mHeaWatHp_flow_nominal,
+      dp_nominal=max(valIso.dpHeaWat_nominal) + dpValCheHeaWat_nominal,
+      datPum=dat.pumHeaWatPriSin[1],
+      r_N=yPumHeaWatPriSet);
+  else
+    yPumHeaWatPriSet=dat.ctl.yPumHeaWatPriSet;
+  end if;
+  if is_dpBalYPumSetCal
+    and have_chiWat
+    and typDis==Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Variable2
+    and (typPumChiWatPri==Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Variable
+      or typPumChiWatPri==Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.None
+      and typPumHeaWatPri==Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Variable) then
+    0=Buildings.Templates.Utilities.computeBalancingPressureDrop(
+      m_flow_nominal=hp.mChiWatHp_flow_nominal,
+      dp_nominal=max(valIso.dpChiWat_nominal) + dpValCheChiWat_nominal,
+      datPum=if typPumChiWatPri==Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Variable
+        then dat.pumChiWatPriSin[1] else dat.pumHeaWatPriSin[1],
+      r_N=yPumChiWatPriSet);
+  else
+    yPumChiWatPriSet=dat.ctl.yPumChiWatPriSet;
+  end if;
+  if is_dpBalYPumSetCal then
+    if have_heaWat then
+      assert(dpBalHeaWatHp_nominal>=0,
+        "In "+ getInstanceName() + ": "+
+        "The calculated pressure drop for the HW balancing valve is negative, "+
+        "indicating that the primary pump curve needs to be revised.");
+      assert(yPumHeaWatPriSet >= 0.1 and yPumHeaWatPriSet <= 2,
+        "In "+ getInstanceName() + ": "+
+        "The calculated primary pump speed to provide the design HW flow is out of bounds, "+
+        "indicating that the primary pump curve needs to be revised.");
+    end if;
+    if have_chiWat then
+      assert(dpBalChiWatHp_nominal>=0,
+        "In "+ getInstanceName() + ": "+
+        "The calculated pressure drop for the CHW balancing valve is negative, "+
+        "indicating that the primary pump curve needs to be revised.");
+      assert(yPumChiWatPriSet >= 0.1 and yPumChiWatPriSet <= 2,
+        "In "+ getInstanceName() + ": "+
+        "The calculated primary pump speed to provide the design CHW flow is out of bounds, "+
+        "indicating that the primary pump curve needs to be revised.");
+    end if;
+  end if;
 equation
   /* Control point connection - start */
-  connect(bus, hp.bus);
   connect(busWea, hp.busWea);
+  connect(bus, hp.bus);
+  connect(bus, hrc.bus);
   connect(bus, pumPri.bus);
   connect(bus, valIso.bus);
   connect(bus.pumChiWatPri, pumChiWatPri.bus);
   connect(bus.pumHeaWatPri, pumHeaWatPri.bus);
   connect(bus.pumChiWatSec, pumChiWatSec.bus);
   connect(bus.pumHeaWatSec, pumHeaWatSec.bus);
+  connect(bus.valChiWatMinByp, valChiWatMinByp.bus);
+  connect(bus.valHeaWatMinByp, valHeaWatMinByp.bus);
   connect(VChiWatPri_flow.y, bus.VChiWatPri_flow);
   connect(VHeaWatPri_flow.y, bus.VHeaWatPri_flow);
   connect(VChiWatSec_flow.y, bus.VChiWatSec_flow);
@@ -432,6 +743,10 @@ equation
   connect(THeaWatSecSup.y, bus.THeaWatSecSup);
   connect(TChiWatSecRet.y, bus.TChiWatSecRet);
   connect(THeaWatSecRet.y, bus.THeaWatSecRet);
+  connect(THeaWatRetUpsHrc.y, bus.THeaWatRetUpsHrc);
+  connect(TChiWatRetUpsHrc.y, bus.TChiWatRetUpsHrc);
+  connect(dpHeaWatLoc.y, bus.dpHeaWatLoc);
+  connect(dpChiWatLoc.y, bus.dpChiWatLoc);
   /* Control point connection - stop */
   connect(pumChiWatPri.ports_b, outPumChiWatPri.ports_a)
     annotation (Line(points={{0,80},{0,80}},  color={0,127,255}));
@@ -460,16 +775,10 @@ equation
       color={0,0,0},
       thickness=0.5,
       visible=have_chiWat));
-  connect(TChiWatPriSup.port_b, junChiWatBypSup.port_1)
-    annotation (Line(
-      points={{70,80},{90,80}},
-      color={0,0,0},
-      thickness=0.5,
-      visible=have_chiWat));
   connect(pumChiWatSec.ports_b, outPumChiWatSec.ports_a)
-    annotation (Line(points={{190,80},{190,80}},color={0,127,255}));
+    annotation (Line(points={{270,80},{270,80}},color={0,127,255}));
   connect(inlPumChiWatSec.ports_b, pumChiWatSec.ports_a)
-    annotation (Line(points={{170,80},{170,80}},color={0,127,255}));
+    annotation (Line(points={{250,80},{250,80}},color={0,127,255}));
   connect(valIso.port_bChiWat, supChiWatPri.port_a)
     annotation (Line(
       points={{-60,80},{-60,80},{-20,80}},
@@ -488,19 +797,31 @@ equation
   connect(pumPri.ports_bChiHeaWatHp, hp.ports_aChiHeaWat)
     annotation (Line(points={{-250,-130},{-250,-130}},
                                                     color={0,127,255}));
-  connect(VChiWatSec_flow.port_b, port_bChiWat)
-    annotation (Line(
-      points={{228,80},{600,80}},
-      color={0,0,0},
-      thickness=0.5,
-      visible=have_chiWat));
   connect(supChiWatSec.port_b, VChiWatSec_flow.port_a)
     annotation (Line(
-      points={{190,80},{208,80}},
+      points={{270,80},{288,80}},
       color={0,0,0},
       visible=have_chiWat and typPumChiWatSec <> Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.Centralized,
       thickness=0.5));
 
+  connect(port_bChiWat, dpChiWatLoc.port_a)
+    annotation (Line(
+      points={{600,80},{560.5,80},{560.5,50}},
+      color={0,127,255},
+      visible=false));
+  connect(dpChiWatLoc.port_b, port_aChiWat)
+    annotation (Line(
+      points={{560.5,30},{560.5,0},{600,0}},
+      color={0,127,255},
+      visible=false));
+  connect(port_bHeaWat, dpHeaWatLoc.port_a) annotation (Line(
+      points={{600,-280},{560.5,-280},{560.5,-310}},
+      color={0,127,255},
+      visible=false));
+  connect(dpHeaWatLoc.port_b, port_aHeaWat) annotation (Line(
+      points={{560.5,-330},{560.5,-360},{600,-360}},
+      color={0,127,255},
+      visible=false));
   connect(pumHeaWatPri.ports_b, outPumHeaWatPri.ports_a)
     annotation (Line(points={{0,-280},{0,-280}},  color={0,127,255}));
   connect(inlPumHeaWatPri.ports_b, pumHeaWatPri.ports_a)
@@ -511,13 +832,10 @@ equation
   connect(VHeaWatPri_flow.port_b, THeaWatPriSup.port_a)
     annotation (Line(points={{40,-280},{50,-280}},  color={0,0,0},
       thickness=0.5));
-  connect(THeaWatPriSup.port_b, junHeaWatBypSup.port_1)
-    annotation (Line(points={{70,-280},{90,-280}},  color={0,0,0},
-      thickness=0.5));
   connect(pumHeaWatSec.ports_b, outPumHeaWatSec.ports_a)
-    annotation (Line(points={{190,-280},{190,-280}},color={0,127,255}));
+    annotation (Line(points={{270,-280},{270,-280}},color={0,127,255}));
   connect(inlPumHeaWatSec.ports_b, pumHeaWatSec.ports_a)
-    annotation (Line(points={{170,-280},{170,-280}},color={0,127,255}));
+    annotation (Line(points={{250,-280},{250,-280}},color={0,127,255}));
   connect(supHeaWatPri.port_b, VHeaWatPri_flow.port_a)
     annotation (Line(
       points={{0,-280},{20,-280}},
@@ -526,12 +844,12 @@ equation
       visible=have_heaWat and typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Dedicated));
   connect(supHeaWatSec.port_b, VHeaWatSec_flow.port_a)
     annotation (Line(
-      points={{190,-280},{210,-280}},
+      points={{270,-280},{290,-280}},
       color={0,0,0},
       thickness=0.5,
       visible=have_heaWat and typPumHeaWatSec <> Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.Centralized));
   connect(outPumHeaWatSec.port_b, VHeaWatSec_flow.port_a)
-    annotation (Line(points={{210,-280},{210,-280}},color={0,0,0},
+    annotation (Line(points={{290,-280},{290,-280}},color={0,0,0},
       thickness=0.5));
   connect(valIso.port_bHeaWat, inlPumHeaWatPri.port_a)
     annotation (Line(
@@ -540,7 +858,7 @@ equation
       thickness=0.5,
       visible=have_heaWat and typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Headered));
   connect(VHeaWatSec_flow.port_b, port_bHeaWat)
-    annotation (Line(points={{230,-280},{600,-280}},color={0,0,0},
+    annotation (Line(points={{310,-280},{600,-280}},color={0,0,0},
       thickness=0.5));
   connect(valIso.port_bHeaWat, supHeaWatPri.port_a)
     annotation (Line(
@@ -548,95 +866,187 @@ equation
       color={0,0,0},
       thickness=0.5,
       visible=have_heaWat and typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Dedicated));
-  connect(junHeaWatBypSup.port_3, junHeaWatBypRet.port_3)
-    annotation (Line(points={{100,-290},{100,-350}}, color={0,0,0},
-      thickness=0.5));
-  connect(junChiWatBypSup.port_3, junChiWatBypRet.port_3)
-    annotation (Line(
-      points={{100,70},{100,10}},
-      color={0,0,0},
-      thickness=0.5,
-      visible=have_chiWat));
   connect(junChiWatBypSup.port_2, TChiWatSecSup.port_a)
     annotation (Line(
-      points={{110,80},{130,80}},
+      points={{190,80},{210,80}},
       color={0,0,0},
       thickness=0.5,
       visible=have_chiWat));
   connect(TChiWatSecSup.port_b, inlPumChiWatSec.port_a)
-    annotation (Line(points={{150,80},{150,80}},
+    annotation (Line(points={{230,80},{230,80}},
                                                color={0,0,0},
       thickness=0.5));
   connect(junChiWatBypRet.port_1, TChiWatSecRet.port_b)
     annotation (Line(
-      points={{110,0},{130,0}},
-      color={0,0,0},
-      pattern=LinePattern.Dash,
-      thickness=0.5,
-      visible=have_chiWat));
-  connect(port_aChiWat, TChiWatSecRet.port_a)
-    annotation (Line(
-      points={{600,0},{150,0}},
-      color={0,0,0},
-      pattern=LinePattern.Dash,
-      thickness=0.5,
-      visible=have_chiWat));
-  connect(junChiWatBypRet.port_2, TChiWatPriRet.port_a)
-    annotation (Line(
-      points={{90,0},{70,0}},
+      points={{190,0},{310,0}},
       color={0,0,0},
       pattern=LinePattern.Dash,
       thickness=0.5,
       visible=have_chiWat));
-  connect(port_aHeaWat, THeaWatSecRet.port_a)
-    annotation (Line(points={{600,-360},{150,-360}},color={0,0,0},
-      thickness=0.5,
-      pattern=LinePattern.Dash));
   connect(junHeaWatBypSup.port_2, THeaWatSecSup.port_a)
-    annotation (Line(points={{110,-280},{130,-280}},
+    annotation (Line(points={{190,-280},{210,-280}},
                                                    color={0,0,0},
       thickness=0.5));
   connect(THeaWatSecSup.port_b, inlPumHeaWatSec.port_a)
-    annotation (Line(points={{150,-280},{150,-280}},
+    annotation (Line(points={{230,-280},{230,-280}},
                                                    color={0,0,0},
       thickness=0.5));
   connect(THeaWatSecSup.port_b, supHeaWatSec.port_a) annotation (Line(
-      points={{150,-280},{158,-280},{158,-232},{166,-232},{166,-280},{170,-280}},
+      points={{230,-280},{250,-280}},
       color={0,0,0},
       thickness=0.5,
       visible=have_heaWat and typPumHeaWatSec <> Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.Centralized));
   connect(TChiWatSecSup.port_b, supChiWatSec.port_a) annotation (Line(
-      points={{150,80},{158,80},{158,60},{166,60},{166,80},{170,80}},
+      points={{230,80},{250,80}},
       color={0,0,0},
       thickness=0.5,
       visible=have_chiWat and typPumChiWatSec <> Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.Centralized));
-  connect(bouHeaWat.ports[1], THeaWatPriRet.port_b)
-    annotation (Line(points={{20,-350},{20,-360},{50,-360}},
-                                                           color={0,127,255}));
   connect(junHeaWatBypRet.port_1, THeaWatSecRet.port_b)
-    annotation (Line(points={{110,-360},{130,-360}}, color={0,0,0},
+    annotation (Line(points={{190,-360},{310,-360}}, color={0,0,0},
       thickness=0.5,
       pattern=LinePattern.Dash));
-  connect(junHeaWatBypRet.port_2, THeaWatPriRet.port_a) annotation (Line(
-      points={{90,-360},{70,-360}},
+  connect(outPumChiWatSec.port_b, VChiWatSec_flow.port_a) annotation (Line(
+      points={{290,80},{288,80}},
       color={0,0,0},
+      thickness=1));
+  connect(TChiWatPriRet.port_b, valIso.port_aChiWat) annotation (Line(
+      points={{50,0},{0,0},{0,40},{-60,40}},
+      color={0,0,0},
+      pattern=LinePattern.Dash,
+      thickness=0.5,
+      visible=have_chiWat));
+  connect(junHeaWatHrcEnt.port_2, junHeaWatHrcLvg.port_1)
+    annotation (Line(points={{490,-360},{390,-360}}, color={0,0,0},
       thickness=0.5,
       pattern=LinePattern.Dash));
-  connect(THeaWatPriRet.port_b, valIso.port_aHeaWat) annotation (Line(
-      points={{50,-360},{-584,-360},{-584,60},{-540,60}},
-      color={0,0,0},
+  connect(junHeaWatHrcLvg.port_2, THeaWatSecRet.port_a)
+    annotation (Line(points={{370,-360},{330,-360}}, color={0,0,0},
       thickness=0.5,
       pattern=LinePattern.Dash));
-  connect(outPumChiWatSec.port_b, VChiWatSec_flow.port_a) annotation (Line(
-      points={{210,80},{208,80}},
+  connect(junHeaWatHrcEnt.port_3, hrc.port_a1) annotation (Line(
+      points={{500,-350},{500,-180},{380,-180},{380,-160}},
       color={0,0,0},
-      thickness=1));
-  connect(TChiWatPriRet.port_b, valIso.port_aChiWat) annotation (Line(
-      points={{50,0},{0,0},{0,40},{-60,40}},
+      thickness=0.5,
+      pattern=LinePattern.Dash,
+      visible=have_hrc));
+  connect(hrc.port_b1, junHeaWatHrcLvg.port_3) annotation (Line(
+      points={{500,-160},{440,-160},{440,-200},{380,-200},{380,-350}},
+      color={0,0,0},
+      thickness=0.5,
+      visible=have_hrc));
+  connect(junChiWatHrcEnt.port_3, hrc.port_a2)
+    annotation (Line(
+      points={{500,-10},{500,-88}},
+      color={0,0,0},
+      thickness=0.5,
+      pattern=LinePattern.Dash,
+      visible=have_hrc));
+  connect(junChiWatHrcEnt.port_2, junChiWatHrcLvg.port_1)
+    annotation (Line(
+      points={{490,0},{390,0}},
+      color={0,0,0},
+      thickness=0.5,
+      pattern=LinePattern.Dash,
+      visible=have_chiWat));
+  connect(junChiWatHrcLvg.port_2, TChiWatSecRet.port_a)
+    annotation (Line(
+      points={{370,0},{330,0}},
+      color={0,0,0},
+      thickness=0.5,
+      pattern=LinePattern.Dash,
+      visible=have_chiWat));
+  connect(hrc.port_b2, junChiWatHrcLvg.port_3)
+    annotation (Line(
+      points={{380,-88},{380,-10}},
+      color={0,0,0},
+      thickness=0.5,
+      visible=have_hrc));
+  connect(port_aChiWat, TChiWatRetUpsHrc.port_a) annotation (Line(
+      points={{600,0},{550,0}},
+      color={0,0,0},
+      pattern=LinePattern.Dash,
+      thickness=0.5,
+      visible=have_chiWat));
+  connect(TChiWatRetUpsHrc.port_b, junChiWatHrcEnt.port_1) annotation (Line(
+      points={{530,0},{510,0}},
       color={0,0,0},
       pattern=LinePattern.Dash,
+      thickness=0.5));
+  connect(port_aHeaWat, THeaWatRetUpsHrc.port_a) annotation (Line(
+      points={{600,-360},{550,-360}},
+      color={0,0,0},
+      pattern=LinePattern.Dash,
+      thickness=0.5));
+  connect(THeaWatRetUpsHrc.port_b, junHeaWatHrcEnt.port_1) annotation (Line(
+      points={{530,-360},{510,-360}},
+      color={0,0,0},
+      pattern=LinePattern.Dash,
+      thickness=0.5));
+  connect(junChiWatBypSup.port_3, valChiWatMinByp.port_a)
+    annotation (Line(points={{180,70},{180,50}}, color={0,0,0},
+      thickness=0.5));
+  connect(valChiWatMinByp.port_b, junChiWatBypRet.port_3)
+    annotation (Line(points={{180,30},{180,10}}, color={0,0,0},
+      thickness=0.5));
+  connect(junHeaWatBypSup.port_3, valHeaWatMinByp.port_a)
+    annotation (Line(points={{180,-290},{180,-310}}, color={0,0,0},
+      thickness=0.5));
+  connect(valHeaWatMinByp.port_b, junHeaWatBypRet.port_3)
+    annotation (Line(points={{180,-330},{180,-350}}, color={0,0,0},
+      thickness=0.5));
+  connect(VChiWatSec_flow.port_b, port_bChiWat)
+    annotation (Line(
+      points={{308,80},{600,80}},
+      color={0,0,0},
+      thickness=0.5,
+      visible=have_chiWat));
+  connect(TChiWatPriSup.port_b, tanChiWatSup.port_a) annotation (Line(
+      points={{70,80},{120,80}},
+      color={0,0,0},
       thickness=0.5,
       visible=have_chiWat));
+  connect(tanChiWatSup.port_b, junChiWatBypSup.port_1) annotation (Line(
+      points={{140,80},{170,80}},
+      color={0,0,0},
+      thickness=0.5,
+      visible=have_chiWat));
+  connect(junChiWatBypRet.port_2, tanChiWatRet.port_a) annotation (Line(
+      points={{170,0},{140,0}},
+      color={0,0,0},
+      thickness=0.5,
+      visible=have_chiWat,
+      pattern=LinePattern.Dash));
+  connect(tanChiWatRet.port_b, TChiWatPriRet.port_a) annotation (Line(
+      points={{120,0},{70,0}},
+      color={0,0,0},
+      thickness=0.5,
+      visible=have_chiWat,
+      pattern=LinePattern.Dash));
+  connect(THeaWatPriSup.port_b, tanHeaWatSup.port_a) annotation (Line(
+      points={{70,-280},{120,-280}},
+      color={0,0,0},
+      thickness=0.5));
+  connect(tanHeaWatSup.port_b, junHeaWatBypSup.port_1) annotation (Line(
+      points={{140,-280},{170,-280}},
+      color={0,0,0},
+      thickness=0.5));
+  connect(junHeaWatBypRet.port_2, tanHeaWatRet.port_a) annotation (Line(
+      points={{170,-360},{140,-360}},
+      color={0,0,0},
+      thickness=0.5,
+      pattern=LinePattern.Dash));
+  connect(tanHeaWatRet.port_b, THeaWatPriRet.port_a) annotation (Line(
+      points={{120,-360},{70,-360}},
+      color={0,0,0},
+      thickness=0.5,
+      pattern=LinePattern.Dash));
+  connect(bouHeaWat.ports[1], THeaWatPriRet.port_b)
+    annotation (Line(points={{0,-350},{0,-360},{50,-360}}, color={0,127,255}));
+  connect(THeaWatPriRet.port_b, valIso.port_aHeaWat) annotation (Line(
+      points={{50,-360},{-580,-360},{-580,60},{-540,60}},
+      color={0,0,0},
+      thickness=0.5,
+      pattern=LinePattern.Dash));
   annotation (
     defaultComponentName="pla",
     Documentation(
@@ -645,14 +1055,25 @@ equation
 <p>
 This template represents an air-to-water heat pump plant
 with closed-loop controls. While the heat pump plant configuration can be changed
-through parameters, a typical configuration is shown in the image below.
+through parameters, the image below shows a typical configuration with
+two reversible air-to-water heat pumps, a primary-secondary distribution system 
+and a sidestream heat recovery chiller.
+For a detailed schematic of the actual plant configuration, refer to the diagram
+view of the plant component. In Dymola, for example, you can access this by right-clicking
+the component <code>pla</code> in the model
+<a href=\"modelica://Buildings.Templates.Plants.HeatPumps.Validation.AirToWater\">
+Buildings.Templates.Plants.HeatPumps.Validation.AirToWater</a>
+and selecting \"Show Component\" from the context menu.
 </p>
 <p align=\"center\">
 <img alt=\"Image of heat pump plant\"
 src=\"modelica://Buildings/Resources/Images/Templates/Plants/HeatPumps/AirToWater.png\"/>
 </p>
 <p>
-Only identical heat pumps are currently supported.
+Currently, only identical heat pumps are supported.
+Although the template can accommodate any number of identical heat pumps,
+the graphical feedback for system configuration via the diagram layer is
+only accurate for up to 6 devices.
 </p>
 <p>
 The supported plant configurations are enumerated in the table below.
@@ -672,23 +1093,40 @@ Setting the parameter <code>have_chiWat</code> to true (default setting) allows
 modeling a plant that provides both heating hot water and chilled water.
 </td>
 </tr>
+<tr><td>Heat recovery</td>
+<td>
+<b>Without sidestream heat recovery chiller</b><br/>
+With sidestream heat recovery chiller
+</td>
+<td>
+This option is only available for heating and cooling plants.
+When selected, the template includes a chiller and its associated dedicated
+primary CHW and CW pumps.
+The chiller is considered connected in a sidestream configuration to both
+the CHW return and the HW return.
+</td>
+</tr>
 <tr><td>Type of distribution</td>
 <td>
-<b>Constant primary-variable secondary centralized</b>
+<b>Constant primary-variable secondary centralized</b><br/>
+Variable primary-only
 </td>
 <td>
 It is assumed that the HW and the CHW loops have the
 same type of distribution, as specified by this parameter.<br/>
+Most AWHPs on the market use a reverse cycle for defrosting.
+This requires maximum primary flow during defrost cycles.
+Consequently, variable primary plants commonly adopt a high
+minimum flow setpoint, typically close to the design flow rate,
+effectively operating akin to constant primary plants but with
+variable speed pumps controlling the loop differential pressure.
+While the flow rate directed towards the loads varies,
+the bypass valve control loop ensures a constant primary flow
+for a given number of staged units.<br/>
 \"Centralized secondary pumps\" refers to configurations with a single
 group of secondary pumps that is typically integrated into the plant.<br/>
 Distributed secondary pumps with multiple secondary loops served
-by dedicated secondary pumps are currently not supported.<br/>
-Options are limited to constant primary distributions because most
-AWHPs on the market use a reverse cycle for defrosting.
-This requires maximum primary flow during defrost cycles and hinders
-variable primary distributions.<br/>
-An option for constant primary-only distributions with ∆p-controlled
-variable speed pumps will be added in a next release.
+by dedicated secondary pumps are currently not supported.
 </td>
 </tr>
 <tr><td>Type of primary pump arrangement</td>
@@ -708,7 +1146,8 @@ True
 <td>This option is only available for heating and cooling plants
 with dedicated primary pumps.
 If this option is not selected (default setting), each AWHP uses
-a common dedicated primary pump for HW and CHW.
+a common dedicated primary pump for HW and CHW –
+this pump is then denoted as the primary HW pump.
 Otherwise, each AWHP relies on a separate dedicated HW pump
 and a separate dedicated CHW pump.
 </td>
@@ -734,6 +1173,33 @@ Constant speed
 </td>
 <td>See the note above on primary HW pumps.</td>
 </tr>
+<tr><td>HW buffer tank</td>
+<td>
+<b>HW buffer tank in the primary supply</b><br/>
+HW buffer tank in the primary return<br/>
+No HW buffer tank
+</td>
+<td>By default, the HW buffer tank is considered integrated into the primary supply
+to mitigate the impact of defrost cycles on the temperature of the HW supplied to the loads.
+This assumes that the buffer tank is well-mixed.</br>
+The default sizing of the tank corresponds to <i>4</i>&nbsp;min of the design primary flow rate.
+This is based on manufacturer recommendations, which account for the fact that defrost cycles
+can take <i>3</i> to <i>5</i>&nbsp;min to complete.
+</td>
+</tr>
+<tr><td>CHW buffer tank</td>
+<td>
+<b>CHW buffer tank in the primary return</b><br/>
+CHW buffer tank in the primary supply<br/>
+No CHW buffer tank
+</td>
+<td>By default, the CHW buffer tank is considered integrated into the primary return
+to mitigate the impact of rapid load variations on the plant controls.
+This assumes that the buffer tank is well-mixed.</br>
+The default sizing of the tank corresponds to <i>2</i>&nbsp;min of the design primary flow rate,
+based on manufacturer recommendations.
+</td>
+</tr>
 <tr><td>Controller</td>
 <td>
 <b>Closed-loop controls with supply temperature and differential pressure reset</b><br/>
@@ -750,7 +1216,7 @@ An open loop controller is also available for validation purposes.
 </table>
 <h4>Control points</h4>
 <p>
-The control sequence implemented in this template requires the 
+The control sequence implemented in this template requires the
 external input points specified in the documentation of the controller
 <a href=\"modelica://Buildings.Templates.Plants.HeatPumps.Components.Controls.AirToWater\">
 Buildings.Templates.Plants.HeatPumps.Components.Controls.AirToWater</a>.
@@ -767,5 +1233,37 @@ ASHRAE, 2021. Guideline 36-2021, High-Performance Sequences of Operation
 for HVAC Systems. Atlanta, GA.
 </li>
 </ul>
-</html>"));
+</html>", revisions="<html>
+<ul>
+<li>
+May 31, 2024, by Antoine Gautier:<br/>
+Added sidestream heat recovery chiller, primary-only pumping,
+buffer tanks, failsafe staging conditions and internal computation
+of pump speed or balancing valve ∆p to meet design flow.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3808\">#3808</a>.
+</li>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    Diagram(graphics={
+        Polygon(
+          points={{560,80},{560,44},{561,44},{561,80}},
+          lineColor={0,0,0},
+          visible=have_chiWat and not ctl.have_senDpChiWatRemWir),
+        Polygon(
+          points={{560,36},{560,0},{561,0},{561,36}},
+          lineColor={0,0,0},
+          visible=have_chiWat and not ctl.have_senDpChiWatRemWir),
+        Polygon(
+          points={{560,-324},{560,-360},{561,-360},{561,-324}},
+          lineColor={0,0,0},
+          visible=have_heaWat and not ctl.have_senDpHeaWatRemWir),
+        Polygon(
+          points={{560,-280},{560,-316},{561,-316},{561,-280}},
+          lineColor={0,0,0},
+          visible=have_heaWat and not ctl.have_senDpHeaWatRemWir)}));
 end AirToWater;
diff --git a/Buildings/Templates/Plants/HeatPumps/Components/Controls/AirToWater.mo b/Buildings/Templates/Plants/HeatPumps/Components/Controls/AirToWater.mo
index ddb864f12e7..b9334268c9d 100644
--- a/Buildings/Templates/Plants/HeatPumps/Components/Controls/AirToWater.mo
+++ b/Buildings/Templates/Plants/HeatPumps/Components/Controls/AirToWater.mo
@@ -14,24 +14,29 @@ model AirToWater
     final min=1)=size(staEqu, 1)
     "Number of stages"
     annotation (Evaluate=true);
-  final parameter Integer nEquAlt(
-    final min=0)=max({sum({(if staEqu[i, j] > 0 and staEqu[i, j] < 1 then 1 else 0) for j in 1:nHp}) for i in 1:nSta})
-    "Number of lead/lag alternate equipment"
-    annotation (Evaluate=true);
-  final parameter Integer idxEquAlt[nEquAlt]=Modelica.Math.BooleanVectors.index(
-    {Modelica.Math.BooleanVectors.anyTrue({staEqu[i,j] > 0 and staEqu[i,j] < 1 for i in 1:nSta})
-    for j in 1:nHp})
+  final parameter Integer idxEquAlt[ctl.nEquAlt]=Modelica.Math.BooleanVectors.index(
+    {Modelica.Math.BooleanVectors.anyTrue({
+      nHp==1 or staEqu[i,j] > 0 and staEqu[i,j] < 1 for i in 1:nSta})
+      for j in 1:nHp})
     "Indices of lead/lag alternate equipment"
     annotation (Evaluate=true,
     Dialog(group="Equipment staging and rotation"));
   Buildings.Templates.Plants.Controls.HeatPumps.AirToWater ctl(
+    final is_priOnl=cfg.typDis==Buildings.Templates.Plants.HeatPumps.Types.Distribution.Variable1Only,
+    final have_hrc_select=cfg.have_hrc,
     final TChiWatSupSet_max=dat.TChiWatSupSet_max,
     final TChiWatSup_nominal=dat.TChiWatSup_nominal,
     final THeaWatSupSet_min=dat.THeaWatSupSet_min,
     final THeaWatSup_nominal=dat.THeaWatSup_nominal,
     final TOutChiWatLck=dat.TOutChiWatLck,
     final TOutHeaWatLck=dat.TOutHeaWatLck,
+    final VChiWatHp_flow_min=fill(dat.VChiWatHp_flow_min, cfg.nHp),
+    final VChiWatHp_flow_nominal=fill(dat.VChiWatHp_flow_nominal, cfg.nHp),
+    final VChiWatPri_flow_nominal=dat.VChiWatPri_flow_nominal,
     final VChiWatSec_flow_nominal=dat.VChiWatSec_flow_nominal,
+    final VHeaWatHp_flow_min=fill(dat.VHeaWatHp_flow_min, cfg.nHp),
+    final VHeaWatHp_flow_nominal=fill(dat.VHeaWatHp_flow_nominal, cfg.nHp),
+    final VHeaWatPri_flow_nominal=dat.VHeaWatPri_flow_nominal,
     final VHeaWatSec_flow_nominal=dat.VHeaWatSec_flow_nominal,
     final capCooHp_nominal=fill(dat.capCooHp_nominal, cfg.nHp),
     final capHeaHp_nominal=fill(dat.capHeaHp_nominal, cfg.nHp),
@@ -40,21 +45,24 @@ model AirToWater
     final dpChiWatRemSet_min=dat.dpChiWatRemSet_min,
     final dpHeaWatRemSet_max=dat.dpHeaWatRemSet_max,
     final dpHeaWatRemSet_min=dat.dpHeaWatRemSet_min,
+    final capCooHrc_min=dat.capCooHrc_min,
+    final capHeaHrc_min=dat.capHeaHrc_min,
+    final COPHeaHrc_nominal=dat.COPHeaHrc_nominal,
+    final TChiWatSupHrc_min=dat.TChiWatSupHrc_min,
+    final THeaWatSupHrc_max=dat.THeaWatSupHrc_max,
     final have_chiWat=cfg.have_chiWat,
     final have_heaWat=cfg.have_heaWat,
     final have_inpSch=have_inpSch,
     final have_pumChiWatPriDed_select=cfg.have_pumChiWatPriDed,
-    final have_pumChiWatSec_select=cfg.typPumChiWatSec==Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.Centralized,
-    final have_pumHeaWatSec_select=cfg.typPumHeaWatSec==Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.Centralized,
     final have_pumPriHdr=cfg.typArrPumPri==Buildings.Templates.Components.Types.PumpArrangement.Headered,
-    final have_pumHeaWatPriVar=cfg.have_pumHeaWatPriVar,
-    final have_pumChiWatPriVar=cfg.have_pumChiWatPriVar,
+    final have_pumHeaWatPriVar_select=cfg.have_pumHeaWatPriVar,
+    final have_pumChiWatPriVar_select=cfg.have_pumChiWatPriVar,
     final have_senDpChiWatRemWir=cfg.have_senDpChiWatRemWir,
     final have_senDpHeaWatRemWir=cfg.have_senDpHeaWatRemWir,
     final have_senTChiWatPriRet_select=have_senTChiWatPriRet_select,
-    final have_senTChiWatSecRet=have_senTChiWatSecRet,
+    final have_senTChiWatSecRet_select=have_senTChiWatSecRet_select,
     final have_senTHeaWatPriRet_select=have_senTHeaWatPriRet_select,
-    final have_senTHeaWatSecRet=have_senTHeaWatSecRet,
+    final have_senTHeaWatSecRet_select=have_senTHeaWatSecRet_select,
     final have_senVChiWatPri_select=have_senVChiWatPri_select,
     final have_senVHeaWatPri_select=have_senVHeaWatPri_select,
     final have_valHpInlIso=cfg.have_valHpInlIso,
@@ -72,10 +80,14 @@ model AirToWater
     final schCoo=dat.schCoo,
     final schHea=dat.schHea,
     final staEqu=dat.staEqu,
-    final yPumChiWatPriSet=dat.yPumChiWatPriSet,
-    final yPumHeaWatPriSet=dat.yPumHeaWatPriSet)
+    final yPumChiWatPri_min=dat.yPumChiWatPri_min,
+    yPumChiWatPriSet=dat.yPumChiWatPriSet,
+    final yPumChiWatSec_min=dat.yPumChiWatSec_min,
+    final yPumHeaWatPri_min=dat.yPumHeaWatPri_min,
+    yPumHeaWatPriSet=dat.yPumHeaWatPriSet,
+    final yPumHeaWatSec_min=dat.yPumHeaWatSec_min)
     "Plant controller"
-    annotation (Placement(transformation(extent={{-20,-20},{20,40}})));
+    annotation (Placement(transformation(extent={{-20,-32},{20,40}})));
   Buildings.Controls.OBC.CDL.Integers.MultiSum reqPlaHeaWatAirHan(
     final nin=nAirHan) if cfg.have_heaWat "Sum of HW plant requests from AHU"
     annotation (Placement(transformation(extent={{210,190},{190,210}})));
@@ -149,6 +161,20 @@ model AirToWater
   Buildings.Controls.OBC.CDL.Integers.Add reqResChiWat
     "Sum of CHW reset requests of all loads served"
     annotation (Placement(transformation(extent={{110,64},{90,84}})));
+  Buildings.Templates.Plants.Controls.Pumps.Generic.ResetLocalDifferentialPressure
+    resDpHeaWatLoc[nSenDpHeaWatRem](
+    dpLocSet_min=fill(dat.dpHeaWatLocSet_min, nSenDpHeaWatRem),
+    dpLocSet_max=fill(dat.dpHeaWatLocSet_max, nSenDpHeaWatRem))
+    if cfg.have_heaWat and not have_senDpHeaWatRemWir
+    "Local HW DP reset"
+    annotation (Placement(transformation(extent={{-70,-10},{-50,10}})));
+  Buildings.Templates.Plants.Controls.Pumps.Generic.ResetLocalDifferentialPressure
+    resDpChiWatLoc[nSenDpChiWatRem](
+    dpLocSet_min=fill(dat.dpChiWatLocSet_min, nSenDpChiWatRem),
+    dpLocSet_max=fill(dat.dpChiWatLocSet_max, nSenDpChiWatRem))
+    if cfg.have_chiWat and not have_senDpChiWatRemWir
+    "Local CHW DP reset"
+    annotation (Placement(transformation(extent={{-70,-50},{-50,-30}})));
 equation
   /* Control point connection - start */
   // Inputs from plant control bus
@@ -168,9 +194,11 @@ equation
   connect(bus.dpChiWatLoc, ctl.dpChiWatLoc);
   connect(bus.dpChiWatLocSet, ctl.dpChiWatLocSet);
   connect(bus.dpChiWatRem, ctl.dpChiWatRem);
+  connect(bus.dpChiWatRem, resDpChiWatLoc.dpRem);
   connect(bus.dpHeaWatLoc, ctl.dpHeaWatLoc);
   connect(bus.dpHeaWatLocSet, ctl.dpHeaWatLocSet);
   connect(bus.dpHeaWatRem, ctl.dpHeaWatRem);
+  connect(bus.dpHeaWatRem, resDpHeaWatLoc.dpRem);
   connect(busHp.y1_actual, ctl.u1Hp_actual);
   connect(busPumChiWatPri.y1_actual, ctl.u1PumChiWatPri_actual);
   connect(busPumChiWatSec.y1_actual, ctl.u1PumChiWatSec_actual);
@@ -178,6 +206,9 @@ equation
   connect(busPumHeaWatSec.y1_actual, ctl.u1PumHeaWatSec_actual);
   connect(bus.u1SchCoo, ctl.u1SchCoo);
   connect(bus.u1SchHea, ctl.u1SchHea);
+  connect(busHrc.y1_actual, ctl.u1Hrc_actual);
+  connect(bus.TChiWatRetUpsHrc, ctl.TChiWatRetUpsHrc);
+  connect(bus.THeaWatRetUpsHrc, ctl.THeaWatRetUpsHrc);
   // Outputs to plant control bus
   connect(ctl.TSupSet, busHp.TSet);
   connect(ctl.TChiWatSupSet, bus.TChiWatSupSet);
@@ -194,12 +225,19 @@ equation
   connect(ctl.y1ValChiWatHpOutIso, busValChiWatHpOutIso.y1);
   connect(ctl.y1ValHeaWatHpInlIso, busValHeaWatHpInlIso.y1);
   connect(ctl.y1ValHeaWatHpOutIso, busValHeaWatHpOutIso.y1);
+  connect(ctl.yValHeaWatMinByp, busValHeaWatMinByp.y);
+  connect(ctl.yValChiWatMinByp, busValChiWatMinByp.y);
   connect(ctl.yPumChiWatPriDed, busPumChiWatPri.y);
   connect(ctl.yPumChiWatPriHdr, busPumChiWatPri.y);
   connect(ctl.yPumChiWatSec, busPumChiWatSec.y);
   connect(ctl.yPumHeaWatPriDed, busPumHeaWatPri.y);
   connect(ctl.yPumHeaWatPriHdr, busPumHeaWatPri.y);
   connect(ctl.yPumHeaWatSec, busPumHeaWatSec.y);
+  connect(ctl.y1Hrc, busHrc.y1);
+  connect(ctl.y1CooHrc, busHrc.y1Coo);
+  connect(ctl.TSupSetHrc, busHrc.TSupSet);
+  connect(ctl.y1PumChiWatHrc, busPumChiWatHrc.y1);
+  connect(ctl.y1PumHeaWatHrc, busPumHeaWatHrc.y1);
   /* Control point connection - stop */
   connect(busAirHan.reqResChiWat, reqResChiWatAirHan.u) annotation (Line(
       points={{260,140},{240,140},{240,80},{212,80}},
@@ -266,17 +304,24 @@ equation
   connect(phReqResChiWatEquZon.y, reqResChiWat.u2) annotation (Line(points={{148,
           -200},{134,-200},{134,68},{112,68}}, color={255,127,0}));
   connect(reqPlaHeaWat.y, ctl.nReqPlaHeaWat) annotation (Line(points={{88,194},
-          {-40,194},{-40,22.3529},{-22,22.3529}},
-                                       color={255,127,0}));
+          {-40,194},{-40,18},{-22,18}},color={255,127,0}));
   connect(reqPlaChiWat.y, ctl.nReqPlaChiWat) annotation (Line(points={{88,154},
-          {-38,154},{-38,20.5882},{-22,20.5882}},
-                                       color={255,127,0}));
+          {-38,154},{-38,16},{-22,16}},color={255,127,0}));
   connect(reqResHeaWat.y,ctl.nReqResHeaWat)  annotation (Line(points={{88,114},
-          {-36,114},{-36,18.8235},{-22,18.8235}},
-                                       color={255,127,0}));
+          {-36,114},{-36,14},{-22,14}},color={255,127,0}));
   connect(reqResChiWat.y,ctl.nReqResChiWat)  annotation (Line(points={{88,74},{
-          -34,74},{-34,17.0588},{-22,17.0588}},
+          -34,74},{-34,12},{-22,12}},
                                   color={255,127,0}));
+  connect(resDpHeaWatLoc.dpLocSet, ctl.dpHeaWatLocSet) annotation (Line(points={
+          {-48.2,0},{-40,0},{-40,-22},{-22,-22}}, color={0,0,127}));
+  connect(resDpChiWatLoc.dpLocSet, ctl.dpChiWatLocSet) annotation (Line(points={
+          {-48.2,-40},{-40,-40},{-40,-28},{-22,-28}}, color={0,0,127}));
+  connect(ctl.dpChiWatRemSet, resDpChiWatLoc.dpRemSet) annotation (Line(points={
+          {22,-12},{40,-12},{40,-60},{-80,-60},{-80,-34},{-72,-34}}, color={0,0,
+          127}));
+  connect(ctl.dpHeaWatRemSet, resDpHeaWatLoc.dpRemSet) annotation (Line(points={
+          {22,-10},{34,-10},{34,-10},{42,-10},{42,-62},{-82,-62},{-82,6},{-72,6}},
+        color={0,0,127}));
   annotation (
     defaultComponentName="ctl", Documentation(info="<html>
 <p>
diff --git a/Buildings/Templates/Plants/HeatPumps/Components/Data/Controller.mo b/Buildings/Templates/Plants/HeatPumps/Components/Data/Controller.mo
index 582616e6f93..c263034ab14 100644
--- a/Buildings/Templates/Plants/HeatPumps/Components/Data/Controller.mo
+++ b/Buildings/Templates/Plants/HeatPumps/Components/Data/Controller.mo
@@ -30,21 +30,36 @@ record Controller
       enable=cfg.have_heaWat and cfg.typCtl==Buildings.Templates.Plants.HeatPumps.Types.Controller.AirToWater));
   parameter Modelica.Units.SI.VolumeFlowRate VHeaWatHp_flow_nominal(
     start=0.1,
-    displayUnit="l/s",
     final min=0)
-    "Design HW volume flow rate - Each heat pump"
+    "Design heat pump HW volume flow rate - Each heat pump"
     annotation (Evaluate=true,
     Dialog(group="Heat pump flow setpoints",
       enable=cfg.have_heaWat and cfg.typCtl==Buildings.Templates.Plants.HeatPumps.Types.Controller.AirToWater));
+  parameter Modelica.Units.SI.VolumeFlowRate VHeaWatHp_flow_min(
+    start=VHeaWatHp_flow_nominal,
+    final min=0)=1.1*VHeaWatHp_flow_nominal
+    "Minimum heat pump HW volume flow rate - Each heat pump"
+    annotation (Evaluate=true,
+    Dialog(group="Heat pump flow setpoints",
+      enable=cfg.have_heaWat and cfg.typCtl==Buildings.Templates.Plants.HeatPumps.Types.Controller.AirToWater
+      and cfg.typDis==Buildings.Templates.Plants.HeatPumps.Types.Distribution.Variable1Only));
   parameter Modelica.Units.SI.HeatFlowRate capHeaHp_nominal(
     start=1,
     final min=0)
-    "Design heating capacity - Each heat pump"
+    "Design heat pump heating capacity - Each heat pump"
     annotation (Dialog(group="Capacity",
       enable=cfg.have_heaWat and cfg.typCtl==Buildings.Templates.Plants.HeatPumps.Types.Controller.AirToWater));
+  parameter Modelica.Units.SI.VolumeFlowRate VHeaWatPri_flow_nominal(
+    start=VHeaWatHp_flow_nominal*cfg.nHp,
+    final min=0)=VHeaWatHp_flow_nominal*cfg.nHp
+    "Design primary HW volume flow rate"
+    annotation (Evaluate=true,
+    Dialog(group="Capacity",
+      enable=cfg.have_heaWat and cfg.typCtl==Buildings.Templates.Plants.HeatPumps.Types.Controller.AirToWater
+      and cfg.typDis==Buildings.Templates.Plants.HeatPumps.Types.Distribution.Variable1Only
+      and cfg.typArrPumPri==Buildings.Templates.Components.Types.PumpArrangement.Headered));
   parameter Modelica.Units.SI.VolumeFlowRate VHeaWatSec_flow_nominal(
     start=0.01,
-    displayUnit="l/s",
     final min=0)
     "Design secondary HW volume flow rate"
     annotation (Evaluate=true,
@@ -57,9 +72,7 @@ record Controller
     "Minimum value to which the HW differential pressure can be reset - Remote sensor"
     annotation (Dialog(group=
       "Information provided by designer",
-      enable=cfg.have_heaWat and cfg.typCtl==Buildings.Templates.Plants.HeatPumps.Types.Controller.AirToWater
-        and (cfg.typDis==Buildings.Templates.Plants.HeatPumps.Types.Distribution.Variable1Only
-        or cfg.typPumHeaWatSec<>Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.None)));
+      enable=cfg.have_heaWat and cfg.typCtl==Buildings.Templates.Plants.HeatPumps.Types.Controller.AirToWater));
   // HACK(AntoineGautier):
   // Using cfg.nSenDpHeaWatRem for size(dpHeaWatRemSet_max, 1) is not supported by Dymola which fails to "evaluate and check the size declaration".
   // So the size is kept unassigned.
@@ -68,13 +81,29 @@ record Controller
     start=fill(Buildings.Templates.Data.Defaults.dpHeaWatRemSet_max, cfg.nSenDpHeaWatRem),
     final min=fill(0, cfg.nSenDpHeaWatRem))
     "Maximum HW differential pressure setpoint - Remote sensor"
+    annotation (Dialog(group=
+      "Information provided by testing, adjusting, and balancing contractor",
+      enable=cfg.have_heaWat and cfg.typCtl==Buildings.Templates.Plants.HeatPumps.Types.Controller.AirToWater));
+  parameter Real dpHeaWatLocSet_min(
+    start=0,
+    final unit="Pa",
+    final min=0)=5 * 6895
+    "Minimum HW loop differential pressure setpoint local to the plant"
     annotation (Dialog(group=
       "Information provided by testing, adjusting, and balancing contractor",
       enable=cfg.have_heaWat and cfg.typCtl==Buildings.Templates.Plants.HeatPumps.Types.Controller.AirToWater
-        and (cfg.typDis==Buildings.Templates.Plants.HeatPumps.Types.Distribution.Variable1Only
-        or cfg.typPumHeaWatSec<>Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.None)));
+        and not cfg.have_senDpHeaWatRemWir));
+  parameter Real dpHeaWatLocSet_max(
+    start=1E5,
+    final unit="Pa",
+    final min=0)
+    "Maximum HW loop differential pressure setpoint local to the plant"
+    annotation (Dialog(group=
+      "Information provided by testing, adjusting, and balancing contractor",
+      enable=cfg.have_heaWat and cfg.typCtl==Buildings.Templates.Plants.HeatPumps.Types.Controller.AirToWater
+        and not cfg.have_senDpHeaWatRemWir));
   parameter Real yPumHeaWatPriSet(
-    final max=1,
+    final max=2,
     final min=0,
     start=1,
     final unit="1")
@@ -82,7 +111,19 @@ record Controller
     annotation (Dialog(group=
       "Information provided by testing, adjusting, and balancing contractor",
       enable=cfg.typCtl==Buildings.Templates.Plants.HeatPumps.Types.Controller.AirToWater and
-      cfg.have_heaWat and cfg.have_pumHeaWatPriVar));
+      cfg.have_heaWat and cfg.typDis==Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Variable2
+      and cfg.have_pumHeaWatPriVar));
+  parameter Real yPumHeaWatPri_min(
+    final max=1,
+    final min=0,
+    start=0.1,
+    final unit="1")=0.1
+    "Primary HW pump minimum speed"
+    annotation (Dialog(group=
+      "Information provided by testing, adjusting, and balancing contractor",
+      enable=cfg.have_heaWat and cfg.typCtl==Buildings.Templates.Plants.HeatPumps.Types.Controller.AirToWater
+      and cfg.typPumHeaWatPri==Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Variable
+      and cfg.typDis==Buildings.Templates.Plants.HeatPumps.Types.Distribution.Variable1Only));
   parameter Real yPumHeaWatSec_min(
     final unit="1",
     final min=0,
@@ -115,21 +156,36 @@ record Controller
       enable=cfg.have_chiWat and cfg.typCtl==Buildings.Templates.Plants.HeatPumps.Types.Controller.AirToWater));
   parameter Modelica.Units.SI.VolumeFlowRate VChiWatHp_flow_nominal(
     start=0.1,
-    displayUnit="l/s",
     final min=0)
-    "Design CHW volume flow rate - Each heat pump"
+    "Design heat pump CHW volume flow rate - Each heat pump"
     annotation (Evaluate=true,
     Dialog(group="Heat pump flow setpoints",
       enable=cfg.have_chiWat and cfg.typCtl==Buildings.Templates.Plants.HeatPumps.Types.Controller.AirToWater));
+  parameter Modelica.Units.SI.VolumeFlowRate VChiWatHp_flow_min(
+    start=VChiWatHp_flow_nominal,
+    final min=0)=1.1*VChiWatHp_flow_nominal
+    "Minimum heat pump CHW volume flow rate - Each heat pump"
+    annotation (Evaluate=true,
+    Dialog(group="Heat pump flow setpoints",
+      enable=cfg.have_chiWat and cfg.typCtl==Buildings.Templates.Plants.HeatPumps.Types.Controller.AirToWater
+      and cfg.typDis==Buildings.Templates.Plants.HeatPumps.Types.Distribution.Variable1Only));
   parameter Modelica.Units.SI.HeatFlowRate capCooHp_nominal(
     start=1,
     final min=0)
-    "Design cooling capacity - Each heat pump"
+    "Design heat pump cooling capacity - Each heat pump"
     annotation (Dialog(group="Capacity",
       enable=cfg.have_chiWat and cfg.typCtl==Buildings.Templates.Plants.HeatPumps.Types.Controller.AirToWater));
+  parameter Modelica.Units.SI.VolumeFlowRate VChiWatPri_flow_nominal(
+    start=VChiWatHp_flow_nominal*cfg.nHp,
+    final min=0)=VChiWatHp_flow_nominal*cfg.nHp
+    "Design primary CHW volume flow rate"
+    annotation (Evaluate=true,
+    Dialog(group="Capacity",
+      enable=cfg.have_chiWat and cfg.typCtl==Buildings.Templates.Plants.HeatPumps.Types.Controller.AirToWater
+      and cfg.typDis==Buildings.Templates.Plants.HeatPumps.Types.Distribution.Variable1Only
+      and cfg.typArrPumPri==Buildings.Templates.Components.Types.PumpArrangement.Headered));
   parameter Modelica.Units.SI.VolumeFlowRate VChiWatSec_flow_nominal(
     start=0.01,
-    displayUnit="l/s",
     final min=0)
     "Design secondary CHW volume flow rate"
     annotation (Evaluate=true,
@@ -158,8 +214,26 @@ record Controller
       enable=cfg.have_chiWat and cfg.typCtl==Buildings.Templates.Plants.HeatPumps.Types.Controller.AirToWater
         and (cfg.typDis==Buildings.Templates.Plants.HeatPumps.Types.Distribution.Variable1Only
         or cfg.typPumChiWatSec<>Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.None)));
+  parameter Real dpChiWatLocSet_min(
+    start=0,
+    final unit="Pa",
+    final min=0)=5 * 6895
+    "Minimum CHW loop differential pressure setpoint local to the plant"
+    annotation (Dialog(group=
+      "Information provided by testing, adjusting, and balancing contractor",
+      enable=cfg.have_chiWat and cfg.typCtl==Buildings.Templates.Plants.HeatPumps.Types.Controller.AirToWater
+        and not cfg.have_senDpChiWatRemWir));
+  parameter Real dpChiWatLocSet_max(
+    start=1E5,
+    final unit="Pa",
+    final min=0)
+    "Maximum CHW loop differential pressure setpoint local to the plant"
+    annotation (Dialog(group=
+      "Information provided by testing, adjusting, and balancing contractor",
+      enable=cfg.have_chiWat and cfg.typCtl==Buildings.Templates.Plants.HeatPumps.Types.Controller.AirToWater
+        and not cfg.have_senDpChiWatRemWir));
   parameter Real yPumChiWatPriSet(
-    final max=1,
+    final max=2,
     final min=0,
     start=1,
     final unit="1")
@@ -168,6 +242,17 @@ record Controller
       "Information provided by testing, adjusting, and balancing contractor",
       enable=cfg.have_chiWat and cfg.typCtl==Buildings.Templates.Plants.HeatPumps.Types.Controller.AirToWater
       and cfg.have_pumChiWatPriVar));
+  parameter Real yPumChiWatPri_min(
+    final max=1,
+    final min=0,
+    start=0.1,
+    final unit="1")=0.1
+    "Primary CHW pump minimum speed"
+    annotation (Dialog(group=
+      "Information provided by testing, adjusting, and balancing contractor",
+      enable=cfg.have_chiWat and cfg.typCtl==Buildings.Templates.Plants.HeatPumps.Types.Controller.AirToWater
+      and cfg.typPumChiWatPri==Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Variable
+      and cfg.typDis==Buildings.Templates.Plants.HeatPumps.Types.Distribution.Variable1Only));
   parameter Real yPumChiWatSec_min(
     final unit="1",
     final min=0,
@@ -215,6 +300,38 @@ record Controller
     "Staging part load ratio"
     annotation (Dialog(group="Equipment staging and rotation",
     enable=cfg.typCtl==Buildings.Templates.Plants.HeatPumps.Types.Controller.AirToWater));
+  parameter Real TChiWatSupHrc_min(
+    final min=273.15,
+    start=4 + 273.15,
+    final unit="K",
+    displayUnit="degC")
+    "Sidestream HRC – Minimum allowable CHW supply temperature"
+    annotation (Dialog(group="Information provided by designer", enable=cfg.have_hrc));
+  parameter Real THeaWatSupHrc_max(
+    final min=273.15,
+    start=60 + 273.15,
+    final unit="K",
+    displayUnit="degC")
+    "Sidestream HRC – Maximum allowable HW supply temperature"
+    annotation (Dialog(group="Information provided by designer", enable=cfg.have_hrc));
+  parameter Real COPHeaHrc_nominal(
+    final min=1.1,
+    final unit="1",
+    start=2.8)
+    "Sidestream HRC – Heating COP at design heating conditions"
+    annotation (Dialog(group="Information provided by designer", enable=cfg.have_hrc));
+  parameter Real capCooHrc_min(
+    start=0,
+    final min=0,
+    final unit="W")
+    "Sidestream HRC – Minimum cooling capacity below which cycling occurs"
+    annotation (Dialog(group="Information provided by designer", enable=cfg.have_hrc));
+  parameter Real capHeaHrc_min(
+    start=0,
+    final min=0,
+    final unit="W")
+    "Sidestream HRC – Minimum heating capacity below which cycling occurs"
+    annotation (Dialog(group="Information provided by designer", enable=cfg.have_hrc));
   annotation (
     defaultComponentName="datCtl",
     Documentation(
diff --git a/Buildings/Templates/Plants/HeatPumps/Components/HeatPumpGroups/AirToWater.mo b/Buildings/Templates/Plants/HeatPumps/Components/HeatPumpGroups/AirToWater.mo
index 533afb57ce9..70dcff13a74 100644
--- a/Buildings/Templates/Plants/HeatPumps/Components/HeatPumpGroups/AirToWater.mo
+++ b/Buildings/Templates/Plants/HeatPumps/Components/HeatPumpGroups/AirToWater.mo
@@ -6,15 +6,15 @@ model AirToWater
     final typ=Buildings.Templates.Components.Types.HeatPump.AirToWater,
     final typMod=Buildings.Templates.Components.Types.HeatPumpModel.EquationFit);
   Buildings.Templates.Components.HeatPumps.AirToWater hp[nHp](
-    redeclare each final package MediumHeaWat=MediumHeaWat,
-    redeclare each final package MediumAir=MediumAir,
+    each final show_T=show_T,
+    redeclare each final package MediumHeaWat = MediumHeaWat,
+    redeclare each final package MediumAir = MediumAir,
     each final is_rev=is_rev,
     final dat=datHp,
     each final allowFlowReversal=allowFlowReversal,
     each final energyDynamics=energyDynamics,
-    each final have_preDroChiHeaWat=have_preDroChiHeaWat,
-    each final have_preDroSou=have_preDroSou)
-    "Heat pump unit"
+    each final have_dpChiHeaWat=have_dpChiHeaWatHp,
+    each final have_dpSou=have_dpSou) "Heat pump unit"
     annotation (Placement(transformation(extent={{10,-10},{-10,10}})));
 equation
   for i in 1:nHp loop
diff --git a/Buildings/Templates/Plants/HeatPumps/Components/HeatRecoveryChiller.mo b/Buildings/Templates/Plants/HeatPumps/Components/HeatRecoveryChiller.mo
new file mode 100644
index 00000000000..c924809e263
--- /dev/null
+++ b/Buildings/Templates/Plants/HeatPumps/Components/HeatRecoveryChiller.mo
@@ -0,0 +1,213 @@
+within Buildings.Templates.Plants.HeatPumps.Components;
+model HeatRecoveryChiller
+  "Heat recovery chiller for sidestream integration"
+  extends Buildings.Fluid.Interfaces.PartialFourPortInterface(
+    redeclare final package Medium1=MediumHeaWat,
+    redeclare final package Medium2=MediumChiWat,
+    final m1_flow_nominal=datHrc.mCon_flow_nominal,
+    final m2_flow_nominal=datHrc.mChiWat_flow_nominal)
+    annotation (IconMap(extent={{-600,600},{600,-600}}));
+  /* RFE(AntoineGautier): IconMap is used above until the following PR is completed:
+  https://github.com/ibpsa/modelica-ibpsa/issues/1781
+  Note that the extent annotation results in flipping the icon vertically (port_*2 at the top),
+  which allows better integration into the HP plant diagram.
+  Ideally, with PR#1781, port_a1 and port_b1 should be moved to be vertically
+  aligned with port_a2 and port_b2, respectively.
+  */replaceable package MediumChiWat=Buildings.Media.Water
+    constrainedby Modelica.Media.Interfaces.PartialMedium
+    "CHW medium"
+    annotation (__Linkage(enable=false));
+  replaceable package MediumHeaWat=Buildings.Media.Water
+    constrainedby Modelica.Media.Interfaces.PartialMedium
+    "HW medium"
+    annotation (__Linkage(enable=false));
+  parameter Buildings.Templates.Components.Data.PumpSingle datPumChiWat
+    "HRC CHW pump parameters"
+    annotation (Placement(transformation(extent={{60,20},{80,40}})));
+  parameter Buildings.Templates.Components.Data.PumpSingle datPumHeaWat
+    "HRC HW pump parameters"
+    annotation (Placement(transformation(extent={{60,-8},{80,12}})));
+  parameter Buildings.Templates.Components.Data.Chiller datHrc
+    "HRC parameters"
+    annotation (Placement(transformation(extent={{60,-40},{80,-20}})));
+  parameter Modelica.Units.SI.Time tauHrc=30
+    "HRC – Time constant at nominal flow, used if energy or mass balance is dynamic"
+    annotation (Dialog(tab="Dynamics",group="Nominal condition",
+      enable=energyDynamics<>Modelica.Fluid.Types.Dynamics.SteadyState),
+    __ctrlFlow(enable=false));
+  parameter Modelica.Units.SI.Time tauPum=1
+    "Pump – Time constant of fluid volume for nominal flow, used if energy or mass balance is dynamic"
+    annotation (Dialog(tab="Dynamics",group="Nominal condition",
+      enable=energyDynamics<>Modelica.Fluid.Types.Dynamics.SteadyState),
+    __ctrlFlow(enable=false));
+  parameter Modelica.Fluid.Types.Dynamics energyDynamics=Modelica.Fluid.Types.Dynamics.DynamicFreeInitial
+    "Type of energy balance: dynamic (3 initialization options) or steady state"
+    annotation (Evaluate=true,
+    Dialog(tab="Dynamics",group="Conservation equations"),
+    __ctrlFlow(enable=false));
+  Buildings.Templates.Plants.HeatPumps.Interfaces.Bus bus
+    "Plant control bus"
+    annotation (Placement(transformation(extent={{-20,80},{20,120}}),
+      iconTransformation(extent={{-20,200},{20,240}})));
+  Buildings.Templates.Components.Chillers.Compression hrc(
+    redeclare final package MediumChiWat=MediumChiWat,
+    redeclare final package MediumCon=MediumHeaWat,
+    final dat=datHrc,
+    final typ=Buildings.Templates.Components.Types.Chiller.WaterCooled,
+    final have_switchover=true,
+    final energyDynamics=energyDynamics,
+    final tau=tauHrc,
+    final allowFlowReversal1=allowFlowReversal1,
+    final allowFlowReversal2=allowFlowReversal2,
+    final show_T=show_T)
+    "Heat recovery chiller"
+    annotation (Placement(transformation(extent={{-10,-4},{10,16}})));
+  Buildings.Templates.Components.Pumps.Single pumChiWat(
+    have_var=false,
+    have_valChe=false,
+    redeclare final package Medium=MediumChiWat,
+    final dat=datPumChiWat,
+    final energyDynamics=energyDynamics,
+    final tau=tauPum,
+    final allowFlowReversal=allowFlowReversal2,
+    final show_T=show_T)
+    "HRC CHW pump"
+    annotation (Placement(transformation(extent={{50,-70},{30,-50}})));
+  Buildings.Templates.Components.Pumps.Single pumHeaWat(
+    have_var=false,
+    have_valChe=false,
+    redeclare final package Medium=MediumHeaWat,
+    final dat=datPumHeaWat,
+    final energyDynamics=energyDynamics,
+    final tau=tauPum,
+    final allowFlowReversal=allowFlowReversal1,
+    final show_T=show_T)
+    "HRC HW pump"
+    annotation (Placement(transformation(extent={{-70,50},{-50,70}})));
+equation
+  connect(port_a1, pumHeaWat.port_a)
+    annotation (Line(points={{-100,60},{-70,60}},color={0,127,255}));
+  connect(port_a2, pumChiWat.port_a)
+    annotation (Line(points={{100,-60},{50,-60}},color={0,127,255}));
+  connect(pumChiWat.port_b, hrc.port_a2)
+    annotation (Line(points={{30,-60},{10,-60},{10,0}},color={0,127,255}));
+  connect(hrc.port_b2, port_b2)
+    annotation (Line(points={{-10,0},{-10,-60},{-100,-60}},color={0,127,255}));
+  connect(pumHeaWat.port_b, hrc.port_a1)
+    annotation (Line(points={{-50,60},{-10,60},{-10,12}},color={0,127,255}));
+  connect(hrc.port_b1, port_b1)
+    annotation (Line(points={{10,12},{10,60},{100,60}},color={0,127,255}));
+  connect(bus.hrc, hrc.bus)
+    annotation (Line(points={{0,100},{0,100},{0,16}},color={255,204,51},thickness=0.5),
+      Text(string="%first",index=-1,extent={{-3,6},{-3,6}},horizontalAlignment=TextAlignment.Right));
+  connect(bus.pumHeaWatHrc, pumHeaWat.bus)
+    annotation (Line(points={{0,100},{0,70},{-60,70}},color={255,204,51},thickness=0.5));
+  connect(bus.pumChiWatHrc, pumChiWat.bus)
+    annotation (Line(points={{0,100},{0,70},{40,70},{40,-50}},color={255,204,51},thickness=0.5));
+  annotation (
+    defaultComponentName="hrc",
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=false,
+        extent={{-600,-600},{600,600}}),
+      graphics={
+        Line(
+          points={{-600,-362},{-600,-82},{-476,-82},{-420,-62},{-200,-62}},
+          color={0,0,0},
+          thickness=5,
+          pattern=LinePattern.Dash),
+        Line(
+          points={{600,362},{600,42},{476,42},{420,62},{200,62}},
+          color={0,0,0},
+          thickness=5,
+          pattern=LinePattern.Dash),
+        Bitmap(
+          extent={{-60,100},{60,220}},
+          fileName=
+            "modelica://Buildings/Resources/Images/Templates/Components/Boilers/ControllerOnboard.svg"),
+        Text(
+          extent={{-140,-50},{140,50}},
+          textColor={0,0,0},
+          textString="HRC"),
+        Rectangle(
+          extent={{-200,-100},{200,100}},
+          lineColor={0,0,0},
+          lineThickness=1),
+        Line(
+          points={{470,120},{470,82}},
+          color={0,0,0}),
+        Bitmap(
+          extent={{520,-12},{420,88}},
+          fileName=
+            "modelica://Buildings/Resources/Images/Templates/Components/Pumps/Single.svg"),
+        Bitmap(
+          extent={{340,20},{260,100}},
+          fileName=
+            "modelica://Buildings/Resources/Images/Templates/Components/Valves/Check.svg",
+          visible=pumChiWat.have_valChe),
+        Bitmap(
+          extent={{-520,-132},{-420,-32}},
+          fileName=
+            "modelica://Buildings/Resources/Images/Templates/Components/Pumps/Single.svg"),
+        Bitmap(
+          extent={{-340,-100},{-260,-20}},
+          fileName=
+            "modelica://Buildings/Resources/Images/Templates/Components/Valves/Check.svg",
+          visible=pumHeaWat.have_valChe),
+        Bitmap(
+          extent={{420,120},{520,220}},
+          fileName=
+            "modelica://Buildings/Resources/Images/Templates/Components/Actuators/MotorStarter.svg"),
+        Line(
+          points={{-600,360},{-600,60},{-200,60}},
+          color={0,0,0},
+          thickness=5),
+        Line(
+          points={{600,-360},{600,-60},{200,-60}},
+          color={0,0,0},
+          thickness=5),
+        Bitmap(
+          extent={{-520,-260},{-420,-160}},
+          fileName=
+            "modelica://Buildings/Resources/Images/Templates/Components/Actuators/MotorStarter.svg"),
+        Line(
+          points={{-470,-124},{-470,-160}},
+          color={0,0,0})}),
+    Diagram(
+      coordinateSystem(
+        preserveAspectRatio=false)),
+    Documentation(
+      info="<html>
+<p>
+Model of a heat recovery chiller with constant speed CHW and HW pumps.
+The model is intended to represent the sidestream integration of a HRC
+into a heating and cooling plant.
+In such a configuration, the condenser is connected to the HW
+return and the evaporator is connected to the CHW return.
+</p>
+<h4>Control points</h4>
+<p>
+The following input and output points are available.
+</p>
+<ul>
+<li>Chiller: Refer to the documentation of
+<a href=\"modelica://Buildings.Templates.Components.Chillers.Compression\">
+Buildings.Templates.Components.Chillers.Compression</a>
+considering <code>have_switchover=true</code> and
+<code>typ=Buildings.Templates.Components.Types.Chiller.WaterCooled</code>.
+</li>
+<li>CHW pump or HW pump: Refer to the documentation of
+<a href=\"modelica://Buildings.Templates.Components.Pumps.Single\">
+Buildings.Templates.Components.Pumps.Single</a>.
+</li>
+</ul>
+</html>",
+      revisions="<html>
+<ul>
+<li>
+May 31, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end HeatRecoveryChiller;
diff --git a/Buildings/Templates/Plants/HeatPumps/Components/Interfaces/PartialController.mo b/Buildings/Templates/Plants/HeatPumps/Components/Interfaces/PartialController.mo
index aacd12b97cb..7b7d3660027 100644
--- a/Buildings/Templates/Plants/HeatPumps/Components/Interfaces/PartialController.mo
+++ b/Buildings/Templates/Plants/HeatPumps/Components/Interfaces/PartialController.mo
@@ -45,14 +45,17 @@ block PartialController "Interface for heat pump plant controller"
     annotation (Evaluate=true,
     Dialog(group="Configuration",
       enable=typ<>Buildings.Templates.Plants.HeatPumps.Types.Controller.OpenLoop));
-  parameter Boolean have_senVHeaWatPri_select(start=false)
+  parameter Boolean have_senVHeaWatPri_select(start=false)=false
     "Set to true for plants with primary HW flow sensor"
     annotation (Evaluate=true,
     Dialog(group="Configuration",
       enable=typ<>Buildings.Templates.Plants.HeatPumps.Types.Controller.OpenLoop and
-      cfg.have_heaWat and not cfg.have_hrc and have_senVHeaWatSec));
+      cfg.have_heaWat and not cfg.have_hrc and have_senVHeaWatSec
+      and cfg.typDis<>Buildings.Templates.Plants.HeatPumps.Types.Distribution.Variable1Only));
   final parameter Boolean have_senVHeaWatPri=cfg.have_heaWat and
-    (if cfg.have_hrc or not have_senVHeaWatSec then true else have_senVHeaWatPri_select)
+    (if cfg.have_hrc or not have_senVHeaWatSec
+    or cfg.typDis==Buildings.Templates.Plants.HeatPumps.Types.Distribution.Variable1Only
+    then true else have_senVHeaWatPri_select)
     "Set to true for plants with primary HW flow sensor"
     annotation (Evaluate=true, Dialog(group="Configuration"));
   // Secondary flow sensor required for secondary HW pump staging.
@@ -60,15 +63,17 @@ block PartialController "Interface for heat pump plant controller"
     cfg.typPumHeaWatSec<>Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.None
     "Set to true for plants with secondary HW flow sensor"
     annotation (Evaluate=true, Dialog(group="Configuration"));
-  parameter Boolean have_senVChiWatPri_select(start=false)
+  parameter Boolean have_senVChiWatPri_select(start=false)=have_senVHeaWatPri_select
     "Set to true for plants with primary CHW flow sensor"
     annotation (Evaluate=true,
     Dialog(group="Configuration",
       enable=typ<>Buildings.Templates.Plants.HeatPumps.Types.Controller.OpenLoop and
-      cfg.have_chiWat and not cfg.have_hrc and have_senVChiWatSec));
+      cfg.have_chiWat and not cfg.have_hrc and have_senVChiWatSec
+      and cfg.typDis<>Buildings.Templates.Plants.HeatPumps.Types.Distribution.Variable1Only));
   final parameter Boolean have_senVChiWatPri=cfg.have_chiWat and
-    (if cfg.have_hrc or not have_senVChiWatSec then true
-    else have_senVChiWatPri_select)
+    (if cfg.have_hrc or not have_senVChiWatSec
+     or cfg.typDis<>Buildings.Templates.Plants.HeatPumps.Types.Distribution.Variable1Only
+     then true else have_senVChiWatPri_select)
     "Set to true for plants with primary CHW flow sensor"
     annotation (Evaluate=true, Dialog(group="Configuration"));
   // Secondary flow sensor required for secondary CHW pump staging.
@@ -76,7 +81,7 @@ block PartialController "Interface for heat pump plant controller"
     cfg.typPumChiWatSec<>Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.None
     "Set to true for plants with secondary CHW flow sensor"
     annotation (Evaluate=true, Dialog(group="Configuration"));
-  parameter Boolean have_senTHeaWatPriRet_select(start=false)
+  parameter Boolean have_senTHeaWatPriRet_select(start=false)=false
     "Set to true for plants with primary HW return temperature sensor"
     annotation (Evaluate=true,
     Dialog(group="Configuration",
@@ -86,7 +91,7 @@ block PartialController "Interface for heat pump plant controller"
     (if cfg.have_hrc or not have_senTHeaWatSecRet then true else have_senTHeaWatPriRet_select)
     "Set to true for plants with primary HW return temperature sensor"
     annotation (Evaluate=true, Dialog(group="Configuration"));
-  parameter Boolean have_senTChiWatPriRet_select(start=false)
+  parameter Boolean have_senTChiWatPriRet_select(start=false)=have_senTHeaWatPriRet_select
     "Set to true for plants with primary CHW return temperature sensor"
     annotation (Evaluate=true,
     Dialog(group="Configuration",
@@ -106,16 +111,34 @@ block PartialController "Interface for heat pump plant controller"
     cfg.typPumChiWatSec<>Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.None
     "Set to true for plants with secondary CHW supply temperature sensor"
     annotation (Evaluate=true, Dialog(group="Configuration"));
-  parameter Boolean have_senTHeaWatSecRet(start=false)
+
+  // Following return temperature sensors are:
+  // - optional for primary-secondary plants without HRC,
+  // - required for plants with HRC: downstream of HRC.
+  parameter Boolean have_senTHeaWatSecRet_select(start=false)=false
     "Set to true for plants with secondary HW return temperature sensor"
-    annotation (Evaluate=true, Dialog(group="Configuration",
-    enable=typ<>Buildings.Templates.Plants.HeatPumps.Types.Controller.OpenLoop and
-    cfg.typPumHeaWatSec<>Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.None));
-  parameter Boolean have_senTChiWatSecRet(start=false)
+    annotation (Evaluate=true, Dialog(group="Sensors",
+      enable=typ<>Buildings.Templates.Plants.HeatPumps.Types.Controller.OpenLoop and
+    cfg.typPumHeaWatSec<>Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.None
+    and not cfg.have_hrc));
+  parameter Boolean have_senTChiWatSecRet_select(start=false)=have_senTHeaWatSecRet_select
     "Set to true for plants with secondary CHW return temperature sensor"
-    annotation (Evaluate=true, Dialog(group="Configuration",
+    annotation (Evaluate=true, Dialog(group="Sensors",
     enable=typ<>Buildings.Templates.Plants.HeatPumps.Types.Controller.OpenLoop and
-    cfg.typPumChiWatSec<>Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.None));
+    cfg.typPumChiWatSec<>Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.None
+    and not cfg.have_hrc));
+  final parameter Boolean have_senTHeaWatSecRet=
+    if cfg.have_hrc then true
+    elseif cfg.typPumHeaWatSec==Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.None then false
+    else have_senTHeaWatSecRet_select
+    "Set to true for plants with secondary HW return temperature sensor"
+    annotation (Evaluate=true);
+  final parameter Boolean have_senTChiWatSecRet(start=false)=
+    if cfg.have_hrc then true
+    elseif cfg.typPumChiWatSec==Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.None then false
+    else have_senTChiWatSecRet_select
+    "Set to true for plants with secondary CHW return temperature sensor"
+    annotation (Evaluate=true);
   parameter Boolean have_senDpHeaWatRemWir=false
     "Set to true for remote HW differential pressure sensor(s) hardwired to plant or pump controller"
     annotation (Evaluate=true,
@@ -180,43 +203,62 @@ protected
   Buildings.Templates.Components.Interfaces.Bus busPumHeaWatPri
     if cfg.typPumHeaWatPri<>Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.None
     "Primary HW pump control bus"
-    annotation (Placement(transformation(extent={{-260,160},{-220,200}}),
+    annotation (Placement(transformation(extent={{-260,60},{-220,100}}),
       iconTransformation(extent={{-466,50},{-426,90}})));
-  Buildings.Templates.Components.Interfaces.Bus busPumHeaWatSec
-    if cfg.typPumHeaWatSec == Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.Centralized
+  Buildings.Templates.Components.Interfaces.Bus busPumHeaWatSec if cfg.typPumHeaWatSec
+     == Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.Centralized
     "Secondary HW pump control bus"
-    annotation (Placement(transformation(extent={{-260,120},{-220,160}}),
+    annotation (Placement(transformation(extent={{-260,20},{-220,60}}),
       iconTransformation(extent={{-466,50},{-426,90}})));
-  Buildings.Templates.Components.Interfaces.Bus busPumChiWatPri
-    if cfg.typPumChiWatPri<>Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.None
+  Buildings.Templates.Components.Interfaces.Bus busPumChiWatPri if cfg.typPumChiWatPri
+     <> Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.None
     "Primary CHW pump control bus"
-    annotation (Placement(transformation(extent={{-260,-220},{-220,-180}}),
+    annotation (Placement(transformation(extent={{-260,-180},{-220,-140}}),
       iconTransformation(extent={{-466,50},{-426,90}})));
-  Buildings.Templates.Components.Interfaces.Bus busPumChiWatSec
-    if cfg.typPumHeaWatSec == Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.Centralized
+  Buildings.Templates.Components.Interfaces.Bus busPumChiWatSec if cfg.typPumHeaWatSec
+     == Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.Centralized
     "Secondary CHW pump control bus"
-    annotation (Placement(transformation(extent={{-260,-260},{-220,-220}}),
+    annotation (Placement(transformation(extent={{-260,-220},{-220,-180}}),
       iconTransformation(extent={{-466,50},{-426,90}})));
   Buildings.Templates.Components.Interfaces.Bus busValHeaWatHpInlIso[nHp]
     if cfg.have_heaWat and cfg.have_valHpInlIso
     "Heat pump inlet HW isolation valve control bus"
-    annotation (Placement(transformation(extent={{-260,280},{-220,320}}),
+    annotation (Placement(transformation(extent={{-260,180},{-220,220}}),
       iconTransformation(extent={{-466,50},{-426,90}})));
   Buildings.Templates.Components.Interfaces.Bus busValHeaWatHpOutIso[nHp]
     if cfg.have_heaWat and cfg.have_valHpOutIso
     "Heat pump outlet HW isolation valve control bus"
-    annotation (Placement(transformation(extent={{-260,240},{-220,280}}),
+    annotation (Placement(transformation(extent={{-260,140},{-220,180}}),
       iconTransformation(extent={{-466,50},{-426,90}})));
   Buildings.Templates.Components.Interfaces.Bus busValChiWatHpInlIso[nHp]
     if cfg.have_chiWat and cfg.have_valHpInlIso
     "Heat pump inlet CHW isolation valve control bus"
-    annotation (Placement(transformation(extent={{-260,-100},{-220,-60}}),
+    annotation (Placement(transformation(extent={{-260,-60},{-220,-20}}),
       iconTransformation(extent={{-466,50},{-426,90}})));
   Buildings.Templates.Components.Interfaces.Bus busValChiWatHpOutIso[nHp]
     if cfg.have_chiWat and cfg.have_valHpOutIso
     "Heat pump outlet CHW isolation valve control bus"
-    annotation (Placement(transformation(extent={{-260,-140},{-220,-100}}),
+    annotation (Placement(transformation(extent={{-260,-100},{-220,-60}}),
       iconTransformation(extent={{-466,50},{-426,90}})));
+  Buildings.Templates.Components.Interfaces.Bus busPumChiWatHrc if cfg.have_hrc
+    "Sidestream HRC CHW pump control bus" annotation (Placement(transformation(
+          extent={{-260,-340},{-220,-300}}), iconTransformation(extent={{-466,50},
+            {-426,90}})));
+  Buildings.Templates.Components.Interfaces.Bus busPumHeaWatHrc if cfg.have_hrc
+    "Sidestream HRC HW pump control bus" annotation (Placement(transformation(
+          extent={{-260,-380},{-220,-340}}), iconTransformation(extent={{-466,50},
+            {-426,90}})));
+  Buildings.Templates.Components.Interfaces.Bus busHrc if cfg.have_hrc
+    "Sidestream HRC control bus" annotation (Placement(transformation(extent={{-260,
+            -300},{-220,-260}}), iconTransformation(extent={{-466,50},{-426,90}})));
+  Buildings.Templates.Components.Interfaces.Bus busValHeaWatMinByp
+    if cfg.have_valHeaWatMinByp "HW minimum flow bypass valve control bus"
+    annotation (Placement(transformation(extent={{-260,100},{-220,140}}),
+        iconTransformation(extent={{-466,50},{-426,90}})));
+  Buildings.Templates.Components.Interfaces.Bus busValChiWatMinByp
+    if cfg.have_valChiWatMinByp "CHW minimum flow bypass valve control bus"
+    annotation (Placement(transformation(extent={{-260,-140},{-220,-100}}),
+        iconTransformation(extent={{-466,50},{-426,90}})));
 equation
   /* Control point connection - start */
   connect(busPumHeaWatPri, bus.pumHeaWatPri);
@@ -228,8 +270,13 @@ equation
   connect(busValHeaWatHpOutIso, bus.valHeaWatHpOutIso);
   connect(busValChiWatHpInlIso, bus.valChiWatHpInlIso);
   connect(busValChiWatHpOutIso, bus.valChiWatHpOutIso);
+  connect(busValHeaWatMinByp, bus.valHeaWatMinByp);
+  connect(busValChiWatMinByp, bus.valChiWatMinByp);
+  connect(busHrc, bus.hrc);
+  connect(busPumChiWatHrc, bus.pumChiWatHrc);
+  connect(busPumHeaWatHrc, bus.pumHeaWatHrc);
   /* Control point connection - stop */
-                                       annotation (
+annotation (
     Icon(
       coordinateSystem(
         preserveAspectRatio=false),
diff --git a/Buildings/Templates/Plants/HeatPumps/Components/Interfaces/PartialHeatPumpGroup.mo b/Buildings/Templates/Plants/HeatPumps/Components/Interfaces/PartialHeatPumpGroup.mo
index a1bd7818c69..556187326a5 100644
--- a/Buildings/Templates/Plants/HeatPumps/Components/Interfaces/PartialHeatPumpGroup.mo
+++ b/Buildings/Templates/Plants/HeatPumps/Components/Interfaces/PartialHeatPumpGroup.mo
@@ -125,11 +125,11 @@ model PartialHeatPumpGroup "Interface for heat pump group"
     annotation (Dialog(tab="Assumptions",
       enable=Buildings.Templates.Components.Types.HeatPump.WaterToWater),
     Evaluate=true);
-  parameter Boolean have_preDroChiHeaWat=true
-    "Set to true for CHW/HW pressure drop computed by this model, false for external computation"
+  parameter Boolean have_dpChiHeaWatHp=true
+    "Set to true for HP CHW/HW pressure drop computed by this model, false for external computation"
     annotation (Evaluate=true,
     Dialog(tab="Assumptions"));
-  parameter Boolean have_preDroSou=true
+  parameter Boolean have_dpSou=true
     "Set to true for source fluid pressure drop computed by this model, false for external computation"
     annotation (Evaluate=true,
     Dialog(tab="Assumptions",
diff --git a/Buildings/Templates/Plants/HeatPumps/Components/PumpsPrimaryDedicated.mo b/Buildings/Templates/Plants/HeatPumps/Components/PumpsPrimaryDedicated.mo
index 5721bb03f62..c45a12e7d69 100644
--- a/Buildings/Templates/Plants/HeatPumps/Components/PumpsPrimaryDedicated.mo
+++ b/Buildings/Templates/Plants/HeatPumps/Components/PumpsPrimaryDedicated.mo
@@ -58,7 +58,7 @@ model PumpsPrimaryDedicated
          then Buildings.Templates.Data.Defaults.dpValChe else 0, nPum))=fill(
     if typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Dedicated
      then Buildings.Templates.Data.Defaults.dpValChe else 0, nPum)
-    "HW pump check valve pressure drop at design HW pump flow rate"
+    "HW pump check valve pressure drop at design pump flow rate (selection conditions)"
     annotation (Dialog(group="Nominal condition",
       enable=typArrPumPri==Buildings.Templates.Components.Types.PumpArrangement.Dedicated));
   parameter Modelica.Units.SI.PressureDifference dpValCheChiWat_nominal[if have_pumChiWatPriDed then nPum else 0](
@@ -67,7 +67,7 @@ model PumpsPrimaryDedicated
          else 0, if have_pumChiWatPriDed then nPum else 0))=fill(if
     have_pumChiWatPriDed then Buildings.Templates.Data.Defaults.dpValChe else 0,
     if have_pumChiWatPriDed then nPum else 0)
-    "CHW pump check valve pressure drop at design CHW pump flow rate"
+    "CHW pump check valve pressure drop at design pump flow rate (selection conditions)"
     annotation (Dialog(group="Nominal condition", enable=have_pumChiWatPriDed));
   parameter Modelica.Fluid.Types.Dynamics energyDynamics=Modelica.Fluid.Types.Dynamics.DynamicFreeInitial
     "Type of energy balance: dynamic (3 initialization options) or steady state"
diff --git a/Buildings/Templates/Plants/HeatPumps/Components/Validation/HeatPumpGroupAirToWater.mo b/Buildings/Templates/Plants/HeatPumps/Components/Validation/HeatPumpGroupAirToWater.mo
index b22dd0e9779..7bef09bc26c 100644
--- a/Buildings/Templates/Plants/HeatPumps/Components/Validation/HeatPumpGroupAirToWater.mo
+++ b/Buildings/Templates/Plants/HeatPumps/Components/Validation/HeatPumpGroupAirToWater.mo
@@ -17,6 +17,8 @@ model HeatPumpGroupAirToWater
       typPumHeaWatPri=Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Variable,
       typPumChiWatPri=Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.None,
       typPumHeaWatSec=Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.None,
+      typTanHeaWat = Buildings.Templates.Components.Types.IntegrationPoint.None,
+      typTanChiWat = Buildings.Templates.Components.Types.IntegrationPoint.None,
       have_pumHeaWatPriVar=true,
       have_pumChiWatPriVar=false,
       typDis=Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Only,
@@ -64,6 +66,8 @@ model HeatPumpGroupAirToWater
       typPumHeaWatPri=Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Variable,
       typPumChiWatPri=Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Variable,
       typPumHeaWatSec=Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.None,
+      typTanHeaWat = Buildings.Templates.Components.Types.IntegrationPoint.None,
+      typTanChiWat = Buildings.Templates.Components.Types.IntegrationPoint.None,
       have_pumHeaWatPriVar=true,
       have_pumChiWatPriVar=true,
       typDis=Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Only,
@@ -170,8 +174,7 @@ model HeatPumpGroupAirToWater
     redeclare final package Medium=Medium,
     use_p_in=true,
     use_T_in=true,
-    nPorts=hpAwNrv.nHp)
-    "Boundary conditions at HP inlet"
+    nPorts=hpAwNrv.nHp) "Boundary conditions at HP inlet"
     annotation (Placement(transformation(extent={{-120,150},{-100,170}})));
   BoundaryConditions.WeatherData.ReaderTMY3 weaDat(
     filNam=Modelica.Utilities.Files.loadResource(
diff --git a/Buildings/Templates/Plants/HeatPumps/Components/Validation/HeatRecoveryChiller.mo b/Buildings/Templates/Plants/HeatPumps/Components/Validation/HeatRecoveryChiller.mo
new file mode 100644
index 00000000000..d2b891535ab
--- /dev/null
+++ b/Buildings/Templates/Plants/HeatPumps/Components/Validation/HeatRecoveryChiller.mo
@@ -0,0 +1,189 @@
+within Buildings.Templates.Plants.HeatPumps.Components.Validation;
+model HeatRecoveryChiller
+  "Validation model for heat recovery chiller"
+  extends Modelica.Icons.Example;
+  replaceable package Medium=Buildings.Media.Water
+    constrainedby Modelica.Media.Interfaces.PartialMedium
+    "CHW/HW medium";
+  parameter Modelica.Fluid.Types.Dynamics energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial
+    "Type of energy balance: dynamic (3 initialization options) or steady state"
+    annotation (Evaluate=true,
+    Dialog(tab="Dynamics",group="Conservation equations"));
+  parameter Buildings.Templates.Components.Data.Chiller datHrc(
+    final typ=Buildings.Templates.Components.Types.Chiller.WaterCooled,
+    redeclare Buildings.Fluid.Chillers.Data.ElectricReformulatedEIR.ReformEIRChiller_Trane_CGWD_207kW_3_99COP_None per,
+    cap_nominal=500E3,
+    COP_nominal=3.8,
+    dpChiWat_nominal=Buildings.Templates.Data.Defaults.dpChiWatChi,
+    dpCon_nominal=Buildings.Templates.Data.Defaults.dpConWatChi,
+    TChiWatSup_nominal=Buildings.Templates.Data.Defaults.TChiWatSup,
+    TConEnt_nominal=Buildings.Templates.Data.Defaults.THeaWatRetMed,
+    mChiWat_flow_nominal=datHrc.cap_nominal / abs(datHrc.TChiWatSup_nominal -
+      Buildings.Templates.Data.Defaults.TChiWatRet) / Buildings.Utilities.Psychrometrics.Constants.cpWatLiq,
+    mCon_flow_nominal=datHrc.QCon_flow_nominal / abs(datHrc.TConEnt_nominal -
+      Buildings.Templates.Data.Defaults.THeaWatSupMed) / Buildings.Utilities.Psychrometrics.Constants.cpWatLiq)
+    "HRC parameters"
+    annotation (Placement(transformation(extent={{-180,100},{-160,120}})));
+  parameter Buildings.Templates.Components.Data.PumpSingle datPumChiWatHrc(
+    final typ=Buildings.Templates.Components.Types.Pump.Single,
+    m_flow_nominal=datHrc.mChiWat_flow_nominal,
+    dp_nominal=datHrc.dpChiWat_nominal)
+    "HRC CHW pump parameters"
+    annotation (Placement(transformation(extent={{-140,100},{-120,120}})));
+  parameter Buildings.Templates.Components.Data.PumpSingle datPumHeaWatHrc(
+    final typ=Buildings.Templates.Components.Types.Pump.Single,
+    m_flow_nominal=datHrc.mCon_flow_nominal,
+    dp_nominal=datHrc.dpCon_nominal)
+    "HRC HW pump parameters"
+    annotation (Placement(transformation(extent={{-100,100},{-80,120}})));
+  Buildings.Templates.Plants.HeatPumps.Components.HeatRecoveryChiller hrc(
+    redeclare final package MediumChiWat=Medium,
+    redeclare final package MediumHeaWat=Medium,
+    final datPumChiWat=datPumChiWatHrc,
+    final datPumHeaWat=datPumHeaWatHrc,
+    final datHrc=datHrc,
+    final energyDynamics=energyDynamics)
+    annotation (Placement(transformation(extent={{-60,-56},{60,64}})));
+  Fluid.Sources.Boundary_pT inlChiWat(
+    redeclare final package Medium=Medium,
+    T=datHrc.TChiWatRet_nominal,
+    nPorts=1)
+    "Boundary conditions for HRC entering CHW"
+    annotation (Placement(transformation(extent={{150,30},{130,50}})));
+  Fluid.Sources.Boundary_pT inlHeaWat(
+    redeclare final package Medium=Medium,
+    T=datHrc.TConEnt_nominal,
+    nPorts=1)
+    "Boundary conditions for HRC entering HW"
+    annotation (Placement(transformation(extent={{-150,-50},{-130,-30}})));
+  Fluid.Sources.Boundary_pT outHeaWat(
+    redeclare final package Medium=Medium,
+    nPorts=1)
+    "Boundary conditions for HRC leaving HW"
+    annotation (Placement(transformation(extent={{150,-50},{130,-30}})));
+  Fluid.Sources.Boundary_pT outChiWat(
+    redeclare final package Medium=Medium,
+    nPorts=1)
+    "Boundary conditions for HRC leaving CHW"
+    annotation (Placement(transformation(extent={{-150,30},{-130,50}})));
+  Buildings.Templates.Components.Interfaces.Bus busHrc
+    "HRC control bus"
+    annotation (Placement(transformation(extent={{20,80},{60,120}}),
+      iconTransformation(extent={{-300,-80},{-260,-40}})));
+  Buildings.Templates.Components.Interfaces.Bus busPumChiWatHrc
+    "HRC CHW pump control bus"
+    annotation (Placement(transformation(extent={{60,60},{100,100}}),
+      iconTransformation(extent={{-300,-80},{-260,-40}})));
+  Buildings.Templates.Components.Interfaces.Bus busPumHeaWatHrc
+    "HRC HW pump control bus"
+    annotation (Placement(transformation(extent={{60,100},{100,140}}),
+      iconTransformation(extent={{-300,-80},{-260,-40}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.TimeTable y1(
+    table=[
+      0, 0, 0;
+      0.1, 1, 1;
+      0.5, 1, 0;
+      0.9, 0, 0],
+    timeScale=1000,
+    period=1000)
+    "Source for DO signals"
+    annotation (Placement(transformation(extent={{-60,130},{-40,150}})));
+  Buildings.Controls.OBC.CDL.Reals.Switch TSupSet(
+    y(
+      unit="K",
+      displayUnit="degC"))
+    "HRC supply temperature setpoint"
+    annotation (Placement(transformation(extent={{30,150},{50,170}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant TChiWatSupSet(
+    final k=datHrc.TChiWatSup_nominal)
+    "CHW supply temperature setpoint"
+    annotation (Placement(transformation(extent={{-130,170},{-110,190}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant THeaWatSupSet(
+    final k=datHrc.TConLvg_nominal)
+    "HW supply temperature setpoint"
+    annotation (Placement(transformation(extent={{-100,150},{-80,170}})));
+  Fluid.Sensors.TemperatureTwoPort THeaWatLvg(
+    redeclare final package Medium=Medium,
+    final m_flow_nominal=datHrc.mCon_flow_nominal)
+    "HRC leaving HW temperature"
+    annotation (Placement(transformation(extent={{80,-50},{100,-30}})));
+  Fluid.Sensors.TemperatureTwoPort TChiWatLvg(
+    redeclare final package Medium=Medium,
+    final m_flow_nominal=datHrc.mChiWat_flow_nominal)
+    "HRC leaving CHW temperature"
+    annotation (Placement(transformation(extent={{-80,30},{-100,50}})));
+  Buildings.Templates.Plants.HeatPumps.Interfaces.Bus bus
+    "Plant control bus"
+    annotation (Placement(transformation(extent={{-20,40},{20,80}}),
+      iconTransformation(extent={{-480,-120},{-440,-80}})));
+equation
+  connect(inlHeaWat.ports[1], hrc.port_a1)
+    annotation (Line(points={{-130,-40},{-60,-40},{-60,-32}},color={0,127,255}));
+  connect(y1.y[1], busPumHeaWatHrc.y1)
+    annotation (Line(points={{-38,140},{80,140},{80,120}},color={255,0,255}));
+  connect(y1.y[1], busPumChiWatHrc.y1)
+    annotation (Line(points={{-38,140},{80,140},{80,80}},color={255,0,255}));
+  connect(y1.y[1], busHrc.y1)
+    annotation (Line(points={{-38,140},{40,140},{40,100}},color={255,0,255}));
+  connect(y1.y[2], busHrc.y1Coo)
+    annotation (Line(points={{-38,140},{40,140},{40,100}},color={255,0,255}));
+  connect(y1.y[2], TSupSet.u2)
+    annotation (Line(points={{-38,140},{20,140},{20,160},{28,160}},color={255,0,255}));
+  connect(TChiWatSupSet.y, TSupSet.u1)
+    annotation (Line(points={{-108,180},{20,180},{20,168},{28,168}},color={0,0,127}));
+  connect(THeaWatSupSet.y, TSupSet.u3)
+    annotation (Line(points={{-78,160},{0,160},{0,152},{28,152}},color={0,0,127}));
+  connect(TSupSet.y, busHrc.TSupSet)
+    annotation (Line(points={{52,160},{60,160},{60,100},{40,100}},color={0,0,127}));
+  connect(outHeaWat.ports[1], THeaWatLvg.port_b)
+    annotation (Line(points={{130,-40},{100,-40}},color={0,127,255}));
+  connect(THeaWatLvg.port_a, hrc.port_b1)
+    annotation (Line(points={{80,-40},{60,-40},{60,-32}},color={0,127,255}));
+  connect(hrc.port_b2, TChiWatLvg.port_a)
+    annotation (Line(points={{-60,40},{-80,40}},color={0,127,255}));
+  connect(TChiWatLvg.port_b, outChiWat.ports[1])
+    annotation (Line(points={{-100,40},{-130,40}},color={0,127,255}));
+  connect(inlChiWat.ports[1], hrc.port_a2)
+    annotation (Line(points={{130,40},{60,40}},color={0,127,255}));
+  connect(busHrc, bus.hrc)
+    annotation (Line(points={{40,100},{0,100},{0,60}},color={255,204,51},thickness=0.5));
+  connect(bus, hrc.bus)
+    annotation (Line(points={{0,60},{0,26}},color={255,204,51},thickness=0.5));
+  connect(busPumChiWatHrc, bus.pumChiWatHrc)
+    annotation (Line(points={{80,80},{0,80},{0,60}},color={255,204,51},thickness=0.5));
+  connect(busPumHeaWatHrc, bus.pumHeaWatHrc)
+    annotation (Line(points={{80,120},{0,120},{0,60}},color={255,204,51},thickness=0.5));
+  annotation (
+    __Dymola_Commands(
+      file=
+        "modelica://Buildings/Resources/Scripts/Dymola/Templates/Plants/HeatPumps/Components/Validation/HeatRecoveryChiller.mos"
+        "Simulate and plot"),
+    experiment(
+      Tolerance=1e-6,
+      StopTime=1000.0),
+    Documentation(
+      revisions="<html>
+<ul>
+<li>
+May 31, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>",
+      info="<html>
+<p>
+This model validates the model
+<a href=\"modelica://Buildings.Templates.Plants.HeatPumps.Components.HeatRecoveryChiller\">
+Buildings.Templates.Plants.HeatPumps.Components.HeatRecoveryChiller</a>.
+</p>
+<p>
+The CHW and HW return temperatures and flow rates are at their design values.
+The HRC supply temperature setpoint is switched from the design CHW 
+supply temperature to the design HW supply temperature when the HRC
+operating mode is switched from cooling to heating.
+</p>
+</html>"),
+    Diagram(
+      coordinateSystem(
+        extent={{-200,-200},{200,200}})));
+end HeatRecoveryChiller;
diff --git a/Buildings/Templates/Plants/HeatPumps/Components/Validation/PumpsPrimaryDedicated.mo b/Buildings/Templates/Plants/HeatPumps/Components/Validation/PumpsPrimaryDedicated.mo
index f75e6661008..bfa4baf7f1b 100644
--- a/Buildings/Templates/Plants/HeatPumps/Components/Validation/PumpsPrimaryDedicated.mo
+++ b/Buildings/Templates/Plants/HeatPumps/Components/Validation/PumpsPrimaryDedicated.mo
@@ -35,6 +35,8 @@ model PumpsPrimaryDedicated
       typPumHeaWatPri=Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Variable,
       typPumChiWatPri=Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.None,
       typPumHeaWatSec=Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.None,
+      typTanHeaWat = Buildings.Templates.Components.Types.IntegrationPoint.None,
+      typTanChiWat = Buildings.Templates.Components.Types.IntegrationPoint.None,
       typDis=Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Only,
       nPumChiWatSec=0,
       rhoHeaWat_default=Buildings.Media.Water.d_const,
@@ -83,6 +85,8 @@ model PumpsPrimaryDedicated
       typPumHeaWatPri=Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Variable,
       typPumChiWatPri=Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Variable,
       typPumHeaWatSec=Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.None,
+      typTanHeaWat = Buildings.Templates.Components.Types.IntegrationPoint.None,
+      typTanChiWat = Buildings.Templates.Components.Types.IntegrationPoint.None,
       typDis=Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Only,
       nPumChiWatSec=0,
       rhoHeaWat_default=Buildings.Media.Water.d_const,
@@ -131,6 +135,8 @@ model PumpsPrimaryDedicated
       typPumHeaWatPri=Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Variable,
       typPumChiWatPri=Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Variable,
       typPumHeaWatSec=Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.None,
+      typTanHeaWat = Buildings.Templates.Components.Types.IntegrationPoint.None,
+      typTanChiWat = Buildings.Templates.Components.Types.IntegrationPoint.None,
       typDis=Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Only,
       nPumChiWatSec=0,
       rhoHeaWat_default=Buildings.Media.Water.d_const,
@@ -179,6 +185,8 @@ model PumpsPrimaryDedicated
       typPumHeaWatPri=Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Variable,
       typPumChiWatPri=Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.None,
       typPumHeaWatSec=Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.None,
+      typTanHeaWat = Buildings.Templates.Components.Types.IntegrationPoint.None,
+      typTanChiWat = Buildings.Templates.Components.Types.IntegrationPoint.None,
       typDis=Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Only,
       nPumChiWatSec=0,
       rhoHeaWat_default=Buildings.Media.Water.d_const,
diff --git a/Buildings/Templates/Plants/HeatPumps/Components/Validation/ValvesIsolation.mo b/Buildings/Templates/Plants/HeatPumps/Components/Validation/ValvesIsolation.mo
index aa872c51043..04e5047f183 100644
--- a/Buildings/Templates/Plants/HeatPumps/Components/Validation/ValvesIsolation.mo
+++ b/Buildings/Templates/Plants/HeatPumps/Components/Validation/ValvesIsolation.mo
@@ -24,6 +24,8 @@ model ValvesIsolation
       typPumHeaWatPri=Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Variable,
       typPumChiWatPri=Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.None,
       typPumHeaWatSec=Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.None,
+      typTanHeaWat = Buildings.Templates.Components.Types.IntegrationPoint.None,
+      typTanChiWat = Buildings.Templates.Components.Types.IntegrationPoint.None,
       typDis=Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Only,
       nPumChiWatSec=0,
       rhoHeaWat_default=Buildings.Media.Water.d_const,
@@ -72,6 +74,8 @@ model ValvesIsolation
       have_pumChiWatPriDed=valIsoHeaInl.have_pumChiWatPriDed,
       typPumHeaWatPri=Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Variable,
       typPumChiWatPri=Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.None,
+      typTanHeaWat = Buildings.Templates.Components.Types.IntegrationPoint.None,
+      typTanChiWat = Buildings.Templates.Components.Types.IntegrationPoint.None,
       is_rev=false,
       typPumHeaWatSec=Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.None,
       typDis=Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Only,
@@ -121,6 +125,8 @@ model ValvesIsolation
       typPumHeaWatPri=Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Variable,
       typPumChiWatPri=Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Variable,
       typPumHeaWatSec=Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.None,
+      typTanHeaWat = Buildings.Templates.Components.Types.IntegrationPoint.None,
+      typTanChiWat = Buildings.Templates.Components.Types.IntegrationPoint.None,
       typDis=Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Only,
       nPumChiWatSec=0,
       rhoHeaWat_default=Buildings.Media.Water.d_const,
diff --git a/Buildings/Templates/Plants/HeatPumps/Components/Validation/package.order b/Buildings/Templates/Plants/HeatPumps/Components/Validation/package.order
index 2fae7671638..5f02603f8f2 100644
--- a/Buildings/Templates/Plants/HeatPumps/Components/Validation/package.order
+++ b/Buildings/Templates/Plants/HeatPumps/Components/Validation/package.order
@@ -1,3 +1,4 @@
 HeatPumpGroupAirToWater
+HeatRecoveryChiller
 PumpsPrimaryDedicated
 ValvesIsolation
diff --git a/Buildings/Templates/Plants/HeatPumps/Components/ValvesIsolation.mo b/Buildings/Templates/Plants/HeatPumps/Components/ValvesIsolation.mo
index 997b4cd520c..bfa62ce8b0a 100644
--- a/Buildings/Templates/Plants/HeatPumps/Components/ValvesIsolation.mo
+++ b/Buildings/Templates/Plants/HeatPumps/Components/ValvesIsolation.mo
@@ -64,32 +64,37 @@ model ValvesIsolation
     "Balancing valve pressure drop at design CHW mass flow rate - Each heat pump"
     annotation (Dialog(group="Nominal condition",
       enable=have_chiWat));
-  parameter Modelica.Units.SI.PressureDifference dpValveHeaWat_nominal[nHp]=fill(Buildings.Templates.Data.Defaults.dpValIso, nHp)
-    "HW isolation valve pressure drop: identical for inlet and outlet valves"
+  parameter Modelica.Units.SI.PressureDifference dpValveHeaWat_nominal[nHp]=
+    fill(Buildings.Templates.Data.Defaults.dpValIso, nHp)
+    "HW isolation valve pressure drop (identical for inlet and outlet valves)"
     annotation (Dialog(group="Nominal condition"));
   final parameter Modelica.Units.SI.PressureDifference dpFixedHeaWat_nominal[nHp]=
     dpHeaWatHp_nominal + dpBalHeaWatHp_nominal
     "Fixed HW pressure drop: HP + balancing valve"
     annotation (Dialog(group="Nominal condition"));
+  // The following parameter is intended for external use.
   final parameter Modelica.Units.SI.PressureDifference dpHeaWat_nominal[nHp]=
-    dpFixedHeaWat_nominal +(if have_valHpOutIso then dpValveHeaWat_nominal else fill(0, nHp)) +
+    dpFixedHeaWat_nominal +
+    (if have_valHpOutIso then dpValveHeaWat_nominal else fill(0, nHp)) +
     (if have_valHpInlIso then dpValveHeaWat_nominal else fill(0, nHp))
     "Total HW pressure drop: fixed + valves"
     annotation (Dialog(group="Nominal condition"));
   parameter Modelica.Units.SI.PressureDifference dpValveChiWat_nominal[nHp](
     each start=0)=fill(Buildings.Templates.Data.Defaults.dpValIso, nHp)
-    "Isolation valve CHW pressure drop: identical for inlet and outlet valves"
+    "Isolation valve CHW pressure drop (identical for inlet and outlet valves)"
     annotation (Dialog(group="Nominal condition",
       enable=have_chiWat));
   final parameter Modelica.Units.SI.PressureDifference dpFixedChiWat_nominal[nHp]=
-    if have_chiWat then dpChiWatHp_nominal + dpBalChiWatHp_nominal else fill(0, nHp)
+    if have_chiWat then dpBalChiWatHp_nominal + dpChiWatHp_nominal else fill(0, nHp)
     "Total fixed CHW pressure drop"
     annotation (Dialog(group="Nominal condition",
       enable=have_chiWat));
+  // The following parameter is intended for external use.
   final parameter Modelica.Units.SI.PressureDifference dpChiWat_nominal[nHp]=
-    dpFixedChiWat_nominal +(if have_chiWat and have_valHpOutIso then dpValveChiWat_nominal
-    else fill(0, nHp)) +(if have_chiWat and have_valHpInlIso then dpValveChiWat_nominal
-    else fill(0, nHp))
+    if have_chiWat then dpFixedChiWat_nominal +
+      (if have_valHpOutIso then dpValveChiWat_nominal else fill(0, nHp)) +
+      (if have_valHpInlIso then dpValveChiWat_nominal else fill(0, nHp))
+    else fill(0, nHp)
     "Total CHW pressure drop: fixed + valves"
     annotation (Dialog(group="Nominal condition",
       enable=have_chiWat));
@@ -161,7 +166,7 @@ model ValvesIsolation
     annotation (Evaluate=true,
     Dialog(tab="Advanced",
       enable=have_valHpInlIso or have_valHpOutIso));
-  parameter Boolean linearized=true
+  parameter Boolean linearized=false
     "= true, use linear relation between m_flow and dp for any flow rate"
     annotation (Evaluate=true,
     Dialog(tab="Advanced",
@@ -369,7 +374,7 @@ model ValvesIsolation
     final nPorts=nHp + 1)
     "Fluid volume at junction"
     annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,
-      origin={-160,50})));
+      origin={-160,120})));
   Fluid.Delays.DelayFirstOrder junChiWatSup(
     redeclare final package Medium=Medium,
     final tau=tau,
@@ -381,7 +386,7 @@ model ValvesIsolation
     if have_chiWat
     "Fluid volume at junction"
     annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,
-      origin={-82,50})));
+      origin={-80,120})));
   Fluid.Delays.DelayFirstOrder junHeaWatRet(
     redeclare final package Medium=Medium,
     final tau=tau,
@@ -392,7 +397,7 @@ model ValvesIsolation
     final nPorts=nHp + 1)
     "Fluid volume at junction"
     annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,
-      origin={80,50})));
+      origin={80,120})));
   /*
   HW pressure drop computed in this component in the absence of isolation valves
   at both inlet and outlet.
@@ -430,7 +435,7 @@ model ValvesIsolation
     if have_chiWat
     "Fluid volume at junction"
     annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,
-      origin={160,50})));
+      origin={160,120})));
 protected
   Buildings.Templates.Components.Interfaces.Bus busValHeaWatHpInlIso[nHp]
     if have_valHpInlIso
@@ -474,8 +479,8 @@ equation
   connect(ports_aHeaWatHp, pasHeaWatHpOut.port_a)
     annotation (Line(points={{-180,-200},{-160,-200},{-160,-10}},          color={0,127,255}));
   connect(ports_aChiHeaWatHp, pasHeaWatHpOut.port_a)
-    annotation (Line(points={{-100,-200},{-120,-200},{-120,-20},{-160,-20},{
-          -160,-10}},
+    annotation (Line(points={{-100,-200},{-120,-200},{-120,-20},{-160,-20},{-160,
+          -10}},
       color={0,127,255}));
   connect(ports_aChiHeaWatHp, pasChiWatHpOut.port_a)
     annotation (Line(points={{-100,-200},{-80,-200},{-80,-10}},          color={0,127,255}));
@@ -483,38 +488,42 @@ equation
     annotation (Line(points={{-20,-200},{-20,-20},{-80,-20},{-80,-10}},
       color={0,127,255}));
   connect(valHeaWatHpOutIso.port_b, junHeaWatSup.ports[1:nHp])
-    annotation (Line(points={{-180,10},{-180,20},{-160,20},{-160,40}},color={0,127,255}));
+    annotation (Line(points={{-180,10},{-180,20},{-160,20},{-160,110}},
+                                                                      color={0,127,255}));
   connect(pasHeaWatHpOut.port_b, junHeaWatSup.ports[1:nHp])
-    annotation (Line(points={{-160,10},{-160,40}},color={0,127,255}));
+    annotation (Line(points={{-160,10},{-160,110}},
+                                                  color={0,127,255}));
   connect(junHeaWatSup.ports[nHp + 1], port_bHeaWat)
-    annotation (Line(points={{-160,40},{-180,40},{-180,200}},color={0,127,255}));
+    annotation (Line(points={{-160,110},{-180,110},{-180,200}},
+                                                             color={0,127,255}));
   connect(valChiWatHpOutIso.port_b, junChiWatSup.ports[1:nHp])
-    annotation (Line(points={{-100,10},{-100,20},{-82,20},{-82,40}},color={0,127,255}));
+    annotation (Line(points={{-100,10},{-100,20},{-80,20},{-80,110}},
+                                                                    color={0,127,255}));
   connect(pasChiWatHpOut.port_b, junChiWatSup.ports[1:nHp])
-    annotation (Line(points={{-80,10},{-80,40},{-82,40}},color={0,127,255}));
+    annotation (Line(points={{-80,10},{-80,110}},        color={0,127,255}));
   connect(port_bChiWat, junChiWatSup.ports[nHp + 1])
-    annotation (Line(points={{-100,200},{-100,40},{-82,40}},color={0,127,255}));
+    annotation (Line(points={{-100,200},{-100,110},{-80,110}},
+                                                            color={0,127,255}));
   connect(port_aHeaWat, junHeaWatRet.ports[nHp + 1])
-    annotation (Line(points={{100,200},{100,40},{80,40}},color={0,127,255}));
+    annotation (Line(points={{100,200},{100,110},{80,110}},
+                                                         color={0,127,255}));
   connect(junHeaWatRet.ports[1:nHp], valHeaWatHpInlIso.port_a)
-    annotation (Line(points={{80,40},{80,20},{100,20},{100,10}},color={0,127,255}));
+    annotation (Line(points={{80,110},{80,20},{100,20},{100,10}},
+                                                                color={0,127,255}));
   connect(pasHeaWatHpInl.port_a, junHeaWatRet.ports[1:nHp])
-    annotation (Line(points={{80,10},{80,26},{80,40},{80,40}},color={0,127,255}));
+    annotation (Line(points={{80,10},{80,110}},               color={0,127,255}));
   connect(port_aChiWat, junChiWatRet.ports[nHp + 1])
-    annotation (Line(points={{180,200},{180,40},{160,40}},color={0,127,255}));
+    annotation (Line(points={{180,200},{180,110},{160,110}},
+                                                          color={0,127,255}));
   connect(valChiWatHpInlIso.port_a, junChiWatRet.ports[1:nHp])
-    annotation (Line(points={{180,10},{180,20},{160,20},{160,40}},color={0,127,255}));
+    annotation (Line(points={{180,10},{180,20},{160,20},{160,110}},
+                                                                  color={0,127,255}));
   connect(pasChiWatHpInl.port_a, junChiWatRet.ports[1:nHp])
-    annotation (Line(points={{160,10},{160,26},{160,40},{160,40}},color={0,127,255}));
+    annotation (Line(points={{160,10},{160,110}},                 color={0,127,255}));
   connect(pasHeaWatHpInl.port_b, ports_bChiHeaWatHp)
     annotation (Line(points={{80,-10},{80,-200},{100,-200}},         color={0,127,255}));
-  connect(valHeaWatHpInlIso.port_b, ports_bChiHeaWatHp)
-    annotation (Line(points={{100,-10},{100,-200}},color={0,127,255}));
   connect(pasChiWatHpInl.port_b, ports_bChiHeaWatHp)
     annotation (Line(points={{160,-10},{160,-180},{100,-180},{100,-200}},color={0,127,255}));
-  connect(valChiWatHpInlIso.port_b, ports_bChiHeaWatHp)
-    annotation (Line(points={{180,-10},{180,-180},{100,-180},{100,-200}},
-      color={0,127,255}));
   connect(busValHeaWatHpInlIso, valHeaWatHpInlIso.bus)
     annotation (Line(points={{60,160},{110,160},{110,0}},color={255,204,51},thickness=0.5));
   connect(busValChiWatHpInlIso, valChiWatHpInlIso.bus)
@@ -524,6 +533,10 @@ equation
   connect(busValHeaWatHpOutIso, valHeaWatHpOutIso.bus)
     annotation (Line(points={{-60,160},{-190,160},{-190,0}},color={255,204,51},thickness=0.5));
 
+  connect(valHeaWatHpInlIso.port_b, ports_bChiHeaWatHp) annotation (Line(points
+        ={{100,-10},{100,-10},{100,-200}}, color={0,127,255}));
+  connect(valChiWatHpInlIso.port_b, ports_bChiHeaWatHp) annotation (Line(points
+        ={{180,-10},{180,-180},{100,-180},{100,-200}}, color={0,127,255}));
   annotation (
     defaultComponentName="valIso",
     Diagram(
@@ -533,6 +546,48 @@ equation
       coordinateSystem(
         preserveAspectRatio=false,
         extent={{-2400,-700},{2400,700}}), graphics={
+        Line(
+          points={{240,150},{0,150},{0,-50}},
+          color={0,0,0},
+          thickness=5,
+          visible=have_chiWat and not have_pumChiWatPriDed and nHp >= 1,
+          origin={1950,-400},
+          rotation=90),
+        Line(
+          points={{240,150},{0,150},{0,-50}},
+          color={0,0,0},
+          thickness=5,
+          visible=have_chiWat and not have_pumChiWatPriDed and nHp >= 2,
+          origin={1150,-400},
+          rotation=90),
+        Line(
+          points={{240,150},{0,150},{0,-50}},
+          color={0,0,0},
+          thickness=5,
+          visible=have_chiWat and not have_pumChiWatPriDed and nHp >= 3,
+          origin={350,-400},
+          rotation=90),
+        Line(
+          points={{240,150},{0,150},{0,-50}},
+          color={0,0,0},
+          thickness=5,
+          visible=have_chiWat and not have_pumChiWatPriDed and nHp >= 4,
+          origin={-450,-400},
+          rotation=90),
+        Line(
+          points={{240,150},{0,150},{0,-50}},
+          color={0,0,0},
+          thickness=5,
+          visible=have_chiWat and not have_pumChiWatPriDed and nHp >= 5,
+          origin={-1250,-400},
+          rotation=90),
+        Line(
+          points={{240,150},{0,150},{0,-50}},
+          color={0,0,0},
+          thickness=5,
+          visible=have_chiWat and not have_pumChiWatPriDed and nHp >= 6,
+          origin={-2050,-400},
+          rotation=90),
         Line(
           points={{1000,-160},{1000,-700}},
           color={0,0,0},
@@ -1014,48 +1069,6 @@ equation
           origin={1970,-200},
           rotation=-90),
         Line(points={{1820,-508}}, color={0,0,0}),
-        Line(
-          points={{160,150},{0,150},{0,-50}},
-          color={0,0,0},
-          thickness=5,
-          visible=have_chiWat and not have_pumChiWatPriDed and nHp >= 1,
-          origin={1950,-400},
-          rotation=90),
-        Line(
-          points={{160,150},{0,150},{0,-50}},
-          color={0,0,0},
-          thickness=5,
-          visible=have_chiWat and not have_pumChiWatPriDed and nHp >= 2,
-          origin={1150,-400},
-          rotation=90),
-        Line(
-          points={{160,150},{0,150},{0,-50}},
-          color={0,0,0},
-          thickness=5,
-          visible=have_chiWat and not have_pumChiWatPriDed and nHp >= 3,
-          origin={350,-400},
-          rotation=90),
-        Line(
-          points={{160,150},{0,150},{0,-50}},
-          color={0,0,0},
-          thickness=5,
-          visible=have_chiWat and not have_pumChiWatPriDed and nHp >= 4,
-          origin={-450,-400},
-          rotation=90),
-        Line(
-          points={{160,150},{0,150},{0,-50}},
-          color={0,0,0},
-          thickness=5,
-          visible=have_chiWat and not have_pumChiWatPriDed and nHp >= 5,
-          origin={-1250,-400},
-          rotation=90),
-        Line(
-          points={{160,150},{0,150},{0,-50}},
-          color={0,0,0},
-          thickness=5,
-          visible=have_chiWat and not have_pumChiWatPriDed and nHp >= 6,
-          origin={-2050,-400},
-          rotation=90),
    Rectangle(
           extent={{2180,220},{2220,178}},
           lineColor={0,0,0},
@@ -1210,14 +1223,6 @@ It is assumed that the heat pumps always provide heating hot water.
 Optionally, chilled water return and supply and the associated isolation valves
 can be modeled by setting the parameter <code>have_chiWat</code> to true.
 </p>
-<h4>Implementation details</h4>
-<p>
-By default, the isolation valves are modeled considering a linear
-variation of the pressure drop with the flow rate (<code>linearized=true</code>), 
-as opposed to the quadratic relationship usually considered for 
-a turbulent flow regime.
-By limiting the size of the system of nonlinear equations, this setting 
-reduces the risk of solver failure and the time to solution.
 </html>", revisions="<html>
 <ul>
 <li>
diff --git a/Buildings/Templates/Plants/HeatPumps/Components/package.order b/Buildings/Templates/Plants/HeatPumps/Components/package.order
index 426b14e3579..ade73a275c5 100644
--- a/Buildings/Templates/Plants/HeatPumps/Components/package.order
+++ b/Buildings/Templates/Plants/HeatPumps/Components/package.order
@@ -1,3 +1,4 @@
+HeatRecoveryChiller
 PumpsPrimaryDedicated
 ValvesIsolation
 Controls
diff --git a/Buildings/Templates/Plants/HeatPumps/Configuration/HeatPumpPlant.mo b/Buildings/Templates/Plants/HeatPumps/Configuration/HeatPumpPlant.mo
index be40d255458..44ae7c57739 100644
--- a/Buildings/Templates/Plants/HeatPumps/Configuration/HeatPumpPlant.mo
+++ b/Buildings/Templates/Plants/HeatPumps/Configuration/HeatPumpPlant.mo
@@ -80,6 +80,9 @@ record HeatPumpPlant
   parameter Boolean have_pumHeaWatPriVar
     "Set to true for variable speed primary HW pumps"
     annotation (Evaluate=true);
+  parameter Buildings.Templates.Components.Types.IntegrationPoint typTanHeaWat
+    "Specify if there is a HW buffer tank and where it is integrated into the system"
+    annotation (Evaluate=true);
   parameter Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary typPumHeaWatSec
     "Type of secondary HW pumps"
     annotation (Evaluate=true);
@@ -111,6 +114,9 @@ record HeatPumpPlant
   parameter Boolean have_pumChiWatPriVar
     "Set to true for variable speed primary CHW pumps"
     annotation (Evaluate=true);
+  parameter Buildings.Templates.Components.Types.IntegrationPoint typTanChiWat
+    "Specify if there is a CHW buffer tank and where it is integrated into the system"
+    annotation (Evaluate=true);
   parameter Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary typPumChiWatSec
     "Type of secondary CHW pumps"
     annotation (Evaluate=true);
diff --git a/Buildings/Templates/Plants/HeatPumps/Data/HeatPumpPlant.mo b/Buildings/Templates/Plants/HeatPumps/Data/HeatPumpPlant.mo
index 309f5f718d6..3e796169c0f 100644
--- a/Buildings/Templates/Plants/HeatPumps/Data/HeatPumpPlant.mo
+++ b/Buildings/Templates/Plants/HeatPumps/Data/HeatPumpPlant.mo
@@ -29,6 +29,14 @@ record HeatPumpPlant
     THeaWatSupHp_nominal=ctl.THeaWatSup_nominal)
     "Heat pumps"
     annotation (Dialog(group="Heat pumps"));
+  parameter Modelica.Units.SI.PressureDifference dpBalHeaWatHp_nominal(start=0)=0
+    "HP HW balancing valve pressure drop at design HW flow"
+    annotation (Dialog(group="Heat pumps",
+      enable=cfg.typPumHeaWatPri==Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Constant));
+  parameter Modelica.Units.SI.PressureDifference dpBalChiWatHp_nominal(start=0)=0
+    "HP CHW balancing valve pressure drop at design CHW flow"
+    annotation (Dialog(group="Heat pumps",
+      enable=cfg.typPumChiWatPri==Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Constant));
   // HW loop
   parameter Buildings.Templates.Components.Data.PumpMultiple pumHeaWatPri(
     final nPum=cfg.nPumHeaWatPri,
@@ -51,13 +59,29 @@ record HeatPumpPlant
     per(
       pressure(
         V_flow=if pumHeaWatPri.typ == Buildings.Templates.Components.Types.Pump.None
-          then
-              [0] else pumHeaWatPri.per.pressure.V_flow,
+          then [0] else pumHeaWatPri.per.pressure.V_flow,
         dp=if pumHeaWatPri.typ == Buildings.Templates.Components.Types.Pump.None
-          then
-              [0] else pumHeaWatPri.per.pressure.dp)),
+          then [0] else pumHeaWatPri.per.pressure.dp)),
     each rho_default=pumHeaWatPri.rho_default)
     "Cast multiple pump record into single pump record array";
+  parameter Modelica.Units.SI.PressureDifference dpValCheHeaWat_nominal(start=0)=
+    Buildings.Templates.Data.Defaults.dpValChe
+    "Primary (HW or common HW and CHW) pump check valve pressure drop at design flow rate (selection conditions)"
+    annotation(Dialog(group="Primary HW loop"));
+  parameter Buildings.Templates.Components.Data.Valve valHeaWatMinByp(
+    final typ=Buildings.Templates.Components.Types.Valve.TwoWayModulating,
+    m_flow_nominal=
+      if cfg.have_valHeaWatMinByp then ctl.VHeaWatHp_flow_min * cfg.rhoHeaWat_default
+      else 0,
+    dpValve_nominal=Buildings.Templates.Data.Defaults.dpValBypMin)
+    "HW minimum flow bypass valve"
+    annotation(Dialog(group="Primary HW loop", enable=cfg.have_valHeaWatMinByp));
+  parameter Modelica.Units.SI.Volume VTanHeaWat(start=0)=
+    if cfg.have_heaWat then 240 * cfg.nHp * hp.mHeaWatHp_flow_nominal / cfg.rhoHeaWat_default
+    else 0
+    "Volume of HW buffer tank"
+    annotation (Dialog(group="Primary HW loop",
+    enable=cfg.typTanHeaWat<>Buildings.Templates.Components.Types.IntegrationPoint.None));
   parameter Buildings.Templates.Components.Data.PumpMultiple pumHeaWatSec(
     final nPum=cfg.nPumHeaWatSec,
     final rho_default=cfg.rhoHeaWat_default,
@@ -85,15 +109,30 @@ record HeatPumpPlant
     per(
       pressure(
         V_flow=if pumChiWatPri.typ == Buildings.Templates.Components.Types.Pump.None
-          then
-              [
-          0] else pumChiWatPri.per.pressure.V_flow,
+          then [0] else pumChiWatPri.per.pressure.V_flow,
         dp=if pumChiWatPri.typ == Buildings.Templates.Components.Types.Pump.None
-          then
-              [
-          0] else pumChiWatPri.per.pressure.dp)),
+          then [0] else pumChiWatPri.per.pressure.dp)),
     each rho_default=pumChiWatPri.rho_default)
     "Cast multiple pump record into single pump record array";
+  parameter Modelica.Units.SI.PressureDifference dpValCheChiWat_nominal(start=0)=
+    Buildings.Templates.Data.Defaults.dpValChe
+    "Primary CHW pump check valve pressure drop at design CHW flow rate"
+    annotation(Dialog(group="Primary CHW loop",
+      enable=cfg.typPumChiWatPri<>Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.None));
+  parameter Buildings.Templates.Components.Data.Valve valChiWatMinByp(
+    final typ=Buildings.Templates.Components.Types.Valve.TwoWayModulating,
+    m_flow_nominal=
+      if cfg.have_valChiWatMinByp then ctl.VChiWatHp_flow_min * cfg.rhoChiWat_default
+      else 0,
+    dpValve_nominal=Buildings.Templates.Data.Defaults.dpValBypMin)
+    "CHW minimum flow bypass valve"
+    annotation(Dialog(group="Primary CHW loop", enable=cfg.have_valChiWatMinByp));
+  parameter Modelica.Units.SI.Volume VTanChiWat(start=0)=
+    if cfg.have_chiWat then 120 * cfg.nHp * hp.mChiWatHp_flow_nominal / cfg.rhoChiWat_default
+    else 0
+    "Volume of HW buffer tank"
+    annotation (Dialog(group="Primary CHW loop",
+    enable=cfg.typTanChiWat<>Buildings.Templates.Components.Types.IntegrationPoint.None));
   parameter Buildings.Templates.Components.Data.PumpMultiple pumChiWatSec(
     final nPum=cfg.nPumChiWatSec,
     final rho_default=cfg.rhoChiWat_default,
@@ -102,6 +141,54 @@ record HeatPumpPlant
     "Secondary CHW pumps"
     annotation (Dialog(group="Secondary CHW loop",
       enable=cfg.typPumChiWatSec==Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.Centralized));
+  // Sidestream HRC
+  parameter Buildings.Templates.Components.Data.Chiller hrc(
+    typ=if cfg.have_hrc then Buildings.Templates.Components.Types.Chiller.WaterCooled
+      else Buildings.Templates.Components.Types.Chiller.None,
+    cpChiWat_default=cfg.cpChiWat_default,
+    cpCon_default=cfg.cpHeaWat_default,
+    COP_nominal=ctl.COPHeaHrc_nominal - 1,
+    TChiWatSup_nominal=ctl.TChiWatSup_nominal,
+    TChiWatSup_min=ctl.TChiWatSupHrc_min,
+    TConEnt_nominal=if cfg.have_hrc then
+      hrc.TConLvg_nominal - hrc.QCon_flow_nominal / hrc.mCon_flow_nominal / hrc.cpCon_default
+      else 273.15,
+    TConLvg_nominal=ctl.THeaWatSup_nominal,
+    TConLvg_max=ctl.THeaWatSupHrc_max,
+    PLR_min=abs(ctl.capCooHrc_min / hrc.cap_nominal))
+    "Chiller"
+    annotation (Dialog(group="Sidetream heat recovery chiller", enable=cfg.have_hrc));
+  /* HACK(AntoineGautier):
+  The bindings for per.pressure in the single pump record declarations below
+  are identical to the default bindings in the PumpSingle class definition.
+  However, they are needed for Dymola (version 2024x Refresh 1) that fails
+  to evaluate the size of per.pressure.dp otherwise.
+  */
+  parameter Buildings.Templates.Components.Data.PumpSingle pumChiWatHrc(
+    final rho_default=cfg.rhoChiWat_default,
+    final typ=if cfg.have_hrc then Buildings.Templates.Components.Types.Pump.Single
+      else Buildings.Templates.Components.Types.Pump.None,
+    m_flow_nominal=hrc.mChiWat_flow_nominal,
+    dp_nominal=hrc.dpChiWat_nominal,
+    per(pressure(
+      V_flow=if pumChiWatHrc.typ<>Buildings.Templates.Components.Types.Pump.None then
+      {0, 1, 2} * pumChiWatHrc.m_flow_nominal / cfg.rhoChiWat_default else {0,0,0},
+      dp=if pumChiWatHrc.typ<>Buildings.Templates.Components.Types.Pump.None then
+      {1.14, 1, 0.42} * pumChiWatHrc.dp_nominal else {0,0,0})))
+    annotation (Dialog(group="Sidetream heat recovery chiller", enable=cfg.have_hrc));
+  parameter Buildings.Templates.Components.Data.PumpSingle pumHeaWatHrc(
+    final rho_default=cfg.rhoHeaWat_default,
+    final typ=if cfg.have_hrc then Buildings.Templates.Components.Types.Pump.Single
+      else Buildings.Templates.Components.Types.Pump.None,
+    m_flow_nominal=hrc.mCon_flow_nominal,
+    dp_nominal=hrc.dpCon_nominal,
+    per(pressure(
+      V_flow=if pumHeaWatHrc.typ<>Buildings.Templates.Components.Types.Pump.None then
+      {0, 1, 2} * pumHeaWatHrc.m_flow_nominal / cfg.rhoHeaWat_default else {0,0,0},
+      dp=if pumHeaWatHrc.typ<>Buildings.Templates.Components.Types.Pump.None then
+      {1.14, 1, 0.42} * pumHeaWatHrc.dp_nominal else {0,0,0})))
+    "HRC HW pump"
+    annotation (Dialog(group="Sidetream heat recovery chiller", enable=cfg.have_hrc));
   annotation (
     defaultComponentName="dat",
     Documentation(
@@ -124,4 +211,6 @@ conditions that differ from the design conditions specified
 in the controller sub-record.
 </p>
 </html>"));
+
+
 end HeatPumpPlant;
diff --git a/Buildings/Templates/Plants/HeatPumps/Interfaces/PartialHeatPumpPlant.mo b/Buildings/Templates/Plants/HeatPumps/Interfaces/PartialHeatPumpPlant.mo
index 8f57e405b53..d80f9b844a8 100644
--- a/Buildings/Templates/Plants/HeatPumps/Interfaces/PartialHeatPumpPlant.mo
+++ b/Buildings/Templates/Plants/HeatPumps/Interfaces/PartialHeatPumpPlant.mo
@@ -20,7 +20,7 @@ partial model PartialHeatPumpPlant
   Derived classes representing AWHP shall use:
   redeclare final package MediumSou = MediumAir
   */
-    replaceable package MediumSou=Buildings.Media.Water
+  replaceable package MediumSou=Buildings.Media.Water
     constrainedby Modelica.Media.Interfaces.PartialMedium
     "Source-side medium"
     annotation (Dialog(enable=typ==Buildings.Templates.Components.Types.HeatPump.WaterToWater),
@@ -44,13 +44,16 @@ partial model PartialHeatPumpPlant
     "Set to true if the plant provides DHW"
     annotation (Evaluate=true,
     Dialog(group="Configuration"));
-  // RFE(AntoineGautier): Add option for sidestream HRC. Always excluded for now.
-  final parameter Boolean have_hrc(
+  parameter Boolean have_hrc_select(
     start=false)=false
     "Set to true for plants with a sidestream heat recovery chiller"
     annotation (Evaluate=true,
     Dialog(group="Configuration",
     enable=have_heaWat and have_chiWat));
+  final parameter Boolean have_hrc=if have_heaWat and have_chiWat then have_hrc_select
+    else false
+    "Set to true for plants with sidestream heat recovery chiller"
+    annotation (Evaluate=true);
   parameter Buildings.Templates.Components.Types.HeatPump typ
     "Type of heat pump"
     annotation (Evaluate=true,
@@ -86,6 +89,8 @@ partial model PartialHeatPumpPlant
     final typPumHeaWatPri=typPumHeaWatPri,
     final typPumChiWatSec=typPumChiWatSec,
     final typPumHeaWatSec=typPumHeaWatSec,
+    final typTanChiWat=typTanChiWat,
+    final typTanHeaWat=typTanHeaWat,
     final typCtl=ctl.typ,
     final nAirHan=ctl.nAirHan,
     final nEquZon=ctl.nEquZon,
@@ -112,8 +117,7 @@ partial model PartialHeatPumpPlant
     annotation (Evaluate=true,
     Dialog(group="Heat pumps"));
   // Plants with AWHP.
-  // RFE(AntoineGautier): Add constant primary-only option.
-  final parameter Buildings.Templates.Plants.HeatPumps.Types.Distribution typDis_select1(
+  parameter Buildings.Templates.Plants.HeatPumps.Types.Distribution typDis_select1(
     start=Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Variable2)=
     Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Variable2
     "Type of distribution system"
@@ -121,6 +125,8 @@ partial model PartialHeatPumpPlant
     Dialog(group="Configuration",
     enable=typ==Buildings.Templates.Components.Types.HeatPump.AirToWater),
     choices(
+      choice=Buildings.Templates.Plants.HeatPumps.Types.Distribution.Variable1Only
+      "Variable primary-only",
       choice=Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Variable2
       "Constant primary - Variable secondary centralized"));
   // Plants with WWHP.
@@ -151,64 +157,37 @@ partial model PartialHeatPumpPlant
     annotation (Evaluate=true,
     Dialog(group="Primary loop"));
   final parameter Boolean have_bypHeaWatFix=
-    have_heaWat and typDis <> Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Only
-    and typDis <> Buildings.Templates.Plants.HeatPumps.Types.Distribution.Variable1Only
+    have_heaWat and (
+    typDis == Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Variable2
+    or typDis == Buildings.Templates.Plants.HeatPumps.Types.Distribution.Variable1And2)
     "Set to true if the HW loop has a fixed bypass"
     annotation (Evaluate=true,
     Dialog(group="Primary loop"));
-  final parameter Boolean have_valHeaWatMinByp=have_heaWat and typDis ==
-    Buildings.Templates.Plants.HeatPumps.Types.Distribution.Variable1Only
+  final parameter Boolean have_valHeaWatMinByp=have_heaWat and
+    typDis == Buildings.Templates.Plants.HeatPumps.Types.Distribution.Variable1Only
     "Set to true if the HW loop has a minimum flow bypass valve"
     annotation (Evaluate=true,
     Dialog(group="Primary loop"));
-  // Constant primary plants with dedicated primary pumps.
+  // Constant primary - variable secondary plants.
   parameter Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary typPumHeaWatPri_select1(
     start=Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Variable)=
     Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Variable
     "Type of primary HW pumps"
     annotation (Evaluate=true,
     Dialog(group="Primary loop",
-      enable=have_heaWat and typArrPumPri==Buildings.Templates.Components.Types.PumpArrangement.Dedicated
-        and (typDis==Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Only
-        or typDis==Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Variable2)),
+      enable=have_heaWat
+      and typDis==Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Variable2),
     choices(
     choice=Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Constant
       "Constant speed pump specified separately",
     choice=Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Variable
       "Variable speed pump specified separately"));
-  // Constant primary plants with headered primary pumps.
-  parameter Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary typPumHeaWatPri_select2(
-    start=Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Variable)=
-    Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Variable
-    "Type of primary HW pumps"
-    annotation (Evaluate=true,
-    Dialog(group="Primary loop",
-      enable=have_heaWat and typArrPumPri==Buildings.Templates.Components.Types.PumpArrangement.Headered
-        and (typDis==Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Only
-        or typDis==Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Variable2)),
-    choices(choice=Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Constant
-      "Constant speed pump specified separately",
-    choice=Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Variable
-      "Variable speed pump specified separately"));
-  // Variable primary plants with headered primary pumps require variable speed pumps.
+  // Constant primary-only plants and variable primary plants require variable speed pumps.
   final parameter Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary typPumHeaWatPri=
-    if have_heaWat and typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Dedicated
-    and (typDis == Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Only
-    or typDis == Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Variable2)
-    then typPumHeaWatPri_select1 elseif have_heaWat and typArrPumPri ==
-    Buildings.Templates.Components.Types.PumpArrangement.Headered and (typDis ==
-    Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Only or typDis ==
-    Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Variable2)
-    then typPumHeaWatPri_select2 elseif have_heaWat and typArrPumPri ==
-    Buildings.Templates.Components.Types.PumpArrangement.Dedicated and (typDis ==
-    Buildings.Templates.Plants.HeatPumps.Types.Distribution.Variable1Only or typDis ==
-    Buildings.Templates.Plants.HeatPumps.Types.Distribution.Variable1And2) then
-    Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Variable
-    elseif have_heaWat and typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Headered
-    and (typDis == Buildings.Templates.Plants.HeatPumps.Types.Distribution.Variable1Only
-    or typDis == Buildings.Templates.Plants.HeatPumps.Types.Distribution.Variable1And2)
-    then Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Variable else
-    Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.None
+    if have_heaWat then (
+      if typDis == Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Variable2
+      then typPumHeaWatPri_select1 else Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Variable)
+    else Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.None
     "Type of primary HW pumps"
     annotation (Evaluate=true);
   final parameter Boolean have_pumHeaWatPriVar=
@@ -228,6 +207,17 @@ partial model PartialHeatPumpPlant
     "Number of primary HW pumps"
     annotation (Evaluate=true,
     Dialog(group="Primary loop"));
+  parameter Buildings.Templates.Components.Types.IntegrationPoint typTanHeaWat_select(
+    start=Buildings.Templates.Components.Types.IntegrationPoint.None)=
+    Buildings.Templates.Components.Types.IntegrationPoint.Supply
+    "Specify if there is a HW buffer tank and where it is integrated into the system"
+    annotation (Evaluate=true,
+    Dialog(group="Primary loop", enable=have_heaWat));
+  final parameter Buildings.Templates.Components.Types.IntegrationPoint typTanHeaWat=
+    if have_heaWat then typTanHeaWat_select
+    else Buildings.Templates.Components.Types.IntegrationPoint.None
+    "Specify if there is a HW buffer tank and where it is integrated into the system"
+    annotation (Evaluate=true);
   // RFE: Only centralized secondary HW pumps are currently supported for primary-secondary plants.
   final parameter Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary typPumHeaWatSec=
     if have_heaWat and (typDis == Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Variable2
@@ -265,56 +255,38 @@ partial model PartialHeatPumpPlant
     annotation (Evaluate=true,
     Dialog(group="Primary loop"));
   final parameter Boolean have_bypChiWatFix=
-    have_chiWat and typDis <> Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Only
-    and typDis <> Buildings.Templates.Plants.HeatPumps.Types.Distribution.Variable1Only
+    have_chiWat and (
+    typDis == Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Variable2
+    or typDis == Buildings.Templates.Plants.HeatPumps.Types.Distribution.Variable1And2)
     "Set to true if the CHW loop has a fixed bypass"
     annotation (Evaluate=true,
     Dialog(group="Primary loop"));
-  final parameter Boolean have_valChiWatMinByp=have_chiWat and typDis ==
-    Buildings.Templates.Plants.HeatPumps.Types.Distribution.Variable1Only
+  final parameter Boolean have_valChiWatMinByp=have_chiWat and
+    typDis == Buildings.Templates.Plants.HeatPumps.Types.Distribution.Variable1Only
     "Set to true if the CHW loop has a minimum flow bypass valve"
     annotation (Evaluate=true,
     Dialog(group="Primary loop"));
-  // Constant primary plants with separate dedicated primary CHW pumps.
+  // Constant primary - variable secondary plants with separate dedicated primary CHW pumps or headered primary pumps.
   parameter Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary typPumChiWatPri_select1(
     start=Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Variable)=
     typPumHeaWatPri
     "Type of primary CHW pumps"
     annotation (Evaluate=true,
     Dialog(group="Primary loop",
-      enable=have_pumChiWatPriDed and (typDis==Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Only
-        or typDis==Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Variable2)));
-  // Constant primary plants with headered primary pumps.
-  parameter Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary typPumChiWatPri_select2(
-    start=Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Variable)=
-    typPumHeaWatPri
-    "Type of primary CHW pumps"
-    annotation (Evaluate=true,
-    Dialog(group="Primary loop",
-      enable=have_chiWat and typArrPumPri==Buildings.Templates.Components.Types.PumpArrangement.Headered
-        and (typDis==Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Only
-        or typDis==Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Variable2)),
+      enable=(have_pumChiWatPriDed
+      or have_chiWat and typArrPumPri==Buildings.Templates.Components.Types.PumpArrangement.Headered)
+      and typDis==Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Variable2),
     choices(choice=Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Constant
       "Constant speed pump specified separately",
     choice=Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Variable
       "Variable speed pump specified separately"));
-  // Variable primary plants with headered primary CHW pumps require variable speed pumps.
+  // Constant primary-only plants and variable primary plants require variable speed pumps.
   final parameter Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary typPumChiWatPri=
-    if have_pumChiWatPriDed and (typDis == Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Only
-    or typDis == Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Variable2)
-    then typPumChiWatPri_select1 elseif have_chiWat and typArrPumPri ==
-    Buildings.Templates.Components.Types.PumpArrangement.Headered and (typDis ==
-    Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Only or typDis ==
-    Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Variable2)
-    then typPumChiWatPri_select2 elseif have_pumChiWatPriDed and (typDis ==
-    Buildings.Templates.Plants.HeatPumps.Types.Distribution.Variable1Only or typDis ==
-    Buildings.Templates.Plants.HeatPumps.Types.Distribution.Variable1And2) then
-    Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Variable
-    elseif have_chiWat and typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Headered
-    and (typDis == Buildings.Templates.Plants.HeatPumps.Types.Distribution.Variable1Only
-    or typDis == Buildings.Templates.Plants.HeatPumps.Types.Distribution.Variable1And2)
-    then Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Variable else
-    Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.None
+    if have_pumChiWatPriDed
+      or have_chiWat and typArrPumPri==Buildings.Templates.Components.Types.PumpArrangement.Headered
+    then (if typDis == Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Variable2
+    then typPumChiWatPri_select1 else  Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Variable)
+    else Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.None
     "Type of primary CHW pumps"
     annotation (Evaluate=true);
   final parameter Boolean have_pumChiWatPriVar=
@@ -335,6 +307,17 @@ partial model PartialHeatPumpPlant
     "Number of primary CHW pumps"
     annotation (Evaluate=true,
     Dialog(group="Primary loop"));
+  parameter Buildings.Templates.Components.Types.IntegrationPoint typTanChiWat_select(
+    start=Buildings.Templates.Components.Types.IntegrationPoint.None)=
+    Buildings.Templates.Components.Types.IntegrationPoint.Return
+    "Specify if there is a CHW buffer tank and where it is integrated into the system"
+    annotation (Evaluate=true,
+    Dialog(group="Primary loop", enable=have_chiWat));
+  final parameter Buildings.Templates.Components.Types.IntegrationPoint typTanChiWat=
+    if have_chiWat then typTanChiWat_select
+    else Buildings.Templates.Components.Types.IntegrationPoint.None
+    "Specify if there is a CHW buffer tank and where it is integrated into the system"
+    annotation (Evaluate=true);
   // RFE: Currently, only centralized secondary CHW pumps are supported for primary-secondary plants.
   final parameter Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary typPumChiWatSec=
     if have_chiWat and (typDis == Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Variable2
@@ -405,11 +388,9 @@ partial model PartialHeatPumpPlant
     "OAT or source fluid supply temperature (evaporator entering) in heating mode - Each heat pump";
   final parameter Modelica.Units.SI.Temperature TSouCoo_nominal=dat.hp.TSouCooHp_nominal
     "OAT or source fluid supply temperature (evaporator entering) in cooling mode - Each heat pump";
-  // Dynamics and miscellaneous parameterss.
-  parameter Modelica.Units.SI.Time tau=30
-    "Time constant at nominal flow"
-    annotation (Dialog(tab="Dynamics",group="Nominal condition"));
-  parameter Modelica.Fluid.Types.Dynamics energyDynamics=Modelica.Fluid.Types.Dynamics.DynamicFreeInitial
+  // Dynamics and miscellaneous parameters.
+  final parameter Modelica.Fluid.Types.Dynamics energyDynamics=
+    Modelica.Fluid.Types.Dynamics.FixedInitial
     "Type of energy balance: dynamic (3 initialization options) or steady state"
     annotation (Evaluate=true,
     Dialog(tab="Dynamics",group="Conservation equations"));
@@ -417,6 +398,9 @@ partial model PartialHeatPumpPlant
     "= true to allow flow reversal, false restricts to design direction (port_a -> port_b)"
     annotation (Dialog(tab="Assumptions"),
     Evaluate=true);
+  parameter Boolean linearized = false
+    "= true, use linear relation between m_flow and dp for all valves"
+    annotation(Evaluate=true, Dialog(tab="Advanced"));
   parameter Boolean show_T=false
     "= true, if actual temperature at port is computed"
     annotation (Dialog(tab="Advanced",group="Diagnostics"));
diff --git a/Buildings/Templates/Plants/HeatPumps/Types.mo b/Buildings/Templates/Plants/HeatPumps/Types.mo
index eced4ebe8bf..da700295d16 100644
--- a/Buildings/Templates/Plants/HeatPumps/Types.mo
+++ b/Buildings/Templates/Plants/HeatPumps/Types.mo
@@ -32,12 +32,6 @@ package Types
     Centralized
       "Variable secondary centralized")
     "Enumeration to specify the type of secondary HW pumps";
-  type SensorLocation = enumeration(
-    Return
-      "Sensor in the return line",
-    Supply
-      "Sensor in the supply line")
-    "Enumeration to specify the sensor location";
   annotation (
     Documentation(
       info="<html>
diff --git a/Buildings/Templates/Plants/HeatPumps/Validation/AirToWater.mo b/Buildings/Templates/Plants/HeatPumps/Validation/AirToWater.mo
index dc1438e2bd2..99a7aaf4f5f 100644
--- a/Buildings/Templates/Plants/HeatPumps/Validation/AirToWater.mo
+++ b/Buildings/Templates/Plants/HeatPumps/Validation/AirToWater.mo
@@ -10,9 +10,10 @@ model AirToWater
     annotation (Evaluate=true,
     Dialog(group="Configuration"));
   inner parameter UserProject.Data.AllSystems datAll(
-    pla(final cfg=pla.cfg))
+    pla(
+      final cfg=pla.cfg))
     "Plant parameters"
-    annotation (Placement(transformation(extent={{-120,160},{-100,180}})));
+    annotation (Placement(transformation(extent={{160,160},{180,180}})));
   parameter Boolean allowFlowReversal=true
     "= true to allow flow reversal, false restricts to design direction (port_a -> port_b)"
     annotation (Dialog(tab="Assumptions"),
@@ -26,7 +27,7 @@ model AirToWater
       "modelica://Buildings/Resources/weatherdata/USA_CA_San.Francisco.Intl.AP.724940_TMY3.mos"))
     "Outdoor conditions"
     annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,
-      origin={-170,-40})));
+      origin={-170,-60})));
   Fluid.HeatExchangers.SensibleCooler_T loaHeaWat(
     redeclare final package Medium=Medium,
     final m_flow_nominal=pla.mHeaWat_flow_nominal,
@@ -34,9 +35,9 @@ model AirToWater
     final dp_nominal=0,
     final energyDynamics=energyDynamics,
     tau=300,
-    QMin_flow=-pla.capHea_nominal)
+    QMin_flow=- pla.capHea_nominal)
     "HW system approximated by prescribed return temperature"
-    annotation (Placement(transformation(extent={{70,-110},{90,-90}})));
+    annotation (Placement(transformation(extent={{70,-130},{90,-110}})));
   Fluid.HeatExchangers.Heater_T loaChiWat(
     redeclare final package Medium=Medium,
     final m_flow_nominal=pla.mChiWat_flow_nominal,
@@ -47,279 +48,254 @@ model AirToWater
     QMax_flow=pla.capCoo_nominal)
     if have_chiWat
     "CHW system system approximated by prescribed return temperature"
-    annotation (Placement(transformation(extent={{70,-50},{90,-30}})));
-  Fluid.Actuators.Valves.TwoWayEqualPercentage     valDisHeaWat(
+    annotation (Placement(transformation(extent={{70,-70},{90,-50}})));
+  Fluid.Actuators.Valves.TwoWayEqualPercentage valDisHeaWat(
     redeclare final package Medium=Medium,
     m_flow_nominal=pla.mHeaWat_flow_nominal,
     dpValve_nominal=3E4,
     dpFixed_nominal=datAll.pla.ctl.dpHeaWatRemSet_max[1] - 3E4)
     "Distribution system approximated by variable flow resistance"
-    annotation (Placement(transformation(extent={{110,-110},{130,-90}})));
-  Fluid.Actuators.Valves.TwoWayEqualPercentage     valDisChiWat(
+    annotation (Placement(transformation(extent={{110,-130},{130,-110}})));
+  Fluid.Actuators.Valves.TwoWayEqualPercentage valDisChiWat(
     redeclare final package Medium=Medium,
     m_flow_nominal=pla.mChiWat_flow_nominal,
     dpValve_nominal=3E4,
     dpFixed_nominal=datAll.pla.ctl.dpChiWatRemSet_max[1] - 3E4)
     if have_chiWat
     "Distribution system approximated by variable flow resistance"
-    annotation (Placement(transformation(extent={{110,-50},{130,-30}})));
+    annotation (Placement(transformation(extent={{110,-70},{130,-50}})));
   Buildings.Templates.Plants.HeatPumps.AirToWater pla(
     redeclare final package MediumHeaWat=Medium,
+    have_hrc_select=true,
     final dat=datAll.pla,
     final have_chiWat=have_chiWat,
     nHp=3,
-    typArrPumPri=Buildings.Templates.Components.Types.PumpArrangement.Dedicated,
-    typPumHeaWatPri_select2=Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Variable,
-    typPumChiWatPri_select1=Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Constant,
-    final energyDynamics=energyDynamics,
+    typPumHeaWatPri_select1=Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Constant,
     final allowFlowReversal=allowFlowReversal,
+    linearized=true,
     show_T=true,
     ctl(
       nAirHan=1,
-      nEquZon=0,
-      have_senVHeaWatPri_select=true,
-      have_senVChiWatPri_select=true,
-      have_senTHeaWatPriRet_select=true,
-      have_senTChiWatPriRet_select=true,
-      have_senTHeaWatSecRet=true,
-      have_senTChiWatSecRet=true,
-      have_senDpHeaWatRemWir=true))
+      nEquZon=0),
+    is_dpBalYPumSetCal=true)
     "Heat pump plant"
-    annotation (Placement(transformation(extent={{-80,-100},{-40,-60}})));
+    annotation (Placement(transformation(extent={{-80,-120},{-40,-80}})));
   Buildings.Controls.OBC.CDL.Reals.Sources.Constant TDum(
     k=293.15,
     y(final unit="K",
       displayUnit="degC"))
     "Placeholder signal for request generator"
-    annotation (Placement(transformation(extent={{-180,130},{-160,150}})));
-  Fluid.Sensors.RelativePressure dpHeaWatRem_1(
-    redeclare final package Medium = Medium)
+    annotation (Placement(transformation(extent={{-180,150},{-160,170}})));
+  Fluid.Sensors.RelativePressure dpHeaWatRem[1](
+    redeclare each final package Medium=Medium)
     "HW differential pressure at one remote location"
-    annotation (Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=-90,
-        origin={40,-120})));
-  Fluid.Sensors.RelativePressure dpChiWatRem_1(
-    redeclare final package Medium = Medium) if have_chiWat
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=-90,
+      origin={40,-140})));
+  Fluid.Sensors.RelativePressure dpChiWatRem[1](
+    redeclare each final package Medium=Medium)
+    if have_chiWat
     "CHW differential pressure at one remote location"
-    annotation (Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=-90,
-        origin={40,-60})));
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=-90,
+      origin={40,-80})));
   Buildings.Controls.OBC.ASHRAE.G36.AHUs.MultiZone.VAV.SetPoints.PlantRequests reqPlaRes(
-    final heaCoi=Buildings.Controls.OBC.ASHRAE.G36.Types.HeatingCoil.WaterBased, final
-      cooCoi=if have_chiWat then Buildings.Controls.OBC.ASHRAE.G36.Types.CoolingCoil.WaterBased
-         else Buildings.Controls.OBC.ASHRAE.G36.Types.CoolingCoil.None)
+    final heaCoi=Buildings.Controls.OBC.ASHRAE.G36.Types.HeatingCoil.WaterBased,
+    final cooCoi=if have_chiWat then Buildings.Controls.OBC.ASHRAE.G36.Types.CoolingCoil.WaterBased
+      else Buildings.Controls.OBC.ASHRAE.G36.Types.CoolingCoil.None)
     "Plant and reset request"
-    annotation (Placement(transformation(extent={{90,102},{70,122}})));
-  AirHandlersFans.Interfaces.Bus busAirHan "AHU control bus" annotation (
-      Placement(transformation(extent={{-60,100},{-20,140}}),iconTransformation(
-          extent={{-340,-140},{-300,-100}})));
-  Interfaces.Bus busPla "Plant control bus" annotation (Placement(
-        transformation(extent={{-100,-40},{-60,0}}), iconTransformation(extent
-          ={{-370,-70},{-330,-30}})));
-  Buildings.Controls.OBC.CDL.Routing.RealVectorFilter dpChiWatRem(
-    final nin=pla.cfg.nSenDpChiWatRem,
-    final nout=pla.cfg.nSenDpChiWatRem) if have_chiWat
-    "Gather all remote CHW differential pressure signals"
-    annotation (Placement(transformation(extent={{10,10},{-10,30}})));
-  Buildings.Controls.OBC.CDL.Routing.RealVectorFilter dpHeaWatRem(
-    final nin=pla.cfg.nSenDpHeaWatRem,
-    final nout=pla.cfg.nSenDpHeaWatRem)
-    "Gather all remote HW differential pressure signals"
-    annotation (Placement(transformation(extent={{10,-30},{-10,-10}})));
+    annotation (Placement(transformation(extent={{90,122},{70,142}})));
+  AirHandlersFans.Interfaces.Bus busAirHan
+    "AHU control bus"
+    annotation (Placement(transformation(extent={{-60,120},{-20,160}}),
+      iconTransformation(extent={{-340,-140},{-300,-100}})));
+  Interfaces.Bus busPla
+    "Plant control bus"
+    annotation (Placement(transformation(extent={{-100,-60},{-60,-20}}),
+      iconTransformation(extent={{-370,-70},{-330,-30}})));
   Buildings.Controls.OBC.CDL.Reals.Sources.TimeTable ratFlo(
-    table=[0,0,0; 5,0,0; 7,1,0; 12,0.2,0.2; 16,0,1; 22,0.1,0.1; 24,0,0],
+    table=[
+      0, 0, 0;
+      5, 0, 0;
+      7, 1, 0;
+      12, 0.2, 0.2;
+      16, 0, 1;
+      22, 0.1, 0.1;
+      24, 0, 0],
     timeScale=3600)
     "Source signal for flow rate ratio – Index 1 for HW, 2 for CHW"
-    annotation (Placement(transformation(extent={{-180,70},{-160,90}})));
+    annotation (Placement(transformation(extent={{-180,90},{-160,110}})));
   Buildings.Controls.OBC.CDL.Reals.PID ctlEquZon[if have_chiWat then 2 else 1](
     each k=0.1,
     each Ti=60,
-    each final reverseActing=true) "Zone equipment controller"
-    annotation (Placement(transformation(extent={{70,70},{90,90}})));
+    each final reverseActing=true)
+    "Zone equipment controller"
+    annotation (Placement(transformation(extent={{70,90},{90,110}})));
   Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter norFlo[if have_chiWat
-     then 2 else 1](
-     k=if have_chiWat then {1/pla.mHeaWat_flow_nominal,1/pla.mChiWat_flow_nominal}
-         else {1/pla.mHeaWat_flow_nominal})
-     "Normalize flow rate" annotation (
-     Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=90,
-        origin={180,0})));
+    then 2 else 1](
+    k=if have_chiWat then {1 / pla.mHeaWat_flow_nominal, 1 / pla.mChiWat_flow_nominal}
+      else {1 / pla.mHeaWat_flow_nominal})
+    "Normalize flow rate"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=90,
+      origin={180,0})));
   Fluid.Sensors.MassFlowRate mChiWat_flow(
-   redeclare final package Medium = Medium) if have_chiWat
-   "CHW mass flow rate" annotation (
-      Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=-90,
-        origin={160,-60})));
-  Fluid.Sensors.MassFlowRate mHeaWat_flow(redeclare final package Medium =
-        Medium) "HW mass flow rate" annotation (Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=-90,
-        origin={160,-120})));
-  Buildings.Controls.OBC.CDL.Reals.AddParameter TChiWatRet(p=pla.TChiWatRet_nominal
-         - pla.TChiWatSup_nominal) if have_chiWat
+    redeclare final package Medium=Medium)
+    if have_chiWat
+    "CHW mass flow rate"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=-90,
+      origin={160,-80})));
+  Fluid.Sensors.MassFlowRate mHeaWat_flow(
+    redeclare final package Medium=Medium)
+    "HW mass flow rate"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=-90,
+      origin={160,-140})));
+  Buildings.Controls.OBC.CDL.Reals.AddParameter TChiWatRet(
+    p=pla.TChiWatRet_nominal - pla.TChiWatSup_nominal)
+    if have_chiWat
     "Prescribed CHW return temperature"
-    annotation (Placement(transformation(extent={{-130,30},{-110,50}})));
-  Buildings.Controls.OBC.CDL.Reals.AddParameter THeaWatRet(p=pla.THeaWatRet_nominal
-         - pla.THeaWatSup_nominal) "Prescribed HW return temperature"
-    annotation (Placement(transformation(extent={{-130,-10},{-110,10}})));
-  Buildings.Controls.OBC.CDL.Reals.Max max2 "Limit prescribed HWRT"
-    annotation (Placement(transformation(extent={{-90,-10},{-70,10}})));
-  Buildings.Controls.OBC.CDL.Reals.Min min1 if have_chiWat
+    annotation (Placement(transformation(extent={{-130,52},{-110,72}})));
+  Buildings.Controls.OBC.CDL.Reals.AddParameter THeaWatRet(
+    p=pla.THeaWatRet_nominal - pla.THeaWatSup_nominal)
+    "Prescribed HW return temperature"
+    annotation (Placement(transformation(extent={{-130,12},{-110,32}})));
+  Buildings.Controls.OBC.CDL.Reals.Max max2
+    "Limit prescribed HWRT"
+    annotation (Placement(transformation(extent={{-90,12},{-70,32}})));
+  Buildings.Controls.OBC.CDL.Reals.Min min1
+    if have_chiWat
     "Limit prescribed CHWRT"
-    annotation (Placement(transformation(extent={{-90,30},{-70,50}})));
+    annotation (Placement(transformation(extent={{-90,52},{-70,72}})));
   Buildings.Controls.OBC.CDL.Integers.Multiply mulInt[4]
     "Importance multiplier"
-    annotation (Placement(transformation(extent={{0,110},{-20,130}})));
-  Buildings.Controls.OBC.CDL.Integers.Sources.Constant cst[4](each k=10)
+    annotation (Placement(transformation(extent={{0,130},{-20,150}})));
+  Buildings.Controls.OBC.CDL.Integers.Sources.Constant cst[4](
+    each k=10)
     "Constant"
-    annotation (Placement(transformation(extent={{40,150},{20,170}})));
+    annotation (Placement(transformation(extent={{40,170},{20,190}})));
   Buildings.Fluid.FixedResistances.PressureDrop pipHeaWat(
-    redeclare final package Medium =Medium,
+    redeclare final package Medium=Medium,
     final m_flow_nominal=pla.mHeaWat_flow_nominal,
-    final dp_nominal=max(
-      max(datAll.pla.pumHeaWatPri.dp_nominal),
-      max(datAll.pla.pumHeaWatSec.dp_nominal)) - datAll.pla.ctl.dpHeaWatRemSet_max[1])
+    final dp_nominal=Buildings.Templates.Data.Defaults.dpHeaWatLocSet_max - max(datAll.pla.ctl.dpHeaWatRemSet_max))
     "Piping"
-    annotation (Placement(transformation(extent={{10,-150},{-10,-130}})));
+    annotation (Placement(transformation(extent={{10,-170},{-10,-150}})));
   Buildings.Fluid.FixedResistances.PressureDrop pipChiWat(
-    redeclare final package Medium =Medium,
+    redeclare final package Medium=Medium,
     final m_flow_nominal=pla.mChiWat_flow_nominal,
-    final dp_nominal=max(
-      max(datAll.pla.pumChiWatPri.dp_nominal),
-      max(datAll.pla.pumChiWatSec.dp_nominal)) - datAll.pla.ctl.dpChiWatRemSet_max[1])
+    final dp_nominal=Buildings.Templates.Data.Defaults.dpChiWatLocSet_max - max(datAll.pla.ctl.dpChiWatRemSet_max))
     if have_chiWat
     "Piping"
-    annotation (Placement(transformation(extent={{10,-90},{-10,-70}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant con(k=293.15)
+    annotation (Placement(transformation(extent={{10,-110},{-10,-90}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant con(
+    k=293.15)
     "Constant limiting prescribed return temperature"
-    annotation (Placement(transformation(extent={{-180,10},{-160,30}})));
-  Controls.Utilities.PlaceholderInteger ph[2](each final have_inp=have_chiWat,
-      each final u_internal=0) "Placeholder value"
-    annotation (Placement(transformation(extent={{40,114},{20,134}})));
+    annotation (Placement(transformation(extent={{-180,32},{-160,52}})));
+  Controls.Utilities.PlaceholderInteger ph[2](
+    each final have_inp=have_chiWat,
+    each final u_internal=0)
+    "Placeholder value"
+    annotation (Placement(transformation(extent={{40,134},{20,154}})));
 equation
   if have_chiWat then
     connect(mulInt[3].y, busAirHan.reqResChiWat)
-      annotation (Line(points={{-22,120},{-40,120}}, color={255,127,0}));
+      annotation (Line(points={{-22,140},{-40,140}},color={255,127,0}));
     connect(mulInt[4].y, busAirHan.reqPlaChiWat)
-      annotation (Line(points={{-22,120},{-40,120}}, color={255,127,0}));
+      annotation (Line(points={{-22,140},{-40,140}},color={255,127,0}));
   end if;
   connect(weaDat.weaBus, pla.busWea)
-    annotation (Line(points={{-160,-40},{-60,-40},{-60,-60}},
-                                                           color={255,204,51},thickness=0.5));
+    annotation (Line(points={{-160,-60},{-60,-60},{-60,-80}},color={255,204,51},thickness=0.5));
   connect(pla.port_bChiWat, loaChiWat.port_a)
-    annotation (Line(points={{-40,-76},{-20,-76},{-20,-40},{70,-40}},
-                                                             color={0,127,255}));
+    annotation (Line(points={{-40,-96},{-20,-96},{-20,-60},{70,-60}},color={0,127,255}));
   connect(loaChiWat.port_b, valDisChiWat.port_a)
-    annotation (Line(points={{90,-40},{110,-40}},
-                                            color={0,127,255}));
+    annotation (Line(points={{90,-60},{110,-60}},color={0,127,255}));
   connect(loaHeaWat.port_b, valDisHeaWat.port_a)
-    annotation (Line(points={{90,-100},{110,-100}},
-                                                color={0,127,255}));
+    annotation (Line(points={{90,-120},{110,-120}},color={0,127,255}));
   connect(pla.port_bHeaWat, loaHeaWat.port_a)
-    annotation (Line(points={{-40,-90},{-20,-90},{-20,-100},{70,-100}},
-                                                                 color={0,127,255}));
-  connect(loaChiWat.port_a, dpChiWatRem_1.port_a)
-    annotation (Line(points={{70,-40},{40,-40},{40,-50}}, color={0,127,255}));
-  connect(dpHeaWatRem_1.port_a, loaHeaWat.port_a) annotation (Line(points={{40,-110},
-          {40,-100},{70,-100}}, color={0,127,255}));
-  connect(TDum.y, reqPlaRes.TAirSup) annotation (Line(points={{-158,140},{100,
-          140},{100,120},{92,120}},color={0,0,127}));
-  connect(TDum.y, reqPlaRes.TAirSupSet) annotation (Line(points={{-158,140},{
-          100,140},{100,115},{92,115}},
-                                   color={0,0,127}));
-  connect(busAirHan, pla.busAirHan[1]) annotation (Line(
-      points={{-40,120},{-40,-62}},
-      color={255,204,51},
-      thickness=0.5));
-  connect(pla.bus, busPla) annotation (Line(
-      points={{-80,-62},{-80,-20}},
-      color={255,204,51},
-      thickness=0.5));
-  connect(dpHeaWatRem.y, busPla.dpHeaWatRem)
-    annotation (Line(points={{-12,-20},{-80,-20}}, color={0,0,127}));
-  connect(dpChiWatRem.y, busPla.dpChiWatRem)
-    annotation (Line(points={{-12,20},{-20,20},{-20,-18},{-80,-18},{-80,-20}},
-                                                           color={0,0,127}));
-  connect(valDisChiWat.y_actual, reqPlaRes.uCooCoiSet) annotation (Line(points={{125,-33},
-          {140,-33},{140,109},{92,109}},          color={0,0,127}));
-  connect(valDisHeaWat.y_actual, reqPlaRes.uHeaCoiSet) annotation (Line(points={{125,-93},
-          {136,-93},{136,104},{92,104}},          color={0,0,127}));
-  connect(dpHeaWatRem_1.p_rel, dpHeaWatRem.u[1]) annotation (Line(points={{31,-120},
-          {20,-120},{20,-20},{12,-20}},
-                                      color={0,0,127}));
-  connect(dpChiWatRem_1.p_rel, dpChiWatRem.u[1]) annotation (Line(points={{31,-60},
-          {22,-60},{22,20},{12,20}},
-                                   color={0,0,127}));
-  connect(valDisChiWat.port_b, mChiWat_flow.port_a) annotation (Line(points={{130,-40},
-          {160,-40},{160,-50}},      color={0,127,255}));
-  connect(mChiWat_flow.port_b, dpChiWatRem_1.port_b) annotation (Line(points={{160,
-          -70},{160,-80},{40,-80},{40,-70}}, color={0,127,255}));
-  connect(valDisHeaWat.port_b, mHeaWat_flow.port_a) annotation (Line(points={{130,
-          -100},{160,-100},{160,-110}}, color={0,127,255}));
-  connect(mHeaWat_flow.port_b, dpHeaWatRem_1.port_b) annotation (Line(points={{160,
-          -130},{160,-140},{40,-140},{40,-130}}, color={0,127,255}));
-  connect(mHeaWat_flow.m_flow, norFlo[1].u) annotation (Line(points={{171,-120},
-          {180,-120},{180,-12}}, color={0,0,127}));
+    annotation (Line(points={{-40,-110},{-20,-110},{-20,-120},{70,-120}},color={0,127,255}));
+  connect(loaChiWat.port_a, dpChiWatRem[1].port_a)
+    annotation (Line(points={{70,-60},{40,-60},{40,-70}},color={0,127,255}));
+  connect(dpHeaWatRem[1].port_a, loaHeaWat.port_a)
+    annotation (Line(points={{40,-130},{40,-120},{70,-120}},color={0,127,255}));
+  connect(TDum.y, reqPlaRes.TAirSup)
+    annotation (Line(points={{-158,160},{100,160},{100,140},{92,140}},color={0,0,127}));
+  connect(TDum.y, reqPlaRes.TAirSupSet)
+    annotation (Line(points={{-158,160},{100,160},{100,135},{92,135}},color={0,0,127}));
+  connect(busAirHan, pla.busAirHan[1])
+    annotation (Line(points={{-40,140},{-40,-82}},color={255,204,51},thickness=0.5));
+  connect(pla.bus, busPla)
+    annotation (Line(points={{-80,-82},{-80,-40}},color={255,204,51},thickness=0.5));
+  connect(valDisChiWat.y_actual, reqPlaRes.uCooCoiSet)
+    annotation (Line(points={{125,-53},{140,-53},{140,129},{92,129}},color={0,0,127}));
+  connect(valDisHeaWat.y_actual, reqPlaRes.uHeaCoiSet)
+    annotation (Line(points={{125,-113},{136,-113},{136,124},{92,124}},color={0,0,127}));
+  connect(valDisChiWat.port_b, mChiWat_flow.port_a)
+    annotation (Line(points={{130,-60},{160,-60},{160,-70}},color={0,127,255}));
+  connect(mChiWat_flow.port_b, dpChiWatRem[1].port_b)
+    annotation (Line(points={{160,-90},{160,-100},{40,-100},{40,-90}},color={0,127,255}));
+  connect(valDisHeaWat.port_b, mHeaWat_flow.port_a)
+    annotation (Line(points={{130,-120},{160,-120},{160,-130}},color={0,127,255}));
+  connect(mHeaWat_flow.port_b, dpHeaWatRem[1].port_b)
+    annotation (Line(points={{160,-150},{160,-160},{40,-160},{40,-150}},color={0,127,255}));
+  connect(mHeaWat_flow.m_flow, norFlo[1].u)
+    annotation (Line(points={{171,-140},{180,-140},{180,-12}},color={0,0,127}));
   connect(mChiWat_flow.m_flow, norFlo[2].u)
-    annotation (Line(points={{171,-60},{180,-60},{180,-12}}, color={0,0,127}));
-  connect(norFlo.y, ctlEquZon.u_m) annotation (Line(points={{180,12},{180,60},{80,
-          60},{80,68}}, color={0,0,127}));
+    annotation (Line(points={{171,-80},{180,-80},{180,-12}},color={0,0,127}));
+  connect(norFlo.y, ctlEquZon.u_m)
+    annotation (Line(points={{180,12},{180,60},{80,60},{80,88}},color={0,0,127}));
   connect(ratFlo.y[1:(if have_chiWat then 2 else 1)], ctlEquZon.u_s)
-    annotation (Line(points={{-158,80},{68,80}}, color={0,0,127}));
-  connect(ctlEquZon[2].y, valDisChiWat.y) annotation (Line(points={{92,80},{100,
-          80},{100,-20},{120,-20},{120,-28}}, color={0,0,127}));
-  connect(ctlEquZon[1].y, valDisHeaWat.y) annotation (Line(points={{92,80},{100,
-          80},{100,-84},{120,-84},{120,-88}}, color={0,0,127}));
-  connect(busPla.THeaWatPriSup, THeaWatRet.u) annotation (Line(
-      points={{-80,-20},{-140,-20},{-140,0},{-132,0}},
-      color={255,204,51},
-      thickness=0.5));
-  connect(busPla.TChiWatPriSup, TChiWatRet.u) annotation (Line(
-      points={{-80,-20},{-140,-20},{-140,40},{-132,40}},
-      color={255,204,51},
-      thickness=0.5));
-  connect(TChiWatRet.y,min1. u1) annotation (Line(points={{-108,40},{-100,40},{-100,
-          46},{-92,46}}, color={0,0,127}));
-  connect(min1.y, loaChiWat.TSet) annotation (Line(points={{-68,40},{62,40},{62,
-          -32},{68,-32}}, color={0,0,127}));
-  connect(max2.y, loaHeaWat.TSet) annotation (Line(points={{-68,0},{60,0},{60,-92},
-          {68,-92}}, color={0,0,127}));
-  connect(cst.y, mulInt.u1) annotation (Line(points={{18,160},{6,160},{6,126},{2,
-          126}}, color={255,127,0}));
-  connect(mulInt[1].y, busAirHan.reqResHeaWat) annotation (Line(points={{-22,120},
-          {-30,120},{-30,120},{-40,120}}, color={255,127,0}));
+    annotation (Line(points={{-158,100},{68,100}},color={0,0,127}));
+  connect(ctlEquZon[2].y, valDisChiWat.y)
+    annotation (Line(points={{92,100},{100,100},{100,-40},{120,-40},{120,-48}},
+      color={0,0,127}));
+  connect(ctlEquZon[1].y, valDisHeaWat.y)
+    annotation (Line(points={{92,100},{100,100},{100,-104},{120,-104},{120,-108}},
+      color={0,0,127}));
+  connect(busPla.THeaWatPriSup, THeaWatRet.u)
+    annotation (Line(points={{-80,-40},{-140,-40},{-140,22},{-132,22}},color={255,204,51},thickness=0.5));
+  connect(busPla.TChiWatPriSup, TChiWatRet.u)
+    annotation (Line(points={{-80,-40},{-140,-40},{-140,62},{-132,62}},color={255,204,51},thickness=0.5));
+  connect(TChiWatRet.y, min1.u1)
+    annotation (Line(points={{-108,62},{-100,62},{-100,68},{-92,68}},color={0,0,127}));
+  connect(min1.y, loaChiWat.TSet)
+    annotation (Line(points={{-68,62},{62,62},{62,-52},{68,-52}},color={0,0,127}));
+  connect(max2.y, loaHeaWat.TSet)
+    annotation (Line(points={{-68,22},{60,22},{60,-112},{68,-112}},color={0,0,127}));
+  connect(cst.y, mulInt.u1)
+    annotation (Line(points={{18,180},{6,180},{6,146},{2,146}},color={255,127,0}));
+  connect(mulInt[1].y, busAirHan.reqResHeaWat)
+    annotation (Line(points={{-22,140},{-40,140}},color={255,127,0}));
   connect(mulInt[2].y, busAirHan.reqPlaHeaWat)
-    annotation (Line(points={{-22,120},{-40,120}}, color={255,127,0}));
-  connect(pipHeaWat.port_b, pla.port_aHeaWat) annotation (Line(points={{-10,-140},
-          {-30,-140},{-30,-98},{-40,-98}}, color={0,127,255}));
-  connect(pipChiWat.port_b, pla.port_aChiWat) annotation (Line(points={{-10,-80},
-          {-20,-80},{-20,-84},{-40,-84}}, color={0,127,255}));
-  connect(mChiWat_flow.port_b, pipChiWat.port_a) annotation (Line(points={{160,-70},
-          {160,-80},{10,-80}}, color={0,127,255}));
-  connect(mHeaWat_flow.port_b, pipHeaWat.port_a) annotation (Line(points={{160,-130},
-          {160,-140},{10,-140}}, color={0,127,255}));
-  connect(con.y, min1.u2) annotation (Line(points={{-158,20},{-100,20},{-100,34},
-          {-92,34}}, color={0,0,127}));
-  connect(con.y, max2.u1) annotation (Line(points={{-158,20},{-100,20},{-100,6},
-          {-92,6}}, color={0,0,127}));
-  connect(THeaWatRet.y, max2.u2) annotation (Line(points={{-108,0},{-100,0},{
-          -100,-6},{-92,-6}}, color={0,0,127}));
-  connect(reqPlaRes.yChiWatResReq, ph[1].u) annotation (Line(points={{68,120},{
-          50,120},{50,124},{42,124}}, color={255,127,0}));
-  connect(reqPlaRes.yChiPlaReq, ph[2].u) annotation (Line(points={{68,115},{50,
-          115},{50,124},{42,124}}, color={255,127,0}));
-  connect(reqPlaRes.yHotWatResReq, mulInt[1].u2) annotation (Line(points={{68,
-          109},{12,109},{12,114},{2,114}}, color={255,127,0}));
-  connect(reqPlaRes.yHotWatPlaReq, mulInt[2].u2) annotation (Line(points={{68,
-          104},{12,104},{12,114},{2,114}}, color={255,127,0}));
-  connect(ph[1].y, mulInt[3].u2) annotation (Line(points={{18,124},{12,124},{12,
-          114},{2,114}}, color={255,127,0}));
-  connect(ph[2].y, mulInt[4].u2) annotation (Line(points={{18,124},{12,124},{12,
-          114},{2,114}}, color={255,127,0}));
+    annotation (Line(points={{-22,140},{-40,140}},color={255,127,0}));
+  connect(pipHeaWat.port_b, pla.port_aHeaWat)
+    annotation (Line(points={{-10,-160},{-30,-160},{-30,-118},{-40,-118}},color={0,127,255}));
+  connect(pipChiWat.port_b, pla.port_aChiWat)
+    annotation (Line(points={{-10,-100},{-20,-100},{-20,-104},{-40,-104}},color={0,127,255}));
+  connect(mChiWat_flow.port_b, pipChiWat.port_a)
+    annotation (Line(points={{160,-90},{160,-100},{10,-100}},color={0,127,255}));
+  connect(mHeaWat_flow.port_b, pipHeaWat.port_a)
+    annotation (Line(points={{160,-150},{160,-160},{10,-160}},color={0,127,255}));
+  connect(con.y, min1.u2)
+    annotation (Line(points={{-158,42},{-100,42},{-100,56},{-92,56}},color={0,0,127}));
+  connect(con.y, max2.u1)
+    annotation (Line(points={{-158,42},{-100,42},{-100,28},{-92,28}},color={0,0,127}));
+  connect(THeaWatRet.y, max2.u2)
+    annotation (Line(points={{-108,22},{-100,22},{-100,16},{-92,16}},color={0,0,127}));
+  connect(reqPlaRes.yChiWatResReq, ph[1].u)
+    annotation (Line(points={{68,140},{50,140},{50,144},{42,144}},color={255,127,0}));
+  connect(reqPlaRes.yChiPlaReq, ph[2].u)
+    annotation (Line(points={{68,135},{50,135},{50,144},{42,144}},color={255,127,0}));
+  connect(reqPlaRes.yHotWatResReq, mulInt[1].u2)
+    annotation (Line(points={{68,129},{12,129},{12,134},{2,134}},color={255,127,0}));
+  connect(reqPlaRes.yHotWatPlaReq, mulInt[2].u2)
+    annotation (Line(points={{68,124},{12,124},{12,134},{2,134}},color={255,127,0}));
+  connect(ph[1].y, mulInt[3].u2)
+    annotation (Line(points={{18,144},{12,144},{12,134},{2,134}},color={255,127,0}));
+  connect(ph[2].y, mulInt[4].u2)
+    annotation (Line(points={{18,144},{12,144},{12,134},{2,134}},color={255,127,0}));
+  connect(dpChiWatRem.p_rel, busPla.dpChiWatRem)
+    annotation (Line(points={{31,-80},{20.5,-80},{20.5,-40},{-80,-40}},color={0,0,127}),
+      Text(string="%second",index=1,extent={{-6,3},{-6,3}},horizontalAlignment=TextAlignment.Right));
+  connect(dpHeaWatRem.p_rel, busPla.dpHeaWatRem)
+    annotation (Line(points={{31,-140},{18,-140},{18,-42},{-80,-42},{-80,-40}},
+      color={0,0,127}),Text(string="%second",index=1,extent={{-6,3},{-6,3}},
+      horizontalAlignment=TextAlignment.Right));
   annotation (
     __Dymola_Commands(
       file=
@@ -339,22 +315,24 @@ cooling loads.
 The heating loads reach their peak value first, the cooling loads reach it last.
 </p>
 <p>
-Three equally sized heat pumps are modeled. All can be lead/lag alternated.
+Three equally sized heat pumps are modeled, which can all be lead/lag alternated.
+A heat recovery chiller is included (<code>pla.have_hrc_select=true</code>) 
+and connected to the HW and CHW return pipes (sidestream integration).
 A unique aggregated load is modeled on each loop by means of a cooling or heating
 component controlled to maintain a constant <i>&Delta;T</i>
 and a modulating valve controlled to track a prescribed flow rate.
-An importance multiplier of <i>10</i> is applied to the plant requests 
+An importance multiplier of <i>10</i> is applied to the plant requests
 and reset requests generated from the valve position.
 </p>
 <p>
 The user can toggle the top-level parameter <code>have_chiWat</code>
-to switch between a cooling and heating system (the default setting) 
+to switch between a cooling and heating system (the default setting)
 to a heating-only system.
 Advanced equipment and control options can be modified via the parameter
 dialog of the plant component.
 </p>
 <p>
-Simulating this model shows how the plant responds to a varying load by 
+Simulating this model shows how the plant responds to a varying load by
 </p>
 <ul>
 <li>
@@ -364,17 +342,34 @@ staging or unstaging the AWHPs and associated primary pumps,
 rotating lead/lag alternate equipment to ensure even wear,
 </li>
 <li>
-resetting the supply temperature and remote differential pressure 
+resetting the supply temperature and remote differential pressure
 in both the CHW and HW loops based on the valve position,
 </li>
 <li>
-staging and controlling the secondary pumps to meet the 
+staging and controlling the secondary pumps to meet the
 remote differential pressure setpoint.
 </li>
 </ul>
-</html>", revisions="<html>
+<h4>Details</h4>
+<p>
+By default, all valves within the plant are modeled considering a linear
+variation of the pressure drop with the flow rate (<code>pla.linearized=true</code>),
+as opposed to the quadratic relationship usually considered for
+a turbulent flow regime.
+By limiting the size of the system of nonlinear equations, this setting
+reduces the risk of solver failure and the time to solution for testing
+various plant configurations.
+</p>
+</html>",
+      revisions="<html>
 <ul>
 <li>
+May 31, 2024, by Antoine Gautier:<br/>
+Added sidestream HRC and refactored the model after updating the HP plant template.
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3808\">#3808</a>.
+</li>
+<li>
 March 29, 2024, by Antoine Gautier:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Templates/Plants/HeatPumps/Validation/UserProject/Data/AllSystems.mo b/Buildings/Templates/Plants/HeatPumps/Validation/UserProject/Data/AllSystems.mo
index 29b78074952..2f2863d01bb 100644
--- a/Buildings/Templates/Plants/HeatPumps/Validation/UserProject/Data/AllSystems.mo
+++ b/Buildings/Templates/Plants/HeatPumps/Validation/UserProject/Data/AllSystems.mo
@@ -10,42 +10,53 @@ class AllSystems
     hp(
       capHeaHp_nominal=500E3,
       capCooHp_nominal=500E3,
-      mHeaWatHp_flow_nominal=pla.hp.capHeaHp_nominal/abs(pla.ctl.THeaWatSup_nominal
-           - Buildings.Templates.Data.Defaults.THeaWatRetMed)/Buildings.Utilities.Psychrometrics.Constants.cpWatLiq,
-      mChiWatHp_flow_nominal=pla.hp.capCooHp_nominal/abs(pla.ctl.TChiWatSup_nominal
-           - Buildings.Templates.Data.Defaults.TChiWatRet)/Buildings.Utilities.Psychrometrics.Constants.cpWatLiq,
+      mHeaWatHp_flow_nominal=pla.hp.capHeaHp_nominal / abs(pla.ctl.THeaWatSup_nominal -
+        Buildings.Templates.Data.Defaults.THeaWatRetMed) / Buildings.Utilities.Psychrometrics.Constants.cpWatLiq,
+      mChiWatHp_flow_nominal=pla.hp.capCooHp_nominal / abs(pla.ctl.TChiWatSup_nominal -
+        Buildings.Templates.Data.Defaults.TChiWatRet) / Buildings.Utilities.Psychrometrics.Constants.cpWatLiq,
       dpHeaWatHp_nominal=Buildings.Templates.Data.Defaults.dpHeaWatHp,
       TSouHeaHp_nominal=Buildings.Templates.Data.Defaults.TOutHpHeaLow,
       TSouCooHp_nominal=Buildings.Templates.Data.Defaults.TOutHpCoo,
-      perFitHp(hea(
-          P=pla.hp.capHeaHp_nominal/Buildings.Templates.Data.Defaults.COPHpAwHea,
-          coeQ={-4.2670305442,-0.7381077035,6.0049480456,0,0},
-          coeP={-4.9107455513,5.3665308366,0.5447612754,0,0},
+      perFitHp(
+        hea(
+          P=pla.hp.capHeaHp_nominal / Buildings.Templates.Data.Defaults.COPHpAwHea,
+          coeQ={- 4.2670305442, - 0.7381077035, 6.0049480456, 0, 0},
+          coeP={- 4.9107455513, 5.3665308366, 0.5447612754, 0, 0},
           TRefLoa=pla.hp.THeaWatRetHp_nominal,
-          TRefSou=pla.hp.TSouHeaHp_nominal), coo(
-          P=pla.hp.capCooHp_nominal/Buildings.Templates.Data.Defaults.COPHpAwCoo,
-          coeQ={-2.2545246871,6.9089257665,-3.6548225094,0,0},
-          coeP={-5.8086010402,1.6894933858,5.1167787436,0,0},
+          TRefSou=pla.hp.TSouHeaHp_nominal),
+        coo(
+          P=pla.hp.capCooHp_nominal / Buildings.Templates.Data.Defaults.COPHpAwCoo,
+          coeQ={- 2.2545246871, 6.9089257665, - 3.6548225094, 0, 0},
+          coeP={- 5.8086010402, 1.6894933858, 5.1167787436, 0, 0},
           TRefLoa=pla.hp.TChiWatRetHp_nominal,
           TRefSou=pla.hp.TSouCooHp_nominal))),
-    pumHeaWatPri(dp_nominal=fill(
-      (if pla.cfg.have_chiWat and pla.cfg.typPumChiWatPri==Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.None
-        then max(pla.hp.dpHeaWatHp_nominal, pla.hp.dpChiWatHp_nominal) else  pla.hp.dpHeaWatHp_nominal) *1.2, pla.cfg.nPumHeaWatPri)
-           .+ (if pla.cfg.typDis == Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Only
-           or pla.cfg.typDis == Buildings.Templates.Plants.HeatPumps.Types.Distribution.Variable1Only
-           then Buildings.Templates.Data.Defaults.dpHeaWatLocSet_max else 0)),
+    pumHeaWatPri(
+      dp_nominal=fill(1.5 *(if pla.cfg.have_chiWat and pla.cfg.typPumChiWatPri ==
+        Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.None then max(pla.hp.dpHeaWatHp_nominal, pla.hp.dpChiWatHp_nominal)
+        else pla.hp.dpHeaWatHp_nominal), pla.cfg.nPumHeaWatPri) .+(if pla.cfg.typDis ==
+        Buildings.Templates.Plants.HeatPumps.Types.Distribution.Variable1Only
+        then Buildings.Templates.Data.Defaults.dpHeaWatLocSet_max else 0)),
     pumHeaWatSec(
-      m_flow_nominal=fill(
-        pla.ctl.VHeaWatSec_flow_nominal*Buildings.Media.Water.d_const/max(1,pla.cfg.nPumHeaWatSec), pla.cfg.nPumHeaWatSec),
+      m_flow_nominal=fill(pla.ctl.VHeaWatSec_flow_nominal * Buildings.Media.Water.d_const /
+        max(1, pla.cfg.nPumHeaWatSec), pla.cfg.nPumHeaWatSec),
       dp_nominal=fill(Buildings.Templates.Data.Defaults.dpHeaWatLocSet_max, pla.cfg.nPumHeaWatSec)),
-    pumChiWatPri(dp_nominal=fill(pla.hp.dpChiWatHp_nominal*1.2, pla.cfg.nPumChiWatPri)
-           .+ (if pla.cfg.typDis == Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Only
-           or pla.cfg.typDis == Buildings.Templates.Plants.HeatPumps.Types.Distribution.Variable1Only
-           then Buildings.Templates.Data.Defaults.dpChiWatLocSet_max else 0)),
+    pumChiWatPri(
+      dp_nominal=fill(1.5 * pla.hp.dpChiWatHp_nominal, pla.cfg.nPumChiWatPri) .+
+        (if pla.cfg.typDis == Buildings.Templates.Plants.HeatPumps.Types.Distribution.Variable1Only
+        then Buildings.Templates.Data.Defaults.dpChiWatLocSet_max else 0)),
     pumChiWatSec(
-      m_flow_nominal=fill(
-        pla.ctl.VChiWatSec_flow_nominal*Buildings.Media.Water.d_const/max(1,pla.cfg.nPumChiWatSec), pla.cfg.nPumChiWatSec),
+      m_flow_nominal=fill(pla.ctl.VChiWatSec_flow_nominal * Buildings.Media.Water.d_const /
+        max(1, pla.cfg.nPumChiWatSec), pla.cfg.nPumChiWatSec),
       dp_nominal=fill(Buildings.Templates.Data.Defaults.dpChiWatLocSet_max, pla.cfg.nPumChiWatSec)),
+    hrc(
+      redeclare Buildings.Fluid.Chillers.Data.ElectricReformulatedEIR.ReformEIRChiller_Trane_CGWD_207kW_3_99COP_None per,
+      cap_nominal=500E3,
+      dpChiWat_nominal=Buildings.Templates.Data.Defaults.dpChiWatChi,
+      dpCon_nominal=Buildings.Templates.Data.Defaults.dpConWatChi,
+      mChiWat_flow_nominal=pla.hrc.cap_nominal / abs(pla.ctl.TChiWatSup_nominal -
+        Buildings.Templates.Data.Defaults.TChiWatRet) / Buildings.Utilities.Psychrometrics.Constants.cpWatLiq,
+      mCon_flow_nominal=pla.hrc.QCon_flow_nominal / abs(pla.ctl.THeaWatSup_nominal -
+        Buildings.Templates.Data.Defaults.THeaWatRetMed) / Buildings.Utilities.Psychrometrics.Constants.cpWatLiq),
     ctl(
       THeaWatSupSet_min=298.15,
       VHeaWatSec_flow_nominal=pla.cfg.nHp * pla.ctl.VHeaWatHp_flow_nominal / 1.1,
@@ -53,23 +64,31 @@ class AllSystems
       VChiWatSec_flow_nominal=pla.cfg.nHp * pla.ctl.VChiWatHp_flow_nominal / 1.1,
       dpChiWatRemSet_max={Buildings.Templates.Data.Defaults.dpChiWatRemSet_max},
       dpHeaWatRemSet_max={Buildings.Templates.Data.Defaults.dpHeaWatRemSet_max},
+      dpChiWatLocSet_max=Buildings.Templates.Data.Defaults.dpChiWatLocSet_max,
+      dpHeaWatLocSet_max=Buildings.Templates.Data.Defaults.dpHeaWatLocSet_max,
       THeaWatSup_nominal=Buildings.Templates.Data.Defaults.THeaWatSupMed,
       TOutChiWatLck=273.15,
       TOutHeaWatLck=Buildings.Templates.Data.Defaults.TOutHeaWatLck,
-      VHeaWatHp_flow_nominal=pla.hp.mHeaWatHp_flow_nominal/Buildings.Media.Water.d_const,
-      VChiWatHp_flow_nominal=pla.hp.mChiWatHp_flow_nominal/Buildings.Media.Water.d_const,
+      VHeaWatHp_flow_nominal=pla.hp.mHeaWatHp_flow_nominal / Buildings.Media.Water.d_const,
+      VChiWatHp_flow_nominal=pla.hp.mChiWatHp_flow_nominal / Buildings.Media.Water.d_const,
       capHeaHp_nominal=pla.hp.capHeaHp_nominal,
       capCooHp_nominal=pla.hp.capCooHp_nominal,
       TChiWatSup_nominal=Buildings.Templates.Data.Defaults.TChiWatSup,
-      yPumChiWatPriSet=if pla.cfg.have_chiWat and pla.cfg.typPumChiWatPri==Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.None
-        then pla.hp.mChiWatHp_flow_nominal/max(pla.hp.mHeaWatHp_flow_nominal, pla.hp.mChiWatHp_flow_nominal) else 1,
-      yPumHeaWatPriSet=if pla.cfg.have_chiWat and pla.cfg.typPumChiWatPri==Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.None
-        then pla.hp.mHeaWatHp_flow_nominal/max(pla.hp.mHeaWatHp_flow_nominal, pla.hp.mChiWatHp_flow_nominal) else 1,
-      staEqu={fill(i/pla.cfg.nHp, pla.cfg.nHp) for i in 1:pla.cfg.nHp}))
+      yPumChiWatPriSet=if pla.cfg.have_chiWat and pla.cfg.typPumChiWatPri ==
+        Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.None then pla.hp.mChiWatHp_flow_nominal /
+        max(pla.hp.mHeaWatHp_flow_nominal, pla.hp.mChiWatHp_flow_nominal) else 1,
+      yPumHeaWatPriSet=if pla.cfg.have_chiWat and pla.cfg.typPumChiWatPri ==
+        Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.None then pla.hp.mHeaWatHp_flow_nominal /
+        max(pla.hp.mHeaWatHp_flow_nominal, pla.hp.mChiWatHp_flow_nominal) else 1,
+      staEqu={fill(i / pla.cfg.nHp, pla.cfg.nHp) for i in 1:pla.cfg.nHp},
+      TChiWatSupHrc_min=Buildings.Templates.Data.Defaults.TChiWatSup_min,
+      THeaWatSupHrc_max=pla.ctl.THeaWatSup_nominal + 5,
+      COPHeaHrc_nominal=4.8,
+      capCooHrc_min=0.3 * pla.hrc.cap_nominal,
+      capHeaHrc_min=0.3 * pla.hrc.QCon_flow_nominal))
     "Parameters for heat pump plant"
     annotation (Dialog(group="Plants"),
     Placement(transformation(extent={{-10,0},{10,20}})));
-
   annotation (
     defaultComponentPrefixes="inner parameter",
     defaultComponentName="datAll",
diff --git a/Buildings/Templates/Plants/HeatPumps/Validation/UserProject/Data/package.mo b/Buildings/Templates/Plants/HeatPumps/Validation/UserProject/Data/package.mo
index e083ed1c4bd..91a7c1a7855 100644
--- a/Buildings/Templates/Plants/HeatPumps/Validation/UserProject/Data/package.mo
+++ b/Buildings/Templates/Plants/HeatPumps/Validation/UserProject/Data/package.mo
@@ -1,5 +1,6 @@
 within Buildings.Templates.Plants.HeatPumps.Validation.UserProject;
-package Data "Package with classes for storing system parameters"
+package Data
+  "Package with classes for storing system parameters"
   extends Modelica.Icons.MaterialPropertiesPackage;
   annotation (
     Documentation(
diff --git a/Buildings/Templates/Plants/HeatPumps/Validation/UserProject/package.mo b/Buildings/Templates/Plants/HeatPumps/Validation/UserProject/package.mo
index 0080c5049a9..6128dfe0497 100644
--- a/Buildings/Templates/Plants/HeatPumps/Validation/UserProject/package.mo
+++ b/Buildings/Templates/Plants/HeatPumps/Validation/UserProject/package.mo
@@ -1,5 +1,6 @@
 within Buildings.Templates.Plants.HeatPumps.Validation;
-package UserProject "Package with configured models"
+package UserProject
+  "Package with configured models"
   extends Modelica.Icons.VariantsPackage;
   annotation (
     Documentation(
diff --git a/Buildings/Templates/Plants/HeatPumps/Validation/package.mo b/Buildings/Templates/Plants/HeatPumps/Validation/package.mo
index 8d54b9e0ff9..25b374bf4c8 100644
--- a/Buildings/Templates/Plants/HeatPumps/Validation/package.mo
+++ b/Buildings/Templates/Plants/HeatPumps/Validation/package.mo
@@ -1,5 +1,6 @@
 within Buildings.Templates.Plants.HeatPumps;
-package Validation "Package with validation models"
+package Validation
+  "Package with validation models"
   extends Modelica.Icons.ExamplesPackage;
   annotation (
     Documentation(
diff --git a/Buildings/UsersGuide/ReleaseNotes/Version_12_0_0.mo b/Buildings/UsersGuide/ReleaseNotes/Version_12_0_0.mo
index 7f9043df63a..a10f802b5e5 100644
--- a/Buildings/UsersGuide/ReleaseNotes/Version_12_0_0.mo
+++ b/Buildings/UsersGuide/ReleaseNotes/Version_12_0_0.mo
@@ -30,6 +30,20 @@ The following <b style=\"color:blue\">new components</b> have been added
 to <b style=\"color:blue\">existing</b> libraries:
 </p>
 <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><td colspan=\"2\"><b>Buildings.Templates</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Templates.Plants
+    </td>
+    <td valign=\"top\">Several new components have been added and existing ones updated
+                       to support the following new features in the heat pump plant template:
+                       sidestream heat recovery chiller, primary-only pumping, buffer tanks,
+                       failsafe staging conditions and internal computation of pump speed
+                       or balancing valve ∆p to meet design flow.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3808\">#3808</a>.
+    </td>
+</tr>
 <tr><td colspan=\"2\"><b>xxx</b>
     </td>
 </tr>
@@ -67,18 +81,22 @@ have been <b style=\"color:blue\">improved</b> in a
 <tr><td colspan=\"2\"><b>Buildings.Controls.OBC.CDL</b>
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Reals.Sort
-    </td>
-    <td valign=\"top\">Added an output variable with the indices of the sorted elements.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3809\">issue 3809</a>.
-    </td>
-</tr>
 <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Logical.Latch
     </td>
     <td valign=\"top\">Simplified the implementation.<br/>
                        This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3796\">#3796</a>.
     </td>
 </tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Logical.TrueFalseHold
+    </td>
+    <td valign=\"top\">Refactored with synchronous language elements.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3787\">issue 3787</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Reals.Sort
+    </td>
+    <td valign=\"top\">Added an output variable with the indices of the sorted elements.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3809\">issue 3809</a>.
 <tr><td colspan=\"2\"><b>Buildings.DHC.ETS</b>
     </td>
 </tr>
@@ -117,6 +135,20 @@ have been <b style=\"color:blue\">improved</b> in a
 <b style=\"color:blue\">non-backward compatible</b> way:
 </p>
 <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.CDL</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Logical.TrueHold<br/>
+                       Buildings.Controls.OBC.CDL.Logical.Validation.TrueHold
+    </td>
+    <td valign=\"top\">The blocks have been moved to the <code>Obsolete</code> package.
+                       Users are encouraged to use <code>TrueFalseHold(falseHoldDuration=0)</code>
+                       instead.<br/>
+                       For Dymola, the conversion script will automatically
+                       update existing models.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3787\">issue 3787</a>.
+    </td>
+</tr>
 <tr><td colspan=\"2\"><b>Buildings.Fluid.Geothermal</b>
     </td>
 </tr>
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 00000000000..c2d092a194f
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,362 @@
+# This file may be used to create an environment using:
+# $ conda create --name <env> --file <this file>
+# platform: linux-64
+_libgcc_mutex=0.1=conda_forge
+_openmp_mutex=4.5=2_gnu
+accessible-pygments=0.0.4=pyhd8ed1ab_0
+aiofiles=22.1.0=pyhd8ed1ab_0
+aiosqlite=0.18.0=pyhd8ed1ab_0
+alabaster=0.7.13=pyhd8ed1ab_0
+alsa-lib=1.2.8=h166bdaf_0
+anyio=3.6.2=pyhd8ed1ab_0
+argon2-cffi=21.3.0=pyhd8ed1ab_0
+argon2-cffi-bindings=21.2.0=py39hb9d737c_3
+astroid=2.15.2=py39hf3d152e_0
+asttokens=2.2.1=pyhd8ed1ab_0
+attr=2.5.1=h166bdaf_1
+attrs=22.2.0=pyh71513ae_0
+autopep8=2.0.2=pyhd8ed1ab_0
+babel=2.12.1=pyhd8ed1ab_1
+backcall=0.2.0=pyh9f0ad1d_0
+backports=1.0=pyhd8ed1ab_3
+backports.functools_lru_cache=1.6.4=pyhd8ed1ab_0
+beautifulsoup4=4.12.2=pyha770c72_0
+bleach=6.0.0=pyhd8ed1ab_0
+boltons=23.0.0=pyhd8ed1ab_0
+brotli=1.0.9=h166bdaf_8
+brotli-bin=1.0.9=h166bdaf_8
+brotlipy=0.7.0=py39hb9d737c_1005
+buildingspy=4.0.dev1=pypi_0
+bzip2=1.0.8=h7f98852_4
+ca-certificates=2022.12.7=ha878542_0
+cairo=1.16.0=ha61ee94_1014
+cerberus=1.3.4=pypi_0
+certifi=2022.12.7=pyhd8ed1ab_0
+cffi=1.15.1=py39he91dace_3
+charset-normalizer=3.1.0=pyhd8ed1ab_0
+chemicals=1.1.1=pyhd8ed1ab_0
+colorama=0.4.6=pyhd8ed1ab_0
+comm=0.1.3=pyhd8ed1ab_0
+conda=23.3.1=py39hf3d152e_0
+conda-package-handling=2.0.2=pyh38be061_0
+conda-package-streaming=0.7.0=pyhd8ed1ab_1
+contourpy=1.0.7=py39h4b4f3f3_0
+coolprop=6.4.1=py39h5a03fae_7
+cryptography=40.0.1=py39h079d5ae_0
+cycler=0.11.0=pyhd8ed1ab_0
+dbus=1.13.6=h5008d03_3
+debugpy=1.6.7=py39h227be39_0
+decorator=5.1.1=pyhd8ed1ab_0
+defusedxml=0.7.1=pyhd8ed1ab_0
+dill=0.3.6=pyhd8ed1ab_1
+docstring-to-markdown=0.12=pyhd8ed1ab_0
+docutils=0.19=py39hf3d152e_1
+entrypoints=0.4=pyhd8ed1ab_0
+et_xmlfile=1.1.0=pyhd8ed1ab_0
+executing=1.2.0=pyhd8ed1ab_0
+expat=2.5.0=hcb278e6_1
+fftw=3.3.10=nompi_hc118613_107
+flake8=6.0.0=pyhd8ed1ab_0
+flit-core=3.8.0=pyhd8ed1ab_0
+fluids=1.0.21=pyh6c4a22f_0
+font-ttf-dejavu-sans-mono=2.37=hab24e00_0
+font-ttf-inconsolata=3.000=h77eed37_0
+font-ttf-source-code-pro=2.038=h77eed37_0
+font-ttf-ubuntu=0.83=hab24e00_0
+fontconfig=2.14.2=h14ed4e7_0
+fonts-conda-ecosystem=1=0
+fonts-conda-forge=1=0
+fonttools=4.39.3=py39h72bdee0_0
+freetype=2.12.1=hca18f0e_1
+future=0.18.3=pyhd8ed1ab_0
+fuzzywuzzy=0.18.0=pyhd8ed1ab_0
+gettext=0.21.1=h27087fc_0
+gitdb=4.0.10=pyhd8ed1ab_0
+gitpython=3.1.31=pyhd8ed1ab_0
+glib=2.74.1=h6239696_1
+glib-tools=2.74.1=h6239696_1
+gmp=6.2.1=h58526e2_0
+gmpy2=2.1.2=py39h376b7d2_1
+graphite2=1.3.13=h58526e2_1001
+gst-plugins-base=1.22.0=h4243ec0_2
+gstreamer=1.22.0=h25f0c4b_2
+gstreamer-orc=0.4.33=h166bdaf_0
+harfbuzz=6.0.0=h8e241bc_0
+html5lib=1.1=pyh9f0ad1d_0
+iapws=1.5.3=pyhd8ed1ab_0
+icu=70.1=h27087fc_0
+idna=3.4=pyhd8ed1ab_0
+imagesize=1.4.1=pyhd8ed1ab_0
+importlib-metadata=6.3.0=pyha770c72_0
+importlib-resources=5.12.0=pyhd8ed1ab_0
+importlib_metadata=6.3.0=hd8ed1ab_0
+importlib_resources=5.12.0=pyhd8ed1ab_0
+ipykernel=6.22.0=pyh210e3f2_0
+ipympl=0.9.3=pyhd8ed1ab_0
+ipython=8.12.0=pyh41d4057_0
+ipython_genutils=0.2.0=py_1
+ipywidgets=8.0.6=pyhd8ed1ab_0
+isort=5.12.0=pyhd8ed1ab_1
+jack=1.9.22=h11f4161_0
+jedi=0.18.2=pyhd8ed1ab_0
+jinja2=3.1.2=pyhd8ed1ab_1
+jpype1=1.4.1=py39hf939315_1
+json5=0.9.5=pyh9f0ad1d_0
+jsonpatch=1.32=pyhd8ed1ab_0
+jsonpointer=2.0=py_0
+jsonschema=4.17.3=pyhd8ed1ab_0
+jupyter-lsp=2.0.1=pyhd8ed1ab_0
+jupyter_client=8.2.0=pyhd8ed1ab_0
+jupyter_core=5.3.0=py39hf3d152e_0
+jupyter_events=0.6.3=pyhd8ed1ab_0
+jupyter_server=2.5.0=pyhd8ed1ab_0
+jupyter_server_fileid=0.9.0=pyhd8ed1ab_0
+jupyter_server_terminals=0.4.4=pyhd8ed1ab_1
+jupyter_server_ydoc=0.8.0=pyhd8ed1ab_0
+jupyter_ydoc=0.2.3=pyhd8ed1ab_0
+jupyterlab=3.6.3=pyhd8ed1ab_0
+jupyterlab-lsp=4.0.1=pyhd8ed1ab_0
+jupyterlab_code_formatter=1.6.0=pyhd8ed1ab_0
+jupyterlab_pygments=0.2.2=pyhd8ed1ab_0
+jupyterlab_server=2.22.1=pyhd8ed1ab_0
+jupyterlab_widgets=3.0.7=pyhd8ed1ab_0
+kaleido-core=0.2.1=h3644ca4_0
+keyutils=1.6.1=h166bdaf_0
+kiwisolver=1.4.4=py39hf939315_1
+krb5=1.20.1=h81ceb04_0
+lame=3.100=h166bdaf_1003
+lazy-object-proxy=1.9.0=py39h72bdee0_0
+lcms2=2.15=haa2dc70_1
+ld_impl_linux-64=2.40=h41732ed_0
+lerc=4.0.0=h27087fc_0
+levenshtein=0.20.9=py39h227be39_0
+libblas=3.9.0=16_linux64_openblas
+libbrotlicommon=1.0.9=h166bdaf_8
+libbrotlidec=1.0.9=h166bdaf_8
+libbrotlienc=1.0.9=h166bdaf_8
+libcap=2.67=he9d0100_0
+libcblas=3.9.0=16_linux64_openblas
+libclang=15.0.7=default_had23c3d_1
+libclang13=15.0.7=default_h3e3d535_1
+libcups=2.3.3=h36d4200_3
+libdb=6.2.32=h9c3ff4c_0
+libdeflate=1.18=h0b41bf4_0
+libedit=3.1.20191231=he28a2e2_2
+libevent=2.1.10=h28343ad_4
+libexpat=2.5.0=hcb278e6_1
+libffi=3.4.2=h7f98852_5
+libflac=1.4.2=h27087fc_0
+libgcc-ng=12.2.0=h65d4601_19
+libgcrypt=1.10.1=h166bdaf_0
+libgfortran-ng=12.2.0=h69a702a_19
+libgfortran5=12.2.0=h337968e_19
+libglib=2.74.1=h606061b_1
+libgomp=12.2.0=h65d4601_19
+libgpg-error=1.46=h620e276_0
+libiconv=1.17=h166bdaf_0
+libjpeg-turbo=2.1.5.1=h0b41bf4_0
+liblapack=3.9.0=16_linux64_openblas
+libllvm15=15.0.7=hadd5161_1
+libnsl=2.0.0=h7f98852_0
+libogg=1.3.4=h7f98852_1
+libopenblas=0.3.21=pthreads_h78a6416_3
+libopus=1.3.1=h7f98852_1
+libpng=1.6.39=h753d276_0
+libpq=15.2=hb675445_0
+libsndfile=1.2.0=hb75c966_0
+libsodium=1.0.18=h36c2ea0_1
+libsqlite=3.40.0=h753d276_0
+libstdcxx-ng=12.2.0=h46fd767_19
+libsystemd0=253=h8c4010b_1
+libtiff=4.5.0=ha587672_6
+libtool=2.4.7=h27087fc_0
+libudev1=253=h0b41bf4_1
+libuuid=2.38.1=h0b41bf4_0
+libuv=1.44.2=h166bdaf_0
+libvorbis=1.3.7=h9c3ff4c_0
+libwebp-base=1.3.0=h0b41bf4_0
+libxcb=1.13=h7f98852_1004
+libxkbcommon=1.5.0=h79f4944_1
+libxml2=2.10.3=hca2bb57_4
+libxslt=1.1.37=h873f0b0_0
+libzlib=1.2.13=h166bdaf_4
+lxml=4.9.2=py39h14694de_0
+lz4-c=1.9.4=hcb278e6_0
+markupsafe=2.1.2=py39h72bdee0_0
+mathjax=2.7.7=ha770c72_3
+matplotlib=3.7.1=py39hf3d152e_0
+matplotlib-base=3.7.1=py39he190548_0
+matplotlib-inline=0.1.6=pyhd8ed1ab_0
+mccabe=0.7.0=pyhd8ed1ab_0
+mistune=2.0.5=pyhd8ed1ab_0
+mpc=1.3.1=hfe3b2da_0
+mpfr=4.2.0=hb012696_0
+mpg123=1.31.3=hcb278e6_0
+mpmath=1.3.0=pyhd8ed1ab_0
+munkres=1.1.4=pyh9f0ad1d_0
+mysql-common=8.0.32=ha901b37_1
+mysql-libs=8.0.32=hd7da12d_1
+nbclassic=0.5.5=pyh8b2e9e2_0
+nbclient=0.7.3=pyhd8ed1ab_0
+nbconvert-core=7.3.1=pyhd8ed1ab_0
+nbformat=5.8.0=pyhd8ed1ab_0
+ncurses=6.3=h27087fc_1
+nest-asyncio=1.5.6=pyhd8ed1ab_0
+nodejs=18.15.0=h8d033a5_0
+notebook=6.5.4=pyha770c72_0
+notebook-shim=0.2.2=pyhd8ed1ab_0
+nspr=4.35=h27087fc_0
+nss=3.89=he45b914_0
+numpy=1.24.2=py39h7360e5f_0
+openjpeg=2.5.0=hfec8fc6_2
+openpyxl=3.1.1=py39h72bdee0_0
+openssl=3.1.0=h0b41bf4_0
+packaging=23.1=pyhd8ed1ab_0
+pandas=2.0.0=py39h2ad29b5_0
+pandocfilters=1.5.0=pyhd8ed1ab_0
+parso=0.8.3=pyhd8ed1ab_0
+patsy=0.5.3=pyhd8ed1ab_0
+pcre2=10.40=hc3806b6_0
+pexpect=4.8.0=pyh1a96a4e_2
+pickleshare=0.7.5=py_1003
+pillow=9.5.0=py39h7207d5c_0
+pint=0.20.1=pyhd8ed1ab_0
+pip=23.0.1=pyhd8ed1ab_0
+pixman=0.40.0=h36c2ea0_0
+pkgutil-resolve-name=1.3.10=pyhd8ed1ab_0
+platformdirs=3.2.0=pyhd8ed1ab_0
+plotly=5.14.1=pyhd8ed1ab_0
+pluggy=1.0.0=pyhd8ed1ab_5
+ply=3.11=py_1
+pnpm=7.28.0=he2f69ee_0
+pooch=1.7.0=pyha770c72_3
+prometheus_client=0.16.0=pyhd8ed1ab_0
+prompt-toolkit=3.0.38=pyha770c72_0
+prompt_toolkit=3.0.38=hd8ed1ab_0
+psutil=5.9.4=py39hb9d737c_0
+pthread-stubs=0.4=h36c2ea0_1001
+ptyprocess=0.7.0=pyhd3deb0d_0
+pulseaudio=16.1=hcb278e6_3
+pulseaudio-client=16.1=h5195f5e_3
+pulseaudio-daemon=16.1=ha8d29e2_3
+pure_eval=0.2.2=pyhd8ed1ab_0
+pycodestyle=2.10.0=pyhd8ed1ab_0
+pycosat=0.6.4=py39hb9d737c_1
+pycparser=2.21=pyhd8ed1ab_0
+pydata-sphinx-theme=0.13.3=pyhd8ed1ab_0
+pydocstyle=6.3.0=pyhd8ed1ab_0
+pyflakes=3.0.1=pyhd8ed1ab_0
+pyfunnel=0.3.0=pypi_0
+pygments=2.15.0=pyhd8ed1ab_0
+pylint=2.17.2=pyhd8ed1ab_0
+pyopenssl=23.1.1=pyhd8ed1ab_0
+pyparsing=3.0.9=pyhd8ed1ab_0
+pyperclip=1.8.2=pyhd8ed1ab_2
+pyqt=5.15.7=py39h5c7b992_3
+pyqt5-sip=12.11.0=py39h227be39_3
+pyrsistent=0.19.3=py39h72bdee0_0
+pysocks=1.7.1=pyha2e5f31_6
+python=3.9.16=h2782a2a_0_cpython
+python-dateutil=2.8.2=pyhd8ed1ab_0
+python-fastjsonschema=2.16.3=pyhd8ed1ab_0
+python-json-logger=2.0.7=pyhd8ed1ab_0
+python-kaleido=0.2.1=pyhd8ed1ab_0
+python-levenshtein=0.20.9=pyhd8ed1ab_0
+python-lsp-jsonrpc=1.0.0=pyhd8ed1ab_0
+python-lsp-server=1.7.2=pyhd8ed1ab_0
+python-lsp-server-base=1.7.2=pyhd8ed1ab_0
+python-tzdata=2023.3=pyhd8ed1ab_0
+python_abi=3.9=3_cp39
+pytidylib=0.3.2=pypi_0
+pytoolconfig=1.2.5=pyhd8ed1ab_0
+pytz=2023.3=pyhd8ed1ab_0
+pyyaml=6.0=py39hb9d737c_5
+pyzmq=25.0.2=py39h0be026e_0
+qt-main=5.15.8=h67dfc38_7
+rapidfuzz=2.15.0=py39h227be39_0
+readline=8.2=h8228510_1
+requests=2.28.2=pyhd8ed1ab_1
+rfc3339-validator=0.1.4=pyhd8ed1ab_0
+rfc3986-validator=0.1.1=pyh9f0ad1d_0
+rope=1.7.0=pyhd8ed1ab_0
+ruamel.yaml=0.17.21=py39h72bdee0_3
+ruamel.yaml.clib=0.2.7=py39h72bdee0_1
+scipy=1.10.1=py39h7360e5f_0
+seaborn=0.12.2=hd8ed1ab_0
+seaborn-base=0.12.2=pyhd8ed1ab_0
+send2trash=1.8.0=pyhd8ed1ab_0
+setuptools=67.6.1=pyhd8ed1ab_0
+simplejson=3.18.0=pypi_0
+sip=6.7.8=py39h227be39_0
+six=1.16.0=pyh6c4a22f_0
+smmap=3.0.5=pyh44b312d_0
+sniffio=1.3.0=pyhd8ed1ab_0
+snowballstemmer=2.2.0=pyhd8ed1ab_0
+soupsieve=2.3.2.post1=pyhd8ed1ab_0
+sphinx=6.1.3=pyhd8ed1ab_0
+sphinx_bootstrap_theme=0.8.1=pyhd8ed1ab_0
+sphinxcontrib-applehelp=1.0.4=pyhd8ed1ab_0
+sphinxcontrib-devhelp=1.0.2=py_0
+sphinxcontrib-htmlhelp=2.0.1=pyhd8ed1ab_0
+sphinxcontrib-jsmath=1.0.1=py_0
+sphinxcontrib-qthelp=1.0.3=py_0
+sphinxcontrib-serializinghtml=1.1.5=pyhd8ed1ab_2
+sqlite=3.40.0=h4ff8645_0
+stack_data=0.6.2=pyhd8ed1ab_0
+statsmodels=0.13.5=py39h2ae25f5_2
+sympy=1.11.1=pypyh9d50eac_103
+tabulate=0.9.0=pyhd8ed1ab_1
+tenacity=8.2.2=pyhd8ed1ab_0
+terminado=0.17.1=pyh41d4057_0
+thermo=0.2.21=pyhd8ed1ab_0
+tinycss2=1.2.1=pyhd8ed1ab_0
+tk=8.6.12=h27826a3_0
+toml=0.10.2=pyhd8ed1ab_0
+tomli=2.0.1=pyhd8ed1ab_0
+tomlkit=0.11.7=pyha770c72_0
+toolz=0.12.0=pyhd8ed1ab_0
+tornado=6.2=py39hb9d737c_1
+tqdm=4.65.0=pyhd8ed1ab_1
+traitlets=5.9.0=pyhd8ed1ab_0
+typing=3.10.0.0=pyhd8ed1ab_0
+typing-extensions=4.5.0=hd8ed1ab_0
+typing_extensions=4.5.0=pyha770c72_0
+tzdata=2023c=h71feb2d_0
+ujson=5.7.0=py39h227be39_0
+unicodedata2=15.0.0=py39hb9d737c_0
+urllib3=1.26.15=pyhd8ed1ab_0
+wcwidth=0.2.6=pyhd8ed1ab_0
+webencodings=0.5.1=py_1
+websocket-client=1.5.1=pyhd8ed1ab_0
+whatthepatch=1.0.4=pyhd8ed1ab_0
+wheel=0.40.0=pyhd8ed1ab_0
+widgetsnbextension=4.0.7=pyhd8ed1ab_0
+wrapt=1.15.0=py39h72bdee0_0
+xcb-util=0.4.0=h166bdaf_0
+xcb-util-image=0.4.0=h166bdaf_0
+xcb-util-keysyms=0.4.0=h166bdaf_0
+xcb-util-renderutil=0.3.9=h166bdaf_0
+xcb-util-wm=0.4.1=h166bdaf_0
+xkeyboard-config=2.38=h0b41bf4_0
+xorg-kbproto=1.0.7=h7f98852_1002
+xorg-libice=1.0.10=h7f98852_0
+xorg-libsm=1.2.3=hd9c2040_1000
+xorg-libx11=1.8.4=h0b41bf4_0
+xorg-libxau=1.0.9=h7f98852_0
+xorg-libxdmcp=1.1.3=h7f98852_0
+xorg-libxext=1.3.4=h0b41bf4_2
+xorg-libxrender=0.9.10=h7f98852_1003
+xorg-renderproto=0.11.1=h7f98852_1002
+xorg-xextproto=7.3.0=h0b41bf4_1003
+xorg-xf86vidmodeproto=2.3.1=h7f98852_1002
+xorg-xproto=7.0.31=h7f98852_1007
+xz=5.2.6=h166bdaf_0
+y-py=0.5.5=py39h50f1755_2
+yaml=0.2.5=h7f98852_2
+yapf=0.32.0=pyhd8ed1ab_0
+ypy-websocket=0.8.2=pyhd8ed1ab_0
+zeromq=4.3.4=h9c3ff4c_1
+zipp=3.15.0=pyhd8ed1ab_0
+zlib=1.2.13=h166bdaf_4
+zstandard=0.19.0=py39h29414ee_1
+zstd=1.5.2=h3eb15da_6