From 4033ccde98eb369c31cad8e25f4936f79b4a8609 Mon Sep 17 00:00:00 2001
From: Mathias Chouet <mathias.chouet@irstea.fr>
Date: Thu, 14 May 2020 11:48:38 +0200
Subject: [PATCH 1/2] Fix #404 - add Cunge (1980) to Walls, update doc
---
docs/en/calculators/structures/liste.md | 2 +-
docs/fr/calculators/structures/liste.md | 6 +++---
jalhyd_branch | 3 +--
src/app/calculators/cloisons/config.json | 1 +
src/app/calculators/cloisons/en.json | 4 ++++
src/app/calculators/cloisons/fr.json | 4 ++++
src/app/calculators/parallelstructure/config.json | 1 +
src/app/calculators/parallelstructure/en.json | 4 ++--
src/app/calculators/parallelstructure/fr.json | 4 ++--
src/app/formulaire/elements/formulaire-node.ts | 2 +-
src/locale/messages.en.json | 13 ++++++++-----
src/locale/messages.fr.json | 13 ++++++++-----
12 files changed, 36 insertions(+), 21 deletions(-)
diff --git a/docs/en/calculators/structures/liste.md b/docs/en/calculators/structures/liste.md
index 99662c99d..d52496ab7 100644
--- a/docs/en/calculators/structures/liste.md
+++ b/docs/en/calculators/structures/liste.md
@@ -4,7 +4,7 @@
|---------------------------|----------------:|-------------------------------|
| [Weir / orifice Cemagref 88](./cem_88_d.md) | 0.4 | Parallel Structures |
| [Weir / undershot gate Cemagref 88](./cem_88_v.md) | 0.6 | Parallel Structures |
-| [Cunge 80](./cunge_80.md) | 0.6 | Parallel Structures |
+| [Cunge (1980)](./cunge_80.md) | 0.6 | Parallel Structures, Cross walls, Downwall |
| [Free flow gate](./vanne_denoyee.md) | 0.6 | Parallel Structures |
| [Submerged gate](./vanne_noyee.md) | 0.6 | Parallel Structures |
| [Free flow weir](./seuil_denoye.md) | 0.4 | Parallel Structures, Free flow weir stage-discharge laws |
diff --git a/docs/fr/calculators/structures/liste.md b/docs/fr/calculators/structures/liste.md
index 878a45b6f..b818193a9 100644
--- a/docs/fr/calculators/structures/liste.md
+++ b/docs/fr/calculators/structures/liste.md
@@ -2,9 +2,9 @@
| Équation | Coefficient de débit par défaut | Disponible dans |
|---------------------------|----------------:|-------------------------------|
-| [Dévesoir / orifice Cemagref 88](./cem_88_d.md) | 0.4 | Lois d'ouvrages |
-| [Dévesoir / vanne de fond Cemagref 88](./cem_88_v.md) | 0.6 | Lois d'ouvrages |
-| [Cunge 80](./cunge_80.md) | 0.6 | Lois d'ouvrages |
+| [Déversoir / orifice Cemagref 88](./cem_88_d.md) | 0.4 | Lois d'ouvrages |
+| [Déversoir / vanne de fond Cemagref 88](./cem_88_v.md) | 0.6 | Lois d'ouvrages |
+| [Cunge (1980)](./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 |
| [Seuil dénoyé](./seuil_denoye.md) | 0.4 | Lois d'ouvrages, Lois de déversoirs dénoyés |
diff --git a/jalhyd_branch b/jalhyd_branch
index 989a06763..39c03dc43 100644
--- a/jalhyd_branch
+++ b/jalhyd_branch
@@ -1,2 +1 @@
-214-regime-uniforme-conduite-circulaire-provoquer-une-erreur-fatale-si-la-conduite-est-en-charge
-
+220-loi-d-ouvrage-cunge80-mettre-le-coefficient-de-debit-par-defaut-a-1
diff --git a/src/app/calculators/cloisons/config.json b/src/app/calculators/cloisons/config.json
index bb5e3cd4f..e8e19e4a6 100644
--- a/src/app/calculators/cloisons/config.json
+++ b/src/app/calculators/cloisons/config.json
@@ -44,6 +44,7 @@
"CdWSL",
"CdWR",
"CdGR",
+ "CdCunge",
"CdT",
"S",
"alpha2",
diff --git a/src/app/calculators/cloisons/en.json b/src/app/calculators/cloisons/en.json
index 997eae6e8..80f95f219 100644
--- a/src/app/calculators/cloisons/en.json
+++ b/src/app/calculators/cloisons/en.json
@@ -9,12 +9,16 @@
"select_structure_SeuilTriangulaireTrunc": "Truncated triangular weir",
"select_structure_Orifice": "Orifice",
"select_structure_SeuilRectangulaire": "Rectangular weir",
+ "select_structure_VanneRectangulaire": "Rectangular gate",
+
+ "select_loidebit_VanneRectangulaire_GateCunge80": "Cunge (1980)",
"select_loidebit_Orifice_OrificeSubmerged": "Submerged orifice",
"select_loidebit_Orifice_OrificeFree": "Free orifice",
"select_loidebit_SeuilRectangulaire_WeirSubmergedLarinier": "Submerged slot (Larinier 1992)",
"select_loidebit_SeuilRectangulaire_WeirVillemonte": "Villemonte 1947",
+ "select_loidebit_SeuilRectangulaire_WeirCunge80": "Cunge (1980)",
"select_loidebit_SeuilTriangulaire_TriangularWeirFree": "V-notch sharp-crested weir (Villemonte)",
"select_loidebit_SeuilTriangulaire_TriangularWeirBroad": "V-notch broad-crested weir (Bos)",
diff --git a/src/app/calculators/cloisons/fr.json b/src/app/calculators/cloisons/fr.json
index c7a58c66e..fd09e504d 100644
--- a/src/app/calculators/cloisons/fr.json
+++ b/src/app/calculators/cloisons/fr.json
@@ -6,12 +6,16 @@
"select_structure_SeuilTriangulaireTrunc": "Seuil triangulaire tronqué",
"select_structure_Orifice": "Orifice",
"select_structure_SeuilRectangulaire": "Seuil rectangulaire",
+ "select_structure_VanneRectangulaire": "Vanne rectangulaire",
+
+ "select_loidebit_VanneRectangulaire_GateCunge80": "Cunge (1980)",
"select_loidebit_Orifice_OrificeSubmerged": "Orifice noyé",
"select_loidebit_Orifice_OrificeFree": "Orifice dénoyé",
"select_loidebit_SeuilRectangulaire_WeirSubmergedLarinier": "Fente noyée (Larinier 1992)",
"select_loidebit_SeuilRectangulaire_WeirVillemonte": "Villemonte 1947",
+ "select_loidebit_SeuilRectangulaire_WeirCunge80": "Cunge (1980)",
"select_loidebit_SeuilTriangulaire_TriangularWeirFree": "Déversoir triangulaire mince (Villemonte)",
"select_loidebit_SeuilTriangulaire_TriangularWeirBroad": "Déversoir triangulaire épais (Bos)",
diff --git a/src/app/calculators/parallelstructure/config.json b/src/app/calculators/parallelstructure/config.json
index 2f2e9cb83..e6f77606e 100644
--- a/src/app/calculators/parallelstructure/config.json
+++ b/src/app/calculators/parallelstructure/config.json
@@ -52,6 +52,7 @@
"CdWSL",
"CdWR",
"CdGR",
+ "CdCunge",
"CdT",
"CdO",
"alpha",
diff --git a/src/app/calculators/parallelstructure/en.json b/src/app/calculators/parallelstructure/en.json
index 3e2e7fc8e..9b4431705 100644
--- a/src/app/calculators/parallelstructure/en.json
+++ b/src/app/calculators/parallelstructure/en.json
@@ -13,7 +13,7 @@
"select_loidebit_VanneRectangulaire_GateCem88d": "Weir/Orifice Cemagref 88",
"select_loidebit_VanneRectangulaire_GateCem88v": "Weir/Undershot gate Cemagref 88",
- "select_loidebit_VanneRectangulaire_GateCunge80": "Cunge 80",
+ "select_loidebit_VanneRectangulaire_GateCunge80": "Cunge (1980)",
"select_loidebit_VanneRectangulaire_RectangularOrificeFree": "Free flow gate",
"select_loidebit_VanneRectangulaire_RectangularOrificeSubmerged": "Submerged gate",
@@ -29,7 +29,7 @@
"select_loidebit_SeuilRectangulaire_WeirVillemonte": "Villemonte 1957",
"select_loidebit_SeuilRectangulaire_WeirFree": "Free flow weir",
"select_loidebit_SeuilRectangulaire_KIVI": "Kindsvater-Carter and Villemonte",
- "select_loidebit_SeuilRectangulaire_WeirCunge80": "Cunge 80",
+ "select_loidebit_SeuilRectangulaire_WeirCunge80": "Cunge (1980)",
"UNIT_Q": "m³/s"
}
diff --git a/src/app/calculators/parallelstructure/fr.json b/src/app/calculators/parallelstructure/fr.json
index 75c23e0b1..e4cf67bfb 100644
--- a/src/app/calculators/parallelstructure/fr.json
+++ b/src/app/calculators/parallelstructure/fr.json
@@ -13,7 +13,7 @@
"select_loidebit_VanneRectangulaire_GateCem88d": "Déversoir/Orifice Cemagref 88",
"select_loidebit_VanneRectangulaire_GateCem88v": "Déversoir/Vanne de fond Cemagref 88",
- "select_loidebit_VanneRectangulaire_GateCunge80": "Cunge 80",
+ "select_loidebit_VanneRectangulaire_GateCunge80": "Cunge (1980)",
"select_loidebit_VanneRectangulaire_RectangularOrificeFree": "Vanne dénoyée",
"select_loidebit_VanneRectangulaire_RectangularOrificeSubmerged": "Vanne noyée",
@@ -29,7 +29,7 @@
"select_loidebit_SeuilRectangulaire_WeirVillemonte": "Villemonte 1957",
"select_loidebit_SeuilRectangulaire_WeirFree": "Seuil dénoyé",
"select_loidebit_SeuilRectangulaire_KIVI": "Kindsvater-Carter et Villemonte",
- "select_loidebit_SeuilRectangulaire_WeirCunge80": "Cunge 80",
+ "select_loidebit_SeuilRectangulaire_WeirCunge80": "Cunge (1980)",
"UNIT_Q": "m³/s"
}
diff --git a/src/app/formulaire/elements/formulaire-node.ts b/src/app/formulaire/elements/formulaire-node.ts
index cffa97d86..dfb19188a 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", "CdWR", "CdO", "CdT", "CdWSL" ]) {
+ public emptyFields(except: string[] = [ "Cd0", "CdWS", "CdGR", "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 92a3ba1fe..7fb9569d9 100644
--- a/src/locale/messages.en.json
+++ b/src/locale/messages.en.json
@@ -215,6 +215,7 @@
"INFO_LIB_BT": "Half opening of the triangle",
"INFO_LIB_CD": "Discharge coefficient",
"INFO_LIB_CDGR": "Discharge coefficient gate",
+ "INFO_LIB_CDCUNGE": "Discharge coefficient",
"INFO_LIB_CDWR": "Discharge coefficient weir",
"INFO_LIB_CDWSL": "Discharge coefficient slot",
"INFO_LIB_CDWS": "Discharge coefficient",
@@ -303,7 +304,7 @@
"INFO_LINKED_VALUE_SECTION_RESULT": "%s (%s, section)",
"INFO_LINKED_VALUE_SECTION": "%s (%s, section)",
"INFO_LOIDEBIT_KIVI": "Kindsvater-Carter and Villemonte",
- "INFO_LOIDEBIT_WeirSubmergedLarinier": "Submerged slot (Larinier 1992)",
+ "INFO_LOIDEBIT_WeirSubmergedLarinier": "Submerged slot (Larinier)",
"INFO_LOIDEBIT_OrificeSubmerged": "Submerged orifice",
"INFO_LOIDEBIT_OrificeFree": "Free orifice",
"INFO_LOIDEBIT_TriangularWeirBroad": "V-notch broad-crested weir (Bos)",
@@ -313,13 +314,15 @@
"INFO_LOIDEBIT_GateCem88v": "Weir/Undershot gate Cemagref 88",
"INFO_LOIDEBIT_WeirCem88d": "Weir/Orifice Cemagref 88",
"INFO_LOIDEBIT_WeirCem88v": "Weir/Undershot gate Cemagref 88",
- "INFO_LOIDEBIT_Cunge80": "Cunge 80",
+ "INFO_LOIDEBIT_Cunge80": "Cunge (1980)",
+ "INFO_LOIDEBIT_WeirCunge80": "Broad weir / orifice (Cunge)",
+ "INFO_LOIDEBIT_GateCunge80": "Broad weir (Cunge)",
"INFO_LOIDEBIT_RectangularOrificeFree": "Free flow gate",
"INFO_LOIDEBIT_RectangularOrificeSubmerged": "Submerged gate",
- "INFO_LOIDEBIT_VanLevLarinier": "Regulated submerged slot (Larinier 1992)",
- "INFO_LOIDEBIT_VanLevVillemonte": "Regulated notch (Villemonte 1957)",
+ "INFO_LOIDEBIT_VanLevLarinier": "Regulated submerged slot (Larinier)",
+ "INFO_LOIDEBIT_VanLevVillemonte": "Regulated notch (Villemonte)",
"INFO_LOIDEBIT_WeirFree": "Free flow weir",
- "INFO_LOIDEBIT_WeirVillemonte": "Notch (Villemonte 1957)",
+ "INFO_LOIDEBIT_WeirVillemonte": "Notch (Villemonte)",
"INFO_MACRORUGO_TITRE_COURT": "Rock-ramp",
"INFO_MACRORUGO_TITRE": "Rock-ramp fishpasses",
"INFO_MENU_DIAGRAM_TITLE": "Modules diagram",
diff --git a/src/locale/messages.fr.json b/src/locale/messages.fr.json
index 27088491c..a46fe1ad2 100644
--- a/src/locale/messages.fr.json
+++ b/src/locale/messages.fr.json
@@ -214,6 +214,7 @@
"INFO_LIB_BETA": "Coefficient béta",
"INFO_LIB_BT": "Demi-ouverture du triangle",
"INFO_LIB_CDGR": "Coefficient de débit vanne",
+ "INFO_LIB_CDCUNGE": "Coefficient de débit",
"INFO_LIB_CDWR": "Coefficient de débit seuil",
"INFO_LIB_CDWSL": "Coefficient de débit fente",
"INFO_LIB_CDWS": "Coefficient de débit",
@@ -302,7 +303,7 @@
"INFO_LINKED_VALUE_SECTION_RESULT": "%s (%s, section)",
"INFO_LINKED_VALUE_SECTION": "%s (%s, section)",
"INFO_LOIDEBIT_KIVI": "Kindsvater-Carter et Villemonte",
- "INFO_LOIDEBIT_WeirSubmergedLarinier": "Fente noyée (Larinier 1992)",
+ "INFO_LOIDEBIT_WeirSubmergedLarinier": "Fente noyée (Larinier)",
"INFO_LOIDEBIT_OrificeSubmerged": "Orifice noyé",
"INFO_LOIDEBIT_OrificeFree": "Orifice dénoyé",
"INFO_LOIDEBIT_TriangularWeirBroad": "Déversoir triangulaire épais (Bos)",
@@ -312,13 +313,15 @@
"INFO_LOIDEBIT_GateCem88v": "Déversoir/Vanne de fond Cemagref 88",
"INFO_LOIDEBIT_WeirCem88d": "Déversoir/Orifice Cemagref 88",
"INFO_LOIDEBIT_WeirCem88v": "Déversoir/Vanne de fond Cemagref 88",
- "INFO_LOIDEBIT_Cunge80": "Cunge 80",
+ "INFO_LOIDEBIT_Cunge80": "Cunge (1980)",
+ "INFO_LOIDEBIT_WeirCunge80": "Seuil épais / orifice (Cunge)",
+ "INFO_LOIDEBIT_GateCunge80": "Seuil épais (Cunge)",
"INFO_LOIDEBIT_RectangularOrificeFree": "Vanne dénoyé",
"INFO_LOIDEBIT_RectangularOrificeSubmerged": "Vanne noyé",
- "INFO_LOIDEBIT_VanLevLarinier": "Fente noyée régulée (Larinier 1992)",
- "INFO_LOIDEBIT_VanLevVillemonte": "Échancrure régulée (Villemonte 1957)",
+ "INFO_LOIDEBIT_VanLevLarinier": "Fente noyée régulée (Larinier)",
+ "INFO_LOIDEBIT_VanLevVillemonte": "Échancrure régulée (Villemonte)",
"INFO_LOIDEBIT_WeirFree": "Seuil dénoyé",
- "INFO_LOIDEBIT_WeirVillemonte": "Échancrure (Villemonte 1957)",
+ "INFO_LOIDEBIT_WeirVillemonte": "Échancrure (Villemonte)",
"INFO_MACRORUGO_TITRE_COURT": "Macro-rugo.",
"INFO_MACRORUGO_TITRE": "Passe à macro-rugosités",
"INFO_MENU_DIAGRAM_TITLE": "Diagramme des modules",
--
GitLab
From 7060e75e1e8582389a766983cfb81f02f7e9366f Mon Sep 17 00:00:00 2001
From: Mathias Chouet <mathias.chouet@irstea.fr>
Date: Fri, 15 May 2020 09:33:57 +0200
Subject: [PATCH 2/2] Fix #404 (2) - add gate opening in Cloisons interface
---
src/app/calculators/cloisons/config.json | 1 +
src/app/calculators/cloisons/en.json | 1 +
src/app/calculators/cloisons/fr.json | 1 +
3 files changed, 3 insertions(+)
diff --git a/src/app/calculators/cloisons/config.json b/src/app/calculators/cloisons/config.json
index e8e19e4a6..4aeb04671 100644
--- a/src/app/calculators/cloisons/config.json
+++ b/src/app/calculators/cloisons/config.json
@@ -41,6 +41,7 @@
},
"h1",
"L",
+ "W",
"CdWSL",
"CdWR",
"CdGR",
diff --git a/src/app/calculators/cloisons/en.json b/src/app/calculators/cloisons/en.json
index 80f95f219..2a41cd7cf 100644
--- a/src/app/calculators/cloisons/en.json
+++ b/src/app/calculators/cloisons/en.json
@@ -1,6 +1,7 @@
{
"Q": "Total discharge",
"P": "Sill",
+ "W": "Gate opening",
"ZR": "Upstream bed elevation",
"PB": "Pool mean depth",
"h1": "Head",
diff --git a/src/app/calculators/cloisons/fr.json b/src/app/calculators/cloisons/fr.json
index fd09e504d..bf30fb990 100644
--- a/src/app/calculators/cloisons/fr.json
+++ b/src/app/calculators/cloisons/fr.json
@@ -1,6 +1,7 @@
{
"Q": "Débit total",
"P": "Pelle",
+ "W": "Ouverture de vanne",
"select_structure_SeuilTriangulaire": "Seuil triangulaire",
"select_structure_SeuilTriangulaireTrunc": "Seuil triangulaire tronqué",
--
GitLab