s_ranjbar/summer_course_2024
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

The dual_supply_capability is added to the city model structure

Browse Source
This commit is contained in:
Saeed Ranjbar 2024-02-01 15:41:05 -05:00
parent ac4742d2c4
commit 3e193f04a6
3 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hub/city_model_structure/energy_systems/non_pv_generation_system.py
View File

@ -42,6 +42,7 @@ class NonPvGenerationSystem(GenerationSystem):
self._cooling_output_curve = None self._cooling_output_curve = None
self._cooling_fuel_consumption_curve = None self._cooling_fuel_consumption_curve = None
self._cooling_efficiency_curve = None self._cooling_efficiency_curve = None
self._dual_supply_capability = None
@property @property
def nominal_heat_output(self): def nominal_heat_output(self):
@ -427,4 +428,22 @@ class NonPvGenerationSystem(GenerationSystem):
""" """
self._cooling_efficiency_curve = value self._cooling_efficiency_curve = value
@property
def dual_supply_capability(self):
"""
Get the capability of the generation component for simultaneous heat and cold production
:return: bool
"""
return self._dual_supply_capability
@dual_supply_capability.setter
def dual_supply_capability(self, value):
"""
Set the capability of the generation component for simultaneous heat and cold production
:return: bool
"""
self._dual_supply_capability = value

2
hub/imports/energy_systems/north_america_custom_energy_system_parameters.py
View File

@ -120,6 +120,8 @@ class NorthAmericaCustomEnergySystemParameters:
_generic_storage_system.type_energy_stored = 'thermal' _generic_storage_system.type_energy_stored = 'thermal'
_storage_systems.append(_generic_storage_system) _storage_systems.append(_generic_storage_system)
_generation_system.energy_storage_systems = [_storage_systems] _generation_system.energy_storage_systems = [_storage_systems]
if archetype_generation_system.dual_supply_capability:
_generation_system.dual_supply_capability = True
_generation_systems.append(_generation_system) _generation_systems.append(_generation_system)
return _generation_systems return _generation_systems

3
tests/test_systems_factory.py
View File

@ -141,4 +141,5 @@ class TestSystemsFactory(TestCase):
self.assertLess(0, building.heating_consumption[cte.YEAR][0]) self.assertLess(0, building.heating_consumption[cte.YEAR][0])
self.assertEqual(0, building.cooling_consumption[cte.YEAR][0]) self.assertEqual(0, building.cooling_consumption[cte.YEAR][0])
self.assertLess(0, building.domestic_hot_water_consumption[cte.YEAR][0]) self.assertLess(0, building.domestic_hot_water_consumption[cte.YEAR][0])
self.assertLess(0, building.onsite_electrical_production[cte.YEAR][0]) self.assertLess(0, building.onsite_electrical_production[cte.YEAR][0])
print('test')