s_ranjbar/system_assignation
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Title: merging changes from hub/final_energy_system_model branch in here

Browse Source
This commit is contained in:
Saeed Ranjbar 2024-02-07 20:39:16 -05:00
parent 57c33d7ee5
commit 0699c24520
3 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.gitignore vendored
View File

@ -1 +1,13 @@
.idea .idea
*.idf
*.bnd
*.eio
*.end
*.err
*.eso
*.expidf
*.mtr
*.rvaudit
*.shd
*.csv
*.htm

2
hub/catalog_factories/energy_systems/montreal_custom_catalog.py
View File

@ -69,8 +69,10 @@ class MontrealCustomCatalog(Catalog):
storage_system = ThermalStorageSystem(equipment_id) storage_system = ThermalStorageSystem(equipment_id)
storage_systems = [storage_system] storage_systems = [storage_system]
if model_name == 'PV system': if model_name == 'PV system':
system_type = 'Photovoltaic'
generation_system = PvGenerationSystem(equipment_id, generation_system = PvGenerationSystem(equipment_id,
name=None, name=None,
system_type=system_type,
model_name=model_name, model_name=model_name,
electricity_efficiency=electricity_efficiency, electricity_efficiency=electricity_efficiency,
energy_storage_systems=storage_systems energy_storage_systems=storage_systems

10
main.py
View File

@ -33,11 +33,11 @@ energy_plus_workflow(city)
city_buildings_peak_heating_demands = {} city_buildings_peak_heating_demands = {}
for building in city.buildings: for building in city.buildings:
city_buildings_peak_heating_demands[f'{building.name}'] = building.heating_peak_load[cte.YEAR] city_buildings_peak_heating_demands[f'{building.name}'] = building.heating_peak_load[cte.YEAR]
# call_random(city.buildings, residential_systems_percentage) call_random(city.buildings, residential_systems_percentage)
# EnergySystemsFactory('montreal_custom', city).enrich() EnergySystemsFactory('montreal_custom', city).enrich()
# for building in city.buildings: for building in city.buildings:
# print(building.heating_consumption[cte.YEAR]) print(building.heating_consumption[cte.YEAR])
# print(building.energy_systems_archetype_name) print(building.energy_systems_archetype_name)
call_random(city.buildings, residential_new_systems_percentage) call_random(city.buildings, residential_new_systems_percentage)
EnergySystemsFactory('montreal_future', city).enrich() EnergySystemsFactory('montreal_future', city).enrich()
SystemSizing(city.buildings).hvac_sizing() SystemSizing(city.buildings).hvac_sizing()