Skip to content

Fix headloss bugs #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dgilman wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix headloss bugs #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2072a0
Fix Colebrook term in transitional friction factor
dgilman Nov 11, 2026
d0cad33
Do not convert max_headloss_allowed to feet
dgilman Nov 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion HydroGenerate/hydraulic_processing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)))
Expand Down
3 changes: 0 additions & 3 deletions HydroGenerate/hydropower_potential.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down