NREL-Sienna · jd-lara · Jan 23, 2024 · Jan 22, 2024 · Jan 22, 2024 · Jan 22, 2024
diff --git a/src/PowerSimulations.jl b/src/PowerSimulations.jl
@@ -20,7 +20,6 @@ export SimulationPartitionResults
 # Network Relevant Exports
 export NetworkModel
 export StandardPTDFModel
-export PTDFPowerModel
 export CopperPlatePowerModel
 export AreaBalancePowerModel
 

diff --git a/src/core/formulations.jl b/src/core/formulations.jl
@@ -153,7 +153,6 @@ struct LossLessLine <: AbstractBranchFormulation end
 
 abstract type AbstractPTDFModel <: PM.AbstractDCPModel end
 struct StandardPTDFModel <: AbstractPTDFModel end
-struct PTDFPowerModel <: AbstractPTDFModel end
 
 struct CopperPlatePowerModel <: PM.AbstractActivePowerModel end
 struct AreaBalancePowerModel <: PM.AbstractActivePowerModel end

diff --git a/src/core/optimization_container.jl b/src/core/optimization_container.jl
@@ -494,7 +494,7 @@ function _make_system_expressions!(
     dc_bus_numbers::Vector{Int},
     ::Type{T},
     bus_reduction_map::Dict{Int64, Set{Int64}},
-) where {T <: Union{PTDFPowerModel, StandardPTDFModel}}
+) where {T <: StandardPTDFModel}
     time_steps = get_time_steps(container)
     if isempty(bus_reduction_map)
         ac_bus_numbers = collect(Iterators.flatten(values(subnetworks)))

diff --git a/src/devices_models/device_constructors/branch_constructor.jl b/src/devices_models/device_constructors/branch_constructor.jl
@@ -439,7 +439,7 @@ function construct_device!(
     sys::PSY.System,
     ::ArgumentConstructStage,
     model::DeviceModel{T, HVDCTwoTerminalUnbounded},
-    network_model::NetworkModel{<:Union{StandardPTDFModel, PTDFPowerModel}},
+    network_model::NetworkModel{StandardPTDFModel},
 ) where {T <: TwoTerminalHVDCTypes}
     devices =
         get_available_components(T, sys, get_attribute(model, "filter_function"))
@@ -461,7 +461,7 @@ function construct_device!(
     sys::PSY.System,
     ::ModelConstructStage,
     model::DeviceModel{<:TwoTerminalHVDCTypes, HVDCTwoTerminalUnbounded},
-    network_model::NetworkModel{<:Union{StandardPTDFModel, PTDFPowerModel}},
+    network_model::NetworkModel{StandardPTDFModel},
 )
     add_constraint_dual!(container, sys, model)
     return
@@ -497,7 +497,7 @@ function construct_device!(
     sys::PSY.System,
     ::ArgumentConstructStage,
     model::DeviceModel{T, HVDCTwoTerminalLossless},
-    network_model::NetworkModel{<:Union{StandardPTDFModel, PTDFPowerModel}},
+    network_model::NetworkModel{StandardPTDFModel},
 ) where {T <: TwoTerminalHVDCTypes}
     devices =
         get_available_components(T, sys, get_attribute(model, "filter_function"))
@@ -522,7 +522,7 @@ function construct_device!(
     network_model::NetworkModel{U},
 ) where {
     T <: TwoTerminalHVDCTypes,
-    U <: Union{StandardPTDFModel, PTDFPowerModel},
+    U <: StandardPTDFModel,
 }
     devices =
         get_available_components(T, sys, get_attribute(model, "filter_function"))

diff --git a/src/devices_models/devices/HVDCsystems.jl b/src/devices_models/devices/HVDCsystems.jl
@@ -215,7 +215,7 @@ function add_to_expression!(
     U <: ActivePowerVariable,
     V <: PSY.InterconnectingConverter,
     W <: AbstractConverterFormulation,
-    X <: Union{PTDFPowerModel, StandardPTDFModel},
+    X <: StandardPTDFModel
 }
     variable = get_variable(container, U(), V)
     expression_dc = get_expression(container, T(), PSY.DCBus)

diff --git a/src/devices_models/devices/common/add_to_expression.jl b/src/devices_models/devices/common/add_to_expression.jl
@@ -212,7 +212,7 @@ function add_to_expression!(
     U <: FlowActivePowerToFromVariable,
     V <: TwoTerminalHVDCTypes,
     W <: AbstractDeviceFormulation,
-    X <: Union{PTDFPowerModel, StandardPTDFModel},
+    X <: StandardPTDFModel,
 }
     var = get_variable(container, U(), V)
     nodal_expr = get_expression(container, T(), PSY.ACBus)
@@ -248,7 +248,7 @@ function add_to_expression!(
     U <: FlowActivePowerFromToVariable,
     V <: TwoTerminalHVDCTypes,
     W <: AbstractTwoTerminalDCLineFormulation,
-    X <: Union{PTDFPowerModel, StandardPTDFModel},
+    X <: StandardPTDFModel,
 }
     var = get_variable(container, U(), V)
     nodal_expr = get_expression(container, T(), PSY.ACBus)
@@ -579,7 +579,7 @@ function add_to_expression!(
     U <: TimeSeriesParameter,
     V <: PSY.StaticInjection,
     W <: AbstractDeviceFormulation,
-    X <: Union{PTDFPowerModel, StandardPTDFModel},
+    X <: StandardPTDFModel,
 }
     param_container = get_parameter(container, U(), V)
     multiplier = get_multiplier_array(param_container)
@@ -613,7 +613,7 @@ function add_to_expression!(
     U <: OnStatusParameter,
     V <: PSY.ThermalGen,
     W <: AbstractDeviceFormulation,
-    X <: Union{PTDFPowerModel, StandardPTDFModel},
+    X <: StandardPTDFModel,
 }
     parameter = get_parameter_array(container, U(), V)
     sys_expr = get_expression(container, T(), PSY.System)
@@ -647,7 +647,7 @@ function add_to_expression!(
     U <: VariableType,
     V <: PSY.StaticInjection,
     W <: AbstractDeviceFormulation,
-    X <: Union{PTDFPowerModel, StandardPTDFModel},
+    X <: StandardPTDFModel,
 }
     variable = get_variable(container, U(), V)
     sys_expr = get_expression(container, T(), PSY.System)
@@ -686,7 +686,7 @@ function add_to_expression!(
     U <: OnVariable,
     V <: PSY.ThermalGen,
     W <: Union{AbstractCompactUnitCommitment, ThermalCompactDispatch},
-    X <: Union{PTDFPowerModel, StandardPTDFModel},
+    X <: StandardPTDFModel,
 }
     variable = get_variable(container, U(), V)
     sys_expr = get_expression(container, T(), PSY.System)

diff --git a/src/network_models/copperplate_model.jl b/src/network_models/copperplate_model.jl
@@ -6,7 +6,7 @@ function add_constraints!(
 ) where {
     T <: CopperPlateBalanceConstraint,
     U <: PSY.System,
-    V <: Union{CopperPlatePowerModel, StandardPTDFModel, PTDFPowerModel},
+    V <: Union{CopperPlatePowerModel, StandardPTDFModel},
 }
     time_steps = get_time_steps(container)
     expressions = get_expression(container, ActivePowerBalance(), U)

