fix: oriol changes in catalogues were implemented

2024-10-21 10:16:35 +02:00 · 2024-10-21 10:16:35 +02:00 · d77bd7d337
commit d77bd7d337
parent 20a801626a
10 changed files with 3869 additions and 790 deletions
--- a/.gitignore
+++ b/.gitignore
@ -12,3 +12,5 @@
 cerc_hub.egg-info
 /out_files
 /input_files/output_buildings.geojson
+*/.pyc
+*.pyc
--- a/hub/catalog_factories/construction/nrcan_catalog.py
+++ b/hub/catalog_factories/construction/nrcan_catalog.py
@ -128,6 +128,12 @@ class NrcanCatalog(Catalog):
      infiltration_rate_for_ventilation_system_on = (
        archetype['infiltration_rate_for_ventilation_system_on'] / cte.HOUR_TO_SECONDS
      )
+      infiltration_rate_area_for_ventilation_system_off = (
+              archetype['infiltration_rate_area_for_ventilation_system_off'] * 1
+      )
+      infiltration_rate_area_for_ventilation_system_on = (
+              archetype['infiltration_rate_area_for_ventilation_system_on'] * 1
+      )

      archetype_constructions = []
      for archetype_construction in archetype['constructions']:
@ -153,7 +159,6 @@ class NrcanCatalog(Catalog):
                                         _window)
            archetype_constructions.append(_construction)
            break
-
      _catalog_archetypes.append(Archetype(archetype_id,
                                           name,
                                           function,
@ -165,7 +170,10 @@ class NrcanCatalog(Catalog):
                                           extra_loses_due_to_thermal_bridges,
                                           None,
                                           infiltration_rate_for_ventilation_system_off,
-                                           infiltration_rate_for_ventilation_system_on))
+                                           infiltration_rate_for_ventilation_system_on,
+                                           infiltration_rate_area_for_ventilation_system_off,
+                                           infiltration_rate_area_for_ventilation_system_on
+                                           ))
    return _catalog_archetypes

  def names(self, category=None):
--- a/hub/catalog_factories/data_models/construction/archetype.py
+++ b/hub/catalog_factories/data_models/construction/archetype.py
@ -23,7 +23,10 @@ class Archetype:
               extra_loses_due_to_thermal_bridges,
               indirect_heated_ratio,
               infiltration_rate_for_ventilation_system_off,
-               infiltration_rate_for_ventilation_system_on):
+               infiltration_rate_for_ventilation_system_on,
+               infiltration_rate_area_for_ventilation_system_off,
+               infiltration_rate_area_for_ventilation_system_on
+               ):
    self._id = archetype_id
    self._name = name
    self._function = function
@ -36,6 +39,8 @@ class Archetype:
    self._indirect_heated_ratio = indirect_heated_ratio
    self._infiltration_rate_for_ventilation_system_off = infiltration_rate_for_ventilation_system_off
    self._infiltration_rate_for_ventilation_system_on = infiltration_rate_for_ventilation_system_on
+    self._infiltration_rate_area_for_ventilation_system_off = infiltration_rate_area_for_ventilation_system_off
+    self._infiltration_rate_area_for_ventilation_system_on = infiltration_rate_area_for_ventilation_system_on

  @property
  def id(self):
@ -133,6 +138,22 @@ class Archetype:
    """
    return self._infiltration_rate_for_ventilation_system_on

+  @property
+  def infiltration_rate_area_for_ventilation_system_off(self):
+    """
+    Get archetype infiltration rate for ventilation system off in m3/sm2
+    :return: float
+    """
+    return self._infiltration_rate_area_for_ventilation_system_off
+
+  @property
+  def infiltration_rate_area_for_ventilation_system_on(self):
+    """
+    Get archetype infiltration rate for ventilation system on in m3/sm2
+    :return: float
+    """
+    return self._infiltration_rate_for_ventilation_system_on
+
  def to_dictionary(self):
    """Class content to dictionary"""
    _constructions = []
@ -149,6 +170,8 @@ class Archetype:
                             'indirect heated ratio': self.indirect_heated_ratio,
                             'infiltration rate for ventilation off [1/s]': self.infiltration_rate_for_ventilation_system_off,
                             'infiltration rate for ventilation on [1/s]': self.infiltration_rate_for_ventilation_system_on,
+                             'infiltration rate area for ventilation off [m3/sm2]': self.infiltration_rate_area_for_ventilation_system_off,
+                             'infiltration rate area for ventilation on [m3/sm2]': self.infiltration_rate_area_for_ventilation_system_on,
                             'constructions': _constructions
                             }
               }
--- a/hub/city_model_structure/building_demand/thermal_archetype.py
+++ b/hub/city_model_structure/building_demand/thermal_archetype.py
@ -20,6 +20,8 @@ class ThermalArchetype:
    self._indirect_heated_ratio = None
    self._infiltration_rate_for_ventilation_system_off = None
    self._infiltration_rate_for_ventilation_system_on = None
+    self._infiltration_rate_area_for_ventilation_system_off = None
+    self._infiltration_rate_area_for_ventilation_system_on = None

  @property
  def constructions(self) -> [Construction]:
@ -132,3 +134,36 @@ class ThermalArchetype:
    :param value: float
    """
    self._infiltration_rate_for_ventilation_system_on = value
+
+  @property
+  def infiltration_rate_area_for_ventilation_system_off(self):
+    """
+    Get infiltration rate for ventilation system off in l/s/m2
+    :return: float
+    """
+    return self._infiltration_rate_for_ventilation_system_off
+
+  @infiltration_rate_area_for_ventilation_system_off.setter
+  def infiltration_rate_area_for_ventilation_system_off(self, value):
+    """
+    Set infiltration rate for ventilation system off in l/s/m2
+    :param value: float
+    """
+    self._infiltration_rate_for_ventilation_system_off = value
+
+  @property
+  def infiltration_rate_area_for_ventilation_system_on(self):
+    """
+    Get infiltration rate for ventilation system on in l/s/m2
+    :return: float
+    """
+    return self._infiltration_rate_for_ventilation_system_on
+
+  @infiltration_rate_area_for_ventilation_system_on.setter
+  def infiltration_rate_area_for_ventilation_system_on(self, value):
+    """
+    Set infiltration rate for ventilation system on in l/s/m2
+    :param value: float
+    """
+    self._infiltration_rate_for_ventilation_system_on = value
+
--- a/hub/city_model_structure/building_demand/thermal_zone.py
+++ b/hub/city_model_structure/building_demand/thermal_zone.py
@ -44,6 +44,8 @@ class ThermalZone:
    self._indirectly_heated_area_ratio = None
    self._infiltration_rate_system_on = None
    self._infiltration_rate_system_off = None
+    self._infiltration_rate_area_system_on = None
+    self._infiltration_rate_area_system_off = None
    self._volume = volume
    self._ordinate_number = None
    self._view_factors_matrix = None
@ -166,6 +168,24 @@ class ThermalZone:
    self._infiltration_rate_system_off = self._parent_internal_zone.thermal_archetype.infiltration_rate_for_ventilation_system_off
    return self._infiltration_rate_system_off

