Merge branch 'master' into FT_EMconverter

Author: AHaumer

Modelica/Electrical/Machines/BasicMachines/SynchronousMachines/SM_ElectricalExcited.mo

@@ -113,7 +113,7 @@ model SM_ElectricalExcited
     "Brush loss parameter record" annotation (Dialog(tab="Losses"));
   output SI.Voltage ve=pin_ep.v - pin_en.v
     "Excitation voltage";
-  output SI.Current ie=pin_ep.i "Excitation current";
+  output SI.Current ie(start=0)=pin_ep.i "Excitation current";
   Machines.BasicMachines.Components.DamperCage damperCage(
     final Lrsigmad=Lrsigmad,
     final Lrsigmaq=Lrsigmaq,

Modelica/Electrical/Machines/Examples/SynchronousMachines/SMEE_DOL.mo

@@ -41,7 +41,8 @@ model SMEE_DOL
     TrOperational=293.15,
     alpha20r=smeeData.alpha20r,
     alpha20e=smeeData.alpha20e,
-    TeOperational=293.15)
+    TeOperational=293.15,
+    ie(fixed=true))
     annotation (Placement(transformation(extent={{-20,-50},{0,-30}})));
   Machines.Sensors.RotorDisplacementAngle rotorDisplacementAngle(p=smee.p, m=m)
     annotation (Placement(transformation(
@@ -132,7 +133,6 @@ model SMEE_DOL
     annotation (Placement(transformation(extent={{90,-50},{70,-30}})));
 initial equation
   smee.is[1:2] = zeros(2);
-  smee.ie = 0;
   //conditional damper cage currents are defined as fixed start values
 equation
   connect(rotorDisplacementAngle.plug_n, smee.plug_sn) annotation (Line(

Modelica/Electrical/Machines/Examples/SynchronousMachines/SMEE_LoadDump.mo

@@ -55,7 +55,8 @@ model SMEE_LoadDump
     TrOperational=293.15,
     alpha20r=smeeData.alpha20r,
     alpha20e=smeeData.alpha20e,
-    TeOperational=293.15)
+    TeOperational=293.15,
+    ie(fixed=true))
     annotation (Placement(transformation(extent={{0,-40},{20,-20}})));
   parameter Machines.Utilities.SynchronousMachineData smeeData(
     SNominal=30e3,
@@ -155,7 +156,6 @@ protected
 initial equation
   smee.idq_sr = zeros(2);
   //conditional damper cage currents are defined as fixed start values
-  smee.ie = 0;
 equation
   connect(terminalBox.plug_sn, smee.plug_sn) annotation (Line(
       points={{4,-20},{4,-20}},

Modelica/Electrical/Machines/Examples/SynchronousMachines/SMEE_Rectifier.mo

@@ -49,7 +49,8 @@ model SMEE_Rectifier
     TrOperational=293.15,
     alpha20r=smeeData.alpha20r,
     alpha20e=smeeData.alpha20e,
-    TeOperational=293.15)
+    TeOperational=293.15,
+    ie(fixed=true))
     annotation (Placement(transformation(extent={{0,-40},{20,-20}})));
   parameter Machines.Utilities.SynchronousMachineData smeeData(
     SNominal=30e3,
@@ -176,7 +177,6 @@ protected
 initial equation
   smee.is[1:2] = zeros(2);
   //conditional damper cage currents are defined as fixed start values
-  smee.ie = 0;
 equation
   connect(terminalBox.plug_sn, smee.plug_sn) annotation (Line(
       points={{4,-20},{4,-20}},

Modelica/Magnetic/FundamentalWave/BasicMachines/SynchronousMachines/SM_ElectricalExcited.mo

@@ -109,7 +109,7 @@ model SM_ElectricalExcited
     annotation (Dialog(tab="Losses"));
   output SI.Voltage ve=pin_ep.v - pin_en.v
     "Excitation voltage";
-  output SI.Current ie=pin_ep.i "Excitation current";
+  output SI.Current ie(start=0)=pin_ep.i "Excitation current";
   // Rotor cage components
   Modelica.Blocks.Interfaces.RealOutput ir[2](
     start=zeros(2),

Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMEE_DOL.mo

@@ -33,6 +33,7 @@ model SMEE_DOL
     statorCoreParameters(VRef=100),
     strayLoadParameters(IRef=100),
     brushParameters(ILinear=0.01),
+    ie(fixed=true),
     ir(each fixed=true),
     wMechanical(fixed=true),
     m=m,
@@ -125,7 +126,6 @@ model SMEE_DOL
 initial equation
   // sum(smee.is) = 0;
   smee.is[1:2] = zeros(2);
-  smee.ie = 0;
   //conditional damper cage currents are defined as fixed start values
 equation
   connect(irRMS, smee.irRMS);

Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMEE_LoadDump.mo

@@ -59,7 +59,8 @@ model SMEE_LoadDump
     alpha20r=smeeData.alpha20r,
     TrOperational=293.15,
     TeOperational=293.15,
-    alpha20e=smeeData.alpha20e)
+    alpha20e=smeeData.alpha20e,
+    ie(fixed=true))
     annotation (Placement(transformation(extent={{0,-40},{20,-20}})));
   parameter Modelica.Electrical.Machines.Utilities.SynchronousMachineData smeeData(
     SNominal=30e3,
@@ -163,7 +164,6 @@ public
 initial equation
   smee.airGap.V_msr = Complex(0, 0);
   //conditional damper cage currents are defined as fixed start values
-  smee.ie = 0;
 equation
   connect(terminalBox.plug_sn, smee.plug_sn) annotation (Line(
       points={{4,-20},{4,-20}}, color={0,0,255}));

Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMEE_Rectifier.mo

@@ -42,6 +42,7 @@ model SMEE_Rectifier
     statorCoreParameters(VRef=100),
     strayLoadParameters(IRef=100),
     brushParameters(ILinear=0.01),
+    ie(fixed=true),
     ir(each fixed=true),
     Rs=smeeData.Rs*m/3,
     Lssigma=smeeData.Lssigma*m/3,
@@ -182,7 +183,6 @@ protected
 initial equation
   smee.is[1:2] = zeros(2);
   //conditional damper cage currents are defined as fixed start values
-  smee.ie = 0;
 equation
   connect(terminalBox.plug_sn, smee.plug_sn) annotation (Line(
       points={{4,-20},{4,-20}}, color={0,0,255}));