Skip to content
Snippets Groups Projects
Commit 4033ccde authored by Mathias Chouet's avatar Mathias Chouet Committed by mathias.chouet
Browse files

Fix #404 - add Cunge (1980) to Walls, update doc

parent 278e7471
No related branches found
No related tags found
1 merge request!90Resolve "Cunge 1980: ajout dans les cloisons et modification du coef. de débit"
Hide whitespace changes
Inline Side-by-side
Showing
with 36 additions and 21 deletions
docs/en/calculators/structures/liste.md
+ 1
− 1
View file @ 4033ccde
......@@ -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 |
......
docs/fr/calculators/structures/liste.md
+ 3
− 3
View file @ 4033ccde
......@@ -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 |
......
jalhyd_branch
+ 1
− 2
View file @ 4033ccde
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
src/app/calculators/cloisons/config.json
+ 1
− 0
View file @ 4033ccde
......@@ -44,6 +44,7 @@
"CdWSL",
"CdWR",
"CdGR",
"CdCunge",
"CdT",
"S",
"alpha2",
......
src/app/calculators/cloisons/en.json
+ 4
− 0
View file @ 4033ccde
......@@ -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)",
......
src/app/calculators/cloisons/fr.json
+ 4
− 0
View file @ 4033ccde
......@@ -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)",
......
src/app/calculators/parallelstructure/config.json
+ 1
− 0
View file @ 4033ccde
......@@ -52,6 +52,7 @@
"CdWSL",
"CdWR",
"CdGR",
"CdCunge",
"CdT",
"CdO",
"alpha",
......
src/app/calculators/parallelstructure/en.json
+ 2
− 2
View file @ 4033ccde
......@@ -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"
}
src/app/calculators/parallelstructure/fr.json
+ 2
− 2
View file @ 4033ccde
......@@ -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"
}
src/app/formulaire/elements/formulaire-node.ts
+ 1
− 1
View file @ 4033ccde
......@@ -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 (
......
src/locale/messages.en.json
+ 8
− 5
View file @ 4033ccde
......@@ -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",
......
src/locale/messages.fr.json
+ 8
− 5
View file @ 4033ccde
......@@ -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",
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment