Skip to content
GitLab
Commit 1b48ae93 authored by Mathias Chouet's avatar Mathias Chouet :spaghetti:
Browse files

Merge branch '419-renommer-les-lois-d-ouvrage' into 'master' 

Resolve "Renommer les lois d'ouvrage"

Closes #419

See merge request cassiopee/nghyd!97
parents a08d52a0 25356532
devel 591-macrorugo-mise-a-jour-de-la-formule-f-h-a-partir-de-cassan-2023 609-ajout-du-module-courbe-de-remous-d-une-passe-a-macro-rugosite 621-utiliser-des-identifiants-symboliques-plutot-que-numeriques-dans-les-fichiers 622-mise-a-jour-vers-angular-16 master 4.17.0 4.16.3 4.16.2 4.16.1 4.16.0 4.15.1 4.15.0 4.14.2 4.14.1 4.14.0 4.13.1 4.13.0 4.12.1 4.12.0 4.11.1 4.11.0 4.10.6 stable
No related merge requests found
Pipeline #14497 failed with stages
in 15 minutes and 56 seconds
Hide whitespace changes
Inline Side-by-side
Showing
with 137 additions and 192 deletions
+137 -192
DEVELOPERS.md
+ 2
− 0
View file @ 1b48ae93
...@@ -290,6 +290,8 @@ Dans le fichier de configuration du module, ajouter la définition des listes d ...@@ -290,6 +290,8 @@ Dans le fichier de configuration du module, ajouter la définition des listes d
} }
``` ```
**IMPORTANT** : les id doivent être de la forme `select_`_`unmotclesansespacenitirets`_
#### si la liste n'est pas associée à un enum #### si la liste n'est pas associée à un enum
Une liste déroulante peut être associée à une **source**, qui détermine quels sont les choix possibles. Une liste déroulante peut être associée à une **source**, qui détermine quels sont les choix possibles.
......
docs/en/calculators/structures/liste.md
+ 15
− 15
View file @ 1b48ae93
...@@ -2,21 +2,21 @@ ...@@ -2,21 +2,21 @@
| Equation | Default discharge coefficient | Available in | | Equation | Default discharge coefficient | Available in |
|---------------------------|----------------:|-------------------------------| |---------------------------|----------------:|-------------------------------|
| [Weir / orifice Cemagref 88](./cem_88_d.md) | 0.4 | Parallel Structures | | [Broad-crested weir / Orifice (Cemagref-D)](./cem_88_d.md) | 0.4 | Parallel Structures |
| [Weir / undershot gate Cemagref 88](./cem_88_v.md) | 0.6 | Parallel Structures | | [Broad-crested weir / sluice gate (Cemagref-V)](./cem_88_v.md) | 0.6 | Parallel Structures |
| [Cunge (1980)](./cunge_80.md) | 0.6 | Parallel Structures, Cross walls, Downwall | | [Broad-crested weir / orifice (Cunge)](./cunge_80.md) | 0.6 | Parallel Structures, Cross walls, Downwall |
| [Free flow gate](./vanne_denoyee.md) | 0.6 | Parallel Structures | | [Free flow sluice gate](./vanne_denoyee.md) | 0.6 | Parallel Structures |
| [Submerged gate](./vanne_noyee.md) | 0.6 | Parallel Structures | | [Submerged sluice gate](./vanne_noyee.md) | 0.6 | Parallel Structures |
| [Free flow weir](./seuil_denoye.md) | 0.4 | Parallel Structures, Free flow weir stage-discharge laws | | [Free flow sharp-crested weir (Poleni)](./seuil_denoye.md) | 0.4 | Parallel Structures, Free flow weir stage-discharge laws |
| [Submerged weir](./seuil_noye.md) | 0.9 | Parallel Structures | | [Deeply submerged sharp-crested weir (Rajaratnam)](./seuil_noye.md) | 0.9 | Parallel Structures |
| [Submerged slot (Larinier 1992)](./fente_noyee.md) | 0.75 | Parallel Structures, Cross walls, Downwall | | [Submerged slot (Larinier)](./fente_noyee.md) | 0.75 | Parallel Structures, Cross walls, Downwall |
| [Kindsvater-Carter and Villemonte](./kivi.md) | \(\alpha\)=0.4, \(\beta\)=0.001 | Parallel Structures | | [Sharp-crested weir (Kindsvater-Carter + Villemonte)](./kivi.md) | \(\alpha\)=0.4, \(\beta\)=0.001 | Parallel Structures |
| [Triangular weir (Villemonte)](./dever_triang.md) | 1.36 | Parallel Structures, Free flow weir stage-discharge laws, Cross walls, Downwall | | [Triangular weir sharp-crested (Villemonte) and broad-crested (Bos)](./dever_triang.md) | 1.36 | Parallel Structures, Free flow weir stage-discharge laws, Cross walls, Downwall |
| [Truncated triangular weir (Villemonte)](./dever_triang_tronque.md) | 1.36 | Parallel Structures, Free flow weir stage-discharge laws, Cross walls, Downwall | | [Truncated triangular weir (Villemonte)](./dever_triang_tronque.md) | 1.36 | Parallel Structures, Free flow weir stage-discharge laws, Cross walls, Downwall |
| [Submerged orifice](./orifice_noye.md) | 0.7 | Parallel Structures, Cross walls, Downwall | | [Submerged orifice (Bernoulli)](./orifice_noye.md) | 0.7 | Parallel Structures, Cross walls, Downwall |
| [Free orifice](./orifice_denoye.md) | 0.7 | Parallel Structures | | [Free flow orifice (Bernoulli)](./orifice_denoye.md) | 0.7 | Parallel Structures |
| [Villemonte 1947](./villemonte_1947.md) | 0.4 | Parallel Structures, Cross walls, Downwall | | [Sharp-crested weir (Villemonte)](./villemonte_1947.md) | 0.4 | Parallel Structures, Cross walls, Downwall |
| [Regulated notch (Villemonte 1957)](../pab/pab.md#the-downstream-partition) | 0.4 | Downwall | | [Regulated notch (Villemonte)](../pab/pab.md#the-downstream-partition) | 0.4 | Downwall |
| [Regulated submerged slot (Larinier 1992)](../pab/pab.md#the-downstream-partition) | 0.75 | Downwall | | [Regulated submerged slot (Larinier)](../pab/pab.md#the-downstream-partition) | 0.75 | Downwall |
Table: Stage-discharge equations list Table: Stage-discharge equations list
docs/fr/calculators/structures/liste.md
+ 13
− 13
View file @ 1b48ae93
...@@ -2,21 +2,21 @@ ...@@ -2,21 +2,21 @@
| Équation | Coefficient de débit par défaut | Disponible dans | | Équation | Coefficient de débit par défaut | Disponible dans |
|---------------------------|----------------:|-------------------------------| |---------------------------|----------------:|-------------------------------|
| [Déversoir / orifice Cemagref 88](./cem_88_d.md) | 0.4 | Lois d'ouvrages | | [Seuil épais / orifice (Cemagref-D)](./cem_88_d.md) | 0.4 | Lois d'ouvrages |
| [Déversoir / vanne de fond Cemagref 88](./cem_88_v.md) | 0.6 | Lois d'ouvrages | | [Seuil épais / vanne de fond (Cemagref-V)](./cem_88_v.md) | 0.6 | Lois d'ouvrages |
| [Cunge (1980)](./cunge_80.md) | 1 | Lois d'ouvrages, Cloisons, Cloison aval | | [Seuil épais / orifice (Cunge)](./cunge_80.md) | 1 | Lois d'ouvrages, Cloisons, Cloison aval |
| [Vanne dénoyée](./vanne_denoyee.md) | 0.6 | Lois d'ouvrages | | [Vanne dénoyée](./vanne_denoyee.md) | 0.6 | Lois d'ouvrages |
| [Vanne noyée](./vanne_noyee.md) | 0.6 | Lois d'ouvrages | | [Vanne noyée](./vanne_noyee.md) | 0.6 | Lois d'ouvrages |
| [Seuil dénoyé](./seuil_denoye.md) | 0.4 | Lois d'ouvrages, Lois de déversoirs dénoyés | | [Seuil mince dénoyé (Poleni)](./seuil_denoye.md) | 0.4 | Lois d'ouvrages, Lois de déversoirs dénoyés |
| [Seuil noyé](./seuil_noye.md) | 0.9 | Lois d'ouvrages | | [Seuil mince noyé (Rajaratnam)](./seuil_noye.md) | 0.9 | Lois d'ouvrages |
| [Fente noyée (Larinier 1992)](./fente_noyee.md) | 0.75 | Lois d'ouvrages, Cloisons, Cloison aval | | [Fente noyée (Larinier)](./fente_noyee.md) | 0.75 | Lois d'ouvrages, Cloisons, Cloison aval |
| [Kindsvater-Carter et Villemonte](./kivi.md) | \(\alpha\)=0.4, \(\beta\)=0.001 | Lois d'ouvrages | | [Kindsvater-Carter et Villemonte](./kivi.md) | \(\alpha\)=0.4, \(\beta\)=0.001 | Lois d'ouvrages |
| [Déversoir triangulaire (Villemonte)](./dever_triang.md) | 1.36 | Lois d'ouvrages, Lois de déversoirs dénoyés, Cloisons, Cloison aval | | [Seuil triangulaire mince (Villemonte) et épais (Bos)](./dever_triang.md) | 1.36 | Lois d'ouvrages, Lois de déversoirs dénoyés, Cloisons, Cloison aval |
| [Déversoir triangulaire tronqué (Villemonte)](./dever_triang_tronque.md) | 1.36 | Lois d'ouvrages, Lois de déversoirs dénoyés, Cloisons, Cloison aval | | [Seuil triangulaire tronqué (Villemonte)](./dever_triang_tronque.md) | 1.36 | Lois d'ouvrages, Lois de déversoirs dénoyés, Cloisons, Cloison aval |
| [Orifice noyé](./orifice_noye.md) | 0.7 | Lois d'ouvrages, Cloisons, Cloison aval | | [Orifice noyé (Bernoulli)](./orifice_noye.md) | 0.7 | Lois d'ouvrages, Cloisons, Cloison aval |
| [Orifice dénoyé](./orifice_denoye.md) | 0.7 | Lois d'ouvrages | | [Orifice dénoyé (Bernoulli)](./orifice_denoye.md) | 0.7 | Lois d'ouvrages |
| [Villemonte 1947](./villemonte_1947.md) | 0.4 | Lois d'ouvrages, Cloisons, Cloison aval | | [Seuil mince (Villemonte)](./villemonte_1947.md) | 0.4 | Lois d'ouvrages, Cloisons, Cloison aval |
| [Échancrure régulée (Villemonte 1957)](../pab/pab.md#la-cloison-aval) | 0.4 | Cloison aval | | [Échancrure régulée (Villemonte)](../pab/pab.md#la-cloison-aval) | 0.4 | Cloison aval |
| [Fente noyée régulée (Larinier 1992)](../pab/pab.md#la-cloison-aval) | 0.75 | Cloison aval | | [Fente noyée régulée (Larinier)](../pab/pab.md#la-cloison-aval) | 0.75 | Cloison aval |
Table: Liste des équations d'ouvrages Table: Liste des équations d'ouvrages
jalhyd_branch
+ 2
− 1
View file @ 1b48ae93
220-loi-d-ouvrage-cunge80-mettre-le-coefficient-de-debit-par-defaut-a-1 master
src/app/calculators/bief/en.json
+ 6
− 6
View file @ 1b48ae93
...@@ -2,16 +2,16 @@ ...@@ -2,16 +2,16 @@
"fs_water_line": "Type of water line", "fs_water_line": "Type of water line",
"select_regime": "Regime", "select_regime": "Regime",
"select_regime_0": "Fluvial", "REGIME_0": "Fluvial",
"select_regime_1": "Torrential", "REGIME_1": "Torrential",
"fs_section": "Type of section", "fs_section": "Type of section",
"select_section": "Choice of section type", "select_section": "Choice of section type",
"select_section_2": "Trapezoidal", "SECTION_2": "Trapezoidal",
"select_section_1": "Rectangular", "SECTION_1": "Rectangular",
"select_section_0": "Circular", "SECTION_0": "Circular",
"select_section_3": "Parabolic", "SECTION_3": "Parabolic",
"LargeurFond": "Width at bottom", "LargeurFond": "Width at bottom",
"Fruit": "Bank slope", "Fruit": "Bank slope",
......
src/app/calculators/bief/fr.json
+ 6
− 6
View file @ 1b48ae93
...@@ -2,16 +2,16 @@ ...@@ -2,16 +2,16 @@
"fs_water_line": "Type de ligne d'eau", "fs_water_line": "Type de ligne d'eau",
"select_regime": "Régime", "select_regime": "Régime",
"select_regime_0": "Fluvial", "REGIME_0": "Fluvial",
"select_regime_1": "Torrentiel", "REGIME_1": "Torrentiel",
"fs_section": "Type de section", "fs_section": "Type de section",
"select_section": "Choix du type de section", "select_section": "Choix du type de section",
"select_section_2": "Trapézoïdale", "SECTION_2": "Trapézoïdale",
"select_section_1": "Rectangulaire", "SECTION_1": "Rectangulaire",
"select_section_0": "Circulaire", "SECTION_0": "Circulaire",
"select_section_3": "Parabolique", "SECTION_3": "Parabolique",
"LargeurFond": "Largeur au fond", "LargeurFond": "Largeur au fond",
"Fruit": "Fruit des berges", "Fruit": "Fruit des berges",
......
src/app/calculators/cloisons/en.json
+ 0
− 20
View file @ 1b48ae93
...@@ -6,26 +6,6 @@ ...@@ -6,26 +6,6 @@
"PB": "Pool mean depth", "PB": "Pool mean depth",
"h1": "Head", "h1": "Head",
"select_structure_SeuilTriangulaire": "Triangular weir",
"select_structure_SeuilTriangulaireTrunc": "Truncated triangular weir",
"select_structure_Orifice": "Orifice",
"select_structure_SeuilRectangulaire": "Rectangular weir",
"select_structure_VanneRectangulaire": "Rectangular gate",
"select_loidebit_VanneRectangulaire_GateCunge80": "Cunge (1980)",
"select_loidebit_Orifice_OrificeSubmerged": "Submerged orifice",
"select_loidebit_Orifice_OrificeFree": "Free orifice",
"select_loidebit_SeuilRectangulaire_WeirSubmergedLarinier": "Submerged slot (Larinier 1992)",
"select_loidebit_SeuilRectangulaire_WeirVillemonte": "Villemonte 1947",
"select_loidebit_SeuilRectangulaire_WeirCunge80": "Cunge (1980)",
"select_loidebit_SeuilTriangulaire_TriangularWeirFree": "V-notch sharp-crested weir (Villemonte)",
"select_loidebit_SeuilTriangulaire_TriangularWeirBroad": "V-notch broad-crested weir (Bos)",
"select_loidebit_SeuilTriangulaireTrunc_TriangularTruncWeirFree": "Truncated triangular weir (Villemonte)",
"UNIT_PV": "W/m³", "UNIT_PV": "W/m³",
"UNIT_Q": "m³/s", "UNIT_Q": "m³/s",
"UNIT_YMOY": "m", "UNIT_YMOY": "m",
......
src/app/calculators/cloisons/fr.json
+ 0
− 20
View file @ 1b48ae93
...@@ -3,26 +3,6 @@ ...@@ -3,26 +3,6 @@
"P": "Pelle", "P": "Pelle",
"W": "Ouverture de vanne", "W": "Ouverture de vanne",
"select_structure_SeuilTriangulaire": "Seuil triangulaire",
"select_structure_SeuilTriangulaireTrunc": "Seuil triangulaire tronqué",
"select_structure_Orifice": "Orifice",
"select_structure_SeuilRectangulaire": "Seuil rectangulaire",
"select_structure_VanneRectangulaire": "Vanne rectangulaire",
"select_loidebit_VanneRectangulaire_GateCunge80": "Cunge (1980)",
"select_loidebit_Orifice_OrificeSubmerged": "Orifice noyé",
"select_loidebit_Orifice_OrificeFree": "Orifice dénoyé",
"select_loidebit_SeuilRectangulaire_WeirSubmergedLarinier": "Fente noyée (Larinier 1992)",
"select_loidebit_SeuilRectangulaire_WeirVillemonte": "Villemonte 1947",
"select_loidebit_SeuilRectangulaire_WeirCunge80": "Cunge (1980)",
"select_loidebit_SeuilTriangulaire_TriangularWeirFree": "Déversoir triangulaire mince (Villemonte)",
"select_loidebit_SeuilTriangulaire_TriangularWeirBroad": "Déversoir triangulaire épais (Bos)",
"select_loidebit_SeuilTriangulaireTrunc_TriangularTruncWeirFree": "Déversoir triangulaire tronqué (Villemonte)",
"UNIT_PV": "W/m³", "UNIT_PV": "W/m³",
"UNIT_Q": "m³/s", "UNIT_Q": "m³/s",
"UNIT_YMOY": "m", "UNIT_YMOY": "m",
......
src/app/calculators/courberemous/en.json
+ 24
− 24
View file @ 1b48ae93
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
"fs_section": "Type of section", "fs_section": "Type of section",
"select_section": "Choice of section type", "select_section": "Choice of section type",
"select_section_2": "Trapezoidal", "SECTION_2": "Trapezoidal",
"select_section_1": "Rectangular", "SECTION_1": "Rectangular",
"select_section_0": "Circular", "SECTION_0": "Circular",
"select_section_3": "Parabolic", "SECTION_3": "Parabolic",
"LargeurFond": "Width at bottom", "LargeurFond": "Width at bottom",
"Fruit": "Bank slope", "Fruit": "Bank slope",
...@@ -43,27 +43,27 @@ ...@@ -43,27 +43,27 @@
"UNIT_IMP": "N", "UNIT_IMP": "N",
"UNIT_TAU0": "Pa", "UNIT_TAU0": "Pa",
"select_resolution_0": "Integration by trapezoid", "RESOLUTION_0": "Integration by trapezoid",
"select_resolution_1": "Runge Kutta fourth order", "RESOLUTION_1": "Runge Kutta fourth order",
"select_resolution_2": "Explicit Euler", "RESOLUTION_2": "Explicit Euler",
"fs_target_data": "Data to compute", "fs_target_data": "Data to compute",
"select_target": "Choice of the data to compute", "select_target": "Choice of the data to compute",
"select_target_none": "None", "TARGET_none": "None",
"select_target_Hs": "Head (m)", "TARGET_Hs": "Head (m)",
"select_target_Hsc": "Critical head (m)", "TARGET_Hsc": "Critical head (m)",
"select_target_B": "Surface width (m)", "TARGET_B": "Surface width (m)",
"select_target_P": "Wetted perimeter (m)", "TARGET_P": "Wetted perimeter (m)",
"select_target_S": "Wetted area (m2)", "TARGET_S": "Wetted area (m2)",
"select_target_R": "Hydraulic radius (m)", "TARGET_R": "Hydraulic radius (m)",
"select_target_V": "Average speed (m/s)", "TARGET_V": "Average speed (m/s)",
"select_target_Fr": "Froude number", "TARGET_Fr": "Froude number",
"select_target_Yc": "Critical depth (m)", "TARGET_Yc": "Critical depth (m)",
"select_target_Yn": "Normal depth (m)", "TARGET_Yn": "Normal depth (m)",
"select_target_Ycor": "Corresponding depth (m)", "TARGET_Ycor": "Corresponding depth (m)",
"select_target_Ycon": "Conjugate depth (m)", "TARGET_Ycon": "Conjugate depth (m)",
"select_target_J": "Head loss (m)", "TARGET_J": "Head loss (m)",
"select_target_I-J": "Linear variation of specific head (m/m)", "TARGET_I-J": "Linear variation of specific head (m/m)",
"select_target_Imp": "Impulse (N)", "TARGET_Imp": "Impulse (N)",
"select_target_Tau0": "Tractive force (Pa)" "TARGET_Tau0": "Tractive force (Pa)"
} }
\ No newline at end of file
src/app/calculators/courberemous/fr.json
+ 24
− 24
View file @ 1b48ae93
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
"fs_section": "Type de section", "fs_section": "Type de section",
"select_section": "Choix du type de section", "select_section": "Choix du type de section",
"select_section_2": "Trapézoïdale", "SECTION_2": "Trapézoïdale",
"select_section_1": "Rectangulaire", "SECTION_1": "Rectangulaire",
"select_section_0": "Circulaire", "SECTION_0": "Circulaire",
"select_section_3": "Parabolique", "SECTION_3": "Parabolique",
"LargeurFond": "Largeur au fond", "LargeurFond": "Largeur au fond",
"Fruit": "Fruit des berges", "Fruit": "Fruit des berges",
...@@ -42,27 +42,27 @@ ...@@ -42,27 +42,27 @@
"UNIT_IMP": "N", "UNIT_IMP": "N",
"UNIT_TAU0": "Pa", "UNIT_TAU0": "Pa",
"select_resolution_0": "Intégration par trapèzes", "RESOLUTION_0": "Intégration par trapèzes",
"select_resolution_1": "Runge Kutta d'ordre 4", "RESOLUTION_1": "Runge Kutta d'ordre 4",
"select_resolution_2": "Euler explicite", "RESOLUTION_2": "Euler explicite",
"fs_target_data": "Donnée à calculer", "fs_target_data": "Donnée à calculer",
"select_target": "Choix de la donnée à calculer", "select_target": "Choix de la donnée à calculer",
"select_target_none": "Aucune", "TARGET_none": "Aucune",
"select_target_Hs": "La charge (m)", "TARGET_Hs": "La charge (m)",
"select_target_Hsc": "La charge critique (m)", "TARGET_Hsc": "La charge critique (m)",
"select_target_B": "La largeur au miroir (m)", "TARGET_B": "La largeur au miroir (m)",
"select_target_P": "Le périmètre mouillé (m)", "TARGET_P": "Le périmètre mouillé (m)",
"select_target_S": "La surface mouillée (m2)", "TARGET_S": "La surface mouillée (m2)",
"select_target_R": "Le rayon hydraulique (m)", "TARGET_R": "Le rayon hydraulique (m)",
"select_target_V": "La vitesse moyenne (m/s)", "TARGET_V": "La vitesse moyenne (m/s)",
"select_target_Fr": "Le Froude", "TARGET_Fr": "Le Froude",
"select_target_Yc": "Le tirant d'eau critique (m)", "TARGET_Yc": "Le tirant d'eau critique (m)",
"select_target_Yn": "Le tirant d'eau normal (m)", "TARGET_Yn": "Le tirant d'eau normal (m)",
"select_target_Ycor": "Le tirant d'eau correspondant (m)", "TARGET_Ycor": "Le tirant d'eau correspondant (m)",
"select_target_Ycon": "Le tirant d'eau conjugué (m)", "TARGET_Ycon": "Le tirant d'eau conjugué (m)",
"select_target_J": "La perte de charge (m)", "TARGET_J": "La perte de charge (m)",
"select_target_I-J": "La variation linéaire de l'énergie spécifique (m/m)", "TARGET_I-J": "La variation linéaire de l'énergie spécifique (m/m)",
"select_target_Imp": "L'impulsion (N)", "TARGET_Imp": "L'impulsion (N)",
"select_target_Tau0": "La force tractrice (Pa)" "TARGET_Tau0": "La force tractrice (Pa)"
} }
\ No newline at end of file
src/app/calculators/dever/en.json
+ 0
− 8
View file @ 1b48ae93
...@@ -5,14 +5,6 @@ ...@@ -5,14 +5,6 @@
"L": "Width of the weir", "L": "Width of the weir",
"Cd": "Discharge coefficient", "Cd": "Discharge coefficient",
"select_structure_SeuilRectangulaire": "Rectangular weir",
"select_structure_SeuilTriangulaire": "Triangular weir",
"select_structure_SeuilTriangulaireTrunc": "Truncated triangular weir",
"select_loidebit_SeuilRectangulaire_WeirFree": "Free flow rectangular weir",
"select_loidebit_SeuilTriangulaire_TriangularWeirFree": "Triangular weir (Villemonte)",
"select_loidebit_SeuilTriangulaireTrunc_TriangularTruncWeirFree": "Truncated triangular weir (Villemonte)",
"UNIT_Q": "m³/s", "UNIT_Q": "m³/s",
"UNIT_EC": "m", "UNIT_EC": "m",
"UNIT_V": "m/s" "UNIT_V": "m/s"
......
src/app/calculators/dever/fr.json
+ 0
− 8
View file @ 1b48ae93
...@@ -5,14 +5,6 @@ ...@@ -5,14 +5,6 @@
"L": "Largeur du déversoir", "L": "Largeur du déversoir",
"Cd": "Coefficient de débit", "Cd": "Coefficient de débit",
"select_structure_SeuilRectangulaire": "Déversoir rectangulaire",
"select_structure_SeuilTriangulaire": "Déversoir triangulaire",
"select_structure_SeuilTriangulaireTrunc": "Déversoir triangulaire tronqué",
"select_loidebit_SeuilRectangulaire_WeirFree": "Déversoir rectangulaire dénoyé",
"select_loidebit_SeuilTriangulaire_TriangularWeirFree": "Déversoir triangulaire (Villemonte)",
"select_loidebit_SeuilTriangulaireTrunc_TriangularTruncWeirFree": "Déversoir triangulaire tronqué (Villemonte)",
"UNIT_Q": "m³/s", "UNIT_Q": "m³/s",
"UNIT_EC": "m", "UNIT_EC": "m",
"UNIT_V": "m/s" "UNIT_V": "m/s"
......
src/app/calculators/grille/config.json
+ 3
− 3
View file @ 1b48ae93
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
"type": "fieldset", "type": "fieldset",
"fields": [ "fields": [
{ {
"id": "select_grid_type", "id": "select_gridtype",
"type": "select", "type": "select",
"property": "gridType", "property": "gridType",
"default": "Conventional", "default": "Conventional",
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
"type": "fieldset", "type": "fieldset",
"fields": [ "fields": [
{ {
"id": "select_grid_profile", "id": "select_gridprofile",
"type": "select", "type": "select",
"property": "gridProfile", "property": "gridProfile",
"default": "Rectangular", "default": "Rectangular",
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
}, },
{ {
"type": "options", "type": "options",
"selectIds": [ "select_grid_type", "select_grid_profile" ], "selectIds": [ "select_gridtype", "select_gridprofile" ],
"help": "devalaison/grille.html", "help": "devalaison/grille.html",
"resultsHelp": { "resultsHelp": {
"VAPDG": "devalaison/grille.html#vitesse-dapproche-moyenne-pour-le-debit-maximum-turbine-en-soustrayant-la-partie-superieure-eventuellement-obturee", "VAPDG": "devalaison/grille.html#vitesse-dapproche-moyenne-pour-le-debit-maximum-turbine-en-soustrayant-la-partie-superieure-eventuellement-obturee",
......
src/app/calculators/grille/en.json
+ 8
− 8
View file @ 1b48ae93
...@@ -19,16 +19,16 @@ ...@@ -19,16 +19,16 @@
"OEntH": "Effective obstruction due to spacers and transversal elements", "OEntH": "Effective obstruction due to spacers and transversal elements",
"cIncl": "Average shape coefficient of spacers and transversal elements", "cIncl": "Average shape coefficient of spacers and transversal elements",
"select_grid_type": "Grid type", "select_gridtype": "Grid type",
"select_grid_profile": "Bars profile", "select_gridprofile": "Bars profile",
"select_grid_type_0": "Conventional", "GRIDTYPE_0": "Conventional",
"select_grid_type_1": "Oriented", "GRIDTYPE_1": "Oriented",
"select_grid_type_2": "Inclined", "GRIDTYPE_2": "Inclined",
"select_grid_profile_0": "Rectangular", "GRIDPROFILE_0": "Rectangular",
"select_grid_profile_1": "Hydrodynamic", "GRIDPROFILE_1": "Hydrodynamic",
"select_grid_profile_2": "Custom", "GRIDPROFILE_2": "Custom",
"H": "Water height", "H": "Water height",
"HG": "Grid height", "HG": "Grid height",
......
src/app/calculators/grille/fr.json
+ 8
− 8
View file @ 1b48ae93
...@@ -19,16 +19,16 @@ ...@@ -19,16 +19,16 @@
"OEntH": "Obstruction effective due aux entretoises et éléments transversaux", "OEntH": "Obstruction effective due aux entretoises et éléments transversaux",
"cIncl": "Coefficient de forme moyen des entretoises et éléments transversaux", "cIncl": "Coefficient de forme moyen des entretoises et éléments transversaux",
"select_grid_type": "Type de grille", "select_gridtype": "Type de grille",
"select_grid_profile": "Profil des barreaux", "select_gridprofile": "Profil des barreaux",
"select_grid_type_0": "Conventionnelle", "GRIDTYPE_0": "Conventionnelle",
"select_grid_type_1": "Orientée", "GRIDTYPE_1": "Orientée",
"select_grid_type_2": "Inclinée", "GRIDTYPE_2": "Inclinée",
"select_grid_profile_0": "Rectangulaire", "GRIDPROFILE_0": "Rectangulaire",
"select_grid_profile_1": "Hydrodynamique", "GRIDPROFILE_1": "Hydrodynamique",
"select_grid_profile_2": "Personnalisé", "GRIDPROFILE_2": "Personnalisé",
"H": "Hauteur d'eau", "H": "Hauteur d'eau",
"HG": "Hauteur de grille", "HG": "Hauteur de grille",
......
src/app/calculators/lechaptcalmon/en.json
+ 9
− 10
View file @ 1b48ae93
{ {
"fs_materiau": "Type of material", "fs_materiau": "Type of material",
"select_material": "Choice of material", "select_material": "Choice of material",
"select_material_0": "", "MATERIAL_0": "Unlined cast iron - Coarse concrete (corrosive water)",
"select_material_1": "Unlined cast iron - Coarse concrete (corrosive water)", "MATERIAL_1": "Cast steel or uncoated - Coarse concrete (somewhat corrosive water)",
"select_material_2": "Cast steel or uncoated - Coarse concrete (somewhat corrosive water)", "MATERIAL_2": "Cast steel or cement coating",
"select_material_3": "Cast steel or cement coating", "MATERIAL_3": "Cast iron or steel coating bitumen - Centrifuged concrete ",
"select_material_4": "Cast iron or steel coating bitumen - Centrifuged concrete ", "MATERIAL_4": "Rolled steel - Smooth concrete",
"select_material_5": "Rolled steel - Smooth concrete", "MATERIAL_5": "Cast iron or steel coating centrifuged",
"select_material_6": "Cast iron or steel coating centrifuged", "MATERIAL_6": "PVC - Polyethylene",
"select_material_7": "PVC - Polyethylene", "MATERIAL_7": "Hydraulically smooth pipe - 0.05 ≤ D ≤ 0.2",
"select_material_8": "Hydraulically smooth pipe - 0.05 ≤ D ≤ 0.2", "MATERIAL_8": "Hydraulically smooth pipe - 0.25 ≤ D ≤ 1",
"select_material_9": "Hydraulically smooth pipe - 0.25 ≤ D ≤ 1",
"L": "L", "L": "L",
"M": "M", "M": "M",
"N": "N", "N": "N",
......
src/app/calculators/lechaptcalmon/fr.json
+ 9
− 10
View file @ 1b48ae93
{ {
"fs_materiau": "Type du matériau", "fs_materiau": "Type du matériau",
"select_material": "Choix du matériau", "select_material": "Choix du matériau",
"select_material_0": "", "MATERIAL_0": "Fonte ou acier non revêtus - Béton grossier (eau corrosive)",
"select_material_1": "Fonte ou acier non revêtus - Béton grossier (eau corrosive)", "MATERIAL_1": "Fonte ou acier non revêtus - Béton grossier (eau peu corrosive)",
"select_material_2": "Fonte ou acier non revêtus - Béton grossier (eau peu corrosive)", "MATERIAL_2": "Fonte ou acier revêtement ciment",
"select_material_3": "Fonte ou acier revêtement ciment", "MATERIAL_3": "Fonte ou acier revêtement bitume - Béton centrifugé",
"select_material_4": "Fonte ou acier revêtement bitume - Béton centrifugé", "MATERIAL_4": "Acier laminé - Béton lisse",
"select_material_5": "Acier laminé - Béton lisse", "MATERIAL_5": "Fonte ou acier revêtement centrifugé",
"select_material_6": "Fonte ou acier revêtement centrifugé", "MATERIAL_6": "PVC - Polyéthylène",
"select_material_7": "PVC - Polyéthylène", "MATERIAL_7": "Tuyau hydrauliquement lisse - 0.05 ≤ D ≤ 0.2",
"select_material_8": "Tuyau hydrauliquement lisse - 0.05 ≤ D ≤ 0.2", "MATERIAL_8": "Tuyau hydrauliquement lisse - 0.25 ≤ D ≤ 1",
"select_material_9": "Tuyau hydrauliquement lisse - 0.25 ≤ D ≤ 1",
"L": "L", "L": "L",
"M": "M", "M": "M",
"N": "N", "N": "N",
......
src/app/calculators/macrorugocompound/config.json
+ 2
− 2
View file @ 1b48ae93
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
"type": "fieldset", "type": "fieldset",
"fields": [ "fields": [
{ {
"id": "select_pass_type", "id": "select_passtype",
"type": "select", "type": "select",
"property": "inclinedApron" "property": "inclinedApron"
}, },
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
{ {
"type": "options", "type": "options",
"idCal": "Q", "idCal": "Q",
"selectIds": [ "select_pass_type" ], "selectIds": [ "select_passtype" ],
"help": "pam/macrorugo_complexe.html" "help": "pam/macrorugo_complexe.html"
} }
] ]
\ No newline at end of file
src/app/calculators/macrorugocompound/en.json
+ 3
− 3
View file @ 1b48ae93
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
"macrorugo_container": "Aprons", "macrorugo_container": "Aprons",
"fs_macrorugo": "Apron", "fs_macrorugo": "Apron",
"select_pass_type": "Pass type", "select_passtype": "Pass type",
"If": "Slope", "If": "Slope",
"Ks": "Bottom roughness", "Ks": "Bottom roughness",
"C": "Block concentration", "C": "Block concentration",
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
"Y": "Water depth", "Y": "Water depth",
"xCenter": "Mid-apron abscissa", "xCenter": "Mid-apron abscissa",
"select_pass_type_0": "Multiple aprons", "PASSTYPE_0": "Multiple aprons",
"select_pass_type_1": "Inclined apron", "PASSTYPE_1": "Inclined apron",
"UNIT_Q": "m³/s", "UNIT_Q": "m³/s",
"UNIT_PV": "W/m³", "UNIT_PV": "W/m³",
......
src/app/calculators/macrorugocompound/fr.json
+ 3
− 3
View file @ 1b48ae93
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
"macrorugo_container": "Radiers", "macrorugo_container": "Radiers",
"fs_macrorugo": "Radier", "fs_macrorugo": "Radier",
"select_pass_type": "Type de passe", "select_passtype": "Type de passe",
"If": "Pente", "If": "Pente",
"Ks": "Rugosité de fond", "Ks": "Rugosité de fond",
"C": "Concentration de blocs", "C": "Concentration de blocs",
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
"Y": "Profondeur", "Y": "Profondeur",
"xCenter": "Abscisse du milieu du radier", "xCenter": "Abscisse du milieu du radier",
"select_pass_type_0": "Radiers multiples", "PASSTYPE_0": "Radiers multiples",
"select_pass_type_1": "Radier incliné", "PASSTYPE_1": "Radier incliné",
"UNIT_Q": "m³/s", "UNIT_Q": "m³/s",
"UNIT_PV": "W/m³", "UNIT_PV": "W/m³",
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment