License header change to better reflect the coder and code contributors, remove the Model creators from the contributors as it may be misleading

CONTRIBUTING.md

@@ -56,7 +56,8 @@ Include a small header with contact information and the code license at the top
     """
     Name module
     SPDX - License - Identifier: LGPL - 3.0 - or -later
-    Copyright © 2020 Project Author name mail@concordia.ca
+    Copyright © 2022 Concordia CERC group
+    Project Coder name mail@concordia.ca
     """
     
     

PYGUIDE.md

@@ -31,7 +31,8 @@ comment.
 """
 MyClass module
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2020 Project Author name name@concordia.ca
+Copyright © 2022 Concordia CERC group
+Project Coder name name@concordia.ca
 """
 
 import sys

catalogs/catalog.py

@@ -1,7 +1,8 @@
 """
 Catalog base class
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2022 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
+Copyright © 2022 Concordia CERC group
+Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
 """
 
 class Catalog:

catalogs/construction/nrel_catalog.py

@@ -0,0 +1,34 @@
+"""
+Greenery catalog
+SPDX - License - Identifier: LGPL - 3.0 - or -later
+Copyright © 2022 Concordia CERC group
+Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
+"""
+import xmltodict
+from pathlib import Path
+from catalogs.catalog import Catalog
+
+
+class NrelCatalog(Catalog):
+  def __init__(self, path):
+    archetypes = str(Path(path / 'us_archetypes.xml').resolve())
+    constructions = str(Path(path / 'us_constructions.xml').resolve())
+    with open(constructions) as xml:
+      self._constructions = xmltodict.parse(xml.read())
+    with open(archetypes) as xml:
+      self._archetypes = xmltodict.parse(xml.read())
+    self._windows = []
+    self._materials = []
+    self._constructions = []
+    self._archetypes = []
+
+  @property
+  def names(self, category=None):
+    nam
+
+  def entries(self, category=None):
+    pass
+
+  def get_entry(self, name):
+    pass
+

catalogs/construction_catalog_factory.py

@@ -0,0 +1,39 @@
+"""
+Construction catalog factory, publish the construction information
+SPDX - License - Identifier: LGPL - 3.0 - or -later
+Copyright © 2022 Concordia CERC group
+Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
+"""
+
+from pathlib import Path
+from typing import TypeVar
+from catalogs.construction.nrel_catalog import NrelCatalog
+from catalogs.construction.nrcan_catalog import NrcanCatalog
+Catalog = TypeVar('Catalog')
+
+class ConstructionCatalogFactory:
+  def __init__(self, file_type, base_path=None):
+    if base_path is None:
+      base_path = Path(Path(__file__).parent.parent / 'data/construction')
+    self._catalog_type = '_' + file_type.lower()
+    self._path = base_path
+
+  def _nrel(self):
+    """
+    Retrieve NREL catalog
+    """
+    return NrelCatalog(self._path)
+
+  def _nrcan(self):
+    """
+    Retrieve NRCAN catalog
+    """
+    return NrcanCatalog(self._city, self._base_path)
+
+  @property
+  def catalog(self) -> Catalog:
+    """
+    Enrich the city given to the class using the class given handler
+    :return: Catalog
+    """
+    return getattr(self, self._catalog_type, lambda: None)

catalogs/data_models/construction/archetype.py

@@ -0,0 +1,10 @@
+"""
+Construction catalog Archetype
+SPDX - License - Identifier: LGPL - 3.0 - or -later
+Copyright © 2022 Concordia CERC group
+Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
+"""
+
+class Archetype:
+  def __init__(self):
+    pass

catalogs/data_models/construction/construction.py

@@ -0,0 +1,10 @@
+"""
+Construction catalog contruction
+SPDX - License - Identifier: LGPL - 3.0 - or -later
+Copyright © 2022 Concordia CERC group
+Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
+"""
+
+class Construction:
+  def __init__(self):
+    pass

catalogs/data_models/construction/content.py

@@ -0,0 +1,41 @@
+"""
+Construction catalog content
+SPDX - License - Identifier: LGPL - 3.0 - or -later
+Copyright © 2022 Concordia CERC group
+Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
+"""
+
+class Content:
+  def __init__(self, archetypes, constructions, materials, windows):
+    self._archetypes = archetypes
+    self._constructions = constructions
+    self._materials = materials
+    self._windows = windows
+
+  @property
+  def archetypes(self):
+    """
+    All archetypes in the catalog
+    """
+    return self._archetypes
+
+  @property
+  def constructions(self):
+    """
+    All constructions in the catalog
+    """
+    return self._constructions
+
+  @property
+  def materials(self):
+    """
+    All materials in the catalog
+    """
+    return self._materials
+
+  @property
+  def windows(self):
+    """
+    All windows in the catalog
+    """
+    return self._windows

catalogs/data_models/construction/material.py

@@ -0,0 +1,13 @@
+"""
+Construction catalog material
+SPDX - License - Identifier: LGPL - 3.0 - or -later
+Copyright © 2022 Concordia CERC group
+Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
+"""
+
+from city_model_structure.building_demand.material import Material as LibsMaterial
+
+class Material(LibsMaterial):
+  def __init__(self):
+    # Inherit normal material directly if needed additional transformations will be done to this class
+    super().__init__()

catalogs/data_models/construction/window.py

