Fix #393 - rename Triangular weir flow to (Villemonte)

DEVELOPERS.md

@@ -189,7 +189,7 @@ Différents éléments de la configuration peuvent contenir une clé `help` donn
 
  * pour un champ de saisie numérique : `{... "type": "input", "id": "ID", "help": "aide.html", ...}` (remplace la forme courte `"ID"`)
  * pour n'importe quelle entrée d'un champ de type "select" : `{... "type": "select", "help": "aide.html", ...}`
- * pour des entrées spécifiques d'un champ de type "select" : `{... "type": "select", "help": { "IdDeLOption": "aide.html", ...}, ...}` (se référer au fichier de traduction du module pour la liste des ID des options, par exemple "SeuilTriangulaireTrunc_TriangularTruncWeirFree")
+ * pour des entrées spécifiques d'un champ de type "select" : `{... "type": "select", "help": { "IdDeLOption": "aide.html", ...}, ...}` (se référer au fichier de traduction du module pour la liste des ID des options, par exemple "SeuilTriangulaireTrunc_TriangularTruncWeir")
  * pour un groupe de champs ("fieldset") : `{... "type": "fieldset", "help": "aide.html", ...}`
  * pour tous les groupes de champs d'un groupe de champs répétable ("fieldset_template") : `{... "type": "fieldset_template", "help": "aide.html", ...}`
  * pour l'entête d'un groupe de champs répétables ("template_container") : `{... "type": "template_container", "help": "aide.html", ...}`

src/app/calculators/cloisons/config.json

@@ -34,8 +34,8 @@
                     "Orifice_OrificeSubmerged": "structures/orifice_noye.html",
                     "SeuilRectangulaire_WeirVillemonte": "structures/kivi.html",
                     "SeuilRectangulaire_WeirSubmergedLarinier": "structures/fente_noyee.html",
-                    "SeuilTriangulaire_TriangularWeirFree": "structures/dever_triang.html",
-                    "SeuilTriangulaireTrunc_TriangularTruncWeirFree": "structures/dever_triang_tronque.html"
+                    "SeuilTriangulaire_TriangularWeir": "structures/dever_triang.html",
+                    "SeuilTriangulaireTrunc_TriangularTruncWeir": "structures/dever_triang_tronque.html"
                 }
             },
             "h1",

src/app/calculators/cloisons/en.json

@@ -16,9 +16,9 @@
     "select_loidebit_SeuilRectangulaire_WeirSubmergedLarinier": "Submerged slot (Larinier 1992)",
     "select_loidebit_SeuilRectangulaire_WeirVillemonte": "Villemonte 1947",
 
-    "select_loidebit_SeuilTriangulaire_TriangularWeirFree": "Triangular weir (Villemonte)",
+    "select_loidebit_SeuilTriangulaire_TriangularWeir": "Triangular weir (Villemonte)",
 
-    "select_loidebit_SeuilTriangulaireTrunc_TriangularTruncWeirFree": "Truncated triangular weir (Villemonte)",
+    "select_loidebit_SeuilTriangulaireTrunc_TriangularTruncWeir": "Truncated triangular weir (Villemonte)",
 
 	"UNIT_PV": "W/m³",
 	"UNIT_Q": "m³/s",

src/app/calculators/cloisons/fr.json

@@ -13,9 +13,9 @@
     "select_loidebit_SeuilRectangulaire_WeirSubmergedLarinier": "Fente noyée (Larinier 1992)",
     "select_loidebit_SeuilRectangulaire_WeirVillemonte": "Villemonte 1947",
 
-    "select_loidebit_SeuilTriangulaire_TriangularWeirFree": "Déversoir triangulaire (Villemonte)",
+    "select_loidebit_SeuilTriangulaire_TriangularWeir": "Déversoir triangulaire (Villemonte)",
 
-    "select_loidebit_SeuilTriangulaireTrunc_TriangularTruncWeirFree": "Déversoir triangulaire tronqué (Villemonte)",
+    "select_loidebit_SeuilTriangulaireTrunc_TriangularTruncWeir": "Déversoir triangulaire tronqué (Villemonte)",
 
 	"UNIT_PV": "W/m³",
 	"UNIT_Q": "m³/s",

src/app/calculators/dever/config.json

@@ -30,8 +30,8 @@
                 "source": "device_loi_debit",
                 "help": {
                     "SeuilRectangulaire_WeirFree": "structures/seuil_denoye.html",
-                    "SeuilTriangulaire_TriangularWeirFree": "structures/dever_triang.html",
-                    "SeuilTriangulaireTrunc_TriangularTruncWeirFree": "structures/dever_triang_tronque.html"
+                    "SeuilTriangulaire_TriangularWeir": "structures/dever_triang.html",
+                    "SeuilTriangulaireTrunc_TriangularTruncWeir": "structures/dever_triang_tronque.html"
                 }
             },
             "ZDV",

