Changeset 1024 for trunk

Timestamp:

02/01/08 12:53:12 (7 months ago)

Author:

clauss

Message:

Modelica.Electrical.Analog smooth, noEvent added

Location:

trunk/Modelica/Electrical/Analog

Files:

• Ideal.mo (modified) (45 diffs)
• Semiconductors.mo (modified) (34 diffs)

trunk/Modelica/Electrical/Analog/Ideal.mo

@@ -1 +1 @@
 within Modelica.Electrical.Analog;
-package Ideal
-  "Ideal electrical elements such as switches, diode, transformer, operational amplifier"
-
+package Ideal 
+  "Ideal electrical elements such as switches, diode, transformer, operational amplifier" 
+  
   extends Modelica.Icons.Library;
-
+  
   annotation (Window(
        x=0.03,
@@ -42 +42 @@
 </dl>
 </html>"));
-
-          model IdealThyristor "Ideal thyristor"
+  
+          model IdealThyristor "Ideal thyristor" 
             extends Modelica.Electrical.Analog.Interfaces.OnePort;
-            parameter Modelica.SIunits.Resistance Ron(final min=0) = 1.E-5
+            parameter Modelica.SIunits.Resistance Ron(final min=0) = 1.E-5 
       "Closed thyristor resistance";
-            parameter Modelica.SIunits.Conductance Goff(final min=0) = 1.E-5
+            parameter Modelica.SIunits.Conductance Goff(final min=0) = 1.E-5 
       "Opened thyristor conductance";
-            parameter Modelica.SIunits.Voltage Vknee(final min=0, start=0)
+            parameter Modelica.SIunits.Voltage Vknee(final min=0, start=0) 
       "Forward threshold voltage";
             Boolean off(start=true) "Switching state";
@@ -57 +57 @@
           extent={{-20,-20},{20,20}},
           rotation=270)));
-  protected
-            Real s(final unit="1")
+  protected 
+            Real s(final unit="1") 
       "Auxiliary variable: if on then current, if opened then voltage";
             constant Modelica.SIunits.Voltage unitVoltage= 1  annotation(HideResult=true);
@@ -179 +179 @@
                 width=0.6,
                 height=0.6));
-          equation
+          equation 
             off = s < 0 or pre(off) and not fire;
             v = (s*unitCurrent)*(if off then 1 else Ron) + Vknee;
             i = (s*unitVoltage)*(if off then Goff else 1) + Goff*Vknee;
           end IdealThyristor;
-
-          model IdealGTOThyristor "Ideal GTO thyristor"
+  
+          model IdealGTOThyristor "Ideal GTO thyristor" 
             extends Modelica.Electrical.Analog.Interfaces.OnePort;
-            parameter Modelica.SIunits.Resistance Ron(final min=0) = 1.E-5
+            parameter Modelica.SIunits.Resistance Ron(final min=0) = 1.E-5 
       "Closed thyristor resistance";
-            parameter Modelica.SIunits.Conductance Goff(final min=0) = 1.E-5
+            parameter Modelica.SIunits.Conductance Goff(final min=0) = 1.E-5 
       "Opened thyristor conductance";
-            parameter Modelica.SIunits.Voltage Vknee(final min=0, start=0)
+            parameter Modelica.SIunits.Voltage Vknee(final min=0, start=0) 
       "Forward threshold voltage";
             Boolean off(start=true) "Switching state";
@@ -199 +199 @@
           extent={{-20,-20},{20,20}},
           rotation=270)));
-  protected
-            Real s(final unit="1")
+  protected 
+            Real s(final unit="1") 
       "Auxiliary variable: if on then current, if opened then voltage";
             constant Modelica.SIunits.Voltage unitVoltage= 1  annotation(HideResult=true);
@@ -321 +321 @@
                 width=0.6,
                 height=0.6));
-          equation
+          equation 
             off = s < 0 or not fire;
             v = (s*unitCurrent)*(if off then 1 else Ron) + Vknee;
             i = (s*unitVoltage)*(if off then Goff else 1) + Goff*Vknee;
           end IdealGTOThyristor;
-
-  model IdealCommutingSwitch "Ideal commuting switch"
+  
+  model IdealCommutingSwitch "Ideal commuting switch" 
     parameter SI.Resistance Ron(final min=0) = 1.E-5 "Closed switch resistance";
-    parameter SI.Conductance Goff(final min=0) = 1.E-5
+    parameter SI.Conductance Goff(final min=0) = 1.E-5 
       "Opened switch conductance";
     Interfaces.PositivePin p annotation (Placement(transformation(extent={{-110,
@@ -337 +337 @@
     Interfaces.NegativePin n1 annotation (Placement(transformation(extent={{90,
               40},{110,60}}, rotation=0)));
-    Modelica.Blocks.Interfaces.BooleanInput control
+    Modelica.Blocks.Interfaces.BooleanInput control 
       "true => p--n2 connected, false => p--n1 connected" annotation (Placement(
           transformation(
@@ -343 +343 @@
           extent={{-20,-20},{20,20}},
           rotation=270)));
-  protected
+  protected 
     Real s1(final unit="1");
     Real s2(final unit="1") "Auxiliary variables";
@@ -416 +416 @@
         width=0.6,
         height=0.6));
-  equation
+  equation 
     0 = p.i + n2.i + n1.i;
-
+    
     p.v - n1.v = (s1*unitCurrent)*(if (control) then 1 else Ron);
     n1.i = -(s1*unitVoltage)*(if (control) then Goff else 1);
@@ -424 +424 @@
     n2.i = -(s2*unitVoltage)*(if (control) then 1 else Goff);
   end IdealCommutingSwitch;
-
-  model IdealIntermediateSwitch "Ideal intermediate switch"
+  
+  model IdealIntermediateSwitch "Ideal intermediate switch" 
     parameter SI.Resistance Ron(final min=0) = 1.E-5 "Closed switch resistance";
-    parameter SI.Conductance Goff(final min=0) = 1.E-5
+    parameter SI.Conductance Goff(final min=0) = 1.E-5 
       "Opened switch conductance";
     Interfaces.PositivePin p1 annotation (Placement(transformation(extent={{
@@ -437 +437 @@
     Interfaces.NegativePin n2 annotation (Placement(transformation(extent={{90,
               -10},{110,10}}, rotation=0)));
-    Modelica.Blocks.Interfaces.BooleanInput control
+    Modelica.Blocks.Interfaces.BooleanInput control 
       "true => p1--n2, p2--n1 connected, otherwise p1--n1, p2--n2  connected" 
       annotation (Placement(transformation(
@@ -443 +443 @@
           extent={{-20,-20},{20,20}},
           rotation=270)));
-  protected
+  protected 
     Real s1(final unit="1");
     Real s2(final unit="1");
@@ -531 +531 @@
         width=0.6,
         height=0.6));
-  equation
+  equation 
     p1.v - n1.v = (s1*unitCurrent)*(if (control) then 1 else Ron);
     p2.v - n2.v = (s2*unitCurrent)*(if (control) then 1 else Ron);
     p1.v - n2.v = (s3*unitCurrent)*(if (control) then Ron else 1);
     p2.v - n1.v = (s4*unitCurrent)*(if (control) then Ron else 1);
-
+    
     p1.i = if control then s1*unitVoltage*Goff + s3*unitCurrent else s1*unitCurrent + s3*unitVoltage*Goff;
     p2.i = if control then s2*unitVoltage*Goff + s4*unitCurrent else s2*unitCurrent + s4*unitVoltage*Goff;
@@ -542 +542 @@
     n2.i = if control then -s2*unitVoltage*Goff - s3*unitCurrent else -s2*unitCurrent - s3*unitVoltage*Goff;
   end IdealIntermediateSwitch;
-
-  model ControlledIdealCommutingSwitch "Controlled ideal commuting switch"
+  
+  model ControlledIdealCommutingSwitch "Controlled ideal commuting switch" 
     parameter SI.Voltage level=0.5 "Switch level";
     parameter SI.Resistance Ron(final min=0) = 1.E-5 "Closed switch resistance";
-    parameter SI.Conductance Goff(final min=0) = 1.E-5
+    parameter SI.Conductance Goff(final min=0) = 1.E-5 
       "Opened switch conductance";
     Interfaces.PositivePin p annotation (Placement(transformation(extent={{-110,
@@ -554 +554 @@
     Interfaces.NegativePin n1 annotation (Placement(transformation(extent={{90,
               40},{110,60}}, rotation=0)));
-    Interfaces.Pin control
+    Interfaces.Pin control 
       "Control pin: if control.v > level p--n2 connected, otherwise p--n1 connected"
        annotation (Placement(transformation(
@@ -560 +560 @@
           extent={{-10,-10},{10,10}},
           rotation=90)));
-  protected
+  protected 
     Real s1(final unit="1");
     Real s2(final unit="1") "Auxiliary variables";
@@ -634 +634 @@
         width=0.6,
         height=0.6));
-  equation
+  equation 
     control.i = 0;
     0 = p.i + n2.i + n1.i;
-
+    
     p.v - n1.v = (s1*unitCurrent)*(if (control.v > level) then 1 else Ron);
     n1.i = -(s1*unitVoltage)*(if (control.v > level) then Goff else 1);
@@ -643 +643 @@
     n2.i = -(s2*unitVoltage)*(if (control.v > level) then 1 else Goff);
   end ControlledIdealCommutingSwitch;
-
-  model ControlledIdealIntermediateSwitch
-    "Controlled ideal intermediate switch"
+  
+  model ControlledIdealIntermediateSwitch 
+    "Controlled ideal intermediate switch" 
     parameter SI.Voltage level=0.5 "Switch level";
     parameter SI.Resistance Ron(final min=0) = 1.E-5 "Closed switch resistance";
-    parameter SI.Conductance Goff(final min=0) = 1.E-5
+    parameter SI.Conductance Goff(final min=0) = 1.E-5 
       "Opened switch conductance";
     Interfaces.PositivePin p1 annotation (Placement(transformation(extent={{
@@ -664 +664 @@
           extent={{-10,-10},{10,10}},
           rotation=90)));
-  protected
+  protected 
     Real s1(final unit="1");
     Real s2(final unit="1");
@@ -753 +753 @@
         width=0.6,
         height=0.6));
-  equation
+  equation 
     control.i = 0;
-
+    
     p1.v - n1.v = (s1*unitCurrent)*(if (control.v > level) then 1 else Ron);
     p2.v - n2.v = (s2*unitCurrent)*(if (control.v > level) then 1 else Ron);
     p1.v - n2.v = (s3*unitCurrent)*(if (control.v > level) then Ron else 1);
     p2.v - n1.v = (s4*unitCurrent)*(if (control.v > level) then Ron else 1);
-
+    
     p1.i = if control.v > level then s1*unitVoltage*Goff + s3*unitCurrent else s1*unitCurrent + s3*unitVoltage*Goff;
     p2.i = if control.v > level then s2*unitVoltage*Goff + s4*unitCurrent else s2*unitCurrent + s4*unitVoltage*Goff;
@@ -766 +766 @@
     n2.i = if control.v > level then -s2*unitVoltage*Goff - s3*unitCurrent else -s2*unitCurrent - s3*unitVoltage*Goff;
   end ControlledIdealIntermediateSwitch;
-
-  model IdealOpAmp "Ideal operational amplifier (norator-nullator pair)"
+  
+  model IdealOpAmp "Ideal operational amplifier (norator-nullator pair)" 
     SI.Voltage v1 "Voltage drop over the left port";
     SI.Voltage v2 "Voltage drop over the right port";
@@ -877 +877 @@
         width=0.71,
         height=0.59));
-  equation
+  equation 
     v1 = p1.v - n1.v;
     v2 = p2.v - n2.v;
@@ -887 +887 @@
     i1 = 0;
   end IdealOpAmp;
-
-  model IdealOpAmp3Pin
-    "Ideal operational amplifier (norator-nullator pair), but 3 pins"
+  
+  model IdealOpAmp3Pin 
+    "Ideal operational amplifier (norator-nullator pair), but 3 pins" 
     Interfaces.PositivePin in_p "Positive pin of the input port" annotation (Placement(
           transformation(extent={{-110,-60},{-90,-40}}, rotation=0)));
@@ -978 +978 @@
         width=0.71,
         height=0.59));
-  equation
+  equation 
     in_p.v = in_n.v;
     in_p.i = 0;
     in_n.i = 0;
   end IdealOpAmp3Pin;
-
-  model IdealOpAmpLimited "Ideal operational amplifier with limitation"
+  
+  model IdealOpAmpLimited "Ideal operational amplifier with limitation" 
     Interfaces.PositivePin in_p "Positive pin of the input port" annotation (Placement(
           transformation(extent={{-110,-60},{-90,-40}}, rotation=0)));
@@ -998 +998 @@
             rotation=0)));
     SI.Voltage vin "input voltage";
-  protected
+  protected 
     Real s(final unit="1") "Auxiliary variable";
     constant Modelica.SIunits.Voltage unitVoltage= 1  annotation(HideResult=true);
@@ -1089 +1089 @@
         width=0.71,
         height=0.59));
