Run ttws --clean Buildings for #308

lbl-srg · Oct 30, 2014 · 20ea705 · 20ea705
1 parent 2f647c7
commit 20ea705
Show file tree

Hide file tree

Showing 609 changed files with 1,507 additions and 3,239 deletions.
diff --git a/Buildings/Airflow/Multizone/BaseClasses/ErrorControl.mo b/Buildings/Airflow/Multizone/BaseClasses/ErrorControl.mo
@@ -2,9 +2,7 @@ within Buildings.Airflow.Multizone.BaseClasses;
 model ErrorControl "Interface that defines parameters for error control"
   parameter Boolean forceErrorControlOnFlow = true
     "Flag to force error control on m_flow. Set to true if interested in flow rate";
-  annotation (Diagram(graphics),
-                       Icon(graphics),
-Documentation(info="<html>
+  annotation (Documentation(info="<html>
 <p>
 This is an interface that defines parameters used for error control.
 <p>

diff --git a/Buildings/Airflow/Multizone/BaseClasses/TwoWayFlowElementBuoyancy.mo b/Buildings/Airflow/Multizone/BaseClasses/TwoWayFlowElementBuoyancy.mo
@@ -11,9 +11,7 @@ partial model TwoWayFlowElementBuoyancy
   parameter Modelica.SIunits.Length hB=2.7/2
     "|Geometry|Height of reference pressure zone B";
 
-  annotation (Diagram(graphics),
-                       Icon(graphics),
-Documentation(info="<html>
+  annotation (Documentation(info="<html>
 <p>
 This is a partial model for models that describe the bi-directional
 air flow through large openings.

diff --git a/Buildings/Airflow/Multizone/BaseClasses/ZonalFlow.mo b/Buildings/Airflow/Multizone/BaseClasses/ZonalFlow.mo
@@ -33,8 +33,7 @@ equation
   port_a2.C_outflow = inStream(port_b2.C_outflow);
   port_b2.C_outflow = inStream(port_a2.C_outflow);
 
-  annotation (Diagram(graphics),
-                       Icon(graphics={
+  annotation (                       Icon(graphics={
         Line(points={{-86,-46},{0,-34},{88,-52}}, color={0,0,127}),
         Line(points={{-92,50},{0,34},{84,48}},    color={0,0,127}),
         Polygon(

diff --git a/Buildings/Airflow/Multizone/DoorDiscretizedOpen.mo b/Buildings/Airflow/Multizone/DoorDiscretizedOpen.mo
@@ -32,9 +32,7 @@ equation
       dp_turbulent=dp_turbulent);
   end for;
 
-  annotation (Diagram(graphics),
-                       Icon(graphics),
-defaultComponentName="doo",
+  annotation (defaultComponentName="doo",
 Documentation(info="<html>
 <p>
 This model describes the bi-directional air flow through an open door.

diff --git a/Buildings/Airflow/Multizone/DoorDiscretizedOperable.mo b/Buildings/Airflow/Multizone/DoorDiscretizedOperable.mo
@@ -17,8 +17,7 @@ model DoorDiscretizedOperable
   parameter Real mOpe = 0.5 "|Open aperture|Flow exponent for door";
   parameter Real mClo= 0.65 "|Closed aperture|Flow exponent for crack";
   Modelica.Blocks.Interfaces.RealInput y "Opening signal, 0=closed, 1=open"
-    annotation (Placement(transformation(extent={{-120,-10},{-100,10}},rotation=
-           0), iconTransformation(extent={{-120,-10},{-100,10}})));
+    annotation (Placement(transformation(extent={{-120,-10},{-100,10}}), iconTransformation(extent={{-120,-10},{-100,10}})));
 protected
  parameter Modelica.SIunits.Area AOpe=wOpe*hOpe "Open aperture area";
  parameter Modelica.SIunits.Area AClo(fixed=false) "Closed aperture area";
@@ -54,8 +53,7 @@ equation
       dp_turbulent=dp_turbulent);
   end for;
 
-  annotation (Diagram(graphics),
-                       Icon(graphics={
+  annotation (                       Icon(graphics={
         Text(
           extent={{-118,34},{-98,16}},
           lineColor={0,0,127},

diff --git a/Buildings/Airflow/Multizone/EffectiveAirLeakageArea.mo b/Buildings/Airflow/Multizone/EffectiveAirLeakageArea.mo
@@ -11,8 +11,7 @@ model EffectiveAirLeakageArea "Effective air leakage area"
 
   parameter Modelica.SIunits.Area L(min=0) "Effective leakage area";
 
-  annotation (Diagram(graphics),
-                       Icon(graphics={
+  annotation (                       Icon(graphics={
         Rectangle(
           extent={{-50,48},{50,-42}},
           lineColor={0,0,255},

diff --git a/Buildings/Airflow/Multizone/Examples/ChimneyShaftNoVolume.mo b/Buildings/Airflow/Multizone/Examples/ChimneyShaftNoVolume.mo
@@ -14,7 +14,7 @@ model ChimneyShaftNoVolume
     p_start=101325,
     nPorts=3) "Air volume of a room"
      annotation (Placement(transformation(extent={{20,-60},
-            {40,-40}},   rotation=0)));
+            {40,-40}})));
   Buildings.Airflow.Multizone.Orifice oriChiTop(
     m=0.5,
     redeclare package Medium = Medium,
@@ -50,8 +50,7 @@ model ChimneyShaftNoVolume
     redeclare package Medium = Medium,
     densitySelection=Buildings.Airflow.Multizone.Types.densitySelection.fromTop,
     h=1.5) "Model for stack effect outside the room"
-    annotation (Placement(transformation(extent={{100,-1},{120,19}},  rotation=
-            0)));
+    annotation (Placement(transformation(extent={{100,-1},{120,19}})));
   Buildings.Airflow.Multizone.Orifice oriChiBot(
     m=0.5,
     redeclare package Medium = Medium,
@@ -77,7 +76,6 @@ model ChimneyShaftNoVolume
   Modelica.Thermal.HeatTransfer.Sensors.TemperatureSensor temSen
     "Temperature sensor" annotation (Placement(transformation(
         extent={{-10,-10},{10,10}},
-        rotation=0,
         origin={-80,0})));
   Modelica.Blocks.Math.Gain gain(k=3000)
     annotation (Placement(transformation(extent={{-28,20},{-8,40}})));
@@ -91,8 +89,7 @@ model ChimneyShaftNoVolume
     redeclare package Medium = Medium,
     densitySelection=Buildings.Airflow.Multizone.Types.densitySelection.fromBottom,
     h=1.5) "Model for stack effect inside the room"
-    annotation (Placement(transformation(extent={{100,-59},{120,-39}},rotation=
-            0)));
+    annotation (Placement(transformation(extent={{100,-59},{120,-39}})));
 
 equation
   connect(TSet.y, con.u_s) annotation (Line(
@@ -168,7 +165,6 @@ equation
     experiment(
       StopTime=3600,
       Tolerance=1e-06),
-    Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},{100,100}})),
     Documentation(info="<html>
 <p>
 This model demonstrate buoyancy-induced air flow

diff --git a/Buildings/Airflow/Multizone/Examples/ChimneyShaftWithVolume.mo b/Buildings/Airflow/Multizone/Examples/ChimneyShaftWithVolume.mo
@@ -14,7 +14,7 @@ model ChimneyShaftWithVolume
     p_start=101325,
     nPorts=3) "Air volume of a room"
      annotation (Placement(transformation(extent={{20,-60},
-            {40,-40}},   rotation=0)));
+            {40,-40}})));
   Buildings.Airflow.Multizone.Orifice oriChiTop(
     m=0.5,
     redeclare package Medium = Medium,
@@ -50,8 +50,7 @@ model ChimneyShaftWithVolume
     redeclare package Medium = Medium,
     densitySelection=Buildings.Airflow.Multizone.Types.densitySelection.fromTop,
     h=1.5) "Model for stack effect outside the room"
-    annotation (Placement(transformation(extent={{100,-1},{120,19}},  rotation=
-            0)));
+    annotation (Placement(transformation(extent={{100,-1},{120,19}})));
   Buildings.Airflow.Multizone.Orifice oriChiBot(
     m=0.5,
     redeclare package Medium = Medium,
@@ -77,7 +76,6 @@ model ChimneyShaftWithVolume
   Modelica.Thermal.HeatTransfer.Sensors.TemperatureSensor temSen
     "Temperature sensor" annotation (Placement(transformation(
         extent={{-10,-10},{10,10}},
-        rotation=0,
         origin={-80,0})));
   Modelica.Blocks.Math.Gain gain(k=3000)
     annotation (Placement(transformation(extent={{-28,20},{-8,40}})));
@@ -95,8 +93,7 @@ model ChimneyShaftWithVolume
     redeclare package Medium = Medium,
     densitySelection=Buildings.Airflow.Multizone.Types.densitySelection.fromBottom,
     h=1.5) "Model for stack effect inside the room"
-    annotation (Placement(transformation(extent={{100,-59},{120,-39}},rotation=
-            0)));
+    annotation (Placement(transformation(extent={{100,-59},{120,-39}})));
 
 equation
   connect(TSet.y, con.u_s) annotation (Line(
@@ -172,7 +169,6 @@ equation
     experiment(
       StopTime=3600,
       Tolerance=1e-06),
-    Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},{100,100}})),
     Documentation(info="<html>
 <p>
 This model is identical to

diff --git a/Buildings/Airflow/Multizone/Examples/ClosedDoors.mo b/Buildings/Airflow/Multizone/Examples/ClosedDoors.mo
@@ -7,7 +7,7 @@ model ClosedDoors "Model with three closed doors"
     redeclare package Medium = Medium,
     LClo=20*1E-4,
     forceErrorControlOnFlow=true) "Discretized door" annotation (Placement(
-        transformation(extent={{10,-30},{30,-10}},rotation=0)));
+        transformation(extent={{10,-30},{30,-10}})));
 
   Buildings.Fluid.MixingVolumes.MixingVolume volA(
     redeclare package Medium = Medium,
@@ -16,42 +16,42 @@ model ClosedDoors "Model with three closed doors"
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     massDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     m_flow_nominal=0.01)                                     annotation (
-      Placement(transformation(extent={{-80,0},{-60,20}}, rotation=0)));
+      Placement(transformation(extent={{-80,0},{-60,20}})));
   Buildings.Fluid.MixingVolumes.MixingVolume volB(
     redeclare package Medium = Medium,
     V=2.5*5*5,
     nPorts=4,
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     massDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     m_flow_nominal=0.01)                                     annotation (
-      Placement(transformation(extent={{40,40},{60,60}}, rotation=0)));
+      Placement(transformation(extent={{40,40},{60,60}})));
   Buildings.HeatTransfer.Sources.PrescribedHeatFlow PrescribedHeatFlow1
-    annotation (Placement(transformation(extent={{4,40},{24,60}}, rotation=0)));
+    annotation (Placement(transformation(extent={{4,40},{24,60}})));
   Modelica.Blocks.Sources.Sine Sine1(freqHz=1/3600) annotation (Placement(
-        transformation(extent={{-68,40},{-48,60}}, rotation=0)));
+        transformation(extent={{-68,40},{-48,60}})));
   Modelica.Blocks.Math.Gain Gain1(k=100) annotation (Placement(transformation(
-          extent={{-28,40},{-8,60}}, rotation=0)));
+          extent={{-28,40},{-8,60}})));
   Buildings.Fluid.MixingVolumes.MixingVolume volC(
     redeclare package Medium = Medium,
     V=2.5*5*5,
     nPorts=4,
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     massDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     m_flow_nominal=0.01)                                     annotation (
-      Placement(transformation(extent={{70,-40},{90,-20}}, rotation=0)));
+      Placement(transformation(extent={{70,-40},{90,-20}})));
   Buildings.Airflow.Multizone.DoorDiscretizedOperable dooAC(
     redeclare package Medium = Medium,
     LClo=20*1E-4,
     forceErrorControlOnFlow=true) "Discretized door" annotation (Placement(
-        transformation(extent={{10,-60},{30,-40}}, rotation=0)));
+        transformation(extent={{10,-60},{30,-40}})));
   Modelica.Blocks.Sources.Constant yDoor(k=0) "Input signal for door opening"
                                              annotation (Placement(
-        transformation(extent={{-60,-90},{-40,-70}}, rotation=0)));
+        transformation(extent={{-60,-90},{-40,-70}})));
   Buildings.Airflow.Multizone.DoorDiscretizedOperable dooBC(
     redeclare package Medium = Medium,
     LClo=20*1E-4,
     forceErrorControlOnFlow=true) "Discretized door" annotation (Placement(
-        transformation(extent={{10,-90},{30,-70}}, rotation=0)));
+        transformation(extent={{10,-90},{30,-70}})));
   inner Modelica.Fluid.System system
     annotation (Placement(transformation(extent={{70,68},{90,88}})));
 equation

diff --git a/Buildings/Airflow/Multizone/Examples/NaturalVentilation.mo b/Buildings/Airflow/Multizone/Examples/NaturalVentilation.mo
@@ -12,31 +12,29 @@ model NaturalVentilation
     T_start=273.15 + 18,
     nPorts=2,
     m_flow_nominal=0.001)
