diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Classes/Aliasing.mo" "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Classes/Aliasing.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Classes/Aliasing.mo" 2021-11-24 08:09:22.147363002 +0000 +++ "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Classes/Aliasing.mo" 2021-11-24 08:09:51.607274416 +0000 @@ -2,7 +2,7 @@ model Aliasing "Demonstrating the aliasing effect" extends Modelica.Icons.Example; import Modelica.Constants.pi; - parameter Modelica.SIunits.Frequency f=10 "Frequency of sine wave"; + parameter Modelica.Units.SI.Frequency f=10 "Frequency of sine wave"; Real x "Sine wave"; equation x = cos(2*pi*f*time); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Classes/TestVector2D.mo" "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Classes/TestVector2D.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Classes/TestVector2D.mo" 2021-11-24 08:09:22.147363002 +0000 +++ "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Classes/TestVector2D.mo" 2021-11-24 08:09:51.523274669 +0000 @@ -3,7 +3,7 @@ extends Modelica.Icons.Example; parameter Vector2D a(x=3,y=4) "Vector"; parameter Real aMag=sqrt(a.x^2+a.y^2) "Magnitude of a"; - parameter Modelica.SIunits.Time T=0.2 "Time constant"; + parameter Modelica.Units.SI.Time T=0.2 "Time constant"; Vector2D v(x(start=0,fixed=true),y(start=0,fixed=true)) "Integral of a/T"; equation der(v.x)=a.x/T; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Classes/wrapAngle.mo" "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Classes/wrapAngle.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Classes/wrapAngle.mo" 2021-11-24 08:09:22.147363002 +0000 +++ "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Classes/wrapAngle.mo" 2021-11-24 08:09:51.479274801 +0000 @@ -2,10 +2,10 @@ function wrapAngle "Wrap angle to interval ]-pi,pi] or [0,2*pi[" extends Modelica.Math.Icons.AxisCenter; import Modelica.Constants.pi; - input Modelica.SIunits.Angle u "Input angle"; + input Modelica.Units.SI.Angle u "Input angle"; input Boolean positiveRange=false "Use only positive output range, if true"; - output Modelica.SIunits.Angle y "Wrapped output angle"; + output Modelica.Units.SI.Angle y "Wrapped output angle"; algorithm y :=mod(u, 2*pi); if y>pi and not positiveRange then diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Electrical/Components/Brush.mo" "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Electrical/Components/Brush.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Electrical/Components/Brush.mo" 2021-11-24 08:09:22.147363002 +0000 +++ "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Electrical/Components/Brush.mo" 2021-11-24 08:09:51.443274909 +0000 @@ -1,8 +1,8 @@ within HanserModelica.Electrical.Components; model Brush "Electrical brush model" extends Modelica.Electrical.Analog.Interfaces.OnePort; - parameter Modelica.SIunits.Current ILinear "Current limit of linear range"; - parameter Modelica.SIunits.Voltage V=2 "Brush voltage limit"; + parameter Modelica.Units.SI.Current ILinear "Current limit of linear range"; + parameter Modelica.Units.SI.Voltage V=2 "Brush voltage limit"; equation v = smooth(0,HanserModelica.Electrical.Functions.brush(i,ILinear,V)); annotation (Icon(coordinateSystem(preserveAspectRatio=false), graphics={ diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Electrical/Components/RLSeries.mo" "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Electrical/Components/RLSeries.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Electrical/Components/RLSeries.mo" 2021-11-24 08:09:22.147363002 +0000 +++ "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Electrical/Components/RLSeries.mo" 2021-11-24 08:09:51.435274933 +0000 @@ -3,7 +3,7 @@ extends Modelica.Electrical.Analog.Interfaces.TwoPin; parameter Real R(start=1) "Resistance"; parameter Real L(start=1) "Inductance"; - Modelica.SIunits.Current i(start=0) = p.i "Current"; + Modelica.Units.SI.Current i(start=0) = p.i "Current"; Modelica.Electrical.Analog.Basic.Resistor resistor(final R=R) annotation (Placement(transformation(extent={{-40,-10},{-20,10}}))); Modelica.Electrical.Analog.Basic.Inductor inductor(final L=L) annotation (Placement(transformation(extent={{20,-10},{40,10}}))); equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Electrical/ConditionalComponents.mo" "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Electrical/ConditionalComponents.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Electrical/ConditionalComponents.mo" 2021-11-24 08:09:22.147363002 +0000 +++ "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Electrical/ConditionalComponents.mo" 2021-11-24 08:09:51.391275065 +0000 @@ -1,9 +1,9 @@ within HanserModelica.Electrical; model ConditionalComponents "Conditional components" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Resistance R = 10 "Resistance"; - parameter Modelica.SIunits.Inductance L = 2 "Inductance"; - parameter Modelica.SIunits.Voltage v = 10 "DC voltage"; + parameter Modelica.Units.SI.Resistance R = 10 "Resistance"; + parameter Modelica.Units.SI.Inductance L = 2 "Inductance"; + parameter Modelica.Units.SI.Voltage v = 10 "DC voltage"; parameter Boolean useInductor = true "Use inductor if true"; Modelica.Electrical.Analog.Basic.Ground ground annotation (Placement(transformation(extent={{-40,-40},{-20,-20}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Electrical/Functions/brush.mo" "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Electrical/Functions/brush.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Electrical/Functions/brush.mo" 2021-11-24 08:09:22.147363002 +0000 +++ "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Electrical/Functions/brush.mo" 2021-11-24 08:09:51.355275174 +0000 @@ -1,10 +1,10 @@ within HanserModelica.Electrical.Functions; function brush "Brush voltage against brush current" extends Modelica.Icons.Function; - input Modelica.SIunits.Current i "Brush current"; - input Modelica.SIunits.Current ILinear "Current limit of linear range"; - input Modelica.SIunits.Voltage V=2 "Brush voltage limit"; - output Modelica.SIunits.Voltage v "Brush voltage"; + input Modelica.Units.SI.Current i "Brush current"; + input Modelica.Units.SI.Current ILinear "Current limit of linear range"; + input Modelica.Units.SI.Voltage V=2 "Brush voltage limit"; + output Modelica.Units.SI.Voltage v "Brush voltage"; algorithm v := if i<-ILinear then -V elseif i>ILinear then +V else V*i/ILinear; annotation (Documentation(info=" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Electrical/QuasiStaticMultiPhase.mo" "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Electrical/QuasiStaticMultiPhase.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Electrical/QuasiStaticMultiPhase.mo" 2021-11-24 08:09:22.147363002 +0000 +++ "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Electrical/QuasiStaticMultiPhase.mo" 2021-11-24 08:09:51.343275210 +0000 @@ -2,32 +2,32 @@ model QuasiStaticMultiPhase "Quasi static multi phase circuit" extends Modelica.Icons.Example; - Modelica.Electrical.QuasiStationary.MultiPhase.Basic.Inductor inductor(L=fill(0.0008, 3)) + Modelica.Electrical.QuasiStatic.Polyphase.Basic.Inductor inductor(L=fill(0.0008, 3)) annotation (Placement(transformation(extent={{-2,10},{18,30}}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Basic.VariableConductor conductor annotation (Placement(transformation( + Modelica.Electrical.QuasiStatic.Polyphase.Basic.VariableConductor conductor annotation (Placement(transformation( extent={{-10,-10},{10,10}}, rotation=270, origin={30,0}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Basic.Inductor mainInductor(L=fill(0.01, 3)) annotation (Placement(transformation( + Modelica.Electrical.QuasiStatic.Polyphase.Basic.Inductor mainInductor(L=fill(0.01, 3)) annotation (Placement(transformation( extent={{-10,-10},{10,10}}, rotation=270, origin={-20,0}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Sources.VoltageSource voltageSource( + Modelica.Electrical.QuasiStatic.Polyphase.Sources.VoltageSource voltageSource( f=50, V=fill(100, 3), - phi=-Modelica.Electrical.MultiPhase.Functions.symmetricOrientation(3), + phi=-Modelica.Electrical.Polyphase.Functions.symmetricOrientation(3), gamma(fixed=true, start=0)) annotation (Placement(transformation( extent={{-10,-10},{10,10}}, rotation=270, origin={-70,0}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Sensors.MultiSensor sensor annotation (Placement(transformation(extent={{-50,10},{-30,30}}))); + Modelica.Electrical.QuasiStatic.Polyphase.Sensors.MultiSensor sensor annotation (Placement(transformation(extent={{-50,10},{-30,30}}))); Modelica.Blocks.Sources.Ramp ramp[3]( height=fill(60, 3), duration=fill(1, 3), offset=fill(-30, 3)) annotation (Placement(transformation(extent={{80,-10},{60,10}}))); - Modelica.Electrical.QuasiStationary.SinglePhase.Basic.Ground ground annotation (Placement(transformation(extent={{-80,-72},{-60,-52}}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Basic.Star star annotation (Placement(transformation( + Modelica.Electrical.QuasiStatic.SinglePhase.Basic.Ground ground annotation (Placement(transformation(extent={{-80,-72},{-60,-52}}))); + Modelica.Electrical.QuasiStatic.Polyphase.Basic.Star star annotation (Placement(transformation( extent={{-10,-10},{10,10}}, rotation=270, origin={-70,-30}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Electrical/RLSeriesFrequencySweep.mo" "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Electrical/RLSeriesFrequencySweep.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Electrical/RLSeriesFrequencySweep.mo" 2021-11-24 08:09:22.147363002 +0000 +++ "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Electrical/RLSeriesFrequencySweep.mo" 2021-11-24 08:09:51.307275318 +0000 @@ -3,28 +3,28 @@ extends Modelica.Icons.Example; import Modelica.Constants.pi; output Real abs_y = bode.abs_y "Magnitude of voltage ratio"; - output Modelica.SIunits.AmplitudeLevelDifference dB_y = bode.dB_y "Log10 of magnitude of voltage ratio in dB"; - output Modelica.SIunits.Angle arg_y = bode.arg_y "Angle of voltage ratio"; - Modelica.ComplexBlocks.Sources.LogFrequencySweep frequencySweep( + output Modelica.Units.SI.AmplitudeLevelDifference dB_y = bode.dB_y "Log10 of magnitude of voltage ratio in dB"; + output Modelica.Units.SI.Angle arg_y = bode.arg_y "Angle of voltage ratio"; + Modelica.Blocks.Sources.LogFrequencySweep frequencySweep( duration=1, wMin=1, wMax=10E3) annotation (Placement(transformation( origin={-70,-40}, extent={{-10,-10},{10,10}}, rotation=0))); - Modelica.Electrical.QuasiStationary.SinglePhase.Sources.VariableVoltageSource voltageSource(gamma(fixed=true, start=0)) annotation (Placement(transformation( + Modelica.Electrical.QuasiStatic.SinglePhase.Sources.VariableVoltageSource voltageSource(gamma(fixed=true, start=0)) annotation (Placement(transformation( origin={-30,-20}, extent={{-10,10},{10,-10}}, rotation=270))); - Modelica.Electrical.QuasiStationary.SinglePhase.Basic.Ground ground annotation (Placement(transformation(extent={{-40,-60},{-20,-40}}))); - Modelica.Electrical.QuasiStationary.SinglePhase.Basic.Resistor resistor(R_ref=100) annotation (Placement(transformation(extent={{20,-10},{40,10}}))); - Modelica.Electrical.QuasiStationary.SinglePhase.Basic.Inductor inductor(L=1/(2*pi)) annotation (Placement(transformation(extent={{52,-10},{72,10}}))); + Modelica.Electrical.QuasiStatic.SinglePhase.Basic.Ground ground annotation (Placement(transformation(extent={{-40,-60},{-20,-40}}))); + Modelica.Electrical.QuasiStatic.SinglePhase.Basic.Resistor resistor(R_ref=100) annotation (Placement(transformation(extent={{20,-10},{40,10}}))); + Modelica.Electrical.QuasiStatic.SinglePhase.Basic.Inductor inductor(L=1/(2*pi)) annotation (Placement(transformation(extent={{52,-10},{72,10}}))); Modelica.ComplexBlocks.Sources.ComplexConstant complexConst(k=Complex(10, 0)) annotation (Placement(transformation(extent={{-80,-10},{-60,10}}))); - Modelica.Electrical.QuasiStationary.SinglePhase.Sensors.CurrentSensor currentSensor annotation (Placement(transformation( + Modelica.Electrical.QuasiStatic.SinglePhase.Sensors.CurrentSensor currentSensor annotation (Placement(transformation( extent={{10,10},{-10,-10}}, rotation=180, origin={-10,0}))); - Modelica.Electrical.QuasiStationary.SinglePhase.Sensors.VoltageSensor voltageSensor annotation (Placement(transformation( + Modelica.Electrical.QuasiStatic.SinglePhase.Sensors.VoltageSensor voltageSensor annotation (Placement(transformation( extent={{-10,10},{10,-10}}, rotation=0, origin={30,20}))); @@ -44,7 +44,7 @@ connect(voltageSensor.pin_n, inductor.pin_p) annotation (Line(points={{40,20},{52,20},{52,0}}, color={85,170,255})); connect(ground.pin, inductor.pin_n) annotation (Line(points={{-30,-40},{80,-40},{80,0},{72,0}}, color={85,170,255})); connect(bode.divisor, complexConst.y) annotation (Line(points={{-58,24},{-50,24},{-50,0},{-59,0}}, color={85,170,255})); - connect(bode.u, voltageSensor.y) annotation (Line(points={{-58,36},{30,36},{30,31}}, color={85,170,255})); + connect(bode.u, voltageSensor.v) annotation (Line(points={{-58,36},{30,36},{30,31}}, color={85,170,255})); connect(currentSensor.pin_p, voltageSource.pin_p) annotation (Line(points={{-20,0},{-30,0},{-30,-10}}, color={85,170,255})); connect(currentSensor.pin_n, resistor.pin_p) annotation (Line(points={{0,0},{20,0}}, color={85,170,255})); annotation (Documentation(info=" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Electrical/Records/RLData.mo" "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Electrical/Records/RLData.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Electrical/Records/RLData.mo" 2021-11-24 08:09:22.147363002 +0000 +++ "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Electrical/Records/RLData.mo" 2021-11-24 08:09:51.255275474 +0000 @@ -1,8 +1,8 @@ within HanserModelica.Electrical.Records; record RLData "Data of R-L series connection" extends Modelica.Icons.Record; - parameter Modelica.SIunits.Resistance R(start=1) "Resistance"; - parameter Modelica.SIunits.Inductance L(start=1) "Inductance"; + parameter Modelica.Units.SI.Resistance R(start=1) "Resistance"; + parameter Modelica.Units.SI.Inductance L(start=1) "Inductance"; parameter String componentName = "RLData" "Component name"; annotation(defaultComponentName = "rlData", defaultComponentPrefixes = "parameter", Icon(graphics={ diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Electrical/Rectifier.mo" "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Electrical/Rectifier.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Electrical/Rectifier.mo" 2021-11-24 08:09:22.147363002 +0000 +++ "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Electrical/Rectifier.mo" 2021-11-24 08:09:51.187275679 +0000 @@ -1,18 +1,17 @@ within HanserModelica.Electrical; model Rectifier "Three-phase six-pulse rectifier with resistive load" extends Modelica.Icons.Example; - Modelica.Electrical.MultiPhase.Sources.SineVoltage sineVoltage( - phase=-Modelica.Electrical.MultiPhase.Functions.symmetricOrientation(3), - freqHz=fill(50, 3),V=fill(sqrt(2)*100, 3)) annotation (Placement(transformation( + Modelica.Electrical.Polyphase.Sources.SineVoltage sineVoltage( + phase=-Modelica.Electrical.Polyphase.Functions.symmetricOrientation(3), f = fill(50, 3),V=fill(sqrt(2)*100, 3)) annotation (Placement(transformation( extent={{-10,-10},{10,10}}, rotation=270, origin={-90,40}))); - Modelica.Electrical.MultiPhase.Basic.Star star annotation (Placement(transformation( + Modelica.Electrical.Polyphase.Basic.Star star annotation (Placement(transformation( extent={{-10,-10},{10,10}}, rotation=270, origin={-90,10}))); - Modelica.Electrical.MultiPhase.Basic.Inductor inductor(L=fill(0.3E-3, 3)) annotation (Placement(transformation(extent={{-70,40},{-50,60}}))); - Modelica.Electrical.MultiPhase.Basic.Resistor resistor(R=fill(0.03, 3)) annotation (Placement(transformation( + Modelica.Electrical.Polyphase.Basic.Inductor inductor(L=fill(0.3E-3, 3)) annotation (Placement(transformation(extent={{-70,40},{-50,60}}))); + Modelica.Electrical.Polyphase.Basic.Resistor resistor(R=fill(0.03, 3)) annotation (Placement(transformation( extent={{10,10},{-10,-10}}, rotation=180, origin={-30,50}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Electrical/Signals.mo" "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Electrical/Signals.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Electrical/Signals.mo" 2021-11-24 08:09:22.147363002 +0000 +++ "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Electrical/Signals.mo" 2021-11-24 08:09:51.167275739 +0000 @@ -1,9 +1,9 @@ within HanserModelica.Electrical; model Signals "Application of signals, sources, sesors" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Resistance R = 10 "Resistance"; - parameter Modelica.SIunits.Inductance L = 2 "Inductance"; - parameter Modelica.SIunits.Current IRef = 0.25 "Reference current"; + parameter Modelica.Units.SI.Resistance R = 10 "Resistance"; + parameter Modelica.Units.SI.Inductance L = 2 "Inductance"; + parameter Modelica.Units.SI.Current IRef = 0.25 "Reference current"; Modelica.Electrical.Analog.Basic.Ground ground annotation (Placement(transformation(extent={{0,-40},{20,-20}}))); Modelica.Electrical.Analog.Basic.Resistor resistor(R=R) annotation (Placement(transformation(extent={{30,10},{50,30}}))); Modelica.Electrical.Analog.Basic.Inductor inductor(L=L, i(start=0, fixed=true)) annotation (Placement(transformation(extent={{60,10},{80,30}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Electrical/StarDelta.mo" "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Electrical/StarDelta.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Electrical/StarDelta.mo" 2021-11-24 08:09:22.147363002 +0000 +++ "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Electrical/StarDelta.mo" 2021-11-24 08:09:51.143275811 +0000 @@ -1,32 +1,31 @@ within HanserModelica.Electrical; model StarDelta "Example of three-phase star connected sources and delta connected load" extends Modelica.Icons.Example; - Modelica.Electrical.MultiPhase.Basic.Star star annotation (Placement(transformation( + Modelica.Electrical.Polyphase.Basic.Star star annotation (Placement(transformation( extent={{-10,-10},{10,10}}, rotation=270, origin={-70,-10}))); - Modelica.Electrical.MultiPhase.Basic.Delta delta annotation (Placement(transformation( + Modelica.Electrical.Polyphase.Basic.Delta delta annotation (Placement(transformation( extent={{-10,-10},{10,10}}, rotation=270, origin={80,2}))); Modelica.Electrical.Analog.Basic.Ground ground annotation (Placement(transformation(extent={{-90,-40},{-70,-20}}))); - Modelica.Electrical.MultiPhase.Sources.SineVoltage sineVoltage( - phase=-Modelica.Electrical.MultiPhase.Functions.symmetricOrientation(3), - freqHz=fill(50, 3), + Modelica.Electrical.Polyphase.Sources.SineVoltage sineVoltage( + phase=-Modelica.Electrical.Polyphase.Functions.symmetricOrientation(3), f = fill(50, 3), V=fill(sqrt(2)*230, 3)) annotation (Placement(transformation( extent={{-10,-10},{10,10}}, rotation=270, origin={-70,20}))); - Modelica.Electrical.MultiPhase.Ideal.IdealClosingSwitch switch(Ron=fill(1E-5, 3), Goff=fill(1E-5, 3)) annotation (Placement(transformation(extent={{-60,30},{-40,50}}))); - Modelica.Electrical.MultiPhase.Basic.Resistor resistor(R=fill(1, 3)) annotation (Placement(transformation(extent={{-30,30},{-10,50}}))); - Modelica.Electrical.MultiPhase.Basic.Inductor inductor(L=fill(0.01, 3)) annotation (Placement(transformation(extent={{0,30},{20,50}}))); + Modelica.Electrical.Polyphase.Ideal.IdealClosingSwitch switch(Ron=fill(1E-5, 3), Goff=fill(1E-5, 3)) annotation (Placement(transformation(extent={{-60,30},{-40,50}}))); + Modelica.Electrical.Polyphase.Basic.Resistor resistor(R=fill(1, 3)) annotation (Placement(transformation(extent={{-30,30},{-10,50}}))); + Modelica.Electrical.Polyphase.Basic.Inductor inductor(L=fill(0.01, 3)) annotation (Placement(transformation(extent={{0,30},{20,50}}))); Modelica.Blocks.Sources.BooleanStep booleanStep[3](startTime=fill(0.02, 3)) annotation (Placement(transformation(extent={{-90,50},{-70,70}}))); - Modelica.Electrical.MultiPhase.Basic.Inductor inductorLoad(L=fill(0.1, 3)) annotation (Placement(transformation( + Modelica.Electrical.Polyphase.Basic.Inductor inductorLoad(L=fill(0.1, 3)) annotation (Placement(transformation( extent={{-10,-10},{10,10}}, rotation=270, origin={50,0}))); - Modelica.Electrical.MultiPhase.Sensors.CurrentQuasiRMSSensor currentRMSSensor annotation (Placement(transformation(extent={{60,50},{80,30}}))); - Modelica.Electrical.MultiPhase.Sensors.CurrentSensor currentSensor annotation (Placement(transformation(extent={{30,50},{50,30}}))); + Modelica.Electrical.Polyphase.Sensors.CurrentQuasiRMSSensor currentRMSSensor annotation (Placement(transformation(extent={{60,50},{80,30}}))); + Modelica.Electrical.Polyphase.Sensors.CurrentSensor currentSensor annotation (Placement(transformation(extent={{30,50},{50,30}}))); Modelica.Blocks.Math.RootMeanSquare rootMeanSquare[3](f=fill(50, 3)) annotation (Placement(transformation(extent={{20,50},{0,70}}))); initial equation inductorLoad.i[1:3]=zeros(3); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Electrical/StarPolygon.mo" "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Electrical/StarPolygon.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Electrical/StarPolygon.mo" 2021-11-24 08:09:22.147363002 +0000 +++ "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Electrical/StarPolygon.mo" 2021-11-24 08:09:51.115275895 +0000 @@ -2,44 +2,43 @@ model StarPolygon "Example of polyphase star connected sources and polygon connected load" extends Modelica.Icons.Example; parameter Integer m = 5 "Number of phases"; - parameter Modelica.SIunits.Frequency f = 50 "Suppyl frequency"; - parameter Modelica.SIunits.Voltage Vrms = 230 "RMS supply voltages"; - Modelica.Electrical.MultiPhase.Basic.Star star(m=m) + parameter Modelica.Units.SI.Frequency f = 50 "Suppyl frequency"; + parameter Modelica.Units.SI.Voltage Vrms = 230 "RMS supply voltages"; + Modelica.Electrical.Polyphase.Basic.Star star(m=m) annotation (Placement(transformation( extent={{-10,-10},{10,10}}, rotation=270, origin={-70,-10}))); - Modelica.Electrical.MultiPhase.Basic.Delta delta(m=m) + Modelica.Electrical.Polyphase.Basic.Delta delta(m=m) annotation (Placement(transformation( extent={{-10,-10},{10,10}}, rotation=270, origin={80,2}))); Modelica.Electrical.Analog.Basic.Ground ground annotation (Placement(transformation(extent={{-90,-40},{-70,-20}}))); - Modelica.Electrical.MultiPhase.Sources.SineVoltage sineVoltage( - phase=-Modelica.Electrical.MultiPhase.Functions.symmetricOrientation(m), - freqHz=fill(f, m), + Modelica.Electrical.Polyphase.Sources.SineVoltage sineVoltage( + phase=-Modelica.Electrical.Polyphase.Functions.symmetricOrientation(m), f = fill(f, m), V=fill(sqrt(2)*Vrms, m), m=m) annotation (Placement(transformation( extent={{-10,-10},{10,10}}, rotation=270, origin={-70,20}))); - Modelica.Electrical.MultiPhase.Ideal.IdealClosingSwitch switch( + Modelica.Electrical.Polyphase.Ideal.IdealClosingSwitch switch( m=m, Ron=fill(1E-5, m), Goff=fill(1E-5, m)) annotation (Placement(transformation(extent={{-60,30},{-40,50}}))); - Modelica.Electrical.MultiPhase.Basic.Resistor resistor(m=m, R=fill(1, m)) + Modelica.Electrical.Polyphase.Basic.Resistor resistor(m=m, R=fill(1, m)) annotation (Placement(transformation(extent={{-30,30},{-10,50}}))); - Modelica.Electrical.MultiPhase.Basic.Inductor inductor(L=fill(0.01, m), m=m) + Modelica.Electrical.Polyphase.Basic.Inductor inductor(L=fill(0.01, m), m=m) annotation (Placement(transformation(extent={{0,30},{20,50}}))); Modelica.Blocks.Sources.BooleanStep booleanStep[m](startTime=fill(0.02, m)) annotation (Placement(transformation(extent={{-90,50},{-70,70}}))); - Modelica.Electrical.MultiPhase.Basic.Inductor inductorLoad(L=fill(0.1, m), m=m) + Modelica.Electrical.Polyphase.Basic.Inductor inductorLoad(L=fill(0.1, m), m=m) annotation (Placement(transformation( extent={{-10,-10},{10,10}}, rotation=270, origin={50,0}))); - Modelica.Electrical.MultiPhase.Sensors.CurrentQuasiRMSSensor currentRMSSensor(m=m) + Modelica.Electrical.Polyphase.Sensors.CurrentQuasiRMSSensor currentRMSSensor(m=m) annotation (Placement(transformation(extent={{60,50},{80,30}}))); - Modelica.Electrical.MultiPhase.Sensors.CurrentSensor currentSensor(m=m) + Modelica.Electrical.Polyphase.Sensors.CurrentSensor currentSensor(m=m) annotation (Placement(transformation(extent={{30,50},{50,30}}))); Modelica.Blocks.Math.RootMeanSquare rootMeanSquare[m](f=fill(f, m)) annotation (Placement(transformation(extent={{20,50},{0,70}}))); initial equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Electrical/Tables.mo" "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Electrical/Tables.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Electrical/Tables.mo" 2021-11-24 08:09:22.147363002 +0000 +++ "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Electrical/Tables.mo" 2021-11-24 08:09:51.091275967 +0000 @@ -1,8 +1,8 @@ within HanserModelica.Electrical; model Tables "Application of tables" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Inductance L = 2 "Inductance"; - parameter Modelica.SIunits.Voltage v = 20 "Total DC voltage"; + parameter Modelica.Units.SI.Inductance L = 2 "Inductance"; + parameter Modelica.Units.SI.Voltage v = 20 "Total DC voltage"; Modelica.Electrical.Analog.Basic.Ground ground annotation (Placement(transformation(extent={{-50,-20},{-30,0}}))); Modelica.Electrical.Analog.Sources.ConstantVoltage constantVoltage(V=v) annotation (Placement(transformation( extent={{-10,-10},{10,10}}, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/FirstSteps/Electrical3.mo" "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/FirstSteps/Electrical3.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/FirstSteps/Electrical3.mo" 2021-11-24 08:09:22.147363002 +0000 +++ "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/FirstSteps/Electrical3.mo" 2021-11-24 08:09:50.991276268 +0000 @@ -2,12 +2,12 @@ model Electrical3 "R-L series circuit, third implementation" extends Modelica.Icons.Example; // Parameters are constant variables - parameter Modelica.SIunits.Resistance R = 10 "Resistance"; - parameter Modelica.SIunits.Inductance L = 2 "Inductance"; - parameter Modelica.SIunits.Voltage v = 20 "Total DC voltage"; - Modelica.SIunits.Voltage vR "Voltage drop of resistor"; - Modelica.SIunits.Voltage vL "Voltage drop of inductor"; - Modelica.SIunits.Current i "Current"; + parameter Modelica.Units.SI.Resistance R = 10 "Resistance"; + parameter Modelica.Units.SI.Inductance L = 2 "Inductance"; + parameter Modelica.Units.SI.Voltage v = 20 "Total DC voltage"; + Modelica.Units.SI.Voltage vR "Voltage drop of resistor"; + Modelica.Units.SI.Voltage vL "Voltage drop of inductor"; + Modelica.Units.SI.Current i "Current"; initial equation i = 0; equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/FirstSteps/Electrical4.mo" "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/FirstSteps/Electrical4.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/FirstSteps/Electrical4.mo" 2021-11-24 08:09:22.147363002 +0000 +++ "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/FirstSteps/Electrical4.mo" 2021-11-24 08:09:50.967276340 +0000 @@ -2,13 +2,13 @@ model Electrical4 "R-L series circuit, graphical implementation" extends Modelica.Icons.Example; // Parameters are constant variables - parameter Modelica.SIunits.Resistance R = 10 "Resistance"; - parameter Modelica.SIunits.Inductance L = 2 "Inductance"; - parameter Modelica.SIunits.Voltage v = 20 "Total DC voltage"; + parameter Modelica.Units.SI.Resistance R = 10 "Resistance"; + parameter Modelica.Units.SI.Inductance L = 2 "Inductance"; + parameter Modelica.Units.SI.Voltage v = 20 "Total DC voltage"; // Alias variables to simplify result access - Modelica.SIunits.Voltage vR = resistor.v "Voltage drop of resistor"; - Modelica.SIunits.Voltage vL = inductor.v "Voltage drop of inductor"; - Modelica.SIunits.Current i = resistor.i "Current"; + Modelica.Units.SI.Voltage vR = resistor.v "Voltage drop of resistor"; + Modelica.Units.SI.Voltage vL = inductor.v "Voltage drop of inductor"; + Modelica.Units.SI.Current i = resistor.i "Current"; Modelica.Electrical.Analog.Basic.Ground ground annotation (Placement(transformation(extent={{-50,-20},{-30,0}}))); Modelica.Electrical.Analog.Sources.ConstantVoltage constantVoltage(V=v) annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=270,origin={-40,20}))); Modelica.Electrical.Analog.Basic.Resistor resistor(R=R) annotation (Placement(transformation(extent={{-20,30},{0,50}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/InductionMachines/IMC_Characteristics.mo" "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/InductionMachines/IMC_Characteristics.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/InductionMachines/IMC_Characteristics.mo" 2021-11-24 08:09:22.147363002 +0000 +++ "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/InductionMachines/IMC_Characteristics.mo" 2021-11-24 08:09:50.911276509 +0000 @@ -3,35 +3,35 @@ extends Modelica.Icons.Example; import Modelica.Constants.pi; parameter Integer m=3 "Number of phases"; - parameter Modelica.SIunits.Voltage VsNominal=100 "Nominal stator RMS voltage per phase"; - parameter Modelica.SIunits.Current IsNominal=100 "Nominal stator RMS voltage per phase"; - parameter Modelica.SIunits.Frequency fsNominal=imcData.fsNominal "Nominal frequency"; - parameter Modelica.SIunits.AngularVelocity w_Load(displayUnit="rev/min")= + parameter Modelica.Units.SI.Voltage VsNominal=100 "Nominal stator RMS voltage per phase"; + parameter Modelica.Units.SI.Current IsNominal=100 "Nominal stator RMS voltage per phase"; + parameter Modelica.Units.SI.Frequency fsNominal=imcData.fsNominal "Nominal frequency"; + parameter Modelica.Units.SI.AngularVelocity w_Load(displayUnit="rev/min")= 1440.45*2*Modelica.Constants.pi/60 "Nominal load speed"; parameter Integer p=imcData.p "Number of pole pairs"; Real speedPerUnit = p*imc.wMechanical/(2*pi*fsNominal) "Per unit speed"; Real slip = 1-speedPerUnit "Slip"; - output Modelica.SIunits.Current I=currentRMSSensor.I " RMS current"; - Modelica.Electrical.QuasiStationary.MultiPhase.Sources.VoltageSource voltageSource( + output Modelica.Units.SI.Current I=currentRMSSensor.I " RMS current"; + Modelica.Electrical.QuasiStatic.Polyphase.Sources.VoltageSource voltageSource( m=m, f=fsNominal, V=fill(VsNominal, m), - phi=-Modelica.Electrical.MultiPhase.Functions.symmetricOrientation(m)) annotation (Placement(transformation( + phi=-Modelica.Electrical.Polyphase.Functions.symmetricOrientation(m)) annotation (Placement(transformation( origin={-60,40}, extent={{-10,-10},{10,10}}, rotation=270))); - Modelica.Electrical.QuasiStationary.MultiPhase.Basic.Star star(m=m) + Modelica.Electrical.QuasiStatic.Polyphase.Basic.Star star(m=m) annotation (Placement(transformation( origin={-70,20}, extent={{-10,-10},{10,10}}, rotation=180))); - Modelica.Electrical.QuasiStationary.SinglePhase.Basic.Ground ground + Modelica.Electrical.QuasiStatic.SinglePhase.Basic.Ground ground annotation (Placement(transformation( extent={{-10,-10},{10,10}}, rotation=270, origin={-90,20}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Sensors.PowerSensor powerSensor(m=m) annotation (Placement(transformation(extent={{-40,70},{-20,90}}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Sensors.CurrentQuasiRMSSensor currentRMSSensor(m=m) annotation (Placement(transformation(extent={{-10,70},{10,90}}))); + Modelica.Electrical.QuasiStatic.Polyphase.Sensors.PowerSensor powerSensor(m=m) annotation (Placement(transformation(extent={{-40,70},{-20,90}}))); + Modelica.Electrical.QuasiStatic.Polyphase.Sensors.CurrentQuasiRMSSensor currentRMSSensor(m=m) annotation (Placement(transformation(extent={{-10,70},{10,90}}))); Modelica.Magnetic.QuasiStatic.FundamentalWave.BasicMachines.InductionMachines.IM_SquirrelCage imc( Js=imcData.Js, p=imcData.p, @@ -54,13 +54,13 @@ TsOperational=imcData.TsRef, effectiveStatorTurns=imcData.effectiveStatorTurns, TrOperational=imcData.TrRef) annotation (Placement(transformation(extent={{20,30},{40,50}}))); - Modelica.Electrical.QuasiStationary.SinglePhase.Basic.Ground + Modelica.Electrical.QuasiStatic.SinglePhase.Basic.Ground groundMachine annotation (Placement(transformation( extent={{-10,-10},{10,10}}, origin={-10,10}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Basic.Star + Modelica.Electrical.QuasiStatic.Polyphase.Basic.Star starMachine(m= - Modelica.Electrical.MultiPhase.Functions.numberOfSymmetricBaseSystems( + Modelica.Electrical.Polyphase.Functions.numberOfSymmetricBaseSystems( m)) annotation (Placement(transformation( extent={{-10,10},{10,-10}}, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/InductionMachines/IMC_DOL.mo" "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/InductionMachines/IMC_DOL.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/InductionMachines/IMC_DOL.mo" 2021-11-24 08:09:22.147363002 +0000 +++ "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/InductionMachines/IMC_DOL.mo" 2021-11-24 08:09:50.879276605 +0000 @@ -3,32 +3,32 @@ extends Modelica.Icons.Example; import Modelica.Constants.pi; parameter Integer m=3 "Number of phases"; - parameter Integer mBase=Modelica.Electrical.MultiPhase.Functions.numberOfSymmetricBaseSystems(m) + parameter Integer mBase=Modelica.Electrical.Polyphase.Functions.numberOfSymmetricBaseSystems(m) "Number of base systems"; - parameter Modelica.SIunits.Voltage VsNominal=100 "Nominal RMS voltage per phase"; - parameter Modelica.SIunits.Current IsNominal=100 "Nominal RMS current per phase"; - parameter Modelica.SIunits.Frequency fsNominal=imc.fsNominal "Nominal frequency"; - parameter Modelica.SIunits.Time tOn=0.1 "Start time of machine"; - parameter Modelica.SIunits.Torque tauLoad=161.4 "Nominal load torque"; - parameter Modelica.SIunits.AngularVelocity + parameter Modelica.Units.SI.Voltage VsNominal=100 "Nominal RMS voltage per phase"; + parameter Modelica.Units.SI.Current IsNominal=100 "Nominal RMS current per phase"; + parameter Modelica.Units.SI.Frequency fsNominal=imc.fsNominal "Nominal frequency"; + parameter Modelica.Units.SI.Time tOn=0.1 "Start time of machine"; + parameter Modelica.Units.SI.Torque tauLoad=161.4 "Nominal load torque"; + parameter Modelica.Units.SI.AngularVelocity w_Load(displayUnit="rev/min")=1440.45*2*Modelica.Constants.pi/60 "Nominal load speed"; - parameter Modelica.SIunits.Inertia JLoad=0.5 "Load inertia"; + parameter Modelica.Units.SI.Inertia JLoad=0.5 "Load inertia"; parameter Integer p=2 "Number of pole pairs"; - Modelica.SIunits.Current I=currentRMSSensor.I "Transient RMS current"; - Modelica.SIunits.Current Iqs=currentRMSSensorQS.I "QS RMS current"; - Modelica.Electrical.QuasiStationary.MultiPhase.Sources.VoltageSource + Modelica.Units.SI.Current I=currentRMSSensor.I "Transient RMS current"; + Modelica.Units.SI.Current Iqs=currentRMSSensorQS.I "QS RMS current"; + Modelica.Electrical.QuasiStatic.Polyphase.Sources.VoltageSource voltageSourceQS(m=m,f=fsNominal,V=fill(VsNominal, m), - phi=-Modelica.Electrical.MultiPhase.Functions.symmetricOrientation(m)) + phi=-Modelica.Electrical.Polyphase.Functions.symmetricOrientation(m)) annotation (Placement(transformation(origin={-60,40},extent={{-10,-10},{10,10}},rotation=270))); - Modelica.Electrical.QuasiStationary.MultiPhase.Basic.Star starQS(m=m) + Modelica.Electrical.QuasiStatic.Polyphase.Basic.Star starQS(m=m) annotation (Placement(transformation(origin={-70,20},extent={{-10,10},{10,-10}},rotation=180))); - Modelica.Electrical.QuasiStationary.SinglePhase.Basic.Ground groundQS + Modelica.Electrical.QuasiStatic.SinglePhase.Basic.Ground groundQS annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=270,origin={-90,20}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Sensors.PowerSensor + Modelica.Electrical.QuasiStatic.Polyphase.Sensors.PowerSensor powerSensorQS(m=m) annotation (Placement(transformation(extent={{-40,70},{-20,90}}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Sensors.CurrentQuasiRMSSensor currentRMSSensorQS(m=m) annotation (Placement(transformation(extent={{-10,70},{10,90}}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Ideal.IdealClosingSwitch + Modelica.Electrical.QuasiStatic.Polyphase.Sensors.CurrentQuasiRMSSensor currentRMSSensorQS(m=m) annotation (Placement(transformation(extent={{-10,70},{10,90}}))); + Modelica.Electrical.QuasiStatic.Polyphase.Ideal.IdealClosingSwitch idealCloserQS(final m=m,Ron=fill(1e-5*m/3, m),Goff=fill(1e-5*3/m, m)) annotation (Placement(transformation(origin={-60,70},extent={{10,10},{-10,-10}},rotation=270))); Modelica.Blocks.Sources.BooleanStep @@ -36,17 +36,17 @@ annotation (Placement(transformation(extent={{-100,60},{-80,80}}))); Modelica.Electrical.Analog.Basic.Ground ground annotation (Placement(transformation(origin={-90,-80},extent={{-10,-10},{10,10}},rotation=270))); - Modelica.Electrical.MultiPhase.Basic.Star star(final m=m) + Modelica.Electrical.Polyphase.Basic.Star star(final m=m) annotation (Placement(transformation(extent={{-60,-90},{-80,-70}}))); - Modelica.Electrical.MultiPhase.Sources.CosineVoltage cosineVoltage( + Modelica.Electrical.Polyphase.Sources.CosineVoltage cosineVoltage( final m=m, - freqHz=fill(fsNominal, m), +f =fill(fsNominal, m), V=fill(sqrt(2.0)*VsNominal, m)) annotation (Placement( transformation( origin={-60,-60}, extent={{10,10},{-10,-10}}, rotation=90))); - Modelica.Electrical.MultiPhase.Ideal.IdealClosingSwitch idealCloser( + Modelica.Electrical.Polyphase.Ideal.IdealClosingSwitch idealCloser( final m=m, Ron=fill(1e-5*m/3, m), Goff=fill(1e-5*3/m, m)) annotation (Placement(transformation( @@ -56,10 +56,9 @@ Modelica.Blocks.Sources.BooleanStep booleanStep[m](each startTime=tOn, each startValue=false) annotation (Placement(transformation( extent={{-100,-40},{-80,-20}}))); - Modelica.Electrical.MultiPhase.Sensors.CurrentQuasiRMSSensor currentRMSSensor(final m=m) annotation (Placement(transformation(origin={0,-20}, extent={{-10,-10},{10,10}}))); + Modelica.Electrical.Polyphase.Sensors.CurrentQuasiRMSSensor currentRMSSensor(final m=m) annotation (Placement(transformation(origin={0,-20}, extent={{-10,-10},{10,10}}))); Modelica.Electrical.Machines.Utilities.MultiTerminalBox terminalBox(m=m, terminalConnection="Y") annotation (Placement(transformation(extent={{20,-54},{40,-34}}))); - Modelica.Magnetic.FundamentalWave.BasicMachines.AsynchronousInductionMachines.AIM_SquirrelCage - imc( + Modelica.Magnetic.FundamentalWave.BasicMachines.InductionMachines.IM_SquirrelCage imc( Jr=imcData.Jr, Js=imcData.Js, p=imcData.p, @@ -91,7 +90,7 @@ tau_nominal=-tauLoad, TorqueDirection=false, useSupport=false) annotation (Placement(transformation(extent={{100,-70},{80,-50}}))); - Modelica.Electrical.MultiPhase.Sensors.PowerSensor powerSensor(final + Modelica.Electrical.Polyphase.Sensors.PowerSensor powerSensor(final m=m) annotation (Placement(transformation(extent={{-40,-30},{-20,-10}}))); Modelica.Mechanics.Rotational.Components.Inertia loadInertiaQS(J= JLoad) annotation (Placement(transformation(extent={{50,30},{70,50}}))); @@ -125,11 +124,11 @@ TsOperational=imcData.TsRef, effectiveStatorTurns=imcData.effectiveStatorTurns, TrOperational=imcData.TrRef) annotation (Placement(transformation(extent={{20,30},{40,50}}))); - Modelica.Electrical.QuasiStationary.SinglePhase.Basic.Ground + Modelica.Electrical.QuasiStatic.SinglePhase.Basic.Ground groundMachineQS annotation (Placement(transformation( extent={{-10,-10},{10,10}}, origin={-10,10}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Basic.Star + Modelica.Electrical.QuasiStatic.Polyphase.Basic.Star starMachineQS(m= mBase) annotation (Placement(transformation( @@ -137,7 +136,7 @@ rotation=270, origin={-10,30}))); Modelica.Magnetic.QuasiStatic.FundamentalWave.Utilities.MultiTerminalBox terminalBoxQS(m=m, terminalConnection="Y") annotation (Placement(transformation(extent={{20,46},{40,66}}))); - Modelica.Electrical.MultiPhase.Basic.Star starMachine(m = mBase) annotation (Placement(transformation( + Modelica.Electrical.Polyphase.Basic.Star starMachine(m = mBase) annotation (Placement(transformation( extent={{10,-10},{-10,10}}, rotation=90, origin={-12,-70}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/InductionMachines/IMC_Inverter1.mo" "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/InductionMachines/IMC_Inverter1.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/InductionMachines/IMC_Inverter1.mo" 2021-11-24 08:09:22.147363002 +0000 +++ "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/InductionMachines/IMC_Inverter1.mo" 2021-11-24 08:09:50.787276881 +0000 @@ -3,18 +3,17 @@ extends Modelica.Icons.Example; import Modelica.Constants.pi; parameter Integer m=3 "Number of phases"; - parameter Modelica.SIunits.Voltage VsNominal=100 "Nominal RMS voltage per phase"; - parameter Modelica.SIunits.Current IsNominal=100 "Nominal RMS current per phase"; - parameter Modelica.SIunits.Frequency fsNominal=imcData.fsNominal "Nominal frequency"; - parameter Modelica.SIunits.Frequency f=fsNominal "Maximum operational frequency"; - Modelica.SIunits.Frequency fActual=ramp.y "Actual frequency"; - parameter Modelica.SIunits.Time tRamp=1 "Frequency ramp"; - parameter Modelica.SIunits.Torque TLoad=161.4 "Nominal load torque"; - parameter Modelica.SIunits.Time tStep=1.5 "Time of load torque step"; - parameter Modelica.SIunits.Inertia JLoad=0.29 "Load's moment of inertia"; - output Modelica.SIunits.Current I=currentRMSSensor.I "Transient RMS current"; - Modelica.Magnetic.FundamentalWave.BasicMachines.AsynchronousInductionMachines.AIM_SquirrelCage - imc( + parameter Modelica.Units.SI.Voltage VsNominal=100 "Nominal RMS voltage per phase"; + parameter Modelica.Units.SI.Current IsNominal=100 "Nominal RMS current per phase"; + parameter Modelica.Units.SI.Frequency fsNominal=imcData.fsNominal "Nominal frequency"; + parameter Modelica.Units.SI.Frequency f=fsNominal "Maximum operational frequency"; + Modelica.Units.SI.Frequency fActual=ramp.y "Actual frequency"; + parameter Modelica.Units.SI.Time tRamp=1 "Frequency ramp"; + parameter Modelica.Units.SI.Torque TLoad=161.4 "Nominal load torque"; + parameter Modelica.Units.SI.Time tStep=1.5 "Time of load torque step"; + parameter Modelica.Units.SI.Inertia JLoad=0.29 "Load's moment of inertia"; + output Modelica.Units.SI.Current I=currentRMSSensor.I "Transient RMS current"; + Modelica.Magnetic.FundamentalWave.BasicMachines.InductionMachines.IM_SquirrelCage imc( p=imcData.p, fsNominal=imcData.fsNominal, TsRef=imcData.TsRef, @@ -46,12 +45,12 @@ fNominal=fsNominal, VNominal=VsNominal) annotation (Placement( transformation(extent={{-40,-10},{-20,10}}))); - Modelica.Electrical.MultiPhase.Sources.SignalVoltage signalVoltage( + Modelica.Electrical.Polyphase.Sources.SignalVoltage signalVoltage( final m=m) annotation (Placement(transformation( origin={-10,-30}, extent={{-10,10},{10,-10}}, rotation=180))); - Modelica.Electrical.MultiPhase.Basic.Star star(final m=m) annotation ( + Modelica.Electrical.Polyphase.Basic.Star star(final m=m) annotation ( Placement(transformation(extent={{-30,-40},{-50,-20}}))); Modelica.Electrical.Analog.Basic.Ground ground annotation (Placement( transformation( @@ -67,8 +66,8 @@ offsetTorque=0) annotation (Placement(transformation(extent={{96,-90}, {76,-70}}))); Modelica.Electrical.Machines.Utilities.MultiTerminalBox terminalBox(terminalConnection="Y", m=m) annotation (Placement(transformation(extent={{20,-74},{40,-54}}))); - Modelica.Electrical.MultiPhase.Sensors.CurrentQuasiRMSSensor currentRMSSensor(final m=m) annotation (Placement(transformation(origin={20,-30}, extent={{-10,10},{10,-10}}))); - Modelica.Electrical.MultiPhase.Basic.Star starMachine(final m=Modelica.Electrical.MultiPhase.Functions.numberOfSymmetricBaseSystems(m)) annotation (Placement(transformation( + Modelica.Electrical.Polyphase.Sensors.CurrentQuasiRMSSensor currentRMSSensor(final m=m) annotation (Placement(transformation(origin={20,-30}, extent={{-10,10},{10,-10}}))); + Modelica.Electrical.Polyphase.Basic.Star starMachine(final m=Modelica.Electrical.Polyphase.Functions.numberOfSymmetricBaseSystems(m)) annotation (Placement(transformation( extent={{10,-10},{-10,10}}, rotation=0, origin={0,-74}))); @@ -76,7 +75,7 @@ origin={-30,-74}, extent={{-10,-10},{10,10}}, rotation=270))); - Modelica.Electrical.MultiPhase.Sensors.VoltageQuasiRMSSensor voltageRMSSensor(final m=m) annotation ( + Modelica.Electrical.Polyphase.Sensors.VoltageQuasiRMSSensor voltageRMSSensor(final m=m) annotation ( Placement(transformation(origin={54,-54}, extent={{10,10},{-10,-10}}, rotation=270))); parameter ParameterRecords.IMC imcData "Induction machine parameters" annotation (Placement(transformation(extent={{50,-10},{70,10}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/InductionMachines/IMC_Steinmetz.mo" "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/InductionMachines/IMC_Steinmetz.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/InductionMachines/IMC_Steinmetz.mo" 2021-11-24 08:09:22.147363002 +0000 +++ "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/InductionMachines/IMC_Steinmetz.mo" 2021-11-24 08:09:50.699277146 +0000 @@ -2,19 +2,19 @@ model IMC_Steinmetz "Induction machine with squirrel cage and Steinmetz-connection" extends Modelica.Icons.Example; constant Integer m=3 "Number of phases"; - parameter Modelica.SIunits.Voltage VsNominal=100 "Nominal RMS voltage per phase"; - parameter Modelica.SIunits.Current IsNominal=100 "Nominal RMS current per phase"; - parameter Modelica.SIunits.Frequency fsNominal=imcData.fsNominal "Nominal frequency"; - parameter Modelica.SIunits.Time tStart1=0.1 "Start time"; - parameter Modelica.SIunits.Capacitance Cr=0.0035 "Motor's running capacitor"; - parameter Modelica.SIunits.Capacitance Cs=5*Cr "Motor's (additional) starting capacitor"; - parameter Modelica.SIunits.AngularVelocity wSwitch(displayUnit="rev/min")= + parameter Modelica.Units.SI.Voltage VsNominal=100 "Nominal RMS voltage per phase"; + parameter Modelica.Units.SI.Current IsNominal=100 "Nominal RMS current per phase"; + parameter Modelica.Units.SI.Frequency fsNominal=imcData.fsNominal "Nominal frequency"; + parameter Modelica.Units.SI.Time tStart1=0.1 "Start time"; + parameter Modelica.Units.SI.Capacitance Cr=0.0035 "Motor's running capacitor"; + parameter Modelica.Units.SI.Capacitance Cs=5*Cr "Motor's (additional) starting capacitor"; + parameter Modelica.Units.SI.AngularVelocity wSwitch(displayUnit="rev/min")= 1350*2*Modelica.Constants.pi/60 "Speed for switching off the starting capacitor"; - parameter Modelica.SIunits.Torque tauLoad=2/3*161.4 "Nominal load torque"; - parameter Modelica.SIunits.AngularVelocity wLoad(displayUnit="rev/min")= + parameter Modelica.Units.SI.Torque tauLoad=2/3*161.4 "Nominal load torque"; + parameter Modelica.Units.SI.AngularVelocity wLoad(displayUnit="rev/min")= 1462.5*2*Modelica.Constants.pi/60 "Nominal load speed"; - parameter Modelica.SIunits.Inertia JLoad=0.29 "Load's moment of inertia"; - Modelica.Magnetic.FundamentalWave.BasicMachines.AsynchronousInductionMachines.AIM_SquirrelCage imc( + parameter Modelica.Units.SI.Inertia JLoad=0.29 "Load's moment of inertia"; + Modelica.Magnetic.FundamentalWave.BasicMachines.InductionMachines.IM_SquirrelCage imc( p=imcData.p, fsNominal=imcData.fsNominal, TsRef=imcData.TsRef, @@ -37,7 +37,7 @@ TsOperational=imcData.TsRef, alpha20r=imcData.alpha20r, TrOperational=imcData.TrRef) annotation (Placement(transformation(extent={{-20,-50},{0,-30}}))); - Modelica.Electrical.Analog.Sources.SineVoltage sineVoltage(freqHz=fsNominal, V=sqrt(2)*VsNominal) annotation (Placement( + Modelica.Electrical.Analog.Sources.SineVoltage sineVoltage(f =fsNominal, V=sqrt(2)*VsNominal) annotation (Placement( transformation(extent={{-50,90},{-70,70}}))); Modelica.Electrical.Analog.Basic.Ground ground annotation (Placement( transformation( @@ -57,15 +57,15 @@ tau_nominal=-tauLoad, useSupport=false) annotation (Placement(transformation(extent={{90,-50},{70,-30}}))); Modelica.Electrical.Machines.Utilities.TerminalBox terminalBox(terminalConnection="D") annotation (Placement(transformation(extent={{-20,-34},{0,-14}}))); - Modelica.Electrical.MultiPhase.Basic.PlugToPin_p pin3(m=m, k=3) annotation (Placement(transformation( + Modelica.Electrical.Polyphase.Basic.PlugToPin_p pin3(m=m, k=3) annotation (Placement(transformation( origin={-30,18}, extent={{-10,-10},{10,10}}, rotation=90))); - Modelica.Electrical.MultiPhase.Basic.PlugToPin_p pin2(m=m, k=2) annotation (Placement(transformation( + Modelica.Electrical.Polyphase.Basic.PlugToPin_p pin2(m=m, k=2) annotation (Placement(transformation( origin={-10,18}, extent={{-10,-10},{10,10}}, rotation=90))); - Modelica.Electrical.MultiPhase.Basic.PlugToPin_p pin1(m=m, k=1) annotation (Placement(transformation( + Modelica.Electrical.Polyphase.Basic.PlugToPin_p pin1(m=m, k=1) annotation (Placement(transformation( origin={10,18}, extent={{-10,-10},{10,10}}, rotation=90))); @@ -88,7 +88,7 @@ extent={{-10,-10},{10,10}}, rotation=90))); Modelica.Mechanics.Rotational.Sensors.SpeedSensor speedSensor annotation (Placement(transformation(extent={{-10,-10},{10,10}}, origin={30,-20}))); - Modelica.Electrical.MultiPhase.Sensors.CurrentSensor currentSensor annotation (Placement(transformation( + Modelica.Electrical.Polyphase.Sensors.CurrentSensor currentSensor annotation (Placement(transformation( origin={-10,-10}, extent={{-10,-10},{10,10}}, rotation=270))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/InductionMachines/IMC_Transformer.mo" "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/InductionMachines/IMC_Transformer.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/InductionMachines/IMC_Transformer.mo" 2021-11-24 08:09:22.147363002 +0000 +++ "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/InductionMachines/IMC_Transformer.mo" 2021-11-24 08:09:50.651277290 +0000 @@ -3,15 +3,15 @@ import Modelica.Constants.pi; extends Modelica.Icons.Example; constant Integer m=3 "Number of phases"; - parameter Modelica.SIunits.Voltage VsNominal=100 "Nominal RMS voltage per phase"; - parameter Modelica.SIunits.Current IsNominal=100 "Nominal RMS current per phase"; - parameter Modelica.SIunits.Frequency fsNominal=50 "Nominal frequency"; - parameter Modelica.SIunits.Time tStart1=0.1 "Start time"; - parameter Modelica.SIunits.Time tStart2=2.0 "Start time of bypass transformer"; - parameter Modelica.SIunits.Torque TLoad=161.4 "Nominal load torque"; - parameter Modelica.SIunits.AngularVelocity wLoad(displayUnit="rev/min")= + parameter Modelica.Units.SI.Voltage VsNominal=100 "Nominal RMS voltage per phase"; + parameter Modelica.Units.SI.Current IsNominal=100 "Nominal RMS current per phase"; + parameter Modelica.Units.SI.Frequency fsNominal=50 "Nominal frequency"; + parameter Modelica.Units.SI.Time tStart1=0.1 "Start time"; + parameter Modelica.Units.SI.Time tStart2=2.0 "Start time of bypass transformer"; + parameter Modelica.Units.SI.Torque TLoad=161.4 "Nominal load torque"; + parameter Modelica.Units.SI.AngularVelocity wLoad(displayUnit="rev/min")= 1440.45*2*Modelica.Constants.pi/60 "Nominal load speed"; - parameter Modelica.SIunits.Inertia JLoad=0.29 "Load's moment of inertia"; + parameter Modelica.Units.SI.Inertia JLoad=0.29 "Load's moment of inertia"; Modelica.Magnetic.QuasiStatic.FundamentalWave.BasicMachines.InductionMachines.IM_SquirrelCage imcQS( p=imcData.p, fsNominal=imcData.fsNominal, @@ -35,31 +35,31 @@ effectiveStatorTurns=imcData.effectiveStatorTurns, alpha20r=imcData.alpha20r, TrOperational=imcData.TrRef) annotation (Placement(transformation(extent={{80,10},{60,30}}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Sensors.CurrentQuasiRMSSensor currentRMSSensorQS(m=m) annotation (Placement(transformation( + Modelica.Electrical.QuasiStatic.Polyphase.Sensors.CurrentQuasiRMSSensor currentRMSSensorQS(m=m) annotation (Placement(transformation( origin={-40,80}, extent={{-10,10},{10,-10}}, rotation=0))); - Modelica.Electrical.QuasiStationary.MultiPhase.Sources.VoltageSource sineVoltageQS( + Modelica.Electrical.QuasiStatic.Polyphase.Sources.VoltageSource sineVoltageQS( final m=m, f=fsNominal, V=fill(VsNominal/sqrt(3), m)) annotation (Placement(transformation(origin={-70,80}, extent={{10,10},{-10,-10}}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Basic.Star starQS(final m=m) annotation (Placement(transformation( + Modelica.Electrical.QuasiStatic.Polyphase.Basic.Star starQS(final m=m) annotation (Placement(transformation( extent={{10,-10},{-10,10}}, rotation=90, origin={-80,50}))); - Modelica.Electrical.QuasiStationary.SinglePhase.Basic.Ground groundQS annotation (Placement(transformation( + Modelica.Electrical.QuasiStatic.SinglePhase.Basic.Ground groundQS annotation (Placement(transformation( origin={-80,20}, extent={{-10,-10},{10,10}}, rotation=0))); Modelica.Blocks.Sources.BooleanStep booleanStep1QS[m](each startTime=tStart1) annotation (Placement(transformation(extent={{-60,40},{-40,60}}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Ideal.IdealClosingSwitch idealCloserQS( + Modelica.Electrical.QuasiStatic.Polyphase.Ideal.IdealClosingSwitch idealCloserQS( final m=m, Ron=fill(1e-5, m), Goff=fill(1e-5, m)) annotation (Placement(transformation( origin={-10,80}, extent={{-10,10},{10,-10}}, rotation=0))); - Modelica.Electrical.QuasiStationary.Machines.BasicMachines.Transformers.Yy.Yy00 transformerQS( + Modelica.Electrical.QuasiStatic.Machines.BasicMachines.Transformers.Yy.Yy00 transformerQS( n=transformerData.n, R1=transformerData.R1, L1sigma=transformerData.L1sigma, @@ -75,7 +75,7 @@ rotation=0, origin={20,80}))); - Modelica.Electrical.QuasiStationary.SinglePhase.Basic.Ground ground2QS annotation (Placement(transformation( + Modelica.Electrical.QuasiStatic.SinglePhase.Basic.Ground ground2QS annotation (Placement(transformation( origin={20,50}, extent={{-10,-10},{10,10}}, rotation=0))); @@ -95,7 +95,7 @@ v_sc=0.06, P_sc=500) "Transformer parameters" annotation (Placement(transformation(extent={{80,80},{100,100}}))); Modelica.Blocks.Sources.BooleanStep booleanStep2QS[m](each startTime=tStart2) annotation (Placement(transformation(extent={{-60,10},{-40,30}}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Ideal.IdealCommutingSwitch idealCommutingSwitchQS( + Modelica.Electrical.QuasiStatic.Polyphase.Ideal.IdealCommutingSwitch idealCommutingSwitchQS( final m=m, Ron=fill(1e-5, m), Goff=fill(50E-5, m)) annotation (Placement(transformation( @@ -110,7 +110,7 @@ useSupport=false) annotation (Placement(transformation(extent={{0,10},{20,30}}))); Modelica.Magnetic.QuasiStatic.FundamentalWave.Utilities.TerminalBox terminalBoxQS(terminalConnection="D", m=m) annotation (Placement(transformation(extent={{80,26},{60,46}}))); - Modelica.Magnetic.FundamentalWave.BasicMachines.AsynchronousInductionMachines.AIM_SquirrelCage imc( + Modelica.Magnetic.FundamentalWave.BasicMachines.InductionMachines.IM_SquirrelCage imc( p=imcData.p, fsNominal=imcData.fsNominal, TsRef=imcData.TsRef, @@ -134,17 +134,17 @@ effectiveStatorTurns=imcData.effectiveStatorTurns, alpha20r=imcData.alpha20r, TrOperational=imcData.TrRef) annotation (Placement(transformation(extent={{80,-90},{60,-70}}))); - Modelica.Electrical.MultiPhase.Sensors.CurrentQuasiRMSSensor currentRMSSensor(m=m) annotation (Placement(transformation( + Modelica.Electrical.Polyphase.Sensors.CurrentQuasiRMSSensor currentRMSSensor(m=m) annotation (Placement(transformation( origin={-40,-20}, extent={{-10,10},{10,-10}}, rotation=0))); - Modelica.Electrical.MultiPhase.Sources.SineVoltage sineVoltage( + Modelica.Electrical.Polyphase.Sources.SineVoltage sineVoltage( final m=m, - freqHz=fill(fsNominal, m), +f =fill(fsNominal, m), V=fill(sqrt(2/3)*VsNominal, m)) annotation (Placement(transformation( origin={-70,-20}, extent={{10,10},{-10,-10}}))); - Modelica.Electrical.MultiPhase.Basic.Star star(final m=m) annotation ( + Modelica.Electrical.Polyphase.Basic.Star star(final m=m) annotation ( Placement(transformation(extent={{10,-10},{-10,10}}, rotation=90, origin={-80,-50}))); @@ -155,7 +155,7 @@ rotation=0))); Modelica.Blocks.Sources.BooleanStep booleanStep1[m](each startTime= tStart1) annotation (Placement(transformation(extent={{-60,-60},{-40,-40}}))); - Modelica.Electrical.MultiPhase.Ideal.IdealClosingSwitch idealCloser( + Modelica.Electrical.Polyphase.Ideal.IdealClosingSwitch idealCloser( final m=m, Ron=fill(1e-5, m), Goff=fill(1e-5, m)) annotation (Placement(transformation( @@ -184,7 +184,7 @@ rotation=0))); Modelica.Blocks.Sources.BooleanStep booleanStep2[m](each startTime= tStart2) annotation (Placement(transformation(extent={{-60,-90},{-40,-70}}))); - Modelica.Electrical.MultiPhase.Ideal.IdealCommutingSwitch + Modelica.Electrical.Polyphase.Ideal.IdealCommutingSwitch idealCommutingSwitch( final m=m, Ron=fill(1e-5, m), diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/InductionMachines/IMC_YD.mo" "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/InductionMachines/IMC_YD.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/InductionMachines/IMC_YD.mo" 2021-11-24 08:09:22.147363002 +0000 +++ "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/InductionMachines/IMC_YD.mo" 2021-11-24 08:09:50.563277554 +0000 @@ -3,15 +3,15 @@ import Modelica.Constants.pi; extends Modelica.Icons.Example; constant Integer m=3 "Number of phases"; - parameter Modelica.SIunits.Voltage VsNominal=100 "Nominal RMS voltage per phase"; - parameter Modelica.SIunits.Current IsNominal=100 "Nominal RMS current per phase"; - parameter Modelica.SIunits.Frequency fsNominal=50 "Nominal frequency"; - parameter Modelica.SIunits.Time tStart1=0.1 "Start time"; - parameter Modelica.SIunits.Time tStart2=2.0 "Start time from Y to D"; - parameter Modelica.SIunits.Torque TLoad=161.4 "Nominal load torque"; - parameter Modelica.SIunits.AngularVelocity wLoad(displayUnit="rev/min")= + parameter Modelica.Units.SI.Voltage VsNominal=100 "Nominal RMS voltage per phase"; + parameter Modelica.Units.SI.Current IsNominal=100 "Nominal RMS current per phase"; + parameter Modelica.Units.SI.Frequency fsNominal=50 "Nominal frequency"; + parameter Modelica.Units.SI.Time tStart1=0.1 "Start time"; + parameter Modelica.Units.SI.Time tStart2=2.0 "Start time from Y to D"; + parameter Modelica.Units.SI.Torque TLoad=161.4 "Nominal load torque"; + parameter Modelica.Units.SI.AngularVelocity wLoad(displayUnit="rev/min")= 1440.45*2*Modelica.Constants.pi/60 "Nominal load speed"; - parameter Modelica.SIunits.Inertia JLoad=0.29 "Load's moment of inertia"; + parameter Modelica.Units.SI.Inertia JLoad=0.29 "Load's moment of inertia"; Modelica.Magnetic.QuasiStatic.FundamentalWave.BasicMachines.InductionMachines.IM_SquirrelCage imcQS( p=imcData.p, fsNominal=imcData.fsNominal, @@ -36,24 +36,24 @@ effectiveStatorTurns=imcData.effectiveStatorTurns, alpha20r=imcData.alpha20r, TrOperational=imcData.TrRef) annotation (Placement(transformation(extent={{20,10},{40,30}}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Sensors.CurrentQuasiRMSSensor currentRMSSensorQS(m=m) annotation (Placement(transformation( + Modelica.Electrical.QuasiStatic.Polyphase.Sensors.CurrentQuasiRMSSensor currentRMSSensorQS(m=m) annotation (Placement(transformation( extent={{-10,10},{10,-10}}, rotation=270, origin={30,70}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Sources.VoltageSource sineVoltageQS( + Modelica.Electrical.QuasiStatic.Polyphase.Sources.VoltageSource sineVoltageQS( final m=m, f=fsNominal, V=fill(VsNominal/sqrt(3), m)) annotation (Placement(transformation( origin={-30,90}, extent={{10,10},{-10,-10}}, rotation=0))); - Modelica.Electrical.QuasiStationary.MultiPhase.Basic.Star starQS(final m=m) annotation (Placement(transformation(extent={{-50,80},{-70,100}}))); - Modelica.Electrical.QuasiStationary.SinglePhase.Basic.Ground groundQS annotation (Placement(transformation( + Modelica.Electrical.QuasiStatic.Polyphase.Basic.Star starQS(final m=m) annotation (Placement(transformation(extent={{-50,80},{-70,100}}))); + Modelica.Electrical.QuasiStatic.SinglePhase.Basic.Ground groundQS annotation (Placement(transformation( origin={-90,90}, extent={{-10,-10},{10,10}}, rotation=270))); Modelica.Blocks.Sources.BooleanStep booleanStepQS[m](each startTime=tStart1) annotation (Placement(transformation(extent={{-80,50},{-60,70}}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Ideal.IdealClosingSwitch idealCloserQS( + Modelica.Electrical.QuasiStatic.Polyphase.Ideal.IdealClosingSwitch idealCloserQS( final m=m, Ron=fill(1e-5, m), Goff=fill(1e-5, m)) annotation (Placement(transformation( @@ -69,7 +69,7 @@ tau_nominal=-TLoad, useSupport=false) annotation (Placement(transformation(extent={{100,10},{80,30}}))); - Modelica.Magnetic.FundamentalWave.BasicMachines.AsynchronousInductionMachines.AIM_SquirrelCage imc( + Modelica.Magnetic.FundamentalWave.BasicMachines.InductionMachines.IM_SquirrelCage imc( p=imcData.p, fsNominal=imcData.fsNominal, TsRef=imcData.TsRef, @@ -97,14 +97,14 @@ extent={{-10,10},{10,-10}}, rotation=270, origin={30,-30}))); - Modelica.Electrical.MultiPhase.Sources.SineVoltage sineVoltage( + Modelica.Electrical.Polyphase.Sources.SineVoltage sineVoltage( final m=m, - freqHz=fill(fsNominal, m), +f =fill(fsNominal, m), V=fill(sqrt(2/3)*VsNominal, m)) annotation (Placement(transformation( origin={-30,-10}, extent={{10,10},{-10,-10}}, rotation=0))); - Modelica.Electrical.MultiPhase.Basic.Star star(final m=m) annotation ( + Modelica.Electrical.Polyphase.Basic.Star star(final m=m) annotation ( Placement(transformation(extent={{-50,-20},{-70,0}}))); Modelica.Electrical.Analog.Basic.Ground ground annotation (Placement( transformation( @@ -113,7 +113,7 @@ rotation=270))); Modelica.Blocks.Sources.BooleanStep booleanStep[m](each startTime= tStart1) annotation (Placement(transformation(extent={{-80,-50},{-60,-30}}))); - Modelica.Electrical.MultiPhase.Ideal.IdealClosingSwitch idealCloser( + Modelica.Electrical.Polyphase.Ideal.IdealClosingSwitch idealCloser( final m=m, Ron=fill(1e-5, m), Goff=fill(1e-5, m)) annotation (Placement(transformation( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/InductionMachines/IMC_withLosses.mo" "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/InductionMachines/IMC_withLosses.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/InductionMachines/IMC_withLosses.mo" 2021-11-24 08:09:22.147363002 +0000 +++ "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/InductionMachines/IMC_withLosses.mo" 2021-11-24 08:09:50.487277783 +0000 @@ -3,30 +3,30 @@ extends Modelica.Icons.Example; import Modelica.Constants.pi; constant Integer m=3 "Number of phases"; - Modelica.SIunits.Power Ps=electricalPowerSensor.y.re "Stator active power"; - Modelica.SIunits.ReactivePower Qs=electricalPowerSensor.y.im "Stator reactive power"; - Modelica.SIunits.ApparentPower Ss=sqrt(Ps^2 + Qs^2) "Stator apparent power"; + Modelica.Units.SI.Power Ps=electricalPowerSensor.apparentPower.re "Stator active power"; + Modelica.Units.SI.ReactivePower Qs=electricalPowerSensor.apparentPower.im "Stator reactive power"; + Modelica.Units.SI.ApparentPower Ss=sqrt(Ps^2 + Qs^2) "Stator apparent power"; protected parameter Real Ptable[:]={1E-6,1845,3549,5325,7521,9372,11010,12930, 14950,16360,18500,18560,20180,22170} "Table of measured power data"; parameter Real Itable[:]={11.0,11.20,12.27,13.87,16.41,18.78,21.07, 23.92,27.05,29.40,32.85,32.95,35.92,39.35} "Table of measured current data"; - parameter Real wtable[:]=Modelica.SIunits.Conversions.from_rpm({1500,1496,1493,1490,1486,1482,1479,1475,1471, + parameter Real wtable[:]=Modelica.Units.Conversions.from_rpm({1500,1496,1493,1490,1486,1482,1479,1475,1471, 1467,1462,1462,1458,1453}) "Table of measured speed data"; parameter Real ctable[:]={0.085,0.327,0.506,0.636,0.741,0.797,0.831, 0.857,0.875,0.887,0.896,0.896,0.902,0.906} "Table of measured power factor data"; parameter Real etable[:]={0,0.7250,0.8268,0.8698,0.8929,0.9028,0.9064, 0.9088,0.9089,0.9070,0.9044,0.9043,0.9008,0.8972} "Table of measured efficiency data"; public - output Modelica.SIunits.Power Pm=powerSensor.power "Mechanical output power"; - output Modelica.SIunits.Power Ps_sim=sqrt(3)*imcData.VsNominal*I_sim*pfs_sim "Simulated stator power"; - output Modelica.SIunits.Power Ps_meas=sqrt(3)*imcData.VsNominal*I_meas*pfs_meas "Simulated stator power"; - output Modelica.SIunits.Power loss_sim=Ps_sim-Pm "Simulated total losses"; - output Modelica.SIunits.Power loss_meas=Ps_meas-Pm "Measured total losses"; - output Modelica.SIunits.Current I_sim=currentRMSSensor.I "Simulated current"; - output Modelica.SIunits.Current I_meas=combiTable1Ds.y[1] "Measured current"; - output Modelica.SIunits.AngularVelocity w_sim(displayUnit="rev/min") = imc.wMechanical "Simulated speed"; - output Modelica.SIunits.AngularVelocity w_meas(displayUnit="rev/min")=combiTable1Ds.y[2] "Measured speed"; + output Modelica.Units.SI.Power Pm=powerSensor.power "Mechanical output power"; + output Modelica.Units.SI.Power Ps_sim=sqrt(3)*imcData.VsNominal*I_sim*pfs_sim "Simulated stator power"; + output Modelica.Units.SI.Power Ps_meas=sqrt(3)*imcData.VsNominal*I_meas*pfs_meas "Simulated stator power"; + output Modelica.Units.SI.Power loss_sim=Ps_sim-Pm "Simulated total losses"; + output Modelica.Units.SI.Power loss_meas=Ps_meas-Pm "Measured total losses"; + output Modelica.Units.SI.Current I_sim=currentRMSSensor.I "Simulated current"; + output Modelica.Units.SI.Current I_meas=combiTable1Ds.y[1] "Measured current"; + output Modelica.Units.SI.AngularVelocity w_sim(displayUnit="rev/min") = imc.wMechanical "Simulated speed"; + output Modelica.Units.SI.AngularVelocity w_meas(displayUnit="rev/min")=combiTable1Ds.y[2] "Measured speed"; output Real pfs_sim=if noEvent(Ss > Modelica.Constants.small) then Ps/ Ss else 0 "Simulated power factor"; output Real pfs_meas=combiTable1Ds.y[3] "Measured power factor"; @@ -60,15 +60,15 @@ TrOperational=imcData.TNominal) annotation (Placement(transformation(extent={{-20,60},{0,80}}))); Modelica.Magnetic.QuasiStatic.FundamentalWave.Utilities.MultiTerminalBox terminalBox(terminalConnection="D", m=m) annotation (Placement(transformation(extent={{-20,76},{0,96}}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Sensors.PowerSensor electricalPowerSensor(m=m) annotation (Placement(transformation( + Modelica.Electrical.QuasiStatic.Polyphase.Sensors.PowerSensor electricalPowerSensor(m=m) annotation (Placement(transformation( extent={{-10,-10},{10,10}}, rotation=0, origin={-40,90}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Sensors.CurrentQuasiRMSSensor currentRMSSensor(m=m) annotation (Placement(transformation( + Modelica.Electrical.QuasiStatic.Polyphase.Sensors.CurrentQuasiRMSSensor currentRMSSensor(m=m) annotation (Placement(transformation( origin={-70,90}, extent={{-10,10},{10,-10}}, rotation=0))); - Modelica.Electrical.QuasiStationary.MultiPhase.Sources.VoltageSource sineVoltage( + Modelica.Electrical.QuasiStatic.Polyphase.Sources.VoltageSource sineVoltage( final m=m, f=imcData.fsNominal, V=fill(imcData.VsNominal/sqrt(3), m)) @@ -76,11 +76,11 @@ origin={-90,70}, extent={{-10,-10},{10,10}}, rotation=270))); - Modelica.Electrical.QuasiStationary.MultiPhase.Basic.Star star(final m=m) annotation (Placement(transformation( + Modelica.Electrical.QuasiStatic.Polyphase.Basic.Star star(final m=m) annotation (Placement(transformation( extent={{10,-10},{-10,10}}, rotation=90, origin={-90,40}))); - Modelica.Electrical.QuasiStationary.SinglePhase.Basic.Ground ground annotation (Placement(transformation(origin={-90,10}, extent={{-10,-10},{10,10}}))); + Modelica.Electrical.QuasiStatic.SinglePhase.Basic.Ground ground annotation (Placement(transformation(origin={-90,10}, extent={{-10,-10},{10,10}}))); Modelica.Mechanics.Rotational.Sensors.PowerSensor powerSensor annotation (Placement(transformation(extent={{10,60},{30,80}}))); Modelica.Mechanics.Rotational.Components.Inertia loadInertia(J=imcData.Jr) annotation (Placement(transformation(extent={{40,60},{60,80}}))); Modelica.Mechanics.Rotational.Sources.Torque torque annotation (Placement(transformation(extent={{90,60},{70,80}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/InductionMachines/IMS_Characteristics1.mo" "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/InductionMachines/IMS_Characteristics1.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/InductionMachines/IMS_Characteristics1.mo" 2021-11-24 08:09:22.147363002 +0000 +++ "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/InductionMachines/IMS_Characteristics1.mo" 2021-11-24 08:09:50.431277951 +0000 @@ -4,19 +4,19 @@ import Modelica.Constants.pi; parameter Integer m=3 "Number of stator phases"; parameter Integer mr=3 "Number of rotor phases"; - parameter Integer mBase=Modelica.Electrical.MultiPhase.Functions.numberOfSymmetricBaseSystems(m) + parameter Integer mBase=Modelica.Electrical.Polyphase.Functions.numberOfSymmetricBaseSystems(m) "Number of base systems"; - parameter Modelica.SIunits.Voltage VsNominal=100 "Nominal RMS voltage per phase"; - parameter Modelica.SIunits.Current IsNominal=100 "Nominal RMS current per phase"; - parameter Modelica.SIunits.Frequency fsNominal=imsData.fsNominal "Nominal frequency"; - parameter Modelica.SIunits.Resistance Rr=0/imsData.turnsRatio^2 "Starting resistance"; + parameter Modelica.Units.SI.Voltage VsNominal=100 "Nominal RMS voltage per phase"; + parameter Modelica.Units.SI.Current IsNominal=100 "Nominal RMS current per phase"; + parameter Modelica.Units.SI.Frequency fsNominal=imsData.fsNominal "Nominal frequency"; + parameter Modelica.Units.SI.Resistance Rr=0/imsData.turnsRatio^2 "Starting resistance"; parameter Integer p=imsData.p "Number of pole pairs"; - parameter Modelica.SIunits.AngularVelocity w_Load(displayUnit="rev/min")= - Modelica.SIunits.Conversions.from_rpm(1440.45) + parameter Modelica.Units.SI.AngularVelocity w_Load(displayUnit="rev/min")= + Modelica.Units.Conversions.from_rpm(1440.45) "Nominal load speed"; Real speedPerUnit = p*ims.wMechanical/(2*pi*fsNominal) "Per unit speed"; Real slip = 1-speedPerUnit "Slip"; - output Modelica.SIunits.Current I=currentSensor.I " RMS current"; + output Modelica.Units.SI.Current I=currentSensor.I " RMS current"; Modelica.Magnetic.QuasiStatic.FundamentalWave.Utilities.MultiTerminalBox terminalBox(m=m, terminalConnection="Y") annotation (Placement(transformation(extent={{20,46},{40,66}}))); Modelica.Magnetic.QuasiStatic.FundamentalWave.BasicMachines.InductionMachines.IM_SlipRing ims( p=imsData.p, @@ -47,33 +47,33 @@ effectiveStatorTurns=imsData.effectiveStatorTurns, TrOperational=imsData.TrRef) annotation (Placement(transformation(extent={{20,30},{40,50}}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Sources.VoltageSource voltageSource( + Modelica.Electrical.QuasiStatic.Polyphase.Sources.VoltageSource voltageSource( m=m, - phi=-Modelica.Electrical.MultiPhase.Functions.symmetricOrientation(m), + phi=-Modelica.Electrical.Polyphase.Functions.symmetricOrientation(m), f=fsNominal, V=fill(VsNominal, m)) annotation (Placement(transformation( origin={-80,60}, extent={{-10,-10},{10,10}}, rotation=270))); - Modelica.Electrical.QuasiStationary.MultiPhase.Basic.Star star(m=m) + Modelica.Electrical.QuasiStatic.Polyphase.Basic.Star star(m=m) annotation (Placement(transformation( origin={-80,30}, extent={{-10,-10},{10,10}}, rotation=270))); - Modelica.Electrical.QuasiStationary.SinglePhase.Basic.Ground ground + Modelica.Electrical.QuasiStatic.SinglePhase.Basic.Ground ground annotation (Placement(transformation( extent={{-10,-10},{10,10}}, rotation=0, origin={-80,10}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Sensors.PowerSensor powerSensor(m=m) annotation (Placement(transformation(extent={{-70,70},{-50,90}}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Sensors.CurrentQuasiRMSSensor currentSensor(m=m) annotation (Placement(transformation(extent={{-10,70},{10,90}}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Basic.Star + Modelica.Electrical.QuasiStatic.Polyphase.Sensors.PowerSensor powerSensor(m=m) annotation (Placement(transformation(extent={{-70,70},{-50,90}}))); + Modelica.Electrical.QuasiStatic.Polyphase.Sensors.CurrentQuasiRMSSensor currentSensor(m=m) annotation (Placement(transformation(extent={{-10,70},{10,90}}))); + Modelica.Electrical.QuasiStatic.Polyphase.Basic.Star starMachine(m=mBase) annotation (Placement(transformation( extent={{-10,10},{10,-10}}, rotation=270, origin={-40,30}))); - Modelica.Electrical.QuasiStationary.SinglePhase.Basic.Ground + Modelica.Electrical.QuasiStatic.SinglePhase.Basic.Ground groundMachine annotation (Placement(transformation( extent={{-10,-10},{10,10}}, origin={-40,10}))); @@ -83,12 +83,12 @@ height=3*2*pi*fsNominal/p, duration=1, offset=-2*pi*fsNominal/p) annotation (Placement(transformation(extent={{100,30},{80,50}}))); - Modelica.Electrical.QuasiStationary.SinglePhase.Basic.Ground groundRotor annotation (Placement(transformation(extent={{-10,-10},{10,10}}, origin={-10,10}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Basic.Star starRotor(m=mr) annotation (Placement(transformation( + Modelica.Electrical.QuasiStatic.SinglePhase.Basic.Ground groundRotor annotation (Placement(transformation(extent={{-10,-10},{10,10}}, origin={-10,10}))); + Modelica.Electrical.QuasiStatic.Polyphase.Basic.Star starRotor(m=mr) annotation (Placement(transformation( origin={-10,30}, extent={{-10,-10},{10,10}}, rotation=270))); - Modelica.Electrical.QuasiStationary.MultiPhase.Basic.Resistor resistor(m=mr, R_ref=fill(Rr, mr)) annotation (Placement(transformation( + Modelica.Electrical.QuasiStatic.Polyphase.Basic.Resistor resistor(m=mr, R_ref=fill(Rr, mr)) annotation (Placement(transformation( extent={{-10,-10},{10,10}}, rotation=270, origin={10,36}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/InductionMachines/IMS_Start.mo" "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/InductionMachines/IMS_Start.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/InductionMachines/IMS_Start.mo" 2021-11-24 08:09:22.147363002 +0000 +++ "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/InductionMachines/IMS_Start.mo" 2021-11-24 08:09:50.375278120 +0000 @@ -4,36 +4,36 @@ import Modelica.Constants.pi; parameter Integer m=3 "Number of stator phases"; parameter Integer mr=3 "Number of rotor phases"; - parameter Modelica.SIunits.Voltage VsNominal=100 "Nominal RMS voltage per phase"; - parameter Modelica.SIunits.Current IsNominal=100 "Nominal RMS current per phase"; - parameter Modelica.SIunits.Frequency fsNominal=ims.fsNominal "Nominal frequency"; - parameter Modelica.SIunits.Time tOn=0.1 "Start time of machine"; - parameter Modelica.SIunits.Resistance RStart=0.16/imsData.turnsRatio^ 2 "Starting resistance"; - parameter Modelica.SIunits.Time tRheostat=1.0 "Time of shortening the rheostat"; - parameter Modelica.SIunits.Torque tauLoad=161.4 "Nominal load torque"; - parameter Modelica.SIunits.AngularVelocity w_Load(displayUnit="rev/min")= - Modelica.SIunits.Conversions.from_rpm(1440.45) "Nominal load speed"; - parameter Modelica.SIunits.Inertia JLoad=0.29 "Load inertia"; - output Modelica.SIunits.Current I=currentRMSSensor.I "Transient RMS current"; - output Modelica.SIunits.Current Iqs=currentRMSSensorQS.I "QS RMS current"; + parameter Modelica.Units.SI.Voltage VsNominal=100 "Nominal RMS voltage per phase"; + parameter Modelica.Units.SI.Current IsNominal=100 "Nominal RMS current per phase"; + parameter Modelica.Units.SI.Frequency fsNominal=ims.fsNominal "Nominal frequency"; + parameter Modelica.Units.SI.Time tOn=0.1 "Start time of machine"; + parameter Modelica.Units.SI.Resistance RStart=0.16/imsData.turnsRatio^ 2 "Starting resistance"; + parameter Modelica.Units.SI.Time tRheostat=1.0 "Time of shortening the rheostat"; + parameter Modelica.Units.SI.Torque tauLoad=161.4 "Nominal load torque"; + parameter Modelica.Units.SI.AngularVelocity w_Load(displayUnit="rev/min")= + Modelica.Units.Conversions.from_rpm(1440.45) "Nominal load speed"; + parameter Modelica.Units.SI.Inertia JLoad=0.29 "Load inertia"; + output Modelica.Units.SI.Current I=currentRMSSensor.I "Transient RMS current"; + output Modelica.Units.SI.Current Iqs=currentRMSSensorQS.I "QS RMS current"; Modelica.Electrical.Analog.Basic.Ground ground annotation (Placement( transformation( origin={-90,-80}, extent={{-10,-10},{10,10}}, rotation=270))); - Modelica.Electrical.MultiPhase.Basic.Star star(final m=m) annotation ( + Modelica.Electrical.Polyphase.Basic.Star star(final m=m) annotation ( Placement(transformation( extent={{10,-10},{-10,10}}, origin={-70,-80}))); - Modelica.Electrical.MultiPhase.Sources.SineVoltage sineVoltage( + Modelica.Electrical.Polyphase.Sources.SineVoltage sineVoltage( final m=m, - freqHz=fill(fsNominal, m), +f =fill(fsNominal, m), V=fill(sqrt(2.0)*VsNominal, m)) annotation (Placement( transformation( origin={-60,-60}, extent={{10,-10},{-10,10}}, rotation=90))); - Modelica.Electrical.MultiPhase.Ideal.IdealClosingSwitch idealCloser( + Modelica.Electrical.Polyphase.Ideal.IdealClosingSwitch idealCloser( final m=m, Ron=fill(1e-5*m/3, m), Goff=fill(1e-5*3/m, m)) annotation (Placement(transformation( @@ -41,11 +41,10 @@ extent={{-10,-10},{10,10}}, rotation=90))); Modelica.Blocks.Sources.BooleanStep booleanStep[m](each startTime=tOn) annotation (Placement(transformation(extent={{-100,-40},{-80,-20}}))); - Modelica.Electrical.MultiPhase.Sensors.CurrentQuasiRMSSensor currentRMSSensor(m=m) annotation (Placement(transformation(origin={0,-20}, extent={{-10,-10},{10,10}}))); + Modelica.Electrical.Polyphase.Sensors.CurrentQuasiRMSSensor currentRMSSensor(m=m) annotation (Placement(transformation(origin={0,-20}, extent={{-10,-10},{10,10}}))); Modelica.Electrical.Machines.Utilities.MultiTerminalBox terminalBoxM(m=m, terminalConnection="Y") annotation (Placement(transformation(extent={{20,-54},{40,-34}}))); Modelica.Magnetic.QuasiStatic.FundamentalWave.Utilities.MultiTerminalBox terminalBoxQS(m=m, terminalConnection="Y") annotation (Placement(transformation(extent={{20,46},{40,66}}))); - Modelica.Magnetic.FundamentalWave.BasicMachines.AsynchronousInductionMachines.AIM_SlipRing - ims( + Modelica.Magnetic.FundamentalWave.BasicMachines.InductionMachines.IM_SlipRing ims( Jr=imsData.Jr, Js=imsData.Js, p=imsData.p, @@ -128,26 +127,26 @@ TorqueDirection=false, useSupport=false, w_nominal=w_Load) annotation (Placement(transformation(extent={{100,30},{80,50}}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Sources.VoltageSource + Modelica.Electrical.QuasiStatic.Polyphase.Sources.VoltageSource voltageSourceQS( m=m, - phi=-Modelica.Electrical.MultiPhase.Functions.symmetricOrientation(m), + phi=-Modelica.Electrical.Polyphase.Functions.symmetricOrientation(m), f=fsNominal, V=fill(VsNominal, m)) annotation (Placement(transformation( origin={-60,40}, extent={{-10,-10},{10,10}}, rotation=270))); - Modelica.Electrical.QuasiStationary.MultiPhase.Basic.Star starQS(m=m) annotation (Placement(transformation( + Modelica.Electrical.QuasiStatic.Polyphase.Basic.Star starQS(m=m) annotation (Placement(transformation( origin={-70,20}, extent={{-10,-10},{10,10}}, rotation=180))); - Modelica.Electrical.QuasiStationary.SinglePhase.Basic.Ground groundQS annotation (Placement(transformation( + Modelica.Electrical.QuasiStatic.SinglePhase.Basic.Ground groundQS annotation (Placement(transformation( extent={{-10,-10},{10,10}}, rotation=270, origin={-90,20}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Sensors.PowerSensor powerSensorQS(m=m) annotation (Placement(transformation(extent={{-40,70},{-20,90}}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Sensors.CurrentQuasiRMSSensor currentRMSSensorQS(m=m) annotation (Placement(transformation(extent={{-10,70},{10,90}}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Ideal.IdealClosingSwitch + Modelica.Electrical.QuasiStatic.Polyphase.Sensors.PowerSensor powerSensorQS(m=m) annotation (Placement(transformation(extent={{-40,70},{-20,90}}))); + Modelica.Electrical.QuasiStatic.Polyphase.Sensors.CurrentQuasiRMSSensor currentRMSSensorQS(m=m) annotation (Placement(transformation(extent={{-10,70},{10,90}}))); + Modelica.Electrical.QuasiStatic.Polyphase.Ideal.IdealClosingSwitch idealCloserQS( final m=m, Ron=fill(1e-5*m/3, m), @@ -157,16 +156,16 @@ rotation=270))); Modelica.Blocks.Sources.BooleanStep booleanStepQS[m](each startTime=tOn, each startValue=false) annotation (Placement( transformation(extent={{-100,60},{-80,80}}))); - Modelica.Electrical.MultiPhase.Sensors.PowerSensor powerSensor(m=m) annotation (Placement(transformation(extent={{-40,-30},{-20,-10}}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Basic.Star - starMachineQS(m=Modelica.Electrical.MultiPhase.Functions.numberOfSymmetricBaseSystems(m)) annotation (Placement(transformation( + Modelica.Electrical.Polyphase.Sensors.PowerSensor powerSensor(m=m) annotation (Placement(transformation(extent={{-40,-30},{-20,-10}}))); + Modelica.Electrical.QuasiStatic.Polyphase.Basic.Star + starMachineQS(m=Modelica.Electrical.Polyphase.Functions.numberOfSymmetricBaseSystems(m)) annotation (Placement(transformation( extent={{-10,10},{10,-10}}, rotation=270, origin={-10,30}))); - Modelica.Electrical.QuasiStationary.SinglePhase.Basic.Ground groundMachineQS annotation (Placement(transformation( + Modelica.Electrical.QuasiStatic.SinglePhase.Basic.Ground groundMachineQS annotation (Placement(transformation( extent={{-10,-10},{10,10}}, origin={-10,10}))); - Modelica.Electrical.MultiPhase.Basic.Star starMachine(final m=Modelica.Electrical.MultiPhase.Functions.numberOfSymmetricBaseSystems(m)) annotation (Placement(transformation( + Modelica.Electrical.Polyphase.Basic.Star starMachine(final m=Modelica.Electrical.Polyphase.Functions.numberOfSymmetricBaseSystems(m)) annotation (Placement(transformation( extent={{10,-10},{-10,10}}, rotation=90, origin={-12,-70}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/InductionMachines/ParameterRecords.mo" "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/InductionMachines/ParameterRecords.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/InductionMachines/ParameterRecords.mo" 2021-11-24 08:09:22.147363002 +0000 +++ "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/InductionMachines/ParameterRecords.mo" 2021-11-24 08:09:50.283278396 +0000 @@ -3,7 +3,7 @@ extends Modelica.Icons.RecordsPackage; record IMC "Machine parameters of indutction maschine with squirrel cage" import Modelica.Constants.pi; - extends Modelica.Electrical.Machines.Utilities.ParameterRecords.AIM_SquirrelCageData( + extends Modelica.Electrical.Machines.Utilities.ParameterRecords.IM_SquirrelCageData( effectiveStatorTurns=59.2, TsRef=373.15, TrRef=373.15); @@ -15,7 +15,7 @@ record IMC_withLosses "Machine parameters of indutction maschine with squirrel cage with losses" import Modelica.Constants.pi; - extends Modelica.Electrical.Machines.Utilities.ParameterRecords.AIM_SquirrelCageData( + extends Modelica.Electrical.Machines.Utilities.ParameterRecords.IM_SquirrelCageData( statorCoreParameters(PRef=410, VRef=387.9), Jr=0.12, Rs=0.56, @@ -31,19 +31,19 @@ Rr=0.42, alpha20r(displayUnit="1/K") = Modelica.Electrical.Machines.Thermal.Constants.alpha20Aluminium, effectiveStatorTurns=270.1); - parameter Modelica.SIunits.Power PmNominal=18500 "Nominal mechanical output power"; - parameter Modelica.SIunits.Voltage VsNominal=400 "Nominal stator RMS voltage per phase"; - parameter Modelica.SIunits.Current IsNominal=32.85 "Nominal stator RMS current per phase"; + parameter Modelica.Units.SI.Power PmNominal=18500 "Nominal mechanical output power"; + parameter Modelica.Units.SI.Voltage VsNominal=400 "Nominal stator RMS voltage per phase"; + parameter Modelica.Units.SI.Current IsNominal=32.85 "Nominal stator RMS current per phase"; parameter Real pfsNominal=0.898 "Nominal power factor"; - parameter Modelica.SIunits.Power PsNominal=sqrt(3)*VsNominal*IsNominal*pfsNominal "Nominal active stator power"; - parameter Modelica.SIunits.Power lossNominal=PsNominal-PmNominal "Nominal losses"; + parameter Modelica.Units.SI.Power PsNominal=sqrt(3)*VsNominal*IsNominal*pfsNominal "Nominal active stator power"; + parameter Modelica.Units.SI.Power lossNominal=PsNominal-PmNominal "Nominal losses"; parameter Real effNominal=0.9049 "Nominal efficiency"; - parameter Modelica.SIunits.Frequency fsNominal=50 "Nominal frequency"; - parameter Modelica.SIunits.AngularVelocity wNominal(displayUnit="rev/min")=Modelica.SIunits.Conversions.from_rpm(1462.5) "Nominal speed"; - parameter Modelica.SIunits.AngularVelocity w0(displayUnit="rev/min")=Modelica.SIunits.Conversions.from_rpm(1499.64) "No loads speed"; - parameter Modelica.SIunits.Torque tauNominal=PmNominal/wNominal "Nominal torque"; - parameter Modelica.SIunits.Temperature TNominal=Modelica.SIunits.Conversions.from_degC(90) "Nominal temperature"; + parameter Modelica.Units.SI.Frequency fsNominal=50 "Nominal frequency"; + parameter Modelica.Units.SI.AngularVelocity wNominal(displayUnit="rev/min")=Modelica.Units.Conversions.from_rpm(1462.5) "Nominal speed"; + parameter Modelica.Units.SI.AngularVelocity w0(displayUnit="rev/min")=Modelica.Units.Conversions.from_rpm(1499.64) "No loads speed"; + parameter Modelica.Units.SI.Torque tauNominal=PmNominal/wNominal "Nominal torque"; + parameter Modelica.Units.SI.Temperature TNominal=Modelica.Units.Conversions.from_degC(90) "Nominal temperature"; annotation ( defaultComponentName="imcData", defaultComponentPrefixes="parameter"); @@ -51,7 +51,7 @@ record IMS "Machine parameters of indutction maschine with slip ring rotor" import Modelica.Constants.pi; - extends Modelica.Electrical.Machines.Utilities.ParameterRecords.AIM_SlipRingData( + extends Modelica.Electrical.Machines.Utilities.ParameterRecords.IM_SlipRingData( effectiveStatorTurns=59.2, TsRef=373.15, TrRef=373.15); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Machines/EquivalentCircuit.mo" "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Machines/EquivalentCircuit.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Machines/EquivalentCircuit.mo" 2021-11-24 08:09:22.147363002 +0000 +++ "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Machines/EquivalentCircuit.mo" 2021-11-24 08:09:50.239278528 +0000 @@ -2,66 +2,65 @@ model EquivalentCircuit "Comparison of equivalent circuits of electric and magnetic circuits" extends Modelica.Icons.Example; constant Integer m=3 "Number of phases"; - parameter Modelica.SIunits.Voltage VNominal = 400 "Nominal phase voltage"; - parameter Modelica.SIunits.Frequency fNominal = 50 "Nominal frequency"; + parameter Modelica.Units.SI.Voltage VNominal = 400 "Nominal phase voltage"; + parameter Modelica.Units.SI.Frequency fNominal = 50 "Nominal frequency"; // Equivalent electric circuit - parameter Modelica.SIunits.Resistance R=0.56 "Winding resistance"; - parameter Modelica.SIunits.Inductance Lsigma=4.848E-3 "Stray inductance"; - parameter Modelica.SIunits.Inductance Lm=0.2114 "Magnetizing inductance"; + parameter Modelica.Units.SI.Resistance R=0.56 "Winding resistance"; + parameter Modelica.Units.SI.Inductance Lsigma=4.848E-3 "Stray inductance"; + parameter Modelica.Units.SI.Inductance Lm=0.2114 "Magnetizing inductance"; parameter Real effectiveTurns = 135.0 "Number of effective turns"; - parameter Modelica.SIunits.Conductance Gc=908.2E-6 "Electric loss conductance"; + parameter Modelica.Units.SI.Conductance Gc=908.2E-6 "Electric loss conductance"; // Equivalent magnetic circuit - parameter Modelica.SIunits.Conductance G=m*effectiveTurns^2*Gc/2 "Magnetic loss conductance"; - parameter Modelica.SIunits.Reluctance R_msigma=m*effectiveTurns^2/2/Lsigma "Stray reluctance"; - parameter Modelica.SIunits.Reluctance R_m=m*effectiveTurns^2/2/Lm "Main field reluctance"; - Modelica.SIunits.ComplexCurrent i_e[m] = resistor_e.i "Current of electric circuit"; - Modelica.SIunits.ComplexCurrent i_m[m] = resistor_m.i "Current of magnetic circuit"; - Modelica.SIunits.Power coreLoss_e=sum(core_e.conductor.LossPower); - Modelica.SIunits.Power coreLoss_m=core_m.lossPower; - Modelica.Electrical.QuasiStationary.MultiPhase.Sources.VoltageSource - sineVoltage_e(m=m,phi=-Modelica.Electrical.MultiPhase.Functions.symmetricOrientation(m), + parameter Modelica.Units.SI.Conductance G=m*effectiveTurns^2*Gc/2 "Magnetic loss conductance"; + parameter Modelica.Units.SI.Reluctance R_msigma=m*effectiveTurns^2/2/Lsigma "Stray reluctance"; + parameter Modelica.Units.SI.Reluctance R_m=m*effectiveTurns^2/2/Lm "Main field reluctance"; + Modelica.Units.SI.ComplexCurrent i_e[m] = resistor_e.i "Current of electric circuit"; + Modelica.Units.SI.ComplexCurrent i_m[m] = resistor_m.i "Current of magnetic circuit"; + Modelica.Units.SI.Power coreLoss_e=sum(core_e.conductor.LossPower); + Modelica.Units.SI.Power coreLoss_m=core_m.lossPower; + Modelica.Electrical.QuasiStatic.Polyphase.Sources.VoltageSource + sineVoltage_e(m=m,phi=-Modelica.Electrical.Polyphase.Functions.symmetricOrientation(m), gamma(fixed=true, start=0),f=fNominal,V=fill(VNominal, m)) annotation (Placement(transformation(extent={{-10,10},{10,-10}},rotation=270,origin={-70,70}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Sources.VoltageSource - sineVoltage_m(m=m,phi=-Modelica.Electrical.MultiPhase.Functions.symmetricOrientation(m), + Modelica.Electrical.QuasiStatic.Polyphase.Sources.VoltageSource + sineVoltage_m(m=m,phi=-Modelica.Electrical.Polyphase.Functions.symmetricOrientation(m), gamma(fixed=true, start=0),f=fNominal,V=fill(VNominal, m)) annotation (Placement(transformation(extent={{-10,10},{10,-10}},rotation=270,origin={-70,-30}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Basic.Resistor + Modelica.Electrical.QuasiStatic.Polyphase.Basic.Resistor resistor_e(m=m, R_ref=fill(R, m)) annotation (Placement(transformation(extent={{-10,-10},{10,10}},origin={-50,80}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Basic.Resistor + Modelica.Electrical.QuasiStatic.Polyphase.Basic.Resistor resistor_m(m=m, R_ref=fill(R, m)) annotation (Placement(transformation(extent={{-10,-10},{10,10}},origin={-50,-20}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Basic.Conductor core_e( + Modelica.Electrical.QuasiStatic.Polyphase.Basic.Conductor core_e( m=m, G_ref=fill(Gc, m)) annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=270,origin={10,70}))); - Modelica.Magnetic.QuasiStatic.FundamentalWave.Components.MultiPhaseElectroMagneticConverter - converter_m(m=m, effectiveTurns=effectiveTurns) + Modelica.Magnetic.QuasiStatic.FundamentalWave.Components.PolyphaseElectroMagneticConverter converter_m(m=m, effectiveTurns=effectiveTurns) annotation (Placement(transformation(extent={{0,-40},{20,-20}}))); Modelica.Magnetic.QuasiStatic.FundamentalWave.Components.EddyCurrent core_m(G=G) annotation (Placement(transformation(extent={{-10,-10},{10,10}},origin={40,-20}))); Modelica.Magnetic.QuasiStatic.FundamentalWave.Components.Reluctance main_m( R_m(d=R_m, q=R_m)) annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=270,origin={90,-30}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Basic.Inductor stray_e(m=m, L=fill(Lsigma, m)) + Modelica.Electrical.QuasiStatic.Polyphase.Basic.Inductor stray_e(m=m, L=fill(Lsigma, m)) annotation (Placement(transformation(extent={{20,70},{40,90}}))); Modelica.Magnetic.QuasiStatic.FundamentalWave.Components.Reluctance stray_m(R_m(d=R_msigma, q=R_msigma)) annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=270,origin={60,-30}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Basic.Inductor main_e(m=m, L=fill(Lm, m)) + Modelica.Electrical.QuasiStatic.Polyphase.Basic.Inductor main_e(m=m, L=fill(Lm, m)) annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=270,origin={50,70}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Sensors.PowerSensor powerb_e(m=m) + Modelica.Electrical.QuasiStatic.Polyphase.Sensors.PowerSensor powerb_e(m=m) annotation (Placement(transformation(extent={{-30,70},{-10,90}}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Sensors.PowerSensor powerb_m(m=m) + Modelica.Electrical.QuasiStatic.Polyphase.Sensors.PowerSensor powerb_m(m=m) annotation (Placement(transformation(extent={{-30,-30},{-10,-10}}))); - Modelica.Electrical.QuasiStationary.SinglePhase.Basic.Ground ground_e + Modelica.Electrical.QuasiStatic.SinglePhase.Basic.Ground ground_e annotation (Placement(transformation(extent={{-80,10},{-60,30}}))); - Modelica.Electrical.QuasiStationary.SinglePhase.Basic.Ground ground_m + Modelica.Electrical.QuasiStatic.SinglePhase.Basic.Ground ground_m annotation (Placement(transformation(extent={{-80,-90},{-60,-70}}))); Modelica.Magnetic.QuasiStatic.FundamentalWave.Components.Ground mground_m annotation (Placement(transformation(extent={{10,-90},{30,-70}}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Basic.Star star_e(m=m) + Modelica.Electrical.QuasiStatic.Polyphase.Basic.Star star_e(m=m) annotation (Placement(transformation(extent={{-10,10},{10,-10}},rotation=270,origin={-70,40}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Basic.Star star_m(m=m) + Modelica.Electrical.QuasiStatic.Polyphase.Basic.Star star_m(m=m) annotation (Placement(transformation(extent={{-10,10},{10,-10}},rotation=270,origin={-70,-60}))); equation connect(sineVoltage_e.plug_n, star_e.plug_p) annotation (Line( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Machines/Functions/complexTurns.mo" "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Machines/Functions/complexTurns.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Machines/Functions/complexTurns.mo" 2021-11-24 08:09:22.147363002 +0000 +++ "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Machines/Functions/complexTurns.mo" 2021-11-24 08:09:50.179278709 +0000 @@ -11,8 +11,8 @@ Integer Sg = if winding.doubleLayer then div(winding.Sprime,2) else winding.Sprime "Number of slots per coil group"; Integer yShift = div(winding.Sprime, winding.m) "Slot displacement between two adjacent windings"; Integer coilSideCounter[Sg]=zeros(Sg) "Coil side counter to validate winding"; - Modelica.SIunits.Angle dgamma "Local coil width"; - Modelica.SIunits.Angle gamma "Local orientation of coil"; + Modelica.Units.SI.Angle dgamma "Local coil width"; + Modelica.Units.SI.Angle gamma "Local orientation of coil"; Real xic "Local skewing factor of coil"; algorithm // Check for odd number of phases diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Machines/Records/Winding.mo" "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Machines/Records/Winding.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Machines/Records/Winding.mo" 2021-11-24 08:09:22.147363002 +0000 +++ "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Machines/Records/Winding.mo" 2021-11-24 08:09:50.091278974 +0000 @@ -9,7 +9,7 @@ parameter Integer ycb[:] "Slot indices of begin of coils"; parameter Integer yce[:] "Slot indices of end of coils"; parameter Integer nc(final min=1) "Number of turns per coil"; - parameter Modelica.SIunits.Angle offset "Offset of winding layout"; + parameter Modelica.Units.SI.Angle offset "Offset of winding layout"; annotation (Documentation(info="

This record defines the topology of a polyphase integer slot winding.

")); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Machines/TestSingleLayer12over12.mo" "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Machines/TestSingleLayer12over12.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Machines/TestSingleLayer12over12.mo" 2021-11-24 08:09:22.147363002 +0000 +++ "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Machines/TestSingleLayer12over12.mo" 2021-11-24 08:09:50.043279118 +0000 @@ -6,9 +6,9 @@ HanserModelica.Machines.Records.SingleLayer12over12() "Winding"; parameter Complex N[winding.m]=HanserModelica.Machines.Functions.complexTurns( winding) "Complex numbers of turns"; - parameter Real effectiveTurns[winding.m] = Modelica.ComplexMath.'abs'(N) + parameter Real effectiveTurns[winding.m] = Modelica.ComplexMath.abs(N) "Magnitudes of complex numbers of turns"; - parameter Modelica.SIunits.Angle orientiation[winding.m]( + parameter Modelica.Units.SI.Angle orientiation[winding.m]( each displayUnit="deg")=Modelica.ComplexMath.arg(N) "Orientation of complex numbers of turns"; annotation (experiment(StopTime=1, Interval=0.001, Tolerance=1e-06), diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Magnetic/Components/Transformer.mo" "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Magnetic/Components/Transformer.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Magnetic/Components/Transformer.mo" 2021-11-24 08:09:22.147363002 +0000 +++ "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Magnetic/Components/Transformer.mo" 2021-11-24 08:09:50.007279226 +0000 @@ -2,16 +2,16 @@ model Transformer "Transformer model" parameter Integer N1 "Number of primary turns"; parameter Integer N2 "Number of secondary turns"; - parameter Modelica.SIunits.Resistance R1 "Primary resistance"; - parameter Modelica.SIunits.Resistance R2 "Secondary resistance"; - parameter Modelica.SIunits.Permeance G_m1sigma "Primary stray inductance"; - parameter Modelica.SIunits.Permeance G_m2sigma "Secondary stray inductance"; - parameter Modelica.SIunits.Reluctance R_m "Main field reluctance"; - parameter Modelica.SIunits.Conductance Gc "Eddy current loss conductance"; - Modelica.SIunits.Current i1(start=0) = p1.i "Primary current"; - Modelica.SIunits.Current i2(start=0) = p2.i "Secondary current"; - Modelica.SIunits.Voltage v1 = p1.v - n1.v "Primary voltage"; - Modelica.SIunits.Voltage v2 = p2.v - n2.v "Secondary voltage"; + parameter Modelica.Units.SI.Resistance R1 "Primary resistance"; + parameter Modelica.Units.SI.Resistance R2 "Secondary resistance"; + parameter Modelica.Units.SI.Permeance G_m1sigma "Primary stray inductance"; + parameter Modelica.Units.SI.Permeance G_m2sigma "Secondary stray inductance"; + parameter Modelica.Units.SI.Reluctance R_m "Main field reluctance"; + parameter Modelica.Units.SI.Conductance Gc "Eddy current loss conductance"; + Modelica.Units.SI.Current i1(start=0) = p1.i "Primary current"; + Modelica.Units.SI.Current i2(start=0) = p2.i "Secondary current"; + Modelica.Units.SI.Voltage v1 = p1.v - n1.v "Primary voltage"; + Modelica.Units.SI.Voltage v2 = p2.v - n2.v "Secondary voltage"; Modelica.Electrical.Analog.Interfaces.PositivePin p1 annotation ( Placement(visible = true, transformation(extent = {{-110, 40}, {-90, 60}}, rotation = 0), iconTransformation(extent = {{-110, 90}, {-90, 110}}, rotation = 0))); Modelica.Electrical.Analog.Interfaces.PositivePin p2 annotation ( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Magnetic/Coupling.mo" "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Magnetic/Coupling.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Magnetic/Coupling.mo" 2021-11-24 08:09:22.147363002 +0000 +++ "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Magnetic/Coupling.mo" 2021-11-24 08:09:49.971279335 +0000 @@ -1,11 +1,11 @@ within HanserModelica.Magnetic; model Coupling "Electro-magnetic coupling" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Resistance R = 10 "Resistance"; - parameter Modelica.SIunits.Inductance L = 2 "Inductance"; + parameter Modelica.Units.SI.Resistance R = 10 "Resistance"; + parameter Modelica.Units.SI.Inductance L = 2 "Inductance"; parameter Integer N=1000 "Number of turns"; - parameter Modelica.SIunits.Permeance G_m = L/N^2 "Permeance of the magnetic circuit"; - parameter Modelica.SIunits.Voltage v = 20 "Total DC voltage"; + parameter Modelica.Units.SI.Permeance G_m = L/N^2 "Permeance of the magnetic circuit"; + parameter Modelica.Units.SI.Voltage v = 20 "Total DC voltage"; Modelica.Magnetic.FluxTubes.Basic.ElectroMagneticConverter converter(N=N, i(fixed=true, start=0)) annotation (Placement(transformation(extent={{0,-10},{20,10}}))); Modelica.Magnetic.FluxTubes.Basic.ConstantPermeance permeance(G_m=G_m) annotation (Placement(transformation( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Magnetic/TestTransformer.mo" "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Magnetic/TestTransformer.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Magnetic/TestTransformer.mo" 2021-11-24 08:09:22.147363002 +0000 +++ "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Magnetic/TestTransformer.mo" 2021-11-24 08:09:49.939279431 +0000 @@ -19,7 +19,7 @@ rotation=270, origin={40,10}))); Modelica.Electrical.Analog.Ideal.IdealClosingSwitch switch(Ron=1e-5, Goff=1e-5) annotation (Placement(transformation(extent={{0,20},{20,40}}))); - Modelica.Electrical.Analog.Sources.SineVoltage sineVoltage(V=sqrt(2)*6900, freqHz=50) annotation (Placement(transformation( + Modelica.Electrical.Analog.Sources.SineVoltage sineVoltage(V=sqrt(2)*6900, f =50) annotation (Placement(transformation( extent={{-10,-10},{10,10}}, rotation=270, origin={-72,10}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/MoveTo_Modelica/ComplexBlocks/ComplexMath/Bode.mo" "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/MoveTo_Modelica/ComplexBlocks/ComplexMath/Bode.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/MoveTo_Modelica/ComplexBlocks/ComplexMath/Bode.mo" 2021-11-24 08:09:22.147363002 +0000 +++ "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/MoveTo_Modelica/ComplexBlocks/ComplexMath/Bode.mo" 2021-11-24 08:09:49.887279587 +0000 @@ -1,7 +1,7 @@ -within HanserModelica.MoveTo_Modelica.ComplexBlocks.ComplexMath; +within HanserModelica.MoveTo_Modelica.ComplexBlocks.ComplexMath; block Bode "Calculate quantities to plot Bode diagram" parameter Boolean useDivisor = true "Use divisor input, if true" annotation(Evaluate = true, HideResult = true, choices( checkBox = true)); - constant Modelica.SIunits.AmplitudeLevelDifference dB = 20 "Amplitude level difference"; + constant Modelica.Units.SI.AmplitudeLevelDifference dB = 20 "Amplitude level difference"; Modelica.ComplexBlocks.Interfaces.ComplexInput u "Dividend if useDivisor == true" annotation (Placement(transformation(extent={{-140,40},{-100,80}}), iconTransformation(extent={{-140,40},{-100,80}}))); Modelica.ComplexBlocks.Interfaces.ComplexInput divisor if useDivisor "Divisor" annotation (Placement(transformation(extent={{-140,-80},{-100,-40}}), iconTransformation(extent={{-140,-80},{-100,-40}}))); Modelica.Blocks.Interfaces.RealOutput abs_y "Absolute value of ratio u / divisor" annotation (Placement(transformation( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Rotational/Components/DCPMMachine.mo" "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Rotational/Components/DCPMMachine.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Rotational/Components/DCPMMachine.mo" 2021-11-24 08:09:22.151362990 +0000 +++ "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Rotational/Components/DCPMMachine.mo" 2021-11-24 08:09:49.831279755 +0000 @@ -1,22 +1,22 @@ within HanserModelica.Rotational.Components; model DCPMMachine "Permanent magnet DC machine" - parameter Modelica.SIunits.Resistance Ra "Armature resistance"; - parameter Modelica.SIunits.Inductance La "Armature inductance"; - parameter Modelica.SIunits.ElectricalTorqueConstant k "Transformation coefficient"; - parameter Modelica.SIunits.Inertia Jr "Rotor inertia"; - Modelica.SIunits.Torque tauElectrical = -emf.flange.tau "Electromagnetic tourque"; - Modelica.SIunits.Torque tauShaft = -flange.tau "Shaft torque"; - Modelica.SIunits.Angle phiMechanical(start=0) = flange.phi "Angle"; - Modelica.SIunits.AngularVelocity wMechanical(start=0) = der(flange.phi) "Angular velocity"; - Modelica.SIunits.Voltage va = pin_ap.v-pin_an.v "Armature voltage"; - Modelica.SIunits.Current ia(start=0) = pin_ap.i "Armature current"; + parameter Modelica.Units.SI.Resistance Ra "Armature resistance"; + parameter Modelica.Units.SI.Inductance La "Armature inductance"; + parameter Modelica.Units.SI.ElectricalTorqueConstant k "Transformation coefficient"; + parameter Modelica.Units.SI.Inertia Jr "Rotor inertia"; + Modelica.Units.SI.Torque tauElectrical = -emf.flange.tau "Electromagnetic tourque"; + Modelica.Units.SI.Torque tauShaft = -flange.tau "Shaft torque"; + Modelica.Units.SI.Angle phiMechanical(start=0) = flange.phi "Angle"; + Modelica.Units.SI.AngularVelocity wMechanical(start=0) = der(flange.phi) "Angular velocity"; + Modelica.Units.SI.Voltage va = pin_ap.v-pin_an.v "Armature voltage"; + Modelica.Units.SI.Current ia(start=0) = pin_ap.i "Armature current"; Modelica.Electrical.Analog.Interfaces.PositivePin pin_ap "Positive armature pin" annotation (Placement(visible = true,transformation(extent = {{-70, 30}, {-50, 50}}, rotation = 0), iconTransformation(extent = {{-70, 90}, {-50, 110}}, rotation = 0))); Modelica.Electrical.Analog.Interfaces.NegativePin pin_an "Negative armature pin" annotation (Placement(visible = true,transformation(extent = {{50, 30}, {70, 50}}, rotation = 0), iconTransformation(extent = {{50, 92}, {70, 112}}, rotation = 0))); Modelica.Mechanics.Rotational.Interfaces.Flange_a flange "Shaft" annotation (Placement(transformation(extent={{90,-10},{110,10}}))); Modelica.Electrical.Analog.Basic.Resistor resistor(final R=Ra) annotation (Placement(visible = true, transformation(origin = {-60, 20}, extent = {{-10, -10}, {10, 10}}, rotation = 270))); - Modelica.Electrical.Analog.Basic.EMF emf(final k=k) annotation (Placement(transformation(extent={{-10,10},{10,-10}}))); + Modelica.Electrical.Analog.Basic.RotationalEMF emf(final k=k) annotation (Placement(transformation(extent={{-10,10},{10,-10}}))); Modelica.Electrical.Analog.Basic.Inductor inductor(final L=La) annotation (Placement(visible = true, transformation(origin = {-60, -10}, extent = {{-10, -10}, {10, 10}}, rotation = 270))); Modelica.Mechanics.Rotational.Components.Inertia inertia(final J=Jr) annotation (Placement(transformation(extent={{20,-10},{40,10}}))); equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/SynchronousMachines/SMEE_DOL.mo" "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/SynchronousMachines/SMEE_DOL.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/SynchronousMachines/SMEE_DOL.mo" 2021-11-24 08:09:22.151362990 +0000 +++ "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/SynchronousMachines/SMEE_DOL.mo" 2021-11-24 08:09:49.679280212 +0000 @@ -2,13 +2,13 @@ model SMEE_DOL "Electrical excited synchronous machine starting direct on line" extends Modelica.Icons.Example; parameter Integer m=3 "Number of phases"; - parameter Modelica.SIunits.Voltage VNominal=100 "Nominal RMS voltage per phase"; - parameter Modelica.SIunits.Frequency fNominal=50 "Nominal frequency"; - parameter Modelica.SIunits.Voltage Ve=smeeData.Re*smeeData.IeOpenCircuit "Excitation current"; - parameter Modelica.SIunits.Angle gamma0(displayUnit="deg") = 0 "Initial rotor displacement angle"; - Modelica.SIunits.Current irRMS = sqrt(smee.ir[1]^2+smee.ir[2]^2)/sqrt(2) "Quasi RMS rotor current"; - Modelica.SIunits.Angle theta = rotorDisplacementAngle.rotorDisplacementAngle "Rotor displacement angle"; - Modelica.Magnetic.FundamentalWave.BasicMachines.SynchronousInductionMachines.SM_ElectricalExcited smee( + parameter Modelica.Units.SI.Voltage VNominal=100 "Nominal RMS voltage per phase"; + parameter Modelica.Units.SI.Frequency fNominal=50 "Nominal frequency"; + parameter Modelica.Units.SI.Voltage Ve=smeeData.Re*smeeData.IeOpenCircuit "Excitation current"; + parameter Modelica.Units.SI.Angle gamma0(displayUnit="deg") = 0 "Initial rotor displacement angle"; + Modelica.Units.SI.Current irRMS = sqrt(smee.ir[1]^2+smee.ir[2]^2)/sqrt(2) "Quasi RMS rotor current"; + Modelica.Units.SI.Angle theta = rotorDisplacementAngle.rotorDisplacementAngle "Rotor displacement angle"; + Modelica.Magnetic.FundamentalWave.BasicMachines.SynchronousMachines.SM_ElectricalExcited smee( phiMechanical(start=-(Modelica.Constants.pi + gamma0)/smee.p, fixed=true), fsNominal=smeeData.fsNominal, TsRef=smeeData.TsRef, @@ -54,20 +54,20 @@ extent={{-10,-10},{10,10}}, rotation=0))); Modelica.Mechanics.Rotational.Sensors.MultiSensor mechanicalSensor annotation (Placement(transformation(extent={{40,-50},{60,-30}}))); - Modelica.Electrical.MultiPhase.Sensors.MultiSensor multiSensor(m=m) annotation (Placement(transformation( + Modelica.Electrical.Polyphase.Sensors.MultiSensor multiSensor(m=m) annotation (Placement(transformation( origin={40,30}, extent={{-10,-10},{10,10}}, rotation=270))); - Modelica.Electrical.MultiPhase.Sensors.CurrentQuasiRMSSensor currentRMSSensor(m=m) annotation (Placement(transformation( + Modelica.Electrical.Polyphase.Sensors.CurrentQuasiRMSSensor currentRMSSensor(m=m) annotation (Placement(transformation( origin={40,0}, extent={{-10,-10},{10,10}}, rotation=270))); - Modelica.Electrical.MultiPhase.Sources.SineVoltage sineVoltage( + Modelica.Electrical.Polyphase.Sources.SineVoltage sineVoltage( final m=m, final V=fill(VNominal*sqrt(2), m), - final freqHz=fill(fNominal, m)) annotation (Placement(transformation( + final f =fill(fNominal, m)) annotation (Placement(transformation( extent={{-10,40},{-30,60}}))); - Modelica.Electrical.MultiPhase.Basic.Star star(final m=m) annotation ( + Modelica.Electrical.Polyphase.Basic.Star star(final m=m) annotation ( Placement(transformation(extent={{-40,40},{-60,60}}))); Modelica.Electrical.Analog.Basic.Ground ground annotation (Placement( transformation( @@ -84,7 +84,7 @@ rotation=90))); Modelica.Electrical.Machines.Utilities.TerminalBox terminalBox(terminalConnection="Y", m=m) annotation (Placement(transformation(extent={{-20,-34},{0,-14}}))); - Modelica.Electrical.MultiPhase.Ideal.IdealClosingSwitch switch( + Modelica.Electrical.Polyphase.Ideal.IdealClosingSwitch switch( final m=m, Ron=fill(1e-5*m/3, m), Goff=fill(1e-5*m/3, m)) annotation (Placement(transformation( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/SynchronousMachines/SMEE_LoadDump.mo" "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/SynchronousMachines/SMEE_LoadDump.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/SynchronousMachines/SMEE_LoadDump.mo" 2021-11-24 08:09:22.151362990 +0000 +++ "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/SynchronousMachines/SMEE_LoadDump.mo" 2021-11-24 08:09:49.623280380 +0000 @@ -3,25 +3,25 @@ extends Modelica.Icons.Example; import Modelica.Constants.pi; constant Integer m=3 "Number of phases"; - parameter Modelica.SIunits.AngularVelocity wNominal=2*pi*smeeData.fsNominal + parameter Modelica.Units.SI.AngularVelocity wNominal=2*pi*smeeData.fsNominal /smee.p "Nominal speed"; - parameter Modelica.SIunits.Impedance ZNominal=3*smeeData.VsNominal^2/ + parameter Modelica.Units.SI.Impedance ZNominal=3*smeeData.VsNominal^2/ smeeData.SNominal "Nominal load impedance"; parameter Real powerFactor( min=0, max=1) = 0.8 "Load power factor"; - parameter Modelica.SIunits.Resistance RLoad=ZNominal*powerFactor + parameter Modelica.Units.SI.Resistance RLoad=ZNominal*powerFactor "Load resistance"; - parameter Modelica.SIunits.Inductance LLoad=ZNominal*sqrt(1-powerFactor^2)/(2*pi*smeeData.fsNominal) "Load inductance"; - parameter Modelica.SIunits.Voltage Ve0=smee.IeOpenCircuit* + parameter Modelica.Units.SI.Inductance LLoad=ZNominal*sqrt(1-powerFactor^2)/(2*pi*smeeData.fsNominal) "Load inductance"; + parameter Modelica.Units.SI.Voltage Ve0=smee.IeOpenCircuit* Modelica.Electrical.Machines.Thermal.convertResistance(smee.Re,smee.TeRef,smee.alpha20e,smee.TeOperational) "No load excitation voltage"; parameter Real k=2*Ve0/smeeData.VsNominal "Voltage controller: gain"; - parameter Modelica.SIunits.Time Ti=smeeData.Td0Transient/2 + parameter Modelica.Units.SI.Time Ti=smeeData.Td0Transient/2 "Voltage controller: integral time constant"; output Real controlError=(setPointGain.y - voltageRMSSensor.V)/smeeData.VsNominal; - output Modelica.SIunits.Current ie = smee.ie "Excitation current"; - Modelica.Magnetic.FundamentalWave.BasicMachines.SynchronousInductionMachines.SM_ElectricalExcited smee( + output Modelica.Units.SI.Current ie = smee.ie "Excitation current"; + Modelica.Magnetic.FundamentalWave.BasicMachines.SynchronousMachines.SM_ElectricalExcited smee( fsNominal=smeeData.fsNominal, TsRef=smeeData.TsRef, Lrsigmad=smeeData.Lrsigmad, @@ -80,7 +80,7 @@ yMax=2.5*Ve0, yMin=0, Td=0.001, - initType=Modelica.Blocks.Types.InitPID.InitialState) + initType=Modelica.Blocks.Types.Init.InitialState) annotation (Placement(transformation(extent={{-70,-20},{-50,-40}}))); Modelica.Electrical.Analog.Sources.SignalVoltage excitationVoltage annotation (Placement(transformation( @@ -97,7 +97,7 @@ rotation=270))); Modelica.Blocks.Sources.BooleanPulse loadControl(period=4, startTime=2) annotation (Placement(transformation(extent={{-70,10},{-50,30}}))); - Modelica.Electrical.MultiPhase.Ideal.CloserWithArc switch( + Modelica.Electrical.Polyphase.Ideal.CloserWithArc switch( m=m, Ron=fill(1e-5, m), Goff=fill(1e-5, m), @@ -106,19 +106,19 @@ Vmax=fill(60, m), closerWithArc(off(start=fill(true, m), fixed=fill(true, m)))) annotation (Placement(transformation(extent={{0,60},{-20,40}}))); - Modelica.Electrical.MultiPhase.Basic.Resistor loadResistor(m=m, R=fill( + Modelica.Electrical.Polyphase.Basic.Resistor loadResistor(m=m, R=fill( RLoad, m)) annotation (Placement(transformation(extent={{-30,40},{-50,60}}))); - Modelica.Electrical.MultiPhase.Basic.Inductor loadInductor(m=m, L=fill( + Modelica.Electrical.Polyphase.Basic.Inductor loadInductor(m=m, L=fill( LLoad, m)) annotation (Placement(transformation(extent={{-60,40},{-80,60}}))); - Modelica.Electrical.MultiPhase.Basic.Star star(m=m) annotation ( + Modelica.Electrical.Polyphase.Basic.Star star(m=m) annotation ( Placement(transformation( extent={{-10,-10},{10,10}}, rotation=270, origin={-90,30}))); protected - constant Modelica.SIunits.MagneticFlux unitMagneticFlux=1 + constant Modelica.Units.SI.MagneticFlux unitMagneticFlux=1 annotation (HideResult=true); public Modelica.Blocks.Sources.Ramp speedRamp(height=wNominal, duration=1) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/SynchronousMachines/SMEE_LoadImpedance1.mo" "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/SynchronousMachines/SMEE_LoadImpedance1.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/SynchronousMachines/SMEE_LoadImpedance1.mo" 2021-11-24 08:09:22.151362990 +0000 +++ "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/SynchronousMachines/SMEE_LoadImpedance1.mo" 2021-11-24 08:09:49.531280657 +0000 @@ -1,25 +1,25 @@ -within HanserModelica.SynchronousMachines; +within HanserModelica.SynchronousMachines; model SMEE_LoadImpedance1 "Electrical excited synchronous machine operating at variable load impedance with angle 45° cap." extends Modelica.Icons.Example; import Modelica.Constants.pi; parameter Integer m=3 "Number of stator phases"; - parameter Modelica.SIunits.Voltage VsNominal=smeeData.VsNominal "Nominal RMS voltage per phase"; - parameter Modelica.SIunits.Current IsNominal = smeeData.SNominal/m/VsNominal "Nominal current"; - parameter Modelica.SIunits.Angle phi = -45*pi/180 "Load impedance angle"; - parameter Modelica.SIunits.Impedance ZsNominal = VsNominal/IsNominal "Nominal impedance"; - parameter Modelica.SIunits.Frequency fsNominal=smeeData.fsNominal "Nominal frequency"; - parameter Modelica.SIunits.AngularVelocity w(displayUnit="rev/min")=2*pi*fsNominal/smee.p "Actual speed"; - parameter Modelica.SIunits.Current IeMax=19 "Maximum excitation current"; - parameter Modelica.SIunits.Current Ie0=10 "Open circuit excitation current for nominal voltage"; - parameter Modelica.SIunits.Current ie=Ie0 "Actual open circuit current"; - parameter Modelica.SIunits.Angle gamma0(displayUnit="deg") = 0 + parameter Modelica.Units.SI.Voltage VsNominal=smeeData.VsNominal "Nominal RMS voltage per phase"; + parameter Modelica.Units.SI.Current IsNominal = smeeData.SNominal/m/VsNominal "Nominal current"; + parameter Modelica.Units.SI.Angle phi = -45*pi/180 "Load impedance angle"; + parameter Modelica.Units.SI.Impedance ZsNominal = VsNominal/IsNominal "Nominal impedance"; + parameter Modelica.Units.SI.Frequency fsNominal=smeeData.fsNominal "Nominal frequency"; + parameter Modelica.Units.SI.AngularVelocity w(displayUnit="rev/min")=2*pi*fsNominal/smee.p "Actual speed"; + parameter Modelica.Units.SI.Current IeMax=19 "Maximum excitation current"; + parameter Modelica.Units.SI.Current Ie0=10 "Open circuit excitation current for nominal voltage"; + parameter Modelica.Units.SI.Current ie=Ie0 "Actual open circuit current"; + parameter Modelica.Units.SI.Angle gamma0(displayUnit="deg") = 0 "Initial rotor displacement angle"; parameter Boolean positiveRange = false "Use positive range of angles, if true"; - Modelica.SIunits.ComplexCurrent isr[m] = smee.is*Modelica.ComplexMath.exp(Complex(0,theta+pi/2)) "Stator current w.r.t. rotor fixed frame"; - output Modelica.SIunits.Power P=multiSensor.apparentPowerTotal.re " real power"; - output Modelica.SIunits.ReactivePower Q=multiSensor.apparentPowerTotal.im " reactive power"; - output Modelica.SIunits.ApparentPower S=sqrt(P^2+Q^2) " apparent power"; - Modelica.SIunits.Angle theta=rotorDisplacementAngle.rotorDisplacementAngle "Rotor displacement angle"; + Modelica.Units.SI.ComplexCurrent isr[m] = smee.is*Modelica.ComplexMath.exp(Complex(0,theta+pi/2)) "Stator current w.r.t. rotor fixed frame"; + output Modelica.Units.SI.Power P=multiSensor.apparentPowerTotal.re " real power"; + output Modelica.Units.SI.ReactivePower Q=multiSensor.apparentPowerTotal.im " reactive power"; + output Modelica.Units.SI.ApparentPower S=sqrt(P^2+Q^2) " apparent power"; + Modelica.Units.SI.Angle theta=rotorDisplacementAngle.rotorDisplacementAngle "Rotor displacement angle"; Modelica.Magnetic.QuasiStatic.FundamentalWave.BasicMachines.SynchronousMachines.SM_ElectricalExcited smee( p=2, fsNominal=smeeData.fsNominal, @@ -70,28 +70,28 @@ annotation (Placement( transformation(extent={{100,-20},{80,0}}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Basic.Star star(m=m) + Modelica.Electrical.QuasiStatic.Polyphase.Basic.Star star(m=m) annotation (Placement(transformation( origin={-60,40}, extent={{-10,-10},{10,10}}, rotation=180))); - Modelica.Electrical.QuasiStationary.SinglePhase.Basic.Ground + Modelica.Electrical.QuasiStatic.SinglePhase.Basic.Ground grounde annotation (Placement(transformation( extent={{-10,-10},{10,10}}, rotation=0, origin={-70,10}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Sensors.MultiSensor multiSensor(m=m) annotation (Placement(transformation( + Modelica.Electrical.QuasiStatic.Polyphase.Sensors.MultiSensor multiSensor(m=m) annotation (Placement(transformation( extent={{-10,-10},{10,10}}, rotation=270, origin={0,26}))); Modelica.Magnetic.QuasiStatic.FundamentalWave.Utilities.MultiTerminalBox terminalBox(m=m, terminalConnection="Y") annotation (Placement(transformation(extent={{-10,-4},{10,16}}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Basic.Star - starMachine(m=Modelica.Electrical.MultiPhase.Functions.numberOfSymmetricBaseSystems(m)) + Modelica.Electrical.QuasiStatic.Polyphase.Basic.Star + starMachine(m=Modelica.Electrical.Polyphase.Functions.numberOfSymmetricBaseSystems(m)) annotation (Placement(transformation( extent={{-10,10},{10,-10}}, rotation=180, origin={-20,10}))); - Modelica.Electrical.QuasiStationary.SinglePhase.Basic.Ground + Modelica.Electrical.QuasiStatic.SinglePhase.Basic.Ground groundMachine annotation (Placement(transformation( extent={{-10,-10},{10,10}}, rotation=270, @@ -101,7 +101,7 @@ rotation=90, origin={30,-10}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Basic.VariableImpedance impedance(m=m) + Modelica.Electrical.QuasiStatic.Polyphase.Basic.VariableImpedance impedance(m=m) annotation (Placement(transformation(extent={{-20,30},{-40,50}}))); Modelica.ComplexBlocks.Sources.ComplexRampPhasor complexRamp[m]( useLogRamp=fill(true, m), diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/SynchronousMachines/SMEE_LoadImpedance2.mo" "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/SynchronousMachines/SMEE_LoadImpedance2.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/SynchronousMachines/SMEE_LoadImpedance2.mo" 2021-11-24 08:09:22.151362990 +0000 +++ "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/SynchronousMachines/SMEE_LoadImpedance2.mo" 2021-11-24 08:09:49.491280777 +0000 @@ -1,4 +1,4 @@ -within HanserModelica.SynchronousMachines; +within HanserModelica.SynchronousMachines; model SMEE_LoadImpedance2 "Electrical excited synchronous machine operating at variable load impedance with angle 30° cap." import Modelica.Constants.pi; extends SMEE_LoadImpedance1(phi=-30*pi/180); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/SynchronousMachines/SMEE_LoadImpedance4.mo" "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/SynchronousMachines/SMEE_LoadImpedance4.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/SynchronousMachines/SMEE_LoadImpedance4.mo" 2021-11-24 08:09:22.151362990 +0000 +++ "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/SynchronousMachines/SMEE_LoadImpedance4.mo" 2021-11-24 08:09:49.475280826 +0000 @@ -1,4 +1,4 @@ -within HanserModelica.SynchronousMachines; +within HanserModelica.SynchronousMachines; model SMEE_LoadImpedance4 "Electrical excited synchronous machine operating at variable load impedance with angle 30° ind." import Modelica.Constants.pi; extends SMEE_LoadImpedance1(phi=30*pi/180); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/SynchronousMachines/SMEE_LoadImpedance5.mo" "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/SynchronousMachines/SMEE_LoadImpedance5.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/SynchronousMachines/SMEE_LoadImpedance5.mo" 2021-11-24 08:09:22.151362990 +0000 +++ "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/SynchronousMachines/SMEE_LoadImpedance5.mo" 2021-11-24 08:09:49.463280861 +0000 @@ -1,4 +1,4 @@ -within HanserModelica.SynchronousMachines; +within HanserModelica.SynchronousMachines; model SMEE_LoadImpedance5 "Electrical excited synchronous machine operating at variable load impedance with angle 45° cap." import Modelica.Constants.pi; extends SMEE_LoadImpedance1( phi=45*pi/180); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/SynchronousMachines/SMEE_Rectifier.mo" "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/SynchronousMachines/SMEE_Rectifier.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/SynchronousMachines/SMEE_Rectifier.mo" 2021-11-24 08:09:22.151362990 +0000 +++ "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/SynchronousMachines/SMEE_Rectifier.mo" 2021-11-24 08:09:49.447280910 +0000 @@ -4,23 +4,23 @@ extends Modelica.Icons.Example; import Modelica.Constants.pi; constant Integer m=3 "Number of phases"; - parameter Modelica.SIunits.AngularVelocity wNominal=2*pi*smeeData.fsNominal + parameter Modelica.Units.SI.AngularVelocity wNominal=2*pi*smeeData.fsNominal /smee.p "Nominal speed"; - parameter Modelica.SIunits.Voltage VDC0=sqrt(2*3)*smeeData.VsNominal + parameter Modelica.Units.SI.Voltage VDC0=sqrt(2*3)*smeeData.VsNominal "No-load DC voltage"; - parameter Modelica.SIunits.Resistance RLoad=VDC0^2/smeeData.SNominal + parameter Modelica.Units.SI.Resistance RLoad=VDC0^2/smeeData.SNominal "Load resistance"; - parameter Modelica.SIunits.Voltage Ve0=smee.IeOpenCircuit* + parameter Modelica.Units.SI.Voltage Ve0=smee.IeOpenCircuit* Modelica.Electrical.Machines.Thermal.convertResistance( smee.Re, smee.TeRef, smee.alpha20e, smee.TeOperational) "No load excitation voltage"; parameter Real k=2*Ve0/smeeData.VsNominal "Voltage controller: gain"; - parameter Modelica.SIunits.Time Ti=smeeData.Td0Transient/2 + parameter Modelica.Units.SI.Time Ti=smeeData.Td0Transient/2 "Voltage controller: integral time constant"; - output Modelica.SIunits.Current ie = smee.ie "Excitation current"; - Modelica.Magnetic.FundamentalWave.BasicMachines.SynchronousInductionMachines.SM_ElectricalExcited smee( + output Modelica.Units.SI.Current ie = smee.ie "Excitation current"; + Modelica.Magnetic.FundamentalWave.BasicMachines.SynchronousMachines.SM_ElectricalExcited smee( fsNominal=smeeData.fsNominal, TsRef=smeeData.TsRef, Lrsigmad=smeeData.Lrsigmad, @@ -102,7 +102,7 @@ Ti=Ti, yMax=2.5*Ve0, yMin=0, - initType=Modelica.Blocks.Types.InitPID.InitialState, + initType=Modelica.Blocks.Types.Init.InitialState, Td=0.001) annotation (Placement(transformation(extent={{-70,-20},{-50,-40}}))); Modelica.Electrical.Analog.Sources.SignalVoltage excitationVoltage @@ -147,7 +147,7 @@ rotation=270, origin={-60,0}))); protected - constant Modelica.SIunits.MagneticFlux unitMagneticFlux=1 + constant Modelica.Units.SI.MagneticFlux unitMagneticFlux=1 annotation (HideResult=true); public Modelica.Electrical.PowerConverters.ACDC.DiodeBridge2mPulse rectifier annotation (Placement(transformation(extent={{74,20},{54,40}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/SynchronousMachines/SMEE_Slip1.mo" "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/SynchronousMachines/SMEE_Slip1.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/SynchronousMachines/SMEE_Slip1.mo" 2021-11-24 08:09:22.151362990 +0000 +++ "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/SynchronousMachines/SMEE_Slip1.mo" 2021-11-24 08:09:49.339281234 +0000 @@ -3,25 +3,25 @@ extends Modelica.Icons.Example; import Modelica.Constants.pi; parameter Integer m=3 "Number of stator phases"; - parameter Modelica.SIunits.Voltage VsNominal=100 + parameter Modelica.Units.SI.Voltage VsNominal=100 "Nominal RMS voltage per phase"; - parameter Modelica.SIunits.Frequency fsNominal=smeeData.fsNominal "Nominal frequency"; - parameter Modelica.SIunits.AngularVelocity w(displayUnit="rev/min")= - Modelica.SIunits.Conversions.from_rpm(1499) "Actual speed"; - parameter Modelica.SIunits.Current IeMax=19 "Maximum excitation current"; - parameter Modelica.SIunits.Current Ie0=10 "Open circuit excitation current for nominal voltage"; - parameter Modelica.SIunits.Current ie=0 "Actual open circuit current"; - parameter Modelica.SIunits.Angle gamma0(displayUnit="deg") = 0 "Initial rotor displacement angle"; + parameter Modelica.Units.SI.Frequency fsNominal=smeeData.fsNominal "Nominal frequency"; + parameter Modelica.Units.SI.AngularVelocity w(displayUnit="rev/min")= + Modelica.Units.Conversions.from_rpm(1499) "Actual speed"; + parameter Modelica.Units.SI.Current IeMax=19 "Maximum excitation current"; + parameter Modelica.Units.SI.Current Ie0=10 "Open circuit excitation current for nominal voltage"; + parameter Modelica.Units.SI.Current ie=0 "Actual open circuit current"; + parameter Modelica.Units.SI.Angle gamma0(displayUnit="deg") = 0 "Initial rotor displacement angle"; parameter Boolean positiveRange = false "Use positive range of angles, if true"; - Modelica.SIunits.Angle phii=Modelica.Math.wrapAngle(smee.arg_is[1], positiveRange) "Angle of current"; - Modelica.SIunits.Angle phiv=Modelica.Math.wrapAngle(smee.arg_vs[1], positiveRange) "Angle of voltage"; - Modelica.SIunits.Angle phis = Modelica.Math.wrapAngle(phiv-phii,positiveRange) "Angle between voltage and current"; - Modelica.SIunits.Angle epsilon = Modelica.Math.wrapAngle(phis-theta,positiveRange) "Current angle"; - Modelica.SIunits.ComplexCurrent isr[m] = smee.is*Modelica.ComplexMath.exp(Complex(0,theta+pi/2)) "Stator current w.r.t. rotor fixed frame"; - output Modelica.SIunits.Power P=multiSensor.apparentPowerTotal.re " real power"; - output Modelica.SIunits.ReactivePower Q=multiSensor.apparentPowerTotal.im " reactive power"; - output Modelica.SIunits.ApparentPower S=sqrt(P^2+Q^2) " apparent power"; - Modelica.SIunits.Angle theta=rotorDisplacementAngle.rotorDisplacementAngle "Rotor displacement angle"; + Modelica.Units.SI.Angle phii=Modelica.Math.wrapAngle(smee.arg_is[1], positiveRange) "Angle of current"; + Modelica.Units.SI.Angle phiv=Modelica.Math.wrapAngle(smee.arg_vs[1], positiveRange) "Angle of voltage"; + Modelica.Units.SI.Angle phis = Modelica.Math.wrapAngle(phiv-phii,positiveRange) "Angle between voltage and current"; + Modelica.Units.SI.Angle epsilon = Modelica.Math.wrapAngle(phis-theta,positiveRange) "Current angle"; + Modelica.Units.SI.ComplexCurrent isr[m] = smee.is*Modelica.ComplexMath.exp(Complex(0,theta+pi/2)) "Stator current w.r.t. rotor fixed frame"; + output Modelica.Units.SI.Power P=multiSensor.apparentPowerTotal.re " real power"; + output Modelica.Units.SI.ReactivePower Q=multiSensor.apparentPowerTotal.im " reactive power"; + output Modelica.Units.SI.ApparentPower S=sqrt(P^2+Q^2) " apparent power"; + Modelica.Units.SI.Angle theta=rotorDisplacementAngle.rotorDisplacementAngle "Rotor displacement angle"; Modelica.Magnetic.QuasiStatic.FundamentalWave.BasicMachines.SynchronousMachines.SM_ElectricalExcited smee( p=2, fsNominal=smeeData.fsNominal, @@ -72,39 +72,39 @@ annotation (Placement( transformation(extent={{100,20},{80,40}}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Sources.VoltageSource + Modelica.Electrical.QuasiStatic.Polyphase.Sources.VoltageSource voltageSource( m=m, - phi=-Modelica.Electrical.MultiPhase.Functions.symmetricOrientation( + phi=-Modelica.Electrical.Polyphase.Functions.symmetricOrientation( m), V=fill(VsNominal, m), f=fsNominal) annotation (Placement(transformation( origin={-30,80}, extent={{-10,-10},{10,10}}, rotation=180))); - Modelica.Electrical.QuasiStationary.MultiPhase.Basic.Star star(m=m) + Modelica.Electrical.QuasiStatic.Polyphase.Basic.Star star(m=m) annotation (Placement(transformation( origin={-60,80}, extent={{-10,-10},{10,10}}, rotation=180))); - Modelica.Electrical.QuasiStationary.SinglePhase.Basic.Ground + Modelica.Electrical.QuasiStatic.SinglePhase.Basic.Ground grounde annotation (Placement(transformation( extent={{-10,-10},{10,10}}, rotation=0, origin={-70,50}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Sensors.MultiSensor multiSensor(m=m) annotation (Placement(transformation( + Modelica.Electrical.QuasiStatic.Polyphase.Sensors.MultiSensor multiSensor(m=m) annotation (Placement(transformation( extent={{-10,-10},{10,10}}, rotation=270, origin={0,66}))); Modelica.Magnetic.QuasiStatic.FundamentalWave.Utilities.MultiTerminalBox terminalBox(m=m, terminalConnection="Y") annotation (Placement(transformation(extent={{-10,36},{10,56}}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Basic.Star + Modelica.Electrical.QuasiStatic.Polyphase.Basic.Star starMachine(m= - Modelica.Electrical.MultiPhase.Functions.numberOfSymmetricBaseSystems(m)) + Modelica.Electrical.Polyphase.Functions.numberOfSymmetricBaseSystems(m)) annotation (Placement(transformation( extent={{-10,10},{10,-10}}, rotation=180, origin={-20,50}))); - Modelica.Electrical.QuasiStationary.SinglePhase.Basic.Ground + Modelica.Electrical.QuasiStatic.SinglePhase.Basic.Ground groundMachine annotation (Placement(transformation( extent={{-10,-10},{10,10}}, rotation=270, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/SynchronousMachines/SMEE_Synchronization1.mo" "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/SynchronousMachines/SMEE_Synchronization1.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/SynchronousMachines/SMEE_Synchronization1.mo" 2021-11-24 08:09:22.151362990 +0000 +++ "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/SynchronousMachines/SMEE_Synchronization1.mo" 2021-11-24 08:09:49.247281510 +0000 @@ -1,19 +1,19 @@ -within HanserModelica.SynchronousMachines; +within HanserModelica.SynchronousMachines; model SMEE_Synchronization1 "Electrical excited synchronous machine synchronized to grid" extends Modelica.Icons.Example; import Modelica.Constants.pi; parameter Integer m=3 "Number of phases"; parameter Integer p=2 "Number of poles"; - parameter Modelica.SIunits.Angle phi=Modelica.SIunits.Conversions.from_deg(0) + parameter Modelica.Units.SI.Angle phi=Modelica.Units.Conversions.from_deg(0) "Phase angle lag of mains voltages over machine voltages"; - parameter Modelica.SIunits.Voltage VNominal=100 "Nominal RMS voltage per phase"; - parameter Modelica.SIunits.Frequency fNominal=50 "Nominal frequency"; - parameter Modelica.SIunits.Voltage Ve=smeeData.Re*smeeData.IeOpenCircuit "Excitation current"; - parameter Modelica.SIunits.Angle gamma0(displayUnit="deg") = 0 "Initial rotor displacement angle"; - parameter Modelica.SIunits.AngularVelocity wNominal=2*pi*smeeData.fsNominal/p "Nominal angular velocity"; - Modelica.SIunits.Current irRMS = sqrt(smee.ir[1]^2+smee.ir[2]^2)/sqrt(2) "Quasi RMS rotor current"; - output Modelica.SIunits.Current ie = smee.ie "Excitation current"; - Modelica.Magnetic.FundamentalWave.BasicMachines.SynchronousInductionMachines.SM_ElectricalExcited smee( + parameter Modelica.Units.SI.Voltage VNominal=100 "Nominal RMS voltage per phase"; + parameter Modelica.Units.SI.Frequency fNominal=50 "Nominal frequency"; + parameter Modelica.Units.SI.Voltage Ve=smeeData.Re*smeeData.IeOpenCircuit "Excitation current"; + parameter Modelica.Units.SI.Angle gamma0(displayUnit="deg") = 0 "Initial rotor displacement angle"; + parameter Modelica.Units.SI.AngularVelocity wNominal=2*pi*smeeData.fsNominal/p "Nominal angular velocity"; + Modelica.Units.SI.Current irRMS = sqrt(smee.ir[1]^2+smee.ir[2]^2)/sqrt(2) "Quasi RMS rotor current"; + output Modelica.Units.SI.Current ie = smee.ie "Excitation current"; + Modelica.Magnetic.FundamentalWave.BasicMachines.SynchronousMachines.SM_ElectricalExcited smee( phiMechanical(start=-(pi + gamma0)/smee.p, fixed=true), fsNominal=smeeData.fsNominal, TsRef=smeeData.TsRef, @@ -54,22 +54,21 @@ origin={10,-60}, extent={{-10,-10},{10,10}}, rotation=0))); - Modelica.Electrical.MultiPhase.Sensors.MultiSensor multiSensor(m=m) annotation (Placement(transformation( + Modelica.Electrical.Polyphase.Sensors.MultiSensor multiSensor(m=m) annotation (Placement(transformation( origin={40,30}, extent={{-10,-10},{10,10}}, rotation=270))); - Modelica.Electrical.MultiPhase.Sensors.CurrentQuasiRMSSensor currentRMSSensor(m=m) annotation (Placement(transformation( + Modelica.Electrical.Polyphase.Sensors.CurrentQuasiRMSSensor currentRMSSensor(m=m) annotation (Placement(transformation( origin={40,0}, extent={{-10,-10},{10,10}}, rotation=270))); - Modelica.Electrical.MultiPhase.Sources.SineVoltage sineVoltage( + Modelica.Electrical.Polyphase.Sources.SineVoltage sineVoltage( final m=m, - final V=fill(VNominal*sqrt(2), m), - final freqHz=fill(fNominal, m), - phase=-Modelica.Electrical.MultiPhase.Functions.symmetricOrientation(m) - fill(phi, m)) + final V=fill(VNominal*sqrt(2), m), final f = fill(fNominal, m), + phase=(-Modelica.Electrical.Polyphase.Functions.symmetricOrientation(m)) - fill(phi, m)) annotation (Placement(transformation( extent={{-10,40},{-30,60}}))); - Modelica.Electrical.MultiPhase.Basic.Star star(final m=m) annotation ( + Modelica.Electrical.Polyphase.Basic.Star star(final m=m) annotation ( Placement(transformation(extent={{-40,40},{-60,60}}))); Modelica.Electrical.Analog.Basic.Ground ground annotation (Placement( transformation( @@ -82,7 +81,7 @@ rotation=90))); Modelica.Electrical.Machines.Utilities.TerminalBox terminalBox(terminalConnection="Y", m=m) annotation (Placement(transformation(extent={{30,-24},{50,-4}}))); - Modelica.Electrical.MultiPhase.Ideal.IdealClosingSwitch switch( + Modelica.Electrical.Polyphase.Ideal.IdealClosingSwitch switch( final m=m, Ron=fill(1e-5*m/3, m), Goff=fill(1e-5*m/3, m)) annotation (Placement(transformation( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/SynchronousMachines/SMEE_Synchronization2.mo" "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/SynchronousMachines/SMEE_Synchronization2.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/SynchronousMachines/SMEE_Synchronization2.mo" 2021-11-24 08:09:22.151362990 +0000 +++ "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/SynchronousMachines/SMEE_Synchronization2.mo" 2021-11-24 08:09:49.207281631 +0000 @@ -1,6 +1,6 @@ -within HanserModelica.SynchronousMachines; +within HanserModelica.SynchronousMachines; model SMEE_Synchronization2 "Synchronizazion of electrical excited synchronous machine with 10° voltage phase shift" - extends SMEE_Synchronization1(phi=Modelica.SIunits.Conversions.from_deg(10)); + extends SMEE_Synchronization1(phi=Modelica.Units.Conversions.from_deg(10)); annotation (experiment(StopTime=0.3,Interval=0.0001,Tolerance=1e-08), Documentation(info="

Compare the simulation results of this simulation model with results calculated by diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/SynchronousMachines/SMEE_VCurve1.mo" "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/SynchronousMachines/SMEE_VCurve1.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/SynchronousMachines/SMEE_VCurve1.mo" 2021-11-24 08:09:22.151362990 +0000 +++ "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/SynchronousMachines/SMEE_VCurve1.mo" 2021-11-24 08:09:49.183281703 +0000 @@ -4,24 +4,24 @@ import Modelica.Constants.pi; parameter Integer m=3 "Number of stator phases"; parameter Integer p=2 "Number of poles"; - parameter Modelica.SIunits.Voltage VsNominal=100 + parameter Modelica.Units.SI.Voltage VsNominal=100 "Nominal RMS voltage per phase"; - parameter Modelica.SIunits.Frequency fsNominal=smeeData.fsNominal "Nominal frequency"; - parameter Modelica.SIunits.AngularVelocity wNominal=2*pi*fsNominal/p "Nominal speed"; - parameter Modelica.SIunits.Current IeMax=31 "Maximum excitation current"; - parameter Modelica.SIunits.Current Ie0=10 "No load excitation current"; - parameter Modelica.SIunits.Torque tauMax=smeeData.SNominal/wNominal "Maximum torque at power factor = 1"; - parameter Modelica.SIunits.Angle gamma0(displayUnit="deg") = 0 "Initial rotor displacement angle"; - output Modelica.SIunits.Power P=multiSensor.apparentPowerTotal.re "Active power"; - output Modelica.SIunits.Power Pm=mechanicalPowerSensor.P "Mechanical power"; - output Modelica.SIunits.ReactivePower Q=multiSensor.apparentPowerTotal.im "Reactive power"; - output Modelica.SIunits.Current ie = smee.ie "Excitation current"; - Modelica.SIunits.Angle theta=rotorDisplacementAngle.rotorDisplacementAngle "Rotor displacement angle"; + parameter Modelica.Units.SI.Frequency fsNominal=smeeData.fsNominal "Nominal frequency"; + parameter Modelica.Units.SI.AngularVelocity wNominal=2*pi*fsNominal/p "Nominal speed"; + parameter Modelica.Units.SI.Current IeMax=31 "Maximum excitation current"; + parameter Modelica.Units.SI.Current Ie0=10 "No load excitation current"; + parameter Modelica.Units.SI.Torque tauMax=smeeData.SNominal/wNominal "Maximum torque at power factor = 1"; + parameter Modelica.Units.SI.Angle gamma0(displayUnit="deg") = 0 "Initial rotor displacement angle"; + output Modelica.Units.SI.Power P=multiSensor.apparentPowerTotal.re "Active power"; + output Modelica.Units.SI.Power Pm=mechanicalPowerSensor.P "Mechanical power"; + output Modelica.Units.SI.ReactivePower Q=multiSensor.apparentPowerTotal.im "Reactive power"; + output Modelica.Units.SI.Current ie = smee.ie "Excitation current"; + Modelica.Units.SI.Angle theta=rotorDisplacementAngle.rotorDisplacementAngle "Rotor displacement angle"; parameter Boolean positiveRange = false "Use positive range of angles, if true"; - Modelica.SIunits.Angle phii = Modelica.Math.wrapAngle(smee.arg_is[1],positiveRange) "Angle of current"; - Modelica.SIunits.Angle phiv = Modelica.Math.wrapAngle(smee.arg_vs[1],positiveRange) "Angle of voltage"; - Modelica.SIunits.Angle phis = Modelica.Math.wrapAngle(phiv-phii,positiveRange) "Angle between voltage and current"; - Modelica.SIunits.Angle epsilon = Modelica.Math.wrapAngle(phis-theta,positiveRange) "Current angle"; + Modelica.Units.SI.Angle phii = Modelica.Math.wrapAngle(smee.arg_is[1],positiveRange) "Angle of current"; + Modelica.Units.SI.Angle phiv = Modelica.Math.wrapAngle(smee.arg_vs[1],positiveRange) "Angle of voltage"; + Modelica.Units.SI.Angle phis = Modelica.Math.wrapAngle(phiv-phii,positiveRange) "Angle between voltage and current"; + Modelica.Units.SI.Angle epsilon = Modelica.Math.wrapAngle(phis-theta,positiveRange) "Current angle"; Modelica.Magnetic.QuasiStatic.FundamentalWave.BasicMachines.SynchronousMachines.SM_ElectricalExcited smee( phiMechanical(start=-(pi + gamma0)/p, fixed=true), @@ -72,39 +72,39 @@ mechanicalPowerSensor annotation (Placement(transformation(extent={{40,10},{60,30}}))); Modelica.Mechanics.Rotational.Sources.ConstantTorque constantTorque(useSupport=false, tau_constant=0) annotation (Placement(transformation(extent={{90,10},{70,30}}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Sources.VoltageSource + Modelica.Electrical.QuasiStatic.Polyphase.Sources.VoltageSource voltageSource( m=m, - phi=-Modelica.Electrical.MultiPhase.Functions.symmetricOrientation( + phi=-Modelica.Electrical.Polyphase.Functions.symmetricOrientation( m), V=fill(VsNominal, m), f=fsNominal) annotation (Placement(transformation( origin={-30,80}, extent={{-10,-10},{10,10}}, rotation=180))); - Modelica.Electrical.QuasiStationary.MultiPhase.Basic.Star star(m=m) + Modelica.Electrical.QuasiStatic.Polyphase.Basic.Star star(m=m) annotation (Placement(transformation( origin={-60,80}, extent={{-10,-10},{10,10}}, rotation=180))); - Modelica.Electrical.QuasiStationary.SinglePhase.Basic.Ground + Modelica.Electrical.QuasiStatic.SinglePhase.Basic.Ground grounde annotation (Placement(transformation( extent={{-10,-10},{10,10}}, rotation=270, origin={-90,80}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Sensors.MultiSensor multiSensor(m=m) annotation (Placement(transformation( + Modelica.Electrical.QuasiStatic.Polyphase.Sensors.MultiSensor multiSensor(m=m) annotation (Placement(transformation( extent={{-10,-10},{10,10}}, rotation=270, origin={0,60}))); Modelica.Magnetic.QuasiStatic.FundamentalWave.Utilities.MultiTerminalBox terminalBox(m=m, terminalConnection="Y") annotation (Placement(transformation(extent={{-10,26},{10,46}}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Basic.Star + Modelica.Electrical.QuasiStatic.Polyphase.Basic.Star starMachine(m= - Modelica.Electrical.MultiPhase.Functions.numberOfSymmetricBaseSystems(m)) + Modelica.Electrical.Polyphase.Functions.numberOfSymmetricBaseSystems(m)) annotation (Placement(transformation( extent={{-10,10},{10,-10}}, rotation=180, origin={-20,40}))); - Modelica.Electrical.QuasiStationary.SinglePhase.Basic.Ground + Modelica.Electrical.QuasiStatic.SinglePhase.Basic.Ground groundMachine annotation (Placement(transformation( extent={{-10,-10},{10,10}}, rotation=270, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/SynchronousMachines/SMPM_CurrentSource.mo" "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/SynchronousMachines/SMPM_CurrentSource.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/SynchronousMachines/SMPM_CurrentSource.mo" 2021-11-24 08:09:22.151362990 +0000 +++ "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/SynchronousMachines/SMPM_CurrentSource.mo" 2021-11-24 08:09:49.099281956 +0000 @@ -3,22 +3,22 @@ extends Modelica.Icons.Example; import Modelica.Constants.pi; parameter Integer m=3 "Number of phases"; - parameter Modelica.SIunits.Voltage VNominal=100 "Nominal RMS voltage per phase"; - parameter Modelica.SIunits.Frequency fNominal=smpmData.fsNominal "Nominal frequency"; - parameter Modelica.SIunits.Frequency f=50 "Actual frequency"; - parameter Modelica.SIunits.Time tRamp=1 "Frequency ramp"; - parameter Modelica.SIunits.AngularFrequency wNominal = 2*pi*fNominal/smpmData.p "Nominal angular velocity"; - parameter Modelica.SIunits.Torque TLoad=139.3 "Nominal load torque"; - parameter Modelica.SIunits.Time tStep=1.2 "Time of load torque step"; - parameter Modelica.SIunits.Inertia JLoad=0.29 "Load's moment of inertia"; - Modelica.SIunits.Angle theta=rotorDisplacementAngle.rotorDisplacementAngle "Rotor displacement angle, quasi stastic"; - parameter Modelica.SIunits.Current IsOperation=100 "Operating current"; - parameter Modelica.SIunits.Angle epsilonOperation = -0.741 "Operation current angle"; + parameter Modelica.Units.SI.Voltage VNominal=100 "Nominal RMS voltage per phase"; + parameter Modelica.Units.SI.Frequency fNominal=smpmData.fsNominal "Nominal frequency"; + parameter Modelica.Units.SI.Frequency f=50 "Actual frequency"; + parameter Modelica.Units.SI.Time tRamp=1 "Frequency ramp"; + parameter Modelica.Units.SI.AngularFrequency wNominal = 2*pi*fNominal/smpmData.p "Nominal angular velocity"; + parameter Modelica.Units.SI.Torque TLoad=139.3 "Nominal load torque"; + parameter Modelica.Units.SI.Time tStep=1.2 "Time of load torque step"; + parameter Modelica.Units.SI.Inertia JLoad=0.29 "Load's moment of inertia"; + Modelica.Units.SI.Angle theta=rotorDisplacementAngle.rotorDisplacementAngle "Rotor displacement angle, quasi stastic"; + parameter Modelica.Units.SI.Current IsOperation=100 "Operating current"; + parameter Modelica.Units.SI.Angle epsilonOperation = -0.741 "Operation current angle"; parameter Boolean positiveRange = false "Use positive range of angles, if true"; - Modelica.SIunits.Angle phii = Modelica.Math.wrapAngle(smpm.arg_is[1],positiveRange) "Angle of current"; - Modelica.SIunits.Angle phiv = Modelica.Math.wrapAngle(smpm.arg_vs[1],positiveRange) "Angle of voltage"; - Modelica.SIunits.Angle phis = Modelica.Math.wrapAngle(phiv-phii,positiveRange) "Angle between voltage and current"; - Modelica.SIunits.Angle epsilon = Modelica.Math.wrapAngle(phis-theta,positiveRange) "Current angle"; + Modelica.Units.SI.Angle phii = Modelica.Math.wrapAngle(smpm.arg_is[1],positiveRange) "Angle of current"; + Modelica.Units.SI.Angle phiv = Modelica.Math.wrapAngle(smpm.arg_vs[1],positiveRange) "Angle of voltage"; + Modelica.Units.SI.Angle phis = Modelica.Math.wrapAngle(phiv-phii,positiveRange) "Angle between voltage and current"; + Modelica.Units.SI.Angle epsilon = Modelica.Math.wrapAngle(phis-theta,positiveRange) "Current angle"; Modelica.Blocks.Sources.Constant iq(k=IsOperation*cos(epsilonOperation)*3/m) annotation (Placement( transformation(extent={{-90,40},{-70,60}}))); Modelica.Blocks.Sources.Constant id(k=IsOperation*sin(epsilonOperation)*3/m) annotation (Placement(transformation(extent={{-90,70},{-70,90}}))); @@ -56,15 +56,15 @@ Modelica.Mechanics.Rotational.Components.Inertia inertiaLoad(J=0.29) annotation (Placement(transformation(extent={{50,0},{70,20}}))); Modelica.Mechanics.Rotational.Sources.QuadraticSpeedDependentTorque quadraticTorque(tau_nominal=-TLoad, w_nominal(displayUnit="rpm") = wNominal) annotation (Placement(transformation(extent={{100,0},{80,20}}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Basic.Star + Modelica.Electrical.QuasiStatic.Polyphase.Basic.Star starMachine(m= - Modelica.Electrical.MultiPhase.Functions.numberOfSymmetricBaseSystems( + Modelica.Electrical.Polyphase.Functions.numberOfSymmetricBaseSystems( m)) annotation (Placement(transformation( extent={{-10,10},{10,-10}}, rotation=180, origin={-30,10}))); - Modelica.Electrical.QuasiStationary.SinglePhase.Basic.Ground + Modelica.Electrical.QuasiStatic.SinglePhase.Basic.Ground groundM annotation (Placement(transformation( extent={{-10,-10},{10,10}}, rotation=0, @@ -78,20 +78,20 @@ extent={{-10,-10},{10,10}}, rotation=90, origin={30,50}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Sources.ReferenceCurrentSource referenceCurrentSource(m=m) annotation (Placement(transformation( + Modelica.Electrical.QuasiStatic.Polyphase.Sources.ReferenceCurrentSource referenceCurrentSource(m=m) annotation (Placement(transformation( extent={{10,-10},{-10,10}}, rotation=90, origin={0,80}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Basic.Star star(m=m) + Modelica.Electrical.QuasiStatic.Polyphase.Basic.Star star(m=m) annotation (Placement(transformation( origin={50,80}, extent={{-10,-10},{10,10}}, rotation=270))); - Modelica.Electrical.QuasiStationary.SinglePhase.Basic.Ground + Modelica.Electrical.QuasiStatic.SinglePhase.Basic.Ground grounde annotation (Placement(transformation( extent={{-10,-10},{10,10}}, origin={50,60}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Basic.Resistor resistor(m=m, R_ref=fill(1e5, m)) annotation (Placement(transformation( + Modelica.Electrical.QuasiStatic.Polyphase.Basic.Resistor resistor(m=m, R_ref=fill(1e5, m)) annotation (Placement(transformation( extent={{-10,-10},{10,10}}, rotation=270, origin={20,80}))); @@ -99,12 +99,12 @@ extent={{10,-10},{-10,10}}, rotation=90, origin={30,10}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Sensors.CurrentQuasiRMSSensor currentRMSSensor(m=m) annotation (Placement(transformation( + Modelica.Electrical.QuasiStatic.Polyphase.Sensors.CurrentQuasiRMSSensor currentRMSSensor(m=m) annotation (Placement(transformation( extent={{10,10},{-10,-10}}, rotation=90, origin={0,50}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Sensors.VoltageQuasiRMSSensor voltageRMSSensor(m=m) annotation (Placement(transformation(extent={{-40,50},{-20,30}}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Basic.Star starM(m=m) annotation (Placement(transformation( + Modelica.Electrical.QuasiStatic.Polyphase.Sensors.VoltageQuasiRMSSensor voltageRMSSensor(m=m) annotation (Placement(transformation(extent={{-40,50},{-20,30}}))); + Modelica.Electrical.QuasiStatic.Polyphase.Basic.Star starM(m=m) annotation (Placement(transformation( extent={{-10,10},{10,-10}}, rotation=270, origin={-50,30}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/SynchronousMachines/SMPM_MTPA1.mo" "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/SynchronousMachines/SMPM_MTPA1.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/SynchronousMachines/SMPM_MTPA1.mo" 2021-11-24 08:09:22.151362990 +0000 +++ "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/SynchronousMachines/SMPM_MTPA1.mo" 2021-11-24 08:09:49.027282172 +0000 @@ -3,21 +3,21 @@ extends Modelica.Icons.Example; import Modelica.Constants.pi; parameter Integer m=3 "Number of phases"; - parameter Modelica.SIunits.Voltage VNominal=100 + parameter Modelica.Units.SI.Voltage VNominal=100 "Nominal RMS voltage per phase"; - parameter Modelica.SIunits.Frequency fNominal=50 "Nominal frequency"; - parameter Modelica.SIunits.Frequency f=50 "Actual frequency"; - parameter Modelica.SIunits.Time tRamp=1 "Frequency ramp"; - parameter Modelica.SIunits.Torque TLoad=181.4 "Nominal load torque"; - parameter Modelica.SIunits.Time tStep=1.2 "Time of load torque step"; - parameter Modelica.SIunits.Inertia JLoad=0.29 "Load's moment of inertia"; - parameter Modelica.SIunits.AngularVelocity wNominal=2*pi*fNominal/smpmData1.p "Nominal angular velocity"; - Modelica.SIunits.Angle theta=rotorDisplacementAngle.rotorDisplacementAngle "Rotor displacement angle, quasi stastic"; + parameter Modelica.Units.SI.Frequency fNominal=50 "Nominal frequency"; + parameter Modelica.Units.SI.Frequency f=50 "Actual frequency"; + parameter Modelica.Units.SI.Time tRamp=1 "Frequency ramp"; + parameter Modelica.Units.SI.Torque TLoad=181.4 "Nominal load torque"; + parameter Modelica.Units.SI.Time tStep=1.2 "Time of load torque step"; + parameter Modelica.Units.SI.Inertia JLoad=0.29 "Load's moment of inertia"; + parameter Modelica.Units.SI.AngularVelocity wNominal=2*pi*fNominal/smpmData1.p "Nominal angular velocity"; + Modelica.Units.SI.Angle theta=rotorDisplacementAngle.rotorDisplacementAngle "Rotor displacement angle, quasi stastic"; parameter Boolean positiveRange = false "Use positive range of angles, if true"; - Modelica.SIunits.Angle phii = Modelica.Math.wrapAngle(smpm.arg_is[1],positiveRange) "Angle of current"; - Modelica.SIunits.Angle phiv = Modelica.Math.wrapAngle(smpm.arg_vs[1],positiveRange) "Angle of voltage"; - Modelica.SIunits.Angle phis = Modelica.Math.wrapAngle(phiv-phii,positiveRange) "Angle between voltage and current"; - Modelica.SIunits.Angle epsilon = Modelica.Math.wrapAngle(phis-theta,positiveRange) "Current angle"; + Modelica.Units.SI.Angle phii = Modelica.Math.wrapAngle(smpm.arg_is[1],positiveRange) "Angle of current"; + Modelica.Units.SI.Angle phiv = Modelica.Math.wrapAngle(smpm.arg_vs[1],positiveRange) "Angle of voltage"; + Modelica.Units.SI.Angle phis = Modelica.Math.wrapAngle(phiv-phii,positiveRange) "Angle between voltage and current"; + Modelica.Units.SI.Angle epsilon = Modelica.Math.wrapAngle(phis-theta,positiveRange) "Current angle"; parameter HanserModelica.SynchronousMachines.ParameterRecords.SMPM1 smpmData1 "Data of synchronous machine SMPM_MTPA1" annotation (Placement(transformation(extent={{50,32},{70,52}}))); @@ -51,11 +51,11 @@ TrOperational=smpmData1.TrRef) annotation (Placement(transformation(extent={{0,0},{20,20}}))); Modelica.Mechanics.Rotational.Sources.ConstantSpeed constantSpeed(w_fixed=wNominal) annotation (Placement(transformation(extent={{80,0},{60,20}}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Basic.Star starMachine(m=Modelica.Electrical.MultiPhase.Functions.numberOfSymmetricBaseSystems(m)) annotation (Placement(transformation( + Modelica.Electrical.QuasiStatic.Polyphase.Basic.Star starMachine(m=Modelica.Electrical.Polyphase.Functions.numberOfSymmetricBaseSystems(m)) annotation (Placement(transformation( extent={{-10,10},{10,-10}}, rotation=180, origin={-20,10}))); - Modelica.Electrical.QuasiStationary.SinglePhase.Basic.Ground groundM annotation (Placement(transformation( + Modelica.Electrical.QuasiStatic.SinglePhase.Basic.Ground groundM annotation (Placement(transformation( extent={{-10,-10},{10,10}}, rotation=0, origin={-50,0}))); @@ -66,18 +66,18 @@ extent={{-10,-10},{10,10}}, rotation=90, origin={40,50}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Sources.ReferenceCurrentSource referenceCurrentSource(m=m) annotation (Placement(transformation( + Modelica.Electrical.QuasiStatic.Polyphase.Sources.ReferenceCurrentSource referenceCurrentSource(m=m) annotation (Placement(transformation( extent={{10,-10},{-10,10}}, rotation=90, origin={10,80}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Basic.Star star(m=m) annotation (Placement(transformation( + Modelica.Electrical.QuasiStatic.Polyphase.Basic.Star star(m=m) annotation (Placement(transformation( origin={60,80}, extent={{-10,-10},{10,10}}, rotation=270))); - Modelica.Electrical.QuasiStationary.SinglePhase.Basic.Ground grounde annotation (Placement(transformation( + Modelica.Electrical.QuasiStatic.SinglePhase.Basic.Ground grounde annotation (Placement(transformation( extent={{-10,-10},{10,10}}, origin={60,60}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Basic.Resistor resistor(m=m, R_ref=fill(1e5, m)) annotation (Placement(transformation( + Modelica.Electrical.QuasiStatic.Polyphase.Basic.Resistor resistor(m=m, R_ref=fill(1e5, m)) annotation (Placement(transformation( extent={{-10,-10},{10,10}}, rotation=270, origin={30,80}))); @@ -88,12 +88,12 @@ extent={{10,-10},{-10,10}}, rotation=90, origin={40,10}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Sensors.CurrentQuasiRMSSensor currentRMSSensor(m=m) annotation (Placement(transformation( + Modelica.Electrical.QuasiStatic.Polyphase.Sensors.CurrentQuasiRMSSensor currentRMSSensor(m=m) annotation (Placement(transformation( extent={{10,10},{-10,-10}}, rotation=90, origin={10,50}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Sensors.VoltageQuasiRMSSensor voltageRMSSensor(m=m) annotation (Placement(transformation(extent={{-30,50},{-10,30}}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Basic.Star starM(m=m) annotation (Placement(transformation( + Modelica.Electrical.QuasiStatic.Polyphase.Sensors.VoltageQuasiRMSSensor voltageRMSSensor(m=m) annotation (Placement(transformation(extent={{-30,50},{-10,30}}))); + Modelica.Electrical.QuasiStatic.Polyphase.Basic.Star starM(m=m) annotation (Placement(transformation( extent={{-10,10},{10,-10}}, rotation=270, origin={-40,30}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/SynchronousMachines/SMR_Inverter.mo" "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/SynchronousMachines/SMR_Inverter.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/SynchronousMachines/SMR_Inverter.mo" 2021-11-24 08:09:22.151362990 +0000 +++ "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/SynchronousMachines/SMR_Inverter.mo" 2021-11-24 08:09:48.979282317 +0000 @@ -3,18 +3,18 @@ extends Modelica.Icons.Example; import Modelica.Constants.pi; parameter Integer m = 3 "Number of phases"; - parameter Modelica.SIunits.Voltage VsNominal = 100 "Nominal RMS voltage per phase"; - parameter Modelica.SIunits.Current IsNominal = 100 "Nominal current"; - parameter Modelica.SIunits.Frequency fsNominal = smrData.fsNominal "Nominal frequency"; - parameter Modelica.SIunits.Frequency f = fsNominal "Maximum operational frequency"; - Modelica.SIunits.Frequency fActual = ramp.y "Actual frequency"; - parameter Modelica.SIunits.Time tRamp = 1 "Frequency ramp"; - parameter Modelica.SIunits.Torque tauLoad = 135.2 "Nominal load torque"; - parameter Modelica.SIunits.Time tStep = 1.5 "Time of load torque step"; - parameter Modelica.SIunits.Inertia JLoad = 0.29 "Load's moment of inertia"; - parameter Modelica.SIunits.AngularVelocity wNominal = 2 * pi * fsNominal / smrData.p "Nominal angular velocity"; - output Modelica.SIunits.Current I = currentRMSSensor.I "Transient RMS current"; - Modelica.Magnetic.FundamentalWave.BasicMachines.SynchronousInductionMachines.SM_ReluctanceRotor smr(p = smrData.p, fsNominal = smrData.fsNominal, TsRef = smrData.TsRef, alpha20s(displayUnit = "1/K") = smrData.alpha20s, Jr = smrData.Jr, Js = smrData.Js, frictionParameters = smrData.frictionParameters, phiMechanical(fixed = true), wMechanical(fixed = true), statorCoreParameters = smrData.statorCoreParameters, strayLoadParameters = smrData.strayLoadParameters, TrRef = smrData.TrRef, m = m, Rs = smrData.Rs * m / 3, Lssigma = smrData.Lssigma * m / 3, Lszero = smrData.Lszero * m / 3, effectiveStatorTurns = smrData.effectiveStatorTurns, Lmd = smrData.Lmd * m / 3, Lmq = smrData.Lmq * m / 3, useDamperCage = smrData.useDamperCage, Lrsigmad = smrData.Lrsigmad, Lrsigmaq = smrData.Lrsigmaq, Rrd = smrData.Rrd, Rrq = smrData.Rrq, + parameter Modelica.Units.SI.Voltage VsNominal = 100 "Nominal RMS voltage per phase"; + parameter Modelica.Units.SI.Current IsNominal = 100 "Nominal current"; + parameter Modelica.Units.SI.Frequency fsNominal = smrData.fsNominal "Nominal frequency"; + parameter Modelica.Units.SI.Frequency f = fsNominal "Maximum operational frequency"; + Modelica.Units.SI.Frequency fActual = ramp.y "Actual frequency"; + parameter Modelica.Units.SI.Time tRamp = 1 "Frequency ramp"; + parameter Modelica.Units.SI.Torque tauLoad = 135.2 "Nominal load torque"; + parameter Modelica.Units.SI.Time tStep = 1.5 "Time of load torque step"; + parameter Modelica.Units.SI.Inertia JLoad = 0.29 "Load's moment of inertia"; + parameter Modelica.Units.SI.AngularVelocity wNominal = 2 * pi * fsNominal / smrData.p "Nominal angular velocity"; + output Modelica.Units.SI.Current I = currentRMSSensor.I "Transient RMS current"; + Modelica.Magnetic.FundamentalWave.BasicMachines.SynchronousMachines.SM_ReluctanceRotor smr(p = smrData.p, fsNominal = smrData.fsNominal, TsRef = smrData.TsRef, alpha20s(displayUnit = "1/K") = smrData.alpha20s, Jr = smrData.Jr, Js = smrData.Js, frictionParameters = smrData.frictionParameters, phiMechanical(fixed = true), wMechanical(fixed = true), statorCoreParameters = smrData.statorCoreParameters, strayLoadParameters = smrData.strayLoadParameters, TrRef = smrData.TrRef, m = m, Rs = smrData.Rs * m / 3, Lssigma = smrData.Lssigma * m / 3, Lszero = smrData.Lszero * m / 3, effectiveStatorTurns = smrData.effectiveStatorTurns, Lmd = smrData.Lmd * m / 3, Lmq = smrData.Lmq * m / 3, useDamperCage = smrData.useDamperCage, Lrsigmad = smrData.Lrsigmad, Lrsigmaq = smrData.Lrsigmaq, Rrd = smrData.Rrd, Rrq = smrData.Rrq, TsOperational=smrData.TsRef, TrOperational=smrData.TrRef, alpha20r=smrData.alpha20r) annotation ( @@ -23,9 +23,9 @@ Placement(transformation(extent={{-70,-30},{-50,-10}}))); Modelica.Electrical.Machines.Utilities.VfController vfController(final m = m, VNominal = VsNominal, fNominal = fsNominal) annotation ( Placement(transformation(extent={{-40,-30},{-20,-10}}))); - Modelica.Electrical.MultiPhase.Sources.SignalVoltage signalVoltage(final m = m) annotation ( + Modelica.Electrical.Polyphase.Sources.SignalVoltage signalVoltage(final m = m) annotation ( Placement(transformation(origin={-10,-50}, extent = {{-10, 10}, {10, -10}}, rotation = 180))); - Modelica.Electrical.MultiPhase.Basic.Star star(final m = m) annotation ( + Modelica.Electrical.Polyphase.Basic.Star star(final m = m) annotation ( Placement(transformation(extent={{-30,-60},{-50,-40}}))); Modelica.Electrical.Analog.Basic.Ground ground annotation ( Placement(transformation(origin={-60,-50}, extent = {{-10, -10}, {10, 10}}, rotation = 270))); @@ -35,13 +35,13 @@ Placement(transformation(extent = {{96, -90}, {76, -70}}))); Modelica.Electrical.Machines.Utilities.MultiTerminalBox terminalBox(terminalConnection = "Y", m = m) annotation ( Placement(transformation(extent = {{20, -74}, {40, -54}}))); - Modelica.Electrical.MultiPhase.Sensors.CurrentQuasiRMSSensor currentRMSSensor(final m = m) annotation ( + Modelica.Electrical.Polyphase.Sensors.CurrentQuasiRMSSensor currentRMSSensor(final m = m) annotation ( Placement(transformation(origin = {20, -50}, extent = {{-10, 10}, {10, -10}}))); - Modelica.Electrical.MultiPhase.Basic.Star starMachine(final m = Modelica.Electrical.MultiPhase.Functions.numberOfSymmetricBaseSystems(m)) annotation ( + Modelica.Electrical.Polyphase.Basic.Star starMachine(final m = Modelica.Electrical.Polyphase.Functions.numberOfSymmetricBaseSystems(m)) annotation ( Placement(transformation(extent = {{10, -10}, {-10, 10}}, rotation = 0, origin = {0, -74}))); Modelica.Electrical.Analog.Basic.Ground groundMachine annotation ( Placement(transformation(origin = {-30, -74}, extent = {{-10, -10}, {10, 10}}, rotation = 270))); - Modelica.Electrical.MultiPhase.Sensors.VoltageQuasiRMSSensor voltageRMSSensor(final m=m) annotation ( + Modelica.Electrical.Polyphase.Sensors.VoltageQuasiRMSSensor voltageRMSSensor(final m=m) annotation ( Placement(transformation(origin={60,-50}, extent={{10,10},{-10,-10}}))); parameter ParameterRecords.SMR smrData "Synchronous machine data" annotation (Placement(transformation(extent={{70,-28},{90,-8}}))); initial equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/SynchronousMachines/SMR_MTPA.mo" "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/SynchronousMachines/SMR_MTPA.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/SynchronousMachines/SMR_MTPA.mo" 2021-11-24 08:09:22.151362990 +0000 +++ "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/SynchronousMachines/SMR_MTPA.mo" 2021-11-24 08:09:48.939282436 +0000 @@ -3,20 +3,20 @@ extends Modelica.Icons.Example; import Modelica.Constants.pi; parameter Integer m = 3 "Number of phases"; - parameter Modelica.SIunits.Voltage VNominal = 100 "Nominal RMS voltage per phase"; - parameter Modelica.SIunits.Frequency fsNominal = 50 "Nominal frequency"; - parameter Modelica.SIunits.Frequency f = 50 "Actual frequency"; - parameter Modelica.SIunits.Time tRamp = 1 "Frequency ramp"; - parameter Modelica.SIunits.Torque TLoad = 88.67 "Nominal load torque"; - parameter Modelica.SIunits.Time tStep = 1.2 "Time of load torque step"; - parameter Modelica.SIunits.Inertia JLoad = 0.29 "Load's moment of inertia"; - parameter Modelica.SIunits.AngularVelocity wNominal = 2 * pi * fsNominal / smrData.p "Nominal angular velocity"; - Modelica.SIunits.Angle theta = rotorDisplacementAngle.rotorDisplacementAngle "Rotor displacement angle, quasi stastic"; + parameter Modelica.Units.SI.Voltage VNominal = 100 "Nominal RMS voltage per phase"; + parameter Modelica.Units.SI.Frequency fsNominal = 50 "Nominal frequency"; + parameter Modelica.Units.SI.Frequency f = 50 "Actual frequency"; + parameter Modelica.Units.SI.Time tRamp = 1 "Frequency ramp"; + parameter Modelica.Units.SI.Torque TLoad = 88.67 "Nominal load torque"; + parameter Modelica.Units.SI.Time tStep = 1.2 "Time of load torque step"; + parameter Modelica.Units.SI.Inertia JLoad = 0.29 "Load's moment of inertia"; + parameter Modelica.Units.SI.AngularVelocity wNominal = 2 * pi * fsNominal / smrData.p "Nominal angular velocity"; + Modelica.Units.SI.Angle theta = rotorDisplacementAngle.rotorDisplacementAngle "Rotor displacement angle, quasi stastic"; parameter Boolean positiveRange = false "Use positive range of angles, if true"; - Modelica.SIunits.Angle phii = Modelica.Math.wrapAngle(smr.arg_is[1], positiveRange) "Angle of current"; - Modelica.SIunits.Angle phiv = Modelica.Math.wrapAngle(smr.arg_vs[1], positiveRange) "Angle of voltage"; - Modelica.SIunits.Angle phis = Modelica.Math.wrapAngle(phiv - phii, positiveRange) "Angle between voltage and current"; - Modelica.SIunits.Angle epsilon = Modelica.Math.wrapAngle(phis - theta, positiveRange) "Current angle"; + Modelica.Units.SI.Angle phii = Modelica.Math.wrapAngle(smr.arg_is[1], positiveRange) "Angle of current"; + Modelica.Units.SI.Angle phiv = Modelica.Math.wrapAngle(smr.arg_vs[1], positiveRange) "Angle of voltage"; + Modelica.Units.SI.Angle phis = Modelica.Math.wrapAngle(phiv - phii, positiveRange) "Angle between voltage and current"; + Modelica.Units.SI.Angle epsilon = Modelica.Math.wrapAngle(phis - theta, positiveRange) "Current angle"; Modelica.Magnetic.QuasiStatic.FundamentalWave.BasicMachines.SynchronousMachines.SM_ReluctanceRotor smr(p = smrData.p, fsNominal = smrData.fsNominal, TsRef = smrData.TsRef, Jr = smrData.Jr, Js = smrData.Js, frictionParameters = smrData.frictionParameters, statorCoreParameters = smrData.statorCoreParameters, strayLoadParameters = smrData.strayLoadParameters, Lrsigmad = smrData.Lrsigmad, Lrsigmaq = smrData.Lrsigmaq, Rrd = smrData.Rrd, Rrq = smrData.Rrq, TrRef = smrData.TrRef, phiMechanical(fixed = true, start = 0), m = m, effectiveStatorTurns = smrData.effectiveStatorTurns, Rs = smrData.Rs * m / 3, Lssigma = smrData.Lssigma * m / 3, Lmd = smrData.Lmd * m / 3, Lmq = smrData.Lmq * m / 3, TrOperational=smrData.TrRef, useDamperCage=false, @@ -26,9 +26,9 @@ Placement(transformation(extent = {{0, 0}, {20, 20}}))); Modelica.Mechanics.Rotational.Sources.ConstantSpeed quadraticSpeedDependentTorque(w_fixed = wNominal) annotation ( Placement(transformation(extent = {{80, 0}, {60, 20}}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Basic.Star starMachine(m = Modelica.Electrical.MultiPhase.Functions.numberOfSymmetricBaseSystems(m)) annotation ( + Modelica.Electrical.QuasiStatic.Polyphase.Basic.Star starMachine(m = Modelica.Electrical.Polyphase.Functions.numberOfSymmetricBaseSystems(m)) annotation ( Placement(transformation(extent = {{-10, 10}, {10, -10}}, rotation = 180, origin = {-20, 10}))); - Modelica.Electrical.QuasiStationary.SinglePhase.Basic.Ground groundM annotation ( + Modelica.Electrical.QuasiStatic.SinglePhase.Basic.Ground groundM annotation ( Placement(transformation(extent = {{-10, -10}, {10, 10}}, rotation = 0, origin = {-50, 0}))); Modelica.Magnetic.QuasiStatic.FundamentalWave.Utilities.MultiTerminalBox terminalBox(terminalConnection = "Y", m = m) annotation ( Placement(transformation(extent = {{0, 16}, {20, 36}}))); @@ -36,13 +36,13 @@ Placement(transformation(extent = {{-40, 70}, {-20, 90}}))); Modelica.Mechanics.Rotational.Sensors.AngleSensor angleSensor annotation ( Placement(transformation(extent = {{-10, -10}, {10, 10}}, rotation = 90, origin = {40, 50}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Sources.ReferenceCurrentSource referenceCurrentSource(m = m) annotation ( + Modelica.Electrical.QuasiStatic.Polyphase.Sources.ReferenceCurrentSource referenceCurrentSource(m = m) annotation ( Placement(transformation(extent = {{10, -10}, {-10, 10}}, rotation = 90, origin = {10, 80}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Basic.Star star(m = m) annotation ( + Modelica.Electrical.QuasiStatic.Polyphase.Basic.Star star(m = m) annotation ( Placement(transformation(origin = {60, 80}, extent = {{-10, -10}, {10, 10}}, rotation = 270))); - Modelica.Electrical.QuasiStationary.SinglePhase.Basic.Ground grounde annotation ( + Modelica.Electrical.QuasiStatic.SinglePhase.Basic.Ground grounde annotation ( Placement(transformation(extent = {{-10, -10}, {10, 10}}, origin = {60, 60}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Basic.Resistor resistor(m = m, R_ref = fill(1e5, m)) annotation ( + Modelica.Electrical.QuasiStatic.Polyphase.Basic.Resistor resistor(m = m, R_ref = fill(1e5, m)) annotation ( Placement(transformation(extent = {{-10, -10}, {10, 10}}, rotation = 270, origin = {30, 80}))); Modelica.Magnetic.QuasiStatic.FundamentalWave.Sensors.RotorDisplacementAngle rotorDisplacementAngle( m=m, @@ -51,11 +51,11 @@ extent={{10,-10},{-10,10}}, rotation=90, origin={40,10}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Sensors.CurrentQuasiRMSSensor currentRMSSensor(m = m) annotation ( + Modelica.Electrical.QuasiStatic.Polyphase.Sensors.CurrentQuasiRMSSensor currentRMSSensor(m = m) annotation ( Placement(transformation(extent = {{10, 10}, {-10, -10}}, rotation = 90, origin = {10, 50}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Sensors.VoltageQuasiRMSSensor voltageRMSSensor(m = m) annotation ( + Modelica.Electrical.QuasiStatic.Polyphase.Sensors.VoltageQuasiRMSSensor voltageRMSSensor(m = m) annotation ( Placement(transformation(extent = {{-30, 50}, {-10, 30}}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Basic.Star starM(m = m) annotation ( + Modelica.Electrical.QuasiStatic.Polyphase.Basic.Star starM(m = m) annotation ( Placement(transformation(extent = {{-10, 10}, {10, -10}}, rotation = 270, origin = {-40, 30}))); Modelica.ComplexBlocks.Sources.ComplexRotatingPhasor rotSource(magnitude = 100, w = 2 * pi) annotation ( Placement(transformation(extent = {{-10, -10}, {10, 10}}, rotation = 90, origin = {-70, 20}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/SynchronousMachines/Templates/SMEE_ShortCircuit.mo" "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/SynchronousMachines/Templates/SMEE_ShortCircuit.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/SynchronousMachines/Templates/SMEE_ShortCircuit.mo" 2021-11-24 08:09:22.151362990 +0000 +++ "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/SynchronousMachines/Templates/SMEE_ShortCircuit.mo" 2021-11-24 08:09:48.867282653 +0000 @@ -4,15 +4,15 @@ import Modelica.Constants.pi; parameter Integer m=3 "Number of phases"; parameter Integer p=2 "Number of poles"; - parameter Modelica.SIunits.Angle phi=Modelica.SIunits.Conversions.from_deg(0) "Phase angle lag of machine voltages"; - parameter Modelica.SIunits.Voltage VNominal=100 "Nominal RMS voltage per phase"; - parameter Modelica.SIunits.Frequency fNominal=50 "Nominal frequency"; - parameter Modelica.SIunits.Voltage Ve=smeeData.Re*smeeData.IeOpenCircuit "Excitation voltage"; - parameter Modelica.SIunits.Angle gamma0(displayUnit="deg") = 0 "Initial rotor displacement angle"; - parameter Modelica.SIunits.AngularVelocity wNominal=2*pi*smeeData.fsNominal/p "Nominal angular velocity"; - Modelica.SIunits.Current irRMS = sqrt(smee.ir[1]^2+smee.ir[2]^2)/sqrt(2) "Quasi RMS rotor current"; - output Modelica.SIunits.Current ie = smee.ie "Excitation current"; - Modelica.Magnetic.FundamentalWave.BasicMachines.SynchronousInductionMachines.SM_ElectricalExcited smee( + parameter Modelica.Units.SI.Angle phi=Modelica.Units.Conversions.from_deg(0) "Phase angle lag of machine voltages"; + parameter Modelica.Units.SI.Voltage VNominal=100 "Nominal RMS voltage per phase"; + parameter Modelica.Units.SI.Frequency fNominal=50 "Nominal frequency"; + parameter Modelica.Units.SI.Voltage Ve=smeeData.Re*smeeData.IeOpenCircuit "Excitation voltage"; + parameter Modelica.Units.SI.Angle gamma0(displayUnit="deg") = 0 "Initial rotor displacement angle"; + parameter Modelica.Units.SI.AngularVelocity wNominal=2*pi*smeeData.fsNominal/p "Nominal angular velocity"; + Modelica.Units.SI.Current irRMS = sqrt(smee.ir[1]^2+smee.ir[2]^2)/sqrt(2) "Quasi RMS rotor current"; + output Modelica.Units.SI.Current ie = smee.ie "Excitation current"; + Modelica.Magnetic.FundamentalWave.BasicMachines.SynchronousMachines.SM_ElectricalExcited smee( phiMechanical(start=-(pi + gamma0)/smee.p, fixed=true), fsNominal=smeeData.fsNominal, TsRef=smeeData.TsRef, @@ -51,17 +51,17 @@ origin={-10,-60}, extent={{-10,-10},{10,10}}, rotation=0))); - Modelica.Electrical.MultiPhase.Sensors.MultiSensor multiSensor(m=m) annotation (Placement(transformation( + Modelica.Electrical.Polyphase.Sensors.MultiSensor multiSensor(m=m) annotation (Placement(transformation( origin={20,30}, extent={{-10,-10},{10,10}}, rotation=270))); - Modelica.Electrical.MultiPhase.Sensors.CurrentQuasiRMSSensor currentRMSSensor(m=m) annotation (Placement(transformation( + Modelica.Electrical.Polyphase.Sensors.CurrentQuasiRMSSensor currentRMSSensor(m=m) annotation (Placement(transformation( origin={20,0}, extent={{-10,-10},{10,10}}, rotation=270))); Modelica.Electrical.Machines.Utilities.TerminalBox terminalBox(terminalConnection="Y", m=m) annotation (Placement(transformation(extent={{10,-24},{30,-4}}))); - Modelica.Electrical.MultiPhase.Ideal.IdealClosingSwitch switch( + Modelica.Electrical.Polyphase.Ideal.IdealClosingSwitch switch( final m=m, Ron=fill(1e-5*m/3, m), Goff=fill(1e-5*m/3, m)) annotation (Placement(transformation( @@ -75,9 +75,9 @@ origin={-60,40}, extent={{-10,-10},{10,10}}, rotation=0))); - Modelica.Electrical.MultiPhase.Basic.PlugToPin_p pin1(m=m, k=1) annotation (Placement(transformation(extent={{-30,60},{-50,80}}))); - Modelica.Electrical.MultiPhase.Basic.PlugToPin_p pin2(m=m, k=2) annotation (Placement(transformation(extent={{-30,40},{-50,60}}))); - Modelica.Electrical.MultiPhase.Basic.PlugToPin_p pin3(m=m, k=3) annotation (Placement(transformation(extent={{-30,20},{-50,40}}))); + Modelica.Electrical.Polyphase.Basic.PlugToPin_p pin1(m=m, k=1) annotation (Placement(transformation(extent={{-30,60},{-50,80}}))); + Modelica.Electrical.Polyphase.Basic.PlugToPin_p pin2(m=m, k=2) annotation (Placement(transformation(extent={{-30,40},{-50,60}}))); + Modelica.Electrical.Polyphase.Basic.PlugToPin_p pin3(m=m, k=3) annotation (Placement(transformation(extent={{-30,20},{-50,40}}))); Modelica.Electrical.Machines.Sensors.MechanicalPowerSensor mechanicalPowerSensor annotation (Placement(transformation(extent={{40,-40},{60,-20}}))); Modelica.Mechanics.Rotational.Sources.ConstantSpeed constantSpeed(useSupport=false, final w_fixed=wNominal) annotation (Placement(transformation(extent={{90,-40},{70,-20}}))); Modelica.Electrical.Analog.Sources.ConstantVoltage constantVoltage(V=Ve) annotation (Placement(transformation( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Thermal/Components/LongRod.mo" "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Thermal/Components/LongRod.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Thermal/Components/LongRod.mo" 2021-11-24 08:09:22.151362990 +0000 +++ "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Thermal/Components/LongRod.mo" 2021-11-24 08:09:48.791282882 +0000 @@ -1,10 +1,10 @@ within HanserModelica.Thermal.Components; model LongRod "Long rod consisting of n short rods" parameter Integer n = 3 "Number of short rods"; - parameter Modelica.SIunits.HeatCapacity C = 1500 "Total heat capacity of long rod element"; - parameter Modelica.SIunits.ThermalResistance R = 0.08 "Total heat resistance of long rod element"; - parameter Modelica.SIunits.Temperature T0=293.15 "Initial temperature of inner rod elements"; - Modelica.SIunits.Temperature T[n] = shortRod.T "Heat capacitor temperatures"; + parameter Modelica.Units.SI.HeatCapacity C = 1500 "Total heat capacity of long rod element"; + parameter Modelica.Units.SI.ThermalResistance R = 0.08 "Total heat resistance of long rod element"; + parameter Modelica.Units.SI.Temperature T0=293.15 "Initial temperature of inner rod elements"; + Modelica.Units.SI.Temperature T[n] = shortRod.T "Heat capacitor temperatures"; ShortRod shortRod[n](final C=fill(C/n, n),final R=fill(R/n, n),final T0=fill(T0, n)) annotation (Placement(transformation(extent={{-10,-10},{10,10}}))); Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a port_a annotation (Placement(transformation(extent={{-110,-10},{-90,10}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Thermal/Components/ShortRod.mo" "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Thermal/Components/ShortRod.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Thermal/Components/ShortRod.mo" 2021-11-24 08:09:22.151362990 +0000 +++ "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Thermal/Components/ShortRod.mo" 2021-11-24 08:09:48.763282966 +0000 @@ -1,9 +1,9 @@ within HanserModelica.Thermal.Components; model ShortRod "Short rod" - parameter Modelica.SIunits.HeatCapacity C = 1500 "Heat capacity of rod element"; - parameter Modelica.SIunits.ThermalResistance R = 0.08 "Heat resistance of rod element"; - parameter Modelica.SIunits.Temperature T0=293.15 "Initial temperature of rod element"; - Modelica.SIunits.Temperature T = heatCapacitor.T "Heat capacitor temperature"; + parameter Modelica.Units.SI.HeatCapacity C = 1500 "Heat capacity of rod element"; + parameter Modelica.Units.SI.ThermalResistance R = 0.08 "Heat resistance of rod element"; + parameter Modelica.Units.SI.Temperature T0=293.15 "Initial temperature of rod element"; + Modelica.Units.SI.Temperature T = heatCapacitor.T "Heat capacitor temperature"; Modelica.Thermal.HeatTransfer.Components.ThermalResistor thermalResistor1(final R=R/2) annotation (Placement(transformation(extent={{-60,-10},{-40,10}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Thermal/Coupling.mo" "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Thermal/Coupling.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Thermal/Coupling.mo" 2021-11-24 08:09:22.151362990 +0000 +++ "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/Thermal/Coupling.mo" 2021-11-24 08:09:48.747283014 +0000 @@ -1,14 +1,14 @@ within HanserModelica.Thermal; model Coupling "Electro-thermal coupling" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Voltage v = 100 "DC supply voltage"; - parameter Modelica.SIunits.Resistance RRef = 10 "Resistance at TRef"; - parameter Modelica.SIunits.Temperature TRef = 20+273.15 "Reference temperature"; - parameter Modelica.SIunits.LinearTemperatureCoefficient alphaRef = 0.004 + parameter Modelica.Units.SI.Voltage v = 100 "DC supply voltage"; + parameter Modelica.Units.SI.Resistance RRef = 10 "Resistance at TRef"; + parameter Modelica.Units.SI.Temperature TRef = 20+273.15 "Reference temperature"; + parameter Modelica.Units.SI.LinearTemperatureCoefficient alphaRef = 0.004 "Linear temperature coefficient at reference temperature"; - parameter Modelica.SIunits.Temperature TAmbient = 20+273.15 "Ambient temperature"; - parameter Modelica.SIunits.ThermalResistance R = 0.08 "Thermal resistance"; - parameter Modelica.SIunits.HeatCapacity C = 1500 "Thermal capacitance"; + parameter Modelica.Units.SI.Temperature TAmbient = 20+273.15 "Ambient temperature"; + parameter Modelica.Units.SI.ThermalResistance R = 0.08 "Thermal resistance"; + parameter Modelica.Units.SI.HeatCapacity C = 1500 "Thermal capacitance"; Modelica.Electrical.Analog.Basic.Resistor resistor( R=RRef, T_ref=TRef, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/VariablesTypes/Attributes.mo" "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/VariablesTypes/Attributes.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/VariablesTypes/Attributes.mo" 2021-11-24 08:09:22.151362990 +0000 +++ "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/VariablesTypes/Attributes.mo" 2021-11-24 08:09:48.643283327 +0000 @@ -2,7 +2,7 @@ model Attributes "Example on attributes" extends Modelica.Icons.Example; parameter Real T1(quantity="time", unit="s", displayUnit="h")=7200 "Time constant 1"; - parameter Modelica.SIunits.Time T2(displayUnit="h")=7200 "Time constant 2"; + parameter Modelica.Units.SI.Time T2(displayUnit="h")=7200 "Time constant 2"; Real x(start=0); Real y(start=10); equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/VariablesTypes/ComplexCalculation.mo" "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/VariablesTypes/ComplexCalculation.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/VariablesTypes/ComplexCalculation.mo" 2021-11-24 08:09:22.151362990 +0000 +++ "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/VariablesTypes/ComplexCalculation.mo" 2021-11-24 08:09:48.631283363 +0000 @@ -1,13 +1,13 @@ within HanserModelica.VariablesTypes; model ComplexCalculation "Complex calculation" extends Modelica.Icons.Example; - parameter Modelica.SIunits.ComplexImpedance Z1 = Complex(10,2) "Impedance Z1 = (10+j*2) Ohm"; - parameter Modelica.SIunits.Impedance Z2abs = 50 "Magnitude of complex impedance Z2"; - Modelica.SIunits.ComplexImpedance Z2 "Complex impedance with varying angle"; - parameter Modelica.SIunits.AngularVelocity w = 2*Modelica.Constants.pi "Angular velocity of impedance angle Z2"; - parameter Modelica.SIunits.ComplexVoltage V = Complex(100,0) "Total voltage"; - Modelica.SIunits.ComplexCurrent I "Total current"; - Modelica.SIunits.ComplexPower S "Total apparent power"; + parameter Modelica.Units.SI.ComplexImpedance Z1 = Complex(10,2) "Impedance Z1 = (10+j*2) Ohm"; + parameter Modelica.Units.SI.Impedance Z2abs = 50 "Magnitude of complex impedance Z2"; + Modelica.Units.SI.ComplexImpedance Z2 "Complex impedance with varying angle"; + parameter Modelica.Units.SI.AngularVelocity w = 2*Modelica.Constants.pi "Angular velocity of impedance angle Z2"; + parameter Modelica.Units.SI.ComplexVoltage V = Complex(100,0) "Total voltage"; + Modelica.Units.SI.ComplexCurrent I "Total current"; + Modelica.Units.SI.ComplexPower S "Total apparent power"; equation // Z2 has constant magnitude, varying angle Z2 = Modelica.ComplexMath.fromPolar(Z2abs,w*time); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/openmodelica.metadata.json" "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/openmodelica.metadata.json" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/openmodelica.metadata.json" 2021-11-24 08:09:22.151362990 +0000 +++ "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/openmodelica.metadata.json" 2021-11-24 08:09:51.635274332 +0000 @@ -1 +1 @@ -{"path":"HanserModelica", "sha":"f2181bfcd51e943deb6a3b23b166df638f483990", "support":"noSupport", "uses":{"Complex":"3.2.3", "Modelica":"3.2.3"}, "version":"1.1.1-master", "zipfile":"https://github.com/christiankral/HanserModelica/archive/f2181bfcd51e943deb6a3b23b166df638f483990.zip"} +{"path": "HanserModelica", "sha": "f2181bfcd51e943deb6a3b23b166df638f483990", "support": "noSupport", "uses": {"Complex": "4.0.0", "Modelica": "4.0.0"}, "version": "1.1.1-master", "zipfile": "https://github.com/christiankral/HanserModelica/archive/f2181bfcd51e943deb6a3b23b166df638f483990.zip", "extraInfo": "Conversion script /home/hudson/saved_omc/libraries/.openmodelica/libraries/Modelica 4.0.0+maint.om//Resources/Scripts/Conversion/ConvertModelica_from_3.2.3_to_4.0.0.mos was applied"} \ No newline at end of file diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/package.mo" "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/package.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/package.mo" 2021-11-24 08:09:22.151362990 +0000 +++ "converted-libraries/.openmodelica/libraries/HanserModelica 1.1.1-master/package.mo" 2021-11-24 08:09:51.631274344 +0000 @@ -7,7 +7,7 @@ preferredView="info", version="1.1.1", versionDate="2020-08-24", - uses(Complex(version="3.2.3"), Modelica(version="3.2.3")), + uses(Modelica(version = "4.0.0")), Documentation(info="

HanserModelica is a Modelica open source educational library on object oriented modeling applied to electrical engineering and