hub/catalog_factories/data_models/energy_systems/archetype.py

@@ -15,20 +15,11 @@ class Archetype:
   """
   Archetype class
   """
+  def __init__(self, name, systems):
 
-  def __init__(self, name, systems, archetype_cluster_id=None):
-    self._cluster_id = archetype_cluster_id
     self._name = name
     self._systems = systems
 
-  @property
-  def cluster_id(self):
-    """
-    Get id
-    :return: string
-    """
-    return self._cluster_id
-
   @property
   def name(self):
     """
@@ -52,9 +43,8 @@ class Archetype:
       _systems.append(_system.to_dictionary())
     content = {
       'Archetype': {
-        'cluster_id': self.cluster_id,
         'name': self.name,
         'systems': _systems
+        }
       }
-    }
     return content

hub/catalog_factories/data_models/energy_systems/thermal_storage_system.py

@@ -119,7 +119,7 @@ class ThermalStorageSystem(EnergyStorageSystem):
         'height [m]': self.height,
         'layers': _layers,
         'maximum operating temperature [Celsius]': self.maximum_operating_temperature,
-        'storage_medium': _medias,
+        'storage_medium': self.storage_medium.to_dictionary(),
         'heating coil capacity [W]': self.heating_coil_capacity
       }
     }

hub/catalog_factories/energy_systems/montreal_custom_catalog.py

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

hub/catalog_factories/energy_systems/montreal_future_system_catalogue.py

@@ -30,8 +30,7 @@ class MontrealFutureSystemCatalogue(Catalog):
     path = str(path / 'montreal_future_systems.xml')
     with open(path, 'r', encoding='utf-8') as xml:
       self._archetypes = xmltodict.parse(xml.read(),
-                                         force_list=['pv_generation_component', 'templateStorages', 'demand',
+                                         force_list=['pv_generation_component', 'templateStorages', 'demand'])
-                                                     'system', 'system_id'])
 
     self._storage_components = self._load_storage_components()
     self._generation_components = self._load_generation_components()
@@ -50,7 +49,7 @@ class MontrealFutureSystemCatalogue(Catalog):
       'non_pv_generation_component']
     if non_pv_generation_components is not None:
       for non_pv in non_pv_generation_components:
-        system_id = non_pv['generation_system_id']
+        system_id = non_pv['system_id']
         name = non_pv['name']
         system_type = non_pv['system_type']
         model_name = non_pv['model_name']
@@ -182,7 +181,7 @@ class MontrealFutureSystemCatalogue(Catalog):
       'pv_generation_component']
     if pv_generation_components is not None:
       for pv in pv_generation_components:
-        system_id = pv['generation_system_id']
+        system_id = pv['system_id']
         name = pv['name']
         system_type = pv['system_type']
         model_name = pv['model_name']
@@ -382,7 +381,6 @@ class MontrealFutureSystemCatalogue(Catalog):
     _system_archetypes = []
     system_clusters = self._archetypes['EnergySystemCatalog']['system_archetypes']['system_archetype']
     for system_cluster in system_clusters:
-      archetype_id = system_cluster['@cluster_id']
       name = system_cluster['name']
       systems = system_cluster['systems']['system_id']
       integer_system_ids = [int(item) for item in systems]
@@ -390,7 +388,7 @@ class MontrealFutureSystemCatalogue(Catalog):
       for system_archetype in self._systems:
         if int(system_archetype.id) in integer_system_ids:
           _systems.append(system_archetype)
-      _system_archetypes.append(Archetype(archetype_cluster_id=archetype_id, name=name, systems=_systems))
+      _system_archetypes.append(Archetype(name=name, systems=_systems))
     return _system_archetypes
 
   def _load_materials(self):

hub/city_model_structure/building.py

@@ -27,7 +27,7 @@ class Building(CityObject):
   """
   Building(CityObject) class
   """
-  def __init__(self, name, surfaces, year_of_construction, function, usages=None, terrains=None, city=None):
+  def __init__(self, name, surfaces, year_of_construction, function, terrains=None, city=None):
     super().__init__(name, surfaces)
     self._city = city
     self._households = None
@@ -36,7 +36,6 @@ class Building(CityObject):
     self._terrains = terrains
     self._year_of_construction = year_of_construction
     self._function = function
-    self._usages = usages
     self._average_storey_height = None
     self._storeys_above_ground = None
     self._floor_area = None
@@ -93,7 +92,6 @@ class Building(CityObject):
         logging.error('Building %s [%s] has an unexpected surface type %s.', self.name, self.aliases, surface.type)
     self._domestic_hot_water_peak_load = None
     self._fuel_consumption_breakdown = {}
-    self._systems_archetype_cluster_id = None
     self._pv_generation = {}
 
   @property
@@ -258,17 +256,7 @@ class Building(CityObject):
     :param value: str
     """
     if value is not None:
-      self._function = value
+      self._function = str(value)
-
-  @property
-  def usages(self) -> Union[None, list]:
-    """
-    Get building usages, if none, assume usage is function
-    :return: None or list of functions
-    """
-    if self._usages is None and self._function is not None:
-      self._usages = [{'usage': self._function, 'ratio': 1 }]
-    return self._usages
 
   @property
   def average_storey_height(self) -> Union[None, float]:
@@ -605,6 +593,19 @@ class Building(CityObject):
     """
     self._city = value
 
+  @property
+  def usages_percentage(self):
+    """
+    Get the usages and percentages for the building
+    """
+    _usage = ''
+    for internal_zone in self.internal_zones:
+      if internal_zone.usages is None:
+        continue
+      for usage in internal_zone.usages:
+        _usage = f'{_usage}{usage.name}_{usage.percentage} '
+    return _usage.rstrip()
+
   @property
   def energy_systems(self) -> Union[None, List[EnergySystem]]:
     """
@@ -866,87 +867,53 @@ class Building(CityObject):
     Get energy consumption of different sectors
     return: dict
     """
-    fuel_breakdown = {cte.ELECTRICITY: {cte.LIGHTING: self.lighting_electrical_demand[cte.YEAR][0] if self.lighting_electrical_demand else 0,
+    fuel_breakdown = {cte.ELECTRICITY: {cte.LIGHTING: self.lighting_electrical_demand[cte.YEAR][0],
-                                        cte.APPLIANCES: self.appliances_electrical_demand[cte.YEAR][0] if self.appliances_electrical_demand else 0}}
+                                        cte.APPLIANCES: self.appliances_electrical_demand[cte.YEAR][0]}}
     energy_systems = self.energy_systems
-    if energy_systems is not None:
+    for energy_system in energy_systems:
-      for energy_system in energy_systems:
+      demand_types = energy_system.demand_types
-        demand_types = energy_system.demand_types
+      generation_systems = energy_system.generation_systems
-        generation_systems = energy_system.generation_systems
+      for demand_type in demand_types:
-        for demand_type in demand_types:
+        for generation_system in generation_systems:
-          for generation_system in generation_systems:
+          if generation_system.system_type != cte.PHOTOVOLTAIC:
-            if generation_system.system_type != cte.PHOTOVOLTAIC:
+            if generation_system.fuel_type not in fuel_breakdown:
-              if generation_system.fuel_type not in fuel_breakdown:
+              fuel_breakdown[generation_system.fuel_type] = {}
-                fuel_breakdown[generation_system.fuel_type] = {}
+            if demand_type in generation_system.energy_consumption:
-              if demand_type in generation_system.energy_consumption:
+              fuel_breakdown[f'{generation_system.fuel_type}'][f'{demand_type}'] = (
-                fuel_breakdown[f'{generation_system.fuel_type}'][f'{demand_type}'] = (
+                generation_system.energy_consumption)[f'{demand_type}'][cte.YEAR][0]
-                  generation_system.energy_consumption)[f'{demand_type}'][cte.YEAR][0]
+            storage_systems = generation_system.energy_storage_systems
-              storage_systems = generation_system.energy_storage_systems
+            if storage_systems:
-              if storage_systems:
+              for storage_system in storage_systems:
-                for storage_system in storage_systems:
+                if storage_system.type_energy_stored == 'thermal' and storage_system.heating_coil_energy_consumption:
-                  if storage_system.type_energy_stored == 'thermal' and storage_system.heating_coil_energy_consumption:
+                  fuel_breakdown[cte.ELECTRICITY][f'{demand_type}'] += storage_system.heating_coil_energy_consumption[cte.YEAR][0]
-                    fuel_breakdown[cte.ELECTRICITY][f'{demand_type}'] += (
+    #TODO: When simulation models of all energy system archetypes are created, this part can be removed
-                      storage_system.heating_coil_energy_consumption)[f'{demand_type}'][cte.YEAR][0]
+    heating_fuels = []
-      #TODO: When simulation models of all energy system archetypes are created, this part can be removed
+    dhw_fuels = []
-      heating_fuels = []
+    for energy_system in self.energy_systems:
-      dhw_fuels = []
+      if cte.HEATING in energy_system.demand_types:
-      for energy_system in self.energy_systems:
+        for generation_system in energy_system.generation_systems:
-        if cte.HEATING in energy_system.demand_types:
+          heating_fuels.append(generation_system.fuel_type)
-          for generation_system in energy_system.generation_systems:
+      if cte.DOMESTIC_HOT_WATER in energy_system.demand_types:
-            heating_fuels.append(generation_system.fuel_type)
+        for generation_system in energy_system.generation_systems:
-        if cte.DOMESTIC_HOT_WATER in energy_system.demand_types:
+          dhw_fuels.append(generation_system.fuel_type)
-          for generation_system in energy_system.generation_systems:
+    for key in fuel_breakdown:
-            dhw_fuels.append(generation_system.fuel_type)
+      if key == cte.ELECTRICITY and cte.COOLING not in fuel_breakdown[key]:
-      for key in fuel_breakdown:
+        for energy_system in energy_systems:
-        if key == cte.ELECTRICITY and cte.COOLING not in fuel_breakdown[key]:
+          if cte.COOLING in energy_system.demand_types and cte.COOLING not in fuel_breakdown[key]:
+            for generation_system in energy_system.generation_systems:
+              fuel_breakdown[generation_system.fuel_type][cte.COOLING] = self.cooling_consumption[cte.YEAR][0]
+      for fuel in heating_fuels:
+        if cte.HEATING not in fuel_breakdown[fuel]:
           for energy_system in energy_systems:
-            if cte.COOLING in energy_system.demand_types and cte.COOLING not in fuel_breakdown[key]:
+            if cte.HEATING in energy_system.demand_types:
-              if self.cooling_consumption:
+              for generation_system in energy_system.generation_systems:
-                fuel_breakdown[energy_system.generation_systems[0].fuel_type][cte.COOLING] = self.cooling_consumption[cte.YEAR][0]
+                fuel_breakdown[generation_system.fuel_type][cte.HEATING] = self.heating_consumption[cte.YEAR][0]
-        for fuel in heating_fuels:
+      for fuel in dhw_fuels:
-          if cte.HEATING not in fuel_breakdown[fuel]:
+        if cte.DOMESTIC_HOT_WATER not in fuel_breakdown[fuel]:
-            for energy_system in energy_systems:
+          for energy_system in energy_systems:
-              if cte.HEATING in energy_system.demand_types:
+            if cte.DOMESTIC_HOT_WATER in energy_system.demand_types:
-                if self.heating_consumption:
+              for generation_system in energy_system.generation_systems:
-                  fuel_breakdown[energy_system.generation_systems[0].fuel_type][cte.HEATING] = self.heating_consumption[cte.YEAR][0]
+                fuel_breakdown[generation_system.fuel_type][cte.DOMESTIC_HOT_WATER] = self.domestic_hot_water_consumption[cte.YEAR][0]
-        for fuel in dhw_fuels:
-          if cte.DOMESTIC_HOT_WATER not in fuel_breakdown[fuel]:
-            for energy_system in energy_systems:
-              if cte.DOMESTIC_HOT_WATER in energy_system.demand_types:
-                if self.domestic_hot_water_consumption:
-                  fuel_breakdown[energy_system.generation_systems[0].fuel_type][cte.DOMESTIC_HOT_WATER] = self.domestic_hot_water_consumption[cte.YEAR][0]
     self._fuel_consumption_breakdown = fuel_breakdown
     return self._fuel_consumption_breakdown
 
-  @property
-  def energy_systems_archetype_cluster_id(self):
-    """
-    Get energy systems archetype id
-    :return: str
-    """
-    return self._systems_archetype_cluster_id
-
-  @energy_systems_archetype_cluster_id.setter
-  def energy_systems_archetype_cluster_id(self, value):
-    """
-    Set energy systems archetype id
-    :param value: str
-    """
-    self._systems_archetype_cluster_id = value
-
-  @property
-  def pv_generation(self):
-    """
-    temporary attribute to get the onsite pv generation in W
-    :return: dict
-    """
-    return self._pv_generation
-
-  @pv_generation.setter
-  def pv_generation(self, value):
-    """
-    temporary attribute to set the onsite pv generation in W
-    :param value: float
-    """
-    self._pv_generation = value
-

hub/city_model_structure/building_demand/surface.py

@@ -157,7 +157,6 @@ class Surface:
     if self._inclination is None:
       self._inclination = np.arccos(self.perimeter_polygon.normal[2])
     return self._inclination
-
   @property
   def type(self):
     """

