From db30870fc1cfbb59db5a94ed0359159f53a408f6 Mon Sep 17 00:00:00 2001 From: Pilar Date: Thu, 1 Dec 2022 15:33:14 -0500 Subject: [PATCH] change units in monthly energy balance exporter --- city_model_structure/city.py | 8 ++++++-- .../building_energy/insel/insel_monthly_energy_balance.py | 4 ++-- imports/construction/data_classes/building_achetype.py | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/city_model_structure/city.py b/city_model_structure/city.py index c8f9ea60..39e9736c 100644 --- a/city_model_structure/city.py +++ b/city_model_structure/city.py @@ -452,5 +452,9 @@ class City: return _merge_city @property - def level_of_detail(self): - return self._level_of_detail + def level_of_detail(self) -> LevelOfDetail: + """ + Get level of detail of different aspects of the city: geometry, construction and usage + :return: LevelOfDetail + """ + return self._level_of_detail diff --git a/exports/building_energy/insel/insel_monthly_energy_balance.py b/exports/building_energy/insel/insel_monthly_energy_balance.py index ef9a4db4..55f08443 100644 --- a/exports/building_energy/insel/insel_monthly_energy_balance.py +++ b/exports/building_energy/insel/insel_monthly_energy_balance.py @@ -71,9 +71,9 @@ class InselMonthlyEnergyBalance(Insel): internal_zone = building.internal_zones[0] thermal_zone = internal_zone.thermal_zones[0] parameters.append(f'{thermal_zone.indirectly_heated_area_ratio} % BP(6) Indirectly heated area ratio') - parameters.append(f'{thermal_zone.effective_thermal_capacity / 1000} % BP(7) Effective heat capacity (kJ/m2K)') + parameters.append(f'{thermal_zone.effective_thermal_capacity / 3600} % BP(7) Effective heat capacity (Wh/m2K)') parameters.append(f'{thermal_zone.additional_thermal_bridge_u_value} ' - f'% BP(8) Additional U-value for heat bridge W/m2K') + f'% BP(8) Additional U-value for heat bridge (Wh/m2K)') parameters.append('1 % BP(9) Usage type (0=standard, 1=IWU)') # ZONES AND SURFACES diff --git a/imports/construction/data_classes/building_achetype.py b/imports/construction/data_classes/building_achetype.py index 199cc5a4..708549b5 100644 --- a/imports/construction/data_classes/building_achetype.py +++ b/imports/construction/data_classes/building_achetype.py @@ -60,7 +60,7 @@ class BuildingArchetype: @property def additional_thermal_bridge_u_value(self): """ - Get archetype's additional U value due to thermal bridges in W/m2K + Get archetype's additional U value due to thermal bridges per area of shell in W/m2K :return: float """ return self._additional_thermal_bridge_u_value