Merge remote-tracking branch 'origin/retrofit_project' into retrofit_project
This commit is contained in:
commit
38bda1920d
|
@ -41,44 +41,44 @@
|
|||
<equipment id="1" type="Water distribution heating">
|
||||
<name>Water distribution heating</name>
|
||||
<distribution_heat_losses units="%">10</distribution_heat_losses>
|
||||
<distribution_consumption_fix_flow units="%">4</distribution_consumption_fix_flow>
|
||||
<distribution_consumption_variable_flow units="%">1</distribution_consumption_variable_flow>
|
||||
<distribution_consumption_fix_flow units="%">2</distribution_consumption_fix_flow>
|
||||
<distribution_consumption_variable_flow units="%">0</distribution_consumption_variable_flow>
|
||||
</equipment>
|
||||
<equipment id="2" type="Water distribution cooling">
|
||||
<name>Water distribution cooling</name>
|
||||
<distribution_heat_losses units="%">10</distribution_heat_losses>
|
||||
<distribution_heat_losses units="%">5</distribution_heat_losses>
|
||||
<distribution_consumption_fix_flow units="%">4</distribution_consumption_fix_flow>
|
||||
<distribution_consumption_variable_flow units="%">1</distribution_consumption_variable_flow>
|
||||
<distribution_consumption_variable_flow units="%">0</distribution_consumption_variable_flow>
|
||||
</equipment>
|
||||
<equipment id="3" type="Central air distribution heating">
|
||||
<name>Central air distribution heating</name>
|
||||
<distribution_heat_losses units="%">10</distribution_heat_losses>
|
||||
<distribution_consumption_fix_flow units="%">13</distribution_consumption_fix_flow>
|
||||
<distribution_consumption_fix_flow units="%">0</distribution_consumption_fix_flow>
|
||||
<distribution_consumption_variable_flow units="%">13</distribution_consumption_variable_flow>
|
||||
</equipment>
|
||||
<equipment id="4" type="Central air distribution cooling">
|
||||
<name>Central air distribution cooling</name>
|
||||
<distribution_heat_losses units="%">10</distribution_heat_losses>
|
||||
<distribution_consumption_fix_flow units="%">13</distribution_consumption_fix_flow>
|
||||
<distribution_heat_losses units="%">5</distribution_heat_losses>
|
||||
<distribution_consumption_fix_flow units="%">0</distribution_consumption_fix_flow>
|
||||
<distribution_consumption_variable_flow units="%">13</distribution_consumption_variable_flow>
|
||||
</equipment>
|
||||
<equipment id="5" type="Local air distribution heating">
|
||||
<name>Local air distribution heating</name>
|
||||
<distribution_heat_losses units="%">10</distribution_heat_losses>
|
||||
<distribution_heat_losses units="%">5</distribution_heat_losses>
|
||||
<distribution_consumption_fix_flow units="%">8</distribution_consumption_fix_flow>
|
||||
<distribution_consumption_variable_flow units="%">8</distribution_consumption_variable_flow>
|
||||
<distribution_consumption_variable_flow units="%">0</distribution_consumption_variable_flow>
|
||||
</equipment>
|
||||
<equipment id="6" type="Local air distribution cooling">
|
||||
<name>Local air distribution cooling</name>
|
||||
<distribution_heat_losses units="%">10</distribution_heat_losses>
|
||||
<distribution_heat_losses units="%">2</distribution_heat_losses>
|
||||
<distribution_consumption_fix_flow units="%">8</distribution_consumption_fix_flow>
|
||||
<distribution_consumption_variable_flow units="%">8</distribution_consumption_variable_flow>
|
||||
<distribution_consumption_variable_flow units="%">0</distribution_consumption_variable_flow>
|
||||
</equipment>
|
||||
<equipment id="7" type="Refrigerant distribution">
|
||||
<name>Refrigerant distribution</name>
|
||||
<distribution_heat_losses units="%">1</distribution_heat_losses>
|
||||
<distribution_consumption_fix_flow units="%">1</distribution_consumption_fix_flow>
|
||||
<distribution_consumption_variable_flow units="%">2</distribution_consumption_variable_flow>
|
||||
<distribution_consumption_variable_flow units="%">0</distribution_consumption_variable_flow>
|
||||
</equipment>
|
||||
<equipment id="8" type="No distribution">
|
||||
<name>No distribution</name>
|
||||
|
@ -94,7 +94,7 @@
|
|||
</equipment>
|
||||
<equipment id="2" type="fan-coils">
|
||||
<name>fan-coils</name>
|
||||
<parasitic_consumption units="%">2</parasitic_consumption>
|
||||
<parasitic_consumption units="%">1</parasitic_consumption>
|
||||
</equipment>
|
||||
<equipment id="3" type="inductors">
|
||||
<name>inductors</name>
|
||||
|
@ -122,7 +122,7 @@
|
|||
</demands>
|
||||
<equipments>
|
||||
<generation_id>2</generation_id>
|
||||
<distribution_id>1</distribution_id>
|
||||
<distribution_id>8</distribution_id>
|
||||
<dissipation_id>1</dissipation_id>
|
||||
</equipments>
|
||||
</system>
|
||||
|
@ -194,7 +194,7 @@
|
|||
</demands>
|
||||
<equipments>
|
||||
<generation_id>2</generation_id>
|
||||
<distribution_id>5</distribution_id>
|
||||
<distribution_id>8</distribution_id>
|
||||
<dissipation_id>3</dissipation_id>
|
||||
</equipments>
|
||||
</system>
|
||||
|
@ -218,7 +218,7 @@
|
|||
</demands>
|
||||
<equipments>
|
||||
<generation_id>2</generation_id>
|
||||
<distribution_id>1</distribution_id>
|
||||
<distribution_id>8</distribution_id>
|
||||
<dissipation_id>3</dissipation_id>
|
||||
</equipments>
|
||||
</system>
|
||||
|
@ -296,7 +296,7 @@
|
|||
</demands>
|
||||
<equipments>
|
||||
<generation_id>7</generation_id>
|
||||
<distribution_id>1</distribution_id>
|
||||
<distribution_id>3</distribution_id>
|
||||
<dissipation_id>2</dissipation_id>
|
||||
</equipments>
|
||||
</system>
|
||||
|
@ -307,7 +307,7 @@
|
|||
</demands>
|
||||
<equipments>
|
||||
<generation_id>7</generation_id>
|
||||
<distribution_id>2</distribution_id>
|
||||
<distribution_id>4</distribution_id>
|
||||
<dissipation_id>2</dissipation_id>
|
||||
</equipments>
|
||||
</system>
|
||||
|
@ -435,5 +435,27 @@
|
|||
<system_id>15</system_id>
|
||||
</systems>
|
||||
</system_cluster>
|
||||
<system_cluster name="system 8 gas">
|
||||
<systems>
|
||||
<system_id>1</system_id>
|
||||
</systems>
|
||||
</system_cluster>
|
||||
<system_cluster name="system 8 gas pv">
|
||||
<systems>
|
||||
<system_id>1</system_id>
|
||||
<system_id>15</system_id>
|
||||
</systems>
|
||||
</system_cluster>
|
||||
<system_cluster name="system 8 electricity">
|
||||
<systems>
|
||||
<system_id>16</system_id>
|
||||
</systems>
|
||||
</system_cluster>
|
||||
<system_cluster name="system 8 electricity pv">
|
||||
<systems>
|
||||
<system_id>16</system_id>
|
||||
<system_id>15</system_id>
|
||||
</systems>
|
||||
</system_cluster>
|
||||
</system_clusters>
|
||||
</catalog>
|
||||
|
|
Loading…
Reference in New Issue
Block a user