diff --git a/src/nub.ts b/src/nub.ts index a883bcf1ebdf0878939ec2d28e2d147caaa810d2..978173cfbf581e770f81025646a3e4468fbde1b9 100644 --- a/src/nub.ts +++ b/src/nub.ts @@ -52,7 +52,6 @@ export abstract class Nub extends ComputeNode implements IObservable { * (used by CalcSerie with varying parameters) */ protected set currentResult(r: Result) { - // this.setCurrentResult(r); if (! this._result) { this.initNewResultElement(); } diff --git a/src/structure/structure_rectangular_orifice_free.ts b/src/structure/structure_rectangular_orifice_free.ts index fab6ca9897946327861068ed5b12e2b94ff568af..053a32a2a12c07851953312036bd5a83d1e77a97 100644 --- a/src/structure/structure_rectangular_orifice_free.ts +++ b/src/structure/structure_rectangular_orifice_free.ts @@ -19,7 +19,7 @@ export class StructureRectangularOrificeFree extends RectangularStructure { } public Calc(sVarCalc: string, rInit?: number): Result { - this._result = super.Calc(sVarCalc, rInit); + this.currentResult = super.Calc(sVarCalc, rInit); if (this.prms.h2.v > 0) { this._result.resultElement.addMessage(new Message( MessageCode.WARNING_DOWNSTREAM_ELEVATION_POSSIBLE_SUBMERSION, diff --git a/src/structure/structure_weir_free.ts b/src/structure/structure_weir_free.ts index 080620d08bfda9626db42c4eb6baf0c4fd38a111..a37cc12eeca40bde0e38674bd19209fa63f3bfad 100644 --- a/src/structure/structure_weir_free.ts +++ b/src/structure/structure_weir_free.ts @@ -17,7 +17,7 @@ export class StructureWeirFree extends RectangularStructure { } public Calc(sVarCalc: string, rInit?: number): Result { - this._result = super.Calc(sVarCalc, rInit); + this.currentResult = super.Calc(sVarCalc, rInit); // do not check h2 for derived classes (ex: StructureWeirVillemonte) if (this._loiDebit === LoiDebit.WeirFree && this.prms.h2.v > 0) { this._result.resultElement.addMessage(new Message( diff --git a/src/structure/structure_weir_submerged_larinier.ts b/src/structure/structure_weir_submerged_larinier.ts index 1ee2c543dea9266b2c245eab3e9d0cd72353cc54..6b6d8e5b8d5bf88fc66d33dd32e9f5d92b77ebd3 100644 --- a/src/structure/structure_weir_submerged_larinier.ts +++ b/src/structure/structure_weir_submerged_larinier.ts @@ -26,7 +26,7 @@ export class StructureWeirSubmergedLarinier extends RectangularStructure { } public Calc(sVarCalc: string, rInit?: number): Result { - this._result = super.Calc(sVarCalc, rInit); + this.currentResult = super.Calc(sVarCalc, rInit); const h2h1ratio = this.prms.h2.v / this.prms.h1.v; if (h2h1ratio < 0.7 || h2h1ratio > 0.9) { this._result.resultElement.addMessage(new Message( diff --git a/src/structure/structure_weir_villemonte.ts b/src/structure/structure_weir_villemonte.ts index 2f16ac156dfdf1dbced12bbe35896839387d110d..c8c66c85869d6c22b109d00077968bc862c90453 100644 --- a/src/structure/structure_weir_villemonte.ts +++ b/src/structure/structure_weir_villemonte.ts @@ -14,7 +14,7 @@ export class StructureWeirVillemonte extends StructureWeirFree { } public Calc(sVarCalc: string, rInit?: number): Result { - this._result = super.Calc(sVarCalc, rInit); + this.currentResult = super.Calc(sVarCalc, rInit); if ((this.prms.h2.v / this.prms.h1.v) > 0.7) { this._result.resultElement.addMessage(new Message( MessageCode.WARNING_NOTCH_SUBMERSION_GREATER_THAN_07,