src/app/calculators/dever/en.json

@@ -10,8 +10,8 @@
     "select_structure_SeuilTriangulaireTrunc": "Truncated triangular weir",
 
     "select_loidebit_SeuilRectangulaire_WeirFree": "Free flow rectangular weir",
-    "select_loidebit_SeuilTriangulaire_TriangularWeirFree": "Free flow triangular weir",
-    "select_loidebit_SeuilTriangulaireTrunc_TriangularTruncWeirFree": "Free flow truncated triangular weir",
+    "select_loidebit_SeuilTriangulaire_TriangularWeir": "Triangular weir (Villemonte)",
+    "select_loidebit_SeuilTriangulaireTrunc_TriangularTruncWeir": "Truncated triangular weir (Villemonte)",
 
 	"UNIT_Q": "m³/s",
     "UNIT_EC": "m",

src/app/calculators/dever/fr.json

@@ -10,8 +10,8 @@
     "select_structure_SeuilTriangulaireTrunc": "Déversoir triangulaire tronqué",
 
     "select_loidebit_SeuilRectangulaire_WeirFree": "Déversoir rectangulaire dénoyé",
-    "select_loidebit_SeuilTriangulaire_TriangularWeirFree": "Déversoir triangulaire dénoyé",
-    "select_loidebit_SeuilTriangulaireTrunc_TriangularTruncWeirFree": "Déversoir triangulaire tronqué dénoyé",
+    "select_loidebit_SeuilTriangulaire_TriangularWeir": "Déversoir triangulaire (Villemonte)",
+    "select_loidebit_SeuilTriangulaireTrunc_TriangularTruncWeir": "Déversoir triangulaire tronqué (Villemonte)",
 
 	"UNIT_Q": "m³/s",
     "UNIT_EC": "m",

src/app/calculators/parallelstructure/config.json

@@ -39,8 +39,8 @@
                     "SeuilRectangulaire_WeirSubmergedLarinier": "structures/fente_noyee.html",
                     "SeuilRectangulaire_WeirSubmerged": "structures/seuil_noye.html",
                     "SeuilRectangulaire_WeirFree": "structures/seuil_denoye.html",
-                    "SeuilTriangulaire_TriangularWeirFree": "structures/dever_triang.html",
-                    "SeuilTriangulaireTrunc_TriangularTruncWeirFree": "structures/dever_triang_tronque.html"
+                    "SeuilTriangulaire_TriangularWeir": "structures/dever_triang.html",
+                    "SeuilTriangulaireTrunc_TriangularTruncWeir": "structures/dever_triang_tronque.html"
                 }
             },
             "S",

src/app/calculators/parallelstructure/en.json

@@ -17,9 +17,9 @@
     "select_loidebit_VanneRectangulaire_RectangularOrificeFree": "Free flow gate",
     "select_loidebit_VanneRectangulaire_RectangularOrificeSubmerged": "Submerged gate",
 
-    "select_loidebit_SeuilTriangulaire_TriangularWeirFree": "Triangular weir (Villemonte)",
+    "select_loidebit_SeuilTriangulaire_TriangularWeir": "Triangular weir (Villemonte)",
 
-    "select_loidebit_SeuilTriangulaireTrunc_TriangularTruncWeirFree": "Truncated triangular weir (Villemonte)",
+    "select_loidebit_SeuilTriangulaireTrunc_TriangularTruncWeir": "Truncated triangular weir (Villemonte)",
 
     "select_loidebit_SeuilRectangulaire_WeirCem88d": "Weir/Orifice Cemagref 88",
     "select_loidebit_SeuilRectangulaire_WeirCem88v": "Weir/Undershot gate Cemagref 88",

src/app/calculators/parallelstructure/fr.json

@@ -17,9 +17,9 @@
     "select_loidebit_VanneRectangulaire_RectangularOrificeFree": "Vanne dénoyée",
     "select_loidebit_VanneRectangulaire_RectangularOrificeSubmerged": "Vanne noyée",
 
-    "select_loidebit_SeuilTriangulaire_TriangularWeirFree": "Déversoir triangulaire (Villemonte)",
+    "select_loidebit_SeuilTriangulaire_TriangularWeir": "Déversoir triangulaire (Villemonte)",
 
-    "select_loidebit_SeuilTriangulaireTrunc_TriangularTruncWeirFree": "Déversoir triangulaire tronqué (Villemonte)",
+    "select_loidebit_SeuilTriangulaireTrunc_TriangularTruncWeir": "Déversoir triangulaire tronqué (Villemonte)",
 
     "select_loidebit_SeuilRectangulaire_WeirCem88d": "Déversoir/Orifice Cemagref 88",
     "select_loidebit_SeuilRectangulaire_WeirCem88v": "Déversoir/Vanne de fond Cemagref 88",

src/app/examples/pab-ech-triang.json

