diff --git a/Modelica/Electrical/Machines/BasicMachines/DCMachines/DC_SeriesExcited.mo b/Modelica/Electrical/Machines/BasicMachines/DCMachines/DC_SeriesExcited.mo index c3a0dc68e7..d309f7a1b7 100644 --- a/Modelica/Electrical/Machines/BasicMachines/DCMachines/DC_SeriesExcited.mo +++ b/Modelica/Electrical/Machines/BasicMachines/DCMachines/DC_SeriesExcited.mo @@ -1,7 +1,7 @@ within Modelica.Electrical.Machines.BasicMachines.DCMachines; model DC_SeriesExcited "Series excited linear DC machine" extends Machines.Interfaces.PartialBasicDCMachine( - wNominal(start=1410*2*pi/60), + wNominal(start=Modelica.Units.Conversions.from_rpm(1410)), final ViNominal=VaNominal - (Machines.Thermal.convertResistance( Ra, TaRef, diff --git a/Modelica/Electrical/Machines/Examples/DCMachines/DCPM_withLosses.mo b/Modelica/Electrical/Machines/Examples/DCMachines/DCPM_withLosses.mo index 635627b70c..94c23e31b7 100644 --- a/Modelica/Electrical/Machines/Examples/DCMachines/DCPM_withLosses.mo +++ b/Modelica/Electrical/Machines/Examples/DCMachines/DCPM_withLosses.mo @@ -2,16 +2,15 @@ within Modelica.Electrical.Machines.Examples.DCMachines; model DCPM_withLosses "Test example: Investigate influence of losses on DCPM motor performance" extends Modelica.Icons.Example; - import Modelica.Constants.pi; parameter SI.Voltage Va=100 "Actual armature voltage"; parameter SI.Time tStart=0.2 "Start of armature voltage ramp"; parameter SI.Time tRamp=0.8 "Armature voltage ramp"; parameter SI.Torque TLoad1=63.66 "Nominal load torque"; - parameter SI.AngularVelocity wLoad1=1425*2*pi/60 + parameter SI.AngularVelocity wLoad1=Modelica.Units.Conversions.from_rpm(1425) "Nominal load speed"; parameter SI.Torque TLoad2=61.30 "Nominal load torque"; - parameter SI.AngularVelocity wLoad2=1417.5*2*pi/60 + parameter SI.AngularVelocity wLoad2=Modelica.Units.Conversions.from_rpm(1417.5) "Nominal load speed"; parameter SI.Inertia JLoad=0.15 "Load's moment of inertia"; diff --git a/Modelica/Electrical/Machines/Examples/DCMachines/DCSE_SinglePhase.mo b/Modelica/Electrical/Machines/Examples/DCMachines/DCSE_SinglePhase.mo index df70a44c85..a1a08aab99 100644 --- a/Modelica/Electrical/Machines/Examples/DCMachines/DCSE_SinglePhase.mo +++ b/Modelica/Electrical/Machines/Examples/DCMachines/DCSE_SinglePhase.mo @@ -7,7 +7,7 @@ model DCSE_SinglePhase parameter SI.Time tRamp=0.9 "Resistance ramp"; parameter SI.Torque TLoad=63.66 "Nominal load torque"; parameter SI.AngularVelocity wLoad(displayUnit="rev/min")= - 1410*2*Modelica.Constants.pi/60 "Nominal load speed"; + Modelica.Units.Conversions.from_rpm(1410) "Nominal load speed"; parameter SI.Inertia JLoad=0.15 "Load's moment of inertia"; Machines.BasicMachines.DCMachines.DC_SeriesExcited dcse( diff --git a/Modelica/Electrical/Machines/Examples/DCMachines/DCSE_Start.mo b/Modelica/Electrical/Machines/Examples/DCMachines/DCSE_Start.mo index b668c2a561..f48cdcf937 100644 --- a/Modelica/Electrical/Machines/Examples/DCMachines/DCSE_Start.mo +++ b/Modelica/Electrical/Machines/Examples/DCMachines/DCSE_Start.mo @@ -7,7 +7,7 @@ model DCSE_Start parameter SI.Time tRamp=0.9 "Resistance ramp"; parameter SI.Torque TLoad=63.66 "Nominal load torque"; parameter SI.AngularVelocity wLoad(displayUnit="rev/min")= - 1410*2*Modelica.Constants.pi/60 "Nominal load speed"; + Modelica.Units.Conversions.from_rpm(1410) "Nominal load speed"; parameter SI.Inertia JLoad=0.15 "Load's moment of inertia"; Machines.BasicMachines.DCMachines.DC_SeriesExcited dcse( diff --git a/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_DOL.mo b/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_DOL.mo index 64197dc5a8..35c4d5dd4b 100644 --- a/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_DOL.mo +++ b/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_DOL.mo @@ -9,7 +9,7 @@ model IMC_DOL parameter SI.Time tStart1=0.1 "Start time"; parameter SI.Torque TLoad=161.4 "Nominal load torque"; parameter SI.AngularVelocity wLoad(displayUnit="rev/min")= - 1440.45*2*Modelica.Constants.pi/60 "Nominal load speed"; + Modelica.Units.Conversions.from_rpm(1440.45) "Nominal load speed"; parameter SI.Inertia JLoad=0.29 "Load's moment of inertia"; Machines.BasicMachines.InductionMachines.IM_SquirrelCage aimc( diff --git a/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_Initialize.mo b/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_Initialize.mo index b8feb7cce3..f37d0ea99a 100644 --- a/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_Initialize.mo +++ b/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_Initialize.mo @@ -11,7 +11,7 @@ model IMC_Initialize parameter SI.Time tStart=0.5 "Start time"; parameter SI.Torque TLoad=161.4 "Nominal load torque"; parameter SI.AngularVelocity wLoad(displayUnit="rev/min")= - 1440.45*2*Modelica.Constants.pi/60 "Nominal load speed"; + Modelica.Units.Conversions.from_rpm(1440.45) "Nominal load speed"; parameter SI.Inertia JLoad=0.29 "Load's moment of inertia"; Machines.BasicMachines.InductionMachines.IM_SquirrelCage aimc( diff --git a/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_InverterDrive.mo b/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_InverterDrive.mo index f207aa65c3..085ef79b15 100644 --- a/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_InverterDrive.mo +++ b/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_InverterDrive.mo @@ -13,7 +13,7 @@ model IMC_InverterDrive parameter SI.Voltage VDC=factorY2DC(m)*VNominal/sqrt(3) "Theoretical DC voltage"; parameter SI.Capacitance CDC=5e-3 "DC capacitor"; parameter SI.Torque TLoad=161.4 "Nominal load torque"; - parameter SI.AngularVelocity wLoad=1440.45*2*pi/60 "Nominal load speed"; + parameter SI.AngularVelocity wLoad=Modelica.Units.Conversions.from_rpm(1440.45) "Nominal load speed"; parameter SI.Inertia JLoad=0.29 "Load's moment of inertia"; Polyphase.Sources.SineVoltage sineVoltage( final m=m, diff --git a/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_Steinmetz.mo b/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_Steinmetz.mo index 97c8637bb0..4582243678 100644 --- a/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_Steinmetz.mo +++ b/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_Steinmetz.mo @@ -12,11 +12,11 @@ model IMC_Steinmetz parameter SI.Capacitance Cs=5*Cr "Motor's (additional) starting capacitor"; parameter SI.AngularVelocity wSwitch(displayUnit="rev/min")= - 1350*2*Modelica.Constants.pi/60 + Modelica.Units.Conversions.from_rpm(1350) "Speed for switching off the starting capacitor"; parameter SI.Torque TLoad=2/3*161.4 "Nominal load torque"; parameter SI.AngularVelocity wLoad(displayUnit="rev/min")= - 1462.5*2*Modelica.Constants.pi/60 "Nominal load speed"; + Modelica.Units.Conversions.from_rpm(1462.5) "Nominal load speed"; parameter SI.Inertia JLoad=0.29 "Load's moment of inertia"; Machines.BasicMachines.InductionMachines.IM_SquirrelCage aimc( diff --git a/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_Transformer.mo b/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_Transformer.mo index 3e16bd3e82..533fe1914b 100644 --- a/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_Transformer.mo +++ b/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_Transformer.mo @@ -11,7 +11,7 @@ model IMC_Transformer "Start time of bypass transformer"; parameter SI.Torque TLoad=161.4 "Nominal load torque"; parameter SI.AngularVelocity wLoad(displayUnit="rev/min")= - 1440.45*2*Modelica.Constants.pi/60 "Nominal load speed"; + Modelica.Units.Conversions.from_rpm(1440.45) "Nominal load speed"; parameter SI.Inertia JLoad=0.29 "Load's moment of inertia"; Machines.BasicMachines.InductionMachines.IM_SquirrelCage aimc( diff --git a/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_YD.mo b/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_YD.mo index 6e7d13a277..af065b418a 100644 --- a/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_YD.mo +++ b/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_YD.mo @@ -10,7 +10,7 @@ model IMC_YD parameter SI.Time tStart2=2.0 "Start time from Y to D"; parameter SI.Torque TLoad=161.4 "Nominal load torque"; parameter SI.AngularVelocity wLoad(displayUnit="rev/min")= - 1440.45*2*Modelica.Constants.pi/60 "Nominal load speed"; + Modelica.Units.Conversions.from_rpm(1440.45) "Nominal load speed"; parameter SI.Inertia JLoad=0.29 "Load's moment of inertia"; Machines.BasicMachines.InductionMachines.IM_SquirrelCage aimc( diff --git a/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_YDarc.mo b/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_YDarc.mo index 2e03fdbe88..8608341cff 100644 --- a/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_YDarc.mo +++ b/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_YDarc.mo @@ -12,7 +12,7 @@ model IMC_YDarc "Test example: InductionMachineSquirrelCage Y-D" parameter SI.Time tStart2=2.0 "Start time from Y to D"; parameter SI.Torque TLoad=161.4 "Nominal load torque"; parameter SI.AngularVelocity wLoad(displayUnit="rev/min")= - 1440.45*2*Modelica.Constants.pi/60 "Nominal load speed"; + Modelica.Units.Conversions.from_rpm(1440.45) "Nominal load speed"; parameter SI.Inertia JLoad=0.29 "Load's moment of inertia"; Machines.BasicMachines.InductionMachines.IM_SquirrelCage aimc( diff --git a/Modelica/Electrical/Machines/Examples/InductionMachines/IMS_Start.mo b/Modelica/Electrical/Machines/Examples/InductionMachines/IMS_Start.mo index 39daed2395..de88e27d8b 100644 --- a/Modelica/Electrical/Machines/Examples/InductionMachines/IMS_Start.mo +++ b/Modelica/Electrical/Machines/Examples/InductionMachines/IMS_Start.mo @@ -12,7 +12,7 @@ model IMS_Start "Test example: InductionMachineSlipRing" "Start time of shorting starting resistance"; parameter SI.Torque TLoad=161.4 "Nominal load torque"; parameter SI.AngularVelocity wLoad(displayUnit="rev/min")= - 1440.45*2*Modelica.Constants.pi/60 "Nominal load speed"; + Modelica.Units.Conversions.from_rpm(1440.45) "Nominal load speed"; parameter SI.Inertia JLoad=0.29 "Load's moment of inertia"; Machines.BasicMachines.InductionMachines.IM_SlipRing aims( diff --git a/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMEE_Generator.mo b/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMEE_Generator.mo index 3fba52c584..6219f828e9 100644 --- a/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMEE_Generator.mo +++ b/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMEE_Generator.mo @@ -7,7 +7,7 @@ model SMEE_Generator "Nominal RMS voltage per phase"; parameter SI.Frequency fNominal=50 "Nominal frequency"; parameter SI.AngularVelocity wActual(displayUnit="rev/min")= - 1499*2*Modelica.Constants.pi/60 "Actual speed"; + Modelica.Units.Conversions.from_rpm(1499) "Actual speed"; parameter SI.Current Ie=19 "Excitation current"; parameter SI.Current Ie0=10 "Initial excitation current"; parameter SI.Angle gamma0(displayUnit="deg") = 0 diff --git a/Modelica/Electrical/Machines/Interfaces/PartialBasicDCMachine.mo b/Modelica/Electrical/Machines/Interfaces/PartialBasicDCMachine.mo index b353fb1c62..b5ac6de2c5 100644 --- a/Modelica/Electrical/Machines/Interfaces/PartialBasicDCMachine.mo +++ b/Modelica/Electrical/Machines/Interfaces/PartialBasicDCMachine.mo @@ -9,7 +9,7 @@ partial model PartialBasicDCMachine "Partial model for DC machine" "Nominal armature current (>0..Motor, <0..Generator)" annotation (Dialog(tab="Nominal parameters")); parameter SI.AngularVelocity wNominal(displayUnit="rev/min", - start=1425*2*pi/60) "Nominal speed" + start=Modelica.Units.Conversions.from_rpm(1425)) "Nominal speed" annotation (Dialog(tab="Nominal parameters")); parameter SI.Temperature TaNominal(start=293.15) "Nominal armature temperature" diff --git a/Modelica/Electrical/Machines/Utilities/ParameterRecords/DcPermanentMagnetData.mo b/Modelica/Electrical/Machines/Utilities/ParameterRecords/DcPermanentMagnetData.mo index a437279448..0234249a37 100644 --- a/Modelica/Electrical/Machines/Utilities/ParameterRecords/DcPermanentMagnetData.mo +++ b/Modelica/Electrical/Machines/Utilities/ParameterRecords/DcPermanentMagnetData.mo @@ -1,7 +1,6 @@ within Modelica.Electrical.Machines.Utilities.ParameterRecords; record DcPermanentMagnetData "Common parameters for DC machines" extends Modelica.Icons.Record; - import Modelica.Constants.pi; parameter SI.Inertia Jr=0.15 "Rotor's moment of inertia"; parameter SI.Inertia Js=Jr "Stator's moment of inertia"; parameter SI.Voltage VaNominal=100 @@ -11,7 +10,7 @@ record DcPermanentMagnetData "Common parameters for DC machines" "Nominal armature current (>0..Motor, <0..Generator)" annotation (Dialog(tab="Nominal parameters")); parameter SI.AngularVelocity wNominal(displayUnit="rev/min")= - 1425*2*pi/60 "Nominal speed" + Modelica.Units.Conversions.from_rpm(1425) "Nominal speed" annotation (Dialog(tab="Nominal parameters")); parameter SI.Temperature TaNominal=293.15 "Nominal armature temperature" diff --git a/Modelica/Electrical/Machines/Utilities/ParameterRecords/DcSeriesExcitedData.mo b/Modelica/Electrical/Machines/Utilities/ParameterRecords/DcSeriesExcitedData.mo index 9ead2dc868..334d0c166d 100644 --- a/Modelica/Electrical/Machines/Utilities/ParameterRecords/DcSeriesExcitedData.mo +++ b/Modelica/Electrical/Machines/Utilities/ParameterRecords/DcSeriesExcitedData.mo @@ -1,7 +1,6 @@ within Modelica.Electrical.Machines.Utilities.ParameterRecords; record DcSeriesExcitedData "Common parameters for DC machines" - extends DcPermanentMagnetData(wNominal=1410*2*pi/60); - import Modelica.Constants.pi; + extends DcPermanentMagnetData(wNominal=Modelica.Units.Conversions.from_rpm(1410)); parameter SI.Resistance Re=0.01 "Series excitation resistance at TeRef" annotation (Dialog(tab="Excitation")); diff --git a/Modelica/Electrical/PowerConverters/Examples/ACAC/SoftStarter.mo b/Modelica/Electrical/PowerConverters/Examples/ACAC/SoftStarter.mo index 471a8bc69b..d13fea2261 100644 --- a/Modelica/Electrical/PowerConverters/Examples/ACAC/SoftStarter.mo +++ b/Modelica/Electrical/PowerConverters/Examples/ACAC/SoftStarter.mo @@ -10,7 +10,7 @@ model SoftStarter "Soft start of an induction machine" parameter SI.Inertia JLoad=aimcData.Jr "Load's moment of inertia"; parameter SI.Torque TLoad=161.4 "Nominal load torque"; parameter SI.AngularVelocity wLoad(displayUnit="rev/min")= - 1440.45*2*Modelica.Constants.pi/60 "Nominal load speed"; + Modelica.Units.Conversions.from_rpm(1440.45) "Nominal load speed"; Modelica.Electrical.Polyphase.Sources.SineVoltage sineVoltage( final m=m, f=fill(fNominal, m), diff --git a/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/ComparisonPolyphase/IMC_DOL_CommonLeakage.mo b/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/ComparisonPolyphase/IMC_DOL_CommonLeakage.mo index 6cc68bb26a..ce8552b868 100644 --- a/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/ComparisonPolyphase/IMC_DOL_CommonLeakage.mo +++ b/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/ComparisonPolyphase/IMC_DOL_CommonLeakage.mo @@ -11,7 +11,7 @@ model IMC_DOL_CommonLeakage 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")= - 1440.45*2*Modelica.Constants.pi/60 "Nominal load speed"; + Modelica.Units.Conversions.from_rpm(1440.45) "Nominal load speed"; parameter SI.Inertia J_Load=0.29 "Load inertia"; Modelica.Electrical.Analog.Basic.Ground groundM annotation (Placement( transformation( diff --git a/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/ComparisonPolyphase/IMC_DOL_Polyphase.mo b/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/ComparisonPolyphase/IMC_DOL_Polyphase.mo index 7c269b5fa7..0894e4534a 100644 --- a/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/ComparisonPolyphase/IMC_DOL_Polyphase.mo +++ b/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/ComparisonPolyphase/IMC_DOL_Polyphase.mo @@ -11,7 +11,7 @@ model IMC_DOL_Polyphase 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")= - 1440.45*2*Modelica.Constants.pi/60 "Nominal load speed"; + Modelica.Units.Conversions.from_rpm(1440.45) "Nominal load speed"; parameter SI.Inertia J_Load=0.29 "Load inertia"; parameter Integer p=2 "Number of pole pairs"; Modelica.Electrical.Analog.Basic.Ground groundM annotation (Placement( diff --git a/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_DOL.mo b/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_DOL.mo index 733e367f68..a61551a20b 100644 --- a/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_DOL.mo +++ b/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_DOL.mo @@ -9,7 +9,7 @@ model IMC_DOL 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")= - 1440.45*2*Modelica.Constants.pi/60 "Nominal load speed"; + Modelica.Units.Conversions.from_rpm(1440.45) "Nominal load speed"; parameter SI.Inertia J_Load=0.29 "Load inertia"; parameter Integer p=2 "Number of pole pairs"; Modelica.Electrical.Analog.Basic.Ground ground annotation (Placement( diff --git a/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Initialize.mo b/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Initialize.mo index d484597144..406dd072f8 100644 --- a/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Initialize.mo +++ b/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Initialize.mo @@ -11,7 +11,7 @@ model IMC_Initialize parameter SI.Time tStart=0.5 "Start time"; parameter SI.Torque TLoad=161.4 "Nominal load torque"; parameter SI.AngularVelocity wLoad(displayUnit="rev/min")= - 1440.45*2*Modelica.Constants.pi/60 "Nominal load speed"; + Modelica.Units.Conversions.from_rpm(1440.45) "Nominal load speed"; parameter SI.Inertia JLoad=0.29 "Load's moment of inertia"; Magnetic.FundamentalWave.BasicMachines.InductionMachines.IM_SquirrelCage aimc( diff --git a/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Steinmetz.mo b/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Steinmetz.mo index 2d6ce2f8c9..67e01b4027 100644 --- a/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Steinmetz.mo +++ b/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Steinmetz.mo @@ -13,11 +13,11 @@ model IMC_Steinmetz parameter SI.Capacitance Cs=5*Cr "Motor's (additional) starting capacitor"; parameter SI.AngularVelocity wSwitch(displayUnit="rev/min")= - 1350*2*Modelica.Constants.pi/60 + Modelica.Units.Conversions.from_rpm(1350) "Speed for switching off the starting capacitor"; parameter SI.Torque TLoad=2/3*161.4 "Nominal load torque"; parameter SI.AngularVelocity wLoad(displayUnit="rev/min")= - 1462.5*2*Modelica.Constants.pi/60 "Nominal load speed"; + Modelica.Units.Conversions.from_rpm(1462.5) "Nominal load speed"; parameter SI.Inertia JLoad=0.29 "Load's moment of inertia"; Magnetic.FundamentalWave.BasicMachines.InductionMachines.IM_SquirrelCage aimc( diff --git a/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Transformer.mo b/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Transformer.mo index d4cb6d2f6b..43f0ae8d69 100644 --- a/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Transformer.mo +++ b/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Transformer.mo @@ -12,7 +12,7 @@ model IMC_Transformer "Start time of bypass transformer"; parameter SI.Torque TLoad=161.4 "Nominal load torque"; parameter SI.AngularVelocity wLoad(displayUnit="rev/min")= - 1440.45*2*Modelica.Constants.pi/60 "Nominal load speed"; + Modelica.Units.Conversions.from_rpm(1440.45) "Nominal load speed"; parameter SI.Inertia JLoad=0.29 "Load's moment of inertia"; Magnetic.FundamentalWave.BasicMachines.InductionMachines.IM_SquirrelCage aimc( diff --git a/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_YD.mo b/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_YD.mo index 0a4a5e67ea..bf8e661206 100644 --- a/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_YD.mo +++ b/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_YD.mo @@ -11,7 +11,7 @@ model IMC_YD parameter SI.Time tStart2=2.0 "Start time from Y to D"; parameter SI.Torque TLoad=161.4 "Nominal load torque"; parameter SI.AngularVelocity wLoad(displayUnit="rev/min")= - 1440.45*2*Modelica.Constants.pi/60 "Nominal load speed"; + Modelica.Units.Conversions.from_rpm(1440.45) "Nominal load speed"; parameter SI.Inertia JLoad=0.29 "Load's moment of inertia"; Magnetic.FundamentalWave.BasicMachines.InductionMachines.IM_SquirrelCage aimc( diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Characteristics.mo b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Characteristics.mo index e7c0f44923..aa4c5de447 100644 --- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Characteristics.mo +++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Characteristics.mo @@ -7,7 +7,7 @@ model IMC_Characteristics "Characteristic curves of Induction machine with squir "Nominal RMS voltage per phase"; parameter SI.Frequency fNominal=imcData.fsNominal "Nominal frequency"; parameter SI.AngularVelocity w_Load(displayUnit="rev/min")= - 1440.45*2*Modelica.Constants.pi/60 "Nominal load speed"; + Modelica.Units.Conversions.from_rpm(1440.45) "Nominal load speed"; parameter Integer p=imcData.p "Number of pole pairs"; Real speedPerUnit = p*imcQS.wMechanical/(2*pi*fNominal) "Per unit speed"; Real slip = 1-speedPerUnit "Slip"; diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_DOL.mo b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_DOL.mo index 3541ab5058..78e5e22a91 100644 --- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_DOL.mo +++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_DOL.mo @@ -10,7 +10,7 @@ model IMC_DOL 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")= - 1440.45*2*Modelica.Constants.pi/60 "Nominal load speed"; + Modelica.Units.Conversions.from_rpm(1440.45) "Nominal load speed"; parameter SI.Inertia J_Load=0.5 "Load inertia"; parameter Integer p=2 "Number of pole pairs"; output SI.Current Itr=currentQuasiRMSSensor.I diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Initialize.mo b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Initialize.mo index c5fc877658..38cbba7071 100644 --- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Initialize.mo +++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Initialize.mo @@ -10,7 +10,7 @@ model IMC_Initialize "Steady-state initialization of induction machine with squi parameter SI.Time tStart=0.5 "Start time"; parameter SI.Torque TLoad=161.4 "Nominal load torque"; parameter SI.AngularVelocity wLoad(displayUnit="rev/min")= - 1440.45*2*Modelica.Constants.pi/60 "Nominal load speed"; + Modelica.Units.Conversions.from_rpm(1440.45) "Nominal load speed"; parameter SI.Inertia JLoad=0.29 "Load's moment of inertia"; Magnetic.QuasiStatic.FundamentalWave.BasicMachines.InductionMachines.IM_SquirrelCage diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Transformer.mo b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Transformer.mo index 18f0e5683c..ecc0aa86be 100644 --- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Transformer.mo +++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Transformer.mo @@ -11,7 +11,7 @@ model IMC_Transformer "Induction machine with squirrel cage starting with transf "Start time of bypass transformer"; parameter SI.Torque TLoad=161.4 "Nominal load torque"; parameter SI.AngularVelocity wLoad(displayUnit="rev/min")= - 1440.45*2*Modelica.Constants.pi/60 "Nominal load speed"; + Modelica.Units.Conversions.from_rpm(1440.45) "Nominal load speed"; parameter SI.Inertia JLoad=0.29 "Load's moment of inertia"; Magnetic.QuasiStatic.FundamentalWave.BasicMachines.InductionMachines.IM_SquirrelCage diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_YD.mo b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_YD.mo index 5ad88469d8..11add4af7b 100644 --- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_YD.mo +++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_YD.mo @@ -10,7 +10,7 @@ model IMC_YD "Induction machine with squirrel cage starting Y-D" parameter SI.Time tStart2=2.0 "Start time from Y to D"; parameter SI.Torque TLoad=161.4 "Nominal load torque"; parameter SI.AngularVelocity wLoad(displayUnit="rev/min")= - 1440.45*2*Modelica.Constants.pi/60 "Nominal load speed"; + Modelica.Units.Conversions.from_rpm(1440.45) "Nominal load speed"; parameter SI.Inertia JLoad=0.29 "Load's moment of inertia"; Magnetic.QuasiStatic.FundamentalWave.BasicMachines.InductionMachines.IM_SquirrelCage diff --git a/ModelicaTest/Electrical/Machines/DCPM_Utilities.mo b/ModelicaTest/Electrical/Machines/DCPM_Utilities.mo index 5f2d6efc40..e093f22be1 100644 --- a/ModelicaTest/Electrical/Machines/DCPM_Utilities.mo +++ b/ModelicaTest/Electrical/Machines/DCPM_Utilities.mo @@ -119,12 +119,11 @@ The controller parameter record is used in the drive parameters record, and fill record MachineData "Standard machine parameters" extends Modelica.Icons.Record; - import Modelica.Constants.pi; parameter Modelica.Units.SI.Voltage VANominal=100 "Nominal armature voltage"; parameter Modelica.Units.SI.Current IANominal=100 "Nominal armature current"; - parameter Modelica.Units.SI.AngularVelocity wNominal=1425*pi/30 + parameter Modelica.Units.SI.AngularVelocity wNominal=Modelica.Units.Conversions.from_rpm(1425) "Nominal speed"; parameter Modelica.Units.SI.Resistance RA=0.05 "Armature resistance"; parameter Modelica.Units.SI.Inductance LA=0.0015 "Armature inductance"; @@ -146,11 +145,10 @@ Extending from this record, the parameters of other machines (with different par end MachineData; record M48V "Real machine 48 V" - import Modelica.Constants.pi; extends ModelicaTest.Electrical.Machines.DCPM_Utilities.MachineData( VANominal=48, IANominal=25, - wNominal=3500*pi/30, + wNominal=Modelica.Units.Conversions.from_rpm(3500), RA=0.24, LA=0.004, J=0.0008);