diff --git a/city_model_structure/facilities.py b/city_model_structure/facilities.py index 629a2dc1..aff575c6 100644 --- a/city_model_structure/facilities.py +++ b/city_model_structure/facilities.py @@ -10,14 +10,18 @@ class facilities: facilities class """ - def __init__(self, operation_schedules, heat_dissipation, lighting_facilities_electric_power): + def __init__(self, operation_schedules, convective_fraction, latent_fraction, + radiant_fraction, total_value_of_heat_dissipation): """ Constructor """ self._operation_schedules = operation_schedules - self._heat_dissipation = heat_dissipation - self._lighting_facilities_electric_power = lighting_facilities_electric_power + self._convective_fraction = convective_fraction + self._latent_fraction = latent_fraction + self._radiant_fraction = radiant_fraction + self._total_value_of_heat_dissipation = total_value_of_heat_dissipation + @property @@ -29,18 +33,33 @@ class facilities: return self._operation_schedules @property - def heat_dissipation(self): + def convective_fraction(self): """ - Get heat dissipation - :return: heat dissipation + Get convective fraction value + :return: convective fraction """ - return self._heat_dissipation + return self._convective_fraction @property - def lighting_facilities_electric_power(self): + def latent_fraction(self): """ - Get electric power of the lightings - :return: lighting electric power + Get latent fraction value + :return: latent fraction """ - return self._lighting_facilities_electric_power + return self._latent_fraction + @property + def radiant_fraction(self): + """ + Get radiant fraction value + :return: radiant fraction + """ + return self._radiant_fraction + + @property + def total_value_of_heat_dissipation(self): + """ + Get heat dissipation value + :return: heat dissipation + """ + return self._total_value_of_heat_dissipation \ No newline at end of file diff --git a/city_model_structure/hvac_facilities.py b/city_model_structure/hvac_facilities.py new file mode 100644 index 00000000..f4631daf --- /dev/null +++ b/city_model_structure/hvac_facilities.py @@ -0,0 +1,36 @@ +""" +Building module +SPDX - License - Identifier: LGPL - 3.0 - or -later +Copyright © 2020 Project Author Sanam Dabirian sanam.dabirian@mail.concordia.ca +""" + + +class hvac_facilities: + """ + HVAC facilities class + """ + + def __init__(self, temperature_setpoints, hvac_schedules): + """ + Constructor + """ + + self._temperature_setpoints = temperature_setpoints + self._hvac_schedules = hvac_schedules + + @property + def temperature_setpoints(self): + """ + Get temperature setpoints + :return: temperature setpoints + """ + return self._temperature_setpoints + + @property + def hvac_schedules(self): + """ + Get HVAC schedules + :return: HVAC schedules + """ + return self._hvac_schedules +