From 5a99f16bc97d7ea15d2f138c53ce38730e47b77a Mon Sep 17 00:00:00 2001 From: p_monsalvete Date: Wed, 3 May 2023 09:58:52 -0400 Subject: [PATCH] solved 2 todos --- hub/city_model_structure/building_demand/surface.py | 1 + .../montreal_custom_energy_system_parameters.py | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/hub/city_model_structure/building_demand/surface.py b/hub/city_model_structure/building_demand/surface.py index a8df0330..56d73d1c 100644 --- a/hub/city_model_structure/building_demand/surface.py +++ b/hub/city_model_structure/building_demand/surface.py @@ -42,6 +42,7 @@ class Surface: self._associated_thermal_boundaries = [] self._vegetation = None self._percentage_shared = None + self._pv_coverage = None @property def name(self): diff --git a/hub/imports/energy_systems/montreal_custom_energy_system_parameters.py b/hub/imports/energy_systems/montreal_custom_energy_system_parameters.py index 07a14b31..3ce85e0c 100644 --- a/hub/imports/energy_systems/montreal_custom_energy_system_parameters.py +++ b/hub/imports/energy_systems/montreal_custom_energy_system_parameters.py @@ -45,9 +45,10 @@ class MontrealCustomEnergySystemParameters: energy_system.demand_types = equipment.demand_types _generation_system = GenericGenerationSystem() archetype_generation_equipment = equipment.generation_system - # todo: calculate powers - _generation_system.heat_power = 0 - _generation_system.cooling_power = 0 + # dhw peak does not add anything to the total heat peak + _generation_system.heat_power = building.heating_peak_load + _generation_system.cooling_power = building.cooling_peak_load + # the only system that generates electricity in the montreal custom catalog is PV systems _generation_system.electricity_power = 0 _generation_system.fuel_type = archetype_generation_equipment.fuel_type _generation_system.source_types = archetype_generation_equipment.source_types