From a1c7910797a8595a5204db1175b751877d4e4556 Mon Sep 17 00:00:00 2001
From: "mathias.chouet" <mathias.chouet@irstea.fr>
Date: Mon, 27 Jul 2020 14:32:53 +0200
Subject: [PATCH] Fix #421 new coefficient for Submerged sluice gate
updated doc
---
docs/en/calculators/structures/liste.md | 2 +-
docs/fr/calculators/structures/liste.md | 4 ++--
src/app/calculators/cloisons/config.json | 1 +
src/app/calculators/dever/config.json | 1 +
src/app/calculators/parallelstructure/config.json | 1 +
src/app/formulaire/elements/formulaire-node.ts | 2 +-
src/locale/messages.en.json | 1 +
src/locale/messages.fr.json | 1 +
8 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/docs/en/calculators/structures/liste.md b/docs/en/calculators/structures/liste.md
index 23a7ac236..be8dc7441 100644
--- a/docs/en/calculators/structures/liste.md
+++ b/docs/en/calculators/structures/liste.md
@@ -6,7 +6,7 @@
| [Broad-crested weir / sluice gate (Cemagref-V)](./cem_88_v.md) | 0.6 | Parallel Structures |
| [Broad-crested weir / orifice (Cunge)](./cunge_80.md) | 0.6 | Parallel Structures, Cross walls, Downwall |
| [Free flow sluice gate](./vanne_denoyee.md) | 0.6 | Parallel Structures |
-| [Submerged sluice gate](./vanne_noyee.md) | 0.6 | Parallel Structures |
+| [Submerged sluice gate](./vanne_noyee.md) | 0.8 | Parallel Structures |
| [Free flow sharp-crested weir (Poleni)](./seuil_denoye.md) | 0.4 | Parallel Structures, Free flow weir stage-discharge laws |
| [Deeply submerged sharp-crested weir (Rajaratnam)](./seuil_noye.md) | 0.9 | Parallel Structures |
| [Submerged slot (Larinier)](./fente_noyee.md) | 0.75 | Parallel Structures, Cross walls, Downwall |
diff --git a/docs/fr/calculators/structures/liste.md b/docs/fr/calculators/structures/liste.md
index cb79ed159..07a0ef921 100644
--- a/docs/fr/calculators/structures/liste.md
+++ b/docs/fr/calculators/structures/liste.md
@@ -5,8 +5,8 @@
| [Seuil épais / orifice (Cemagref-D)](./cem_88_d.md) | 0.4 | Lois d'ouvrages |
| [Seuil épais / vanne de fond (Cemagref-V)](./cem_88_v.md) | 0.6 | Lois d'ouvrages |
| [Seuil épais / orifice (Cunge)](./cunge_80.md) | 1 | Lois d'ouvrages, Cloisons, Cloison aval |
-| [Vanne dénoyée](./vanne_denoyee.md) | 0.6 | Lois d'ouvrages |
-| [Vanne noyée](./vanne_noyee.md) | 0.6 | Lois d'ouvrages |
+| [Vanne de fond dénoyée](./vanne_denoyee.md) | 0.6 | Lois d'ouvrages |
+| [Vanne de fond noyée](./vanne_noyee.md) | 0.8 | Lois d'ouvrages |
| [Seuil mince dénoyé (Poleni)](./seuil_denoye.md) | 0.4 | Lois d'ouvrages, Lois de déversoirs dénoyés |
| [Seuil mince noyé (Rajaratnam)](./seuil_noye.md) | 0.9 | Lois d'ouvrages |
| [Fente noyée (Larinier)](./fente_noyee.md) | 0.75 | Lois d'ouvrages, Cloisons, Cloison aval |
diff --git a/src/app/calculators/cloisons/config.json b/src/app/calculators/cloisons/config.json
index e9b9a8c9b..dfdb8e24e 100644
--- a/src/app/calculators/cloisons/config.json
+++ b/src/app/calculators/cloisons/config.json
@@ -47,6 +47,7 @@
"CdWSL",
"CdWR",
"CdGR",
+ "CdGRS",
"CdCunge",
"CdT",
"S",
diff --git a/src/app/calculators/dever/config.json b/src/app/calculators/dever/config.json
index 375ca3bfe..db3abf963 100644
--- a/src/app/calculators/dever/config.json
+++ b/src/app/calculators/dever/config.json
@@ -39,6 +39,7 @@
"CdWSL",
"CdWR",
"CdGR",
+ "CdGRS",
"CdT",
"alpha2",
"BT",
diff --git a/src/app/calculators/parallelstructure/config.json b/src/app/calculators/parallelstructure/config.json
index 9f3553940..5e9528854 100644
--- a/src/app/calculators/parallelstructure/config.json
+++ b/src/app/calculators/parallelstructure/config.json
@@ -54,6 +54,7 @@
"CdWSL",
"CdWR",
"CdGR",
+ "CdGRS",
"CdCunge",
"CdT",
"CdO",
diff --git a/src/app/formulaire/elements/formulaire-node.ts b/src/app/formulaire/elements/formulaire-node.ts
index dfb19188a..9a2e5e3c4 100644
--- a/src/app/formulaire/elements/formulaire-node.ts
+++ b/src/app/formulaire/elements/formulaire-node.ts
@@ -143,7 +143,7 @@ export abstract class FormulaireNode implements IObservable {
/**
* Set value of all single parameters to undefined, except for the given parameter ids
*/
- public emptyFields(except: string[] = [ "Cd0", "CdWS", "CdGR", "CdCunge", "CdWR", "CdO", "CdT", "CdWSL" ]) {
+ public emptyFields(except: string[] = [ "Cd0", "CdWS", "CdGR", "CdGRS", "CdCunge", "CdWR", "CdO", "CdT", "CdWSL" ]) {
for (const p of this.allFormElements ) {
if (p instanceof NgParameter) {
if (
diff --git a/src/locale/messages.en.json b/src/locale/messages.en.json
index 70bfe0153..74b9989f6 100644
--- a/src/locale/messages.en.json
+++ b/src/locale/messages.en.json
@@ -221,6 +221,7 @@
"INFO_LIB_BETA": "Beta coefficient",
"INFO_LIB_BT": "Half opening of the triangle",
"INFO_LIB_CDGR": "Discharge coefficient gate",
+ "INFO_LIB_CDGRS": "Discharge coefficient gate submerged",
"INFO_LIB_CDCUNGE": "Discharge coefficient",
"INFO_LIB_CDWR": "Discharge coefficient weir",
"INFO_LIB_CDWSL": "Discharge coefficient slot",
diff --git a/src/locale/messages.fr.json b/src/locale/messages.fr.json
index ab01c11e0..18b9ffed9 100644
--- a/src/locale/messages.fr.json
+++ b/src/locale/messages.fr.json
@@ -222,6 +222,7 @@
"INFO_LIB_BT": "Demi-ouverture du triangle",
"INFO_LIB_CD": "Coefficient de débit",
"INFO_LIB_CDGR": "Coefficient de débit vanne",
+ "INFO_LIB_CDGRS": "Coefficient de débit vanne noyée",
"INFO_LIB_CDCUNGE": "Coefficient de débit",
"INFO_LIB_CDWR": "Coefficient de débit seuil",
"INFO_LIB_CDWSL": "Coefficient de débit fente",
--
GitLab