parouby
/
Pamhyr2
mirror of https://gitlab.com/pamhyr/pamhyr2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of gitlab-ssh.irstea.fr:theophile.terraz/pamhyr into terraz_dev

adists_release
Theophile Terraz 2024-10-07 14:27:42 +02:00
parent fa2cc303cd 3adce567df
commit 9364b99158
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/Model/Friction/Friction.py
View File

@ -177,8 +177,7 @@ class Friction(SQLSubModel):
def has_coefficient(self): def has_coefficient(self):
return ( return (
self._begin_strickler is not None and self._begin_strickler is not None
self._end_strickler is not None
) )
def is_full_defined(self): def is_full_defined(self):
@ -237,7 +236,8 @@ class Friction(SQLSubModel):
@property @property
def end_strickler(self): def end_strickler(self):
return self._end_strickler # return self._end_strickler
return self._begin_strickler
@end_strickler.setter @end_strickler.setter
def end_strickler(self, strickler): def end_strickler(self, strickler):
@ -247,13 +247,17 @@ class Friction(SQLSubModel):
def get_friction(self, rk): def get_friction(self, rk):
if not self.contains_rk(rk): if not self.contains_rk(rk):
return None return None
minor = interp(rk,
[self.begin_rk, self.end_rk], minor = self.begin_strickler.minor
[self.begin_strickler.minor, medium = self.begin_strickler.medium
self.end_strickler.minor])
medium = interp(rk, # minor = interp(rk,
[self.begin_rk, self.end_rk], # [self.begin_rk, self.end_rk],
[self.begin_strickler.medium, # [self.begin_strickler.minor,
self.end_strickler.medium]) # self.end_strickler.minor])
# medium = interp(rk,
# [self.begin_rk, self.end_rk],
# [self.begin_strickler.medium,
# self.end_strickler.medium])
return minor, medium return minor, medium

3
src/Model/Geometry/Reach.py
View File

@ -840,6 +840,9 @@ class Reach(SQLSubModel):
z_last = profile.z_min() z_last = profile.z_min()
rk_last = profile.rk rk_last = profile.rk
if (rk_last - rk_first) == 0:
continue
incline_acc += [ incline_acc += [
(z_last - z_first) (z_last - z_first)
/ /