Fix case w/o secondary flow sensor

AntoineGautier · AntoineGautier · commit 259946079fa9 · 2026-02-11T15:48:37.000+01:00
diff --git a/Buildings/Controls/OBC/ASHRAE/G36/Plants/Boilers/PrimaryController.mo b/Buildings/Controls/OBC/ASHRAE/G36/Plants/Boilers/PrimaryController.mo
@@ -69,7 +69,7 @@ model PrimaryController
     user interface may not be exposed";
 
   parameter Integer nLooSec(
-    final min=1,
+    final min=0,
     final start=1)
     "Number of secondary loops serviced by primary plant"
     annotation (Dialog(tab="General",
diff --git a/Buildings/Templates/Plants/Boilers/HotWater/Components/Controls/G36.mo b/Buildings/Templates/Plants/Boilers/HotWater/Components/Controls/G36.mo
@@ -210,7 +210,6 @@ equation
   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]);
   connect(busLooCon.THeaWatPriSup, ctlLooPri.TSupPri);
@@ -233,7 +232,6 @@ 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);
@@ -301,6 +299,10 @@ 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>
diff --git a/Buildings/Templates/Plants/Boilers/HotWater/Components/Interfaces/PartialController.mo b/Buildings/Templates/Plants/Boilers/HotWater/Components/Interfaces/PartialController.mo
@@ -176,6 +176,12 @@ 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 have_senVHeaWatSec
+    "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
@@ -273,6 +279,17 @@ equation
     annotation(Line(points={{-160,200},{-180,200},{-180,0},{-260,0}},
       color={255,204,51},
       thickness=0.5));
+  /* HACK(AntoineGautier)
+   * Dymola should remove this at translation if have_senVHeaWatSec is false
+   * But it doesn't... We have to remove it explicitly.
+   */
+  if have_senVHeaWatSec then
+    connect(bus.VHeaWatSec_flow, VHeaWatSec_flow.u[1])
+      annotation (Line(
+        points={{-260,0},{-260,-14},{-240,-14},{-240,-80},{-212,-80}},
+        color={255,204,51},
+          thickness=0.5));
+  end if;
 annotation(Icon(coordinateSystem(preserveAspectRatio=false)),
   Diagram(coordinateSystem(preserveAspectRatio=false,
     extent={{-260,-280},{260,280}},
