diff --git a/HydroGenerate/hydraulic_processing.py b/HydroGenerate/hydraulic_processing.py index 8102e53..7589214 100755 --- a/HydroGenerate/hydraulic_processing.py +++ b/HydroGenerate/hydraulic_processing.py @@ -329,7 +329,7 @@ def frictionfactor_calculator(self, hydraulic_parameters): elif Re > 2000: # Cubic interpolation formula derived from the Moody Diagram (Dunlop, 1991) AA= -1.5634601348517065795 AB= 0.00328895476345399058690 - Y2 = (epsilon / 3.7 * D) + AB + Y2 = (epsilon / (3.7 * D)) + AB Y3 = -2 * np.log10(Y2) FA = Y3**-2 FB = FA * (2 - (AA * AB / (Y2 * Y3))) diff --git a/HydroGenerate/hydropower_potential.py b/HydroGenerate/hydropower_potential.py index e572b13..869cd4b 100755 --- a/HydroGenerate/hydropower_potential.py +++ b/HydroGenerate/hydropower_potential.py @@ -271,9 +271,6 @@ def si_to_us_conversion(self): if self.net_head is not None: self.net_head = self.net_head / ft_to_m # m to ft - if self.max_headloss_allowed is not None: - self.max_headloss_allowed = self.max_headloss_allowed / ft_to_m # m to ft - if self.penstock_length is not None: self.penstock_length = self.penstock_length / ft_to_m # m to ft