From 6e902ec7152ef121af11765ee99fcf5d45f054fc Mon Sep 17 00:00:00 2001
From: "mathias.chouet" <mathias.chouet@irstea.fr>
Date: Wed, 11 Sep 2019 14:41:25 +0200
Subject: [PATCH] Fix nghyd#285
---
src/nub.ts | 1 -
src/structure/structure_rectangular_orifice_free.ts | 2 +-
src/structure/structure_weir_free.ts | 2 +-
src/structure/structure_weir_submerged_larinier.ts | 2 +-
src/structure/structure_weir_villemonte.ts | 2 +-
5 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/nub.ts b/src/nub.ts
index a883bcf1..978173cf 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 fab6ca98..053a32a2 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 080620d0..a37cc12e 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 1ee2c543..6b6d8e5b 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 2f16ac15..c8c66c85 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,
--
GitLab