Skip to content

transformer refactor changes #121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
m-bossart wants to merge 3 commits into
base: psy6
Choose a base branch
from
Open

transformer refactor changes #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
35fc188
transformer refactor changes
m-bossart Jul 8, 2026
6d95778
remove base power from top level transformer
m-bossart Jul 10, 2026
f65387c
name updates
m-bossart Jul 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions 118-Bus/data_118bus.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,16 +77,17 @@ for row in eachrow(line_params)
);
push!(lines, line)
else
local tline = Transformer2W(;
local tline = TwoWindingTransformer(;
name = "line$num",
available = true,
active_power_flow = 0.0,
reactive_power_flow = 0.0,
arc = Arc(; from = nodes[bus_from], to = nodes[bus_to]),
r = row["Resistance (p.u.)"],
x = row["Reactance (p.u.)"],
primary_shunt = 0.0,
rating = row["Max Flow (MW)"]/100,
circuit = TransformerCircuit(;
arc = Arc(; from = nodes[bus_from], to = nodes[bus_to]),
available = true,
active_power_flow = 0.0,
reactive_power_flow = 0.0,
r = row["Resistance (p.u.)"],
x = row["Reactance (p.u.)"],
rating = row["Max Flow (MW)"]/100,
),
);
push!(tlines, tline)
end
Expand Down
4,310 changes: 4,309 additions & 1 deletion psid_tests/data_tests/9BusSystem.json
View file
Open in desktop

Large diffs are not rendered by default.

89,145 changes: 89,144 additions & 1 deletion psid_tests/data_tests/WECC_240_dynamic.json
View file
Open in desktop

Large diffs are not rendered by default.

228 changes: 130 additions & 98 deletions psy_data/data_14bus_pu.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,44 +253,56 @@ branches14_dc(nodes14) = [
1.14, # 69kV limit
1.04,
),
TapTransformer(
"Trans3",
true,
0.0,
0.0,
Arc(from = nodes14[4], to = nodes14[7]),
0.0,
0.20912,
0.0,
0.978,
20.0,
100.0,
),
TapTransformer(
"Trans1",
true,
0.0,
0.0,
Arc(from = nodes14[4], to = nodes14[9]),
0.0,
0.55618,
0.0,
0.969,
20.0,
100.0,
),
TapTransformer(
"Trans2",
true,
0.0,
0.0,
Arc(from = nodes14[5], to = nodes14[6]),
0.0,
0.25202,
0.0,
0.932,
20.0,
100.0,
TwoWindingTransformer(;
name = "Trans3",
circuit = TransformerCircuit(;
arc = Arc(from = nodes14[4], to = nodes14[7]),
tap = 0.978,
winding_group_number = WindingGroupNumber.UNDEFINED,
available = true,
rating = 20.0,
active_power_flow = 0.0,
reactive_power_flow = 0.0,
base_power = 100.0,
base_voltage_primary = get_base_voltage(nodes14[4]),
base_voltage_secondary = get_base_voltage(nodes14[7]),
r = 0.0,
x = 0.20912,
),
),
TwoWindingTransformer(;
name = "Trans1",
circuit = TransformerCircuit(;
arc = Arc(from = nodes14[4], to = nodes14[9]),
tap = 0.969,
winding_group_number = WindingGroupNumber.UNDEFINED,
available = true,
rating = 20.0,
active_power_flow = 0.0,
reactive_power_flow = 0.0,
base_power = 100.0,
base_voltage_primary = get_base_voltage(nodes14[4]),
base_voltage_secondary = get_base_voltage(nodes14[9]),
r = 0.0,
x = 0.55618,
),
),
TwoWindingTransformer(;
name = "Trans2",
circuit = TransformerCircuit(;
arc = Arc(from = nodes14[5], to = nodes14[6]),
tap = 0.932,
winding_group_number = WindingGroupNumber.UNDEFINED,
available = true,
rating = 20.0,
active_power_flow = 0.0,
reactive_power_flow = 0.0,
base_power = 100.0,
base_voltage_primary = get_base_voltage(nodes14[5]),
base_voltage_secondary = get_base_voltage(nodes14[6]),
r = 0.0,
x = 0.25202,
),
),
Line(
"Line8",
Expand Down Expand Up @@ -328,17 +340,21 @@ branches14_dc(nodes14) = [
1.14, # 69kV limit
1.04,
),
Transformer2W(
"Trans4",
true,
0.0,
0.0,
Arc(from = nodes14[7], to = nodes14[8]),
0.0,
0.17615,
0.0,
20.0,
100.0,
TwoWindingTransformer(;
name = "Trans4",
circuit = TransformerCircuit(;
arc = Arc(from = nodes14[7], to = nodes14[8]),
winding_group_number = WindingGroupNumber.UNDEFINED,
available = true,
rating = 20.0,
active_power_flow = 0.0,
reactive_power_flow = 0.0,
base_power = 100.0,
base_voltage_primary = get_base_voltage(nodes14[7]),
base_voltage_secondary = get_base_voltage(nodes14[8]),
r = 0.0,
x = 0.17615,
),
),
Line(
"Line16",
Expand Down Expand Up @@ -499,44 +515,56 @@ branches14(nodes14) = [
1.14, # 69kV limit
1.04,
),
TapTransformer(
"Trans3", # name
true, # available
0.0, # active power flow
0.0, # reactive power flow
Arc(from = nodes14[4], to = nodes14[7]),
0.0, # r
0.20912, # x
0.0, # primary shunt
0.978, # tap
20.0, # rating
100.0, # base power
),
TapTransformer(
"Trans1",
true,
0.0,
0.0,
Arc(from = nodes14[4], to = nodes14[9]),
0.0,
0.55618,
0.0,
0.969,
20.0,
100.0,
),
TapTransformer(
"Trans2",
true,
0.0,
0.0,
Arc(from = nodes14[5], to = nodes14[6]),
0.0,
0.25202,
0.0,
0.932,
20.0,
100.0,
TwoWindingTransformer(;
name = "Trans3",
circuit = TransformerCircuit(;
arc = Arc(from = nodes14[4], to = nodes14[7]),
tap = 0.978,
winding_group_number = WindingGroupNumber.UNDEFINED,
available = true,
rating = 20.0,
active_power_flow = 0.0,
reactive_power_flow = 0.0,
base_power = 100.0,
base_voltage_primary = get_base_voltage(nodes14[4]),
base_voltage_secondary = get_base_voltage(nodes14[7]),
r = 0.0,
x = 0.20912,
),
),
TwoWindingTransformer(;
name = "Trans1",
circuit = TransformerCircuit(;
arc = Arc(from = nodes14[4], to = nodes14[9]),
tap = 0.969,
winding_group_number = WindingGroupNumber.UNDEFINED,
available = true,
rating = 20.0,
active_power_flow = 0.0,
reactive_power_flow = 0.0,
base_power = 100.0,
base_voltage_primary = get_base_voltage(nodes14[4]),
base_voltage_secondary = get_base_voltage(nodes14[9]),
r = 0.0,
x = 0.55618,
),
),
TwoWindingTransformer(;
name = "Trans2",
circuit = TransformerCircuit(;
arc = Arc(from = nodes14[5], to = nodes14[6]),
tap = 0.932,
winding_group_number = WindingGroupNumber.UNDEFINED,
available = true,
rating = 20.0,
active_power_flow = 0.0,
reactive_power_flow = 0.0,
base_power = 100.0,
base_voltage_primary = get_base_voltage(nodes14[5]),
base_voltage_secondary = get_base_voltage(nodes14[6]),
r = 0.0,
x = 0.25202,
),
),
Line(
"Line8",
Expand Down Expand Up @@ -574,17 +602,21 @@ branches14(nodes14) = [
1.14, # 69kV limit
1.04,
),
Transformer2W(
"Trans4",
true,
0.0,
0.0,
Arc(from = nodes14[7], to = nodes14[8]),
0.0,
0.17615,
0.0,
20.0,
100.0,
TwoWindingTransformer(;
name = "Trans4",
circuit = TransformerCircuit(;
arc = Arc(from = nodes14[7], to = nodes14[8]),
winding_group_number = WindingGroupNumber.UNDEFINED,
available = true,
rating = 20.0,
active_power_flow = 0.0,
reactive_power_flow = 0.0,
base_power = 100.0,
base_voltage_primary = get_base_voltage(nodes14[7]),
base_voltage_secondary = get_base_voltage(nodes14[8]),
r = 0.0,
x = 0.17615,
),
),
Line(
"Line16",
Expand Down