Changeset 1150 for branches/maintenance/3.0/Modelica
- Timestamp:
- 07/17/08 20:57:16 (4 months ago)
- Location:
- branches/maintenance/3.0/Modelica
- Files:
-
- 2 modified
-
Electrical/Analog/Basic.mo (modified) (2 diffs)
-
package.mo (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/maintenance/3.0/Modelica/Electrical/Analog/Basic.mo
r1046 r1150 508 508 fillColor={0,0,255})})); 509 509 initial equation 510 (Lnom - Linf) = (Lzer - Linf)*Ipar/Inom*(Modelica.Constants.pi/2-a rctan(Ipar/Inom));510 (Lnom - Linf) = (Lzer - Linf)*Ipar/Inom*(Modelica.Constants.pi/2-atan(Ipar/Inom)); 511 511 equation 512 512 assert(Lzer > Lnom+Modelica.Constants.eps, … … 514 514 assert(Linf < Lnom-Modelica.Constants.eps, 515 515 "Linf (= " + String(Linf) + ") has to be < Lnom (= " + String(Lnom) + ")"); 516 (Lact - Linf)*i/Ipar = (Lzer - Linf)*noEvent(a rctan(i/Ipar));516 (Lact - Linf)*i/Ipar = (Lzer - Linf)*noEvent(atan(i/Ipar)); 517 517 Psi = Lact*i; 518 518 v = der(Psi); -
branches/maintenance/3.0/Modelica/package.mo
r1145 r1150 2 2 package Modelica "Modelica Standard Library (Version 3.0)" 3 3 extends Icons.Library; 4 4 5 5 6 6 annotation ( … … 685 685 BooleanExpression </td> 686 686 <td valign=\"top\"> Changed annotation preserveAspectRatio from true to false.</td> 687 </tr> 688 689 <tr><td colspan=\"2\"><b>Electrical.Analog.Basic.</b></td></tr> 690 <tr><td valign=\"top\"> SaturatingInductor</td> 691 <td valign=\"top\"> Replaced non-standard \"arctan\" by \"atan\" function.</td> 687 692 </tr> 688 693
