Skip to content

Commit

Permalink
add base_year
Browse files Browse the repository at this point in the history
  • Loading branch information
jerrypotts committed Nov 20, 2024
1 parent 6bdd3e7 commit 5eb0acd
Show file tree
Hide file tree
Showing 7 changed files with 53 additions and 10 deletions.
12 changes: 10 additions & 2 deletions src/models/generated/ACTransportTechnology.jl
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ This file is auto-generated. Do not edit.
voltage::Float64
network_id::Int64
maximum_new_capacity::Float64
base_year::Int
existing_line_capacity::Float64
wacc::Float64
line_loss::Float64
Expand All @@ -44,6 +45,7 @@ This file is auto-generated. Do not edit.
- `voltage::Float64`: (default: `0.0`) Technology resistance in Ohms
- `network_id::Int64`: Numerical Index
- `maximum_new_capacity::Float64`: Maximum capacity that can be added to transmission line (MW)
- `base_year::Int`: (default: `2020`) Reference year for technology data
- `existing_line_capacity::Float64`: Existing capacity of transport technology (MW)
- `wacc::Float64`: (default: `0`) Weighted average cost of capital
- `line_loss::Float64`: Transmission loss for each transport technology (%)
Expand Down Expand Up @@ -79,6 +81,8 @@ mutable struct ACTransportTechnology{T <: PSY.Device} <: Technology
network_id::Int64
"Maximum capacity that can be added to transmission line (MW)"
maximum_new_capacity::Float64
"Reference year for technology data"
base_year::Int
"Existing capacity of transport technology (MW)"
existing_line_capacity::Float64
"Weighted average cost of capital"
Expand All @@ -88,8 +92,8 @@ mutable struct ACTransportTechnology{T <: PSY.Device} <: Technology
end


function ACTransportTechnology{T}(; base_power, capital_cost, start_region, available, name, capital_recovery_factor=30, end_region, power_systems_type, angle_limit=0.0, internal=InfrastructureSystemsInternal(), ext=Dict(), resistance=0.0, voltage=0.0, network_id, maximum_new_capacity, existing_line_capacity, wacc=0, line_loss, ) where T <: PSY.Device
ACTransportTechnology{T}(base_power, capital_cost, start_region, available, name, capital_recovery_factor, end_region, power_systems_type, angle_limit, internal, ext, resistance, voltage, network_id, maximum_new_capacity, existing_line_capacity, wacc, line_loss, )
function ACTransportTechnology{T}(; base_power, capital_cost, start_region, available, name, capital_recovery_factor=30, end_region, power_systems_type, angle_limit=0.0, internal=InfrastructureSystemsInternal(), ext=Dict(), resistance=0.0, voltage=0.0, network_id, maximum_new_capacity, base_year=2020, existing_line_capacity, wacc=0, line_loss, ) where T <: PSY.Device
ACTransportTechnology{T}(base_power, capital_cost, start_region, available, name, capital_recovery_factor, end_region, power_systems_type, angle_limit, internal, ext, resistance, voltage, network_id, maximum_new_capacity, base_year, existing_line_capacity, wacc, line_loss, )
end

