Add pwl TwoTerminalHVDC loss model

Project.toml

@@ -45,8 +45,8 @@ LinearAlgebra = "1"
 Logging = "1"
 MathOptInterface = "1"
 PowerModels = "^0.21"
-PowerNetworkMatrices = "^0.11.1"
-PowerSystems = "4"
+PowerNetworkMatrices = "^0.11"
+PowerSystems = "^4.4"
 PrettyTables = "2"
 ProgressMeter = "^1.5"
 Serialization = "1"

src/core/constraints.jl

@@ -332,23 +332,8 @@ The specified constraint is formulated as:
 ```
 """
 struct PhaseAngleControlLimit <: ConstraintType end
-"""
-Struct to create the constraints that set the losses through a lossy HVDC two-terminal line.
-
-For more information check [Branch Formulations](@ref PowerSystems.Branch-Formulations).
-
-The specified constraints are formulated as:
-
-```math
-\\begin{align*}
-& f_t^\\text{to-from} - f_t^\\text{from-to} \\le \\ell_t,\\quad \\forall t \\in \\{1,\\dots, T\\} \\\\
-& f_t^\\text{from-to} - f_t^\\text{to-from} \\le \\ell_t,\\quad \\forall t \\in \\{1,\\dots, T\\}
-\\end{align*}
-```
-"""
-struct HVDCLossesAbsoluteValue <: ConstraintType end
-struct HVDCDirection <: ConstraintType end
 struct InterfaceFlowLimit <: ConstraintType end
+struct HVDCFlowCalculationConstraint <: ConstraintType end
 
 abstract type PowerVariableLimitsConstraint <: ConstraintType end
 """

src/core/formulations.jl

@@ -134,6 +134,11 @@ struct HVDCTwoTerminalLossless <: AbstractTwoTerminalDCLineFormulation end
 Branch type to represent lossy power flow on DC lines
 """
 struct HVDCTwoTerminalDispatch <: AbstractTwoTerminalDCLineFormulation end
+"""
+Branch type to represent piecewise lossy power flow on two terminal DC lines
+"""
+struct HVDCTwoTerminalPiecewiseLoss <: AbstractTwoTerminalDCLineFormulation end
+
 # Not Implemented
 # struct VoltageSourceDC <: AbstractTwoTerminalDCLineFormulation end
 

src/core/variables.jl

@@ -228,8 +228,36 @@ Docs abbreviation: ``u^\\text{dir}``
 """
 struct HVDCFlowDirectionVariable <: VariableType end
 
+"""
+Struct to dispatch the creation of HVDC Received Flow at From Bus Variables for PWL formulations
+
+Docs abbreviation: ``x``
+"""
+struct HVDCActivePowerReceivedFromVariable <: VariableType end
+
+"""
+Struct to dispatch the creation of HVDC Received Flow at To Bus Variables for PWL formulations
+
+Docs abbreviation: ``y``
+"""
+struct HVDCActivePowerReceivedToVariable <: VariableType end
+
 abstract type SparseVariableType <: VariableType end
 
+"""
+Struct to dispatch the creation of HVDC Piecewise Loss Variables
+
+Docs abbreviation: ``h`` or ``w``
+"""
+struct HVDCPiecewiseLossVariable <: SparseVariableType end
+
+"""
+Struct to dispatch the creation of HVDC Piecewise Binary Loss Variables
+
+Docs abbreviation: ``z``
+"""
+struct HVDCPiecewiseBinaryLossVariable <: SparseVariableType end
+
 """
 Struct to dispatch the creation of piecewise linear cost variables for objective function
 
@@ -274,6 +302,8 @@ const START_VARIABLES = (HotStartVariable, WarmStartVariable, ColdStartVariable)
 
 should_write_resulting_value(::Type{PieceWiseLinearCostVariable}) = false
 should_write_resulting_value(::Type{PieceWiseLinearBlockOffer}) = false
+should_write_resulting_value(::Type{HVDCPiecewiseLossVariable}) = false
+should_write_resulting_value(::Type{HVDCPiecewiseBinaryLossVariable}) = false
 convert_result_to_natural_units(::Type{ActivePowerVariable}) = true
 convert_result_to_natural_units(::Type{PowerAboveMinimumVariable}) = true
 convert_result_to_natural_units(::Type{ActivePowerInVariable}) = true

src/devices_models/device_constructors/branch_constructor.jl

@@ -694,7 +694,6 @@ function construct_device!(
     add_constraints!(container, FlowRateConstraintFromTo, devices, model, network_model)
     add_constraints!(container, FlowRateConstraintToFrom, devices, model, network_model)
     add_constraints!(container, HVDCPowerBalance, devices, model, network_model)
-    add_constraints!(container, HVDCLossesAbsoluteValue, devices, model, network_model)
     return
 end
 
@@ -719,6 +718,7 @@ function construct_device!(
         HVDCTwoTerminalDispatch(),
     )
     add_variables!(container, HVDCFlowDirectionVariable, devices, HVDCTwoTerminalDispatch())
+    add_variables!(container, HVDCLosses, devices, HVDCTwoTerminalDispatch())
     add_to_expression!(
         container,
         ActivePowerBalance,
@@ -754,6 +754,135 @@ function construct_device!(
     return
 end
 
+function construct_device!(
+    container::OptimizationContainer,
+    sys::PSY.System,
+    ::ArgumentConstructStage,
+    model::DeviceModel{T, U},
+    network_model::NetworkModel{<:AbstractPTDFModel},
+) where {
+    T <: TwoTerminalHVDCTypes,
+    U <: HVDCTwoTerminalPiecewiseLoss,
+}
+    devices =
+        get_available_components(model, sys)
+    add_variables!(
+        container,
+        HVDCActivePowerReceivedFromVariable,
+        devices,
+        HVDCTwoTerminalPiecewiseLoss(),
+    )
+    add_variables!(
+        container,
+        HVDCActivePowerReceivedToVariable,
+        devices,
+        HVDCTwoTerminalPiecewiseLoss(),
+    )
+    _add_sparse_pwl_loss_variables!(container, devices, model)
+    add_to_expression!(
+        container,
+        ActivePowerBalance,
+        HVDCActivePowerReceivedFromVariable,
+        devices,
+        model,
+        network_model,
+    )
+    add_to_expression!(
+        container,
+        ActivePowerBalance,
+        HVDCActivePowerReceivedToVariable,
+        devices,
+        model,
+        network_model,
+    )
+    return
+end
+
+function construct_device!(
+    container::OptimizationContainer,
+    sys::PSY.System,
+    ::ModelConstructStage,
+    model::DeviceModel{T, U},
+    network_model::NetworkModel{<:AbstractPTDFModel},
+) where {
+    T <: TwoTerminalHVDCTypes,
+    U <: HVDCTwoTerminalPiecewiseLoss,
+}
+    devices =
+        get_available_components(model, sys)
+    add_constraints!(container, FlowRateConstraintFromTo, devices, model, network_model)
+    add_constraints!(container, FlowRateConstraintToFrom, devices, model, network_model)
+    add_constraints!(
+        container,
+        HVDCFlowCalculationConstraint,
+        devices,
+        model,
+        network_model,
+    )
+    return
+end
+
+# TODO: Other models besides PTDF
+#=
+function construct_device!(
+    container::OptimizationContainer,
+    sys::PSY.System,
+    ::ArgumentConstructStage,
+    model::DeviceModel{T, HVDCTwoTerminalPiecewiseLoss},
+    network_model::NetworkModel{<:PM.AbstractActivePowerModel},
+) where {T <: TwoTerminalHVDCTypes}
+    devices =
+        get_available_components(model, sys)
+    add_variables!(
+        container,
+        FlowActivePowerToFromVariable,
+        devices,
+        HVDCTwoTerminalDispatch(),
+    )
+    add_variables!(
+        container,
+        FlowActivePowerFromToVariable,
+        devices,
+        HVDCTwoTerminalDispatch(),
+    )
+    add_variables!(container, HVDCFlowDirectionVariable, devices, HVDCTwoTerminalDispatch())
+    add_to_expression!(
+        container,
+        ActivePowerBalance,
+        FlowActivePowerToFromVariable,
+        devices,
+        model,
+        network_model,
+    )
+    add_to_expression!(
+        container,
+        ActivePowerBalance,
+        FlowActivePowerFromToVariable,
+        devices,
+        model,
+        network_model,
+    )
+    add_feedforward_arguments!(container, model, devices)
+    return
+end
+
+function construct_device!(
+    container::OptimizationContainer,
+    sys::PSY.System,
+    ::ModelConstructStage,
+    model::DeviceModel{T, HVDCTwoTerminalPiecewiseLoss},
+    network_model::NetworkModel{CopperPlatePowerModel},
+) where {T <: TwoTerminalHVDCTypes}
+    devices =
+        get_available_components(model, sys)
+    @warn "CopperPlatePowerModel models with HVDC ignores inter-area losses"
+    add_constraints!(container, FlowRateConstraintFromTo, devices, model, network_model)
+    add_constraints!(container, FlowRateConstraintToFrom, devices, model, network_model)
+    add_constraint_dual!(container, sys, model)
+    return
+end
+=#
+
 function construct_device!(
     container::OptimizationContainer,
     sys::PSY.System,
@@ -765,7 +894,6 @@ function construct_device!(
     add_constraints!(container, FlowRateConstraintFromTo, devices, model, network_model)
     add_constraints!(container, FlowRateConstraintToFrom, devices, model, network_model)
     add_constraints!(container, HVDCPowerBalance, devices, model, network_model)
-    add_constraints!(container, HVDCDirection, devices, model, network_model)
     add_constraint_dual!(container, sys, model)
     add_feedforward_constraints!(container, model, devices)
     return