small corrections to avoid cross environment issues

main.py

@@ -11,7 +11,7 @@ from imports.geometry.helpers.geometry_helper import GeometryHelper
 from city_model_structure.city import City
 
 
-name_gml = 'one_building_in_kelowna.gml'
+name_gml = 'Dompark.gml'
 function_format = 'hft'
 construction_format = 'nrel'
 usage_format = 'comnet'
@@ -30,10 +30,10 @@ keep_weather_file = True
 keep_ig_file = True
 
 pickle_geometry = True
-pickle_weather = False
+pickle_weather = True
-pickle_construction = False
+pickle_construction = True
-pickle_usage = False
+pickle_usage = True
-pickle_schedules = False
+pickle_schedules = True
 pickle_file = 'tests/tests_data/dompark.pickle'
 
 # Load geometry
@@ -91,32 +91,6 @@ if not pickle_construction or not pickle_usage or not pickle_schedules:
 else:
   city = City.load(pickle_file)
 
-# Assign user defined parameters
-if not pickle_geometry:
-  for building in city.buildings:
-    print(len(building.storeys))
-    print(building.storeys[0].thermal_boundaries)
-    print(building.storeys[0].thermal_zone)
-    print('number of thermal boundaries', len(building.thermal_boundaries))
-    for i_tb, thermal_boundary in enumerate(building.thermal_boundaries):
-      print(i_tb, thermal_boundary.type)
-      for thermal_zone in thermal_boundary.thermal_zones:
-        print(thermal_zone.id)
-    quit()
-    for thermal_zone in building.thermal_zones:
-      print('volume', thermal_zone.volume)
-      for thermal_boundary in thermal_zone.thermal_boundaries:
-        print('type', thermal_boundary.surface.type)
-        print('id', thermal_boundary.surface.id)
-        print('area tb', thermal_boundary.area)
-        for tz in thermal_boundary.thermal_zones:
-          print('delimits', tz.id)
-        print('window ratio', thermal_boundary.window_ratio)
-        for thermal_opening in thermal_boundary.thermal_openings:
-          print('area window', thermal_opening.area)
-          print('frame', thermal_opening.frame_ratio)
-  quit()
-
 for building in city.buildings:
   building.heated = True
   building.cooled = True

requirements.txt

@@ -1,24 +1,24 @@
 Shapely~=1.7.0
-cycler==0.10.0
+cycler~=0.10.0
-geographiclib==1.50 
+geographiclib~=1.52
-geopy~=1.21.0
+geopy~=2.2.0
-kiwisolver==1.2.0 
+kiwisolver~=1.3.2
-matplotlib==3.2.1 
+matplotlib~=3.5.1
-numpy~=1.18.4
+numpy~=1.21.2
-numpy-stl==2.11.2 
+numpy-stl~=2.16.3
-pandas~=1.0.3
+pandas~=1.2.5
 pip~=20.1
-pyny3d==0.2 
+pyny3d~=0.2
 pyparsing~=2.4.7
 pyproj~=2.6.1.post1
-python-dateutil==2.8.1 
+python-dateutil=2.8.1
-python-utils==2.4.0 
+python-utils=2.4.0
 pytz~=2020.1
-scipy==1.4.1 
+scipy~=1.8.0
-setuptools~=46.1.3
+setuptools~=58.0.4
-six==1.14.0 
+six~=1.14.0
-stl==0.0.3 
+stl~=0.0.3
-xmltodict==0.12.0
+xmltodict~=0.12.0
 reverse_geocoder~=1.5.1
 
 pathlib~=1.0.1

tests/tmp/Montreal.cli

@@ -1,4 +1,4 @@
-Montréal
+Montréal
 45.47,-73.75,0.0,-5.0
 
 dm  m h G_Dh  G_Bn