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

This commit is contained in:
Pilar Monsalvete 2023-05-02 12:42:42 -04:00
commit 229112387e

View File

@ -11,7 +11,7 @@ from sra_engine import SraEngine
try: try:
file_path = (Path(__file__).parent / 'input_files' / 'selected_building.geojson') file_path = (Path(__file__).parent / 'input_files' / 'selected_building_1780.geojson')
climate_reference_city = 'Montreal' climate_reference_city = 'Montreal'
weather_file = 'CAN_PQ_Montreal.Intl.AP.716270_CWEC.epw' weather_file = 'CAN_PQ_Montreal.Intl.AP.716270_CWEC.epw'
weather_format = 'epw' weather_format = 'epw'
@ -26,7 +26,7 @@ try:
print('[simulation start]') print('[simulation start]')
city = GeometryFactory('geojson', city = GeometryFactory('geojson',
path=file_path, path=file_path,
height_field='building_height', height_field='heightmax',
year_of_construction_field='ANNEE_CONS', year_of_construction_field='ANNEE_CONS',
function_field='CODE_UTILI', function_field='CODE_UTILI',
function_to_hub=Dictionaries().montreal_function_to_hub_function).city function_to_hub=Dictionaries().montreal_function_to_hub_function).city