@@ -0,0 +1,78 @@
+"""
+Construction catalog window
+SPDX - License - Identifier: LGPL - 3.0 - or -later
+Copyright © 2022 Concordia CERC group
+Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
+"""
+
+class Window:
+  def __init__(self):
+    self._frame_ratio = None
+    self._g_value = None
+    self._overall_u_value = None
+    self._construction_name = None
+
+  @property
+  def frame_ratio(self):
+    """
+    Get window frame ratio
+    :return: None or float
+    """
+    return self._frame_ratio
+
+  @frame_ratio.setter
+  def frame_ratio(self, value):
+    """
+    Set window frame ratio
+    :param value: float
+    """
+    if value is not None:
+      self._frame_ratio = float(value)
+
+  @property
+  def g_value(self):
+    """
+    Get thermal opening g-value
+    :return: None or float
+    """
+    return self._g_value
+
+  @g_value.setter
+  def g_value(self, value):
+    """
+    Set thermal opening g-value
+    :param value: float
+    """
+    if value is not None:
+      self._g_value = float(value)
+
+  @property
+  def overall_u_value(self):
+    """
+    Get thermal opening overall U-value in W/m2K
+    :return: None or float
+    """
+    return self._overall_u_value
+
+  @overall_u_value.setter
+  def overall_u_value(self, value):
+    """
+    Set thermal opening overall U-value in W/m2K
+    :param value: float
+    """
+    if value is not None:
+      self._overall_u_value = float(value)
+
+  @property
+  def construction_name(self):
+    """
+    Get thermal opening construction name
+    """
+    return self._construction_name
+
+  @construction_name.setter
+  def construction_name(self, value):
+    """
+    Set thermal opening construction name
+    """
+    self._construction_name = value

catalogs/data_models/greenery/content.py

@@ -1,10 +1,11 @@
 """
 Greenery catalog content
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2022 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
+Copyright © 2022 Concordia CERC group
+Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
 """
 
-class GreeneryContent:
+class Content:
   def __init__(self, vegetations, plants, soils):
     self._vegetations = vegetations
     self._plants = plants

catalogs/data_models/greenery/plant.py

@@ -1,10 +1,11 @@
 """
 Greenery catalog data model Plant class
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2022 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
+Copyright © 2022 Concordia CERC group
+Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
 """
 
-from catalogs.data_model.greenery.soil import Soil as libs_soil
+from catalogs.data_models.greenery.soil import Soil as libs_soil
 
 
 class Plant:

catalogs/data_models/greenery/plant_percentage.py

@@ -1,10 +1,11 @@
 """
 Greenery catalog data model Plant percentage class
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2022 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
+Copyright © 2022 Concordia CERC group
+Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
 """
 
-from catalogs.data_model.greenery.plant import Plant as libs_plant
+from catalogs.data_models.greenery.plant import Plant as libs_plant
 
 class PlantPercentage(libs_plant):
 

catalogs/data_models/greenery/soil.py

@@ -1,7 +1,8 @@
 """
 Greenery catalog data model Soil class
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2022 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
+Copyright © 2022 Concordia CERC group
+Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
 """
 
 class Soil:

catalogs/data_models/greenery/vegetation.py

@@ -1,10 +1,11 @@
 """
 Greenery catalog data model Vegetation class
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2022 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
+Copyright © 2022 Concordia CERC group
+Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
 """
 
-from catalogs.data_model.greenery.plant_percentage import PlantPercentage
+from catalogs.data_models.greenery.plant_percentage import PlantPercentage
 
 class Vegetation:
   def __init__(self, category, vegetation, plant_percentages):

catalogs/greenery/greenery_catalog.py

@@ -1,18 +1,19 @@
 """
 Greenery catalog
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2022 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
+Copyright © 2022 Concordia CERC group
+Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
 """
 
 from pyecore.resources import ResourceSet, URI
 from catalogs.greenery.ecore_greenery.greenerycatalog import GreeneryCatalog as gc
 from catalogs.catalog import Catalog
 from pathlib import Path
-from catalogs.data_model.greenery.vegetation import Vegetation as libs_vegetation
+from catalogs.data_models.greenery.vegetation import Vegetation as libs_vegetation
-from catalogs.data_model.greenery.plant import Plant as libs_plant
+from catalogs.data_models.greenery.plant import Plant as libs_plant
-from catalogs.data_model.greenery.soil import Soil as libs_soil
+from catalogs.data_models.greenery.soil import Soil as libs_soil
-from catalogs.data_model.greenery.plant_percentage import PlantPercentage as libs_pp
+from catalogs.data_models.greenery.plant_percentage import PlantPercentage as libs_pp
-from catalogs.data_model.greenery.greenery_content import GreeneryContent
+from catalogs.data_models.greenery.content import Content as GreeneryContent
 
 
 class GreeneryCatalog(Catalog):
@@ -56,7 +57,7 @@ class GreeneryCatalog(Catalog):
     for soil in catalog_data.soils:
       soils.append(libs_soil(soil))
 
-    self._data = GreeneryContent(vegetations, plants, soils)
+    self._content = GreeneryContent(vegetations, plants, soils)
 
   def names(self, category=None):
     """
@@ -65,22 +66,22 @@ class GreeneryCatalog(Catalog):
     """
     if category is None:
       _names = {'vegetations': [], 'plants': [], 'soils': []}
