Skip to content

Commit

Permalink
add closing </p>
Browse files Browse the repository at this point in the history
  • Loading branch information
thorade committed Feb 9, 2015
1 parent 9abb939 commit e0c4a0f
Show file tree
Hide file tree
Showing 16 changed files with 20 additions and 1 deletion.
1 change: 1 addition & 0 deletions Annex60/Controls/Continuous/Examples/OffTimer.mo
Expand Up @@ -36,6 +36,7 @@ Annex60.Controls.Continuous.OffTimer</a>.
The input to the two timers are alternating boolean values.
Whenever the input becomes <code>false(=0)</code>, the timer is reset.
The figures below show the input and output of the blocks.
</p>
<p align=\"center\">
<img src=\"modelica://Annex60/Resources/Images/Controls/Continuous/Examples/OffTimer1.png\" border=\"1\" alt=\"Input and output of the OffTimer offTim1.\"/><br/>
<img src=\"modelica://Annex60/Resources/Images/Controls/Continuous/Examples/OffTimer2.png\" border=\"1\" alt=\"Input and output of the OffTimer offTim1.\"/>
Expand Down
1 change: 1 addition & 0 deletions Annex60/Controls/Continuous/Examples/PIDHysteresisTimer.mo
Expand Up @@ -89,6 +89,7 @@ and the system has little heat capacity.
The figure below shows the control error
<code>con.feeBac.y</code> and the control signal
<code>con.y</code>.
</p>
<p align=\"center\">
<img src=\"modelica://Annex60/Resources/Images/Controls/Continuous/Examples/PIDHysteresisTimerError.png\" border=\"1\" alt=\"Control error.\"/><br/>
<img src=\"modelica://Annex60/Resources/Images/Controls/Continuous/Examples/PIDHysteresisTimerOutput.png\" border=\"1\" alt=\"Control signal.\"/>
Expand Down
1 change: 1 addition & 0 deletions Annex60/Controls/Continuous/Examples/SignalRanker.mo
Expand Up @@ -27,6 +27,7 @@ Example that demonstrates the use of the signal ranker model.
The figure below shows the input and output signals of the block.
Note that
<code>sigRan.y[1] &ge; sigRan.y[2] &ge; sigRan.y[3]</code>.
</p>
<p align=\"center\">
<img src=\"modelica://Annex60/Resources/Images/Controls/Continuous/Examples/SignalRankerU.png\" border=\"1\" alt=\"Input to signal ranker.\"/><br/>
<img src=\"modelica://Annex60/Resources/Images/Controls/Continuous/Examples/SignalRankerY.png\" border=\"1\" alt=\"Output of signal ranker.\"/>
Expand Down
1 change: 1 addition & 0 deletions Annex60/Controls/Continuous/PIDHysteresisTimer.mo
Expand Up @@ -240,6 +240,7 @@ 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.
</p>
</html>", revisions="<html>
<ul>
<li>
Expand Down
1 change: 1 addition & 0 deletions Annex60/Controls/Continuous/SignalRanker.mo
Expand Up @@ -24,6 +24,7 @@ signal satisfies <code>y[i] &gt;= y[i+1]</code> for all <code>i=1, ..., nin-1</c
<p>
This block may for example be used in a variable air volume flow
controller to access the position of the dampers that are most open.
</p>
</html>",
revisions="<html>
<ul>
Expand Down
2 changes: 2 additions & 0 deletions Annex60/Fluid/Actuators/Dampers/Exponential.mo
Expand Up @@ -45,6 +45,7 @@ differentiable in <i>y</i> and the derivative is continuous.
<p>
The damper characteristics <i>k<sub>d</sub>(y)</i> is then used to
compute the flow coefficient <i>k(y)</i> as
</p>
<p align=\"center\" style=\"font-style:italic;\">
k(y) = (2 &rho; &frasl; k<sub>d</sub>(y))<sup>1/2</sup> A,
</p>
Expand All @@ -61,6 +62,7 @@ with regularization near the origin.
</p>
<p>
ASHRAE 825-RP lists the following parameter values as typical:
</p>
<table summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
<tr>
<td></td><th>opposed blades</th><th>single blades</th>
Expand Down
1 change: 1 addition & 0 deletions Annex60/Fluid/BaseClasses/PartialThreeWayResistance.mo
Expand Up @@ -122,6 +122,7 @@ If <code>dynamicBalance=true</code>, then at the junction of the three flows,
a mixing volume will be present. This will introduce a dynamic energy and momentum
balance, which often breaks algebraic loops.
The time constant of the mixing volume is determined by the parameter <code>tau</code>.
</p>
</html>", revisions="<html>
<ul>
<li>
Expand Down
1 change: 1 addition & 0 deletions Annex60/Fluid/Interfaces/PartialFourPortInterface.mo
Expand Up @@ -72,6 +72,7 @@ It is similar to
<a href=\"modelica://Annex60.Fluid.Interfaces.PartialTwoPortInterface\">
Annex60.Fluid.Interfaces.PartialTwoPortInterface</a>,
but it has four ports instead of two.
</p>
<p>
The model is used by other models in this package that add heat transfer,
mass transfer and pressure drop equations.
Expand Down
1 change: 1 addition & 0 deletions Annex60/Fluid/Sources/TraceSubstancesFlowSource.mo
Expand Up @@ -58,6 +58,7 @@ carbon dioxide concentration is typically so small that it need not be
added to the room mass balance, and since the mass flow rate can be
made small compared to the room volume if the medium that leaves this
component has a carbon dioxide concentration of <i>1</i>.
</p>
</html>", revisions="<html>
<ul>
<li>
Expand Down
2 changes: 2 additions & 0 deletions Annex60/Media/Air.mo
Expand Up @@ -394,6 +394,7 @@ This function computes the specific entropy.
</p>
<p>
The specific entropy of the mixture is obtained from
</p>
<p align=\"center\" style=\"font-style:italic;\">
s = s<sub>s</sub> + s<sub>m</sub>,
</p>
Expand All @@ -406,6 +407,7 @@ of the dry air and water vapor.
</p>
<p>
The entropy change due to change in state is obtained from
</p>
<p align=\"center\" style=\"font-style:italic;\">
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;)
Expand Down
1 change: 1 addition & 0 deletions Annex60/Utilities/Math/Bicubic.mo
Expand Up @@ -11,6 +11,7 @@ equation
Documentation(info="<html>
<p>
This block computes
</p>
<p align=\"center\" style=\"font-style:italic;\">
y = a<sub>1</sub>
+ a<sub>2</sub> x<sub>1</sub> + a<sub>3</sub> x<sub>1</sub><sup>2</sup>
Expand Down
1 change: 1 addition & 0 deletions Annex60/Utilities/Math/Biquadratic.mo
Expand Up @@ -11,6 +11,7 @@ equation
Documentation(info="<html>
<p>
This block computes
</p>
<p align=\"center\" style=\"font-style:italic;\">
y = a<sub>1</sub> + a<sub>2</sub> x<sub>1</sub>
+ a<sub>3</sub> x<sub>1</sub><sup>2</sup>
Expand Down
Expand Up @@ -20,14 +20,16 @@ The original polynomial has the form<br/>
y = a<sub>1</sub> + a<sub>2</sub> x + a<sub>3</sub> x<sup>2</sup> + ...
</p>
<p>
This function computes new coefficients<br/>
This function computes new coefficients
</p>
<p align=\"center\" style=\"font-style:italic;\">
b<sub>1</sub> = a<sub>2</sub>, b<sub>2</sub> = 2 a<sub>3</sub>, ...
</p>
<p>
and then calls recursively
<a href=\"modelica://Annex60.Utilities.Math.Functions.polynomial\">
Annex60.Utilities.Math.polynomial</a>
</p>
</html>",
revisions="<html>
<ul>
Expand Down
1 change: 1 addition & 0 deletions Annex60/Utilities/Math/Functions/inverseXRegularized.mo
Expand Up @@ -23,6 +23,7 @@ Function that approximates <i>y=1 &frasl; x</i>
inside the interval <i>-&delta; &le; x &le; &delta;</i>.
The approximation is twice continuously differentiable with a bounded derivative on the whole
real line.
</p>
<p>
See the package <code>Examples</code> for the graph.
</p>
Expand Down
1 change: 1 addition & 0 deletions Annex60/Utilities/Math/Functions/spliceFunction.mo
Expand Up @@ -32,6 +32,7 @@ The function is adapted from
<a href=\"modelica://Modelica.Media.Air.MoistAir.Utilities.spliceFunction\">
Modelica.Media.Air.MoistAir.Utilities.spliceFunction</a> and provided here
for easier accessability to model developers.
</p>
</html>", revisions="<html>
<ul>
<li>
Expand Down
1 change: 1 addition & 0 deletions Annex60/Utilities/Psychrometrics/pW_TDewPoi.mo
Expand Up @@ -30,6 +30,7 @@ The approximation error of this simplified function is below 5% for a
temperature of <i>0</i>&deg;C to <i>30</i>&deg;C.
The benefit of this simpler function is that it can be inverted analytically,
whereas the other function requires a numerical solution.
</p>
</html>", revisions="<html>
<ul>
<li>
Expand Down

0 comments on commit e0c4a0f

Please sign in to comment.