diff --git a/src/app/calculators/parallel-structures/parallel-structures.config.json b/src/app/calculators/parallel-structures/parallel-structures.config.json index d1819d6f3be7a5096276a2c7fcfc57b36fc54f28..07272c3a1b2a1f970f89ac76dc3155b04749538c 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 413ad660beb3cda235fee5e540267eb946511fb5..08d9b4a41dbd34e82050dd75f8d39b96872816fb 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 4c90fe711ea9fcddd4a6c2610e8dabda7c9cd781..233ba439bc6a4a3a5cf592d0f38e83d86ef0a807 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",