Skip to content

Give the impedances and resistances in Electrical parameters a unit #4819

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
henrikt-ma wants to merge 1 commit into
base: master
Choose a base branch
from
+29 −29
Open

Give the impedances and resistances in Electrical parameters a unit #4819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Modelica/Electrical/Analog/Examples/CompareTransformers.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
parameter Real n=2 "Turns ratio primary:secondary voltage";
parameter SI.Resistance R1=0.01
"Primary resistance w.r.t. primary side";
parameter SI.Inductance L1sigma=0.05/(2*pi*f)
parameter SI.Inductance L1sigma=0.05'Ohm'/(2*pi*f)

Check failure on line 13 in Modelica/Electrical/Analog/Examples/CompareTransformers.mo

View workflow job for this annotation

GitHub Actions / syntax_checks 

expected `;` but received `'Ohm'`
"Primary leakage inductance w.r.t. primary side";
parameter SI.Inductance Lm1= 10./(2*pi*f)
parameter SI.Inductance Lm1= 10'Ohm'/(2*pi*f)
"Magnetizing inductance w.r.t. primary side";
parameter SI.Inductance L2sigma=0.05/(2*pi*f)/n^2
parameter SI.Inductance L2sigma=0.05'Ohm'/(2*pi*f)/n^2
"Secondary leakage inductance w.r.t. secondary side";
parameter SI.Resistance R2=0.01/n^2
parameter SI.Resistance R2=0.01'Ohm'/n^2
"Secondary resistance w.r.t. secondary side";
parameter SI.Resistance RL=1/n^2 "Load resistance";
parameter SI.Resistance RL=1'Ohm'/n^2 "Load resistance";
final parameter SI.Inductance L1=L1sigma + M*n
"Primary no-load inductance";
final parameter SI.Inductance L2=L2sigma + M/n
Expand Down
2 changes: 1 addition & 1 deletion Modelica/Electrical/Machines/BasicMachines/InductionMachines/IM_SlipRing.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
parameter SI.Voltage VsNominal(start=100)
"Nominal stator voltage per phase"
annotation (Dialog(enable=not useTurnsRatio));
parameter SI.Voltage VrLockedRotor(start=100*(2*pi*
parameter SI.Voltage VrLockedRotor(start=100'V'*(2*pi*

Check failure on line 54 in Modelica/Electrical/Machines/BasicMachines/InductionMachines/IM_SlipRing.mo

View workflow job for this annotation

GitHub Actions / syntax_checks 

expected `)` but received `'V'`
fsNominal*Lm)/sqrt(Rs^2 + (2*pi*fsNominal*(Lm + Lssigma))^2))
"Locked-rotor voltage per phase"
annotation (Dialog(enable=not useTurnsRatio));
Expand Down
6 changes: 3 additions & 3 deletions Modelica/Electrical/Machines/Examples/InductionMachines/IMC_InverterDrive.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,9 @@
parameter Utilities.ParameterRecords.IM_SquirrelCageData aimcData(
Rs=0.03*16,
Rr=0.04*16,
Lssigma=3*(1 - sqrt(1 - 0.0667))/(2*pi*aimcData.fsNominal)*16,
Lm=3*sqrt(1 - 0.0667)/(2*pi*aimcData.fsNominal)*16,
Lrsigma=3*(1 - sqrt(1 - 0.0667))/(2*pi*aimcData.fsNominal)*16) "Induction machine data"
Lssigma=3'Ohm'*(1 - sqrt(1 - 0.0667))/(2*pi*aimcData.fsNominal)*16,

Check failure on line 106 in Modelica/Electrical/Machines/Examples/InductionMachines/IMC_InverterDrive.mo

View workflow job for this annotation

GitHub Actions / syntax_checks 

expected `)` but received `'Ohm'`
Lm=3'Ohm'*sqrt(1 - 0.0667)/(2*pi*aimcData.fsNominal)*16,
Lrsigma=3'Ohm'*(1 - sqrt(1 - 0.0667))/(2*pi*aimcData.fsNominal)*16) "Induction machine data"
annotation (Placement(transformation(extent={{20,-70},{40,-50}})));
Modelica.Mechanics.Rotational.Components.Inertia loadInertia(J=JLoad)
annotation (Placement(transformation(extent={{50,-40},{70,-20}})));
Expand Down
2 changes: 1 addition & 1 deletion Modelica/Electrical/Machines/Examples/InductionMachines/IMC_YDarc.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"Nominal RMS voltage per phase";
parameter SI.Frequency fNominal=50 "Nominal frequency";
parameter SI.Resistance RLine=0.0001 "Line resistance";
parameter SI.Inductance LLine=0.0001/(2*pi*fNominal) "Line inductance";
parameter SI.Inductance LLine=0.0001'Ohm'/(2*pi*fNominal) "Line inductance";

Check failure on line 10 in Modelica/Electrical/Machines/Examples/InductionMachines/IMC_YDarc.mo

View workflow job for this annotation

GitHub Actions / syntax_checks 

expected `;` but received `'Ohm'`
parameter SI.Time tStart1=0.1 "Start time";
parameter SI.Time tStart2=2.0 "Start time from Y to D";
parameter SI.Torque TLoad=161.4 "Nominal load torque";
Expand Down
6 changes: 3 additions & 3 deletions Modelica/Electrical/Machines/Examples/InductionMachines/IMC_withLosses.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,14 +130,14 @@
Jr=0.12,
Rs=0.56,
alpha20s(displayUnit="1/K")=Modelica.Electrical.Machines.Thermal.Constants.alpha20Copper,
Lssigma=1.52/(2*pi*fNominal),
Lssigma=1.52'Ohm'/(2*pi*fNominal),

Check failure on line 133 in Modelica/Electrical/Machines/Examples/InductionMachines/IMC_withLosses.mo

View workflow job for this annotation

GitHub Actions / syntax_checks 

expected `)` but received `'Ohm'`
frictionParameters(PRef=180, wRef=wNominal),
strayLoadParameters(
PRef=0.005*sqrt(3)*VNominal*INominal*pfNominal,
IRef=INominal/sqrt(3),
wRef=wNominal),
Lm=66.4/(2*pi*fNominal),
Lrsigma=2.31/(2*pi*fNominal),
Lm=66.4'Ohm'/(2*pi*fNominal),
Lrsigma=2.31'Ohm'/(2*pi*fNominal),
Rr=0.42,
alpha20r(displayUnit="1/K")=Modelica.Electrical.Machines.Thermal.Constants.alpha20Aluminium) "Induction machine data"
annotation (Placement(transformation(extent={{-40,-30},{-20,-10}})));
Expand Down
2 changes: 1 addition & 1 deletion Modelica/Electrical/Machines/Examples/InductionMachines/IMS_Start.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"Nominal RMS voltage per phase";
parameter SI.Frequency fNominal=50 "Nominal frequency";
parameter SI.Time tStart1=0.1 "Start time";
parameter SI.Resistance Rstart=0.16/aimsData.turnsRatio^2
parameter SI.Resistance Rstart=0.16'Ohm'/aimsData.turnsRatio^2