-
-  equation
+    
+  equation 
     in_p.i = 0;
     in_n.i = 0;
@@ -1096 +1096 @@
     VMin.i = 0;
     vin = in_p.v - in_n.v;
-    in_p.v - in_n.v = unitVoltage*(if s < -1 then s + 1 else if s > 1 then s - 1 else 0);
-    out.v = if s < -1 then VMin.v else if s > 1 then VMax.v else (VMax.v - VMin.v)*s/2 + (VMax.v + VMin.v)/2;
+    in_p.v - in_n.v = unitVoltage*noEvent(smooth(0,(if s < -1 then s + 1 else if s > 1 then s - 1 else 0)));
+    out.v = noEvent(smooth(0,if s < -1 then VMin.v else if s > 1 then VMax.v else (VMax.v - VMin.v)*s/2 + (VMax.v + VMin.v)/2));
   end IdealOpAmpLimited;
-
-        model IdealDiode "Ideal diode"
+  
+        model IdealDiode "Ideal diode" 
           extends Modelica.Electrical.Analog.Interfaces.OnePort;
-          parameter Modelica.SIunits.Resistance Ron(final min=0) = 1.E-5
+          parameter Modelica.SIunits.Resistance Ron(final min=0) = 1.E-5 
       "Forward state-on differential resistance (closed diode resistance)";
