Reformat graphics and Modelica text

modelica · Feb 7, 2024 · 0bbef79 · 0bbef79
1 parent 5dfb795
commit 0bbef79
Show file tree

Hide file tree

Showing 8 changed files with 192 additions and 302 deletions.
diff --git a/examples/DC-Motor2023/models/sse_edrive/emachine.mo b/examples/DC-Motor2023/models/sse_edrive/emachine.mo
@@ -1,94 +1,79 @@
 within sse_edrive;
-model emachine
+model emachine "DC-Motor for a mild hybrid application"
   Modelica.Electrical.Analog.Basic.Ground ground
-    annotation (Placement(transformation(extent={{4,-44},{24,-24}})));
+    annotation (Placement(transformation(extent={{-20,-60},{0,-40}})));
   Modelica.Electrical.Analog.Basic.Resistor resistor(
     R=1,
     T_ref=300.15,
     alpha=0,
-    T=300.15) annotation (Placement(transformation(extent={{10,-10},{-10,10}},
+    T=300.15) annotation (Placement(transformation(
+        extent={{10,-10},{-10,10}},
         rotation=180,
-        origin={-40,68})));
-
-  Modelica.Electrical.Analog.Basic.Inductor inductor(            L=0.001, i(start=
-          0))
-    annotation (Placement(transformation(
+        origin={-10,60})));
+  Modelica.Electrical.Analog.Basic.Inductor inductor(L=0.001, i(start=0)) annotation (Placement(
+        transformation(
         extent={{10,-10},{-10,10}},
         rotation=90,
-        origin={36,50})));
-  Modelica.Electrical.Analog.Basic.RotationalEMF emf(k=0.01) annotation (
-      Placement(transformation(
+        origin={40,40})));
+  Modelica.Electrical.Analog.Basic.RotationalEMF emf(k=0.01) annotation (Placement(transformation(
         extent={{10,10},{-10,-10}},
         rotation=180,
-        origin={36,10})));
-  Modelica.Electrical.Analog.Sensors.CurrentSensor currentSensor annotation (
-      Placement(transformation(
+        origin={40,0})));
+  Modelica.Electrical.Analog.Sensors.CurrentSensor currentSensor annotation (Placement(transformation(
         extent={{10,-10},{-10,10}},
         rotation=270,
-        origin={-76,18})));
-  Modelica.Blocks.Interfaces.RealOutput I(unit="A")
-                                          annotation (Placement(
-        transformation(
+        origin={-60,2})));
+  Modelica.Blocks.Interfaces.RealOutput I(unit="A") annotation (Placement(transformation(
         extent={{-10,-10},{10,10}},
         rotation=180,
-        origin={-106,-62})));
-  Modelica.Mechanics.Rotational.Components.AngleToTorqueAdaptor
-    angleToTorqueAdaptor(use_a=false)
-                         annotation (Placement(transformation(
+        origin={-110,-60})));
+  Modelica.Mechanics.Rotational.Components.AngleToTorqueAdaptor angleToTorqueAdaptor(use_a=false)
+    annotation (Placement(transformation(
         extent={{-10,-10},{10,10}},
         rotation=180,
-        origin={56,10})));
-  Modelica.Blocks.Interfaces.RealInput w(unit="rad/s")
-                                         annotation (Placement(transformation(
+        origin={60,0})));
+  Modelica.Blocks.Interfaces.RealInput w(unit="rad/s") annotation (Placement(transformation(
         extent={{-20,-20},{20,20}},
         rotation=180,
-        origin={102,-22})));
-  Modelica.Blocks.Interfaces.RealInput phi(unit="rad")
-                                           annotation (Placement(
-        transformation(
+        origin={120,-20})));
+  Modelica.Blocks.Interfaces.RealInput phi(unit="rad") annotation (Placement(transformation(
         extent={{-20,-20},{20,20}},
         rotation=180,
-        origin={102,-62})));
-  Modelica.Blocks.Interfaces.RealOutput M(unit="N.m") annotation (Placement(
-        transformation(
-        extent={{-10,-10},{10,10}},
+        origin={120,-60})));
+  Modelica.Blocks.Interfaces.RealOutput M(unit="N.m") annotation (Placement(transformation(
+        extent={{10,-10},{-10,10}},
         rotation=180,
-        origin={92,60})));
-  Modelica.Electrical.Analog.Sources.SignalVoltage signalVoltage annotation (
-      Placement(transformation(
+        origin={110,60})));
+  Modelica.Electrical.Analog.Sources.SignalVoltage signalVoltage annotation (Placement(transformation(
         extent={{-10,-10},{10,10}},
         rotation=90,
-        origin={-76,54})));
-  Modelica.Blocks.Interfaces.RealInput U(unit="V") annotation (Placement(
-        transformation(
+        origin={-60,40})));
+  Modelica.Blocks.Interfaces.RealInput U(unit="V") annotation (Placement(transformation(
         extent={{-20,-20},{20,20}},
         rotation=0,
-        origin={-112,54})));
+        origin={-120,60})));
 equation
-  connect(currentSensor.i,I)  annotation (Line(points={{-87,18},{-88,18},{-88,
-          -62},{-106,-62}},                       color={0,0,127}));
+  connect(currentSensor.i, I)
+    annotation (Line(points={{-71,2},{-88,2},{-88,-60},{-110,-60}}, color={0,0,127}));
   connect(angleToTorqueAdaptor.flange, emf.flange)
-    annotation (Line(points={{54,10},{46,10}},               color={0,0,0}));
-  connect(angleToTorqueAdaptor.w, w) annotation (Line(points={{59,5},{79,7.2},
-          {79,-22},{102,-22}},       color={0,0,127}));
-  connect(angleToTorqueAdaptor.tau, M) annotation (Line(points={{59,18},{72,
-          18},{72,60},{92,60}}, color={0,0,127}));
-  connect(phi, angleToTorqueAdaptor.phi) annotation (Line(points={{102,-62},{
-          72,-62},{72,2},{59,2}}, color={0,0,127}));
-  connect(resistor.n, inductor.p)
-    annotation (Line(points={{-30,68},{36,68},{36,60}}, color={0,0,255}));
-  connect(emf.p, inductor.n)
-    annotation (Line(points={{36,20},{36,40}}, color={0,0,255}));
-  connect(emf.n, ground.p)
-    annotation (Line(points={{36,0},{36,-24},{14,-24}}, color={0,0,255}));
+    annotation (Line(points={{58,0},{50,0}}, color={0,0,0}));
+  connect(angleToTorqueAdaptor.w, w)
+    annotation (Line(points={{63,-5},{83,-5},{83,-20},{120,-20}}, color={0,0,127}));
+  connect(angleToTorqueAdaptor.tau, M)
+    annotation (Line(points={{63,8},{76,8},{76,60},{110,60}}, color={0,0,127}));
+  connect(phi, angleToTorqueAdaptor.phi)
+    annotation (Line(points={{120,-60},{76,-60},{76,-8},{63,-8}}, color={0,0,127}));
+  connect(resistor.n, inductor.p) annotation (Line(points={{0,60},{40,60},{40,50}}, color={0,0,255}));
+  connect(emf.p, inductor.n) annotation (Line(points={{40,10},{40,30}}, color={0,0,255}));
+  connect(emf.n, ground.p) annotation (Line(points={{40,-10},{40,-40},{-10,-40}}, color={0,0,255}));
   connect(ground.p, currentSensor.p)
-    annotation (Line(points={{14,-24},{-76,-24},{-76,8}}, color={0,0,255}));
-  connect(signalVoltage.n, resistor.p) annotation (Line(points={{-76,64},{-64,
-          64},{-64,68},{-50,68}}, color={0,0,255}));
+    annotation (Line(points={{-10,-40},{-60,-40},{-60,-8}}, color={0,0,255}));
+  connect(signalVoltage.n, resistor.p)
+    annotation (Line(points={{-60,50},{-60,60},{-20,60}}, color={0,0,255}));
   connect(signalVoltage.p, currentSensor.n)
-    annotation (Line(points={{-76,44},{-76,28}}, color={0,0,255}));
+    annotation (Line(points={{-60,30},{-60,12}}, color={0,0,255}));
   connect(signalVoltage.v, U)
