From a39b35e6ce40ad1b364b93b7b54649ab2b80d807 Mon Sep 17 00:00:00 2001 From: Jose Daniel Lara Date: Thu, 29 Feb 2024 21:42:22 -0700 Subject: [PATCH] change fields in technologies --- src/demand.jl | 3 ++- src/portfolio.jl | 2 +- src/storage.jl | 3 ++- src/supply.jl | 3 ++- src/technologies.jl | 6 +++++- src/transport.jl | 3 ++- 6 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/demand.jl b/src/demand.jl index b4fa9fa..244ea99 100644 --- a/src/demand.jl +++ b/src/demand.jl @@ -3,6 +3,7 @@ struct DemandTechnology{T <: PSY.StaticInjection} <: Technology available::Bool power_systems_type::Type{T} capital_cost::Float64 - time_series_container::InfrastructureSystems.TimeSeriesContainer + supplemental_attributes_container::IS.SupplementalAttributesContainer + time_series_container::IS.TimeSeriesContainer internal::InfrastructureSystemsInternal end diff --git a/src/portfolio.jl b/src/portfolio.jl index 29e4ca7..52839a6 100644 --- a/src/portfolio.jl +++ b/src/portfolio.jl @@ -8,7 +8,7 @@ struct Portfolio <: IS.InfrastructurePortfoliosType aggregation::Type{<:Union{PSY.ACBus, PSY.AggregationTopology}} discount_rate::Float64 portfolio_data::IS.PortfolioData # Inputs to the model - investment_data::Dict # Investment decisions container i.e., model outputs. Container TBD + investment_schedule::Dict # Investment decisions container i.e., model outputs. Container TBD metadata::PortfolioMetadata time_series_directory::Union{Nothing, String} time_series_container::InfrastructurePortfolios.TimeSeriesContainer diff --git a/src/storage.jl b/src/storage.jl index 10498a9..459b6d5 100644 --- a/src/storage.jl +++ b/src/storage.jl @@ -8,6 +8,7 @@ struct StorageTechnology{T <: PSY.Storage} <: Technology capital_cost::Float64 operational_cost::PSY.OperationalCost ext::Dict{String, Any} - time_series_container::InfrastructureSystems.TimeSeriesContainer + supplemental_attributes_container::IS.SupplementalAttributesContainer + time_series_container::IS.TimeSeriesContainer internal::InfrastructureSystemsInternal end diff --git a/src/supply.jl b/src/supply.jl index 5dc2fd9..00c1598 100644 --- a/src/supply.jl +++ b/src/supply.jl @@ -7,6 +7,7 @@ struct SupplyTechnology{T <: PSY.Generator} <: Technology capacity_factor::Float64 capital_cost::Float64 operational_cost::PSY.OperationalCost - time_series_container::InfrastructureSystems.TimeSeriesContainer + supplemental_attributes_container::IS.SupplementalAttributesContainer + time_series_container::IS.TimeSeriesContainer internal::InfrastructureSystemsInternal end diff --git a/src/technologies.jl b/src/technologies.jl index 9c71053..92a529e 100644 --- a/src/technologies.jl +++ b/src/technologies.jl @@ -1,9 +1,12 @@ """ +abstract type to represent technolgies available for investment. + Required fields for a technology Type - name - available - power_systems_type - time_series_container +- supplemental_attributes_container - internal """ abstract type Technology <: IS.InfrastructureSystemsComponent end @@ -13,4 +16,5 @@ get_available(val::Technology) = val.available get_power_systems_type(val::Technology) = val.power_systems_type get_internal(val::Technology) = val.internal get_ext(val::Technology) = get_ext(get_internal(val)) -get_name(val::Technology) = val.name +get_time_series_container(val::Technology) = val.time_series_container +get_supplemental_attributes_container(val::Technology) = val.supplemental_attributes_container diff --git a/src/transport.jl b/src/transport.jl index bbcb749..e5eaf1a 100644 --- a/src/transport.jl +++ b/src/transport.jl @@ -3,6 +3,7 @@ struct TransportTechnology{T <: PSY.Device} <: Technology available::Bool power_systems_type::Type{T} capital_cost::Float64 - time_series_container::InfrastructureSystems.TimeSeriesContainer + supplemental_attributes_container::IS.SupplementalAttributesContainer + time_series_container::IS.TimeSeriesContainer internal::InfrastructureSystemsInternal end