Title: merging changes from hub/final_energy_system_model branch in here
This commit is contained in:
parent
57c33d7ee5
commit
0699c24520
14
.gitignore
vendored
14
.gitignore
vendored
@ -1 +1,13 @@
|
||||
.idea
|
||||
.idea
|
||||
*.idf
|
||||
*.bnd
|
||||
*.eio
|
||||
*.end
|
||||
*.err
|
||||
*.eso
|
||||
*.expidf
|
||||
*.mtr
|
||||
*.rvaudit
|
||||
*.shd
|
||||
*.csv
|
||||
*.htm
|
||||
|
@ -69,8 +69,10 @@ class MontrealCustomCatalog(Catalog):
|
||||
storage_system = ThermalStorageSystem(equipment_id)
|
||||
storage_systems = [storage_system]
|
||||
if model_name == 'PV system':
|
||||
system_type = 'Photovoltaic'
|
||||
generation_system = PvGenerationSystem(equipment_id,
|
||||
name=None,
|
||||
system_type=system_type,
|
||||
model_name=model_name,
|
||||
electricity_efficiency=electricity_efficiency,
|
||||
energy_storage_systems=storage_systems
|
||||
|
10
main.py
10
main.py
@ -33,11 +33,11 @@ energy_plus_workflow(city)
|
||||
city_buildings_peak_heating_demands = {}
|
||||
for building in city.buildings:
|
||||
city_buildings_peak_heating_demands[f'{building.name}'] = building.heating_peak_load[cte.YEAR]
|
||||
# call_random(city.buildings, residential_systems_percentage)
|
||||
# EnergySystemsFactory('montreal_custom', city).enrich()
|
||||
# for building in city.buildings:
|
||||
# print(building.heating_consumption[cte.YEAR])
|
||||
# print(building.energy_systems_archetype_name)
|
||||
call_random(city.buildings, residential_systems_percentage)
|
||||
EnergySystemsFactory('montreal_custom', city).enrich()
|
||||
for building in city.buildings:
|
||||
print(building.heating_consumption[cte.YEAR])
|
||||
print(building.energy_systems_archetype_name)
|
||||
call_random(city.buildings, residential_new_systems_percentage)
|
||||
EnergySystemsFactory('montreal_future', city).enrich()
|
||||
SystemSizing(city.buildings).hvac_sizing()
|
||||
|
Loading…
Reference in New Issue
Block a user