diff --git a/src/devalaison/grille.ts b/src/devalaison/grille.ts
index b54f0757b11588ccad3e70ff2c314817b18281b6..1170c0874b9fb7ccec9342ee3150ac9120252ed0 100644
--- a/src/devalaison/grille.ts
+++ b/src/devalaison/grille.ts
@@ -97,7 +97,7 @@ export class Grille extends Nub implements Observer {
}
public Calc(): Result {
- this.currentResult = this.Equation();
+ this.currentResultElement = this.Equation();
return this.result;
}
diff --git a/src/devalaison/jet.ts b/src/devalaison/jet.ts
index c00f1944db56539e83da61ef8c81c5f5df12633b..d61b0f4a5e2706242764a7785ae6aa64f3451b6c 100644
--- a/src/devalaison/jet.ts
+++ b/src/devalaison/jet.ts
@@ -24,7 +24,7 @@ export class Jet extends Nub {
}
public Calc(sVarCalc: string, rInit?: number): Result {
- this.currentResult = super.Calc(sVarCalc, rInit);
+ this.currentResultElement = super.Calc(sVarCalc, rInit);
// omit extra results if calculation failed
if (this.result.vCalc !== undefined) {
// H: chute
diff --git a/src/macrorugo/macrorugo_compound.ts b/src/macrorugo/macrorugo_compound.ts
index 4d4b748edf24a686a6341a70a135007ca3cab5d1..0a16b571c0955248b8ebfb06f7f773c0344085c2 100644
--- a/src/macrorugo/macrorugo_compound.ts
+++ b/src/macrorugo/macrorugo_compound.ts
@@ -91,7 +91,7 @@ export class MacrorugoCompound extends MacroRugo implements Observer {
throw new Error("MacrorugoCompound.Calc() : invalid parameter " + sVarCalc);
}
this.copyPrmsToChildren();
- this.currentResult = this.Equation(sVarCalc);
+ this.currentResultElement = this.Equation(sVarCalc);
// lateral inclination for inclined aprons
if (this.properties.getPropValue("inclinedApron") === MRCInclination.INCLINED) {
diff --git a/src/math/spp.ts b/src/math/spp.ts
index b7436633524c7a9e2e9f074d71e40bcfd1b3b4d9..b59c5bc03a1b7e94fc8825f6a47f7a1c8633a2f8 100644
--- a/src/math/spp.ts
+++ b/src/math/spp.ts
@@ -50,7 +50,7 @@ export class SPP extends Nub {
}
switch (sVarCalc) {
case "Y":
- this.currentResult = super.Calc(sVarCalc, rInit);
+ this.currentResultElement = super.Calc(sVarCalc, rInit);
if (this.result.ok) {
this.getParameter(sVarCalc).v = this.result.resultElement.vCalc;
}
diff --git a/src/nub.ts b/src/nub.ts
index 91c1c24270235a07a2e284a85d858f8d7b88758b..b5fff7fd54306d3d8e7267f5cd797195a1a71061 100644
--- a/src/nub.ts
+++ b/src/nub.ts
@@ -114,11 +114,11 @@ export abstract class Nub extends ComputeNode implements IObservable {
}
/**
- * Local setter to set results of Equation() / Solve() / … as current
+ * Local setter to set result element of Equation() / Solve() / … as current
* ResultElement, instead of overwriting the whole Result object
* (used by CalcSerie with varying parameters)
*/
- protected set currentResult(r: Result) {
+ protected set currentResultElement(r: Result) {
if (! this._result) {
this.initNewResultElement();
}
@@ -450,14 +450,14 @@ export abstract class Nub extends ComputeNode implements IObservable {
rInit = computedVar.initValue;
}
if (computedVar.isAnalytical()) {
- this.currentResult = this.Equation(sVarCalc);
+ this.currentResultElement = this.Equation(sVarCalc);
this._result.symbol = sVarCalc;
return this._result;
}
const resSolve: Result = this.Solve(sVarCalc, rInit);
if (!resSolve.ok) {
- this.currentResult = resSolve;
+ this.currentResultElement = resSolve;
this._result.symbol = sVarCalc;
return this._result;
}
@@ -466,7 +466,7 @@ export abstract class Nub extends ComputeNode implements IObservable {
const res: Result = this.Equation(sAnalyticalPrm);
res.vCalc = resSolve.vCalc;
- this.currentResult = res;
+ this.currentResultElement = res;
this._result.symbol = sVarCalc;
this.notifyResultUpdated();
diff --git a/src/open-channel/regime_uniforme.ts b/src/open-channel/regime_uniforme.ts
index e842449979865455cbab5887c9a0ba04a17300e3..4666bb50c094dd303da61c8af0829aefb60000ec 100644
--- a/src/open-channel/regime_uniforme.ts
+++ b/src/open-channel/regime_uniforme.ts
@@ -72,7 +72,7 @@ export class RegimeUniforme extends SectionNub {
&& this.section.prms.YB.v >= this.section.prms.D.v
&& isGreaterThan(this.section.prms.Y.v, this.section.prms.D.v, 1e-3)
) {
- this.currentResult = new Result(new Message(MessageCode.ERROR_RU_CIRC_LEVEL_TOO_HIGH));
+ this.currentResultElement = new Result(new Message(MessageCode.ERROR_RU_CIRC_LEVEL_TOO_HIGH));
return this.result;
}
diff --git a/src/open-channel/section/section_type.ts b/src/open-channel/section/section_type.ts
index be114310313c472be1b4b5e94f9334e2d2092d5a..dc7c597687c05868a4c6c65061ed538af93b09ef 100644
--- a/src/open-channel/section/section_type.ts
+++ b/src/open-channel/section/section_type.ts
@@ -166,7 +166,7 @@ export abstract class acSection extends Nub {
* (used by triggerChainCalculation)
*/
public CalcSerie(rInit?: number): Result {
- this.currentResult = this.parent.CalcSerie(rInit);
+ this.currentResultElement = this.parent.CalcSerie(rInit);
return this.result;
}
diff --git a/src/pab/cloison_aval.ts b/src/pab/cloison_aval.ts
index 31d961585a17dc7d2d835964974b3d8c863c99ff..f3b2ee103696196596b32ed26e5cac1e4650fd9c 100644
--- a/src/pab/cloison_aval.ts
+++ b/src/pab/cloison_aval.ts
@@ -52,14 +52,14 @@ export class CloisonAval extends ParallelStructure {
throw new Error("CloisonAval sVarCalc should be Z1");
}
if (!this.checkVanneLevante()) {
- this.currentResult.addMessage(new Message(MessageCode.ERROR_CLOISON_AVAL_UN_OUVRAGE_REGULE));
+ this.currentResultElement.addMessage(new Message(MessageCode.ERROR_CLOISON_AVAL_UN_OUVRAGE_REGULE));
return this.result;
}
let m: Message;
if (this.hasVanneLevante()) {
const s = this.structures[this.indexVanneLevante] as StructureVanLevVillemonte | StructureVanLevLarinier;
this.prms.Z1.v = this.prms.Z2.v + s.getParameter("DH").v;
- this.currentResult = this.CalcStructPrm(this.indexVanneLevante, "ZDV");
+ this.currentResultElement = this.CalcStructPrm(this.indexVanneLevante, "ZDV");
if (this.result.ok) {
s.prms.ZDV.v = this.result.vCalc;
}
@@ -74,7 +74,7 @@ export class CloisonAval extends ParallelStructure {
}
if (!this.hasVanneLevante() || this.result.ok) {
// Calculation of Z1 with the new ZDV in case of existing vanne levante
- this.currentResult = super.Calc("Z1", rInit);
+ this.currentResultElement = super.Calc("Z1", rInit);
if (this.result.ok) {
this.getParameter(sVarCalc).v = this.result.vCalc;
// Recalcul du débit total pour récupérer les résultats des ouvrages dans les résultats complémentaires
diff --git a/src/pab/pab.ts b/src/pab/pab.ts
index 811081b426884e212e9182ee86c65362adc75a73..fe4d7647a43487a7fab1bcb8cfc89dcafe05755e 100644
--- a/src/pab/pab.ts
+++ b/src/pab/pab.ts
@@ -147,7 +147,7 @@ export class Pab extends FishPass {
}
}
if (r.hasErrorMessages()) {
- this.currentResult = r;
+ this.currentResultElement = r;
return this.result;
}
return super.Calc(sVarCalc, rInit);
diff --git a/src/par/par.ts b/src/par/par.ts
index b89e4380bf984aae6d8a1aff3770e203bde24b02..bf84a1a394c3e8b2c381539cfd804a92169c0ec2 100644
--- a/src/par/par.ts
+++ b/src/par/par.ts
@@ -97,7 +97,7 @@ export class Par extends FishPass implements Observer {
// if any fatal error occurred
if (hasError) {
- this.currentResult = r;
+ this.currentResultElement = r;
return this.result;
}
diff --git a/src/par/par_simulation.ts b/src/par/par_simulation.ts
index ce67c64a08ce56db67114b1d2a5c32e8d85ec6ec..a6d7ad8385528193b1c24ac16223a86472eaf7b4 100644
--- a/src/par/par_simulation.ts
+++ b/src/par/par_simulation.ts
@@ -112,7 +112,7 @@ export class ParSimulation extends Par implements Observer {
// if any fatal error occurred
if (hasError) {
- this.currentResult = r;
+ this.currentResultElement = r;
return this.result;
}
diff --git a/src/solveur/solveur.ts b/src/solveur/solveur.ts
index 68bdd598371952db8d6938f48691385ac5a2358d..6db56950ffc97381b539c65f2d3f1cccb2a3720d 100644
--- a/src/solveur/solveur.ts
+++ b/src/solveur/solveur.ts
@@ -136,7 +136,7 @@ export class Solveur extends Nub implements Observer {
const r: Result = new Result(new ResultElement());
if (this.nubToCalculate.resultHasMultipleValues()) {
r.resultElement.addMessage(new Message(MessageCode.ERROR_SOLVEUR_NO_VARIATED_PARAMS_ALLOWED));
- this.currentResult = r;
+ this.currentResultElement = r;
return this.result;
}
return super.Calc(sVarCalc, rInit);
diff --git a/src/structure/parallel_structure.ts b/src/structure/parallel_structure.ts
index e8037fc96411821218809969b9aa0421cea2da7d..2d85e9b5c4b49a6eef00c791911bcf86947b3885 100644
--- a/src/structure/parallel_structure.ts
+++ b/src/structure/parallel_structure.ts
@@ -130,7 +130,7 @@ export class ParallelStructure extends Nub {
case "Z1":
case "Z2":
case "Q":
- this.currentResult = super.Calc(sVarCalc, rInit);
+ this.currentResultElement = super.Calc(sVarCalc, rInit);
if (this.result.ok) {
this.getParameter(sVarCalc).v = this.result.resultElement.vCalc;
}
diff --git a/src/structure/structure.ts b/src/structure/structure.ts
index 0d97bd2fa226bd76996fcbab22b089604af8126f..52dc8ed713e910ca1ae5d45067ad91c47295171e 100644
--- a/src/structure/structure.ts
+++ b/src/structure/structure.ts
@@ -204,26 +204,26 @@ export abstract class Structure extends ChildNub {
};
if (sVarCalc === "Q") {
if (this.prms.h1.v <= 1E-20 || Math.abs(this.prms.h1.v - this.prms.h2.v) < 1E-20 || this.W <= 1E-20) {
- this.currentResult = new Result(0, this, flagsNull);
+ this.currentResultElement = new Result(0, this, flagsNull);
return this._result;
}
} else if (this.prms.Q.v === 0) {
// Débit nul <=> tirant d'eau amont = tirant d'eau aval ou tout autre paramètre nul
switch (sVarCalc) {
case "Z1":
- this.currentResult = new Result(this.prms.Z2.v, this, flagsNull);
+ this.currentResultElement = new Result(this.prms.Z2.v, this, flagsNull);
return this._result;
case "Z2":
- this.currentResult = new Result(this.prms.Z1.v, this, flagsNull);
+ this.currentResultElement = new Result(this.prms.Z1.v, this, flagsNull);
return this._result;
default:
// Est-ce toujours vrai ? Nécessitera peut-être d'étendre la méthode
- this.currentResult = new Result(0, this, flagsNull);
+ this.currentResultElement = new Result(0, this, flagsNull);
return this._result;
}
} else if (this.W === 0 && sVarCalc === "Z1") {
// Si la vanne est fermée la cote amont est infinie
- this.currentResult = new Result(Infinity, this, flagsNull);
+ this.currentResultElement = new Result(Infinity, this, flagsNull);
return this._result;
}
@@ -249,7 +249,7 @@ export abstract class Structure extends ChildNub {
res = new Result(new Message(MessageCode.ERROR_STRUCTURE_Q_TROP_ELEVE), this, flagsNull);
}
res.vCalc = rPrm;
- this.currentResult = res;
+ this.currentResultElement = res;
// "Les cotes et le débit ne sont pas cohérents => fermeture de l'ouvrage
return res;
@@ -261,7 +261,7 @@ export abstract class Structure extends ChildNub {
[this.prms.Z1.v, this.prms.Z2.v] = [this.prms.Z2.v, this.prms.Z1.v]; // Swap ES6 fashion
const res: Result = super.Calc(sVarCalc, rInit);
[this.prms.Z1.v, this.prms.Z2.v] = [this.prms.Z2.v, this.prms.Z1.v]; // Swap ES6 fashion
- this.currentResult = res;
+ this.currentResultElement = res;
return res;
}
diff --git a/src/structure/structure_orifice_free.ts b/src/structure/structure_orifice_free.ts
index ce1cdfb4e147bffd199d89e2863a209e3fd66d6a..2e73f509702b4249d3d0b94b6a53c1c0aff83dd7 100644
--- a/src/structure/structure_orifice_free.ts
+++ b/src/structure/structure_orifice_free.ts
@@ -24,7 +24,7 @@ export class StructureOrificeFree extends Structure {
}
public Calc(sVarCalc: string, rInit?: number): Result {
- this.currentResult = super.Calc(sVarCalc, rInit);
+ this.currentResultElement = super.Calc(sVarCalc, rInit);
if (this.loiDebit === LoiDebit.OrificeFree && this.prms.Z2.v > this.prms.Zco.v) {
this._result.resultElement.addMessage(new Message(
MessageCode.WARNING_ORIFICE_FREE_DOWNSTREAM_ELEVATION_POSSIBLE_SUBMERSION,
diff --git a/src/structure/structure_rectangular_orifice_free.ts b/src/structure/structure_rectangular_orifice_free.ts
index b5082d172b19e4b41bf1239f51cbf7f9f7cd5c21..fd66175efee5197aabcdc11a11b8fbdf97af2658 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.currentResult = super.Calc(sVarCalc, rInit);
+ this.currentResultElement = 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 4bc0607fb4b83bdb0bf2ac0e1be03afbe4617a32..6e588384ba5642cde1ac74ed8dfc95e5ca858e5a 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.currentResult = super.Calc(sVarCalc, rInit);
+ this.currentResultElement = 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.ts b/src/structure/structure_weir_submerged.ts
index 76925f3fd2553475a7cfdea6f252e3d7621cd19d..76f7969b7b1b84fea88a41adef9c5de396395202 100644
--- a/src/structure/structure_weir_submerged.ts
+++ b/src/structure/structure_weir_submerged.ts
@@ -20,7 +20,7 @@ export class StructureWeirSubmerged extends RectangularStructure {
}
public Calc(sVarCalc: string, rInit?: number): Result {
- this.currentResult = super.Calc(sVarCalc, rInit);
+ this.currentResultElement = super.Calc(sVarCalc, rInit);
const h2h1ratio = this.prms.h2.v / this.prms.h1.v;
if (h2h1ratio < 0.8) {
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 63df6fd3001d0dc15e4e4a18482c44f882055fa8..72f0c5e69bfcdcd680fd5cf39c4d6df23be04888 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.currentResult = super.Calc(sVarCalc, rInit);
+ this.currentResultElement = 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 e701fd2421560376084e65fd1d50deb9c74cc48f..0599551f0a5360d87e27e3847e58d21b313cd348 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.currentResult = super.Calc(sVarCalc, rInit);
+ this.currentResultElement = super.Calc(sVarCalc, rInit);
if ((this.prms.h2.v / this.prms.h1.v) > 0.7) {
this._result.resultElement.addMessage(new Message(
MessageCode.WARNING_NOTCH_SUBMERGENCE_GREATER_THAN_07,
diff --git a/src/verification/verificateur.ts b/src/verification/verificateur.ts
index 4ceb194cbc91616c18ac6055e224c87b69ac0506..69a7df262a43dc6dc362bf896a3a9e97017871eb 100644
--- a/src/verification/verificateur.ts
+++ b/src/verification/verificateur.ts
@@ -181,7 +181,7 @@ export class Verificateur extends Nub {
}
public Calc(): Result {
- this.currentResult = this.Equation();
+ this.currentResultElement = this.Equation();
return this.result;
}