Merge pull request #1065 from lbl-srg/issue1058_terminalUnit

Issue1058 terminal unit
lbl-srg · Nov 16, 2017 · 39dd590 · 39dd590
2 parents 5a6db5c + bcd4b98
commit 39dd590
Show file tree

Hide file tree

Showing 19 changed files with 54 additions and 65 deletions.
diff --git a/Buildings/Applications/DataCenters/ChillerCooled/Examples/BaseClasses/PostProcess.mo b/Buildings/Applications/DataCenters/ChillerCooled/Examples/BaseClasses/PostProcess.mo
@@ -108,7 +108,7 @@ equation
           textStyle={TextStyle.Bold,TextStyle.Italic})}),
     Documentation(info="<html>
 <p>
-This partial model calculate performance metrics for a data center system. 
+This partial model calculate performance metrics for a data center system.
 The performance metrics include cooling mode signal switch times, economizing hours, and total
 energy consumption.
 </p>

diff --git a/...gs/Applications/DataCenters/ChillerCooled/Examples/IntegratedPrimaryLoadSideEconomizer.mo b/...gs/Applications/DataCenters/ChillerCooled/Examples/IntegratedPrimaryLoadSideEconomizer.mo
@@ -224,7 +224,7 @@ Buildings.Applications.DataCenters.ChillerCooled.Controls.CoolingTowerSpeed</a>.
 </p>
 <h5>Room temperature control</h5>
 <p>
-The room temperature is controlled by adjusting the fan speed of the AHU using a PI controller. 
+The room temperature is controlled by adjusting the fan speed of the AHU using a PI controller.
 </p>
 <p>
 Note that for simplicity, the temperature and differential pressure reset control

diff --git a/...s/Applications/DataCenters/ChillerCooled/Examples/IntegratedPrimarySecondaryEconomizer.mo b/...s/Applications/DataCenters/ChillerCooled/Examples/IntegratedPrimarySecondaryEconomizer.mo
@@ -260,7 +260,7 @@ Buildings.Applications.DataCenters.ChillerCooled.Controls.CoolingTowerSpeed</a>.
 </p>
 <h5>Room temperature control</h5>
 <p>
-The room temperature is controlled by adjusting the fan speed of the AHU using a PI controller. 
+The room temperature is controlled by adjusting the fan speed of the AHU using a PI controller.
 </p>
 <p>
 Note that for simplicity, the chilled water supply temperature and

diff --git a/...pplications/DataCenters/ChillerCooled/Examples/NonIntegratedPrimarySecondaryEconomizer.mo b/...pplications/DataCenters/ChillerCooled/Examples/NonIntegratedPrimarySecondaryEconomizer.mo
@@ -283,7 +283,7 @@ Buildings.Applications.DataCenters.ChillerCooled.Controls.CoolingTowerSpeed</a>.
 </p>
 <h5>Room temperature control</h5>
 <p>
-The room temperature is controlled by adjusting the fan speed of the AHU using a PI controller. 
+The room temperature is controlled by adjusting the fan speed of the AHU using a PI controller.
 </p>
 <p>
 Note that for simplicity, the temperature and differential pressure reset control

diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/SetPoints/VAVSupplySignals.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/SetPoints/VAVSupplySignals.mo
@@ -200,8 +200,7 @@ annotation (
         Text(
           extent={{-124,146},{96,108}},
           lineColor={0,0,255},
-          textString="%name")}), Diagram(coordinateSystem(preserveAspectRatio=false)),
-Documentation(info="<html>
+          textString="%name")}),Documentation(info="<html>
 <p>
 Block that outputs the coil valve postions for VAV system with multiple zones,
 implemented according to the ASHRAE Guideline G36, PART5.N.2

diff --git a/...ontrols/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/SetPoints/Validation/ReturnFanDirectPressure.mo b/...ontrols/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/SetPoints/Validation/ReturnFanDirectPressure.mo
@@ -1,6 +1,6 @@
 within Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.MultiZone.SetPoints.Validation;
 model ReturnFanDirectPressure
-  "Validate model for calculating return fan control with direct building pressure 
+  "Validate model for calculating return fan control with direct building pressure
   of multi zone VAV AHU"
   extends Modelica.Icons.Example;
 
@@ -45,7 +45,7 @@ annotation (
 This example validates
 <a href=\"modelica://Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.MultiZone.SetPoints.ReturnFanDirectPressure\">
 Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.MultiZone.SetPoints.ReturnFanDirectPressure</a>
-for exhaust air damper and return fan control with direct building pressure measurement 
+for exhaust air damper and return fan control with direct building pressure measurement
 for systems with multiple
 zones.
 </p>

diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/SetPoints/Validation/Valve.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/SetPoints/Validation/Valve.mo
@@ -54,7 +54,7 @@ annotation (
 This example validates
 <a href=\"modelica://Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.MultiZone.SetPoints.VAVSupplySignals\">
 Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.MultiZone.SetPoints.VAVSupplySignals</a>
-for a change of the supply air temperature setpoint, measured supply air temperature and 
+for a change of the supply air temperature setpoint, measured supply air temperature and
 the supply fan status, to specify coil valve positions, and generate control
 loop signal.
 </p>

diff --git a/.../Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/Economizers/Validation/Controller_Disable.mo b/.../Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/Economizers/Validation/Controller_Disable.mo
@@ -225,7 +225,7 @@ outdoor air control
           horizontalAlignment=TextAlignment.Left,
           fontSize=8,
           textString="Overide damper positions
-based on the TMix tracking 
+based on the TMix tracking
 freeze protection ")}),
 Documentation(info="<html>
 <p>

diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/SetPoints/ExhaustDamper.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/SetPoints/ExhaustDamper.mo
@@ -163,8 +163,8 @@ annotation (
             100}})),
  Documentation(info="<html>
 <p>
-Control sequence for exhaust dampers without fans. It is implemented according 
-to ASHRAE Guidline 35 (G36), PART5.N.8.(for multi zone VAV AHU), PART5.P.6 
+Control sequence for exhaust dampers without fans. It is implemented according
+to ASHRAE Guidline 35 (G36), PART5.N.8.(for multi zone VAV AHU), PART5.P.6
 and PART3.2B.3 (for single zone VAV AHU).
 </p>
 
@@ -179,7 +179,7 @@ the supply fan is at minimum speed).
 </li>
 <li>
 <code>maxExhDamPos</code> is the exhaust damper position that maintains a building
-pressure of <i>12</i> Pa (<i>0.05</i> inchWC) while the economizer damper is fully 
+pressure of <i>12</i> Pa (<i>0.05</i> inchWC) while the economizer damper is fully
 open and the fan speed is at cooling maximum.
 </li>
 </ul>

diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Controller.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Controller.mo
@@ -8,12 +8,11 @@ block Controller "Controller for room VAV box"
   parameter Modelica.SIunits.Area AFlo "Area of the zone";
 
 
-  parameter Buildings.Controls.OBC.CDL.Types.SimpleController controllerTypeCoo=
-    Buildings.Controls.OBC.CDL.Types.SimpleController.PI
-    "Type of controller"
-    annotation(Dialog(group="Cooling loop signal"));
+  parameter Buildings.Controls.OBC.CDL.Types.SimpleController controllerTypeCoo
+    =Buildings.Controls.OBC.CDL.Types.SimpleController.PI "Type of controller"
+    annotation (Dialog(group="Cooling loop signal"));
 
-  parameter Real kCoo(final unit="1/K")=1
+  parameter Real kCoo(final unit="1/K") = 0.1
     "Gain for cooling control loop signal"
     annotation(Dialog(group="Cooling loop signal"));
 
@@ -33,7 +32,7 @@ block Controller "Controller for room VAV box"
     Buildings.Controls.OBC.CDL.Types.SimpleController.PI
     "Type of controller"
     annotation(Dialog(group="Heating loop signal"));
-  parameter Real kHea(final unit="1/K")=1
+  parameter Real kHea(final unit="1/K")=0.1
     "Gain for heating control loop signal"
     annotation(Dialog(group="Heating loop signal"));
 

diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/ModeAndSetPoints.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/ModeAndSetPoints.mo
@@ -94,30 +94,28 @@ block ModeAndSetPoints "Output zone setpoint with operation mode selection"
     each final unit="K",
     each quantity="ThermodynamicTemperature")
     "Measured zone temperatures"
