rolled back some changes and hardcoded values

This commit is contained in:
Pilar Monsalvete 2023-05-02 14:44:45 -04:00
parent 9ecf59c68f
commit 7a6bf0ac52

View File

@ -4,7 +4,6 @@ SPDX - License - Identifier: LGPL - 3.0 - or -later
Copyright © 2022 Concordia CERC group Copyright © 2022 Concordia CERC group
Project Coder Guille Guillermo.GutierrezMorote@concordia.ca Project Coder Guille Guillermo.GutierrezMorote@concordia.ca
Code contributors: Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca Code contributors: Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
Soroush Samareh Abolhassani soroush.samarehabolhassani@mail.concordia.ca
""" """
import copy import copy
from pathlib import Path from pathlib import Path
@ -190,7 +189,6 @@ class Idf:
_schedule.Minutes_per_Item = 60 _schedule.Minutes_per_Item = 60
def _add_infiltration_schedules(self, thermal_zone): def _add_infiltration_schedules(self, thermal_zone):
# todo: clean the way infiltration is hardcoded
_infiltration_schedules = [] _infiltration_schedules = []
if thermal_zone.thermal_control is None: if thermal_zone.thermal_control is None:
return return
@ -204,9 +202,9 @@ class Idf:
_infiltration_values = [] _infiltration_values = []
for hvac_value in hvac_availability_schedule.values: for hvac_value in hvac_availability_schedule.values:
if hvac_value == 0: if hvac_value == 0:
_infiltration_values.append(1) _infiltration_values.append(thermal_zone.infiltration_rate_system_off)
else: else:
_infiltration_values.append(1) _infiltration_values.append(thermal_zone.infiltration_rate_system_on)
_schedule.values = _infiltration_values _schedule.values = _infiltration_values
_infiltration_schedules.append(_schedule) _infiltration_schedules.append(_schedule)
for schedule in self._idf.idfobjects[self._HOURLY_SCHEDULE]: for schedule in self._idf.idfobjects[self._HOURLY_SCHEDULE]:
@ -424,7 +422,7 @@ class Idf:
Air_Changes_per_Hour=thermal_zone.infiltration_rate_system_off * factorreduct Air_Changes_per_Hour=thermal_zone.infiltration_rate_system_off * factorreduct
) )
def _add_DHW(self, thermal_zone, zone_name): def _add_dhw(self, thermal_zone, zone_name):
fuel_type = 'Electricity' fuel_type = 'Electricity'
method = 'Watts/Area' method = 'Watts/Area'
factor_size = thermal_zone.total_floor_area / thermal_zone.footprint_area factor_size = thermal_zone.total_floor_area / thermal_zone.footprint_area
@ -501,7 +499,7 @@ class Idf:
self._add_occupancy(thermal_zone, building.name) self._add_occupancy(thermal_zone, building.name)
self._add_lighting(thermal_zone, building.name) self._add_lighting(thermal_zone, building.name)
self._add_appliances(thermal_zone, building.name) self._add_appliances(thermal_zone, building.name)
self._add_DHW(thermal_zone, building.name) self._add_dhw(thermal_zone, building.name)
if self._export_type == "Surfaces": if self._export_type == "Surfaces":
if building.name in self._target_buildings or building.name in self._adjacent_buildings: if building.name in self._target_buildings or building.name in self._adjacent_buildings:
if building.internal_zones[0].thermal_zones is not None: if building.internal_zones[0].thermal_zones is not None: