From 77777a29ffde76ee083e5783d95c078db7e7ea39 Mon Sep 17 00:00:00 2001
From: Jean-Pascal <jean-pascal.aubry@inrae.fr>
Date: Fri, 15 Dec 2023 16:25:23 +0000
Subject: [PATCH 1/3] fix: verification title updated Refs #643
---
src/locale/messages.en.json | 2 +-
src/locale/messages.fr.json | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/locale/messages.en.json b/src/locale/messages.en.json
index 46a339559..8a00fbdb1 100755
--- a/src/locale/messages.en.json
+++ b/src/locale/messages.en.json
@@ -643,7 +643,7 @@
"INFO_THEME_PASSE_NATURELLE_DESCRIPTION": "Tools for sizing a evenly distributed macro-roughnesses pass in rockfill or prefabricated",
"INFO_THEME_PASSE_NATURELLE_TITRE": "Evenly distributed macro-roughness fish pass",
"INFO_THEME_VERIFICATION_DESCRIPTION": "Tools for verifying fish passes crossing capabilities by different fish species",
- "INFO_THEME_VERIFICATION_TITRE": "Fish passes verification",
+ "INFO_THEME_VERIFICATION_TITRE": "Verification of crossing criteria",
"INFO_TITREJOURNAL": "Calculation log",
"INFO_TITREJOURNAL_GLOBAL": "Calculation log synthesis",
"INFO_WELCOME_CONTENT": "<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>",
diff --git a/src/locale/messages.fr.json b/src/locale/messages.fr.json
index d305b2ecc..ae15f4861 100755
--- a/src/locale/messages.fr.json
+++ b/src/locale/messages.fr.json
@@ -644,7 +644,7 @@
"INFO_THEME_PASSE_NATURELLE_DESCRIPTION": "Outils de dimensionnement d'une passe à poissons de type passe à macro-rugosités régulièrement réparties en enrochements ou préfabriquées",
"INFO_THEME_PASSE_NATURELLE_TITRE": "Passes à macro-rugosités régulièrement réparties",
"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_THEME_VERIFICATION_TITRE": "Vérification des critères de franchissement",
"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>",
--
GitLab
From 2c6061b3ef09156fbe78d65d9a89cecb738215cf Mon Sep 17 00:00:00 2001
From: Jean-Pascal <jean-pascal.aubry@inrae.fr>
Date: Mon, 8 Jan 2024 10:37:29 +0000
Subject: [PATCH 2/3] docs: update description of crossability verification
module and add warning in crossability verification doc Refs #643
---
docs/en/calculators/verif/principe.md | 6 ++++++
docs/fr/calculators/verif/principe.md | 6 ++++++
src/locale/messages.en.json | 4 ++--
src/locale/messages.fr.json | 2 +-
4 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/docs/en/calculators/verif/principe.md b/docs/en/calculators/verif/principe.md
index a26143330..3ff28f5b1 100644
--- a/docs/en/calculators/verif/principe.md
+++ b/docs/en/calculators/verif/principe.md
@@ -1,5 +1,11 @@
# Crossability verification
+## Warning
+
+The purpose of this tool is to carry out a simple check of the compatibility between certain fish pass sizing criteria and the passage capacities of the target fish species. It may prove useful during the design phase of a facility to ensure that the proposed design is consistent with its hydrological operating range.
+
+However, this tool is not sufficient to fully verify the functionality of a planned or existing system, insofar as other important dimensional and hydraulic criteria are not taken into account by this module (feed flow rate and characteristics of the fish intake in terms of attractiveness, and depending on the type of system: basin aspect ratio, concentration of macro-roughness, bottom roughness, size of humps, etc.).
+
This module allows to verify the capacity of different fish species to cross the following types of fish passes:
- [fish ladders](pab.md)
diff --git a/docs/fr/calculators/verif/principe.md b/docs/fr/calculators/verif/principe.md
index bce6ec0e9..02bee8061 100644
--- a/docs/fr/calculators/verif/principe.md
+++ b/docs/fr/calculators/verif/principe.md
@@ -1,5 +1,11 @@
# Vérification des critères de franchissement
+## Avertissement
+
+Cet outil a pour objectif de réaliser une vérification simple de la compatibilité entre certains critères de dimensionnement des passes à poissons et les capacités de franchissement des espèces de poissons cibles. Il peut s'avérer utile lors de la phase de conception d'un dispositif afin de s’assurer de la cohérence du dimensionnement projeté sur sa plage de fonctionnement hydrologique.
+
+Cet outil n’est cependant pas suffisant pour la vérification complète de la fonctionnalité d’un dispositif projeté ou déjà réalisé, dans la mesure où d’autres critères importants, dimensionnels et hydrauliques, ne sont pas pris en compte par ce module (débit d'alimentation et caractéristique de l’entrée piscicole vis-à -vis de l'attractivité, et selon les types de dispositif : rapport de forme des bassins, concentration des macrorugosités, rugosités de fond, taille des ralentisseurs…).
+
Cet outil permet de vérifier la capacité des différentes espèces de poissons à franchir les types de passes suivants :
- [passes à bassins](pab.md)
diff --git a/src/locale/messages.en.json b/src/locale/messages.en.json
index 8a00fbdb1..33c9c8bf6 100755
--- a/src/locale/messages.en.json
+++ b/src/locale/messages.en.json
@@ -642,8 +642,8 @@
"INFO_THEME_PASSE_A_RALENTISSEURS_DESCRIPTION": "Baffle fishway",
"INFO_THEME_PASSE_NATURELLE_DESCRIPTION": "Tools for sizing a evenly distributed macro-roughnesses pass in rockfill or prefabricated",
"INFO_THEME_PASSE_NATURELLE_TITRE": "Evenly distributed macro-roughness fish pass",
- "INFO_THEME_VERIFICATION_DESCRIPTION": "Tools for verifying fish passes crossing capabilities by different fish species",
- "INFO_THEME_VERIFICATION_TITRE": "Verification of crossing criteria",
+ "INFO_THEME_VERIFICATION_DESCRIPTION": "The purpose of this tool is to carry out a simple check of the compatibility between certain fish pass sizing criteria and the passage capacities of the target fish species. It may prove useful during the design phase of a facility to ensure that the proposed design is consistent with its hydrological operating range",
+ "INFO_THEME_VERIFICATION_TITRE": "Crossability verification",
"INFO_TITREJOURNAL": "Calculation log",
"INFO_TITREJOURNAL_GLOBAL": "Calculation log synthesis",
"INFO_WELCOME_CONTENT": "<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>",
diff --git a/src/locale/messages.fr.json b/src/locale/messages.fr.json
index ae15f4861..362841cf7 100755
--- a/src/locale/messages.fr.json
+++ b/src/locale/messages.fr.json
@@ -643,7 +643,7 @@
"INFO_THEME_PASSE_A_RALENTISSEURS_DESCRIPTION": "Passe à ralentisseurs",
"INFO_THEME_PASSE_NATURELLE_DESCRIPTION": "Outils de dimensionnement d'une passe à poissons de type passe à macro-rugosités régulièrement réparties en enrochements ou préfabriquées",
"INFO_THEME_PASSE_NATURELLE_TITRE": "Passes à macro-rugosités régulièrement réparties",
- "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_DESCRIPTION": "Cet outil a pour objectif de réaliser une vérification simple de la compatibilité entre certains critères de dimensionnement des passes à poissons et les capacités de franchissement des espèces de poissons cibles. Il peut s'avérer utile lors de la phase de conception d'un dispositif afin de s’assurer de la cohérence du dimensionnement projeté sur sa plage de fonctionnement hydrologique",
"INFO_THEME_VERIFICATION_TITRE": "Vérification des critères de franchissement",
"INFO_TITREJOURNAL": "Journal de calcul",
"INFO_TITREJOURNAL_GLOBAL": "Synthèse du journal de calcul",
--
GitLab
From c7cef977be326851a29a29933f46812b1ac55285 Mon Sep 17 00:00:00 2001
From: David Dorchies <david.dorchies@inrae.fr>
Date: Mon, 8 Jan 2024 17:15:13 +0100
Subject: [PATCH 3/3] docs(verificateur): spelling
Refs #643
---
docs/en/calculators/verif/principe.md | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/docs/en/calculators/verif/principe.md b/docs/en/calculators/verif/principe.md
index 3ff28f5b1..8139905b8 100644
--- a/docs/en/calculators/verif/principe.md
+++ b/docs/en/calculators/verif/principe.md
@@ -2,9 +2,18 @@
## Warning
-The purpose of this tool is to carry out a simple check of the compatibility between certain fish pass sizing criteria and the passage capacities of the target fish species. It may prove useful during the design phase of a facility to ensure that the proposed design is consistent with its hydrological operating range.
-
-However, this tool is not sufficient to fully verify the functionality of a planned or existing system, insofar as other important dimensional and hydraulic criteria are not taken into account by this module (feed flow rate and characteristics of the fish intake in terms of attractiveness, and depending on the type of system: basin aspect ratio, concentration of macro-roughness, bottom roughness, size of humps, etc.).
+The purpose of this tool is to carry out a simple check of the compatibility
+between certain fish pass sizing criteria and the passage capacities of the
+target fish species.
+It may prove useful during the design phase of a facility to ensure that the
+proposed design is consistent with its hydrological operating range.
+
+However, this tool is not sufficient to fully verify the functionality of a
+planned or existing system, insofar as other important dimensional and
+hydraulic criteria are not taken into account by this module
+(feed flow rate and characteristics of the fish intake in terms of attractiveness,
+and depending on the type of system: basin aspect ratio,
+concentration of macro-roughness, bottom roughness, size of baffles, etc.).
This module allows to verify the capacity of different fish species to cross the following types of fish passes:
--
GitLab