From de066b25fbb235c201409abb311df9ae27e18236 Mon Sep 17 00:00:00 2001
From: jgavalda <oriol.gavalda@concordia.ca>
Date: Fri, 19 May 2023 16:57:35 -0400
Subject: [PATCH] Changes hub to incorporate change in distribution

---
 .../montreal_custom_systems.xml               | 84 +++++++++++++++----
 1 file changed, 66 insertions(+), 18 deletions(-)

diff --git a/hub/data/energy_systems/montreal_custom_systems.xml b/hub/data/energy_systems/montreal_custom_systems.xml
index 99c073e9..ea525ec1 100644
--- a/hub/data/energy_systems/montreal_custom_systems.xml
+++ b/hub/data/energy_systems/montreal_custom_systems.xml
@@ -8,8 +8,8 @@
             </demands>
             <heating_efficiency>0.85</heating_efficiency>
             <distribution_heat_losses units="%">10</distribution_heat_losses>
-            <distribution_consumption_fix_flow units="%">1000000000</distribution_consumption_fix_flow>
-            <distribution_consumption_variable_flow units="%">1000000000</distribution_consumption_variable_flow>
+            <distribution_consumption_fix_flow units="%">2</distribution_consumption_fix_flow>
+            <distribution_consumption_variable_flow units="%">2</distribution_consumption_variable_flow>
             <storage>false</storage>
         </system>
         <system id="2" type="boiler" fuel_type="electricity">
@@ -20,8 +20,8 @@
             </demands>
             <heating_efficiency>1</heating_efficiency>
             <distribution_heat_losses units="%">10</distribution_heat_losses>
-            <distribution_consumption_fix_flow units="%">1000000000</distribution_consumption_fix_flow>
-            <distribution_consumption_variable_flow units="%">1000000000</distribution_consumption_variable_flow>
+            <distribution_consumption_fix_flow units="%">2</distribution_consumption_fix_flow>
+            <distribution_consumption_variable_flow units="%">2</distribution_consumption_variable_flow>
             <storage>true</storage>
         </system>
         <system id="3" type="furnace" fuel_type="gas">
@@ -32,8 +32,8 @@
            </demands>
             <heating_efficiency>0.85</heating_efficiency>
             <distribution_heat_losses units="%">25</distribution_heat_losses>
-            <distribution_consumption_fix_flow units="%">1000000000</distribution_consumption_fix_flow>
-            <distribution_consumption_variable_flow units="%">1000000000</distribution_consumption_variable_flow>
+            <distribution_consumption_fix_flow units="%">13</distribution_consumption_fix_flow>
+            <distribution_consumption_variable_flow units="%">13</distribution_consumption_variable_flow>
             <storage>false</storage>
         </system>
         <system id="4" type="furnace" fuel_type="electricity">
@@ -44,8 +44,8 @@
             </demands>
             <heating_efficiency>1</heating_efficiency>
             <distribution_heat_losses units="%">25</distribution_heat_losses>
-            <distribution_consumption_fix_flow units="%">1000000000</distribution_consumption_fix_flow>
-            <distribution_consumption_variable_flow units="%">1000000000</distribution_consumption_variable_flow>
+            <distribution_consumption_fix_flow units="%">13</distribution_consumption_fix_flow>
+            <distribution_consumption_variable_flow units="%">13</distribution_consumption_variable_flow>
             <storage>false</storage>
         </system>
         <system id="5" type="baseboard" fuel_type="gas">
@@ -56,8 +56,8 @@
             </demands>
             <heating_efficiency>0.85</heating_efficiency>
             <distribution_heat_losses units="%">10</distribution_heat_losses>
-            <distribution_consumption_fix_flow units="%">1000000000</distribution_consumption_fix_flow>
-            <distribution_consumption_variable_flow units="%">1000000000</distribution_consumption_variable_flow>
+            <distribution_consumption_fix_flow units="%">2</distribution_consumption_fix_flow>
+            <distribution_consumption_variable_flow units="%">2</distribution_consumption_variable_flow>
             <storage>false</storage>
         </system>
         <system id="6" type="baseboard" fuel_type="electricity">
