Merge pull request #37 from LAMPSPUC/handle_shunt_control_in_bus_section

Add shunt info in bus section

Author: iagochavarry

docs/src/index.md

@@ -61,20 +61,6 @@ The package parses all available sections into a julia dictionary. Every key rep
 - DOPC
 - DCTE
 
-**Incoming Sections:**
-
-- DARE
-- DCAI
-- DCAR
-- DCSC
-- DGEI
-- DGLT
-- DINJ
-- DMFL
-- DMOT
-- DMTE
-- TITU
-
 ## PowerModels.jl converter
 
 The package also allow converting .pwf file directly into PowerModels.jl network data structure:

docs/src/quickguide.md

@@ -1,27 +1,15 @@
 # Quick Start Guide
 
-Parsing a .pwf file to Julia dictionary is as simple as:
+All functionalities of the PWF.jl package can be used by the following function
 
 ```julia
 using PWF
 
 file = "3bus.pwf"
-pwf_dict = parse_pwf(file)
+pwf_dict = parse_file(file; pm = true, add_control_data = false)
 ```
 
-Converting the .pwf file into PowerModels.jl network data dictionary:
-
-```julia
-network_data = parse_pwf_to_powermodels(file)
-```
-
-Then you are ready to use PowerModels!
-
-```julia
-using PowerModels, Ipopt
-
-run_ac_pf(network_data, Ipopt.Optimizer)
-```
+The parameter `pm` indicates if the data should be converted to the PowerModels.jl format. `add_control_data` is used to inform if additional information regarding control actions should be included in the PowerModels.jl data. For more information about Control Actions visit the ControlPowerFlow.jl [documentation](https://github.com/LAMPSPUC/ControlPowerFlow.jl)
 
 For more information about PowerModels.jl visit the PowerModels [documentation](https://lanl-ansi.github.io/PowerModels.jl/stable/)
 

src/pwf2pm/bus.jl

@@ -100,7 +100,9 @@ function _pwf2pm_bus!(pm_data::Dict, pwf_data::Dict, bus::Dict, dict_dgbt, dict_
         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
+        sub_data["control_data"]["tap_constraint_type"] = nothing
+        sub_data["control_data"]["shunt_control"] = nothing
+        sub_data["control_data"]["shunt_section"] = nothing
     end
 
     idx = string(sub_data["index"])

src/pwf2pm/shunt.jl

@@ -62,6 +62,17 @@ function _pwf2pm_DBSH_shunt!(pm_data::Dict, pwf_data::Dict, shunt::Dict; add_con
         sub_data["control_data"]["bsmax"] = bs_bounds[2]
         @assert sub_data["control_data"]["bsmin"] <= sub_data["control_data"]["bsmax"]
         sub_data["control_data"]["inclination"] = nothing
+
+        controlled_bus = sub_data["control_data"]["controlled_bus"]
+        if sub_data["control_data"]["shunt_control_type"] in [2,3]
+            pm_data["bus"]["$controlled_bus"]["control_data"]["shunt_control"] = true
+            shunt_section = pm_data["bus"]["$controlled_bus"]["control_data"]["shunt_section"] 
+            if isnothing(shunt_section)
+                pm_data["bus"]["$controlled_bus"]["control_data"]["shunt_section"] = "DBSH"
+            else
+                # don't overwrite
+            end
+        end
     end
 
     sub_data["source_id"] = ["switched shunt", sub_data["shunt_bus"], "0$(n+1)"]
@@ -115,6 +126,17 @@ function _pwf2pm_DCER_shunt!(pm_data::Dict, pwf_data::Dict, shunt::Dict; add_con
         sub_data["control_data"]["vmmax"] = ctrl_bus["vm"]
         sub_data["control_data"]["controlled_bus"] = shunt["CONTROLLED BUS"]
         sub_data["control_data"]["inclination"] = shunt["INCLINATION"]
+
+        controlled_bus = sub_data["control_data"]["controlled_bus"]
+        if sub_data["control_data"]["shunt_control_type"] in [2,3]
+            pm_data["bus"]["$controlled_bus"]["control_data"]["shunt_control"] = true
+            shunt_section = pm_data["bus"]["$controlled_bus"]["control_data"]["shunt_section"] 
+            if isnothing(shunt_section)
+                pm_data["bus"]["$controlled_bus"]["control_data"]["shunt_section"] = "DCER"
+            else
+                pm_data["bus"]["$controlled_bus"]["control_data"]["shunt_section"] = "DCER" # DCER always overwrites
+            end
+        end
     end
 
     sub_data["source_id"] = ["switched shunt", sub_data["shunt_bus"], "0$(n+1)"]

src/pwf2pm/transformer.jl

@@ -110,17 +110,18 @@ function _pwf2pm_transformer!(pm_data::Dict, pwf_data::Dict, branch::Dict; add_c
                 sub_data["control_data"]["valsp"] = branch_dctr[circuit]["SPECIFIED VALUE"]
                 sub_data["control_data"]["controlled_bus"] = branch_dctr[circuit]["MEASUREMENT EXTREMITY"]
 
+                # Add tap control information in controlled bus
                 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"
+                if isnothing(pm_data["bus"]["$(sub_data["control_data"]["controlled_bus"])"]["control_data"]["tap_constraint_type"]) # setpoint is more restrict than bounds
+                    pm_data["bus"]["$(sub_data["control_data"]["controlled_bus"])"]["control_data"]["tap_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"
+                pm_data["bus"]["$(sub_data["control_data"]["controlled_bus"])"]["control_data"]["tap_constraint_type"] = "setpoint"
             end
 
         elseif constraint_type == "PHASE CONTROL" # phase control