Skip to content

Commit

Permalink
Add new pf solution from PSAT into Example2
Browse files Browse the repository at this point in the history
  • Loading branch information
lvanfretti committed Mar 13, 2024
1 parent fa8fde2 commit 315c337
Show file tree
Hide file tree
Showing 6 changed files with 49 additions and 28 deletions.
7 changes: 3 additions & 4 deletions Example2/Analysis/PFVariants/Ramping_pf.mo
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,10 @@ model Ramping_pf
pss4_Tw=0.355570139928890,
pss5_Kw=48.660727200594167,
pss5_Tw=0.355570139928890,
redeclare record Bus = Example2.PFData.Data.BusData.PF_Bus_0,
redeclare record Loads = Example2.PFData.Data.LoadData.PF_Loads_0,
redeclare record Bus = Example2.PFData.Data.BusData.PF_Bus_1,
redeclare record Loads = Example2.PFData.Data.LoadData.PF_Loads_1,
redeclare record Trafos = Example2.PFData.Data.TrafoData.PF_Trafos_0,
redeclare record Machines =
Example2.PFData.Data.MachineData.PF_Machines_0)
redeclare record Machines = Example2.PFData.Data.MachineData.PF_Machines_1)
annotation (Placement(transformation(extent={{58,-40},{138,40}})));
Modelica.Blocks.Sources.Constant r(k=0) annotation (Placement(transformation(
extent={{-20,-20},{20,20}},
Expand Down
48 changes: 24 additions & 24 deletions Example2/PFData/Data/BusData/PF_Bus_1.mo
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
within Example2.PFData.Data.BusData;
record PF_Bus_1
extends PFData.Data.BusData.Bus_Template(
V1=1.03,
A1=Modelica.Units.Conversions.from_deg(0.35378975855),
V2=1.01,
A2=Modelica.Units.Conversions.from_deg(0.18336917813),
V3=1.03,
A3=Modelica.Units.Conversions.from_deg(-0.11868238913),
V4=1.01,
A4=Modelica.Units.Conversions.from_deg(-0.29656809182),
V5=1.0069,
A5=Modelica.Units.Conversions.from_deg(0.24064774259),
V6=0.97914,
A6=Modelica.Units.Conversions.from_deg(0.06483200039),
V7=0.9610106,
A7=Modelica.Units.Conversions.from_deg(-0.08179502992),
V8=0.94828,
A8=Modelica.Units.Conversions.from_deg(-0.32311454975),
V9=0.9713628,
A9=Modelica.Units.Conversions.from_deg(-0.56119369128),
V10=0.98486,
A10=Modelica.Units.Conversions.from_deg(-0.41387167085),
V11=1.0088,
A11=Modelica.Units.Conversions.from_deg(-0.23424936555));
record PF_Bus_1 "Solution generated through PSAT and exported"
extends PFData.Data.BusData.Bus_Template(
V1 = 1.030000000000000026645353,
A1 = 0.353381617759011334989339,
V2 = 1.010000000000000008881784,
A2 = 0.183079867930758671823455,
V3 = 1.030000000000000026645353,
A3 = -0.118682399999999993456257,
V4 = 1.010000000000000008881784,
A4 = -0.296314118513723079306743,
V5 = 1.006868743567559176810278,
A5 = 0.240647076811152743625044,
V6 = 0.979142058690767758122320,
A6 = 0.064832288389243569737275,
V7 = 0.962831011348559862028651,
A7 = -0.081590947228161264659363,
V8 = 0.948276887978486193730987,
A8 = -0.323114536393189877294674,
V9 = 0.973864710338688710500321,
A9 = -0.560256955944522627710569,
V10 = 0.984857572147705417897612,
A10 = -0.413872272884731773334721,
V11 = 1.008829440787384346123190,
A11 = -0.234249217664486170109583);
end PF_Bus_1;
8 changes: 8 additions & 0 deletions Example2/PFData/Data/LoadData/PF_Loads_1.mo
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
within Example2.PFData.Data.LoadData;
record PF_Loads_1 "Solution generated through PSAT and exported"
extends PFData.Data.LoadData.Loads_Template(
PL7_1 = 1e06*( 967.000000000000000000000000),
QL7_1 = 1e06*( -100.000000000000000000000000),
PL9_1 = 1e06*( 1767.000000000000227373675443),
QL9_1 = 1e06*( -250.000000000000000000000000));
end PF_Loads_1;
1 change: 1 addition & 0 deletions Example2/PFData/Data/LoadData/package.order
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
Loads_Template
PF_Loads_0
PF_Loads_1
12 changes: 12 additions & 0 deletions Example2/PFData/Data/MachineData/PF_Machines_1.mo
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
within Example2.PFData.Data.MachineData;
record PF_Machines_1 "Solution generated through PSAT and exported"
extends PFData.Data.MachineData.Machines_Template(
P1_1 = 1e06*( 699.999999999999317878973670),
Q1_1 = 1e06*( 182.450226027067287759564351),
P2_1 = 1e06*( 700.000000000000113686837722),
Q2_1 = 1e06*( 228.434194888740705664531561),
P3_1 = 1e06*( 718.906215107728939983644523),
Q3_1 = 1e06*( 172.421333322956030542627559),
P4_1 = 1e06*( 700.000000000000000000000000),
Q4_1 = 1e06*( 193.556043309307227673343732));
end PF_Machines_1;
1 change: 1 addition & 0 deletions Example2/PFData/Data/MachineData/package.order
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
Machines_Template
PF_Machines_0
PF_Machines_1

0 comments on commit 315c337

Please sign in to comment.