Context Navigation

← Previous Changeset
Next Changeset →

Changeset 572

Timestamp:

08/18/2007 07:22:28 PM (17 months ago)

Author:

otter

Message:

Replaced <td> by <td valign="top">
(OpenOffice does not support css-style files and therefore ignores the
attribute to have all table entries aligned on top. To fix this, all
table cells are explicitly defined with valign="top")

Location:

Modelica/trunk/Modelica

Files:

: 29 modified

Blocks/Continuous.mo (modified) (3 diffs)
Blocks/Sources.mo (modified) (1 diff)
Blocks/Types.mo (modified) (2 diffs)
Electrical/Digital.mo (modified) (7 diffs)
Electrical/Machines.mo (modified) (8 diffs)
Math/package.mo (modified) (4 diffs)
Mechanics/MultiBody/Examples/Elementary/package.mo (modified) (2 diffs)
Mechanics/MultiBody/Examples/Loops/package.mo (modified) (2 diffs)
Mechanics/MultiBody/Examples/Systems/package.mo (modified) (1 diff)
Mechanics/MultiBody/Forces.mo (modified) (6 diffs)
Mechanics/MultiBody/Frames.mo (modified) (3 diffs)
Mechanics/MultiBody/Joints.mo (modified) (5 diffs)
Mechanics/MultiBody/Sensors.mo (modified) (3 diffs)
Mechanics/MultiBody/Types.mo (modified) (4 diffs)
Mechanics/MultiBody/Visualizers.mo (modified) (7 diffs)
Mechanics/MultiBody/package.mo (modified) (3 diffs)
Mechanics/MultiBody/parts.mo (modified) (6 diffs)
Mechanics/Rotational.mo (modified) (3 diffs)
Media/IdealGases/Common/package.mo (modified) (1 diff)
Media/IdealGases/SingleGases.mo (modified) (2 diffs)
Media/Water/IF97_Utilities.mo (modified) (21 diffs)
Media/Water/package.mo (modified) (5 diffs)
Media/package.mo (modified) (15 diffs)
Thermal/FluidHeatFlow.mo (modified) (3 diffs)
Thermal/HeatTransfer.mo (modified) (1 diff)
Utilities/Files.mo (modified) (1 diff)
Utilities/Streams.mo (modified) (1 diff)
Utilities/Strings.mo (modified) (3 diffs)
package.mo (modified) (88 diffs)

Legend:

: Unmodified
: Added
: Removed

Modelica/trunk/Modelica/Blocks/Continuous.mo

r550	r572
28	28
29	29	<table border=1 cellspacing=0 cellpadding=2>
30		<tr><td><b>Name</b></td>
31		<td><b>Description</b></td></tr>
32
33		<tr><td><b>Init.NoInit</b></td>
34		<td>no initialization (start values are used as guess values with fixed=false)</td></tr>
35
36		<tr><td><b>Init.SteadyState</b></td>
37		<td>steady state initialization (derivatives of states are zero)</td></tr>
38
39		<tr><td><b>Init.InitialState</b></td>
40		<td>Initialization with initial states</td></tr>
41
42		<tr><td><b>Init.InitialOutput</b></td>
43		<td>Initialization with initial outputs (and steady state of the states if possibles)</td></tr>
	30	<tr><td valign=\"top\"><b>Name</b></td>
	31	<td valign=\"top\"><b>Description</b></td></tr>
	32
	33	<tr><td valign=\"top\"><b>Init.NoInit</b></td>
	34	<td valign=\"top\">no initialization (start values are used as guess values with fixed=false)</td></tr>
	35
	36	<tr><td valign=\"top\"><b>Init.SteadyState</b></td>
	37	<td valign=\"top\">steady state initialization (derivatives of states are zero)</td></tr>
	38
	39	<tr><td valign=\"top\"><b>Init.InitialState</b></td>
	40	<td valign=\"top\">Initialization with initial states</td></tr>
	41
	42	<tr><td valign=\"top\"><b>Init.InitialOutput</b></td>
	43	<td valign=\"top\">Initialization with initial outputs (and steady state of the states if possibles)</td></tr>
44	44	</table>
45	45
…	…
815	815
816	816	<table border=1 cellspacing=0 cellpadding=2>
817		<tr><td><b>initType</b></td>
818		<td><b>I.initType</b></td>
819		<td><b>D.initType</b></td></tr>
820
821		<tr><td><b>NoInit</b></td>
822		<td>NoInit</td>
823		<td>NoInit</td></tr>
824
825		<tr><td><b>SteadyState</b></td>
826		<td>SteadyState</td>
827		<td>SteadyState</td></tr>
828
829		<tr><td><b>InitialState</b></td>
830		<td>InitialState</td>
831		<td>InitialState</td></tr>
832
833		<tr><td><b>InitialOutput</b><br>
	817	<tr><td valign=\"top\"><b>initType</b></td>
	818	<td valign=\"top\"><b>I.initType</b></td>
	819	<td valign=\"top\"><b>D.initType</b></td></tr>
	820
	821	<tr><td valign=\"top\"><b>NoInit</b></td>
	822	<td valign=\"top\">NoInit</td>
	823	<td valign=\"top\">NoInit</td></tr>
	824
	825	<tr><td valign=\"top\"><b>SteadyState</b></td>
	826	<td valign=\"top\">SteadyState</td>
	827	<td valign=\"top\">SteadyState</td></tr>
	828
	829	<tr><td valign=\"top\"><b>InitialState</b></td>
	830	<td valign=\"top\">InitialState</td>
	831	<td valign=\"top\">InitialState</td></tr>
	832
	833	<tr><td valign=\"top\"><b>InitialOutput</b><br>
834	834	and initial equation: y = y_start</td>
835		<td>NoInit</td>
836		<td>SteadyState</td></tr>
837
838		<tr><td><b>DoNotUse_InitialIntegratorState</b></td>
839		<td>InitialState</td>
840		<td>NoInit</td></tr>
	835	<td valign=\"top\">NoInit</td>
	836	<td valign=\"top\">SteadyState</td></tr>
	837
	838	<tr><td valign=\"top\"><b>DoNotUse_InitialIntegratorState</b></td>
	839	<td valign=\"top\">InitialState</td>
	840	<td valign=\"top\">NoInit</td></tr>
841	841	</table>
842	842
…	…
1086	1086
1087	1087	<table border=1 cellspacing=0 cellpadding=2>
1088		<tr><td><b>initType</b></td>
1089		<td><b>I.initType</b></td>
1090		<td><b>D.initType</b></td></tr>
1091
1092		<tr><td><b>NoInit</b></td>
1093		<td>NoInit</td>
1094		<td>NoInit</td></tr>
1095
1096		<tr><td><b>SteadyState</b></td>
1097		<td>SteadyState</td>
1098		<td>SteadyState</td></tr>
1099
1100		<tr><td><b>InitialState</b></td>
1101		<td>InitialState</td>
1102		<td>InitialState</td></tr>
1103
1104		<tr><td><b>InitialOutput</b><br>
	1088	<tr><td valign=\"top\"><b>initType</b></td>
	1089	<td valign=\"top\"><b>I.initType</b></td>
	1090	<td valign=\"top\"><b>D.initType</b></td></tr>
	1091
	1092	<tr><td valign=\"top\"><b>NoInit</b></td>
	1093	<td valign=\"top\">NoInit</td>
	1094	<td valign=\"top\">NoInit</td></tr>
	1095
	1096	<tr><td valign=\"top\"><b>SteadyState</b></td>
	1097	<td valign=\"top\">SteadyState</td>
	1098	<td valign=\"top\">SteadyState</td></tr>
	1099
	1100	<tr><td valign=\"top\"><b>InitialState</b></td>
	1101	<td valign=\"top\">InitialState</td>
	1102	<td valign=\"top\">InitialState</td></tr>
	1103
	1104	<tr><td valign=\"top\"><b>InitialOutput</b><br>
1105	1105	and initial equation: y = y_start</td>
1106		<td>NoInit</td>
1107		<td>SteadyState</td></tr>
1108
1109		<tr><td><b>DoNotUse_InitialIntegratorState</b></td>
1110		<td>InitialState</td>
1111		<td>NoInit</td></tr>
	1106	<td valign=\"top\">NoInit</td>
	1107	<td valign=\"top\">SteadyState</td></tr>
	1108
	1109	<tr><td valign=\"top\"><b>DoNotUse_InitialIntegratorState</b></td>
	1110	<td valign=\"top\">InitialState</td>
	1111	<td valign=\"top\">NoInit</td></tr>
1112	1112	</table>
1113	1113

Modelica/trunk/Modelica/Blocks/Sources.mo