Check failure on line 9 in Modelica/Electrical/Machines/Examples/InductionMachines/IMS_Start.mo

View workflow job for this annotation

GitHub Actions / syntax_checks 

expected `;` but received `'Ohm'`
"Starting resistance";
parameter SI.Time tStart2=1.0
"Start time of shorting starting resistance";
Expand Down
8 changes: 4 additions & 4 deletions Modelica/Electrical/Machines/Utilities/ParameterRecords/IM_SlipRingData.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ record IM_SlipRingData
"Common parameters for induction machines with slip ring"
extends InductionMachineData;
import Modelica.Constants.pi;
parameter SI.Inductance Lm=3*sqrt(1 - 0.0667)/(2*pi*
parameter SI.Inductance Lm=3'Ohm'*sqrt(1 - 0.0667)/(2*pi*
fsNominal) "Stator main field inductance per phase"
annotation (Dialog(tab="Nominal resistances and inductances"));
parameter SI.Inductance Lrsigma=3*(1 - sqrt(1 - 0.0667))/
parameter SI.Inductance Lrsigma=3'Ohm'*(1 - sqrt(1 - 0.0667))/
(2*pi*fsNominal)/turnsRatio^2
"Rotor stray inductance per phase w.r.t. rotor side"
annotation (Dialog(tab="Nominal resistances and inductances"));
Expand All @@ -16,7 +16,7 @@ record IM_SlipRingData
parameter SI.Inductance Lrzero=Lrsigma/turnsRatio^2
"Rotor zero sequence inductance w.r.t. rotor side"
annotation (Dialog(tab="Nominal resistances and inductances"));
parameter SI.Resistance Rr=0.04/turnsRatio^2
parameter SI.Resistance Rr=0.04'Ohm'/turnsRatio^2
"Rotor resistance per phase at TRef w.r.t. rotor side"
annotation (Dialog(tab="Nominal resistances and inductances"));
parameter SI.Temperature TrRef=293.15
Expand All @@ -35,7 +35,7 @@ record IM_SlipRingData
parameter SI.Voltage VsNominal=100
"Nominal stator voltage per phase"
annotation (Dialog(enable=not useTurnsRatio));
parameter SI.Voltage VrLockedRotor=100*(2*pi*fsNominal*Lm)
parameter SI.Voltage VrLockedRotor=100'V'*(2*pi*fsNominal*Lm)
/sqrt(Rs^2 + (2*pi*fsNominal*(Lm + Lssigma))^2)
"Locked-rotor voltage per phase"
annotation (Dialog(enable=not useTurnsRatio));
Expand Down
4 changes: 2 additions & 2 deletions Modelica/Electrical/Machines/Utilities/ParameterRecords/IM_SquirrelCageData.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
"Common parameters for induction machines with squirrel cage"
extends InductionMachineData;
import Modelica.Constants.pi;
parameter SI.Inductance Lm=3*sqrt(1 - 0.0667)/(2*pi*
parameter SI.Inductance Lm=3'Ohm'*sqrt(1 - 0.0667)/(2*pi*

Check failure on line 6 in Modelica/Electrical/Machines/Utilities/ParameterRecords/IM_SquirrelCageData.mo

View workflow job for this annotation

GitHub Actions / syntax_checks 

expected `;` but received `'Ohm'`
fsNominal) "Stator main field inductance per phase"
annotation (Dialog(tab="Nominal resistances and inductances"));
parameter SI.Inductance Lrsigma=3*(1 - sqrt(1 - 0.0667))/
parameter SI.Inductance Lrsigma=3'Ohm'*(1 - sqrt(1 - 0.0667))/
(2*pi*fsNominal)
"Rotor stray inductance per phase (equivalent three-phase winding)"
annotation (Dialog(tab="Nominal resistances and inductances"));
Expand Down
2 changes: 1 addition & 1 deletion Modelica/Electrical/Machines/Utilities/ParameterRecords/InductionMachineData.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
parameter SI.Inductance Lszero=Lssigma
"Stator zero sequence inductance"
annotation (Dialog(tab="Nominal resistances and inductances"));
parameter SI.Inductance Lssigma=3*(1 - sqrt(1 - 0.0667))/
parameter SI.Inductance Lssigma=3'Ohm'*(1 - sqrt(1 - 0.0667))/

Check failure on line 23 in Modelica/Electrical/Machines/Utilities/ParameterRecords/InductionMachineData.mo

View workflow job for this annotation

GitHub Actions / syntax_checks 

expected `;` but received `'Ohm'`
(2*pi*fsNominal) "Stator stray inductance per phase"
annotation (Dialog(tab="Nominal resistances and inductances"));
parameter Real ratioCommonStatorLeakage(final min=0, final max=1)=1
Expand Down
2 changes: 1 addition & 1 deletion Modelica/Electrical/Machines/Utilities/ParameterRecords/SM_ElectricalExcitedData.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
within Modelica.Electrical.Machines.Utilities.ParameterRecords;
record SM_ElectricalExcitedData
"Common parameters for synchronous machines with electrical excitation"
extends SM_ReluctanceRotorData(Lmd=1.5/(2*pi*fsNominal), Lmq=1.5/(2*pi*
extends SM_ReluctanceRotorData(Lmd=1.5'Ohm'/(2*pi*fsNominal), Lmq=1.5'Ohm'/(2*pi*

Check failure on line 4 in Modelica/Electrical/Machines/Utilities/ParameterRecords/SM_ElectricalExcitedData.mo

View workflow job for this annotation

GitHub Actions / syntax_checks 

expected `)` but received `'Ohm'`
fsNominal));
import Modelica.Constants.pi;
parameter SI.Voltage VsNominal=100
Expand Down
2 changes: 1 addition & 1 deletion Modelica/Electrical/Machines/Utilities/ParameterRecords/SM_PermanentMagnetData.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
within Modelica.Electrical.Machines.Utilities.ParameterRecords;
record SM_PermanentMagnetData
"Common parameters for synchronous machines with permanent magnet"
extends SM_ReluctanceRotorData(Lmd=0.3/(2*pi*fsNominal), Lmq=0.3/(2*pi*
extends SM_ReluctanceRotorData(Lmd=0.3'Ohm'/(2*pi*fsNominal), Lmq=0.3'Ohm'/(2*pi*
fsNominal));
import Modelica.Constants.pi;
parameter SI.Voltage VsOpenCircuit=112.3
Expand Down
8 changes: 4 additions & 4 deletions Modelica/Electrical/Machines/Utilities/ParameterRecords/SM_ReluctanceRotorData.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
within Modelica.Electrical.Machines.Utilities.ParameterRecords;
record SM_ReluctanceRotorData
"Common parameters for synchronous machines with reluctance rotor"
extends InductionMachineData(Lssigma=0.1/(2*pi*fsNominal));
extends InductionMachineData(Lssigma=0.1'Ohm'/(2*pi*fsNominal));
import Modelica.Constants.pi;
parameter SI.Inductance Lmd=2.9/(2*pi*fsNominal)
parameter SI.Inductance Lmd=2.9'Ohm'/(2*pi*fsNominal)
"Stator main field inductance per phase in d-axis"
annotation (Dialog(tab="Nominal resistances and inductances"));
parameter SI.Inductance Lmq=0.9/(2*pi*fsNominal)
parameter SI.Inductance Lmq=0.9'Ohm'/(2*pi*fsNominal)
"Stator main field inductance per phase in q-axis"
annotation (Dialog(tab="Nominal resistances and inductances"));
parameter Boolean useDamperCage=true "Enable / disable damper cage"
annotation (Evaluate=true,Dialog(tab=
"Nominal resistances and inductances", group="Damper cage"));
parameter SI.Inductance Lrsigmad=0.05/(2*pi*fsNominal)
parameter SI.Inductance Lrsigmad=0.05'Ohm'/(2*pi*fsNominal)
"Damper stray inductance in d-axis" annotation (Dialog(
tab="Nominal resistances and inductances",
group="Damper cage",
Expand Down
2 changes: 1 addition & 1 deletion Modelica/Electrical/Polyphase/Examples/TestSensors.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ model TestSensors
"Nominal RMS voltage per phase";
parameter SI.Frequency f=50 "Frequency";
parameter SI.Resistance R=1/sqrt(2) "Load resistance";
parameter SI.Inductance L=1/sqrt(2)/(2*pi*f) "Load inductance";
parameter SI.Inductance L=1'Ohm'/sqrt(2)/(2*pi*f) "Load inductance";
final parameter SI.Impedance Z=sqrt(R^2 + (2*pi*f*L)^2) "Load impedance";
final parameter SI.Current IRMS=VRMS/Z "Steady state RMS current";
final parameter SI.ActivePower P=3*R*IRMS^2 "Total active power";
Expand Down
2 changes: 1 addition & 1 deletion Modelica/Electrical/QuasiStatic/Polyphase/Examples/TestSensors.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"Nominal RMS voltage per phase";
parameter SI.Frequency f=50 "Frequency";
parameter SI.Resistance R=1/sqrt(2) "Load resistance";
parameter SI.Inductance L=1/sqrt(2)/(2*pi*f) "Load inductance";
parameter SI.Inductance L=1'Ohm'/sqrt(2)/(2*pi*f) "Load inductance";

Check failure on line 10 in Modelica/Electrical/QuasiStatic/Polyphase/Examples/TestSensors.mo

View workflow job for this annotation

GitHub Actions / syntax_checks 

expected `;` but received `'Ohm'`
final parameter SI.Impedance Z=sqrt(R^2 + (2*pi*f*L)^2) "Load impedance";
final parameter SI.Current IRMS=VRMS/Z "Steady state RMS current";
final parameter SI.ActivePower P=3*R*IRMS^2 "Total active power";
Expand Down
Loading