Merge pull request #36 from LAMPSPUC/fix-elements

Adjust tap control and shunts

Author: iagochavarry

.github/workflows/ci.yml

@@ -15,9 +15,6 @@ jobs:
           - version: "1"
             os: ubuntu-latest
             arch: x64
-          - version: "1.0"
-            os: ubuntu-latest
-            arch: x64
     steps:
       - uses: actions/checkout@v2
       - uses: julia-actions/setup-julia@v1

src/pwf2pm/bus.jl

@@ -99,6 +99,8 @@ function _pwf2pm_bus!(pm_data::Dict, pwf_data::Dict, bus::Dict, dict_dgbt, dict_
         sub_data["control_data"]["voltage_controlled_bus"] = bus["CONTROLLED BUS"]
         sub_data["control_data"]["vmmin"] = sub_data["vmin"]
         sub_data["control_data"]["vmmax"] = sub_data["vmax"]
+        sub_data["control_data"]["tap_control"] = nothing
+        sub_data["control_data"]["constraint_type"] = nothing
     end
 
     idx = string(sub_data["index"])

src/pwf2pm/shunt.jl

@@ -1,12 +1,3 @@
-function _create_new_shunt(sub_data::Dict, pm_data::Dict)
-    for (idx, value) in pm_data["shunt"]
-        if value["shunt_bus"] == sub_data["shunt_bus"] && value["source_id"][1] == sub_data["source_id"][1]
-            return false, idx
-        end
-    end
-    return true    
-end
-
 function _handle_bs_bounds(shunt::Dict{String, Any})
     bsmin, bsmax = 0.0, 0.0
     for (i,el) in shunt["REACTANCE GROUPS"]
@@ -76,18 +67,8 @@ function _pwf2pm_DBSH_shunt!(pm_data::Dict, pwf_data::Dict, shunt::Dict; add_con
     sub_data["source_id"] = ["switched shunt", sub_data["shunt_bus"], "0$(n+1)"]
     sub_data["index"] = length(pm_data["shunt"]) + 1
 
-    if _create_new_shunt(sub_data, pm_data)[1]
-        idx = string(sub_data["index"])
-        pm_data["shunt"][idx] = sub_data
-    else
-        idx = _create_new_shunt(sub_data, pm_data)[2]
-        pm_data["shunt"][idx]["gs"] += sub_data["gs"]
-        pm_data["shunt"][idx]["bs"] += sub_data["bs"]
-        if add_control_data
-            pm_data["shunt"][idx]["control_data"]["bsmin"] += sub_data["control_data"]["bsmin"]
-            pm_data["shunt"][idx]["control_data"]["bsmax"] += sub_data["control_data"]["bsmax"]
-        end
-    end
+    idx = string(sub_data["index"])
+    pm_data["shunt"][idx] = sub_data
 end
 
 function _pwf2pm_DBSH_shunt!(pm_data::Dict, pwf_data::Dict; add_control_data::Bool=false)
@@ -139,18 +120,8 @@ function _pwf2pm_DCER_shunt!(pm_data::Dict, pwf_data::Dict, shunt::Dict; add_con
     sub_data["source_id"] = ["switched shunt", sub_data["shunt_bus"], "0$(n+1)"]
     sub_data["index"]     = length(pm_data["shunt"]) + 1
 
-    if _create_new_shunt(sub_data, pm_data)[1]
-        idx = string(sub_data["index"])
-        pm_data["shunt"][idx] = sub_data
-    else
-        idx = _create_new_shunt(sub_data, pm_data)[2]
-        pm_data["shunt"][idx]["gs"] += sub_data["gs"]
-        pm_data["shunt"][idx]["bs"] += sub_data["bs"]
-        if add_control_data
-            pm_data["shunt"][idx]["control_data"]["bsmin"] += sub_data["control_data"]["bsmin"]
-            pm_data["shunt"][idx]["control_data"]["bsmax"] += sub_data["control_data"]["bsmax"]
-        end
-    end
+    idx = string(sub_data["index"])
+    pm_data["shunt"][idx] = sub_data
 end
 
 function _pwf2pm_DCER_shunt!(pm_data::Dict, pwf_data::Dict; add_control_data::Bool=false)
@@ -212,8 +183,6 @@ function _pwf2pm_DBAR_shunt!(pm_data::Dict, pwf_data::Dict; add_control_data::Bo
      end 
 end
 
-# Assumption - if there are more than one shunt for the same bus we sum their values into one shunt (source: Organon)
-# CAUTION: this might be an Organon error
 function _pwf2pm_shunt!(pm_data::Dict, pwf_data::Dict; add_control_data::Bool=false)
     pm_data["shunt"] = Dict{String, Any}()
 

src/pwf2pm/transformer.jl

@@ -103,14 +103,24 @@ function _pwf2pm_transformer!(pm_data::Dict, pwf_data::Dict, branch::Dict; add_c
             sub_data["control_data"]["shift_control_variable"] = nothing
             sub_data["control_data"]["shiftmin"] = nothing
             sub_data["control_data"]["shiftmax"] = nothing
+
             if constraint_type == "VOLTAGE CONTROL"
+
                 sub_data["control_data"]["constraint_type"] = "bounds"
                 sub_data["control_data"]["valsp"] = branch_dctr[circuit]["SPECIFIED VALUE"]
                 sub_data["control_data"]["controlled_bus"] = branch_dctr[circuit]["MEASUREMENT EXTREMITY"]
+
+                pm_data["bus"]["$(sub_data["control_data"]["controlled_bus"])"]["control_data"]["control_type"] = "tap_control"
+                if isnothing(pm_data["bus"]["$(sub_data["control_data"]["controlled_bus"])"]["control_data"]["constraint_type"]) # setpoint is more restrict than bounds
+                    pm_data["bus"]["$(sub_data["control_data"]["controlled_bus"])"]["control_data"]["constraint_type"] = "bounds"
+                end
 
             else
+                pm_data["bus"]["$(sub_data["control_data"]["controlled_bus"])"]["control_data"]["control_type"] = "tap_control"
+
                 sub_data["control_data"]["constraint_type"] = "setpoint"
                 sub_data["control_data"]["valsp"] = nothing
+                pm_data["bus"]["$(sub_data["control_data"]["controlled_bus"])"]["control_data"]["constraint_type"] = "setpoint"
             end
 
         elseif constraint_type == "PHASE CONTROL" # phase control

test/test_pwf_to_powermodels.jl

@@ -246,8 +246,9 @@
             @test pm_data["branch"]["2"]["b_to"] == -0.07
             @test pm_data["branch"]["3"]["b_fr"] == 0.0
             @test pm_data["branch"]["3"]["b_to"] == 0.0
-            @test length(pm_data["shunt"]) == 1
-            @test pm_data["shunt"]["1"]["bs"] == -1.755
+            @test length(pm_data["shunt"]) == 2
+            @test pm_data["shunt"]["1"]["bs"] == -1.5
+            @test pm_data["shunt"]["2"]["bs"] == -0.255
         end
 
         @testset "Transformer control fields" begin