FIX: voltage source impedance for >3 wire networks

For indices >1:nphases, the impedance of voltage sources was being set to zero, which is the incorrect behavior.

Closes #376
Closes #422

Author: pseudocubic

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## staged
 
+- Fixed voltage_source impedance matrices, which were populating impedances outside of `1:nphases` with zeros instead of the defined mutual and self impedances [#422](https://github.com/lanl-ansi/PowerModelsDistribution.jl/pull/422) [#376](https://github.com/lanl-ansi/PowerModelsDistribution.jl/issues/376)
 - Added compat for SpecialFunctions
 - Added support for computing line constants from WireData, LineGeometry, LineSpacing, TSData and CNData
 - Added Julia library SpecialFunctions for `besselj0` implementation

src/io/dss/dss2eng.jl

@@ -383,11 +383,11 @@ function _dss2eng_vsource!(data_eng::Dict{String,<:Any}, data_dss::Dict{String,<
 
         # some values require addition of neutral by default
         n_conductors = length(eng_obj["connections"])
-        eng_obj["rs"] = zeros(n_conductors, n_conductors)
-        eng_obj["rs"][1:phases, 1:phases] = defaults["rmatrix"]
+        eng_obj["rs"] = fill(defaults["r_mutual"], n_conductors, n_conductors)
+        eng_obj["rs"][LinearAlgebra.diagind(eng_obj["rs"])] .= defaults["r_self"]
 
-        eng_obj["xs"] = zeros(n_conductors, n_conductors)
-        eng_obj["xs"][1:phases, 1:phases] = defaults["xmatrix"]
+        eng_obj["xs"] = fill(defaults["x_mutual"], n_conductors, n_conductors)
+        eng_obj["xs"][LinearAlgebra.diagind(eng_obj["xs"])] .= defaults["x_self"]
 
         eng_obj["vm"] = zeros(n_conductors)
         eng_obj["vm"][1:phases] = vm

src/io/dss/dss_edge_structs.jl

@@ -525,6 +525,10 @@ function _create_vsource(name::String=""; kwargs...)::Dict{String,Any}
         # Derived Properties
         "rmatrix" => real(Z),
         "xmatrix" => imag(Z),
+        "r_self" => rs,
+        "r_mutual" => rm,
+        "x_self" => xs,
+        "x_mutual" => xm,
         "vmag" => Vmag,
         "like" => get(kwargs, :like, "")
     )

test/data/en_validation_case_data/test_gen_3ph_wye.dss

@@ -2,7 +2,7 @@
 
 Clear
 
-New Circuit.Test phases=3 basekv=0.4 baseMVA=0.2 bus1=B1 MVASC1=1e8 MVASC3=1e8
+New Circuit.Test phases=3 basekv=0.4 baseMVA=0.2 bus1=B1 MVASC1=1e4 MVASC3=1e4
 
 New Linecode.Zabcn units=km nphases=4
 ~ rmatrix=(0.227217624 0.059217624 0.059217624 0.059217624 |0.059217624 0.227217624 0.059217624 0.059217624 |0.059217624 0.059217624 0.227217624 0.059217624 |0.059217624 0.059217624 0.059217624 0.227217624)