diff --git a/src/Model/Friction/Friction.py b/src/Model/Friction/Friction.py index a71a72f34c7b723e4f58c0c71eefec1de089d334..8eb575b01819ef92c11f6cad025134830fe94931 100644 --- a/src/Model/Friction/Friction.py +++ b/src/Model/Friction/Friction.py @@ -177,8 +177,7 @@ class Friction(SQLSubModel): def has_coefficient(self): return ( - self._begin_strickler is not None and - self._end_strickler is not None + self._begin_strickler is not None ) def is_full_defined(self): @@ -237,7 +236,8 @@ class Friction(SQLSubModel): @property def end_strickler(self): - return self._end_strickler + # return self._end_strickler + return self._begin_strickler @end_strickler.setter def end_strickler(self, strickler): @@ -247,13 +247,17 @@ class Friction(SQLSubModel): def get_friction(self, rk): if not self.contains_rk(rk): return None - minor = interp(rk, - [self.begin_rk, self.end_rk], - [self.begin_strickler.minor, - self.end_strickler.minor]) - medium = interp(rk, - [self.begin_rk, self.end_rk], - [self.begin_strickler.medium, - self.end_strickler.medium]) + + minor = self.begin_strickler.minor + medium = self.begin_strickler.medium + + # minor = interp(rk, + # [self.begin_rk, self.end_rk], + # [self.begin_strickler.minor, + # self.end_strickler.minor]) + # medium = interp(rk, + # [self.begin_rk, self.end_rk], + # [self.begin_strickler.medium, + # self.end_strickler.medium]) return minor, medium diff --git a/src/Model/Geometry/Reach.py b/src/Model/Geometry/Reach.py index 3ef25793e744592f4b8c4b00d9a0903e9ed6f254..265889677cef8ad652a55bd45e554773cc3f6a23 100644 --- a/src/Model/Geometry/Reach.py +++ b/src/Model/Geometry/Reach.py @@ -840,6 +840,9 @@ class Reach(SQLSubModel): z_last = profile.z_min() rk_last = profile.rk + if (rk_last - rk_first) == 0: + continue + incline_acc += [ (z_last - z_first) /