From 7b53ef53ee425d0fdbf434dce7871800f613dfc3 Mon Sep 17 00:00:00 2001 From: cjbasp22 Date: Thu, 11 Apr 2024 13:23:58 -0600 Subject: [PATCH] Update hydropower_potential.py --- HydroGenerate/hydropower_potential.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/HydroGenerate/hydropower_potential.py b/HydroGenerate/hydropower_potential.py index 17614cb..ea6a82c 100755 --- a/HydroGenerate/hydropower_potential.py +++ b/HydroGenerate/hydropower_potential.py @@ -392,21 +392,20 @@ def revenue_calculation(self, hp_params): mean_power = np.mean(hp_params.power) # mean of the power provided for a time series of flow + if hp_params.n_operation_days is None: + hp_params.n_operation_days = 365 + if hp_params.capacity_factor: annual_energy = hp_params.capacity_factor * mean_power * 365 # annual energy generated, killowatt day hp_params.n_operation_days = hp_params.capacity_factor * 365 # update - elif hp_params.n_operation_days: + else: if hp_params.n_operation_days > 365: raise ValueError('The number of days in a year a plant operates cannot exceed 365') - annual_energy = hp_params.n_operation_days * mean_power / 365 # annual energy generatedkillowatt day + annual_energy = hp_params.n_operation_days * mean_power # annual energy generatedkillowatt day hp_params.capacity_factor = hp_params.n_operation_days * 100/ 365 # update - else: - raise ValueError('The number of days a plant operates, or the capacity factor, are needed' \ - ' to compute annual energy generated and revenue') - if hp_params.electricity_sell_price is None: hp_params.electricity_sell_price = 0.01110 # average retail U.S. electricity price in 2021. https://www.eia.gov/electricity/state/