change fields in technologies

NREL-Sienna · Mar 1, 2024 · a39b35e · a39b35e
1 parent bcd2a5e
commit a39b35e
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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