@@ -68,8 +68,8 @@
             </demands>
             <heating_efficiency>1</heating_efficiency>
             <distribution_heat_losses units="%">0</distribution_heat_losses>
-            <distribution_consumption_fix_flow units="%">1000000000</distribution_consumption_fix_flow>
-            <distribution_consumption_variable_flow units="%">1000000000</distribution_consumption_variable_flow>
+            <distribution_consumption_fix_flow units="%">4</distribution_consumption_fix_flow>
+            <distribution_consumption_variable_flow units="%">4</distribution_consumption_variable_flow>
             <storage>false</storage>
         </system>
         <system id="7" type="cooler" fuel_type="electricity">
@@ -79,8 +79,8 @@
             </demands>
             <cooling_efficiency>3.23</cooling_efficiency>
             <distribution_heat_losses units="%">0</distribution_heat_losses>
-            <distribution_consumption_fix_flow units="%">1000000000</distribution_consumption_fix_flow>
-            <distribution_consumption_variable_flow units="%">1000000000</distribution_consumption_variable_flow>
+            <distribution_consumption_fix_flow units="%">4</distribution_consumption_fix_flow>
+            <distribution_consumption_variable_flow units="%">4</distribution_consumption_variable_flow>
             <storage>false</storage>
         </system>
         <system id="8" type="cooler" fuel_type="electricity">
@@ -90,8 +90,8 @@
             </demands>
             <cooling_efficiency>3.23</cooling_efficiency>
             <distribution_heat_losses units="%">10</distribution_heat_losses>
-            <distribution_consumption_fix_flow units="%">1000000000</distribution_consumption_fix_flow>
-            <distribution_consumption_variable_flow units="%">1000000000</distribution_consumption_variable_flow>
+            <distribution_consumption_fix_flow units="%">4</distribution_consumption_fix_flow>
+            <distribution_consumption_variable_flow units="%">4</distribution_consumption_variable_flow>
             <storage>false</storage>
         </system>
         <system id="9" type="cooler" fuel_type="electricity">
@@ -101,8 +101,8 @@
             </demands>
             <cooling_efficiency>3.23</cooling_efficiency>
             <distribution_heat_losses units="%">0</distribution_heat_losses>
-            <distribution_consumption_fix_flow units="%">1000000000</distribution_consumption_fix_flow>
-            <distribution_consumption_variable_flow units="%">1000000000</distribution_consumption_variable_flow>
+            <distribution_consumption_fix_flow units="%">4</distribution_consumption_fix_flow>
+            <distribution_consumption_variable_flow units="%">4</distribution_consumption_variable_flow>
             <storage>false</storage>
         </system>
         <system id="10" type="electricity generator" fuel_type="renewable">
@@ -113,18 +113,50 @@
             <electrical_efficiency>0.22</electrical_efficiency>
             <storage>true</storage>
         </system>
+        <system id="11" type="water distribution and fancoils" fuel_type="electricity">
+            <name>Water distribution and fancoils</name>
+            <demands>
+                <demand>electricity</demand>
+            </demands>
+            <distribution_heat_losses units="%">0</distribution_heat_losses>
+            <distribution_consumption_fix_flow units="%">4</distribution_consumption_fix_flow>
+            <distribution_consumption_variable_flow units="%">4</distribution_consumption_variable_flow>
+            <storage>false</storage>
+        </system>
+        <system id="12" type="air distribution central" fuel_type="electricity">
+            <name>Air distribution central</name>
+            <demands>
+                <demand>electricity</demand>
+            </demands>
+            <distribution_heat_losses units="%">0</distribution_heat_losses>
+            <distribution_consumption_fix_flow units="%">4</distribution_consumption_fix_flow>
+            <distribution_consumption_variable_flow units="%">4</distribution_consumption_variable_flow>
+            <storage>false</storage>
+        </system>
+        <system id="13" type="DX distribution central" fuel_type="electricity">
+            <name>DX distribution central</name>
+            <demands>
+                <demand>electricity</demand>
+            </demands>
+            <distribution_heat_losses units="%">0</distribution_heat_losses>
+            <distribution_consumption_fix_flow units="%">4</distribution_consumption_fix_flow>
+            <distribution_consumption_variable_flow units="%">4</distribution_consumption_variable_flow>
+            <storage>false</storage>
+        </system>
     </systems>
     <system_clusters>
         <system_cluster name="system 1 gas">
             <systems>
                 <system_id>1</system_id>
                 <system_id>7</system_id>
