From f0cfc9f7669f5af8e22ba03b0d1ff99570380a29 Mon Sep 17 00:00:00 2001
From: "francois.grand" <francois.grand@irstea.fr>
Date: Fri, 23 Mar 2018 14:25:39 +0100
Subject: [PATCH] =?UTF-8?q?=20#75=20ajout=20loi=20de=20d=C3=A9bit=20Kindsv?=
=?UTF-8?q?ater-Carter=20&=20Villemonte=20-=20modif=20fichier=20de=20confi?=
=?UTF-8?q?guration=20de=20la=20calculette=20"ouvrages=20parall=C3=A8les"?=
=?UTF-8?q?=20(d=C3=A9pendances=20de=20'Cd'=20remodel=C3=A9es)=20-=20ajout?=
=?UTF-8?q?=20de=20la=20traduction=20des=20messages?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../parallel-structures.config.json | 78 ++++++++++++++++++-
.../parallel-structures.fr.json | 6 +-
.../form-def-parallel-structures.ts | 5 +-
src/locale/error_messages.fr.json | 4 +-
4 files changed, 85 insertions(+), 8 deletions(-)
diff --git a/src/app/calculators/parallel-structures/parallel-structures.config.json b/src/app/calculators/parallel-structures/parallel-structures.config.json
index 165ecec72..ff29ad62e 100644
--- a/src/app/calculators/parallel-structures/parallel-structures.config.json
+++ b/src/app/calculators/parallel-structures/parallel-structures.config.json
@@ -60,6 +60,9 @@
},
{
"id": "select_loidebit1_cunge80"
+ },
+ {
+ "id": "select_loidebit1_kivi"
}
],
"dep_exist": [
@@ -150,12 +153,79 @@
"nodeType": "StructureRectangle",
"dep_exist": [
{
- "refid": "select_ouvrage",
- "refvalue": "select_ouvrage_vanne_rect"
+ "refid": "select_loidebit1",
+ "refvalue": "select_loidebit1_seuildenoye"
},
{
- "refid": "select_ouvrage",
- "refvalue": "select_ouvrage_seuil_rect"
+ "refid": "select_loidebit1",
+ "refvalue": "select_loidebit1_cunge80"
+ },
+ {
+ "refid": "select_loidebit1",
+ "refvalue": "select_loidebit1_cem88d"
+ },
+ {
+ "refid": "select_loidebit1",
+ "refvalue": "select_loidebit1_cem88v"
+ },
+ {
+ "refid": "select_loidebit2",
+ "refvalue": "select_loidebit2_vannedenoye"
+ },
+ {
+ "refid": "select_loidebit2",
+ "refvalue": "select_loidebit2_vannenoye"
+ },
+ {
+ "refid": "select_loidebit2",
+ "refvalue": "select_loidebit2_cunge80"
+ },
+ {
+ "refid": "select_loidebit2",
+ "refvalue": "select_loidebit2_cem88d"
+ },
+ {
+ "refid": "select_loidebit2",
+ "refvalue": "select_loidebit2_cem88v"
+ }
+ ]
+ },
+ {
+ "type": "input",
+ "id": "alpha",
+ "unit": "",
+ "value": 0.4,
+ "nodeType": "StructureKIVI",
+ "dep_exist": [
+ {
+ "refid": "select_loidebit1",
+ "refvalue": "select_loidebit1_kivi"
+ }
+ ]
+ },
+ {
+ "type": "input",
+ "id": "beta",
+ "unit": "",
+ "value": 0.4,
+ "nodeType": "StructureKIVI",
+ "dep_exist": [
+ {
+ "refid": "select_loidebit1",
+ "refvalue": "select_loidebit1_kivi"
+ }
+ ]
+ },
+ {
+ "type": "input",
+ "id": "ZRAM",
+ "unit": "",
+ "value": 0.4,
+ "nodeType": "StructureKIVI",
+ "dep_exist": [
+ {
+ "refid": "select_loidebit1",
+ "refvalue": "select_loidebit1_kivi"
}
]
}
diff --git a/src/app/calculators/parallel-structures/parallel-structures.fr.json b/src/app/calculators/parallel-structures/parallel-structures.fr.json
index 258adb9d2..f683f20df 100644
--- a/src/app/calculators/parallel-structures/parallel-structures.fr.json
+++ b/src/app/calculators/parallel-structures/parallel-structures.fr.json
@@ -16,6 +16,7 @@
"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_kivi": "Kindsvater-Carter et Villemonte",
"select_loidebit2": "Loi de débit",
"select_loidebit2_vannedenoye": "Vanne dénoyé",
"select_loidebit2_vannenoye": "Vanne noyé",
@@ -25,7 +26,10 @@
"ZDV": "Cote de la crête du déversoir ou du radier de la vanne",
"L": "Largeur du déversoir",
"Cd": "Coefficient de débit",
+ "alpha": "Coefficient alpha",
+ "beta": "Coefficient béta",
+ "ZRAM": "Cote du radier amont",
"struct_container": "Ouvrages",
"fs_param_calc": "Paramètres de calcul",
"Pr": "Précision de calcul"
-}
+}
\ No newline at end of file
diff --git a/src/app/formulaire/definition/form-def-parallel-structures.ts b/src/app/formulaire/definition/form-def-parallel-structures.ts
index 75a5aa89c..a9965b2a2 100644
--- a/src/app/formulaire/definition/form-def-parallel-structures.ts
+++ b/src/app/formulaire/definition/form-def-parallel-structures.ts
@@ -25,7 +25,8 @@ export class FormDefParallelStructures {
"cunge80": LoiDebit.Cunge80,
"seuildenoye": LoiDebit.WeirFree,
"vannenoye": LoiDebit.OrificeSubmerged,
- "vannedenoye": LoiDebit.OrificeFree
+ "vannedenoye": LoiDebit.OrificeFree,
+ "kivi": LoiDebit.KIVI
}
/**
@@ -46,7 +47,7 @@ export class FormDefParallelStructures {
}
/**
- * @return type d'ouvrage courant du FieldSet donné
+ * @return loi de débit courante du FieldSet donné
*/
public getLoiDebit(fs: FieldSet): LoiDebit {
if (fs.calculatorType !== CalculatorType.Structure)
diff --git a/src/locale/error_messages.fr.json b/src/locale/error_messages.fr.json
index 6f6bd4a50..d08817f01 100644
--- a/src/locale/error_messages.fr.json
+++ b/src/locale/error_messages.fr.json
@@ -86,5 +86,7 @@
"INFO_OPTION_NO": "Non",
"INFO_PABDIM_TITRE": "Passe à bassin : dimensions",
"INFO_PABPUISS_TITRE": "Passe à bassin : puissance dissipée",
- "INFO_OUVRAGEPARAL_TITRE": "Ouvrages en parallèle"
+ "INFO_OUVRAGEPARAL_TITRE": "Ouvrages en parallèle",
+ "WARNING_STRUCTUREKIVI_PELLE_TROP_FAIBLE": "La pelle du seuil doit mesurer au moins 0,1 m. Le coefficient béta est forcé à 0",
+ "WARNING_STRUCTUREKIVI_HP_TROP_ELEVE": "h/p ne doit pas être supérieur à 2,5. h/p est forcé à 2,5"
}
\ No newline at end of file
--
GitLab