removed empty lines

lbl-srg · Jan 5, 2024 · 9dcbd7d · 9dcbd7d
1 parent d9b30bf
commit 9dcbd7d
Show file tree

Hide file tree

Showing 4 changed files with 133 additions and 235 deletions.
diff --git a/Buildings/Controls/OBC/ASHRAE/G36/FanCoilUnit/Subsequences/Validation/FanSpeed.mo b/Buildings/Controls/OBC/ASHRAE/G36/FanCoilUnit/Subsequences/Validation/FanSpeed.mo
@@ -2,33 +2,39 @@ within Buildings.Controls.OBC.ASHRAE.G36.FanCoilUnit.Subsequences.Validation;
 block FanSpeed
   "Validation model for fan speed subsequence"
 
-  Buildings.Controls.OBC.ASHRAE.G36.FanCoilUnit.Subsequences.FanSpeed fanSpe(final
-      have_cooCoi=true, final have_heaCoi=true)
+  Buildings.Controls.OBC.ASHRAE.G36.FanCoilUnit.Subsequences.FanSpeed fanSpe(
+    final have_cooCoi=true,
+    final have_heaCoi=true)
     "Instance demonstrating variation of heating loop signal"
     annotation (Placement(transformation(extent={{-40,120},{-20,140}})));
 
-  Buildings.Controls.OBC.ASHRAE.G36.FanCoilUnit.Subsequences.FanSpeed fanSpe2(final
-      have_cooCoi=true, final have_heaCoi=true)
+  Buildings.Controls.OBC.ASHRAE.G36.FanCoilUnit.Subsequences.FanSpeed fanSpe2(
+    final have_cooCoi=true,
+    final have_heaCoi=true)
     "Instance demonstrating variation of operating mode"
     annotation (Placement(transformation(extent={{80,120},{100,140}})));
 
-  Buildings.Controls.OBC.ASHRAE.G36.FanCoilUnit.Subsequences.FanSpeed fanSpe1(final
-      have_cooCoi=true, final have_heaCoi=true)
+  Buildings.Controls.OBC.ASHRAE.G36.FanCoilUnit.Subsequences.FanSpeed fanSpe1(
+    final have_cooCoi=true,
+    final have_heaCoi=true)
     "Instance demonstrating variation of cooling loop signal"
     annotation (Placement(transformation(extent={{-40,-10},{-20,10}})));
 
-  Buildings.Controls.OBC.ASHRAE.G36.FanCoilUnit.Subsequences.FanSpeed fanSpe3(final
-      have_cooCoi=true, final have_heaCoi=false)
+  Buildings.Controls.OBC.ASHRAE.G36.FanCoilUnit.Subsequences.FanSpeed fanSpe3(
+    final have_cooCoi=true,
+    final have_heaCoi=false)
     "Instance demonstrating variation of cooling loop signal with no heating coil"
     annotation (Placement(transformation(extent={{80,-10},{100,10}})));
 
-  Buildings.Controls.OBC.ASHRAE.G36.FanCoilUnit.Subsequences.FanSpeed fanSpe4(final
-      have_cooCoi=false, final have_heaCoi=true)
+  Buildings.Controls.OBC.ASHRAE.G36.FanCoilUnit.Subsequences.FanSpeed fanSpe4(
+    final have_cooCoi=false,
+    final have_heaCoi=true)
     "Instance demonstrating variation of heating loop signal with no cooling coil"
     annotation (Placement(transformation(extent={{-40,-140},{-20,-120}})));
 
-  Buildings.Controls.OBC.ASHRAE.G36.FanCoilUnit.Subsequences.FanSpeed fanSpe5(final
-      have_cooCoi=false, final have_heaCoi=false)
+  Buildings.Controls.OBC.ASHRAE.G36.FanCoilUnit.Subsequences.FanSpeed fanSpe5(
+    final have_cooCoi=false,
+    final have_heaCoi=false)
     "Instance demonstrating variation of operating mode with no heating and cooling coils"
     annotation (Placement(transformation(extent={{80,-140},{100,-120}})));
 
@@ -179,99 +185,63 @@ protected
 
 equation
   connect(reaToInt.y, fanSpe.opeMod) annotation (Line(points={{-48,170},{-46,170},
-          {-46,136},{-42,136}},
-                              color={255,127,0}));
-
+          {-46,136},{-42,136}}, color={255,127,0}));
   connect(booPul.y, fanSpe.u1FanPro) annotation (Line(points={{-78,140},{-50,140},
-          {-50,132},{-42,132}},
-                             color={255,0,255}));
-
+          {-50,132},{-42,132}}, color={255,0,255}));
   connect(sin.y, abs.u)
-    annotation (Line(points={{-78,110},{-72,110}},
-                                                 color={0,0,127}));
-
+    annotation (Line(points={{-78,110},{-72,110}}, color={0,0,127}));
   connect(abs.y, fanSpe.uHea) annotation (Line(points={{-48,110},{-46,110},{-46,
-          128},{-42,128}},
-                     color={0,0,127}));
-
+          128},{-42,128}}, color={0,0,127}));
   connect(con.y, fanSpe.uCoo) annotation (Line(points={{-78,80},{-44,80},{-44,124},
           {-42,124}},color={0,0,127}));
-
   connect(con1.y, reaToInt.u)
     annotation (Line(points={{-78,170},{-72,170}}, color={0,0,127}));
-
   connect(reaToInt1.y, fanSpe2.opeMod) annotation (Line(points={{72,170},{74,170},
-          {74,136},{78,136}},      color={255,127,0}));
-
+          {74,136},{78,136}}, color={255,127,0}));
   connect(booPul1.y, fanSpe2.u1FanPro) annotation (Line(points={{42,140},{70,140},
           {70,132},{78,132}}, color={255,0,255}));
-
   connect(con2.y, fanSpe2.uCoo) annotation (Line(points={{42,80},{76,80},{76,
           124},{78,124}}, color={0,0,127}));
-
   connect(ram.y, reaToInt1.u)
     annotation (Line(points={{42,170},{48,170}}, color={0,0,127}));
-
   connect(reaToInt2.y,fanSpe1. opeMod) annotation (Line(points={{-48,40},{-46,40},
-          {-46,6},{-42,6}},     color={255,127,0}));
-
+          {-46,6},{-42,6}}, color={255,127,0}));
   connect(booPul2.y,fanSpe1. u1FanPro) annotation (Line(points={{-78,10},{-50,10},
-          {-50,2},{-42,2}},     color={255,0,255}));
-
+          {-50,2},{-42,2}}, color={255,0,255}));
   connect(sin2.y, abs2.u)
-    annotation (Line(points={{-78,-50},{-72,-50}},   color={0,0,127}));
-
+    annotation (Line(points={{-78,-50},{-72,-50}}, color={0,0,127}));
   connect(con4.y, reaToInt2.u)
-    annotation (Line(points={{-78,40},{-72,40}},   color={0,0,127}));
-
+    annotation (Line(points={{-78,40},{-72,40}}, color={0,0,127}));
   connect(con3.y,fanSpe1. uHea) annotation (Line(points={{-78,-20},{-56,-20},{-56,
-          -2},{-42,-2}},   color={0,0,127}));
-
+          -2},{-42,-2}}, color={0,0,127}));
   connect(abs2.y,fanSpe1. uCoo) annotation (Line(points={{-48,-50},{-46,-50},{-46,
-          -6},{-42,-6}},       color={0,0,127}));
-
+          -6},{-42,-6}}, color={0,0,127}));
   connect(con5.y, fanSpe2.uHea) annotation (Line(points={{42,110},{60,110},{60,
           128},{78,128}}, color={0,0,127}));
-
   connect(reaToInt3.y,fanSpe3. opeMod) annotation (Line(points={{72,40},{74,40},
-          {74,6},{78,6}},       color={255,127,0}));
-
+          {74,6},{78,6}}, color={255,127,0}));
   connect(booPul3.y,fanSpe3. u1FanPro) annotation (Line(points={{42,10},{70,10},{
-          70,2},{78,2}},        color={255,0,255}));
-
+          70,2},{78,2}}, color={255,0,255}));
   connect(sin1.y,abs1. u)
-    annotation (Line(points={{42,-20},{48,-20}},     color={0,0,127}));
-
+    annotation (Line(points={{42,-20},{48,-20}}, color={0,0,127}));
   connect(con7.y,reaToInt3. u)
-    annotation (Line(points={{42,40},{48,40}},     color={0,0,127}));
-
+    annotation (Line(points={{42,40},{48,40}}, color={0,0,127}));
   connect(abs1.y,fanSpe3. uCoo) annotation (Line(points={{72,-20},{74,-20},{74,-6},
-          {78,-6}},            color={0,0,127}));
-
+          {78,-6}}, color={0,0,127}));
   connect(reaToInt4.y, fanSpe4.opeMod) annotation (Line(points={{-48,-90},{-46,-90},
-          {-46,-124},{-42,-124}},
-                                color={255,127,0}));
-
+          {-46,-124},{-42,-124}}, color={255,127,0}));
   connect(booPul4.y, fanSpe4.u1FanPro) annotation (Line(points={{-78,-120},{-50,-120},
-          {-50,-128},{-42,-128}},
-                                color={255,0,255}));
-
+          {-50,-128},{-42,-128}}, color={255,0,255}));
   connect(sin3.y, abs3.u)
     annotation (Line(points={{-78,-150},{-72,-150}}, color={0,0,127}));
-
   connect(abs3.y, fanSpe4.uHea) annotation (Line(points={{-48,-150},{-46,-150},
-          {-46,-132},{-42,-132}},
-                            color={0,0,127}));
-
+          {-46,-132},{-42,-132}}, color={0,0,127}));
   connect(con8.y, reaToInt4.u)
     annotation (Line(points={{-78,-90},{-72,-90}}, color={0,0,127}));
-
   connect(reaToInt5.y, fanSpe5.opeMod) annotation (Line(points={{72,-90},{74,-90},
-          {74,-124},{78,-124}},      color={255,127,0}));
-
+          {74,-124},{78,-124}}, color={255,127,0}));
   connect(booPul5.y, fanSpe5.u1FanPro) annotation (Line(points={{42,-120},{70,-120},
-          {70,-128},{78,-128}},       color={255,0,255}));
-
+          {70,-128},{78,-128}},  color={255,0,255}));
   connect(ram1.y, reaToInt5.u)
     annotation (Line(points={{42,-90},{48,-90}}, color={0,0,127}));
 

diff --git a/Buildings/Controls/OBC/ASHRAE/G36/FanCoilUnit/Subsequences/Validation/PlantRequests.mo b/Buildings/Controls/OBC/ASHRAE/G36/FanCoilUnit/Subsequences/Validation/PlantRequests.mo
@@ -6,12 +6,14 @@ model PlantRequests
     "Calculate plant request"
     annotation (Placement(transformation(extent={{60,50},{80,70}})));
 
-  Buildings.Controls.OBC.ASHRAE.G36.FanCoilUnit.Subsequences.PlantRequests plaReq1(final
-      have_hotWatCoi=false) "Calculate plant request"
+  Buildings.Controls.OBC.ASHRAE.G36.FanCoilUnit.Subsequences.PlantRequests plaReq1(
+    final have_hotWatCoi=false)
+    "Calculate plant request"
     annotation (Placement(transformation(extent={{60,-80},{80,-60}})));
 
-  Buildings.Controls.OBC.ASHRAE.G36.FanCoilUnit.Subsequences.PlantRequests plaReq2(final
-      have_chiWatCoi=false) "Calculate plant request"
+  Buildings.Controls.OBC.ASHRAE.G36.FanCoilUnit.Subsequences.PlantRequests plaReq2(
+    final have_chiWatCoi=false)
+    "Calculate plant request"
     annotation (Placement(transformation(extent={{60,-160},{80,-140}})));
 
 protected
@@ -107,40 +109,28 @@ protected
 equation
   connect(supTem.y, plaReq1.TAirSup) annotation (Line(points={{-58,-40},{20,-40},
           {20,-66},{58,-66}}, color={0,0,127}));
-
   connect(cooCoi.y, plaReq1.uCooCoiSet) annotation (Line(points={{-58,-80},{20,-80},
           {20,-73.8},{58,-73.8}}, color={0,0,127}));
-
   connect(supTem1.y, plaReq.TAirSup) annotation (Line(points={{-58,80},{0,80},{0,
           64},{58,64}},   color={0,0,127}));
-
   connect(cooCoi1.y, plaReq.uCooCoiSet) annotation (Line(points={{-58,40},{10,40},
           {10,56.2},{58,56.2}}, color={0,0,127}));
-
   connect(heaCoi.y, plaReq.uHeaCoiSet) annotation (Line(points={{-58,0},{30,0},{
           30,52},{58,52}}, color={0,0,127}));
-
   connect(supTemSet1.y, plaReq.TAirSupSet) annotation (Line(points={{-18,60},{0,
           60},{0,60},{58,60}}, color={0,0,127}));
-
   connect(supTemSet.y, plaReq1.TAirSupSet) annotation (Line(points={{-18,-60},{0,
           -60},{0,-70},{58,-70}}, color={0,0,127}));
-
   connect(fanSpe.y, plaReq.uFan) annotation (Line(points={{32,80},{50,80},{50,
           68},{58,68}}, color={0,0,127}));
-
   connect(fanSpe1.y, plaReq1.uFan) annotation (Line(points={{42,-20},{52,-20},
           {52,-62},{58,-62}}, color={0,0,127}));
-
   connect(supTem3.y, plaReq2.TAirSup) annotation (Line(points={{-58,-120},{20,-120},
           {20,-146},{58,-146}},         color={0,0,127}));
-
   connect(supTemSet2.y, plaReq2.TAirSupSet) annotation (Line(points={{-18,-140},
           {0,-140},{0,-150},{58,-150}}, color={0,0,127}));
-
   connect(fanSpe2.y, plaReq2.uFan) annotation (Line(points={{42,-100},{52,-100},
           {52,-142},{58,-142}}, color={0,0,127}));
-
   connect(heaCoi2.y, plaReq2.uHeaCoiSet) annotation (Line(points={{-58,-160},{52,
           -160},{52,-158},{58,-158}}, color={0,0,127}));
 

diff --git a/...dings/Controls/OBC/ASHRAE/G36/FanCoilUnit/Subsequences/Validation/SupplyAirTemperature.mo b/...dings/Controls/OBC/ASHRAE/G36/FanCoilUnit/Subsequences/Validation/SupplyAirTemperature.mo
@@ -3,22 +3,30 @@ block SupplyAirTemperature
   "Validation model for supply air temperature setpoint subsequence"
 
   Buildings.Controls.OBC.ASHRAE.G36.FanCoilUnit.Subsequences.SupplyAirTemperature
-    TSupAir(final have_cooCoi=true, final have_heaCoi=true)
+    TSupAir(
+    final have_cooCoi=true,
+    final have_heaCoi=true)
     "Instance demonstrating heating signal operation"
     annotation (Placement(transformation(extent={{-50,60},{-30,84}})));
 
   Buildings.Controls.OBC.ASHRAE.G36.FanCoilUnit.Subsequences.SupplyAirTemperature
-    TSupAir3(final have_cooCoi=true, final have_heaCoi=false)
+    TSupAir3(
+    final have_cooCoi=true,
+    final have_heaCoi=false)
     "Instance demonstrating cooling signal operation when heating coil is absent"
     annotation (Placement(transformation(extent={{60,-80},{80,-56}})));
 
   Buildings.Controls.OBC.ASHRAE.G36.FanCoilUnit.Subsequences.SupplyAirTemperature
-    TSupAir2(final have_cooCoi=false, final have_heaCoi=true)
+    TSupAir2(
+    final have_cooCoi=false,
+    final have_heaCoi=true)
     "Instance demonstrating heating signal operation when cooling coil is absent"
     annotation (Placement(transformation(extent={{-50,-100},{-30,-76}})));
 
   Buildings.Controls.OBC.ASHRAE.G36.FanCoilUnit.Subsequences.SupplyAirTemperature
-    TSupAir1(final have_cooCoi=true, final have_heaCoi=true)
+    TSupAir1(
+    final have_cooCoi=true,
+    final have_heaCoi=true)
     "Instance demonstrating cooling signal operation"
     annotation (Placement(transformation(extent={{80,60},{100,84}})));
 
@@ -122,60 +130,37 @@ protected
 
 equation
   connect(sin.y, TSupAir.TAirSup)
-    annotation (Line(points={{-68,70},{-60,70},{-60,69.6},{-52,69.6}},
-                                                 color={0,0,127}));
-
+    annotation (Line(points={{-68,70},{-60,70},{-60,69.6},{-52,69.6}}, color={0,0,127}));
   connect(sin6.y, TSupAir2.TAirSup)
-    annotation (Line(points={{-68,-90},{-60,-90},{-60,-90.4},{-52,-90.4}},
-                                                   color={0,0,127}));
-
+    annotation (Line(points={{-68,-90},{-60,-90},{-60,-90.4},{-52,-90.4}}, color={0,0,127}));
   connect(sin8.y, TSupAir2.uHea) annotation (Line(points={{-68,-60},{-60,-60},{-60,
           -85.6},{-52,-85.6}}, color={0,0,127}));
-
   connect(sin4.y,TSupAir1. TAirSup)
