diff --git a/doc/users/Tuto1/step2.pamhyr b/doc/users/Tuto1/step2.pamhyr index e10e685b6ce4b9e25e4542a1b28f15fdaa745870..c7516dff606939dd005eafa8e54776cee528a4ee 100644 Binary files a/doc/users/Tuto1/step2.pamhyr and b/doc/users/Tuto1/step2.pamhyr differ diff --git a/src/View/Results/CustomPlot/Plot.py b/src/View/Results/CustomPlot/Plot.py index 0f2ed5cbeb9b2e24de4d47f1ce87f5a6e6ed5de7..a3073c7a1bf4dd2b21cd737793f12f574cae6239 100644 --- a/src/View/Results/CustomPlot/Plot.py +++ b/src/View/Results/CustomPlot/Plot.py @@ -200,9 +200,9 @@ class CustomPlot(PamhyrPlot): p.get_ts_key(self._timestamp, "Q"), p.get_ts_key(self._timestamp, "Z")) / sqrt(9.81 * ( - p.geometry.wet_width( - p.get_ts_key(self._timestamp, "Z")) / p.geometry.wet_area( + p.get_ts_key(self._timestamp, "Z")) / + p.geometry.wet_width( p.get_ts_key(self._timestamp, "Z")) )), reach.profiles @@ -394,8 +394,8 @@ class CustomPlot(PamhyrPlot): map(lambda z, q: profile.geometry.speed(q, z) / sqrt(9.81 * ( - profile.geometry.wet_width(z) / - profile.geometry.wet_area(z)) + profile.geometry.wet_area(z) / + profile.geometry.wet_width(z)) ), z, q) ) diff --git a/src/View/Results/Table.py b/src/View/Results/Table.py index fead357e1af820e1f498befe08cb1d3a4731f8b5..c92e994e259e678858afa61a35e15fd9febe61f5 100644 --- a/src/View/Results/Table.py +++ b/src/View/Results/Table.py @@ -121,8 +121,8 @@ class TableModel(PamhyrTableModel): q = self._lst[row].get_ts_key(self._timestamp, "Q") z = self._lst[row].get_ts_key(self._timestamp, "Z") v = self._lst[row].geometry.speed(q, z) - b = self._lst[row].geometry.wet_area(z) - a = self._lst[row].geometry.wet_width(z) + a = self._lst[row].geometry.wet_area(z) + b = self._lst[row].geometry.wet_width(z) froude = v / sqrt(9.81 * (a / b)) return f"{froude:.4f}" else: