Skip to content

Commit fa70283

Browse files
AHaumerAHaumer
committed
fixed a bug introduced by resolving conflicts
1 parent 27fe554 commit fa70283

File tree

4 files changed

+23
-25
lines changed

4 files changed

+23
-25
lines changed

‎Modelica/Blocks/package.mo‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2642,10 +2642,10 @@ random number generator. This block is used in the example
26422642
10}}, color={0,0,127}));
26432643
connect(angleSensor.phi, phi_motor) annotation (Line(points={{10,11},{10,11},{
26442644
10,22},{10,30},{70,30}}, color={0,0,127}));
2645-
connect(id.y, dqToThreePhase.id_rms) annotation (Line(points={{-69,70},
2646-
{-60,70},{-60,56},{-52,56}}, color={0,0,127}));
2647-
connect(iq_rms1, dqToThreePhase.iq_rms) annotation (Line(points={{
2648-
-120,60},{-100,60},{-100,44},{-52,44}}, color={0,0,127}));
2645+
connect(id.y, dqToThreePhase.d) annotation (Line(points={{-69,70},{-60,
2646+
70},{-60,56},{-52,56}}, color={0,0,127}));
2647+
connect(iq_rms1, dqToThreePhase.q) annotation (Line(points={{-120,60},
2648+
{-100,60},{-100,44},{-52,44}}, color={0,0,127}));
26492649
annotation (
26502650
Documentation(info="<html>
26512651
<p>

‎Modelica/Electrical/Machines.mo‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2673,10 +2673,10 @@ In practice it is nearly impossible to drive a PMSMD without current controller.
26732673
connect(signalCurrent.plug_p, star.plug_p) annotation (Line(
26742674
points={{-10,60},{-10,90},{-50,90}},
26752675
color={0,0,255}));
2676-
connect(id.y, dqToThreePhase.id_rms) annotation (Line(points={{-69,70},
2677-
{-60,70},{-60,56},{-52,56}}, color={0,0,127}));
2678-
connect(iq.y, dqToThreePhase.iq_rms) annotation (Line(points={{-69,30},
2679-
{-60,30},{-60,44},{-52,44}}, color={0,0,127}));
2676+
connect(id.y, dqToThreePhase.d) annotation (Line(points={{-69,70},{-60,
2677+
70},{-60,56},{-52,56}}, color={0,0,127}));
2678+
connect(iq.y, dqToThreePhase.q) annotation (Line(points={{-69,30},{-60,
2679+
30},{-60,44},{-52,44}}, color={0,0,127}));
26802680
connect(groundM.p, terminalBox.starpoint) annotation (Line(
26812681
points={{-70,-28},{-20,-28}},
26822682
color={0,0,255}));
@@ -16905,12 +16905,10 @@ using the provided mechanical rotor angle phi. The output are the instantaneous
1690516905
parameter Integer p "Number of pole pairs";
1690616906
parameter Boolean useRMS=true "If true, inputs dq are multiplied by sqrt(2)";
1690716907
extends Modelica.Blocks.Interfaces.MO(final nout=m);
16908-
Modelica.Blocks.Interfaces.RealInput id_rms "d-component"
16909-
annotation (Placement(
16910-
transformation(extent={{-140,40},{-100,80}})));
16911-
Modelica.Blocks.Interfaces.RealInput iq_rms "q-component"
16912-
annotation (Placement(
16913-
transformation(extent={{-140,-80},{-100,-40}})));
16908+
Modelica.Blocks.Interfaces.RealInput d "d-component"
16909+
annotation (Placement(transformation(extent={{-140,40},{-100,80}})));
16910+
Modelica.Blocks.Interfaces.RealInput q "q-component"
16911+
annotation (Placement(transformation(extent={{-140,-80},{-100,-40}})));
1691416912
Modelica.Blocks.Interfaces.RealInput phi(unit="rad") "Rotor angle"
1691516913
annotation (Placement(
1691616914
transformation(
@@ -16936,16 +16934,16 @@ using the provided mechanical rotor angle phi. The output are the instantaneous
1693616934
annotation (
1693716935
Placement(transformation(extent={{40,10},{60,-10}})));
1693816936
equation
16939-
connect(iq_rms, toPeak_q.u)
16937+
connect(q, toPeak_q.u)
1694016938
annotation (Line(points={{-120,-60},{-62,-60}}, color={0,0,127}));
1694116939
connect(phi, toGamma.u)
1694216940
annotation (Line(points={{0,-120},{0,-62}}, color={0,0,127}));
1694316941
connect(rotator.angle, toGamma.y)
1694416942
annotation (Line(points={{0,-12},{0,-39},{0,-39}}, color={0,0,127}));
1694516943
connect(rotator.y, fromSpacePhasor.u)
1694616944
annotation (Line(points={{11,0},{24,0},{38,0}}, color={0,0,127}));
16947-
connect(toPeak_d.u, id_rms) annotation (Line(
16948-
points={{-62,60},{-120,60}}, color={0,0,127}));
16945+
connect(toPeak_d.u, d)
16946+
annotation (Line(points={{-62,60},{-120,60}}, color={0,0,127}));
1694916947
connect(toPeak_d.y, rotator.u[1]) annotation (Line(
1695016948
points={{-39,60},{-30,60},{-30,0},{-12,0}}, color={0,0,127}));
1695116949
connect(toPeak_q.y, rotator.u[2]) annotation (Line(

‎Modelica/Magnetic/FundamentalWave.mo‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4383,10 +4383,10 @@ and accelerate the inertias.</p>
43834383
connect(currentQuasiRMSSensor.plug_n, voltageQuasiRMSSensor.plug_p)
43844384
annotation (Line(
43854385
points={{-10,-10},{-20,-10}}, color={0,0,255}));
4386-
connect(id.y, dqToThreePhase.id_rms) annotation (Line(points={{-69,70},
4387-
{-60,70},{-60,56},{-52,56}}, color={0,0,127}));
4388-
connect(iq.y, dqToThreePhase.iq_rms) annotation (Line(points={{-69,30},
4389-
{-60,30},{-60,44},{-52,44}}, color={0,0,127}));
4386+
connect(id.y, dqToThreePhase.d) annotation (Line(points={{-69,70},{-60,
4387+
70},{-60,56},{-52,56}}, color={0,0,127}));
4388+
connect(iq.y, dqToThreePhase.q) annotation (Line(points={{-69,30},{-60,
4389+
30},{-60,44},{-52,44}}, color={0,0,127}));
43904390
annotation (experiment(StopTime=2.0, Interval=1E-4, Tolerance=1e-06), Documentation(
43914391
info="<html>
43924392
<p>A synchronous machine with permanent magnets accelerates a quadratic speed dependent load from standstill.

‎Modelica/Magnetic/QuasiStatic/FundamentalWave.mo‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3193,12 +3193,12 @@ Simulate for 1 second and plot (versus time):
31933193
connect(starMachine.pin_n, groundM.p) annotation (Line(points={{-40,-80},{-60,-80}}, color={0,0,255}));
31943194
connect(id.y, dqToThreePhaseQS.id_rms) annotation (Line(points={{-79,
31953195
30},{-74,30},{-74,96},{-52,96}}, color={0,0,127}));
3196-
connect(id.y, dqToThreePhase.id_rms) annotation (Line(points={{-79,30},
3197-
{-74,30},{-74,-4},{-52,-4}}, color={0,0,127}));
3196+
connect(id.y, dqToThreePhase.d) annotation (Line(points={{-79,30},{-74,
3197+
30},{-74,-4},{-52,-4}}, color={0,0,127}));
31983198
connect(iq.y, dqToThreePhaseQS.iq_rms) annotation (Line(points={{-79,
31993199
-10},{-68,-10},{-68,84},{-52,84}}, color={0,0,127}));
3200-
connect(iq.y, dqToThreePhase.iq_rms) annotation (Line(points={{-79,
3201-
-10},{-68,-10},{-68,-16},{-52,-16}}, color={0,0,127}));
3200+
connect(iq.y, dqToThreePhase.q) annotation (Line(points={{-79,-10},{-68,
3201+
-10},{-68,-16},{-52,-16}}, color={0,0,127}));
32023202
annotation (
32033203
experiment(StopTime=2.0, Interval=1E-4, Tolerance=1E-6),
32043204
Documentation(info="<html>

0 commit comments

Comments
 (0)