-      for vegetation in self._data.vegetations:
+      for vegetation in self._content.vegetations:
         _names['vegetations'].append(vegetation.name)
-      for plant in self._data.plants:
+      for plant in self._content.plants:
         _names['plants'].append(plant.name)
-      for soil in self._data.soils:
+      for soil in self._content.soils:
         _names['soils'].append(soil.name)
     else:
       _names = {category: []}
       if category.lower() == 'vegetations':
-        for vegetation in self._data.vegetations:
+        for vegetation in self._content.vegetations:
           _names[category].append(vegetation.name)
       elif category.lower() == 'plants':
-        for plant in self._data.plants:
+        for plant in self._content.plants:
           _names[category].append(plant.name)
       elif category.lower() == 'soils':
-        for soil in self._data.soils:
+        for soil in self._content.soils:
           _names[category].append(soil.name)
       else:
         raise ValueError(f'Unknown category [{category}]')
@@ -90,26 +91,26 @@ class GreeneryCatalog(Catalog):
     """
     Get one complete entry from the greenery catalog
     """
-    for entry in self._data.vegetations:
+    for entry in self._content.vegetations:
       if entry.name.lower() == name.lower():
         return entry
-    for entry in self._data.plants:
+    for entry in self._content.plants:
       if entry.name.lower() == name.lower():
         return entry
-    for entry in self._data.soils:
+    for entry in self._content.soils:
       if entry.name.lower() == name.lower():
         return entry
     raise IndexError(f"{name} doesn't exists in the catalog")
 
   def entries(self, category=None):
     if category is None:
-      return self._data
+      return self._content
     else:
       if category.lower() == 'vegetations':
-        return self._data.vegetations
+        return self._content.vegetations
       elif category.lower() == 'plants':
-        return self._data.plants
+        return self._content.plants
       elif category.lower() == 'soils':
-        return self._data.soils
+        return self._content.soils
       else:
         raise ValueError(f'Unknown category [{category}]')

catalogs/greenery_catalog_factory.py

@@ -1,7 +1,8 @@
 """
 Greenery catalog publish the greenery information
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2022 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
+Copyright © 2022 Concordia CERC group
+Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
 """
 
 from pathlib import Path
@@ -16,7 +17,7 @@ class GreeneryCatalogFactory:
   def __init__(self, file_type, base_path=None):
     if base_path is None:
       base_path = Path(Path(__file__).parent.parent / 'data/greenery')
-    self._file_type = '_' + file_type.lower()
+    self._catalog_type = '_' + file_type.lower()
     self._path = base_path
 
   @property
@@ -33,4 +34,4 @@ class GreeneryCatalogFactory:
     Enrich the city given to the class using the class given handler
     :return: Catalog
     """
-    return getattr(self, self._file_type, lambda: None)
+    return getattr(self, self._catalog_type, lambda: None)

city_model_structure/attributes/edge.py

@@ -1,8 +1,8 @@
 """
 Node module
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2021 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
+Copyright © 2022 Concordia CERC group
-Contributor Milad milad.aghamohamadnia@concordia.ca
+Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
 """
 import uuid
 from typing import List, TypeVar

city_model_structure/attributes/node.py

@@ -1,8 +1,8 @@
 """
 Node module
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2021 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
+Copyright © 2022 Concordia CERC group
-Contributor Milad milad.aghamohamadnia@concordia.ca
+Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
 """
 
 import uuid

city_model_structure/attributes/plane.py

@@ -1,7 +1,8 @@
 """
 Plane module
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2020 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
+Copyright © 2022 Concordia CERC group
+Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
 """
 
 from typing import TypeVar

city_model_structure/attributes/point.py

@@ -1,7 +1,8 @@
 """
 Point module
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2020 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
+Copyright © 2022 Concordia CERC group
+Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
 """
 
 import math

city_model_structure/attributes/polygon.py

@@ -1,7 +1,8 @@
 """
 Polygon module
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2020 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
+Copyright © 2022 Concordia CERC group
+Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
 """
 
 from __future__ import annotations

city_model_structure/attributes/polyhedron.py

@@ -1,8 +1,9 @@
 """
 Polyhedron module
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
+Copyright © 2022 Concordia CERC group
-Contributors Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
+Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
+Code contributors: Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
 """
 
 from typing import List, Union

city_model_structure/attributes/record.py

@@ -1,7 +1,8 @@
 """
 Record module
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2021 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
+Copyright © 2022 Concordia CERC group
+Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
 """
 
 

city_model_structure/attributes/schedule.py

@@ -1,7 +1,8 @@
 """
 Schedule module
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2021 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
+Copyright © 2022 Concordia CERC group
+Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
 """
 
 import uuid

city_model_structure/attributes/time_series.py

@@ -1,7 +1,8 @@
 """
 Time series module
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2021 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
+Copyright © 2022 Concordia CERC group
+Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
 """
 
 from typing import List

city_model_structure/building.py

@@ -1,8 +1,9 @@
 """
 Building module
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
+Copyright © 2022 Concordia CERC group
-contributors: Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
+Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
+Code contributors: Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
 """
 
 from typing import List, Union

city_model_structure/building_demand/appliances.py

@@ -1,7 +1,8 @@
 """
 Appliances module
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2022 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
+Copyright © 2022 Concordia CERC group
+Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
 """
 from typing import Union, List
 from city_model_structure.attributes.schedule import Schedule

city_model_structure/building_demand/household.py

@@ -1,7 +1,8 @@
 """
 Household module
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2020 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
+Copyright © 2022 Concordia CERC group
+Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
 """
 
 

city_model_structure/building_demand/internal_gains.py

@@ -1,7 +1,8 @@
 """
 InternalGains module
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
+Copyright © 2022 Concordia CERC group
+Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
 """
 
 from typing import Union, List

city_model_structure/building_demand/internal_zone.py

@@ -1,7 +1,8 @@
 """
 InternalZone module. It saves the original geometrical information from interiors together with some attributes of those
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2022 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
+Copyright © 2022 Concordia CERC group
+Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
 """
 
 import uuid

city_model_structure/building_demand/layer.py

@@ -1,7 +1,8 @@
 """
 Layers module
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
+Copyright © 2022 Concordia CERC group
+Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
 """
 import uuid
 from typing import Union

city_model_structure/building_demand/lighting.py

@@ -1,7 +1,8 @@
 """
 Lighting module
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2022 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
+Copyright © 2022 Concordia CERC group
+Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
 """
 from typing import Union, List
 from city_model_structure.attributes.schedule import Schedule

city_model_structure/building_demand/material.py

@@ -1,9 +1,8 @@
 """
 Material module
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
+Copyright © 2022 Concordia CERC group
-Contributor Atiya atiya.atiya@mail.concordia.ca
+Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
-Contributor Mohammad Reza mohammad.seyedabadi@mail.concordia.ca
 """
 
 import ast
@@ -15,42 +14,16 @@ class Material:
   Material class
   """
   def __init__(self):
