From c221c9876f7b896c573f359898dd4282e85e32aa Mon Sep 17 00:00:00 2001 From: Peter Yefi Date: Mon, 1 Nov 2021 14:52:38 +0000 Subject: [PATCH] Added attributes for heatpump coefficients --- .../energy_systems/heat_pump.py | 87 ++++++++++++++----- 1 file changed, 65 insertions(+), 22 deletions(-) diff --git a/city_model_structure/energy_systems/heat_pump.py b/city_model_structure/energy_systems/heat_pump.py index 041f2a95..752f13b0 100644 --- a/city_model_structure/energy_systems/heat_pump.py +++ b/city_model_structure/energy_systems/heat_pump.py @@ -6,6 +6,7 @@ Contributor Peter Yefi peteryefi@gmail.com """ from typing import List +from typing import Dict class HeatPump: @@ -17,10 +18,12 @@ class HeatPump: self._model = None self._cooling_capacity = None self._cooling_comp_power = None - self._cooling_water_flow = None + self._cooling_capacity_coff = None + self._cooling_comp_power_coff = None self._heating_capacity = None self._heating_comp_power = None - self._heating_water_flow = None + self._heating_capacity_coff = None + self._heating_comp_power_coff = None @property def model(self) -> str: @@ -75,22 +78,42 @@ class HeatPump: self._cooling_comp_power = value @property - def cooling_water_flow(self) -> List[float]: + def cooling_capacity_coff(self) -> List[float]: """ - Get Water flow in m3/h - :return: [[float]] + Get cooling capacity coefficients + :return: [float] """ - return self._cooling_water_flow + return self._cooling_capacity_coff - @cooling_water_flow.setter - def cooling_water_flow(self, value): + @cooling_capacity_coff.setter + def cooling_capacity_coff(self, value): """ - Set water flow in m3/h - :param value: [[float]] + Set the value for cooling capacity coefficients + :param value: [float] :return: """ - if self._cooling_water_flow is None: - self._cooling_water_flow = value + if self._cooling_capacity_coff is None: + self._cooling_capacity_coff = value + + @property + def cooling_comp_power_coff(self) -> List[float]: + """ + Get cooling compressor power coefficients + :return: [float] + """ + return self._cooling_comp_power_coff + + @cooling_comp_power_coff.setter + def cooling_comp_power_coff(self, value): + """ + Set the value for cooling compressor power coefficients + :param value: [float] + :return: + """ + if self._cooling_comp_power_coff is None: + self._cooling_comp_power_coff = value + + @property def heating_capacity(self) -> List[float]: @@ -129,19 +152,39 @@ class HeatPump: self._heating_comp_power = value @property - def heating_water_flow(self) -> List[float]: + def heating_comp_power_coff(self) -> List[float]: """ - Get heating water flow in m3/h - :return: [[float]] + Get heating compressor power coefficients + :return: [float] """ - return self._heating_water_flow + return self._heating_comp_power_coff - @heating_water_flow.setter - def heating_water_flow(self, value): + @heating_comp_power_coff.setter + def heating_comp_power_coff(self, value): """ - Set the heating water flow in m3/h - :param value: [[float]] + Set the value for heating compressor power coefficients + :param value: [float] :return: """ - if self._heating_water_flow is None: - self._heating_water_flow = value + if self._heating_comp_power_coff is None: + self._heating_comp_power_coff = value + + @property + def heating_capacity_coff(self) -> List[float]: + """ + Get heating capacity coefficients + :return: [float] + """ + return self._heating_capacity_coff + + @heating_capacity_coff.setter + def heating_capacity_coff(self, value): + """ + Set the value for heating capacity coefficients + :param value: [float] + :return: + """ + if self._heating_capacity_coff is None: + self._heating_capacity_coff = value + +