Skip to content

Commit 50dad5d

Browse files
committed
Update
1 parent cfff7e7 commit 50dad5d

3 files changed

Lines changed: 6947 additions & 49 deletions

File tree

OpenIPSL/Electrical/Machines/ControlsMotors.mo

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -252,17 +252,14 @@ package ControlsMotors "Control models"
252252
Modelica.Blocks.Sources.BooleanExpression open_circuit_condition(y=if
253253
Resistor.i <= 0 then true else false)
254254
annotation (Placement(transformation(extent={{52,6},{32,26}})));
255-
Modelica.Blocks.Sources.RealExpression Pmotor(y=-(n.vr*n.ir + n.vi*n.ii)
256-
*(nr_input/wb))
255+
Modelica.Blocks.Sources.RealExpression Pmotor(y=-(n.vr*n.ir + n.vi*n.ii))
257256
annotation (Placement(transformation(extent={{24,70},{44,90}})));
258-
Modelica.Blocks.Sources.RealExpression Qmotor(y=(n.vr*n.ii - n.vi*n.ir)
259-
*(nr_input/wb))
257+
Modelica.Blocks.Sources.RealExpression Qmotor(y=(n.vr*n.ii - n.vi*n.ir))
260258
annotation (Placement(transformation(extent={{24,54},{44,74}})));
261259
OpenIPSL.Types.PerUnit P;
262260
Modelica.Units.SI.ActivePower Pdc;
263261
OpenIPSL.Types.PerUnit Q;
264262
OpenIPSL.Types.PerUnit S;
265-
Modelica.Units.SI.AngularVelocity rotor_speed;
266263

267264
Modelica.Blocks.Sources.RealExpression Vmotor(y=Capacitor.v*m_input/(2*sqrt(2)
268265
*V_b))
@@ -304,14 +301,6 @@ package ControlsMotors "Control models"
304301
parameter Modelica.Units.SI.AngularVelocity wb = 2*pi*fn/N;
305302
Modelica.Blocks.Sources.RealExpression Smotor(y=sqrt(Pmotor.y^2 + Qmotor.y^2))
306303
annotation (Placement(transformation(extent={{62,38},{82,58}})));
307-
Modelica.Blocks.Interfaces.RealInput nr_input annotation (Placement(
308-
transformation(
309-
extent={{-20,-20},{20,20}},
310-
rotation=180,
311-
origin={120,-70}), iconTransformation(
312-
extent={{-10,-10},{10,10}},
313-
rotation=180,
314-
origin={130,-70})));
315304
Modelica.Electrical.Analog.Sources.SignalVoltage voltage annotation (
316305
Placement(transformation(
317306
extent={{-10,10},{10,-10}},
@@ -351,8 +340,6 @@ package ControlsMotors "Control models"
351340
P*S_b = Pdc;
352341

353342

354-
rotor_speed = nr_input;
355-
356343
n.vr = vr_m.y;
357344
n.vi = vi_m.y;
358345
connect(ground.p, Capacitor.n) annotation (Line(points={{-4,-30},{-4,-28},{30,

0 commit comments

Comments
 (0)