-          parameter Modelica.SIunits.Conductance Goff(final min=0) = 1.E-5
+          parameter Modelica.SIunits.Conductance Goff(final min=0) = 1.E-5 
       "Backward state-off conductance (opened diode conductance)";
-          parameter Modelica.SIunits.Voltage Vknee(final min=0, start=0)
+          parameter Modelica.SIunits.Voltage Vknee(final min=0, start=0) 
       "Forward threshold voltage";
           Boolean off(start=true) "Switching state";
-  protected
-          Real s(final unit="1")
+  protected 
+          Real s(final unit="1") 
       "Auxiliary variable: if on then current, if opened then voltage";
           constant Modelica.SIunits.Voltage unitVoltage= 1  annotation(HideResult=true);
@@ -1226 +1226 @@
               width=0.6,
               height=0.6));
-        equation
+        equation 
           off = s < 0;
           v = (s*unitCurrent)*(if off then 1 else Ron) + Vknee;
           i = (s*unitVoltage)*(if off then Goff else 1) + Goff*Vknee;
         end IdealDiode;
-
-  model IdealTransformer "Ideal electrical transformer"
+  
+  model IdealTransformer "Ideal electrical transformer" 
     extends Interfaces.TwoPort;
     parameter Real n(start=1) "Turns ratio";
@@ -1323 +1323 @@
         width=0.6,
         height=0.6));
-  equation
+  equation 
     v1 = n*v2;
     i2 = -n*i1;
   end IdealTransformer;
-
-  model IdealGyrator "Ideal gyrator"
+  
+  model IdealGyrator "Ideal gyrator" 
     extends Interfaces.TwoPort;
     parameter SI.Conductance G(start=1) "Gyration conductance";
@@ -1411 +1411 @@
             fillPattern=FillPattern.Solid),
           Line(points={{96,50},{40,50},{40,-50},{96,-50}}, color={0,0,255})}));
-
-  equation
+    
+  equation 
     i1 = G*v2;
     i2 = -G*v1;
   end IdealGyrator;
-
-  model Idle "Idle branch"
+  
+  model Idle "Idle branch" 
     extends Interfaces.OnePort;
     annotation (
@@ -1461 +1461 @@
         width=0.6,
         height=0.6));
-  equation
+  equation 
     i = 0;
   end Idle;
-
-  model Short "Short cut branch"
+  
+  model Short "Short cut branch" 
     extends Interfaces.OnePort;
     annotation (
@@ -1511 +1511 @@
         width=0.6,
         height=0.6));
-  equation
+  equation 
     v = 0;
   end Short;
-
- model IdealOpeningSwitch "Ideal electrical opener"
+  
+ model IdealOpeningSwitch "Ideal electrical opener" 
     extends Modelica.Electrical.Analog.Interfaces.OnePort;
     parameter SI.Resistance Ron(final min=0) = 1.E-5 "Closed switch resistance"
        annotation (Placement(transformation(extent={{-56.6667,10},{-10,56.6667}},
             rotation=0)));
-    parameter SI.Conductance Goff(final min=0) = 1.E-5
+    parameter SI.Conductance Goff(final min=0) = 1.E-5 
       "Opened switch conductance" annotation (Placement(transformation(extent={
               {10,10},{56.6667,56.6667}}, rotation=0)));
-    Modelica.Blocks.Interfaces.BooleanInput control
+    Modelica.Blocks.Interfaces.BooleanInput control 
       "true => switch open, false => p--n connected" annotation (Placement(
           transformation(
@@ -1529 +1529 @@
           extent={{-20,-20},{20,20}},
           rotation=270)));
-  protected
+  protected 
    Real s(final unit="1") "Auxiliary variable";
    constant Modelica.SIunits.Voltage unitVoltage= 1  annotation(HideResult=true);
@@ -1594 +1594 @@
           Line(points={{0,51},{0,26}}, color={0,0,255}),
           Line(points={{40,20},{40,0}}, color={0,0,255})}));
- equation
+ equation 
     v = (s*unitCurrent)*(if control then 1 else Ron);
     i = (s*unitVoltage)*(if control then Goff else 1);
  end IdealOpeningSwitch;
-
-    model IdealClosingSwitch "Ideal electrical closer"
+  
+    model IdealClosingSwitch "Ideal electrical closer" 
       extends Modelica.Electrical.Analog.Interfaces.OnePort;
-      parameter SI.Resistance Ron(final min=0) = 1.E-5
+      parameter SI.Resistance Ron(final min=0) = 1.E-5 
       "Closed switch resistance" 
          annotation (Placement(transformation(extent={{-56.6667,10},{-10,
               56.6667}}, rotation=0)));
-      parameter SI.Conductance Goff(final min=0) = 1.E-5
+      parameter SI.Conductance Goff(final min=0) = 1.E-5 
       "Opened switch conductance"   annotation (Placement(transformation(extent=
              {{10,10},{56.6667,56.6667}}, rotation=0)));
-      Modelica.Blocks.Interfaces.BooleanInput control
+      Modelica.Blocks.Interfaces.BooleanInput control 
       "true => p--n connected, false => switch open"   annotation (Placement(
           transformation(
@@ -1614 +1614 @@
           extent={{-20,-20},{20,20}},
           rotation=270)));
-  protected
+  protected 
       Real s(final unit="1") "Auxiliary variable";
       constant Modelica.SIunits.Voltage unitVoltage= 1  annotation(HideResult=true);
@@ -1678 +1678 @@
             lineColor={0,0,255}),
           Line(points={{0,51},{0,26}}, color={0,0,255})}));
-    equation
+    equation 
       v = (s*unitCurrent)*(if control then Ron else 1);
       i = (s*unitVoltage)*(if control then 1 else Goff);
     end IdealClosingSwitch;
-
-  model ControlledIdealOpeningSwitch "Controlled ideal electrical opener"
-
+  
+  model ControlledIdealOpeningSwitch "Controlled ideal electrical opener" 
+    
     parameter SI.Voltage level=0.5 "Switch level" annotation (Placement(
           transformation(extent={{-56.6667,10},{-10,56.6667}}, rotation=0)));
