CERC/co2_emission
19
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 5 Wiki Activity

Remove generic_energy_system methods add loop for generation_systems #1

Merged
g_gutierrez merged 1 commits from fix/generation_systems into main 2024-11-06 16:04:12 -05:00
Conversation 0 Commits 1 Files Changed 1 +21 -19
1 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
co2_emission/co2_emission.py
View File

@ -40,7 +40,8 @@ class Co2Emission:
""" """
results = {} results = {}
for energy_system in self._building.energy_systems: for energy_system in self._building.energy_systems:
fuel_type = energy_system.generation_system.generic_generation_system.fuel_type for generation_system in energy_system.generation_systems:
fuel_type = generation_system.fuel_type
emissions_factor = self._emissions_factor[fuel_type] emissions_factor = self._emissions_factor[fuel_type]
for demand_type in energy_system.demand_types: for demand_type in energy_system.demand_types:
if demand_type == cte.ELECTRICITY: if demand_type == cte.ELECTRICITY:
@ -59,6 +60,7 @@ class Co2Emission:
values = [v * emissions_factor for v in self._building.domestic_hot_water_consumption[time_period]] values = [v * emissions_factor for v in self._building.domestic_hot_water_consumption[time_period]]
results_by_time_period[time_period] = values results_by_time_period[time_period] = values
results[demand_type] = results_by_time_period results[demand_type] = results_by_time_period
emission_factor = self._emissions_factor[cte.ELECTRICITY] emission_factor = self._emissions_factor[cte.ELECTRICITY]
results_by_time_period = {} results_by_time_period = {}
for time_period in self._building.lighting_electrical_demand: for time_period in self._building.lighting_electrical_demand: