Add parsing of multi-terminal DC lines (#43)

* Add example test data for multi-terminal DC lines * Add parsing of multi-terminal DC lines * Add test for `show` on mutli-terminal DC lines * Document fields of DC buses * Add parsing of multi-terminal DC links * Fix MultiTerminalDCLines constructor * Make an attempt at better names * fixup! Make an attempt at better names
nickrobinson251 · Oct 26, 2021 · 329bf40 · 329bf40
1 parent f234d9c
commit 329bf40
Show file tree

Hide file tree

Showing 7 changed files with 471 additions and 15 deletions.
diff --git a/docs/src/api.md b/docs/src/api.md
@@ -64,6 +64,16 @@ SwitchedShunts
 ImpedanceCorrections
 ```
 
+## Multi-Terminal DC Lines
+```@docs
+MultiTerminalDCLines
+MultiTerminalDCLine
+DCLineID
+ACConverters
+DCBuses
+DCLinks
+```
+
 ## Multi-Section Line Groups
 ```@docs
 MultiSectionLineGroups

diff --git a/src/PowerFlowData.jl b/src/PowerFlowData.jl
@@ -11,6 +11,7 @@ export parse_network
 export Network
 export CaseID, Buses, Loads, Generators, Branches, Transformers, AreaInterchanges
 export TwoTerminalDCLines, VSCDCLines, SwitchedShunts, ImpedanceCorrections
+export MultiTerminalDCLines, MultiTerminalDCLine, DCLineID, ACConverters, DCBuses, DCLinks
 export MultiSectionLineGroups, Zones, InterAreaTransfers, Owners, FACTSDevices
 
 include("debug.jl")

diff --git a/src/parsing.jl b/src/parsing.jl
@@ -63,8 +63,8 @@ function parse_network(source)
     impedance_corrections, pos = parse_records!(ImpedanceCorrections(), bytes, pos, len, OPTIONS)
     @debug 1 "Parsed ImpedanceCorrections: nrows = $(length(impedance_corrections)), pos = $pos"
 
-    # Skip these for now...
     multi_terminal_dc, pos = parse_records!(MultiTerminalDCLines(), bytes, pos, len, OPTIONS)
+    @debug 1 "Parsed MultiTerminalDCLines: nrows = $(length(multi_terminal_dc)), pos = $pos"
 
     multi_section_lines, pos = parse_records!(MultiSectionLineGroups(), bytes, pos, len, OPTIONS)
     @debug 1 "Parsed MultiSectionLineGroups: nrows = $(length(multi_section_lines)), pos = $pos"
@@ -93,6 +93,7 @@ function parse_network(source)
         vsc_dc,
         switched_shunts,
         impedance_corrections,
+        multi_terminal_dc,
         multi_section_lines,
         zones,
         area_transfers,
@@ -303,3 +304,48 @@ end
     # @show block
     return block
 end
+
+###
+### MultiTerminalDCLines
+###
+
+function parse_row!(rec::R, bytes, pos, len, options) where {R <: MultiTerminalDCLines}
+    line_id, pos = parse_dclineid(bytes, pos, len, options)
+
+    nconv = line_id.nconv
+    converters = ACConverters(nconv)
+    for _ in 1:nconv
+        converters, pos = parse_row!(converters, bytes, pos, len, options)
+    end
+
+    ndcbs = line_id.ndcbs
+    dc_buses = DCBuses(ndcbs)
+    for _ in 1:ndcbs
+        dc_buses, pos = parse_row!(dc_buses, bytes, pos, len, options)
+    end
+
+    ndcln = line_id.ndcln
+    dc_links = DCLinks(ndcln)
+    for _ in 1:ndcln
+        dc_links, pos = parse_row!(dc_links, bytes, pos, len, options)
+    end
+    line = MultiTerminalDCLine(line_id, converters, dc_buses, dc_links)
+    push!(rec.lines, line)
+    return rec, pos
+end
+
+@generated function parse_dclineid(bytes, pos, len, options)
+    block = Expr(:block)
+    nfields = fieldcount(DCLineID)
+    for i in 1:fieldcount(DCLineID)
+        T = fieldtype(DCLineID, i)
+        val_i = Symbol(:val, i)
+        push!(block.args, :(($val_i, pos, code) = parse_value($T, bytes, pos, len, options)))
+    end
+    push!(block.args, quote
+        args = Tuple{$(fieldtypes(DCLineID)...)}([$((Symbol(:val, i) for i in 1:nfields)...)])
+        return DCLineID(args...), pos
+    end)
+    # @show block
+    return block
+end