Skip to content

Commit

Permalink
resolves #1850
Browse files Browse the repository at this point in the history
git-svn-id: https://svn.modelica.org/projects/Modelica/trunk@8864 7ce873d0-865f-4ce7-a662-4bb36ea78beb
  • Loading branch information
ahaumer committed Dec 23, 2015
1 parent 92389bf commit b14e6e7
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Modelica/ComplexBlocks.mo
Expand Up @@ -122,8 +122,8 @@ Plotting the imaginary part versus the real part, you will see an Archimedean sp
connect(transferFunction.y, complexToPolar.u)
annotation (Line(points={{-19,0},{-2,0}}, color={85,170,255}));
annotation (
experiment(StopTime=1, Interval=0.001),
Documentation(info="<html>
experiment(StopTime=1, Interval=0.001), Documentation(info=
"<html>
<p>This example shows the response of a PT2 defined by its transfer function</p>
<pre>
1
Expand Down Expand Up @@ -1988,7 +1988,7 @@ zero or negative.
extent={{-90,-90},{90,-10}},
textString="a(jw)")}), Documentation(info="<html>
<p>
The complex input u is multiplied by the complex transfer function (depending on frequncy input w) to obtain the complex output y (nb = dimension of b, na = dimension of a):
The complex input u is multiplied by the complex transfer function (depending on frequency input w) to obtain the complex output y (nb = dimension of b, na = dimension of a):
</p>
<pre>
b[1]*(jw)^[nb-1] + b[2]*(jw)^[nb-2] + ... + b[nb]
Expand Down
12 changes: 12 additions & 0 deletions Modelica/package.mo
Expand Up @@ -2433,6 +2433,18 @@ to <b style=\"color:blue\">existing</b> libraries:<br>
<tr><td valign=\"top\" width=\"150\">BandLimitedWhiteNoise</td>
<td valign=\"top\"> Noise generator to produce band-limited white noise with normal distribution</td></tr>

<tr><td colspan=\"2\"><b>Modelica.ComplexBlocks.Examples</b></td></tr>
<tr><td valign=\"top\" width=\"150\">ShowTransferFunction</td>
<td valign=\"top\"> Example to demonstrate the usage of the block TransferFunction.</td></tr>

<tr><td colspan=\"2\"><b>Modelica.ComplexBlocks.ComplexMath</b></td></tr>
<tr><td valign=\"top\" width=\"150\">TransferFunction</td>
<td valign=\"top\"> This block allows to define a complex transfer function (depending on frequency input w) to obtain the complex output y.</td></tr>

<tr><td colspan=\"2\"><b>Modelica.ComplexBlocks.Sources</b></td></tr>
<tr><td valign=\"top\" width=\"150\">LogFrequencySweep</td>
<td valign=\"top\"> The logarithm of w performs a linear ramp from log10(wMin) to log10(wMax), the output is the decimal power of this logarithmic ramp.</td></tr>

<tr><td colspan=\"2\"><b>Modelica.Mechanics.Rotational.Components.</b></td></tr>
<tr><td valign=\"top\" width=\"150\">ElastoBacklash2</td>
<td valign=\"top\">Alternative model of backlash. The difference to the existing ElastoBacklash
Expand Down

0 comments on commit b14e6e7

Please sign in to comment.