Merge pull request #299 from RWTH-EBC/issue298_SetDefaultBug

Issue298 set default bug

README.md

@@ -47,7 +47,7 @@ IEA-EBC [Annex60](https://github.com/iea-annex60/modelica-annex60).
 
 ### Version
 
-The current version is 0.3.7, which is a pre-release.
+The current version is 0.3.8, which is a pre-release.
 
 ### How to cite TEASER
 

doc/conf.py

@@ -60,7 +60,7 @@
 # The short X.Y version.
 version = '0.3.'
 # The full version, including alpha/beta/rc tags.
-release = '0.3.7'
+release = '0.3.8'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

doc/index.rst

@@ -60,7 +60,7 @@ IEA-EBC `Annex60 <https://github.com/iea-annex60/modelica-annex60>`_.
 Version
 ==================
 
-The current version is 0.3.7, which is a pre-release.
+The current version is 0.3.8, which is a pre-release.
 
 How to cite TEASER
 ==================

setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup
 
 setup(name='teaser',
-      version='0.3.7',
+      version='0.3.8',
       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, Institute of Energy Efficient Buildings and Indoor Climate',

teaser/logic/buildingobjects/thermalzone.py

@@ -1250,6 +1250,8 @@ def retrofit_zone(self, window_type=None, material=None):
             win_count.replace_window(self.parent.year_of_retrofit, window_type)
 
     def set_calc_default(self):
+        '''sets default calculation parameters
+        '''
         self.outer_walls_help = []
         self.rooftops = []
         self.ground_floors = []
@@ -1284,6 +1286,28 @@ def set_calc_default(self):
 
         self.r_rad_ow_iw = 0.0
 
+        self.r1_iw = 0.0
+        self.c1_iw = 0.0
+        self.ua_value_iw = 0.0
+        self.r_conv_iw = 0.0
+        self.r_rad_iw = 0.0
+        self.r_comb_iw = 0.0
+        self.area_iw = 0.0
+        self.r_conv_inner_iw = 0.0
+        self.r_rad_inner_iw = 0.0
+        self.r_comb_inner_iw = 0.0
+        self.r_conv_outer_iw = 0.0
+        self.r_rad_outer_iw = 0.0
+        self.r_comb_outer_iw = 0.0
+
+        self.alpha_conv_inner_iw = 0.0
+        self.alpha_rad_inner_iw = 0.0
+        self.alpha_comb_inner_iw = 0.0
+
+        self.alpha_conv_outer_iw = 0.0
+        self.alpha_rad_outer_iw = 0.0
+        self.alpha_comb_outer_iw = 0.0
+
         self.r1_rt = 0.0
         self.c1_rt = 0.0
         self.r_rest_rt = 0.0