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 +9 -12
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b7c2bbae96 - Show all commits

2
hub/catalog_factories/data_models/energy_systems/pv_generation_system.py
View File

@ -33,7 +33,7 @@ class PvGenerationSystem(GenerationSystem):
minimum_cooling_supply_temperature=None, heat_output_curve=None, minimum_cooling_supply_temperature=None, heat_output_curve=None,
heat_fuel_consumption_curve=None, heat_efficiency_curve=None, heat_fuel_consumption_curve=None, heat_efficiency_curve=None,
cooling_output_curve=None, cooling_fuel_consumption_curve=None, cooling_output_curve=None, cooling_fuel_consumption_curve=None,
cooling_efficiency_curve=None, storage=None, auxiliary_equipment=None) cooling_efficiency_curve=None)
self._nominal_ambient_temperature = nominal_ambient_temperature self._nominal_ambient_temperature = nominal_ambient_temperature
self._nominal_cell_temperature = nominal_cell_temperature self._nominal_cell_temperature = nominal_cell_temperature
self._nominal_radiation = nominal_radiation self._nominal_radiation = nominal_radiation

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

@ -86,8 +86,6 @@ class NorthAmericaEnergySystemCatalog(Catalog):
None, None,
None, None,
None, None,
None,
None,
None) None)
generation_components.append(boiler_component) generation_components.append(boiler_component)
for heat_pump in heat_pumps: for heat_pump in heat_pumps:
@ -142,8 +140,6 @@ class NorthAmericaEnergySystemCatalog(Catalog):
cop_curve, cop_curve,
None, None,
None, None,
None,
None,
None) None)
generation_components.append(heat_pump_component) generation_components.append(heat_pump_component)
for pv in photovoltaics: for pv in photovoltaics:
@ -215,8 +211,6 @@ class NorthAmericaEnergySystemCatalog(Catalog):
None, None,
None, None,
None, None,
None,
None,
None) None)
generation_components.append(boiler_template) generation_components.append(boiler_template)
elif "Heat Pump" in system_name: elif "Heat Pump" in system_name:
@ -254,8 +248,6 @@ class NorthAmericaEnergySystemCatalog(Catalog):
None, None,
None, None,
None, None,
None,
None,
None) None)
generation_components.append(heat_pump_template) generation_components.append(heat_pump_template)
else: else:
@ -309,6 +301,8 @@ class NorthAmericaEnergySystemCatalog(Catalog):
model_name, model_name,
manufacturer, manufacturer,
storage_type, storage_type,
None,
None,
volume, volume,
height, height,
layers, layers,
@ -338,6 +332,8 @@ class NorthAmericaEnergySystemCatalog(Catalog):
None, None,
storage_type, storage_type,
None, None,
None,
None,
height, height,
layers, layers,
maximum_temperature) maximum_temperature)

7
tests/test_systems_catalog.py
View File

@ -13,6 +13,7 @@ class TestSystemsCatalog(TestCase):
def test_montreal_custom_catalog(self): def test_montreal_custom_catalog(self):
catalog = EnergySystemsCatalogFactory('montreal_custom').catalog catalog = EnergySystemsCatalogFactory('montreal_custom').catalog
catalog_categories = catalog.names() catalog_categories = catalog.names()
archetypes = catalog.names('archetypes') archetypes = catalog.names('archetypes')
self.assertEqual(23, len(archetypes['archetypes'])) self.assertEqual(23, len(archetypes['archetypes']))
@ -32,13 +33,13 @@ class TestSystemsCatalog(TestCase):
for value in catalog_categories[category]: for value in catalog_categories[category]:
catalog.get_entry(value) catalog.get_entry(value)
print(catalog.entries())
with self.assertRaises(IndexError): with self.assertRaises(IndexError):
catalog.get_entry('unknown') catalog.get_entry('unknown')
def test_north_america_systems_catalog(self): def test_north_america_systems_catalog(self):
catalog = EnergySystemsCatalogFactory('north_america').catalog catalog = EnergySystemsCatalogFactory('north_america').catalog
print(catalog.entries())
# def test_montreal_catalog(self):
# catalog = EnergySystemsCatalogFactory('montreal_custom').catalog