some modifications in parameters after technical discussion

hub/catalog_factories/data_models/energy_systems/archetype.py

@@ -40,7 +40,7 @@ class Archetype:
     Get name
     :return: string
     """
-    return f'{self._name}_{self._lod}'
+    return f'{self._name}_lod{self._lod}'
 
   @property
   def demand_types(self):

hub/catalog_factories/data_models/energy_systems/distribution_system.py

@@ -7,13 +7,11 @@ Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
 
 
 class DistributionSystem:
-  def __init__(self, system_type, distribution_power, supply_temperature, mass_flow, distribution_consumption,
+  def __init__(self, system_type, supply_temperature, distribution_consumption,
                heat_losses):
 
     self._type = system_type
-    self._distribution_power = distribution_power
     self._supply_temperature = supply_temperature
-    self._mass_flow = mass_flow
     self._distribution_consumption = distribution_consumption
     self._heat_losses = heat_losses
 
@@ -25,14 +23,6 @@ class DistributionSystem:
     """
     return self._type
 
-  @property
-  def distribution_power(self):
-    """
-    Get distribution_power (pump or fan) in W
-    :return: float
-    """
-    return self._distribution_power
-
   @property
   def supply_temperature(self):
     """
@@ -41,18 +31,10 @@ class DistributionSystem:
     """
     return self._supply_temperature
 
-  @property
-  def mass_flow(self):
-    """
-    Get mass_flow in kg/s
-    :return: float
-    """
-    return self._mass_flow
-
   @property
   def distribution_consumption(self):
     """
-    Get distribution_consumption in % over energy produced
+    Get distribution_consumption (pump of fan) in % over energy produced
     :return: float
     """
     return self._distribution_consumption

hub/catalog_factories/data_models/energy_systems/emission_system.py

@@ -5,15 +5,12 @@ Copyright © 2023 Concordia CERC group
 Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
 """
 
-from hub.catalog_factories.data_models.usages.schedule import Schedule
-
 
 class EmissionSystem:
-  def __init__(self, system_type, parasitic_energy_consumption, hvac_availability):
+  def __init__(self, system_type, parasitic_energy_consumption):
 
     self._type = system_type
     self._parasitic_energy_consumption = parasitic_energy_consumption
-    self._hvac_availability = hvac_availability
 
   @property
   def type(self):
@@ -26,16 +23,7 @@ class EmissionSystem:
   @property
   def parasitic_energy_consumption(self):
     """
-    Get parasitic_energy_consumption in W
+    Get parasitic_energy_consumption in ratio (W/W)
     :return: float
     """
     return self._parasitic_energy_consumption
-
-  # todo: should be here??? Related to control and associated to usage!!!
-  @property
-  def hvac_availability(self) -> [Schedule]:
-    """
-    Get hvac_availability in degree Celsius
-    :return: [Schedule]
-    """
-    return self._hvac_availability

hub/catalog_factories/data_models/energy_systems/generation_system.py

@@ -7,16 +7,12 @@ Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
 
 
 class GenerationSystem:
-  def __init__(self, system_type, fuel_type, source_type, heat_power, cooling_power,
-               electricity_power, heat_efficiency, cooling_efficiency, electricity_efficiency,
+  def __init__(self, system_type, fuel_type, source_types, heat_efficiency, cooling_efficiency, electricity_efficiency,
                source_temperature, source_mass_flow, storage_capacity, auxiliary_equipment):
 
     self._type = system_type
     self._fuel_type = fuel_type
-    self._source_type = source_type
-    self._heat_power = heat_power
-    self._cooling_power = cooling_power
-    self._electricity_power = electricity_power
+    self._source_types = source_types
     self._heat_efficiency = heat_efficiency
     self._cooling_efficiency = cooling_efficiency
     self._electricity_efficiency = electricity_efficiency
@@ -42,36 +38,12 @@ class GenerationSystem:
     return self._fuel_type
 
   @property
-  def source_type(self):
+  def source_types(self):
     """
     Get source_type from [air, water, geothermal, district_heating, grid, on_site_electricity]
-    :return: string
+    :return: [string]
     """
-    return self._source_type
-
-  @property
-  def heat_power(self):
-    """
-    Get heat_power in W
-    :return: float
-    """
-    return self._heat_power
-
-  @property
-  def cooling_power(self):
-    """
-    Get cooling_power in W
-    :return: float
-    """
-    return self._cooling_power
-
-  @property
-  def electricity_power(self):
-    """
-    Get electricity_power in W
-    :return: float
-    """
-    return self._electricity_power
+    return self._source_types
 
   @property
   def heat_efficiency(self):