@@ -1690 +1690 @@
        annotation (Placement(transformation(extent={{10,10},{56.6667,56.6667}},
             rotation=0)));
-    parameter SI.Conductance Goff(final min=0) = 1.E-5
+    parameter SI.Conductance Goff(final min=0) = 1.E-5 
       "Opened switch conductance" annotation (Placement(transformation(extent={
               {-56.6667,-56.6667},{-10,-10}}, rotation=0)));
@@ -1697 +1697 @@
     Interfaces.NegativePin n annotation (Placement(transformation(extent={{90,
               -10},{110,10}}, rotation=0)));
-    Interfaces.Pin control
+    Interfaces.Pin control 
       "Control pin: control.v > level switch open, otherwise p--n connected" 
       annotation (Placement(transformation(
@@ -1703 +1703 @@
           extent={{-10,-10},{10,10}},
           rotation=90)));
-  protected
+  protected 
     Real s(final unit="1") "Auxiliary variable";
     constant Modelica.SIunits.Voltage unitVoltage= 1  annotation(HideResult=true);
@@ -1765 +1765 @@
           Line(points={{0,96},{0,25}}, color={0,0,255}),
           Line(points={{40,20},{40,0}}, color={0,0,255})}));
-  equation
+  equation 
     control.i = 0;
     0 = p.i + n.i;
@@ -1771 +1771 @@
     p.i = (s*unitVoltage)*(if (control.v > level) then Goff else 1);
   end ControlledIdealOpeningSwitch;
-
-    model ControlledIdealClosingSwitch "Controlled ideal electrical closer"
-
+  
+    model ControlledIdealClosingSwitch "Controlled ideal electrical closer" 
+    
       parameter SI.Voltage level=0.5 "Switch level" annotation (Placement(
           transformation(extent={{-56.6667,10},{-10,56.6667}}, rotation=0)));
-      parameter SI.Resistance Ron(final min=0) = 1.E-5
+      parameter SI.Resistance Ron(final min=0) = 1.E-5 
       "Closed switch resistance" 
          annotation (Placement(transformation(extent={{10,10},{56.6667,56.6667}},
             rotation=0)));
-      parameter SI.Conductance Goff(final min=0) = 1.E-5
+      parameter SI.Conductance Goff(final min=0) = 1.E-5 
       "Opened switch conductance"   annotation (Placement(transformation(extent=
              {{-56.6667,-56.6667},{-10,-10}}, rotation=0)));
@@ -1787 +1787 @@
       Modelica.Electrical.Analog.Interfaces.NegativePin n annotation (Placement(
           transformation(extent={{90,-10},{110,10}}, rotation=0)));
-      Modelica.Electrical.Analog.Interfaces.Pin control
+      Modelica.Electrical.Analog.Interfaces.Pin control 
       "Control pin: control.v > level switch closed, otherwise switch open" 
         annotation (Placement(transformation(
@@ -1793 +1793 @@
           extent={{-10,-10},{10,10}},
           rotation=90)));
-  protected
+  protected 
       Real s(final unit="1") "Auxiliary variable";
       constant Modelica.SIunits.Voltage unitVoltage= 1  annotation(HideResult=true);
@@ -1854 +1854 @@
           Line(points={{40,0},{96,0}}, color={0,0,255}),
           Line(points={{0,96},{0,25}}, color={0,0,255})}));
-    equation
+    equation 
       control.i = 0;
       0 = p.i + n.i;
@@ -1860 +1860 @@
       p.i = (s*unitVoltage)*(if (control.v > level) then 1 else Goff);
     end ControlledIdealClosingSwitch;
-
+  
 end Ideal;

trunk/Modelica/Electrical/Analog/Semiconductors.mo

@@ -1 +1 @@
 within Modelica.Electrical.Analog;
-package Semiconductors
-  "Semiconductor devices such as diode, MOS and bipolar transistor"
+package Semiconductors 
+  "Semiconductor devices such as diode, MOS and bipolar transistor" 
   extends Modelica.Icons.Library;
   import Modelica.SIunits;
-
+  
   annotation (
     Window(
@@ -44 +44 @@
 </dl>
 </html>"));
-