Jd/hvdc model

Project.toml

@@ -1,7 +1,7 @@
 name = "PowerSimulations"
 uuid = "e690365d-45e2-57bb-ac84-44ba829e73c4"
 authors = ["Jose Daniel Lara", "Clayton Barrows", "Daniel Thom", "Dheepak Krishnamurthy", "Sourabh Dalvi"]
-version = "0.22.0"
+version = "0.23.0"
 
 [deps]
 CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
@@ -42,8 +42,8 @@ JSON3 = "1"
 JuMP = "1"
 MathOptInterface = "1"
 PowerModels = "~0.19"
-PowerNetworkMatrices = "^0.8"
-PowerSystems = "^2.6"
+PowerNetworkMatrices = "^0.9"
+PowerSystems = "^3"
 PrettyTables = "^1.3, 2"
 ProgressMeter = "^1.5"
 TimeSeries = "~0.23"

docs/src/formulation_library/Branch.md

@@ -44,24 +44,24 @@ StaticBranchUnbounded
 
 ---
 
-## `HVDCP2PLossless`
+## `HVDCTwoTerminalLossless`
 
 ```@docs
-HVDCP2PLossless
+HVDCTwoTerminalLossless
 ```
 
 ---
 
-## `HVDCP2PDispatch`
+## `HVDCTwoTerminalDispatch`
 
 ```@docs
-HVDCP2PDispatch
+HVDCTwoTerminalDispatch
 ```
 
 ---
 
-## `HVDCP2PUnbounded`
+## `HVDCTwoTerminalUnbounded`
 
 ```@docs
-HVDCP2PUnbounded
+HVDCTwoTerminalUnbounded
 ```

src/PowerSimulations.jl

@@ -41,11 +41,15 @@ export ConstantMaxInterfaceFlow
 export StaticBranch
 export StaticBranchBounds
 export StaticBranchUnbounded
-export HVDCP2PLossless
-export HVDCP2PDispatch
-export HVDCP2PUnbounded
+export HVDCTwoTerminalLossless
+export HVDCTwoTerminalDispatch
+export HVDCTwoTerminalUnbounded
 export PhaseAngleControl
 # export VoltageSourceDC
+
+######## HVDC models ########
+export LossLessConverter
+export LossLessLine
 ######## Load Models ########
 export StaticPowerLoad
 export PowerLoadInterruption
@@ -511,7 +515,8 @@ include("devices_models/devices/renewable_generation.jl")
 include("devices_models/devices/thermal_generation.jl")
 include("devices_models/devices/electric_loads.jl")
 include("devices_models/devices/AC_branches.jl")
-include("devices_models/devices/DC_branches.jl")
+include("devices_models/devices/TwoTerminalDC_branches.jl")
+include("devices_models/devices/HVDCsystems.jl")
 include("devices_models/devices/regulation_device.jl")
 
 # Services Models
@@ -528,12 +533,14 @@ include("network_models/powermodels_interface.jl")
 include("network_models/pm_translator.jl")
 include("network_models/network_slack_variables.jl")
 include("network_models/area_balance_model.jl")
+include("network_models/hvdc_networks.jl")
 
 include("initial_conditions/initialization.jl")
 
 # Device constructors
 include("devices_models/device_constructors/constructor_validations.jl")
 include("devices_models/device_constructors/thermalgeneration_constructor.jl")
+include("devices_models/device_constructors/hvdcsystems_constructor.jl")
 include("devices_models/device_constructors/branch_constructor.jl")
 include("devices_models/device_constructors/renewablegeneration_constructor.jl")
 include("devices_models/device_constructors/load_constructor.jl")

src/core/definitions.jl

@@ -27,6 +27,7 @@ const JuMPVariableMatrix = DenseAxisArray{
 const JuMPFloatArray = DenseAxisArray{Float64}
 const JuMPVariableArray = DenseAxisArray{JuMP.VariableRef}
 
+const TwoTerminalHVDCTypes = Union{PSY.TwoTerminalHVDCLine, PSY.TwoTerminalVSCDCLine}
 # Settings constants
 const UNSET_HORIZON = 0
 const UNSET_INI_TIME = Dates.DateTime(0)

src/core/formulations.jl

@@ -102,7 +102,7 @@ struct MyCustomBranchFormulation <: PSI.AbstractDeviceFormulation
 # Generic Branch Models
 abstract type AbstractBranchFormulation <: AbstractDeviceFormulation end
 
-############################### AC Branch Formulations #####################################
+############################### AC/DC Branch Formulations #####################################
 """
 Branch type to add unbounded flow variables and use flow constraints
 """
@@ -121,21 +121,32 @@ Branch formulation for PhaseShiftingTransformer flow control
 struct PhaseAngleControl <: AbstractBranchFormulation end
 
 ############################### DC Branch Formulations #####################################
-abstract type AbstractDCLineFormulation <: AbstractBranchFormulation end
+abstract type AbstractTwoTerminalDCLineFormulation <: AbstractBranchFormulation end
 """
 Branch type to avoid flow constraints
 """
-struct HVDCP2PUnbounded <: AbstractDCLineFormulation end
+struct HVDCTwoTerminalUnbounded <: AbstractTwoTerminalDCLineFormulation end
 """
 Branch type to represent lossless power flow on DC lines
 """
-struct HVDCP2PLossless <: AbstractDCLineFormulation end
+struct HVDCTwoTerminalLossless <: AbstractTwoTerminalDCLineFormulation end
 """
 Branch type to represent lossy power flow on DC lines
 """
-struct HVDCP2PDispatch <: AbstractDCLineFormulation end
+struct HVDCTwoTerminalDispatch <: AbstractTwoTerminalDCLineFormulation end
 # Not Implemented
-# struct VoltageSourceDC <: AbstractDCLineFormulation end
+# struct VoltageSourceDC <: AbstractTwoTerminalDCLineFormulation end
+
+############################### AC/DC Converter Formulations #####################################
+abstract type AbstractConverterFormulation <: AbstractDeviceFormulation end
+
+"""
+LossLess InterconnectingConverter Model
+"""
+struct LossLessConverter <: AbstractConverterFormulation end
+
+# TODO: Think if this an ok abstraction for future use cases
+struct LossLessLine <: AbstractBranchFormulation end
 
 ############################## Network Model Formulations ##################################
 # These formulations are taken directly from PowerModels

src/core/network_model.jl

@@ -30,7 +30,7 @@ mutable struct NetworkModel{T <: PM.AbstractPowerModel}
     use_slacks::Bool
     PTDF_matrix::Union{Nothing, PNM.PowerNetworkMatrix}
     subnetworks::Dict{Int, Set{Int}}
-    bus_area_map::Dict{PSY.Bus, Int}
+    bus_area_map::Dict{PSY.ACBus, Int}
     duals::Vector{DataType}
 
     function NetworkModel(
@@ -41,7 +41,7 @@ mutable struct NetworkModel{T <: PM.AbstractPowerModel}
         duals = Vector{DataType}(),
     ) where {T <: PM.AbstractPowerModel}
         _check_pm_formulation(T)
-        new{T}(use_slacks, PTDF_matrix, subnetworks, Dict{PSY.Bus, Int}(), duals)
+        new{T}(use_slacks, PTDF_matrix, subnetworks, Dict{PSY.ACBus, Int}(), duals)
     end
 end
 
@@ -107,7 +107,7 @@ function _assign_subnetworks_to_buses(
 ) where {T <: Union{CopperPlatePowerModel, StandardPTDFModel}}
     subnetworks = model.subnetworks
     temp_bus_map = Dict{Int, Int}()
-    for bus in get_available_components(PSY.Bus, sys)
+    for bus in get_available_components(PSY.ACBus, sys)
         bus_no = PSY.get_number(bus)
         if haskey(temp_bus_map, bus_no)
             model.bus_area_map[bus] = temp_bus_map[bus_no]
@@ -131,7 +131,7 @@ _assign_subnetworks_to_buses(
 
 function get_reference_bus(
     model::NetworkModel{T},
-    b::PSY.Bus,
+    b::PSY.ACBus,
 )::Int where {T <: PM.AbstractPowerModel}
     if isempty(model.bus_area_map)
         return first(keys(model.subnetworks))

src/core/optimization_container.jl

@@ -267,7 +267,7 @@ end
 function is_milp(container::OptimizationContainer)::Bool
     !supports_milp(container) && return false
     if !isempty(
-        JuMP.all_constraints(container.JuMPmodel, JuMP.VariableRef, JuMP.MOI.ZeroOne),
+        JuMP.all_constraints(PSI.get_jump_model(container), JuMP.VariableRef, JuMP.MOI.ZeroOne),
     )
         return true
     end
@@ -307,10 +307,10 @@ function _finalize_jump_model!(container::OptimizationContainer, settings::Setti
         @debug "The optimization model has no optimizer attached" _group =
             LOG_GROUP_OPTIMIZATION_CONTAINER
     else
-        JuMP.set_optimizer(container.JuMPmodel, get_optimizer(settings))
+        JuMP.set_optimizer(PSI.get_jump_model(container), get_optimizer(settings))
     end
 
-    JuMPmodel = container.JuMPmodel
+    JuMPmodel = PSI.get_jump_model(container)
     warm_start_enabled = get_warm_start(settings)
     solver_supports_warm_start = _validate_warm_start_support(JuMPmodel, warm_start_enabled)
     set_warm_start!(settings, solver_supports_warm_start)
@@ -386,7 +386,7 @@ function reset_optimization_model!(container::OptimizationContainer)
     container.initial_conditions_data = InitialConditionsData()
     container.objective_function = ObjectiveFunction()
     container.primal_values_cache = PrimalValuesCache()
-    JuMP.empty!(container.JuMPmodel)
+    JuMP.empty!(PSI.get_jump_model(container))
     return
 end
 
@@ -425,36 +425,43 @@ end
 function _make_system_expressions!(
     container::OptimizationContainer,
     subnetworks::Dict{Int, Set{Int}},
+    dc_bus_numbers::Vector{Int},
     ::Type{<:PM.AbstractPowerModel},
 )
     time_steps = get_time_steps(container)
-    bus_numbers = collect(Iterators.flatten(values(subnetworks)))
+    ac_bus_numbers = collect(Iterators.flatten(values(subnetworks)))
     container.expressions = Dict(
-        ExpressionKey(ActivePowerBalance, PSY.Bus) =>
-            _make_container_array(bus_numbers, time_steps),
-        ExpressionKey(ReactivePowerBalance, PSY.Bus) =>
-            _make_container_array(bus_numbers, time_steps),
+        ExpressionKey(ActivePowerBalance, PSY.ACBus) =>
+            _make_container_array(ac_bus_numbers, time_steps),
+        ExpressionKey(ActivePowerBalance, PSY.DCBus) =>
+            _make_container_array(dc_bus_numbers, time_steps),
+        ExpressionKey(ReactivePowerBalance, PSY.ACBus) =>
+            _make_container_array(ac_bus_numbers, time_steps),
     )
     return
 end
 
 function _make_system_expressions!(
     container::OptimizationContainer,
     subnetworks::Dict{Int, Set{Int}},
+    dc_bus_numbers::Vector{Int},
     ::Type{<:PM.AbstractActivePowerModel},
 )
     time_steps = get_time_steps(container)
-    bus_numbers = collect(Iterators.flatten(values(subnetworks)))
+    ac_bus_numbers = collect(Iterators.flatten(values(subnetworks)))
     container.expressions = Dict(
-        ExpressionKey(ActivePowerBalance, PSY.Bus) =>
-            _make_container_array(bus_numbers, time_steps),
+        ExpressionKey(ActivePowerBalance, PSY.ACBus) =>
+            _make_container_array(ac_bus_numbers, time_steps),
+        ExpressionKey(ActivePowerBalance, PSY.DCBus) =>
+            _make_container_array(dc_bus_numbers, time_steps),
     )
     return
 end
 
 function _make_system_expressions!(
     container::OptimizationContainer,
     subnetworks::Dict{Int, Set{Int}},
+    ::Vector{Int},
     ::Type{CopperPlatePowerModel},
 )
     time_steps = get_time_steps(container)
@@ -469,16 +476,19 @@ end
 function _make_system_expressions!(
     container::OptimizationContainer,
     subnetworks::Dict{Int, Set{Int}},
+    dc_bus_numbers::Vector{Int},
     ::Type{T},
 ) where {T <: Union{PTDFPowerModel, StandardPTDFModel}}
     time_steps = get_time_steps(container)
-    bus_numbers = sort!(collect(Iterators.flatten(values(subnetworks))))
+    ac_bus_numbers = sort!(collect(Iterators.flatten(values(subnetworks))))
     subnetworks = collect(keys(subnetworks))
     container.expressions = Dict(
         ExpressionKey(ActivePowerBalance, PSY.System) =>
             _make_container_array(subnetworks, time_steps),
-        ExpressionKey(ActivePowerBalance, PSY.Bus) =>
-            _make_container_array(bus_numbers, time_steps),
+        ExpressionKey(ActivePowerBalance, PSY.DCBus) =>
+            _make_container_array(dc_bus_numbers, time_steps),
+        ExpressionKey(ActivePowerBalance, PSY.ACBus) =>
+            _make_container_array(ac_bus_numbers, time_steps),
     )
     return
 end
@@ -487,8 +497,10 @@ function initialize_system_expressions!(
     container::OptimizationContainer,
     ::Type{T},
     subnetworks::Dict{Int, Set{Int}},
+    system::PSY.System,
 ) where {T <: PM.AbstractPowerModel}
-    _make_system_expressions!(container, subnetworks, T)
+    dc_bus_numbers = [PSY.get_number(b) for b in PSY.get_components(PSY.DCBus, system)]
+    _make_system_expressions!(container, subnetworks, dc_bus_numbers, T)
     return
 end
 
@@ -499,7 +511,12 @@ function build_impl!(
 )
     transmission = get_network_formulation(template)
     transmission_model = get_network_model(template)
-    initialize_system_expressions!(container, transmission, transmission_model.subnetworks)
+    initialize_system_expressions!(
+        container,
+        transmission,
+        transmission_model.subnetworks,
+        sys,
+    )
 
     # Order is required
     for device_model in values(template.devices)
@@ -607,7 +624,7 @@ function build_impl!(
         @debug "Building Objective" _group = LOG_GROUP_OPTIMIZATION_CONTAINER
         update_objective_function!(container)
     end
-    @debug "Total operation count $(container.JuMPmodel.operator_counter)" _group =
+    @debug "Total operation count $(PSI.get_jump_model(container).operator_counter)" _group =
         LOG_GROUP_OPTIMIZATION_CONTAINER
 
     check_optimization_container(container)
@@ -1325,7 +1342,7 @@ function get_expression(
     ::Type{U},
     meta = CONTAINER_KEY_EMPTY_META,
 ) where {T <: SystemBalanceExpressions, U <: PM.AbstractPowerModel}
-    return get_expression(container, ExpressionKey(T, PSY.Bus, meta))
+    return get_expression(container, ExpressionKey(T, PSY.ACBus, meta))
 end
 
 function get_expression(

src/core/variables.jl

@@ -172,7 +172,7 @@ struct FlowReactivePowerToFromVariable <: VariableType end
 
 struct PhaseShifterAngle <: VariableType end
 
-# Necessary as a work around for HVDCP2P models with losses
+# Necessary as a work around for HVDCTwoTerminal models with losses
 struct HVDCLosses <: VariableType end
 struct HVDCFlowDirectionVariable <: VariableType end