s_ranjbar/energy_system_modelling_workflow
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into main

Browse Source
This commit is contained in:
Pilar Monsalvete 2023-06-09 13:12:12 -04:00
commit e07156ac30
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hub/imports/energy_systems/montreal_custom_energy_system_parameters.py
View File

@ -123,9 +123,12 @@ class MontrealCustomEnergySystemParameters:
energy_systems_connection = city.energy_systems_connection_table
for building in city.buildings:
_building_energy_systems = []
energy_systems = energy_systems_connection['Energy System Type'] \
.where(energy_systems_connection['Building'] == building.name)
energy_systems = energy_systems_connection['Energy System Type'].where(
energy_systems_connection['Building'] == building.name
)
for energy_system in energy_systems:
if str(energy_system) == 'nan':
break
_generic_building_energy_systems = city.generic_energy_systems[energy_system]
for _generic_building_energy_system in _generic_building_energy_systems:
_building_energy_equipment = EnergySystem()

2
hub/version.py
View File

@ -1,4 +1,4 @@
"""
Hub version number
"""
__version__ = '0.1.7.16'
__version__ = '0.1.7.17'