Skip to content

Commit

Permalink
fix cop/performance calculation
Browse files Browse the repository at this point in the history
  • Loading branch information
LavermanJJ committed Nov 7, 2022
1 parent 97f3bd0 commit 2db998c
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions pysolarfocus/components/heat_pump.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,24 +33,24 @@ def __init__(self) -> None:
@property
def cop_heating(self) -> float:
if self.electrical_power.scaled_value:
return self.heatpump.thermal_power_heating.scaled_value / self.heatpump.electrical_power.scaled_value
return self.thermal_power_heating.scaled_value / self.electrical_power.scaled_value
return 0.0

@property
def cop_cooling(self) -> float:
if self.electrical_power.scaled_value:
return self.heatpump.thermal_power_cooling.scaled_value / self.heatpump.electrical_power.scaled_value
return self.thermal_power_cooling.scaled_value / self.electrical_power.scaled_value
return 0.0

@property
def performance_overall_heating(self) -> float:
if self.electrical_energy_heating.scaled_value:
return self.heatpump.thermal_energy_heating.scaled_value / self.heatpump.electrical_energy_heating.scaled_value
return self.thermal_energy_heating.scaled_value / self.electrical_energy_heating.scaled_value
return 0.0

@property
def performance_overall_drinking_water(self) -> float:
if self.electrical_energy_drinking_water.scaled_value:
return self.heatpump.thermal_energy_drinking_water.scaled_value / self.heatpump.electrical_energy_drinking_water.scaled_value
return self.thermal_energy_drinking_water.scaled_value / self.electrical_energy_drinking_water.scaled_value
return 0.0

0 comments on commit 2db998c

Please sign in to comment.