Merge pull request #43 from RWTH-EBC/issue42_ReplaceWindow

Issue42 replace window

README.md

@@ -21,7 +21,7 @@ TEASER4 contains an archetype building generator as well as parameter calculatio
 
 ### Version
 
-The current version is 0.1.2. As the idea of TEASER4 came up at the Institute for Energy Efficient Buildings and Indoor Climate (EBC) at RWTH Aachen University in 2012 we leave the number 4 as a reminder.
+The current version is 0.1.3. As the idea of TEASER came up at the Institute for Energy Efficient Buildings and Indoor Climate (EBC) at RWTH Aachen University in 2012 we leave the number 4 as a reminder.
 
 
 ### How to contribute to the development of TEASER

doc/README.md

@@ -8,10 +8,11 @@ Documentation to follow
 Acknowlegdements
 -----
 
-The following people from RWTH Aachen University, E.ON Energy Research Center, Institute for Energy Efficient Buildings and Indoor Climate have directly contributed to the implementation of TEASER 4.0.1:
+The following people from RWTH Aachen University, E.ON Energy Research Center, Institute for Energy Efficient Buildings and Indoor Climate have directly contributed to the implementation of TEASER4 0.1.0:
 
 - Moritz Lauster
 - Marcus Fuchs
 - Yasin Görgülü
 - Christoph Gingter
+- Michael Mans
 - Peter Remmen

doc/_build/html/_sources/index.txt

@@ -32,7 +32,7 @@ TEASER4 contains an archetype building generator as well as parameter calculatio
 Version
 ==================
 
-The current version is 0.1.2. As the idea of TEASER came up at the Institute for Energy Efficient Buildings and Indoor Climate (EBC) at RWTH Aachen University in 2012 and this is the fourth "internal" version, we leave the number 4 as a reminder.
+The current version is 0.1.3. As the idea of TEASER came up at the Institute for Energy Efficient Buildings and Indoor Climate (EBC) at RWTH Aachen University in 2012 and this is the fourth "internal" version, we leave the number 4 as a reminder.
 
 
 How to contribute to TEASER

doc/_build/html/index.html

@@ -71,7 +71,7 @@ <h1>Description<a class="headerlink" href="#description" title="Permalink to thi
 </div>
 <div class="section" id="version">
 <h1>Version<a class="headerlink" href="#version" title="Permalink to this headline">¶</a></h1>
-<p>The current version is 0.1.2. As the idea of TEASER came up at the Institute for Energy Efficient Buildings and Indoor Climate (EBC) at RWTH Aachen University in 2012 and this is the fourth &#8220;internal&#8221; version, we leave the number 4 as a reminder.</p>
+<p>The current version is 0.1.3. As the idea of TEASER came up at the Institute for Energy Efficient Buildings and Indoor Climate (EBC) at RWTH Aachen University in 2012 and this is the fourth &#8220;internal&#8221; version, we leave the number 4 as a reminder.</p>
 </div>
 <div class="section" id="how-to-contribute-to-teaser">
 <h1>How to contribute to TEASER<a class="headerlink" href="#how-to-contribute-to-teaser" title="Permalink to this headline">¶</a></h1>

doc/_build/html/teaser.Logic.BuildingObjects.BuildingPhysics.html

@@ -86,8 +86,8 @@ <h1>BuildingPhysics package<a class="headerlink" href="#buildingphysics-package"
 <p class="rubric">Attributes</p>
 <table border="1" class="docutils">
 <colgroup>
-<col width="17%" />
-<col width="83%" />
+<col width="12%" />
+<col width="88%" />
 </colgroup>
 <tbody valign="top">
 <tr class="row-odd"><td>internal_id</td>
@@ -127,7 +127,7 @@ <h1>BuildingPhysics package<a class="headerlink" href="#buildingphysics-package"
 <td>(float) Constant heat transfer coefficient of radiation outer side for inner walls and ground floor zero</td>
 </tr>
 <tr class="row-odd"><td>layer</td>
-<td>(list) List of all layers of a building element (to be filled with Layer objects)</td>
+<td>(list) List of all layers of a building element (to be filled with Layer objects). Use element.layer = None to delete all layers of the building element</td>
 </tr>
 </tbody>
 </table>

doc/index.rst

@@ -32,7 +32,7 @@ TEASER4 contains an archetype building generator as well as parameter calculatio
 Version
 ==================
 
-The current version is 0.1.2. As the idea of TEASER came up at the Institute for Energy Efficient Buildings and Indoor Climate (EBC) at RWTH Aachen University in 2012 and this is the fourth "internal" version, we leave the number 4 as a reminder.
+The current version is 0.1.3. As the idea of TEASER came up at the Institute for Energy Efficient Buildings and Indoor Climate (EBC) at RWTH Aachen University in 2012 and this is the fourth "internal" version, we leave the number 4 as a reminder.
 
 
 How to contribute to TEASER

teaser/Logic/BuildingObjects/BuildingPhysics/BuildingElement.py

@@ -12,6 +12,7 @@
 
 
 class BuildingElement(object):
+
     '''Building element class.
 
     This is the base class for all building elements.
@@ -76,7 +77,8 @@ class BuildingElement(object):
 
     layer : list
         List of all layers of a building element (to be filled with Layer
-        objects)
+        objects). Use element.layer = None to delete all layers of the building
+        element
 
     Raises
     ----------
@@ -140,7 +142,7 @@ def calc_ua_value(self):
         self.r_outer_comb = 0.0
 
         for count_layer in self.layer:
-            self.r_conduc += (count_layer.thickness / 
+            self.r_conduc += (count_layer.thickness /
                               count_layer.material.thermal_conduc)
 
         self.r_inner_conv = (1 / self.inner_convection) * (1 / self.area)
@@ -152,9 +154,10 @@ def calc_ua_value(self):
 
             self.r_outer_conv = (1 / self.outer_convection) * (1 / self.area)
             self.r_outer_rad = (1 / self.outer_radiation) * (1 / self.area)
-            self.r_outer_comb = 1 / (1 / self.r_outer_conv + 1 / self.r_outer_rad)
+            self.r_outer_comb = 1 / \
+                (1 / self.r_outer_conv + 1 / self.r_outer_rad)
 
-        self.ua_value = (1 / (self.r_inner_comb + self.r_conduc * 
+        self.ua_value = (1 / (self.r_inner_comb + self.r_conduc *
                               (1 / self.area) + self.r_outer_comb))
 
     def gather_element_properties(self):
@@ -387,8 +390,8 @@ def save_type_element(self):
         '''
 
         xml_file = open(
-                utilis.get_full_path("InputData\\TypeBuildingElements.xml",
-                                     'r', encoding='UTF-8'))
+            utilis.get_full_path("InputData\\TypeBuildingElements.xml",
+                                 'r', encoding='UTF-8'))
 
         xml_parse = tb_bind.CreateFromDocument(xml_file.read())
 
@@ -456,8 +459,8 @@ def save_type_element(self):
             xml_parse.Window.append(pyxb_wall)
 
         out_file = open(
-                utilis.get_full_path("InputData\\TypeBuildingElements.xml",
-                                     'w', encoding='UTF-8'))
+            utilis.get_full_path("InputData\\TypeBuildingElements.xml",
+                                 'w', encoding='UTF-8'))
 
         out_file.write(xml_parse.toDOM().toprettyxml())
 
@@ -581,10 +584,11 @@ def year_of_retrofit(self):
 
     @year_of_retrofit.setter
     def year_of_retrofit(self, value):
-        if self.year_of_construction is not None:  # year_of_construction(!)
-            self._year_of_retrofit = value
-        else:
-            raise ValueError("Specify year of construction first")
+        if value is not None:
+            if self.year_of_construction is not None:
+                self._year_of_retrofit = value
+            else:
+                raise ValueError("Specify year of construction first")
 
     @property
     def orientation(self):
@@ -606,13 +610,17 @@ def layer(self):
 
     @layer.setter
     def layer(self, value):
-
-        ass_error_1 = "Value has to be an instance of Layer()"
-
-        assert isinstance(value, Layer), ass_error_1
-
-        if self._layer is None:
-            self._layer = [value]
-
+
+        if value == None:
+            self._layer = []
         else:
-            self._layer.append(value)
+            ass_error_1 = "Value has to be an instance of Layer()"
+
+            assert isinstance(value, Layer), ass_error_1
+
+
+            if self._layer is None:
+                self._layer = [value]
+
+            else:
+                self._layer.append(value)

teaser/Logic/BuildingObjects/BuildingPhysics/Window.py

@@ -74,5 +74,5 @@ def replace_window(self, year_of_refurbishment, window_type=None):
             pass
 
         self.set_calc_default()
-
+        self.layer = None
         self.load_type_element(year_of_refurbishment, window_type)