r550	r572
168	168
169	169	<table border=1 cellspacing=0 cellpadding=2>
170		<tr><td><b>offset</b></td>
171		<td>Value which is added to the signal</td>
	170	<tr><td valign=\"top\"><b>offset</b></td>
	171	<td valign=\"top\">Value which is added to the signal</td>
172	172	</tr>
173		<tr><td><b>startTime</b></td>
174		<td>Start time of signal. For time < startTime,
	173	<tr><td valign=\"top\"><b>startTime</b></td>
	174	<td valign=\"top\">Start time of signal. For time < startTime,
175	175	the output y is set to offset.</td>
176	176	</tr>

Modelica/trunk/Modelica/Blocks/Types.mo

r550	r572
42	42
43	43	<table border=1 cellspacing=0 cellpadding=2>
44		<tr><td><b>choice</b></td>
45		<td><b>Meaning of choice</b></td>
46		</tr>
47
48		<tr><td>HoldLastPoint</td>
49		<td>Hold the last table point outside of the table scope</td>
50		</tr>
51		<tr><td>LastTwoPoints</td>
52		<td>Extrapolate linearly through the last two table points
	44	<tr><td valign=\"top\"><b>choice</b></td>
	45	<td valign=\"top\"><b>Meaning of choice</b></td>
	46	</tr>
	47
	48	<tr><td valign=\"top\">HoldLastPoint</td>
	49	<td valign=\"top\">Hold the last table point outside of the table scope</td>
	50	</tr>
	51	<tr><td valign=\"top\">LastTwoPoints</td>
	52	<td valign=\"top\">Extrapolate linearly through the last two table points
53	53	outside of the table scope</td>
54	54	</tr>
55		<tr><td>Periodic</td>
56		<td>Repeat the table scope periodically</td>
	55	<tr><td valign=\"top\">Periodic</td>
	56	<td valign=\"top\">Repeat the table scope periodically</td>
57	57	</tr>
58	58	</table>
…	…
192	192
193	193	<table border=1 cellspacing=0 cellpadding=2>
194		<tr><td><b>choice</b></td>
195		<td><b>Meaning of choice</b></td>
196		</tr>
197
198		<tr><td>LinearSegments</td>
199		<td>Table points are linearly interpolated</td>
200		</tr>
201		<tr><td>ContinuousDerivative</td>
202		<td>Table points are interpolated such that the
	194	<tr><td valign=\"top\"><b>choice</b></td>
	195	<td valign=\"top\"><b>Meaning of choice</b></td>
	196	</tr>
	197
	198	<tr><td valign=\"top\">LinearSegments</td>
	199	<td valign=\"top\">Table points are linearly interpolated</td>
	200	</tr>
	201	<tr><td valign=\"top\">ContinuousDerivative</td>
	202	<td valign=\"top\">Table points are interpolated such that the
203	203	first derivative is continuous</td>
204	204	</tr>

Modelica/trunk/Modelica/Electrical/Digital.mo

r548	r572
235	235
236	236	<table border=1 cellspacing=0 cellpadding=2>
237		<tr><td><b>Logic value</b></td>
238		<td><b>Integer code</b></td>
239		<td><b>Meaning</b></td>
	237	<tr><td valign=\"top\"><b>Logic value</b></td>
	238	<td valign=\"top\"><b>Integer code</b></td>
	239	<td valign=\"top\"><b>Meaning</b></td>
240	240	</tr>
241	241
242		<tr><td~~>'U'</td> <td>1</td> <td~~>Uninitialized</td></tr>
243		<tr><td~~>'X'</td> <td>2</td> <td~~>Forcing Unknown</td></tr>
244		<tr><td~~>'0'</td> <td>3</td> <td~~>Forcing 0</td></tr>
245		<tr><td~~>'1'</td> <td>4</td> <td~~>Forcing 1</td></tr>
246		<tr><td~~>'Z'</td> <td>5</td> <td~~>High Impedance</td></tr>
247		<tr><td~~>'W'</td> <td>6</td> <td~~>Weak Unknown</td></tr>
248		<tr><td~~>'L'</td> <td>7</td> <td~~>Weak 0</td></tr>
249		<tr><td~~>'H'</td> <td>8</td> <td~~>Weak 1</td></tr>
250		<tr><td~~>'-'</td> <td>9</td> <td~~>Don't care</td></tr>
	242	<tr><td valign=\"top\">'U'</td> <td valign=\"top\">1</td> <td valign=\"top\">Uninitialized</td></tr>
	243	<tr><td valign=\"top\">'X'</td> <td valign=\"top\">2</td> <td valign=\"top\">Forcing Unknown</td></tr>
	244	<tr><td valign=\"top\">'0'</td> <td valign=\"top\">3</td> <td valign=\"top\">Forcing 0</td></tr>
	245	<tr><td valign=\"top\">'1'</td> <td valign=\"top\">4</td> <td valign=\"top\">Forcing 1</td></tr>
	246	<tr><td valign=\"top\">'Z'</td> <td valign=\"top\">5</td> <td valign=\"top\">High Impedance</td></tr>
	247	<tr><td valign=\"top\">'W'</td> <td valign=\"top\">6</td> <td valign=\"top\">Weak Unknown</td></tr>
	248	<tr><td valign=\"top\">'L'</td> <td valign=\"top\">7</td> <td valign=\"top\">Weak 0</td></tr>
	249	<tr><td valign=\"top\">'H'</td> <td valign=\"top\">8</td> <td valign=\"top\">Weak 1</td></tr>
	250	<tr><td valign=\"top\">'-'</td> <td valign=\"top\">9</td> <td valign=\"top\">Don't care</td></tr>
