Bug Fixes and Minor Updates

fachif · fachif · commit 709a5411f994 · 2023-11-20T08:35:57.000-05:00
The following are the modifications: 1- W0 is now a parameter at the top layer of Renewables.PSSE.Wind model. This fixes the "circular equalities detected" error. 2- Added a Machine Base M_b parameter to the Wind, PV, and BESS models. This modification was the one previously displayed in Pull Request OpenIPSL#341.
diff --git a/OpenIPSL/Electrical/Renewables/PSSE/BESS.mo b/OpenIPSL/Electrical/Renewables/PSSE/BESS.mo
@@ -1,6 +1,6 @@
 within OpenIPSL.Electrical.Renewables.PSSE;
-model BESS
-  "Framework for a battery energy storage system plant including controllers"
+model BESS "Framework for a battery energy storage system plant including controllers"
+parameter Types.ApparentPower M_b=RenewableGenerator.SysData.S_b "Machine base power" annotation(Dialog(group= "Power flow data"));
 extends OpenIPSL.Electrical.Essentials.pfComponent(
     final enablefn=true,
     final enableV_b=false,
@@ -18,6 +18,7 @@ extends OpenIPSL.Electrical.Essentials.pfComponent(
   replaceable
     OpenIPSL.Electrical.Renewables.PSSE.InverterInterface.BaseClasses.BaseREGC
     RenewableGenerator(
+    M_b=M_b,
     P_0=P_0,
     Q_0=Q_0,
     v_0=v_0,
@@ -36,6 +37,7 @@ extends OpenIPSL.Electrical.Essentials.pfComponent(
   replaceable
     OpenIPSL.Electrical.Renewables.PSSE.PlantController.BaseClasses.BaseREPC
     PlantController(
+    M_b=M_b,
     P_0=P_0,
     Q_0=Q_0,
     v_0=v_0,
diff --git a/OpenIPSL/Electrical/Renewables/PSSE/PV.mo b/OpenIPSL/Electrical/Renewables/PSSE/PV.mo
@@ -1,5 +1,6 @@
 within OpenIPSL.Electrical.Renewables.PSSE;
 model PV "Framework for a photovoltaic plant including controllers"
+parameter Types.ApparentPower M_b=RenewableGenerator.SysData.S_b "Machine base power" annotation(Dialog(group= "Power flow data"));
 extends OpenIPSL.Electrical.Essentials.pfComponent(
     final enablefn=false,
     final enableV_b=false,
@@ -17,6 +18,7 @@ extends OpenIPSL.Electrical.Essentials.pfComponent(
   replaceable
     OpenIPSL.Electrical.Renewables.PSSE.InverterInterface.BaseClasses.BaseREGC
     RenewableGenerator(
+    M_b=M_b,
     P_0=P_0,
     Q_0=Q_0,
     v_0=v_0,
@@ -35,6 +37,7 @@ extends OpenIPSL.Electrical.Essentials.pfComponent(
   replaceable
     OpenIPSL.Electrical.Renewables.PSSE.PlantController.BaseClasses.BaseREPC
     PlantController(
+    M_b=M_b,
     P_0=P_0,
     Q_0=Q_0,
     v_0=v_0,
diff --git a/OpenIPSL/Electrical/Renewables/PSSE/Wind.mo b/OpenIPSL/Electrical/Renewables/PSSE/Wind.mo
@@ -1,5 +1,6 @@
 within OpenIPSL.Electrical.Renewables.PSSE;
 model Wind "Framework for a wind plant including controllers"
+parameter Types.ApparentPower M_b=RenewableGenerator.SysData.S_b "Machine base power" annotation(Dialog(group= "Power flow data"));
 extends OpenIPSL.Electrical.Essentials.pfComponent(
     final enablefn=false,
     final enableV_b=false,
@@ -17,6 +18,7 @@ extends OpenIPSL.Electrical.Essentials.pfComponent(
   replaceable
     OpenIPSL.Electrical.Renewables.PSSE.InverterInterface.BaseClasses.BaseREGC
     RenewableGenerator(
+    M_b=M_b,
     P_0=P_0,
     Q_0=Q_0,
     v_0=v_0,
@@ -35,6 +37,7 @@ extends OpenIPSL.Electrical.Essentials.pfComponent(
   replaceable
     OpenIPSL.Electrical.Renewables.PSSE.PlantController.BaseClasses.BaseREPC
     PlantController(
+    M_b=M_b,
     P_0=P_0,
     Q_0=Q_0,
     v_0=v_0,
@@ -59,7 +62,8 @@ extends OpenIPSL.Electrical.Essentials.pfComponent(
   Modelica.Blocks.Interfaces.RealInput FREQ if QFunctionality >= 4 "Connection Point Frequency"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
 
-  replaceable WindDriveTrain.BaseClasses.BaseWTDT DriveTrain annotation (
+  replaceable WindDriveTrain.BaseClasses.BaseWTDT DriveTrain(W0=W0)
+                                                             annotation (
       choicesAllMatching=true, Placement(transformation(extent={{-72,-80},{-52,
             -60}})));
   Modelica.Blocks.Sources.Constant w0(k=W0)
@@ -107,36 +111,39 @@ protected
       parameter Boolean pflag = (if TOscillation == 1 then true else false);
 
 equation
-  connect(gain1.u, RenewableGenerator.q_0) annotation (Line(points={{51.2,-64},{58.5714,-64},{58.5714,-21.4286}},
+  connect(gain1.u, RenewableGenerator.q_0) annotation (Line(points={{51.2,-64},
+          {58.5714,-64},{58.5714,-21.4286}},
                                     color={0,0,127}));
   connect(freq_ref.y, PlantController.Freq_ref) annotation (Line(points={{-84.5,
           -41},{-88,-41},{-88,-12},{-80,-12}}, color={0,0,127}));
   connect(PlantController.Plant_pref, RenewableGenerator.p_0) annotation (Line(
-        points={{-80,4},{-96,4},{-96,-96},{66,-96},{66,-58},{67.1429,-58},{67.1429,-21.4286}},
+        points={{-80,4},{-96,4},{-96,-96},{66,-96},{66,-58},{67.1429,-58},{
+          67.1429,-21.4286}},
         color={0,0,127}));
-  connect(PlantController.Qref, RenewableGenerator.q_0) annotation (Line(points={{-80,12},{-98,12},{-98,-98},{58.5714,-98},{58.5714,-21.4286}},
-                                                                         color={
+  connect(PlantController.Qref, RenewableGenerator.q_0) annotation (Line(points={{-80,12},
+          {-98,12},{-98,-98},{58.5714,-98},{58.5714,-21.4286}},          color={
           0,0,127}));
   connect(RenewableGenerator.p, pwPin)
     annotation (Line(points={{70,0},{100,0}}, color={0,0,255}));
   connect(PlantController.Freq, FREQ) annotation (Line(points={{-80,-4},{-92,-4},{-92,0},{-120,0}},
                              color={0,0,127}));
   connect(RenewableController.Iqcmd, RenewableGenerator.Iqcmd)
-    annotation (Line(points={{20.6667,11.3333},{22,11.3333},{22,11.4286},{27.1429,11.4286}},
-                                                         color={0,0,127}));
+    annotation (Line(points={{20.6667,11.3333},{22,11.3333},{22,11.4286},{
+          27.1429,11.4286}},                             color={0,0,127}));
   connect(RenewableController.Ipcmd, RenewableGenerator.Ipcmd)
-    annotation (Line(points={{20.6667,-11.3333},{22,-11.3333},{22,-11.4286},{27.1429,-11.4286}},
-                                                           color={0,0,127}));
+    annotation (Line(points={{20.6667,-11.3333},{22,-11.3333},{22,-11.4286},{
+          27.1429,-11.4286}},                              color={0,0,127}));
   connect(RenewableGenerator.V_t, RenewableController.Vt) annotation (Line(
-        points={{38.5714,21.4286},{38.5714,28},{-28,28},{-28,13.3333},{-21.3333,13.3333}},
-                     color={0,0,127}));
+        points={{38.5714,21.4286},{38.5714,28},{-28,28},{-28,13.3333},{-21.3333,
+          13.3333}}, color={0,0,127}));
   connect(RenewableGenerator.Pgen, RenewableController.Pe) annotation (Line(
         points={{50,21.4286},{50,30},{-30,30},{-30,8},{-21.3333,8}}, color={0,0,
           127}));
   connect(RenewableGenerator.Qgen, RenewableController.Qgen) annotation (Line(
-        points={{61.4286,21.4286},{61.4286,32},{-32,32},{-32,2.66667},{-21.3333,2.66667}},
-                     color={0,0,127}));
-  connect(gain.u, RenewableGenerator.p_0) annotation (Line(points={{51.2,-44},{67.1429,-44},{67.1429,-21.4286}},
+        points={{61.4286,21.4286},{61.4286,32},{-32,32},{-32,2.66667},{-21.3333,
+          2.66667}}, color={0,0,127}));
+  connect(gain.u, RenewableGenerator.p_0) annotation (Line(points={{51.2,-44},{
+          67.1429,-44},{67.1429,-21.4286}},
                                     color={0,0,127}));
   connect(RenewableGenerator.IQ0, RenewableController.iq0) annotation (Line(
         points={{32.8571,-21.4286},{32.8571,-26},{16,-26},{16,-21.3333}},
@@ -152,31 +159,38 @@ equation
   connect(RenewableController.p0, RenewableGenerator.p_0) annotation (Line(
         points={{-16,-21.3333},{-16,-34},{67.1429,-34},{67.1429,-21.4286}},
         color={0,0,127}));
-  connect(gain.y, RenewableController.Pref) annotation (Line(points={{37.4,-44},{-28,-44},{-28,-8},{-21.3333,-8}},
-                                             color={0,0,127}));
-  connect(gain1.y, RenewableController.Qext) annotation (Line(points={{37.4,-64},{-30,-64},{-30,-2.66667},{-21.3333,-2.66667}},
-                                                         color={0,0,127}));
+  connect(gain.y, RenewableController.Pref) annotation (Line(points={{37.4,-44},
+          {-28,-44},{-28,-8},{-21.3333,-8}}, color={0,0,127}));
+  connect(gain1.y, RenewableController.Qext) annotation (Line(points={{37.4,-64},
+          {-30,-64},{-30,-2.66667},{-21.3333,-2.66667}}, color={0,0,127}));
   connect(PlantController.Qext, RenewableController.Qext) annotation (Line(
         points={{-37,10},{-34,10},{-34,-2.66667},{-21.3333,-2.66667}}, color={0,
           0,127}));
   connect(PlantController.Pref, RenewableController.Pref) annotation (Line(
         points={{-37,-10},{-21.3333,-10},{-21.3333,-8}}, color={0,0,127}));
-  connect(PlantController.q0, RenewableController.q0) annotation (Line(points={{-46,-22},{-46,-32},{-8,-32},{-8,-21.3333}},
-                                                        color={0,0,127}));
-  connect(PlantController.v0, RenewableController.v0) annotation (Line(points={{-58,-22},{-58,-30},{0,-30},{0,-21.3333}},
-                                                      color={0,0,127}));
-  connect(PlantController.p0, RenewableController.p0) annotation (Line(points={{-70,-22},{-70,-34},{-16,-34},{-16,-21.3333}},
-                                                                  color={0,0,127}));
-  connect(DriveTrain.wg, RenewableController.Wg) annotation (Line(points={{-51.1667,-75},{-32,-75},{-32,-13.3333},{-21.3333,-13.3333}},
+  connect(PlantController.q0, RenewableController.q0) annotation (Line(points={{-46,-22},
+          {-46,-32},{-8,-32},{-8,-21.3333}},            color={0,0,127}));
+  connect(PlantController.v0, RenewableController.v0) annotation (Line(points={{-58,-22},
+          {-58,-30},{0,-30},{0,-21.3333}},            color={0,0,127}));
+  connect(PlantController.p0, RenewableController.p0) annotation (Line(points={{-70,-22},
+          {-70,-34},{-16,-34},{-16,-21.3333}},                    color={0,0,127}));
+  connect(DriveTrain.wg, RenewableController.Wg) annotation (Line(points={{
+          -51.1667,-75},{-32,-75},{-32,-13.3333},{-21.3333,-13.3333}},
                                                               color={0,0,127}));
-  connect(DriveTrain.Pe, RenewableGenerator.Pgen) annotation (Line(points={{-73.6667,-75},{-80,-75},{-80,-94},{80,-94},{80,30},{50,30},{50,21.4286}},
+  connect(DriveTrain.Pe, RenewableGenerator.Pgen) annotation (Line(points={{
+          -73.6667,-75},{-80,-75},{-80,-94},{80,-94},{80,30},{50,30},{50,
+          21.4286}},
         color={0,0,127}));
-  connect(DriveTrain.Pm, RenewableGenerator.p_0) annotation (Line(points={{-73.6667,-65},{-88,-65},{-88,-96},{66,-96},{66,-58},{67.1429,-58},{67.1429,-21.4286}},
-                                                                      color={0,0,
+  connect(DriveTrain.Pm, RenewableGenerator.p_0) annotation (Line(points={{
+          -73.6667,-65},{-88,-65},{-88,-96},{66,-96},{66,-58},{67.1429,-58},{
+          67.1429,-21.4286}},                                         color={0,0,
           127}));
-  connect(DriveTrain.P0, RenewableGenerator.p_0) annotation (Line(points={{-57,-81.6667},{-57,-86},{-18,-86},{-18,-34},{67.1429,-34},{67.1429,-21.4286}},
+  connect(DriveTrain.P0, RenewableGenerator.p_0) annotation (Line(points={{-57,
+          -81.6667},{-57,-86},{-18,-86},{-18,-34},{67.1429,-34},{67.1429,
+          -21.4286}},
         color={0,0,127}));
-  connect(w0.y, DriveTrain.W_0) annotation (Line(points={{-0.5,-85},{-8,-85},{-8,-90},{-67,-90},{-67,-81.6667}},
+  connect(w0.y, DriveTrain.W_0) annotation (Line(points={{-0.5,-85},{-8,-85},{
+          -8,-90},{-67,-90},{-67,-81.6667}},
                                           color={0,0,127}));
   connect(PlantController.branch_ii, branch_ii) annotation (Line(points={{-62,
           22},{-62,58},{-30,58},{-30,80}}, color={0,0,127}));
diff --git a/OpenIPSL/Electrical/Renewables/PSSE/WindDriveTrain/BaseClasses/BaseWTDT.mo b/OpenIPSL/Electrical/Renewables/PSSE/WindDriveTrain/BaseClasses/BaseWTDT.mo
@@ -12,6 +12,9 @@ partial model BaseWTDT
     final enableP_0=false,
     final enableS_b=false);
 
+    parameter OpenIPSL.Types.PerUnit W0=0;
+
+
   Modelica.Blocks.Interfaces.RealInput Pm "Mechanical Power"
     annotation (Placement(transformation(extent={{-160,40},{-120,80}})));
   Modelica.Blocks.Interfaces.RealInput Pe "Electrical Power"
diff --git a/OpenIPSL/Electrical/Renewables/PSSE/WindDriveTrain/WTDTA1.mo b/OpenIPSL/Electrical/Renewables/PSSE/WindDriveTrain/WTDTA1.mo
@@ -89,7 +89,6 @@ protected
   parameter OpenIPSL.Types.PerUnit Hg = H - Ht;
   parameter OpenIPSL.Types.PerUnit Kshaft = 2*Ht*Hg*(2*pi*Freq1)^2/(H*w0);
   parameter Modelica.Units.SI.AngularVelocity w0 = 2*pi*fn;
-  parameter OpenIPSL.Types.PerUnit W0(fixed=false);
   parameter OpenIPSL.Types.PerUnit T0(fixed=false);
 
 initial equation
