CERC/hub
58
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases 84 Wiki Activity

final_energy_system_model #60

Merged
g_gutierrez merged 113 commits from final_energy_system_model into main 2024-03-14 09:13:21 -04:00
Conversation 0 Commits 113 Files Changed 235 +3 -7
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0240e89170 - Show all commits

8
hub/catalog_factories/energy_systems/north_america_energy_system_catalog.py
View File

@ -40,15 +40,10 @@ class NorthAmericaEnergySystemCatalog(Catalog):
def _load_generation_components(self):
generation_components = []
boilers = self._archetypes['EnergySystemCatalog']['energy_generation_components']['boilers']
print(len(boilers))
heat_pumps = self._archetypes['EnergySystemCatalog']['energy_generation_components']['heatPumps']
print(len(heat_pumps))
photovoltaics = self._archetypes['EnergySystemCatalog']['energy_generation_components']['photovoltaicModules']
print(len(photovoltaics))
templates = self._archetypes['EnergySystemCatalog']['energy_generation_components']['templateGenerationEquipments']
print(len(templates))
for boiler in boilers:
print(boiler)
boiler_id = boiler['@generation_id']
name = boiler['@name']
system_type = 'Boiler'
@ -175,7 +170,8 @@ class NorthAmericaEnergySystemCatalog(Catalog):
source_medium=source_medium,
supply_medium=supply_medium,
fuel_type=fuel_type,
heat_efficiency=heat_efficiency)
heat_efficiency=heat_efficiency,
energy_storage_systems=energy_storage_system)
generation_components.append(heat_pump_template)
else:
electricity_efficiency = float(template['@nominalEfficiency'])

2
tests/test_systems_catalog.py
View File

@ -54,4 +54,4 @@ class TestSystemsCatalog(TestCase):
with self.assertRaises(IndexError):
catalog.get_entry('unknown')
print(catalog.entries())