Skip to content

Amendment for #4140: Fix merge conflict #4146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Jun 8, 2023
Merged

Amendment for #4140: Fix merge conflict #4146

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
94509a2
Revert "#4107 missing commits in master (#4140)"
beutlich Jun 2, 2023
3b164e6
Resolved issue #4072 (for Modelica/Electrical)
Mar 29, 2023
c699448
Resolved issue #4072 (for rest of Modelica)
Mar 29, 2023
202c4b1
Squash doubled point {0,-50.5}
tobolar Apr 5, 2023
31d2b0f
Delete doubled connection's coordinate
tobolar May 5, 2023
30041de
Delete doubled connection's coordinate
tobolar May 16, 2023
23f5abe
Fix near-zero coordinate in connection's annotation
tobolar May 16, 2023
6d2fe70
Delete doubled connection's coordinate
tobolar May 5, 2023
b9326ca
Delete doubled connection's coordinate
tobolar May 5, 2023
c8c4c32
Delete doubled connection's coordinate
tobolar May 5, 2023
2b686a6
Delete doubled connection's coordinate
tobolar May 5, 2023
bf036a6
Delete doubled connection's coordinate
tobolar May 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions Modelica/Electrical/Machines/Examples/SynchronousMachines/SMPM_NoLoad.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,7 @@ equation
annotation (Line(points={{0,20},{0,12}}, color={0,0,255}));
connect(potentialSensor.phi, toSpacePhasor.u) annotation (Line(points={{0,
41},{0,50},{8,50}}, color={0,0,127}));
connect(constantSpeed.flange, smpm.flange)
annotation (Line(points={{32,0},{10,0}}));
connect(speed.flange, smpm.flange) annotation (Line(points={{30,0},{10,0}}));
connect(smpm.flange, hallSensor.flange)
annotation (Line(points={{10,0},{20,0},{20,-30},{30,-30}}));
connect(toSpacePhasor.y, toPolar.u)
Expand Down