Skip to content
Snippets Groups Projects
Commit 43e0aedc authored by mathias.chouet's avatar mathias.chouet
Browse files

Fix #297 - SectionParametree 

replaced Yf & Yt with Ycor
renamed Yco to Ycon
linked doc to CourbeRemous target selector
parent 39b85249
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 68 additions and 67 deletions
docs-fr/calculators/hsl/var_hydrauliques.md
+ 2
− 4
View file @ 43e0aedc
...@@ -117,11 +117,9 @@ avec : ...@@ -117,11 +117,9 @@ avec :
* \(f(h_k) = \dfrac{Q^2 B}{g S^3} - 1\) * \(f(h_k) = \dfrac{Q^2 B}{g S^3} - 1\)
* \(f'(h_k) = \dfrac{Q^2}{g} \dfrac{B'.S - 3 B S'}{S^4}\) * \(f'(h_k) = \dfrac{Q^2}{g} \dfrac{B'.S - 3 B S'}{S^4}\)
## Tirant d'eau fluvial Yf ## Tirant d'eau correspondant Ycor
## Tirant d'eau torrentiel Yt ## Tirant d'eau conjugué Ycon
## Tirant d'eau conjugué Yco
## Charge spécifique Hs ## Charge spécifique Hs
......
src/app/calculators/remous/remous.config.json
+ 21
− 4
View file @ 43e0aedc
...@@ -64,7 +64,25 @@ ...@@ -64,7 +64,25 @@
{ {
"id": "select_target", "id": "select_target",
"type": "select", "type": "select",
"source": "remous_target" "source": "remous_target",
"help": {
"B": "hsl/var_hydrauliques.html#largeur-au-miroir-b",
"P": "hsl/var_hydrauliques.html#perimetre-mouille-p",
"S": "hsl/var_hydrauliques.html#surface-mouillee-s",
"R": "hsl/var_hydrauliques.html#rayon-hydraulique-r",
"Fr": "hsl/var_hydrauliques.html#froude-fr",
"V": "hsl/var_hydrauliques.html#vitesse-moyenne-v",
"Yn": "hsl/var_hydrauliques.html#tirant-deau-normal-yn",
"Yc": "hsl/var_hydrauliques.html#tirant-deau-critique-yc",
"Ycor": "hsl/var_hydrauliques.html#tirant-deau-correspondant-ycor",
"Ycon": "hsl/var_hydrauliques.html#tirant-deau-conjugue-ycon",
"Hs": "hsl/var_hydrauliques.html#charge-specifique-hs",
"Hsc": "hsl/var_hydrauliques.html#charge-critique-hsc",
"J": "hsl/var_hydrauliques.html#perte-de-charge-j",
"I-J": "hsl/var_hydrauliques.html#variation-lineaire-de-lenergie-specifique-i-j",
"Imp": "hsl/var_hydrauliques.html#impulsion-imp",
"Tau0": "hsl/var_hydrauliques.html#force-tractrice-tau0"
}
} }
] ]
}, },
...@@ -84,9 +102,8 @@ ...@@ -84,9 +102,8 @@
"V": "hsl/var_hydrauliques.html#vitesse-moyenne-v", "V": "hsl/var_hydrauliques.html#vitesse-moyenne-v",
"Yn": "hsl/var_hydrauliques.html#tirant-deau-normal-yn", "Yn": "hsl/var_hydrauliques.html#tirant-deau-normal-yn",
"Yc": "hsl/var_hydrauliques.html#tirant-deau-critique-yc", "Yc": "hsl/var_hydrauliques.html#tirant-deau-critique-yc",
"Yt": "hsl/var_hydrauliques.html#tirant-deau-torrentiel-yt", "Ycor": "hsl/var_hydrauliques.html#tirant-deau-correspondant-ycor",
"Yf": "hsl/var_hydrauliques.html#tirant-deau-fluvial-yf", "Ycon": "hsl/var_hydrauliques.html#tirant-deau-conjugue-ycon",
"Yco": "hsl/var_hydrauliques.html#tirant-deau-conjugue-yco",
"Hs": "hsl/var_hydrauliques.html#charge-specifique-hs", "Hs": "hsl/var_hydrauliques.html#charge-specifique-hs",
"Hsc": "hsl/var_hydrauliques.html#charge-critique-hsc", "Hsc": "hsl/var_hydrauliques.html#charge-critique-hsc",
"J": "hsl/var_hydrauliques.html#perte-de-charge-j", "J": "hsl/var_hydrauliques.html#perte-de-charge-j",
......
src/app/calculators/remous/remous.en.json
+ 4
− 6
View file @ 43e0aedc
...@@ -34,9 +34,8 @@ ...@@ -34,9 +34,8 @@
"UNIT_P": "m", "UNIT_P": "m",
"UNIT_R": "m", "UNIT_R": "m",
"UNIT_V": "m/s", "UNIT_V": "m/s",
"UNIT_YF": "m", "UNIT_YCOR": "m",
"UNIT_YT": "m", "UNIT_YCON": "m",
"UNIT_YCO": "m",
"UNIT_J": "m", "UNIT_J": "m",
"UNIT_I-J": "m/m", "UNIT_I-J": "m/m",
"UNIT_IMP": "N", "UNIT_IMP": "N",
...@@ -59,9 +58,8 @@ ...@@ -59,9 +58,8 @@
"select_target_Fr": "Froude number", "select_target_Fr": "Froude number",
"select_target_Yc": "Critical depth (m)", "select_target_Yc": "Critical depth (m)",
"select_target_Yn": "Normal depth (m)", "select_target_Yn": "Normal depth (m)",
"select_target_Yf": "Subcritical depth (m)", "select_target_Ycor": "Corresponding depth (m)",
"select_target_Yt": "Supercritical depth (m)", "select_target_Ycon": "Conjugate depth (m)",
"select_target_Yco": "Conjugate depth (m)",
"select_target_J": "Head loss (m)", "select_target_J": "Head loss (m)",
"select_target_I-J": "Linear variation of specific head (m/m)", "select_target_I-J": "Linear variation of specific head (m/m)",
"select_target_Imp": "Impulse (N)", "select_target_Imp": "Impulse (N)",
......
src/app/calculators/remous/remous.fr.json
+ 6
− 8
View file @ 43e0aedc
...@@ -33,9 +33,8 @@ ...@@ -33,9 +33,8 @@
"UNIT_P": "m", "UNIT_P": "m",
"UNIT_R": "m", "UNIT_R": "m",
"UNIT_V": "m/s", "UNIT_V": "m/s",
"UNIT_YF": "m", "UNIT_YCOR": "m",
"UNIT_YT": "m", "UNIT_YCON": "m",
"UNIT_YCO": "m",
"UNIT_J": "m", "UNIT_J": "m",
"UNIT_I-J": "m/m", "UNIT_I-J": "m/m",
"UNIT_IMP": "N", "UNIT_IMP": "N",
...@@ -58,11 +57,10 @@ ...@@ -58,11 +57,10 @@
"select_target_Fr": "Le Froude", "select_target_Fr": "Le Froude",
"select_target_Yc": "Le tirant d'eau critique (m)", "select_target_Yc": "Le tirant d'eau critique (m)",
"select_target_Yn": "Le tirant d'eau normal (m)", "select_target_Yn": "Le tirant d'eau normal (m)",
"select_target_Yf": "Le tirant d'eau fluvial (m)", "select_target_Ycor": "Le tirant d'eau correspondant (m)",
"select_target_Yt": "Le tirant d'eau torrentiel (m)", "select_target_Ycon": "Le tirant d'eau conjugué (m)",
"select_target_Yco": "Le tirant d'eau conjugué (m)",
"select_target_J": "La perte de charge (m)", "select_target_J": "La perte de charge (m)",
"select_target_I-J": "Variation linéaire de l'énergie spécifique (m/m)", "select_target_I-J": "La variation linéaire de l'énergie spécifique (m/m)",
"select_target_Imp": "Impulsion (N)", "select_target_Imp": "L'impulsion (N)",
"select_target_Tau0": "La force tractrice (Pa)" "select_target_Tau0": "La force tractrice (Pa)"
} }
\ No newline at end of file
src/app/calculators/section-param/section-param.config.json
+ 2
− 3
View file @ 43e0aedc
...@@ -53,9 +53,8 @@ ...@@ -53,9 +53,8 @@
"V": "hsl/var_hydrauliques.html#vitesse-moyenne-v", "V": "hsl/var_hydrauliques.html#vitesse-moyenne-v",
"Yn": "hsl/var_hydrauliques.html#tirant-deau-normal-yn", "Yn": "hsl/var_hydrauliques.html#tirant-deau-normal-yn",
"Yc": "hsl/var_hydrauliques.html#tirant-deau-critique-yc", "Yc": "hsl/var_hydrauliques.html#tirant-deau-critique-yc",
"Yt": "hsl/var_hydrauliques.html#tirant-deau-torrentiel-yt", "Ycor": "hsl/var_hydrauliques.html#tirant-deau-correspondant-ycor",
"Yf": "hsl/var_hydrauliques.html#tirant-deau-fluvial-yf", "Ycon": "hsl/var_hydrauliques.html#tirant-deau-conjugue-ycon",
"Yco": "hsl/var_hydrauliques.html#tirant-deau-conjugue-yco",
"Hs": "hsl/var_hydrauliques.html#charge-specifique-hs", "Hs": "hsl/var_hydrauliques.html#charge-specifique-hs",
"Hsc": "hsl/var_hydrauliques.html#charge-critique-hsc", "Hsc": "hsl/var_hydrauliques.html#charge-critique-hsc",
"J": "hsl/var_hydrauliques.html#perte-de-charge-j", "J": "hsl/var_hydrauliques.html#perte-de-charge-j",
......
src/app/calculators/section-param/section-param.en.json
+ 18
− 20
View file @ 43e0aedc
...@@ -20,23 +20,22 @@ ...@@ -20,23 +20,22 @@
"Q": "Flow", "Q": "Flow",
"Y": "Draft", "Y": "Draft",
"fs_param_calc": "Calculation parameters", "fs_param_calc": "Calculation parameters",
"Hs": "Charge spécifique", "Hs": "Specific cahrge",
"Hsc": "Charge critique", "Hsc": "Critical charge",
"B": "Largeur au miroir", "B": "Width at mirror",
"P": "Périmètre mouillé", "P": "Wet perimeter",
"S": "Surface mouillée", "S": "Wet surface",
"R": "Rayon hydraulique", "R": "Hydraulic radius",
"V": "Vitesse moyenne", "V": "Average speed",
"Fr": "Froude", "Fr": "Froude",
"Yc": "Tirant d'eau critique", "Yc": "Critical depth",
"Yn": "Tirant d'eau normal", "Yn": "Normal depth",
"Yf": "Tirant d'eau fluvial", "Ycor": "Corresponding depth",
"Yt": "Tirant d'eau torrentiel", "Ycon": "Conjugate depth",
"Yco": "Tirant d'eau conjugué", "J": "Loss of charge",
"J": "Perte de charge", "I-J": "Linear variation of specific energy",
"I-J": "Variation linéaire de l'énergie spécifique", "Imp": "Impulse",
"Imp": "Impulsion", "Tau0": "Tractive force",
"Tau0": "Force tractrice",
"UNIT_B": "m", "UNIT_B": "m",
"UNIT_HS": "m", "UNIT_HS": "m",
"UNIT_HSC": "m", "UNIT_HSC": "m",
...@@ -49,8 +48,7 @@ ...@@ -49,8 +48,7 @@
"UNIT_TAU0": "Pa", "UNIT_TAU0": "Pa",
"UNIT_V": "m/s", "UNIT_V": "m/s",
"UNIT_YC": "m", "UNIT_YC": "m",
"UNIT_YCO": "m", "UNIT_YCON": "m",
"UNIT_YF": "m", "UNIT_YCOR": "m",
"UNIT_YN": "m", "UNIT_YN": "m"
"UNIT_YT": "m"
} }
src/app/calculators/section-param/section-param.fr.json
+ 5
− 7
View file @ 43e0aedc
...@@ -29,9 +29,8 @@ ...@@ -29,9 +29,8 @@
"Fr": "Froude", "Fr": "Froude",
"Yc": "Tirant d'eau critique", "Yc": "Tirant d'eau critique",
"Yn": "Tirant d'eau normal", "Yn": "Tirant d'eau normal",
"Yf": "Tirant d'eau fluvial", "Ycor": "Tirant d'eau correspondant",
"Yt": "Tirant d'eau torrentiel", "Ycon": "Tirant d'eau conjugué",
"Yco": "Tirant d'eau conjugué",
"J": "Perte de charge", "J": "Perte de charge",
"I-J": "Variation linéaire de l'énergie spécifique", "I-J": "Variation linéaire de l'énergie spécifique",
"Imp": "Impulsion", "Imp": "Impulsion",
...@@ -48,8 +47,7 @@ ...@@ -48,8 +47,7 @@
"UNIT_TAU0": "Pa", "UNIT_TAU0": "Pa",
"UNIT_V": "m/s", "UNIT_V": "m/s",
"UNIT_YC": "m", "UNIT_YC": "m",
"UNIT_YCO": "m", "UNIT_YCON": "m",
"UNIT_YF": "m", "UNIT_YCOR": "m",
"UNIT_YN": "m", "UNIT_YN": "m"
"UNIT_YT": "m"
} }
src/app/components/remous-results/remous-results.component.ts
+ 1
− 1
View file @ 43e0aedc
...@@ -207,7 +207,7 @@ export class RemousResultsComponent extends ResultsComponent implements DoCheck ...@@ -207,7 +207,7 @@ export class RemousResultsComponent extends ResultsComponent implements DoCheck
public graph1_options = {}; public graph1_options = {};
/* /*
* config du graphe secondaire (paramètre supplémentaire sauf Hs, Hsc, Yf, Yt, Yco) * config du graphe secondaire (paramètre supplémentaire sauf Hs, Hsc, Ycor, Ycon)
*/ */
public graph2_type = "line"; public graph2_type = "line";
public graph2_data = {}; public graph2_data = {};
......
src/app/components/section-results/section-results.component.ts
+ 2
− 3
View file @ 43e0aedc
...@@ -50,10 +50,9 @@ export class SectionResultsComponent extends ResultsComponent implements DoCheck ...@@ -50,10 +50,9 @@ export class SectionResultsComponent extends ResultsComponent implements DoCheck
"Hs": { r: 255, g: 0, b: 0 }, "Hs": { r: 255, g: 0, b: 0 },
"Hsc": { r: 0, g: 0, b: 255 }, "Hsc": { r: 0, g: 0, b: 255 },
"Yn": { r: 16, g: 128, b: 16 }, "Yn": { r: 16, g: 128, b: 16 },
"Yf": { r: 128, g: 128, b: 128 }, "Ycor": { r: 128, g: 128, b: 128 },
"Yt": { r: 0, g: 0, b: 0 },
"Yc": { r: 255, g: 128, b: 0 }, "Yc": { r: 255, g: 128, b: 0 },
"Yco": { r: 255, g: 0, b: 255 }, "Ycon": { r: 255, g: 0, b: 255 },
}; };
/** hardcoded bullet-proof default canvas size **/ /** hardcoded bullet-proof default canvas size **/
......
src/app/formulaire/definition/form-compute-courbe-remous.ts
+ 1
− 1
View file @ 43e0aedc
...@@ -46,7 +46,7 @@ export class FormComputeCourbeRemous extends FormCompute { ...@@ -46,7 +46,7 @@ export class FormComputeCourbeRemous extends FormCompute {
this.remousResults.hauteurNormale = this.resultYn.resultElement; this.remousResults.hauteurNormale = this.resultYn.resultElement;
this.remousResults.hauteurCritique = this.resultYc.resultElement; this.remousResults.hauteurCritique = this.resultYc.resultElement;
if (this.remousResults.extraParamSymbol) { if (this.remousResults.extraParamSymbol) {
this.remousResults.extraChart = ["Hs", "Hsc", "Yf", "Yt", "Yco"].indexOf(this.remousResults.extraParamSymbol) === -1; this.remousResults.extraChart = ! ["Hs", "Hsc", "Ycor", "Ycon"].includes(this.remousResults.extraParamSymbol);
} else { } else {
this.remousResults.extraChart = false; this.remousResults.extraChart = false;
} }
......
src/locale/messages.en.json
+ 3
− 5
View file @ 43e0aedc
...@@ -45,9 +45,8 @@ ...@@ -45,9 +45,8 @@
"ERROR_REMOUS_PENTE_FORTE": "The water line slope is too steep at abscissa %x% m (the discretisation step should be reduced)", "ERROR_REMOUS_PENTE_FORTE": "The water line slope is too steep at abscissa %x% m (the discretisation step should be reduced)",
"ERROR_SECTION_NON_CONVERGENCE_NEWTON_HCONJUG": "Non-convergence of the calculation of the combined depth (Newton's method)", "ERROR_SECTION_NON_CONVERGENCE_NEWTON_HCONJUG": "Non-convergence of the calculation of the combined depth (Newton's method)",
"ERROR_SECTION_NON_CONVERGENCE_NEWTON_HCRITIQUE": "Non-convergence of the calculation of the critical depth (Newton's method)", "ERROR_SECTION_NON_CONVERGENCE_NEWTON_HCRITIQUE": "Non-convergence of the calculation of the critical depth (Newton's method)",
"ERROR_SECTION_NON_CONVERGENCE_NEWTON_HFLU": "Non convergence of the calculation of the corresponding elevation (Newton's method) for the calculation of the subcritical depth", "ERROR_SECTION_NON_CONVERGENCE_NEWTON_HCOR": "Non convergence of the calculation of the corresponding elevation (Newton's method)",
"ERROR_SECTION_NON_CONVERGENCE_NEWTON_HNORMALE": "Non convergence of the calculation of the normal depth (Newton's method)", "ERROR_SECTION_NON_CONVERGENCE_NEWTON_HNORMALE": "Non convergence of the calculation of the normal depth (Newton's method)",
"ERROR_SECTION_NON_CONVERGENCE_NEWTON_HTOR": "Non convergence of the calculation of the corresponding height (Newton's method) for the calculation of the supercritical depth",
"ERROR_SECTION_PENTE_NEG_NULLE_HNORMALE_INF": "The slope is negative or zero, the normal depth is infinite", "ERROR_SECTION_PENTE_NEG_NULLE_HNORMALE_INF": "The slope is negative or zero, the normal depth is infinite",
"ERROR_STRUCTURE_Q_TROP_ELEVE": "The flow passing through the other devices is too high: the requested parameter is not calculable.", "ERROR_STRUCTURE_Q_TROP_ELEVE": "The flow passing through the other devices is too high: the requested parameter is not calculable.",
"INFO_CALCULATOR_CALC_NAME": "Calculator name", "INFO_CALCULATOR_CALC_NAME": "Calculator name",
...@@ -253,11 +252,10 @@ ...@@ -253,11 +252,10 @@
"INFO_LIB_VMAX": "Maximal speed", "INFO_LIB_VMAX": "Maximal speed",
"INFO_LIB_W": "Gate opening", "INFO_LIB_W": "Gate opening",
"INFO_LIB_YC": "Critical depth", "INFO_LIB_YC": "Critical depth",
"INFO_LIB_YCO": "Conjugate depth", "INFO_LIB_YCON": "Conjugate depth",
"INFO_LIB_YF": "Subcritical depth", "INFO_LIB_YCOR": "Corresponding depth",
"INFO_LIB_YMOY": "Average depth", "INFO_LIB_YMOY": "Average depth",
"INFO_LIB_YN": "Normal depth", "INFO_LIB_YN": "Normal depth",
"INFO_LIB_YT": "Supercritical depth",
"INFO_LIB_Z": "Water level", "INFO_LIB_Z": "Water level",
"INFO_LIB_Z1": "Upstream water level", "INFO_LIB_Z1": "Upstream water level",
"INFO_LIB_Z2": "Downstream water level", "INFO_LIB_Z2": "Downstream water level",
......
src/locale/messages.fr.json
+ 3
− 5
View file @ 43e0aedc
...@@ -45,9 +45,8 @@ ...@@ -45,9 +45,8 @@
"ERROR_REMOUS_PENTE_FORTE": "La pente de la ligne d'eau est trop forte à l'abscisse %x% m (il faudrait réduire le pas de discrétisation)", "ERROR_REMOUS_PENTE_FORTE": "La pente de la ligne d'eau est trop forte à l'abscisse %x% m (il faudrait réduire le pas de discrétisation)",
"ERROR_SECTION_NON_CONVERGENCE_NEWTON_HCONJUG": "Non convergence du calcul de la hauteur conjuguée (Méthode de Newton)", "ERROR_SECTION_NON_CONVERGENCE_NEWTON_HCONJUG": "Non convergence du calcul de la hauteur conjuguée (Méthode de Newton)",
"ERROR_SECTION_NON_CONVERGENCE_NEWTON_HCRITIQUE": "Non convergence du calcul de la hauteur critique (Méthode de Newton)", "ERROR_SECTION_NON_CONVERGENCE_NEWTON_HCRITIQUE": "Non convergence du calcul de la hauteur critique (Méthode de Newton)",
"ERROR_SECTION_NON_CONVERGENCE_NEWTON_HFLU": "Non convergence du calcul de la hauteur correspondante (Méthode de Newton) pour le calcul de la hauteur fluviale", "ERROR_SECTION_NON_CONVERGENCE_NEWTON_HCOR": "Non convergence du calcul de la hauteur correspondante (Méthode de Newton)",
"ERROR_SECTION_NON_CONVERGENCE_NEWTON_HNORMALE": "Non convergence du calcul de la hauteur normale (Méthode de Newton)", "ERROR_SECTION_NON_CONVERGENCE_NEWTON_HNORMALE": "Non convergence du calcul de la hauteur normale (Méthode de Newton)",
"ERROR_SECTION_NON_CONVERGENCE_NEWTON_HTOR": "Non convergence du calcul de la hauteur correspondante (Méthode de Newton) pour le calcul de la hauteur torrentielle",
"ERROR_SECTION_PENTE_NEG_NULLE_HNORMALE_INF": "La pente est négative ou nulle, la hauteur normale est infinie", "ERROR_SECTION_PENTE_NEG_NULLE_HNORMALE_INF": "La pente est négative ou nulle, la hauteur normale est infinie",
"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_Q_TROP_ELEVE": "Le débit passant par les autres ouvrages est trop élevé: le paramètre demandé n'est pas calculable.",
"INFO_CALCULATOR_CALC_NAME": "Nom du module de calcul", "INFO_CALCULATOR_CALC_NAME": "Nom du module de calcul",
...@@ -252,11 +251,10 @@ ...@@ -252,11 +251,10 @@
"INFO_LIB_VMAX": "Vitesse maximale", "INFO_LIB_VMAX": "Vitesse maximale",
"INFO_LIB_W": "Ouverture de vanne", "INFO_LIB_W": "Ouverture de vanne",
"INFO_LIB_YC": "Tirant d'eau critique", "INFO_LIB_YC": "Tirant d'eau critique",
"INFO_LIB_YCO": "Tirant d'eau conjugué", "INFO_LIB_YCON": "Tirant d'eau conjugué",
"INFO_LIB_YF": "Tirant d'eau fluvial", "INFO_LIB_YCOR": "Tirant d'eau correspondant",
"INFO_LIB_YMOY": "Tirant d'eau moyen", "INFO_LIB_YMOY": "Tirant d'eau moyen",
"INFO_LIB_YN": "Tirant d'eau normal", "INFO_LIB_YN": "Tirant d'eau normal",
"INFO_LIB_YT": "Tirant d'eau torrentiel",
"INFO_LIB_Z": "Niveau d'eau", "INFO_LIB_Z": "Niveau d'eau",
"INFO_LIB_Z1": "Cote de l'eau amont", "INFO_LIB_Z1": "Cote de l'eau amont",
"INFO_LIB_Z2": "Cote de l'eau aval", "INFO_LIB_Z2": "Cote de l'eau aval",
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment