From eca86f8cab4cfae6803a627ae04573308407175f Mon Sep 17 00:00:00 2001 From: JIMENOFONSECA Date: Tue, 12 Nov 2019 13:46:13 +0800 Subject: [PATCH] super_hotfix --- cea/demand/building_properties.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/cea/demand/building_properties.py b/cea/demand/building_properties.py index 0f90409b21..a9ee477545 100644 --- a/cea/demand/building_properties.py +++ b/cea/demand/building_properties.py @@ -383,8 +383,16 @@ def geometry_reader_radiation_daysim(self, locator, envelope, occupancy, geometr df = envelope.merge(occupancy, left_index=True, right_index=True) df = df.merge(geometry, left_index=True, right_index=True) - df['empty_envelope_ratio'] = 1 - ( - (df['void_deck'] * (df['height_ag'] / df['floors_ag'])) / (df['Awall'] + df['Awin'])) + def calc_empty_envelope_ratio(void_deck_floors, height, floors, Awall, Awin): + if (Awall + Awin) > 0.0: + empty_envelope_ratio = 1 - ((void_deck_floors * (height/ floors)) / (Awall + Awin)) + else: + empty_envelope_ratio = 1 + return empty_envelope_ratio + + df['empty_envelope_ratio'] = df.apply(lambda x: calc_empty_envelope_ratio(x['void_deck'], x['height_ag'], + x['floors_ag'], x['Awall'], + x['Awin']), axis=1) # adjust envelope areas with Void_deck df['Aw'] = df['Awin'] * df['empty_envelope_ratio']