-    annotation (Line(points={{62,70},{70,70},{70,69.6},{78,69.6}},
-                                               color={0,0,127}));
-
+    annotation (Line(points={{62,70},{70,70},{70,69.6},{78,69.6}}, color={0,0,127}));
   connect(con.y,TSupAir.TZonHeaSet)  annotation (Line(points={{-68,130},{-56,130},
-          {-56,78},{-52,78}},      color={0,0,127}));
-
+          {-56,78},{-52,78}}, color={0,0,127}));
   connect(con1.y,TSupAir.TZonCooSet)  annotation (Line(points={{-68,10},{-56,10},
-          {-56,61.2},{-52,61.2}},
-                              color={0,0,127}));
-
+          {-56,61.2},{-52,61.2}}, color={0,0,127}));
   connect(con2.y,TSupAir1.TZonHeaSet)  annotation (Line(points={{62,130},{72,130},
-          {72,78},{78,78}},      color={0,0,127}));
-
+          {72,78},{78,78}}, color={0,0,127}));
   connect(con3.y,TSupAir1.TZonCooSet)  annotation (Line(points={{62,10},{72,10},
-          {72,61.2},{78,61.2}},
-                            color={0,0,127}));
-
+          {72,61.2},{78,61.2}}, color={0,0,127}));
   connect(con4.y,TSupAir2.TZonHeaSet)  annotation (Line(points={{-68,-30},{-56,-30},
-          {-56,-82},{-52,-82}},      color={0,0,127}));
-
+          {-56,-82},{-52,-82}}, color={0,0,127}));
   connect(con6.y,TSupAir3.TZonCooSet)  annotation (Line(points={{42,-120},{54,-120},
           {54,-78.8},{58,-78.8}},   color={0,0,127}));
-
   connect(con5.y, TSupAir.uHea) annotation (Line(points={{-68,100},{-60,100},{-60,
           74.4},{-52,74.4}}, color={0,0,127}));
-
   connect(con7.y, TSupAir1.uHea) annotation (Line(points={{62,100},{68,100},{68,
-          74.4},{78,74.4}},
-                        color={0,0,127}));
-
+          74.4},{78,74.4}}, color={0,0,127}));
   connect(con8.y, TSupAir.uCoo) annotation (Line(points={{-68,40},{-60,40},{-60,
           66},{-52,66}}, color={0,0,127}));
-
   connect(con9.y, TSupAir1.uCoo) annotation (Line(points={{62,40},{70,40},{70,66},
-          {78,66}},     color={0,0,127}));
-
+          {78,66}}, color={0,0,127}));
   connect(sin5.y, TSupAir3.uCoo) annotation (Line(points={{42,-90},{52,-90},{52,
           -74},{58,-74}}, color={0,0,127}));
-
   connect(sin3.y, TSupAir3.TAirSup) annotation (Line(points={{42,-60},{52,-60},{
-          52,-70.4},{58,-70.4}},
-                              color={0,0,127}));
-
+          52,-70.4},{58,-70.4}}, color={0,0,127}));
   connect(con10.y, TSupAir.u1Fan) annotation (Line(points={{-98,-10},{-54,-10},{
           -54,82.8},{-52,82.8}},   color={255,0,255}));
   connect(con10.y, TSupAir1.u1Fan) annotation (Line(points={{-98,-10},{74,-10},{
@@ -196,27 +181,25 @@ equation
                 fillPattern = FillPattern.Solid,
                 points={{-36,60},{64,0},{-36,-60},{-36,60}})}),  Diagram(
         coordinateSystem(preserveAspectRatio=false, extent={{-140,-140},{140,140}})),
-    __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/G36/FanCoilUnit/Subsequences/Validation/SupplyAirTemperature.mos"
+__Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/G36/FanCoilUnit/Subsequences/Validation/SupplyAirTemperature.mos"
     "Simulate and plot"),
-    Documentation(info="<html>
-      <p>
-      This example validates
-      <a href=\"modelica://Buildings.Controls.OBC.ASHRAE.G36.FanCoilUnit.Subsequences.SupplyAirTemperature\">
-      Buildings.Controls.OBC.ASHRAE.G36.FanCoilUnit.Subsequences.SupplyAirTemperature</a>. 
-      Each of the four instances of the controller represents operation with different
-      inputs for heating and cooling loop signals, and different configuration
-      parameters of fan coil unit with presence or absence of heating and cooling
-      coils, as described in the instance comments.
-      </p>
-      </html>", revisions="<html>
-      <ul>
-      <li>
-      March 18, 2022, by Karthik Devaprasad:<br/>
-      First implementation.
-      </li>
-      </ul>
-      </html>"),
-    experiment(
-      StopTime=100,
-      Tolerance=1e-06));
+experiment(StopTime=100, Tolerance=1e-06),
+Documentation(info="<html>
+<p>
+This example validates
+<a href=\"modelica://Buildings.Controls.OBC.ASHRAE.G36.FanCoilUnit.Subsequences.SupplyAirTemperature\">
+Buildings.Controls.OBC.ASHRAE.G36.FanCoilUnit.Subsequences.SupplyAirTemperature</a>. 
+Each of the four instances of the controller represents operation with different
+inputs for heating and cooling loop signals, and different configuration
+parameters of fan coil unit with presence or absence of heating and cooling
+coils, as described in the instance comments.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+March 18, 2022, by Karthik Devaprasad:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
 end SupplyAirTemperature;