Almost finish task 7
This commit is contained in:
parent
c704625950
commit
780ee331e4
10
a1.py
10
a1.py
@ -155,10 +155,14 @@ def calc_energy_power(heights: tuple[float, ...], water_mass_outs: tuple[float,
|
|||||||
energy, power = (), ()
|
energy, power = (), ()
|
||||||
|
|
||||||
for i in range(len(heights)):
|
for i in range(len(heights)):
|
||||||
energy += water_mass_outs[i] * GRAVITY_ACC * \
|
energy_jules = water_mass_outs[i] * GRAVITY_ACC * \
|
||||||
(heights[i] + relative_elevation) * (efficiency/100), # note the comma
|
(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
|
return energy, power
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user