Maint 8.1.x patch url (#2796)

* Added missing figures and corrected hyperlinks * Resized image
lbl-srg · Dec 5, 2021 · e335f80 · e335f80
1 parent f800847
commit e335f80
Show file tree

Hide file tree

Showing 10 changed files with 68 additions and 64 deletions.
diff --git a/Buildings/Experimental/DHC/CentralPlants/Cooling/Controls/ChilledWaterPumpSpeed.mo b/Buildings/Experimental/DHC/CentralPlants/Cooling/Controls/ChilledWaterPumpSpeed.mo
@@ -122,24 +122,24 @@ equation
 <ul>
 <li>
 August 6, 2020 by Jing Wang:<br/>
-First implementation. 
+First implementation.
 </li>
 </ul>
 </html>",
       info="<html>
 <p>
-This model implements the control logic for variable speed pumps. 
-The staging of pumps is implemented through an instance of 
-<a href=\"modelica://Buildings.Applications.BaseClasses.Controls.VariableSpeedPumpStage\">
-Buildings.Applications.BaseClasses.Controls.VariableSpeedPumpStage</a>. 
+This model implements the control logic for variable speed pumps.
+The staging of pumps is implemented through an instance of
+<a href=\"modelica://Buildings.Applications.DataCenters.ChillerCooled.Controls.VariableSpeedPumpStage\">
+Buildings.Applications.DataCenters.ChillerCooled.Controls.VariableSpeedPumpStagee</a>.
 </p>
 <p>
-The pump speed is controlled to maintain the pressure difference setpoint 
+The pump speed is controlled to maintain the pressure difference setpoint
 through a PID controller.
 </p>
-<p>The model inputs are the measured chilled water mass flow rate 
-<code>masFloPum</code> and the pressure difference <code>dpMea</code> at a 
-reference point from the demand side. The output <code>y</code> is a vector 
+<p>The model inputs are the measured chilled water mass flow rate
+<code>masFloPum</code> and the pressure difference <code>dpMea</code> at a
+reference point from the demand side. The output <code>y</code> is a vector
 of pump speeds.
 </p>
 <p>

diff --git a/Buildings/Experimental/DHC/CentralPlants/Cooling/Plant.mo b/Buildings/Experimental/DHC/CentralPlants/Cooling/Plant.mo
@@ -359,36 +359,36 @@ equation
     defaultComponentName="pla",
     Documentation(
       info="<html>
-<p>This model showcases a generic district central cooling plant as illustrated 
+<p>This model showcases a generic district central cooling plant as illustrated
 in the schematics below. </p>
 <ul>
-<li>The cooling is provided by two parallel chillers instantiated from 
-<a href=\"modelica://Buildings.Applications.BaseClasses.Equipment.ElectricChillerParallel\">
-Buildings.Applications.BaseClasses.Equipment.ElectricChillerParallel</a>. </li>
-<li>The chilled water bypass loop is controlled to ensure a minimum flow of 
+<li>The cooling is provided by two parallel chillers instantiated from
+<a href=\"modelica://Buildings.Applications.DataCenters.ChillerCooled.Equipment.ElectricChillerParallel\">
+Buildings.Applications.DataCenters.ChillerCooled.Equipment.ElectricChillerParallel</a>. </li>
+<li>The chilled water bypass loop is controlled to ensure a minimum flow of
 chilled water running through the chillers all the time. </li>
-<li>The condenser water is cooled by two parallel cooling towers with a bypass 
-loop. See <a href=\"modelica://Buildings.Experimental.DHC.CentralPlants.Cooling.Subsystems.CoolingTowerWithBypass\">
-Buildings.Experimental.DHC.CentralPlants.Cooling.Subsystems.CoolingTowerWithBypass</a> 
+<li>The condenser water is cooled by two parallel cooling towers with a bypass
+loop. See <a href=\"modelica://Buildings.Experimental.DHC.CentralPlants.Cooling.Subsystems.CoolingTowersWithBypass\">
+Buildings.Experimental.DHC.CentralPlants.Cooling.Subsystems.CoolingTowersWithBypass</a>
 for the details of the modeling of the cooling towers. </li>
-<li>The chilled water loop is equipped with two parallel variable speed pumps, 
-which are controlled to maitain a use-determined pressure difference setpoint at 
-the demand side. The condenser water pumps are constant speed with prescribed 
+<li>The chilled water loop is equipped with two parallel variable speed pumps,
+which are controlled to maitain a use-determined pressure difference setpoint at
+the demand side. The condenser water pumps are constant speed with prescribed
 mass flow rates. </li>
-<li>The plant operates when it receives an <code>on</code> signal from the 
+<li>The plant operates when it receives an <code>on</code> signal from the
 external control. </li>
 </ul>
 <p>The staging of the chillers is based on the calculated cooling load. </p>
 <p>See <a href=\"modelica://Buildings.Experimental.DHC.CentralPlants.Cooling.Controls.ChillerStage\">
-Buildings.Experimental.DHC.CentralPlants.Cooling.Controls.ChillerStage</a> for 
+Buildings.Experimental.DHC.CentralPlants.Cooling.Controls.ChillerStage</a> for
 the detailed control logic. </p>
 <p><img src=\"modelica://Buildings/Resources/Images/Experimental/DHC/CentralPlants/Cooling/Plant.png\" alt=\"System schematics\"/>. </p>
 </html>",
       revisions="<html>
 <ul>
 <li>
 August 6, 2020 by Jing Wang:<br/>
-First implementation. 
+First implementation.
 </li>
 </ul>
 </html>"),

diff --git a/...dings/Experimental/DHC/CentralPlants/Cooling/Subsystems/Examples/CoolingTowersParallel.mo b/...dings/Experimental/DHC/CentralPlants/Cooling/Subsystems/Examples/CoolingTowersParallel.mo
@@ -71,8 +71,8 @@ equation
     Documentation(
       info="<html>
 <p>This model validates the parallel connected cooling tower subsystem in
-<a href=\"modelica://Buildings.Experimental.DHC.CentralPlants.Cooling.Subsystems.CoolingTowerParellel\">
-Buildings.Experimental.DHC.CentralPlants.Cooling.Subsystems.CoolingTowerParellel</a>.</p>
+<a href=\"modelica://Buildings.Experimental.DHC.CentralPlants.Cooling.Subsystems.CoolingTowersParallel\">
+Buildings.Experimental.DHC.CentralPlants.Cooling.Subsystems.CoolingTowersParallel</a>.</p>
 </html>",
       revisions="<html>
 <ul>

diff --git a/...ngs/Experimental/DHC/CentralPlants/Cooling/Subsystems/Examples/CoolingTowersWithBypass.mo b/...ngs/Experimental/DHC/CentralPlants/Cooling/Subsystems/Examples/CoolingTowersWithBypass.mo
@@ -22,11 +22,13 @@ equation
      Text(string="%first",index=-1,extent={{-6,3},{-6,3}},
       horizontalAlignment=TextAlignment.Right));
   connect(onOffCon.y, tow.on[1])
-   annotation (Line(points={{1,-190},{10,-190},{10,-236},{-96,-236},{-96,-34},
-    {10,-34},{10,-46},{20,-46}}, color={255,0,255}));
+   annotation (Line(points={{2,-190},{10,-190},{10,-236},{-96,-236},{-96,-34},{
+          10,-34},{10,-46},{20,-46}},
+                                 color={255,0,255}));
   connect(onOffCon.y, tow.on[2])
-   annotation (Line(points={{1,-190},{10,-190},{10,-236},{-96,-236},{-96,-34},
-    {10,-34},{10,-46},{20,-46}}, color={255,0,255}));
+   annotation (Line(points={{2,-190},{10,-190},{10,-236},{-96,-236},{-96,-34},{
+          10,-34},{10,-46},{20,-46}},
+                                 color={255,0,255}));
   annotation (
     Icon(
       coordinateSystem(
@@ -55,6 +57,6 @@ First implementation.
       info="<html>
 <p>This model validates the parallel connected cooling tower subsystem in
 <a href=\"modelica://Buildings.Experimental.DHC.CentralPlants.Cooling.Subsystems.CoolingTowersWithBypass\">
-Buildings.Experimental.DHC.CentralPlants.Cooling.Subsystems.CoolingTowerWithBypass</a>.</p>
+Buildings.Experimental.DHC.CentralPlants.Cooling.Subsystems.CoolingTowersWithBypass</a>.</p>
 </html>"));
 end CoolingTowersWithBypass;
diff --git a/...sources/Images/Experimental/DHC/CentralPlants/Cooling/Controls/ChillerStage.png b/...sources/Images/Experimental/DHC/CentralPlants/Cooling/Controls/ChillerStage.png
diff --git a/...sources/Images/Experimental/DHC/CentralPlants/Cooling/Controls/ChillerStage.svg b/...sources/Images/Experimental/DHC/CentralPlants/Cooling/Controls/ChillerStage.svg
diff --git a/Buildings/Resources/Images/Experimental/DHC/CentralPlants/Cooling/Plant.png b/Buildings/Resources/Images/Experimental/DHC/CentralPlants/Cooling/Plant.png
diff --git a/Buildings/Resources/Images/Experimental/DHC/CentralPlants/Cooling/Plant.svg b/Buildings/Resources/Images/Experimental/DHC/CentralPlants/Cooling/Plant.svg
diff --git a/Buildings/Resources/Images/Experimental/DHC/Networks/Controls/MainPump.png b/Buildings/Resources/Images/Experimental/DHC/Networks/Controls/MainPump.png