From d6677c7fdb372926b102a34b7d08a20f3798873f Mon Sep 17 00:00:00 2001 From: Alireza Adli Date: Thu, 18 Jul 2024 17:16:30 -0400 Subject: [PATCH] Finalize minor improvements --- .../life_cycle_assessment/access_nrcan_catalogue.py | 4 ++-- .../life_cycle_assessment/opening_emission.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hub/city_model_structure/life_cycle_assessment/access_nrcan_catalogue.py b/hub/city_model_structure/life_cycle_assessment/access_nrcan_catalogue.py index a04c2fd2..04350b81 100644 --- a/hub/city_model_structure/life_cycle_assessment/access_nrcan_catalogue.py +++ b/hub/city_model_structure/life_cycle_assessment/access_nrcan_catalogue.py @@ -103,9 +103,9 @@ class AccessNrcanCatalog: return opaque_surface[opaque_surface_key]['layers'] def search_transparent_surfaces( - self, surface_type, opaque_surface_code, climate_zone): + self, surface_type, opaque_surface_code): return self.transparent_surfaces[ - f'{surface_type}_{opaque_surface_code}_{climate_zone}'] + f'{surface_type}_{opaque_surface_code}'] def find_opaque_surface(self, function, period_of_construction, climate_zone): """Returns the opaque_surface_name corresponding to the given arguments.""" diff --git a/hub/city_model_structure/life_cycle_assessment/opening_emission.py b/hub/city_model_structure/life_cycle_assessment/opening_emission.py index c14eaaf3..dc87893f 100644 --- a/hub/city_model_structure/life_cycle_assessment/opening_emission.py +++ b/hub/city_model_structure/life_cycle_assessment/opening_emission.py @@ -22,5 +22,5 @@ class OpeningEmission: def opening_surface(self): return self._opening_surface - def opening_emission(self): + def calculate_opening_emission(self): return self._opening_material_emission * self._opening_surface