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

Merge remote-tracking branch 'origin/modifying_energy_system_catalogs_and_importers' into modifying_energy_system_catalogs_and_importers

Browse Source
This commit is contained in:
Guille Gutierrez 2024-07-04 08:17:59 +02:00
commit 26b2af1e2b
6 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hub/catalog_factories/data_models/energy_systems/emission_system.py
View File

@ -10,7 +10,7 @@ class EmissionSystem:
""" """
Emission system class Emission system class
""" """
def __init__(self, system_id, model_name=None, system_type=None, parasitic_energy_consumption=None): def __init__(self, system_id, model_name=None, system_type=None, parasitic_energy_consumption=0):
self._system_id = system_id self._system_id = system_id
self._model_name = model_name self._model_name = model_name

2
hub/catalog_factories/energy_systems/montreal_custom_catalog.py
View File

@ -135,7 +135,7 @@ class MontrealCustomCatalog(Catalog):
equipment_id = float(equipment['@id']) equipment_id = float(equipment['@id'])
equipment_type = equipment['@type'] equipment_type = equipment['@type']
model_name = equipment['name'] model_name = equipment['name']
parasitic_consumption = None parasitic_consumption = 0
if 'parasitic_consumption' in equipment: if 'parasitic_consumption' in equipment:
parasitic_consumption = float(equipment['parasitic_consumption']['#text']) / 100 parasitic_consumption = float(equipment['parasitic_consumption']['#text']) / 100

2
hub/catalog_factories/energy_systems/montreal_future_system_catalogue.py
View File

@ -262,7 +262,7 @@ class MontrealFutureSystemCatalogue(Catalog):
system_id = None system_id = None
model_name = None model_name = None
system_type = None system_type = None
parasitic_energy_consumption = None parasitic_energy_consumption = 0
emission_system = EmissionSystem(system_id=system_id, emission_system = EmissionSystem(system_id=system_id,
model_name=model_name, model_name=model_name,
system_type=system_type, system_type=system_type,

2
hub/city_model_structure/energy_systems/emission_system.py
View File

@ -13,7 +13,7 @@ class EmissionSystem:
def __init__(self): def __init__(self):
self._model_name = None self._model_name = None
self._type = None self._type = None
self._parasitic_energy_consumption = None self._parasitic_energy_consumption = 0
@property @property
def model_name(self): def model_name(self):

8
hub/imports/energy_systems/montreal_custom_energy_system_parameters.py
View File

@ -138,8 +138,12 @@ class MontrealCustomEnergySystemParameters:
_distribution_system.heat_losses = archetype_distribution_system.heat_losses _distribution_system.heat_losses = archetype_distribution_system.heat_losses
_emission_system = None _emission_system = None
if archetype_distribution_system.emission_systems is not None: if archetype_distribution_system.emission_systems is not None:
_emission_system = EmissionSystem() _emission_systems = []
_distribution_system.emission_systems = [_emission_system] for emission_system in archetype_distribution_system.emission_systems:
_emission_system = EmissionSystem()
_emission_system.parasitic_energy_consumption = emission_system.parasitic_energy_consumption
_emission_systems.append(_emission_system)
_distribution_system.emission_systems = _emission_systems
_distribution_systems.append(_distribution_system) _distribution_systems.append(_distribution_system)
return _distribution_systems return _distribution_systems

8
hub/imports/energy_systems/montreal_future_energy_systems_parameters.py
View File

@ -187,8 +187,12 @@ class MontrealFutureEnergySystemParameters:
_distribution_system.heat_losses = archetype_distribution_system.heat_losses _distribution_system.heat_losses = archetype_distribution_system.heat_losses
_emission_system = None _emission_system = None
if archetype_distribution_system.emission_systems is not None: if archetype_distribution_system.emission_systems is not None:
_emission_system = EmissionSystem() _emission_systems = []
_distribution_system.emission_systems = [_emission_system] for emission_system in archetype_distribution_system.emission_systems:
_emission_system = EmissionSystem()
_emission_system.parasitic_energy_consumption = emission_system.parasitic_energy_consumption
_emission_systems.append(_emission_system)
_distribution_system.emission_systems = _emission_systems
_distribution_systems.append(_distribution_system) _distribution_systems.append(_distribution_system)
return _distribution_systems return _distribution_systems