-{"header":{"source":"jalhyd","format_version":"1.3","created":"2020-03-12T11:18:53.067Z"},"settings":{"precision":1e-7,"maxIterations":100,"displayPrecision":3},"documentation":"Cette session correspond au dimensionnement d’une passe à bassins à cloisons déversantes à profil ½ triangulaire.\n\nElle consiste à utiliser les différents outils du module « Passe à bassins » dans l’objectif de déterminer :\n\n * La chute totale (compte tenu des niveaux d’eau amont et aval) et le nombre de chutes entre bassins (compte tenu d’une chute entre bassins fixée) ;\n * Le volume et les dimensions des bassins ;\n * Les dimensions et le calage altitudinal de la 1ère cloison et la cote mi- bassin du 1er bassin ;\n * Le fonctionnement hydraulique de la passe en fonction de différents niveaux d’eau amont et aval.\n\nLes différents paramètres de calculs des modules peuvent être liés entre eux.\n\nLa démarche de conception est itérative entre les différents modules afin d’ajuster les caractéristiques géométriques du dispositif au débit d’alimentation et à la puissance dissipée fixés, compte tenu des critères de conception adaptés aux espèces cibles.\n\nDans le cas d’une échancrure à profil ½ triangulaire, il convient de diviser par 2 le coefficient de débit d’un déversoir triangulaire renseigné par défaut (1.36) pour obtenir le débit de l’échancrure.\n","session":[{"uid":"OWt1bW","props":{"calcType":"PabChute"},"meta":{"title":"PAB : chute"},"children":[],"parameters":[{"symbol":"Z1","mode":"SINGLE","value":9.18},{"symbol":"Z2","mode":"SINGLE","value":7.6},{"symbol":"DH","mode":"CALCUL"}]},{"uid":"eG4zcn","props":{"calcType":"PabNombre"},"meta":{"title":"PAB : nombre"},"children":[],"parameters":[{"symbol":"DHT","mode":"LINK","targetNub":"OWt1bW","targetParam":"DH"},{"symbol":"N","mode":"SINGLE","value":7},{"symbol":"DH","mode":"CALCUL"}]},{"uid":"aWRwdD","props":{"calcType":"PabPuissance"},"meta":{"title":"PAB : puissance"},"children":[],"parameters":[{"symbol":"DH","mode":"LINK","targetNub":"eG4zcn","targetParam":"DH"},{"symbol":"Q","mode":"SINGLE","value":0.7},{"symbol":"V","mode":"CALCUL"},{"symbol":"PV","mode":"SINGLE","value":150}]},{"uid":"OHFiOD","props":{"calcType":"PabDimensions"},"meta":{"title":"PAB : dimensions"},"children":[],"parameters":[{"symbol":"L","mode":"SINGLE","value":6},{"symbol":"W","mode":"SINGLE","value":5},{"symbol":"Y","mode":"CALCUL"},{"symbol":"V","mode":"LINK","targetNub":"aWRwdD","targetParam":"V"}]},{"uid":"cG9mOD","props":{"calcType":"Cloisons"},"meta":{"title":"Cloisons"},"children":[{"uid":"MGJvcj","props":{"calcType":"Structure","structureType":"SeuilRectangulaire","loiDebit":"WeirVillemonte"},"children":[],"parameters":[{"symbol":"h1","mode":"SINGLE","value":0.57},{"symbol":"L","mode":"SINGLE","value":0.5},{"symbol":"CdWR","mode":"SINGLE","value":0.4}]},{"uid":"NmZjYm","props":{"calcType":"Structure","structureType":"SeuilTriangulaireTrunc","loiDebit":"TriangularTruncWeirFree"},"children":[],"parameters":[{"symbol":"h1","mode":"SINGLE","value":0.57},{"symbol":"BT","mode":"SINGLE","value":4.5},{"symbol":"ZT","mode":"SINGLE","value":9.11},{"symbol":"CdT","mode":"SINGLE","value":0.68}]}],"parameters":[{"symbol":"Q","mode":"CALCUL"},{"symbol":"Z1","mode":"LINK","targetNub":"OWt1bW","targetParam":"Z1"},{"symbol":"LB","mode":"LINK","targetNub":"OHFiOD","targetParam":"L"},{"symbol":"BB","mode":"LINK","targetNub":"OHFiOD","targetParam":"W"},{"symbol":"PB","mode":"SINGLE","value":0.94},{"symbol":"DH","mode":"LINK","targetNub":"eG4zcn","targetParam":"DH"}]},{"uid":"OGR4ZG","props":{"calcType":"Pab"},"meta":{"title":"PAB"},"children":[{"uid":"aGxpNX","props":{"calcType":"Cloisons"},"children":[{"uid":"dW9rZG","props":{"calcType":"Structure","structureType":"SeuilRectangulaire","loiDebit":"WeirVillemonte"},"children":[],"parameters":[{"symbol":"ZDV","mode":"SINGLE","value":8.881},{"symbol":"L","mode":"SINGLE","value":0.5},{"symbol":"CdWR","mode":"SINGLE","value":0.4}]},{"uid":"MGVqNG","props":{"calcType":"Structure","structureType":"SeuilTriangulaireTrunc","loiDebit":"TriangularTruncWeirFree"},"children":[],"parameters":[{"symbol":"ZDV","mode":"SINGLE","value":8.61},{"symbol":"BT","mode":"SINGLE","value":4.5},{"symbol":"ZT","mode":"SINGLE","value":9.11},{"symbol":"CdT","mode":"SINGLE","value":0.68}]}],"parameters":[{"symbol":"LB","mode":"SINGLE","value":6},{"symbol":"BB","mode":"SINGLE","value":5},{"symbol":"ZRMB","mode":"SINGLE","value":8.014},{"symbol":"ZRAM","mode":"SINGLE","value":8.127},{"symbol":"QA","mode":"SINGLE","value":0}]},{"uid":"cG42bn","props":{"calcType":"Cloisons"},"children":[{"uid":"MDV5aD","props":{"calcType":"Structure","structureType":"SeuilRectangulaire","loiDebit":"WeirVillemonte"},"children":[],"parameters":[{"symbol":"ZDV","mode":"SINGLE","value":8.656},{"symbol":"L","mode":"SINGLE","value":0.5},{"symbol":"CdWR","mode":"SINGLE","value":0.4}]},{"uid":"ZWtkNj","props":{"calcType":"Structure","structureType":"SeuilTriangulaireTrunc","loiDebit":"TriangularTruncWeirFree"},"children":[],"parameters":[{"symbol":"ZDV","mode":"SINGLE","value":8.384},{"symbol":"BT","mode":"SINGLE","value":4.5},{"symbol":"ZT","mode":"SINGLE","value":8.884},{"symbol":"CdT","mode":"SINGLE","value":0.68}]}],"parameters":[{"symbol":"LB","mode":"SINGLE","value":6},{"symbol":"BB","mode":"SINGLE","value":5},{"symbol":"ZRMB","mode":"SINGLE","value":7.789},{"symbol":"ZRAM","mode":"SINGLE","value":7.901},{"symbol":"QA","mode":"SINGLE","value":0}]},{"uid":"emd0bj","props":{"calcType":"Cloisons"},"children":[{"uid":"aXRvaW","props":{"calcType":"Structure","structureType":"SeuilRectangulaire","loiDebit":"WeirVillemonte"},"children":[],"parameters":[{"symbol":"ZDV","mode":"SINGLE","value":8.43},{"symbol":"L","mode":"SINGLE","value":0.5},{"symbol":"CdWR","mode":"SINGLE","value":0.4}]},{"uid":"cDB5eG","props":{"calcType":"Structure","structureType":"SeuilTriangulaireTrunc","loiDebit":"TriangularTruncWeirFree"},"children":[],"parameters":[{"symbol":"ZDV","mode":"SINGLE","value":8.159},{"symbol":"BT","mode":"SINGLE","value":4.5},{"symbol":"ZT","mode":"SINGLE","value":8.659},{"symbol":"CdT","mode":"SINGLE","value":0.68}]}],"parameters":[{"symbol":"LB","mode":"SINGLE","value":6},{"symbol":"BB","mode":"SINGLE","value":5},{"symbol":"ZRMB","mode":"SINGLE","value":7.563},{"symbol":"ZRAM","mode":"SINGLE","value":7.676},{"symbol":"QA","mode":"SINGLE","value":0}]},{"uid":"bGRtbW","props":{"calcType":"Cloisons"},"children":[{"uid":"cXdsbH","props":{"calcType":"Structure","structureType":"SeuilRectangulaire","loiDebit":"WeirVillemonte"},"children":[],"parameters":[{"symbol":"ZDV","mode":"SINGLE","value":8.204},{"symbol":"L","mode":"SINGLE","value":0.5},{"symbol":"CdWR","mode":"SINGLE","value":0.4}]},{"uid":"MTVrMm","props":{"calcType":"Structure","structureType":"SeuilTriangulaireTrunc","loiDebit":"TriangularTruncWeirFree"},"children":[],"parameters":[{"symbol":"ZDV","mode":"SINGLE","value":7.933},{"symbol":"BT","mode":"SINGLE","value":4.5},{"symbol":"ZT","mode":"SINGLE","value":8.433},{"symbol":"CdT","mode":"SINGLE","value":0.68}]}],"parameters":[{"symbol":"LB","mode":"SINGLE","value":6},{"symbol":"BB","mode":"SINGLE","value":5},{"symbol":"ZRMB","mode":"SINGLE","value":7.337},{"symbol":"ZRAM","mode":"SINGLE","value":7.45},{"symbol":"QA","mode":"SINGLE","value":0}]},{"uid":"M3RoeG","props":{"calcType":"Cloisons"},"children":[{"uid":"Yml4MD","props":{"calcType":"Structure","structureType":"SeuilRectangulaire","loiDebit":"WeirVillemonte"},"children":[],"parameters":[{"symbol":"ZDV","mode":"SINGLE","value":7.978},{"symbol":"L","mode":"SINGLE","value":0.5},{"symbol":"CdWR","mode":"SINGLE","value":0.4}]},{"uid":"bmFhbj","props":{"calcType":"Structure","structureType":"SeuilTriangulaireTrunc","loiDebit":"TriangularTruncWeirFree"},"children":[],"parameters":[{"symbol":"ZDV","mode":"SINGLE","value":7.707},{"symbol":"BT","mode":"SINGLE","value":4.5},{"symbol":"ZT","mode":"SINGLE","value":8.207},{"symbol":"CdT","mode":"SINGLE","value":0.68}]}],"parameters":[{"symbol":"LB","mode":"SINGLE","value":6},{"symbol":"BB","mode":"SINGLE","value":5},{"symbol":"ZRMB","mode":"SINGLE","value":7.111},{"symbol":"ZRAM","mode":"SINGLE","value":7.224},{"symbol":"QA","mode":"SINGLE","value":0}]},{"uid":"MTk5NG","props":{"calcType":"Cloisons"},"children":[{"uid":"NTc3NX","props":{"calcType":"Structure","structureType":"SeuilRectangulaire","loiDebit":"WeirVillemonte"},"children":[],"parameters":[{"symbol":"ZDV","mode":"SINGLE","value":7.753},{"symbol":"L","mode":"SINGLE","value":0.5},{"symbol":"CdWR","mode":"SINGLE","value":0.4}]},{"uid":"N2doZj","props":{"calcType":"Structure","structureType":"SeuilTriangulaireTrunc","loiDebit":"TriangularTruncWeirFree"},"children":[],"parameters":[{"symbol":"ZDV","mode":"SINGLE","value":7.481},{"symbol":"BT","mode":"SINGLE","value":4.5},{"symbol":"ZT","mode":"SINGLE","value":7.981},{"symbol":"CdT","mode":"SINGLE","value":0.68}]}],"parameters":[{"symbol":"LB","mode":"SINGLE","value":6},{"symbol":"BB","mode":"SINGLE","value":5},{"symbol":"ZRMB","mode":"SINGLE","value":6.886},{"symbol":"ZRAM","mode":"SINGLE","value":6.999},{"symbol":"QA","mode":"SINGLE","value":0}]}],"parameters":[{"symbol":"Q","mode":"CALCUL","value":1.612},{"symbol":"Z1","mode":"LISTE","values":[9,9.04,9.1,9.18,9.3],"extensionStrategy":0},{"symbol":"Z2","mode":"SINGLE","value":7.6}],"downWall":{"uid":"NjcxOW","props":{"calcType":"CloisonAval"},"children":[{"uid":"NnVua3","props":{"calcType":"Structure","structureType":"SeuilRectangulaire","loiDebit":"WeirVillemonte"},"children":[],"parameters":[{"symbol":"ZDV","mode":"SINGLE","value":7.527},{"symbol":"L","mode":"SINGLE","value":0.5},{"symbol":"CdWR","mode":"SINGLE","value":0.4}]},{"uid":"MnFwZj","props":{"calcType":"Structure","structureType":"SeuilTriangulaireTrunc","loiDebit":"TriangularTruncWeirFree"},"children":[],"parameters":[{"symbol":"ZDV","mode":"SINGLE","value":7.256},{"symbol":"BT","mode":"SINGLE","value":4.5},{"symbol":"ZT","mode":"SINGLE","value":7.756},{"symbol":"CdT","mode":"SINGLE","value":0.68}]}],"parameters":[{"symbol":"ZRAM","mode":"SINGLE","value":6.773}]}}]}
\ No newline at end of file
+{"header":{"source":"jalhyd","format_version":"1.3","created":"2020-03-12T11:18:53.067Z"},"settings":{"precision":1e-7,"maxIterations":100,"displayPrecision":3},"documentation":"Cette session correspond au dimensionnement d’une passe à bassins à cloisons déversantes à profil ½ triangulaire.\n\nElle consiste à utiliser les différents outils du module « Passe à bassins » dans l’objectif de déterminer :\n\n * La chute totale (compte tenu des niveaux d’eau amont et aval) et le nombre de chutes entre bassins (compte tenu d’une chute entre bassins fixée) ;\n * Le volume et les dimensions des bassins ;\n * Les dimensions et le calage altitudinal de la 1ère cloison et la cote mi- bassin du 1er bassin ;\n * Le fonctionnement hydraulique de la passe en fonction de différents niveaux d’eau amont et aval.\n\nLes différents paramètres de calculs des modules peuvent être liés entre eux.\n\nLa démarche de conception est itérative entre les différents modules afin d’ajuster les caractéristiques géométriques du dispositif au débit d’alimentation et à la puissance dissipée fixés, compte tenu des critères de conception adaptés aux espèces cibles.\n\nDans le cas d’une échancrure à profil ½ triangulaire, il convient de diviser par 2 le coefficient de débit d’un déversoir triangulaire renseigné par défaut (1.36) pour obtenir le débit de l’échancrure.\n","session":[{"uid":"OWt1bW","props":{"calcType":"PabChute"},"meta":{"title":"PAB : chute"},"children":[],"parameters":[{"symbol":"Z1","mode":"SINGLE","value":9.18},{"symbol":"Z2","mode":"SINGLE","value":7.6},{"symbol":"DH","mode":"CALCUL"}]},{"uid":"eG4zcn","props":{"calcType":"PabNombre"},"meta":{"title":"PAB : nombre"},"children":[],"parameters":[{"symbol":"DHT","mode":"LINK","targetNub":"OWt1bW","targetParam":"DH"},{"symbol":"N","mode":"SINGLE","value":7},{"symbol":"DH","mode":"CALCUL"}]},{"uid":"aWRwdD","props":{"calcType":"PabPuissance"},"meta":{"title":"PAB : puissance"},"children":[],"parameters":[{"symbol":"DH","mode":"LINK","targetNub":"eG4zcn","targetParam":"DH"},{"symbol":"Q","mode":"SINGLE","value":0.7},{"symbol":"V","mode":"CALCUL"},{"symbol":"PV","mode":"SINGLE","value":150}]},{"uid":"OHFiOD","props":{"calcType":"PabDimensions"},"meta":{"title":"PAB : dimensions"},"children":[],"parameters":[{"symbol":"L","mode":"SINGLE","value":6},{"symbol":"W","mode":"SINGLE","value":5},{"symbol":"Y","mode":"CALCUL"},{"symbol":"V","mode":"LINK","targetNub":"aWRwdD","targetParam":"V"}]},{"uid":"cG9mOD","props":{"calcType":"Cloisons"},"meta":{"title":"Cloisons"},"children":[{"uid":"MGJvcj","props":{"calcType":"Structure","structureType":"SeuilRectangulaire","loiDebit":"WeirVillemonte"},"children":[],"parameters":[{"symbol":"h1","mode":"SINGLE","value":0.57},{"symbol":"L","mode":"SINGLE","value":0.5},{"symbol":"CdWR","mode":"SINGLE","value":0.4}]},{"uid":"NmZjYm","props":{"calcType":"Structure","structureType":"SeuilTriangulaireTrunc","loiDebit":"TriangularTruncWeir"},"children":[],"parameters":[{"symbol":"h1","mode":"SINGLE","value":0.57},{"symbol":"BT","mode":"SINGLE","value":4.5},{"symbol":"ZT","mode":"SINGLE","value":9.11},{"symbol":"CdT","mode":"SINGLE","value":0.68}]}],"parameters":[{"symbol":"Q","mode":"CALCUL"},{"symbol":"Z1","mode":"LINK","targetNub":"OWt1bW","targetParam":"Z1"},{"symbol":"LB","mode":"LINK","targetNub":"OHFiOD","targetParam":"L"},{"symbol":"BB","mode":"LINK","targetNub":"OHFiOD","targetParam":"W"},{"symbol":"PB","mode":"SINGLE","value":0.94},{"symbol":"DH","mode":"LINK","targetNub":"eG4zcn","targetParam":"DH"}]},{"uid":"OGR4ZG","props":{"calcType":"Pab"},"meta":{"title":"PAB"},"children":[{"uid":"aGxpNX","props":{"calcType":"Cloisons"},"children":[{"uid":"dW9rZG","props":{"calcType":"Structure","structureType":"SeuilRectangulaire","loiDebit":"WeirVillemonte"},"children":[],"parameters":[{"symbol":"ZDV","mode":"SINGLE","value":8.881},{"symbol":"L","mode":"SINGLE","value":0.5},{"symbol":"CdWR","mode":"SINGLE","value":0.4}]},{"uid":"MGVqNG","props":{"calcType":"Structure","structureType":"SeuilTriangulaireTrunc","loiDebit":"TriangularTruncWeir"},"children":[],"parameters":[{"symbol":"ZDV","mode":"SINGLE","value":8.61},{"symbol":"BT","mode":"SINGLE","value":4.5},{"symbol":"ZT","mode":"SINGLE","value":9.11},{"symbol":"CdT","mode":"SINGLE","value":0.68}]}],"parameters":[{"symbol":"LB","mode":"SINGLE","value":6},{"symbol":"BB","mode":"SINGLE","value":5},{"symbol":"ZRMB","mode":"SINGLE","value":8.014},{"symbol":"ZRAM","mode":"SINGLE","value":8.127},{"symbol":"QA","mode":"SINGLE","value":0}]},{"uid":"cG42bn","props":{"calcType":"Cloisons"},"children":[{"uid":"MDV5aD","props":{"calcType":"Structure","structureType":"SeuilRectangulaire","loiDebit":"WeirVillemonte"},"children":[],"parameters":[{"symbol":"ZDV","mode":"SINGLE","value":8.656},{"symbol":"L","mode":"SINGLE","value":0.5},{"symbol":"CdWR","mode":"SINGLE","value":0.4}]},{"uid":"ZWtkNj","props":{"calcType":"Structure","structureType":"SeuilTriangulaireTrunc","loiDebit":"TriangularTruncWeir"},"children":[],"parameters":[{"symbol":"ZDV","mode":"SINGLE","value":8.384},{"symbol":"BT","mode":"SINGLE","value":4.5},{"symbol":"ZT","mode":"SINGLE","value":8.884},{"symbol":"CdT","mode":"SINGLE","value":0.68}]}],"parameters":[{"symbol":"LB","mode":"SINGLE","value":6},{"symbol":"BB","mode":"SINGLE","value":5},{"symbol":"ZRMB","mode":"SINGLE","value":7.789},{"symbol":"ZRAM","mode":"SINGLE","value":7.901},{"symbol":"QA","mode":"SINGLE","value":0}]},{"uid":"emd0bj","props":{"calcType":"Cloisons"},"children":[{"uid":"aXRvaW","props":{"calcType":"Structure","structureType":"SeuilRectangulaire","loiDebit":"WeirVillemonte"},"children":[],"parameters":[{"symbol":"ZDV","mode":"SINGLE","value":8.43},{"symbol":"L","mode":"SINGLE","value":0.5},{"symbol":"CdWR","mode":"SINGLE","value":0.4}]},{"uid":"cDB5eG","props":{"calcType":"Structure","structureType":"SeuilTriangulaireTrunc","loiDebit":"TriangularTruncWeir"},"children":[],"parameters":[{"symbol":"ZDV","mode":"SINGLE","value":8.159},{"symbol":"BT","mode":"SINGLE","value":4.5},{"symbol":"ZT","mode":"SINGLE","value":8.659},{"symbol":"CdT","mode":"SINGLE","value":0.68}]}],"parameters":[{"symbol":"LB","mode":"SINGLE","value":6},{"symbol":"BB","mode":"SINGLE","value":5},{"symbol":"ZRMB","mode":"SINGLE","value":7.563},{"symbol":"ZRAM","mode":"SINGLE","value":7.676},{"symbol":"QA","mode":"SINGLE","value":0}]},{"uid":"bGRtbW","props":{"calcType":"Cloisons"},"children":[{"uid":"cXdsbH","props":{"calcType":"Structure","structureType":"SeuilRectangulaire","loiDebit":"WeirVillemonte"},"children":[],"parameters":[{"symbol":"ZDV","mode":"SINGLE","value":8.204},{"symbol":"L","mode":"SINGLE","value":0.5},{"symbol":"CdWR","mode":"SINGLE","value":0.4}]},{"uid":"MTVrMm","props":{"calcType":"Structure","structureType":"SeuilTriangulaireTrunc","loiDebit":"TriangularTruncWeir"},"children":[],"parameters":[{"symbol":"ZDV","mode":"SINGLE","value":7.933},{"symbol":"BT","mode":"SINGLE","value":4.5},{"symbol":"ZT","mode":"SINGLE","value":8.433},{"symbol":"CdT","mode":"SINGLE","value":0.68}]}],"parameters":[{"symbol":"LB","mode":"SINGLE","value":6},{"symbol":"BB","mode":"SINGLE","value":5},{"symbol":"ZRMB","mode":"SINGLE","value":7.337},{"symbol":"ZRAM","mode":"SINGLE","value":7.45},{"symbol":"QA","mode":"SINGLE","value":0}]},{"uid":"M3RoeG","props":{"calcType":"Cloisons"},"children":[{"uid":"Yml4MD","props":{"calcType":"Structure","structureType":"SeuilRectangulaire","loiDebit":"WeirVillemonte"},"children":[],"parameters":[{"symbol":"ZDV","mode":"SINGLE","value":7.978},{"symbol":"L","mode":"SINGLE","value":0.5},{"symbol":"CdWR","mode":"SINGLE","value":0.4}]},{"uid":"bmFhbj","props":{"calcType":"Structure","structureType":"SeuilTriangulaireTrunc","loiDebit":"TriangularTruncWeir"},"children":[],"parameters":[{"symbol":"ZDV","mode":"SINGLE","value":7.707},{"symbol":"BT","mode":"SINGLE","value":4.5},{"symbol":"ZT","mode":"SINGLE","value":8.207},{"symbol":"CdT","mode":"SINGLE","value":0.68}]}],"parameters":[{"symbol":"LB","mode":"SINGLE","value":6},{"symbol":"BB","mode":"SINGLE","value":5},{"symbol":"ZRMB","mode":"SINGLE","value":7.111},{"symbol":"ZRAM","mode":"SINGLE","value":7.224},{"symbol":"QA","mode":"SINGLE","value":0}]},{"uid":"MTk5NG","props":{"calcType":"Cloisons"},"children":[{"uid":"NTc3NX","props":{"calcType":"Structure","structureType":"SeuilRectangulaire","loiDebit":"WeirVillemonte"},"children":[],"parameters":[{"symbol":"ZDV","mode":"SINGLE","value":7.753},{"symbol":"L","mode":"SINGLE","value":0.5},{"symbol":"CdWR","mode":"SINGLE","value":0.4}]},{"uid":"N2doZj","props":{"calcType":"Structure","structureType":"SeuilTriangulaireTrunc","loiDebit":"TriangularTruncWeir"},"children":[],"parameters":[{"symbol":"ZDV","mode":"SINGLE","value":7.481},{"symbol":"BT","mode":"SINGLE","value":4.5},{"symbol":"ZT","mode":"SINGLE","value":7.981},{"symbol":"CdT","mode":"SINGLE","value":0.68}]}],"parameters":[{"symbol":"LB","mode":"SINGLE","value":6},{"symbol":"BB","mode":"SINGLE","value":5},{"symbol":"ZRMB","mode":"SINGLE","value":6.886},{"symbol":"ZRAM","mode":"SINGLE","value":6.999},{"symbol":"QA","mode":"SINGLE","value":0}]}],"parameters":[{"symbol":"Q","mode":"CALCUL","value":1.612},{"symbol":"Z1","mode":"LISTE","values":[9,9.04,9.1,9.18,9.3],"extensionStrategy":0},{"symbol":"Z2","mode":"SINGLE","value":7.6}],"downWall":{"uid":"NjcxOW","props":{"calcType":"CloisonAval"},"children":[{"uid":"NnVua3","props":{"calcType":"Structure","structureType":"SeuilRectangulaire","loiDebit":"WeirVillemonte"},"children":[],"parameters":[{"symbol":"ZDV","mode":"SINGLE","value":7.527},{"symbol":"L","mode":"SINGLE","value":0.5},{"symbol":"CdWR","mode":"SINGLE","value":0.4}]},{"uid":"MnFwZj","props":{"calcType":"Structure","structureType":"SeuilTriangulaireTrunc","loiDebit":"TriangularTruncWeir"},"children":[],"parameters":[{"symbol":"ZDV","mode":"SINGLE","value":7.256},{"symbol":"BT","mode":"SINGLE","value":4.5},{"symbol":"ZT","mode":"SINGLE","value":7.756},{"symbol":"CdT","mode":"SINGLE","value":0.68}]}],"parameters":[{"symbol":"ZRAM","mode":"SINGLE","value":6.773}]}}]}
\ No newline at end of file

src/locale/messages.en.json

@@ -305,8 +305,8 @@
     "INFO_LOIDEBIT_WeirSubmergedLarinier": "Submerged slot (Larinier 1992)",
     "INFO_LOIDEBIT_OrificeSubmerged": "Submerged orifice",
     "INFO_LOIDEBIT_OrificeFree": "Free orifice",
-    "INFO_LOIDEBIT_TriangularWeirFree": "Free flow triangular weir",
-    "INFO_LOIDEBIT_TriangularTruncWeirFree": "Free flow truncated triangular weir",
+    "INFO_LOIDEBIT_TriangularWeir": "Triangular weir (Villemonte)",
+    "INFO_LOIDEBIT_TriangularTruncWeir": "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",

src/locale/messages.fr.json

@@ -304,8 +304,8 @@
     "INFO_LOIDEBIT_WeirSubmergedLarinier": "Fente noyée (Larinier 1992)",
     "INFO_LOIDEBIT_OrificeSubmerged": "Orifice noyé",
     "INFO_LOIDEBIT_OrificeFree": "Orifice dénoyé",
-    "INFO_LOIDEBIT_TriangularWeirFree": "Déversoir triangulaire dénoyé",
-    "INFO_LOIDEBIT_TriangularTruncWeirFree": "Déversoir triangulaire tronqué dénoyé",
+    "INFO_LOIDEBIT_TriangularWeir": "Déversoir triangulaire (Villemonte)",
+    "INFO_LOIDEBIT_TriangularTruncWeir": "Déversoir triangulaire tronqué (Villemonte)",
     "INFO_LOIDEBIT_GateCem88d": "Déversoir/Orifice Cemagref 88",
     "INFO_LOIDEBIT_GateCem88v": "Déversoir/Vanne de fond Cemagref 88",
     "INFO_LOIDEBIT_WeirCem88d": "Déversoir/Orifice Cemagref 88",