diff --git a/src/devices_models/device_constructors/branch_constructor.jl b/src/devices_models/device_constructors/branch_constructor.jl index c15958c239..56ca547ae0 100644 --- a/src/devices_models/device_constructors/branch_constructor.jl +++ b/src/devices_models/device_constructors/branch_constructor.jl @@ -175,12 +175,16 @@ construct_device!( # For DC Power only. Implements constraints function construct_device!( - ::OptimizationContainer, - ::PSY.System, + container::OptimizationContainer, + sys::PSY.System, ::ArgumentConstructStage, - ::DeviceModel{<:PSY.ACBranch, StaticBranch}, + model::DeviceModel{T, StaticBranch}, ::NetworkModel{<:PM.AbstractActivePowerModel}, -) +) where {T <: PSY.ACBranch} + devices = + get_available_components(T, sys, get_attribute(model, "filter_function")) + + add_feedforward_arguments!(container, model, devices) end # For DC Power only. Implements constraints @@ -196,6 +200,7 @@ function construct_device!( devices = get_available_components(T, sys, get_attribute(device_model, "filter_function")) add_constraints!(container, RateLimitConstraint, devices, device_model, network_model) + add_feedforward_constraints!(container, device_model, devices) add_constraint_dual!(container, sys, device_model) return end diff --git a/src/devices_models/devices/AC_branches.jl b/src/devices_models/devices/AC_branches.jl index 852613a960..dc02460b37 100644 --- a/src/devices_models/devices/AC_branches.jl +++ b/src/devices_models/devices/AC_branches.jl @@ -22,6 +22,7 @@ get_variable_binary(::FlowActivePowerVariable, ::Type{<:PSY.ACBranch}, ::Abstrac get_variable_binary(::PhaseShifterAngle, ::Type{PSY.PhaseShiftingTransformer}, ::AbstractBranchFormulation,) = false get_variable_multiplier(_, ::Type{<:PSY.ACBranch}, _) = NaN +get_parameter_multiplier(::FixValueParameter, ::PSY.MonitoredLine, ::StaticBranch) = 1.0 get_variable_multiplier(::PhaseShifterAngle, d::PSY.PhaseShiftingTransformer, ::PhaseAngleControl) = 1.0/PSY.get_x(d) get_initial_conditions_device_model(::OperationModel, ::DeviceModel{T, <:AbstractBranchFormulation}) where {T <: PSY.ACBranch} = DeviceModel(T, StaticBranch)