-    self._type = type
     self._id = None
     self._name = None
     self._conductivity = None
     self._specific_heat = None
     self._density = None
-    self._density_unit = None
     self._solar_absorptance = None
     self._thermal_absorptance = None
     self._visible_absorptance = None
     self._no_mass = False
     self._thermal_resistance = None
-    self._embodied_carbon = None
-    self._embodied_carbon_unit = None
-    self._recycling_ratio = None
-    self._onsite_recycling_ratio = None
-    self._company_recycling_ratio = None
-    self._landfilling_ratio = None
-    self._cost = None
-    self._cost_unit = None
-
-  @property
-  def type(self):
-    """
-    Get material type
-    :return: str
-    """
-    return self._type
-
-  @type.setter
-  def type(self, value):
-    """
-    Set material type
-    :param value: string
-    """
-    self._type = str(value)
 
   @property
   def id(self):
@@ -135,23 +108,6 @@ class Material:
     if value is not None:
       self._density = float(value)
 
-  @property
-  def density_unit(self) -> Union[None, str]:
-    """
-    Get material density unit
-    :return: None or string
-    """
-    return self._density_unit
-
-  @density_unit.setter
-  def density_unit(self, value):
-    """
-    Set material density unit
-    :param value: string
-    """
-    if value is not None:
-      self._density_unit = str(value)
-
   @property
   def solar_absorptance(self) -> Union[None, float]:
     """
@@ -236,139 +192,3 @@ class Material:
     """
     if value is not None:
       self._thermal_resistance = float(value)
-
-  @property
-  def embodied_carbon(self) -> Union[None, float]:
-    """
-    Get material embodied carbon
-    :return: None or float
-    """
-    return self._embodied_carbon
-
-  @embodied_carbon.setter
-  def embodied_carbon(self, value):
-    """
-    Set material embodied carbon
-    :param value: float
-    """
-    if value is not None:
-      self._embodied_carbon = float(value)
-
-  @property
-  def embodied_carbon_unit(self) -> Union[None, str]:
-    """
-    Get material embodied carbon unit
-    :return: None or string
-    """
-    return self._embodied_carbon
-
-  @embodied_carbon_unit.setter
-  def embodied_carbon_unit(self, value):
-    """
-    Set material embodied carbon unit
-    :param value: string
-    """
-    if value is not None:
-      self._embodied_carbon_unit = str(value)
-
-  @property
-  def recycling_ratio(self) -> Union[None, float]:
-    """
-    Get material recycling ratio
-    :return: None or float
-    """
-    return self._recycling_ratio
-
-  @recycling_ratio.setter
-  def recycling_ratio(self, value):
-    """
-    Set material recycling ratio
-    :param value: float
-    """
-    if value is not None:
-      self._recycling_ratio = float(value)
-
-  @property
-  def onsite_recycling_ratio(self) -> Union[None, float]:
-    """
-    Get material onsite recycling ratio
-    :return: None or float
-    """
-    return self._onsite_recycling_ratio
-
-  @onsite_recycling_ratio.setter
-  def onsite_recycling_ratio(self, value):
-    """
-    Set material onsite recycling ratio
-    :param value: float
-    """
-    if value is not None:
-      self._onsite_recycling_ratio = float(value)
-
-    @property
-    def company_recycling_ratio(self) -> Union[None, float]:
-      """
-      Get material company recycling ratio
-      :return: None or float
-      """
-      return self._company_recycling_ratio
-
-    @company_recycling_ratio.setter
-    def company_recycling_ratio(self, value):
-      """
-      Set material company recycling ratio
-      :param value: float
-      """
-      if value is not None:
-        self._company_recycling_ratio = float(value)
-
-    @property
-    def landfilling_ratio(self) -> Union[None, float]:
-      """
-      Get material landfilling ratio
-      :return: None or float
-      """
-      return self._landfilling_ratio
-
-    @landfilling_ratio.setter
-    def landfilling_ratio(self, value):
-      """
-      Set material landfilling ratio
-      :param value: float
-      """
-      if value is not None:
-        self._landfilling_ratio = float(value)
-
-    @property
-    def cost(self) -> Union[None, float]:
-      """
-      Get material cost
-      :return: None or float
-      """
-      return self._cost
-
-    @cost.setter
-    def cost(self, value):
-      """
-      Set material cost
-      :param value: float
-      """
-      if value is not None:
-        self._cost = float(value)
-
-    @property
-    def cost_unit(self) -> Union[None, str]:
-      """
-      Get material cost unit
-      :return: None or string
-      """
-      return self._cost_unit
-
-    @cost_unit.setter
-    def cost_unit(self, value):
-      """
-      Set material cost unit
-      :param value: string
-      """
-      if value is not None:
-        self._cost_unit = float(value)

