PAR : calage

DEVELOPERS.md

@@ -183,6 +183,19 @@ Les options peuvent également contenir :
  * les identifiants des listes déroulantes
  * l'aide associée aux résultats (voir ci-dessous)
 
+#### champs
+
+La liste fields contient les champs à afficher, dans l'ordre. Un champ peut être désigné par sa forme courte (son symbole seulement, ex: `"B"`) ou sa forme longue, comme suit :
+
+```json
+{
+    "id": "B",
+    "allowEmpty": false
+}
+```
+
+Définir `allowEmpty` à `true` permet de lancer le calcul même si la valeur du paramètre est laissée vide. Cette option peut être omise si elle vaut `false` (par défaut).
+
 #### aide contextuelle
 
 Différents éléments de la configuration peuvent contenir une clé `help` donnant l'URL de l'aide pour l'élément de l'interface graphique concerné :

package.json

@@ -62,8 +62,8 @@
     "jalhyd": "file:../jalhyd",
     "material-design-icons": "^3.0.1",
     "mathjax": "^2.7.7",
-    "mermaid": "^8.2.5",
     "ngx-konami": "^1.7.1",
+    "mermaid": "^8.3.1",
     "ngx-markdown": "^9.0.0",
     "ngx-material-file-input": "^2.1.0",
     "ngx-matomo": "^0.1.4",

src/app/app.module.ts

@@ -29,7 +29,7 @@ import { MaterialFileInputModule } from "ngx-material-file-input";
 import { DragDropModule } from "@angular/cdk/drag-drop";
 
 import { TableModule } from "primeng/table";
-import { KonamiModule } from "ngx-konami";
+/* import { KonamiModule } from "ngx-konami"; */
 import { MarkdownModule, MarkedOptions } from "ngx-markdown";
 
 import { FlexLayoutModule } from "@angular/flex-layout";
@@ -173,7 +173,7 @@ const appRoutes: Routes = [
     ),
     StorageServiceModule,
     TableModule,
