Change percentages according to Energuide and data from HQ and Energir

Merge remote-tracking branch 'origin/main'
# Conflicts: # scripts/random_assignation.py
2024-07-26 15:19:13 -04:00 · 2024-07-26 15:19:01 -04:00 · 2024-07-26 15:15:34 -04:00
2 changed files with 7 additions and 9 deletions
--- a/.idea/energy_system_modelling_workflow.iml
+++ b/.idea/energy_system_modelling_workflow.iml
@ -2,7 +2,7 @@
 <module type="PYTHON_MODULE" version="4">
  <component name="NewModuleRootManager">
    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="jdk" jdkName="hub" jdkType="Python SDK" />
+    <orderEntry type="jdk" jdkName="C:\Users\marie.proville\miniconda3\envs\Hub" jdkType="Python SDK" />
    <orderEntry type="sourceFolder" forTests="false" />
  </component>
 </module>
--- a/scripts/random_assignation.py
+++ b/scripts/random_assignation.py
@ -15,8 +15,8 @@ from hub.city_model_structure.building import Building
 energy_systems_format = 'montreal_custom'

 # parameters:
-residential_systems_percentage = {'system 1 gas': 100,
-                                  'system 1 electricity': 0,
+residential_systems_percentage = {'system 1 gas': 15,
+                                  'system 1 electricity': 35,
                                  'system 2 gas': 0,
                                  'system 2 electricity': 0,
                                  'system 3 and 4 gas': 0,
@ -25,13 +25,11 @@ residential_systems_percentage = {'system 1 gas': 100,
                                  'system 5 electricity': 0,
                                  'system 6 gas': 0,
                                  'system 6 electricity': 0,
-                                  'system 8 gas': 0,
-                                  'system 8 electricity': 0}
+                                  'system 8 gas': 15,
+                                  'system 8 electricity': 35}

-residential_new_systems_percentage = {'PV+ASHP+GasBoiler+TES': 0,
-                                      'PV+4Pipe+DHW': 100,
-                                      'Central Heating+Unitary Cooling+Unitary DHW': 0,
-                                      'Central Heating+Unitary Cooling+Unitary DHW+PV': 0,
+residential_new_systems_percentage = {'PV+ASHP+GasBoiler+TES': 100,
+                                      'PV+4Pipe+DHW': 0,
                                      'PV+ASHP+ElectricBoiler+TES': 0,
                                      'PV+GSHP+GasBoiler+TES': 0,
                                      'PV+GSHP+ElectricBoiler+TES': 0,
Author	SHA1	Message	Date
ogavalda	a474a7d97e	Change percentages according to Energuide and data from HQ and Energir	2024-07-26 15:19:13 -04:00
ogavalda	0ae92e77a1	Merge remote-tracking branch 'origin/main' # Conflicts: # scripts/random_assignation.py	2024-07-26 15:19:01 -04:00
ogavalda	e09338c300	Change percentages according to Energuide and data from HQ and Energir	2024-07-26 15:15:34 -04:00