Changeset 1072
- Timestamp:
- 02/26/08 08:34:21 (6 months ago)
- Location:
- trunk/Modelica
- Files:
-
- 18 modified
-
Blocks/package.mo (modified) (3 diffs)
-
Constants.mo (modified) (1 diff)
-
Electrical/Analog/package.mo (modified) (1 diff)
-
Electrical/Digital.mo (modified) (2 diffs)
-
Electrical/Machines.mo (modified) (21 diffs)
-
Icons.mo (modified) (1 diff)
-
Math/package.mo (modified) (1 diff)
-
Mechanics/MultiBody/package.mo (modified) (2 diffs)
-
Mechanics/Rotational.mo (modified) (1 diff)
-
Mechanics/Translational.mo (modified) (1 diff)
-
Media/Incompressible.mo (modified) (1 diff)
-
Media/package.mo (modified) (2 diffs)
-
SIunits.mo (modified) (11 diffs)
-
StateGraph.mo (modified) (1 diff)
-
Thermal/FluidHeatFlow.mo (modified) (10 diffs)
-
Thermal/HeatTransfer.mo (modified) (45 diffs)
-
Utilities/package.mo (modified) (1 diff)
-
package.mo (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Modelica/Blocks/package.mo
r1047 r1072 39 39 </dl> 40 40 <p> 41 Copyright © 1998-200 7, Modelica Association and DLR.41 Copyright © 1998-2008, Modelica Association and DLR. 42 42 </p> 43 43 <p> … … 158 158 159 159 <li> The output of the controller is a torque that drives a motor inertia 160 \"inertia1\". Via a compl öiant spring/damper component, the load160 \"inertia1\". Via a complᅵiant spring/damper component, the load 161 161 inertia \"inertia2\" is attached. A constant external torque of 10 Nm 162 162 is acting on the load inertia.</li> … … 271 271 <p> 272 272 This example demonstrates how to construct an inverse model in Modelica 273 (for more details see <a href=\"http://www.modelica.org/events/Conference2005/online_proceedings/Session3/Session3c3.pdf\">Looye, Th ümmel, Kurze, Otter, Bals: Nonlinear Inverse Models for Control</a>).273 (for more details see <a href=\"http://www.modelica.org/events/Conference2005/online_proceedings/Session3/Session3c3.pdf\">Looye, Thᅵmmel, Kurze, Otter, Bals: Nonlinear Inverse Models for Control</a>). 274 274 </p> 275 275 -
trunk/Modelica/Constants.mo
r1046 r1072 76 76 77 77 <p> 78 Copyright © 1998-200 7, Modelica Association and DLR.78 Copyright © 1998-2008, Modelica Association and DLR. 79 79 </p> 80 80 <p> -
trunk/Modelica/Electrical/Analog/package.mo
r1044 r1072 37 37 38 38 <p> 39 Copyright © 1998-200 7, Modelica Association and Fraunhofer-Gesellschaft.39 Copyright © 1998-2008, Modelica Association and Fraunhofer-Gesellschaft. 40 40 </p> 41 41 <p> -
trunk/Modelica/Electrical/Digital.mo
r1046 r1072 241 241 242 242 <p> 243 Copyright © 1998-200 7, Modelica Association and Fraunhofer-Gesellschaft.243 Copyright © 1998-2008, Modelica Association and Fraunhofer-Gesellschaft. 244 244 </p> 245 245 <p> … … 4395 4395 parameter Real value_L(start=0) "value for digital L (Weak 0)"; 4396 4396 parameter Real value_H(start=1) "value for digital H (Weak 1)"; 4397 parameter Real value_m(start=0.5) "value for digital m (Don Žt care)";4397 parameter Real value_m(start=0.5) "value for digital m (Donᅵt care)"; 4398 4398 annotation (Documentation(info="<HTML> 4399 4399 <P> -
trunk/Modelica/Electrical/Machines.mo
r1046 r1072 47 47 </dl> 48 48 <p> 49 Copyright © 1998-200 7, Modelica Association and Anton Haumer.49 Copyright © 1998-2008, Modelica Association and Anton Haumer. 50 50 </p> 51 51 <p> … … 181 181 </dd> 182 182 <dt><b>Copyright:</b></dt> 183 <dd>Copyright © 1998-200 7, Modelica Association and Anton Haumer.<br>183 <dd>Copyright © 1998-2008, Modelica Association and Anton Haumer.<br> 184 184 <i>The Modelica package is <b>free</b> software; it can be redistributed and/or modified 185 185 under the terms of the <b>Modelica license</b>, see the license conditions … … 1911 1911 </dd> 1912 1912 <dt><b>Copyright:</b></dt> 1913 <dd>Copyright © 1998-200 7, Modelica Association and Anton Haumer.<br>1913 <dd>Copyright © 1998-2008, Modelica Association and Anton Haumer.<br> 1914 1914 <i>The Modelica package is <b>free</b> software; it can be redistributed and/or modified 1915 1915 under the terms of the <b>Modelica license</b>, see the license conditions … … 1994 1994 </dd> 1995 1995 <dt><b>Copyright:</b></dt> 1996 <dd>Copyright © 1998-200 7, Modelica Association and Anton Haumer.<br>1996 <dd>Copyright © 1998-2008, Modelica Association and Anton Haumer.<br> 1997 1997 <i>The Modelica package is <b>free</b> software; it can be redistributed and/or modified 1998 1998 under the terms of the <b>Modelica license</b>, see the license conditions … … 2407 2407 </dd> 2408 2408 <dt><b>Copyright:</b></dt> 2409 <dd>Copyright © 1998-200 7, Modelica Association and Anton Haumer.<br>2409 <dd>Copyright © 1998-2008, Modelica Association and Anton Haumer.<br> 2410 2410 <i>The Modelica package is <b>free</b> software; it can be redistributed and/or modified 2411 2411 under the terms of the <b>Modelica license</b>, see the license conditions … … 3128 3128 </dd> 3129 3129 <dt><b>Copyright:</b></dt> 3130 <dd>Copyright © 1998-200 7, Modelica Association and Anton Haumer.<br>3130 <dd>Copyright © 1998-2008, Modelica Association and Anton Haumer.<br> 3131 3131 <i>The Modelica package is <b>free</b> software; it can be redistributed and/or modified 3132 3132 under the terms of the <b>Modelica license</b>, see the license conditions … … 3614 3614 </dl> 3615 3615 <p> 3616 Copyright © 1998-200 7, Modelica Association and Anton Haumer.3616 Copyright © 1998-2008, Modelica Association and Anton Haumer. 3617 3617 </p> 3618 3618 <p> … … 3646 3646 </dd> 3647 3647 <dt><b>Copyright:</b></dt> 3648 <dd>Copyright © 1998-200 7, Modelica Association and Anton Haumer.<br>3648 <dd>Copyright © 1998-2008, Modelica Association and Anton Haumer.<br> 3649 3649 <i>The Modelica package is <b>free</b> software; it can be redistributed and/or modified 3650 3650 under the terms of the <b>Modelica license</b>, see the license conditions … … 3973 3973 </dd> 3974 3974 <dt><b>Copyright:</b></dt> 3975 <dd>Copyright © 1998-200 7, Modelica Association and Anton Haumer.<br>3975 <dd>Copyright © 1998-2008, Modelica Association and Anton Haumer.<br> 3976 3976 <i>The Modelica package is <b>free</b> software; it can be redistributed and/or modified 3977 3977 under the terms of the <b>Modelica license</b>, see the license conditions … … 4253 4253 </dd> 4254 4254 <dt><b>Copyright:</b></dt> 4255 <dd>Copyright © 1998-200 7, Modelica Association and Anton Haumer.<br>4255 <dd>Copyright © 1998-2008, Modelica Association and Anton Haumer.<br> 4256 4256 <i>The Modelica package is <b>free</b> software; it can be redistributed and/or modified 4257 4257 under the terms of the <b>Modelica license</b>, see the license conditions … … 4636 4636 </dd> 4637 4637 <dt><b>Copyright:</b></dt> 4638 <dd>Copyright © 1998-200 7, Modelica Association and Anton Haumer.<br>4638 <dd>Copyright © 1998-2008, Modelica Association and Anton Haumer.<br> 4639 4639 <i>The Modelica package is <b>free</b> software; it can be redistributed and/or modified 4640 4640 under the terms of the <b>Modelica license</b>, see the license conditions … … 4933 4933 </dd> 4934 4934 <dt><b>Copyright:</b></dt> 4935 <dd>Copyright © 1998-200 7, Modelica Association and Anton Haumer.<br>4935 <dd>Copyright © 1998-2008, Modelica Association and Anton Haumer.<br> 4936 4936 <i>The Modelica package is <b>free</b> software; it can be redistributed and/or modified 4937 4937 under the terms of the <b>Modelica license</b>, see the license conditions … … 5186 5186 </dd> 5187 5187 <dt><b>Copyright:</b></dt> 5188 <dd>Copyright © 1998-200 7, Modelica Association and Anton Haumer.<br>5188 <dd>Copyright © 1998-2008, Modelica Association and Anton Haumer.<br> 5189 5189 <i>The Modelica package is <b>free</b> software; it can be redistributed and/or modified 5190 5190 under the terms of the <b>Modelica license</b>, see the license conditions … … 5545 5545 </dd> 5546 5546 <dt><b>Copyright:</b></dt> 5547 <dd>Copyright © 1998-200 7, Modelica Association and Anton Haumer.<br>5547 <dd>Copyright © 1998-2008, Modelica Association and Anton Haumer.<br> 5548 5548 <i>The Modelica package is <b>free</b> software; it can be redistributed and/or modified 5549 5549 under the terms of the <b>Modelica license</b>, see the license conditions … … 6212 6212 </dd> 6213 6213 <dt><b>Copyright:</b></dt> 6214 <dd>Copyright © 1998-200 7, Modelica Association and Anton Haumer.<br>6214 <dd>Copyright © 1998-2008, Modelica Association and Anton Haumer.<br> 6215 6215 <i>The Modelica package is <b>free</b> software; it can be redistributed and/or modified 6216 6216 under the terms of the <b>Modelica license</b>, see the license conditions … … 6807 6807 </dd> 6808 6808 <dt><b>Copyright:</b></dt> 6809 <dd>Copyright © 1998-200 7, Modelica Association and Anton Haumer.<br>6809 <dd>Copyright © 1998-2008, Modelica Association and Anton Haumer.<br> 6810 6810 <i>The Modelica package is <b>free</b> software; it can be redistributed and/or modified 6811 6811 under the terms of the <b>Modelica license</b>, see the license conditions … … 6848 6848 </dd> 6849 6849 <dt><b>Copyright:</b></dt> 6850 <dd>Copyright © 1998-200 7, Modelica Association and Anton Haumer.<br>6850 <dd>Copyright © 1998-2008, Modelica Association and Anton Haumer.<br> 6851 6851 <i>The Modelica package is <b>free</b> software; it can be redistributed and/or modified 6852 6852 under the terms of the <b>Modelica license</b>, see the license conditions … … 7033 7033 </dd> 7034 7034 <dt><b>Copyright:</b></dt> 7035 <dd>Copyright © 1998-200 7, Modelica Association and Anton Haumer.<br>7035 <dd>Copyright © 1998-2008, Modelica Association and Anton Haumer.<br> 7036 7036 <i>The Modelica package is <b>free</b> software; it can be redistributed and/or modified 7037 7037 under the terms of the <b>Modelica license</b>, see the license conditions … … 7297 7297 7298 7298 <dt><b>Copyright:</b></dt> 7299 <dd>Copyright © 1998-200 7, Modelica Association and Anton Haumer.<br>7299 <dd>Copyright © 1998-2008, Modelica Association and Anton Haumer.<br> 7300 7300 <i>The Modelica package is <b>free</b> software; it can be redistributed and/or modified 7301 7301 under the terms of the <b>Modelica license</b>, see the license conditions … … 7415 7415 </dd> 7416 7416 <dt><b>Copyright:</b></dt> 7417 <dd>Copyright © 1998-200 7, Modelica Association and Anton Haumer.<br>7417 <dd>Copyright © 1998-2008, Modelica Association and Anton Haumer.<br> 7418 7418 <i>The Modelica package is <b>free</b> software; it can be redistributed and/or modified 7419 7419 under the terms of the <b>Modelica license</b>, see the license conditions … … 7752 7752 </dd> 7753 7753 <dt><b>Copyright:</b></dt> 7754 <dd>Copyright © 1998-200 7, Modelica Association and Anton Haumer.<br>7754 <dd>Copyright © 1998-2008, Modelica Association and Anton Haumer.<br> 7755 7755 <i>The Modelica package is <b>free</b> software; it can be redistributed and/or modified 7756 7756 under the terms of the <b>Modelica license</b>, see the license conditions -
trunk/Modelica/Icons.mo
r1046 r1072 92 92 93 93 <p> 94 Copyright © 1998-200 7, Modelica Association and DLR.94 Copyright © 1998-2008, Modelica Association and DLR. 95 95 </p> 96 96 <p> -
trunk/Modelica/Math/package.mo
r1046 r1072 33 33 34 34 <p> 35 Copyright © 1998-200 7, Modelica Association and DLR.35 Copyright © 1998-2008, Modelica Association and DLR. 36 36 </p> 37 37 <p> -
trunk/Modelica/Mechanics/MultiBody/package.mo
r1046 r1072 33 33 34 34 <p> 35 Copyright © 1998-200 7, Modelica Association and DLR.35 Copyright © 1998-2008, Modelica Association and DLR. 36 36 </p> 37 37 <p> … … 706 706 present. This model is available as 707 707 <a href=\"Modelica://Modelica.Mechanics.MultiBody.Examples.Loops.EngineV6_analytic\"> 708 MultiBody.Examples.Loops.Engine V6_analytic</a>.708 MultiBody.Examples.Loops.EngineᅵV6_analytic</a>. 709 709 </p> 710 710 <p> -
trunk/Modelica/Mechanics/Rotational.mo
r1052 r1072 38 38 39 39 <p> 40 Copyright © 1998-200 7, Modelica Association and DLR.40 Copyright © 1998-2008, Modelica Association and DLR. 41 41 </p> 42 42 <p> -
trunk/Modelica/Mechanics/Translational.mo
r1046 r1072 123 123 124 124 <p> 125 Copyright © 1998-200 7, Modelica Association, Anton Haumer and Universität Paderborn, FB 12.125 Copyright © 1998-2008, Modelica Association, Anton Haumer and Universität Paderborn, FB 12. 126 126 </p> 127 127 <p> -
trunk/Modelica/Media/Incompressible.mo
r1038 r1072 445 445 <p> 446 446 447 <p><b>Copyright © 2004-200 7, Modelica Association and DLR.</b></p>447 <p><b>Copyright © 2004-2008, Modelica Association and DLR.</b></p> 448 448 449 449 <p><i> -
trunk/Modelica/Media/package.mo
r1044 r1072 47 47 </ul> 48 48 <p> 49 Copyright © 1998-200 7, Modelica Association.49 Copyright © 1998-2008, Modelica Association. 50 50 </p> 51 51 <p> … … 704 704 <td valign=\"top\">Temperature at p, h, X</td></tr> 705 705 <tr><td valign=\"top\">Medium.density_phX(p,h,X)</td> 706 <td valign=\"top\">kg/m ³</td>706 <td valign=\"top\">kg/mᅵ</td> 707 707 <td valign=\"top\">Density at p, h, X</td></tr> 708 708 <tr><td valign=\"top\">Medium.temperature_psX(p,s,X)</td> -
trunk/Modelica/SIunits.mo
r1046 r1072 255 255 256 256 <p> 257 Copyright © 1998-200 7, Modelica Association and DLR.257 Copyright © 1998-2008, Modelica Association and DLR. 258 258 </p> 259 259 <p> … … 358 358 lineColor={0,0,0}, 359 359 lineThickness=1, 360 textString=" °C"),360 textString="ᅵC"), 361 361 Text( 362 362 extent={{82,-7},{22,-67}}, … … 458 458 end NonSIunits; 459 459 460 function to_degC "Convert from Kelvin to °Celsius"460 function to_degC "Convert from Kelvin to ᅵCelsius" 461 461 extends ConversionIcon; 462 462 input Temperature Kelvin "Kelvin value"; … … 469 469 extent={{100,-20},{20,-100}}, 470 470 lineColor={0,0,0}, 471 textString=" °C")}));471 textString="ᅵC")})); 472 472 algorithm 473 473 Celsius := Kelvin + Modelica.Constants.T_zero; 474 474 end to_degC; 475 475 476 function from_degC "Convert from °Celsius to Kelvin"476 function from_degC "Convert from ᅵCelsius to Kelvin" 477 477 extends ConversionIcon; 478 478 input NonSIunits.Temperature_degC Celsius "Celsius value"; … … 482 482 extent={{-20,100},{-100,20}}, 483 483 lineColor={0,0,0}, 484 textString=" °C"), Text(484 textString="ᅵC"), Text( 485 485 extent={{100,-20},{20,-100}}, 486 486 lineColor={0,0,0}, … … 490 490 end from_degC; 491 491 492 function to_degF "Convert from Kelvin to °Fahrenheit"492 function to_degF "Convert from Kelvin to ᅵFahrenheit" 493 493 extends ConversionIcon; 494 494 input Temperature Kelvin "Kelvin value"; … … 501 501 extent={{100,-20},{20,-100}}, 502 502 lineColor={0,0,0}, 503 textString=" °F")}));503 textString="ᅵF")})); 504 504 algorithm 505 505 Fahrenheit := (Kelvin + Modelica.Constants.T_zero)*(9/5) + 32; 506 506 end to_degF; 507 507 508 function from_degF "Convert from °Fahrenheit to Kelvin"508 function from_degF "Convert from ᅵFahrenheit to Kelvin" 509 509 extends ConversionIcon; 510 510 input NonSIunits.Temperature_degF Fahrenheit "Fahrenheit value"; … … 514 514 extent={{-20,100},{-100,20}}, 515 515 lineColor={0,0,0}, 516 textString=" °F"), Text(516 textString="ᅵF"), Text( 517 517 extent={{100,-20},{20,-100}}, 518 518 lineColor={0,0,0}, … … 522 522 end from_degF; 523 523 524 function to_degRk "Convert from Kelvin to °Rankine"524 function to_degRk "Convert from Kelvin to ᅵRankine" 525 525 extends ConversionIcon; 526 526 input Temperature Kelvin "Kelvin value"; … … 533 533 extent={{100,-20},{20,-100}}, 534 534 lineColor={0,0,0}, 535 textString=" °Rk")}));535 textString="ᅵRk")})); 536 536 algorithm 537 537 Rankine := (9/5)*Kelvin; 538 538 end to_degRk; 539 539 540 function from_degRk "Convert from °Rankine to Kelvin"540 function from_degRk "Convert from ᅵRankine to Kelvin" 541 541 extends ConversionIcon; 542 542 input NonSIunits.Temperature_degRk Rankine "Rankine value"; … … 546 546 extent={{-20,100},{-100,20}}, 547 547 lineColor={0,0,0}, 548 textString=" °Rk"), Text(548 textString="ᅵRk"), Text( 549 549 extent={{100,-20},{20,-100}}, 550 550 lineColor={0,0,0}, -
trunk/Modelica/StateGraph.mo
r1046 r1072 72 72 73 73 <p> 74 Copyright © 1998-200 7, Modelica Association and DLR74 Copyright © 1998-2008, Modelica Association and DLR 75 75 </p> 76 76 <p> -
trunk/Modelica/Thermal/FluidHeatFlow.mo
r1035 r1072 63 63 </dl> 64 64 <p> 65 Copyright © 1998-200 7, Modelica Association, Anton Haumer and arsenal research.65 Copyright © 1998-2008, Modelica Association, Anton Haumer and arsenal research. 66 66 </p> 67 67 <p> … … 171 171 </dl> 172 172 <p> 173 Copyright © 1998-200 7, Modelica Association, Anton Haumer and arsenal research.173 Copyright © 1998-2008, Modelica Association, Anton Haumer and arsenal research. 174 174 </p> 175 175 <p> … … 1315 1315 </dl> 1316 1316 <p> 1317 Copyright © 1998-200 7, Modelica Association, Anton Haumer and arsenal research.1317 Copyright © 1998-2008, Modelica Association, Anton Haumer and arsenal research. 1318 1318 </p> 1319 1319 <p> … … 1430 1430 </dl> 1431 1431 <p> 1432 Copyright © 1998-200 7, Modelica Association, Anton Haumer and arsenal research.1432 Copyright © 1998-2008, Modelica Association, Anton Haumer and arsenal research. 1433 1433 </p> 1434 1434 <p> … … 1650 1650 </dl> 1651 1651 <p> 1652 Copyright © 1998-200 7, Modelica Association, Anton Haumer and arsenal research.1652 Copyright © 1998-2008, Modelica Association, Anton Haumer and arsenal research. 1653 1653 </p> 1654 1654 <p> … … 1771 1771 </dl> 1772 1772 <p> 1773 Copyright © 1998-200 7, Modelica Association, Anton Haumer and arsenal research.1773 Copyright © 1998-2008, Modelica Association, Anton Haumer and arsenal research. 1774 1774 </p> 1775 1775 <p> … … 2142 2142 </dl> 2143 2143 <p> 2144 Copyright © 1998-200 7, Modelica Association, Anton Haumer and arsenal research.2144 Copyright © 1998-2008, Modelica Association, Anton Haumer and arsenal research. 2145 2145 </p> 2146 2146 <p> … … 2354 2354 </dl> 2355 2355 <p> 2356 Copyright © 1998-200 7, Modelica Association, Anton Haumer and arsenal research.2356 Copyright © 1998-2008, Modelica Association, Anton Haumer and arsenal research. 2357 2357 </p> 2358 2358 <p> … … 2493 2493 </dl> 2494 2494 <p> 2495 Copyright © 1998-200 7, Modelica Association, Anton Haumer and arsenal research.2495 Copyright © 1998-2008, Modelica Association, Anton Haumer and arsenal research. 2496 2496 </p> 2497 2497 <p> … … 2571 2571 extent={{30,60},{60,40}}, 2572 2572 lineColor={0,0,255}, 2573 textString="dp ~ V_flow ²")}));2573 textString="dp ~ V_flowᅵ")})); 2574 2574 parameter Modelica.SIunits.VolumeFlowRate V_flowLaminar(min=Modelica.Constants.small, start=0.1) 2575 2575 "Laminar volume flow" -
trunk/Modelica/Thermal/HeatTransfer.mo
r1046 r1072 136 136 </dd> 137 137 </dl> 138 <p><b>Copyright © 2001-200 7, Modelica Association, Michael Tiller and DLR.</b></p>138 <p><b>Copyright © 2001-2008, Modelica Association, Michael Tiller and DLR.</b></p> 139 139 <p><i> 140 140 This Modelica package is free software; it can be redistributed and/or modified … … 1602 1602 extends Modelica.Icons.Library2; 1603 1603 1604 model ToKelvin "Conversion block from °Celsius to Kelvin"1604 model ToKelvin "Conversion block from ᅵCelsius to Kelvin" 1605 1605 annotation ( 1606 1606 Diagram(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100}, … … 1616 1616 lineColor={0,0,0}, 1617 1617 lineThickness=1, 1618 textString=" °C"),
