diff --git a/src/app/calculators/cloisons/en.json b/src/app/calculators/cloisons/en.json
index 93888b09378d9180d255086724077d0dc286a49d..04c177e8de12de77d697868a1924473b415a023d 100644
--- a/src/app/calculators/cloisons/en.json
+++ b/src/app/calculators/cloisons/en.json
@@ -6,26 +6,6 @@
"PB": "Pool mean depth",
"h1": "Head",
- "select_structure_SeuilTriangulaire": "Triangular weir",
- "select_structure_SeuilTriangulaireTrunc": "Truncated triangular weir",
- "select_structure_Orifice": "Orifice",
- "select_structure_SeuilRectangulaire": "Rectangular weir",
- "select_structure_VanneRectangulaire": "Rectangular gate",
-
- "select_loidebit_GateCunge80": "Cunge (1980)",
-
- "select_loidebit_OrificeSubmerged": "Submerged orifice",
- "select_loidebit_OrificeFree": "Free orifice",
-
- "select_loidebit_WeirSubmergedLarinier": "Submerged slot (Larinier 1992)",
- "select_loidebit_WeirVillemonte": "Villemonte 1947",
- "select_loidebit_WeirCunge80": "Cunge (1980)",
-
- "select_loidebit_TriangularWeirFree": "V-notch sharp-crested weir (Villemonte)",
- "select_loidebit_TriangularWeirBroad": "V-notch broad-crested weir (Bos)",
-
- "select_loidebit_TriangularTruncWeirFree": "Truncated triangular weir (Villemonte)",
-
"UNIT_PV": "W/m³",
"UNIT_Q": "m³/s",
"UNIT_YMOY": "m",
diff --git a/src/app/calculators/dever/en.json b/src/app/calculators/dever/en.json
index c5fb1f2d29fa442f40e17e47664cc8fa22b8ef0e..4e82de4dd58b9d7081698655d69d81f7983df335 100644
--- a/src/app/calculators/dever/en.json
+++ b/src/app/calculators/dever/en.json
@@ -5,14 +5,6 @@
"L": "Width of the weir",
"Cd": "Discharge coefficient",
- "select_structure_SeuilRectangulaire": "Rectangular weir",
- "select_structure_SeuilTriangulaire": "Triangular weir",
- "select_structure_SeuilTriangulaireTrunc": "Truncated triangular weir",
-
- "select_loidebit_WeirFree": "Free flow rectangular weir",
- "select_loidebit_TriangularWeirFree": "Triangular weir (Villemonte)",
- "select_loidebit_TriangularTruncWeirFree": "Truncated triangular weir (Villemonte)",
-
"UNIT_Q": "m³/s",
"UNIT_EC": "m",
"UNIT_V": "m/s"
diff --git a/src/app/calculators/parallelstructure/en.json b/src/app/calculators/parallelstructure/en.json
index 133a40b338aeb610b923fafae6bdaf6b53202298..8d322cbd9c6bb8c4d421135439e37a465671312e 100644
--- a/src/app/calculators/parallelstructure/en.json
+++ b/src/app/calculators/parallelstructure/en.json
@@ -2,34 +2,5 @@
"Q": "Total Flow",
"W": "Gate opening",
- "select_structure_Orifice": "Orifice",
- "select_structure_VanneRectangulaire": "Rectangular gate",
- "select_structure_SeuilRectangulaire": "Rectangular weir",
- "select_structure_SeuilTriangulaire": "Triangular weir",
- "select_structure_SeuilTriangulaireTrunc": "Truncated triangular weir",
-
- "select_loidebit_OrificeSubmerged": "Submerged orifice",
- "select_loidebit_OrificeFree": "Free orifice",
-
- "select_loidebit_GateCem88d": "Weir/Orifice Cemagref 88",
- "select_loidebit_GateCem88v": "Weir/Undershot gate Cemagref 88",
- "select_loidebit_GateCunge80": "Cunge (1980)",
- "select_loidebit_RectangularOrificeFree": "Free flow gate",
- "select_loidebit_RectangularOrificeSubmerged": "Submerged gate",
-
- "select_loidebit_TriangularWeirFree": "V-notch sharp-crested weir (Villemonte)",
- "select_loidebit_TriangularWeirBroad": "V-notch broad-crested weir (Bos)",
-
- "select_loidebit_TriangularTruncWeirFree": "Truncated triangular weir (Villemonte)",
-
- "select_loidebit_WeirCem88d": "Weir/Orifice Cemagref 88",
- "select_loidebit_WeirCem88v": "Weir/Undershot gate Cemagref 88",
- "select_loidebit_WeirSubmergedLarinier": "Submerged slot (Larinier 1992)",
- "select_loidebit_WeirSubmerged": "Submerged weir",
- "select_loidebit_WeirVillemonte": "Villemonte 1957",
- "select_loidebit_WeirFree": "Free flow weir",
- "select_loidebit_KIVI": "Kindsvater-Carter and Villemonte",
- "select_loidebit_WeirCunge80": "Cunge (1980)",
-
"UNIT_Q": "m³/s"
}
diff --git a/src/app/components/pab-table/pab-table.component.ts b/src/app/components/pab-table/pab-table.component.ts
index f2c806d291931c4e878f6dfeeb18e81e76ec6a96..286cf39b140bc0ba1082c9a5331eaf0d4177a204 100644
--- a/src/app/components/pab-table/pab-table.component.ts
+++ b/src/app/components/pab-table/pab-table.component.ts
@@ -763,7 +763,7 @@ export class PabTableComponent implements AfterViewInit, OnInit {
this.updateValidity();
}
- /**
+ /**
* Finds the localized title for a LoiDebit item
*/
private localizeLoiDebit(l: LoiDebit) {
diff --git a/src/app/formulaire/elements/pab-table.ts b/src/app/formulaire/elements/pab-table.ts
index aea39c56e070c4123365d0e40345562572ac0dfd..3601cf19b5ee2e7a4e6569ce6f6b2551e9122ed8 100644
--- a/src/app/formulaire/elements/pab-table.ts
+++ b/src/app/formulaire/elements/pab-table.ts
@@ -12,10 +12,6 @@ import { FormulairePab } from "../definition/form-pab";
*/
export class PabTable extends FormulaireElement {
- constructor(parent: FormulaireNode) {
- super(parent);
- }
-
public parseConfig(json: {}) {
this._confId = json["id"];
}
diff --git a/src/locale/messages.en.json b/src/locale/messages.en.json
index 7fb9569d91eef3e7edd1a49288a21c9ac0daf6b9..45b8d3ba29cc05763a956a034c327a8335c0aff1 100644
--- a/src/locale/messages.en.json
+++ b/src/locale/messages.en.json
@@ -213,7 +213,6 @@
"INFO_LIB_BB": "Pool width",
"INFO_LIB_BETA": "Beta coefficient",
"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",
@@ -244,6 +243,25 @@
"INFO_LIB_J": "Head loss",
"INFO_LIB_L": "Weir width",
"INFO_LIB_LB": "Pool length",
+ "INFO_LIB_LOIDEBIT_KIVI": "Sharp-crested weir (Kindsvater-Carter + Villemonte)",
+ "INFO_LIB_LOIDEBIT_WEIRSUBMERGEDLARINIER": "Submerged slot (Larinier)",
+ "INFO_LIB_LOIDEBIT_ORIFICESUBMERGED": "Submerged orifice (Bernoulli)",
+ "INFO_LIB_LOIDEBIT_ORIFICEFREE": "Free flow orifice (Bernoulli)",
+ "INFO_LIB_LOIDEBIT_TRIANGULARWEIRBROAD": "Broad-crested weir (Bos)",
+ "INFO_LIB_LOIDEBIT_TRIANGULARWEIRFREE": "Sharp-crested weir (Villemonte)",
+ "INFO_LIB_LOIDEBIT_TRIANGULARTRUNCWEIRFREE": "Sharp-crested weir (Villemonte)",
+ "INFO_LIB_LOIDEBIT_GATECEM88D": "Broad-crested weir / Orifice (Cemagref)",
+ "INFO_LIB_LOIDEBIT_GATECEM88V": "Broad-crested weir / sluice gate (Cemagref)",
+ "INFO_LIB_LOIDEBIT_WEIRCEM88D": "Broad-crested weir (Cemagref-D)",
+ "INFO_LIB_LOIDEBIT_WEIRCEM88V": "Broad-crested weir (Cemagref-V)",
+ "INFO_LIB_LOIDEBIT_CUNGE80": "Broad-crested weir / orifice (Cunge)",
+ "INFO_LIB_LOIDEBIT_WEIRCUNGE80": "Broad-crested weir (Cunge)",
+ "INFO_LIB_LOIDEBIT_GATECUNGE80": "Broad-crested weir / orifice (Cunge)",
+ "INFO_LIB_LOIDEBIT_RECTANGULARORIFICEFREE": "Free flow sluice gate",
+ "INFO_LIB_LOIDEBIT_RECTANGULARORIFICESUBMERGED": "Submerged sluice gate",
+ "INFO_LIB_LOIDEBIT_WEIRFREE": "Free flow sharp-crested weir (Poleni)",
+ "INFO_LIB_LOIDEBIT_WEIRSUBMERGED": "Deeply submerged sharp-crested weir (Rajaratnam)",
+ "INFO_LIB_LOIDEBIT_WEIRVILLEMONTE": "Sharp-crested weir (Villemonte)",
"INFO_LIB_Y": "Water line",
"INFO_LIB_MINZDV": "Minimal crest elevation",
"INFO_LIB_MAXZDV": "Maximal crest elevation",
@@ -265,14 +283,13 @@
"INFO_LIB_RADIER_N_COURT": "A",
"INFO_LIB_S": "Orifice area",
"INFO_LIB_SELECT_LOIDEBIT": "Stage-discharge law",
- "INFO_LIB_SELECT_LOIDEBIT1_KIVI": "Kindsvater-Carter and Villemonte",
- "INFO_LIB_SELECT_LOIDEBIT1": "Stage-discharge law",
- "INFO_LIB_SELECT_LOIDEBIT2": "Stage-discharge law",
- "INFO_LIB_SELECT_LOIDEBIT3": "Stage-discharge law",
- "INFO_LIB_SELECT_LOIDEBIT4": "Stage-discharge law",
- "INFO_LIB_SELECT_STRUCTURE_SEUIL_RECT": "Rectangular weir",
"INFO_LIB_SELECT_STRUCTURE": "Device",
"INFO_LIB_STRUCT_CONTAINER": "Devices",
+ "INFO_LIB_STRUCTURE_ORIFICE": "Orifice",
+ "INFO_LIB_STRUCTURE_SEUILRECTANGULAIRE": "Rectangular weir",
+ "INFO_LIB_STRUCTURE_SEUILTRIANGULAIRE": "Triangular weir",
+ "INFO_LIB_STRUCTURE_SEUILTRIANGULAIRETRUNC": "Truncated triangular weir",
+ "INFO_LIB_STRUCTURE_VANNERECTANGULAIRE": "Rectangular gate",
"INFO_LIB_TAU0": "Tractive force",
"INFO_LIB_TOR": "Supercritical water line",
"INFO_LIB_TOTAL": "Total",
@@ -303,26 +320,6 @@
"INFO_LINKED_VALUE_RESULT": "%s (%s)",
"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)",
- "INFO_LOIDEBIT_OrificeSubmerged": "Submerged orifice",
- "INFO_LOIDEBIT_OrificeFree": "Free orifice",
- "INFO_LOIDEBIT_TriangularWeirBroad": "V-notch broad-crested weir (Bos)",
- "INFO_LOIDEBIT_TriangularWeirFree": "V-notch sharp-crested weir (Villemonte)",
- "INFO_LOIDEBIT_TriangularTruncWeirFree": "Truncated triangular weir (Villemonte)",
- "INFO_LOIDEBIT_GateCem88d": "Weir/Orifice Cemagref 88",
- "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 (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)",
- "INFO_LOIDEBIT_VanLevVillemonte": "Regulated notch (Villemonte)",
- "INFO_LOIDEBIT_WeirFree": "Free flow weir",
- "INFO_LOIDEBIT_WeirVillemonte": "Notch (Villemonte)",
"INFO_MACRORUGO_TITRE_COURT": "Rock-ramp",
"INFO_MACRORUGO_TITRE": "Rock-ramp fishpasses",
"INFO_MENU_DIAGRAM_TITLE": "Modules diagram",
@@ -366,6 +363,16 @@
"INFO_PAB_HEADER_PARAMETERS": "Parameters",
"INFO_PAB_HEADER_VALUES": "Values",
"INFO_PAB_CLOISON_OUVRAGE_N": "Wall : device #%s",
+ "INFO_PAB_LOIDEBIT_WEIRSUBMERGEDLARINIER": "Submerged slot (Larinier)",
+ "INFO_PAB_LOIDEBIT_ORIFICESUBMERGED": "Submerged orifice (Bernoulli)",
+ "INFO_PAB_LOIDEBIT_TRIANGULARWEIRBROAD": "V-notch broad-crested weir (Bos)",
+ "INFO_PAB_LOIDEBIT_TRIANGULARWEIRFREE": "V-notch sharp-crested weir (Villemonte)",
+ "INFO_PAB_LOIDEBIT_TRIANGULARTRUNCWEIRFREE": "Truncated triangular weir (Villemonte)",
+ "INFO_PAB_LOIDEBIT_WEIRCUNGE80": "Broad weir / orifice (Cunge)",
+ "INFO_PAB_LOIDEBIT_GATECUNGE80": "Broad weir (Cunge)",
+ "INFO_PAB_LOIDEBIT_VANLEVLARINIER": "Regulated submerged slot (Larinier)",
+ "INFO_PAB_LOIDEBIT_VANLEVVILLEMONTE": "Regulated notch (Villemonte)",
+ "INFO_PAB_LOIDEBIT_WEIRVILLEMONTE": "Notch (Villemonte)",
"INFO_PARAMETRES_FIXES": "All parameters must be fixed",
"INFO_PAB_TITRE_COURT": "Fish ladder",
"INFO_PAB_TITRE": "Fish ladder",
diff --git a/src/locale/messages.fr.json b/src/locale/messages.fr.json
index 4e946f2d584bbf4fb4a342a6df2a225b3a879d81..d4ab0c5fe06a652ebdc264de39979cf7cc9faca8 100644
--- a/src/locale/messages.fr.json
+++ b/src/locale/messages.fr.json
@@ -186,11 +186,11 @@
"INFO_WALL_REMOVED": "Cloison n°%s supprimée",
"INFO_WALLS_AND_DEVICES_REMOVED": "%s cloison(s) et %s ouvrage(s) supprimé(s)",
"INFO_WALLS_REMOVED": "%s cloison(s) supprimée(s)",
- "INFO_LECHAPTCALMON_TITRE_COURT": "Lechapt-C.",
- "INFO_LECHAPTCALMON_TITRE": "Lechapt-Calmon",
"INFO_JET_TITRE_TRAJECTOIRE": "Trajectoire",
"INFO_JET_TITRE_TRAJECTOIRE_ET_COTE_EAU": "Trajectoire et cote de l'eau",
"INFO_JET_FOND": "Fond",
+ "INFO_LECHAPTCALMON_TITRE_COURT": "Lechapt-C.",
+ "INFO_LECHAPTCALMON_TITRE": "Lechapt-Calmon",
"INFO_LIB_ABSCISSE": "Abscisse (m)",
"INFO_LIB_ALTITUDE": "Altitude (m)",
"INFO_LIB_LENGTHS": "Toutes les longueurs",
@@ -245,24 +245,23 @@
"INFO_LIB_LB": "Longueur du bassin",
"INFO_LIB_LOIDEBIT_KIVI": "Seuil mince (Kindsvater-Carter + Villemonte)",
"INFO_LIB_LOIDEBIT_WEIRSUBMERGEDLARINIER": "Fente noyée (Larinier)",
- "INFO_LIB_LOIDEBIT_ORIFICESUBMERGED": "Orifice noyé",
- "INFO_LIB_LOIDEBIT_ORIFICEFREE": "Orifice dénoyé",
+ "INFO_LIB_LOIDEBIT_ORIFICESUBMERGED": "Orifice noyé (Bernoulli)",
+ "INFO_LIB_LOIDEBIT_ORIFICEFREE": "Orifice dénoyé (Bernoulli)",
"INFO_LIB_LOIDEBIT_TRIANGULARWEIRBROAD": "Seuil épais (Bos)",
"INFO_LIB_LOIDEBIT_TRIANGULARWEIRFREE": "Seuil mince (Villemonte)",
"INFO_LIB_LOIDEBIT_TRIANGULARTRUNCWEIRFREE": "Seuil mince (Villemonte)",
"INFO_LIB_LOIDEBIT_GATECEM88D": "Seuil épais / Orifice (Cemagref)",
"INFO_LIB_LOIDEBIT_GATECEM88V": "Seuil épais / Vanne de fond (Cemagref)",
- "INFO_LIB_LOIDEBIT_WEIRCEM88D": "Seuil épais (Cemagref)",
- "INFO_LIB_LOIDEBIT_WEIRCEM88V": "Seuil épais (Cemagref)",
+ "INFO_LIB_LOIDEBIT_WEIRCEM88D": "Seuil épais (Cemagref-D)",
+ "INFO_LIB_LOIDEBIT_WEIRCEM88V": "Seuil épais (Cemagref-V)",
"INFO_LIB_LOIDEBIT_CUNGE80": "Seuil épais / orifice (Cunge)",
"INFO_LIB_LOIDEBIT_WEIRCUNGE80": "Seuil épais (Cunge)",
"INFO_LIB_LOIDEBIT_GATECUNGE80": "Seuil épais / orifice (Cunge)",
"INFO_LIB_LOIDEBIT_RECTANGULARORIFICEFREE": "Vanne de fond dénoyée",
"INFO_LIB_LOIDEBIT_RECTANGULARORIFICESUBMERGED": "Vanne de fond noyée",
- "INFO_LIB_LOIDEBIT_VANLEVLARINIER": "Fente noyée régulée (Larinier)",
- "INFO_LIB_LOIDEBIT_VANLEVVILLEMONTE": "Échancrure régulée (Villemonte)",
- "INFO_LIB_LOIDEBIT_WEIRFREE": "Seuil dénoyé",
- "INFO_LIB_LOIDEBIT_WEIRVILLEMONTE": "Échancrure (Villemonte)",
+ "INFO_LIB_LOIDEBIT_WEIRFREE": "Seuil mince dénoyé (Poleni)",
+ "INFO_LIB_LOIDEBIT_WEIRSUBMERGED": "Seuil mince fortement noyé (Rajaratnam)",
+ "INFO_LIB_LOIDEBIT_WEIRVILLEMONTE": "Seuil mince (Villemonte)",
"INFO_LIB_Y": "Ligne d'eau",
"INFO_LIB_MINZDV": "Cote minimale de la crête",
"INFO_LIB_MAXZDV": "Cote maximale de la crête",
@@ -284,15 +283,9 @@
"INFO_LIB_RADIER_N_COURT": "R",
"INFO_LIB_S": "Surface de l'orifice",
"INFO_LIB_SELECT_LOIDEBIT": "Loi de débit",
- "INFO_LIB_SELECT_LOIDEBIT1_KIVI": "Kindsvater-Carter et Villemonte",
- "INFO_LIB_SELECT_LOIDEBIT1": "Loi de débit",
- "INFO_LIB_SELECT_LOIDEBIT2": "Loi de débit",
- "INFO_LIB_SELECT_LOIDEBIT3": "Loi de débit",
- "INFO_LIB_SELECT_LOIDEBIT4": "Loi de débit",
- "INFO_LIB_SELECT_STRUCTURE_SEUIL_RECT": "Seuil rectangulaire",
"INFO_LIB_SELECT_STRUCTURE": "Ouvrage",
"INFO_LIB_STRUCT_CONTAINER": "Ouvrages",
- "INFO_LIB_STRUCTURE_Orifice": "Orifice",
+ "INFO_LIB_STRUCTURE_ORIFICE": "Orifice",
"INFO_LIB_STRUCTURE_SEUILRECTANGULAIRE": "Seuil rectangulaire",
"INFO_LIB_STRUCTURE_SEUILTRIANGULAIRE": "Seuil triangulaire",
"INFO_LIB_STRUCTURE_SEUILTRIANGULAIRETRUNC": "Seuil triangulaire tronqué",
@@ -370,16 +363,16 @@
"INFO_PAB_HEADER_PARAMETERS": "Paramètres",
"INFO_PAB_HEADER_VALUES": "Valeurs",
"INFO_PAB_CLOISON_OUVRAGE_N": "Cloison : ouvrage n° %s",
- "INFO_PAB_LOIDEBIT_KIVI": "Kindsvater-Carter et Villemonte",
- "INFO_PAB_LOIDEBIT_WeirSubmergedLarinier": "Fente noyée (Larinier)",
- "INFO_PAB_LOIDEBIT_OrificeSubmerged": "Orifice noyé",
- "INFO_PAB_LOIDEBIT_TriangularWeirBroad": "Déversoir triangulaire épais (Bos)",
- "INFO_PAB_LOIDEBIT_TriangularWeirFree": "Déversoir triangulaire mince (Villemonte)",
- "INFO_PAB_LOIDEBIT_TriangularTruncWeirFree": "Déversoir triangulaire tronqué (Villemonte)",
- "INFO_PAB_LOIDEBIT_GateCunge80": "Seuil épais / orifice (Cunge)",
- "INFO_PAB_LOIDEBIT_VanLevLarinier": "Fente noyée régulée (Larinier)",
- "INFO_PAB_LOIDEBIT_VanLevVillemonte": "Échancrure régulée (Villemonte)",
- "INFO_PAB_LOIDEBIT_WeirVillemonte": "Échancrure (Villemonte)",
+ "INFO_PAB_LOIDEBIT_WEIRSUBMERGEDLARINIER": "Fente noyée (Larinier)",
+ "INFO_PAB_LOIDEBIT_ORIFICESUBMERGED": "Orifice noyé",
+ "INFO_PAB_LOIDEBIT_TRIANGULARWEIRBROAD": "Déversoir triangulaire épais (Bos)",
+ "INFO_PAB_LOIDEBIT_TRIANGULARWEIRFREE": "Déversoir triangulaire mince (Villemonte)",
+ "INFO_PAB_LOIDEBIT_TRIANGULARTRUNCWEIRFREE": "Déversoir triangulaire tronqué (Villemonte)",
+ "INFO_PAB_LOIDEBIT_GATECUNGE80": "Seuil épais / orifice (Cunge)",
+ "INFO_PAB_LOIDEBIT_WEIRCUNGE80": "Seuil épais (Cunge)",
+ "INFO_PAB_LOIDEBIT_VANLEVLARINIER": "Fente noyée régulée (Larinier)",
+ "INFO_PAB_LOIDEBIT_VANLEVVILLEMONTE": "Échancrure régulée (Villemonte)",
+ "INFO_PAB_LOIDEBIT_WEIRVILLEMONTE": "Échancrure (Villemonte)",
"INFO_PARAMETRES_FIXES": "Tous les paramètres doivent être fixés",
"INFO_PAB_TITRE_COURT": "PAB",
"INFO_PAB_TITRE": "Passe à bassins",