diff --git a/src/network_models/network_constructor.jl b/src/network_models/network_constructor.jl
@@ -75,34 +75,11 @@ function construct_network!(
     return
 end
 
-function construct_network!(
-    container::OptimizationContainer,
-    sys::PSY.System,
-    model::NetworkModel{T},
-    template::ProblemTemplate,
-) where {T <: PTDFPowerModel}
-    construct_network!(
-        container,
-        sys,
-        model,
-        template;
-        instantiate_model = instantiate_nip_ptdf_expr_model,
-    )
-
-    add_pm_expr_refs!(container, T, sys)
-
-    add_constraints!(container, CopperPlateBalanceConstraint, sys, model)
-    add_constraints!(container, NodalBalanceActiveConstraint, sys, model)
-    add_constraint_dual!(container, sys, model)
-    return
-end
-
 function construct_network!(
     container::OptimizationContainer,
     sys::PSY.System,
     model::NetworkModel{T},
     template::ProblemTemplate;
-    instantiate_model = instantiate_nip_expr_model,
 ) where {T <: PM.AbstractActivePowerModel}
     if T in UNSUPPORTED_POWERMODELS
         throw(
@@ -126,9 +103,9 @@ function construct_network!(
         objective_function!(container, PSY.ACBus, model)
     end
 
-    @debug "Building the $T network with $instantiate_model method" _group =
+    @debug "Building the $T network with instantiate_nip_expr_model method" _group =
         LOG_GROUP_NETWORK_CONSTRUCTION
-    powermodels_network!(container, T, sys, template, instantiate_model)
+    powermodels_network!(container, T, sys, template, instantiate_nip_expr_model)
     #Constraints in case the model has DC Buses
     add_constraints!(container, NodalBalanceActiveConstraint, sys, model)
     add_pm_variable_refs!(container, T, sys)
@@ -143,7 +120,6 @@ function construct_network!(
     sys::PSY.System,
     model::NetworkModel{T},
     template::ProblemTemplate;
-    instantiate_model = instantiate_nip_expr_model,
 ) where {T <: PM.AbstractPowerModel}
     if T in UNSUPPORTED_POWERMODELS
         throw(
@@ -174,11 +150,11 @@ function construct_network!(
         objective_function!(container, PSY.ACBus, model)
     end
 
-    @debug "Building the $T network with $instantiate_model method" _group =
+    @debug "Building the $T network with instantiate_nip_expr_model method" _group =
         LOG_GROUP_NETWORK_CONSTRUCTION
     #Constraints in case the model has DC Buses
     add_constraints!(container, NodalBalanceActiveConstraint, sys, model)
-    powermodels_network!(container, T, sys, template, instantiate_model)
+    powermodels_network!(container, T, sys, template, instantiate_nip_expr_model)
     add_pm_variable_refs!(container, T, sys)
     add_pm_constraint_refs!(container, T, sys)
 
@@ -190,8 +166,7 @@ function construct_network!(
     container::OptimizationContainer,
     sys::PSY.System,
     model::NetworkModel{T},
-    template::ProblemTemplate;
-    instantiate_model = instantiate_bfp_expr_model,
+    template::ProblemTemplate,
 ) where {T <: PM.AbstractBFModel}
     if T in UNSUPPORTED_POWERMODELS
         throw(
@@ -235,23 +210,24 @@ function construct_network!(
         objective_function!(container, PSY.ACBus, model)
     end
 
-    @debug "Building the $T network with $instantiate_model method" _group =
+    @debug "Building the $T network with instantiate_bfp_expr_model method" _group =
         LOG_GROUP_NETWORK_CONSTRUCTION
     #Constraints in case the model has DC Buses
     add_constraints!(container, NodalBalanceActiveConstraint, sys, model)
-    powermodels_network!(container, T, sys, template, instantiate_model)
+    powermodels_network!(container, T, sys, template, instantiate_bfp_expr_model)
     add_pm_variable_refs!(container, T, sys)
     add_pm_constraint_refs!(container, T, sys)
     add_constraint_dual!(container, sys, model)
     return
 end
 
+#=
+# AbstractIVRModel models not currently supported
 function construct_network!(
     container::OptimizationContainer,
     sys::PSY.System,
     model::NetworkModel{T},
     template::ProblemTemplate;
-    instantiate_model = instantiate_vip_expr_model,
 ) where {T <: PM.AbstractIVRModel}
     if T in UNSUPPORTED_POWERMODELS
         throw(
@@ -299,13 +275,14 @@ function construct_network!(
         objective_function!(container, PSY.ACBus, model)
     end
 
-    @debug "Building the $T network with $instantiate_model method" _group =
+    @debug "Building the $T network with instantiate_vip_expr_model method" _group =
         LOG_GROUP_NETWORK_CONSTRUCTION
     #Constraints in case the model has DC Buses
     add_constraints!(container, NodalBalanceActiveConstraint, sys, model)
-    powermodels_network!(container, T, sys, template, instantiate_model)
+    powermodels_network!(container, T, sys, template, instantiate_vip_expr_model)
     add_pm_variable_refs!(container, T, sys)
     add_pm_constraint_refs!(container, T, sys)
     add_constraint_dual!(container, sys, model)
     return
 end
+=#
diff --git a/src/network_models/pm_translator.jl b/src/network_models/pm_translator.jl
@@ -446,18 +446,6 @@ function get_branches_to_pm(
     return PM_branches, PMmap_br
 end
 
-function get_branches_to_pm(
-    ::PSY.System,
-    network_model::NetworkModel{PTDFPowerModel},
-    ::Type{T},
-    branch_template::BranchModelContainer,
-    start_idx = 0,
-) where {T <: TwoTerminalHVDCTypes}
-    PM_branches = Dict{String, Any}()
-    PMmap_br = Dict{PM_MAP_TUPLE, T}()
-    return PM_branches, PMmap_br
-end
-
 function get_buses_to_pm(buses::IS.FlattenIteratorWrapper{PSY.ACBus})
     PM_buses = Dict{String, Any}()
     PMmap_buses = Dict{Int, PSY.ACBus}()