Run ttws --strip Annex60

ibpsa · Oct 30, 2014 · 6fda8b0 · 6fda8b0
1 parent bd523e5
commit 6fda8b0
Show file tree

Hide file tree

Showing 256 changed files with 1,989 additions and 2,011 deletions.
diff --git a/Annex60/Controls/Continuous/Examples/LimPID.mo b/Annex60/Controls/Continuous/Examples/LimPID.mo
@@ -101,15 +101,15 @@ Added documentation.
 </ul>
 </html>", info="<html>
 <p>
-This model tests the implementation of the 
+This model tests the implementation of the
 PID controller with optional reverse action.
 The model <code>limPIDOri</code> is the original
 implementation of the controller from the Modelica
 Standard Library. The models <code>limPID</code>
 and <code>limPIDRev</code> are the implementations
 from the Buildings library. The model
 <code>limPIDRev</code> is parameterized to have
-reverse action. 
+reverse action.
 The assertion blocks test whether the results
 of all three controllers are identical.
 </p>

diff --git a/Annex60/Controls/Continuous/Examples/PIDHysteresis.mo b/Annex60/Controls/Continuous/Examples/PIDHysteresis.mo
@@ -77,14 +77,14 @@ equation
     Documentation(info="<html>
 <p>
 Example that demonstrates the use of the PID controller
-with hysteresis. The control objective is to keep 
+with hysteresis. The control objective is to keep
 the temperature of the energy storage <code>cap</code>
 at <i>40</i>&deg;C.
-The controller <code>con</code> is parameterized to 
-switch on if the control error is bigger than 
+The controller <code>con</code> is parameterized to
+switch on if the control error is bigger than
 <i>e<sub>on</sub>=1</i>.
 The output of the controller remains above <i>y<sub>min</sub>=0.3</i> until the control
-error is smaller than <i>e<sub>off</sub>=-1</i>, at which 
+error is smaller than <i>e<sub>off</sub>=-1</i>, at which
 time the controller outputs <i>y=0</i> until the
 control error is again bigger than <i>1</i>.
 The figure below shows the control error

diff --git a/Annex60/Controls/Continuous/Examples/PIDHysteresisTimer.mo b/Annex60/Controls/Continuous/Examples/PIDHysteresisTimer.mo
@@ -77,8 +77,8 @@ equation
     Documentation(info="<html>
 <p>
 Example that demonstrates the use of the PID controller
-with hysteresis and off timer. 
-The example is identical to 
+with hysteresis and off timer.
+The example is identical to
 <a href=\"modelica://Annex60.Controls.Continuous.Examples.PIDHysteresis\">
 Annex60.Controls.Continuous.Examples.PIDHysteresis</a>,
 except that the controller also has an off timer.

diff --git a/Annex60/Controls/Continuous/Examples/SignalRanker.mo b/Annex60/Controls/Continuous/Examples/SignalRanker.mo
@@ -27,7 +27,7 @@ __Dymola_Commands(file="modelica://Annex60/Resources/Scripts/Dymola/Controls/Con
 <p>
 Example that demonstrates the use of the signal ranker model.
 The figure below shows the input and output signals of the block.
-Note that 
+Note that
 <code>sigRan.y[1] &ge; sigRan.y[2] &ge; sigRan.y[3]</code>.
 <p align=\"center\">
 <img src=\"modelica://Annex60/Resources/Images/Controls/Continuous/Examples/SignalRankerU.png\" border=\"1\" alt=\"Input to signal ranker.\"/><br/>

diff --git a/Annex60/Controls/Continuous/LimPID.mo b/Annex60/Controls/Continuous/LimPID.mo
@@ -16,16 +16,16 @@ protected
 defaultComponentName="conPID",
 Documentation(info="<html>
 <p>
-This model is identical to 
+This model is identical to
 <a href=\"modelica://Modelica.Blocks.Continuous.LimPID\">
 Modelica.Blocks.Continuous.LimPID</a> except
 that it can be configured to have a reverse action.
 </p>
 <p>
 If the parameter <code>reverseAction=false</code> (the default),
-then <code>u_m &lt; u_s</code> increases the controller output, 
+then <code>u_m &lt; u_s</code> increases the controller output,
 otherwise the controller output is decreased.
-Thus, 
+Thus,
 </p>
 <ul>
 <li>

diff --git a/Annex60/Controls/Continuous/NumberOfRequests.mo b/Annex60/Controls/Continuous/NumberOfRequests.mo
@@ -43,7 +43,7 @@ defaultComponentName="numReq",
 Documentation(info="<html>
 <p>
 Block that outputs the number of inputs that exceed a threshold.
-The parameter <code>kind</code> is used to determine the kind of the 
+The parameter <code>kind</code> is used to determine the kind of the
 inequality. The table below shows the allowed settings.
 </p>
 <table border=\"1\" cellspacing=0 cellpadding=2 style=\"border-collapse:collapse;\" summary=\"Allowed parameter settings.\">

diff --git a/Annex60/Controls/Continuous/PIDHysteresis.mo b/Annex60/Controls/Continuous/PIDHysteresis.mo
@@ -172,7 +172,7 @@ If the controller is off, and the control error becomes larger than <code>eOn</c
 the controller switches to on and remains on until the control error is smaller than <code>eOff</code>.
 When the controller is on, the set point tracking can be done using a P-, PI-, or PID-controller.
 In its off-mode, the control output is zero. Thus, the parameters <code>yMin</code> and <code>yMax</code> are
-used to constrain the output of the controller during its on mode only. This can be used, for 
+used to constrain the output of the controller during its on mode only. This can be used, for
 example, to modulate a device between 0.3 and 1.0, and switch it to off when the control error
 is small enough.
 </p>
@@ -181,12 +181,12 @@ is small enough.
 <li>
 February 24, 2010, by Michael Wetter:<br/>
 Changed PID controller from Modelica Standard Library to
-PID controller from Buildings library to allow reverse control action. 
+PID controller from Buildings library to allow reverse control action.
 </li>
 <li>
 October 2, 2009, by Michael Wetter:<br/>
 Fixed error in default parameter <code>eOn</code>.
-Fixed error by introducing parameter <code>Td</code>, 
+Fixed error by introducing parameter <code>Td</code>,
 which used to be hard-wired in the PID controller.
 </li>
 <li>

diff --git a/Annex60/Controls/Continuous/PIDHysteresisTimer.mo b/Annex60/Controls/Continuous/PIDHysteresisTimer.mo
@@ -236,9 +236,9 @@ Block of a controller for set point tracking with a hysteresis element that swit
 controller to short cycle.
 </p>
 <p>
-The controller is similar to 
+The controller is similar to
 <a href=\"modelica://Annex60.Controls.Continuous.PIDHysteresis\">
-Annex60.Controls.Continuous.PIDHysteresis</a> but in addition, 
+Annex60.Controls.Continuous.PIDHysteresis</a> but in addition,
 it has a timer that prevents the controller from switching to on
 too fast. When the controller switches off, the timer starts and
 avoids the controller from switching on until <code>minOffTime</code> seconds elapsed.
@@ -247,7 +247,7 @@ avoids the controller from switching on until <code>minOffTime</code> seconds el
 <li>
 February 24, 2010, by Michael Wetter:<br/>
 Changed PID controller from Modelica Standard Library to
-PID controller from Buildings library to allow reverse control action. 
+PID controller from Buildings library to allow reverse control action.
 </li>
 <li>
 October 2, 2009, by Michael Wetter:<br/>

diff --git a/Annex60/Controls/Continuous/package.mo b/Annex60/Controls/Continuous/package.mo
@@ -4,7 +4,7 @@ package Continuous "Package with models for discrete time controls"
 annotation (
 preferredView="info", Documentation(info="<html>
 This package contains components models for continuous time controls.
-For additional models, see also 
+For additional models, see also
 <a href=\"modelica://Modelica.Blocks.Continuous\">
 Modelica.Blocks.Discrete</a>.
 </html>"),

diff --git a/Annex60/Controls/Discrete/BooleanDelay.mo b/Annex60/Controls/Discrete/BooleanDelay.mo
@@ -19,9 +19,9 @@ info="<html>
 <p>
 Block that delays the boolean input signal by
 one sampling interval.
-For example, 
+For example,
 if <i>u</i> denotes the input,
-<i>y</i> denotes the output, and 
+<i>y</i> denotes the output, and
 <i>t<sub>i</sub></i> and <i>t<sub>i+1</sub></i>
 denote subsequent sampling
 instants, then the model outputs

diff --git a/Annex60/Controls/Discrete/package.mo b/Annex60/Controls/Discrete/package.mo
@@ -4,7 +4,7 @@ package Discrete "Package with models for discrete time controls"
 annotation (
 preferredView="info", Documentation(info="<html>
 This package contains components models for discrete time controls.
-For additional models, see also 
+For additional models, see also
 <a href=\"modelica://Modelica.Blocks.Discrete\">
 Modelica.Blocks.Discrete</a>.
 </html>"),

diff --git a/Annex60/Controls/SetPoints/Examples/HotWaterTemperatureReset.mo b/Annex60/Controls/SetPoints/Examples/HotWaterTemperatureReset.mo
@@ -53,10 +53,10 @@ The parameters of the block <code>heaCur</code>
 are for a heating system with
 <i>60</i>&deg;C supply water temperature and
 <i>40</i>&deg;C return water temperature at
-an outside temperature of 
+an outside temperature of
 <i>-10</i>&deg;C and a room temperature of
-<i>20</i>&deg;C. The offset for the temperature reset is 
-<i>8</i> Kelvin, i.e., above 
+<i>20</i>&deg;C. The offset for the temperature reset is
+<i>8</i> Kelvin, i.e., above
 <i>12</i>&deg;C outside temperature, there is no heating load.
 The figure below shows the computed supply and return water temperatures.
 </p>

diff --git a/Annex60/Controls/SetPoints/HotWaterTemperatureReset.mo b/Annex60/Controls/SetPoints/HotWaterTemperatureReset.mo
@@ -74,13 +74,13 @@ by a parameter, or it can be an input to the model. The latter allows
 to use this model with systems that have night set back.
 </p>
 <p>
-The parameter <code>dTOutHeaBal</code> can be used to shift the heating curve 
-to take into account that heat gains from solar, equipment and people 
-make up for some of the transmission losses. 
+The parameter <code>dTOutHeaBal</code> can be used to shift the heating curve
+to take into account that heat gains from solar, equipment and people
+make up for some of the transmission losses.
 For example, in energy efficient houses, the heating may not be switched on if
 the outside air temperature is greater than
 <i>12</i>&deg;C, even if a room temperature of <i>20</i>&deg;C is required.
-In such a situation, set <code>dTOutHeaBal=20-12=8</code> Kelvin to 
+In such a situation, set <code>dTOutHeaBal=20-12=8</code> Kelvin to
 shift the heating curve.
 </p>
 </html>", revisions="<html>

diff --git a/Annex60/Controls/SetPoints/OccupancySchedule.mo b/Annex60/Controls/SetPoints/OccupancySchedule.mo
@@ -177,7 +177,7 @@ defaultComponentName="occSch",
 Documentation(info="<html>
 <p>
 This model outputs whether the building is currently occupied,
-and how long it will take until the next time when the building 
+and how long it will take until the next time when the building
 will be occupied or non-occupied.
 The latter may be used, for example, to start a ventilation system
 half an hour before occupancy starts in order to ventilate the room.

diff --git a/Annex60/Controls/SetPoints/Table.mo b/Annex60/Controls/SetPoints/Table.mo
@@ -2,7 +2,7 @@ within Annex60.Controls.SetPoints;
 model Table
   "Model for a set point that is interpolated based on a user-specified table"
   extends Modelica.Blocks.Interfaces.SISO;
-  parameter Real table[:,2]=fill(0.0, 1, 2) 
+  parameter Real table[:,2]=fill(0.0, 1, 2)
     "Table matrix ( e.g., table=[u1, y1; u2, y2; u3, y3])";
 
   parameter Real offset=0 "Offset of output signal";
@@ -44,15 +44,15 @@ This block can be used to schedule a set-point by using piecewise linear functio
 For example, the instances
 </p>
 <pre>
-Annex60.Controls.SetPoints.Table tabLinExt(constantExtrapolation=false, 
-                                             table=[20, 0.0; 
-                                                    22, 0.5; 
-                                                    25, 0.5; 
+Annex60.Controls.SetPoints.Table tabLinExt(constantExtrapolation=false,
+                                             table=[20, 0.0;
+                                                    22, 0.5;
+                                                    25, 0.5;
                                                     26, 1.0]);
-Annex60.Controls.SetPoints.Table tabConExt(constantExtrapolation=true, 
-                                             table=[20, 0.0; 
-                                                    22, 0.5; 
-                                                    25, 0.5; 
+Annex60.Controls.SetPoints.Table tabConExt(constantExtrapolation=true,
+                                             table=[20, 0.0;
+                                                    22, 0.5;
+                                                    25, 0.5;
                                                     26, 1.0]);
 </pre>
 <p>
@@ -63,8 +63,8 @@ will cause the following output:
 </p>
 <p>
 For the default setting <code>constantExtrapolation=true</code>, the
-block outputs 
-<code>y=y1+offset</code> for <code>u &le; u1</code>, and 
+block outputs
+<code>y=y1+offset</code> for <code>u &le; u1</code>, and
 <code>y=yMax+offset</code> for <code>u &ge; uMax</code>.
 Otherwise, the table is linearly extrapolated with a constant derivative.
 </p>

diff --git a/Annex60/Controls/SetPoints/package.mo b/Annex60/Controls/SetPoints/package.mo
@@ -3,7 +3,7 @@ package SetPoints "Package with models for control set points"
   extends Modelica.Icons.VariantsPackage;
 annotation (preferredView="info", Documentation(info="<html>
 This package contains components models to compute set points of control systems.
-For additional models, see also 
+For additional models, see also
 <a href=\"modelica://Modelica.Blocks.Continuous\">
 Modelica.Blocks.Continuous</a>.
 </html>"));

diff --git a/Annex60/Controls/package.mo b/Annex60/Controls/package.mo
@@ -4,7 +4,7 @@ package Controls "Package with models for controls"
 annotation (
 preferredView="info", Documentation(info="<html>
 This package contains components models for controls.
-For additional models, see also 
+For additional models, see also
 <a href=\"modelica://Modelica.Blocks\">
 Modelica.Blocks</a>.
 </html>"),

diff --git a/Annex60/Experimental/Media/AirPTDecoupled.mo b/Annex60/Experimental/Media/AirPTDecoupled.mo
@@ -105,15 +105,15 @@ This function returns the dynamic viscosity.
 </p>
 <h4>Implementation</h4>
 <p>
-The function is based on the 5th order polynomial 
-of 
+The function is based on the 5th order polynomial
+of
 <a href=\"modelica://Modelica.Media.Air.MoistAir.dynamicViscosity\">
 Modelica.Media.Air.MoistAir.dynamicViscosity</a>.
 However, for the typical range of temperatures encountered
 in building applications, a linear function sufficies.
 This implementation is therefore the above 5th order polynomial,
 linearized around <i>20</i>&deg;C.
-The relative error of this linearization is 
+The relative error of this linearization is
 <i>0.4</i>% at <i>-20</i>&deg;C,
 and less then
 <i>0.2</i>% between  <i>-5</i>&deg;C and  <i>+50</i>&deg;C.
@@ -286,7 +286,7 @@ s = s<sub>s</sub> + s<sub>m</sub>,
 </p>
 <p>
 where
-<i>s<sub>s</sub></i> is the entropy change due to the state change 
+<i>s<sub>s</sub></i> is the entropy change due to the state change
 (relative to the reference temperature) and
 <i>s<sub>m</sub></i> is the entropy change due to mixing
 of the dry air and water vapor.
@@ -297,7 +297,7 @@ The entropy change due to change in state is obtained from
 s<sub>s</sub> = c<sub>v</sub> ln(T/T<sub>0</sub>) + R ln(v/v<sub>0</sub>) <br/>
 = c<sub>v</sub> ln(T/T<sub>0</sub>) + R ln(&rho;<sub>0</sub>/&rho;)
 </p>
-<p>If we assume <i>&rho; = p<sub>0</sub>/(R T)</i>, 
+<p>If we assume <i>&rho; = p<sub>0</sub>/(R T)</i>,
 and because <i>c<sub>p</sub> = c<sub>v</sub> + R</i>,
 we can write
 </p>
@@ -310,7 +310,7 @@ Next, the entropy of mixing is obtained from a reversible isothermal
 expansion process. Hence,
 </p>
 <p align=\"center\" style=\"font-style:italic;\">
-  s<sub>m</sub> = -R &sum;<sub>i</sub>( X<sub>i</sub> &frasl; M<sub>i</sub> 
+  s<sub>m</sub> = -R &sum;<sub>i</sub>( X<sub>i</sub> &frasl; M<sub>i</sub>
   ln(Y<sub>i</sub>)),
 </p>
 <p>
@@ -367,7 +367,7 @@ algorithm
   annotation (smoothOrder=99, Documentation(info=
                    "<html>
 <p>
-This function computes the derivative of density with respect to temperature 
+This function computes the derivative of density with respect to temperature
 at constant pressure.
 </p>
 </html>", revisions=
@@ -494,7 +494,7 @@ annotation (
 Inline=false,
 Documentation(info="<html>
 <p>
-This function returns the thermodynamic state based on pressure, 
+This function returns the thermodynamic state based on pressure,
 specific entropy and mass fraction.
 </p>
 <p>
@@ -778,15 +778,15 @@ end der_specificHeatCapacityCv;
   annotation (preferredView="info", Documentation(info="<html>
 <p>
 This medium package models moist air using a gas law in which pressure and temperature
-are independent, which often leads to significantly faster and more robust computations. 
+are independent, which often leads to significantly faster and more robust computations.
 The specific heat capacities at constant pressure and at constant volume are constant.
 The air is assumed to be not saturated.
 </p>
 </html>", revisions="<html>
 <ul>
 <li>
 July 24, 2014, by Michael Wetter:<br/>
-Changed implementation to use 
+Changed implementation to use
 <a href=\"modelica://Annex60.Utilities.Psychrometrics.Constants\">
 Annex60.Utilities.Psychrometrics.Constants</a>.
 This was done to use consistent values throughout the library.
@@ -824,7 +824,7 @@ during model check and translation.
 </li>
 <li>
 August 3, 2011, by Michael Wetter:<br/>
-Fixed bug in <code>u=h-R*T</code>, which is only valid for ideal gases. 
+Fixed bug in <code>u=h-R*T</code>, which is only valid for ideal gases.
 For this medium, the function is <code>u=h-pStd/dStp</code>.
 </li>
 <li>

diff --git a/Annex60/Experimental/Media/Examples/AirPTDecoupledTemperatureEnthalpyInversion.mo b/Annex60/Experimental/Media/Examples/AirPTDecoupledTemperatureEnthalpyInversion.mo
@@ -10,7 +10,7 @@ __Dymola_Commands(file="modelica://Annex60/Resources/Scripts/Dymola/Experimental
         "Simulate and plot"),
     Documentation(info="<html>
 <p>
-This model tests whether the inversion of temperature and enthalpy 
+This model tests whether the inversion of temperature and enthalpy
 is implemented correctly.
 If <i>T &ne; T(h(T))</i>, the model stops with an error.
 </p>

diff --git a/Annex60/Experimental/Media/package.mo b/Annex60/Experimental/Media/package.mo
@@ -4,7 +4,7 @@ package Media "Package with experimental models"
 
   annotation (preferredView="info", Documentation(info="<html>
 <p>
-This package contains models that are experimental. 
+This package contains models that are experimental.
 </p>
 </html>"));
 end Media;
diff --git a/Annex60/Experimental/Media/package.order b/Annex60/Experimental/Media/package.order
@@ -1,2 +1,2 @@
 AirPTDecoupled
-Examples
+Examples
diff --git a/Annex60/Experimental/package.mo b/Annex60/Experimental/package.mo
@@ -4,7 +4,7 @@ package Experimental "Package with experimental models"
 
   annotation (preferredView="info", Documentation(info="<html>
 <p>
-This package contains models that are experimental. 
+This package contains models that are experimental.
 They may be included in the <code>Annex60</code> library
 if they have been shown to be useful.
 For example, this package may include new media models