city_model_structure/building_demand/occupancy.py

@@ -1,7 +1,8 @@
 """
 Occupancy module
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2022 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
+Copyright © 2022 Concordia CERC group
+Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
 """
 from typing import Union, List
 from city_model_structure.attributes.schedule import Schedule

city_model_structure/building_demand/occupant.py

@@ -1,8 +1,9 @@
 """
 Occupant module
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2020 Project Author Sanam Dabirian sanam.dabirian@mail.concordia.ca
+Copyright © 2022 Concordia CERC group
-Contributors Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
+Project Coder Sanam Dabirian sanam.dabirian@mail.concordia.ca
+Code contributors: Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
 """
 
 import calendar as cal

city_model_structure/building_demand/storey.py

@@ -1,7 +1,8 @@
 """
 Storey module
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2020 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
+Copyright © 2022 Concordia CERC group
+Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
 """
 
 from __future__ import annotations

city_model_structure/building_demand/surface.py

@@ -1,8 +1,9 @@
 """
 Surface module
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
+Copyright © 2022 Concordia CERC group
-contributors Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
+Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
+Code contributors: Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
 """
 
 from __future__ import annotations

city_model_structure/building_demand/thermal_boundary.py

@@ -1,8 +1,9 @@
 """
 ThermalBoundary module
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
+Copyright © 2022 Concordia CERC group
-Contributors Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
+Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
+Code contributors: Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
 """
 import uuid
 from typing import List, Union

city_model_structure/building_demand/thermal_control.py

@@ -1,7 +1,8 @@
 """
 ThermalControl module
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2022 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
+Copyright © 2022 Concordia CERC group
+Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
 """
 from typing import Union, List
 from city_model_structure.attributes.schedule import Schedule

city_model_structure/building_demand/thermal_opening.py

@@ -1,8 +1,9 @@
 """
 ThermalOpening module
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
+Copyright © 2022 Concordia CERC group
-Contributors Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
+Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
+Code contributors: Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
 """
 import uuid
 from typing import TypeVar, Union

city_model_structure/building_demand/thermal_zone.py

@@ -1,8 +1,9 @@
 """
 ThermalZone module
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
+Copyright © 2022 Concordia CERC group
-Contributors Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
+Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
+Code contributors: Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
 """
 import uuid
 from typing import List, Union, TypeVar

city_model_structure/building_demand/usage_zone.py

@@ -1,8 +1,9 @@
 """
 UsageZone module
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2020 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
+Copyright © 2022 Concordia CERC group
-Contributors Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
+Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
+Code contributors: Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
 """
 import uuid
 from typing import List, Union

city_model_structure/buildings_cluster.py

@@ -1,7 +1,8 @@
 """
 BuildingsCluster module
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2020 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
+Copyright © 2022 Concordia CERC group
+Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
 """
 
 from typing import List, TypeVar

city_model_structure/bus_system.py

@@ -1,7 +1,8 @@
 """
 Bus system module
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2021 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
+Copyright © 2022 Concordia CERC group
+Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
 """
 
 from typing import List

city_model_structure/city.py

@@ -1,8 +1,9 @@
 """
 City module
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
+Copyright © 2022 Concordia CERC group
-Contributor Peter Yefi peteryefi@gmail.com
+Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
+Code contributors: Peter Yefi peteryefi@gmail.com
 """
 from __future__ import annotations
 import sys

city_model_structure/city_object.py

@@ -1,7 +1,8 @@
 """
 CityObject module
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
+Copyright © 2022 Concordia CERC group
+Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
 """
 
 import math
@@ -39,7 +40,7 @@ class CityObject:
   @property
   def name(self):
     """
-    Get building name
+    Get city object name
     :return: str
     """
     return self._name
@@ -47,7 +48,7 @@ class CityObject:
   @name.setter
   def name(self, value):
     """
-    Set building name
+    Set city object name
     :return: str
     """
     self._name = value

city_model_structure/city_objects_cluster.py

@@ -1,7 +1,8 @@
 """
 CityObjectsCluster module
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2020 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
+Copyright © 2022 Concordia CERC group
+Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
 """
 
 from abc import ABC

city_model_structure/energy_system.py

@@ -1,8 +1,9 @@
 """
 EnergySystem module
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2021 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
+Copyright © 2022 Concordia CERC group
-Contributor Peter Yefi peteryefi@gmail.com
+Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
+Code contributors: Peter Yefi peteryefi@gmail.com
 """
 
 from city_model_structure.city_object import CityObject

