From 76745dc9d0e2f7d9f3eeb3b5dd65466389c87904 Mon Sep 17 00:00:00 2001
From: Pierre-Antoine Rouby <pierre-antoine.rouby@inrae.fr>
Date: Mon, 19 Feb 2024 15:44:04 +0100
Subject: [PATCH] Pamhyr: Fix Pep8 and minor change.
---
src/Model/Geometry/ProfileXYZ.py | 20 ++++++-------------
src/Model/Results/River/River.py | 2 ++
src/View/Frictions/translate.py | 1 -
src/View/Results/PlotKPC.py | 2 +-
.../SedimentLayers/Reach/Profile/translate.py | 1 -
5 files changed, 9 insertions(+), 17 deletions(-)
diff --git a/src/Model/Geometry/ProfileXYZ.py b/src/Model/Geometry/ProfileXYZ.py
index 3d40fd69..f3ebe88f 100644
--- a/src/Model/Geometry/ProfileXYZ.py
+++ b/src/Model/Geometry/ProfileXYZ.py
@@ -478,20 +478,12 @@ class ProfileXYZ(Profile, SQLSubModel):
return abs(rg.dist(rd))
def get_water_limits(self, z):
- # ====================================================================
- # détermination des points limites RG et RD pour un niveau
- # d'eau donné
- #
- # irg et ird sont les premiers indices en partant des rives
- # gauche et droite qui correspondent à des points sous la
- # surface de l'eau ptX et ptY sont les points interpolés où
- # le plan d'eau intersecte le profil known_level est le
- # niveau d'eau pour lequel on a obtenu irg, ird, ptX et ptY
- # ====================================================================
-
-
- # Get the index of last point with elevation lesser than water
- # level (for the right and left river side)
+ """
+ Determine left and right limits of water elevation.
+ """
+
+ # Get the index of first point with elevation lesser than water
+ # elevation (for the right and left river side)
i_left = -1
i_right = -1
diff --git a/src/Model/Results/River/River.py b/src/Model/Results/River/River.py
index 7754796d..57823688 100644
--- a/src/Model/Results/River/River.py
+++ b/src/Model/Results/River/River.py
@@ -62,6 +62,7 @@ class Profile(object):
def has_sediment(self):
return any(map(lambda ts: "sl" in self._data[ts], self._data))
+
class Reach(object):
def __init__(self, reach, study):
self._study = study
@@ -97,6 +98,7 @@ class Reach(object):
def has_sediment(self):
return any(map(lambda profile: profile.has_sediment(), self._profiles))
+
class River(object):
def __init__(self, study):
self._study = study
diff --git a/src/View/Frictions/translate.py b/src/View/Frictions/translate.py
index 3cade05a..9ec0655b 100644
--- a/src/View/Frictions/translate.py
+++ b/src/View/Frictions/translate.py
@@ -34,7 +34,6 @@ class FrictionsTranslate(PamhyrTranslate):
"Frictions", "Stricklers"
)
-
self._dict["Edit frictions"] = _translate(
"Frictions", "Edit frictions"
)
diff --git a/src/View/Results/PlotKPC.py b/src/View/Results/PlotKPC.py
index c7e288d4..7ccffc10 100644
--- a/src/View/Results/PlotKPC.py
+++ b/src/View/Results/PlotKPC.py
@@ -213,7 +213,7 @@ class PlotKPC(PamhyrPlot):
z, d
)
),
- z_sl, d_sl + [f] # HACK: Add dummy data for last layer
+ z_sl, d_sl + [f] # HACK: Add dummy data for last layer
)
)
diff --git a/src/View/SedimentLayers/Reach/Profile/translate.py b/src/View/SedimentLayers/Reach/Profile/translate.py
index ab1b177c..382bc8d2 100644
--- a/src/View/SedimentLayers/Reach/Profile/translate.py
+++ b/src/View/SedimentLayers/Reach/Profile/translate.py
@@ -34,7 +34,6 @@ class SedimentProfileTranslate(SedimentReachTranslate):
"SedimentLayers", "Height (m)"
)
-
self._dict["Profile sediment layers"] = _translate(
"SedimentLayers", "Profile sediment layers"
)
--
GitLab