Merge branch 'master' into issue1413_isat

lbl-srg · Nov 21, 2023 · 64ddc54 · 64ddc54
2 parents 21d6302 + ca5ab3d
commit 64ddc54
Show file tree

Hide file tree

Showing 51 changed files with 417 additions and 297 deletions.
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/BaseClasses/PartialMultiplePumps.mo b/Buildings/Experimental/DHC/Plants/Combined/Subsystems/BaseClasses/PartialMultiplePumps.mo
@@ -102,7 +102,8 @@ partial model PartialMultiplePumps
     final per=per,
     addPowerToMedium=false) "Pump"
     annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
-  MultipleCommands com(final nUni=nPum) "Convert command signal"
+  Buildings.Templates.Components.Controls.MultipleCommands com(final nUni=nPum)
+    "Convert command signal"
     annotation (Placement(transformation(extent={{-50,90},{-30,110}})));
 
   Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea
@@ -241,15 +242,15 @@ equation
 <p>
 This base class represents multiple identical pumps that are piped in parallel.
 An optional check valve in series with each pump is included.
-This class is used to construct the various multiple-pump models within 
+This class is used to construct the various multiple-pump models within
 <a href=\"modelica://Buildings.Experimental.DHC.Plants.Combined.Subsystems\">
 Buildings.Experimental.DHC.Plants.Combined.Subsystems</a>.
 </p>
 <h4>Details</h4>
 <p>
 In a parallel arrangement, all operating units have the same operating point.
 This allows modeling the multiple pumps with a single instance of any
-class derived from 
+class derived from
 <a href=\"modelica://Buildings.Fluid.Movers.BaseClasses.PartialFlowMachine\">
 Buildings.Fluid.Movers.BaseClasses.PartialFlowMachine</a>.
 Hydronics are resolved with mass flow rate multiplier components.

diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/BaseClasses/package.order b/Buildings/Experimental/DHC/Plants/Combined/Subsystems/BaseClasses/package.order
@@ -1,4 +1,3 @@
-MultipleCommands
 MultipleValves
 PartialMultiplePumps
 PassThroughFluid
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/ChillerGroup.mo b/Buildings/Experimental/DHC/Plants/Combined/Subsystems/ChillerGroup.mo
@@ -192,7 +192,7 @@ model ChillerGroup
     final use_input=true)
     "Flow rate multiplier"
     annotation (Placement(transformation(extent={{-30,-70},{-50,-50}})));
-  BaseClasses.MultipleCommands com(
+  Buildings.Templates.Components.Controls.MultipleCommands com(
     final nUni=nUni)
     "Convert command signals"
     annotation (Placement(transformation(extent={{-80,110},{-60,130}})));

diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/CoolingTowerGroup.mo b/Buildings/Experimental/DHC/Plants/Combined/Subsystems/CoolingTowerGroup.mo
@@ -93,7 +93,7 @@ model CoolingTowerGroup "Model of multiple identical cooling towers in parallel"
     final use_input=false,
     final k=nUni)         "Flow rate multiplier"
     annotation (Placement(transformation(extent={{60,-10},{80,10}})));
-  BaseClasses.MultipleCommands com(final nUni=nUni)
+  Buildings.Templates.Components.Controls.MultipleCommands com(final nUni=nUni)
     "Convert command signals"
     annotation (Placement(transformation(extent={{-60,90},{-40,110}})));
   Buildings.Controls.OBC.CDL.Reals.Multiply mulP "Scale power"
@@ -222,15 +222,15 @@ The following input and output points are available.
 </p>
 <ul>
 <li>
-Start command (VFD Run) <code>y1</code>: 
+Start command (VFD Run) <code>y1</code>:
 DO signal dedicated to each unit, with a dimensionality of one
 </li>
 <li>
 Speed command <code>y</code>:
 AO signal common to all units, with a dimensionality of zero
 </li>
 <li>
-CW supply temperature <code>TConWatSup</code>: 
+CW supply temperature <code>TConWatSup</code>:
 AI signal common to all units, with a dimensionality of zero
 </li>
 </ul>

diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/HeatPumpGroup.mo b/Buildings/Experimental/DHC/Plants/Combined/Subsystems/HeatPumpGroup.mo
@@ -108,7 +108,7 @@ model HeatPumpGroup
     final use_input=true)
     "Flow rate multiplier"
     annotation (Placement(transformation(extent={{60,-10},{80,10}})));
-  BaseClasses.MultipleCommands com(final nUni=nUni)
+  Buildings.Templates.Components.Controls.MultipleCommands com(final nUni=nUni)
     "Convert command signals"
     annotation (Placement(transformation(extent={{-60,90},{-40,110}})));
   Buildings.Controls.OBC.CDL.Reals.Multiply mulP "Scale power"

