From a655fc1cdefdbd48559572475e113a8dc31278bb Mon Sep 17 00:00:00 2001 From: HOS Date: Mon, 19 Jun 2023 13:45:07 +0200 Subject: [PATCH] Remove unit-casting --- .../Machines/Examples/SynchronousMachines/SMPM_Braking.mo | 2 +- .../GenericHystTellinenPermanentMagnet.mo | 8 ++++---- .../BasicMachines/SynchronousMachines/SMPM_Braking.mo | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMPM_Braking.mo b/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMPM_Braking.mo index b802819367..fa0e3142b4 100644 --- a/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMPM_Braking.mo +++ b/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMPM_Braking.mo @@ -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, diff --git a/Modelica/Magnetic/FluxTubes/Shapes/HysteresisAndMagnets/GenericHystTellinenPermanentMagnet.mo b/Modelica/Magnetic/FluxTubes/Shapes/HysteresisAndMagnets/GenericHystTellinenPermanentMagnet.mo index d6874f7101..c35808a815 100644 --- a/Modelica/Magnetic/FluxTubes/Shapes/HysteresisAndMagnets/GenericHystTellinenPermanentMagnet.mo +++ b/Modelica/Magnetic/FluxTubes/Shapes/HysteresisAndMagnets/GenericHystTellinenPermanentMagnet.mo @@ -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, diff --git a/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMPM_Braking.mo b/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMPM_Braking.mo index 8f7e915938..895ff1e907 100644 --- a/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMPM_Braking.mo +++ b/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMPM_Braking.mo @@ -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,