From 60b4dee61dcbbd54da97279a8800aed70002f1ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grand?= <francois.grand@inrae.fr>
Date: Thu, 14 Apr 2022 15:59:26 +0200
Subject: [PATCH] fix: missing help for some discharge laws
refs #529
---
src/app/calculators/cloisons/config.json | 18 +++++-----
.../calculators/parallelstructure/config.json | 10 +++---
src/app/calculators/prebarrage/config.json | 34 ++++++++++---------
3 files changed, 33 insertions(+), 29 deletions(-)
diff --git a/src/app/calculators/cloisons/config.json b/src/app/calculators/cloisons/config.json
index 328ffe061..82ccf331e 100644
--- a/src/app/calculators/cloisons/config.json
+++ b/src/app/calculators/cloisons/config.json
@@ -31,14 +31,14 @@
"property": "loiDebit",
"source": "device_loi_debit",
"help": {
- "Orifice_OrificeSubmerged": "structures/orifice_noye.html",
- "SeuilRectangulaire_WeirVillemonte": "structures/kivi.html",
- "SeuilRectangulaire_WeirSubmergedLarinier": "structures/fente_noyee.html",
- "SeuilRectangulaire_WeirCunge80": "structures/cunge_80.html",
- "VanneRectangulaire_GateCunge80": "structures/cunge_80.html",
- "SeuilTriangulaire_TriangularWeirFree": "structures/dever_triang.html",
- "SeuilTriangulaire_TriangularWeirBroad": "structures/dever_triang.html",
- "SeuilTriangulaireTrunc_TriangularTruncWeirFree": "structures/dever_triang_tronque.html"
+ "OrificeSubmerged": "structures/orifice_noye.html",
+ "WeirSubmergedLarinier": "structures/fente_noyee.html",
+ "WeirVillemonte": "structures/kivi.html",
+ "WeirCem88d": "structures/cem_88_d.html",
+ "TriangularWeirFree": "structures/dever_triang.html",
+ "TriangularWeirBroad": "structures/dever_triang.html",
+ "TriangularTruncWeirFree": "structures/dever_triang_tronque.html",
+ "GateCem88d": "structures/cem_88_d.html"
}
},
"h1",
@@ -68,4 +68,4 @@
"selectIds": [ "select_structure", "select_loidebit" ],
"help": "pab/cloisons.html"
}
-]
\ No newline at end of file
+]
diff --git a/src/app/calculators/parallelstructure/config.json b/src/app/calculators/parallelstructure/config.json
index f46051f9d..3ac1aef2c 100644
--- a/src/app/calculators/parallelstructure/config.json
+++ b/src/app/calculators/parallelstructure/config.json
@@ -36,14 +36,16 @@
"GateCem88d": "structures/cem_88_d.html",
"GateCem88v": "structures/cem_88_v.html",
"GateCunge80": "structures/cunge_80.html",
- "OrificeSubmerged": "structures/noye.html",
- "OrificeFree": "structures/denoye.html",
+ "OrificeSubmerged": "structures/orifice_noye.html",
+ "OrificeFree": "structures/orifice_denoye.html",
"WeirSubmergedLarinier": "structures/fente_noyee.html",
"WeirSubmerged": "structures/seuil_noye.html",
"WeirFree": "structures/seuil_denoye.html",
"TriangularWeirFree": "structures/dever_triang.html",
"TriangularWeirBroad": "structures/dever_triang.html",
- "TriangularTruncWeirFree": "structures/dever_triang_tronque.html"
+ "TriangularTruncWeirFree": "structures/dever_triang_tronque.html",
+ "RectangularOrificeFree": "structures/vanne_denoyee.html",
+ "RectangularOrificeSubmerged": "structures/vanne_noyee.html"
}
},
"S",
@@ -82,4 +84,4 @@
"ENUM_StructureJetType": "structures/lois_ouvrages.html#type-de-jet"
}
}
-]
\ No newline at end of file
+]
diff --git a/src/app/calculators/prebarrage/config.json b/src/app/calculators/prebarrage/config.json
index f97c4921f..3474300cd 100644
--- a/src/app/calculators/prebarrage/config.json
+++ b/src/app/calculators/prebarrage/config.json
@@ -63,22 +63,24 @@
"property": "loiDebit",
"source": "device_loi_debit",
"help": {
- "SeuilRectangulaire_KIVI": "structures/kivi.html",
- "SeuilRectangulaire_WeirVillemonte": "structures/kivi.html",
- "SeuilRectangulaire_WeirCem88d": "structures/cem_88_d.html",
- "SeuilRectangulaire_WeirCem88v": "structures/cem_88_v.html",
- "SeuilRectangulaire_WeirCunge80": "structures/cunge_80.html",
- "VanneRectangulaire_GateCem88d": "structures/cem_88_d.html",
- "VanneRectangulaire_GateCem88v": "structures/cem_88_v.html",
- "VanneRectangulaire_GateCunge80": "structures/cunge_80.html",
- "Orifice_OrificeSubmerged": "structures/orifice_noye.html",
- "Orifice_OrificeFree": "structures/orifice_denoye.html",
- "SeuilRectangulaire_WeirSubmergedLarinier": "structures/fente_noyee.html",
- "SeuilRectangulaire_WeirSubmerged": "structures/seuil_noye.html",
- "SeuilRectangulaire_WeirFree": "structures/seuil_denoye.html",
- "SeuilTriangulaire_TriangularWeirFree": "structures/dever_triang.html",
- "SeuilTriangulaire_TriangularWeirBroad": "structures/dever_triang.html",
- "SeuilTriangulaireTrunc_TriangularTruncWeirFree": "structures/dever_triang_tronque.html"
+ "KIVI": "structures/kivi.html",
+ "WeirVillemonte": "structures/kivi.html",
+ "WeirCem88d": "structures/cem_88_d.html",
+ "WeirCem88v": "structures/cem_88_v.html",
+ "WeirCunge80": "structures/cunge_80.html",
+ "GateCem88d": "structures/cem_88_d.html",
+ "GateCem88v": "structures/cem_88_v.html",
+ "GateCunge80": "structures/cunge_80.html",
+ "OrificeSubmerged": "structures/orifice_noye.html",
+ "OrificeFree": "structures/orifice_denoye.html",
+ "WeirSubmergedLarinier": "structures/fente_noyee.html",
+ "WeirSubmerged": "structures/seuil_noye.html",
+ "WeirFree": "structures/seuil_denoye.html",
+ "TriangularWeirFree": "structures/dever_triang.html",
+ "TriangularWeirBroad": "structures/dever_triang.html",
+ "TriangularTruncWeirFree": "structures/dever_triang_tronque.html",
+ "RectangularOrificeFree": "structures/vanne_denoyee.html",
+ "RectangularOrificeSubmerged": "structures/vanne_noyee.html"
}
},
{
--
GitLab