diff --git a/jalhyd_branch b/jalhyd_branch
index 857711bb63024853c37ce7fa23d2d0e7534a27d8..35ca24e720fab4559e49f0f1e70f3929aa8583bd 100644
--- a/jalhyd_branch
+++ b/jalhyd_branch
@@ -1 +1 @@
-369-solveur-absence-de-message-d-erreur-a-la-non-convergence
+379-rugofond-ajouter-un-avertissement-sur-les-lignes-d-eau-trop-elevees
diff --git a/src/app/calculators/cloisons/en.json b/src/app/calculators/cloisons/en.json
index 16d63c6461820ca6ff4ec716ce47d7ab84219ee8..0ea3a154ca4d47a24b61ece8ed1035a616f878a2 100644
--- a/src/app/calculators/cloisons/en.json
+++ b/src/app/calculators/cloisons/en.json
@@ -1,12 +1,5 @@
{
"Q": "Total discharge",
"P": "Sill",
- "W": "Gate opening",
-
- "UNIT_Q": "m³/s",
- "UNIT_YMOY": "m",
- "UNIT_ZDV": "m",
- "UNIT_P": "m",
- "UNIT_H2": "m",
- "UNIT_SUBMERGENCE": "%"
+ "W": "Gate opening"
}
\ No newline at end of file
diff --git a/src/app/calculators/cloisons/fr.json b/src/app/calculators/cloisons/fr.json
index 8bbc3d0d02f49f90b4cb17fa56bf2ac53ebb14c4..f192e3561d3e16cb46f8d552e5a0ab6e19dc65bd 100644
--- a/src/app/calculators/cloisons/fr.json
+++ b/src/app/calculators/cloisons/fr.json
@@ -1,12 +1,5 @@
{
"Q": "Débit total",
"P": "Pelle",
- "W": "Ouverture de vanne",
-
- "UNIT_Q": "m³/s",
- "UNIT_YMOY": "m",
- "UNIT_ZDV": "m",
- "UNIT_P": "m",
- "UNIT_H2": "m",
- "UNIT_SUBMERGENCE": "%"
+ "W": "Ouverture de vanne"
}
\ No newline at end of file
diff --git a/src/locale/messages.en.json b/src/locale/messages.en.json
index dbd8ab0b76eb10773867561d1520dc4c3e991f87..69a48fd7e1baf297974179fd5e423a7753ffdc7e 100755
--- a/src/locale/messages.en.json
+++ b/src/locale/messages.en.json
@@ -82,8 +82,6 @@
"ERROR_STRUCTURE_Q_TROP_ELEVE": "The flow passing through the other devices is too high: the requested parameter is not calculable.",
"ERROR_STRUCTURE_ZDV_PAS_CALCULABLE": "Parameter \"Crest elevation\" cannot be calculated with this discharge law",
"ERROR_STRUCTURE_Z_EGAUX_Q_NON_NUL": "Upstream and downstream elevations are equal but flow is not null",
- "WARNING_COEF_DEBIT_NULL": "Apron n°%number%: Value of calculated parameter is null when discharge coefficient is null",
- "ERROR_D65_NULL": "Calculation is impossible when d65 is null",
"INFO_CALCULATOR_CALC_NAME": "Calculator name",
"INFO_CALCULATOR_CALCULER": "Compute",
"INFO_CALCULATOR_CLONE": "Duplicate",
@@ -723,8 +721,11 @@
"WARNING_SESSION_LOAD_NOTES_MERGED": "Notes have been merged",
"WARNING_VALUE_ROUNDED_TO_INTEGER": "Value of %symbol% was rounded to %rounded%",
"WARNING_VARIATED_LENGTH_LIMITED_BY_LINKED_RESULT": "Number of results is limited by linked result %symbol%",
- "WARNING_ELEVATION_Z1_LOWER_THAN_ZF1": "Apron n°%number%: calculated flow is null because upstream elevation is lower than the upstream bottom elevation of the ramp",
- "WARNING_ELEVATION_Z1_EQUAL_TO_ZF1": "Apron n°%number%: calculated flow is null because upstream elevation is equal to the upstream bottom elevation of the ramp",
+ "ERROR_RUGOFOND_WATERLINE_TOO_HIGHT": "Apron n°%number%: The water level upstream of the pass deduced from the normal depth (%YnValue%m) is higher than the water level upstream of the pass (%elevation%m), flow through the pass is impossible.",
+ "WARNING_RUGOFOND_SLOPE_OUT_OF_RANGE": "The slope of the pass (%slope%%) is outside the range of validity of the normal depth formula (2 to 15%)",
+ "WARNING_RUGOFOND_WATERLINE_TOO_HIGHT": "Apron n°%number%: The water level upstream of the fish pass deduced from the normal depth (%YnValue%m) is higher than the critical level (%criticalElevation%m). The weir upstream of the fish pass is likely to no longer be in free flow.",
+ "WARNING_RUGOFOND_MULTIPLE_ELEVATION_Z1_LOWER_THAN_ZF1": "Apron n°%number%: calculated flow is null because upstream elevation is lower than the upstream bottom elevation of the ramp",
+ "WARNING_RUGOFOND_MULTIPLE_ELEVATION_Z1_EQUAL_TO_ZF1": "Apron n°%number%: calculated flow is null because upstream elevation is equal to the upstream bottom elevation of the ramp",
"ERROR_PAR_P_DEVIATES_MORE_THAN_10_5_PCT": "Given spacing value is more than 10% lower or more than 5% greater than standard value %stdP%",
"ERROR_PAR_QSTAR_OUT_OF_RANGE": "Flow value %val% is outside of validity interval [ %min%, %max% ] given by abacuses",
"ERROR_PAR_HA_OUT_OF_RANGE": "Upstream head value %val% is outside of validity interval [ %min%, %max% ] given by abacuses",
diff --git a/src/locale/messages.fr.json b/src/locale/messages.fr.json
index 6cd1dae1a980ad64b1de2e4b1e483109d90e69ac..a7bfbdfd0eb8f3b1cc1c1dd57233a4c17682f329 100755
--- a/src/locale/messages.fr.json
+++ b/src/locale/messages.fr.json
@@ -82,8 +82,6 @@
"ERROR_STRUCTURE_Q_TROP_ELEVE": "Le débit passant par les autres ouvrages est trop élevé : le paramètre demandé n'est pas calculable.",
"ERROR_STRUCTURE_ZDV_PAS_CALCULABLE": "Le paramètre \"Cote de radier\" ne peut pas être calculé avec cette loi de débit",
"ERROR_STRUCTURE_Z_EGAUX_Q_NON_NUL": "Les cotes amont aval sont égales et le débit n'est pas nul",
- "WARNING_COEF_DEBIT_NULL": "Radier n°%number%: valeur du parametre calculé nul car le coefficient de débit est nul",
- "ERROR_D65_NULL": "Le calcul impossible à cause d'un d65 nul",
"INFO_CALCULATOR_CALC_NAME": "Nom du module de calcul",
"INFO_CALCULATOR_CALCULER": "Calculer",
"INFO_CALCULATOR_CLONE": "Dupliquer",
@@ -726,8 +724,11 @@
"WARNING_SESSION_LOAD_NOTES_MERGED": "Les notes ont été fusionnées",
"WARNING_VALUE_ROUNDED_TO_INTEGER": "La valeur de %symbol% a été arrondie à %rounded%",
"WARNING_VARIATED_LENGTH_LIMITED_BY_LINKED_RESULT": "Le nombre de résultats est limité par le résultat lié %symbol%",
- "WARNING_ELEVATION_Z1_LOWER_THAN_ZF1": "Radier n°%number%: le débit calculé est nul car la cote amont est plus basse que la cote de fond amont de la rampe",
- "WARNING_ELEVATION_Z1_EQUAL_TO_ZF1": "Radier n°%number%: le débit calculé est nul car la cote de l'eau amont est égale à la cote de fond amont de la rampe",
+ "ERROR_RUGOFOND_WATERLINE_TOO_HIGHT": "Radier n°%number%: La cote de l'eau amont de la passe déduite du tirant d'eau normal (%YnValue%m) est supérieure à la cote de l'eau amont de la passe (%elevation%m), l'écoulement dans la passe est impossible.",
+ "WARNING_RUGOFOND_SLOPE_OUT_OF_RANGE": "La pente de la passe (%slope%%) est en dehors du domaine de validité de la formule du tirant d'eau normal (2 à 15 %)",
+ "WARNING_RUGOFOND_WATERLINE_TOO_HIGHT": "Radier n°%number%: La cote de l'eau amont de la passe déduite du tirant d'eau normal (%YnValue%m) est supérieure à la cote critique (%criticalElevation%m). Le déversoir à l'amont de la passe est susceptible de ne plus être dénoyé.",
+ "WARNING_RUGOFOND_MULTIPLE_ELEVATION_Z1_LOWER_THAN_ZF1": "Radier n°%number%: le débit calculé est nul car la cote amont est plus basse que la cote de fond amont de la rampe",
+ "WARNING_RUGOFOND_MULTIPLE_ELEVATION_Z1_EQUAL_TO_ZF1": "Radier n°%number%: le débit calculé est nul car la cote de l'eau amont est égale à la cote de fond amont de la rampe",
"ERROR_PAR_P_DEVIATES_MORE_THAN_10_5_PCT": "La valeur d'espacement fournie est plus de 10% plus petite ou plus de 5% plus grande que la valeur standard %stdP%",
"ERROR_PAR_QSTAR_OUT_OF_RANGE": "La valeur %val% du débit sort de l'intervalle de validité [ %min%, %max% ] donné par les abaques",
"ERROR_PAR_HA_OUT_OF_RANGE": "La valeur %val% de la charge amont sort de l'intervalle de validité [ %min%, %max% ] donné par les abaques",