diff --git a/src/descriptors/power_system_structs.json b/src/descriptors/power_system_structs.json index 3c2943d751..ad5f48c4fa 100644 --- a/src/descriptors/power_system_structs.json +++ b/src/descriptors/power_system_structs.json @@ -1302,9 +1302,9 @@ }, { "name": "operation_cost", - "null_value": "TwoPartCost(nothing)", - "data_type": "TwoPartCost", - "comment": "Operation Cost of Generation [`TwoPartCost`](@ref)" + "null_value": "LoadCost(nothing)", + "data_type": "OperationalCost", + "comment": "Operation Cost of Generation [`OperationalCost`](@ref)" }, { "name": "services", @@ -2594,9 +2594,9 @@ }, { "name": "operation_cost", - "null_value": "TwoPartCost(nothing)", + "null_value": "LoadCost(nothing)", "data_type": "OperationalCost", - "default": "TwoPartCost(LinearFunctionData(0.0), 0.0)", + "default": "LoadCost(nothing)", "comment": "Operation Cost of Generation [`OperationalCost`](@ref)" }, { @@ -2949,9 +2949,9 @@ }, { "name": "operation_cost", - "null_value": "TwoPartCost(nothing)", + "null_value": "HydroGenerationCost(nothing)", "data_type": "OperationalCost", - "default": "TwoPartCost(LinearFunctionData(0.0), 0.0)", + "default": "HydroGenerationCost(nothing)", "comment": "Operation Cost of Generation [`OperationalCost`](@ref)" }, { @@ -3124,9 +3124,9 @@ }, { "name": "operation_cost", - "null_value": "TwoPartCost(nothing)", + "null_value": "HydroGenerationCost(nothing)", "data_type": "OperationalCost", - "default": "TwoPartCost(LinearFunctionData(0.0), 0.0)", + "default": "HydroGenerationCost(nothing)", "comment": "Operation Cost of Generation [`OperationalCost`](@ref)" }, { @@ -3379,9 +3379,9 @@ }, { "name": "operation_cost", - "null_value": "TwoPartCost(nothing)", + "null_value": "HydroGenerationCost(nothing)", "data_type": "OperationalCost", - "default": "TwoPartCost(LinearFunctionData(0.0), 0.0)", + "default": "HydroGenerationCost(nothing)", "comment": "Operation Cost of Generation [`OperationalCost`](@ref)" }, { @@ -3521,9 +3521,9 @@ }, { "name": "operation_cost", - "null_value": "TwoPartCost(nothing)", - "data_type": "TwoPartCost", - "comment": "Operation Cost of Generation [`TwoPartCost`](@ref)" + "null_value": "RenewablePowerCost(nothing)", + "data_type": "OperationalCost", + "comment": "Operation Cost of Generation [`OperationalCost`](@ref)" }, { "name": "base_power", diff --git a/src/models/generated/HydroDispatch.jl b/src/models/generated/HydroDispatch.jl index fc728bb8c0..c5f6ded2e9 100644 --- a/src/models/generated/HydroDispatch.jl +++ b/src/models/generated/HydroDispatch.jl @@ -83,11 +83,11 @@ mutable struct HydroDispatch <: HydroGen internal::InfrastructureSystemsInternal end -function HydroDispatch(name, available, bus, active_power, reactive_power, rating, prime_mover_type, active_power_limits, reactive_power_limits, ramp_limits, time_limits, base_power, operation_cost=TwoPartCost(LinearFunctionData(0.0), 0.0), services=Device[], dynamic_injector=nothing, ext=Dict{String, Any}(), time_series_container=InfrastructureSystems.TimeSeriesContainer(), supplemental_attributes_container=InfrastructureSystems.SupplementalAttributesContainer(), ) +function HydroDispatch(name, available, bus, active_power, reactive_power, rating, prime_mover_type, active_power_limits, reactive_power_limits, ramp_limits, time_limits, base_power, operation_cost=HydroGenerationCost(nothing), services=Device[], dynamic_injector=nothing, ext=Dict{String, Any}(), time_series_container=InfrastructureSystems.TimeSeriesContainer(), supplemental_attributes_container=InfrastructureSystems.SupplementalAttributesContainer(), ) HydroDispatch(name, available, bus, active_power, reactive_power, rating, prime_mover_type, active_power_limits, reactive_power_limits, ramp_limits, time_limits, base_power, operation_cost, services, dynamic_injector, ext, time_series_container, supplemental_attributes_container, InfrastructureSystemsInternal(), ) end -function HydroDispatch(; name, available, bus, active_power, reactive_power, rating, prime_mover_type, active_power_limits, reactive_power_limits, ramp_limits, time_limits, base_power, operation_cost=TwoPartCost(LinearFunctionData(0.0), 0.0), services=Device[], dynamic_injector=nothing, ext=Dict{String, Any}(), time_series_container=InfrastructureSystems.TimeSeriesContainer(), supplemental_attributes_container=InfrastructureSystems.SupplementalAttributesContainer(), internal=InfrastructureSystemsInternal(), ) +function HydroDispatch(; name, available, bus, active_power, reactive_power, rating, prime_mover_type, active_power_limits, reactive_power_limits, ramp_limits, time_limits, base_power, operation_cost=HydroGenerationCost(nothing), services=Device[], dynamic_injector=nothing, ext=Dict{String, Any}(), time_series_container=InfrastructureSystems.TimeSeriesContainer(), supplemental_attributes_container=InfrastructureSystems.SupplementalAttributesContainer(), internal=InfrastructureSystemsInternal(), ) HydroDispatch(name, available, bus, active_power, reactive_power, rating, prime_mover_type, active_power_limits, reactive_power_limits, ramp_limits, time_limits, base_power, operation_cost, services, dynamic_injector, ext, time_series_container, supplemental_attributes_container, internal, ) end @@ -106,7 +106,7 @@ function HydroDispatch(::Nothing) ramp_limits=nothing, time_limits=nothing, base_power=0.0, - operation_cost=TwoPartCost(nothing), + operation_cost=HydroGenerationCost(nothing), services=Device[], dynamic_injector=nothing, ext=Dict{String, Any}(), diff --git a/src/models/generated/HydroEnergyReservoir.jl b/src/models/generated/HydroEnergyReservoir.jl index addf1f9779..501db4903e 100644 --- a/src/models/generated/HydroEnergyReservoir.jl +++ b/src/models/generated/HydroEnergyReservoir.jl @@ -106,11 +106,11 @@ mutable struct HydroEnergyReservoir <: HydroGen internal::InfrastructureSystemsInternal end -function HydroEnergyReservoir(name, available, bus, active_power, reactive_power, rating, prime_mover_type, active_power_limits, reactive_power_limits, ramp_limits, time_limits, base_power, storage_capacity, inflow, initial_storage, operation_cost=TwoPartCost(LinearFunctionData(0.0), 0.0), storage_target=1.0, conversion_factor=1.0, time_at_status=INFINITE_TIME, services=Device[], dynamic_injector=nothing, ext=Dict{String, Any}(), time_series_container=InfrastructureSystems.TimeSeriesContainer(), supplemental_attributes_container=InfrastructureSystems.SupplementalAttributesContainer(), ) +function HydroEnergyReservoir(name, available, bus, active_power, reactive_power, rating, prime_mover_type, active_power_limits, reactive_power_limits, ramp_limits, time_limits, base_power, storage_capacity, inflow, initial_storage, operation_cost=HydroGenerationCost(nothing), storage_target=1.0, conversion_factor=1.0, time_at_status=INFINITE_TIME, services=Device[], dynamic_injector=nothing, ext=Dict{String, Any}(), time_series_container=InfrastructureSystems.TimeSeriesContainer(), supplemental_attributes_container=InfrastructureSystems.SupplementalAttributesContainer(), ) HydroEnergyReservoir(name, available, bus, active_power, reactive_power, rating, prime_mover_type, active_power_limits, reactive_power_limits, ramp_limits, time_limits, base_power, storage_capacity, inflow, initial_storage, operation_cost, storage_target, conversion_factor, time_at_status, services, dynamic_injector, ext, time_series_container, supplemental_attributes_container, InfrastructureSystemsInternal(), ) end -function HydroEnergyReservoir(; name, available, bus, active_power, reactive_power, rating, prime_mover_type, active_power_limits, reactive_power_limits, ramp_limits, time_limits, base_power, storage_capacity, inflow, initial_storage, operation_cost=TwoPartCost(LinearFunctionData(0.0), 0.0), storage_target=1.0, conversion_factor=1.0, time_at_status=INFINITE_TIME, services=Device[], dynamic_injector=nothing, ext=Dict{String, Any}(), time_series_container=InfrastructureSystems.TimeSeriesContainer(), supplemental_attributes_container=InfrastructureSystems.SupplementalAttributesContainer(), internal=InfrastructureSystemsInternal(), ) +function HydroEnergyReservoir(; name, available, bus, active_power, reactive_power, rating, prime_mover_type, active_power_limits, reactive_power_limits, ramp_limits, time_limits, base_power, storage_capacity, inflow, initial_storage, operation_cost=HydroGenerationCost(nothing), storage_target=1.0, conversion_factor=1.0, time_at_status=INFINITE_TIME, services=Device[], dynamic_injector=nothing, ext=Dict{String, Any}(), time_series_container=InfrastructureSystems.TimeSeriesContainer(), supplemental_attributes_container=InfrastructureSystems.SupplementalAttributesContainer(), internal=InfrastructureSystemsInternal(), ) HydroEnergyReservoir(name, available, bus, active_power, reactive_power, rating, prime_mover_type, active_power_limits, reactive_power_limits, ramp_limits, time_limits, base_power, storage_capacity, inflow, initial_storage, operation_cost, storage_target, conversion_factor, time_at_status, services, dynamic_injector, ext, time_series_container, supplemental_attributes_container, internal, ) end @@ -132,7 +132,7 @@ function HydroEnergyReservoir(::Nothing) storage_capacity=0.0, inflow=0.0, initial_storage=0.0, - operation_cost=TwoPartCost(nothing), + operation_cost=HydroGenerationCost(nothing), storage_target=0.0, conversion_factor=0.0, time_at_status=INFINITE_TIME, diff --git a/src/models/generated/HydroPumpedStorage.jl b/src/models/generated/HydroPumpedStorage.jl index 29fae571b4..bb0189c731 100644 --- a/src/models/generated/HydroPumpedStorage.jl +++ b/src/models/generated/HydroPumpedStorage.jl @@ -132,11 +132,11 @@ mutable struct HydroPumpedStorage <: HydroGen internal::InfrastructureSystemsInternal end -function HydroPumpedStorage(name, available, bus, active_power, reactive_power, rating, base_power, prime_mover_type, active_power_limits, reactive_power_limits, ramp_limits, time_limits, rating_pump, active_power_limits_pump, reactive_power_limits_pump, ramp_limits_pump, time_limits_pump, storage_capacity, inflow, outflow, initial_storage, storage_target=(up=1.0, down=1.0), operation_cost=TwoPartCost(LinearFunctionData(0.0), 0.0), pump_efficiency=1.0, conversion_factor=1.0, time_at_status=INFINITE_TIME, services=Device[], dynamic_injector=nothing, ext=Dict{String, Any}(), time_series_container=InfrastructureSystems.TimeSeriesContainer(), supplemental_attributes_container=InfrastructureSystems.SupplementalAttributesContainer(), ) +function HydroPumpedStorage(name, available, bus, active_power, reactive_power, rating, base_power, prime_mover_type, active_power_limits, reactive_power_limits, ramp_limits, time_limits, rating_pump, active_power_limits_pump, reactive_power_limits_pump, ramp_limits_pump, time_limits_pump, storage_capacity, inflow, outflow, initial_storage, storage_target=(up=1.0, down=1.0), operation_cost=HydroGenerationCost(nothing), pump_efficiency=1.0, conversion_factor=1.0, time_at_status=INFINITE_TIME, services=Device[], dynamic_injector=nothing, ext=Dict{String, Any}(), time_series_container=InfrastructureSystems.TimeSeriesContainer(), supplemental_attributes_container=InfrastructureSystems.SupplementalAttributesContainer(), ) HydroPumpedStorage(name, available, bus, active_power, reactive_power, rating, base_power, prime_mover_type, active_power_limits, reactive_power_limits, ramp_limits, time_limits, rating_pump, active_power_limits_pump, reactive_power_limits_pump, ramp_limits_pump, time_limits_pump, storage_capacity, inflow, outflow, initial_storage, storage_target, operation_cost, pump_efficiency, conversion_factor, time_at_status, services, dynamic_injector, ext, time_series_container, supplemental_attributes_container, InfrastructureSystemsInternal(), ) end -function HydroPumpedStorage(; name, available, bus, active_power, reactive_power, rating, base_power, prime_mover_type, active_power_limits, reactive_power_limits, ramp_limits, time_limits, rating_pump, active_power_limits_pump, reactive_power_limits_pump, ramp_limits_pump, time_limits_pump, storage_capacity, inflow, outflow, initial_storage, storage_target=(up=1.0, down=1.0), operation_cost=TwoPartCost(LinearFunctionData(0.0), 0.0), pump_efficiency=1.0, conversion_factor=1.0, time_at_status=INFINITE_TIME, services=Device[], dynamic_injector=nothing, ext=Dict{String, Any}(), time_series_container=InfrastructureSystems.TimeSeriesContainer(), supplemental_attributes_container=InfrastructureSystems.SupplementalAttributesContainer(), internal=InfrastructureSystemsInternal(), ) +function HydroPumpedStorage(; name, available, bus, active_power, reactive_power, rating, base_power, prime_mover_type, active_power_limits, reactive_power_limits, ramp_limits, time_limits, rating_pump, active_power_limits_pump, reactive_power_limits_pump, ramp_limits_pump, time_limits_pump, storage_capacity, inflow, outflow, initial_storage, storage_target=(up=1.0, down=1.0), operation_cost=HydroGenerationCost(nothing), pump_efficiency=1.0, conversion_factor=1.0, time_at_status=INFINITE_TIME, services=Device[], dynamic_injector=nothing, ext=Dict{String, Any}(), time_series_container=InfrastructureSystems.TimeSeriesContainer(), supplemental_attributes_container=InfrastructureSystems.SupplementalAttributesContainer(), internal=InfrastructureSystemsInternal(), ) HydroPumpedStorage(name, available, bus, active_power, reactive_power, rating, base_power, prime_mover_type, active_power_limits, reactive_power_limits, ramp_limits, time_limits, rating_pump, active_power_limits_pump, reactive_power_limits_pump, ramp_limits_pump, time_limits_pump, storage_capacity, inflow, outflow, initial_storage, storage_target, operation_cost, pump_efficiency, conversion_factor, time_at_status, services, dynamic_injector, ext, time_series_container, supplemental_attributes_container, internal, ) end @@ -165,7 +165,7 @@ function HydroPumpedStorage(::Nothing) outflow=0.0, initial_storage=(up=0.0, down=0.0), storage_target=(up=0.0, down=0.0), - operation_cost=TwoPartCost(nothing), + operation_cost=HydroGenerationCost(nothing), pump_efficiency=0.0, conversion_factor=0.0, time_at_status=INFINITE_TIME, diff --git a/src/models/generated/InterconnectingConverter.jl b/src/models/generated/InterconnectingConverter.jl index d850ecd3c3..a542ff19dd 100644 --- a/src/models/generated/InterconnectingConverter.jl +++ b/src/models/generated/InterconnectingConverter.jl @@ -73,11 +73,11 @@ mutable struct InterconnectingConverter <: StaticInjection internal::InfrastructureSystemsInternal end -function InterconnectingConverter(name, available, bus, dc_bus, active_power, rating, active_power_limits, base_power, operation_cost=TwoPartCost(LinearFunctionData(0.0), 0.0), efficiency=1.0, services=Device[], dynamic_injector=nothing, ext=Dict{String, Any}(), time_series_container=InfrastructureSystems.TimeSeriesContainer(), supplemental_attributes_container=InfrastructureSystems.SupplementalAttributesContainer(), ) +function InterconnectingConverter(name, available, bus, dc_bus, active_power, rating, active_power_limits, base_power, operation_cost=LoadCost(nothing), efficiency=1.0, services=Device[], dynamic_injector=nothing, ext=Dict{String, Any}(), time_series_container=InfrastructureSystems.TimeSeriesContainer(), supplemental_attributes_container=InfrastructureSystems.SupplementalAttributesContainer(), ) InterconnectingConverter(name, available, bus, dc_bus, active_power, rating, active_power_limits, base_power, operation_cost, efficiency, services, dynamic_injector, ext, time_series_container, supplemental_attributes_container, InfrastructureSystemsInternal(), ) end -function InterconnectingConverter(; name, available, bus, dc_bus, active_power, rating, active_power_limits, base_power, operation_cost=TwoPartCost(LinearFunctionData(0.0), 0.0), efficiency=1.0, services=Device[], dynamic_injector=nothing, ext=Dict{String, Any}(), time_series_container=InfrastructureSystems.TimeSeriesContainer(), supplemental_attributes_container=InfrastructureSystems.SupplementalAttributesContainer(), internal=InfrastructureSystemsInternal(), ) +function InterconnectingConverter(; name, available, bus, dc_bus, active_power, rating, active_power_limits, base_power, operation_cost=LoadCost(nothing), efficiency=1.0, services=Device[], dynamic_injector=nothing, ext=Dict{String, Any}(), time_series_container=InfrastructureSystems.TimeSeriesContainer(), supplemental_attributes_container=InfrastructureSystems.SupplementalAttributesContainer(), internal=InfrastructureSystemsInternal(), ) InterconnectingConverter(name, available, bus, dc_bus, active_power, rating, active_power_limits, base_power, operation_cost, efficiency, services, dynamic_injector, ext, time_series_container, supplemental_attributes_container, internal, ) end @@ -92,7 +92,7 @@ function InterconnectingConverter(::Nothing) rating=0.0, active_power_limits=(min=0.0, max=0.0), base_power=0.0, - operation_cost=TwoPartCost(nothing), + operation_cost=LoadCost(nothing), efficiency=0.0, services=Device[], dynamic_injector=nothing, diff --git a/src/models/generated/InterruptiblePowerLoad.jl b/src/models/generated/InterruptiblePowerLoad.jl index ae477d9db8..9afb46a484 100644 --- a/src/models/generated/InterruptiblePowerLoad.jl +++ b/src/models/generated/InterruptiblePowerLoad.jl @@ -14,7 +14,7 @@ This file is auto-generated. Do not edit. max_active_power::Float64 max_reactive_power::Float64 base_power::Float64 - operation_cost::TwoPartCost + operation_cost::OperationalCost services::Vector{Service} dynamic_injector::Union{Nothing, DynamicInjection} ext::Dict{String, Any} @@ -34,7 +34,7 @@ This file is auto-generated. Do not edit. - `max_active_power::Float64` - `max_reactive_power::Float64` - `base_power::Float64`: Base power of the unit in MVA, validation range: `(0, nothing)`, action if invalid: `warn` -- `operation_cost::TwoPartCost`: Operation Cost of Generation [`TwoPartCost`](@ref) +- `operation_cost::OperationalCost`: Operation Cost of Generation [`OperationalCost`](@ref) - `services::Vector{Service}`: Services that this device contributes to - `dynamic_injector::Union{Nothing, DynamicInjection}`: corresponding dynamic injection device - `ext::Dict{String, Any}` @@ -52,8 +52,8 @@ mutable struct InterruptiblePowerLoad <: ControllableLoad max_reactive_power::Float64 "Base power of the unit in MVA" base_power::Float64 - "Operation Cost of Generation [`TwoPartCost`](@ref)" - operation_cost::TwoPartCost + "Operation Cost of Generation [`OperationalCost`](@ref)" + operation_cost::OperationalCost "Services that this device contributes to" services::Vector{Service} "corresponding dynamic injection device" @@ -86,7 +86,7 @@ function InterruptiblePowerLoad(::Nothing) max_active_power=0.0, max_reactive_power=0.0, base_power=0.0, - operation_cost=TwoPartCost(nothing), + operation_cost=LoadCost(nothing), services=Device[], dynamic_injector=nothing, ext=Dict{String, Any}(), diff --git a/src/models/generated/RenewableDispatch.jl b/src/models/generated/RenewableDispatch.jl index 48be24be3d..24a91d2158 100644 --- a/src/models/generated/RenewableDispatch.jl +++ b/src/models/generated/RenewableDispatch.jl @@ -15,7 +15,7 @@ This file is auto-generated. Do not edit. prime_mover_type::PrimeMovers reactive_power_limits::Union{Nothing, MinMax} power_factor::Float64 - operation_cost::TwoPartCost + operation_cost::OperationalCost base_power::Float64 services::Vector{Service} dynamic_injector::Union{Nothing, DynamicInjection} @@ -37,7 +37,7 @@ This file is auto-generated. Do not edit. - `prime_mover_type::PrimeMovers`: Prime mover technology according to EIA 923 - `reactive_power_limits::Union{Nothing, MinMax}` - `power_factor::Float64`, validation range: `(0, 1)`, action if invalid: `error` -- `operation_cost::TwoPartCost`: Operation Cost of Generation [`TwoPartCost`](@ref) +- `operation_cost::OperationalCost`: Operation Cost of Generation [`OperationalCost`](@ref) - `base_power::Float64`: Base power of the unit in MVA, validation range: `(0, nothing)`, action if invalid: `warn` - `services::Vector{Service}`: Services that this device contributes to - `dynamic_injector::Union{Nothing, DynamicInjection}`: corresponding dynamic injection device @@ -58,8 +58,8 @@ mutable struct RenewableDispatch <: RenewableGen prime_mover_type::PrimeMovers reactive_power_limits::Union{Nothing, MinMax} power_factor::Float64 - "Operation Cost of Generation [`TwoPartCost`](@ref)" - operation_cost::TwoPartCost + "Operation Cost of Generation [`OperationalCost`](@ref)" + operation_cost::OperationalCost "Base power of the unit in MVA" base_power::Float64 "Services that this device contributes to" @@ -95,7 +95,7 @@ function RenewableDispatch(::Nothing) prime_mover_type=PrimeMovers.OT, reactive_power_limits=nothing, power_factor=1.0, - operation_cost=TwoPartCost(nothing), + operation_cost=RenewablePowerCost(nothing), base_power=0.0, services=Device[], dynamic_injector=nothing,