Remove all uses of unitFrequency. That was previously necessary when …

…Gain.k had unit 1
tobolar · Jun 19, 2023 · 8407292 · 8407292
1 parent a655fc1
commit 8407292
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_Conveyor.mo b/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_Conveyor.mo
@@ -65,7 +65,7 @@ model IMC_Conveyor
     annotation (Placement(transformation(extent={{-20,-34},{0,-14}})));
   parameter Utilities.ParameterRecords.IM_SquirrelCageData aimcData "Induction machine data"
     annotation (Placement(transformation(extent={{-20,-80},{0,-60}})));
-  Blocks.Math.Gain gain(k=fNominal/unitFrequency)
+  Blocks.Math.Gain gain(k=fNominal)
     annotation (Placement(transformation(extent={{-70,50},{-50,70}})));
   Mechanics.Translational.Components.IdealGearR2T idealGearR2T(ratio=1/r)
     annotation (Placement(transformation(extent={{12,-50},{32,-30}})));

diff --git a/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Conveyor.mo b/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Conveyor.mo
@@ -68,7 +68,7 @@ model IMC_Conveyor
     Modelica.Electrical.Machines.Utilities.ParameterRecords.IM_SquirrelCageData
     aimcData "Induction machine data"
     annotation (Placement(transformation(extent={{70,72},{90,92}})));
-  Modelica.Blocks.Math.Gain gain(k=fNominal/unitFrequency)
+  Modelica.Blocks.Math.Gain gain(k=fNominal)
     annotation (Placement(transformation(extent={{-60,40},{-40,60}})));
   Modelica.Mechanics.Translational.Components.IdealGearR2T idealGearR2T(ratio=1/r)
     annotation (Placement(transformation(extent={{32,10},{12,30}})));

diff --git a/...etic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Conveyor.mo b/...etic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Conveyor.mo
@@ -61,7 +61,7 @@ model IMC_Conveyor "Induction machine with squirrel cage and inverter driving a
     Modelica.Electrical.Machines.Utilities.ParameterRecords.IM_SquirrelCageData
     imcData "Induction machine data"
     annotation (Placement(transformation(extent={{70,72},{90,92}})));
-  Modelica.Blocks.Math.Gain gainQS(k=fNominal/unitFrequency)
+  Modelica.Blocks.Math.Gain gainQS(k=fNominal)
     annotation (Placement(transformation(extent={{-60,40},{-40,60}})));
   Modelica.Mechanics.Translational.Components.IdealGearR2T idealGearR2TQS(ratio=1/r)
     annotation (Placement(transformation(extent={{32,10},{12,30}})));
@@ -125,7 +125,7 @@ model IMC_Conveyor "Induction machine with squirrel cage and inverter driving a
       terminalConnection="Y", m=m)
     annotation (Placement(transformation(extent={{60,-74},{40,-54}})));
   Modelica.Blocks.Math.Gain
-                   gain(k=fNominal/unitFrequency)
+                   gain(k=fNominal)
     annotation (Placement(transformation(extent={{-60,-60},{-40,-40}})));
   Modelica.Mechanics.Translational.Components.IdealGearR2T
                                                   idealGearR2T(ratio=1/r)