Move PFData records to Example package

maguilerac · maguilerac · commit 3a067f26d688 · 2023-06-11T22:40:02.000-04:00
The PFData records are simply for demonstration purposes. Therefore, the only place they can be in is under the Examples package.
diff --git a/OpenIPSL/Data/PowerPlant/Examples/PFData/BusData/BusTemplate.mo b/OpenIPSL/Data/PowerPlant/Examples/PFData/BusData/BusTemplate.mo
@@ -1,4 +1,4 @@
-within OpenIPSL.Data.PowerPlant.PFData.BusData;
+within OpenIPSL.Data.PowerPlant.Examples.PFData.BusData;
 partial record BusTemplate "Record template for power flow solutions in buses"
 
   parameter OpenIPSL.Types.PerUnit v1 "Voltage magnitude at bus 'FAULT'"
diff --git a/OpenIPSL/Data/PowerPlant/Examples/PFData/BusData/PFBus00030.mo b/OpenIPSL/Data/PowerPlant/Examples/PFData/BusData/PFBus00030.mo
@@ -1,4 +1,4 @@
-within OpenIPSL.Data.PowerPlant.PFData.BusData;
+within OpenIPSL.Data.PowerPlant.Examples.PFData.BusData;
 record PFBus00030 "Record for power flow solutions in buses - Pload = 30 MW"
   extends BusTemplate(
     v1=1.000000000000,
diff --git a/OpenIPSL/Data/PowerPlant/Examples/PFData/BusData/PFBus00040.mo b/OpenIPSL/Data/PowerPlant/Examples/PFData/BusData/PFBus00040.mo
@@ -1,4 +1,4 @@
-within OpenIPSL.Data.PowerPlant.PFData.BusData;
+within OpenIPSL.Data.PowerPlant.Examples.PFData.BusData;
 record PFBus00040 "Record for power flow solutions in buses - Pload = 40 MW"
   extends BusTemplate(
     v1=1.000000000000,
diff --git a/OpenIPSL/Data/PowerPlant/Examples/PFData/BusData/PFBus00050.mo b/OpenIPSL/Data/PowerPlant/Examples/PFData/BusData/PFBus00050.mo
@@ -1,4 +1,4 @@
-within OpenIPSL.Data.PowerPlant.PFData.BusData;
+within OpenIPSL.Data.PowerPlant.Examples.PFData.BusData;
 record PFBus00050 "Record for power flow solutions in buses - Pload = 50 MW"
   extends BusTemplate(
     v1=1.000000000000,
diff --git a/OpenIPSL/Data/PowerPlant/Examples/PFData/BusData/PFBus00060.mo b/OpenIPSL/Data/PowerPlant/Examples/PFData/BusData/PFBus00060.mo
@@ -1,4 +1,4 @@
-within OpenIPSL.Data.PowerPlant.PFData.BusData;
+within OpenIPSL.Data.PowerPlant.Examples.PFData.BusData;
 record PFBus00060 "Record for power flow solutions in buses - Pload = 60 MW"
   extends BusTemplate(
     v1=1.000000000000,
diff --git a/OpenIPSL/Data/PowerPlant/Examples/PFData/BusData/PFBus00070.mo b/OpenIPSL/Data/PowerPlant/Examples/PFData/BusData/PFBus00070.mo
@@ -1,4 +1,4 @@
-within OpenIPSL.Data.PowerPlant.PFData.BusData;
+within OpenIPSL.Data.PowerPlant.Examples.PFData.BusData;
 record PFBus00070 "Record for power flow solutions in buses - Pload = 70 MW"
   extends BusTemplate(
     v1=1.000000000000,
diff --git a/OpenIPSL/Data/PowerPlant/Examples/PFData/BusData/package.mo b/OpenIPSL/Data/PowerPlant/Examples/PFData/BusData/package.mo
@@ -1,4 +1,4 @@
-within OpenIPSL.Data.PowerPlant.PFData;
+within OpenIPSL.Data.PowerPlant.Examples.PFData;
 package BusData "Records with power flow solutions for buses"
   extends Modelica.Icons.RecordsPackage;
 
diff --git a/OpenIPSL/Data/PowerPlant/Examples/PFData/BusData/package.order b/OpenIPSL/Data/PowerPlant/Examples/PFData/BusData/package.order
diff --git a/OpenIPSL/Data/PowerPlant/Examples/PFData/LoadData/LoadTemplate.mo b/OpenIPSL/Data/PowerPlant/Examples/PFData/LoadData/LoadTemplate.mo
@@ -1,4 +1,4 @@
-within OpenIPSL.Data.PowerPlant.PFData.LoadData;
+within OpenIPSL.Data.PowerPlant.Examples.PFData.LoadData;
 partial record LoadTemplate
   "Record template for power flow solutions in loads"
 
diff --git a/OpenIPSL/Data/PowerPlant/Examples/PFData/LoadData/PFLoad00030.mo b/OpenIPSL/Data/PowerPlant/Examples/PFData/LoadData/PFLoad00030.mo
@@ -1,4 +1,4 @@
-within OpenIPSL.Data.PowerPlant.PFData.LoadData;
+within OpenIPSL.Data.PowerPlant.Examples.PFData.LoadData;
 record PFLoad00030 "Record for power flow solutions in loads - Pload = 30 MW"
   extends LoadTemplate(  PL1=1e06*(30.000000000000), QL1=1e06*(6.000000000000));
 
diff --git a/OpenIPSL/Data/PowerPlant/Examples/PFData/LoadData/PFLoad00040.mo b/OpenIPSL/Data/PowerPlant/Examples/PFData/LoadData/PFLoad00040.mo
@@ -1,4 +1,4 @@
-within OpenIPSL.Data.PowerPlant.PFData.LoadData;
+within OpenIPSL.Data.PowerPlant.Examples.PFData.LoadData;
 record PFLoad00040 "Record for power flow solutions in loads - Pload = 40 MW"
   extends LoadTemplate(  PL1=1e06*(40.000000000000), QL1=1e06*(8.000000000000));
 
diff --git a/OpenIPSL/Data/PowerPlant/Examples/PFData/LoadData/PFLoad00050.mo b/OpenIPSL/Data/PowerPlant/Examples/PFData/LoadData/PFLoad00050.mo
@@ -1,4 +1,4 @@
-within OpenIPSL.Data.PowerPlant.PFData.LoadData;
+within OpenIPSL.Data.PowerPlant.Examples.PFData.LoadData;
 record PFLoad00050 "Record for power flow solutions in loads - Pload = 50 MW"
   extends LoadTemplate(  PL1=1e06*(50.000000000000), QL1=1e06*(10.000000000000));
 
diff --git a/OpenIPSL/Data/PowerPlant/Examples/PFData/LoadData/PFLoad00060.mo b/OpenIPSL/Data/PowerPlant/Examples/PFData/LoadData/PFLoad00060.mo
@@ -1,4 +1,4 @@
-within OpenIPSL.Data.PowerPlant.PFData.LoadData;
+within OpenIPSL.Data.PowerPlant.Examples.PFData.LoadData;
 record PFLoad00060 "Record for power flow solutions in loads - Pload = 60 MW"
   extends LoadTemplate(  PL1=1e06*(60.000000000000), QL1=1e06*(12.000000000000));
 
diff --git a/OpenIPSL/Data/PowerPlant/Examples/PFData/LoadData/PFLoad00070.mo b/OpenIPSL/Data/PowerPlant/Examples/PFData/LoadData/PFLoad00070.mo
@@ -1,4 +1,4 @@
-within OpenIPSL.Data.PowerPlant.PFData.LoadData;
+within OpenIPSL.Data.PowerPlant.Examples.PFData.LoadData;
 record PFLoad00070 "Record for power flow solutions in loads - Pload = 70 MW"
   extends LoadTemplate(  PL1=1e06*(70.000000000000), QL1=1e06*(14.000000000000));
 
diff --git a/OpenIPSL/Data/PowerPlant/Examples/PFData/LoadData/package.mo b/OpenIPSL/Data/PowerPlant/Examples/PFData/LoadData/package.mo
@@ -1,4 +1,4 @@
-within OpenIPSL.Data.PowerPlant.PFData;
+within OpenIPSL.Data.PowerPlant.Examples.PFData;
 package LoadData "Records with power flow solutions for loads"
   extends Modelica.Icons.RecordsPackage;
 
diff --git a/OpenIPSL/Data/PowerPlant/Examples/PFData/LoadData/package.order b/OpenIPSL/Data/PowerPlant/Examples/PFData/LoadData/package.order
diff --git a/OpenIPSL/Data/PowerPlant/Examples/PFData/MachineData/MachineTemplate.mo b/OpenIPSL/Data/PowerPlant/Examples/PFData/MachineData/MachineTemplate.mo
@@ -1,4 +1,4 @@
-within OpenIPSL.Data.PowerPlant.PFData.MachineData;
+within OpenIPSL.Data.PowerPlant.Examples.PFData.MachineData;
 partial record MachineTemplate
   "Record template for power flow solutions in machines"
 
diff --git a/OpenIPSL/Data/PowerPlant/Examples/PFData/MachineData/PFMachine00030.mo b/OpenIPSL/Data/PowerPlant/Examples/PFData/MachineData/PFMachine00030.mo
@@ -1,4 +1,4 @@
-within OpenIPSL.Data.PowerPlant.PFData.MachineData;
+within OpenIPSL.Data.PowerPlant.Examples.PFData.MachineData;
 record PFMachine00030
   "Record for power flow solutions in machines - Pload = 30 MW"
   extends MachineTemplate(
diff --git a/OpenIPSL/Data/PowerPlant/Examples/PFData/MachineData/PFMachine00040.mo b/OpenIPSL/Data/PowerPlant/Examples/PFData/MachineData/PFMachine00040.mo
@@ -1,4 +1,4 @@
-within OpenIPSL.Data.PowerPlant.PFData.MachineData;
+within OpenIPSL.Data.PowerPlant.Examples.PFData.MachineData;
 record PFMachine00040
   "Record for power flow solutions in machines - Pload = 40 MW"
   extends MachineTemplate(
diff --git a/OpenIPSL/Data/PowerPlant/Examples/PFData/MachineData/PFMachine00050.mo b/OpenIPSL/Data/PowerPlant/Examples/PFData/MachineData/PFMachine00050.mo
@@ -1,4 +1,4 @@
-within OpenIPSL.Data.PowerPlant.PFData.MachineData;
+within OpenIPSL.Data.PowerPlant.Examples.PFData.MachineData;
 record PFMachine00050
   "Record for power flow solutions in machines - Pload = 50 MW"
   extends MachineTemplate(
diff --git a/OpenIPSL/Data/PowerPlant/Examples/PFData/MachineData/PFMachine00060.mo b/OpenIPSL/Data/PowerPlant/Examples/PFData/MachineData/PFMachine00060.mo
@@ -1,4 +1,4 @@
-within OpenIPSL.Data.PowerPlant.PFData.MachineData;
+within OpenIPSL.Data.PowerPlant.Examples.PFData.MachineData;
 record PFMachine00060
   "Record for power flow solutions in machines - Pload = 60 MW"
   extends MachineTemplate(
diff --git a/OpenIPSL/Data/PowerPlant/Examples/PFData/MachineData/PFMachine00070.mo b/OpenIPSL/Data/PowerPlant/Examples/PFData/MachineData/PFMachine00070.mo
@@ -1,4 +1,4 @@
-within OpenIPSL.Data.PowerPlant.PFData.MachineData;
+within OpenIPSL.Data.PowerPlant.Examples.PFData.MachineData;
 record PFMachine00070
   "Record for power flow solutions in machines - Pload = 70 MW"
   extends MachineTemplate(
diff --git a/OpenIPSL/Data/PowerPlant/Examples/PFData/MachineData/package.mo b/OpenIPSL/Data/PowerPlant/Examples/PFData/MachineData/package.mo
@@ -1,4 +1,4 @@
-within OpenIPSL.Data.PowerPlant.PFData;
+within OpenIPSL.Data.PowerPlant.Examples.PFData;
 package MachineData "Records with power flow solutions for machines"
   extends Modelica.Icons.RecordsPackage;
 
diff --git a/OpenIPSL/Data/PowerPlant/Examples/PFData/MachineData/package.order b/OpenIPSL/Data/PowerPlant/Examples/PFData/MachineData/package.order
diff --git a/OpenIPSL/Data/PowerPlant/Examples/PFData/PF00030.mo b/OpenIPSL/Data/PowerPlant/Examples/PFData/PF00030.mo
@@ -1,4 +1,4 @@
-within OpenIPSL.Data.PowerPlant.PFData;
+within OpenIPSL.Data.PowerPlant.Examples.PFData;
 record PF00030 "PF solutions for Pload = 30 MW"
   extends PowerFlowTemplate;
 
diff --git a/OpenIPSL/Data/PowerPlant/Examples/PFData/PF00040.mo b/OpenIPSL/Data/PowerPlant/Examples/PFData/PF00040.mo
@@ -1,4 +1,4 @@
-within OpenIPSL.Data.PowerPlant.PFData;
+within OpenIPSL.Data.PowerPlant.Examples.PFData;
 record PF00040 "PF solutions for Pload = 40 MW"
   extends PowerFlowTemplate;
 
diff --git a/OpenIPSL/Data/PowerPlant/Examples/PFData/PF00050.mo b/OpenIPSL/Data/PowerPlant/Examples/PFData/PF00050.mo
@@ -1,4 +1,4 @@
-within OpenIPSL.Data.PowerPlant.PFData;
+within OpenIPSL.Data.PowerPlant.Examples.PFData;
 record PF00050 "PF solutions for Pload = 50 MW"
   extends PowerFlowTemplate;
 
diff --git a/OpenIPSL/Data/PowerPlant/Examples/PFData/PF00060.mo b/OpenIPSL/Data/PowerPlant/Examples/PFData/PF00060.mo
@@ -1,4 +1,4 @@
-within OpenIPSL.Data.PowerPlant.PFData;
+within OpenIPSL.Data.PowerPlant.Examples.PFData;
 record PF00060 "PF solutions for Pload = 60 MW"
   extends PowerFlowTemplate;
 
diff --git a/OpenIPSL/Data/PowerPlant/Examples/PFData/PF00070.mo b/OpenIPSL/Data/PowerPlant/Examples/PFData/PF00070.mo
@@ -1,4 +1,4 @@
-within OpenIPSL.Data.PowerPlant.PFData;
+within OpenIPSL.Data.PowerPlant.Examples.PFData;
 record PF00070 "PF solutions for Pload = 70 MW"
   extends PowerFlowTemplate;
 
diff --git a/OpenIPSL/Data/PowerPlant/Examples/PFData/PowerFlow.mo b/OpenIPSL/Data/PowerPlant/Examples/PFData/PowerFlow.mo
@@ -1,4 +1,4 @@
-within OpenIPSL.Data.PowerPlant.PFData;
+within OpenIPSL.Data.PowerPlant.Examples.PFData;
 record PowerFlow "Record containing replaceable record with power flow results"
   extends Modelica.Icons.Record;
 
diff --git a/OpenIPSL/Data/PowerPlant/Examples/PFData/PowerFlowTemplate.mo b/OpenIPSL/Data/PowerPlant/Examples/PFData/PowerFlowTemplate.mo
@@ -1,4 +1,4 @@
-within OpenIPSL.Data.PowerPlant.PFData;
+within OpenIPSL.Data.PowerPlant.Examples.PFData;
 record PowerFlowTemplate "Template Record for Power Flow Results"
   extends Modelica.Icons.Record;
 
diff --git a/OpenIPSL/Data/PowerPlant/Examples/PFData/package.mo b/OpenIPSL/Data/PowerPlant/Examples/PFData/package.mo
@@ -1,4 +1,4 @@
-within OpenIPSL.Data.PowerPlant;
+within OpenIPSL.Data.PowerPlant.Examples;
 package PFData "Records with Power Flow solutions as obtained from GridCal and pf2rec"
 
   extends Modelica.Icons.RecordsPackage;
diff --git a/OpenIPSL/Data/PowerPlant/Examples/PFData/package.order b/OpenIPSL/Data/PowerPlant/Examples/PFData/package.order
diff --git a/OpenIPSL/Data/PowerPlant/Examples/package.order b/OpenIPSL/Data/PowerPlant/Examples/package.order
@@ -1,2 +1,3 @@
 Anderson
 IEEE421
+PFData
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/Data/PowerPlant/package.order b/OpenIPSL/Data/PowerPlant/package.order
@@ -1,7 +1,6 @@
 HowTo
 Examples
 GenerationGroup
-PFData
 GUDynamicsTemplate
 GUDynamics
 Anderson

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-within OpenIPSL.Data.PowerPlant.PFData.BusData;`
	`1`	`+within OpenIPSL.Data.PowerPlant.Examples.PFData.BusData;`
`2`	`2`	`partial record BusTemplate "Record template for power flow solutions in buses"`
`3`	`3`
`4`	`4`	`parameter OpenIPSL.Types.PerUnit v1 "Voltage magnitude at bus 'FAULT'"`