Skip to content

Commit cea8081

Browse files
authored
Add initial voltage and power generation (#10)
1 parent 39006c8 commit cea8081

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

src/parser.jl

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ function parse_ac_power_data(filename)
88
if isfile(joinpath(TMPDIR, name) * ".jld2")
99
@info "Loading cached JLD2 file"
1010
loaded = JLD2.load(joinpath(TMPDIR, name) * ".jld2")
11-
return loaded["data"], loaded["dicts"]
11+
return loaded["data"], loaded["dicts"]
1212
else
1313
ff = if isfile(filename)
1414
filename
@@ -107,7 +107,7 @@ function process_ac_power_data(filename)
107107
],
108108
storage = isempty(ref[:storage]) ? empty_data = Vector{NamedTuple{(:i,), Tuple{Int64}}}() : [
109109
begin
110-
(c = i,
110+
(c = i,
111111
Einit = stor["energy"],
112112
etac = stor["charge_efficiency"],
113113
etad = stor["discharge_efficiency"],
@@ -129,6 +129,10 @@ function process_ac_power_data(filename)
129129
rate_a = [ref[:branch][l]["rate_a"] for (k, (l, i, j)) in enumerate(ref[:arcs])],
130130
angmax = [b["angmax"] for (i, b) in ref[:branch]],
131131
angmin = [b["angmin"] for (i, b) in ref[:branch]],
132+
vm0 = [v["vm"] for (k, v) in ref[:bus]],
133+
va0 = [v["va"] for (k, v) in ref[:bus]],
134+
pg0 = [v["pg"] for (k, v) in ref[:gen]],
135+
qg0 = [v["qg"] for (k, v) in ref[:gen]],
132136
pdmax = isempty(ref[:storage]) ? Vector{NamedTuple{(:i,), Tuple{Int64}}}() : [s["charge_rating"] for (i, s) in ref[:storage]],
133137
pcmax = isempty(ref[:storage]) ? Vector{NamedTuple{(:i,), Tuple{Int64}}}() : [s["discharge_rating"] for (i, s) in ref[:storage]],
134138
srating = isempty(ref[:storage]) ? Vector{NamedTuple{(:i,), Tuple{Int64}}}() : [s["thermal_rating"] for (i, s) in ref[:storage]],
@@ -139,7 +143,7 @@ function process_ac_power_data(filename)
139143
d, f = splitdir(filename)
140144
name,ext = splitext(f)
141145
JLD2.save(joinpath(TMPDIR, name * ".jld2"), "data", data, "dicts", dicts)
142-
146+
143147
return data, dicts
144148
end
145149

0 commit comments

Comments
 (0)