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

Compare commits

base: CERC:0.1.0.4
Branches Tags
CERC:main
CERC:fix/generation_systems
CERC:v0.1.0.5
CERC:0.1.0.4
CERC:0.1.0.3
CERC:0.1.0.2
CERC:0.1.0.1
...
compare: CERC:main
Branches Tags
CERC:main
CERC:fix/generation_systems
CERC:v0.1.0.5
CERC:0.1.0.4
CERC:0.1.0.3
CERC:0.1.0.2
CERC:0.1.0.1

3 Commits
0.1.0.4 ... main

Author SHA1 Message Date
Guille Gutierrez
1e9ee7b795 Update co2_emission/version.py 2024-11-06 16:09:08 -05:00
Guille Gutierrez
96406c13fc Merge pull request 'Remove generic_energy_system methods add loop for generation_systems' (#1) from fix/generation_systems into main 
Reviewed-on: #1
 2024-11-06 16:04:12 -05:00
Connor Brackley
1afdac3146 Remove generic_energy_system methods add loop for generation_systems 2024-11-06 15:34:32 -05:00
2 changed files with 22 additions and 20 deletions
Show Stats 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:

2
co2_emission/version.py
View File

@ -5,4 +5,4 @@ Copyright © 2023 Project Coder Guille Gutierrez guillermo.gutierrezmorote@conco
Code contributor Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca Code contributor Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
Code contributor Oriol Gavalda Torrellas oriol.gavalda@concordia.ca Code contributor Oriol Gavalda Torrellas oriol.gavalda@concordia.ca
""" """
__version__ = '0.1.0.4' __version__ = '0.1.0.5'