From 923b1fe2671b280cd7beae5f0115ffd0f3135bab Mon Sep 17 00:00:00 2001 From: Saeed Ranjbar Date: Wed, 16 Aug 2023 19:33:18 -0400 Subject: [PATCH] generation components are all added to north_america_energy_system_catalog.py pv_generation_system.py is modified Tools4CitiesESMF.xml is modified --- .../energy_systems/pv_generation_system.py | 17 ++++++---- .../north_america_energy_system_catalog.py | 2 +- hub/data/energy_systems/Tools4CitiesESMF.xml | 32 +++++++++++-------- 3 files changed, 31 insertions(+), 20 deletions(-) diff --git a/hub/catalog_factories/data_models/energy_systems/pv_generation_system.py b/hub/catalog_factories/data_models/energy_systems/pv_generation_system.py index 47a2507f..650694d2 100644 --- a/hub/catalog_factories/data_models/energy_systems/pv_generation_system.py +++ b/hub/catalog_factories/data_models/energy_systems/pv_generation_system.py @@ -20,11 +20,16 @@ class PvGenerationSystem(GenerationSystem): standard_test_condition_cell_temperature, standard_test_condition_maximum_power, cell_temperature_coefficient, width, height, model_name, manufacturer, electricity_efficiency, nominal_electricity_output): - super(GenerationSystem, self).__init__(model_name=model_name, manufacturer=manufacturer, system_type='pv', - fuel_type='renewable', nominal_thermal_output=None, modulation_range=None, - source_types=None, heat_efficiency=None, cooling_efficiency=None, - electricity_efficiency=electricity_efficiency, source_temperature=None, - source_mass_flow=None, nominal_electricity_output=nominal_electricity_output) + super(PvGenerationSystem, self).__init__(model_name=model_name, manufacturer=manufacturer, system_type='pv', + fuel_type='renewable', nominal_thermal_output=None, modulation_range=None, + source_types=None,supply_medium=None, heat_efficiency=None, + cooling_efficiency=None, electricity_efficiency=electricity_efficiency, + source_temperature=None, source_mass_flow=None, + nominal_electricity_output=nominal_electricity_output, + maximum_heating_supply_temperature=None, + minimum_heating_supply_temperature=None, + maximum_cooling_supply_temperature=None, + minimum_cooling_supply_temperature=None) self._nominal_ambient_temperature = nominal_ambient_temperature self._nominal_cell_temperature = nominal_cell_temperature self._nominal_radiation = nominal_radiation @@ -112,7 +117,7 @@ class PvGenerationSystem(GenerationSystem): 'nominal radiation [W/m2]': self.nominal_radiation, 'standard test condition cell temperature [Celsius]': self.standard_test_condition_cell_temperature, 'standard test condition maximum power [kW]': self.standard_test_condition_maximum_power, - 'cell temperature coefficient':self.cell_temperature_coefficient, + 'cell temperature coefficient': self.cell_temperature_coefficient, 'width': self.width, 'height': self.height, } diff --git a/hub/catalog_factories/energy_systems/north_america_energy_system_catalog.py b/hub/catalog_factories/energy_systems/north_america_energy_system_catalog.py index 150df075..f6b37cff 100644 --- a/hub/catalog_factories/energy_systems/north_america_energy_system_catalog.py +++ b/hub/catalog_factories/energy_systems/north_america_energy_system_catalog.py @@ -31,7 +31,7 @@ class NorthAmericaEnergySystemCatalog(Catalog): def __init__(self, path): path = str(path / 'Tools4CitiesESMF.xml') with open(path, 'r', encoding='utf-8') as xml: - self._archetypes = xmltodict.parse(xml.read(), force_list=['boilers', 'photovoltaicModules']) + self._archetypes = xmltodict.parse(xml.read(), force_list=['photovoltaicModules']) self._generation_components = self._load_generation_components() print(self._generation_components) self._storage_components = self._load_storage_components() diff --git a/hub/data/energy_systems/Tools4CitiesESMF.xml b/hub/data/energy_systems/Tools4CitiesESMF.xml index 0f79b6e2..f7e45e35 100644 --- a/hub/data/energy_systems/Tools4CitiesESMF.xml +++ b/hub/data/energy_systems/Tools4CitiesESMF.xml @@ -23,11 +23,11 @@ - - - - - + + + + + @@ -40,14 +40,20 @@ - - - - - - + + + + + + + + - - + + + + + +