Fixed some minor issues

fachif · fachif · commit 00e70d62b32c · 2024-09-23T15:52:54.000-04:00
The following are the modifications done:
1- Eliminated annotation noise in some models.
2- Eliminated the .eps import from CIM5 and CIM6 models and used the C.eps constant instead.
3- Fixed the wording from 'Var' to 'var' in the Data/MachinesMicrogrid record.
diff --git a/OpenIPSL/Electrical/Controls/VariableSpeedDrive/ControllerLogic/VoltsHertzController.mo b/OpenIPSL/Electrical/Controls/VariableSpeedDrive/ControllerLogic/VoltsHertzController.mo
@@ -139,16 +139,14 @@ equation
           96},{60,120}}, color={0,0,127}));
   connect(product1.y, limiter1.u) annotation (Line(points={{-9,40},{6,40}},
                         color={0,0,127}));
-  annotation (preferredView = "info", Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},
-            {100,100}}),                                         graphics={
+  annotation (preferredView = "info", Icon(                                         graphics={
         Rectangle(
           extent={{-100,100},{100,-100}},
           lineColor={28,108,200}),        Text(
           extent={{-80,80},{80,-80}},
           lineColor={28,108,200},
           textString="V/f
-Control")}),                                                     Diagram(
-        coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,100}})),
+Control")}),
     Documentation(info="<html>
 <p>The VoltsHertzController component represents the controller logic for the variable speed drive. The volts hertz control is a simple and widely used method for controlling the speed of an AC induction motor by adjusting the voltage and frequency supplied to the motor at a constant ratio.</p>
 <p>The model has three inputs and two output connectors. The W_ref input connector represents the reference synchronous speed that is user defined,
diff --git a/OpenIPSL/Electrical/Controls/VariableSpeedDrive/PowerElectronics/AC2DCandDC2AC.mo b/OpenIPSL/Electrical/Controls/VariableSpeedDrive/PowerElectronics/AC2DCandDC2AC.mo
@@ -142,8 +142,7 @@ equation
                      color={0,0,255}));
   connect(Capacitor_Voltage.y, Vc) annotation (Line(points={{-63,-74},{-50,-74},
           {-50,-110}}, color={0,0,127}));
-  annotation (preferredView = "info",Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},
-            {100,100}}),
+  annotation (preferredView = "info",Icon(
         graphics={Rectangle(
           extent={{-100,100},{100,-100}},
           lineColor={28,108,200}),
@@ -155,8 +154,7 @@ equation
         Text(
           extent={{-30,-20},{90,-80}},
           textColor={28,108,200},
-          textString="DC/AC")}),                                                                 Diagram(
-        coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,100}}), graphics={Rectangle(
+          textString="DC/AC")}),                                                                 Diagram( graphics={Rectangle(
           extent={{14,90},{94,40}},
           lineColor={0,0,255},
           pattern=LinePattern.Dash), Text(
diff --git a/OpenIPSL/Electrical/Machines/PSSE/BaseClasses/baseMotor.mo b/OpenIPSL/Electrical/Machines/PSSE/BaseClasses/baseMotor.mo
@@ -108,7 +108,7 @@ equation
   nr = (1-s)*ns;
   wr = nr;
 
-  annotation (preferredView = "info",Icon(coordinateSystem(preserveAspectRatio=false), graphics={
+  annotation (preferredView = "info",Icon(graphics={
           Rectangle(extent={{-100,100},{100,-100}}, lineColor={28,108,200}),
                                           Ellipse(
           fillColor={255,255,255},
@@ -120,7 +120,7 @@ equation
           extent={{-100,-20},{100,20}},
           fontName="Arial",
           lineColor={0,0,0},
-          textString="%name")}), Diagram(coordinateSystem(preserveAspectRatio=false)),
+          textString="%name")}),
     Documentation(info="<html>
 <p>
 This component is the base class for the PSSE induction motor models from the Machines.PSSE sub-package.
diff --git a/OpenIPSL/Electrical/Machines/PSSE/CIM5.mo b/OpenIPSL/Electrical/Machines/PSSE/CIM5.mo
@@ -1,7 +1,7 @@
 within OpenIPSL.Electrical.Machines.PSSE;
 model CIM5 "PSSE CIM5 three-phase induction motor model"
   extends OpenIPSL.Electrical.Machines.PSSE.BaseClasses.baseMotor;
-  import Modelica.Constants.eps;
+  //import Modelica.Constants.eps;
   import OpenIPSL.NonElectrical.Functions.SE;
 
   parameter Integer Mtype = 1 "1- Motor Type A; 2- Motor Type B" annotation (Dialog(group=
@@ -89,7 +89,7 @@ initial equation
     der(Epi) = 0;
 
   else
-    s = (1 - Modelica.Constants.eps);
+    s = (1 - C.eps);
 
   end if;
 
@@ -125,7 +125,7 @@ equation
   EQ11 = Epi*(Tp0*w_b*s);
   EQ12 = EQ10 + EQ11 - Epr - EQ9;
   EQ12 = Tp0*der(Epr);
-  EQC = NUM/(Epp + eps);
+  EQC = NUM/(Epp + C.eps);
   NUM = SE(Epp,SE1,SE2,1,1.2);
   Epp = sqrt(Eppr^2 + Eppi^2);
   EQ13 = EQC*Eppr;
diff --git a/OpenIPSL/Electrical/Machines/PSSE/CIM6.mo b/OpenIPSL/Electrical/Machines/PSSE/CIM6.mo
@@ -1,7 +1,6 @@
 within OpenIPSL.Electrical.Machines.PSSE;
 model CIM6 "PSSE CIM6 three-phase induction motor model"
   extends OpenIPSL.Electrical.Machines.PSSE.BaseClasses.baseMotor;
-  import Modelica.Constants.eps;
   import OpenIPSL.NonElectrical.Functions.SE;
 
   parameter Integer Mtype = 1 "1- Motor Type A; 2- Motor Type B" annotation (Dialog(group=
@@ -95,7 +94,7 @@ initial equation
     der(Epi) = 0;
 
   else
-    s = (1 - Modelica.Constants.eps);
+    s = (1 - C.eps);
 
   end if;
 
@@ -132,7 +131,7 @@ equation
   EQ11 = Epi*(Tp0*w_b*s);
   EQ12 = EQ10 + EQ11 - Epr - EQ9;
   EQ12 = Tp0*der(Epr);
-  EQC = NUM/(Epp + eps);
+  EQC = NUM/(Epp + C.eps);
   NUM = SE(Epp,SE1,SE2,1,1.2);
   Epp = sqrt(Eppr^2 + Eppi^2);
   EQ13 = EQC*Eppr;
diff --git a/OpenIPSL/Examples/Microgrids/IEEEMicrogrid/Data/MachinesMicrogrid.mo b/OpenIPSL/Examples/Microgrids/IEEEMicrogrid/Data/MachinesMicrogrid.mo
@@ -21,6 +21,6 @@ record MachinesMicrogrid "Data record for power generation"
 
 
   annotation (Documentation(info="<html>
-This data record has the active and reactive powers in VA and Var, respectively, that are delivered by the generation units to the system. The data is used to initialized the network in a certain operating point.
+This data record has the active and reactive powers in VA and var, respectively, that are delivered by the generation units to the system. The data is used to initialized the network in a certain operating point.
 </html>"));
 end MachinesMicrogrid;