251	251	</table>
252	252
…	…
2466	2466
2467	2467	<table border=1 cellspacing=0 cellpadding=2>
2468		<tr><td><b>Logic value</b></td>
2469		<td><b>Integer code</b></td>
2470		<td><b>Meaning</b></td>
	2468	<tr><td valign=\"top\"><b>Logic value</b></td>
	2469	<td valign=\"top\"><b>Integer code</b></td>
	2470	<td valign=\"top\"><b>Meaning</b></td>
2471	2471	</tr>
2472	2472
2473		<tr><td~~>'U'</td> <td>1</td> <td~~>Uninitialized</td></tr>
2474		<tr><td~~>'X'</td> <td>2</td> <td~~>Forcing Unknown</td></tr>
2475		<tr><td~~>'0'</td> <td>3</td> <td~~>Forcing 0</td></tr>
2476		<tr><td~~>'1'</td> <td>4</td> <td~~>Forcing 1</td></tr>
2477		<tr><td~~>'Z'</td> <td>5</td> <td~~>High Impedance</td></tr>
2478		<tr><td~~>'W'</td> <td>6</td> <td~~>Weak Unknown</td></tr>
2479		<tr><td~~>'L'</td> <td>7</td> <td~~>Weak 0</td></tr>
2480		<tr><td~~>'H'</td> <td>8</td> <td~~>Weak 1</td></tr>
2481		<tr><td~~>'-'</td> <td>9</td> <td~~>Don't care</td></tr>
	2473	<tr><td valign=\"top\">'U'</td> <td valign=\"top\">1</td> <td valign=\"top\">Uninitialized</td></tr>
	2474	<tr><td valign=\"top\">'X'</td> <td valign=\"top\">2</td> <td valign=\"top\">Forcing Unknown</td></tr>
	2475	<tr><td valign=\"top\">'0'</td> <td valign=\"top\">3</td> <td valign=\"top\">Forcing 0</td></tr>
	2476	<tr><td valign=\"top\">'1'</td> <td valign=\"top\">4</td> <td valign=\"top\">Forcing 1</td></tr>
	2477	<tr><td valign=\"top\">'Z'</td> <td valign=\"top\">5</td> <td valign=\"top\">High Impedance</td></tr>
	2478	<tr><td valign=\"top\">'W'</td> <td valign=\"top\">6</td> <td valign=\"top\">Weak Unknown</td></tr>
	2479	<tr><td valign=\"top\">'L'</td> <td valign=\"top\">7</td> <td valign=\"top\">Weak 0</td></tr>
	2480	<tr><td valign=\"top\">'H'</td> <td valign=\"top\">8</td> <td valign=\"top\">Weak 1</td></tr>
	2481	<tr><td valign=\"top\">'-'</td> <td valign=\"top\">9</td> <td valign=\"top\">Don't care</td></tr>
2482	2482	</table>
2483	2483
…	…
2502	2502
2503	2503	<table border=1 cellspacing=0 cellpadding=2>
2504		<tr><td><b>Logic value</b></td>
2505		<td><b>Integer code</b></td>
2506		<td><b>Meaning</b></td>
	2504	<tr><td valign=\"top\"><b>Logic value</b></td>
	2505	<td valign=\"top\"><b>Integer code</b></td>
	2506	<td valign=\"top\"><b>Meaning</b></td>
2507	2507	</tr>
2508	2508
2509		<tr><td~~>'U'</td> <td>1</td> <td~~>Uninitialized</td></tr>
2510		<tr><td~~>'X'</td> <td>2</td> <td~~>Forcing Unknown</td></tr>
2511		<tr><td~~>'0'</td> <td>3</td> <td~~>Forcing 0</td></tr>
2512		<tr><td~~>'1'</td> <td>4</td> <td~~>Forcing 1</td></tr>
2513		<tr><td~~>'Z'</td> <td>5</td> <td~~>High Impedance</td></tr>
2514		<tr><td~~>'W'</td> <td>6</td> <td~~>Weak Unknown</td></tr>
2515		<tr><td~~>'L'</td> <td>7</td> <td~~>Weak 0</td></tr>
2516		<tr><td~~>'H'</td> <td>8</td> <td~~>Weak 1</td></tr>
2517		<tr><td~~>'-'</td> <td>9</td> <td~~>Don't care</td></tr>
	2509	<tr><td valign=\"top\">'U'</td> <td valign=\"top\">1</td> <td valign=\"top\">Uninitialized</td></tr>
	2510	<tr><td valign=\"top\">'X'</td> <td valign=\"top\">2</td> <td valign=\"top\">Forcing Unknown</td></tr>
	2511	<tr><td valign=\"top\">'0'</td> <td valign=\"top\">3</td> <td valign=\"top\">Forcing 0</td></tr>
	2512	<tr><td valign=\"top\">'1'</td> <td valign=\"top\">4</td> <td valign=\"top\">Forcing 1</td></tr>
	2513	<tr><td valign=\"top\">'Z'</td> <td valign=\"top\">5</td> <td valign=\"top\">High Impedance</td></tr>
	2514	<tr><td valign=\"top\">'W'</td> <td valign=\"top\">6</td> <td valign=\"top\">Weak Unknown</td></tr>
	2515	<tr><td valign=\"top\">'L'</td> <td valign=\"top\">7</td> <td valign=\"top\">Weak 0</td></tr>
	2516	<tr><td valign=\"top\">'H'</td> <td valign=\"top\">8</td> <td valign=\"top\">Weak 1</td></tr>
	2517	<tr><td valign=\"top\">'-'</td> <td valign=\"top\">9</td> <td valign=\"top\">Don't care</td></tr>
2518	2518	</table>
2519	2519
…	…
3857	3857
3858	3858	<table border=1 cellspacing=0 cellpadding=2>
3859		<tr><td><b>Logic value</b></td>
3860		<td><b>Integer code</b></td>
3861		<td><b>Meaning</b></td>
	3859	<tr><td valign=\"top\"><b>Logic value</b></td>
	3860	<td valign=\"top\"><b>Integer code</b></td>
	3861	<td valign=\"top\"><b>Meaning</b></td>
3862	3862	</tr>
3863	3863
3864		<tr><td~~>'U'</td> <td>1</td> <td~~>Uninitialized</td></tr>
3865		<tr><td~~>'X'</td> <td>2</td> <td~~>Forcing Unknown</td></tr>
3866		<tr><td~~>'0'</td> <td>3</td> <td~~>Forcing 0</td></tr>
3867		<tr><td~~>'1'</td> <td>4</td> <td~~>Forcing 1</td></tr>
3868		<tr><td~~>'Z'</td> <td>5</td> <td~~>High Impedance</td></tr>
3869		<tr><td~~>'W'</td> <td>6</td> <td~~>Weak Unknown</td></tr>
3870		<tr><td~~>'L'</td> <td>7</td> <td~~>Weak 0</td></tr>
3871		<tr><td~~>'H'</td> <td>8</td> <td~~>Weak 1</td></tr>
3872		<tr><td~~>'-'</td> <td>9</td> <td~~>Don't care</td></tr>
	3864	<tr><td valign=\"top\">'U'</td> <td valign=\"top\">1</td> <td valign=\"top\">Uninitialized</td></tr>
	3865	<tr><td valign=\"top\">'X'</td> <td valign=\"top\">2</td> <td valign=\"top\">Forcing Unknown</td></tr>
	3866	<tr><td valign=\"top\">'0'</td> <td valign=\"top\">3</td> <td valign=\"top\">Forcing 0</td></tr>
	3867	<tr><td valign=\"top\">'1'</td> <td valign=\"top\">4</td> <td valign=\"top\">Forcing 1</td></tr>
	3868	<tr><td valign=\"top\">'Z'</td> <td valign=\"top\">5</td> <td valign=\"top\">High Impedance</td></tr>
	3869	<tr><td valign=\"top\">'W'</td> <td valign=\"top\">6</td> <td valign=\"top\">Weak Unknown</td></tr>
	3870	<tr><td valign=\"top\">'L'</td> <td valign=\"top\">7</td> <td valign=\"top\">Weak 0</td></tr>
	3871	<tr><td valign=\"top\">'H'</td> <td valign=\"top\">8</td> <td valign=\"top\">Weak 1</td></tr>
	3872	<tr><td valign=\"top\">'-'</td> <td valign=\"top\">9</td> <td valign=\"top\">Don't care</td></tr>
