Jd/add thermal time series

src/PowerSimulations.jl

@@ -556,7 +556,7 @@ include("devices_models/devices/common/duration_constraints.jl")
 include("devices_models/devices/common/get_time_series.jl")
 
 # Device Modeling components
-include("devices_models/devices/interfaces.jl")
+include("devices_models/devices/default_interface_methods.jl")
 include("devices_models/devices/common/add_to_expression.jl")
 include("devices_models/devices/common/set_expression.jl")
 include("devices_models/devices/renewable_generation.jl")

src/devices_models/device_constructors/thermalgeneration_constructor.jl

@@ -56,6 +56,10 @@
 
     initial_conditions!(container, devices, D())
 
+    if haskey(get_time_series_names(model), ActivePowerTimeSeriesParameter)
+        add_parameters!(container, ActivePowerTimeSeriesParameter, devices, model)
+    end
+
     add_to_expression!(
         container,
         ActivePowerBalance,
@@ -135,6 +139,17 @@
     add_constraints!(container, RampConstraint, devices, model, network_model)
     add_constraints!(container, DurationConstraint, devices, model, network_model)
 
+    if haskey(get_time_series_names(model), ActivePowerTimeSeriesParameter)
+        add_constraints!(
+            container,
+            ActivePowerVariableTimeSeriesLimitsConstraint,
+            ActivePowerRangeExpressionUB,
+            devices,
+            model,
+            network_model,
+        )
+    end
+
     add_feedforward_constraints!(container, model, devices)
 
     objective_function!(container, devices, model, get_network_formulation(network_model))
@@ -164,6 +179,10 @@
 
     initial_conditions!(container, devices, D())
 
+    if haskey(get_time_series_names(model), ActivePowerTimeSeriesParameter)
+        add_parameters!(container, ActivePowerTimeSeriesParameter, devices, model)
+    end
+
     add_to_expression!(
         container,
         ActivePowerBalance,
@@ -227,6 +246,16 @@
     add_constraints!(container, CommitmentConstraint, devices, model, network_model)
     add_constraints!(container, RampConstraint, devices, model, network_model)
     add_constraints!(container, DurationConstraint, devices, model, network_model)
+    if haskey(get_time_series_names(model), ActivePowerTimeSeriesParameter)
+        add_constraints!(
+            container,
+            ActivePowerVariableTimeSeriesLimitsConstraint,
+            ActivePowerRangeExpressionUB,
+            devices,
+            model,
+            network_model,
+        )
+    end
 
     add_feedforward_constraints!(container, model, devices)
 
@@ -256,6 +285,10 @@
 
     initial_conditions!(container, devices, ThermalBasicUnitCommitment())
 
+    if haskey(get_time_series_names(model), ActivePowerTimeSeriesParameter)
+        add_parameters!(container, ActivePowerTimeSeriesParameter, devices, model)
+    end
+
     add_to_expression!(
         container,
         ActivePowerBalance,
@@ -335,6 +368,17 @@
     )
     add_constraints!(container, CommitmentConstraint, devices, model, network_model)
 
+    if haskey(get_time_series_names(model), ActivePowerTimeSeriesParameter)
+        add_constraints!(
+            container,
+            ActivePowerVariableTimeSeriesLimitsConstraint,
+            ActivePowerRangeExpressionUB,
+            devices,
+            model,
+            network_model,
+        )
+    end
+
     add_feedforward_constraints!(container, model, devices)
 
     objective_function!(container, devices, model, get_network_formulation(network_model))
@@ -361,6 +405,10 @@
 
     initial_conditions!(container, devices, ThermalBasicUnitCommitment())
 
+    if haskey(get_time_series_names(model), ActivePowerTimeSeriesParameter)
+        add_parameters!(container, ActivePowerTimeSeriesParameter, devices, model)
+    end
+
     add_to_expression!(
         container,
         ActivePowerBalance,
@@ -423,6 +471,16 @@
     )
 
     add_constraints!(container, CommitmentConstraint, devices, model, network_model)
+    if haskey(get_time_series_names(model), ActivePowerTimeSeriesParameter)
+        add_constraints!(
+            container,
+            ActivePowerVariableTimeSeriesLimitsConstraint,
+            ActivePowerRangeExpressionUB,
+            devices,
+            model,
+            network_model,
+        )
+    end
 
     add_feedforward_constraints!(container, model, devices)
 
@@ -829,6 +887,10 @@
 
     initial_conditions!(container, devices, ThermalMultiStartUnitCommitment())
 
+    if haskey(get_time_series_names(model), ActivePowerTimeSeriesParameter)
+        add_parameters!(container, ActivePowerTimeSeriesParameter, devices, model)
+    end
+
     add_to_expression!(
         container,
         ActivePowerBalance,
@@ -931,6 +993,16 @@
         network_model,
     )
     add_constraints!(container, ActiveRangeICConstraint, devices, model, network_model)
+    if haskey(get_time_series_names(model), ActivePowerTimeSeriesParameter)
+        add_constraints!(
+            container,
+            ActivePowerVariableTimeSeriesLimitsConstraint,
+            ActivePowerRangeExpressionUB,
+            devices,
+            model,
+            network_model,
+        )
+    end
 
     add_feedforward_constraints!(container, model, devices)
 
@@ -965,6 +1037,10 @@
     add_variables!(container, TimeDurationOff, devices, ThermalMultiStartUnitCommitment())
     add_variables!(container, PowerOutput, devices, ThermalMultiStartUnitCommitment())
 
+    if haskey(get_time_series_names(model), ActivePowerTimeSeriesParameter)
+        add_parameters!(container, ActivePowerTimeSeriesParameter, devices, model)
+    end
+
     add_to_expression!(
         container,
         ActivePowerBalance,
@@ -1053,6 +1129,16 @@
         network_model,
     )
     add_constraints!(container, ActiveRangeICConstraint, devices, model, network_model)
+    if haskey(get_time_series_names(model), ActivePowerTimeSeriesParameter)
+        add_constraints!(
+            container,
+            ActivePowerVariableTimeSeriesLimitsConstraint,
+            ActivePowerRangeExpressionUB,
+            devices,
+            model,
+            network_model,
+        )
+    end
 
     add_feedforward_constraints!(container, model, devices)
 
@@ -1092,6 +1178,10 @@
 
     initial_conditions!(container, devices, ThermalCompactUnitCommitment())
 
+    if haskey(get_time_series_names(model), ActivePowerTimeSeriesParameter)
+        add_parameters!(container, ActivePowerTimeSeriesParameter, devices, model)
+    end
+
     add_to_expression!(
         container,
         ActivePowerBalance,
@@ -1169,6 +1259,16 @@
     add_constraints!(container, CommitmentConstraint, devices, model, network_model)
     add_constraints!(container, RampConstraint, devices, model, network_model)
     add_constraints!(container, DurationConstraint, devices, model, network_model)
+    if haskey(get_time_series_names(model), ActivePowerTimeSeriesParameter)
+        add_constraints!(
+            container,
+            ActivePowerVariableTimeSeriesLimitsConstraint,
+            ActivePowerRangeExpressionUB,
+            devices,
+            model,
+            network_model,
+        )
+    end
 
     add_feedforward_constraints!(container, model, devices)
 
@@ -1202,6 +1302,10 @@
 
     initial_conditions!(container, devices, ThermalCompactUnitCommitment())
 
+    if haskey(get_time_series_names(model), ActivePowerTimeSeriesParameter)
+        add_parameters!(container, ActivePowerTimeSeriesParameter, devices, model)
+    end
+
     add_to_expression!(
         container,
         ActivePowerBalance,
@@ -1270,6 +1374,16 @@
     add_constraints!(container, CommitmentConstraint, devices, model, network_model)
     add_constraints!(container, RampConstraint, devices, model, network_model)
     add_constraints!(container, DurationConstraint, devices, model, network_model)
+    if haskey(get_time_series_names(model), ActivePowerTimeSeriesParameter)
+        add_constraints!(
+            container,
+            ActivePowerVariableTimeSeriesLimitsConstraint,
+            ActivePowerRangeExpressionUB,
+            devices,
+            model,
+            network_model,
+        )
+    end
 
     add_feedforward_constraints!(container, model, devices)
 
@@ -1307,6 +1421,10 @@
 
     initial_conditions!(container, devices, ThermalBasicCompactUnitCommitment())
 
+    if haskey(get_time_series_names(model), ActivePowerTimeSeriesParameter)
+        add_parameters!(container, ActivePowerTimeSeriesParameter, devices, model)
+    end
+
     add_to_expression!(
         container,
         ActivePowerBalance,
@@ -1382,6 +1500,16 @@
         network_model,
     )
     add_constraints!(container, CommitmentConstraint, devices, model, network_model)
+    if haskey(get_time_series_names(model), ActivePowerTimeSeriesParameter)
+        add_constraints!(
+            container,
+            ActivePowerVariableTimeSeriesLimitsConstraint,
+            ActivePowerRangeExpressionUB,
+            devices,
+            model,
+            network_model,
+        )
+    end
 
     add_feedforward_constraints!(container, model, devices)
 
@@ -1413,6 +1541,10 @@
 
     initial_conditions!(container, devices, ThermalBasicCompactUnitCommitment())
 
+    if haskey(get_time_series_names(model), ActivePowerTimeSeriesParameter)
+        add_parameters!(container, ActivePowerTimeSeriesParameter, devices, model)
+    end
+
     add_to_expression!(
         container,
         ActivePowerBalance,
@@ -1479,6 +1611,16 @@
     )
 
     add_constraints!(container, CommitmentConstraint, devices, model, network_model)
+    if haskey(get_time_series_names(model), ActivePowerTimeSeriesParameter)
+        add_constraints!(
+            container,
+            ActivePowerVariableTimeSeriesLimitsConstraint,
+            ActivePowerRangeExpressionUB,
+            devices,
+            model,
+            network_model,
+        )
+    end
 
     add_feedforward_constraints!(container, model, devices)
 

src/devices_models/devices/common/range_constraint.jl

@@ -706,6 +706,9 @@
     jump_model = get_jump_model(container)
     time_steps = axes(constraint_container)[2]
     for device in devices
+        if !(PSY.has_time_series(device))
+            continue
+        end
         name = PSY.get_name(device)
         param = get_parameter_column_refs(param_container, name)
         for t in time_steps
@@ -730,8 +733,11 @@
     W <: AbstractDeviceFormulation,
 }
     time_steps = get_time_steps(container)
-    names = [PSY.get_name(d) for d in devices]
-
+    names = [PSY.get_name(d) for d in devices if PSY.has_time_series(d)]
+    if isempty(names)
+        @debug "There are no $V devices with time series data"
+        return
+    end
     constraint =
         add_constraints_container!(container, T(), V, names, time_steps; meta = "lb")
 
@@ -842,6 +848,9 @@
     time_steps = axes(constraint_container)[2]
     for device in devices
         name = PSY.get_name(device)
+        if !(PSY.has_time_series(device))
+            continue
+        end
         param = get_parameter_column_refs(param_container, name)
         for t in time_steps
             constraint_container[name, t] =
@@ -865,7 +874,11 @@
     W <: AbstractDeviceFormulation,
 }
     time_steps = get_time_steps(container)
-    names = [PSY.get_name(d) for d in devices]
+    names = [PSY.get_name(d) for d in devices if PSY.has_time_series(d)]
+    if isempty(names)
+        @debug "There are no $V devices with time series data"
+        return
+    end
 
     constraint =
         add_constraints_container!(container, T(), V, names, time_steps; meta = "ub")

src/devices_models/devices/interfaces.jl → src/devices_models/devices/default_interface_methods.jl

@@ -11,7 +11,7 @@ get_variable_lower_bound(_, ::PSY.Component, __) = nothing
 get_variable_upper_bound(_, ::PSY.Component, __) = nothing
 
 get_multiplier_value(x, y::PSY.Component, z) =
-    error("Unable to get parameter $x for device $y for formulation $z")
+    error("Unable to get parameter $x for device $(IS.summary(y)) for formulation $z")
 
 get_expression_type_for_reserve(_, y::Type{<:PSY.Component}, z) =
     error("`get_expression_type_for_reserve` must be implemented for $y and $z")

src/devices_models/devices/thermal_generation.jl

@@ -50,6 +50,7 @@ get_variable_upper_bound(::StartVariable, d::PSY.ThermalGen, ::AbstractThermalFo
 get_variable_binary(::Union{ColdStartVariable, WarmStartVariable, HotStartVariable}, ::Type{PSY.ThermalMultiStart}, ::AbstractThermalFormulation) = true
 
 ########################### Parameter related set functions ################################
+get_multiplier_value(::ActivePowerTimeSeriesParameter, d::PSY.ThermalGen, ::AbstractThermalFormulation) = PSY.get_max_active_power(d)
 get_parameter_multiplier(::VariableValueParameter, d::PSY.ThermalGen, ::AbstractThermalFormulation) = 1.0
 get_initial_parameter_value(::VariableValueParameter, d::PSY.ThermalGen, ::AbstractThermalFormulation) = 1.0
 get_expression_multiplier(::OnStatusParameter, ::ActivePowerRangeExpressionUB, d::PSY.ThermalGen, ::AbstractThermalFormulation) = PSY.get_active_power_limits(d).max
@@ -442,6 +443,30 @@ function _get_data_for_range_ic(
     return ini_conds
 end
 
+function add_constraints!(
+    container::OptimizationContainer,
+    ::Type{ActivePowerVariableTimeSeriesLimitsConstraint},
+    U::Type{<:Union{ActivePowerVariable, ActivePowerRangeExpressionUB}},
+    devices::IS.FlattenIteratorWrapper{V},
+    model::DeviceModel{V, W},
+    ::NetworkModel{X},
+) where {
+    V <: PSY.ThermalGen,
+    W <: AbstractThermalUnitCommitment,
+    X <: PM.AbstractPowerModel,
+}
+    add_parameterized_upper_bound_range_constraints(
+        container,
+        ActivePowerVariableTimeSeriesLimitsConstraint,
+        U,
+        ActivePowerTimeSeriesParameter,
+        devices,
+        model,
+        X,
+    )
+    return
+end
+
 """
 This function adds range constraint for the first time period. Constraint (10) from PGLIB formulation
 """