hub/city_model_structure/building_demand/thermal_zone.py

@@ -34,7 +34,7 @@ class ThermalZone:
                volume,
                footprint_area,
                number_of_storeys,
-               usages=None):
+               usage_name=None):
     self._id = None
     self._parent_internal_zone = parent_internal_zone
     self._footprint_area = footprint_area
@@ -51,6 +51,10 @@ class ThermalZone:
     self._view_factors_matrix = None
     self._total_floor_area = None
     self._number_of_storeys = number_of_storeys
+    self._usage_name = usage_name
+    self._usage_from_parent = False
+    if usage_name is None:
+      self._usage_from_parent = True
     self._hours_day = None
     self._days_year = None
     self._mechanical_air_change = None
@@ -60,12 +64,7 @@ class ThermalZone:
     self._internal_gains = None
     self._thermal_control = None
     self._domestic_hot_water = None
-    self._usage_name = None
+    self._usages = None
-    self._usages = usages
-    self._usage_from_parent = False
-    if usages is None:
-      self._usage_from_parent = True
-     
 
   @property
   def parent_internal_zone(self) -> InternalZone:
@@ -78,11 +77,24 @@ class ThermalZone:
   @property
   def usages(self):
     """
-    Get the thermal zone usages
+    Get the thermal zone usages including percentage with the format [percentage]-usage_[percentage]-usage...
+    Eg: 70-office_30-residential
     :return: str
     """
     if self._usage_from_parent:
       self._usages = copy.deepcopy(self._parent_internal_zone.usages)
+    else:
+      values = self._usage_name.split('_')
+      usages = []
+      for value in values:
+        usages.append(value.split('-'))
+      self._usages = []
+      for parent_usage in self._parent_internal_zone.usages:
+        for value in usages:
+          if parent_usage.name == value[1]:
+            new_usage = copy.deepcopy(parent_usage)
+            new_usage.percentage = float(value[0]) / 100
+            self._usages.append(new_usage)
     return self._usages
 
   @property

hub/city_model_structure/energy_systems/pv_generation_system.py

@@ -28,7 +28,9 @@ class PvGenerationSystem(GenerationSystem):
     self._height = None
     self._electricity_power_output = {}
     self._tilt_angle = None
-    self._installed_capacity = None
+    self._surface_azimuth = None
+    self._solar_altitude_angle = None
+    self._solar_azimuth_angle = None
 
   @property
   def nominal_electricity_output(self):
@@ -223,17 +225,33 @@ class PvGenerationSystem(GenerationSystem):
     self._electricity_power_output = value
 
   @property
-  def installed_capacity(self):
+  def tilt_angle(self):
     """
-    Get the total installed nominal capacity in W
+    Get tilt angle of PV system in degrees
     :return: float
     """
-    return self._installed_capacity
+    return self._tilt_angle
 
-  @installed_capacity.setter
+  @tilt_angle.setter
-  def installed_capacity(self, value):
+  def tilt_angle(self, value):
     """
-    Set the total installed nominal capacity in W
+    Set PV system tilt angle in degrees
     :param value: float
     """
-    self._installed_capacity = value
+    self._tilt_angle = value
+
+  @property
+  def surface_azimuth(self):
+    """
+    Get surface azimuth angle of PV system in degrees. 0 is North
+    :return: float
+    """
+    return self._surface_azimuth
+
+  @surface_azimuth.setter
+  def surface_azimuth(self, value):
+    """
+    Set PV system tilt angle in degrees
+    :param value: float
+    """
+    self._surface_azimuth = value

hub/data/construction/palma_archetypes.json

