diff --git a/spec/open-channel/regime_uniforme/regime_uniforme_rect.spec.ts b/spec/open-channel/regime_uniforme/regime_uniforme_rect.spec.ts index 3c9397d6b7a712626425a4b60afab209233ea1e9..4204d3419eb34264958bbbc5640567f35174563e 100644 --- a/spec/open-channel/regime_uniforme/regime_uniforme_rect.spec.ts +++ b/spec/open-channel/regime_uniforme/regime_uniforme_rect.spec.ts @@ -26,7 +26,7 @@ function generateRegimeUniforme(sect: acSection): RegimeUniforme { let ruRect1 = generateRegimeUniforme(generateRectangularSection()); describe("Class RegimeUniforme / section rectangulaire :", () => { - fdescribe("pas de débordement : ", () => { + describe("pas de débordement : ", () => { beforeEach(() => { ruRect1 = generateRegimeUniforme(generateRectangularSection()); SessionSettings.precision = 1E-7; diff --git a/src/open-channel/regime_uniforme.ts b/src/open-channel/regime_uniforme.ts index 3a6d330b5ab1e3c0d087498e5cf062735a848ba5..857622bc5c2bbae2f635a41dde37db48f453f226 100644 --- a/src/open-channel/regime_uniforme.ts +++ b/src/open-channel/regime_uniforme.ts @@ -43,10 +43,6 @@ export class RegimeUniforme extends SectionNub { throw new Error("RegimeUniforme.Equation() : invalid variable name " + sVarCalc); } - // Vitesse moyenne - const V = this.section.CalcSection("V", this.section.prms.Y.v); - r.resultElement.values.V = V.vCalc; - return r; } @@ -58,6 +54,11 @@ export class RegimeUniforme extends SectionNub { */ public Calc(sVarCalc?: string, rInit?: number): Result { const r = super.Calc(sVarCalc, rInit); + + // Vitesse moyenne + const V = this.section.CalcSection("V", this.section.prms.Y.v); + r.resultElement.values.V = V.vCalc; + // Est-ce que ça déborde ? if (this.section.prms.Y.v > this.section.prms.YB.v) { r.resultElement.log.add(new Message(MessageCode.WARNING_SECTION_OVERFLOW)); @@ -73,11 +74,12 @@ export class RegimeUniforme extends SectionNub { } // tslint:disable-next-line:no-empty - protected setParametersCalculability() {} + protected setParametersCalculability() { } protected adjustChildParameters(): void { this.section.prms.Q.calculability = ParamCalculability.EQUATION; this.section.prms.Y.calculability = ParamCalculability.EQUATION; + this.section.prms.YB.calculability = ParamCalculability.FREE; } protected exposeResults() {