Compare commits

...

1 Commits

2 changed files with 5 additions and 4 deletions

View File

@ -33,7 +33,6 @@
<equipment id="7" type="heat pump" fuel_type="electricity"> <equipment id="7" type="heat pump" fuel_type="electricity">
<name>Heat Pump</name> <name>Heat Pump</name>
<heating_efficiency>2.79</heating_efficiency> <heating_efficiency>2.79</heating_efficiency>
<cooling_efficiency>3.23</cooling_efficiency>
<storage>false</storage> <storage>false</storage>
</equipment> </equipment>
</generation_equipments> </generation_equipments>
@ -306,8 +305,8 @@
<demand>cooling</demand> <demand>cooling</demand>
</demands> </demands>
<equipments> <equipments>
<generation_id>7</generation_id> <generation_id>5</generation_id>
<distribution_id>4</distribution_id> <distribution_id>2</distribution_id>
<dissipation_id>2</dissipation_id> <dissipation_id>2</dissipation_id>
</equipments> </equipments>
</system> </system>

View File

@ -29,7 +29,9 @@ class MontrealSystemToHubEnergyGenerationSystem:
'Single zone packaged rooftop unit with air cooled DX': cte.CHILLER, 'Single zone packaged rooftop unit with air cooled DX': cte.CHILLER,
'Single zone make-up air unit with air cooled DX': cte.CHILLER, 'Single zone make-up air unit with air cooled DX': cte.CHILLER,
'Multi-zone built-up system with water cooled, water chiller': cte.CHILLER, 'Multi-zone built-up system with water cooled, water chiller': cte.CHILLER,
'PV system': cte.PHOTOVOLTAIC 'PV system': cte.PHOTOVOLTAIC,
'Multi-zone built-up system with heat pump for heat': cte.HEAT_PUMP,
'Multi-zone built-up system with heat pump for cooling': cte.HEAT_PUMP
} }
@property @property