Merge pull request #1136 from NREL-Sienna/rh/fix_multiple_bugs

Fix multiple issues

src/devices_models/device_constructors/thermalgeneration_constructor.jl

@@ -1534,23 +1534,6 @@ function construct_device!(
         model,
         network_model,
     )
-    add_to_expression!(
-        container,
-        ReactivePowerBalance,
-        ReactivePowerVariable,
-        devices,
-        model,
-        network_model,
-    )
-    add_to_expression!(
-        container,
-        ActivePowerBalance,
-        OnStatusParameter,
-        devices,
-        model,
-        network_model,
-    )
-
     add_to_expression!(
         container,
         ActivePowerRangeExpressionLB,

src/devices_models/devices/common/objective_function/piecewise_linear.jl

@@ -408,21 +408,33 @@ function _add_pwl_term!(
     end
 
     # Compact PWL data does not exists anymore
-
-    if slopes[1] != 0.0
-        @debug "PWL has no 0.0 intercept for generator $(component_name)"
-        # adds a first intercept a x = 0.0 and y below the intercept of the first tuple to make convex equivalent
-        intercept_point = (x = 0.0, y = first(data).y - COST_EPSILON)
-        data = PSY.PiecewiseLinearData(vcat(intercept_point, get_points(data)))
-        @assert PSY.is_convex(slopes)
+    x_coords = PSY.get_x_coords(data)
+    if x_coords[1] != 0.0
+        y_coords = PSY.get_y_coords(data)
+        x_first = round(x_coords[1]; digits = 3)
+        y_first = round(y_coords[1]; digits = 3)
+        slope_first = round(slopes[1]; digits = 3)
+        guess_y_zero = y_coords[1] - slopes[1] * x_coords[1]
+        @warn(
+            "PWL has no 0.0 intercept for generator $(name). First point is given at (x = $(x_first), y = $(y_first)). Adding a first intercept at (x = 0.0, y = $(round(guess_y_zero, digits = 3)) to have equal initial slope $(slope_first)"
+        )
+        if guess_y_zero < 0.0
+            error(
+                "Added zero intercept has negative cost for generator $(name). Consider using other formulation or improve data.",
+            )
+        end
+        # adds a first intercept a x = 0.0 and y above the intercept of the first tuple to make convex equivalent (avoid floating point issues of almost equal slopes)
+        intercept_point = (x = 0.0, y = guess_y_zero + COST_EPSILON)
+        data = PSY.PiecewiseLinearData(vcat(intercept_point, PSY.get_points(data)))
+        @assert PSY.is_convex(data)
     end
 
     time_steps = get_time_steps(container)
     pwl_cost_expressions = Vector{JuMP.AffExpr}(undef, time_steps[end])
     break_points = PSY.get_x_coords(data)
     sos_val = _get_sos_value(container, V, component)
     for t in time_steps
-        _add_pwl_variables!(container, T, component_name, t, data)
+        _add_pwl_variables!(container, T, name, t, data)
         _add_pwl_constraint!(container, component, U(), break_points, sos_val, t)
         pwl_cost =
             _get_pwl_cost_expression(container, component, t, cost_function, U(), V())

src/devices_models/devices/electric_loads.jl

@@ -7,14 +7,14 @@ get_variable_multiplier(_, ::Type{<:PSY.ElectricLoad}, ::AbstractLoadFormulation
 
 get_variable_binary(::ActivePowerVariable, ::Type{<:PSY.ElectricLoad}, ::AbstractLoadFormulation) = false
 get_variable_lower_bound(::ActivePowerVariable, d::PSY.ElectricLoad, ::AbstractLoadFormulation) = 0.0
-get_variable_upper_bound(::ActivePowerVariable, d::PSY.ElectricLoad, ::AbstractLoadFormulation) = PSY.get_active_power(d)
+get_variable_upper_bound(::ActivePowerVariable, d::PSY.ElectricLoad, ::AbstractLoadFormulation) = PSY.get_max_active_power(d)
 
 ########################### ReactivePowerVariable, ElectricLoad ####################################
 
 get_variable_binary(::ReactivePowerVariable, ::Type{<:PSY.ElectricLoad}, ::AbstractLoadFormulation) = false
 
 get_variable_lower_bound(::ReactivePowerVariable, d::PSY.ElectricLoad, ::AbstractLoadFormulation) = 0.0
-get_variable_upper_bound(::ReactivePowerVariable, d::PSY.ElectricLoad, ::AbstractLoadFormulation) = PSY.get_reactive_power(d)
+get_variable_upper_bound(::ReactivePowerVariable, d::PSY.ElectricLoad, ::AbstractLoadFormulation) = PSY.get_max_reactive_power(d)
 
 ########################### ReactivePowerVariable, ElectricLoad ####################################
 

src/services_models/services_constructor.jl

@@ -104,6 +104,7 @@ function construct_service!(
 ) where {SR <: PSY.Reserve}
     name = get_service_name(model)
     service = PSY.get_component(SR, sys, name)
+    !PSY.get_available(service) && return
     add_parameters!(container, RequirementTimeSeriesParameter, service, model)
     contributing_devices = get_contributing_devices(model)
 
@@ -130,6 +131,7 @@ function construct_service!(
 ) where {SR <: PSY.Reserve}
     name = get_service_name(model)
     service = PSY.get_component(SR, sys, name)
+    !PSY.get_available(service) && return
     contributing_devices = get_contributing_devices(model)
 
     add_constraints!(container, RequirementConstraint, service, contributing_devices, model)
@@ -160,6 +162,7 @@ function construct_service!(
 ) where {SR <: PSY.ConstantReserve}
     name = get_service_name(model)
     service = PSY.get_component(SR, sys, name)
+    !PSY.get_available(service) && return
     contributing_devices = get_contributing_devices(model)
 
     add_variables!(
@@ -185,6 +188,7 @@ function construct_service!(
 ) where {SR <: PSY.ConstantReserve}
     name = get_service_name(model)
     service = PSY.get_component(SR, sys, name)
+    !PSY.get_available(service) && return
     contributing_devices = get_contributing_devices(model)
 
     add_constraints!(container, RequirementConstraint, service, contributing_devices, model)
@@ -214,6 +218,7 @@ function construct_service!(
 ) where {SR <: PSY.Reserve}
     name = get_service_name(model)
     service = PSY.get_component(SR, sys, name)
+    !PSY.get_available(service) && return
     contributing_devices = get_contributing_devices(model)
     add_variable!(container, ServiceRequirementVariable(), service, StepwiseCostReserve())
     add_variables!(
@@ -239,6 +244,7 @@ function construct_service!(
 ) where {SR <: PSY.Reserve}
     name = get_service_name(model)
     service = PSY.get_component(SR, sys, name)
+    !PSY.get_available(service) && return
     contributing_devices = get_contributing_devices(model)
 
     add_constraints!(container, RequirementConstraint, service, contributing_devices, model)
@@ -251,6 +257,7 @@ function construct_service!(
     return
 end
 
+#=
 function construct_service!(
     container::OptimizationContainer,
     sys::PSY.System,
@@ -343,6 +350,7 @@ function construct_service!(
     objective_function!(container, services, model)
     return
 end
+=#
 
 """
     Constructs a service for ConstantReserveGroup.
@@ -358,6 +366,7 @@ function construct_service!(
 ) where {SR <: PSY.ConstantReserveGroup}
     name = get_service_name(model)
     service = PSY.get_component(SR, sys, name)
+    !PSY.get_available(service) && return
     contributing_services = PSY.get_contributing_services(service)
     # check if variables exist
     check_activeservice_variables(container, contributing_services)
@@ -376,6 +385,7 @@ function construct_service!(
 ) where {SR <: PSY.ConstantReserveGroup}
     name = get_service_name(model)
     service = PSY.get_component(SR, sys, name)
+    !PSY.get_available(service) && return
     contributing_services = PSY.get_contributing_services(service)
 
     add_constraints!(
@@ -401,6 +411,7 @@ function construct_service!(
 ) where {SR <: PSY.Reserve}
     name = get_service_name(model)
     service = PSY.get_component(SR, sys, name)
+    !PSY.get_available(service) && return
     contributing_devices = get_contributing_devices(model)
     add_parameters!(container, RequirementTimeSeriesParameter, service, model)
 
@@ -427,6 +438,7 @@ function construct_service!(
 ) where {SR <: PSY.Reserve}
     name = get_service_name(model)
     service = PSY.get_component(SR, sys, name)
+    !PSY.get_available(service) && return
     contributing_devices = get_contributing_devices(model)
 
     add_constraints!(container, RequirementConstraint, service, contributing_devices, model)
@@ -458,6 +470,7 @@ function construct_service!(
 ) where {SR <: PSY.ReserveNonSpinning}
     name = get_service_name(model)
     service = PSY.get_component(SR, sys, name)
+    !PSY.get_available(service) && return
     contributing_devices = get_contributing_devices(model)
     add_parameters!(container, RequirementTimeSeriesParameter, service, model)
 
@@ -483,6 +496,7 @@ function construct_service!(
 ) where {SR <: PSY.ReserveNonSpinning}
     name = get_service_name(model)
     service = PSY.get_component(SR, sys, name)
+    !PSY.get_available(service) && return
     contributing_devices = get_contributing_devices(model)
 
     add_constraints!(container, RequirementConstraint, service, contributing_devices, model)
@@ -549,6 +563,7 @@ function construct_service!(
 ) where {T <: PSY.TransmissionInterface}
     name = get_service_name(model)
     service = PSY.get_component(T, sys, name)
+    !PSY.get_available(service) && return
 
     add_to_expression!(
         container,
@@ -640,6 +655,7 @@ function construct_service!(
 ) where {T <: PSY.TransmissionInterface}
     name = get_service_name(model)
     service = PSY.get_component(T, sys, name)
+    !PSY.get_available(service) && return
 
     add_to_expression!(
         container,