Fixes missed 'abs' -> abs rename after MSL 4.0.0 conversion (OpenIPS…

…L#303) * Fixes missed 'abs' -> abs rename after MSL 4.0.0 conversion Fixes OpenIPSL#301 * Add release notes for 3.0.1 and bumb version number
modelica-3rdparty · Jun 23, 2022 · 648ac54 · 648ac54
1 parent 4041bbc
commit 648ac54
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 6 deletions.
diff --git a/OpenIPSL/Electrical/Controls/PSSE/ES/ESST4B.mo b/OpenIPSL/Electrical/Controls/PSSE/ES/ESST4B.mo
@@ -3,6 +3,7 @@ model ESST4B "ST4B Excitation System [IEEE2005]"
   extends Icons.VerifiedModel;
   extends OpenIPSL.Electrical.Controls.PSSE.ES.BaseClasses.BaseExciter;
   import Modelica.ComplexMath.j;
+  import Modelica.ComplexMath.abs;
   parameter Types.Time T_R=0.3 "Regulator input filter time constant";
   parameter Types.PerUnit K_PR=2.97 "Voltage regulator proportional gain";
   parameter Types.TimeAging K_IR=2.97 "Voltage regulator integral gain";
@@ -110,7 +111,7 @@ initial equation
   VR0 = Efd0*K_G;
   V_REF = ECOMP;
 equation
-  VE = 'abs'(K_P_comp*V_T + j*(K_I + K_P_comp*X_L)*I_T);
+  VE = abs(K_P_comp*V_T + j*(K_I + K_P_comp*X_L)*I_T);
   V_T = Gen_terminal.vr + j*Gen_terminal.vi;
   I_T = Gen_terminal.ir + j*Gen_terminal.ii;
   connect(add.y, limiter.u) annotation (Line(

diff --git a/OpenIPSL/Electrical/Machines/PSSE/GENROE.mo b/OpenIPSL/Electrical/Machines/PSSE/GENROE.mo
@@ -6,6 +6,7 @@ model GENROE "ROUND ROTOR GENERATOR MODEL (EXPONENTIAL SATURATION)"
   import Modelica.ComplexMath.arg;
   import Modelica.ComplexMath.real;
   import Modelica.ComplexMath.imag;
+  import Modelica.ComplexMath.abs;
   import Modelica.ComplexMath.conj;
   import Modelica.ComplexMath.fromPolar;
   import OpenIPSL.NonElectrical.Functions.SE_exp;
@@ -53,7 +54,7 @@ protected
   parameter Real ang_PSIpp0=arg(PSIpp0) "flux angle";
   parameter Real ang_It=arg(It) "current angle";
   parameter Real ang_PSIpp0andIt=ang_PSIpp0 - ang_It "angle difference";
-  parameter Types.PerUnit abs_PSIpp0='abs'(PSIpp0)
+  parameter Types.PerUnit abs_PSIpp0=abs(PSIpp0)
     "magnitude of sub-transient flux linkage";
   parameter Real dsat=SE_exp(
       abs_PSIpp0,

diff --git a/OpenIPSL/Electrical/Machines/PSSE/GENROU.mo b/OpenIPSL/Electrical/Machines/PSSE/GENROU.mo
@@ -6,6 +6,7 @@ model GENROU "ROUND ROTOR GENERATOR MODEL (QUADRATIC SATURATION)"
   import Modelica.ComplexMath.arg;
   import Modelica.ComplexMath.real;
   import Modelica.ComplexMath.imag;
+  import Modelica.ComplexMath.abs;
   import Modelica.ComplexMath.conj;
   import Modelica.ComplexMath.fromPolar;
   import Modelica.ComplexMath.j;
@@ -51,7 +52,7 @@ protected
   parameter Types.Angle ang_PSIpp0=arg(PSIpp0) "flux angle";
   parameter Types.Angle ang_It=arg(It) "current angle";
   parameter Types.Angle ang_PSIpp0andIt=ang_PSIpp0 - ang_It "angle difference";
-  parameter Types.PerUnit abs_PSIpp0='abs'(PSIpp0)
+  parameter Types.PerUnit abs_PSIpp0=abs(PSIpp0)
     "magnitude of sub-transient flux linkage";
   parameter Real dsat=SE(
       abs_PSIpp0,

diff --git a/OpenIPSL/Electrical/Machines/PSSE/GENSAE.mo b/OpenIPSL/Electrical/Machines/PSSE/GENSAE.mo
@@ -7,6 +7,7 @@ model GENSAE "SALIENT POLE GENERATOR MODEL (EXPONENTIAL SATURATION)"
   import Modelica.ComplexMath.arg;
   import Modelica.ComplexMath.real;
   import Modelica.ComplexMath.imag;
+  import Modelica.ComplexMath.abs;
   import Modelica.ComplexMath.conj;
   import Modelica.ComplexMath.fromPolar;
   import Modelica.ComplexMath.j;
@@ -36,7 +37,7 @@ protected
   parameter Real ang_PSIpp0=arg(PSIpp0) "flux angle";
   parameter Real ang_It=arg(It) "current angle";
   parameter Real ang_PSIpp0andIt=ang_PSIpp0 - ang_It "angle difference";
-  parameter Types.PerUnit abs_PSIpp0='abs'(PSIpp0)
+  parameter Types.PerUnit abs_PSIpp0=abs(PSIpp0)
     "magnitude of sub-transient flux linkage";
   parameter Complex VT=v_0*cos(angle_0) + j*v_0*sin(angle_0)
     "Complex terminal voltage";

diff --git a/OpenIPSL/UsersGuide/ReleaseNotes/package.order b/OpenIPSL/UsersGuide/ReleaseNotes/package.order
@@ -1,3 +1,4 @@
+v301
 v300
 v200
 v150

diff --git a/OpenIPSL/UsersGuide/ReleaseNotes/v301.mo b/OpenIPSL/UsersGuide/ReleaseNotes/v301.mo
@@ -0,0 +1,17 @@
+within OpenIPSL.UsersGuide.ReleaseNotes;
+class v301 "Version 3.0.1 (2022-06-23)"
+  extends Modelica.Icons.ReleaseNotes;
+  annotation (Documentation(info="<html>
+<h4>What&apos;s Changed</h4>
+<p>
+Bugfix release which is <strong>backwards compatible</strong> with version 3.0.0 
+of <code><strong>OpenIPSL</strong></code>.
+</p>
+<h5>Changes in detail</h5>
+<ul>
+<li>Fixes missed 'abs' -> abs rename after MSL 4.0.0 conversion by <a href=\"https://github.com/dietmarw\">@dietmarw</a> in <a href=\"https://github.com/OpenIPSL/OpenIPSL/pull/303\">#303</a></li>
+</ul>
+<h5>Full Changelog</h5>
+<p><code><a href=\"https://github.com/OpenIPSL/OpenIPSL/compare/v3.0.0...v3.0.1\">v3.0.0...v3.0.1</a></code></p>
+</html>"));
+end v301;
diff --git a/OpenIPSL/package.mo b/OpenIPSL/package.mo
@@ -5,9 +5,10 @@ package OpenIPSL "Open-Instance Power System Library"
 annotation (preferredView="info",
   Protection(access = Access.packageDuplicate),
   uses(Complex(version="4.0.0"), Modelica(version="4.0.0")),
-  version="3.0.0",
-  versionDate="2022-06-09",
+  version="3.0.1",
+  versionDate="2022-06-23",
   conversion(
+    noneFromVersion="3.0.0",
     from(version={"0.8","0.8.1","1.0.0","1.5.0"}, to="2.0.0",
       script="modelica://OpenIPSL/Resources/scripts/ConvertOpenIPSL_from_1.5.0_to_2.0.0.mos"),
     from(version="2.0.0", to="3.0.0",