From 3ce80f33896cd22c8924cf7129fc39b904d4f0cd Mon Sep 17 00:00:00 2001
From: David Dorchies <david.dorchies@irstea.fr>
Date: Fri, 28 Jun 2019 17:24:02 +0200
Subject: [PATCH] Fix #228 Simplification Kivi pour les cloisons et PAB
---
.../calculators/cloisons/cloisons.config.json | 30 ++-----------------
src/app/calculators/cloisons/cloisons.en.json | 2 +-
src/app/calculators/cloisons/cloisons.fr.json | 11 +------
src/app/calculators/pab/pab.fr.json | 11 -------
.../parallel-structures.config.json | 4 +++
.../parallel-structures.en.json | 1 +
.../parallel-structures.fr.json | 2 +-
src/locale/messages.en.json | 8 +++--
src/locale/messages.fr.json | 6 +++-
9 files changed, 22 insertions(+), 53 deletions(-)
diff --git a/src/app/calculators/cloisons/cloisons.config.json b/src/app/calculators/cloisons/cloisons.config.json
index 663a74030..ea679624b 100644
--- a/src/app/calculators/cloisons/cloisons.config.json
+++ b/src/app/calculators/cloisons/cloisons.config.json
@@ -83,8 +83,8 @@
"enum": "LoiDebit.WeirSubmergedLarinier"
},
{
- "id": "select_loidebit1_kivi",
- "enum": "LoiDebit.KIVI"
+ "id": "select_loidebit1_villemonte",
+ "enum": "LoiDebit.WeirVillemonte"
}
],
"dep_exist": [
@@ -192,31 +192,7 @@
}
]
},
- {
- "type": "input",
- "id": "alpha",
- "unit": "",
- "nodeType": "StructureRectangle",
- "dep_exist": [
- {
- "refid": "select_loidebit1",
- "refvalue": "select_loidebit1_kivi"
- }
- ]
- },
- {
- "type": "input",
- "id": "beta",
- "unit": "",
- "nodeType": "StructureRectangle",
- "dep_exist": [
- {
- "refid": "select_loidebit1",
- "refvalue": "select_loidebit1_kivi"
- }
- ]
- },
- {
+ {
"type": "input",
"id": "alpha2",
"unit": "",
diff --git a/src/app/calculators/cloisons/cloisons.en.json b/src/app/calculators/cloisons/cloisons.en.json
index 65b2c7c89..d95c9ebad 100644
--- a/src/app/calculators/cloisons/cloisons.en.json
+++ b/src/app/calculators/cloisons/cloisons.en.json
@@ -7,7 +7,7 @@
"select_ouvrage_seuil_triangtrunc": "Truncated triangular weir",
"select_ouvrage_orifice": "Orifice",
"select_ouvrage_seuil_rect": "Rectangular weir",
- "select_loidebit1_kivi": "Kindsvater-Carter and Villemonte",
+ "select_loidebit1_villemonte": "Villemonte 1947",
"select_loidebit1_fente": "Submerged slot (Larinier 1992)",
"select_loidebit2_orifice": "Submerged orifice",
"select_loidebit3_seuiltriang": "Free flow triangular weir",
diff --git a/src/app/calculators/cloisons/cloisons.fr.json b/src/app/calculators/cloisons/cloisons.fr.json
index cc29c123f..7082d1cc1 100644
--- a/src/app/calculators/cloisons/cloisons.fr.json
+++ b/src/app/calculators/cloisons/cloisons.fr.json
@@ -1,19 +1,10 @@
{
"Q": "Débit total",
- "ZR": "Cote du lit amont",
- "PB": "Profondeur moyenne du bassin",
- "DH": "Chute",
- "h1": "Charge",
- "S": "Surface de l'orifice",
- "ZRAM": "Cote de radier amont de la cloison",
- "alpha2": "Demi-angle au sommet (°)",
- "BT": "Demi-ouverture du triangle (m)",
- "ZT": "Cote haute du triangle (m)",
"select_ouvrage_seuil_triang": "Seuil triangulaire",
"select_ouvrage_seuil_triangtrunc": "Seuil triangulaire tronqué",
"select_ouvrage_orifice": "Orifice",
"select_ouvrage_seuil_rect": "Seuil rectangulaire",
- "select_loidebit1_kivi": "Kindsvater-Carter et Villemonte",
+ "select_loidebit1_villemonte": "Villemonte 1947",
"select_loidebit1_fente": "Fente noyée (Larinier 1992)",
"select_loidebit2_orifice": "Orifice noyé",
"select_loidebit3_seuiltriang": "Déversoir triangulaire dénoyé",
diff --git a/src/app/calculators/pab/pab.fr.json b/src/app/calculators/pab/pab.fr.json
index bd691a552..dd171f91a 100644
--- a/src/app/calculators/pab/pab.fr.json
+++ b/src/app/calculators/pab/pab.fr.json
@@ -1,15 +1,5 @@
{
"fs_param_hydro": "Paramètres hydrauliques",
- "Q": "Débit",
- "Z1": "Cote amont",
- "Z2": "Cote aval",
- "LB": "Longueur du bassin",
- "BB": "Largeur du bassin",
- "PB": "Profondeur moyenne du bassin",
- "W": "Ouverture de vanne",
- "ZRAM": "Cote de radier amont",
- "ZRMB": "Cote de radier mi-bassin",
- "h1": "Charge",
"fs_bassin": "Bassin",
"fs_cloison_aval": "Cloison aval",
"bassin_container": "Bassins",
@@ -24,6 +14,5 @@
"UNIT_YMOY": "m",
"UNIT_Z": "m",
"UNIT_ZRAM": "m",
- "UNIT_ZRB": "m",
"UNIT_ZRMB": "m"
}
\ No newline at end of file
diff --git a/src/app/calculators/parallel-structures/parallel-structures.config.json b/src/app/calculators/parallel-structures/parallel-structures.config.json
index 966819227..2e61bc489 100644
--- a/src/app/calculators/parallel-structures/parallel-structures.config.json
+++ b/src/app/calculators/parallel-structures/parallel-structures.config.json
@@ -74,6 +74,10 @@
"id": "select_loidebit1_cunge80",
"enum": "LoiDebit.Cunge80"
},
+ {
+ "id": "select_loidebit1_villemonte",
+ "enum": "LoiDebit.WeirVillemonte"
+ },
{
"id": "select_loidebit1_kivi",
"enum": "LoiDebit.KIVI"
diff --git a/src/app/calculators/parallel-structures/parallel-structures.en.json b/src/app/calculators/parallel-structures/parallel-structures.en.json
index ad6d5252f..52135d461 100644
--- a/src/app/calculators/parallel-structures/parallel-structures.en.json
+++ b/src/app/calculators/parallel-structures/parallel-structures.en.json
@@ -14,6 +14,7 @@
"select_loidebit1_cem88v": "Weir/Undershot gate Cemagref 88",
"select_loidebit1_fente": "Submerged slot (Larinier 1992)",
"select_loidebit1_kivi": "Kindsvater-Carter and Villemonte",
+ "select_loidebit1_villemonte": "Villemonte 1957",
"select_loidebit2_vannedenoye": "Free flow gate",
"select_loidebit2_vannenoye": "Submerged gate",
"select_loidebit2_cunge80": "Cunge 80",
diff --git a/src/app/calculators/parallel-structures/parallel-structures.fr.json b/src/app/calculators/parallel-structures/parallel-structures.fr.json
index 45e191081..3b9d38763 100644
--- a/src/app/calculators/parallel-structures/parallel-structures.fr.json
+++ b/src/app/calculators/parallel-structures/parallel-structures.fr.json
@@ -7,13 +7,13 @@
"select_ouvrage_seuil_triangtrunc": "Seuil triangulaire tronqué",
"select_ouvrage_seuil_trap": "Seuil trapézoïdal",
"select_ouvrage_vanne_trap": "Vanne trapézoïdale",
- "W": "Ouverture de vanne",
"select_loidebit1_seuildenoye": "Seuil dénoyé",
"select_loidebit1_cunge80": "Cunge 80",
"select_loidebit1_cem88d": "Déversoir/Orifice Cemagref 88",
"select_loidebit1_cem88v": "Déversoir/Vanne de fond Cemagref 88",
"select_loidebit1_fente": "Fente noyée (Larinier 1992)",
"select_loidebit1_kivi": "Kindsvater-Carter et Villemonte",
+ "select_loidebit1_villemonte": "Villemonte 1957",
"select_loidebit2_vannedenoye": "Vanne dénoyé",
"select_loidebit2_vannenoye": "Vanne noyé",
"select_loidebit2_cunge80": "Cunge 80",
diff --git a/src/locale/messages.en.json b/src/locale/messages.en.json
index 95dbe75d2..f88b0bb85 100644
--- a/src/locale/messages.en.json
+++ b/src/locale/messages.en.json
@@ -131,6 +131,7 @@
"INFO_LIB_FS_OUVRAGE": "Device",
"INFO_LIB_FS_PARAM_CALC": "Calculation parameters",
"INFO_LIB_FS_PARAM_HYDRO": "Hydraulic parameters",
+ "INFO_LIB_H1": "Head",
"INFO_LIB_HS": "Specific head",
"INFO_LIB_HSC": "Critical head",
"INFO_LIB_I-J": "Linear variation of specific head",
@@ -138,11 +139,12 @@
"INFO_LIB_J": "Head loss",
"INFO_LIB_L": "Weir width",
"INFO_LIB_LB": "Pool length",
- "INFO_LIB_OUVRAGE_Q_MODE": "Mode",
- "INFO_LIB_OUVRAGE_Q_REGIME": "Regime",
+ "INFO_LIB_OUVRAGE_Q_ENUM_STRUCTUREFLOWMODE": "Mode",
+ "INFO_LIB_OUVRAGE_Q_ENUM_STRUCTUREFLOWREGIME": "Regime",
"INFO_LIB_OUVRAGE_Q": "Discharge",
"INFO_LIB_OUVRAGE_ZDV": "Sill elevation",
"INFO_LIB_P": "Wetted perimeter",
+ "INFO_LIB_PB": "Basin mean depth",
"INFO_LIB_PR": "Display accuracy",
"INFO_LIB_PV": "Volumic dissipated power",
"INFO_LIB_Q_GUIDETECH": "Technical guide flow",
@@ -165,6 +167,7 @@
"INFO_LIB_V": "Average speed",
"INFO_LIB_VDEB": "Conveyance speed",
"INFO_LIB_VMAX": "Maximal speed",
+ "INFO_LIB_W": "Gate opening",
"INFO_LIB_YC": "Critical depth",
"INFO_LIB_YCO": "Conjugate depth",
"INFO_LIB_YF": "Subcritical depth",
@@ -199,6 +202,7 @@
"INFO_LOIDEBIT_RectangularOrificeFree": "Free flow gate",
"INFO_LOIDEBIT_RectangularOrificeSubmerged": "Submerged gate",
"INFO_LOIDEBIT_WeirFree": "Free flow weir",
+ "INFO_LOIDEBIT_WeirVillemonte": "Villemonte 1957",
"INFO_MACRORUGO_TITRE_COURT": "Rock-ramp",
"INFO_MACRORUGO_TITRE": "Rock-ramp fishpasses",
"INFO_MENU_EMPTY_SESSION_TITLE": "New session",
diff --git a/src/locale/messages.fr.json b/src/locale/messages.fr.json
index 3ca525a3b..1e4e1bb5a 100644
--- a/src/locale/messages.fr.json
+++ b/src/locale/messages.fr.json
@@ -131,6 +131,7 @@
"INFO_LIB_FS_OUVRAGE": "Ouvrage",
"INFO_LIB_FS_PARAM_CALC": "Paramètres de calcul",
"INFO_LIB_FS_PARAM_HYDRO": "Paramètres hydrauliques",
+ "INFO_LIB_H1": "Charge",
"INFO_LIB_HS": "Charge spécifique",
"INFO_LIB_HSC": "Charge critique",
"INFO_LIB_I-J": "Variation linéaire de l'énergie spécifique",
@@ -143,6 +144,7 @@
"INFO_LIB_OUVRAGE_Q": "Débit",
"INFO_LIB_OUVRAGE_ZDV": "Cote du seuil",
"INFO_LIB_P": "Périmètre mouillé",
+ "INFO_LIB_PB": "Profondeur moyenne du bassin",
"INFO_LIB_PR": "Précision de calcul",
"INFO_LIB_PV": "Puissance volumique dissipée",
"INFO_LIB_Q_GUIDETECH": "Débit Guide technique",
@@ -165,6 +167,7 @@
"INFO_LIB_V": "Vitesse moyenne",
"INFO_LIB_VDEB": "Vitesse débitante",
"INFO_LIB_VMAX": "Vitesse maximale",
+ "INFO_LIB_W": "Ouverture de vanne",
"INFO_LIB_YC": "Tirant d'eau critique",
"INFO_LIB_YCO": "Tirant d'eau conjugué",
"INFO_LIB_YF": "Tirant d'eau fluvial",
@@ -177,7 +180,7 @@
"INFO_LIB_ZDV": "Cote de la crête du déversoir ou du radier de la vanne",
"INFO_LIB_ZF2": "Cote de fond aval",
"INFO_LIB_ZRAM": "Cote du radier amont",
- "INFO_LIB_ZRMB": "Cote de radier du bassin aval",
+ "INFO_LIB_ZRMB": "Cote de radier mi-bassin",
"INFO_LIB_ZT": "Cote haute du triangle",
"INFO_LINKED_VALUE_DEVICE_RESULT": "%s (%s, ouvrage %s)",
"INFO_LINKED_VALUE_DEVICE": "%s (%s, ouvrage %s)",
@@ -199,6 +202,7 @@
"INFO_LOIDEBIT_RectangularOrificeFree": "Vanne dénoyé",
"INFO_LOIDEBIT_RectangularOrificeSubmerged": "Vanne noyé",
"INFO_LOIDEBIT_WeirFree": "Seuil dénoyé",
+ "INFO_LOIDEBIT_WeirVillemonte": "Villemonte 1957",
"INFO_MACRORUGO_TITRE_COURT": "Macro-rugo.",
"INFO_MACRORUGO_TITRE": "Passe à macro-rugosités",
"INFO_MENU_EMPTY_SESSION_TITLE": "Nouvelle session",
--
GitLab