Merge branch 'ControlledDrives' of https://github.com/AHaumer/Modelic…

…aStandardLibrary into ControlledDrives # Conflicts: # Modelica/Electrical/Machines/Examples/ControlledDCDrives/UsersGuide/References.mo
AHaumer · May 24, 2021 · 2f31c4d · 2f31c4d
2 parents f8cf181 + 17df77e
commit 2f31c4d
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 19 deletions.
diff --git a/Modelica/Electrical/Machines/Examples/ControlledDCDrives/PositionControlledDCPM.mo b/Modelica/Electrical/Machines/Examples/ControlledDCDrives/PositionControlledDCPM.mo
@@ -50,8 +50,7 @@ equation
   connect(loadInertia.flange_b, loadTorque.flange)
     annotation (Line(points={{70,-30},{80,-30}}));
   connect(speedController.y, tau2i.u)
-    annotation (Line(points={{-59,0},{-52,0},{-52,1.55431e-15}},
-                                                 color={0,0,127}));
+    annotation (Line(points={{-59,0},{-52,0}},   color={0,0,127}));
   annotation (experiment(StopTime=2.5, Interval=0.5e-04, Tolerance=1e-06), Documentation(info="<html>
 <p>This model demonstrates how a position controller for a speed controlled DC PM drive works.</p>
 <p>

diff --git a/Modelica/Electrical/Machines/Examples/ControlledDCDrives/SpeedControlledDCPM.mo b/Modelica/Electrical/Machines/Examples/ControlledDCDrives/SpeedControlledDCPM.mo
@@ -37,8 +37,7 @@ equation
   connect(speedSensor.w, speedController.u_m) annotation (Line(points={{50,-71},
           {50,-90},{-76,-90},{-76,-12}},     color={0,0,127}));
   connect(speedController.y, tau2i.u)
-    annotation (Line(points={{-59,0},{-56,0},{-56,1.77636e-15},{-52,1.77636e-15}},
-                                                 color={0,0,127}));
+    annotation (Line(points={{-59,0},{-56,0} ,{-52,0}},   color={0,0,127}));
   connect(step.y, slewRateLimiter.u) annotation (Line(points={{-139,0},{-130,0},
           {-130,-20},{-122,-20}},           color={0,0,127}));
   connect(speedController.u, preFilter.y) annotation (Line(points={{-82,0},{-90,

diff --git a/Modelica/Electrical/Machines/Examples/ControlledDCDrives/UsersGuide/CascadedControl.mo b/Modelica/Electrical/Machines/Examples/ControlledDCDrives/UsersGuide/CascadedControl.mo
@@ -2,7 +2,7 @@ within Modelica.Electrical.Machines.Examples.ControlledDCDrives.UsersGuide;
 class CascadedControl "Concept of cascaded control"
   extends Modelica.Icons.Information;
   annotation (DocumentationClass=true, Documentation(info="<html>
-<p>The concept of cascaded control is hown in Fig.1.</p>
+<p>The concept of cascaded control is shown in Fig. 1.</p>
 <table border=\"0\" cellspacing=\"0\" cellpadding=\"2\">
   <caption align=\"bottom\"><strong>Fig. 1:</strong> Structure of cascaded control</caption>
   <tr>
@@ -12,7 +12,7 @@ class CascadedControl "Concept of cascaded control"
   </tr>
 </table>
 <p>
-Fig.2 shows the euqations describing the drive, using for parameterizing the controllers. 
+Fig. 2 shows the equations describing the drive, using for parameterizing the controllers. 
 The behaviour of the actuator is a delay which can be approximated by a first order. 
 Additionally, filtering or sampling the current defines an additional delay which can be approximated by a first order. 
 Both delays define the sum of small time constants T<sub>&sigma;</sub>.
@@ -52,7 +52,7 @@ which aims at optimal transfer function with respect to disturbance (load torque
 <li>Limitation of the output (reference torque) to the possible torque (current)</li>
 <li>Subsequently, an anti-windup method</li>
 <li>If reference speed is not prescribed by a correctly parameterized position controller which is commanded by a kinematicPTP (optimal path planning), 
-    reference has to be filtered or limited in slew rate.</li>
+    reference has to be filtered or limited in slew rate</li>
 </ul>
 <table border=\"0\" cellspacing=\"0\" cellpadding=\"2\">
   <caption align=\"bottom\"><strong>Fig. 4:</strong> Parameterization of the speed controller</caption>

diff --git a/Modelica/Electrical/Machines/Examples/ControlledDCDrives/UsersGuide/DiscreteControl.mo b/Modelica/Electrical/Machines/Examples/ControlledDCDrives/UsersGuide/DiscreteControl.mo
@@ -24,7 +24,7 @@ There are two choices for the DC-DC inverter that can be compared:
 </p>
 <ul>
 <li>Switching inverter: Reference voltage and actual current are sampled once during the switching interval, thus defining the delays (see Fig. 1).</li>
-<li>Averaging inverter: The delays are approximated using first order - blocks.</li>
+<li>Averaging inverter: The delays are approximated using first order blocks.</li>
 </ul>
 <p>
 Investigating the correct parameterization of the controller or the energy consumption, the averaging inverter is sufficient and shows much higher performance. 

diff --git a/Modelica/Electrical/Machines/Examples/ControlledDCDrives/Utilities/DcdcInverter.mo b/Modelica/Electrical/Machines/Examples/ControlledDCDrives/Utilities/DcdcInverter.mo
@@ -1,5 +1,5 @@
 within Modelica.Electrical.Machines.Examples.ControlledDCDrives.Utilities;
-model DcdcInverter "DC-DC inverter"
+model DcdcInverter "DC/DC inverter"
   import Modelica.Electrical.Machines.Examples.ControlledDCDrives.Utilities.FilterType;
   parameter Boolean useIdealInverter=true "Use ideal averaging inverter, otherwise switching inverter";
   parameter SI.Frequency fS "Switching frequency";
@@ -204,7 +204,7 @@ equation
           extent={{-100,-50},{-80,-70}},
           textColor={128,128,128},
           textString="i")}),    Documentation(info="<html>
-<p>This is a model of a DC-DC inverter. The level of detail of the DC-DC inverter may be chosen from ideal averaging or switching.</p>
+<p>This is a model of a DC/DC inverter. The level of detail of the DC/DC inverter may be chosen from ideal averaging or switching.</p>
 <p>Reference voltage is limited to actual battery voltage.</p>
 <p>Battery voltage and motor current are measured.</p>
 </html>"));

diff --git a/Modelica/Electrical/Machines/Examples/ControlledDCDrives/Utilities/DriveDataDCPM.mo b/Modelica/Electrical/Machines/Examples/ControlledDCDrives/Utilities/DriveDataDCPM.mo
@@ -45,11 +45,11 @@ record DriveDataDCPM
   parameter SI.Inertia JL=motorData.Jr "Load inertia"
     annotation(Dialog(group="Load"));
 //Limits
-  parameter SI.Voltage VaMax=1.2*motorData.VaNominal "Maximum Voltage"
+  parameter SI.Voltage VaMax=1.2*motorData.VaNominal "Maximum voltage"
     annotation(Dialog(tab="Controller", group="Limits"));
   parameter SI.Current IaMax=1.5*motorData.IaNominal "Maximum current"
     annotation(Dialog(tab="Controller", group="Limits"));
-  parameter SI.Torque tauMax=kPhi*IaMax "Maximum el. torque"
+  parameter SI.Torque tauMax=kPhi*IaMax "Maximum electrical torque"
     annotation(Dialog(tab="Controller", group="Limits", enable=false));
   parameter SI.AngularVelocity wMax=w0 "Maximum speed"
     annotation(Dialog(tab="Controller", group="Limits"));

diff --git a/Modelica/Electrical/Machines/Examples/ControlledDCDrives/Utilities/IdealDcDc.mo b/Modelica/Electrical/Machines/Examples/ControlledDCDrives/Utilities/IdealDcDc.mo
@@ -1,5 +1,5 @@
 within Modelica.Electrical.Machines.Examples.ControlledDCDrives.Utilities;
-model IdealDcDc "Ideal DC-DC inverter"
+model IdealDcDc "Ideal DC/DC inverter"
   parameter SI.Frequency fS "Switching frequency";
   parameter SI.Time Tdv=0.5/fS "Dead time of inverter voltage";
   parameter SI.Time Ti=1e-6 "Time constant of integral power controller";
@@ -122,6 +122,6 @@ equation
           extent={{-40,-60},{40,-80}},
           textColor={128,128,128},
           textString="Mot")}),    Documentation(info="<html>
-<p>This is a model of an ideal DC-DC inverter based on a power balance achieved by an integral controller.</p>
+<p>This is a model of an ideal DC/DC inverter based on a power balance achieved by an integral controller.</p>
 </html>"));
 end IdealDcDc;
diff --git a/Modelica/Electrical/Machines/Examples/ControlledDCDrives/Utilities/PartialControlledDCPM.mo b/Modelica/Electrical/Machines/Examples/ControlledDCDrives/Utilities/PartialControlledDCPM.mo
@@ -85,9 +85,9 @@ equation
   annotation (Documentation(info="<html>
   <p>This is a partial model of a controlled DC PM drive.</p>
 <p>
-Electrical power is taken from a battery (constant voltage with inner resistance) and fed to the motor via a DC-DC inverter.
-The level of detail of the DC-DC inverter may be chosen from ideal averaging or switching.
-The DC-DC inverter is commanded by the current controller.
+Electrical power is taken from a battery (constant voltage with inner resistance) and fed to the motor via a DC/DC inverter.
+The level of detail of the DC/DC inverter may be chosen from ideal averaging or switching.
+The DC/DC inverter is commanded by the current controller.
 The current controller is parameterized according to the absolute optimum.
 </p>
 <p>

diff --git a/Modelica/Electrical/Machines/Examples/ControlledDCDrives/Utilities/SwitchingDcDc.mo b/Modelica/Electrical/Machines/Examples/ControlledDCDrives/Utilities/SwitchingDcDc.mo
@@ -1,5 +1,5 @@
 within Modelica.Electrical.Machines.Examples.ControlledDCDrives.Utilities;
-model SwitchingDcDc "Switching DC-DC inverter"
+model SwitchingDcDc "Switching DC/DC inverter"
   parameter SI.Frequency fS "Switching frequency";
   parameter SI.Voltage VMax "Maximum Voltage";
   parameter SI.Resistance RonT=1e-05
@@ -91,6 +91,6 @@ equation
           extent={{-40,-60},{40,-80}},
           textColor={128,128,128},
           textString="Mot")}),    Documentation(info="<html>
-<p>This is a model of a switching DC-DC inverter based on a H-bridge.</p>
+<p>This is a model of a switching DC/DC inverter based on a H-bridge.</p>
 </html>"));
 end SwitchingDcDc;
diff --git a/.../Machines/ControlledDCDrives/Formula1.PNG → .../Machines/ControlledDCDrives/Formula1.png b/.../Machines/ControlledDCDrives/Formula1.PNG → .../Machines/ControlledDCDrives/Formula1.png
diff --git a/.../Machines/ControlledDCDrives/Formula2.PNG → .../Machines/ControlledDCDrives/Formula2.png b/.../Machines/ControlledDCDrives/Formula2.PNG → .../Machines/ControlledDCDrives/Formula2.png
diff --git a/.../Machines/ControlledDCDrives/Formula3.PNG → .../Machines/ControlledDCDrives/Formula3.png b/.../Machines/ControlledDCDrives/Formula3.PNG → .../Machines/ControlledDCDrives/Formula3.png