diff --git a/docs-fr/calculators/hsl/pente.md b/docs-fr/calculators/hsl/pente.md new file mode 100644 index 0000000000000000000000000000000000000000..606c4428cb553ad15c1843679d4d9e23e3347cb7 --- /dev/null +++ b/docs-fr/calculators/hsl/pente.md @@ -0,0 +1,12 @@ +# Pente + +Cet outil permet de calculer la valeur manquante des quatre grandeurs : + +- la cote amont (\(Z_1\)) en m; +- la cote aval (\(Z_2\)) en m; +- la longueur (\(L\)) en m; +- la pente (\(I\)) en m/m; + +## Formule + +$$I = \frac{(Z_1 - Z_2)}{L}$$ diff --git a/jalhyd_branch b/jalhyd_branch index d51eab3aaa83104513da0df42b8af638fee0e774..16cc54ad77db05c20884afc3b44ba04d67f8db09 100644 --- a/jalhyd_branch +++ b/jalhyd_branch @@ -1 +1 @@ -114-ajout-du-module-devalaison-pertes-de-charge-grille-de-prise-d-eau +143-module-de-calcul-pente diff --git a/mkdocs.yml b/mkdocs.yml index c8a9621dd2bdb6d04e05f5cedb47f9327c632c75..b43cc37268245208b43d3dd722f98c367d3e5fff 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -29,6 +29,7 @@ nav: - Régime uniforme: calculators/hsl/regime_uniforme.md - calculators/hsl/courbe_remous.md - calculators/hsl/section_parametree.md + - calculators/hsl/pente.md - calculators/hsl/types_sections.md - calculators/hsl/var_hydrauliques.md - Lois d'ouvrages: diff --git a/src/app/calculators/pente/pente.config.json b/src/app/calculators/pente/pente.config.json new file mode 100644 index 0000000000000000000000000000000000000000..69c014d2aca0eedfddb38438c15e4d1fca7146d9 --- /dev/null +++ b/src/app/calculators/pente/pente.config.json @@ -0,0 +1,17 @@ +[ + { + "id": "fs_pente", + "type": "fieldset", + "fields": [ + "Z1", + "Z2", + "L", + "I" + ] + }, + { + "type": "options", + "idCal": "I", + "help": "hsl/pente.html" + } +] \ No newline at end of file diff --git a/src/app/calculators/pente/pente.en.json b/src/app/calculators/pente/pente.en.json new file mode 100644 index 0000000000000000000000000000000000000000..5c6b218b58e4d1419a522ad133859759f213d325 --- /dev/null +++ b/src/app/calculators/pente/pente.en.json @@ -0,0 +1,7 @@ +{ + "fs_pente": "Length and slope", + "Z1": "Upstream elevation", + "Z2": "Downstream elevation", + "L": "Length", + "I": "Slope" +} \ No newline at end of file diff --git a/src/app/calculators/pente/pente.fr.json b/src/app/calculators/pente/pente.fr.json new file mode 100644 index 0000000000000000000000000000000000000000..94ef7efa7d2627e0de902724e71b9ba884666f14 --- /dev/null +++ b/src/app/calculators/pente/pente.fr.json @@ -0,0 +1,7 @@ +{ + "fs_pente": "Longueur et pente", + "Z1": "Cote amont", + "Z2": "Cote aval", + "L": "Longueur", + "I": "Pente" +} \ No newline at end of file diff --git a/src/app/config.json b/src/app/config.json index 39993d6b2256359839057e746bf8821ee02f0680..d7fa138742d5c05aa522aa79330249d6c204c733 100644 --- a/src/app/config.json +++ b/src/app/config.json @@ -38,7 +38,7 @@ "path": "surface-libre.jpg", "credits": "David Dorchies / Irstea" }, - "calculators": [ 2, 3, 4 ] + "calculators": [ 2, 3, 4, 20 ] }, { "name": "HYDRAULIQUE_EN_CHARGE", diff --git a/src/app/services/formulaire.service.ts b/src/app/services/formulaire.service.ts index 74a2e3100f57e88c807fc1c399b6c73e758723e9..8741f40e1865a7ccc90b525d059a1adddfac36a8 100644 --- a/src/app/services/formulaire.service.ts +++ b/src/app/services/formulaire.service.ts @@ -81,6 +81,7 @@ export class FormulaireService extends Observable { this.calculatorPaths[CalculatorType.MacroRugoCompound] = "macrorugo-compound"; this.calculatorPaths[CalculatorType.Jet] = "jet"; this.calculatorPaths[CalculatorType.Grille] = "grille"; + this.calculatorPaths[CalculatorType.Pente] = "pente"; } private get _intlService(): I18nService { diff --git a/src/locale/messages.en.json b/src/locale/messages.en.json index 28cbff76355d6a4bb4a5086284a1dc49b283c9ee..e070884ccae338df6857985c674090c356ffb0fc 100644 --- a/src/locale/messages.en.json +++ b/src/locale/messages.en.json @@ -294,6 +294,8 @@ "INFO_MENU_DIAGRAM_TITLE": "Modules diagram", "INFO_MACRORUGOCOMPOUND_TITRE": "Compound rock-ramp fishpasses (beta)", "INFO_MACRORUGOCOMPOUND_TITRE_COURT": "Compound RR", + "INFO_PENTE_TITRE": "Slope", + "INFO_PENTE_TITRE_COURT": "Slope", "INFO_MENU_EMPTY_SESSION_TITLE": "New session", "INFO_MENU_HELP_TITLE": "Help", "INFO_MENU_LOAD_SESSION_TITLE": "Load session", diff --git a/src/locale/messages.fr.json b/src/locale/messages.fr.json index 5b901c41c8f84eaf1e4d3e42b6eecd2e117ee6df..7f78962c3eef18b00b3c8c528716b2a0eb2b943f 100644 --- a/src/locale/messages.fr.json +++ b/src/locale/messages.fr.json @@ -293,6 +293,8 @@ "INFO_MENU_DIAGRAM_TITLE": "Diagramme des modules", "INFO_MACRORUGOCOMPOUND_TITRE": "Passe à macro-rugosités complexe (beta)", "INFO_MACRORUGOCOMPOUND_TITRE_COURT": "M-Rugo complexe", + "INFO_PENTE_TITRE": "Pente", + "INFO_PENTE_TITRE_COURT": "Pente", "INFO_MENU_EMPTY_SESSION_TITLE": "Nouvelle session", "INFO_MENU_HELP_TITLE": "Aide", "INFO_MENU_LOAD_SESSION_TITLE": "Charger une session",