Skip to content

Commit

Permalink
Merge pull request #21 from RWTH-EBC/issue20_BugResidential
Browse files Browse the repository at this point in the history
Issue20 bug residential
  • Loading branch information
MichaMans committed Oct 28, 2015
2 parents ed812fe + d8fc49c commit a742351
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ TEASER4 contains an archetype building generator as well as parameter calculatio

### Version

The current version is 0.1.0. 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.1. 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.


### How to contribute to the development of TEASER
Expand Down
2 changes: 1 addition & 1 deletion doc/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ TEASER4 contains an archetype building generator as well as parameter calculatio
Version
==================

The current version is 0.1.0. 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.1. 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
Expand Down
2 changes: 1 addition & 1 deletion teaser/Logic/BuildingObjects/TypeBuildings/Residential.py
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ def __init__(self, parent, name, year_of_construction=None,
if self.residential_layout == 0:
self._est_facade_to_floor_area = 0.66
elif self.residential_layout == 1:
self.est_facade_to_floor_area = 0.8
self._est_facade_to_floor_area = 0.8

self._est_factor_heated_attic = 0.0 # f_TB_DG
self._est_area_per_floor = 0.0 # p_DA
Expand Down

0 comments on commit a742351

Please sign in to comment.