Skip to content

Remove unit-casting #4158

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

Merged
merged 3 commits into from
Dec 11, 2023
Merged

Remove unit-casting #4158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a655fc1
Remove unit-casting
HansOlsson Jun 19, 2023
8407292
Remove all uses of unitFrequency. That was previously necessary when …
HansOlsson Jun 19, 2023
19470b8
Merge branch 'master' into RemoveUnitCasting
HansOlsson Dec 11, 2023
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
2 changes: 1 addition & 1 deletion Modelica/Electrical/Machines/Examples/InductionMachines/IMC_Conveyor.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}})));
Expand Down
2 changes: 1 addition & 1 deletion Modelica/Electrical/Machines/Examples/SynchronousMachines/SMPM_Braking.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ model SMPM_Braking
origin={-10,30})));
Analog.Basic.VariableResistor variableResistor
annotation (Placement(transformation(extent={{0,50},{-20,70}})));
Blocks.Math.Gain gain(k=unitK*R/wNominal)
Blocks.Math.Gain gain(k=R/wNominal)
annotation (Placement(transformation(
extent={{-10,-10},{10,10}},
rotation=90,
Expand Down
8 changes: 4 additions & 4 deletions ...lica/Magnetic/FluxTubes/Shapes/HysteresisAndMagnets/GenericHystTellinenPermanentMagnet.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@ model GenericHystTellinenPermanentMagnet

parameter SI.MagneticFluxDensity Br=1.2 "Remanence" annotation (Dialog(group="Hysteresis", groupImage="modelica://Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/HysteresisAndMagnets/GenericHystTellinenHard/HardMagneticHysteresis.png"));
parameter SI.MagneticFieldStrength Hc=5e5 "Coercitivity" annotation (Dialog(group="Hysteresis"));
parameter Real M(final unit="1") = unitH*10/Hc
parameter Real M(final unit="m/A") = 10/Hc
"Slope of tanh()-function" annotation (Dialog(group="Hysteresis"));
parameter Real K(final unit="1")=1 "mu_0 multiplier" annotation (Dialog(group="Hysteresis"));

protected
constant SI.MagneticFieldStrength unitH = 1;
parameter SI.MagneticFluxDensity eps= Br/1000;
parameter SI.MagneticFieldStrength H0= 0.5*log((1+mu0*Hc/Br)/(1-mu0*Hc/Br)) + M*Hc;
parameter Real H0(final unit="1")= 0.5*log((1+mu0*Hc/Br)/(1-mu0*Hc/Br)) + M*Hc;

equation
hystR = Br*tanh((M*H - H0)/unitH) + mu0*H - eps/2;
hystF = Br*tanh((M*H + H0)/unitH) + mu0*H + eps/2;
hystR = Br*tanh((M*H - H0)) + mu0*H - eps/2;
hystF = Br*tanh((M*H + H0)) + mu0*H + eps/2;

annotation (defaultComponentName="pm",
Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,
Expand Down
2 changes: 1 addition & 1 deletion Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Conveyor.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}})));
Expand Down
2 changes: 1 addition & 1 deletion Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMPM_Braking.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ model SMPM_Braking
origin={-10,30})));
Modelica.Electrical.Analog.Basic.VariableResistor variableResistor
annotation (Placement(transformation(extent={{0,50},{-20,70}})));
Modelica.Blocks.Math.Gain gain(k=unitK*R/wNominal) annotation (Placement(
Modelica.Blocks.Math.Gain gain(k=R/wNominal) annotation (Placement(
transformation(
extent={{-10,-10},{10,10}},
rotation=90,
Expand Down
4 changes: 2 additions & 2 deletions ...etic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Conveyor.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}})));
Expand Down Expand Up @@ -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)
Expand Down