From 49de7f74ddb4305291f780319ca6fa0a5a38c497 Mon Sep 17 00:00:00 2001
From: "mathias.chouet" <mathias.chouet@irstea.fr>
Date: Wed, 30 Oct 2019 09:21:54 +0100
Subject: [PATCH 1/4] Update jalhyd_branch
---
jalhyd_branch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/jalhyd_branch b/jalhyd_branch
index 48817ce02..27ca6c76e 100644
--- a/jalhyd_branch
+++ b/jalhyd_branch
@@ -1 +1 @@
-156-lois-d-ouvrages-orifice-denoye
+165-ajout-de-la-loi-d-ouvrage-de-deversoir-noye
--
GitLab
From 0351fe569cf92fc52be26b9214d87dd1ed86adcc Mon Sep 17 00:00:00 2001
From: "mathias.chouet" <mathias.chouet@irstea.fr>
Date: Thu, 31 Oct 2019 14:33:56 +0100
Subject: [PATCH 2/4] Fix #318 - new discharge law WeirSubmerged
---
docs-fr/calculators/structures/fente_noyee.md | 6 +-----
docs-fr/calculators/structures/seuil_noye.md | 18 ++++++++++++++++++
.../structures/seuil_noye_schema.png | Bin 0 -> 8461 bytes
mkdocs.yml | 1 +
.../parallel-structures.config.json | 2 ++
.../parallel-structures.en.json | 1 +
.../parallel-structures.fr.json | 1 +
src/locale/messages.en.json | 2 ++
src/locale/messages.fr.json | 2 ++
9 files changed, 28 insertions(+), 5 deletions(-)
create mode 100644 docs-fr/calculators/structures/seuil_noye.md
create mode 100644 docs-fr/calculators/structures/seuil_noye_schema.png
diff --git a/docs-fr/calculators/structures/fente_noyee.md b/docs-fr/calculators/structures/fente_noyee.md
index 40bd782ae..2f2a202d2 100644
--- a/docs-fr/calculators/structures/fente_noyee.md
+++ b/docs-fr/calculators/structures/fente_noyee.md
@@ -14,8 +14,4 @@ Avec :
* *H<sub>1</sub>* la charge sur la fente m
* *μ* le coefficient de débit (égal à 0.65 par défaut).
-Le coefficient de débit *μ* peut varier de 0.65 pour une fente à arêtes vives à plus de 0.85 lorsque le profil de la fente est arrondi.
-
-N.B. : la littérature propose plutôt la formule suivante pour un seuil noyé :
-
-$$Q = \mu b H_2\sqrt{2g \Delta H}$$
+Le coefficient de débit *μ* peut varier de 0.65 pour une fente à arêtes vives à plus de 0.85 lorsque le profil de la fente est arrondi.
\ No newline at end of file
diff --git a/docs-fr/calculators/structures/seuil_noye.md b/docs-fr/calculators/structures/seuil_noye.md
new file mode 100644
index 000000000..a73993e32
--- /dev/null
+++ b/docs-fr/calculators/structures/seuil_noye.md
@@ -0,0 +1,18 @@
+# Formule du déversoir noyé
+
+
+
+*Extrait de: Rajaratnam, N., et D. Muralidhar. « Flow below deeply submerged rectangular weirs ». Journal of Hydraulic Research 7, nᵒ 3 (1969): 355–374.*
+
+En régime noyé, le débit dépend de la hauteur d'eau amont \(h_{amont}\) et de la hauteur aval \(h_{aval}\) :
+
+$$Q = Cd \sqrt{2gH} Lh_{aval} \sqrt{h_{amont}-h_{aval}}$$
+
+Avec :
+
+* *L* la largeur du seuil en m
+* *h<sub>amont</sub>* la charge sur le seuil à l'amont en m
+* *h<sub>aval</sub>* la charge sur le seuil à l'aval en m
+* *C<sub>d</sub>* le coefficient de débit (égal à 0.9 par défaut).
+
+Cette formule n'est pas conseillée pour un ennoiement inférieur à 80%.
\ No newline at end of file
diff --git a/docs-fr/calculators/structures/seuil_noye_schema.png b/docs-fr/calculators/structures/seuil_noye_schema.png
new file mode 100644
index 0000000000000000000000000000000000000000..c3f8596a9b658a8a5ea95281a05f8be09c4046d3
GIT binary patch
literal 8461
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
literal 0
HcmV?d00001
diff --git a/mkdocs.yml b/mkdocs.yml
index 90ad4cdd0..b42c7c94d 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -42,6 +42,7 @@ nav:
- calculators/structures/orifice_noye.md
- calculators/structures/orifice_denoye.md
- calculators/structures/fente_noyee.md
+ - calculators/structures/seuil_noye.md
- calculators/structures/dever_triang.md
- calculators/structures/dever_triang_tronque.md
- calculators/structures/cem_88_v.md
diff --git a/src/app/calculators/parallel-structures/parallel-structures.config.json b/src/app/calculators/parallel-structures/parallel-structures.config.json
index b4a36f3cd..b469be78c 100644
--- a/src/app/calculators/parallel-structures/parallel-structures.config.json
+++ b/src/app/calculators/parallel-structures/parallel-structures.config.json
@@ -34,6 +34,7 @@
"Orifice_OrificeSubmerged": "structures/orifice_noye.html",
"Orifice_OrificeFree": "structures/orifice_denoye.html",
"SeuilRectangulaire_WeirSubmergedLarinier": "structures/fente_noyee.html",
+ "SeuilRectangulaire_WeirSubmerged": "structures/seuil_noye.html",
"SeuilRectangulaire_WeirFree": "structures/kivi.html",
"SeuilTriangulaire_TriangularWeirFree": "structures/dever_triang.html",
"SeuilTriangulaireTrunc_TriangularTruncWeirFree": "structures/dever_triang_tronque.html"
@@ -44,6 +45,7 @@
"ZDV",
"L",
"W",
+ "CdWS",
"CdWSL",
"CdWR",
"CdGR",
diff --git a/src/app/calculators/parallel-structures/parallel-structures.en.json b/src/app/calculators/parallel-structures/parallel-structures.en.json
index 349161339..3e63f26b2 100644
--- a/src/app/calculators/parallel-structures/parallel-structures.en.json
+++ b/src/app/calculators/parallel-structures/parallel-structures.en.json
@@ -24,6 +24,7 @@
"select_loidebit_SeuilRectangulaire_WeirCem88d": "Weir/Orifice Cemagref 88",
"select_loidebit_SeuilRectangulaire_WeirCem88v": "Weir/Undershot gate Cemagref 88",
"select_loidebit_SeuilRectangulaire_WeirSubmergedLarinier": "Submerged slot (Larinier 1992)",
+ "select_loidebit_SeuilRectangulaire_WeirSubmerged": "Submerged weir",
"select_loidebit_SeuilRectangulaire_WeirVillemonte": "Villemonte 1957",
"select_loidebit_SeuilRectangulaire_WeirFree": "Free flow weir",
"select_loidebit_SeuilRectangulaire_KIVI": "Kindsvater-Carter and Villemonte",
diff --git a/src/app/calculators/parallel-structures/parallel-structures.fr.json b/src/app/calculators/parallel-structures/parallel-structures.fr.json
index a83658185..ec6b2dbbc 100644
--- a/src/app/calculators/parallel-structures/parallel-structures.fr.json
+++ b/src/app/calculators/parallel-structures/parallel-structures.fr.json
@@ -24,6 +24,7 @@
"select_loidebit_SeuilRectangulaire_WeirCem88d": "Déversoir/Orifice Cemagref 88",
"select_loidebit_SeuilRectangulaire_WeirCem88v": "Déversoir/Vanne de fond Cemagref 88",
"select_loidebit_SeuilRectangulaire_WeirSubmergedLarinier": "Fente noyée (Larinier 1992)",
+ "select_loidebit_SeuilRectangulaire_WeirSubmerged": "Seuil noyé",
"select_loidebit_SeuilRectangulaire_WeirVillemonte": "Villemonte 1957",
"select_loidebit_SeuilRectangulaire_WeirFree": "Seuil dénoyé",
"select_loidebit_SeuilRectangulaire_KIVI": "Kindsvater-Carter et Villemonte",
diff --git a/src/locale/messages.en.json b/src/locale/messages.en.json
index 5813ebc2e..b12fe6900 100644
--- a/src/locale/messages.en.json
+++ b/src/locale/messages.en.json
@@ -5,6 +5,7 @@
"WARNING_ORIFICE_FREE_DOWNSTREAM_ELEVATION_POSSIBLE_SUBMERSION": "Downstream elevation is higher than orifice center elevation (possible submersion)",
"WARNING_NOTCH_SUBMERSION_GREATER_THAN_07": "Notch formula is discouraged when submersion is greater than 0.7",
"WARNING_SLOT_SUBMERSION_NOT_BETWEEN_07_AND_09": "Slot formula is discouraged when submersion is lower than 0.7 or greater than 0.9",
+ "WARNING_WEIR_SUBMERSION_LOWER_THAN_08": "Sumberged weir formula is discouraged when submersion is lower than 08",
"WARNING_ERRORS_ABSTRACT": "%nb% errors occurred during calculation",
"ERROR_BIEF_Z1_CALC_FAILED": "Unable to calculate upstream elevation (calculation interrupted before upstream)",
"ERROR_BIEF_Z2_CALC_FAILED": "Unable to calculate downstream elevation (calculation interrupted before downstream)",
@@ -203,6 +204,7 @@
"INFO_LIB_CDGR": "Discharge coefficient gate",
"INFO_LIB_CDWR": "Discharge coefficient weir",
"INFO_LIB_CDWSL": "Discharge coefficient slot",
+ "INFO_LIB_CDWS": "Discharge coefficient",
"INFO_LIB_CDT": "Discharge coefficient triangular weir",
"INFO_LIB_CDO": "Discharge coefficient orifice",
"INFO_LIB_CLOISON": "Cross wall #",
diff --git a/src/locale/messages.fr.json b/src/locale/messages.fr.json
index 4f4f73fdf..adf9a72ce 100644
--- a/src/locale/messages.fr.json
+++ b/src/locale/messages.fr.json
@@ -5,6 +5,7 @@
"WARNING_ORIFICE_FREE_DOWNSTREAM_ELEVATION_POSSIBLE_SUBMERSION": "La cote de l'eau aval est plus élevée que la cote du centre de l'orifice (ennoiement possible)",
"WARNING_NOTCH_SUBMERSION_GREATER_THAN_07": "La formule de l'échancrure n'est pas conseillée pour un ennoiement supérieur à 0.7",
"WARNING_SLOT_SUBMERSION_NOT_BETWEEN_07_AND_09": "La formule de la fente n'est pas conseillée pour un ennoiement inférieur à 0.7 et supérieur à 0.9",
+ "WARNING_WEIR_SUBMERSION_LOWER_THAN_08": "La formule du seuil noyé n'est pas conseillé pour un ennoiement inférieur à 0.8",
"WARNING_ERRORS_ABSTRACT": "%nb% erreurs rencontrées lors du calcul",
"ERROR_BIEF_Z1_CALC_FAILED": "Impossible de calculer la cote amont (calcul interrompu avant l'amont)",
"ERROR_BIEF_Z2_CALC_FAILED": "Impossible de calculer la cote aval (calcul interrompu avant l'aval)",
@@ -202,6 +203,7 @@
"INFO_LIB_CDGR": "Coefficient de débit vanne",
"INFO_LIB_CDWR": "Coefficient de débit seuil",
"INFO_LIB_CDWSL": "Coefficient de débit fente",
+ "INFO_LIB_CDWS": "Coefficient de débit",
"INFO_LIB_CDT": "Coefficient de débit seuil triangulaire",
"INFO_LIB_CDO": "Coefficient de débit orifice",
"INFO_LIB_CLOISON": "Cloison n°",
--
GitLab
From c28d853eb247499b68ad797cd1694164066d1cc9 Mon Sep 17 00:00:00 2001
From: "mathias.chouet" <mathias.chouet@irstea.fr>
Date: Thu, 31 Oct 2019 15:03:12 +0100
Subject: [PATCH 3/4] Update e2e spec for PAB
---
e2e/pab.e2e-spec.ts | 2 +-
e2e/session/session-pab-regulee-variee.json | 30 ++++++++++-----------
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/e2e/pab.e2e-spec.ts b/e2e/pab.e2e-spec.ts
index fe18716cb..2ce10079a 100644
--- a/e2e/pab.e2e-spec.ts
+++ b/e2e/pab.e2e-spec.ts
@@ -278,7 +278,7 @@ describe("ngHyd − Passe à Bassins", () => {
calcPage.changeSelectValue(pve, 3);
await browser.sleep(300);
// check absence of logs
- expect(await calcPage.nbLogEntries()).toBe(1);
+ expect(await calcPage.nbLogEntries()).toBe(2);
});
});
diff --git a/e2e/session/session-pab-regulee-variee.json b/e2e/session/session-pab-regulee-variee.json
index 31b0cfd59..2c200723d 100644
--- a/e2e/session/session-pab-regulee-variee.json
+++ b/e2e/session/session-pab-regulee-variee.json
@@ -27,7 +27,7 @@
"calcType": 7,
"nodeType": 5,
"structureType": 0,
- "loiDebit": 11
+ "loiDebit": "WeirSubmergedLarinier"
},
"children": [],
"parameters": [
@@ -85,7 +85,7 @@
"calcType": 7,
"nodeType": 5,
"structureType": 0,
- "loiDebit": 11
+ "loiDebit": "WeirSubmergedLarinier"
},
"children": [],
"parameters": [
@@ -143,7 +143,7 @@
"calcType": 7,
"nodeType": 5,
"structureType": 0,
- "loiDebit": 11
+ "loiDebit": "WeirSubmergedLarinier"
},
"children": [],
"parameters": [
@@ -201,7 +201,7 @@
"calcType": 7,
"nodeType": 5,
"structureType": 0,
- "loiDebit": 11
+ "loiDebit": "WeirSubmergedLarinier"
},
"children": [],
"parameters": [
@@ -259,7 +259,7 @@
"calcType": 7,
"nodeType": 5,
"structureType": 0,
- "loiDebit": 11
+ "loiDebit": "WeirSubmergedLarinier"
},
"children": [],
"parameters": [
@@ -317,7 +317,7 @@
"calcType": 7,
"nodeType": 5,
"structureType": 0,
- "loiDebit": 11
+ "loiDebit": "WeirSubmergedLarinier"
},
"children": [],
"parameters": [
@@ -375,7 +375,7 @@
"calcType": 7,
"nodeType": 5,
"structureType": 0,
- "loiDebit": 11
+ "loiDebit": "WeirSubmergedLarinier"
},
"children": [],
"parameters": [
@@ -433,7 +433,7 @@
"calcType": 7,
"nodeType": 5,
"structureType": 0,
- "loiDebit": 11
+ "loiDebit": "WeirSubmergedLarinier"
},
"children": [],
"parameters": [
@@ -491,7 +491,7 @@
"calcType": 7,
"nodeType": 5,
"structureType": 0,
- "loiDebit": 11
+ "loiDebit": "WeirSubmergedLarinier"
},
"children": [],
"parameters": [
@@ -549,7 +549,7 @@
"calcType": 7,
"nodeType": 5,
"structureType": 0,
- "loiDebit": 11
+ "loiDebit": "WeirSubmergedLarinier"
},
"children": [],
"parameters": [
@@ -607,7 +607,7 @@
"calcType": 7,
"nodeType": 5,
"structureType": 0,
- "loiDebit": 11
+ "loiDebit": "WeirSubmergedLarinier"
},
"children": [],
"parameters": [
@@ -665,7 +665,7 @@
"calcType": 7,
"nodeType": 5,
"structureType": 0,
- "loiDebit": 11
+ "loiDebit": "WeirSubmergedLarinier"
},
"children": [],
"parameters": [
@@ -723,7 +723,7 @@
"calcType": 7,
"nodeType": 5,
"structureType": 0,
- "loiDebit": 11
+ "loiDebit": "WeirSubmergedLarinier"
},
"children": [],
"parameters": [
@@ -781,7 +781,7 @@
"calcType": 7,
"nodeType": 5,
"structureType": 0,
- "loiDebit": 11
+ "loiDebit": "WeirSubmergedLarinier"
},
"children": [],
"parameters": [
@@ -855,7 +855,7 @@
"uid": "c216YW",
"props": {
"calcType": 7,
- "loiDebit": 15
+ "loiDebit": "VanLevVillemonte"
},
"children": [],
"parameters": [
--
GitLab
From 587645900406533d95b1336500b8ce3c299b28dc Mon Sep 17 00:00:00 2001
From: "mathias.chouet" <mathias.chouet@irstea.fr>
Date: Thu, 31 Oct 2019 16:43:08 +0100
Subject: [PATCH 4/4] Update doc for WeirSubmerged
---
docs-fr/calculators/structures/seuil_noye.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs-fr/calculators/structures/seuil_noye.md b/docs-fr/calculators/structures/seuil_noye.md
index a73993e32..784e10abb 100644
--- a/docs-fr/calculators/structures/seuil_noye.md
+++ b/docs-fr/calculators/structures/seuil_noye.md
@@ -2,11 +2,11 @@
-*Extrait de: Rajaratnam, N., et D. Muralidhar. « Flow below deeply submerged rectangular weirs ». Journal of Hydraulic Research 7, nᵒ 3 (1969): 355–374.*
+*Extrait de: Rajaratnam, N., Muralidhar, D., 1969. Flow below deeply submerged rectangular weirs. Journal of Hydraulic Research 7, 355–374.*
En régime noyé, le débit dépend de la hauteur d'eau amont \(h_{amont}\) et de la hauteur aval \(h_{aval}\) :
-$$Q = Cd \sqrt{2gH} Lh_{aval} \sqrt{h_{amont}-h_{aval}}$$
+$$Q = Cd \sqrt{2g} Lh_{aval} \sqrt{h_{amont}-h_{aval}}$$
Avec :
--
GitLab