3873	3873	</table>
3874	3874
…	…
3939	3939	<p><b>Code Table</b></p>
3940	3940	<table border=1 cellspacing=0 cellpadding=2>
3941		<tr><td><b>Logic value</b></td>
3942		<td><b>Integer code</b></td>
3943		<td><b>Meaning</b></td>
	3941	<tr><td valign=\"top\"><b>Logic value</b></td>
	3942	<td valign=\"top\"><b>Integer code</b></td>
	3943	<td valign=\"top\"><b>Meaning</b></td>
3944	3944	</tr>
3945	3945
3946		<tr><td~~>'U'</td> <td>1</td> <td~~>Uninitialized</td></tr>
3947		<tr><td~~>'X'</td> <td>2</td> <td~~>Forcing Unknown</td></tr>
3948		<tr><td~~>'0'</td> <td>3</td> <td~~>Forcing 0</td></tr>
3949		<tr><td~~>'1'</td> <td>4</td> <td~~>Forcing 1</td></tr>
3950		<tr><td~~>'Z'</td> <td>5</td> <td~~>High Impedance</td></tr>
3951		<tr><td~~>'W'</td> <td>6</td> <td~~>Weak Unknown</td></tr>
3952		<tr><td~~>'L'</td> <td>7</td> <td~~>Weak 0</td></tr>
3953		<tr><td~~>'H'</td> <td>8</td> <td~~>Weak 1</td></tr>
3954		<tr><td~~>'-'</td> <td>9</td> <td~~>Don't care</td></tr>
	3946	<tr><td valign=\"top\">'U'</td> <td valign=\"top\">1</td> <td valign=\"top\">Uninitialized</td></tr>
	3947	<tr><td valign=\"top\">'X'</td> <td valign=\"top\">2</td> <td valign=\"top\">Forcing Unknown</td></tr>
	3948	<tr><td valign=\"top\">'0'</td> <td valign=\"top\">3</td> <td valign=\"top\">Forcing 0</td></tr>
	3949	<tr><td valign=\"top\">'1'</td> <td valign=\"top\">4</td> <td valign=\"top\">Forcing 1</td></tr>
	3950	<tr><td valign=\"top\">'Z'</td> <td valign=\"top\">5</td> <td valign=\"top\">High Impedance</td></tr>
	3951	<tr><td valign=\"top\">'W'</td> <td valign=\"top\">6</td> <td valign=\"top\">Weak Unknown</td></tr>
	3952	<tr><td valign=\"top\">'L'</td> <td valign=\"top\">7</td> <td valign=\"top\">Weak 0</td></tr>
	3953	<tr><td valign=\"top\">'H'</td> <td valign=\"top\">8</td> <td valign=\"top\">Weak 1</td></tr>
	3954	<tr><td valign=\"top\">'-'</td> <td valign=\"top\">9</td> <td valign=\"top\">Don't care</td></tr>
3955	3955	</table>
3956	3956	<P>
…	…
4026	4026	<p><b>Code Table</b></p>
4027	4027	<table border=1 cellspacing=0 cellpadding=2>
4028		<tr><td><b>Logic value</b></td>
4029		<td><b>Integer code</b></td>
4030		<td><b>Meaning</b></td>
	4028	<tr><td valign=\"top\"><b>Logic value</b></td>
	4029	<td valign=\"top\"><b>Integer code</b></td>
	4030	<td valign=\"top\"><b>Meaning</b></td>