diff --git a/...sults/Dymola/Buildings_Experimental_DHC_Plants_Combined_Examples_AllElectricCWStorage.txt b/...sults/Dymola/Buildings_Experimental_DHC_Plants_Combined_Examples_AllElectricCWStorage.txt
diff --git a/.../Dymola/Buildings_Experimental_DHC_Plants_Combined_Subsystems_Validation_ChillerGroup.txt b/.../Dymola/Buildings_Experimental_DHC_Plants_Combined_Subsystems_Validation_ChillerGroup.txt
@@ -1,4 +1,4 @@
-last-generated=2023-02-24
+last-generated=2023-11-18
 statistics-simulation=
 {
   "linear": " ",

diff --git a/...dings_Experimental_DHC_Plants_Combined_Subsystems_Validation_ChillerHeatRecoveryGroup.txt b/...dings_Experimental_DHC_Plants_Combined_Subsystems_Validation_ChillerHeatRecoveryGroup.txt
diff --git a/...la/Buildings_Experimental_DHC_Plants_Combined_Subsystems_Validation_CoolingTowerGroup.txt b/...la/Buildings_Experimental_DHC_Plants_Combined_Subsystems_Validation_CoolingTowerGroup.txt
diff --git a/...Dymola/Buildings_Experimental_DHC_Plants_Combined_Subsystems_Validation_HeatPumpGroup.txt b/...Dymola/Buildings_Experimental_DHC_Plants_Combined_Subsystems_Validation_HeatPumpGroup.txt
@@ -1,4 +1,4 @@
-last-generated=2023-02-27
+last-generated=2023-11-18
 statistics-initialization=
 {
   "nonlinear": "1",
@@ -15,8 +15,8 @@ time=[0e+00, 1e+03]
 y1.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, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
 y1.y[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, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 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]
 heaPum.heaPum.uMod=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 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]
-heaPum.m_flow=[-0e+00, 3.490642547607422e+01, 4.611556243896484e+01, 4.760150909423828e+01, 4.776080322265625e+01, 4.777650833129883e+01, 4.777812576293945e+01, 4.777828598022461e+01, 4.777830505371094e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 6.434868335723877e+00, 6.977401375770569e-01, 9.93689801543951e-03, 9.504941408522427e-05, 8.25065626486321e-07, 9.362485897668194e-09, 1.093475865410198e-09, 2.822132805224697e-10, -1.590973464082879e-10, -1.781868819161758e-10, -1.161865742504986e-11, 3.139839733698468e-12, 6.793108176667007e-12, 4.008961565493685e-12, 8.273035170336743e-14, 3.691649105006835e-14, -5.875150626416525e-13, -1.3055042073426e-12, -5.055858075947439e-13, -1.304866696465179e-12]
-heaPum.heaPum.m1_flow=[-0e+00, 1.745321273803711e+01, 2.305778121948242e+01, 2.380075454711914e+01, 2.388040161132812e+01, 2.388825416564941e+01, 2.388906288146973e+01, 2.38891429901123e+01, 2.388915252685547e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 6.434868335723877e+00, 6.977401375770569e-01, 9.93689801543951e-03, 9.504941408522427e-05, 8.25065626486321e-07, 9.362485897668194e-09, 1.093475865410198e-09, 2.822132805224697e-10, -1.590973464082879e-10, -1.781868819161758e-10, -1.161865742504986e-11, 3.139839733698468e-12, 6.793108176667007e-12, 4.008961565493685e-12, 8.273035170336743e-14, 3.691649105006835e-14, -5.875150626416525e-13, -1.3055042073426e-12, -5.055858075947439e-13, -1.304866696465179e-12]
+heaPum.m_flow=[-0e+00, 3.490642547607422e+01, 4.611556243896484e+01, 4.760150909423828e+01, 4.776080322265625e+01, 4.777650833129883e+01, 4.777812576293945e+01, 4.777828598022461e+01, 4.777830505371094e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 4.77783088684082e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 6.434868335723877e+00, 6.977401375770569e-01, 9.93689801543951e-03, 9.504941408522427e-05, 8.250655696429021e-07, 9.362520536626562e-09, 1.09344933107991e-09, 2.823933586970639e-10, -1.59421059686693e-10, -1.781948477663775e-10, -1.176966163418669e-11, 3.10100035927352e-12, 6.755125105117887e-12, 3.520447171626029e-12, 3.705874582898838e-13, -3.218579374374142e-13, -6.008010929037244e-13, -1.318569710882789e-12, -5.184344707004351e-13, -1.453878792530283e-12]
+heaPum.heaPum.m1_flow=[-0e+00, 1.745321273803711e+01, 2.305778121948242e+01, 2.380075454711914e+01, 2.388040161132812e+01, 2.388825416564941e+01, 2.388906288146973e+01, 2.38891429901123e+01, 2.388915252685547e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 2.38891544342041e+01, 6.434868335723877e+00, 6.977401375770569e-01, 9.93689801543951e-03, 9.504941408522427e-05, 8.250655696429021e-07, 9.362520536626562e-09, 1.09344933107991e-09, 2.823933586970639e-10, -1.59421059686693e-10, -1.781948477663775e-10, -1.176966163418669e-11, 3.10100035927352e-12, 6.755125105117887e-12, 3.520447171626029e-12, 3.705874582898838e-13, -3.218579374374142e-13, -6.008010929037244e-13, -1.318569710882789e-12, -5.184344707004351e-13, -1.453878792530283e-12]
 heaPum.mHeaWatUni_flow_nominal=[2.38891544342041e+01, 2.38891544342041e+01]
 heaPum.weaBus.TDryBul=[2.609500122070312e+02, 2.609493103027344e+02, 2.609486083984375e+02, 2.609479370117188e+02, 2.609472351074219e+02, 2.60946533203125e+02, 2.609458618164062e+02, 2.609451599121094e+02, 2.609444885253906e+02, 2.609438171386719e+02, 2.60943115234375e+02, 2.609424438476562e+02, 2.609417724609375e+02, 2.609411010742188e+02, 2.609403991699219e+02, 2.609397277832031e+02, 2.609390563964844e+02, 2.609383850097656e+02, 2.60937744140625e+02, 2.609370727539062e+02, 2.609364013671875e+02, 2.609357299804688e+02, 2.6093505859375e+02, 2.609344177246094e+02, 2.609337463378906e+02, 2.6093310546875e+02, 2.609324340820312e+02, 2.609317932128906e+02, 2.6093115234375e+02, 2.609304809570312e+02, 2.609298400878906e+02, 2.6092919921875e+02, 2.609285583496094e+02, 2.609279174804688e+02, 2.609272766113281e+02, 2.609266357421875e+02, 2.609259948730469e+02, 2.609253540039062e+02, 2.609247436523438e+02, 2.609241027832031e+02, 2.609234924316406e+02, 2.609228515625e+02, 2.609222412109375e+02, 2.609216003417969e+02, 2.609209899902344e+02, 2.609203796386719e+02, 2.609197692871094e+02, 2.609191589355469e+02, 2.609185485839844e+02, 2.609179382324219e+02, 2.609173278808594e+02, 2.609167175292969e+02, 2.609161376953125e+02, 2.6091552734375e+02, 2.609149475097656e+02, 2.609143371582031e+02, 2.609137573242188e+02, 2.609131774902344e+02, 2.609125671386719e+02, 2.609119873046875e+02, 2.609114074707031e+02, 2.609108276367188e+02, 2.609102783203125e+02, 2.609096984863281e+02, 2.609091186523438e+02, 2.609085693359375e+02, 2.609079895019531e+02, 2.609074401855469e+02, 2.609068603515625e+02, 2.609063110351562e+02, 2.6090576171875e+02, 2.609052124023438e+02, 2.609046630859375e+02, 2.609041137695312e+02, 2.609035949707031e+02, 2.609030456542969e+02, 2.609024963378906e+02, 2.609019775390625e+02, 2.609014282226562e+02, 2.609009094238281e+02, 2.60900390625e+02, 2.608998718261719e+02, 2.608993530273438e+02, 2.608988342285156e+02, 2.608983154296875e+02, 2.608977966308594e+02, 2.608973083496094e+02, 2.608967895507812e+02, 2.608963012695312e+02, 2.608958129882812e+02, 2.608953247070312e+02, 2.608948364257812e+02, 2.608943481445312e+02, 2.608938598632812e+02, 2.608933715820312e+02, 2.608928833007812e+02, 2.608924255371094e+02, 2.608919372558594e+02, 2.608914794921875e+02, 2.608910217285156e+02, 2.608905639648438e+02]
 THeaWatSupSet.y=[3.081499938964844e+02, 3.081499938964844e+02]

diff --git a/...mola/Buildings_Experimental_DHC_Plants_Combined_Subsystems_Validation_MultiplePumpsDp.txt b/...mola/Buildings_Experimental_DHC_Plants_Combined_Subsystems_Validation_MultiplePumpsDp.txt
@@ -1,4 +1,4 @@
-last-generated=2023-02-27
+last-generated=2023-11-18
 statistics-initialization=
 {
   "nonlinear": "1, 1, 1, 1, 1",

diff --git a/...la/Buildings_Experimental_DHC_Plants_Combined_Subsystems_Validation_MultiplePumpsFlow.txt b/...la/Buildings_Experimental_DHC_Plants_Combined_Subsystems_Validation_MultiplePumpsFlow.txt
@@ -1,4 +1,4 @@
-last-generated=2023-02-27
+last-generated=2023-11-18
 statistics-initialization=
 {
   "nonlinear": "1, 1, 1, 1, 1, 1",

diff --git a/...a/Buildings_Experimental_DHC_Plants_Combined_Subsystems_Validation_MultiplePumpsSpeed.txt b/...a/Buildings_Experimental_DHC_Plants_Combined_Subsystems_Validation_MultiplePumpsSpeed.txt
@@ -1,4 +1,4 @@
-last-generated=2023-02-27
+last-generated=2023-11-18
 statistics-initialization=
 {
   "nonlinear": "1, 2",

diff --git a/...ings_Experimental_DHC_Plants_Combined_Subsystems_Validation_ValveOpeningFlowBalancing.txt b/...ings_Experimental_DHC_Plants_Combined_Subsystems_Validation_ValveOpeningFlowBalancing.txt
@@ -1,4 +1,4 @@
-last-generated=2023-02-24
+last-generated=2023-11-18
 statistics-simulation=
 {
   "linear": " ",