city_model_structure/energy_systems/air_source_hp.py

@@ -1,8 +1,9 @@
 """
 air_source_hp module defines an air source heat pump
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2020 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
+Copyright © 2022 Concordia CERC group
-Contributor Peter Yefi peteryefi@gmail.com
+Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
+Code contributors: Peter Yefi peteryefi@gmail.com
 """
 
 from typing import List

city_model_structure/energy_systems/heat_pump.py

@@ -1,7 +1,8 @@
 """
 heat_pump module defines a heat pump
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2021 Project Author Peter Yefi peteryefi@gmail.com
+Copyright © 2022 Concordia CERC group
+Project Coder Peter Yefi peteryefi@gmail.com
 """
 
 

city_model_structure/energy_systems/hvac_system.py

@@ -1,7 +1,8 @@
 """
 HvacSystem module
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2022 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
+Copyright © 2022 Concordia CERC group
+Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
 """
 from typing import Union
 

city_model_structure/energy_systems/pv_system.py

@@ -1,7 +1,8 @@
 """
 pv_system defines a pv system including all components: PV panels, transformer...
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2020 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
+Copyright © 2022 Concordia CERC group
+Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
 """
 
 from typing import Union

city_model_structure/energy_systems/water_to_water_hp.py

@@ -1,7 +1,8 @@
 """
 water_to_water_hp module defines a water to water heat pump heat pump
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2021 Project Author Peter Yefi peteryefi@gmail.com
+Copyright © 2022 Concordia CERC group
+Project Coder Peter Yefi peteryefi@gmail.com
 """
 
 from typing import List

city_model_structure/fuel.py

@@ -1,8 +1,8 @@
 """
 ConstructionFactory (before PhysicsFactory) retrieve the specific construction module for the given region
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2020 Project Author Atiya atiya.atiya@mail.concordia.ca
+Copyright © 2022 Concordia CERC group
-Contributor Mohammad Reza mohammad.seyedabadi@mail.concordia.ca
+Project Coder Atiya atiya.atiya@mail.concordia.ca
 """
 
 class Fuel:

city_model_structure/iot/sensor.py

@@ -1,7 +1,8 @@
 """
 Sensor module
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
+Copyright © 2022 Concordia CERC group
+Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
 """
 
 from helpers.location import Location

city_model_structure/iot/sensor_measure.py

@@ -1,7 +1,8 @@
 """
 Sensor measure module
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2022 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
+Copyright © 2022 Concordia CERC group
+Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
 """
 
 class SensorMeasure:

city_model_structure/iot/sensor_type.py

@@ -1,7 +1,8 @@
 """
 Sensor type module
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2022 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
+Copyright © 2022 Concordia CERC group
+Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
 """
 
 from enum import Enum

city_model_structure/iot/station.py

@@ -1,7 +1,8 @@
 """
 Station
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2022 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
+Copyright © 2022 Concordia CERC group
+Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
 """
 import uuid
 

city_model_structure/lca_calculations.py

@@ -1,7 +1,8 @@
 """
 LifeCycleAssessment retrieve the specific Life Cycle Assessment module for the given region
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2020 Project Author Atiya
+Copyright © 2022 Concordia CERC group
+Project Coder Atiya atiya.atiya@mail.concordia.ca
 """
 from city_model_structure.machine import Machine
 

city_model_structure/lca_material.py

@@ -1,8 +1,8 @@
 """
-Material module
+LCA Material module
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2020 Project Author Atiya atiya.atiya@mail.concordia.ca
+Copyright © 2022 Concordia CERC group
-Contributor Mohammad Reza mohammad.seyedabadi@mail.concordia.ca
+Project Coder atiya.atiya@mail.concordia.ca
 """
 
 from typing import Union

city_model_structure/machine.py

@@ -1,8 +1,8 @@
 """
 LifeCycleAssessment retrieve the specific Life Cycle Assessment module for the given region
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2020 Project Author Atiya atiya.atiya@mail.concordia.ca
+Copyright © 2022 Concordia CERC group
-Contributor Mohammad Reza mohammad.seyedabadi@mail.concordia.ca
+Project Coder Atiya atiya.atiya@mail.concordia.ca
 """
 
 class Machine:

city_model_structure/network.py

@@ -1,8 +1,8 @@
 """
 Network module
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2021 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
+Copyright © 2022 Concordia CERC group
-Contributor Milad milad.aghamohamadnia@concordia.ca
+Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
 """
 
 import uuid

city_model_structure/parts_consisting_building.py

@@ -1,7 +1,8 @@
 """
 PartsConsistingBuilding module
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2020 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
+Copyright © 2022 Concordia CERC group
+Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
 """
 
 from typing import List, TypeVar

city_model_structure/subway_entrance.py

@@ -1,7 +1,8 @@
 """
 Subway entrance module
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2020 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
+Copyright © 2022 Concordia CERC group
+Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
 """
 from city_model_structure.city_object import CityObject
 

city_model_structure/transport/bus.py

@@ -1,7 +1,8 @@
 """
 Bus module
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2021 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
+Copyright © 2022 Concordia CERC group
+Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
 """
 
 from city_model_structure.attributes.schedule import Schedule

