Trying to fix the PF names - Part A

maguilerac · maguilerac · commit 62ebdd80c2e7 · 2023-01-10T22:49:23.000-05:00
Models/packages starting with Pf were renamed as Px...
diff --git a/OpenIPSL/Examples/Tutorial/Example_4/BaseModels/BaseNetwork/SMIBPartial.mo b/OpenIPSL/Examples/Tutorial/Example_4/BaseModels/BaseNetwork/SMIBPartial.mo
@@ -61,8 +61,8 @@ model SMIBPartial "Partial SMIB Model with PF Record and Load"
         extent={{-6,-6},{6,6}},
         rotation=270,
         origin={36,-46})));
-  PFData.PowerFlow pf(redeclare record PowerFlow =
-        OpenIPSL.Examples.Tutorial.Example_4.PFData.PF00000)
+  PxData.PowerFlow pf(redeclare record PowerFlow =
+        OpenIPSL.Examples.Tutorial.Example_4.PxData.Px00000)
     annotation (Placement(transformation(extent={{-80,26},{-60,46}})));
 equation
   connect(line_01.p, B01.p)
diff --git a/OpenIPSL/Examples/Tutorial/Example_4/Experiments/SMIB.mo b/OpenIPSL/Examples/Tutorial/Example_4/Experiments/SMIB.mo
@@ -2,7 +2,7 @@ within OpenIPSL.Examples.Tutorial.Example_4.Experiments;
 model SMIB
   extends Modelica.Icons.Example;
   extends BaseModels.BaseNetwork.SMIBPartial( pf(redeclare record PowerFlow =
-          PFData.PF00000));
+          PxData.Px00000));
   replaceable BaseModels.GeneratingUnits.GeneratorTurbGovAVR genunit(
     P_0=pf.powerflow.machine.PG1,
     Q_0=pf.powerflow.machine.QG1,
diff --git a/OpenIPSL/Examples/Tutorial/Example_4/Experiments/SMIBVarLoad.mo b/OpenIPSL/Examples/Tutorial/Example_4/Experiments/SMIBVarLoad.mo
@@ -2,7 +2,7 @@ within OpenIPSL.Examples.Tutorial.Example_4.Experiments;
 model SMIBVarLoad "SMIB Model with a Variable Load"
   extends Modelica.Icons.Example;
   extends BaseModels.BaseNetwork.SMIBPartial(
-    pf(redeclare record PowerFlow = PFData.PF00000),
+    pf(redeclare record PowerFlow = PxData.Px00000),
     redeclare OpenIPSL.Electrical.Loads.PSSE.Load_variation load(
       P_0=pf.powerflow.load.PL1,
       Q_0=pf.powerflow.load.QL1,
diff --git a/OpenIPSL/Examples/Tutorial/Example_4/PFData/PF00000.mo b/OpenIPSL/Examples/Tutorial/Example_4/PFData/PF00000.mo
diff --git a/OpenIPSL/Examples/Tutorial/Example_4/PfData/BusData/PfBus00000.mo b/OpenIPSL/Examples/Tutorial/Example_4/PfData/BusData/PfBus00000.mo
diff --git a/OpenIPSL/Examples/Tutorial/Example_4/PfData/LoadData/PfLoad00000.mo b/OpenIPSL/Examples/Tutorial/Example_4/PfData/LoadData/PfLoad00000.mo
diff --git a/OpenIPSL/Examples/Tutorial/Example_4/PfData/MachineData/PfMachine00000.mo b/OpenIPSL/Examples/Tutorial/Example_4/PfData/MachineData/PfMachine00000.mo
diff --git a/OpenIPSL/Examples/Tutorial/Example_4/PfData/TrafoData/PfTrafo00000.mo b/OpenIPSL/Examples/Tutorial/Example_4/PfData/TrafoData/PfTrafo00000.mo
diff --git a/OpenIPSL/Examples/Tutorial/Example_4/PxData/BusData/BusTemplate.mo b/OpenIPSL/Examples/Tutorial/Example_4/PxData/BusData/BusTemplate.mo
@@ -1,4 +1,4 @@
-within OpenIPSL.Examples.Tutorial.Example_4.PFData.BusData;
+within OpenIPSL.Examples.Tutorial.Example_4.PxData.BusData;
 partial record BusTemplate "Record template for power flow solutions in buses"
 
 parameter OpenIPSL.Types.PerUnit v1 "Voltage magnitude at bus 'B01'" annotation(Dialog(enable = false));
diff --git a/OpenIPSL/Examples/Tutorial/Example_4/PxData/BusData/PxBus00000.mo b/OpenIPSL/Examples/Tutorial/Example_4/PxData/BusData/PxBus00000.mo
@@ -0,0 +1,13 @@
+within OpenIPSL.Examples.Tutorial.Example_4.PxData.BusData;
+record PxBus00000 "Record for power flow solutions in buses - Id 00000"
+extends OpenIPSL.Examples.Tutorial.Example_4.PxData.BusData.BusTemplate(
+    v1=1.0000000,
+    A1=0.0706208,
+    v2=1.0000000,
+    A2=0.0000000,
+    v3=0.9959842,
+    A3=-0.0050087,
+    v4=0.9919935,
+    A4=-0.0100578);
+
+end PxBus00000;
diff --git a/OpenIPSL/Examples/Tutorial/Example_4/PxData/BusData/package.mo b/OpenIPSL/Examples/Tutorial/Example_4/PxData/BusData/package.mo
@@ -1,4 +1,4 @@
-within OpenIPSL.Examples.Tutorial.Example_4.PFData;
+within OpenIPSL.Examples.Tutorial.Example_4.PxData;
 package BusData "Records with power flow solutions for buses"
   extends Modelica.Icons.RecordsPackage;
 
diff --git a/OpenIPSL/Examples/Tutorial/Example_4/PxData/BusData/package.order b/OpenIPSL/Examples/Tutorial/Example_4/PxData/BusData/package.order
@@ -1,2 +1,2 @@
 BusTemplate
-PFBus00000
+PxBus00000
diff --git a/OpenIPSL/Examples/Tutorial/Example_4/PxData/LoadData/LoadTemplate.mo b/OpenIPSL/Examples/Tutorial/Example_4/PxData/LoadData/LoadTemplate.mo
@@ -1,4 +1,4 @@
-within OpenIPSL.Examples.Tutorial.Example_4.PFData.LoadData;
+within OpenIPSL.Examples.Tutorial.Example_4.PxData.LoadData;
 partial record LoadTemplate
   "Record template for power flow solutions in loads"
 
diff --git a/OpenIPSL/Examples/Tutorial/Example_4/PxData/LoadData/PxLoad00000.mo b/OpenIPSL/Examples/Tutorial/Example_4/PxData/LoadData/PxLoad00000.mo
@@ -0,0 +1,6 @@
+within OpenIPSL.Examples.Tutorial.Example_4.PxData.LoadData;
+record PxLoad00000 "Record for power flow solutions in loads - Id 00000"
+extends OpenIPSL.Examples.Tutorial.Example_4.PxData.LoadData.LoadTemplate(PL1=
+        1e06*(50.0000000), QL1=1e06*(10.0000000));
+
+end PxLoad00000;
diff --git a/OpenIPSL/Examples/Tutorial/Example_4/PxData/LoadData/package.mo b/OpenIPSL/Examples/Tutorial/Example_4/PxData/LoadData/package.mo
@@ -1,4 +1,4 @@
-within OpenIPSL.Examples.Tutorial.Example_4.PFData;
+within OpenIPSL.Examples.Tutorial.Example_4.PxData;
 package LoadData "Records with power flow solutions for loads"
   extends Modelica.Icons.RecordsPackage;
 
diff --git a/OpenIPSL/Examples/Tutorial/Example_4/PxData/LoadData/package.order b/OpenIPSL/Examples/Tutorial/Example_4/PxData/LoadData/package.order
@@ -1,2 +1,2 @@
 LoadTemplate
-PFLoad00000
+PxLoad00000
diff --git a/OpenIPSL/Examples/Tutorial/Example_4/PxData/MachineData/MachineTemplate.mo b/OpenIPSL/Examples/Tutorial/Example_4/PxData/MachineData/MachineTemplate.mo
@@ -1,4 +1,4 @@
-within OpenIPSL.Examples.Tutorial.Example_4.PFData.MachineData;
+within OpenIPSL.Examples.Tutorial.Example_4.PxData.MachineData;
 partial record MachineTemplate
   "Record template for power flow solutions in machines"
 
diff --git a/OpenIPSL/Examples/Tutorial/Example_4/PxData/MachineData/PxMachine00000.mo b/OpenIPSL/Examples/Tutorial/Example_4/PxData/MachineData/PxMachine00000.mo
@@ -0,0 +1,9 @@
+within OpenIPSL.Examples.Tutorial.Example_4.PxData.MachineData;
+record PxMachine00000 "Record for power flow solutions in machines - Id 00000"
+extends OpenIPSL.Examples.Tutorial.Example_4.PxData.MachineData.MachineTemplate(
+    PG1=1e06*(40.0000000),
+    QG1=1e06*(5.4165820),
+    PG2=1e06*(10.0171156),
+    QG2=1e06*(8.0065440));
+
+end PxMachine00000;
diff --git a/OpenIPSL/Examples/Tutorial/Example_4/PxData/MachineData/package.mo b/OpenIPSL/Examples/Tutorial/Example_4/PxData/MachineData/package.mo
@@ -1,4 +1,4 @@
-within OpenIPSL.Examples.Tutorial.Example_4.PFData;
+within OpenIPSL.Examples.Tutorial.Example_4.PxData;
 package MachineData "Records with power flow solutions for machines"
   extends Modelica.Icons.RecordsPackage;
 
diff --git a/OpenIPSL/Examples/Tutorial/Example_4/PxData/MachineData/package.order b/OpenIPSL/Examples/Tutorial/Example_4/PxData/MachineData/package.order
@@ -1,2 +1,2 @@
 MachineTemplate
-PFMachine00000
+PxMachine00000
diff --git a/OpenIPSL/Examples/Tutorial/Example_4/PxData/PowerFlow.mo b/OpenIPSL/Examples/Tutorial/Example_4/PxData/PowerFlow.mo
@@ -1,11 +1,11 @@
-within OpenIPSL.Examples.Tutorial.Example_4.PFData;
+within OpenIPSL.Examples.Tutorial.Example_4.PxData;
 record PowerFlow
   "Instantiable record containing the replaceable record with power flow results"
   extends Modelica.Icons.Record;
 
   replaceable record PowerFlow =
-        OpenIPSL.Examples.Tutorial.Example_4.PFData.PowerFlowTemplate
-    constrainedby OpenIPSL.Examples.Tutorial.Example_4.PFData.PowerFlowTemplate
+        OpenIPSL.Examples.Tutorial.Example_4.PxData.PowerFlowTemplate
+    constrainedby OpenIPSL.Examples.Tutorial.Example_4.PxData.PowerFlowTemplate
     "Replaceable power flow record"
   annotation(choicesAllMatching=true);
 
diff --git a/OpenIPSL/Examples/Tutorial/Example_4/PxData/PowerFlowTemplate.mo b/OpenIPSL/Examples/Tutorial/Example_4/PxData/PowerFlowTemplate.mo
@@ -1,4 +1,4 @@
-within OpenIPSL.Examples.Tutorial.Example_4.PFData;
+within OpenIPSL.Examples.Tutorial.Example_4.PxData;
 record PowerFlowTemplate "Template Record for Power Flow Results"
   extends Modelica.Icons.Record;
   annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
diff --git a/OpenIPSL/Examples/Tutorial/Example_4/PxData/Px00000.mo b/OpenIPSL/Examples/Tutorial/Example_4/PxData/Px00000.mo
@@ -0,0 +1,33 @@
+within OpenIPSL.Examples.Tutorial.Example_4.PxData;
+record Px00000 "Record for power flow solutions - Id 00000"
+extends OpenIPSL.Examples.Tutorial.Example_4.PxData.PowerFlowTemplate;
+
+replaceable record Bus =
+      OpenIPSL.Examples.Tutorial.Example_4.PxData.BusData.PxBus00000
+    constrainedby
+    OpenIPSL.Examples.Tutorial.Example_4.PxData.BusData.BusTemplate
+                                                            "Power flow results for buses";
+  Bus bus;
+
+replaceable record Load =
+      OpenIPSL.Examples.Tutorial.Example_4.PxData.LoadData.PxLoad00000
+    constrainedby
+    OpenIPSL.Examples.Tutorial.Example_4.PxData.LoadData.LoadTemplate
+    "Power flow results for loads";
+  Load load;
+
+replaceable record Machine =
+      OpenIPSL.Examples.Tutorial.Example_4.PxData.MachineData.PxMachine00000
+    constrainedby
+    OpenIPSL.Examples.Tutorial.Example_4.PxData.MachineData.MachineTemplate
+    "Power flow results for machines";
+  Machine machine;
+
+replaceable record Trafo =
+      OpenIPSL.Examples.Tutorial.Example_4.PxData.TrafoData.PxTrafo00000
+    constrainedby
+    OpenIPSL.Examples.Tutorial.Example_4.PxData.TrafoData.TrafoTemplate
+    "Power flow results for transformers";
+  Trafo trafo;
+
+end Px00000;
diff --git a/OpenIPSL/Examples/Tutorial/Example_4/PxData/TrafoData/PxTrafo00000.mo b/OpenIPSL/Examples/Tutorial/Example_4/PxData/TrafoData/PxTrafo00000.mo
@@ -0,0 +1,5 @@
+within OpenIPSL.Examples.Tutorial.Example_4.PxData.TrafoData;
+record PxTrafo00000 "Record for power flow solutions in trafos - Id 00000"
+extends OpenIPSL.Examples.Tutorial.Example_4.PxData.TrafoData.TrafoTemplate;
+
+end PxTrafo00000;
diff --git a/OpenIPSL/Examples/Tutorial/Example_4/PxData/TrafoData/TrafoTemplate.mo b/OpenIPSL/Examples/Tutorial/Example_4/PxData/TrafoData/TrafoTemplate.mo
@@ -1,4 +1,4 @@
-within OpenIPSL.Examples.Tutorial.Example_4.PFData.TrafoData;
+within OpenIPSL.Examples.Tutorial.Example_4.PxData.TrafoData;
 partial record TrafoTemplate
   "Record template for power flow solutions in transformers"
 
diff --git a/OpenIPSL/Examples/Tutorial/Example_4/PxData/TrafoData/package.mo b/OpenIPSL/Examples/Tutorial/Example_4/PxData/TrafoData/package.mo
@@ -1,4 +1,4 @@
-within OpenIPSL.Examples.Tutorial.Example_4.PFData;
+within OpenIPSL.Examples.Tutorial.Example_4.PxData;
 package TrafoData "Records with power flow solutions for machines"
   extends Modelica.Icons.RecordsPackage;
 
diff --git a/OpenIPSL/Examples/Tutorial/Example_4/PxData/TrafoData/package.order b/OpenIPSL/Examples/Tutorial/Example_4/PxData/TrafoData/package.order
@@ -1,2 +1,2 @@
 TrafoTemplate
-PFTrafo00000
+PxTrafo00000
diff --git a/OpenIPSL/Examples/Tutorial/Example_4/PxData/package.mo b/OpenIPSL/Examples/Tutorial/Example_4/PxData/package.mo
@@ -1,6 +1,6 @@
 within OpenIPSL.Examples.Tutorial.Example_4;
-package PFData "Records with Power Flow Solutions as obtained from GridCal and pf2rec"
+package PxData "Records with Power Flow Solutions as obtained from GridCal and pf2rec"
 
   extends Modelica.Icons.RecordsPackage;
 
-end PFData;
+end PxData;
diff --git a/OpenIPSL/Examples/Tutorial/Example_4/PxData/package.order b/OpenIPSL/Examples/Tutorial/Example_4/PxData/package.order
@@ -4,4 +4,4 @@ LoadData
 TrafoData
 MachineData
 BusData
-PF00000
+Px00000
diff --git a/OpenIPSL/Examples/Tutorial/Example_4/package.order b/OpenIPSL/Examples/Tutorial/Example_4/package.order
@@ -2,4 +2,4 @@ Instructions
 Experiments
 BaseModels
 Utilities
-PFData
+PxData

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-within OpenIPSL.Examples.Tutorial.Example_4.PFData.BusData;`
	`1`	`+within OpenIPSL.Examples.Tutorial.Example_4.PxData.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 'B01'" annotation(Dialog(enable = false));`