From b0e24c3fcd4b2dd0bb00dc6ef61218799ddc6cd7 Mon Sep 17 00:00:00 2001 From: Moritz Lauster Date: Tue, 28 Mar 2017 14:51:47 +0200 Subject: [PATCH] moves calculation of outer wall elements in calc_attributes behind calculation of windows #423 --- teaser/logic/buildingobjects/calculation/four_element.py | 2 +- teaser/logic/buildingobjects/calculation/one_element.py | 2 +- teaser/logic/buildingobjects/calculation/three_element.py | 2 +- teaser/logic/buildingobjects/calculation/two_element.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/teaser/logic/buildingobjects/calculation/four_element.py b/teaser/logic/buildingobjects/calculation/four_element.py index 0a6627768..e99b33b4c 100644 --- a/teaser/logic/buildingobjects/calculation/four_element.py +++ b/teaser/logic/buildingobjects/calculation/four_element.py @@ -593,7 +593,6 @@ def calc_attributes(self): ", please be careful with results. In addition " + "this might lead to RunTimeErrors") self._sum_outer_wall_elements() - self._calc_outer_elements() if len(self.thermal_zone.inner_walls) < 1: warnings.warn('For thermal zone ' + self.thermal_zone.name + ' in building ' + self.thermal_zone.parent.name + @@ -621,6 +620,7 @@ def calc_attributes(self): else: self._sum_rooftop_elements() self._calc_rooftop_elements() + self._calc_outer_elements() self._calc_wf() self._calc_mean_values() self._calc_number_of_elements() diff --git a/teaser/logic/buildingobjects/calculation/one_element.py b/teaser/logic/buildingobjects/calculation/one_element.py index dd439e4b6..39eeeabc8 100644 --- a/teaser/logic/buildingobjects/calculation/one_element.py +++ b/teaser/logic/buildingobjects/calculation/one_element.py @@ -338,13 +338,13 @@ def calc_attributes(self): ", please be careful with results. In addition " + "this might lead to RunTimeErrors") self._sum_outer_wall_elements() - self._calc_outer_elements() if len(self.thermal_zone.windows) < 1: warnings.warn('For thermal zone ' + self.thermal_zone.name + ' in building ' + self.thermal_zone.parent.name + ', no windows have been defined.') else: self._sum_window_elements() + self._calc_outer_elements() self._calc_wf() self._calc_mean_values() self._calc_number_of_elements() diff --git a/teaser/logic/buildingobjects/calculation/three_element.py b/teaser/logic/buildingobjects/calculation/three_element.py index 3768c2e51..8281b6146 100644 --- a/teaser/logic/buildingobjects/calculation/three_element.py +++ b/teaser/logic/buildingobjects/calculation/three_element.py @@ -472,7 +472,6 @@ def calc_attributes(self): ", please be careful with results. In addition " + "this might lead to RunTimeErrors") self._sum_outer_wall_elements() - self._calc_outer_elements() if len(self.thermal_zone.inner_walls) < 1: warnings.warn('For thermal zone ' + self.thermal_zone.name + ' in building ' + self.thermal_zone.parent.name + @@ -493,6 +492,7 @@ def calc_attributes(self): else: self._sum_ground_floor_elements() self._calc_ground_floor_elements() + self._calc_outer_elements() self._calc_wf() self._calc_mean_values() self._calc_number_of_elements() diff --git a/teaser/logic/buildingobjects/calculation/two_element.py b/teaser/logic/buildingobjects/calculation/two_element.py index a80596e7b..70fd68a62 100644 --- a/teaser/logic/buildingobjects/calculation/two_element.py +++ b/teaser/logic/buildingobjects/calculation/two_element.py @@ -402,7 +402,6 @@ def calc_attributes(self): ", please be careful with results. In addition " + "this might lead to RunTimeErrors") self._sum_outer_wall_elements() - self._calc_outer_elements() if len(self.thermal_zone.inner_walls) < 1: warnings.warn('For thermal zone ' + self.thermal_zone.name, ' in building ' + self.thermal_zone.parent.name + @@ -416,6 +415,7 @@ def calc_attributes(self): ', no windows have been defined.') else: self._sum_window_elements() + self._calc_outer_elements() self._calc_wf() self._calc_mean_values() self._calc_number_of_elements()