-    annotation (Line(points={{-88,54},{-112,54}}, color={0,0,127}));
-  annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
-        coordinateSystem(preserveAspectRatio=false)));
+    annotation (Line(points={{-72,40},{-94,40},{-94,60},{-120,60}}, color={0,0,127}));
+  annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(coordinateSystem(
+          preserveAspectRatio=false)));
 end emachine;
diff --git a/examples/DC-Motor2023/models/sse_edrive/mass.mo b/examples/DC-Motor2023/models/sse_edrive/mass.mo
@@ -1,71 +1,59 @@
 within sse_edrive;
-model mass
-  Modelica.Mechanics.Rotational.Components.TorqueToAngleAdaptor
-    torqueToAngleAdaptor(use_a=false)
-                         annotation (Placement(transformation(
+model mass "Rotational mass (load)"
+  Modelica.Mechanics.Rotational.Components.TorqueToAngleAdaptor torqueToAngleAdaptor(use_a=false)
+    annotation (Placement(transformation(
         extent={{-10,-10},{10,10}},
         rotation=180,
-        origin={-60,28})));
-  Modelica.Mechanics.Rotational.Components.TorqueToAngleAdaptor
-    torqueToAngleAdaptor1(use_a=false)
-                          annotation (Placement(transformation(
+        origin={-50,0})));
+  Modelica.Mechanics.Rotational.Components.TorqueToAngleAdaptor torqueToAngleAdaptor1(use_a=false)
+    annotation (Placement(transformation(
         extent={{-10,-10},{10,10}},
         rotation=0,
-        origin={70,28})));
+        origin={50,0})));
   Modelica.Mechanics.Rotational.Components.Inertia inertia(
     J=0.002,
     phi(start=0),
     w(start=0),
-    a(start=0))
-    annotation (Placement(transformation(extent={{-2,18},{18,38}})));
+    a(start=0)) annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
   Modelica.Blocks.Interfaces.RealInput M_A(unit="N.m")
-    annotation (Placement(transformation(extent={{-126,40},{-86,80}})));
-  Modelica.Blocks.Interfaces.RealOutput wA(unit="rad/s")
-                                           annotation (Placement(
-        transformation(
+    annotation (Placement(transformation(extent={{-140,40},{-100,80}})));
+  Modelica.Blocks.Interfaces.RealOutput wA(unit="rad/s") annotation (Placement(transformation(
         extent={{-10,-10},{10,10}},
         rotation=180,
-        origin={-106,-40})));
-  Modelica.Blocks.Interfaces.RealOutput phiA(unit="rad")
-                                             annotation (Placement(
-        transformation(
+        origin={-110,-20})));
+  Modelica.Blocks.Interfaces.RealOutput phiA(unit="rad") annotation (Placement(transformation(
         extent={{-10,-10},{10,10}},
         rotation=180,
-        origin={-108,-68})));
-  Modelica.Blocks.Interfaces.RealInput M_B(unit="N.m") annotation (Placement(
-        transformation(
+        origin={-110,-60})));
+  Modelica.Blocks.Interfaces.RealInput M_B(unit="N.m") annotation (Placement(transformation(
         extent={{-20,-20},{20,20}},
         rotation=180,
-        origin={104,-64})));
-  Modelica.Blocks.Interfaces.RealOutput wB(unit="rad/s")
-                                           annotation (Placement(
-        transformation(
+        origin={120,-60})));
+  Modelica.Blocks.Interfaces.RealOutput wB(unit="rad/s") annotation (Placement(transformation(
         extent={{-10,-10},{10,10}},
         rotation=0,
-        origin={106,30})));
-  Modelica.Blocks.Interfaces.RealOutput phiB(unit="rad")
-                                             annotation (Placement(
-        transformation(
+        origin={110,20})));
+  Modelica.Blocks.Interfaces.RealOutput phiB(unit="rad") annotation (Placement(transformation(
         extent={{-10,-10},{10,10}},
         rotation=0,
-        origin={106,68})));
+        origin={110,60})));
 equation
   connect(inertia.flange_a, torqueToAngleAdaptor.flange)
