From 780ee331e4c52707a9e41260d747788a3e21420d Mon Sep 17 00:00:00 2001
From: Cal Wing <cal@wing.id.au>
Date: Thu, 27 Feb 2025 20:04:00 +1000
Subject: [PATCH] Almost finish task 7

---
 a1.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/a1.py b/a1.py
index d8dfcdd..fec92c8 100644
--- a/a1.py
+++ b/a1.py
@@ -155,10 +155,14 @@ def calc_energy_power(heights: tuple[float, ...], water_mass_outs: tuple[float,
     energy, power = (), ()
 
     for i in range(len(heights)):
-        energy += water_mass_outs[i] * GRAVITY_ACC * \
-            (heights[i] + relative_elevation) * (efficiency/100), # note the comma
+        energy_jules = water_mass_outs[i] * GRAVITY_ACC * \
+            (heights[i] + relative_elevation) * (efficiency/100) # note the comma
 
-        power += energy[i] / time_inc, 
+        energy += energy_jules / 3.6e+6, # convert to kWh
+
+        power_watts = energy[i] / time_inc
+
+        power += power_watts / 1e3, # convert to kW
 
     return energy, power