Revert changes already done in OpenIPSL#347

Revert changes to Renewables (already done in OpenIPSL#347)
ALSETLab · Nov 14, 2024 · 945838b · 945838b
1 parent b0bc9c2
commit 945838b
Show file tree

Hide file tree

Showing 11 changed files with 7 additions and 179 deletions.
diff --git a/OpenIPSL/Data/PowerPlant/GenerationGroup/Generator1.mo b/OpenIPSL/Data/PowerPlant/GenerationGroup/Generator1.mo
@@ -130,7 +130,8 @@ equation
           fillPattern=FillPattern.Solid,
           textString="%name"),
                          Line(points={{-60,-20},{-20,20},{20,-20},{60,20}},
-          color={28,108,200}),Ellipse(extent={{-100,-100},{100,100}}, lineColor=
+          color={28,108,200}),Ellipse(extent={{-100,-100},{100,100}}, lineColor
+            =
            {28,108,200})}),
     Documentation(info="<html>
 <p>Generation group for the example that uses the IEEE421.5-based data set.</p>

diff --git a/OpenIPSL/Data/PowerPlant/GenerationGroup/Generator2.mo b/OpenIPSL/Data/PowerPlant/GenerationGroup/Generator2.mo
@@ -127,7 +127,8 @@ equation
           fillPattern=FillPattern.Solid,
           textString="%name"),
                          Line(points={{-60,-20},{-20,20},{20,-20},{60,20}},
-          color={28,108,200}),Ellipse(extent={{-100,-100},{100,100}}, lineColor=
+          color={28,108,200}),Ellipse(extent={{-100,-100},{100,100}}, lineColor
+            =
            {28,108,200})}),
     Documentation(info="<html>
 <p>Generation Group for the example that uses the Anderson-based data set.</p>

diff --git a/OpenIPSL/Electrical/Controls/PSSE/ES/BaseClasses/PID_No_Windup.mo b/OpenIPSL/Electrical/Controls/PSSE/ES/BaseClasses/PID_No_Windup.mo
diff --git a/OpenIPSL/Electrical/Controls/PSSE/ES/BaseClasses/PI_No_Windup.mo b/OpenIPSL/Electrical/Controls/PSSE/ES/BaseClasses/PI_No_Windup.mo
diff --git a/OpenIPSL/Electrical/Controls/PSSE/ES/BaseClasses/package.order b/OpenIPSL/Electrical/Controls/PSSE/ES/BaseClasses/package.order
@@ -9,5 +9,3 @@ RectifierCommutationVoltageDrop
 calculate_dc_exciter_params
 RotatingExciterBase
 invFEX
-PID_No_Windup
-PI_No_Windup
diff --git a/OpenIPSL/Electrical/Controls/PSSE/VC/IEEEVC.mo b/OpenIPSL/Electrical/Controls/PSSE/VC/IEEEVC.mo
diff --git a/OpenIPSL/Electrical/Controls/PSSE/VC/package.mo b/OpenIPSL/Electrical/Controls/PSSE/VC/package.mo
diff --git a/OpenIPSL/Electrical/Controls/PSSE/VC/package.order b/OpenIPSL/Electrical/Controls/PSSE/VC/package.order
diff --git a/OpenIPSL/Electrical/Renewables/PSSE/BESS.mo b/OpenIPSL/Electrical/Renewables/PSSE/BESS.mo
@@ -1,5 +1,6 @@
 within OpenIPSL.Electrical.Renewables.PSSE;
 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,

diff --git a/OpenIPSL/Electrical/Renewables/PSSE/PV.mo b/OpenIPSL/Electrical/Renewables/PSSE/PV.mo
@@ -1,6 +1,6 @@
 within OpenIPSL.Electrical.Renewables.PSSE;
 model PV "Framework for a photovoltaic plant including controllers"
-  parameter Modelica.Units.SI.ApparentPower M_b "Machine base" annotation (Dialog(group= "Power flow data"));
+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,

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,