Merge pull request #3168 from karthikeyad-pnnl/issue2180_BoilerPlant_…

…MainController_oct_2021 Issue2180 boiler plant main controller oct 2021
lbl-srg · Mar 10, 2023 · fe2a983 · fe2a983
2 parents ecfb839 + 110e5cc
commit fe2a983
Show file tree

Hide file tree

Showing 117 changed files with 1,853 additions and 1,889 deletions.
diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/BypassValve/BypassValvePosition.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/BypassValve/BypassValvePosition.mo
@@ -148,13 +148,13 @@ annotation (defaultComponentName="bypValPos",
                 fillPattern=FillPattern.Solid),
               Text(
                 extent={{-70,20},{70,-20}},
-                lineColor={0,0,0},
+                textColor={0,0,0},
                 fillColor={255,255,255},
                 fillPattern=FillPattern.None,
                 textString="bypValPos"),
               Text(
                 extent={{-100,146},{100,108}},
-                lineColor={0,0,255},
+                textColor={0,0,255},
                 textString="%name")}),
   Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,100}})),
   Documentation(info="<html>
@@ -190,11 +190,5 @@ annotation (defaultComponentName="bypValPos",
     First implementation.
     </li>
     </ul>
-    </html>"),
-    experiment(
-      StartTime=-1814400,
-      StopTime=1814400,
-      Interval=1,
-      Tolerance=1e-06,
-      __Dymola_Algorithm="Dassl"));
+    </html>"));
 end BypassValvePosition;
diff --git a/...ntrols/OBC/ASHRAE/PrimarySystem/BoilerPlant/BypassValve/Validation/BypassValvePosition.mo b/...ntrols/OBC/ASHRAE/PrimarySystem/BoilerPlant/BypassValve/Validation/BypassValvePosition.mo
@@ -101,6 +101,5 @@ First implementation.
       StartTime=0,
       StopTime=300,
       Interval=1,
-      Tolerance=1e-06,
-      __Dymola_Algorithm="Cvode"));
+      Tolerance=1e-06));
 end BypassValvePosition;
diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/BypassValve/Validation/package.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/BypassValve/Validation/package.mo
@@ -21,5 +21,12 @@ package Validation "Validation models for BypassValve sequences"
           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}})}));
+          points={{-58.0,46.0},{42.0,-14.0},{-58.0,-74.0},{-58.0,46.0}})}),
+    Documentation(info="<html>
+<p>
+This package contains validation models for the classes in
+<a href=\"modelica://Buildings.Controls.OBC.ASHRAE.PrimarySystem.BoilerPlant.BypassValve\">
+Buildings.Controls.OBC.ASHRAE.PrimarySystem.BoilerPlant.BypassValve</a>.
+</p>
+</html>"));
 end Validation;
diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Controller.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Controller.mo
diff --git a/.../Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/EquipmentRotation/ControllerTwo.mo b/.../Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/EquipmentRotation/ControllerTwo.mo
@@ -240,7 +240,7 @@ annotation(Diagram(coordinateSystem(extent={{-160,-100},{160,100}})),
           fillPattern=FillPattern.Solid),
         Text(
           extent={{-120,146},{100,108}},
-          lineColor={0,0,255},
+          textColor={0,0,255},
           textString="%name"),
         Ellipse(
           origin={-26.6667,38.6207},

diff --git a/...PrimarySystem/BoilerPlant/Generic/EquipmentRotation/Subsequences/ContinuousLeadSwapTwo.mo b/...PrimarySystem/BoilerPlant/Generic/EquipmentRotation/Subsequences/ContinuousLeadSwapTwo.mo
@@ -50,7 +50,7 @@ equation
     lineColor=DynamicSelect({235,235,235}, if u1 then {0,255,0} else {235,235,235}),
     fillColor=DynamicSelect({235,235,235}, if u1 then {0,255,0} else {235,235,235}),
     fillPattern=FillPattern.Solid), Text( extent={{-120,146},{100,108}},
-    lineColor={0,0,255}, textString="%name")}),
+    textColor={0,0,255}, textString="%name")}),
   Documentation(info="<html>
 <p>
 This block ensures that the new lead device is started and proven on before the old 

diff --git a/...C/ASHRAE/PrimarySystem/BoilerPlant/Generic/EquipmentRotation/Subsequences/LeastRuntime.mo b/...C/ASHRAE/PrimarySystem/BoilerPlant/Generic/EquipmentRotation/Subsequences/LeastRuntime.mo
@@ -137,7 +137,7 @@ equation
   connect(not3.y, and3.u2) annotation (Line(points={{28,-40},{90,-40},{90,20},{98,
           20}}, color={255,0,255}));
   connect(uDevStaSet, mulOr1.u[1:2]) annotation (Line(points={{-180,40},{-130,40},
-          {-130,-20},{-102,-20}},     color={255,0,255}));
+          {-130,-23.5},{-102,-23.5}}, color={255,0,255}));
   connect(mulOr1.y, edg1.u)
     annotation (Line(points={{-78,-20},{-72,-20}}, color={255,0,255}));
   connect(edg1.y, booRep.u)
