diff --git a/src/app/components/macrorugo-compound-results/macrorugo-compound-results-table.component.ts b/src/app/components/macrorugo-compound-results/macrorugo-compound-results-table.component.ts index bf70492bf1b76785f94acbc9409326e0fada2b0e..d466e6869ae5a58c7a9563a9ebb297b1fb2c9834 100644 --- a/src/app/components/macrorugo-compound-results/macrorugo-compound-results-table.component.ts +++ b/src/app/components/macrorugo-compound-results/macrorugo-compound-results-table.component.ts @@ -102,8 +102,9 @@ export class MacrorugoCompoundResultsTableComponent extends ResultsComponentDire (Y !== undefined ? Y.toFixed(nDigits) : "-"), (res.Q !== undefined ? res.Q.toFixed(nDigits) : "-"), res.Vdeb.toFixed(nDigits), - res.Fr.toFixed(nDigits), - res.Vmax.toFixed(nDigits), + res.Fr?.toFixed(nDigits), + res.Vg?.toFixed(nDigits), + res.Vmax?.toFixed(nDigits), res.PV.toFixed(nDigits), this.intlService.localizeText("INFO_ENUM_MACRORUGOFLOWTYPE_" + res.ENUM_MacroRugoFlowType), res.xCenter.toFixed(nDigits) diff --git a/src/app/results/macrorugo-compound-results.ts b/src/app/results/macrorugo-compound-results.ts index 74e776f72846483d97857ed9f123cb6714dbb5eb..a8274fad9846330d93dab23830b33ed3b55bd15f 100644 --- a/src/app/results/macrorugo-compound-results.ts +++ b/src/app/results/macrorugo-compound-results.ts @@ -29,6 +29,7 @@ export class MacrorugoCompoundResults extends MultiDimensionResults implements P "Q", "Vdeb", "Fr", + "Vg", "Vmax", "PV", "ENUM_MacroRugoFlowType", diff --git a/src/locale/messages.en.json b/src/locale/messages.en.json index 0bd6698e86b20836438942fddf7a79dca5758df8..a6042137213dea9aa77eb6f2be16a076a017133a 100755 --- a/src/locale/messages.en.json +++ b/src/locale/messages.en.json @@ -114,7 +114,7 @@ "INFO_COURBEREMOUS_DESCRIPTION": "open channel regime flow subcritical supercritical hydraulic jump", "INFO_COURBEREMOUS_TITRE_COURT": "Backwater", "INFO_COURBEREMOUS_TITRE": "Backwater curves", - "INFO_DEVER_DESCRIPTION": "slot threshold approach speed head hydraulic", + "INFO_DEVER_DESCRIPTION": "slot threshold approach velocity head hydraulic", "INFO_DEVER_TITRE_COURT": "Free weir", "INFO_DEVER_TITRE": "Free flow weir stage-discharge laws", "INFO_DIAGRAM_SOLVEUR_FINDS": "finds", @@ -264,7 +264,7 @@ "INFO_LIB_ELEVATIONS": "Every elevation", "INFO_LIB_VOLUMES": "Every volume", "INFO_LIB_FLOWS": "Every flow", - "INFO_LIB_SPEEDS": "Every speed", + "INFO_LIB_SPEEDS": "Every velocity", "INFO_LIB_DIAMETERS": "Every diameter", "INFO_LIB_ABSCISSE_CLOISON": "Wall abscissa", "INFO_LIB_ALPHA": "Alpha coefficient", @@ -359,10 +359,11 @@ "INFO_LIB_TAU0": "Tractive force", "INFO_LIB_TOR": "Supercritical water line", "INFO_LIB_TOTAL": "Total", - "INFO_LIB_V_GUIDETECH": "Technical guide speed", - "INFO_LIB_V": "Average speed", - "INFO_LIB_VDEB": "Conveyance speed", - "INFO_LIB_VMAX": "Maximal speed", + "INFO_LIB_V_GUIDETECH": "Technical guide velocity", + "INFO_LIB_V": "Average velocity", + "INFO_LIB_VDEB": "Conveyance velocity", + "INFO_LIB_VMAX": "Maximal velocity", + "INFO_LIB_VG": "Averaged velocity between blocks", "INFO_LIB_W": "Gate opening", "INFO_LIB_X": "Value for searched parameter", "INFO_LIB_YC": "Critical depth", @@ -669,9 +670,9 @@ "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_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 velocity values.", "WARNING_GRILLE_O_LOWER_THAN_OB": "Total obstruction (entered) is lower than obstruction due to bars only (calculated)", - "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_LECHAPT_CALMON_SPEED_OUTSIDE_04_2": "This formula is discouraged for a velocity 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", "WARNING_NEGATIVE_SILL": "Sill should be positive", @@ -705,12 +706,12 @@ "ERROR_VERIF_ERRORS_IN_PASS": "Pass to verify contains errors", "ERROR_VERIF_VARYING_ERRORS_IN_PASS": "Pass to verify contains error at iteration %i%", "ERROR_VERIF_MISSING_CRITERION": "Criterion %var_criterion% must be defined", - "ERROR_VERIF_MR_VMAX": "Maximum speed %V% too high (maximum: %maxV%)", + "ERROR_VERIF_MR_VMAX": "Maximum velocity %V% too high (maximum: %maxV%)", "ERROR_VERIF_MR_PVMAX": "Dissipated power %PV% too high (maximum: %maxPV%)", "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_CROSSABLE_WIDTH": "Crossable width %width% m is lower than the width of a block pattern %patternWidth% m", - "WARNING_VERIF_MRC_VMAX_APRON_N": "Maximum speed %V% too high (maximum: %maxV%)", + "WARNING_VERIF_MRC_VMAX_APRON_N": "Maximum velocity %V% too high (maximum: %maxV%)", "WARNING_VERIF_MRC_YMIN_APRON_N": "Water level %Y% too low (minimum: %minY%)", "INFO_VERIF_MRC_CROSSABLE_WIDTH": "Maximum crossable width is %width% m", "ERROR_VERIF_NO_PRESET": "This species group is not compatible with this pass type", diff --git a/src/locale/messages.fr.json b/src/locale/messages.fr.json index 2935be35e211690459f7b9d9299ab33af42a26ac..a65448522a44282436ff78f2d5332698d596464b 100755 --- a/src/locale/messages.fr.json +++ b/src/locale/messages.fr.json @@ -364,6 +364,7 @@ "INFO_LIB_V": "Vitesse moyenne", "INFO_LIB_VDEB": "Vitesse débitante", "INFO_LIB_VMAX": "Vitesse maximale", + "INFO_LIB_VG": "Vitesse moyenne entre les blocs", "INFO_LIB_W": "Ouverture de vanne", "INFO_LIB_X": "Valeur du paramètre recherché", "INFO_LIB_YC": "Tirant d'eau critique",