Remove support for multiple secondary flow sensors, clean comments

Author: AntoineGautier

Buildings/Templates/Plants/Boilers/HotWater/BoilerPlant.mo

@@ -563,9 +563,8 @@ equation
   connect(VHeaWatPriRetCon_flow.y, busLooCon.VHeaWatPri_flow);
   connect(VHeaWatPriSupNon_flow.y, busLooNon.VHeaWatPri_flow);
   connect(VHeaWatPriRetNon_flow.y, busLooNon.VHeaWatPri_flow);
-  // bus.VHeaWatSec_flow is an array for future support of distributed pumps.
-  connect(VHeaWatSecSup_flow.y, bus.VHeaWatSec_flow[1]);
-  connect(VHeaWatSecRet_flow.y, bus.VHeaWatSec_flow[1]);
+  connect(VHeaWatSecSup_flow.y, bus.VHeaWatSec_flow);
+  connect(VHeaWatSecRet_flow.y, bus.VHeaWatSec_flow);
   connect(VHeaWatBypCon_flow.y, busLooCon.VHeaWatByp_flow);
   connect(VHeaWatBypNon_flow.y, busLooNon.VHeaWatByp_flow);
   connect(THeaWatPriSupCon.y, busLooCon.THeaWatPriSup);
@@ -843,7 +842,10 @@ annotation(Documentation(
       <font color=\"gray\"><em>Constant speed, provided with boiler with factory controls</em></font><br />
       <font color=\"gray\"><em>Variable speed, provided with boiler with factory controls</em></font>
     </td>
-    <td></td>
+    <td>
+    This setting is only available for non-condensing boilers.
+    Condensing boilers require variable speed primary HW pumps to prevent primary flow recirculation.
+    </td>
   </tr>
   <tr>
     <td>Type of primary HW pump arrangement</td>

Buildings/Templates/Plants/Boilers/HotWater/Components/Controls/G36.mo

@@ -79,14 +79,11 @@ block G36
     "Design (highest) HW supply temperature setpoint";
   final parameter Real TConBoiHotWatSetMax = dat.THeaWatConSup_nominal
     "Design (highest) HW supply temperature setpoint for condensing boilers";
-  // FIXME: Missing enable condition.
   final parameter Real minPumSpePri = dat.yPumHeaWatPri_min
     "Minimum pump speed";
-  // FIXME: Missing enable condition: only required for primary-only plants with headered variable speed pumps using differential pressure pump speed control, see G36 3.1.8.4.
   final parameter Real VHotWatPri_flow_nominal =
     max(dat.VHeaWatPriCon_flow_nominal, dat.VHeaWatPriNon_flow_nominal)
     "Plant design hot water flow rate through  primary loop";
-  // FIXME: Missing enable condition: only required for primary-only hot water plants with a minimum flow bypass valve, see G36 3.1.8.2.
   final parameter Real boiDesFlo[nBoi] =
     {if i <= cfg.nBoiCon
     then dat.VHeaWatBoiCon_flow_nominal[i]
@@ -210,24 +207,21 @@ equation
   connect(bus.dpHeaWatLoc, ctlLooPri.dpHotWatPri_loc);
   connect(bus.dpHeaWatRem, ctlLooPri.dpHotWatPri_rem);
   connect(bus.TOut, ctlLooPri.TOut);
-  // FIXME: There should be distinct connectors in the controller for condensing and non-condensing groups.
   connect(busLooCon.THeaWatPlaRet, ctlLooPri.TRetPri);
   connect(busLooNon.THeaWatPlaRet, ctlLooPri.TRetPri);
   connect(bus.THeaWatSecRet, ctlLooPri.TRetSec);
+  connect(bus.VHeaWatSec_flow, ctlLooPri.VHotWatSec_flow[1]);
   connect(busBoiCon.THeaWatSup, ctlLooPri.TSupBoi[1:cfg.nBoiCon]);
   connect(busBoiNon.THeaWatSup, ctlLooPri.TSupBoi[(cfg.nBoiCon + 1):nBoi]);
-  // FIXME: There should be distinct connectors in the controller for condensing and non-condensing groups.
   connect(busLooCon.THeaWatPriSup, ctlLooPri.TSupPri);
   connect(busLooNon.THeaWatPriSup, ctlLooPri.TSupPri);
   connect(bus.THeaWatSecSup, ctlLooPri.TSupSec);
   connect(busPumHeaWatPriCon.y1_actual, ctlLooPri.uPriPum[1:cfg.nBoiCon]);
   connect(busPumHeaWatPriNon.y1_actual, ctlLooPri.uPriPum[(cfg.nBoiCon +
     1):nBoi]);
   connect(bus.u1Sch, ctlLooPri.uSchEna);
-  // FIXME: There should be distinct connectors in the controller for condensing and non-condensing groups.
   connect(busLooCon.VHeaWatByp_flow, ctlLooPri.VHotWatDec_flow);
   connect(busLooNon.VHeaWatByp_flow, ctlLooPri.VHotWatDec_flow);
-  // FIXME: There should be distinct connectors in the controller for condensing and non-condensing groups.
   connect(busLooCon.VHeaWatPri_flow, ctlLooPri.VHotWatPri_flow);
   connect(busLooNon.VHeaWatPri_flow, ctlLooPri.VHotWatPri_flow);
   connect(busValBoiConIso.y1_actual, ctlLooPri.uHotWatIsoValOpe[1:cfg.nBoiCon]);
@@ -239,6 +233,7 @@ equation
   // Secondary HW pump controller inputs from plant control bus
   connect(bus.dpHeaWatLoc, ctlPumHeaWatSec.dpHotWat_local);
   connect(bus.dpHeaWatRem, ctlPumHeaWatSec.dpHotWat_remote);
+  connect(bus.VHeaWatSec_flow, ctlPumHeaWatSec.VHotWat_flow);
   connect(busPumHeaWatSec.y1_actual, ctlPumHeaWatSec.uHotWatPum);
   // Primary loop controller outputs to plant control bus
   connect(ctlLooPri.TBoiHotWatSupSet[1:cfg.nBoiCon], busBoiCon.THeaWatSupSet);
@@ -251,7 +246,6 @@ equation
   connect(ctlLooPri.yHotWatIsoVal[(cfg.nBoiCon + 1):nBoi], busValBoiNonIso.y1);
   connect(ctlLooPri.yPriPum[1:cfg.nBoiCon], busPumHeaWatPriCon.y1);
   connect(ctlLooPri.yPriPum[(cfg.nBoiCon + 1):nBoi], busPumHeaWatPriNon.y1);
-  // FIXME: There should be distinct connectors in the controller for condensing and non-condensing groups.
   connect(ctlLooPri.yPriPumSpe, busPumHeaWatPriCon.y);
   connect(ctlLooPri.yPriPumSpe, busPumHeaWatPriNon.y);
   // Secondary HW pump controller outputs to plant control bus
@@ -307,12 +301,6 @@ equation
   connect(reqResHeaWat.y, ctlLooPri.resReq)
     annotation(Line(points={{170,120},{-18,120},{-18,26.9},{-12,26.9}},
       color={255,127,0}));
-  connect(VHeaWatSec_flow.y, ctlLooPri.VHotWatSec_flow)
-    annotation(Line(points={{-188,-80},{-20,-80},{-20,-3.7},{-12,-3.7}},
-      color={0,0,127}));
-  connect(VHeaWatSec_flow.y[1], ctlPumHeaWatSec.VHotWat_flow)
-    annotation(Line(points={{-188,-80},{40,-80},{40,82},{48,82}},
-      color={0,0,127}));
 annotation(Documentation(
   info="<html>
 <h4>Description</h4>

Buildings/Templates/Plants/Boilers/HotWater/Components/Data/Controller.mo

@@ -24,7 +24,15 @@ record Controller
     "Outdoor air lockout temperature above which the plant is prevented from operating"
     annotation(Dialog(group="Temperature setpoints",
       enable=cfg.typCtl ==
-        Buildings.Templates.Plants.Boilers.HotWater.Types.Controller.Guideline36));
+      Buildings.Templates.Plants.Boilers.HotWater.Types.Controller.Guideline36));
+  /* HACK(AntoineGautier):
+   * We use an unknown dimension [:] in the declarations below to avoid Dymola's
+   * error "evaluate and check the size declaration".
+   * However, this requires explicitly providing a value with OCT, 
+   * even if enable=false (the start attribute is not enough for OCT).
+   * Using fill instead of each for the start attribute also enhances tool
+   * compatibility.
+   */
   parameter Modelica.Units.SI.VolumeFlowRate VHeaWatBoiCon_flow_nominal[:](
     start=fill(0.1, cfg.nBoiCon),
     each displayUnit="L/s",

Buildings/Templates/Plants/Boilers/HotWater/Components/Interfaces/PartialController.mo

@@ -177,13 +177,6 @@ block PartialController
       iconTransformation(extent={{-20,-20},{20,20}},
         rotation=-90,
         origin={100,-60})));
-  Buildings.Controls.OBC.CDL.Routing.RealExtractSignal VHeaWatSec_flow(
-    nin=cfg.nLooHeaWatSec,
-    nout=cfg.nLooHeaWatSec)
-    if cfg.typPumHeaWatSec <>
-      Buildings.Templates.Plants.Boilers.HotWater.Types.PumpsSecondary.None
-    "Secondary HW flow (handles none, single or multiple sensors)"
-    annotation(Placement(transformation(extent={{-210,-90},{-190,-70}})));
   protected
   Buildings.Templates.Components.Interfaces.Bus busBoiCon[cfg.nBoiCon]
     if cfg.have_boiCon
@@ -281,14 +274,6 @@ equation
     annotation(Line(points={{-160,200},{-180,200},{-180,0},{-260,0}},
       color={255,204,51},
       thickness=0.5));
-  // HACK: Using an explicit range for bus.VHeaWatSec_flow avoids Dymola's warning
-  // "Note: since there are connections to elements of pla.bus.VHeaWatSec_flow[]
-  // we have to expand pla.boiCon.bus.VHeaWatSec_flow[] (which is connected to it)."
-  connect(bus.VHeaWatSec_flow[1:cfg.nLooHeaWatSec], VHeaWatSec_flow.u)
-    annotation (Line(
-      points={{-260,0},{-260,-14},{-240,-14},{-240,-80},{-212,-80}},
-      color={255,204,51},
-      thickness=0.5));
 annotation(Icon(coordinateSystem(preserveAspectRatio=false)),
   Diagram(coordinateSystem(preserveAspectRatio=false,
     extent={{-260,-280},{260,280}},

Buildings/Templates/Plants/Boilers/HotWater/Validation/BoilerPlant.mo

@@ -112,6 +112,7 @@ model BoilerPlant
     "Heating load"
     annotation(Placement(transformation(extent={{110,-70},{130,-50}})));
   Fluid.MixingVolumes.MixingVolume vol(
+    final energyDynamics=energyDynamics,
     m_flow_nominal=pla.mHeaWat_flow_nominal,
     V=Buildings.Templates.Data.Defaults.ratVLiqByCap * pla.cap_nominal,
     redeclare package Medium=Medium,

Buildings/Templates/Plants/HeatPumps/Components/Data/Controller.mo

@@ -73,10 +73,14 @@ record Controller
     annotation (Dialog(group=
       "Information provided by designer",
       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.
-  // This requires explicitely providing a value with OCT, even if enable=false.
+  /* HACK(AntoineGautier):
+   * We use an unknown dimension [:] in the declaration below to avoid Dymola's
+   * error "evaluate and check the size declaration".
+   * However, this requires explicitly providing a value with OCT, 
+   * even if enable=false (the start attribute is not enough for OCT).
+   * Using fill instead of each for the start attribute also enhances tool
+   * compatibility.
+   */
   parameter Modelica.Units.SI.PressureDifference dpHeaWatRemSet_max[:](
     start=fill(Buildings.Templates.Data.Defaults.dpHeaWatRemSet_max, cfg.nSenDpHeaWatRem),
     final min=fill(0, cfg.nSenDpHeaWatRem))
@@ -201,10 +205,14 @@ 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)));
-  // HACK(AntoineGautier):
-  // Using cfg.nSenDpChiWatRem for size(dpChiWatRemSet_max, 1) is not supported by Dymola which fails to "evaluate and check the size declaration".
-  // So the size is kept unassigned.
-  // This requires explicitely providing a value with OCT, even if enable=false.
+  /* HACK(AntoineGautier):
+   * We use an unknown dimension [:] in the declaration below to avoid Dymola's
+   * error "evaluate and check the size declaration".
+   * However, this requires explicitly providing a value with OCT, 
+   * even if enable=false (the start attribute is not enough for OCT).
+   * Using fill instead of each for the start attribute also enhances tool
+   * compatibility.
+   */
   parameter Modelica.Units.SI.PressureDifference dpChiWatRemSet_max[:](
     start=fill(Buildings.Templates.Data.Defaults.dpChiWatRemSet_max, cfg.nSenDpChiWatRem),
     final min=fill(0, cfg.nSenDpChiWatRem))