lbl-srg · AntoineGautier · May 8, 2025 · May 9, 2025 · May 9, 2025 · May 20, 2025
diff --git a/.travis.yml b/.travis.yml
diff --git a/Buildings/Air/Systems/SingleZone/VAV/Examples/Guideline36.mo b/Buildings/Air/Systems/SingleZone/VAV/Examples/Guideline36.mo
@@ -11,7 +11,6 @@ model Guideline36
   Buildings.Controls.OBC.ASHRAE.G36.AHUs.SingleZone.VAV.Controller con(
     eneStd=Buildings.Controls.OBC.ASHRAE.G36.Types.EnergyStandard.ASHRAE90_1,
     venStd=Buildings.Controls.OBC.ASHRAE.G36.Types.VentilationStandard.ASHRAE62_1,
-
     final VAreBreZon_flow=0.0144,
     final VPopBreZon_flow=0.0075,
     ecoHigLimCon=Buildings.Controls.OBC.ASHRAE.G36.Types.ControlEconomizer.FixedDryBulb,

diff --git a/Buildings/Air/Systems/SingleZone/VAV/Examples/OptimalStart/BaseClasses/ZoneWithAHUG36.mo b/Buildings/Air/Systems/SingleZone/VAV/Examples/OptimalStart/BaseClasses/ZoneWithAHUG36.mo
@@ -48,7 +48,6 @@ block ZoneWithAHUG36
   Buildings.Controls.OBC.ASHRAE.G36.AHUs.SingleZone.VAV.Controller con(
     eneStd=Buildings.Controls.OBC.ASHRAE.G36.Types.EnergyStandard.ASHRAE90_1,
     venStd=Buildings.Controls.OBC.ASHRAE.G36.Types.VentilationStandard.ASHRAE62_1,
-
     VAreBreZon_flow=0.4989,
     VPopBreZon_flow=0.2075,
     ecoHigLimCon=Buildings.Controls.OBC.ASHRAE.G36.Types.ControlEconomizer.FixedDryBulb,
@@ -229,12 +228,12 @@ equation
           preserveAspectRatio=false, extent={{-160,-160},{160,160}})),
 Documentation(info="<html>
 <p>
-This base class contains a controller based on Guideline36 
+This base class contains a controller based on Guideline36
 <a href=\"modelica://Buildings.Controls.OBC.ASHRAE.G36.AHUs.SingleZone.VAV.Controller\">
 Buildings.Controls.OBC.ASHRAE.G36.AHUs.SingleZone.VAV.Controller</a>,
 a single-zone VAV system
 <a href=\"modelica://Buildings.Air.Systems.SingleZone.VAV.ChillerDXHeatingEconomizer\">
-Buildings.Air.Systems.SingleZone.VAV.ChillerDXHeatingEconomizer</a>, 
+Buildings.Air.Systems.SingleZone.VAV.ChillerDXHeatingEconomizer</a>,
 and a single-zone floor building
 <a href=\"modelica://Buildings.ThermalZones.Detailed.Validation.BaseClasses.SingleZoneFloor\">
 Buildings.ThermalZones.Detailed.Validation.BaseClasses.SingleZoneFloor</a>.

diff --git a/Buildings/Applications/DataCenters/ChillerCooled/Examples/BaseClasses/PartialDataCenter.mo b/Buildings/Applications/DataCenters/ChillerCooled/Examples/BaseClasses/PartialDataCenter.mo
@@ -171,18 +171,15 @@ partial model PartialDataCenter
     annotation (Placement(transformation(extent={{10,-10},{-10,10}},
         rotation=90,
         origin={-50,-150})));
-  Buildings.Examples.ChillerPlant.BaseClasses.SimplifiedRoom roo(
+  Buildings.Examples.ChillerPlants.DataCenter.BaseClasses.SimplifiedRoom roo(
     redeclare replaceable package Medium = MediumA,
     rooLen=50,
     rooWid=30,
     rooHei=3,
     m_flow_nominal=mAir_flow_nominal,
     QRoo_flow=500000,
-    nPorts=2)
-    "Room model"
-    annotation (Placement(transformation(
-        extent={{10,-10},{-10,10}},
-        origin={4,-180})));
+    nPorts=2) "Room model" annotation (Placement(transformation(extent={{10,-10},
+            {-10,10}}, origin={4,-180})));
   Buildings.Fluid.Actuators.Valves.TwoWayLinear val[numChi](
     redeclare each package Medium = MediumW,
     each m_flow_nominal=m1_flow_chi_nominal,

diff --git a/Buildings/Applications/DataCenters/DXCooled/Examples/DXCooledAirsideEconomizer.mo b/Buildings/Applications/DataCenters/DXCooled/Examples/DXCooledAirsideEconomizer.mo
@@ -39,7 +39,7 @@ model DXCooledAirsideEconomizer
   parameter Real minSpeFan = 0.2
     "Minimum fan speed ratio required by variable speed fans";
 
-  Buildings.Examples.ChillerPlant.BaseClasses.SimplifiedRoom roo(
+  Buildings.Examples.ChillerPlants.DataCenter.BaseClasses.SimplifiedRoom roo(
     redeclare package Medium = Medium,
     rooLen=50,
     rooHei=3,

diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Controller.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Controller.mo
@@ -698,21 +698,21 @@ outdoor air requirements. Different sequence will be enabled depending on the
 designes minimum outdoor air and economizer function, which include
 <ol type=\"i\">
 <li>
-separate minimum outdoor air damper, with airflow measurement. 
+separate minimum outdoor air damper, with airflow measurement.
 See
 <a href=\"modelica://Buildings.Controls.OBC.ASHRAE.G36.AHUs.MultiZone.VAV.Economizers.Subsequences.Limits.SeparateWithAFMS\">
 Buildings.Controls.OBC.ASHRAE.G36.AHUs.MultiZone.VAV.Economizers.Subsequences.Limits.SeparateWithAFMS</a>
 for a description.
 </li>
 <li>
-separate minimum outdoor air damper, with differential pressure measurement. 
+separate minimum outdoor air damper, with differential pressure measurement.
 See
 <a href=\"modelica://Buildings.Controls.OBC.ASHRAE.G36.AHUs.MultiZone.VAV.Economizers.Subsequences.Limits.SeparateWithDP\">
 Buildings.Controls.OBC.ASHRAE.G36.AHUs.MultiZone.VAV.Economizers.Subsequences.Limits.SeparateWithDP</a>
 for a description.
 </li>
 <li>
-single common minimum outdoor air and economizer damper. 
+single common minimum outdoor air and economizer damper.
 See
 <a href=\"modelica://Buildings.Controls.OBC.ASHRAE.G36.AHUs.MultiZone.VAV.Economizers.Subsequences.Limits.Common\">
 Buildings.Controls.OBC.ASHRAE.G36.AHUs.MultiZone.VAV.Economizers.Subsequences.Limits.Common</a>
@@ -738,14 +738,14 @@ that were computed in the above blocks. Different sequence will be enabled depen
 on the types of building pressure control system, which include
 <ol type=\"i\">
 <li>
-relief damper or relief fan control. 
+relief damper or relief fan control.
 See
 <a href=\"modelica://Buildings.Controls.OBC.ASHRAE.G36.AHUs.MultiZone.VAV.Economizers.Subsequences.Modulations.Reliefs\">
 Buildings.Controls.OBC.ASHRAE.G36.AHUs.MultiZone.VAV.Economizers.Subsequences.Modulations.Reliefs</a>
 for a description.
 </li>
 <li>
-return fan control with airflow tracking, or with direct building pressure control. 
+return fan control with airflow tracking, or with direct building pressure control.
 See
 <a href=\"modelica://Buildings.Controls.OBC.ASHRAE.G36.AHUs.MultiZone.VAV.Economizers.Subsequences.Modulations.ReturnFan\">
 Buildings.Controls.OBC.ASHRAE.G36.AHUs.MultiZone.VAV.Economizers.Subsequences.Modulations.ReturnFan</a>

diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/PlantRequests.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/PlantRequests.mo
@@ -383,7 +383,7 @@ annotation (
   Documentation(info="<html>
 <p>
 This sequence outputs the system reset requests for multiple zone air handling unit. The
-implementation is according to the Section 5.16.16 of ASHRAE Guideline 36, May 2020. 
+implementation is according to the Section 5.16.16 of ASHRAE Guideline 36, May 2020.
 </p>
 <h4>Chilled water reset request <code>yChiWatResReq</code></h4>
 <ol>

diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/Controller.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/Controller.mo
@@ -1263,8 +1263,7 @@ equation
     annotation (Dialog(enable=have_frePro),
             defaultComponentName="conVAV",
     Icon(coordinateSystem(preserveAspectRatio=false, extent={{-200,-400},{200,400}}),
-        graphics={
-                  Rectangle(
+        graphics={Rectangle(
         extent={{-200,-400},{200,400}},
         lineColor={0,0,127},
         fillColor={255,255,255},

diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/PlantRequests.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/PlantRequests.mo
@@ -380,7 +380,7 @@ annotation (
   Documentation(info="<html>
 <p>
 This sequence outputs the system reset requests for single zone air handling unit. The
-implementation is according to the Section 5.18.15 of ASHRAE Guideline 36, May 2020. 
+implementation is according to the Section 5.18.15 of ASHRAE Guideline 36, May 2020.
 </p>
 <h4>chilled water reset request <code>yChiWatResReq</code></h4>
 <ol>

diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/Validation/Controller.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/Validation/Controller.mo
@@ -4,7 +4,6 @@ model Controller "Validation of the top-level controller"
     final eneStd=Buildings.Controls.OBC.ASHRAE.G36.Types.EnergyStandard.ASHRAE90_1,
 
     final venStd=Buildings.Controls.OBC.ASHRAE.G36.Types.VentilationStandard.ASHRAE62_1,
-
     final ecoHigLimCon=Buildings.Controls.OBC.ASHRAE.G36.Types.ControlEconomizer.FixedDryBulb,
 
     final ashCliZon=Buildings.Controls.OBC.ASHRAE.G36.Types.ASHRAEClimateZone.Zone_1A,

diff --git a/Buildings/Controls/OBC/ASHRAE/G36/Generic/TrimAndRespond.mo b/Buildings/Controls/OBC/ASHRAE/G36/Generic/TrimAndRespond.mo
@@ -392,7 +392,7 @@ on request number"),
           textString="Optional hold of the loop output")}),
    Documentation(info="<html>
 <p>
-This block implements the trim and respond logic according to Section 5.1.14.3 
+This block implements the trim and respond logic according to Section 5.1.14.3
 and 5.1.14.4 of ASHRAE Guideline 36, May 2020.
 </p>
 <p>
@@ -441,25 +441,25 @@ In other words, every time step <code>samplePeriod</code>:
 <p>
 Optionally, if the parameter <code>have_hol</code> is set to true, an additional
 input signal <code>uHol</code> allows for holding the trim and respond loop output
-at a fixed value for the longer of the time the input <code>uHol</code> remains true 
+at a fixed value for the longer of the time the input <code>uHol</code> remains true
 and the duration specified by the parameter <code>dtHol</code>.
 When <code>uHol</code> switches back to false, the hold is released and resetting
 continues from the previously held value (without reinitializing to <code>iniSet</code>
-or going through a delay time of <code>delTim</code>). 
+or going through a delay time of <code>delTim</code>).
 </p>
 <p>
 This is typically used in control sequences to freeze the reset logic during the plant
 staging process.
 Consider for example the following specification:<br/>
 \"When a plant stage change is initiated, the reset logic shall be disabled and value
-fixed at its last value for the longer of <i>15</i> minutes and the time it takes 
+fixed at its last value for the longer of <i>15</i> minutes and the time it takes
 for the plant to successfully stage.\"<br/>
-Using this block with <code>have_hol=true</code> and <code>dtHol=15*60</code> 
+Using this block with <code>have_hol=true</code> and <code>dtHol=15*60</code>
 yields the following sequence of events.
 </p>
 <ul>
 <li>0:00 - Stage change is initiated. T&amp;R loop output is at <i>50&nbsp;%</i>.</li>
-<li>0:12 - Stage change is completed. T&amp;R loop output remains at <i>50&nbsp;%</i> 
+<li>0:12 - Stage change is completed. T&amp;R loop output remains at <i>50&nbsp;%</i>
 since <i>&lt;&nbsp;15&nbsp;</i>minutes have elapsed.</li>
 <li>0:15 - T&amp;R is released and continues resetting from <i>50&nbsp;%</i>.</li>
 </ul>

diff --git a/Buildings/Controls/OBC/ASHRAE/G36/Plants/Boilers/BypassValve/BypassValvePosition.mo b/Buildings/Controls/OBC/ASHRAE/G36/Plants/Boilers/BypassValve/BypassValvePosition.mo
@@ -0,0 +1,194 @@
+within Buildings.Controls.OBC.ASHRAE.G36.Plants.Boilers.BypassValve;
+block BypassValvePosition
+  "Sequence for controlling minimum flow bypass valve position"
+
+  parameter Integer nPum = 2
+    "Number of pumps";
+
+  parameter Buildings.Controls.OBC.CDL.Types.SimpleController controllerType= Buildings.Controls.OBC.CDL.Types.SimpleController.PI
+    "Type of controller";
+
+  parameter Real k(
+    final min=0,
+    final unit="1",
+    displayUnit="1") = 1
+    "Gain of controller";
+
+  parameter Real Ti(
+    final min=0,
+    final unit="s",
+    displayUnit="s",
+    final quantity="time") = 0.5
+    "Time constant of integrator block";
+
+  parameter Real Td(
+    final min=0,
+    final unit="s",
+    displayUnit="s",
+    final quantity="time") = 0.1
+    "Time constant of derivative block";
+
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uPumSta[nPum]
+    "Input signals indicating pump statuses"
+    annotation (Placement(transformation(extent={{-140,-20},{-100,20}}),
+      iconTransformation(extent={{-140,-40},{-100,0}})));
+
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput VHotWat_flow(
+    final unit="m3/s",
+    displayUnit="m3/s",
+    final quantity="VolumeFlowRate")
+    "Measured hot-water flow-rate through primary circuit"
+    annotation (Placement(transformation(extent={{-140,20},{-100,60}}),
+      iconTransformation(extent={{-140,0},{-100,40}})));
+
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput VHotWatMinSet_flow(
+    final unit="m3/s",
+    displayUnit="m3/s",
+    final quantity="VolumeFlowRate")
+    "Calculated hot water minimum flow setpoint through boilers"
+    annotation (Placement(transformation(extent={{-140,60},{-100,100}}),
+      iconTransformation(extent={{-140,40},{-100,80}})));
+
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput uMinBypValPos(
+    final unit="1",
+    displayUnit="1",
+    final min=0)
+    "Minimum bypass valve position for condensation control in non-condensing boilers"
+    annotation (Placement(transformation(extent={{-140,-80},{-100,-40}}),
+      iconTransformation(extent={{-140,-80},{-100,-40}})));
+
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yBypValPos(
+    final unit="1",
+    displayUnit="1",
+    final min=0)
+    "Bypass valve opening position"
+    annotation (Placement(transformation(extent={{100,-50},{140,-10}}),
+      iconTransformation(extent={{100,-20},{140,20}})));
+
+protected
+  Buildings.Controls.OBC.CDL.Reals.Subtract sub2
+    "Difference between measured flowrate and minimum flow setpoint"
+    annotation (Placement(transformation(extent={{-70,30},{-50,50}})));
+
+  Buildings.Controls.OBC.CDL.Logical.MultiOr mulOr(
+    final nin=nPum)
+    "Block to detect if any of the pumps are proved ON"
+    annotation (Placement(transformation(extent={{-70,-10},{-50,10}})));
+
+  Buildings.Controls.OBC.CDL.Reals.Divide div
+    "Normalize measured hot water flowrate"
+    annotation (Placement(transformation(extent={{-20,30},{0,50}})));
+
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant con(
+    final k=0)
+    "Constant Real source"
+    annotation (Placement(transformation(extent={{-20,60},{0,80}})));
+
+  Buildings.Controls.OBC.CDL.Reals.Max max
+    "Ensure bypass valve position is greater than lower limit for condensation control"
+    annotation (Placement(transformation(extent={{70,-40},{90,-20}})));
+
+  Buildings.Controls.OBC.CDL.Reals.AddParameter addPar(
+    final p=1e-6)
+    "Prevent division by zero"
+    annotation (Placement(transformation(extent={{-70,70},{-50,90}})));
+
+  Buildings.Controls.OBC.CDL.Reals.PIDWithReset conPID(
+    final controllerType=controllerType,
+    final k=k,
+    final Ti=Ti,
+    final Td=Td,
+    final yMax=1,
+    final yMin=0,
+    xi_start=1,
+    reverseActing=false)
+    "PID loop to regulate flow through primary loop using bypass valve"
+    annotation (Placement(transformation(extent={{20,60},{40,80}})));
+
+  Buildings.Controls.OBC.CDL.Logical.Edge edg
+    "Reset PID loop when it is activated"
+    annotation (Placement(transformation(extent={{-20,-10},{0,10}})));
+
+equation
+
+  connect(mulOr.u[1:nPum], uPumSta) annotation (Line(points={{-72,0},{-120,0}},
+                                  color={255,0,255}));
+
+  connect(uMinBypValPos, max.u2) annotation (Line(points={{-120,-60},{50,-60},{50,
+          -36},{68,-36}}, color={0,0,127}));
+  connect(max.y, yBypValPos)
+    annotation (Line(points={{92,-30},{120,-30}}, color={0,0,127}));
+  connect(VHotWatMinSet_flow, addPar.u)
+    annotation (Line(points={{-120,80},{-72,80}}, color={0,0,127}));
+  connect(addPar.y, div.u2) annotation (Line(points={{-48,80},{-40,80},{-40,34},
+          {-22,34}}, color={0,0,127}));
+  connect(con.y, conPID.u_s)
+    annotation (Line(points={{2,70},{18,70}},   color={0,0,127}));
+  connect(div.y, conPID.u_m)
+    annotation (Line(points={{2,40},{30,40},{30,58}},   color={0,0,127}));
+  connect(mulOr.y, edg.u) annotation (Line(points={{-48,0},{-22,0}},
+                    color={255,0,255}));
+  connect(edg.y, conPID.trigger)
+    annotation (Line(points={{2,0},{24,0},{24,58}}, color={255,0,255}));
+
+  connect(conPID.y, max.u1) annotation (Line(points={{42,70},{50,70},{50,-24},{68,
+          -24}}, color={0,0,127}));
+  connect(sub2.y, div.u1) annotation (Line(points={{-48,40},{-28,40},{-28,46},{-22,
+          46}}, color={0,0,127}));
+  connect(VHotWatMinSet_flow,sub2. u1) annotation (Line(points={{-120,80},{-80,80},
+          {-80,46},{-72,46}}, color={0,0,127}));
+  connect(VHotWat_flow,sub2. u2) annotation (Line(points={{-120,40},{-80,40},{-80,
+          34},{-72,34}}, color={0,0,127}));
+annotation (defaultComponentName="bypValPos",
+  Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,100}}),
+    graphics={Rectangle(
+                extent={{-100,100},{100,-100}},
+                lineColor={28,108,200},
+                fillColor={255,255,255},
+                fillPattern=FillPattern.Solid),
+              Text(
+                extent={{-70,20},{70,-20}},
+                textColor={0,0,0},
+                fillColor={255,255,255},
+                fillPattern=FillPattern.None,
+                textString="bypValPos"),
+              Text(
+                extent={{-100,146},{100,108}},
+                textColor={0,0,255},
+                textString="%name")}),
+  Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,100}})),
+  Documentation(info="<html>
+    <p>
+    Control sequence for bypass circuit valve position <code>yBypValPos</code>
+    for boiler plant loop.
+    </p>
+    <ul>
+    <li>
+    The bypass valve is enabled when any of the hot-water supply pumps are proven on
+    <code>uPumSta = true</code>, and disabled otherwise.
+    </li>
+    <li>
+    When enabled, a PID control loop modulates the bypass valve to maintain
+    a primary circuit flow rate of <code>VHotWatMinSet_flow</code>, calculated in class
+    <a href=\"modelica://Buildings.Controls.OBC.ASHRAE.G36.Plants.Boilers.SetPoints.MinimumFlowSetpoint\">
+    Buildings.Controls.OBC.ASHRAE.G36.Plants.Boilers.SetPoints.MinimumFlowSetpoint</a>.
+    </li>
+    <li>
+    When all the pumps are not proved on <code>uPumSta = false</code>, the valve
+    is fully opened.
+    </li>
+    <li>
+    When a non-condensing boiler is enabled, the bypass valve position is set to the
+    higher value between the signal generated by the PID loop, and the minimum valve
+    position for condensation control <code>uMinBypValPos</code>.
+    </li>
+    </ul>
+    </html>", revisions="<html>
+    <ul>
+    <li>
+    August 17, 2020, by Karthik Devaprasad:<br/>
+    First implementation.
+    </li>
+    </ul>
+    </html>"));
+end BypassValvePosition;