+  @property
+  def infiltration_rate_area_system_on(self):
+    """
+    Get thermal zone infiltration rate system on in air changes per second (1/s)
+    :return: None or float
+    """
+    self._infiltration_rate_area_system_on = self._parent_internal_zone.thermal_archetype.infiltration_rate_area_for_ventilation_system_on
+    return self._infiltration_rate_area_system_on
+
+  @property
+  def infiltration_rate_area_system_off(self):
+    """
+    Get thermal zone infiltration rate system off in air changes per second (1/s)
+    :return: None or float
+    """
+    self._infiltration_rate_area_system_off = self._parent_internal_zone.thermal_archetype.infiltration_rate_area_for_ventilation_system_off
+    return self._infiltration_rate_area_system_off
+
  @property
  def volume(self):
    """
--- a/hub/data/construction/nrcan_archetypes.json
+++ b/hub/data/construction/nrcan_archetypes.json
--- a/hub/exports/building_energy/idf.py
+++ b/hub/exports/building_energy/idf.py
@ -331,6 +331,7 @@ class Idf:
      for material in self._idf.idfobjects[self._MATERIAL]:
        if material.Name == "DefaultMaterial":
          return
+
      self._idf.set_default_constructions()
      return
    for layer in thermal_boundary.layers:
@ -392,9 +393,9 @@ class Idf:
    thermostat = self._add_thermostat(thermal_zone)
    self._idf.newidfobject(self._IDEAL_LOAD_AIR_SYSTEM,
                           Zone_Name=zone_name,
-                           System_Availability_Schedule_Name=f'HVAC AVAIL SCHEDULES {thermal_zone.usage_name}',
-                           Heating_Availability_Schedule_Name=f'HVAC AVAIL SCHEDULES {thermal_zone.usage_name}',
-                           Cooling_Availability_Schedule_Name=f'HVAC AVAIL SCHEDULES {thermal_zone.usage_name}',
+                           System_Availability_Schedule_Name=f'Thermostat_availability schedules {thermal_zone.usage_name}',
+                           Heating_Availability_Schedule_Name=f'Thermostat_availability schedules {thermal_zone.usage_name}',
+                           Cooling_Availability_Schedule_Name=f'Thermostat_availability schedules {thermal_zone.usage_name}',
                           Template_Thermostat_Name=thermostat.Name)

  def _add_occupancy(self, thermal_zone, zone_name):
@ -454,7 +455,7 @@ class Idf:
                           )

  def _add_infiltration(self, thermal_zone, zone_name):
-    schedule = f'Infiltration schedules {thermal_zone.usage_name}'
+    schedule = f'INF_CONST schedules {thermal_zone.usage_name}'
    _infiltration = thermal_zone.infiltration_rate_system_off * cte.HOUR_TO_SECONDS
    self._idf.newidfobject(self._INFILTRATION,
                           Name=f'{zone_name}_infiltration',
@ -464,6 +465,17 @@ class Idf:
                           Air_Changes_per_Hour=_infiltration
                           )

+  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*1
+    self._idf.newidfobject(self._INFILTRATION,
+                           Name=f'{zone_name}_infiltration',
+                           Zone_or_ZoneList_or_Space_or_SpaceList_Name=zone_name,
+                           Schedule_Name=schedule,
+                           Design_Flow_Rate_Calculation_Method='Flow/ExteriorWallArea',
+                           Flow_Rate_per_Exterior_Surface_Area=_infiltration
+                           )
+
  def _add_ventilation(self, thermal_zone, zone_name):
    schedule = f'Ventilation schedules {thermal_zone.usage_name}'
    _air_change = thermal_zone.mechanical_air_change * cte.HOUR_TO_SECONDS
@ -549,9 +561,12 @@ class Idf:
            self._add_schedules(usage, 'DHW_prof', thermal_zone.domestic_hot_water.schedules)
            _new_schedules = self._create_yearly_values_schedules('cold_temp', building.cold_water_temperature[cte.HOUR])
            self._add_schedules(usage, 'cold_temp', _new_schedules)
-
            _new_schedules = self._create_constant_value_schedules('DHW_temp', service_temperature)
            self._add_schedules(usage, 'DHW_temp', _new_schedules)
+            _new_schedules = self._create_constant_value_schedules('INF_CONST', 1)
+            self._add_schedules(usage, 'INF_CONST', _new_schedules)
+            _new_schedules = self._create_constant_value_schedules('Thermostat_availability', 1)
+            self._add_schedules(usage, 'Thermostat_availability', _new_schedules)
            _occ = thermal_zone.occupancy
            if _occ.occupancy_density == 0:
              _total_heat = 0
@ -562,7 +577,7 @@ class Idf:
            self._add_schedules(usage, 'Activity Level', _new_schedules)
            self._add_zone(thermal_zone, building.name)
            self._add_heating_system(thermal_zone, building.name)
-            self._add_infiltration(thermal_zone, building.name)
+            self._add_infiltration_surface(thermal_zone, building.name)
            self._add_ventilation(thermal_zone, building.name)
            self._add_occupancy(thermal_zone, building.name)
            self._add_lighting(thermal_zone, building.name)
@ -611,6 +626,18 @@ class Idf:
      Reporting_Frequency="Hourly",
    )

+    self._idf.newidfobject(
+      "OUTPUT:VARIABLE",
+      Variable_Name="Zone Air Temperature",
+      Reporting_Frequency="Hourly",
+    )
+
+    self._idf.newidfobject(
+      "OUTPUT:VARIABLE",
+      Variable_Name="Zone Air Relative Humidity",
+      Reporting_Frequency="Hourly",
+    )
+
    # post-process to erase windows associated to adiabatic walls
    windows_list = []
    for window in self._idf.idfobjects[self._WINDOW]:
--- a/hub/imports/construction/nrcan_physics_parameters.py
+++ b/hub/imports/construction/nrcan_physics_parameters.py
@ -78,6 +78,9 @@ class NrcanPhysicsParameters:
    thermal_archetype.indirect_heated_ratio = 0
    thermal_archetype.infiltration_rate_for_ventilation_system_on = catalog_archetype.infiltration_rate_for_ventilation_system_on
    thermal_archetype.infiltration_rate_for_ventilation_system_off = catalog_archetype.infiltration_rate_for_ventilation_system_off
+    thermal_archetype.infiltration_rate_area_for_ventilation_system_on = catalog_archetype.infiltration_rate_area_for_ventilation_system_on
+    thermal_archetype.infiltration_rate_area_for_ventilation_system_off = catalog_archetype.infiltration_rate_area_for_ventilation_system_off
+
    _constructions = []
    for catalog_construction in catalog_archetype.constructions:
      construction = Construction()
--- a/main.py
+++ b/main.py
@ -0,0 +1,61 @@
+from pathlib import Path
+
+import pandas as pd
+from building_modelling.geojson_creator import process_geojson
+from building_modelling.ep_run_enrich import energy_plus_workflow
+from hub.imports.geometry_factory import GeometryFactory
+from hub.helpers.dictionaries import Dictionaries
+from hub.imports.construction_factory import ConstructionFactory
+from hub.imports.usage_factory import UsageFactory
+from hub.imports.weather_factory import WeatherFactory
+import hub.helpers.constants as cte
+
+# Specify the GeoJSON file path
+input_files_path = (Path(__file__).parent / 'input_files')
+input_files_path.mkdir(parents=True, exist_ok=True)
+geojson_file = process_geojson(x=-73.5681295982132, y=45.49218262677643, diff=0.00006)
+geojson_file_path = input_files_path / 'output_buildings_expanded.geojson'
+output_path = (Path(__file__).parent / 'out_files').resolve()
+output_path.mkdir(parents=True, exist_ok=True)
+energy_plus_output_path = output_path / 'energy_plus_outputs'
+energy_plus_output_path.mkdir(parents=True, exist_ok=True)
+simulation_results_path = (Path(__file__).parent / 'out_files' / 'simulation_results').resolve()
+simulation_results_path.mkdir(parents=True, exist_ok=True)
+sra_output_path = output_path / 'sra_outputs'
+sra_output_path.mkdir(parents=True, exist_ok=True)
+cost_analysis_output_path = output_path / 'cost_analysis'
+cost_analysis_output_path.mkdir(parents=True, exist_ok=True)
+city = GeometryFactory(file_type='geojson',
+                       path=geojson_file_path,
+                       height_field='height',
+                       year_of_construction_field='year_of_construction',
+                       function_field='function',
+                       function_to_hub=Dictionaries().montreal_function_to_hub_function).city
+ConstructionFactory('nrcan', city).enrich()
+UsageFactory('nrcan', city).enrich()
+WeatherFactory('epw', city).enrich()
+energy_plus_workflow(city, energy_plus_output_path)
+building_name = []
+building_function = []
+building_year_of_construction = []
+total_floor_area = []
+building_heui = []
+building_ceui = []
+for building in city.buildings:
+  building_name.append(building.name)
+  building_function.append(building.function)
+  building_year_of_construction.append(building.year_of_construction)
+  total_floor_area.append(building.thermal_zones_from_internal_zones[0].total_floor_area)
+  building_heui.append(building.heating_demand[cte.YEAR][0] / (
+      building.thermal_zones_from_internal_zones[0].total_floor_area * 3.6e6))
+  building_ceui.append(building.cooling_demand[cte.YEAR][0] / (
+      building.thermal_zones_from_internal_zones[0].total_floor_area * 3.6e6))
+
+df = pd.DataFrame()
+df['building name'] = building_name
+df['function'] = building_function
+df['yoc'] = building_year_of_construction
+df['floor_area'] = total_floor_area
+df['heating_eui'] = building_heui
+df['cooling_eui'] = building_ceui
+df.to_csv('results.csv')
--- a/results_1.csv
+++ b/results_1.csv
@ -0,0 +1,20 @@
+,building name,function,yoc,floor_area,heating_eui,cooling_eui
+0,173347,residential,1986,265.38375176489353,267.0533083996842,18.007308537312785
+1,173348,residential,1986,283.668703481555,522.850852783527,20.576579713797777
+2,173403,residential,1985,11447.230666354299,228.49446179883506,12.684394922648671
+3,174898,residential,1986,283.6906412792159,522.7696663647462,19.57503262214429
+4,175785,residential,1986,467.7235050201416,516.4055045521648,21.088254314769788
+5,175910,residential,1986,261.0009156614542,527.5080465374183,25.742695259498305
+6,176056,residential,1986,182.04670348763466,349.0021295379444,16.753929193049903
+7,176261,residential,1986,277.90742287479225,583.4254987281645,26.256967472981707
+8,176293,residential,1986,369.68735361099243,257.4909312314216,14.023930562649928
+9,176296,residential,1986,290.90516459941864,575.7189866853944,19.385255082748102
+10,176298,residential,1986,369.51916921138763,257.2805985434431,14.098189573739344
+11,176918,residential,1987,2326.6517127379775,345.8090447174934,16.443395331027673
+12,178164,residential,1986,264.07378363609314,268.730268398251,17.960546856543576
+13,179679,residential,1986,260.14088670909405,271.81072456915604,18.017496250196757
+14,179789,residential,1986,181.17727002501488,349.001383425343,16.54743635457496
+15,181310,residential,1986,181.64067029953003,349.52817271006825,16.32917192857884
+16,182393,residential,1986,199.37044820690062,684.773963332913,21.540957535632746
+17,182442,residential,1986,277.0023966698591,312.7559318665529,15.48912001605364
+18,182546,residential,1986,182.38363614678383,687.7449588121772,28.929786166435022