4031	4031	</tr>
4032	4032
4033		<tr><td~~>'U'</td> <td>1</td> <td~~>Uninitialized</td></tr>
4034		<tr><td~~>'X'</td> <td>2</td> <td~~>Forcing Unknown</td></tr>
4035		<tr><td~~>'0'</td> <td>3</td> <td~~>Forcing 0</td></tr>
4036		<tr><td~~>'1'</td> <td>4</td> <td~~>Forcing 1</td></tr>
4037		<tr><td~~>'Z'</td> <td>5</td> <td~~>High Impedance</td></tr>
4038		<tr><td~~>'W'</td> <td>6</td> <td~~>Weak Unknown</td></tr>
4039		<tr><td~~>'L'</td> <td>7</td> <td~~>Weak 0</td></tr>
4040		<tr><td~~>'H'</td> <td>8</td> <td~~>Weak 1</td></tr>
4041		<tr><td~~>'-'</td> <td>9</td> <td~~>Don't care</td></tr>
	4033	<tr><td valign=\"top\">'U'</td> <td valign=\"top\">1</td> <td valign=\"top\">Uninitialized</td></tr>
	4034	<tr><td valign=\"top\">'X'</td> <td valign=\"top\">2</td> <td valign=\"top\">Forcing Unknown</td></tr>
	4035	<tr><td valign=\"top\">'0'</td> <td valign=\"top\">3</td> <td valign=\"top\">Forcing 0</td></tr>
	4036	<tr><td valign=\"top\">'1'</td> <td valign=\"top\">4</td> <td valign=\"top\">Forcing 1</td></tr>
	4037	<tr><td valign=\"top\">'Z'</td> <td valign=\"top\">5</td> <td valign=\"top\">High Impedance</td></tr>
	4038	<tr><td valign=\"top\">'W'</td> <td valign=\"top\">6</td> <td valign=\"top\">Weak Unknown</td></tr>
	4039	<tr><td valign=\"top\">'L'</td> <td valign=\"top\">7</td> <td valign=\"top\">Weak 0</td></tr>
	4040	<tr><td valign=\"top\">'H'</td> <td valign=\"top\">8</td> <td valign=\"top\">Weak 1</td></tr>
	4041	<tr><td valign=\"top\">'-'</td> <td valign=\"top\">9</td> <td valign=\"top\">Don't care</td></tr>
4042	4042	</table>
4043	4043	<P>
…	…
4147	4147	<p><b>Code Table</b></p>
4148	4148	<table border=1 cellspacing=0 cellpadding=2>
4149		<tr><td><b>Logic value</b></td>
4150		<td><b>Integer code</b></td>
4151		<td><b>Meaning</b></td>
	4149	<tr><td valign=\"top\"><b>Logic value</b></td>
	4150	<td valign=\"top\"><b>Integer code</b></td>
	4151	<td valign=\"top\"><b>Meaning</b></td>
4152	4152	</tr>
4153	4153
4154		<tr><td~~>'U'</td> <td>1</td> <td~~>Uninitialized</td></tr>
4155		<tr><td~~>'X'</td> <td>2</td> <td~~>Forcing Unknown</td></tr>
4156		<tr><td~~>'0'</td> <td>3</td> <td~~>Forcing 0</td></tr>
4157		<tr><td~~>'1'</td> <td>4</td> <td~~>Forcing 1</td></tr>
4158		<tr><td~~>'Z'</td> <td>5</td> <td~~>High Impedance</td></tr>
4159		<tr><td~~>'W'</td> <td>6</td> <td~~>Weak Unknown</td></tr>
4160		<tr><td~~>'L'</td> <td>7</td> <td~~>Weak 0</td></tr>
4161		<tr><td~~>'H'</td> <td>8</td> <td~~>Weak 1</td></tr>
4162		<tr><td~~>'-'</td> <td>9</td> <td~~>Don't care</td></tr>
	4154	<tr><td valign=\"top\">'U'</td> <td valign=\"top\">1</td> <td valign=\"top\">Uninitialized</td></tr>
	4155	<tr><td valign=\"top\">'X'</td> <td valign=\"top\">2</td> <td valign=\"top\">Forcing Unknown</td></tr>
	4156	<tr><td valign=\"top\">'0'</td> <td valign=\"top\">3</td> <td valign=\"top\">Forcing 0</td></tr>
	4157	<tr><td valign=\"top\">'1'</td> <td valign=\"top\">4</td> <td valign=\"top\">Forcing 1</td></tr>
	4158	<tr><td valign=\"top\">'Z'</td> <td valign=\"top\">5</td> <td valign=\"top\">High Impedance</td></tr>
	4159	<tr><td valign=\"top\">'W'</td> <td valign=\"top\">6</td> <td valign=\"top\">Weak Unknown</td></tr>
	4160	<tr><td valign=\"top\">'L'</td> <td valign=\"top\">7</td> <td valign=\"top\">Weak 0</td></tr>
	4161	<tr><td valign=\"top\">'H'</td> <td valign=\"top\">8</td> <td valign=\"top\">Weak 1</td></tr>
	4162	<tr><td valign=\"top\">'-'</td> <td valign=\"top\">9</td> <td valign=\"top\">Don't care</td></tr>