"""Get [`ACTransportTechnology`](@ref) `base_power`."""
Expand Down Expand Up @@ -122,6 +126,8 @@ get_voltage(value::ACTransportTechnology) = value.voltage
get_network_id(value::ACTransportTechnology) = value.network_id
"""Get [`ACTransportTechnology`](@ref) `maximum_new_capacity`."""
get_maximum_new_capacity(value::ACTransportTechnology) = value.maximum_new_capacity
"""Get [`ACTransportTechnology`](@ref) `base_year`."""
get_base_year(value::ACTransportTechnology) = value.base_year
"""Get [`ACTransportTechnology`](@ref) `existing_line_capacity`."""
get_existing_line_capacity(value::ACTransportTechnology) = value.existing_line_capacity
"""Get [`ACTransportTechnology`](@ref) `wacc`."""
Expand Down Expand Up @@ -159,6 +165,8 @@ set_voltage!(value::ACTransportTechnology, val) = value.voltage = val
set_network_id!(value::ACTransportTechnology, val) = value.network_id = val
"""Set [`ACTransportTechnology`](@ref) `maximum_new_capacity`."""
set_maximum_new_capacity!(value::ACTransportTechnology, val) = value.maximum_new_capacity = val
"""Set [`ACTransportTechnology`](@ref) `base_year`."""
set_base_year!(value::ACTransportTechnology, val) = value.base_year = val
"""Set [`ACTransportTechnology`](@ref) `existing_line_capacity`."""
set_existing_line_capacity!(value::ACTransportTechnology, val) = value.existing_line_capacity = val
"""Set [`ACTransportTechnology`](@ref) `wacc`."""
Expand Down
12 changes: 10 additions & 2 deletions src/models/generated/ExistingTransportTechnology.jl
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ This file is auto-generated. Do not edit.
voltage::Float64
network_id::Int64
maximum_new_capacity::Float64
base_year::Int
existing_line_capacity::Float64
wacc::Float64
line_loss::Float64
Expand All @@ -44,6 +45,7 @@ This file is auto-generated. Do not edit.
- `voltage::Float64`: (default: `0.0`) Technology resistance in Ohms
- `network_id::Int64`: Numerical Index
- `maximum_new_capacity::Float64`: Maximum capacity that can be added to transmission line (MW)
- `base_year::Int`: (default: `2020`) Reference year for technology data
- `existing_line_capacity::Float64`: Existing capacity of transport technology (MW)
- `wacc::Float64`: (default: `0`) Weighted average cost of capital
- `line_loss::Float64`: Transmission loss for each transport technology (%)
Expand Down Expand Up @@ -79,6 +81,8 @@ mutable struct ExistingTransportTechnology{T <: PSY.Device} <: Technology
network_id::Int64
"Maximum capacity that can be added to transmission line (MW)"
maximum_new_capacity::Float64
"Reference year for technology data"
base_year::Int
"Existing capacity of transport technology (MW)"
existing_line_capacity::Float64
"Weighted average cost of capital"
Expand All @@ -88,8 +92,8 @@ mutable struct ExistingTransportTechnology{T <: PSY.Device} <: Technology
end


function ExistingTransportTechnology{T}(; base_power, capital_cost, start_region, available, name, capital_recovery_factor=30, end_region, power_systems_type, angle_limit=0.0, internal=InfrastructureSystemsInternal(), ext=Dict(), resistance=0.0, voltage=0.0, network_id, maximum_new_capacity, existing_line_capacity, wacc=0, line_loss, ) where T <: PSY.Device
ExistingTransportTechnology{T}(base_power, capital_cost, start_region, available, name, capital_recovery_factor, end_region, power_systems_type, angle_limit, internal, ext, resistance, voltage, network_id, maximum_new_capacity, existing_line_capacity, wacc, line_loss, )
function ExistingTransportTechnology{T}(; base_power, capital_cost, start_region, available, name, capital_recovery_factor=30, end_region, power_systems_type, angle_limit=0.0, internal=InfrastructureSystemsInternal(), ext=Dict(), resistance=0.0, voltage=0.0, network_id, maximum_new_capacity, base_year=2020, existing_line_capacity, wacc=0, line_loss, ) where T <: PSY.Device
ExistingTransportTechnology{T}(base_power, capital_cost, start_region, available, name, capital_recovery_factor, end_region, power_systems_type, angle_limit, internal, ext, resistance, voltage, network_id, maximum_new_capacity, base_year, existing_line_capacity, wacc, line_loss, )
end

"""Get [`ExistingTransportTechnology`](@ref) `base_power`."""
Expand Down Expand Up @@ -122,6 +126,8 @@ get_voltage(value::ExistingTransportTechnology) = value.voltage
get_network_id(value::ExistingTransportTechnology) = value.network_id
"""Get [`ExistingTransportTechnology`](@ref) `maximum_new_capacity`."""
get_maximum_new_capacity(value::ExistingTransportTechnology) = value.maximum_new_capacity
"""Get [`ExistingTransportTechnology`](@ref) `base_year`."""
get_base_year(value::ExistingTransportTechnology) = value.base_year
"""Get [`ExistingTransportTechnology`](@ref) `existing_line_capacity`."""
get_existing_line_capacity(value::ExistingTransportTechnology) = value.existing_line_capacity
"""Get [`ExistingTransportTechnology`](@ref) `wacc`."""
Expand Down Expand Up @@ -159,6 +165,8 @@ set_voltage!(value::ExistingTransportTechnology, val) = value.voltage = val
set_network_id!(value::ExistingTransportTechnology, val) = value.network_id = val
"""Set [`ExistingTransportTechnology`](@ref) `maximum_new_capacity`."""
set_maximum_new_capacity!(value::ExistingTransportTechnology, val) = value.maximum_new_capacity = val
"""Set [`ExistingTransportTechnology`](@ref) `base_year`."""
set_base_year!(value::ExistingTransportTechnology, val) = value.base_year = val
"""Set [`ExistingTransportTechnology`](@ref) `existing_line_capacity`."""
set_existing_line_capacity!(value::ExistingTransportTechnology, val) = value.existing_line_capacity = val
"""Set [`ExistingTransportTechnology`](@ref) `wacc`."""
Expand Down
12 changes: 10 additions & 2 deletions src/models/generated/HVDCTransportTechnology.jl
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ This file is auto-generated. Do not edit.
voltage::Float64
network_id::Int64
maximum_new_capacity::Float64
base_year::Int
existing_line_capacity::Float64
wacc::Float64
line_loss::Float64
Expand All @@ -44,6 +45,7 @@ This file is auto-generated. Do not edit.
- `voltage::Float64`: (default: `0.0`) Technology resistance in Ohms
- `network_id::Int64`: Numerical Index
- `maximum_new_capacity::Float64`: Maximum capacity that can be added to transmission line (MW)
- `base_year::Int`: (default: `2020`) Reference year for technology data
- `existing_line_capacity::Float64`: Existing capacity of transport technology (MW)
- `wacc::Float64`: (default: `0`) Weighted average cost of capital
- `line_loss::Float64`: Transmission loss for each transport technology (%)
Expand Down Expand Up @@ -79,6 +81,8 @@ mutable struct HVDCTransportTechnology{T <: PSY.Device} <: Technology
network_id::Int64
"Maximum capacity that can be added to transmission line (MW)"
maximum_new_capacity::Float64
"Reference year for technology data"
base_year::Int
"Existing capacity of transport technology (MW)"
existing_line_capacity::Float64
"Weighted average cost of capital"
Expand All @@ -88,8 +92,8 @@ mutable struct HVDCTransportTechnology{T <: PSY.Device} <: Technology
end


function HVDCTransportTechnology{T}(; base_power, capital_cost, start_region, available, name, capital_recovery_factor=30, end_region, power_systems_type, angle_limit=0.0, internal=InfrastructureSystemsInternal(), ext=Dict(), resistance=0.0, voltage=0.0, network_id, maximum_new_capacity, existing_line_capacity, wacc=0, line_loss, ) where T <: PSY.Device
HVDCTransportTechnology{T}(base_power, capital_cost, start_region, available, name, capital_recovery_factor, end_region, power_systems_type, angle_limit, internal, ext, resistance, voltage, network_id, maximum_new_capacity, existing_line_capacity, wacc, line_loss, )
function HVDCTransportTechnology{T}(; base_power, capital_cost, start_region, available, name, capital_recovery_factor=30, end_region, power_systems_type, angle_limit=0.0, internal=InfrastructureSystemsInternal(), ext=Dict(), resistance=0.0, voltage=0.0, network_id, maximum_new_capacity, base_year=2020, existing_line_capacity, wacc=0, line_loss, ) where T <: PSY.Device
HVDCTransportTechnology{T}(base_power, capital_cost, start_region, available, name, capital_recovery_factor, end_region, power_systems_type, angle_limit, internal, ext, resistance, voltage, network_id, maximum_new_capacity, base_year, existing_line_capacity, wacc, line_loss, )
end

"""Get [`HVDCTransportTechnology`](@ref) `base_power`."""
Expand Down Expand Up @@ -122,6 +126,8 @@ get_voltage(value::HVDCTransportTechnology) = value.voltage
get_network_id(value::HVDCTransportTechnology) = value.network_id
"""Get [`HVDCTransportTechnology`](@ref) `maximum_new_capacity`."""
get_maximum_new_capacity(value::HVDCTransportTechnology) = value.maximum_new_capacity
"""Get [`HVDCTransportTechnology`](@ref) `base_year`."""
get_base_year(value::HVDCTransportTechnology) = value.base_year
"""Get [`HVDCTransportTechnology`](@ref) `existing_line_capacity`."""
get_existing_line_capacity(value::HVDCTransportTechnology) = value.existing_line_capacity
"""Get [`HVDCTransportTechnology`](@ref) `wacc`."""
Expand Down Expand Up @@ -159,6 +165,8 @@ set_voltage!(value::HVDCTransportTechnology, val) = value.voltage = val
set_network_id!(value::HVDCTransportTechnology, val) = value.network_id = val
"""Set [`HVDCTransportTechnology`](@ref) `maximum_new_capacity`."""
set_maximum_new_capacity!(value::HVDCTransportTechnology, val) = value.maximum_new_capacity = val
"""Set [`HVDCTransportTechnology`](@ref) `base_year`."""
set_base_year!(value::HVDCTransportTechnology, val) = value.base_year = val
"""Set [`HVDCTransportTechnology`](@ref) `existing_line_capacity`."""
set_existing_line_capacity!(value::HVDCTransportTechnology, val) = value.existing_line_capacity = val
"""Set [`HVDCTransportTechnology`](@ref) `wacc`."""
Expand Down
12 changes: 10 additions & 2 deletions src/models/generated/StorageTechnology.jl
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ This file is auto-generated. Do not edit.
eff_up::Float64
cluster::Int64
ext::Dict
base_year::Int
reg_cost::Float64
min_duration::Float64
max_cap_energy::Float64
Expand Down Expand Up @@ -79,6 +80,7 @@ This file is auto-generated. Do not edit.
- `eff_up::Float64`: (default: `1.0`) Efficiency of charging storage
- `cluster::Int64`: (default: `1`) Number of the cluster when representing multiple clusters of a given technology in a given region.
- `ext::Dict`: (default: `Dict()`) Option for providing additional data
- `base_year::Int`: (default: `2020`) Reference year for technology data
- `reg_cost::Float64`: (default: `0.0`) Cost of providing regulation reserves
- `min_duration::Float64`: (default: `0.0`) Minimum required durection for a storage technology
- `max_cap_energy::Float64`: (default: `1e8`) Maximum allowable installed energy capacity for a storage technology
Expand Down Expand Up @@ -149,6 +151,8 @@ mutable struct StorageTechnology{T <: PSY.Storage} <: Technology
cluster::Int64
"Option for providing additional data"
ext::Dict
"Reference year for technology data"
base_year::Int
"Cost of providing regulation reserves "
reg_cost::Float64
"Minimum required durection for a storage technology"
Expand All @@ -160,8 +164,8 @@ mutable struct StorageTechnology{T <: PSY.Storage} <: Technology
end


function StorageTechnology{T}(; base_power, om_costs_energy=StorageCost(), existing_cap_energy=0.0, prime_mover_type=PrimeMovers.OT, lifetime=100, rsv_cost=0.0, available, existing_cap_power=0.0, name, storage_tech, capital_costs_power=LinearCurve(0.0), max_duration=1000.0, unit_size_power=0.0, capital_recovery_factor=30, id, min_cap_power=0.0, capital_costs_energy=LinearCurve(0.0), losses=1.0, eff_down=1.0, rsv_max=0.0, max_cap_power=1e8, power_systems_type, internal=InfrastructureSystemsInternal(), om_costs_power=StorageCost(), balancing_topology, min_cap_energy=0.0, region=nothing, initial_state_of_charge=0.0, unit_size_energy=0.0, eff_up=1.0, cluster=1, ext=Dict(), reg_cost=0.0, min_duration=0.0, max_cap_energy=1e8, reg_max=0.0, ) where T <: PSY.Storage
StorageTechnology{T}(base_power, om_costs_energy, existing_cap_energy, prime_mover_type, lifetime, rsv_cost, available, existing_cap_power, name, storage_tech, capital_costs_power, max_duration, unit_size_power, capital_recovery_factor, id, min_cap_power, capital_costs_energy, losses, eff_down, rsv_max, max_cap_power, power_systems_type, internal, om_costs_power, balancing_topology, min_cap_energy, region, initial_state_of_charge, unit_size_energy, eff_up, cluster, ext, reg_cost, min_duration, max_cap_energy, reg_max, )
function StorageTechnology{T}(; base_power, om_costs_energy=StorageCost(), existing_cap_energy=0.0, prime_mover_type=PrimeMovers.OT, lifetime=100, rsv_cost=0.0, available, existing_cap_power=0.0, name, storage_tech, capital_costs_power=LinearCurve(0.0), max_duration=1000.0, unit_size_power=0.0, capital_recovery_factor=30, id, min_cap_power=0.0, capital_costs_energy=LinearCurve(0.0), losses=1.0, eff_down=1.0, rsv_max=0.0, max_cap_power=1e8, power_systems_type, internal=InfrastructureSystemsInternal(), om_costs_power=StorageCost(), balancing_topology, min_cap_energy=0.0, region=nothing, initial_state_of_charge=0.0, unit_size_energy=0.0, eff_up=1.0, cluster=1, ext=Dict(), base_year=2020, reg_cost=0.0, min_duration=0.0, max_cap_energy=1e8, reg_max=0.0, ) where T <: PSY.Storage
StorageTechnology{T}(base_power, om_costs_energy, existing_cap_energy, prime_mover_type, lifetime, rsv_cost, available, existing_cap_power, name, storage_tech, capital_costs_power, max_duration, unit_size_power, capital_recovery_factor, id, min_cap_power, capital_costs_energy, losses, eff_down, rsv_max, max_cap_power, power_systems_type, internal, om_costs_power, balancing_topology, min_cap_energy, region, initial_state_of_charge, unit_size_energy, eff_up, cluster, ext, base_year, reg_cost, min_duration, max_cap_energy, reg_max, )
end

"""Get [`StorageTechnology`](@ref) `base_power`."""
Expand Down Expand Up @@ -228,6 +232,8 @@ get_eff_up(value::StorageTechnology) = value.eff_up
get_cluster(value::StorageTechnology) = value.cluster
"""Get [`StorageTechnology`](@ref) `ext`."""
get_ext(value::StorageTechnology) = value.ext
"""Get [`StorageTechnology`](@ref) `base_year`."""
get_base_year(value::StorageTechnology) = value.base_year
"""Get [`StorageTechnology`](@ref) `reg_cost`."""
get_reg_cost(value::StorageTechnology) = value.reg_cost
"""Get [`StorageTechnology`](@ref) `min_duration`."""
Expand Down Expand Up @@ -301,6 +307,8 @@ set_eff_up!(value::StorageTechnology, val) = value.eff_up = val
set_cluster!(value::StorageTechnology, val) = value.cluster = val
"""Set [`StorageTechnology`](@ref) `ext`."""
set_ext!(value::StorageTechnology, val) = value.ext = val
"""Set [`StorageTechnology`](@ref) `base_year`."""
set_base_year!(value::StorageTechnology, val) = value.base_year = val
"""Set [`StorageTechnology`](@ref) `reg_cost`."""
set_reg_cost!(value::StorageTechnology, val) = value.reg_cost = val
"""Set [`StorageTechnology`](@ref) `min_duration`."""
Expand Down
Loading

0 comments on commit 5eb0acd

Please sign in to comment.