From 5720a0202296321148a0747d8399ce708e110305 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grand?= <francois.grand@inrae.fr>
Date: Mon, 13 Jun 2022 09:30:28 +0200
Subject: [PATCH 1/3] update jalhyd_branch
---
jalhyd_branch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/jalhyd_branch b/jalhyd_branch
index 227bffb5c..7225ffa2d 100644
--- a/jalhyd_branch
+++ b/jalhyd_branch
@@ -1 +1 @@
-311-parametres-lies-ameliorer-les-informations-sur-la-cible
+314-structure-modification-de-l-avertissement-ennoiement
--
GitLab
From 0cf7ba5cf8a3bf293dd3860e19cce1ced93160e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grand?= <francois.grand@inrae.fr>
Date: Mon, 13 Jun 2022 12:09:52 +0200
Subject: [PATCH 2/3] feat: display submergence factor in result messages
refs #520
---
src/locale/messages.en.json | 10 +++++-----
src/locale/messages.fr.json | 10 +++++-----
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/locale/messages.en.json b/src/locale/messages.en.json
index 649e9e7c1..c93dd4e38 100755
--- a/src/locale/messages.en.json
+++ b/src/locale/messages.en.json
@@ -2,11 +2,11 @@
"ERROR_AT_LEAST_ONE_OF_THOSE_MUST_BE_DEFINED": "At least one of the following values should be specified : %variables%",
"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)",
- "WARNING_ORIFICE_FREE_DOWNSTREAM_ELEVATION_POSSIBLE_SUBMERSION": "Downstream elevation is higher than orifice center elevation (possible submersion)",
- "WARNING_NOTCH_SUBMERSION_GREATER_THAN_07": "Notch formula is discouraged when submersion is greater than 0.7",
- "WARNING_SLOT_SUBMERSION_NOT_BETWEEN_07_AND_09": "Slot formula is discouraged when submersion is lower than 0.7 or greater than 0.9",
- "WARNING_WEIR_SUBMERSION_LOWER_THAN_08": "Submerged weir formula is discouraged when submersion is lower than 08",
+ "WARNING_DOWNSTREAM_ELEVATION_POSSIBLE_SUBMERSION": "Downstream elevation is higher than weir elevation (%submersionPerc%% submersion)",
+ "WARNING_ORIFICE_FREE_DOWNSTREAM_ELEVATION_POSSIBLE_SUBMERSION": "Downstream elevation is higher than orifice center elevation (%submersionPerc%% submersion)",
+ "WARNING_NOTCH_SUBMERSION_GREATER_THAN_07": "Notch submergence (%submersionPerc%%) is higher than recommended boundary (70%)",
+ "WARNING_SLOT_SUBMERSION_NOT_BETWEEN_07_AND_09": "Slot submergence (%submersionPerc%%) is not in the recommended boundaries (70 to 90%)",
+ "WARNING_WEIR_SUBMERSION_LOWER_THAN_08": "Weir submergence factor (%submersionPerc%%) is lower than the recommended boundary (80%)",
"WARNING_INFO_COUNT_SHORT": "%d info(s)",
"WARNING_WARNING_COUNT_SHORT": "%d warning(s)",
"WARNING_ERROR_COUNT_SHORT": "%d error(s)",
diff --git a/src/locale/messages.fr.json b/src/locale/messages.fr.json
index cb3e769e6..378b61fbe 100755
--- a/src/locale/messages.fr.json
+++ b/src/locale/messages.fr.json
@@ -2,11 +2,11 @@
"ERROR_AT_LEAST_ONE_OF_THOSE_MUST_BE_DEFINED": "Au moins une des valeurs suivantes doit être renseignée : %variables%",
"ERROR_CLOISON_AVAL_UN_OUVRAGE_REGULE": "Un seul ouvrage régulé est autorisé sur la cloison aval",
"WARNING_DEVER_ZR_SUP_Z1": "La cote du lit du cours d'eau ne peut pas être supérieure à la cote de l'eau : Impossible de calculer l'énergie cinétique",
- "WARNING_DOWNSTREAM_ELEVATION_POSSIBLE_SUBMERSION": "La cote de l'eau aval est plus élevée que la cote du seuil (ennoiement possible)",
- "WARNING_ORIFICE_FREE_DOWNSTREAM_ELEVATION_POSSIBLE_SUBMERSION": "La cote de l'eau aval est plus élevée que la cote du centre de l'orifice (ennoiement possible)",
- "WARNING_NOTCH_SUBMERSION_GREATER_THAN_07": "La formule de l'échancrure n'est pas conseillée pour un ennoiement supérieur à 0.7",
- "WARNING_SLOT_SUBMERSION_NOT_BETWEEN_07_AND_09": "La formule de la fente n'est pas conseillée pour un ennoiement inférieur à 0.7 et supérieur à 0.9",
- "WARNING_WEIR_SUBMERSION_LOWER_THAN_08": "La formule du seuil noyé n'est pas conseillé pour un ennoiement inférieur à 0.8",
+ "WARNING_DOWNSTREAM_ELEVATION_POSSIBLE_SUBMERSION": "La cote de l'eau aval est plus élevée que la cote du seuil (ennoiement %submersionPerc% %)",
+ "WARNING_ORIFICE_FREE_DOWNSTREAM_ELEVATION_POSSIBLE_SUBMERSION": "La cote de l'eau aval est plus élevée que la cote du centre de l'orifice (ennoiement %submersionPerc% %)",
+ "WARNING_NOTCH_SUBMERSION_GREATER_THAN_07": "L'ennoiement de l'échancrure (%submersionPerc% %) est supérieur à la limite conseillée de 70 %",
+ "WARNING_SLOT_SUBMERSION_NOT_BETWEEN_07_AND_09": "L'ennoiement de la fente (%submersionPerc% %) ne se situe pas entre les valeurs limites conseillées de 70 à 90 %",
+ "WARNING_WEIR_SUBMERSION_LOWER_THAN_08": "L'ennoiement du seuil noyé (%submersionPerc% %) est inférieur à la limite conseillée de 80% ",
"WARNING_INFO_COUNT_SHORT": "%d info(s)",
"WARNING_WARNING_COUNT_SHORT": "%d avertissement(s)",
"WARNING_ERROR_COUNT_SHORT": "%d erreur(s)",
--
GitLab
From 4ded1b310aab7fc9bad83047691475661de62c53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grand?= <francois.grand@inrae.fr>
Date: Mon, 13 Jun 2022 13:10:43 +0200
Subject: [PATCH 3/3] fix: replace "submersion" by "submergence" where
appropriate
refs #520
---
src/locale/messages.en.json | 10 +++++-----
src/locale/messages.fr.json | 10 +++++-----
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/locale/messages.en.json b/src/locale/messages.en.json
index c93dd4e38..7464a98ee 100755
--- a/src/locale/messages.en.json
+++ b/src/locale/messages.en.json
@@ -2,11 +2,11 @@
"ERROR_AT_LEAST_ONE_OF_THOSE_MUST_BE_DEFINED": "At least one of the following values should be specified : %variables%",
"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 (%submersionPerc%% submersion)",
- "WARNING_ORIFICE_FREE_DOWNSTREAM_ELEVATION_POSSIBLE_SUBMERSION": "Downstream elevation is higher than orifice center elevation (%submersionPerc%% submersion)",
- "WARNING_NOTCH_SUBMERSION_GREATER_THAN_07": "Notch submergence (%submersionPerc%%) is higher than recommended boundary (70%)",
- "WARNING_SLOT_SUBMERSION_NOT_BETWEEN_07_AND_09": "Slot submergence (%submersionPerc%%) is not in the recommended boundaries (70 to 90%)",
- "WARNING_WEIR_SUBMERSION_LOWER_THAN_08": "Weir submergence factor (%submersionPerc%%) is lower than the recommended boundary (80%)",
+ "WARNING_DOWNSTREAM_ELEVATION_POSSIBLE_SUBMERSION": "Downstream elevation is higher than weir elevation (%submergencePerc%% submergence)",
+ "WARNING_ORIFICE_FREE_DOWNSTREAM_ELEVATION_POSSIBLE_SUBMERSION": "Downstream elevation is higher than orifice center elevation (%submergencePerc%% submergence)",
+ "WARNING_NOTCH_SUBMERGENCE_GREATER_THAN_07": "Notch submergence (%submergencePerc%%) is higher than recommended boundary (70%)",
+ "WARNING_SLOT_SUBMERGENCE_NOT_BETWEEN_07_AND_09": "Slot submergence (%submergencePerc%%) is not in the recommended boundaries (70 to 90%)",
+ "WARNING_WEIR_SUBMERGENCE_LOWER_THAN_08": "Weir submergence factor (%submergencePerc%%) is lower than the recommended boundary (80%)",
"WARNING_INFO_COUNT_SHORT": "%d info(s)",
"WARNING_WARNING_COUNT_SHORT": "%d warning(s)",
"WARNING_ERROR_COUNT_SHORT": "%d error(s)",
diff --git a/src/locale/messages.fr.json b/src/locale/messages.fr.json
index 378b61fbe..87081356c 100755
--- a/src/locale/messages.fr.json
+++ b/src/locale/messages.fr.json
@@ -2,11 +2,11 @@
"ERROR_AT_LEAST_ONE_OF_THOSE_MUST_BE_DEFINED": "Au moins une des valeurs suivantes doit être renseignée : %variables%",
"ERROR_CLOISON_AVAL_UN_OUVRAGE_REGULE": "Un seul ouvrage régulé est autorisé sur la cloison aval",
"WARNING_DEVER_ZR_SUP_Z1": "La cote du lit du cours d'eau ne peut pas être supérieure à la cote de l'eau : Impossible de calculer l'énergie cinétique",
- "WARNING_DOWNSTREAM_ELEVATION_POSSIBLE_SUBMERSION": "La cote de l'eau aval est plus élevée que la cote du seuil (ennoiement %submersionPerc% %)",
- "WARNING_ORIFICE_FREE_DOWNSTREAM_ELEVATION_POSSIBLE_SUBMERSION": "La cote de l'eau aval est plus élevée que la cote du centre de l'orifice (ennoiement %submersionPerc% %)",
- "WARNING_NOTCH_SUBMERSION_GREATER_THAN_07": "L'ennoiement de l'échancrure (%submersionPerc% %) est supérieur à la limite conseillée de 70 %",
- "WARNING_SLOT_SUBMERSION_NOT_BETWEEN_07_AND_09": "L'ennoiement de la fente (%submersionPerc% %) ne se situe pas entre les valeurs limites conseillées de 70 à 90 %",
- "WARNING_WEIR_SUBMERSION_LOWER_THAN_08": "L'ennoiement du seuil noyé (%submersionPerc% %) est inférieur à la limite conseillée de 80% ",
+ "WARNING_DOWNSTREAM_ELEVATION_POSSIBLE_SUBMERSION": "La cote de l'eau aval est plus élevée que la cote du seuil (ennoiement %submergencePerc% %)",
+ "WARNING_ORIFICE_FREE_DOWNSTREAM_ELEVATION_POSSIBLE_SUBMERSION": "La cote de l'eau aval est plus élevée que la cote du centre de l'orifice (ennoiement %submergencePerc% %)",
+ "WARNING_NOTCH_SUBMERGENCE_GREATER_THAN_07": "L'ennoiement de l'échancrure (%submergencePerc% %) est supérieur à la limite conseillée de 70 %",
+ "WARNING_SLOT_SUBMERGENCE_NOT_BETWEEN_07_AND_09": "L'ennoiement de la fente (%submergencePerc% %) ne se situe pas entre les valeurs limites conseillées de 70 à 90 %",
+ "WARNING_WEIR_SUBMERGENCE_LOWER_THAN_08": "L'ennoiement du seuil noyé (%submergencePerc% %) est inférieur à la limite conseillée de 80% ",
"WARNING_INFO_COUNT_SHORT": "%d info(s)",
"WARNING_WARNING_COUNT_SHORT": "%d avertissement(s)",
"WARNING_ERROR_COUNT_SHORT": "%d erreur(s)",
--
GitLab