city_model_structure/transport/bus_depot.py

@@ -1,7 +1,8 @@
 """
 Bus depot module
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2021 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
+Copyright © 2022 Concordia CERC group
+Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
 """
 
 from city_model_structure.transport.bus_node import BusNode

city_model_structure/transport/bus_edge.py

@@ -1,7 +1,8 @@
 """
 Bus edge module
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2021 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
+Copyright © 2022 Concordia CERC group
+Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
 """
 
 from typing import List, TypeVar

city_model_structure/transport/bus_network.py

@@ -1,7 +1,8 @@
 """
 Bus network module
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2021 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
+Copyright © 2022 Concordia CERC group
+Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
 """
 
 from typing import List

city_model_structure/transport/bus_node.py

@@ -1,7 +1,8 @@
 """
 Bus node module
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2021 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
+Copyright © 2022 Concordia CERC group
+Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
 """
 
 from typing import List, TypeVar

city_model_structure/transport/bus_stop.py

@@ -1,7 +1,8 @@
 """
 Bus stop module
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2021 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
+Copyright © 2022 Concordia CERC group
+Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
 """
 
 from typing import Union

city_model_structure/transport/connection.py

@@ -1,9 +1,9 @@
 """
 Connection module
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2021 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
+Copyright © 2022 Concordia CERC group
-Contributor Milad milad.aghamohamadnia@concordia.ca
+Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
-Contributor Guille guille.gutierrezmorote@concordia.ca
+Code contributors: Guille guille.gutierrezmorote@concordia.ca
 """
 
 import ast

city_model_structure/transport/crossing.py

@@ -1,9 +1,9 @@
 """
 Crossing module
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2021 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
+Copyright © 2022 Concordia CERC group
-Contributor Milad milad.aghamohamadnia@concordia.ca
+Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
-Contributor Guille guille.gutierrezmorote@concordia.ca
+Code contributors: Guille guille.gutierrezmorote@concordia.ca
 """
 
 import ast

city_model_structure/transport/fast_charging_infrastructure.py

@@ -1,7 +1,8 @@
 """
 Fast charging infrastructure module
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2021 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
+Copyright © 2022 Concordia CERC group
+Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
 """
 
 

city_model_structure/transport/join.py

@@ -1,9 +1,9 @@
 """
 Join module
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2021 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
+Copyright © 2022 Concordia CERC group
-Contributor Milad milad.aghamohamadnia@concordia.ca
+Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
-Contributor Guille guille.gutierrezmorote@concordia.ca
+Code contributors: Guille guille.gutierrezmorote@concordia.ca
 """
 
 from city_model_structure.transport.traffic_node import TrafficNode

city_model_structure/transport/lane.py

@@ -1,8 +1,8 @@
 """
 Lane module
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2021 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
+Copyright © 2022 Concordia CERC group
-Contributor Milad milad.aghamohamadnia@concordia.ca
+Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
 """
 
 from typing import List, Union

city_model_structure/transport/origin_destination_edge.py

@@ -1,8 +1,8 @@
 """
 Origin-Destination edge module
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2021 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
+Copyright © 2022 Concordia CERC group
-
+Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
 """
 
 from typing import List, TypeVar

city_model_structure/transport/origin_destination_network.py

@@ -1,7 +1,8 @@
 """
 Origin-Destination network module
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2021 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
+Copyright © 2022 Concordia CERC group
+Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
 """
 
 from typing import List

city_model_structure/transport/origin_destination_node.py

@@ -1,7 +1,8 @@
 """
 Origin-Destination node module
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2021 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
+Copyright © 2022 Concordia CERC group
+Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
 """
 from typing import List, TypeVar
 

city_model_structure/transport/phase.py

@@ -1,8 +1,8 @@
 """
 Phase module
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2021 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
+Copyright © 2022 Concordia CERC group
-Contributor Milad milad.aghamohamadnia@concordia.ca
+Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
 """
 
 from typing import List, Union

city_model_structure/transport/traffic_edge.py

@@ -1,9 +1,9 @@
 """
 Traffic edge module
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2021 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
+Copyright © 2022 Concordia CERC group
-Contributor Milad milad.aghamohamadnia@concordia.ca
+Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
-Contributor Guille guille.gutierrezmorote@concordia.ca
+Code contributors: Guille guille.gutierrezmorote@concordia.ca
 """
 
 from typing import List, Union

city_model_structure/transport/traffic_light.py

@@ -1,9 +1,9 @@
 """
 Traffic light module
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2021 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
+Copyright © 2022 Concordia CERC group
-Contributor Milad milad.aghamohamadnia@concordia.ca
+Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
-Contributor Guille guille.gutierrezmorote@concordia.ca
+Code contributors: Guille guille.gutierrezmorote@concordia.ca
 """
 
 import ast

city_model_structure/transport/traffic_network.py

@@ -1,9 +1,9 @@
 """
 Traffic network module
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2021 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
+Copyright © 2022 Concordia CERC group
-Contributor Milad milad.aghamohamadnia@concordia.ca
+Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
-Contributor Guille guille.gutierrezmorote@concordia.ca
+Code contributors: Guille guille.gutierrezmorote@concordia.ca
 """
 
 from typing import List

city_model_structure/transport/traffic_node.py

@@ -1,9 +1,9 @@
 """
 TrafficNode module
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2021 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
+Copyright © 2022 Concordia CERC group
-Contributor Milad milad.aghamohamadnia@concordia.ca
+Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
-Contributor Guille guille.gutierrezmorote@concordia.ca
+Code contributors: Guille guille.gutierrezmorote@concordia.ca
 """
 
 from typing import List, TypeVar

city_model_structure/transport/walkway_node.py

@@ -1,9 +1,9 @@
 """
 Walkway node module
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2021 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
+Copyright © 2022 Concordia CERC group
-Contributor Milad milad.aghamohamadnia@concordia.ca
+Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
-Contributor Guille guille.gutierrezmorote@concordia.ca
+Code contributors: Guille guille.gutierrezmorote@concordia.ca
 """
 
 from typing import List, Union

city_model_structure/vehicle.py

@@ -1,8 +1,8 @@
 """
 LifeCycleAssessment retrieve the specific Life Cycle Assessment module for the given region
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2020 Project Author Atiya atiya.atiya@mail.concordia.ca
+Copyright © 2022 Concordia CERC group
-Contributor Mohammad Reza mohammad.seyedabadi@mail.concordia.ca
+Project Coder Atiya atiya.atiya@mail.concordia.ca
 """
 
 class Vehicle:

exports/energy_systems/air_source_hp_export.py

@@ -2,7 +2,8 @@
 AirSourceHPExport exports air source values after executing insel.
 Multiple files are generated for the export
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2021 Project Author Peter Yefi peteryefi@gmail.com
+Copyright © 2022 Concordia CERC group
+Project Coder Peter Yefi peteryefi@gmail.com
 """
 from exports.energy_systems.heat_pump_export import HeatPumpExport
 from typing import List, Tuple, Union

exports/energy_systems/heat_pump_export.py

@@ -1,7 +1,8 @@
 """
 HeatPumpExport exports heatpump outputs into several files after insel execution
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2021 Project Author Peter Yefi peteryefi@gmail.com
+Copyright © 2022 Concordia CERC group
+Project Coder Peter Yefi peteryefi@gmail.com
 """
 import os
 from typing import List, Tuple, Union, Dict

exports/energy_systems/water_to_water_hp_export.py

@@ -2,7 +2,8 @@
 WaterToWaterHPExport exports water to water values after executing insel.
 Multiple files are generated for the export
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2021 Project Author Peter Yefi peteryefi@gmail.com
+Copyright © 2022 Concordia CERC group
+Project Coder Peter Yefi peteryefi@gmail.com
 """
 from exports.energy_systems.heat_pump_export import HeatPumpExport
 from typing import List, Tuple, Union

exports/energy_systems_factory.py

@@ -1,7 +1,8 @@
 """
 EnergySystemsFactory exports energy systems into several formats
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2020 Project Author Peter Yefi peteryefi@gmail.com
+Copyright © 2022 Concordia CERC group
+Project Coder Peter Yefi peteryefi@gmail.com
 """
 
 from pathlib import Path

exports/exports_factory.py

@@ -1,7 +1,8 @@
 """
 ExportsFactory export a city into several formats
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
+Copyright © 2022 Concordia CERC group
+Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
 """
 
 from pathlib import Path

exports/formats/energy_ade.py

@@ -1,7 +1,8 @@
 """
 ExportsFactory export a city into several formats
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
+Copyright © 2022 Concordia CERC group
+Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
 """
 
 import uuid

exports/formats/idf.py

@@ -1,7 +1,10 @@
 """
 TestOccupancyFactory test and validate the city model structure schedules parameters
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2020 Project Author Soroush Samareh Abolhassani - soroush.samarehabolhassani@mail.concordia.ca
+Copyright © 2022 Concordia CERC group
+Project Coder Guille Guillermo.GutierrezMorote@concordia.ca
+Code contributors: Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
+                   Soroush Samareh Abolhassani soroush.samarehabolhassani@mail.concordia.ca
 """
 
 from geomeppy import IDF

exports/formats/obj.py

@@ -1,7 +1,8 @@
 """
 export a city into Obj format
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
+Copyright © 2022 Concordia CERC group
+Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
 """
 
 from pathlib import Path

exports/formats/simplified_radiosity_algorithm.py

@@ -1,7 +1,8 @@
 """
 Simplified Radiosity Algorithm
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2020 Project Author Guillermo.GutierrezMorote@concordia.ca
+Copyright © 2022 Concordia CERC group
+Project Coder Guillermo.GutierrezMorote@concordia.ca
 """
 import xmltodict
 

exports/formats/stl.py

@@ -1,7 +1,8 @@
 """
 export a city into Stl format
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
+Copyright © 2022 Concordia CERC group
+Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
 """
 
 from exports.formats.triangular import Triangular

exports/formats/triangular.py

@@ -1,7 +1,8 @@
 """
 export a city from trimesh into Triangular format (obj or stl)
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
+Copyright © 2022 Concordia CERC group
+Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
 """
 from pathlib import Path
 from trimesh import Trimesh

helpers/configuration_helper.py

@@ -1,7 +1,8 @@
 """
 Configuration helper
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
+Copyright © 2022 Concordia CERC group
+Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
 """
 import configparser
 from pathlib import Path

helpers/constants.py

@@ -1,7 +1,8 @@
 """
 Constant module
 SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2020 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
+Copyright © 2022 Concordia CERC group
+Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
 """
 
 # universal constants