4163	4163	</table>
4164	4164	<P>

Modelica/trunk/Modelica/Electrical/Machines.mo

r542	r572
1850	1850	<table>
1851	1851	<tr>
1852		<td>number of pole pairs p</td>
1853		<td~~>2</td><td~~> </td>
1854		</tr>
1855		<tr>
1856		<td>stator's moment of inertia</td>
1857		<td~~>0.29</td><td~~>kg.m2</td>
1858		</tr>
1859		<tr>
1860		<td>rotor's moment of inertia</td>
1861		<td~~>0.29</td><td~~>kg.m2</td>
1862		</tr>
1863		<tr>
1864		<td>nominal frequency fNominal</td>
1865		<td~~>50</td><td~~>Hz</td>
1866		</tr>
1867		<tr>
1868		<td>nominal voltage per phase</td>
1869		<td~~>100</td><td~~>V RMS</td>
1870		</tr>
1871		<tr>
1872		<td>nominal current per phase</td>
1873		<td~~>100</td><td~~>A RMS</td>
1874		</tr>
1875		<tr>
1876		<td>nominal torque</td>
1877		<td~~>161.4</td><td~~>Nm</td>
1878		</tr>
1879		<tr>
1880		<td>nominal speed</td>
1881		<td~~>1440.45</td><td~~>rpm</td>
1882		</tr>
1883		<tr>
1884		<td>nominal mechanical output</td>
1885		<td~~>24.346</td><td~~>kW</td>
1886		</tr>
1887		<tr>
1888		<td>efficiency</td>
1889		<td~~>92.7</td><td~~>%</td>
1890		</tr>
1891		<tr>
1892		<td>power factor</td>
1893		<td~~>0.875</td><td~~> </td>
1894		</tr>
1895		<tr>
1896		<td>stator resistance</td>
1897		<td~~>0.03</td><td~~>Ohm per phase in warm condition</td>
1898		</tr>
1899		<tr>
1900		<td>rotor resistance</td>
1901		<td~~>0.04</td><td~~>Ohm in warm condition</td>
1902		</tr>
1903		<tr>
1904		<td>stator reactance Xs</td>
1905		<td~~>3</td><td~~>Ohm per phase</td>
1906		</tr>
1907		<tr>
1908		<td>rotor reactance Xr</td>
1909		<td~~>3</td><td~~>Ohm</td>
1910		</tr>
1911		<tr>
1912		<td>total stray coefficient sigma</td>
1913		<td~~>0.0667</td><td~~> </td>
1914		</tr>
1915		<tr>
1916		<td>These values give the following inductances, <br>assuming equal stator and rotor stray inductances:</td>
1917		<td~~> </td><td~~> </td>
1918		</tr>
1919		<tr>
1920		<td>stator stray inductance per phase</td>
1921		<td~~>Xs * (1 - sqrt(1-sigma))/(2pifNominal)</td><td~~> </td>
1922		</tr>
1923		<tr>
1924		<td>rotor stray inductance</td>
1925		<td~~>Xr * (1 - sqrt(1-sigma))/(2pifNominal)</td><td~~> </td>
1926		</tr>
1927		<tr>
1928		<td>main field inductance per phase</td>
1929		<td~~>sqrt(XsXr (1-sigma))/(2pifNominal)</td><td~~> </td>
	1852	<td valign=\"top\">number of pole pairs p</td>
	1853	<td valign=\"top\">2</td><td valign=\"top\"> </td>
	1854	</tr>
	1855	<tr>
	1856	<td valign=\"top\">stator's moment of inertia</td>
	1857	<td valign=\"top\">0.29</td><td valign=\"top\">kg.m2</td>
	1858	</tr>
	1859	<tr>
	1860	<td valign=\"top\">rotor's moment of inertia</td>
	1861	<td valign=\"top\">0.29</td><td valign=\"top\">kg.m2</td>
	1862	</tr>
	1863	<tr>
	1864	<td valign=\"top\">nominal frequency fNominal</td>
	1865	<td valign=\"top\">50</td><td valign=\"top\">Hz</td>
	1866	</tr>