-    annotation (Placement(transformation(rotation=0, extent={{-180,60},{-140,100.5}}),
+    annotation (Placement(transformation(extent={{-180,60},{-140,100.5}}),
       iconTransformation(extent={{-120,40},{-100,60}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput tNexOcc(
     final unit="s",
     quantity="Time")
     "Time to next occupied period"
-    annotation (Placement(transformation(rotation=0, extent={{-180,120},{-140,160}}),
+    annotation (Placement(transformation(extent={{-180,120},{-140,160}}),
       iconTransformation(extent={{-120,70},{-100,90}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput setAdj[numZon](
     each final unit="K",
     each quantity="ThermodynamicTemperature") if (cooAdj or sinAdj)
     "Setpoint adjustment value"
-    annotation (Placement(transformation(extent={{-20,-20},{20,20}},rotation=0,
-      origin={-160,-40}),
+    annotation (Placement(transformation(extent={{-20,-20},{20,20}},origin={-160,-40}),
                         iconTransformation(extent={{-120,10},{-100,30}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput heaSetAdj[numZon](
     each final unit="K",
     each quantity="ThermodynamicTemperature") if heaAdj
     "Heating setpoint adjustment value"
-    annotation (Placement(transformation(extent={{-20,-20},{20,20}},rotation=0,
-      origin={-160,-70}), iconTransformation(extent={{-120,-20},{-100,0}})));
+    annotation (Placement(transformation(extent={{-20,-20},{20,20}},origin={-160,-70}), iconTransformation(extent={{-120,-20},{-100,0}})));
   Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uOcc
     "Current occupancy period, true if it is in occupant period"
-    annotation (Placement(transformation(rotation=0, extent={{-180,0},{-140,40.5}}),
+    annotation (Placement(transformation(extent={{-180,0},{-140,40.5}}),
       iconTransformation(extent={{-120,-50},{-100,-29.5}})));
   Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uOccSen[numZon] if have_occSen
     "Occupancy sensor (occupied=true, unoccupied=false)"

diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Validation/Controller.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Validation/Controller.mo
@@ -136,7 +136,5 @@ October 30, 2017, by Jianjun Hu:<br/>
 First implementation.
 </li>
 </ul>
-</html>"),
-Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
-        coordinateSystem(preserveAspectRatio=false)));
+</html>"));
 end Controller;
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Validation/ModeAndSetPoints.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Validation/ModeAndSetPoints.mo
@@ -113,7 +113,7 @@ First implementation.
 </li>
 </ul>
 </html>"),
-Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
+ Diagram(
         coordinateSystem(preserveAspectRatio=false), graphics={Text(
           extent={{50,86},{126,76}},
           lineColor={85,0,255},

diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/package.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/package.mo
@@ -33,7 +33,7 @@ such as for AHU and for terminal unit control.
 </li>
 <li><a href=\"modelica://Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits\">
 Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits</a> contains control
-sequences for terminal units, such as setpoints for the minimal zone airflow rates and 
+sequences for terminal units, such as setpoints for the minimal zone airflow rates and
 actuator signals for the terminal unit dampers.
 </li>
 </ul>

diff --git a/Buildings/Controls/OBC/CDL/Continuous/Sort.mo b/Buildings/Controls/OBC/CDL/Continuous/Sort.mo
@@ -30,7 +30,7 @@ Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},{
 Documentation(info="<html>
 <p>
 Block that sorts the elements of the input signal <i>u</i>.
-If the parameter <code>ascending = true</code>, then the output signal satisfies 
+If the parameter <code>ascending = true</code>, then the output signal satisfies
 <i>y<sub>i</sub> &lt;= y<sub>i+1</sub></i> for all <i>i &isin; {1, ..., n-1}</i>.
 Otherwise, it satisfies
 <i>y<sub>i</sub> &gt;= y<sub>i+1</sub></i> for all <i>i &isin; {1, ..., n-1}</i>.

diff --git a/Buildings/Controls/OBC/CDL/Continuous/Sources/Sine.mo b/Buildings/Controls/OBC/CDL/Continuous/Sources/Sine.mo
@@ -43,9 +43,6 @@ equation
               {57.5,-61.9},{63.9,-47.2},{72,-24.8},{80,0}}, smooth = Smooth.Bezier),
         Text(extent={{-147,-152},{153,-112}},lineColor={0,0,0},
           textString="freqHz=%freqHz")}),
-    Diagram(coordinateSystem(
-        preserveAspectRatio=true,
-        extent={{-100,-100},{100,100}})),
     Documentation(info="<html>
 <p>
 Block that outputs a <code>sine</code>.

diff --git a/Buildings/Controls/OBC/CDL/Utilities/Assert.mo b/Buildings/Controls/OBC/CDL/Utilities/Assert.mo
@@ -44,8 +44,6 @@ annotation (
           pattern=LinePattern.None,
           fillColor={0,0,0},
           fillPattern=FillPattern.Solid)}),
-                                 Diagram(
-        coordinateSystem(preserveAspectRatio=false)),
 Documentation(info="<html>
 <p>
 Block that writes a warning if the input becomes <code>false</code>.