diff --git a/src/app/calculators/espece/config.json b/src/app/calculators/espece/config.json
new file mode 100644
index 0000000000000000000000000000000000000000..d11f5f33e018ead9e603bd9b4da262a7cbb8dd31
--- /dev/null
+++ b/src/app/calculators/espece/config.json
@@ -0,0 +1,49 @@
+[
+ {
+ "id": "fs_param_species",
+ "type": "fieldset",
+ "fields": [
+ {
+ "id": "DHMax",
+ "allowEmpty": true
+ },
+ {
+ "id": "BMin",
+ "allowEmpty": true
+ },
+ {
+ "id": "PMin",
+ "allowEmpty": true
+ },
+ {
+ "id": "LMin",
+ "allowEmpty": true
+ },
+ {
+ "id": "HMin",
+ "allowEmpty": true
+ },
+ {
+ "id": "YMin",
+ "allowEmpty": true
+ },
+ {
+ "id": "VMax",
+ "allowEmpty": true
+ },
+ {
+ "id": "YMinSB",
+ "allowEmpty": true
+ },
+ {
+ "id": "YMinPB",
+ "allowEmpty": true
+ }
+ ]
+ },
+ {
+ "type": "options",
+ "help": "verification/espece.html",
+ "calculateDisabled": true
+ }
+]
diff --git a/src/app/calculators/espece/en.json b/src/app/calculators/espece/en.json
new file mode 100644
index 0000000000000000000000000000000000000000..2f28082b73903cd165c8f8f9adc40ea32685146c
--- /dev/null
+++ b/src/app/calculators/espece/en.json
@@ -0,0 +1,23 @@
+{
+ "fs_param_species": "Species parameters",
+
+ "DHMax": "Maximal fall",
+ "BMin": "Minimal slot or weir width",
+ "PMin": "Minimal basin width",
+ "LMin": "Minimal basin length",
+ "HMin": "Minimal head on weir",
+ "YMin": "Minimal water level",
+ "VMax": "Maximal flow velocity",
+ "YMinSB": "Minimal water level on superactive baffles",
+ "YMinPB": "Minimal water level on plane baffles",
+
+ "UNIT_DHMax": "m",
+ "UNIT_BMin": "m",
+ "UNIT_PMin": "m",
+ "UNIT_LMin": "m",
+ "UNIT_HMin": "m",
+ "UNIT_YMin": "m",
+ "UNIT_VMax": "m/s",
+ "UNIT_YMinSB": "m",
+ "UNIT_YMinPB": "m"
+}
diff --git a/src/app/calculators/espece/fr.json b/src/app/calculators/espece/fr.json
new file mode 100644
index 0000000000000000000000000000000000000000..8100e46079cda588a75249137a492bd88b8993cc
--- /dev/null
+++ b/src/app/calculators/espece/fr.json
@@ -0,0 +1,23 @@
+{
+ "fs_param_species": "Paramètres de l'espèce",
+
+ "DHMax": "Chute maximale",
+ "BMin": "Largeur minimale de fente ou échancrure latérale",
+ "PMin": "Profondeur minimale de bassin",
+ "LMin": "Longueur minimale de bassin",
+ "HMin": "Charge minimale sur l'échancrure",
+ "YMin": "Tirant d'eau minimal",
+ "VMax": "Vitesse d'écoulement maximale",
+ "YMinSB": "Tirant d'eau minimal sur les ralentisseurs suractifs de fond",
+ "YMinPB": "Tirant d'eau minimal sur les ralentisseurs plans",
+
+ "UNIT_DHMax": "m",
+ "UNIT_BMin": "m",
+ "UNIT_PMin": "m",
+ "UNIT_LMin": "m",
+ "UNIT_HMin": "m",
+ "UNIT_YMin": "m",
+ "UNIT_VMax": "m/s",
+ "UNIT_YMinSB": "m",
+ "UNIT_YMinPB": "m"
+}
diff --git a/src/app/calculators/verificateur/config.json b/src/app/calculators/verificateur/config.json
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/src/app/config.json b/src/app/config.json
index 60017219908ef28f6c38d6cb0633eb2204aa2b36..889c22421034347ec0748b42f1887835b329014e 100644
--- a/src/app/config.json
+++ b/src/app/config.json
@@ -33,6 +33,14 @@
},
"calculators": [ 11, 17, 27 ]
},
+ {
+ "name": "VERIFICATION",
+ "image": {
+ "path": "verification.jpg",
+ "credits": "????"
+ },
+ "calculators": [ 31, 30 ]
+ },
{
"name": "DEVALAISON",
"image": {
diff --git a/src/assets/images/themes/verification.jpg b/src/assets/images/themes/verification.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..3cfe11de2b2ab17adb9a1f2eda7e2d92e79cf013
Binary files /dev/null and b/src/assets/images/themes/verification.jpg differ
diff --git a/src/locale/messages.en.json b/src/locale/messages.en.json
index 52528f87f9fc249c360dd1e6a64aac2cab041484..3ea4792f797a97de6fc3fc7b680e852b47eb98e1 100644
--- a/src/locale/messages.en.json
+++ b/src/locale/messages.en.json
@@ -1,5 +1,5 @@
{
- "ERROR_AT_LEAST_ONE_OF_THOSE_MUST_BE_DEFINED": "At least one of the following values should be specified : %symbols%",
+ "ERROR_AT_LEAST_ONE_OF_THOSE_MUST_BE_DEFINED": "At least one of the following values should be specified: %symbols%",
"ERROR_CLOISON_AVAL_UN_OUVRAGE_REGULE": "Only one regulated device is allowed on the downstream wall",
"WARNING_DEVER_ZR_SUP_Z1": "Elevation of the river bed can't be higher than water elevation: Impossible to calculate the kinetic energy",
"WARNING_DOWNSTREAM_ELEVATION_POSSIBLE_SUBMERSION": "Downstream elevation is higher than weir elevation (possible submersion)",
@@ -34,7 +34,7 @@
"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_NB_INCONSISTENT": "Number of baffles should be %stdNb%",
- "ERROR_PAR_ZR_ZD_MISMATCH": "Values of %ZR% and %ZD% mismatch : either %ZR% should be %expectedZR%, or %ZD% should be %expectedZD%",
+ "ERROR_PAR_ZR_ZD_MISMATCH": "Values of %ZR% and %ZD% mismatch: either %ZR% should be %expectedZR%, or %ZD% should be %expectedZD%",
"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",
@@ -104,8 +104,8 @@
"INFO_DIALOG_COMPUTED_VALUE_TITLE": "Edit initial value",
"INFO_DIALOG_EDIT_PAB_INTERPOLATION_BOUNDS": "between %s and %s",
"INFO_DIALOG_EDIT_PAB_N_DEVICES": "%s device(s)",
- "INFO_DIALOG_EDIT_PAB_N_WALLS": "%s wall(s) : %s device(s)",
- "INFO_DIALOG_EDIT_PAB_N_WALLS_P_DEVICES": "%s wall(s) + %s device(s) : %s devices",
+ "INFO_DIALOG_EDIT_PAB_N_WALLS": "%s wall(s): %s device(s)",
+ "INFO_DIALOG_EDIT_PAB_N_WALLS_P_DEVICES": "%s wall(s) + %s device(s): %s devices",
"INFO_DIALOG_EDIT_PAB_OPTION_VARIABLE": "Variable to edit",
"INFO_DIALOG_EDIT_PAB_OPTION_SET_VALUE": "Fixed value",
"INFO_DIALOG_EDIT_PAB_OPTION_DELTA": "Delta",
@@ -231,7 +231,7 @@
"INFO_LIB_CV": "Cv: Velocity coefficient",
"INFO_LIB_CVQT": "CV.QT: Corrected discharge",
"INFO_LIB_DH": "Fall",
- "INFO_LIB_DHR": "DHR : Residual fall",
+ "INFO_LIB_DHR": "DHR: Residual fall",
"INFO_LIB_DISTANCE_AMONT": "Distance from upstream (m)",
"INFO_LIB_EC": "EC: Kinetic energy",
"INFO_LIB_ENUM_MACRORUGOFLOWTYPE": "Flow type",
@@ -379,8 +379,8 @@
"INFO_PABCHUTE_TITRE": "Fish ladder: fall",
"INFO_PABDIMENSIONS_TITRE_COURT": "FL: dimensions",
"INFO_PABDIMENSIONS_TITRE": "Fish ladder: dimensions",
- "INFO_PABNOMBRE_TITRE_COURT": "FL : number",
- "INFO_PABNOMBRE_TITRE": "Fish ladder : number of falls",
+ "INFO_PABNOMBRE_TITRE_COURT": "FL: number",
+ "INFO_PABNOMBRE_TITRE": "Fish ladder: number of falls",
"INFO_PABPUISSANCE_TITRE_COURT": "FL: diss. power",
"INFO_PABPUISSANCE_TITRE": "Fish ladder: dissipated power",
"INFO_PARALLELSTRUCTURE_TITRE_COURT": "// structures",
@@ -491,6 +491,8 @@
"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_THEME_VERIFICATION_DESCRIPTION": "Tools for verifying fish passes crossing capabilities by different fish species",
+ "INFO_THEME_VERIFICATION_TITRE": "Fish passes verification",
"INFO_TITREJOURNAL": "Calculation log",
"INFO_TITREJOURNAL_GLOBAL": "Calculation log synthesis",
"INFO_WELCOME_CONTENT": "<p>Il regroupe des outils d'aide à la conception des dispositifs de franchissement piscicoles pour la montaison et la dévalaison ainsi que des outils de calcul hydraulique utiles pour l'ingénierie en environnement et agriculture.</p><p>The Cassiopée software was developed by the ecohydraulic R&D pole gathering <a href=\"https://ofb.gouv.fr\" target=\"_blank\">OFB</a> (French Office for Biodiversity) and <a href=\"https://www.imft.fr\" target=\"_blank\">IMFT</a> (Fluids Mechanics Institute of Toulouse) and by <a href=\"http://g-eau.fr/index.php/en/\" target=\"_blank\">UMR G-EAU</a> (Joint Research Unit \"Water Management, Actors, Territories\").</p><p>It includes tools for designing fish crossing devices for upstream and downstream migrations, and hydraulic calculation tools useful for environmental and agricultural engineering.</p><p>For more information, consult <a href=\"assets/docs/en/mentions_legales.html\" target=\"_blank\">legal notice</a> and <a href=\"assets/docs/en/index.html\" target=\"_blank\">documentation</a>.</p>",
@@ -507,6 +509,10 @@
"INFO_YAXB_TITRE_COURT": "Linear f.",
"INFO_TRIGO_TITRE": "Trigonometric function",
"INFO_TRIGO_TITRE_COURT": "Trigo. f.",
+ "INFO_VERIFICATEUR_TITRE": "Fish pass verification",
+ "INFO_VERIFICATEUR_TITRE_COURT": "Verification",
+ "INFO_ESPECE_TITRE": "Fish species characteristics",
+ "INFO_ESPECE_TITRE_COURT": "Species",
"WARNING_WARNINGS_ABSTRACT": "%nb% warnings occurred during calculation",
"ERROR_JET_SUBMERGED_NO_SOLUTION": "There is no solution",
"WARNING_DEVER_ZDV_INF_ZR": "Apron elevation of structure #%number% is below river bed elevation",
@@ -518,9 +524,9 @@
"WARNING_STRUCTUREKIVI_PELLE_TROP_FAIBLE": "Threshold height should be greater than 0.1 m. Beta coefficient is forced to 0",
"WARNING_VANLEV_ZDV_INF_MIN": "Regulated weir: minimum sill elevation reached",
"WARNING_VANLEV_ZDV_SUP_MAX": "Regulated weir: maximum sill elevation reached",
- "WARNING_GRILLE_ALPHA_GREATER_THAN_45": "Recommendation for fish guiding : α ≤ 45°",
- "WARNING_GRILLE_BETA_GREATER_THAN_26": "Recommendation for fish guiding : β ≤ 26°",
- "WARNING_GRILLE_VN_GREATER_THAN_05": "Recommendation to prevent fish getting stuck on grid plan (physical barrier) or prematurely passing through the grid (behavioural barrier) : VN ≤ 0.5 m/s.<br>Above average value calculated here, refer to the recommendations taken from experimental caracterisation of effective speed values.",
+ "WARNING_GRILLE_ALPHA_GREATER_THAN_45": "Recommendation for fish guiding: α ≤ 45°",
+ "WARNING_GRILLE_BETA_GREATER_THAN_26": "Recommendation for fish guiding: β ≤ 26°",
+ "WARNING_GRILLE_VN_GREATER_THAN_05": "Recommendation to prevent fish getting stuck on grid plan (physical barrier) or prematurely passing through the grid (behavioural barrier): VN ≤ 0.5 m/s.<br>Above average value calculated here, refer to the recommendations taken from experimental caracterisation of effective speed values.",
"WARNING_LECHAPT_CALMON_SPEED_OUTSIDE_04_2": "This formula is discouraged for a speed that is not between 0.4 and 2 m/s",
"WARNING_UPSTREAM_BOTTOM_HIGHER_THAN_WATER": "Upstream water elevation is lower or equal to bottom elevation",
"WARNING_DOWNSTREAM_BOTTOM_HIGHER_THAN_WATER": "Downstream water elevation is lower or equal to bottom elevation",
@@ -547,5 +553,26 @@
"ERROR_PAR_A": "Height is outside validity interval [ %min%, %max% ]",
"WARNING_PAR_N_ROUNDED_TO_05": "Number of patterns was rounded to %val%",
"WARNING_PAR_M_ROUNDED_TO_1": "Number of longitudinal strips was rounded to %val%",
- "ERROR_PAR_M_GREATER_THAN_2_N": "Number of longitudinal strips exceeds 2N = %max%"
+ "ERROR_PAR_M_GREATER_THAN_2_N": "Number of longitudinal strips exceeds 2N = %max%",
+ "ERROR_VERIF_ERRORS_IN_PASS": "Pass to verify contains errors",
+ "ERROR_VERIF_MR_VMAX": "Maximum speed %V% too high (maximum: %maxV%)",
+ "ERROR_VERIF_MR_YMIN": "Water level %Y% too low (minimum: %minY%)",
+ "ERROR_VERIF_MRC_AT_LEAST_ONE_APRON": "None of the aprons is crossable",
+ "ERROR_VERIF_MRC_VMAX_APRON_N": "Apron #%N%: maximum speed %V% too high (maximum: %maxV%)",
+ "ERROR_VERIF_MRC_YMIN_APRON_N": "Apron #%N%: water level %Y% too low (minimum: %minY%)",
+ "ERROR_VERIF_NO_PRESET": "This species group is not compatible with this pass type",
+ "ERROR_VERIF_PAB_DHMAX": "Wall #%N%: fall %DH% too high (maximum: %maxDH%)",
+ "ERROR_VERIF_PAB_DHMAX_DW": "Downwall: fall %DH% too high (maximum: %maxDH%)",
+ "ERROR_VERIF_PAB_BMIN": "Wall #%NC%, structure %NS%: slot/weir width %L% too low (minimum: %minB%)",
+ "ERROR_VERIF_PAB_BMIN_DW": "Downwall, structure %NS%: slot/weir width %L% too low (minimum: %minB%)",
+ "ERROR_VERIF_PAB_JETS": "Wall #%N%: at least one jet of type %required% is required, jets of type %forbidden% are forbidden",
+ "ERROR_VERIF_PAB_JETS_DW": "Downwall: at least one jet of type %required% is required, jets of type %forbidden% are forbidden",
+ "ERROR_VERIF_PAB_LMIN": "Wall #%N%: basin length %LB% too low (minimum: %minLB%)",
+ "ERROR_VERIF_PAB_HMIN": "Wall #%NC%, structure %NS%: head on weir %h1% too low (minimum: %minH%)",
+ "ERROR_VERIF_PAB_HMIN_DW": "Downwall, structure %NS%: head on weir %h1% too low (minimum: %minH%)",
+ "ERROR_VERIF_PAB_YMOY": "Wall #%N%: basin depth %PB% too low (minimum: %minPB%)",
+ "ERROR_VERIF_PAB_YMOY_2_DH": "Wall #%N%: basin depth %PB% lower than 2x fall %DH%",
+ "ERROR_VERIF_PAR_DH": "Downstream pass fall prevents crossability",
+ "ERROR_VERIF_PAR_YMIN": "Water level %h% too low (minimum: %minY%)",
+ "WARNING_VERIF_PAR_SPECIES_GROUP": "Species groups 3a, 3b et 7b are discouraged for this pass type"
}
diff --git a/src/locale/messages.fr.json b/src/locale/messages.fr.json
index 78a9f5fc922525899c9558150679ec27fc16eb19..1fd1704a8aeaf0c9391e96508fd7aea3ac316286 100644
--- a/src/locale/messages.fr.json
+++ b/src/locale/messages.fr.json
@@ -491,6 +491,8 @@
"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_THEME_VERIFICATION_DESCRIPTION": "Outils de vérification des capacités de franchissement des passes par les différentes espèces de poissons",
+ "INFO_THEME_VERIFICATION_TITRE": "Vérification de passes",
"INFO_TITREJOURNAL": "Journal de calcul",
"INFO_TITREJOURNAL_GLOBAL": "Synthèse du journal de calcul",
"INFO_WELCOME_CONTENT": "<p>Le logiciel Cassiopée a été développé par le pôle R&D écohydraulique regroupant l'<a href=\"https://ofb.gouv.fr\" target=\"_blank\">OFB</a> (Office Français de la Biodiversité) et l’<a href=\"https://www.imft.fr\" target=\"_blank\">IMFT</a> (Institut de mécanique des fluides de Toulouse) et par l'<a href=\"http://g-eau.fr\" target=\"_blank\">UMR G-EAU</a> (UMR Gestion de l'Eau, Acteurs, Usages).</p><p>Il regroupe des outils d'aide à la conception des dispositifs de franchissement piscicoles pour la montaison et la dévalaison ainsi que des outils de calcul hydraulique utiles pour l'ingénierie en environnement et agriculture.</p><p>Pour plus d'informations, consulter les <a href=\"assets/docs/fr/mentions_legales.html\" target=\"_blank\">mentions légales</a> et la <a href=\"assets/docs/fr/index.html\" target=\"_blank\">documentation</a>.</p>",
@@ -507,6 +509,10 @@
"INFO_YAXB_TITRE_COURT": "F. affine",
"INFO_TRIGO_TITRE": "Fonction trigonométrique",
"INFO_TRIGO_TITRE_COURT": "F. trigo.",
+ "INFO_VERIFICATEUR_TITRE": "Vérification d'une passe",
+ "INFO_VERIFICATEUR_TITRE_COURT": "Vérification",
+ "INFO_ESPECE_TITRE": "Caractéristiques d'une espèce",
+ "INFO_ESPECE_TITRE_COURT": "Espèce",
"WARNING_WARNINGS_ABSTRACT": "%nb% avertissements rencontrés lors du calcul",
"ERROR_JET_SUBMERGED_NO_SOLUTION": "Il n'y a pas de solution",
"WARNING_DEVER_ZDV_INF_ZR": "La cote de radier de l'ouvrage n°%number% est sous la cote de fond du lit",
@@ -547,5 +553,26 @@
"ERROR_PAR_A": "La hauteur est en dehors de l'intervalle de validité [ %min%, %max% ]",
"WARNING_PAR_N_ROUNDED_TO_05": "Le nombre de motifs a été arrondi à %val%",
"WARNING_PAR_M_ROUNDED_TO_1": "Le nombre de bandes a été arrondi à %val%",
- "ERROR_PAR_M_GREATER_THAN_2_N": "Le nombre de bandes dépasse 2N = %max%"
+ "ERROR_PAR_M_GREATER_THAN_2_N": "Le nombre de bandes dépasse 2N = %max%",
+ "ERROR_VERIF_ERRORS_IN_PASS": "La passe à vérifier contient des erreurs",
+ "ERROR_VERIF_MR_VMAX": "Vitesse maximale %V% trop élevée (maximum: %maxV%)",
+ "ERROR_VERIF_MR_YMIN": "Tirant d'eau %Y% insuffisant (minimum: %minY%)",
+ "ERROR_VERIF_MRC_AT_LEAST_ONE_APRON": "Aucun des radiers n'est franchissable",
+ "ERROR_VERIF_MRC_VMAX_APRON_N": "Radier n°%N% : vitesse maximale %V% trop élevée (maximum: %maxV%)",
+ "ERROR_VERIF_MRC_YMIN_APRON_N": "Radier n°%N% : tirant d'eau %Y% insuffisant (minimum: %minY%)",
+ "ERROR_VERIF_NO_PRESET": "Ce groupe d'espèces n'est pas compatible avec ce type de passe",
+ "ERROR_VERIF_PAB_DHMAX": "Cloison n°%N% : chute %DH% trop importante (maximum: %maxDH%)",
+ "ERROR_VERIF_PAB_DHMAX_DW": "Cloison aval : chute %DH% trop importante (maximum: %maxDH%)",
+ "ERROR_VERIF_PAB_BMIN": "Cloison n°%NC%, ouvrage %NS% : largeur de l'échancrure ou de la fente %L% insuffisante (minimum: %minB%)",
+ "ERROR_VERIF_PAB_BMIN_DW": "Cloison aval, ouvrage %NS% : largeur de l'échancrure ou de la fente %L% insuffisante (minimum: %minB%)",
+ "ERROR_VERIF_PAB_JETS": "Cloison n°%N% : au moins un jet de type %required% requis, jets de type %forbidden% interdits",
+ "ERROR_VERIF_PAB_JETS_DW": "Cloison aval : au moins un jet de type %required% requis, jets de type %forbidden% interdits",
+ "ERROR_VERIF_PAB_LMIN": "Cloison n°%N% : longueur de bassin %LB% insuffisante (minimum: %minLB%)",
+ "ERROR_VERIF_PAB_HMIN": "Cloison n°%NC%, ouvrage %NS% : charge sur l'échancrure %h1% insuffisante (minimum: %minH%)",
+ "ERROR_VERIF_PAB_HMIN_DW": "Cloison aval, ouvrage %NS% : charge sur l'échancrure %h1% insuffisante (minimum: %minH%)",
+ "ERROR_VERIF_PAB_YMOY": "Cloison n°%N% : profondeur de bassin %PB% insuffisante (minimum: %minPB%)",
+ "ERROR_VERIF_PAB_YMOY_2_DH": "Cloison n°%N% : profondeur de bassin %PB% inférieure à 2x la chute %DH%",
+ "ERROR_VERIF_PAR_DH": "La chute en pied de passe empêche le franchissement",
+ "ERROR_VERIF_PAR_YMIN": "Tirant d'eau %h% insuffisant (minimum: %minY%)",
+ "WARNING_VERIF_PAR_SPECIES_GROUP": "Les groupes d'espèces 3a, 3b et 7b sont déconseillés pour ce type de passe"
}