Merge remote-tracking branch 'origin/systems_catalog' into systems_catalog

This commit is contained in:
Pilar Monsalvete 2023-06-01 13:39:49 -04:00
commit 03a1744f87
2 changed files with 26 additions and 14 deletions

View File

@ -72,13 +72,13 @@
</fuel>
<fuel fuel_type="gas">
<fixed_monthly cost_unit="currency/month"> 17.71 </fixed_monthly>
<variable cost_unit="currency/kWh"> 0.640 </variable>
<variable cost_unit="currency/kWh"> 0.0640 </variable>
</fuel>
<fuel fuel_type="diesel">
<variable cost_unit="currency/l"> 1.2 </variable>
</fuel>
<fuel fuel_type="biomass">
<variable cost_unit="currency/kg"> 0.09 </variable>
<variable cost_unit="currency/kg"> 0.04 </variable>
</fuel>
</fuels>
<maintenance>
@ -91,12 +91,12 @@
<end_of_life_cost cost_unit="currency/m2"> 6.3 </end_of_life_cost>
<incomes>
<subsidies>
<construction cost_unit="%">2</construction>
<construction cost_unit="%">20</construction>
<hvac cost_unit="%">1.5</hvac>
<photovoltaic cost_unit="%">3.6</photovoltaic>
</subsidies>
<electricity_export cost_unit="currency/kWh">0</electricity_export>
<tax_reduction cost_unit="%">2</tax_reduction>
<electricity_export cost_unit="currency/kWh">0.07</electricity_export>
<tax_reduction cost_unit="%">0.05</tax_reduction>
</incomes>
</archetype>
<archetype function="non-residential" municipality="montreal" country="CA" lod="1">
@ -172,13 +172,13 @@
</fuel>
<fuel fuel_type="gas">
<fixed_monthly cost_unit="currency/month"> 17.71 </fixed_monthly>
<variable cost_unit="currency/m3"> 0.640 </variable>
<variable cost_unit="currency/m3"> 0.0640 </variable>
</fuel>
<fuel fuel_type="diesel">
<variable cost_unit="currency/l"> 1.2 </variable>
</fuel>
<fuel fuel_type="biomass">
<variable cost_unit="currency/kg"> 0.09 </variable>
<variable cost_unit="currency/kg"> 0.04 </variable>
</fuel>
</fuels>
<maintenance>
@ -191,12 +191,12 @@
<end_of_life_cost cost_unit="currency/m2"> 6.3 </end_of_life_cost>
<incomes>
<subsidies>
<construction cost_unit="%">2</construction>
<construction cost_unit="%">20</construction>
<hvac cost_unit="%">1.5</hvac>
<photovoltaic cost_unit="%">3.6</photovoltaic>
</subsidies>
<electricity_export cost_unit="currency/kWh">0</electricity_export>
<tax_reduction cost_unit="%">2</tax_reduction>
<electricity_export cost_unit="currency/kWh">0.05</electricity_export>
<tax_reduction cost_unit="%">0.05</tax_reduction>
</incomes>
</archetype>
</archetypes>

View File

@ -108,6 +108,18 @@
<dissipation_id>1</dissipation_id>
</equipments>
</system>
<system id = "16">
<name>Unitary air conditioner with baseboard heater electrical boiler</name>
<demands>
<demand>heating</demand>
<demand>domestic_hot_water</demand>
</demands>
<equipments>
<generation_id>2</generation_id>
<distribution_id>1</distribution_id>
<dissipation_id>1</dissipation_id>
</equipments>
</system>
<system id = "2">
<name>4 pipe fan coils with fuel fired boiler</name>
<demands>
@ -275,25 +287,25 @@
<system_cluster name="system 1 gas">
<systems>
<system_id>1</system_id>
<system_id>7</system_id>
<system_id>10</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>10</system_id>
<system_id>15</system_id>
</systems>
</system_cluster>
<system_cluster name="system 1 electricity">
<systems>
<system_id>1</system_id>
<system_id>16</system_id>
<system_id>10</system_id>
</systems>
</system_cluster>
<system_cluster name="system 1 electricity pv">
<systems>
<system_id>2</system_id>
<system_id>16</system_id>
<system_id>10</system_id>
<system_id>15</system_id>
</systems>