From 680b63502543c806f1f15f2583c182d07155f9cd Mon Sep 17 00:00:00 2001 From: Peter Yefi Date: Wed, 15 Dec 2021 09:20:08 +0000 Subject: [PATCH] changed heat_pump to air source to reflect data source --- .../energy_systems/air_source_hp.py | 27 ++++--------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/city_model_structure/energy_systems/air_source_hp.py b/city_model_structure/energy_systems/air_source_hp.py index 752f13b0..c6aeaa8a 100644 --- a/city_model_structure/energy_systems/air_source_hp.py +++ b/city_model_structure/energy_systems/air_source_hp.py @@ -1,21 +1,21 @@ """ -heat_pump module defines a heat pump +air_source_hp module defines an air source heat pump SPDX - License - Identifier: LGPL - 3.0 - or -later Copyright © 2020 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca Contributor Peter Yefi peteryefi@gmail.com """ from typing import List -from typing import Dict +from city_model_structure.energy_systems.heat_pump import HeatPump -class HeatPump: +class AirSourceHP(HeatPump): """ - HeatPump class + AirSourceHP class """ def __init__(self): - self._model = None + super().__init__() self._cooling_capacity = None self._cooling_comp_power = None self._cooling_capacity_coff = None @@ -25,23 +25,6 @@ class HeatPump: self._heating_capacity_coff = None self._heating_comp_power_coff = None - @property - def model(self) -> str: - """ - Get model name - :return: str - """ - return self._model - - @model.setter - def model(self, value): - """ - Set model (name, indicated in capacity) - :param value: str - """ - if self._model is None: - self._model = value - @property def cooling_capacity(self) -> List[float]: """