From 0699c245201433423641a5a402da3f55a9057d99 Mon Sep 17 00:00:00 2001
From: Saeed Ranjbar <saeed.ranjbar@mail.concordia.ca>
Date: Wed, 7 Feb 2024 20:39:16 -0500
Subject: [PATCH] Title: merging changes from hub/final_energy_system_model
 branch in here

---
 .gitignore                                         | 14 +++++++++++++-
 .../energy_systems/montreal_custom_catalog.py      |  2 ++
 main.py                                            | 10 +++++-----
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 723ef36f..938fec74 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,13 @@
-.idea
\ No newline at end of file
+.idea
+*.idf
+*.bnd
+*.eio
+*.end
+*.err
+*.eso
+*.expidf
+*.mtr
+*.rvaudit
+*.shd
+*.csv
+*.htm
diff --git a/hub/catalog_factories/energy_systems/montreal_custom_catalog.py b/hub/catalog_factories/energy_systems/montreal_custom_catalog.py
index 1c6bdba5..0ee0c415 100644
--- a/hub/catalog_factories/energy_systems/montreal_custom_catalog.py
+++ b/hub/catalog_factories/energy_systems/montreal_custom_catalog.py
@@ -69,8 +69,10 @@ class MontrealCustomCatalog(Catalog):
           storage_system = ThermalStorageSystem(equipment_id)
         storage_systems = [storage_system]
       if model_name == 'PV system':
+        system_type = 'Photovoltaic'
         generation_system = PvGenerationSystem(equipment_id,
                                                name=None,
+                                               system_type=system_type,
                                                model_name=model_name,
                                                electricity_efficiency=electricity_efficiency,
                                                energy_storage_systems=storage_systems
diff --git a/main.py b/main.py
index 97604747..2ddcc444 100644
--- a/main.py
+++ b/main.py
@@ -33,11 +33,11 @@ energy_plus_workflow(city)
 city_buildings_peak_heating_demands = {}
 for building in city.buildings:
   city_buildings_peak_heating_demands[f'{building.name}'] = building.heating_peak_load[cte.YEAR]
-# call_random(city.buildings, residential_systems_percentage)
-# EnergySystemsFactory('montreal_custom', city).enrich()
-# for building in city.buildings:
-#   print(building.heating_consumption[cte.YEAR])
-#   print(building.energy_systems_archetype_name)
+call_random(city.buildings, residential_systems_percentage)
+EnergySystemsFactory('montreal_custom', city).enrich()
+for building in city.buildings:
+  print(building.heating_consumption[cte.YEAR])
+  print(building.energy_systems_archetype_name)
 call_random(city.buildings, residential_new_systems_percentage)
 EnergySystemsFactory('montreal_future', city).enrich()
 SystemSizing(city.buildings).hvac_sizing()