-    annotation (Line(points={{-2,28},{-58,28}}, color={0,0,0}));
-  connect(inertia.flange_b, torqueToAngleAdaptor1.flange) annotation (Line(
-        points={{18,28},{68,28}},                 color={0,0,0}));
-  connect(torqueToAngleAdaptor.tau, M_A) annotation (Line(points={{-63,36},{-86,
-          36},{-86,60},{-106,60}}, color={0,0,127}));
-  connect(torqueToAngleAdaptor.w, wA) annotation (Line(points={{-63,23},{
-          -80.5,23},{-80.5,-40},{-106,-40}}, color={0,0,127}));
-  connect(torqueToAngleAdaptor.phi, phiA) annotation (Line(points={{-63,20},{
-          -76,20},{-76,-68},{-108,-68}}, color={0,0,127}));
-  connect(torqueToAngleAdaptor1.phi, phiB) annotation (Line(points={{73,36},{88,36},{88,68},{106,68}},
-                                    color={0,0,127}));
-  connect(torqueToAngleAdaptor1.w, wB) annotation (Line(points={{73,33},{89.5,33},{89.5,30},{106,30}},
-                                   color={0,0,127}));
-  connect(torqueToAngleAdaptor1.tau, M_B) annotation (Line(points={{73,20},{86,20},{86,-64},{104,-64}},
-                                      color={0,0,127}));
-  annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
-        coordinateSystem(preserveAspectRatio=false)));
+    annotation (Line(points={{-10,0},{-48,0}}, color={0,0,0}));
+  connect(inertia.flange_b, torqueToAngleAdaptor1.flange)
+    annotation (Line(points={{10,0},{48,0}}, color={0,0,0}));
+  connect(torqueToAngleAdaptor.tau, M_A)
+    annotation (Line(points={{-53,8},{-80,8},{-80,60},{-120,60}}, color={0,0,127}));
+  connect(torqueToAngleAdaptor.w, wA)
+    annotation (Line(points={{-53,-5},{-80.5,-5},{-80.5,-20},{-110,-20}}, color={0,0,127}));
+  connect(torqueToAngleAdaptor.phi, phiA)
+    annotation (Line(points={{-53,-8},{-70,-8},{-70,-60},{-110,-60}}, color={0,0,127}));
+  connect(torqueToAngleAdaptor1.phi, phiB)
+    annotation (Line(points={{53,8},{70,8},{70,60},{110,60}}, color={0,0,127}));
+  connect(torqueToAngleAdaptor1.w, wB)
+    annotation (Line(points={{53,5},{80,5},{80,20},{110,20}}, color={0,0,127}));
+  connect(torqueToAngleAdaptor1.tau, M_B)
+    annotation (Line(points={{53,-8},{80,-8},{80,-60},{120,-60}}, color={0,0,127}));
+  annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(coordinateSystem(
+          preserveAspectRatio=false)));
 end mass;
diff --git a/examples/DC-Motor2023/models/sse_edrive/mass_damper.mo b/examples/DC-Motor2023/models/sse_edrive/mass_damper.mo
@@ -1,79 +1,16 @@
 within sse_edrive;
-model mass_damper
-  Modelica.Mechanics.Rotational.Components.TorqueToAngleAdaptor
-    torqueToAngleAdaptor(use_a=false)
-                         annotation (Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=180,
-        origin={-60,28})));
-  Modelica.Mechanics.Rotational.Components.TorqueToAngleAdaptor
-    torqueToAngleAdaptor1(use_a=false)
-                          annotation (Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=0,
-        origin={70,28})));
-  Modelica.Mechanics.Rotational.Components.Inertia inertia(
-    J=0.002,
-    phi(start=0),
-    w(start=0),
-    a(start=0))
-    annotation (Placement(transformation(extent={{-2,18},{18,38}})));
-  Modelica.Blocks.Interfaces.RealInput M_A(unit="N.m")
-    annotation (Placement(transformation(extent={{-126,40},{-86,80}})));
-  Modelica.Blocks.Interfaces.RealOutput wA(unit="rad/s")
-                                           annotation (Placement(
-        transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=180,
-        origin={-106,-40})));
-  Modelica.Blocks.Interfaces.RealOutput phiA(unit="rad")
-                                             annotation (Placement(
-        transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=180,
-        origin={-108,-68})));
-  Modelica.Blocks.Interfaces.RealInput M_B(unit="N.m") annotation (Placement(
-        transformation(
-        extent={{-20,-20},{20,20}},
-        rotation=180,
-        origin={104,-64})));
-  Modelica.Blocks.Interfaces.RealOutput wB(unit="rad/s")
-                                           annotation (Placement(
-        transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=0,
-        origin={106,30})));
-  Modelica.Blocks.Interfaces.RealOutput phiB(unit="rad")
-                                             annotation (Placement(
-        transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=0,
-        origin={106,68})));
+model mass_damper "Rotational mass with damper"
+  extends mass;
   Modelica.Mechanics.Rotational.Components.Damper damper(d=0.001)