+                <system_id>13</system_id>
             </systems>
         </system_cluster>
         <system_cluster name="system 1 gas pv">
             <systems>
                 <system_id>1</system_id>
                 <system_id>7</system_id>
+                <system_id>13</system_id>
                 <system_id>10</system_id>
             </systems>
         </system_cluster>
@@ -132,12 +164,14 @@
             <systems>
                 <system_id>2</system_id>
                 <system_id>7</system_id>
+                <system_id>13</system_id>
             </systems>
         </system_cluster>
         <system_cluster name="system 1 electricity pv">
             <systems>
                 <system_id>2</system_id>
                 <system_id>7</system_id>
+                <system_id>13</system_id>
                 <system_id>10</system_id>
             </systems>
         </system_cluster>
@@ -145,12 +179,14 @@
             <systems>
                 <system_id>1</system_id>
                 <system_id>8</system_id>
+                <system_id>11</system_id>
             </systems>
         </system_cluster>
         <system_cluster name="system 2 gas pv">
             <systems>
                 <system_id>1</system_id>
                 <system_id>8</system_id>
+                <system_id>11</system_id>
                 <system_id>10</system_id>
             </systems>
         </system_cluster>
@@ -158,12 +194,14 @@
             <systems>
                 <system_id>2</system_id>
                 <system_id>8</system_id>
+                <system_id>11</system_id>
             </systems>
         </system_cluster>
         <system_cluster name="system 2 electricity pv">
             <systems>
                 <system_id>2</system_id>
                 <system_id>8</system_id>
+                <system_id>11</system_id>
                 <system_id>10</system_id>
             </systems>
         </system_cluster>
@@ -171,12 +209,14 @@
             <systems>
                 <system_id>3</system_id>
                 <system_id>4</system_id>
+                <system_id>13</system_id>
             </systems>
         </system_cluster>
         <system_cluster name="system 3 and 4 gas pv">
             <systems>
                 <system_id>3</system_id>
                 <system_id>4</system_id>
+                <system_id>13</system_id>
                 <system_id>10</system_id>
             </systems>
         </system_cluster>
@@ -184,23 +224,27 @@
             <systems>
                 <system_id>4</system_id>
                 <system_id>4</system_id>
+                <system_id>13</system_id>
             </systems>
         </system_cluster>
         <system_cluster name="system 3 and 4 electricity pv">
             <systems>
                 <system_id>4</system_id>
                 <system_id>4</system_id>
+                <system_id>13</system_id>
                 <system_id>10</system_id>
             </systems>
         </system_cluster>
         <system_cluster name="system 5">
             <systems>
                 <system_id>8</system_id>
+                <system_id>11</system_id>
             </systems>
         </system_cluster>
         <system_cluster name="system 5 pv">
             <systems>
                 <system_id>8</system_id>
+                <system_id>11</system_id>
                 <system_id>10</system_id>
             </systems>
         </system_cluster>
@@ -208,12 +252,14 @@
             <systems>
                 <system_id>5</system_id>
                 <system_id>8</system_id>
+                <system_id>12</system_id>
             </systems>
         </system_cluster>
         <system_cluster name="system 6 gas pv">
             <systems>
                 <system_id>5</system_id>
                 <system_id>8</system_id>
+                <system_id>12</system_id>
                 <system_id>10</system_id>
             </systems>
         </system_cluster>
@@ -221,12 +267,14 @@
             <systems>
                 <system_id>6</system_id>
                 <system_id>8</system_id>
+                <system_id>12</system_id>
             </systems>
         </system_cluster>
         <system_cluster name="system 6 electricity pv">
             <systems>
                 <system_id>6</system_id>
                 <system_id>8</system_id>
+                <system_id>12</system_id>
                 <system_id>10</system_id>
             </systems>
         </system_cluster>