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

continued working on the importer

Browse Source
This commit is contained in:
Saeed Ranjbar 2023-10-03 13:07:20 -04:00
parent 087384475f
commit 23a8fbe86d
5 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hub/data/energy_systems/north_america_systems.xml
View File

@ -43,9 +43,9 @@
</heatPumps> </heatPumps>
<templateGenerationEquipments generation_id="16" name="template Natural-Gas Boiler" nominalEfficiency="0.90" fuel="natural gas"/> <templateGenerationEquipments generation_id="16" name="template Natural-Gas Boiler" nominalEfficiency="0.90" fuel="natural gas"/>
<templateGenerationEquipments generation_id="17" name="template Electric Boiler" nominalEfficiency="0.95" fuel="electricity"/> <templateGenerationEquipments generation_id="17" name="template Electric Boiler" nominalEfficiency="0.95" fuel="electricity"/>
<templateGenerationEquipments generation_id="18" name="template Air-to-Water Heat Pump" fuel="Electricity" heatSource="Air" nominalCOP="3" supply_medium="water"/> <templateGenerationEquipments generation_id="18" name="template Air-to-Water Heat Pump" fuel="electricity" heatSource="Air" nominalCOP="3" supply_medium="water"/>
<templateGenerationEquipments generation_id="19" name="template Groundwater-to-Water Heat Pump" fuel="Electricity" heatSource="Ground" nominalCOP="3.5" supply_medium="water"/> <templateGenerationEquipments generation_id="19" name="template Groundwater-to-Water Heat Pump" fuel="electricity" heatSource="Ground" nominalCOP="3.5" supply_medium="water"/>
<templateGenerationEquipments generation_id="20" name="template Water-to-Water Heat Pump" fuel="Electricity" heatSource="Water" nominalCOP="3.5" supply_medium="water"/> <templateGenerationEquipments generation_id="20" name="template Water-to-Water Heat Pump" fuel="electricity" heatSource="Water" nominalCOP="3.5" supply_medium="water"/>
<templateGenerationEquipments generation_id="21" name="template Photovoltaic Module" nominalEfficiency="0.2" width="1.0" height="1.0"/> <templateGenerationEquipments generation_id="21" name="template Photovoltaic Module" nominalEfficiency="0.2" width="1.0" height="1.0"/>
<manufacturers manufacturer_id="1" name="Alpine" country="USA" product="Natural Gas Boiler"/> <manufacturers manufacturer_id="1" name="Alpine" country="USA" product="Natural Gas Boiler"/>
<manufacturers manufacturer_id="2" name="Alta" country="USA" product="Natural Gas Boiler"/> <manufacturers manufacturer_id="2" name="Alta" country="USA" product="Natural Gas Boiler"/>

2
hub/helpers/constants.py
View File

@ -199,7 +199,7 @@ BOILER = 'Boiler'
HEAT_PUMP = 'Heat Pump' HEAT_PUMP = 'Heat Pump'
BASEBOARD = 'Baseboard' BASEBOARD = 'Baseboard'
CHILLER = 'Chiller' CHILLER = 'Chiller'
SENSIBLE = 'Sensible' SENSIBLE = 'sensible'
LATENT = 'Latent' LATENT = 'Latent'
LITHIUMION = 'Lithium Ion' LITHIUMION = 'Lithium Ion'
NICD = 'NiCd' NICD = 'NiCd'

7
hub/helpers/data/north_america_storage_system_to_hub_storage.py
View File

@ -15,12 +15,7 @@ class NorthAmericaStorageSystemToHubEnergyStorage:
""" """
def __init__(self): def __init__(self):
self._dictionary = { self._dictionary = {
'Air Source Heat Pump with Natural Gas Boiler and thermal storage': cte.SENSIBLE, 'template Hot Water Storage Tank': 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,
} }
@property @property

14
hub/helpers/data/north_america_system_to_hub_energy_generation_system.py
View File

@ -15,13 +15,13 @@ class NorthAmericaSystemToHubEnergyGenerationSystem:
""" """
def __init__(self): def __init__(self):
self._dictionary = { self._dictionary = {
'Air Source Heat Pump with Natural Gas Boiler and thermal storage': [cte.HEAT_PUMP, cte.BOILER], 'template Natural-Gas Boiler': cte.BOILER,
'Air Source Heat Pump with Electrical Boiler and thermal storage': [cte.HEAT_PUMP, cte.BOILER], 'template Electric Boiler': cte.BOILER,
'Ground Source Heat Pump with Natural Gas Boiler and thermal storage': [cte.HEAT_PUMP, cte.BOILER], 'template Air-to-Water Heat Pump': cte.HEAT_PUMP,
'Ground Source Heat Pump with Electrical Gas Boiler and thermal storage': [cte.HEAT_PUMP, cte.BOILER], 'template Groundwater-to-Water Heat Pump': cte.HEAT_PUMP,
'Water Source Heat Pump with Natural Gas Boiler and thermal storage': [cte.HEAT_PUMP, cte.BOILER], 'template Water-to-Water Heat Pump': cte.HEAT_PUMP,
'Water Source Heat Pump with Electrical Gas Boiler and thermal storage': [cte.HEAT_PUMP, cte.BOILER], 'template Photovoltaic Module': cte.PHOTOVOLTAIC,
'Photovoltaic system': cte.PHOTOVOLTAIC, 'e': cte.HEATING,
} }
@property @property

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

@ -118,11 +118,12 @@ class NorthAmericaCustomEnergySystemParameters:
energy_system.generation_systems = _generation_systems energy_system.generation_systems = _generation_systems
_thermal_storage_system = ThermalStorageSystem() _thermal_storage_system = ThermalStorageSystem()
archetype_storage_equipment = system.energy_storage_systems archetype_storage_equipments = 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] for archetype_storage_equipment in archetype_storage_equipments:
_thermal_storage_system.maximum_operating_temperature = archetype_storage_equipment.maximum_operating_temperature _type = archetype_storage_equipment.name
_thermal_storage_system.height = archetype_storage_equipment.height _thermal_storage_system.maximum_operating_temperature = archetype_storage_equipment.maximum_operating_temperature
_thermal_storage_system.layers = archetype_storage_equipment.layers _thermal_storage_system.height = archetype_storage_equipment.height
_thermal_storage_system.layers = archetype_storage_equipment.layers
energy_system.energy_storage_system = _thermal_storage_system energy_system.energy_storage_system = _thermal_storage_system
building_systems.append(energy_system) building_systems.append(energy_system)