-    annotation (Placement(transformation(extent={{0,-20},{20,0}})));
+    annotation (Placement(transformation(extent={{-10,-50},{10,-30}})));
   Modelica.Mechanics.Rotational.Components.Fixed fixed
-    annotation (Placement(transformation(extent={{30,-20},{50,0}})));
+    annotation (Placement(transformation(extent={{20,-50},{40,-30}})));
 equation
-  connect(inertia.flange_b, torqueToAngleAdaptor1.flange) annotation (Line(
-        points={{18,28},{68,28}},                 color={0,0,0}));
-  connect(torqueToAngleAdaptor.tau, M_A) annotation (Line(points={{-63,36},{-86,
-          36},{-86,60},{-106,60}}, color={0,0,127}));
-  connect(torqueToAngleAdaptor.w, wA) annotation (Line(points={{-63,23},{
-          -80.5,23},{-80.5,-40},{-106,-40}}, color={0,0,127}));
-  connect(torqueToAngleAdaptor.phi, phiA) annotation (Line(points={{-63,20},{
-          -76,20},{-76,-68},{-108,-68}}, color={0,0,127}));
-  connect(torqueToAngleAdaptor1.phi, phiB) annotation (Line(points={{73,36},{
-          88,36},{88,68},{106,68}}, color={0,0,127}));
-  connect(torqueToAngleAdaptor1.w, wB) annotation (Line(points={{73,33},{89.5,
-          33},{89.5,30},{106,30}}, color={0,0,127}));
-  connect(torqueToAngleAdaptor1.tau, M_B) annotation (Line(points={{73,20},{
-          80,20},{80,-64},{104,-64}}, color={0,0,127}));
-  connect(fixed.flange,damper. flange_b) annotation (Line(points={{40,-10},{
-          20,-10}},             color={0,0,0}));
-  connect(torqueToAngleAdaptor.flange, inertia.flange_a)
-    annotation (Line(points={{-58,28},{-2,28}}, color={0,0,0}));
-  connect(damper.flange_a, inertia.flange_a) annotation (Line(points={{0,-10},
-          {-20,-10},{-20,28},{-2,28}}, color={0,0,0}));
-  annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
-        coordinateSystem(preserveAspectRatio=false)));
+  connect(fixed.flange, damper.flange_b) annotation (Line(points={{30,-40},{10,-40}}, color={0,0,0}));
+  connect(inertia.flange_a, torqueToAngleAdaptor.flange)
+    annotation (Line(points={{-10,0},{-48,0}}, color={0,0,0}));
+  connect(inertia.flange_a, damper.flange_a)
+    annotation (Line(points={{-10,0},{-30,0},{-30,-40},{-10,-40}}, color={0,0,0}));
+  annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(coordinateSystem(
+          preserveAspectRatio=false)));
 end mass_damper;
diff --git a/examples/DC-Motor2023/models/sse_edrive/package.mo b/examples/DC-Motor2023/models/sse_edrive/package.mo
@@ -3,7 +3,7 @@ package sse_edrive "ProSTEP Smart System Engineering DCMmotor example"
 
   annotation (
     uses(Modelica(version="4.0.0")),
-    version="1.1.0",
+    version="1.1.1",
     conversion(noneFromVersion=""),
     versionDate="2022-03-22");
 end sse_edrive;