-    KonamiModule
+    // KonamiModule
   ],
   declarations: [ // composants, pipes et directives
     AppComponent,

src/app/calculators/par/config.json

+[
+    {
+        "id": "fs_param_hydro",
+        "type": "fieldset",
+        "fields": [
+            "Q",
+            "Z1",
+            {
+                "id": "Z2",
+                "allowEmpty": true
+            }
+        ]
+    },
+    {
+        "id": "fs_geometry",
+        "type": "fieldset",
+        "fields": [
+            {
+                "type": "select",
+                "id": "select_par_type",
+                "property": "parType",
+                "default": "PLANE"
+            },
+            "ZD1",
+            "S",
+            {
+                "id": "P",
+                "allowEmpty": true
+            },
+            "L",
+            "a",
+            "N",
+            "M"
+        ]
+    },
+    {
+        "type": "options",
+        "selectIds": [ "select_par_type" ],
+        "help": "par/par.html"
+    }
+]

src/app/calculators/par/en.json

+{
+    "fs_param_hydro": "Hydraulic parameters",
+
+    "Q": "Flow",
+    "Z1": "Upstream water elevation",
+    "Z2": "Downstream water elevation",
+
+    "fs_geometry": "Pass geometry",
+
+    "ZD1": "Upstream spilling elevation",
+    "S": "Slope",
+    "P": "Space between baffles",
+    "L": "Pass width",
+    "a": "Baffle / chevron height",
+    "N": "Number of patterns",
+    "M": "Number of longitudinal strips",
+
+    "h": "Water level in the pass",
+    "ha": "Upstream head",
+    "qStar": "Dimensionless flow",
+    "V": "Flow velocity",
+    "Nb": "Number of baffles",
+    "ZR1": "Upstream apron elevation",
+    "ZD2": "Downstream spilling elevation",
+    "ZR2": "Downstream apron elevation",
+    "ZM": "Minimal rake height of upstream side walls",
+    "LPI": "Pass length following the slope",
+    "LPH": "Pass length in horizontal projection",
+    "A": "A",
+    "B": "B",
+    "C": "C",
+    "D": "D",
+    "H": "Baffle height",
+    "Hmin": "Hmin",
+    "Hmax": "Hmax",
+
+    "select_par_type": "Type de passe",
+    "select_par_type_0": "Plane baffles",
+    "select_par_type_1": "Fatou",
+    "select_par_type_2": "Superactive",
+    "select_par_type_3": "Mixed / chevrons",
+
+    "UNIT_ZD1": "m",
+    "UNIT_S": "m/m",
+    "UNIT_P": "m",
+	"UNIT_L": "m",
+    "UNIT_a": "m",
+	"UNIT_N": "",
+    "UNIT_M": "",
+ 
+    "UNIT_H": "m",
+    "UNIT_HA": "m",
+    "UNIT_QSTAR": "m³/s",
+    "UNIT_V": "m/s",
+    "UNIT_ZM": "m",
+    "UNIT_ZR1": "m",
+    "UNIT_A": "m",
+    "UNIT_B": "m",
+    "UNIT_C": "m",
+    "UNIT_D": "m",
+    "UNIT_HMIN": "m",
+    "UNIT_HMAX": "m",
+    "UNIT_NB": "",
+    "UNIT_ZD2": "m",
+    "UNIT_ZR2": "m",
+    "UNIT_LPI": "m",
+    "UNIT_LPH": "m"
+}
\ No newline at end of file

src/app/calculators/par/fr.json

+{
+    "fs_param_hydro": "Paramètres hydrauliques",
+
+    "Q": "Débit",
+    "Z1": "Cote de l'eau amont",
+    "Z2": "Cote de leau aval",
+
+    "fs_geometry": "Géométrie de la passe",
+
+    "ZD1": "Cote de déversement à l'amont",
+    "S": "Pente",
+    "P": "Espacement entre les ralentisseurs",
+    "L": "Largeur de la passe",
+    "a": "Hauteur des ralentisseurs / des chevrons",
+    "N": "Nombre de motifs",
+    "M": "Nombre de bandes longitudinales",
+
+    "h": "Hauteur d'eau dans la passe",
+    "ha": "Charge amont",
+    "qStar": "Débit adimensionnel",
+    "V": "Vitese débitante",
+    "Nb": "Nombre de ralentisseurs",
+    "ZR1": "Cote de radier à l'amont",
+    "ZD2": "Cote de déversement à l'aval",
+    "ZR2": "Cote de radier à l'aval",
+    "ZM": "Cote d'arase minimale des murs latéraux à l'amont",
+    "LPI": "Longueur de la passe en suivant la pente",
+    "LPH": "Longueur de la passe en projection horizontale",
+    "A": "A",
+    "B": "B",
+    "C": "C",
+    "D": "D",
+    "H": "Hauteur d'un ralentisseur",
+    "Hmin": "Hmin",
+    "Hmax": "Hmax",
+
+    "select_par_type": "Type de passe",
+    "select_par_type_0": "Ralentisseurs plans",
+    "select_par_type_1": "Fatou",
+    "select_par_type_2": "Ralentisseurs suractifs",
+    "select_par_type_3": "Mixte / chevrons",
+
+    "UNIT_ZD1": "m",
+    "UNIT_S": "m/m",
+    "UNIT_P": "m",
+	"UNIT_L": "m",
+    "UNIT_a": "m",
+	"UNIT_N": "",
+    "UNIT_M": "",
+ 
+    "UNIT_H": "m",
+    "UNIT_HA": "m",
+    "UNIT_QSTAR": "m³/s",
+    "UNIT_V": "m/s",
+    "UNIT_ZM": "m",
+    "UNIT_ZR1": "m",
+    "UNIT_A": "m",
+    "UNIT_B": "m",
+    "UNIT_C": "m",
+    "UNIT_D": "m",
+    "UNIT_HMIN": "m",
+    "UNIT_HMAX": "m",
+    "UNIT_NB": "",
+    "UNIT_ZD2": "m",
+    "UNIT_ZR2": "m",
+    "UNIT_LPI": "m",
+    "UNIT_LPH": "m"
+}
\ No newline at end of file

src/app/config.json

@@ -17,6 +17,14 @@
             },
             "calculators": [ 12, 13, 6, 5, 10, 15 ]
         },