-    annotation (Placement(transformation(extent={{-10,-20},{10,0}},
-                                                                  rotation=0)));
+    annotation (Placement(transformation(extent={{-10,-20},{10,0}})));
 
   Buildings.Airflow.Multizone.Orifice oriOutBot(
     redeclare package Medium = Medium,
     A=0.1,
     m=0.5,
     dp_turbulent=0.1) annotation (Placement(transformation(extent={{20,-30},{40,
-            -10}}, rotation=0)));
+            -10}})));
   Buildings.Airflow.Multizone.MediumColumn colOut(
     redeclare package Medium = Medium,
     h=3,
     densitySelection=Buildings.Airflow.Multizone.Types.densitySelection.fromBottom)
-    annotation (Placement(transformation(extent={{71,10},{91,30}},  rotation=0)));
+    annotation (Placement(transformation(extent={{71,10},{91,30}})));
   Buildings.Airflow.Multizone.Orifice oriOutTop(
     redeclare package Medium = Medium,
     A=0.1,
     m=0.5,
-    dp_turbulent=0.1) annotation (Placement(transformation(extent={{23,40},{43,60}},
-                  rotation=0)));
+    dp_turbulent=0.1) annotation (Placement(transformation(extent={{23,40},{43,60}})));
   Buildings.Airflow.Multizone.MediumColumn colRooTop(
     redeclare package Medium = Medium,
     h=3,
     densitySelection=Buildings.Airflow.Multizone.Types.densitySelection.fromBottom)
-    annotation (Placement(transformation(extent={{-30,10},{-9,30}},rotation=0)));
+    annotation (Placement(transformation(extent={{-30,10},{-9,30}})));
   Buildings.Fluid.MixingVolumes.MixingVolume volOut(
     redeclare package Medium = Medium,
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
@@ -45,16 +43,15 @@ model NaturalVentilation
     T_start=273.15 + 20,
     nPorts=2,
     m_flow_nominal=0.001)
-              annotation (Placement(transformation(extent={{53,-20},{73,0}},
-          rotation=0)));
+              annotation (Placement(transformation(extent={{53,-20},{73,0}})));
 
   Buildings.HeatTransfer.Sources.PrescribedHeatFlow preHeaFlo
-    annotation (Placement(transformation(extent={{-49,-20},{-29,0}}, rotation=0)));
+    annotation (Placement(transformation(extent={{-49,-20},{-29,0}})));
   Modelica.Blocks.Sources.Step q_flow(
     height=-100,
     offset=100,
     startTime=3600) annotation (Placement(transformation(extent={{-84,-20},{-64,
-            0}}, rotation=0)));
+            0}})));
   inner Modelica.Fluid.System system
     annotation (Placement(transformation(extent={{120,-80},{140,-60}})));
 equation

diff --git a/Buildings/Airflow/Multizone/Examples/OneEffectiveAirLeakageArea.mo b/Buildings/Airflow/Multizone/Examples/OneEffectiveAirLeakageArea.mo
@@ -10,35 +10,35 @@ model OneEffectiveAirLeakageArea "Model with an effective air leakage area"
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     massDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     m_flow_nominal=0.01)                                     annotation (
-      Placement(transformation(extent={{20,-20},{40,0}}, rotation=0)));
+      Placement(transformation(extent={{20,-20},{40,0}})));
   Buildings.Fluid.MixingVolumes.MixingVolume volB(
     redeclare package Medium = Medium,
     V=2.5*5*5,
     nPorts=1,
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     massDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     m_flow_nominal=0.01)                                     annotation (
-      Placement(transformation(extent={{70,20},{90,40}},  rotation=0)));
+      Placement(transformation(extent={{70,20},{90,40}})));
   Buildings.HeatTransfer.Sources.PrescribedHeatFlow preHeaFlo
-    annotation (Placement(transformation(extent={{0,20},{20,40}},   rotation=0)));
+    annotation (Placement(transformation(extent={{0,20},{20,40}})));
   Modelica.Blocks.Sources.Sine Sine1(freqHz=1/3600) annotation (Placement(
-        transformation(extent={{-80,20},{-60,40}},  rotation=0)));
+        transformation(extent={{-80,20},{-60,40}})));
   Modelica.Blocks.Math.Gain Gain1(k=100) annotation (Placement(transformation(
-          extent={{-40,20},{-20,40}}, rotation=0)));
+          extent={{-40,20},{-20,40}})));
   Buildings.Airflow.Multizone.EffectiveAirLeakageArea cra(redeclare package
       Medium = Medium, L=20E-4) annotation (Placement(transformation(extent={{50,-40},
-            {70,-20}},         rotation=0)));
+            {70,-20}})));
   Buildings.Fluid.Sources.MassFlowSource_T sou(
     redeclare package Medium = Medium,
     nPorts=1,
     use_m_flow_in=true) annotation (Placement(transformation(extent={{-20,-40},{
-            0,-20}},rotation=0)));
+            0,-20}})));
   Modelica.Blocks.Sources.Ramp ramSou(
     duration=3600,
     height=0.01,
     offset=0,
     startTime=1800) annotation (Placement(transformation(extent={{-80,-32},{-60,
-            -12}},rotation=0)));
+            -12}})));
   inner Modelica.Fluid.System system
     annotation (Placement(transformation(extent={{-80,-80},{-60,-60}})));
 equation

diff --git a/Buildings/Airflow/Multizone/Examples/OneOpenDoor.mo b/Buildings/Airflow/Multizone/Examples/OneOpenDoor.mo
@@ -7,7 +7,7 @@ model OneOpenDoor "Model with one open and one closed door"
   Buildings.Airflow.Multizone.DoorDiscretizedOpen dooOpe(redeclare package
       Medium = Medium) "Discretized door"
                                           annotation (Placement(transformation(
-          extent={{10,-8},{30,12}}, rotation=0)));
+          extent={{10,-8},{30,12}})));
 
   Buildings.Fluid.MixingVolumes.MixingVolume volA(
     redeclare package Medium = Medium,
@@ -16,33 +16,31 @@ model OneOpenDoor "Model with one open and one closed door"
     massDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     nPorts=4,
     m_flow_nominal=0.01)
-              annotation (Placement(transformation(extent={{-32,14},{-12,34}},
-          rotation=0)));
+              annotation (Placement(transformation(extent={{-32,14},{-12,34}})));
   Buildings.Fluid.MixingVolumes.MixingVolume volB(
     redeclare package Medium = Medium,
     V=2.5*5*5,
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     massDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     nPorts=4,
     m_flow_nominal=0.01)
-    annotation (Placement(transformation(extent={{60,60},{80,80}},
-          rotation=0)));
+    annotation (Placement(transformation(extent={{60,60},{80,80}})));
   Buildings.HeatTransfer.Sources.PrescribedHeatFlow preHeaFlo
-    annotation (Placement(transformation(extent={{14,60},{34,80}}, rotation=0)));
+    annotation (Placement(transformation(extent={{14,60},{34,80}})));
   Modelica.Blocks.Sources.Sine heaSou(freqHz=1/3600) annotation (Placement(
-        transformation(extent={{-60,60},{-40,80}}, rotation=0)));
+        transformation(extent={{-60,60},{-40,80}})));
   Modelica.Blocks.Math.Gain Gain1(k=100) annotation (Placement(transformation(
-          extent={{-20,60},{0,80}}, rotation=0)));
+          extent={{-20,60},{0,80}})));
   Buildings.Airflow.Multizone.DoorDiscretizedOperable dooOpeClo(redeclare
       package Medium = Medium, LClo=20*1E-4) "Discretized door"
       annotation (
-      Placement(transformation(extent={{10,-44},{30,-24}}, rotation=0)));
+      Placement(transformation(extent={{10,-44},{30,-24}})));
   Modelica.Blocks.Sources.Ramp ramp(
     duration=120,
     height=1,
     offset=0,
     startTime=1000) annotation (Placement(transformation(extent={{-60,-44},{-40,
-            -24}}, rotation=0)));
+            -24}})));
   inner Modelica.Fluid.System system
     annotation (Placement(transformation(extent={{60,-80},{80,-60}})));
 equation