diff --git a/jalhyd_branch b/jalhyd_branch index cbfd46d6cda5e297ae169dbe1955014070a98636..d0b9a50d4d8e0d44bd133d969ef995101f8ee174 100644 --- a/jalhyd_branch +++ b/jalhyd_branch @@ -1 +1 @@ -52-dever-calcul-du-debit-corrige-en-utilisant-la-charge-dans-les-formules +172-lechapt-et-calmon-ajouter-les-pertes-de-charges-singulieres diff --git a/src/app/calculators/lechapt-calmon/lechapt-calmon.config.json b/src/app/calculators/lechapt-calmon/lechapt-calmon.config.json index 34d15a7056d071f5c39b96d6ee4419e170bffde7..87cf30bd5b204cb5bf2515ac0f3313f756593f53 100644 --- a/src/app/calculators/lechapt-calmon/lechapt-calmon.config.json +++ b/src/app/calculators/lechapt-calmon/lechapt-calmon.config.json @@ -21,7 +21,8 @@ "Q", "D", "J", - "Lg" + "Lg", + "Ks" ] }, { diff --git a/src/app/calculators/lechapt-calmon/lechapt-calmon.en.json b/src/app/calculators/lechapt-calmon/lechapt-calmon.en.json index 1d9ee60248759d6235c827ccaabe84452a08ae33..4f54a2db54b68005c4e481d26f9cd370d754e7c1 100644 --- a/src/app/calculators/lechapt-calmon/lechapt-calmon.en.json +++ b/src/app/calculators/lechapt-calmon/lechapt-calmon.en.json @@ -17,7 +17,11 @@ "fs_hydraulique": "Hydraulic features", "Q": "Flow", "D": "Pipe diameter", - "J": "Head drop", + "J": "Total head loss", + "Ks": "Singular head loss coefficient", "Lg": "Pipe length", - "fs_param_calc": "Calculation parameters" + "fs_param_calc": "Calculation parameters", + "Jl": "Linear head loss", + "Kl": "Linear head loss coefficient", + "fD": "Darcy friction factor" } \ No newline at end of file diff --git a/src/app/calculators/lechapt-calmon/lechapt-calmon.fr.json b/src/app/calculators/lechapt-calmon/lechapt-calmon.fr.json index dbdb0e4dce1ada783603a6c5a71aaa27e1f7b1cd..734557c79a01bf97b7e7814f5ae4b1d72632cafc 100644 --- a/src/app/calculators/lechapt-calmon/lechapt-calmon.fr.json +++ b/src/app/calculators/lechapt-calmon/lechapt-calmon.fr.json @@ -16,7 +16,13 @@ "N": "N", "fs_hydraulique": "Caractéristiques hydrauliques", "D": "Diamètre du tuyau", - "J": "Perte de charge", + "J": "Perte de charge totale", + "Ks": "Coefficient de perte de charge singulière", "Lg": "Longueur du tuyau", - "fs_param_calc": "Paramètres de calcul" + "fs_param_calc": "Paramètres de calcul", + "Jl": "Perte de charge linéaire", + "UNIT_JL": "m", + "UNIT_V": "m/s", + "Kl": "Coefficient de perte de charge linéaire", + "fD": "Coefficient de perte de charge de Darcy" } \ No newline at end of file