+        {
+            "name": "PASSE_A_RALENTISSEURS",
+            "image": {
+                "path": "passe-ralentisseurs.jpg",
+                "credits": "????"
+            },
+            "calculators": [ 28 ]
+        },
         {
             "name": "PASSE_NATURELLE",
             "image": {

src/locale/messages.en.json

@@ -32,6 +32,7 @@
     "ERROR_PAB_CALC_Z1_CLOISON": "Error in calculating the upstream water elevation of a wall",
     "ERROR_PAB_Z1_LOWER_THAN_Z2": "Upstream water elevation should be higher than downstream water elevation",
     "ERROR_PAB_Z1_LOWER_THAN_UPSTREAM_WALL": "Upstream water elevation is too low for water to flow through the first wall",
+    "ERROR_PAR_P_DEVIATES_MORE_THAN_10_PCT": "P value deviates by more than 10% from standard value %stdP%",
     "ERROR_PARAM_MUST_BE_A_NUMBER": "Please type a numeric value",
     "ERROR_PARAM_MUST_BE_AT_LEAST": "Value must be >= %s",
     "ERROR_PARAM_MUST_BE_POSITIVE": "Please type a positive numeric value",
@@ -376,6 +377,8 @@
     "INFO_PABPUISSANCE_TITRE": "Fish ladder: dissipated power",
     "INFO_PARALLELSTRUCTURE_TITRE_COURT": "// structures",
     "INFO_PARALLELSTRUCTURE_TITRE": "Parallel structures",
+    "INFO_PAR_TITRE": "Humpback fishway: setup",
+    "INFO_PAR_TITRE_COURT": "HF: setup",
     "INFO_PARAMFIELD_AWAITING_CALCULATION": "Awaiting calculation",
     "INFO_PARAMFIELD_BOUNDARY_CONDITIONS": "Boundary conditions",
     "INFO_PARAMFIELD_CALCULATED": "Calculated",
@@ -474,6 +477,8 @@
     "INFO_THEME_OUTILS_MATHEMATIQUES_DESCRIPTION": "Miscellaneous generic mathematical tools",
     "INFO_THEME_PASSE_A_BASSIN_DESCRIPTION": "Tools for sizing a fish pass made with pools also called fish steps",
     "INFO_THEME_PASSE_A_BASSIN_TITRE": "Fish ladder",
+    "INFO_THEME_PASSE_A_RALENTISSEURS_TITRE": "Humpback fishway",
+    "INFO_THEME_PASSE_A_RALENTISSEURS_DESCRIPTION": "Humpback fishway",
     "INFO_THEME_PASSE_NATURELLE_DESCRIPTION": "Tools for sizing a natural fish pass also called macroroughness pass or rock-ramp fish pass",
     "INFO_THEME_PASSE_NATURELLE_TITRE": "Natural pass",
     "INFO_TITREJOURNAL": "Calculation log",
@@ -488,6 +493,7 @@
     "INFO_EXAMPLE_LABEL_WEIR_JET_LENGTH": "Weir jet length",
     "INFO_EXAMPLES_TITLE": "Examples",
     "INFO_EXAMPLES_SUBTITLE": "Load standard examples",
+    "INFO_PAR_P_WAS_IGNORED": "Given P value was ignored",
     "INFO_YAXB_TITRE": "Linear function",
     "INFO_YAXB_TITRE_COURT": "Linear f.",
     "INFO_TRIGO_TITRE": "Trigonometric function",

src/locale/messages.fr.json

@@ -32,6 +32,7 @@
     "ERROR_PAB_CALC_Z1_CLOISON": "Erreur de calcul de la cote de l'eau amont d'une cloison",
     "ERROR_PAB_Z1_LOWER_THAN_Z2": "La cote de l'eau amont doit être supérieure à la cote de l'eau aval",
     "ERROR_PAB_Z1_LOWER_THAN_UPSTREAM_WALL": "La cote de l'eau amont est trop basse pour que l'eau s'écoule à travers la première cloison",
+    "ERROR_PAR_P_DEVIATES_MORE_THAN_10_PCT": "La valeur de P s'écarte de plus de 10% de la valeur standard %stdP%",
     "ERROR_PARAM_MUST_BE_A_NUMBER": "Veuillez entrer une valeur numérique",
     "ERROR_PARAM_MUST_BE_AT_LEAST": "La valeur doit être >= %s",
     "ERROR_PARAM_MUST_BE_POSITIVE": "Veuillez entrer une valeur numérique positive",
@@ -375,6 +376,8 @@
     "INFO_PABPUISSANCE_TITRE": "Passe à bassins : puissance dissipée",
     "INFO_PARALLELSTRUCTURE_TITRE_COURT": "Ouvrages",
     "INFO_PARALLELSTRUCTURE_TITRE": "Lois d'ouvrages",
+    "INFO_PAR_TITRE": "Passe à ralentisseurs : calage",
+    "INFO_PAR_TITRE_COURT": "PAR : calage",
     "INFO_PARAMFIELD_AWAITING_CALCULATION": "En attente de calcul",
     "INFO_PARAMFIELD_BOUNDARY_CONDITIONS": "Conditions aux limites",
     "INFO_PARAMFIELD_CALCULATED": "Calculé",
@@ -473,6 +476,8 @@
     "INFO_THEME_OUTILS_MATHEMATIQUES_DESCRIPTION": "Divers outils mathématiques génériques",
     "INFO_THEME_PASSE_A_BASSIN_DESCRIPTION": "Outils de dimensionnement d'une passe à poissons de type passe à bassins ou encore appelée échelle à poisson",
     "INFO_THEME_PASSE_A_BASSIN_TITRE": "Passe à bassins",
+    "INFO_THEME_PASSE_A_RALENTISSEURS_TITRE": "Passe à ralentisseurs",
+    "INFO_THEME_PASSE_A_RALENTISSEURS_DESCRIPTION": "Passe à ralentisseurs",
     "INFO_THEME_PASSE_NATURELLE_DESCRIPTION": "Outils de dimensionnement d'une passe à poissons de type passe naturelle ou encore appelée passe à macro-rugosités",
     "INFO_THEME_PASSE_NATURELLE_TITRE": "Passe naturelle",
     "INFO_TITREJOURNAL": "Journal de calcul",
@@ -487,6 +492,7 @@
     "INFO_EXAMPLE_LABEL_WEIR_JET_LENGTH": "Longueur de jet d'un déversoir",
     "INFO_EXAMPLES_TITLE": "Exemples",
     "INFO_EXAMPLES_SUBTITLE": "Charger des exemples types",
+    "INFO_PAR_P_WAS_IGNORED": "La valeur de P fournie a été ignorée",
     "INFO_YAXB_TITRE": "Fonction affine",
     "INFO_YAXB_TITRE_COURT": "F. affine",
     "INFO_TRIGO_TITRE": "Fonction trigonométrique",