moves calculation of outer wall elements in calc_attributes behind ca…

…lculation of windows #423
RWTH-EBC · Mar 28, 2017 · b0e24c3 · b0e24c3
1 parent 639fdef
commit b0e24c3
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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()