@@ -339,7 +339,7 @@
         "infiltration_rate_area_for_ventilation_system_off": 0.0055,
         "constructions": {
           "OutdoorsWall": {
-            "opaque_surface_name": "C_1941_1960_FACEXT1",
+            "opaque_surface_name": " C_1941_1960_FACEXT1",
             "transparent_surface_name": "C_1941_1960_WIN1",
             "transparent_ratio": {
                 "north": "30",

hub/data/construction/palma_archetypes_modified.json

@@ -0,0 +1,774 @@
+{
+    "archetypes": [
+        {
+            "function": "Large multifamily building",
+            "period_of_construction": "2021_2050",
+            "climate_zone": "B3",
+            "average_storey_height": 3.57,
+            "thermal_capacity": 83.018,
+            "extra_loses_due_thermal_bridges": 0.1,
+            "infiltration_rate_for_ventilation_system_on": 0,
+            "infiltration_rate_for_ventilation_system_off": 0.9,
+            "constructions": {
+                "OutdoorsWall": {
+                    "opaque_surface_name": "PA1_PA2_2021_2050_FACEXT",
+                    "transparent_surface_name": "PA1_PA2_2021_2050_WIN1",
+                    "transparent_ratio": {
+                        "north": "60",
+                        "east": "5",
+                        "south": "60",
+                        "west": "5"
+                    }
+                },
+                "OutdoorsRoofCeiling": {
+                    "opaque_surface_name": "PA1_PA2_2021_2050_ROOF",
+                    "transparent_surface_name": null,
+                    "transparent_ratio": {
+                        "north": null,
+                        "east": null,
+                        "south": null,
+                        "west": null
+                    }
+                },
+                "GroundFloor": {
+                    "opaque_surface_name": "PA1_PA2_2021_2050_FLOOR"
+                },
+                "GroundWall": {
+                    "opaque_surface_name": "PA1_PA2_2021_2050_FACEXT"
+                },
+                "GroundRoofCeiling": {
+                    "opaque_surface_name": "PA1_PA2_2021_2050_FLOORINT"
+                }
+            },
+            "infiltration_rate_area_for_ventilation_system_on": 0,
+            "infiltration_rate_area_for_ventilation_system_off": 0
+        },
+        {
+            "function": "Medium multifamily building",
+            "period_of_construction": "2021_2050",
+            "climate_zone": "B3",
+            "average_storey_height": 3.57,
+            "thermal_capacity": 83.018,
+            "extra_loses_due_thermal_bridges": 0.1,
+            "infiltration_rate_for_ventilation_system_on": 0,
+            "infiltration_rate_for_ventilation_system_off": 0.9,
+            "constructions": {
+                "OutdoorsWall": {
+                    "opaque_surface_name": "PA1_PA2_2021_2050_FACEXT",
+                    "transparent_surface_name": "PA1_PA2_2021_2050_WIN1",
+                    "transparent_ratio": {
+                        "north": "60",
+                        "east": "5",
+                        "south": "60",
+                        "west": "5"
+                    }
+                },
+                "OutdoorsRoofCeiling": {
+                    "opaque_surface_name": "PA1_PA2_2021_2050_ROOF",
+                    "transparent_surface_name": null,
+                    "transparent_ratio": {
+                        "north": null,
+                        "east": null,
+                        "south": null,
+                        "west": null
+                    }
+                },
+                "GroundFloor": {
+                    "opaque_surface_name": "PA1_PA2_2021_2050_FLOOR"
+                },
+                "GroundWall": {
+                    "opaque_surface_name": "PA1_PA2_2021_2050_FACEXT"
+                },
+                "GroundRoofCeiling": {
+                    "opaque_surface_name": "PA1_PA2_2021_2050_FLOORINT"
+                }
+            },
+            "infiltration_rate_area_for_ventilation_system_on": 0,
+            "infiltration_rate_area_for_ventilation_system_off": 0
+        },
+        {
+            "function": "Small multifamily building",
+            "period_of_construction": "2021_2050",
+            "climate_zone": "B3",
+            "average_storey_height": 3.57,
+            "thermal_capacity": 83.018,
+            "extra_loses_due_thermal_bridges": 0.1,
+            "infiltration_rate_for_ventilation_system_on": 0,
+            "infiltration_rate_for_ventilation_system_off": 0.9,
+            "constructions": {
+                "OutdoorsWall": {
+                    "opaque_surface_name": "PA1_PA2_2021_2050_FACEXT",
+                    "transparent_surface_name": "PA1_PA2_2021_2050_WIN1",
+                    "transparent_ratio": {
+                        "north": "60",
+                        "east": "5",
+                        "south": "60",
+                        "west": "5"
+                    }
+                },
+                "OutdoorsRoofCeiling": {
+                    "opaque_surface_name": "PA1_PA2_2021_2050_ROOF",
+                    "transparent_surface_name": null,
+                    "transparent_ratio": {
+                        "north": null,
+                        "east": null,
+                        "south": null,
+                        "west": null
+                    }
+                },
+                "GroundFloor": {
+                    "opaque_surface_name": "PA1_PA2_2021_2050_FLOOR"
+                },
+                "GroundWall": {
+                    "opaque_surface_name": "PA1_PA2_2021_2050_FACEXT"
+                },
+                "GroundRoofCeiling": {
+                    "opaque_surface_name": "PA1_PA2_2021_2050_FLOORINT"
+                }
+            },
+            "infiltration_rate_area_for_ventilation_system_on": 0,
+            "infiltration_rate_area_for_ventilation_system_off": 0
+        },
+        {
+            "function": "Single-family building",
+            "period_of_construction": "2021_2050",
+            "climate_zone": "B3",
+            "average_storey_height": 3.57,
+            "thermal_capacity": 83.018,
+            "extra_loses_due_thermal_bridges": 0.1,
+            "infiltration_rate_for_ventilation_system_on": 0,
+            "infiltration_rate_for_ventilation_system_off": 0.9,
+            "constructions": {
+                "OutdoorsWall": {
+                    "opaque_surface_name": "PA1_PA2_2021_2050_FACEXT",
+                    "transparent_surface_name": "PA1_PA2_2021_2050_WIN1",
+                    "transparent_ratio": {
+                        "north": "60",
+                        "east": "5",
+                        "south": "60",
+                        "west": "5"
+                    }
+                },
+                "OutdoorsRoofCeiling": {
+                    "opaque_surface_name": "PA1_PA2_2021_2050_ROOF",
+                    "transparent_surface_name": null,
+                    "transparent_ratio": {
+                        "north": null,
+                        "east": null,
+                        "south": null,
+                        "west": null
+                    }
+                },
+                "GroundFloor": {
+                    "opaque_surface_name": "PA1_PA2_2021_2050_FLOOR"
+                },
+                "GroundWall": {
+                    "opaque_surface_name": "PA1_PA2_2021_2050_FACEXT"
+                },
+                "GroundRoofCeiling": {
+                    "opaque_surface_name": "PA1_PA2_2021_2050_FLOORINT"
+                }
+            },
+            "infiltration_rate_area_for_ventilation_system_on": 0,
+            "infiltration_rate_area_for_ventilation_system_off": 0
+        },
+        {
+            "function": "Large multifamily building",
+            "period_of_construction": "1961_1980",
+            "climate_zone": "B3",
+            "average_storey_height": 3.57,
+            "thermal_capacity": 3000,
+            "extra_loses_due_thermal_bridges": 0.1,
+            "infiltration_rate_for_ventilation_system_on": 0,
+            "infiltration_rate_for_ventilation_system_off": 0.9,
+            "constructions": {
+                "OutdoorsWall": {
+                    "opaque_surface_name": "PA1_PA2_1961_1980_FACEXT1",
+                    "transparent_surface_name": "PA1_PA2_1961_1980_WIN1",
+                    "transparent_ratio": {
+                        "north": "60",
+                        "east": "60",
+                        "south": "60",
+                        "west": "60"
+                    }
+                },
+                "OutdoorsRoofCeiling": {
+                    "opaque_surface_name": "PA1_PA2_1961_1980_ROOF1",
+                    "transparent_surface_name": null,
+                    "transparent_ratio": {
+                        "north": null,
+                        "east": null,
+                        "south": null,
+                        "west": null
+                    }
+                },
+                "GroundFloor": {
+                    "opaque_surface_name": "PA1_PA2_1961_1980_FLOOR1"
+                },
+                "GroundWall": {
+                    "opaque_surface_name": "PA1_PA2_1961_1980_FACEXT1"
+                },
+                "GroundRoofCeiling": {
+                    "opaque_surface_name": "PA1_PA2_1961_1980_FLOOR4"
+                }
+            },
+            "infiltration_rate_area_for_ventilation_system_on": 0,
+            "infiltration_rate_area_for_ventilation_system_off": 0
+        },
+        {
+            "function": "Large multifamily building",
+            "period_of_construction": "1981_2007",
+            "climate_zone": "B3",
+            "average_storey_height": 3.2,
+            "thermal_capacity": 3179,
+            "extra_loses_due_thermal_bridges": 0.1,
+            "infiltration_rate_for_ventilation_system_on": 0,
+            "infiltration_rate_for_ventilation_system_off": 0.9,
+            "constructions": {
+                "OutdoorsWall": {
+                    "opaque_surface_name": "E_1981_2007_FACEXT1",
+                    "transparent_surface_name": "E_1981_2007_WIN1",
+                    "transparent_ratio": {
+                        "north": "45",
+                        "east": "45",
+                        "south": "45",
+                        "west": "45"
+                    }
+                },
+                "OutdoorsRoofCeiling": {
+                    "opaque_surface_name": "E_1981_2007_ROOF1",
+                    "transparent_surface_name": null,
+                    "transparent_ratio": {
+                        "north": null,
+                        "east": null,
+                        "south": null,
+                        "west": null
+                    }
+                },
+                "GroundFloor": {
+                    "opaque_surface_name": "E_1981_2007_FLOORGR1"
+                }
+            },
+            "infiltration_rate_area_for_ventilation_system_on": 0,
+            "infiltration_rate_area_for_ventilation_system_off": 0
+        },
+        {
+            "function": "Medium multifamily building",
+            "period_of_construction": "1800_1900",
+            "climate_zone": "B3",
+            "average_storey_height": 4.39,
+            "thermal_capacity": 3330,
+            "extra_loses_due_thermal_bridges": 0.1,
+            "infiltration_rate_for_ventilation_system_on": 0,
+            "infiltration_rate_for_ventilation_system_off": 0.9,
+            "constructions": {
+                "OutdoorsWall": {
+                    "opaque_surface_name": "A_B1900_FACEXT1",
+                    "transparent_surface_name": "A_B1900_WIN2",
+                    "transparent_ratio": {
+                        "north": "20",
+                        "east": "20",
+                        "south": "20",
+                        "west": "20"
+                    }
+                },
+                "OutdoorsRoofCeiling": {
+                    "opaque_surface_name": "A_B1900_ROOF1",
+                    "transparent_surface_name": null,
+                    "transparent_ratio": {
+                        "north": null,
+                        "east": null,
+                        "south": null,
+                        "west": null
+                    }
+                },
+                "GroundFloor": {
+                    "opaque_surface_name": "A_B1900_FLOORGR1"
+                }
+            },
+            "infiltration_rate_area_for_ventilation_system_on": 0,
+            "infiltration_rate_area_for_ventilation_system_off": 0
+        },
+        {
+            "function": "Medium multifamily building",
+            "period_of_construction": "1901_1940",
+            "climate_zone": "B3",
+            "average_storey_height": 3.65,
+            "thermal_capacity": 3420,
+            "extra_loses_due_thermal_bridges": 0.1,
+            "infiltration_rate_for_ventilation_system_on": 0,
+            "infiltration_rate_for_ventilation_system_off": 0.9,
+            "constructions": {
+                "OutdoorsWall": {
+                    "opaque_surface_name": "B_1901_1940_FACEXT1",
+                    "transparent_surface_name": "B_1901_1940_WIN1",
+                    "transparent_ratio": {
+                        "north": "40",
+                        "east": "40",
+                        "south": "40",
+                        "west": "40"
+                    }
+                },
+                "OutdoorsRoofCeiling": {
+                    "opaque_surface_name": "B_1901_1940_ROOF1",
+                    "transparent_surface_name": null,
+                    "transparent_ratio": {
+                        "north": null,
+                        "east": null,
+                        "south": null,
+                        "west": null
+                    }
+                },
+                "GroundFloor": {
+                    "opaque_surface_name": "B_1901_1940_FLOORGR1"
+                }
+            },
+            "infiltration_rate_area_for_ventilation_system_on": 0,
+            "infiltration_rate_area_for_ventilation_system_off": 0
+        },
+        {
+            "function": "Medium multifamily building",
+            "period_of_construction": "1941_1960",
+            "climate_zone": "B3",
+            "average_storey_height": 3.6,
+            "thermal_capacity": 3000,
+            "extra_loses_due_thermal_bridges": 0.1,
+            "infiltration_rate_for_ventilation_system_on": 0,
+            "infiltration_rate_for_ventilation_system_off": 0.9,
+            "constructions": {
+                "OutdoorsWall": {
+                    "opaque_surface_name": " C_1941_1960_FACEXT1",
+                    "transparent_surface_name": "C_1941_1960_WIN1",
+                    "transparent_ratio": {
+                        "north": "30",
+                        "east": "30",
+                        "south": "30",
+                        "west": "30"
+                    }
+                },
+                "OutdoorsRoofCeiling": {
+                    "opaque_surface_name": "C_1941_1960_ROOF1",
+                    "transparent_surface_name": null,
+                    "transparent_ratio": {
+                        "north": null,
+                        "east": null,
+                        "south": null,
+                        "west": null
+                    }
+                },
+                "GroundFloor": {
+                    "opaque_surface_name": "C_1941_1960_FLOORGR1"
+                }
+            },
+            "infiltration_rate_area_for_ventilation_system_on": 0,
+            "infiltration_rate_area_for_ventilation_system_off": 0
+        },
+        {
+            "function": "Medium multifamily building",
+            "period_of_construction": "1961_1980",
+            "climate_zone": "B3",
+            "average_storey_height": 4.5,
+            "thermal_capacity": 3540,
+            "extra_loses_due_thermal_bridges": 0.1,
+            "infiltration_rate_for_ventilation_system_on": 0,
+            "infiltration_rate_for_ventilation_system_off": 0.9,
+            "constructions": {
+                "OutdoorsWall": {
+                    "opaque_surface_name": "PA1_PA2_1961_1980_FACEXT1",
+                    "transparent_surface_name": "PA1_PA2_1961_1980_WIN1",
+                    "transparent_ratio": {
+                        "north": "55",
+                        "east": "55",
+                        "south": "55",
+                        "west": "55"
+                    }
+                },
+                "OutdoorsRoofCeiling": {
+                    "opaque_surface_name": "PA1_PA2_1961_1980_ROOF1",
+                    "transparent_surface_name": null,
+                    "transparent_ratio": {
+                        "north": null,
+                        "east": null,
+                        "south": null,
+                        "west": null
+                    }
+                },
+                "GroundFloor": {
+                    "opaque_surface_name": "PA1_PA2_1961_1980_FLOOR1"
+                }
+            },
+            "infiltration_rate_area_for_ventilation_system_on": 0,
+            "infiltration_rate_area_for_ventilation_system_off": 0
+        },
+        {
+            "function": "Medium multifamily building",
+            "period_of_construction": "1981_2007",
+            "climate_zone": "B3",
+            "average_storey_height": 3.2,
+            "thermal_capacity": 3179,
+            "extra_loses_due_thermal_bridges": 0.1,
+            "infiltration_rate_for_ventilation_system_on": 0,
+            "infiltration_rate_for_ventilation_system_off": 0.9,
+            "constructions": {
+                "OutdoorsWall": {
+                    "opaque_surface_name": "E_1981_2007_FACEXT1",
+                    "transparent_surface_name": "E_1981_2007_WIN1",
+                    "transparent_ratio": {
+                        "north": "45",
+                        "east": "45",
+                        "south": "45",
+                        "west": "45"
+                    }
+                },
+                "OutdoorsRoofCeiling": {
+                    "opaque_surface_name": "E_1981_2007_ROOF1",
+                    "transparent_surface_name": null,
+                    "transparent_ratio": {
+                        "north": null,
+                        "east": null,
+                        "south": null,
+                        "west": null
+                    }
+                },
+                "GroundFloor": {
+                    "opaque_surface_name": "E_1981_2007_FLOORGR1"
+                }
+            },
+            "infiltration_rate_area_for_ventilation_system_on": 0,
+            "infiltration_rate_area_for_ventilation_system_off": 0
+        },
+        {
+            "function": "Medium multifamily building",
+            "period_of_construction": "2008_2014",
+            "climate_zone": "B3",
+            "average_storey_height": 2.75,
+            "thermal_capacity": 3290,
+            "extra_loses_due_thermal_bridges": 0.1,
+            "infiltration_rate_for_ventilation_system_on": 0,
+            "infiltration_rate_for_ventilation_system_off": 0.9,
+            "constructions": {
+                "OutdoorsWall": {
+                    "opaque_surface_name": "F_2008_2014_FACEXT1",
+                    "transparent_surface_name": "F_2008_2014_WIN1",
+                    "transparent_ratio": {
+                        "north": "40",
+                        "east": "40",
+                        "south": "40",
+                        "west": "40"
+                    }
+                },
+                "OutdoorsRoofCeiling": {
+                    "opaque_surface_name": "F_2008_2014_ROOF1",
+                    "transparent_surface_name": null,
+                    "transparent_ratio": {
+                        "north": null,
+                        "east": null,
+                        "south": null,
+                        "west": null
+                    }
+                },
+                "GroundFloor": {
+                    "opaque_surface_name": "F_2008_2014_FLOORGR1"
+                }
+            },
+            "infiltration_rate_area_for_ventilation_system_on": 0,
+            "infiltration_rate_area_for_ventilation_system_off": 0
+        },
+        {
+            "function": "Small multifamily building",
+            "period_of_construction": "1800_1980",
+            "climate_zone": "B3",
+            "average_storey_height": 3.8,
+            "thermal_capacity": 3527.9,
+            "extra_loses_due_thermal_bridges": 0.1,
+            "infiltration_rate_for_ventilation_system_on": 0,
+            "infiltration_rate_for_ventilation_system_off": 0.9,
+            "constructions": {
+                "OutdoorsWall": {
+                    "opaque_surface_name": "PA3_PA4_1901_1940_FACEXT1",
+                    "transparent_surface_name": "PA3_PA4_1901_1940_WIN1",
+                    "transparent_ratio": {
+                        "north": "40",
+                        "east": "40",
+                        "south": "40",
+                        "west": "40"
+                    }
+                },
+                "OutdoorsRoofCeiling": {
+                    "opaque_surface_name": "PA3_PA4_1901_1940_ROOF1",
+                    "transparent_surface_name": null,
+                    "transparent_ratio": {
+                        "north": null,
+                        "east": null,
+                        "south": null,
+                        "west": null
+                    }
+                },
+                "GroundFloor": {
+                    "opaque_surface_name": "PA3_PA4_1901_1940_FLOORGR1"
+                }
+            },
+            "infiltration_rate_area_for_ventilation_system_on": 0,
+            "infiltration_rate_area_for_ventilation_system_off": 0
+        },
+        {
+            "function": "Small multifamily building",
+            "period_of_construction": "1981_2007",
+            "climate_zone": "B3",
+            "average_storey_height": 3.2,
+            "thermal_capacity": 3179,
+            "extra_loses_due_thermal_bridges": 0.1,
+            "infiltration_rate_for_ventilation_system_on": 0,
+            "infiltration_rate_for_ventilation_system_off": 0.9,
+            "constructions": {
+                "OutdoorsWall": {
+                    "opaque_surface_name": "E_1981_2007_FACEXT1",
+                    "transparent_surface_name": "E_1981_2007_WIN1",
+                    "transparent_ratio": {
+                        "north": "45",
+                        "east": "45",
+                        "south": "45",
+                        "west": "45"
+                    }
+                },
+                "OutdoorsRoofCeiling": {
+                    "opaque_surface_name": "E_1981_2007_ROOF1",
+                    "transparent_surface_name": null,
+                    "transparent_ratio": {
+                        "north": null,
+                        "east": null,
+                        "south": null,
+                        "west": null
+                    }
+                },
+                "GroundFloor": {
+                    "opaque_surface_name": "E_1981_2007_FLOORGR1"
+                }
+            },
+            "infiltration_rate_area_for_ventilation_system_on": 0,
+            "infiltration_rate_area_for_ventilation_system_off": 0
+        },
+        {
+            "function": "Small multifamily building",
+            "period_of_construction": "2008_2014",
+            "climate_zone": "B3",
+            "average_storey_height": 2.75,
+            "thermal_capacity": 3290,
+            "extra_loses_due_thermal_bridges": 0.1,
+            "infiltration_rate_for_ventilation_system_on": 0,
+            "infiltration_rate_for_ventilation_system_off": 0.9,
+            "constructions": {
+                "OutdoorsWall": {
+                    "opaque_surface_name": "F_2008_2014_FACEXT1",
+                    "transparent_surface_name": "F_2008_2014_WIN1",
+                    "transparent_ratio": {
+                        "north": "40",
+                        "east": "40",
+                        "south": "40",
+                        "west": "40"
+                    }
+                },
+                "OutdoorsRoofCeiling": {
+                    "opaque_surface_name": "F_2008_2014_ROOF1",
+                    "transparent_surface_name": null,
+                    "transparent_ratio": {
+                        "north": null,
+                        "east": null,
+                        "south": null,
+                        "west": null
+                    }
+                },
+                "GroundFloor": {
+                    "opaque_surface_name": "F_2008_2014_FLOORGR1"
+                }
+            },
+            "infiltration_rate_area_for_ventilation_system_on": 0,
+            "infiltration_rate_area_for_ventilation_system_off": 0
+        },
+        {
+            "function": "Small multifamily building",
+            "period_of_construction": "2015_2019",
+            "climate_zone": "B3",
+            "average_storey_height": 2.75,
+            "thermal_capacity": 3290,
+            "extra_loses_due_thermal_bridges": 0.1,
+            "infiltration_rate_for_ventilation_system_on": 0,
+            "infiltration_rate_for_ventilation_system_off": 0.9,
+            "constructions": {
+                "OutdoorsWall": {
+                    "opaque_surface_name": "G_2015_2019_FACEXT1",
+                    "transparent_surface_name": "G_2015_2019_WIN1",
+                    "transparent_ratio": {
+                        "north": "40",
+                        "east": "40",
+                        "south": "40",
+                        "west": "40"
+                    }
+                },
+                "OutdoorsRoofCeiling": {
+                    "opaque_surface_name": "G_2015_2019_ROOF1",
+                    "transparent_surface_name": null,
+                    "transparent_ratio": {
+                        "north": null,
+                        "east": null,
+                        "south": null,
+                        "west": null
+                    }
+                },
+                "GroundFloor": {
+                    "opaque_surface_name": "G_2015_2019_FLOORGR1"
+                }
+            },
+            "infiltration_rate_area_for_ventilation_system_on": 0,
+            "infiltration_rate_area_for_ventilation_system_off": 0
+        },
+        {
+            "function": "Single-family building",
+            "period_of_construction": "1800_1980",
+            "climate_zone": "B3",
+            "average_storey_height": 3.68,
+            "thermal_capacity": 4400,
+            "extra_loses_due_thermal_bridges": 0.1,
+            "infiltration_rate_for_ventilation_system_on": 0,
+            "infiltration_rate_for_ventilation_system_off": 0.9,
+            "constructions": {
+                "OutdoorsWall": {
+                    "opaque_surface_name": "PA3_PA4_1901_1940_FACEXT1",
+                    "transparent_surface_name": "PA3_PA4_1901_1940_WIN1",
+                    "transparent_ratio": {
+                        "north": "40",
+                        "east": "40",
+                        "south": "40",
+                        "west": "40"
+                    }
+                },
+                "OutdoorsRoofCeiling": {
+                    "opaque_surface_name": "PA3_PA4_1901_1940_ROOF1",
+                    "transparent_surface_name": null,
+                    "transparent_ratio": {
+                        "north": null,
+                        "east": null,
+                        "south": null,
+                        "west": null
+                    }
+                },
+                "GroundFloor": {
+                    "opaque_surface_name": "PA3_PA4_1901_1940_FLOORGR1"
+                }
+            },
+            "infiltration_rate_area_for_ventilation_system_on": 0,
+            "infiltration_rate_area_for_ventilation_system_off": 0
+        },
+        {
+            "function": "Single-family building",
+            "period_of_construction": "1981_2007",
+            "climate_zone": "B3",
+            "average_storey_height": 3.2,
+            "thermal_capacity": 3179,
+            "extra_loses_due_thermal_bridges": 0.1,
+            "infiltration_rate_for_ventilation_system_on": 0,
+            "infiltration_rate_for_ventilation_system_off": 0.9,
+            "constructions": {
+                "OutdoorsWall": {
+                    "opaque_surface_name": "E_1981_2007_FACEXT1",
+                    "transparent_surface_name": "E_1981_2007_WIN1",
+                    "transparent_ratio": {
+                        "north": "45",
+                        "east": "45",
+                        "south": "45",
+                        "west": "45"
+                    }
+                },
+                "OutdoorsRoofCeiling": {
+                    "opaque_surface_name": "E_1981_2007_ROOF1",
+                    "transparent_surface_name": null,
+                    "transparent_ratio": {
+                        "north": null,
+                        "east": null,
+                        "south": null,
+                        "west": null
+                    }
+                },
+                "GroundFloor": {
+                    "opaque_surface_name": "E_1981_2007_FLOORGR1"
+                }
+            },
+            "infiltration_rate_area_for_ventilation_system_on": 0,
+            "infiltration_rate_area_for_ventilation_system_off": 0
+        },
+        {
+            "function": "Single-family building",
+            "period_of_construction": "2008_2014",
+            "climate_zone": "B3",
+            "average_storey_height": 3.75,
+            "thermal_capacity": 3200,
+            "extra_loses_due_thermal_bridges": 0.1,
+            "infiltration_rate_for_ventilation_system_on": 0,
+            "infiltration_rate_for_ventilation_system_off": 0.9,
+            "constructions": {
+                "OutdoorsWall": {
+                    "opaque_surface_name": "F_2008_2014_FACEXT1",
+                    "transparent_surface_name": "F_2008_2014_WIN1",
+                    "transparent_ratio": {
+                        "north": "60",
+                        "east": "60",
+                        "south": "60",
+                        "west": "60"
+                    }
+                },
+                "OutdoorsRoofCeiling": {
+                    "opaque_surface_name": "F_2008_2014_ROOF1",
+                    "transparent_surface_name": null,
+                    "transparent_ratio": {
+                        "north": null,
+                        "east": null,
+                        "south": null,
+                        "west": null
+                    }
+                },
+                "GroundFloor": {
+                    "opaque_surface_name": "F_2008_2014_FLOORGR1"
+                }
+            },
+            "infiltration_rate_area_for_ventilation_system_on": 0,
+            "infiltration_rate_area_for_ventilation_system_off": 0
+        },
+        {
+            "function": "Single-family building",
+            "period_of_construction": "2015_2019",
+            "climate_zone": "B3",
+            "average_storey_height": 3.75,
+            "thermal_capacity": 3200,
+            "extra_loses_due_thermal_bridges": 0.1,
+            "infiltration_rate_for_ventilation_system_on": 0,
+            "infiltration_rate_for_ventilation_system_off": 0.9,
+            "constructions": {
+                "OutdoorsWall": {
+                    "opaque_surface_name": "G_2015_2019_FACEXT1",
+                    "transparent_surface_name": "G_2015_2019_WIN1",
+                    "transparent_ratio": {
+                        "north": "60",
+                        "east": "60",
+                        "south": "60",
+                        "west": "60"
+                    }
+                },
+                "OutdoorsRoofCeiling": {
+                    "opaque_surface_name": "G_2015_2019_ROOF1",
+                    "transparent_surface_name": null,
+                    "transparent_ratio": {
+                        "north": null,
+                        "east": null,
+                        "south": null,
+                        "west": null
+                    }
+                },
+                "GroundFloor": {
+                    "opaque_surface_name": "G_2015_2019_FLOORGR1"
+                }
+            },
+            "infiltration_rate_area_for_ventilation_system_on": 0,
+            "infiltration_rate_area_for_ventilation_system_off": 0
+        }
+    ]
+}

hub/data/energy_systems/montreal_custom_systems.xml

@@ -198,7 +198,7 @@
             <equipments>
                 <generation_id>3</generation_id>
                 <distribution_id>8</distribution_id>
-            </equipments>
+g            </equipments>
         </system>
         <system id="5">
             <name>Single zone packaged rooftop unit with electrical resistance furnace and baseboards and fuel boiler for acs</name>
@@ -240,7 +240,7 @@
             <demand>domestic_hot_water</demand>
         </demands>
         <equipments>
-            <generation_id>1</generation_id>
+            <generation_id>2</generation_id>
             <distribution_id>3</distribution_id>
         </equipments>
         </system>
@@ -302,7 +302,7 @@
             </demands>
             <equipments>
                 <generation_id>5</generation_id>
-                <distribution_id>4</distribution_id>
+                <distribution_id>6</distribution_id>
             </equipments>
         </system>
         <system id="15">

hub/data/energy_systems/palma_systems.xml

@@ -253,7 +253,7 @@
         <pv_generation_component>
             <system_id>7</system_id>
             <name>template Photovoltaic Module</name>
-            <system_type>photovoltaic</system_type>
+            <system_type>Photovoltaic</system_type>
             <model_name/>
             <manufacturer/>
             <nominal_electricity_output/>
@@ -264,7 +264,7 @@
             <standard_test_condition_cell_temperature>25</standard_test_condition_cell_temperature>
             <standard_test_condition_radiation>1000</standard_test_condition_radiation>
             <standard_test_condition_maximum_power>500</standard_test_condition_maximum_power>
-            <cell_temperature_coefficient>0.3</cell_temperature_coefficient>
+            <cell_temperature_coefficient/>
             <width>2.0</width>
             <height>1.0</height>
             <distribution_systems/>
@@ -274,7 +274,7 @@
         <pv_generation_component>
             <system_id>8</system_id>
             <name>Photovoltaic Module</name>
-            <system_type>photovoltaic</system_type>
+            <system_type>Photovoltaic</system_type>
             <model_name>RE400CAA Pure 2</model_name>
             <manufacturer>REC</manufacturer>
             <nominal_electricity_output>305</nominal_electricity_output>
@@ -295,7 +295,7 @@
         <pv_generation_component>
             <system_id>9</system_id>
             <name>Photovoltaic Module</name>
-            <system_type>photovoltaic</system_type>
+            <system_type>Photovoltaic</system_type>
             <model_name>RE410CAA Pure 2</model_name>
             <manufacturer>REC</manufacturer>
             <nominal_electricity_output>312</nominal_electricity_output>
@@ -316,7 +316,7 @@
         <pv_generation_component>
             <system_id>10</system_id>
             <name>Photovoltaic Module</name>
-            <system_type>photovoltaic</system_type>
+            <system_type>Photovoltaic</system_type>
             <model_name>RE420CAA Pure 2</model_name>
             <manufacturer>REC</manufacturer>
             <nominal_electricity_output>320</nominal_electricity_output>
@@ -337,7 +337,7 @@
         <pv_generation_component>
             <system_id>11</system_id>
             <name>Photovoltaic Module</name>
-            <system_type>photovoltaic</system_type>
+            <system_type>Photovoltaic</system_type>
             <model_name>RE430CAA Pure 2</model_name>
             <manufacturer>REC</manufacturer>
             <nominal_electricity_output>327</nominal_electricity_output>
@@ -358,7 +358,7 @@
         <pv_generation_component>
             <system_id>12</system_id>
             <name>Photovoltaic Module</name>
-            <system_type>photovoltaic</system_type>
+            <system_type>Photovoltaic</system_type>
             <model_name>REC600AA Pro M</model_name>
             <manufacturer>REC</manufacturer>
             <nominal_electricity_output>457</nominal_electricity_output>
@@ -379,7 +379,7 @@
         <pv_generation_component>
             <system_id>13</system_id>
             <name>Photovoltaic Module</name>
-            <system_type>photovoltaic</system_type>
+            <system_type>Photovoltaic</system_type>
             <model_name>REC610AA Pro M</model_name>
             <manufacturer>REC</manufacturer>
             <nominal_electricity_output>464</nominal_electricity_output>
@@ -400,7 +400,7 @@
         <pv_generation_component>
             <system_id>14</system_id>
             <name>Photovoltaic Module</name>
-            <system_type>photovoltaic</system_type>
+            <system_type>Photovoltaic</system_type>
             <model_name>REC620AA Pro M</model_name>
             <manufacturer>REC</manufacturer>
             <nominal_electricity_output>472</nominal_electricity_output>
@@ -421,7 +421,7 @@
         <pv_generation_component>
             <system_id>15</system_id>
             <name>Photovoltaic Module</name>
-            <system_type>photovoltaic</system_type>
+            <system_type>Photovoltaic</system_type>
             <model_name>REC630AA Pro M</model_name>
             <manufacturer>REC</manufacturer>
             <nominal_electricity_output>480</nominal_electricity_output>
@@ -442,7 +442,7 @@
         <pv_generation_component>
             <system_id>16</system_id>
             <name>Photovoltaic Module</name>
-            <system_type>photovoltaic</system_type>
+            <system_type>Photovoltaic</system_type>
             <model_name>REC640AA Pro M</model_name>
             <manufacturer>REC</manufacturer>
             <nominal_electricity_output>487</nominal_electricity_output>

hub/exports/building_energy/idf.py

@@ -468,7 +468,7 @@ class Idf:
 
   def _add_infiltration_surface(self, thermal_zone, zone_name):
     schedule = f'INF_CONST schedules {thermal_zone.usage_name}'
-    _infiltration = thermal_zone.infiltration_rate_area_system_off* cte.INFILTRATION_75PA_TO_4PA
+    _infiltration = thermal_zone.infiltration_rate_area_system_off*1
     self._idf.newidfobject(self._INFILTRATION,
                            Name=f'{zone_name}_infiltration',
                            Zone_or_ZoneList_or_Space_or_SpaceList_Name=zone_name,
@@ -730,10 +730,7 @@ class Idf:
     else:
       # idf only allows setting wwr for external walls
       wwr = 0
-      try:
+      self._idf.set_wwr(wwr)
-        self._idf.set_wwr(wwr, construction='window_construction_1')
-      except ValueError:
-        self._idf.set_wwr(0, construction='window_construction_1')
 
   def _add_surfaces(self, building, zone_name):
     for thermal_zone in building.thermal_zones_from_internal_zones:

hub/exports/formats/cesiumjs_tileset.py

@@ -146,7 +146,7 @@ class CesiumjsTileset:
             'max_height': building.max_height,
             'year_of_construction': building.year_of_construction,
             'function': building.function,
-            'usages_percentage': building.usages
+            'usages_percentage': building.usages_percentage
           }
         },
         'content': {

hub/helpers/constants.py

@@ -316,7 +316,6 @@ GRID = 'Grid'
 ONSITE_ELECTRICITY = 'Onsite Electricity'
 PHOTOVOLTAIC = 'Photovoltaic'
 BOILER = 'Boiler'
-FURNACE = 'Furnace'
 HEAT_PUMP = 'Heat Pump'
 BASEBOARD = 'Baseboard'
 ELECTRICITY_GENERATOR = 'Electricity generator'

hub/helpers/data/montreal_custom_fuel_to_hub_fuel.py

@@ -17,7 +17,6 @@ class MontrealCustomFuelToHubFuel:
     self._dictionary = {
       'gas': cte.GAS,
       'natural gas': cte.GAS,
-      'biomass': cte.BIOMASS,
       'electricity': cte.ELECTRICITY,
       'renewable': cte.RENEWABLE,
       'butane': cte.BUTANE,

hub/helpers/data/montreal_generation_system_to_hub_energy_generation_system.py

@@ -15,10 +15,10 @@ class MontrealGenerationSystemToHubEnergyGenerationSystem:
   def __init__(self):
     self._dictionary = {
       'boiler': cte.BOILER,
-      'furnace': cte.FURNACE,
+      'furnace': cte.BASEBOARD,
       'cooler': cte.CHILLER,
       'electricity generator': cte.ELECTRICITY_GENERATOR,
-      'photovoltaic': cte.PHOTOVOLTAIC,
+      'Photovoltaic': cte.PHOTOVOLTAIC,
       'heat pump': cte.HEAT_PUMP,
       'joule': cte.JOULE,
       'split': cte.SPLIT,

hub/helpers/parsers/list_usage_to_hub.py

@@ -1,31 +0,0 @@
-
-class ListUsageToHub:
-  """
-  Eilat function to hub function class
-  """
-
-  def __init__(self, function_dictionary=None):
-    self._function_dictionary = function_dictionary
-
-  def _apply_function_dictionary(self, usages):
-
-    function_dictionary = self._function_dictionary
-
-    if function_dictionary is not None:
-      for usage in usages:
-        if usage['usage'] in function_dictionary:
-          usage['usage'] = function_dictionary[usage['usage']]
-
-    return usages
-    
-  def parse(self, usages) -> list[dict]:
-    """
-    Get the dictionary
-    :return: {}
-    """
-
-    usages = [{"usage": str(i["usage"]), "ratio": float(i["ratio"])} for i in usages]
-
-    usages = self._apply_function_dictionary(usages)
-
-    return usages

hub/helpers/parsers/string_usage_to_hub.py

@@ -1,19 +0,0 @@
-
-class StringUsageToHub:
-  """
-  Eilat function to hub function class
-  """
-
-  def parse(self, usages) -> list[dict]:
-    """
-    Parse usage string in form residential-80_commercial-20
-    :usages: str 
-    :return: {}
-    """
-
-    parsed_usages = []
-    for usage in usages.split('_'):
-      usage_dict = {"usage": str(usage.split('-')[0]), "ratio": float(usage.split('-')[1])/100}
-      parsed_usages.append(usage_dict)
-
-    return parsed_usages

hub/helpers/usage_parsers.py

@@ -1,31 +0,0 @@
-"""
-Dictionaries module saves all transformations of functions and usages to access the catalogs
-SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2023 Concordia CERC group
-Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
-"""
-
-from hub.helpers.parsers.list_usage_to_hub import ListUsageToHub
-from hub.helpers.parsers.string_usage_to_hub import StringUsageToHub 
-
-class UsageParsers:
-  """
-  Dictionaries class
-  """
-
-  @staticmethod
-  def string_usage_to_hub() -> object:
-    """
-    Hub usage to HfT usage, transformation dictionary
-    :return: dict
-    """
-    return StringUsageToHub().parse
-
-  @staticmethod
-  def list_usage_to_hub(function_dictionary=None) -> object:
-    """
-    Hub usage to HfT usage, transformation dictionary
-    :return: dict
-    """
-    return ListUsageToHub(function_dictionary).parse
-

hub/imports/construction/nrcan_physics_parameters.py

@@ -33,10 +33,21 @@ class NrcanPhysicsParameters:
     city = self._city
     nrcan_catalog = ConstructionCatalogFactory('nrcan').catalog
     for building in city.buildings:
-      if building.function not in Dictionaries().hub_function_to_nrcan_construction_function:
+      main_function = None
-        logging.error('Building %s has an unknown building function %s', building.name, building.function)
+      functions = building.function.split('_')
+      if len(functions) > 1:
+        maximum_percentage = 0
+        for function in functions:
+          percentage_and_function = function.split('-')
+          if float(percentage_and_function[0]) > maximum_percentage:
+            maximum_percentage = float(percentage_and_function[0])
+            main_function = percentage_and_function[-1]
+      else:
+        main_function = functions[-1]
+      if main_function not in Dictionaries().hub_function_to_nrcan_construction_function:
+        logging.error('Building %s has an unknown building function %s', building.name, main_function)
         continue
-      function = Dictionaries().hub_function_to_nrcan_construction_function[building.function]
+      function = Dictionaries().hub_function_to_nrcan_construction_function[main_function]
       try:
         archetype = self._search_archetype(nrcan_catalog, function, building.year_of_construction, self._climate_zone)
 

hub/imports/energy_systems/montreal_custom_energy_system_parameters.py

@@ -3,7 +3,6 @@ Montreal custom energy system importer
 SPDX - License - Identifier: LGPL - 3.0 - or -later
 Copyright © 2023 Concordia CERC group
 Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
-Project Contributor Saeed Ranjbar saeed.ranjbar@concordia.ca
 """
 
 import logging
@@ -84,9 +83,9 @@ class MontrealCustomEnergySystemParameters:
   def _create_generation_systems(archetype_system):
     _generation_systems = []
     for archetype_generation_system in archetype_system.generation_systems:
-      if archetype_generation_system.system_type == 'photovoltaic':
+      if archetype_generation_system.system_type == 'Photovoltaic':
         _generation_system = PvGenerationSystem()
-        _type = archetype_generation_system.system_type
+        _type = 'Photovoltaic'
         _generation_system.system_type = Dictionaries().montreal_generation_system_to_hub_energy_generation_system[
           _type]
         _fuel_type = Dictionaries().montreal_custom_fuel_to_hub_fuel[archetype_generation_system.fuel_type]
@@ -137,14 +136,14 @@ class MontrealCustomEnergySystemParameters:
       _distribution_system.distribution_consumption_variable_flow = \
         archetype_distribution_system.distribution_consumption_variable_flow
       _distribution_system.heat_losses = archetype_distribution_system.heat_losses
-      _generic_emission_system = None
+      _emission_system = None
       if archetype_distribution_system.emission_systems is not None:
         _emission_systems = []
         for emission_system in archetype_distribution_system.emission_systems:
-          _generic_emission_system = EmissionSystem()
+          _emission_system = EmissionSystem()
-          _generic_emission_system.parasitic_energy_consumption = emission_system.parasitic_energy_consumption
+          _emission_system.parasitic_energy_consumption = emission_system.parasitic_energy_consumption
-          _emission_systems.append(_generic_emission_system)
+          _emission_systems.append(_emission_system)
-        _distribution_system.emission_systems = _emission_systems
+      _distribution_system.emission_systems = _emission_systems
       _distribution_systems.append(_distribution_system)
     return _distribution_systems
 

hub/imports/energy_systems/montreal_future_energy_systems_parameters.py

@@ -43,7 +43,6 @@ class MontrealFutureEnergySystemParameters:
       archetype_name = building.energy_systems_archetype_name
       try:
         archetype = self._search_archetypes(montreal_custom_catalog, archetype_name)
-        building.energy_systems_archetype_cluster_id = archetype.cluster_id
       except KeyError:
         logging.error('Building %s has unknown energy system archetype for system name %s', building.name,
                       archetype_name)
@@ -88,7 +87,7 @@ class MontrealFutureEnergySystemParameters:
     archetype_generation_systems = archetype_system.generation_systems
     if archetype_generation_systems is not None:
       for archetype_generation_system in archetype_system.generation_systems:
-        if archetype_generation_system.system_type == 'photovoltaic':
+        if archetype_generation_system.system_type == 'Photovoltaic':
           _generation_system = PvGenerationSystem()
           _generation_system.name = archetype_generation_system.name
           _generation_system.model_name = archetype_generation_system.model_name
@@ -104,21 +103,15 @@ class MontrealFutureEnergySystemParameters:
           _generation_system.nominal_radiation = archetype_generation_system.nominal_radiation
           _generation_system.standard_test_condition_cell_temperature = archetype_generation_system.standard_test_condition_cell_temperature
           _generation_system.standard_test_condition_maximum_power = archetype_generation_system.standard_test_condition_maximum_power
-          _generation_system.standard_test_condition_radiation = archetype_generation_system.standard_test_condition_radiation
           _generation_system.cell_temperature_coefficient = archetype_generation_system.cell_temperature_coefficient
           _generation_system.width = archetype_generation_system.width
           _generation_system.height = archetype_generation_system.height
           _generation_system.tilt_angle = self._city.latitude
           _generic_storage_system = None
           if archetype_generation_system.energy_storage_systems is not None:
-            _storage_systems = []
+            _generic_storage_system = ElectricalStorageSystem()
-            for storage_system in archetype_generation_system.energy_storage_systems:
+            _generic_storage_system.type_energy_stored = 'electrical'
-              if storage_system.type_energy_stored == 'electrical':
+          _generation_system.energy_storage_systems = [_generic_storage_system]
-                _generic_storage_system = ElectricalStorageSystem()
-                _generic_storage_system.type_energy_stored = 'electrical'
-              _storage_systems.append(_generic_storage_system)
-            _generation_system.energy_storage_systems = _storage_systems
-
         else:
           _generation_system = NonPvGenerationSystem()
           _generation_system.name = archetype_generation_system.name
@@ -192,14 +185,14 @@ class MontrealFutureEnergySystemParameters:
         _distribution_system.distribution_consumption_variable_flow = \
           archetype_distribution_system.distribution_consumption_variable_flow
         _distribution_system.heat_losses = archetype_distribution_system.heat_losses
-        _generic_emission_system = None
+        _emission_system = None
         if archetype_distribution_system.emission_systems is not None:
           _emission_systems = []
           for emission_system in archetype_distribution_system.emission_systems:
-            _generic_emission_system = EmissionSystem()
+            _emission_system = EmissionSystem()
-            _generic_emission_system.parasitic_energy_consumption = emission_system.parasitic_energy_consumption
+            _emission_system.parasitic_energy_consumption = emission_system.parasitic_energy_consumption
-            _emission_systems.append(_generic_emission_system)
+            _emission_systems.append(_emission_system)
-          _distribution_system.emission_systems = _emission_systems
+        _distribution_system.emission_systems = _emission_systems
         _distribution_systems.append(_distribution_system)
       return _distribution_systems
 

hub/imports/energy_systems/palma_energy_systems_parameters.py

@@ -87,7 +87,7 @@ class PalmaEnergySystemParameters:
     archetype_generation_systems = archetype_system.generation_systems
     if archetype_generation_systems is not None:
       for archetype_generation_system in archetype_system.generation_systems:
-        if archetype_generation_system.system_type == 'photovoltaic':
+        if archetype_generation_system.system_type == 'Photovoltaic':
           _generation_system = PvGenerationSystem()
           _generation_system.name = archetype_generation_system.name
           _generation_system.model_name = archetype_generation_system.model_name

hub/imports/geometry/geojson.py

@@ -35,8 +35,6 @@ class Geojson:
                year_of_construction_field=None,
                function_field=None,
                function_to_hub=None,
-               usages_field=None,
-               usages_to_hub=None,
                hub_crs=None
                ):
     self._hub_crs = hub_crs
@@ -54,8 +52,6 @@ class Geojson:
     self._year_of_construction_field = year_of_construction_field
     self._function_field = function_field
     self._function_to_hub = function_to_hub
-    self._usages_field = usages_field
-    self._usages_to_hub = usages_to_hub
     with open(path, 'r', encoding='utf8') as json_file:
       self._geojson = json.loads(json_file.read())
 
@@ -121,30 +117,41 @@ class Geojson:
       lod = 0
       for feature in self._geojson['features']:
         extrusion_height = 0
-
         if self._extrusion_height_field is not None:
           extrusion_height = float(feature['properties'][self._extrusion_height_field])
           lod = 1
           self._max_z = max(self._max_z, extrusion_height)
         year_of_construction = None
-
         if self._year_of_construction_field is not None:
           year_of_construction = int(feature['properties'][self._year_of_construction_field])
-
         function = None
         if self._function_field is not None:
           function = str(feature['properties'][self._function_field])
+          if function == 'Mixed use' or function == 'mixed use':
+            function_parts = []
+            if 'usages' in feature['properties']:
+              usages = feature['properties']['usages']
+              for usage in usages:
+                if self._function_to_hub is not None and usage['usage'] in self._function_to_hub:
+                  function_parts.append(f"{usage['percentage']}-{self._function_to_hub[usage['usage']]}")
+                else:
+                  function_parts.append(f"{usage['percentage']}-{usage['usage']}")
+            else:
+              for key, value in feature['properties'].items():
+                if key.startswith("mixed_type_") and not key.endswith("_percentage"):
+                  type_key = key
+                  percentage_key = f"{key}_percentage"
+                  if percentage_key in feature['properties']:
+                    if self._function_to_hub is not None and feature['properties'][type_key] in self._function_to_hub:
+                      usage_function = self._function_to_hub[feature['properties'][type_key]]
+                      function_parts.append(f"{feature['properties'][percentage_key]}-{usage_function}")
+                    else:
+                      function_parts.append(f"{feature['properties'][percentage_key]}-{feature['properties'][type_key]}")
+            function = "_".join(function_parts)
           if self._function_to_hub is not None:
+            # use the transformation dictionary to retrieve the proper function
             if function in self._function_to_hub:
               function = self._function_to_hub[function]
-
-        usages = None
-        if self._usages_field is not None:
-          if self._usages_field in feature['properties']:
-            usages = feature['properties'][self._usages_field]
-            if self._usages_to_hub is not None:
-              usages = self._usages_to_hub(usages)
-
         geometry = feature['geometry']
         building_aliases = []
         if 'id' in feature:
@@ -163,7 +170,6 @@ class Geojson:
                                                building_name,
                                                building_aliases,
                                                function,
-                                               usages,
                                                year_of_construction,
                                                extrusion_height))
 
@@ -172,7 +178,6 @@ class Geojson:
                                                      building_name,
                                                      building_aliases,
                                                      function,
-                                                     usages,
                                                      year_of_construction,
                                                      extrusion_height))
         else:
@@ -198,7 +203,7 @@ class Geojson:
       transformed_coordinates = f'{transformed_coordinates} {transformed[self._X]} {transformed[self._Y]} 0.0'
     return transformed_coordinates.lstrip(' ')
 
-  def _parse_polygon(self, coordinates, building_name, building_aliases, function, usages, year_of_construction, extrusion_height):
+  def _parse_polygon(self, coordinates, building_name, building_aliases, function, year_of_construction, extrusion_height):
     surfaces = []
     for polygon_coordinates in coordinates:
       points = igh.points_from_string(
@@ -231,7 +236,7 @@ class Geojson:
         polygon = Polygon(coordinates)
         polygon.area = igh.ground_area(coordinates)
         surfaces[-1] = Surface(polygon, polygon)
-    building = Building(f'{building_name}', surfaces, year_of_construction, function, usages=usages)
+    building = Building(f'{building_name}', surfaces, year_of_construction, function)
     for alias in building_aliases:
       building.add_alias(alias)
     if extrusion_height == 0:
@@ -266,13 +271,13 @@ class Geojson:
         polygon = Polygon(wall_coordinates)
         wall = Surface(polygon, polygon)
         surfaces.append(wall)
-      building = Building(f'{building_name}', surfaces, year_of_construction, function, usages=usages)
+      building = Building(f'{building_name}', surfaces, year_of_construction, function)
       for alias in building_aliases:
         building.add_alias(alias)
       building.volume = volume
       return building
 
-  def _parse_multi_polygon(self, polygons_coordinates, building_name, building_aliases, function, usages, year_of_construction, extrusion_height):
+  def _parse_multi_polygon(self, polygons_coordinates, building_name, building_aliases, function, year_of_construction, extrusion_height):
     surfaces = []
     for coordinates in polygons_coordinates:
       for polygon_coordinates in coordinates:
@@ -305,7 +310,7 @@ class Geojson:
           polygon = Polygon(coordinates)
           polygon.area = igh.ground_area(coordinates)
           surfaces[-1] = Surface(polygon, polygon)
-    building = Building(f'{building_name}', surfaces, year_of_construction, function, usages=usages)
+    building = Building(f'{building_name}', surfaces, year_of_construction, function)
     for alias in building_aliases:
       building.add_alias(alias)
     if extrusion_height == 0:
@@ -340,7 +345,7 @@ class Geojson:
         polygon = Polygon(wall_coordinates)
         wall = Surface(polygon, polygon)
         surfaces.append(wall)
-      building = Building(f'{building_name}', surfaces, year_of_construction, function, usages=usages)
+      building = Building(f'{building_name}', surfaces, year_of_construction, function)
       for alias in building_aliases:
         building.add_alias(alias)
       building.volume = volume

hub/imports/geometry_factory.py

@@ -23,8 +23,6 @@ class GeometryFactory:
                year_of_construction_field=None,
                function_field=None,
                function_to_hub=None,
-               usages_field=None,
-               usages_to_hub=None,
                hub_crs=None):
     self._file_type = '_' + file_type.lower()
     validate_import_export_type(GeometryFactory, file_type)
@@ -34,8 +32,6 @@ class GeometryFactory:
     self._year_of_construction_field = year_of_construction_field
     self._function_field = function_field
     self._function_to_hub = function_to_hub
-    self._usages_field = usages_field
-    self._usages_to_hub = usages_to_hub
     self._hub_crs = hub_crs
 
   @property
@@ -70,8 +66,6 @@ class GeometryFactory:
                    self._year_of_construction_field,
                    self._function_field,
                    self._function_to_hub,
-                   self._usages_field,
-                   self._usages_to_hub,
                    self._hub_crs).city
 
   @property

hub/imports/usage/comnet_usage_parameters.py

@@ -38,36 +38,38 @@ class ComnetUsageParameters:
     city = self._city
     comnet_catalog = UsageCatalogFactory('comnet').catalog
     for building in city.buildings:
+      usages = []
       comnet_archetype_usages = []
-      usages = building.usages
+      building_functions = building.function.split('_')
+      for function in building_functions:
+        usages.append(function.split('-'))
       for usage in usages:
-        comnet_usage_name = Dictionaries().hub_usage_to_comnet_usage[usage['usage']]
+        comnet_usage_name = Dictionaries().hub_usage_to_comnet_usage[usage[-1]]
         try:
           comnet_archetype_usage = self._search_archetypes(comnet_catalog, comnet_usage_name)
           comnet_archetype_usages.append(comnet_archetype_usage)
         except KeyError:
           logging.error('Building %s has unknown usage archetype for usage %s', building.name, comnet_usage_name)
           continue
-
       for (i, internal_zone) in enumerate(building.internal_zones):
         internal_zone_usages = []
         if len(building.internal_zones) > 1:
           volume_per_area = 0
           if internal_zone.area is None:
             logging.error('Building %s has internal zone area not defined, ACH cannot be calculated for usage %s',
-                          building.name, usages[i]['usage'])
+                          building.name, usages[i][-1])
             continue
           if internal_zone.volume is None:
             logging.error('Building %s has internal zone volume not defined, ACH cannot be calculated for usage %s',
-                          building.name, usages[i]['usage'])
+                          building.name, usages[i][-1])
             continue
           if internal_zone.area <= 0:
             logging.error('Building %s has internal zone area equal to 0, ACH cannot be calculated for usage %s',
-                          building.name,  usages[i]['usage'])
+                          building.name,  usages[i][-1])
             continue
           volume_per_area += internal_zone.volume / internal_zone.area
           usage = Usage()
-          usage.name = usages[i]['usage']
+          usage.name = usages[i][-1]
           self._assign_values(usage, comnet_archetype_usages[i], volume_per_area, building.cold_water_temperature)
           usage.percentage = 1
           self._calculate_reduced_values_from_extended_library(usage, comnet_archetype_usages[i])
@@ -78,24 +80,20 @@ class ComnetUsageParameters:
             logging.error('Building %s no number of storeys assigned, ACH cannot be calculated for usage %s. '
                           'NRCAN construction data for the year %s is used to calculated number of storeys above '
                           'ground', building.name,  usages, building.year_of_construction)
-            try:
+            storeys_above_ground = self.average_storey_height_calculator(self._city, building)
-              storeys_above_ground = self.average_storey_height_calculator(self._city, building)
-            except ValueError as e:
-              logging.error(e)
-              continue
-
           volume_per_area = building.volume / building.floor_area / storeys_above_ground
-          for j, usage_type in enumerate(usages):
+          for (j, mixed_usage) in enumerate(usages):
             usage = Usage()
-            usage.name = usage_type['usage']
+            usage.name = mixed_usage[-1]
-            usage.percentage = float(usage_type['ratio'])
+            if len(usages) > 1:
-
+              usage.percentage = float(mixed_usage[0]) / 100
+            else:
+              usage.percentage = 1
             self._assign_values(usage, comnet_archetype_usages[j], volume_per_area, building.cold_water_temperature)
             self._calculate_reduced_values_from_extended_library(usage, comnet_archetype_usages[j])
             internal_zone_usages.append(usage)
 
         internal_zone.usages = internal_zone_usages
-
   @staticmethod
   def _search_archetypes(comnet_catalog, usage_name):
     comnet_archetypes = comnet_catalog.entries('archetypes').usages
@@ -272,11 +270,20 @@ class ComnetUsageParameters:
   def average_storey_height_calculator(city, building):
     climate_zone = ConstructionHelper.city_to_nrcan_climate_zone(city.climate_reference_city)
     nrcan_catalog = ConstructionCatalogFactory('nrcan').catalog
-
+    main_function = None
-    if building.function not in Dictionaries().hub_function_to_nrcan_construction_function:
+    functions = building.function.split('_')
-      raise ValueError('Building %s has an unknown building function %s', building.name, building.function)
+    if len(functions) > 1:
-
+      maximum_percentage = 0
-    function = Dictionaries().hub_function_to_nrcan_construction_function[building.function]
+      for function in functions:
+        percentage_and_function = function.split('-')
+        if float(percentage_and_function[0]) > maximum_percentage:
+          maximum_percentage = float(percentage_and_function[0])
+          main_function = percentage_and_function[-1]
+    else:
+      main_function = functions[-1]
+    if main_function not in Dictionaries().hub_function_to_nrcan_construction_function:
+      logging.error('Building %s has an unknown building function %s', building.name, main_function)
+    function = Dictionaries().hub_function_to_nrcan_construction_function[main_function]
     construction_archetype = None
     average_storey_height = None
     nrcan_archetypes = nrcan_catalog.entries('archetypes')
@@ -287,8 +294,8 @@ class ComnetUsageParameters:
           construction_archetype = building_archetype
           average_storey_height = building_archetype.average_storey_height
     if construction_archetype is None:
-      raise ValueError('Building %s has unknown construction archetype for building function: %s '
+      logging.error('Building %s has unknown construction archetype for building function: %s '
                     '[%s], building year of construction: %s and climate zone %s', building.name, function,
                     building.function, building.year_of_construction, climate_zone)
 
-    return average_storey_height
+    return average_storey_height

hub/imports/usage/nrcan_usage_parameters.py

@@ -37,18 +37,21 @@ class NrcanUsageParameters:
     nrcan_catalog = UsageCatalogFactory('nrcan').catalog
     comnet_catalog = UsageCatalogFactory('comnet').catalog
     for building in city.buildings:
+      usages = []
       nrcan_archetype_usages = []
       comnet_archetype_usages = []
-      usages = building.usages
+      building_functions = building.function.split('_')
+      for function in building_functions:
+        usages.append(function.split('-'))
       for usage in usages:
-        usage_name = Dictionaries().hub_usage_to_nrcan_usage[usage['usage']]
+        usage_name = Dictionaries().hub_usage_to_nrcan_usage[usage[-1]]
         try:
           archetype_usage = self._search_archetypes(nrcan_catalog, usage_name)
           nrcan_archetype_usages.append(archetype_usage)
         except KeyError:
           logging.error('Building %s has unknown usage archetype for usage %s', building.name, usage_name)
           continue
-        comnet_usage_name = Dictionaries().hub_usage_to_comnet_usage[usage['usage']]
+        comnet_usage_name = Dictionaries().hub_usage_to_comnet_usage[usage[-1]]
         try:
           comnet_archetype_usage = self._search_archetypes(comnet_catalog, comnet_usage_name)
           comnet_archetype_usages.append(comnet_archetype_usage)
@@ -62,19 +65,19 @@ class NrcanUsageParameters:
           volume_per_area = 0
           if internal_zone.area is None:
             logging.error('Building %s has internal zone area not defined, ACH cannot be calculated for usage %s',
-                          building.name, usages[i]['usage'])
+                          building.name, usages[i][-1])
             continue
           if internal_zone.volume is None:
             logging.error('Building %s has internal zone volume not defined, ACH cannot be calculated for usage %s',
-                          building.name, usages[i]['usage'])
+                          building.name, usages[i][-1])
             continue
           if internal_zone.area <= 0:
             logging.error('Building %s has internal zone area equal to 0, ACH cannot be calculated for usage %s',
-                          building.name,  usages[i]['usage'])
+                          building.name,  usages[i][-1])
             continue
           volume_per_area += internal_zone.volume / internal_zone.area
           usage = Usage()
-          usage.name = usages[i]['usage']
+          usage.name = usages[i][-1]
           self._assign_values(usage, nrcan_archetype_usages[i], volume_per_area, building.cold_water_temperature)
           self._assign_comnet_extra_values(usage, comnet_archetype_usages[i], nrcan_archetype_usages[i].occupancy.occupancy_density)
           usage.percentage = 1
@@ -83,21 +86,19 @@ class NrcanUsageParameters:
         else:
           storeys_above_ground = building.storeys_above_ground
           if storeys_above_ground is None:
-            logging.error('Building %s no number of storeys assigned, ACH cannot be calculated for function %s. '
+            logging.error('Building %s no number of storeys assigned, ACH cannot be calculated for usage %s. '
                           'NRCAN construction data for the year %s is used to calculated number of storeys above '
-                          'ground', building.name,  building.function, building.year_of_construction)
+                          'ground', building.name,  usages, building.year_of_construction)
-            try:
+            storeys_above_ground = self.average_storey_height_calculator(self._city, building)
-              storeys_above_ground = self.average_storey_height_calculator(self._city, building)
+            continue
-            except ValueError as e:
-              logging.error(e)
-              continue
-
           volume_per_area = building.volume / building.floor_area / storeys_above_ground
-          for j, usage_type in enumerate(usages):
+          for (j, mixed_usage) in enumerate(usages):
             usage = Usage()
-            usage.name = usage_type['usage']
+            usage.name = mixed_usage[-1]
-            usage.percentage = float(usage_type['ratio'])
+            if len(usages) > 1:
-
+              usage.percentage = float(mixed_usage[0]) / 100
+            else:
+              usage.percentage = 1
             self._assign_values(usage, nrcan_archetype_usages[j], volume_per_area, building.cold_water_temperature)
             self._assign_comnet_extra_values(usage, comnet_archetype_usages[j], nrcan_archetype_usages[j].occupancy.occupancy_density)
             self._calculate_reduced_values_from_extended_library(usage, nrcan_archetype_usages[j])
@@ -226,11 +227,20 @@ class NrcanUsageParameters:
   def average_storey_height_calculator(city, building):
     climate_zone = ConstructionHelper.city_to_nrcan_climate_zone(city.climate_reference_city)
     nrcan_catalog = ConstructionCatalogFactory('nrcan').catalog
-
+    main_function = None
-    if building.function not in Dictionaries().hub_function_to_nrcan_construction_function:
+    functions = building.function.split('_')
-      raise ValueError('Building %s has an unknown building function %s', building.name, building.function)
+    if len(functions) > 1:
-
+      maximum_percentage = 0
-    function = Dictionaries().hub_function_to_nrcan_construction_function[building.function]
+      for function in functions:
+        percentage_and_function = function.split('-')
+        if float(percentage_and_function[0]) > maximum_percentage:
+          maximum_percentage = float(percentage_and_function[0])
+          main_function = percentage_and_function[-1]
+    else:
+      main_function = functions[-1]
+    if main_function not in Dictionaries().hub_function_to_nrcan_construction_function:
+      logging.error('Building %s has an unknown building function %s', building.name, main_function)
+    function = Dictionaries().hub_function_to_nrcan_construction_function[main_function]
     construction_archetype = None
     average_storey_height = None
     nrcan_archetypes = nrcan_catalog.entries('archetypes')
@@ -241,7 +251,7 @@ class NrcanUsageParameters:
           construction_archetype = building_archetype
           average_storey_height = building_archetype.average_storey_height
     if construction_archetype is None:
-      raise ValueError('Building %s has unknown construction archetype for building function: %s '
+      logging.error('Building %s has unknown construction archetype for building function: %s '
                     '[%s], building year of construction: %s and climate zone %s', building.name, function,
                     building.function, building.year_of_construction, climate_zone)
 

hub/version.py

@@ -1,4 +1,4 @@
 """
 Hub version number
 """
-__version__ = '0.2.0.17'
+__version__ = '0.2.0.13'

setup.py

@@ -65,7 +65,6 @@ setup(
             'hub.helpers',
             'hub.helpers.peak_calculation',
             'hub.helpers.data',
-            'hub.helpers.parsers',
             'hub.imports',
             'hub.imports.construction',
             'hub.imports.construction.helpers',
@@ -110,4 +109,4 @@ setup(
     ('hub/exports/building_energy/idf_files', glob.glob('hub/exports/building_energy/idf_files/*.idd'))
   ],
 
-)
+)

tests/test_systems_catalog.py

@@ -39,11 +39,11 @@ class TestSystemsCatalog(TestCase):
 
     catalog_categories = catalog.names()
     archetypes = catalog.names()
-    self.assertEqual(34, len(archetypes['archetypes']))
+    self.assertEqual(15, len(archetypes['archetypes']))
     systems = catalog.names('systems')
-    self.assertEqual(39, len(systems['systems']))
+    self.assertEqual(12, len(systems['systems']))
     generation_equipments = catalog.names('generation_equipments')
-    self.assertEqual(49, len(generation_equipments['generation_equipments']))
+    self.assertEqual(27, len(generation_equipments['generation_equipments']))
     with self.assertRaises(ValueError):
       catalog.names('unknown')
 
@@ -55,7 +55,6 @@ class TestSystemsCatalog(TestCase):
     with self.assertRaises(IndexError):
       catalog.get_entry('unknown')
 
-
   def test_palma_catalog(self):
     catalog = EnergySystemsCatalogFactory('palma').catalog
     catalog_categories = catalog.names()

tests/test_systems_factory.py

@@ -114,8 +114,7 @@ class TestSystemsFactory(TestCase):
     ResultFactory('insel_monthly_energy_balance', self._city, self._output_path).enrich()
 
     for building in self._city.buildings:
-      building.energy_systems_archetype_name = ('Central Hydronic Air and Gas Source Heating System with Unitary Split '
+      building.energy_systems_archetype_name = 'PV+ASHP+GasBoiler+TES'
-                                                'Cooling and Air Source HP DHW and Grid Tied PV')
     EnergySystemsFactory('montreal_future', self._city).enrich()
     # Need to assign energy systems to buildings:
     for building in self._city.buildings:
@@ -132,8 +131,7 @@ class TestSystemsFactory(TestCase):
       self.assertLess(0, building.heating_consumption[cte.YEAR][0])
       self.assertLess(0, building.cooling_consumption[cte.YEAR][0])
       self.assertLess(0, building.domestic_hot_water_consumption[cte.YEAR][0])
-      if 'PV' in building.energy_systems_archetype_name:
+      self.assertLess(0, building.onsite_electrical_production[cte.YEAR][0])
-        self.assertLess(0, building.onsite_electrical_production[cte.YEAR][0])
 
   def test_palma_system_results(self):
     """

tests/test_usage_factory.py

@@ -11,7 +11,6 @@ from hub.imports.geometry_factory import GeometryFactory
 from hub.imports.construction_factory import ConstructionFactory
 from hub.imports.usage_factory import UsageFactory
 from hub.helpers.dictionaries import Dictionaries
-from hub.helpers.usage_parsers import UsageParsers
 
 
 class TestUsageFactory(TestCase):
@@ -76,40 +75,6 @@ class TestUsageFactory(TestCase):
     self.assertIsNotNone(usage.thermal_control.heating_set_back, 'control heating set back is none')
     self.assertIsNotNone(usage.thermal_control.mean_cooling_set_point, 'control cooling set point is none')
 
-    self.assertIsNotNone(usage.mechanical_air_change, 'mechanical air change is none')
-    self.assertIsNotNone(usage.thermal_control.heating_set_point_schedules,
-                         'control heating set point schedule is none')
-    self.assertIsNotNone(usage.thermal_control.cooling_set_point_schedules,
-                         'control cooling set point schedule is none')
-    self.assertIsNotNone(usage.occupancy, 'occupancy is none')
-    occupancy = usage.occupancy
-    self.assertIsNotNone(occupancy.occupancy_density, 'occupancy density is none')
-    self.assertIsNotNone(occupancy.latent_internal_gain, 'occupancy latent internal gain is none')
-    self.assertIsNotNone(occupancy.sensible_convective_internal_gain,
-                         'occupancy sensible convective internal gain is none')
-    self.assertIsNotNone(occupancy.sensible_radiative_internal_gain,
-                         'occupancy sensible radiant internal gain is none')
-    self.assertIsNotNone(occupancy.occupancy_schedules, 'occupancy schedule is none')
-    self.assertIsNotNone(usage.lighting, 'lighting is none')
-    lighting = usage.lighting
-    self.assertIsNotNone(lighting.density, 'lighting density is none')
-    self.assertIsNotNone(lighting.latent_fraction, 'lighting latent fraction is none')
-    self.assertIsNotNone(lighting.convective_fraction, 'lighting convective fraction is none')
-    self.assertIsNotNone(lighting.radiative_fraction, 'lighting radiant fraction is none')
-    self.assertIsNotNone(lighting.schedules, 'lighting schedule is none')
-    self.assertIsNotNone(usage.appliances, 'appliances is none')
-    appliances = usage.appliances
-    self.assertIsNotNone(appliances.density, 'appliances density is none')
-    self.assertIsNotNone(appliances.latent_fraction, 'appliances latent fraction is none')
-    self.assertIsNotNone(appliances.convective_fraction, 'appliances convective fraction is none')
-    self.assertIsNotNone(appliances.radiative_fraction, 'appliances radiant fraction is none')
-    self.assertIsNotNone(appliances.schedules, 'appliances schedule is none')
-    self.assertIsNotNone(usage.thermal_control.hvac_availability_schedules,
-                         'control hvac availability is none')
-    self.assertIsNotNone(usage.domestic_hot_water.service_temperature,
-                         'domestic hot water service temperature is none')
-    self.assertIsNotNone(usage.domestic_hot_water.schedules, 'domestic hot water schedules is none')
-
   def test_import_comnet(self):
     """
     Enrich the city with the usage information from comnet and verify it
@@ -126,7 +91,40 @@ class TestUsageFactory(TestCase):
         self.assertIsNot(len(internal_zone.usages), 0, 'no building usage defined')
         for usage in internal_zone.usages:
           self._check_usage(usage)
+          self.assertIsNotNone(usage.mechanical_air_change, 'mechanical air change is none')
+          self.assertIsNotNone(usage.thermal_control.heating_set_point_schedules,
+                               'control heating set point schedule is none')
+          self.assertIsNotNone(usage.thermal_control.cooling_set_point_schedules,
+                               'control cooling set point schedule is none')
+          self.assertIsNotNone(usage.occupancy, 'occupancy is none')
+          occupancy = usage.occupancy
+          self.assertIsNotNone(occupancy.occupancy_density, 'occupancy density is none')
+          self.assertIsNotNone(occupancy.latent_internal_gain, 'occupancy latent internal gain is none')
+          self.assertIsNotNone(occupancy.sensible_convective_internal_gain,
+                               'occupancy sensible convective internal gain is none')
+          self.assertIsNotNone(occupancy.sensible_radiative_internal_gain,
+                               'occupancy sensible radiant internal gain is none')
+          self.assertIsNotNone(occupancy.occupancy_schedules, 'occupancy schedule is none')
+          self.assertIsNotNone(usage.lighting, 'lighting is none')
+          lighting = usage.lighting
+          self.assertIsNotNone(lighting.density, 'lighting density is none')
+          self.assertIsNotNone(lighting.latent_fraction, 'lighting latent fraction is none')
+          self.assertIsNotNone(lighting.convective_fraction, 'lighting convective fraction is none')
+          self.assertIsNotNone(lighting.radiative_fraction, 'lighting radiant fraction is none')
+          self.assertIsNotNone(lighting.schedules, 'lighting schedule is none')
+          self.assertIsNotNone(usage.appliances, 'appliances is none')
+          appliances = usage.appliances
+          self.assertIsNotNone(appliances.density, 'appliances density is none')
+          self.assertIsNotNone(appliances.latent_fraction, 'appliances latent fraction is none')
+          self.assertIsNotNone(appliances.convective_fraction, 'appliances convective fraction is none')
+          self.assertIsNotNone(appliances.radiative_fraction, 'appliances radiant fraction is none')
+          self.assertIsNotNone(appliances.schedules, 'appliances schedule is none')
+          self.assertIsNotNone(usage.thermal_control.hvac_availability_schedules,
+                               'control hvac availability is none')
           self.assertIsNotNone(usage.domestic_hot_water.density, 'domestic hot water density is none')
+          self.assertIsNotNone(usage.domestic_hot_water.service_temperature,
+                               'domestic hot water service temperature is none')
+          self.assertIsNotNone(usage.domestic_hot_water.schedules, 'domestic hot water schedules is none')
 
   def test_import_nrcan(self):
     """
@@ -150,6 +148,40 @@ class TestUsageFactory(TestCase):
           self.assertIsNot(len(internal_zone.usages), 0, 'no building usage defined')
           for usage in internal_zone.usages:
             self._check_usage(usage)
+            self.assertIsNotNone(usage.mechanical_air_change, 'mechanical air change is none')
+            self.assertIsNotNone(usage.thermal_control.heating_set_point_schedules,
+                                 'control heating set point schedule is none')
+            self.assertIsNotNone(usage.thermal_control.cooling_set_point_schedules,
+                                 'control cooling set point schedule is none')
+            self.assertIsNotNone(usage.occupancy, 'occupancy is none')
+            occupancy = usage.occupancy
+            self.assertIsNotNone(occupancy.occupancy_density, 'occupancy density is none')
+            self.assertIsNotNone(occupancy.latent_internal_gain, 'occupancy latent internal gain is none')
+            self.assertIsNotNone(occupancy.sensible_convective_internal_gain,
+                                 'occupancy sensible convective internal gain is none')
+            self.assertIsNotNone(occupancy.sensible_radiative_internal_gain,
+                                 'occupancy sensible radiant internal gain is none')
+            self.assertIsNotNone(occupancy.occupancy_schedules, 'occupancy schedule is none')
+            self.assertIsNotNone(usage.lighting, 'lighting is none')
+            lighting = usage.lighting
+            self.assertIsNotNone(lighting.density, 'lighting density is none')
+            self.assertIsNotNone(lighting.latent_fraction, 'lighting latent fraction is none')
+            self.assertIsNotNone(lighting.convective_fraction, 'lighting convective fraction is none')
+            self.assertIsNotNone(lighting.radiative_fraction, 'lighting radiant fraction is none')
+            self.assertIsNotNone(lighting.schedules, 'lighting schedule is none')
+            self.assertIsNotNone(usage.appliances, 'appliances is none')
+            appliances = usage.appliances
+            self.assertIsNotNone(appliances.density, 'appliances density is none')
+            self.assertIsNotNone(appliances.latent_fraction, 'appliances latent fraction is none')
+            self.assertIsNotNone(appliances.convective_fraction, 'appliances convective fraction is none')
+            self.assertIsNotNone(appliances.radiative_fraction, 'appliances radiant fraction is none')
+            self.assertIsNotNone(appliances.schedules, 'appliances schedule is none')
+            self.assertIsNotNone(usage.thermal_control.hvac_availability_schedules,
+                                 'control hvac availability is none')
+            self.assertIsNotNone(usage.domestic_hot_water.peak_flow, 'domestic hot water peak flow is none')
+            self.assertIsNotNone(usage.domestic_hot_water.service_temperature,
+                                 'domestic hot water service temperature is none')
+            self.assertIsNotNone(usage.domestic_hot_water.schedules, 'domestic hot water schedules is none')
   
   def test_import_palma(self):
     """
@@ -173,35 +205,38 @@ class TestUsageFactory(TestCase):
           self.assertIsNot(len(internal_zone.usages), 0, 'no building usage defined')
           for usage in internal_zone.usages:
             self._check_usage(usage)
+            self.assertIsNotNone(usage.mechanical_air_change, 'mechanical air change is none')
+            self.assertIsNotNone(usage.thermal_control.heating_set_point_schedules,
+                                 'control heating set point schedule is none')
+            self.assertIsNotNone(usage.thermal_control.cooling_set_point_schedules,
+                                 'control cooling set point schedule is none')
+            self.assertIsNotNone(usage.occupancy, 'occupancy is none')
+            occupancy = usage.occupancy
+            self.assertIsNotNone(occupancy.occupancy_density, 'occupancy density is none')
+            self.assertIsNotNone(occupancy.latent_internal_gain, 'occupancy latent internal gain is none')
+            self.assertIsNotNone(occupancy.sensible_convective_internal_gain,
+                                 'occupancy sensible convective internal gain is none')
+            self.assertIsNotNone(occupancy.sensible_radiative_internal_gain,
+                                 'occupancy sensible radiant internal gain is none')
+            self.assertIsNotNone(occupancy.occupancy_schedules, 'occupancy schedule is none')
+            self.assertIsNotNone(usage.lighting, 'lighting is none')
+            lighting = usage.lighting
+            self.assertIsNotNone(lighting.density, 'lighting density is none')
+            self.assertIsNotNone(lighting.latent_fraction, 'lighting latent fraction is none')
+            self.assertIsNotNone(lighting.convective_fraction, 'lighting convective fraction is none')
+            self.assertIsNotNone(lighting.radiative_fraction, 'lighting radiant fraction is none')
+            self.assertIsNotNone(lighting.schedules, 'lighting schedule is none')
+            self.assertIsNotNone(usage.appliances, 'appliances is none')
+            appliances = usage.appliances
+            self.assertIsNotNone(appliances.density, 'appliances density is none')
+            self.assertIsNotNone(appliances.latent_fraction, 'appliances latent fraction is none')
+            self.assertIsNotNone(appliances.convective_fraction, 'appliances convective fraction is none')
+            self.assertIsNotNone(appliances.radiative_fraction, 'appliances radiant fraction is none')
+            self.assertIsNotNone(appliances.schedules, 'appliances schedule is none')
+            self.assertIsNotNone(usage.thermal_control.hvac_availability_schedules,
+                                 'control hvac availability is none')
             self.assertIsNotNone(usage.domestic_hot_water.peak_flow, 'domestic hot water peak flow is none')
+            self.assertIsNotNone(usage.domestic_hot_water.service_temperature,
+                                 'domestic hot water service temperature is none')
+            self.assertIsNotNone(usage.domestic_hot_water.schedules, 'domestic hot water schedules is none')
 
-
-
-  def test_import_nrcan_multiusage(self):
-    """
-    Enrich the city with the usage information from nrcan and verify it
-    """
-    file = 'test.geojson'
-    file_path = (self._example_path / file).resolve()
-
-    function_dictionary = Dictionaries().montreal_function_to_hub_function
-    usage_parser = UsageParsers().list_usage_to_hub(function_dictionary=function_dictionary)
-
-    city = GeometryFactory('geojson',
-                           path=file_path,
-                           height_field='citygml_me',
-                           year_of_construction_field='ANNEE_CONS',
-                           function_field='CODE_UTILI',
-                           function_to_hub=function_dictionary,
-                           usages_field='usages',
-                           usages_to_hub=usage_parser).city
-
-    ConstructionFactory('nrcan', city).enrich()
-    UsageFactory('nrcan', city).enrich()
-    self._check_buildings(city)
-    for building in city.buildings:
-      for internal_zone in building.internal_zones:
-        if internal_zone.usages is not None:
-          self.assertIsNot(len(internal_zone.usages), 0, 'no building usage defined')
-          for usage in internal_zone.usages:
-            self._check_usage(usage)