From 23a8fbe86dfe7732bde98e43f9299c906527b634 Mon Sep 17 00:00:00 2001 From: Saeed Ranjbar Date: Tue, 3 Oct 2023 13:07:20 -0400 Subject: [PATCH] continued working on the importer --- hub/data/energy_systems/north_america_systems.xml | 6 +++--- hub/helpers/constants.py | 2 +- .../north_america_storage_system_to_hub_storage.py | 7 +------ ...erica_system_to_hub_energy_generation_system.py | 14 +++++++------- ...orth_america_custom_energy_system_parameters.py | 11 ++++++----- 5 files changed, 18 insertions(+), 22 deletions(-) diff --git a/hub/data/energy_systems/north_america_systems.xml b/hub/data/energy_systems/north_america_systems.xml index 285f9de7..36cee745 100644 --- a/hub/data/energy_systems/north_america_systems.xml +++ b/hub/data/energy_systems/north_america_systems.xml @@ -43,9 +43,9 @@ - - - + + + diff --git a/hub/helpers/constants.py b/hub/helpers/constants.py index 586a3a79..1fc51890 100644 --- a/hub/helpers/constants.py +++ b/hub/helpers/constants.py @@ -199,7 +199,7 @@ BOILER = 'Boiler' HEAT_PUMP = 'Heat Pump' BASEBOARD = 'Baseboard' CHILLER = 'Chiller' -SENSIBLE = 'Sensible' +SENSIBLE = 'sensible' LATENT = 'Latent' LITHIUMION = 'Lithium Ion' NICD = 'NiCd' diff --git a/hub/helpers/data/north_america_storage_system_to_hub_storage.py b/hub/helpers/data/north_america_storage_system_to_hub_storage.py index 1a947b8d..fbdebd1e 100644 --- a/hub/helpers/data/north_america_storage_system_to_hub_storage.py +++ b/hub/helpers/data/north_america_storage_system_to_hub_storage.py @@ -15,12 +15,7 @@ class NorthAmericaStorageSystemToHubEnergyStorage: """ def __init__(self): self._dictionary = { - 'Air Source Heat Pump with Natural Gas Boiler and thermal storage': cte.SENSIBLE, - 'Air Source Heat Pump with Electrical Boiler and thermal storage': cte.SENSIBLE, - 'Ground Source Heat Pump with Natural Gas Boiler and thermal storage': cte.SENSIBLE, - 'Ground Source Heat Pump with Electrical Gas Boiler and thermal storage': cte.SENSIBLE, - 'Water Source Heat Pump with Natural Gas Boiler and thermal storage': cte.SENSIBLE, - 'Water Source Heat Pump with Electrical Gas Boiler and thermal storage': cte.SENSIBLE, + 'template Hot Water Storage Tank': cte.SENSIBLE, } @property diff --git a/hub/helpers/data/north_america_system_to_hub_energy_generation_system.py b/hub/helpers/data/north_america_system_to_hub_energy_generation_system.py index 56ff51fd..d7a19943 100644 --- a/hub/helpers/data/north_america_system_to_hub_energy_generation_system.py +++ b/hub/helpers/data/north_america_system_to_hub_energy_generation_system.py @@ -15,13 +15,13 @@ class NorthAmericaSystemToHubEnergyGenerationSystem: """ def __init__(self): self._dictionary = { - 'Air Source Heat Pump with Natural Gas Boiler and thermal storage': [cte.HEAT_PUMP, cte.BOILER], - 'Air Source Heat Pump with Electrical Boiler and thermal storage': [cte.HEAT_PUMP, cte.BOILER], - 'Ground Source Heat Pump with Natural Gas Boiler and thermal storage': [cte.HEAT_PUMP, cte.BOILER], - 'Ground Source Heat Pump with Electrical Gas Boiler and thermal storage': [cte.HEAT_PUMP, cte.BOILER], - 'Water Source Heat Pump with Natural Gas Boiler and thermal storage': [cte.HEAT_PUMP, cte.BOILER], - 'Water Source Heat Pump with Electrical Gas Boiler and thermal storage': [cte.HEAT_PUMP, cte.BOILER], - 'Photovoltaic system': cte.PHOTOVOLTAIC, + 'template Natural-Gas Boiler': cte.BOILER, + 'template Electric Boiler': cte.BOILER, + 'template Air-to-Water Heat Pump': cte.HEAT_PUMP, + 'template Groundwater-to-Water Heat Pump': cte.HEAT_PUMP, + 'template Water-to-Water Heat Pump': cte.HEAT_PUMP, + 'template Photovoltaic Module': cte.PHOTOVOLTAIC, + 'e': cte.HEATING, } @property diff --git a/hub/imports/energy_systems/north_america_custom_energy_system_parameters.py b/hub/imports/energy_systems/north_america_custom_energy_system_parameters.py index 72e60fcf..c1770c87 100644 --- a/hub/imports/energy_systems/north_america_custom_energy_system_parameters.py +++ b/hub/imports/energy_systems/north_america_custom_energy_system_parameters.py @@ -118,11 +118,12 @@ class NorthAmericaCustomEnergySystemParameters: energy_system.generation_systems = _generation_systems _thermal_storage_system = ThermalStorageSystem() - archetype_storage_equipment = system.energy_storage_systems - _thermal_storage_system.generic_storage_system.storage_type = Dictionaries().north_america_storage_system_to_hub_storage[archetype_storage_equipment.storage_type] - _thermal_storage_system.maximum_operating_temperature = archetype_storage_equipment.maximum_operating_temperature - _thermal_storage_system.height = archetype_storage_equipment.height - _thermal_storage_system.layers = archetype_storage_equipment.layers + archetype_storage_equipments = system.energy_storage_systems + for archetype_storage_equipment in archetype_storage_equipments: + _type = archetype_storage_equipment.name + _thermal_storage_system.maximum_operating_temperature = archetype_storage_equipment.maximum_operating_temperature + _thermal_storage_system.height = archetype_storage_equipment.height + _thermal_storage_system.layers = archetype_storage_equipment.layers energy_system.energy_storage_system = _thermal_storage_system building_systems.append(energy_system)