From 520ee5c6acf2883836bcb8fa8bbb63ce5e4b41b6 Mon Sep 17 00:00:00 2001 From: arunkumar-narasimhan <124154466+arunkumar-narasimhan@users.noreply.github.com> Date: Mon, 22 May 2023 17:21:50 +0530 Subject: [PATCH] unify spelling of controllers unify spelling of controllers by omitting dash in description and documentation --- Modelica/Blocks/Continuous.mo | 14 +++++++------- .../Examples/Systems/ControlledMixingUnit.mo | 2 +- .../ControlledDCDrives/Utilities/LimitedPI.mo | 4 ++-- .../Machines/Utilities/DQCurrentController.mo | 2 +- .../Systems/RobotR3/Utilities/Controller.mo | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Modelica/Blocks/Continuous.mo b/Modelica/Blocks/Continuous.mo index 1eba8933f6..7811e0c14a 100644 --- a/Modelica/Blocks/Continuous.mo +++ b/Modelica/Blocks/Continuous.mo @@ -598,7 +598,7 @@ This is discussed in the description of package textString="T=%T")})); end PI; - block PID "PID-controller in additive description form" + block PID "PID controller in additive description form" import Modelica.Blocks.Types.Init; extends Interfaces.SISO; @@ -689,8 +689,8 @@ This is discussed in the description of package textString="Ti=%Ti")}), Documentation(info="
-This is the text-book version of a PID-controller. -For a more practically useful PID-controller, use +This is the text-book version of a PID controller. +For a more practically useful PID controller, use block LimPID.
@@ -1011,18 +1011,18 @@ together) and using the following strategy:diff --git a/Modelica/Electrical/Machines/Examples/ControlledDCDrives/Utilities/LimitedPI.mo b/Modelica/Electrical/Machines/Examples/ControlledDCDrives/Utilities/LimitedPI.mo index 7ec091a8a0..a5b1911d2f 100644 --- a/Modelica/Electrical/Machines/Examples/ControlledDCDrives/Utilities/LimitedPI.mo +++ b/Modelica/Electrical/Machines/Examples/ControlledDCDrives/Utilities/LimitedPI.mo @@ -1,6 +1,6 @@ within Modelica.Electrical.Machines.Examples.ControlledDCDrives.Utilities; block LimitedPI - "Limited PI-controller with anti-windup and feed-forward" + "Limited PI controller with anti-windup and feed-forward" extends Modelica.Blocks.Interfaces.SISO; import Modelica.Blocks.Types.Init; import Modelica.Constants.inf; @@ -196,7 +196,7 @@ equation Proportional - Integral - controller with optional feed-forward and limitation at the output.
-The integral part can be switched off to obtain a limited P-controller. +The integral part can be switched off to obtain a limited P controller.
The feed-forward gain can either be constant or given by the optional input kFF. diff --git a/Modelica/Electrical/Machines/Utilities/DQCurrentController.mo b/Modelica/Electrical/Machines/Utilities/DQCurrentController.mo index d47eac127e..c4a2dd0d6a 100644 --- a/Modelica/Electrical/Machines/Utilities/DQCurrentController.mo +++ b/Modelica/Electrical/Machines/Utilities/DQCurrentController.mo @@ -117,7 +117,7 @@ Simple Current controller
The desired d- and q-component of the space phasor current in rotor fixed coordinate system are given by inputs id
and iq
.
Using the given rotor position (input phi
), the actual three-phase currents are measured and transformed to the d-q coordinate system.
-Two PI-controllers determine the necessary d- and q- voltages, which are transformed back to three-phase (output y[3]
).
+Two PI controllers determine the necessary d- and q- voltages, which are transformed back to three-phase (output y[3]
).
They can be used to feed a voltage source which in turn feeds a permanent magnet synchronous machine.
diff --git a/Modelica/Mechanics/MultiBody/Examples/Systems/RobotR3/Utilities/Controller.mo b/Modelica/Mechanics/MultiBody/Examples/Systems/RobotR3/Utilities/Controller.mo index 7825416185..07e0802258 100644 --- a/Modelica/Mechanics/MultiBody/Examples/Systems/RobotR3/Utilities/Controller.mo +++ b/Modelica/Mechanics/MultiBody/Examples/Systems/RobotR3/Utilities/Controller.mo @@ -87,8 +87,8 @@ equation lineColor={0,0,127})}), Documentation(info="
-This controller has an inner PI-controller to control the motor speed, -and an outer P-controller to control the motor position of one axis. +This controller has an inner PI controller to control the motor speed, +and an outer P controller to control the motor position of one axis. The reference signals are with respect to the gear-output, and the gear ratio is used in the controller to determine the motor reference signals. All signals are communicated via the