Port hybrid systems

Project.toml

@@ -26,7 +26,8 @@ PowerFlows = "94fada2c-fd9a-4e89-8d82-81405f5cb4f6"
 
 [sources]
 InfrastructureSystems = {rev = "IS4", url = "https://github.com/Sienna-Platform/InfrastructureSystems.jl"}
-PowerSystems = {rev = "psy6", url = "https://github.com/Sienna-Platform/PowerSystems.jl"}
+# TODO: Move to main once this branch is merged
+PowerSystems = {rev = "ac/hybridsystem-strip-units", url = "https://github.com/Sienna-Platform/PowerSystems.jl"}
 InfrastructureOptimizationModels = {rev = "main", url = "https://github.com/Sienna-Platform/InfrastructureOptimizationModels.jl"}
 PowerNetworkMatrices = {rev = "psy6", url = "https://github.com/Sienna-Platform/PowerNetworkMatrices.jl"}
 

src/PowerOperationsModels.jl

@@ -225,6 +225,7 @@ include("core/problem_types.jl")
 include("core/interfaces.jl")
 include("core/default_interface_methods.jl")
 include("core/physical_constant_definitions.jl")
+include("core/reserve_traits.jl")
 include("core/variables.jl")
 include("core/expressions.jl")
 include("core/constraints.jl")
@@ -303,6 +304,10 @@ include("services_models/reserve_group.jl")
 include("services_models/transmission_interface.jl")
 include("services_models/services_constructor.jl")
 
+# Hybrid System Models (after services_models since they share reserve infrastructure)
+include("hybrid_system_models/hybrid_systems.jl")
+include("hybrid_system_models/hybridsystem_constructor.jl")
+
 # Two-Terminal HVDC Models
 # NOTE: AC_branches.jl and branch_constructor.jl in twoterminal_hvdc_models/ are
 # identical copies of the files in ac_transmission_models/ — do NOT include them.
@@ -653,6 +658,7 @@ export StorageEnergyOutput
 export EnergyBalanceConstraint
 export StateofChargeLimitsConstraint
 export StateofChargeTargetConstraint
+export HybridEnergyTargetConstraint
 export StorageCyclingCharge
 export StorageCyclingDischarge
 export StorageRegularizationConstraintCharge
@@ -667,19 +673,44 @@ export ReserveChargeConstraint
 
 # expressions
 export TotalReserveOffering
-export ReserveAssignmentBalanceUpDischarge
-export ReserveAssignmentBalanceUpCharge
-export ReserveAssignmentBalanceDownDischarge
-export ReserveAssignmentBalanceDownCharge
-export ReserveDeploymentBalanceUpDischarge
-export ReserveDeploymentBalanceUpCharge
-export ReserveDeploymentBalanceDownDischarge
-export ReserveDeploymentBalanceDownCharge
 
 # parameters
 export EnergyLimitParameter
 export EnergyTargetParameter
 
+######## Hybrid System Formulations ########
+export AbstractHybridFormulation
+export AbstractHybridFormulationWithReserves
+export HybridDispatchWithReserves
+
+# Reserve / constraint marker traits used to parametrize hybrid + storage families.
+export ReserveScale, UnscaledReserve, DeployedReserve
+export ReserveSide, DischargeSide, ChargeSide
+
+# variables
+export HybridEnergyShortageVariable
+export HybridEnergySurplusVariable
+export HybridRenewableActivePower
+export HybridRenewableReserveVariable
+export HybridStorageReservation
+export HybridThermalActivePower
+export HybridThermalReserveVariable
+
+# expressions
+
+# constraints
+export HybridEnergyAssetBalanceConstraint
+export HybridRenewableActivePowerLimitConstraint
+export HybridRenewableReserveLimitConstraint
+export HybridReserveAssignmentConstraint
+export HybridReserveBalanceConstraint
+export HybridStorageBalanceConstraint
+export HybridThermalReserveLimitConstraint
+
+# parameters
+export HybridElectricLoadTimeSeriesParameter
+export HybridRenewableActivePowerTimeSeriesParameter
+
 #################################################################################
 # Exports - Constraint Types (defined in core/constraints.jl)
 #################################################################################

src/core/constraints.jl

@@ -1064,3 +1064,84 @@ The specified constraints are formulated as:
 ```
 """
 struct ShiftDownActivePowerVariableLimitsConstraint <: PowerVariableLimitsConstraint end
+
+#################################################################################
+# Hybrid System Constraints
+#################################################################################
+
+"""
+Couples the hybrid PCC reserve variables (out + in) to the system-level
+`ActivePowerReserveVariable` of each service the hybrid participates in.
+"""
+struct HybridReserveAssignmentConstraint <: ConstraintType end
+
+"""
+Couples the hybrid PCC reserve variables (out + in) to the sum of per-subcomponent reserve
+allocations (thermal + renewable + charging + discharging).
+"""
+struct HybridReserveBalanceConstraint <: ConstraintType end
+
+"""
+Equates the hybrid's PCC active-power injection to the sum of internal subcomponent
+flows (thermal + renewable + storage discharge - storage charge - load) net of served
+reserves.
+"""
+struct HybridEnergyAssetBalanceConstraint <: ConstraintType end
+
+"""
+Status link between a hybrid PCC active-power variable and the reservation variable.
+Parametric on [`ReserveSide`](@ref).`.
+"""
+struct HybridStatusOnConstraint{Sd <: ReserveSide} <: ConstraintType end
+
+"""
+Bound between thermal subcomponent power and its commitment status (no-reserves case).
+Parametric on `BoundDirection` (from IOM).
+"""
+struct HybridThermalOnVariableConstraint{B <: IOM.BoundDirection} <: ConstraintType end
+
+"Range constraint on thermal subcomponent power including up/down reserves."
+struct HybridThermalReserveLimitConstraint <: ConstraintType end
+
+"Upper bound on renewable subcomponent power from the time-series forecast."
+struct HybridRenewableActivePowerLimitConstraint <: ConstraintType end
+
+"Range constraint on renewable subcomponent power including up/down reserves."
+struct HybridRenewableReserveLimitConstraint <: ConstraintType end
+
+"Energy balance for the storage subcomponent of a hybrid system, including reserve deployment."
+struct HybridStorageBalanceConstraint <: ConstraintType end
+
+"""
+Mutually-exclusive charge/discharge limit for the hybrid storage subcomponent
+(no-reserves case). Parametric on [`ReserveSide`](@ref).
+"""
+struct HybridStorageStatusOnConstraint{Sd <: ReserveSide} <: ConstraintType end
+
+"""
+Charge- or discharge-side power limit for the hybrid storage subcomponent including
+reserve carve-outs. Parametric on [`ReserveSide`](@ref).
+"""
+struct HybridStorageReservePowerLimitConstraint{Sd <: ReserveSide} <: ConstraintType end
+
+"""
+Bounds the absolute charge- or discharge-power step change between consecutive time
+steps, penalizing oscillation. Active only when the hybrid `\"regularization\"`
+attribute is set. Parametric on [`ReserveSide`](@ref).
+"""
+struct RegularizationConstraint{Sd <: ReserveSide} <: ConstraintType end
+
+"""
+End-of-period energy target for the storage subcomponent of a hybrid system.
+Used when the attribute `energy_target = true`.
+
+Like the storage [`StateofChargeTargetConstraint`](@ref), this is a soft equality with
+non-negative surplus ([`HybridEnergySurplusVariable`](@ref), energy above target) and
+shortage ([`HybridEnergyShortageVariable`](@ref), energy below target) slacks penalized
+in the objective:
+
+```math
+e^{st}_{T} - e^{st+} + e^{st-} = E^{st}_{T}.
+```
+"""
+struct HybridEnergyTargetConstraint <: ConstraintType end

src/core/expressions.jl

@@ -78,25 +78,46 @@ of the energy balance for the system in medium term planning
 struct EnergyBalanceExpression <: ExpressionType end
 
 #################################################################################
-# Energy Storage Expressions
+# Energy Storage / Hybrid Reserve Aggregation Expressions
+#
+# A single parametric family covers both the hybrid PCC boundary aggregation
+# (HybridPCCReserveExpression) and the storage-subcomponent balance aggregation
+# (StorageReserveBalanceExpression). The three axes are:
+#   D <: ReserveDirection : Up | Down
+#   S <: ReserveScale     : UnscaledReserve (multiplier 1.0)
+#                         | DeployedReserve (multiplier = get_deployed_fraction(s))
+#   Sd <: ReserveSide     : DischargeSide   (PCC "Out" / storage "Discharge")
+#                         | ChargeSide      (PCC "In"  / storage "Charge")
 #################################################################################
 
+"""
+Per-device, per-service aggregation of the reserve quantity offered by a storage device
+(or the storage subcomponent of a hybrid system). One container is created per service
+participated in, and the per-component reserve variables (charging + discharging) are
+summed into it. Consumed by [`HybridReserveBalanceConstraint`](@ref) and used as the
+right-hand side of the system-level reserve balance.
+"""
 struct TotalReserveOffering <: ExpressionType end
 
-abstract type StorageReserveDischargeExpression <: ExpressionType end
-abstract type StorageReserveChargeExpression <: ExpressionType end
+abstract type ReserveAggregationExpression{
+    D <: PSY.ReserveDirection,
+    S <: ReserveScale,
+    Sd <: ReserveSide,
+} <: ExpressionType end
 
-# Used for the Power Limits constraints
-struct ReserveAssignmentBalanceUpDischarge <: StorageReserveDischargeExpression end
-struct ReserveAssignmentBalanceUpCharge <: StorageReserveChargeExpression end
-struct ReserveAssignmentBalanceDownDischarge <: StorageReserveDischargeExpression end
-struct ReserveAssignmentBalanceDownCharge <: StorageReserveChargeExpression end
+"""
+Hybrid-boundary aggregation of reserve quantities offered through the discharge (out) and
+charge (in) sides of a `PSY.HybridSystem`.
+"""
+struct HybridPCCReserveExpression{D, S, Sd} <:
+       ReserveAggregationExpression{D, S, Sd} end
 
-# Used for the SoC estimates
-struct ReserveDeploymentBalanceUpDischarge <: StorageReserveDischargeExpression end
-struct ReserveDeploymentBalanceUpCharge <: StorageReserveChargeExpression end
-struct ReserveDeploymentBalanceDownDischarge <: StorageReserveDischargeExpression end
-struct ReserveDeploymentBalanceDownCharge <: StorageReserveChargeExpression end
+"""
+Aggregation of reserve variables allocated to the storage subcomponent of a hybrid system
+(or a standalone storage device).
+"""
+struct StorageReserveBalanceExpression{D, S, Sd} <:
+       ReserveAggregationExpression{D, S, Sd} end
 
 # Method extensions for output writing
 should_write_resulting_value(::Type{InterfaceTotalFlow}) = true
@@ -108,8 +129,10 @@ should_write_resulting_value(::Type{HydroServedReserveDownExpression}) = true
 should_write_resulting_value(::Type{TotalHydroFlowRateReservoirOutgoing}) = true
 should_write_resulting_value(::Type{TotalHydroFlowRateTurbineOutgoing}) = true
 
-should_write_resulting_value(::Type{StorageReserveDischargeExpression}) = true
-should_write_resulting_value(::Type{StorageReserveChargeExpression}) = true
+should_write_resulting_value(::Type{<:StorageReserveBalanceExpression}) = true
+should_write_resulting_value(
+    ::Type{HybridPCCReserveExpression{D, DeployedReserve, Sd}},
+) where {D <: PSY.ReserveDirection, Sd <: ReserveSide} = true
 
 # Method extensions for unit conversion
 convert_output_to_natural_units(::Type{InterfaceTotalFlow}) = true