From 5204b2cef241768d5786a35b26680c5380d07caf Mon Sep 17 00:00:00 2001
From: Theophile Terraz <theophile.terraz@inrae.fr>
Date: Tue, 27 Aug 2024 17:03:56 +0200
Subject: [PATCH] debug Froude
---
doc/users/Tuto1/step2.pamhyr | Bin 200704 -> 208896 bytes
src/View/Results/CustomPlot/Plot.py | 8 ++++----
src/View/Results/Table.py | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/doc/users/Tuto1/step2.pamhyr b/doc/users/Tuto1/step2.pamhyr
index e10e685b6ce4b9e25e4542a1b28f15fdaa745870..c7516dff606939dd005eafa8e54776cee528a4ee 100644
GIT binary patch
delta 575
zcmZozz|-)6XM(gKI|BoQF%ZLm+(aE?M)r*f^Z6xtc=@dvIC!lX_`Ue`c&+#k@o(dw
z%%9I6v$0W$ce9l&3zH!~OdF6EU}Tn-EK4ma&dkp<&@<38G!*1uR_8A+DNU)2FG|fx
zO)O3|n4B-4#i%v0QB8sisD*>Shk<`1|6%?+{PXzV@b~ba;s3g^v4mepkXfA(MI*=N
zdHQJ^n0Xi@HnTqnWZazoD~FM*nS+~M+|-n@)p&B@FUiTzAAMjd%AV}_UWP3-FC`wr
zoLv8(XS4E?Qf4et>wfZ1p7Bb2^PlI2EKupq-fy-s%X6hO@G#ghaI9rN%C?5}0rMYb
z3C1IQl04fO?6_BPZJ6jNx7qGPHz!CB<5$_qFMigu0Da>*vC-A6v0Q>(Twb2B*|sDx
zDJQikwIDtxGcUCm&M<Zka&-)GRS0o(@^Mvw3QsQhXFK`qKefqw-zu<x)K6A?D#Ko!
zp92cd$*aFhc{g#2vy1EMGB&${%}q>6$t(c|bYf0?T4qjaF*@G}#THaq6w3+{OEN%~
tF_)xPOrH2nX7lzxPE63im>m0`gAp8{%{KqrZT>TExB1U>L}1Yd1puoH#})tp
delta 325
zcmZp8z|*jRXM(gKD+2?AArQlW$V44uM%Il9^ZCWOdHJmw*m<oO_}}yE@mld8;@`$U
znLmGHqYCe4D_IsMMw5w+29xvUvlt~OI*O|EGcrqym!%dJXXfV_=o#pla{<j{=by*G
zzmfki{~i8${BQWr@PFMbXwbpGd7ggS24-%iBb(VD1TwPl|6rZDu`z>j^N~lwj7-@D
zlO5m7u%+gu#6y^q>;Lm?R(?{-j74hQPu|HhUWsr1^W2aHD!tkJ%{FFv?#m3^40a4$
z=^Sg>kFu>{eZc&OS%UEhpCr#V20O+*6CLF?+kNQf1nFV?Dm(eb&-%>~4|5n<fR27V
ivGM-qZGW7ZpaxEk{m%|%HrxDfxB1Vw-R3{j5di>FUvH5B
diff --git a/src/View/Results/CustomPlot/Plot.py b/src/View/Results/CustomPlot/Plot.py
index 0f2ed5cb..a3073c7a 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 fead357e..c92e994e 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:
--
GitLab