update ffs to branch models

NREL-Sienna · Dec 26, 2024 · 7ab39f7 · 7ab39f7
1 parent 35d9f8e
commit 7ab39f7
Showing 1 changed file with 33 additions and 7 deletions.
diff --git a/src/devices_models/device_constructors/branch_constructor.jl b/src/devices_models/device_constructors/branch_constructor.jl
@@ -425,6 +425,8 @@ function construct_device!(
             ),
         )
     end
+    devices = get_available_components(device_model, sys)
+    add_feedforward_arguments!(container, device_model, devices)
     return
 end
 
@@ -452,7 +454,7 @@ function construct_device!(
         network_model,
     )
     add_constraint_dual!(container, sys, device_model)
-
+    add_feedforward_constraints!(container, device_model, devices)
     return
 end
 
@@ -466,6 +468,7 @@ function construct_device!(
     devices = get_available_components(device_model, sys)
     branch_rate_bounds!(container, devices, device_model, network_model)
     add_constraint_dual!(container, sys, device_model)
+    add_feedforward_constraints!(container, device_model, devices)
     return
 end
 
@@ -494,6 +497,7 @@ function construct_device!(
             model,
             network_model,
         )
+        add_feedforward_arguments!(container, model, devices)
     end
     return
 end
@@ -516,17 +520,20 @@ function construct_device!(
             network_model,
         )
         add_constraint_dual!(container, sys, model)
+        add_feedforward_constraints!(container, model, devices)
     end
     return
 end
 
 function construct_device!(
-    ::OptimizationContainer,
-    ::PSY.System,
+    container::OptimizationContainer,
+    sys::PSY.System,
     ::ArgumentConstructStage,
-    ::DeviceModel{T, HVDCTwoTerminalUnbounded},
+    device_model::DeviceModel{T, HVDCTwoTerminalUnbounded},
     ::NetworkModel{<:PM.AbstractPowerModel},
 ) where {T <: TwoTerminalHVDCTypes}
+    devices = get_available_components(device_model, sys)
+    add_feedforward_arguments!(container, device_model, devices)
     return
 end
 
@@ -537,7 +544,9 @@ function construct_device!(
     device_model::DeviceModel{<:TwoTerminalHVDCTypes, HVDCTwoTerminalUnbounded},
     ::NetworkModel{<:PM.AbstractPowerModel},
 )
+    devices = get_available_components(device_model, sys)
     add_constraint_dual!(container, sys, device_model)
+    add_feedforward_constraints!(container, device_model, devices)
     return
 end
 
@@ -558,6 +567,7 @@ function construct_device!(
         model,
         network_model,
     )
+    add_feedforward_arguments!(container, model, devices)
     return
 end
 
@@ -568,7 +578,9 @@ function construct_device!(
     device_model::DeviceModel{<:TwoTerminalHVDCTypes, HVDCTwoTerminalUnbounded},
     ::NetworkModel{CopperPlatePowerModel},
 )
+    devices = get_available_components(device_model, sys)
     add_constraint_dual!(container, sys, device_model)
+    add_feedforward_constraints!(container, model, devices)
     return
 end
 
@@ -590,6 +602,7 @@ function construct_device!(
         model,
         network_model,
     )
+    add_feedforward_arguments!(container, model, devices)
     return
 end
 
@@ -601,17 +614,21 @@ function construct_device!(
     model::DeviceModel{<:TwoTerminalHVDCTypes, HVDCTwoTerminalUnbounded},
     network_model::NetworkModel{<:AbstractPTDFModel},
 )
+    devices = get_available_components(model, sys)
     add_constraint_dual!(container, sys, model)
+    add_feedforward_constraints!(container, model, devices)
     return
 end
 
 function construct_device!(
-    ::OptimizationContainer,
-    ::PSY.System,
+    container::OptimizationContainer,
+    sys::PSY.System,
     ::ArgumentConstructStage,
-    ::DeviceModel{T, HVDCTwoTerminalLossless},
+    model::DeviceModel{T, HVDCTwoTerminalLossless},
     ::NetworkModel{<:PM.AbstractPowerModel},
 ) where {T <: TwoTerminalHVDCTypes}
+    devices = get_available_components(model, sys)
+    add_feedforward_arguments!(container, model, devices)
     return
 end
 
@@ -625,6 +642,7 @@ function construct_device!(
     devices = get_available_components(model, sys)
     add_constraints!(container, FlowRateConstraint, devices, model, network_model)
     add_constraint_dual!(container, sys, model)
+    add_feedforward_constraints!(container, model, devices)
     return
 end
 
@@ -646,6 +664,7 @@ function construct_device!(
         model,
         network_model,
     )
+    add_feedforward_arguments!(container, model, devices)
     return
 end
 
@@ -662,6 +681,7 @@ function construct_device!(
     devices = get_available_components(model, sys)
     add_constraints!(container, FlowRateConstraint, devices, model, network_model)
     add_constraint_dual!(container, sys, model)
+    add_feedforward_constraints!(container, model, devices)
     return
 end
 
@@ -711,6 +731,7 @@ function construct_device!(
         model,
         network_model,
     )
+    add_feedforward_arguments!(container, model, devices)
     return
 end
 
@@ -725,6 +746,8 @@ 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_constraint_dual!(container, sys, model)
+    add_feedforward_constraints!(container, model, devices)
     return
 end
 
@@ -782,6 +805,7 @@ function construct_device!(
     add_constraints!(container, FlowRateConstraintFromTo, devices, model, network_model)
     add_constraints!(container, FlowRateConstraintToFrom, devices, model, network_model)
     add_constraint_dual!(container, sys, model)
+    add_feedforward_constraints!(container, model, devices)
     return
 end
 
@@ -826,6 +850,7 @@ function construct_device!(
         model,
         network_model,
     )
+    add_feedforward_arguments!(container, model, devices)
     return
 end
 
@@ -850,6 +875,7 @@ function construct_device!(
         model,
         network_model,
     )
+    add_feedforward_constraints!(container, model, devices)
     return
 end