diff --git a/docs-fr/calculators/structures/fente_noyee.md b/docs-fr/calculators/structures/fente_noyee.md
index 40bd782ae381caae78156b2557dcf067addd2c59..2f2a202d287e07961303c794e8d0b7ef471221bb 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 0000000000000000000000000000000000000000..784e10abb9bc52ee53766affcdc1f9426ff6c468
--- /dev/null
+++ b/docs-fr/calculators/structures/seuil_noye.md
@@ -0,0 +1,18 @@
+# Formule du déversoir noyé
+
+
+
+*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{2g} 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
Binary files /dev/null and b/docs-fr/calculators/structures/seuil_noye_schema.png differ
diff --git a/e2e/pab.e2e-spec.ts b/e2e/pab.e2e-spec.ts
index fe18716cb8ef57d4f78525cd8a2c0b9a17a5b2c4..2ce10079a04e678a44eb574b21949461e9b93275 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 31b0cfd59adefa5cb1ba19256c499a9e11aeef08..2c200723d09bf197bc8e872bc0cb494f60ecc01a 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": [
diff --git a/jalhyd_branch b/jalhyd_branch
index 48817ce02541c4633023d45f4b03df454e378dfd..27ca6c76e1b922d9099ed9e32d0ff1db90526ce3 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
diff --git a/mkdocs.yml b/mkdocs.yml
index 90ad4cdd09b5073e175f40c659498879481bcbdf..b42c7c94ddfad5f38e1ee2a9d47405b59cdc616d 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 b4a36f3cd5146b04d8c38cf3d64052f0566e9d98..b469be78c2f4050f6e31d6d7aecad361a43d746b 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 3491613396634b1f203b14cab5bae650485e6878..3e63f26b2fe9130af19bff560b423bf483745b04 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 a836581856761bb5b25c534d1a21328971a327aa..ec6b2dbbca0bf65b5995b78ef05aa2dbaaad8321 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 5813ebc2ebfdfac185c39ab741fd6a1465c8bd12..b12fe6900f404f69dad1c63a622f23a2756d659d 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 4f4f73fdf92d7765fbc08b13da038565a867ffa1..adf9a72ce481cee7026e216e955fbc6563446343 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°",