From 769895cae0ff38eb095f3b0f3267ce657c3343d7 Mon Sep 17 00:00:00 2001
From: David Dorchies <david.dorchies@irstea.fr>
Date: Tue, 23 Jul 2019 19:32:45 +0200
Subject: [PATCH] =?UTF-8?q?Corrections=20pour=20#225=20mais=20certaines=20?=
=?UTF-8?q?d=C3=A9pendances=20ne=20marchent=20pas=20pour=20les=20Cd=20de?=
=?UTF-8?q?=20seuils=20et=20vannes=20rectangulaires?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../parallel-structures.config.json | 54 ++++++++++++++-----
src/locale/messages.en.json | 5 ++
src/locale/messages.fr.json | 6 ++-
3 files changed, 51 insertions(+), 14 deletions(-)
diff --git a/src/app/calculators/parallel-structures/parallel-structures.config.json b/src/app/calculators/parallel-structures/parallel-structures.config.json
index d1819d6f3..07272c3a1 100644
--- a/src/app/calculators/parallel-structures/parallel-structures.config.json
+++ b/src/app/calculators/parallel-structures/parallel-structures.config.json
@@ -216,25 +216,49 @@
},
{
"type": "input",
- "id": "Cd",
+ "id": "CdWSL",
"unit": "",
"nodeType": "StructureRectangle",
"dep_exist": [
{
"refid": "select_loidebit1",
"refvalue": "select_loidebit1_fente"
- },
+ }
+ ]
+ },
+ {
+ "type": "input",
+ "id": "CdWR",
+ "unit": "",
+ "nodeType": "StructureRectangle",
+ "dep_exist": [
{
"refid": "select_loidebit1",
"refvalue": "select_loidebit1_seuildenoye"
},
{
"refid": "select_loidebit1",
- "refvalue": "select_loidebit1_cunge80"
+ "refvalue": "select_loidebit1_cem88d"
+ },
+ {
+ "refid": "select_loidebit2",
+ "refvalue": "select_loidebit2_cem88d"
},
{
"refid": "select_loidebit1",
- "refvalue": "select_loidebit1_cem88d"
+ "refvalue": "select_loidebit1_villemonte"
+ }
+ ]
+ },
+ {
+ "type": "input",
+ "id": "CdGR",
+ "unit": "",
+ "nodeType": "StructureRectangle",
+ "dep_exist": [
+ {
+ "refid": "select_loidebit1",
+ "refvalue": "select_loidebit1_cunge80"
},
{
"refid": "select_loidebit1",
@@ -252,21 +276,25 @@
"refid": "select_loidebit2",
"refvalue": "select_loidebit2_cunge80"
},
- {
- "refid": "select_loidebit2",
- "refvalue": "select_loidebit2_cem88d"
- },
{
"refid": "select_loidebit2",
"refvalue": "select_loidebit2_cem88v"
- },
+ }
+ ]
+ },
+ {
+ "type": "input",
+ "id": "CdT",
+ "unit": "",
+ "nodeType": "StructureRectangle",
+ "dep_exist": [
{
- "refid": "select_loidebit3",
- "refvalue": "select_loidebit3_seuiltriang"
+ "refid": "select_ouvrage",
+ "refvalue": "select_ouvrage_seuil_triang"
},
{
- "refid": "select_loidebit3",
- "refvalue": "select_loidebit4_seuiltriangtrunc"
+ "refid": "select_ouvrage",
+ "refvalue": "select_ouvrage_seuil_triangtrunc"
}
]
},
diff --git a/src/locale/messages.en.json b/src/locale/messages.en.json
index 413ad660b..08d9b4a41 100644
--- a/src/locale/messages.en.json
+++ b/src/locale/messages.en.json
@@ -143,6 +143,11 @@
"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_CDWR": "Discharge coefficient weir",
+ "INFO_LIB_CDWSL": "Discharge coefficient slot",
+ "INFO_LIB_CDT": "Discharge coefficient triangular weir",
+ "INFO_LIB_CDO": "Discharge coefficient orifice",
"INFO_LIB_CLOISON": "Cross wall #",
"INFO_LIB_COTE": "Elevation (m)",
"INFO_LIB_COTE_VANNE_LEVANTE": "Lift gate elevation",
diff --git a/src/locale/messages.fr.json b/src/locale/messages.fr.json
index 4c90fe711..233ba439b 100644
--- a/src/locale/messages.fr.json
+++ b/src/locale/messages.fr.json
@@ -142,7 +142,11 @@
"INFO_LIB_BB": "Largeur du bassin",
"INFO_LIB_BETA": "Coefficient béta",
"INFO_LIB_BT": "Demi-ouverture du triangle",
- "INFO_LIB_CD": "Coefficient de débit",
+ "INFO_LIB_CDGR": "Coefficient de débit vanne",
+ "INFO_LIB_CDWR": "Coefficient de débit seuil",
+ "INFO_LIB_CDWSL": "Coefficient de débit fente",
+ "INFO_LIB_CDT": "Coefficient de débit seuil triangulaire",
+ "INFO_LIB_CDO": "Coefficient de débit orifice",
"INFO_LIB_CLOISON": "Cloison n°",
"INFO_LIB_COTE": "Cote (m)",
"INFO_LIB_COTE_VANNE_LEVANTE": "Cote vanne levante",
--
GitLab