added system schematics to the data folder and to the catalog importer
|
@ -7,6 +7,7 @@ Code contributors: Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concord
|
||||||
"""
|
"""
|
||||||
|
|
||||||
import xmltodict
|
import xmltodict
|
||||||
|
from pathlib import Path
|
||||||
from hub.catalog_factories.catalog import Catalog
|
from hub.catalog_factories.catalog import Catalog
|
||||||
from hub.catalog_factories.data_models.energy_systems.system import System
|
from hub.catalog_factories.data_models.energy_systems.system import System
|
||||||
from hub.catalog_factories.data_models.energy_systems.content import Content
|
from hub.catalog_factories.data_models.energy_systems.content import Content
|
||||||
|
@ -251,6 +252,7 @@ class NorthAmericaEnergySystemCatalog(Catalog):
|
||||||
return storage_components
|
return storage_components
|
||||||
|
|
||||||
def _load_systems(self):
|
def _load_systems(self):
|
||||||
|
base_path = Path(Path(__file__).parent.parent.parent / 'data/energy_systems')
|
||||||
_catalog_systems = []
|
_catalog_systems = []
|
||||||
systems = self._archetypes['EnergySystemCatalog']['systems']['system']
|
systems = self._archetypes['EnergySystemCatalog']['systems']['system']
|
||||||
for system in systems:
|
for system in systems:
|
||||||
|
@ -259,12 +261,13 @@ class NorthAmericaEnergySystemCatalog(Catalog):
|
||||||
demands = system['demands']['demand']
|
demands = system['demands']['demand']
|
||||||
generation_components = system['components']['generation_id']
|
generation_components = system['components']['generation_id']
|
||||||
generation_systems = self._search_generation_equipment(self._load_generation_components(), generation_components)
|
generation_systems = self._search_generation_equipment(self._load_generation_components(), generation_components)
|
||||||
|
configuration_schema = Path(base_path / system['schema'])
|
||||||
energy_system = System(system_id=system_id,
|
energy_system = System(system_id=system_id,
|
||||||
name=name,
|
name=name,
|
||||||
demand_types=demands,
|
demand_types=demands,
|
||||||
generation_systems=generation_systems,
|
generation_systems=generation_systems,
|
||||||
distribution_systems=None,
|
distribution_systems=None,
|
||||||
configuration_schema=None)
|
configuration_schema=configuration_schema)
|
||||||
_catalog_systems.append(energy_system)
|
_catalog_systems.append(energy_system)
|
||||||
return _catalog_systems
|
return _catalog_systems
|
||||||
|
|
||||||
|
|
|
@ -109,6 +109,7 @@
|
||||||
<systems>
|
<systems>
|
||||||
<system id="1">
|
<system id="1">
|
||||||
<name>Air Source Heat Pump with Natural Gas Boiler and thermal storage</name>
|
<name>Air Source Heat Pump with Natural Gas Boiler and thermal storage</name>
|
||||||
|
<schema>schemas/ASHP+TES+GasBoiler.jpg</schema>
|
||||||
<demands>
|
<demands>
|
||||||
<demand>heating</demand>
|
<demand>heating</demand>
|
||||||
<demand>domestic_hot_water</demand>
|
<demand>domestic_hot_water</demand>
|
||||||
|
@ -120,6 +121,7 @@
|
||||||
</system>
|
</system>
|
||||||
<system id="2">
|
<system id="2">
|
||||||
<name>Air Source Heat Pump with Electrical Boiler and thermal storage</name>
|
<name>Air Source Heat Pump with Electrical Boiler and thermal storage</name>
|
||||||
|
<schema>schemas/ASHP+TES+ElectricBoiler.jpg</schema>
|
||||||
<demands>
|
<demands>
|
||||||
<demand>heating</demand>
|
<demand>heating</demand>
|
||||||
<demand>domestic_hot_water</demand>
|
<demand>domestic_hot_water</demand>
|
||||||
|
@ -131,6 +133,7 @@
|
||||||
</system>
|
</system>
|
||||||
<system id="3">
|
<system id="3">
|
||||||
<name>Ground Source Heat Pump with Natural Gas Boiler and thermal storage</name>
|
<name>Ground Source Heat Pump with Natural Gas Boiler and thermal storage</name>
|
||||||
|
<schema>schemas/GSHP+TES+GasBoiler.jpg</schema>
|
||||||
<demands>
|
<demands>
|
||||||
<demand>heating</demand>
|
<demand>heating</demand>
|
||||||
<demand>domestic_hot_water</demand>
|
<demand>domestic_hot_water</demand>
|
||||||
|
@ -142,6 +145,7 @@
|
||||||
</system>
|
</system>
|
||||||
<system id="4">
|
<system id="4">
|
||||||
<name>Ground Source Heat Pump with Electrical Boiler and thermal storage</name>
|
<name>Ground Source Heat Pump with Electrical Boiler and thermal storage</name>
|
||||||
|
<schema>schemas/GSHP+TES+ElectricBoiler.jpg</schema>
|
||||||
<demands>
|
<demands>
|
||||||
<demand>heating</demand>
|
<demand>heating</demand>
|
||||||
<demand>domestic_hot_water</demand>
|
<demand>domestic_hot_water</demand>
|
||||||
|
@ -153,6 +157,7 @@
|
||||||
</system>
|
</system>
|
||||||
<system id="5">
|
<system id="5">
|
||||||
<name>Water Source Heat Pump with Natural Gas Boiler and thermal storage</name>
|
<name>Water Source Heat Pump with Natural Gas Boiler and thermal storage</name>
|
||||||
|
<schema>schemas/WSHP+TES+GasBoiler.jpg</schema>
|
||||||
<demands>
|
<demands>
|
||||||
<demand>heating</demand>
|
<demand>heating</demand>
|
||||||
<demand>domestic_hot_water</demand>
|
<demand>domestic_hot_water</demand>
|
||||||
|
@ -163,7 +168,8 @@
|
||||||
</components>
|
</components>
|
||||||
</system>
|
</system>
|
||||||
<system id="6">
|
<system id="6">
|
||||||
<name>Water Source Heat Pump with Electrical Boiler and thermal storage</name>\
|
<name>Water Source Heat Pump with Electrical Boiler and thermal storage</name>
|
||||||
|
<schema>schemas/WSHP+TES+ElectricBoiler.jpg</schema>
|
||||||
<demands>
|
<demands>
|
||||||
<demand>heating</demand>
|
<demand>heating</demand>
|
||||||
<demand>domestic_hot_water</demand>
|
<demand>domestic_hot_water</demand>
|
||||||
|
@ -175,6 +181,7 @@
|
||||||
</system>
|
</system>
|
||||||
<system id="7">
|
<system id="7">
|
||||||
<name>Photovoltaic System</name>
|
<name>Photovoltaic System</name>
|
||||||
|
<schema>schemas/PV.jpg</schema>
|
||||||
<demands>
|
<demands>
|
||||||
<demand>electricity</demand>
|
<demand>electricity</demand>
|
||||||
</demands>
|
</demands>
|
||||||
|
|
BIN
hub/data/energy_systems/schemas/ASHP+TES+ElectricBoiler.jpg
Normal file
After Width: | Height: | Size: 64 KiB |
BIN
hub/data/energy_systems/schemas/ASHP+TES+GasBoiler.jpg
Normal file
After Width: | Height: | Size: 64 KiB |
BIN
hub/data/energy_systems/schemas/GSHP+TES+ElectricBoiler.jpg
Normal file
After Width: | Height: | Size: 64 KiB |
BIN
hub/data/energy_systems/schemas/GSHP+TES+GasBoiler.jpg
Normal file
After Width: | Height: | Size: 64 KiB |
BIN
hub/data/energy_systems/schemas/PV.jpg
Normal file
After Width: | Height: | Size: 64 KiB |
BIN
hub/data/energy_systems/schemas/WSHP+TES+ElectricBoiler.jpg
Normal file
After Width: | Height: | Size: 64 KiB |
BIN
hub/data/energy_systems/schemas/WSHP+TES+GasBoiler.jpg
Normal file
After Width: | Height: | Size: 64 KiB |