Skip to content

Commit

Permalink
Rename record instance names ????Data => ????Data3
Browse files Browse the repository at this point in the history
  • Loading branch information
@christiankral
christiankral committed Oct 17, 2022
1 parent e5aa74c commit f689d90
Show file tree
Hide file tree
Showing 3 changed files with 152 additions and 150 deletions.
86 changes: 44 additions & 42 deletions ...talWave/Examples/BasicMachines/InductionMachines/ComparisonPolyphase/IMC_DOL_Polyphase.mo
View file
Expand Up @@ -6,7 +6,7 @@ model IMC_DOL_Polyphase
parameter Integer m=5 "Number of stator phases" annotation(Evaluate=true);
parameter SI.Voltage VsNominal=100
"Nominal RMS voltage per phase";
parameter SI.Frequency fNominal=aimcData.fsNominal "Nominal frequency";
parameter SI.Frequency fNominal=aimcData3.fsNominal "Nominal frequency";
parameter SI.Time tOn=0.1 "Start time of machine";
parameter SI.Torque T_Load=161.4 "Nominal load torque";
parameter SI.AngularVelocity w_Load(displayUnit="rev/min")=
Expand Down Expand Up @@ -43,30 +43,31 @@ model IMC_DOL_Polyphase
Modelica.Electrical.Machines.Utilities.TerminalBox terminalBoxM(m=m,
terminalConnection="Y") annotation (Placement(transformation(extent={{20,56},
{40,76}})));
Magnetic.FundamentalWave.BasicMachines.InductionMachines.IM_SquirrelCage aimcM(
Jr=aimcData.Jr,
Js=aimcData.Js,
p=aimcData.p,
fsNominal=aimcData.fsNominal,
TsRef=aimcData.TsRef,
alpha20s(displayUnit="1/K") = aimcData.alpha20s,
ratioCommonStatorLeakage=aimcData.ratioCommonStatorLeakage,
frictionParameters=aimcData.frictionParameters,
statorCoreParameters=aimcData.statorCoreParameters,
strayLoadParameters=aimcData.strayLoadParameters,
TrRef=aimcData.TrRef,
alpha20r(displayUnit="1/K") = aimcData.alpha20r,
Magnetic.FundamentalWave.BasicMachines.InductionMachines.IM_SquirrelCage
aimcM(
Jr=aimcData3.Jr,
Js=aimcData3.Js,
p=aimcData3.p,
fsNominal=aimcData3.fsNominal,
TsRef=aimcData3.TsRef,
alpha20s(displayUnit="1/K") = aimcData3.alpha20s,
ratioCommonStatorLeakage=aimcData3.ratioCommonStatorLeakage,
frictionParameters=aimcData3.frictionParameters,
statorCoreParameters=aimcData3.statorCoreParameters,
strayLoadParameters=aimcData3.strayLoadParameters,
TrRef=aimcData3.TrRef,
alpha20r(displayUnit="1/K") = aimcData3.alpha20r,
phiMechanical(fixed=true),
wMechanical(fixed=true),
m=m,
Rs=aimcData.Rs*m/3,
Lssigma=aimcData.Lssigma*m/3,
Lszero=aimcData.Lszero*m/3,
Lm=aimcData.Lm*m/3,
Lrsigma=aimcData.Lrsigma*m/3,
Rr=aimcData.Rr*m/3,
Rs=aimcData3.Rs*m/3,
Lssigma=aimcData3.Lssigma*m/3,
Lszero=aimcData3.Lszero*m/3,
Lm=aimcData3.Lm*m/3,
Lrsigma=aimcData3.Lrsigma*m/3,
Rr=aimcData3.Rr*m/3,
TsOperational=293.15,
effectiveStatorTurns=aimcData.effectiveStatorTurns,
effectiveStatorTurns=aimcData3.effectiveStatorTurns,
TrOperational=293.15)
annotation (Placement(transformation(extent={{20,40},{40,60}})));
Modelica.Mechanics.Rotational.Components.Inertia loadInertiaM(J=J_Load)
Expand All @@ -80,7 +81,7 @@ model IMC_DOL_Polyphase
40},{80,60}})));
parameter
Modelica.Electrical.Machines.Utilities.ParameterRecords.IM_SquirrelCageData
aimcData "Induction machine data"
aimcData3 "Induction machine data of three phase machine"
annotation (Placement(transformation(extent={{-100,-100},{-80,-80}})));
Modelica.Electrical.Analog.Basic.Ground ground3 annotation (Placement(
transformation(
Expand Down Expand Up @@ -112,30 +113,31 @@ model IMC_DOL_Polyphase
Modelica.Electrical.Machines.Utilities.TerminalBox terminalBox3(
terminalConnection="Y", m=m3) annotation (Placement(transformation(
extent={{20,-46},{40,-26}})));
Magnetic.FundamentalWave.BasicMachines.InductionMachines.IM_SquirrelCage aimc3(
Jr=aimcData.Jr,
Js=aimcData.Js,
p=aimcData.p,
fsNominal=aimcData.fsNominal,
Rs=aimcData.Rs,
TsRef=aimcData.TsRef,
alpha20s(displayUnit="1/K") = aimcData.alpha20s,
Lssigma=aimcData.Lssigma,
ratioCommonStatorLeakage=aimcData.ratioCommonStatorLeakage,
Lszero=aimcData.Lszero,
frictionParameters=aimcData.frictionParameters,
statorCoreParameters=aimcData.statorCoreParameters,
strayLoadParameters=aimcData.strayLoadParameters,
Lm=aimcData.Lm,
Lrsigma=aimcData.Lrsigma,
Rr=aimcData.Rr,
TrRef=aimcData.TrRef,
alpha20r(displayUnit="1/K") = aimcData.alpha20r,
Magnetic.FundamentalWave.BasicMachines.InductionMachines.IM_SquirrelCage
aimc3(
Jr=aimcData3.Jr,
Js=aimcData3.Js,
p=aimcData3.p,
fsNominal=aimcData3.fsNominal,
Rs=aimcData3.Rs,
TsRef=aimcData3.TsRef,
alpha20s(displayUnit="1/K") = aimcData3.alpha20s,
Lssigma=aimcData3.Lssigma,
ratioCommonStatorLeakage=aimcData3.ratioCommonStatorLeakage,
Lszero=aimcData3.Lszero,
frictionParameters=aimcData3.frictionParameters,
statorCoreParameters=aimcData3.statorCoreParameters,
strayLoadParameters=aimcData3.strayLoadParameters,
Lm=aimcData3.Lm,
Lrsigma=aimcData3.Lrsigma,
Rr=aimcData3.Rr,
TrRef=aimcData3.TrRef,
alpha20r(displayUnit="1/K") = aimcData3.alpha20r,
phiMechanical(fixed=true),
wMechanical(fixed=true),
m=3,
TsOperational=293.15,
effectiveStatorTurns=aimcData.effectiveStatorTurns,
effectiveStatorTurns=aimcData3.effectiveStatorTurns,
TrOperational=293.15)
annotation (Placement(transformation(extent={{20,-62},{40,-42}})));
Modelica.Mechanics.Rotational.Components.Inertia loadInertia3(J=J_Load)
Expand Down
112 changes: 56 additions & 56 deletions ...lWave/Examples/BasicMachines/InductionMachines/ComparisonPolyphase/IMS_Start_Polyphase.mo
View file
Expand Up @@ -8,9 +8,9 @@ model IMS_Start_Polyphase
parameter Integer mr=5 "Number of rotor phases" annotation(Evaluate=true);
parameter SI.Voltage VsNominal=100
"Nominal RMS voltage per phase";
parameter SI.Frequency fNominal=aimsData.fsNominal "Nominal frequency";
parameter SI.Frequency fNominal=aimsData3.fsNominal "Nominal frequency";
parameter SI.Time tOn=0.1 "Start time of machine";
parameter SI.Resistance RStart=0.16/aimsData.turnsRatio^2
parameter SI.Resistance RStart=0.16/aimsData3.turnsRatio^2
"Starting resistance";
parameter SI.Time tRheostat=1.0
"Time of shortening the rheostat";
Expand All @@ -26,70 +26,70 @@ model IMS_Start_Polyphase
terminalConnection="Y", m=m3) annotation (Placement(transformation(
extent={{20,-54},{40,-34}})));
Magnetic.FundamentalWave.BasicMachines.InductionMachines.IM_SlipRing aimsM(
Jr=aimsData.Jr,
Js=aimsData.Js,
p=aimsData.p,
fsNominal=aimsData.fsNominal,
TsRef=aimsData.TsRef,
alpha20s(displayUnit="1/K") = aimsData.alpha20s,
ratioCommonStatorLeakage=aimsData.ratioCommonStatorLeakage,
frictionParameters=aimsData.frictionParameters,
statorCoreParameters=aimsData.statorCoreParameters,
strayLoadParameters=aimsData.strayLoadParameters,
Jr=aimsData3.Jr,
Js=aimsData3.Js,
p=aimsData3.p,
fsNominal=aimsData3.fsNominal,
TsRef=aimsData3.TsRef,
alpha20s(displayUnit="1/K") = aimsData3.alpha20s,
ratioCommonStatorLeakage=aimsData3.ratioCommonStatorLeakage,
frictionParameters=aimsData3.frictionParameters,
statorCoreParameters=aimsData3.statorCoreParameters,
strayLoadParameters=aimsData3.strayLoadParameters,
phiMechanical(fixed=true),
wMechanical(fixed=true),
ratioCommonRotorLeakage=aimsData.ratioCommonRotorLeakage,
TrRef=aimsData.TrRef,
alpha20r(displayUnit="1/K") = aimsData.alpha20r,
useTurnsRatio=aimsData.useTurnsRatio,
VsNominal=aimsData.VsNominal,
VrLockedRotor=aimsData.VrLockedRotor,
rotorCoreParameters=aimsData.rotorCoreParameters,
TurnsRatio=aimsData.turnsRatio,
ratioCommonRotorLeakage=aimsData3.ratioCommonRotorLeakage,
TrRef=aimsData3.TrRef,
alpha20r(displayUnit="1/K") = aimsData3.alpha20r,
useTurnsRatio=aimsData3.useTurnsRatio,
VsNominal=aimsData3.VsNominal,
VrLockedRotor=aimsData3.VrLockedRotor,
rotorCoreParameters=aimsData3.rotorCoreParameters,
TurnsRatio=aimsData3.turnsRatio,
mr=mr,
m=m,
Rs=aimsData.Rs*m/3,
Lssigma=aimsData.Lssigma*m/3,
Lszero=aimsData.Lszero*m/3,
Lm=aimsData.Lm*m/3,
Lrsigma=aimsData.Lrsigma*mr/3,
Lrzero=aimsData.Lrzero*mr/3,
Rr=aimsData.Rr*mr/3,
Rs=aimsData3.Rs*m/3,
Lssigma=aimsData3.Lssigma*m/3,
Lszero=aimsData3.Lszero*m/3,
Lm=aimsData3.Lm*m/3,
Lrsigma=aimsData3.Lrsigma*mr/3,
Lrzero=aimsData3.Lrzero*mr/3,
Rr=aimsData3.Rr*mr/3,
TsOperational=293.15,
effectiveStatorTurns=aimsData.effectiveStatorTurns,
effectiveStatorTurns=aimsData3.effectiveStatorTurns,
TrOperational=293.15)
annotation (Placement(transformation(extent={{20,30},{40,50}})));
Magnetic.FundamentalWave.BasicMachines.InductionMachines.IM_SlipRing aims3(
p=aimsData.p,
fsNominal=aimsData.fsNominal,
Rs=aimsData.Rs,
TsRef=aimsData.TsRef,
alpha20s(displayUnit="1/K") = aimsData.alpha20s,
ratioCommonStatorLeakage=aimsData.ratioCommonStatorLeakage,
Lszero=aimsData.Lszero,
Lssigma=aimsData.Lssigma,
Jr=aimsData.Jr,
Js=aimsData.Js,
frictionParameters=aimsData.frictionParameters,
p=aimsData3.p,
fsNominal=aimsData3.fsNominal,
Rs=aimsData3.Rs,
TsRef=aimsData3.TsRef,
alpha20s(displayUnit="1/K") = aimsData3.alpha20s,
ratioCommonStatorLeakage=aimsData3.ratioCommonStatorLeakage,
Lszero=aimsData3.Lszero,
Lssigma=aimsData3.Lssigma,
Jr=aimsData3.Jr,
Js=aimsData3.Js,
frictionParameters=aimsData3.frictionParameters,
phiMechanical(fixed=true),
wMechanical(fixed=true),
statorCoreParameters=aimsData.statorCoreParameters,
strayLoadParameters=aimsData.strayLoadParameters,
Lm=aimsData.Lm,
Lrsigma=aimsData.Lrsigma,
ratioCommonRotorLeakage=aimsData.ratioCommonRotorLeakage,
Lrzero=aimsData.Lrzero,
Rr=aimsData.Rr,
TrRef=aimsData.TrRef,
alpha20r(displayUnit="1/K") = aimsData.alpha20r,
useTurnsRatio=aimsData.useTurnsRatio,
VsNominal=aimsData.VsNominal,
VrLockedRotor=aimsData.VrLockedRotor,
rotorCoreParameters=aimsData.rotorCoreParameters,
statorCoreParameters=aimsData3.statorCoreParameters,
strayLoadParameters=aimsData3.strayLoadParameters,
Lm=aimsData3.Lm,
Lrsigma=aimsData3.Lrsigma,
ratioCommonRotorLeakage=aimsData3.ratioCommonRotorLeakage,
Lrzero=aimsData3.Lrzero,
Rr=aimsData3.Rr,
TrRef=aimsData3.TrRef,
alpha20r(displayUnit="1/K") = aimsData3.alpha20r,
useTurnsRatio=aimsData3.useTurnsRatio,
VsNominal=aimsData3.VsNominal,
VrLockedRotor=aimsData3.VrLockedRotor,
rotorCoreParameters=aimsData3.rotorCoreParameters,
m=m3,
TurnsRatio=aimsData.turnsRatio,
TurnsRatio=aimsData3.turnsRatio,
TsOperational=566.3,
effectiveStatorTurns=aimsData.effectiveStatorTurns,
effectiveStatorTurns=aimsData3.effectiveStatorTurns,
TrOperational=566.3)
annotation (Placement(transformation(extent={{20,-70},{40,-50}})));
Modelica.Electrical.Machines.Utilities.SwitchedRheostat rheostatM(
Expand Down Expand Up @@ -120,8 +120,8 @@ model IMS_Start_Polyphase
w_nominal=w_Load) annotation (Placement(transformation(extent={{100,-70},
{80,-50}})));
parameter
Modelica.Electrical.Machines.Utilities.ParameterRecords.IM_SlipRingData aimsData
"Induction machine data"
Modelica.Electrical.Machines.Utilities.ParameterRecords.IM_SlipRingData aimsData3
"Induction machine data of three phase machine"
annotation (Placement(transformation(extent={{-100,-100},{-80,-80}})));
Modelica.Electrical.Analog.Basic.Ground groundM annotation (Placement(
transformation(origin={-90,50}, extent={{-10,-10},{10,10}})));
Expand Down

0 comments on commit f689d90

Please sign in to comment.