Skip to content

Commit 81e2c95

Browse files
maltelenzmaltelenz
authored
Merge pull request #4748 from henrikt-ma/cleanup/trailing-whitespace
Remove trailing white-space
2 parents c1b0ff3 + 9a68c6f commit 81e2c95

File tree

33 files changed

+137
-137
lines changed

33 files changed

+137
-137
lines changed

‎Modelica/Blocks/Math.mo‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2607,9 +2607,9 @@ This block detects positive and negative peaks of differentiable and non-differe
26072607
For differentiable input signals, an extremum is detected if the derivative of the input signal is zero.
26082608
</p>
26092609
<p>
2610-
To handle non-differentiable input signals, the input signal <code>u</code> is conditioned by a first order with time constant <code>T</code>.
2611-
Like in the <a href=\"modelica://Modelica.Blocks.Continuous.Derivative\">derivative block</a>,
2612-
the derivative of the input signal is approximated by <code>(u - x)/T</code>.
2610+
To handle non-differentiable input signals, the input signal <code>u</code> is conditioned by a first order with time constant <code>T</code>.
2611+
Like in the <a href=\"modelica://Modelica.Blocks.Continuous.Derivative\">derivative block</a>,
2612+
the derivative of the input signal is approximated by <code>(u - x)/T</code>.
26132613
This way even steps with local extrema just before and after the step are taken into account.
26142614
</p>
26152615
<p>

‎Modelica/Blocks/package.mo‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1669,9 +1669,9 @@ Note that the ContinuousSignalExtremaBlock detects extrema of both signals witho
16691669
16701670
<p>The output of these blocks is updated after each period of the signal.</p>
16711671
<p>
1672-
Using a simple pulse series, these values can be calculated analytically.
1673-
Propagating these values as initial values for the output,
1674-
we can compare the numerical solution with the analytical solution:
1672+
Using a simple pulse series, these values can be calculated analytically.
1673+
Propagating these values as initial values for the output,
1674+
we can compare the numerical solution with the analytical solution:
16751675
The output is constant from the beginning.
16761676
</p>
16771677
</html>"));

‎Modelica/Electrical/Analog/Examples/DemoPowerSupplyWithBuffer.mo‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,16 +51,16 @@ equation
5151
experiment(Interval = 1e-05, Tolerance = 1e-6, StartTime = 0, StopTime = 1),
5252
Documentation(info="<html>
5353
<p>
54-
At the beginning, the DC power supply charges the buffer capacitor within its limits (current, power, voltage).
55-
The DC power supply is protected from back current by a buffer capacitor and a diode.
56-
This also reduces current ripple of the power supply.
54+
At the beginning, the DC power supply charges the buffer capacitor within its limits (current, power, voltage).
55+
The DC power supply is protected from back current by a buffer capacitor and a diode.
56+
This also reduces current ripple of the power supply.
5757
</p>
5858
<p>
59-
Of course, if the load current feeds back a too high current to the buffer capacitor for a longer period of time,
59+
Of course, if the load current feeds back a too high current to the buffer capacitor for a longer period of time,
6060
the buffer capacitor's voltage increases. This should be under surveillance.
6161
</p>
6262
<p>
63-
The load current is 0 up to 0.5 s, afterwards a pulse with amplitude 50 A, an offset of -25 A, a dutyCycle of 0.5 and a frequency of 1 kHz.
63+
The load current is 0 up to 0.5 s, afterwards a pulse with amplitude 50 A, an offset of -25 A, a dutyCycle of 0.5 and a frequency of 1 kHz.
6464
</p>
6565
</html>"));
6666
end DemoPowerSupplyWithBuffer;

‎Modelica/Electrical/Analog/Ideal/OpAmpLimited.mo‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@ In the first case the necessary power is drawn from an implicit internal supply,
104104
<p>
105105
For most applications it is sufficient to use default settings <code>useFirstOrder=false</code> (default on the Advanced-tab).
106106
In this case the intermediate voltage <code>v_int</code> is simply <code>V0*v_in</code>.<br>
107-
In some applications it might be necessary to set <code>useFirstOrder=true</code>
108-
to let the intermediate voltage <code>v_int</code> rise according to a firstOrder with time constant <code>Tau</code>.
107+
In some applications it might be necessary to set <code>useFirstOrder=true</code>
108+
to let the intermediate voltage <code>v_int</code> rise according to a firstOrder with time constant <code>Tau</code>.
109109
In that case the time constant <code>Tau</code> should fit to the dynamics of the input signal.
110110
</p>
111111
<p>
@@ -115,14 +115,14 @@ Intermediate voltage <code>v_int</code> is limited between positive supply and n
115115
</p>
116116
<h4>Initialization</h4>
117117
<p>
118-
<code>v_in.start</code> and <code>i_out.start</code> are just helpful starting values during initialization,
118+
<code>v_in.start</code> and <code>i_out.start</code> are just helpful starting values during initialization,
119119
it is unlikely that it is necessary to change the start values and / or to declare them as fixed.
120120
</p>
121121
<p>
122122
If it is necessary to use <code>useFirstOrder=true</code>, it is essential to initialize intermediate voltage <code>v_int</code> correctly.<br>
123123
As a default, default initialization (<strong>Linear</strong>) is sufficient: <code>v_int = V0*v_in</code>.<br>
124-
However, in some cases the initialization has more than one solution and it is desired to set
125-
<code>v_int</code> at the positive supply (<strong>UpperLimit</strong>) or
124+
However, in some cases the initialization has more than one solution and it is desired to set
125+
<code>v_int</code> at the positive supply (<strong>UpperLimit</strong>) or
126126
<code>v_int</code> at the negative supply (<strong>LowerLimit</strong>).
127127
</p>
128128
</html>"));

‎Modelica/Electrical/Analog/Lines/M_OLine.mo‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -309,36 +309,36 @@ equation
309309
extent={{-150,130},{150,90}},
310310
textString="%name",
311311
textColor={0,0,255})}), Documentation(info="<html>
312-
<p>The <code>M_OLine</code> is a multi line model which consists of several segments
313-
and several single lines. Each segment consists of resistors and inductors that
314-
are connected in series in each single line, and of capacitors and conductors both
312+
<p>The <code>M_OLine</code> is a multi line model which consists of several segments
313+
and several single lines. Each segment consists of resistors and inductors that
314+
are connected in series in each single line, and of capacitors and conductors both
315315
between the lines and to the ground. The inductors are coupled to each other like in the
316-
<a href=\"modelica://Modelica.Electrical.Analog.Basic.M_Transformer\">M_Transformer</a> model.
316+
<a href=\"modelica://Modelica.Electrical.Analog.Basic.M_Transformer\">M_Transformer</a> model.
317317
The following picture shows the schematic of a segment with four single lines (lines=4):</p>
318318
319319
<blockquote>
320320
<img src=\"modelica://Modelica/Resources/Images/Electrical/Analog/Lines/segment.png\"
321321
alt=\"segment.png\">
322322
</blockquote>
323323
324-
<p>Note that the user can choose whether the optional &quot;refPin&quot;
325-
is active (so that it can be connected to any other pin),
326-
otherwise the internal &quot;ground&quot; is used.
324+
<p>Note that the user can choose whether the optional &quot;refPin&quot;
325+
is active (so that it can be connected to any other pin),
326+
otherwise the internal &quot;ground&quot; is used.
327327
This is done with the checkbox useInternalGround, true by default
328328
(for compatibility with previous versions).
329-
Obviously the potential of the internal ground is always zero,
329+
Obviously the potential of the internal ground is always zero,
330330
its current can be accessed for plotting.</p>
331331
332332
<p>The complete multi line consists of N segments and an auxiliary segment_last:</p>
333333
334334
<p align=\"center\"><code>-- segment_1 -- segment_2 -- ... -- segment_N -- segment_last --</code></p>
335335
336-
<p>In the picture of the segment can be seen, that a single segment is asymmetrical.
337-
Connecting such asymmetrical segments in a series forces also an asymmetrical multi line.
338-
To design a symmetrical model which is useful for coupling and which guaranties the same pin properties,
339-
in <code>segment_1</code> only half valued resistors and inductors are used.
340-
The remaining resistors and inductors are at the other end of the line within
341-
the auxiliary <code>segment_last</code>. For the example with 4 lines the schematic of
336+
<p>In the picture of the segment can be seen, that a single segment is asymmetrical.
337+
Connecting such asymmetrical segments in a series forces also an asymmetrical multi line.
338+
To design a symmetrical model which is useful for coupling and which guaranties the same pin properties,
339+
in <code>segment_1</code> only half valued resistors and inductors are used.
340+
The remaining resistors and inductors are at the other end of the line within
341+
the auxiliary <code>segment_last</code>. For the example with 4 lines the schematic of
342342
<code>segment_last</code> is like this:</p>
343343
344344
<blockquote>
@@ -347,75 +347,75 @@ the auxiliary <code>segment_last</code>. For the example with 4 lines the schema
347347
</blockquote>
348348
349349
<p>The number of the capacitors and conductors depends on the number of single lines that are used,
350-
because each line is coupled to every other line by both a capacitor and a conductor.
351-
One line consists of <strong>at least two segments</strong>.
352-
Inside the model <code>M_OLine</code> the model <code>segment</code> is used.
353-
This model represents one segment which is build as described above.
354-
For modelling the inductances and their mutual couplings the model
355-
<a href=\"modelica://Modelica.Electrical.Analog.Basic.M_Transformer\">M_Transformer</a> is used.
356-
To fill the resistance vector, resistance values as many as lines are needed, e.g.,
357-
if there are four lines, four resistances are needed. For example for a microelectronic line
350+
because each line is coupled to every other line by both a capacitor and a conductor.
351+
One line consists of <strong>at least two segments</strong>.
352+
Inside the model <code>M_OLine</code> the model <code>segment</code> is used.
353+
This model represents one segment which is build as described above.
354+
For modelling the inductances and their mutual couplings the model
355+
<a href=\"modelica://Modelica.Electrical.Analog.Basic.M_Transformer\">M_Transformer</a> is used.
356+
To fill the resistance vector, resistance values as many as lines are needed, e.g.,
357+
if there are four lines, four resistances are needed. For example for a microelectronic line
358358
of 0.1m length, a sensible resistance-vector would be R=[4.76e5, 1.72e5, 1.72e5, 1.72e5].</p>
359359
360360
<p>Filling the matrices of the inductances, capacitances and conductances is a bit more complicated,
361361
because those components occur also between two lines and not only (like the resistor) in one line.
362-
The entries of the matrices are given by the user in form of a vector.
362+
The entries of the matrices are given by the user in form of a vector.
363363
The vector length <code>dim_vector_lgc</code> is calculated by:</p>
364364
365365
<blockquote>
366366
<pre>dim_vector_lgc = lines*(lines+1)/2</pre>
367367
</blockquote>
368368
369369
<p>Inside the model a symmetrical inductance matrix, a symmetrical capacitance matrix and
370-
a symmetrical conductance matrix are built out of the entries of the vectors given by the user.
370+
a symmetrical conductance matrix are built out of the entries of the vectors given by the user.
371371
The way of building is the same for each matrix, so the approach for filling one of the matrices
372372
will be shown in the the example below.</p>
373373
374374
<h5>Example</h5>
375375
376-
<p>The number of lines is assumed to be four. To build the matrix, the model needs the
377-
values from the main diagonal and from the positions that are below the main diagonal.
376+
<p>The number of lines is assumed to be four. To build the matrix, the model needs the
377+
values from the main diagonal and from the positions that are below the main diagonal.
378378
To get the following matrix</p>
379379
380380
<blockquote>
381381
<img src=\"modelica://Modelica/Resources/Images/Electrical/Analog/Lines/M_OLine-eqMatrix.png\" alt=\"Matrix\"/>
382382
</blockquote>
383383
384-
<p>the vector with dim_vector_lgc=4*5/2=10 has to appear in the following way:
384+
<p>the vector with dim_vector_lgc=4*5/2=10 has to appear in the following way:
385385
vector = [<strong>1</strong>, 0.1, 0.2, 0.4, <strong>2</strong>, 0.3 0.5, <strong>3</strong>, 0.6, <strong>4</strong>]</p>
386386
387-
<p>For the example of a microelectronic line of 0.1m length,
388-
which is used as default example for the <code>M_OLine</code> model,
387+
<p>For the example of a microelectronic line of 0.1m length,
388+
which is used as default example for the <code>M_OLine</code> model,
389389
a sensible inductance-matrix would be:</p>
390390
391391
<blockquote>
392392
<img src=\"modelica://Modelica/Resources/Images/Electrical/Analog/Lines/M_OLine-eqL.png\" alt=\"L\"/>
393393
</blockquote>
394394
395-
<p>For the example of a microelectronic line of 0.1m length, which is used as default example
395+
<p>For the example of a microelectronic line of 0.1m length, which is used as default example
396396
for the <code>M_OLine</code> model, a sensible capacitance-matrix would be:</p>
397397
398398
<blockquote>
399399
<img src=\"modelica://Modelica/Resources/Images/Electrical/Analog/Lines/M_OLine-eqC.png\" alt=\"C\"/>
400400
</blockquote>
401401
402-
<p>For the example of a microelectronic line of 0.1m length, which is used as default example
402+
<p>For the example of a microelectronic line of 0.1m length, which is used as default example
403403
for the <code>M_OLine</code> model, a sensible conductance-matrix would be:</p>
404404
405405
<blockquote>
406406
<img src=\"modelica://Modelica/Resources/Images/Electrical/Analog/Lines/M_OLine-eqG.png\" alt=\"G\"/>
407407
</blockquote>
408408
409-
<p>The user has the possibility to enable a conditional heatport. If so, the <code>M_OLine</code>
409+
<p>The user has the possibility to enable a conditional heatport. If so, the <code>M_OLine</code>
410410
can be connected to a thermal network. If the parameter <code>alpha</code> is set to a value different than zero,
411-
the <code>M_OLine</code> becomes temperature sensitive due to their resistors which resistances
411+
the <code>M_OLine</code> becomes temperature sensitive due to their resistors which resistances
412412
are calculated by</p>
413413
414414
<blockquote>
415415
<pre>R_actual = R*(1 + alpha*(heatPort.T - T_ref))</pre>
416416
</blockquote>
417417
418-
<p>and conductors calculated by</p>
418+
<p>and conductors calculated by</p>
419419
420420
<blockquote>
421421
<pre>G_actual = G/(1 + alpha*(heatPort.T - T_ref))</pre>

‎Modelica/Electrical/Analog/Lines/OLine.mo‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ model OLine "Lossy Transmission Line"
4848
iconTransformation(extent={{-110,-110},{-90,-90}})));
4949
output SI.Voltage v[N]=G.v "Voltages at the connections of the elements";
5050
output SI.Current i[N+1]=R.i "Currents at the connections of the elements";
51-
/*
51+
/*
5252
The components R[N+1], L[N+1], C[N] and G[N] have been protected in the previous release(s)
5353
to avoid excessive size of simulation results.
5454
Voltages and currents at the connections are now mirrored to alias variables

‎Modelica/Electrical/Analog/Lines/TLine.mo‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ equation
2323
annotation (defaultComponentName="line",
2424
Documentation(info="<html>
2525
<p>
26-
Lossless transmission line with characteristic impedance Z0 and transmission delay TD. The lossless transmission line TLine is a two Port.
27-
Both port branches consist of a resistor with characteristic impedance Z0 and a controlled voltage source that takes into consideration the transmission delay TD.
28-
For further details see [<a href=\"modelica://Modelica.Electrical.Analog.UsersGuide.References\">Branin1967</a>].
26+
Lossless transmission line with characteristic impedance Z0 and transmission delay TD. The lossless transmission line TLine is a two Port.
27+
Both port branches consist of a resistor with characteristic impedance Z0 and a controlled voltage source that takes into consideration the transmission delay TD.
28+
For further details see [<a href=\"modelica://Modelica.Electrical.Analog.UsersGuide.References\">Branin1967</a>].
2929
The model parameters can be derived from inductance and capacitance per length (L&#39; resp. C&#39;), i. e. Z0 = sqrt(L&#39; / C&#39;).
3030
</p>
3131
<p>
@@ -34,7 +34,7 @@ There are three possibilities for specifying the transmission delay TD:
3434
<ul>
3535
<li>Calculate TD = sqrt(L&#39; * C&#39;)*length_of_line.</li>
3636
<li>Specify the normalized length NL, i.e. the length of the line divided by the wavelength corresponding to the frequency F: TD = NL / F.</li>
37-
<li>Specify NL = 1/4, i.e. the length of the line is assumed to be equal to a quarter of the wavelength corresponding to the frequency F: TD = 1/4 / F.
37+
<li>Specify NL = 1/4, i.e. the length of the line is assumed to be equal to a quarter of the wavelength corresponding to the frequency F: TD = 1/4 / F.
3838
In that case, the characteristic impedance Z0 is called natural impedance.</li>
3939
</ul>
4040

‎Modelica/Electrical/Analog/Sources/DCPowerSupply.mo‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ equation
8282
textString="%P0")}),
8383
Documentation(info="<html>
8484
<p>
85-
This is a simple model of a DC power supply, as used in laboratories.
86-
It can only work in one quadrant, i.e., positive voltage, delivering current.
85+
This is a simple model of a DC power supply, as used in laboratories.
86+
It can only work in one quadrant, i.e., positive voltage, delivering current.
8787
It has three limitations:
8888
</p>
8989
<ul>

‎Modelica/Electrical/Analog/Sources/LightningImpulse.mo‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ The parameters of the trajectory are defined by:
8282
</ul>
8383
<h4>Explanations</h4>
8484
<p>
85-
According to Fig. 1, a straight line between 0.1 and 0.9 of the amplitude is drawn.
86-
The virtual start of the trajectory is defined by the intersection of this straight line and the abscissa.
85+
According to Fig. 1, a straight line between 0.1 and 0.9 of the amplitude is drawn.
86+
The virtual start of the trajectory is defined by the intersection of this straight line and the abscissa.
8787
The rise time <code>T1</code> is defined as the time span between the virtual start of the trajectory and the point in time when the straight line reaches the amplitude.
8888
The decay time to half value <code>T2</code> is defined as the time span between the virtual start and the point in time when the output falls below 0.5 of the amplitude.
8989
</p>

‎Modelica/Electrical/Analog/Sources/LightningImpulseCurrent.mo‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ model LightningImpulseCurrent "Lightning impulse current"
2222
-39.3},{50.9,-44.5},{60.8,-48.8},{70,-51.4}})}),
2323
Documentation(info="<html>
2424
<p>
25-
Lightning impulse current using either a double exponential function or a Heidler function,
25+
Lightning impulse current using either a double exponential function or a Heidler function,
2626
see block <a href=\"modelica://Modelica.Electrical.Analog.Sources.LightningImpulse\">LightningImpulse</a>.
2727
</p>
2828
</html>"));

0 commit comments

Comments
 (0)