Merge pull request #649 from PGorzalka/issue639_inner_ir_emissivity_c…

…alculation

Issue639 inner ir emissivity calculation

README.md

@@ -58,7 +58,7 @@ models for all libraries supporting the
 
 ## Version
 
-TEASER is a ongoing research project, the current version is 0.7.3, which is
+TEASER is a ongoing research project, the current version is 0.7.4, which is
 still a pre-release.
 
 ## How to use TEASER

doc/conf.py

@@ -58,7 +58,7 @@
 # The short X.Y version.
 version = "0.7."
 # The full version, including alpha/beta/rc tags.
-release = "0.7.3"
+release = "0.7.4"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name="teaser",
-    version="0.7.3",
+    version="0.7.4",
     description="Tool for Energy Analysis and Simulation for " "Efficient Retrofit ",
     url="https://github.com/RWTH-EBC/TEASER",
     author="RWTH Aachen University, E.ON Energy Research Center, "

teaser/logic/buildingobjects/calculation/four_element.py

@@ -758,7 +758,7 @@ def _sum_outer_wall_elements(self):
 
         self.ir_emissivity_inner_ow = (
             (sum(out_wall.layer[0].material.ir_emissivity * out_wall.area for
-                 out_wall in self.thermal_zone.outer_walls)))
+                 out_wall in self.thermal_zone.outer_walls)) / self.area_ow)
 
         self.alpha_conv_inner_ow = (
             1 / (self.r_conv_inner_ow * self.area_ow))
@@ -835,7 +835,7 @@ def _sum_ground_floor_elements(self):
 
         self.ir_emissivity_inner_gf = sum(
             ground.layer[0].material.ir_emissivity * ground.area for ground
-            in self.thermal_zone.ground_floors)
+            in self.thermal_zone.ground_floors) / self.area_gf
 
         self.alpha_conv_inner_gf = (
             1 / (self.r_conv_inner_gf * self.area_gf))
@@ -969,12 +969,12 @@ def _sum_inner_wall_elements(self):
                                        self.thermal_zone.ceilings)))
 
         self.ir_emissivity_inner_iw = (
-            sum(in_wall.layer[0].material.ir_emissivity * in_wall.area for
-                in_wall in self.thermal_zone.inner_walls)
-            + sum(floor.layer[0].material.ir_emissivity * floor.area for
-                  floor in self.thermal_zone.floors)
-            + sum(ceiling.layer[0].material.ir_emissivity * ceiling.area for
-                  ceiling in self.thermal_zone.ceilings) / self.area_iw)
+            (sum(in_wall.layer[0].material.ir_emissivity * in_wall.area for
+                 in_wall in self.thermal_zone.inner_walls)
+             + sum(floor.layer[0].material.ir_emissivity * floor.area for
+                   floor in self.thermal_zone.floors)
+             + sum(ceiling.layer[0].material.ir_emissivity * ceiling.area for
+                   ceiling in self.thermal_zone.ceilings)) / self.area_iw)
 
         self.alpha_conv_inner_iw = (
             1 / (self.r_conv_inner_iw * self.area_iw))

teaser/logic/buildingobjects/calculation/three_element.py

@@ -722,7 +722,7 @@ def _sum_ground_floor_elements(self):
 
         self.ir_emissivity_inner_gf = sum(
             ground.layer[0].material.ir_emissivity * ground.area for ground
-            in self.thermal_zone.ground_floors)
+            in self.thermal_zone.ground_floors) / self.area_gf
 
         self.alpha_conv_inner_gf = (
             1 / (self.r_conv_inner_gf * self.area_gf))
@@ -789,12 +789,12 @@ def _sum_inner_wall_elements(self):
                                        self.thermal_zone.ceilings)))
 
         self.ir_emissivity_inner_iw = (
-            sum(in_wall.layer[0].material.ir_emissivity * in_wall.area for
-                in_wall in self.thermal_zone.inner_walls)
-            + sum(floor.layer[0].material.ir_emissivity * floor.area for
-                  floor in self.thermal_zone.floors)
-            + sum(ceiling.layer[0].material.ir_emissivity * ceiling.area for
-                  ceiling in self.thermal_zone.ceilings) / self.area_iw)
+            (sum(in_wall.layer[0].material.ir_emissivity * in_wall.area for
+                 in_wall in self.thermal_zone.inner_walls)
+             + sum(floor.layer[0].material.ir_emissivity * floor.area for
+                   floor in self.thermal_zone.floors)
+             + sum(ceiling.layer[0].material.ir_emissivity * ceiling.area for
+                   ceiling in self.thermal_zone.ceilings)) / self.area_iw)
 
         self.alpha_conv_inner_iw = (
             1 / (self.r_conv_inner_iw * self.area_iw))

teaser/logic/buildingobjects/calculation/two_element.py

@@ -687,12 +687,12 @@ def _sum_inner_wall_elements(self):
                                        self.thermal_zone.ceilings)))
 
         self.ir_emissivity_inner_iw = (
-            sum(in_wall.layer[0].material.ir_emissivity * in_wall.area for
-                in_wall in self.thermal_zone.inner_walls)
-            + sum(floor.layer[0].material.ir_emissivity * floor.area for
-                  floor in self.thermal_zone.floors)
-            + sum(ceiling.layer[0].material.ir_emissivity * ceiling.area for
-                  ceiling in self.thermal_zone.ceilings) / self.area_iw)
+            (sum(in_wall.layer[0].material.ir_emissivity * in_wall.area for
+                 in_wall in self.thermal_zone.inner_walls)
+             + sum(floor.layer[0].material.ir_emissivity * floor.area for
+                   floor in self.thermal_zone.floors)
+             + sum(ceiling.layer[0].material.ir_emissivity * ceiling.area for
+                   ceiling in self.thermal_zone.ceilings)) / self.area_iw)
 
         self.alpha_conv_inner_iw = (
             1 / (self.r_conv_inner_iw * self.area_iw))