The dual_supply_capability is added to the city model structure
This commit is contained in:
parent
ac4742d2c4
commit
3e193f04a6
|
@ -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
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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')
|
Loading…
Reference in New Issue
Block a user