Skip to content

Commit 27a5208

Browse files
committed
Use typology year instead of from geometry
Replaces references to construction year from geometry with typology in BuildingEmissionTimeline. It was moved from geometry to typology
1 parent 14089a0 commit 27a5208

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

cea/analysis/lca/emission_timeline.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ def __init__(
109109
# self.building_properties = building_properties
110110
self.envelope_lookup = envelope_lookup
111111
self.geometry = building_properties.geometry[self.name]
112+
self.typology = building_properties.typology[self.name]
112113
self.envelope = building_properties.envelope[self.name]
113114
self.surface_area = self.get_component_quantity(building_properties)
114115
self.timeline = self.initialize_timeline(end_year)
@@ -152,7 +153,7 @@ def log_emissions(area, ghg, biogenic, demolition, lifetime, key):
152153
)
153154
self.log_emission_in_timeline(
154155
emission=0.0, # when building is first built, no demolition emission
155-
year=self.geometry["year"],
156+
year=self.typology["year"],
156157
col=f"demolition_{key}_kgCO2",
157158
additive=False,
158159
)
@@ -203,7 +204,7 @@ def demolish(self, demolition_year: int) -> None:
203204
:type demolition_year: int
204205
"""
205206
# if demolition_year < self.geometry["year"], raise error
206-
if demolition_year < self.geometry["year"]:
207+
if demolition_year < self.typology["year"]:
207208
raise ValueError(
208209
"Demolition year must be greater than or equal to the construction year."
209210
)
@@ -230,7 +231,7 @@ def initialize_timeline(self, end_year: int) -> pd.DataFrame:
230231
:return: The initialized timeline DataFrame.
231232
:rtype: pd.DataFrame
232233
"""
233-
start_year = self.geometry["year"]
234+
start_year = self.typology["year"]
234235
if start_year >= end_year:
235236
raise ValueError("The starting year must be less than the ending year.")
236237

@@ -265,7 +266,7 @@ def log_emission_with_lifetime(
265266
raise ValueError("Lifetime must be at least 1 year.")
266267

267268
years = list(
268-
range(self.geometry["year"], self.timeline.index.max() + 1, lifetime)
269+
range(self.typology["year"], self.timeline.index.max() + 1, lifetime)
269270
)
270271
self.log_emission_in_timeline(emission, years, col)
271272

0 commit comments

Comments
 (0)