updated to new version of hub
This commit is contained in:
parent
3a1aeca959
commit
47ff19a842
|
@ -81,7 +81,7 @@ class CapitalCosts(CostBase):
|
||||||
capital_cost_other_hvac_ahu = 0
|
capital_cost_other_hvac_ahu = 0
|
||||||
capital_cost_lighting = 0
|
capital_cost_lighting = 0
|
||||||
|
|
||||||
for thermal_zone in self._building.thermal_zones:
|
for thermal_zone in self._building.thermal_zones_from_internal_zones:
|
||||||
for thermal_boundary in thermal_zone.thermal_boundaries:
|
for thermal_boundary in thermal_zone.thermal_boundaries:
|
||||||
if thermal_boundary.type == 'Ground':
|
if thermal_boundary.type == 'Ground':
|
||||||
surface_ground += thermal_boundary.opaque_area
|
surface_ground += thermal_boundary.opaque_area
|
||||||
|
|
|
@ -19,7 +19,7 @@ class CostBase:
|
||||||
self._building = building
|
self._building = building
|
||||||
self._configuration = configuration
|
self._configuration = configuration
|
||||||
self._total_floor_area = 0
|
self._total_floor_area = 0
|
||||||
for thermal_zone in building.thermal_zones:
|
for thermal_zone in building.thermal_zones_from_internal_zones:
|
||||||
self._total_floor_area += thermal_zone.total_floor_area
|
self._total_floor_area += thermal_zone.total_floor_area
|
||||||
self._archetype = None
|
self._archetype = None
|
||||||
self._capital_costs_chapter = None
|
self._capital_costs_chapter = None
|
||||||
|
|
|
@ -59,8 +59,8 @@ class TotalOperationalCosts(CostBase):
|
||||||
domestic_hot_water_electricity = building.domestic_hot_water_consumption[cte.YEAR][0] / 1000
|
domestic_hot_water_electricity = building.domestic_hot_water_consumption[cte.YEAR][0] / 1000
|
||||||
|
|
||||||
electricity_cooling = building.cooling_consumption[cte.YEAR][0] / 1000
|
electricity_cooling = building.cooling_consumption[cte.YEAR][0] / 1000
|
||||||
electricity_lighting = building.lighting_electrical_demand[cte.YEAR]['insel meb'] / 1000
|
electricity_lighting = building.lighting_electrical_demand[cte.YEAR][0] / 1000
|
||||||
electricity_plug_loads = building.appliances_electrical_demand[cte.YEAR]['insel meb'] / 1000
|
electricity_plug_loads = building.appliances_electrical_demand[cte.YEAR][0] / 1000
|
||||||
electricity_distribution = 0
|
electricity_distribution = 0
|
||||||
total_electricity_consumption = (
|
total_electricity_consumption = (
|
||||||
electricity_heating + electricity_cooling + electricity_lighting + domestic_hot_water_electricity +
|
electricity_heating + electricity_cooling + electricity_lighting + domestic_hot_water_electricity +
|
||||||
|
|
Loading…
Reference in New Issue
Block a user