Skip to content

Commit

Permalink
Merge pull request #663 from marcusfuchs/issue662_areas
Browse files Browse the repository at this point in the history 
Fix area calculation by using correct base area
  • Loading branch information
@MichaMans
MichaMans authored Dec 1, 2020
2 parents 76e26e4 + f97b947 commit 272d545
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 18 deletions.
18 changes: 9 additions & 9 deletions teaser/logic/archetypebuildings/tabula/de/singlefamilyhouse.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ def generate_archetype(self):
outer_wall.orientation = value[1]
outer_wall.area = (
self.facade_estimation_factors[self.building_age_group]["ow1"]
* type_bldg_area
* zone.area
) / len(self._outer_wall_names_1)

if self.facade_estimation_factors[self.building_age_group]["ow2"] != 0:
Expand All @@ -396,7 +396,7 @@ def generate_archetype(self):
outer_wall.orientation = value[1]
outer_wall.area = (
self.facade_estimation_factors[self.building_age_group]["ow2"]
* type_bldg_area
* zone.area
) / len(self._outer_wall_names_2)

if self.facade_estimation_factors[self.building_age_group]["win1"] != 0:
Expand All @@ -413,7 +413,7 @@ def generate_archetype(self):
window.orientation = value[1]
window.area = (
self.facade_estimation_factors[self.building_age_group]["win1"]
* type_bldg_area
* zone.area
) / len(self.window_names_1)

if self.facade_estimation_factors[self.building_age_group]["win2"] != 0:
Expand All @@ -430,7 +430,7 @@ def generate_archetype(self):
window.orientation = value[1]
window.area = (
self.facade_estimation_factors[self.building_age_group]["win2"]
* type_bldg_area
* zone.area
) / len(self.window_names_2)

if self.facade_estimation_factors[self.building_age_group]["gf1"] != 0:
Expand All @@ -448,7 +448,7 @@ def generate_archetype(self):
gf.orientation = value[1]
gf.area = (
self.facade_estimation_factors[self.building_age_group]["gf1"]
* type_bldg_area
* zone.area
) / len(self.ground_floor_names_1)

if self.facade_estimation_factors[self.building_age_group]["gf2"] != 0:
Expand All @@ -466,7 +466,7 @@ def generate_archetype(self):
gf.orientation = value[1]
gf.area = (
self.facade_estimation_factors[self.building_age_group]["gf2"]
* type_bldg_area
* zone.area
) / len(self.ground_floor_names_2)

if self.facade_estimation_factors[self.building_age_group]["rt1"] != 0:
Expand All @@ -484,7 +484,7 @@ def generate_archetype(self):
rt.orientation = value[1]
rt.area = (
self.facade_estimation_factors[self.building_age_group]["rt1"]
* type_bldg_area
* zone.area
) / len(self.roof_names_1)

if self.facade_estimation_factors[self.building_age_group]["rt2"] != 0:
Expand All @@ -502,7 +502,7 @@ def generate_archetype(self):
rt.orientation = value[1]
rt.area = (
self.facade_estimation_factors[self.building_age_group]["rt2"]
* type_bldg_area
* zone.area
) / len(self.roof_names_2)

if self.facade_estimation_factors[self.building_age_group]["door"] != 0:
Expand All @@ -520,7 +520,7 @@ def generate_archetype(self):
door.orientation = value[1]
door.area = (
self.facade_estimation_factors[self.building_age_group]["door"]
* type_bldg_area
* zone.area
) / len(self.door_names)

for key, value in self.inner_wall_names.items():
Expand Down
18 changes: 9 additions & 9 deletions teaser/logic/archetypebuildings/tabula/dk/singlefamilyhouse.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ def generate_archetype(self):
outer_wall.orientation = value[1]
outer_wall.area = (
self.facade_estimation_factors[self.building_age_group]["ow1"]
* type_bldg_area
* zone.area
) / len(self._outer_wall_names_1)

if self.facade_estimation_factors[self.building_age_group]["ow2"] != 0:
Expand All @@ -363,7 +363,7 @@ def generate_archetype(self):
outer_wall.orientation = value[1]
outer_wall.area = (
self.facade_estimation_factors[self.building_age_group]["ow2"]
* type_bldg_area
* zone.area
) / len(self._outer_wall_names_2)

if self.facade_estimation_factors[self.building_age_group]["win1"] != 0:
Expand All @@ -380,7 +380,7 @@ def generate_archetype(self):
window.orientation = value[1]
window.area = (
self.facade_estimation_factors[self.building_age_group]["win1"]
* type_bldg_area
* zone.area
) / len(self.window_names_1)

if self.facade_estimation_factors[self.building_age_group]["win2"] != 0:
Expand All @@ -397,7 +397,7 @@ def generate_archetype(self):
window.orientation = value[1]
window.area = (
self.facade_estimation_factors[self.building_age_group]["win2"]
* type_bldg_area
* zone.area
) / len(self.window_names_2)

if self.facade_estimation_factors[self.building_age_group]["gf1"] != 0:
Expand All @@ -415,7 +415,7 @@ def generate_archetype(self):
gf.orientation = value[1]
gf.area = (
self.facade_estimation_factors[self.building_age_group]["gf1"]
* type_bldg_area
* zone.area
) / len(self.ground_floor_names_1)

if self.facade_estimation_factors[self.building_age_group]["gf2"] != 0:
Expand All @@ -433,7 +433,7 @@ def generate_archetype(self):
gf.orientation = value[1]
gf.area = (
self.facade_estimation_factors[self.building_age_group]["gf2"]
* type_bldg_area
* zone.area
) / len(self.ground_floor_names_2)

if self.facade_estimation_factors[self.building_age_group]["rt1"] != 0:
Expand All @@ -451,7 +451,7 @@ def generate_archetype(self):
rt.orientation = value[1]
rt.area = (
self.facade_estimation_factors[self.building_age_group]["rt1"]
* type_bldg_area
* zone.area
) / len(self.roof_names_1)

if self.facade_estimation_factors[self.building_age_group]["rt2"] != 0:
Expand All @@ -469,7 +469,7 @@ def generate_archetype(self):
rt.orientation = value[1]
rt.area = (
self.facade_estimation_factors[self.building_age_group]["rt2"]
* type_bldg_area
* zone.area
) / len(self.roof_names_2)

if self.facade_estimation_factors[self.building_age_group]["door"] != 0:
Expand All @@ -487,7 +487,7 @@ def generate_archetype(self):
door.orientation = value[1]
door.area = (
self.facade_estimation_factors[self.building_age_group]["door"]
* type_bldg_area
* zone.area
) / len(self.door_names)

for key, value in self.inner_wall_names.items():
Expand Down

0 comments on commit 272d545

Please sign in to comment.