@@ -155,7 +155,7 @@ equation
         fillPattern=FillPattern.Solid),
         Text(
           extent={{-120,146},{100,108}},
-          lineColor={0,0,255},
+          textColor={0,0,255},
           textString="%name"),
       Line(points={{-66,-70},{82,-70}},
         color={192,192,192}),

diff --git a/...AE/PrimarySystem/BoilerPlant/Generic/EquipmentRotation/Subsequences/MinimumLeadRuntime.mo b/...AE/PrimarySystem/BoilerPlant/Generic/EquipmentRotation/Subsequences/MinimumLeadRuntime.mo
@@ -108,7 +108,7 @@ equation
         fillPattern=FillPattern.Solid),
         Text(
           extent={{-120,146},{100,108}},
-          lineColor={0,0,255},
+          textColor={0,0,255},
           textString="%name"),
       Line(points={{-66,-70},{82,-70}},
         color={192,192,192}),

diff --git a/.../OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/EquipmentRotation/Subsequences/Scheduler.mo b/.../OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/EquipmentRotation/Subsequences/Scheduler.mo
@@ -200,7 +200,7 @@ equation
           fillPattern=FillPattern.Solid),
         Text(
           extent={{-120,146},{100,108}},
-          lineColor={0,0,255},
+          textColor={0,0,255},
           textString="%name"),
         Ellipse(
           extent={{-52,56},{58,-54}},

diff --git a/...ntrols/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/EquipmentRotation/Subsequences/Two.mo b/...ntrols/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/EquipmentRotation/Subsequences/Two.mo
@@ -66,7 +66,7 @@ equation
         fillPattern=FillPattern.Solid),
         Text(
           extent={{-120,146},{100,108}},
-          lineColor={0,0,255},
+          textColor={0,0,255},
           textString="%name"),
         Line(points={{-40,60},{0,60},{0,-60},{40,-60}}, color={128,128,128}),
         Ellipse(

diff --git a/...tem/BoilerPlant/Generic/EquipmentRotation/Subsequences/Validation/LeastRuntime_uDevRol.mo b/...tem/BoilerPlant/Generic/EquipmentRotation/Subsequences/Validation/LeastRuntime_uDevRol.mo
@@ -170,7 +170,7 @@ Icon(graphics={
         coordinateSystem(preserveAspectRatio=false, extent={{-120,-120},{120,120}}),
         graphics={Text(
           extent={{-52,-104},{46,-114}},
-          lineColor={0,0,127},
+          textColor={0,0,127},
           textString="For simplicity this test assumes 
 the device ON/OFF status equals its setpoint 
 (there is no delay in starting or stopping devices).")}));

diff --git a/...ilerPlant/Generic/EquipmentRotation/Subsequences/Validation/MinimumLeadRuntime_uDevRol.mo b/...ilerPlant/Generic/EquipmentRotation/Subsequences/Validation/MinimumLeadRuntime_uDevRol.mo
@@ -148,7 +148,7 @@ Icon(graphics={
         coordinateSystem(preserveAspectRatio=false, extent={{-120,-120},{120,120}}),
         graphics={Text(
           extent={{-52,-104},{46,-114}},
-          lineColor={0,0,127},
+          textColor={0,0,127},
           textString="For simplicity this test assumes 
 the device ON/OFF status equals its setpoint 
 (there is no delay in starting or stopping devices).")}));

diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/PlantDisable.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/PlantDisable.mo
@@ -247,7 +247,7 @@ equation
         borderPattern=BorderPattern.Raised),
       Text(
         extent={{-120,146},{100,108}},
-        lineColor={0,0,255},
+        textColor={0,0,255},
         textString="%name"),
       Ellipse(
         extent={{-80,80},{80,-80}},
@@ -264,11 +264,11 @@ equation
         fillPattern=FillPattern.Solid),
       Text(
         extent={{-66,46},{76,10}},
-        lineColor={28,108,200},
+        textColor={28,108,200},
         textString="START"),
       Text(
         extent={{-66,-8},{76,-44}},
-        lineColor={28,108,200},
+        textColor={28,108,200},
         textString="STOP")},
       coordinateSystem(
         preserveAspectRatio=false,

diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/PlantEnable.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/PlantEnable.mo
@@ -214,7 +214,7 @@ equation
           borderPattern=BorderPattern.Raised),
         Text(
           extent={{-120,146},{100,108}},
-          lineColor={0,0,255},
+          textColor={0,0,255},
           textString="%name"),
         Ellipse(extent={{-80,80},{80,-80}}, lineColor={28,108,200},fillColor={170,255,213},
           fillPattern=FillPattern.Solid),
@@ -224,11 +224,11 @@ equation
           fillPattern=FillPattern.Solid),
         Text(
           extent={{-66,46},{76,10}},
-          lineColor={28,108,200},
+          textColor={28,108,200},
           textString="START"),
         Text(
           extent={{-66,-8},{76,-44}},
-          lineColor={28,108,200},
+          textColor={28,108,200},
           textString="STOP")},
           coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,100}})),
   Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-160,-140},{160,140}})),

diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/RotationController.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/RotationController.mo
@@ -173,7 +173,7 @@ equation
   connect(equRot.yDevStaSet, yDevStaSet) annotation (Line(points={{-48,46},{-30,
           46},{-30,50},{120,50}}, color={255,0,255}));
   connect(booToInt.y, mulSumInt.u[1:2])
-    annotation (Line(points={{2,0},{8,0},{8,0}},    color={255,127,0}));
+    annotation (Line(points={{2,0},{8,0},{8,-3.5}}, color={255,127,0}));
   connect(mulSumInt.y, intGreThr.u) annotation (Line(points={{32,0},{40,0},{40,30},
           {48,30}}, color={255,127,0}));
   connect(mulSumInt.y, intGreThr1.u)
@@ -204,7 +204,7 @@ equation
     Icon(graphics={
       Text(
         extent={{-120,146},{100,108}},
-        lineColor={0,0,255},
+        textColor={0,0,255},
         textString="%name"),
         Rectangle(
         extent={{-100,-100},{100,100}},

diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/Subsequences/HWIsoVal.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/Subsequences/HWIsoVal.mo
@@ -211,7 +211,7 @@ equation
   connect(and2.y, swi.u2) annotation (Line(points={{-58,-170},{-50,-170},{-50,-40},
           {138,-40}}, color={255,0,255}));
   connect(and2.y, triSam.trigger) annotation (Line(points={{-58,-170},{-50,-170},
-          {-50,20},{-60,20},{-60,38.2}}, color={255,0,255}));
+          {-50,20},{-60,20},{-60,38}},   color={255,0,255}));
   connect(addPar.u, gai.y)
     annotation (Line(points={{18,20},{2,20}}, color={0,0,127}));
   connect(gai.u, triSam.y) annotation (Line(points={{-22,20},{-40,20},{-40,50},{
@@ -232,7 +232,7 @@ annotation (
         pattern=LinePattern.None,
         fillColor={210,210,210},
         fillPattern=FillPattern.Solid,
-        lineColor={0,0,127},
+        textColor={0,0,127},
         horizontalAlignment=TextAlignment.Right,
         textString="Check if all enabled HW isolation valves 
           have been fully open")}),
@@ -244,26 +244,26 @@ annotation (
         fillPattern=FillPattern.Solid),
       Text(
         extent={{-120,146},{100,108}},
-        lineColor={0,0,255},
+        textColor={0,0,255},
         textString="%name"),
       Text(
         extent={{-96,-54},{-60,-66}},
-        lineColor={255,0,255},
+        textColor={255,0,255},
         pattern=LinePattern.Dash,
         textString="chaPro"),
       Text(
         extent={{-96,8},{-66,-6}},
-        lineColor={255,0,255},
+        textColor={255,0,255},
         pattern=LinePattern.Dash,
         textString="uUpsDevSta"),
       Text(
         extent={{-96,68},{-42,56}},
-        lineColor={0,0,127},
+        textColor={0,0,127},
         pattern=LinePattern.Dash,
         textString="uHotWatIsoVal"),
       Text(
         extent={{32,70},{96,54}},
-        lineColor={255,0,255},
+        textColor={255,0,255},
         pattern=LinePattern.Dash,
         textString="yEnaHotWatIsoVal"),
       Polygon(
@@ -278,7 +278,7 @@ annotation (
         fillPattern=FillPattern.Solid),
       Text(
         extent={{44,-54},{98,-66}},
-        lineColor={0,0,127},
+        textColor={0,0,127},
         pattern=LinePattern.Dash,
         textString="yHotWatIsoVal")}),
   Documentation(info="<html>

diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/Validation/PlantEnable.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/Validation/PlantEnable.mo
@@ -114,28 +114,28 @@ equation
     annotation (Line(points={{38,-20},{32,-20}},
       color={0,0,127}));
   connect(plaEna1.supResReq, reaToInt1.y)
-    annotation (Line(points={{-22,-35},{-30,-35},{-30,-20},{-38,-20}},
+    annotation (Line(points={{-22,-36},{-30,-36},{-30,-20},{-38,-20}},
       color={255,127,0}));
   connect(plaEna2.supResReq, reaToInt2.y)
-    annotation (Line(points={{78,65},{70,65},{70,80},{62,80}},
+    annotation (Line(points={{78,64},{70,64},{70,80},{62,80}},
       color={255,127,0}));
   connect(plaEna2.TOut, sin5.y)
-    annotation (Line(points={{78,55},{70,55},{70,40},{32,40}},
+    annotation (Line(points={{78,56},{70,56},{70,40},{32,40}},
       color={0,0,127}));
   connect(plaEna3.supResReq, reaToInt3.y)
-    annotation (Line(points={{78,-35},{70,-35},{70,-20},{62,-20}},
+    annotation (Line(points={{78,-36},{70,-36},{70,-20},{62,-20}},
       color={255,127,0}));
   connect(plaEna3.TOut, con3.y)
-    annotation (Line(points={{78,-45},{70,-45},{70,-60},{32,-60}},
+    annotation (Line(points={{78,-44},{70,-44},{70,-60},{32,-60}},
       color={0,0,127}));
   connect(reaToInt.y, plaEna.supResReq)
-    annotation (Line(points={{-38,80},{-30,80},{-30,65},{-22,65}},
+    annotation (Line(points={{-38,80},{-30,80},{-30,64},{-22,64}},
       color={255,127,0}));
   connect(sin1.y, plaEna.TOut)
-    annotation (Line(points={{-68,40},{-30,40},{-30,55},{-22,55}},
+    annotation (Line(points={{-68,40},{-30,40},{-30,56},{-22,56}},
       color={0,0,127}));
   connect(con1.y, plaEna1.TOut)
-    annotation (Line(points={{-68,-60},{-30,-60},{-30,-45},{-22,-45}},
+    annotation (Line(points={{-68,-60},{-30,-60},{-30,-44},{-22,-44}},
       color={0,0,127}));
   annotation (
     Icon(coordinateSystem(preserveAspectRatio=false),
@@ -154,19 +154,19 @@ equation
       preserveAspectRatio=false),
       graphics={Text(
                   extent={{-72,26},{-24,18}},
-                  lineColor={28,108,200},
+                  textColor={28,108,200},
                   textString="Combination of all inputs"),
                 Text(
                   extent={{32,26},{80,18}},
-                  lineColor={28,108,200},
+                  textColor={28,108,200},
                   textString="Changing outdoor temperature"),
                 Text(
                   extent={{-80,-74},{-16,-82}},
-                  lineColor={28,108,200},
+                  textColor={28,108,200},
                   textString="Changing number of hot-water requests"),
                 Text(
                   extent={{26,-74},{74,-82}},
-                  lineColor={28,108,200},
+                  textColor={28,108,200},
                   textString="Changing boiler-enable schedule")}),
     experiment(
       StopTime=7200,

diff --git a/...gs/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/Validation/RotationController.mo b/...gs/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/Validation/RotationController.mo
@@ -97,8 +97,7 @@ equation
     experiment(
       StopTime=600,
       Interval=1,
-      Tolerance=1e-06,
-      __Dymola_Algorithm="Dassl"),
+      Tolerance=1e-06),
       __Dymola_Commands(file="./Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/Validation/RotationController.mos"
         "Simulate and plot"),
     Documentation(info="<html>

diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/Generic/ChangeStatus.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/Generic/ChangeStatus.mo
@@ -178,7 +178,7 @@ annotation (
           fillPattern=FillPattern.Solid),
         Text(
           extent={{-100,150},{100,110}},
-          lineColor={0,0,255},
+          textColor={0,0,255},
           textString="%name")}),
   Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,100}})),
 Documentation(info="<html>

diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/Generic/EnableLag_flowrate.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/Generic/EnableLag_flowrate.mo
@@ -244,7 +244,7 @@ annotation (
           fillPattern=FillPattern.Solid),
         Text(
           extent={{-100,150},{100,110}},
-          lineColor={0,0,255},
+          textColor={0,0,255},
           textString="%name")}),
   Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-140,-160},{140,160}})),
   Documentation(info="<html>

diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/Generic/Speed_localDp.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/Generic/Speed_localDp.mo
@@ -242,31 +242,31 @@ annotation (
           fillPattern=FillPattern.Solid),
         Text(
           extent={{-100,150},{100,110}},
-          lineColor={0,0,255},
+          textColor={0,0,255},
           textString="%name"),
         Text(
           extent={{-98,52},{-44,30}},
-          lineColor={255,0,255},
+          textColor={255,0,255},
           pattern=LinePattern.Dash,
           textString="uHotWatPum"),
         Text(
           extent={{-98,-30},{-30,-52}},
-          lineColor={0,0,127},
+          textColor={0,0,127},
           pattern=LinePattern.Dash,
           textString="dpHotWat_remote"),
         Text(
           extent={{22,12},{98,-10}},
-          lineColor={0,0,127},
+          textColor={0,0,127},
           pattern=LinePattern.Dash,
           textString="yHotWatPumSpe"),
         Text(
           extent={{-98,-68},{-34,-90}},
-          lineColor={0,0,127},
+          textColor={0,0,127},
           pattern=LinePattern.Dash,
           textString="dpHotWatSet"),
         Text(
           extent={{-98,92},{-30,70}},
-          lineColor={0,0,127},
+          textColor={0,0,127},
           pattern=LinePattern.Dash,
           textString="dpHotWat_local")}),
   Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-140,-140},{140,140}})),