Adapted cloison_aval to new currentResult system

src/pab/cloison_aval.ts

+import { ParamCalculability } from "../param/param-definition";
 import { ParallelStructure } from "../structure/parallel_structure";
 import { loiAdmissiblesCloisonAval, LoiDebit } from "../structure/structure_props";
 import { StructureVanLevLarinier, StructureVanLevVillemonte } from "../structure/structure_vanlev";
 import { Message, MessageCode } from "../util/message";
 import { Result } from "../util/result";
-import { ParamCalculability } from "../param/param-definition";
 
 export { ParallelStructureParams } from "../structure/parallel_structure_params";
 
@@ -30,12 +30,16 @@ export class CloisonAval extends ParallelStructure {
         if (sVarCalc !== "Z1") {
             throw new Error("CloisonAval sVarCalc should be Z1");
         }
+        // if Calc() is called outside of CalcSerie(), _result might not be initialized
+        if (! this._result) {
+            this.initNewResultElement();
+        }
         this.checkVanneLevante();
         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._result = this.CalcStructPrm(this.indexVanneLevante, "ZDV");
+            this.currentResult = this.CalcStructPrm(this.indexVanneLevante, "ZDV");
             if (this.result.ok) {
                 // Suppression des extraResults : ils sont complétés plus bas pour chaque ouvrage
                 this.result.resultElement.extraResults = {};
@@ -52,7 +56,7 @@ export class CloisonAval extends ParallelStructure {
         }
         if (this._result === undefined || this._result.ok) {
             // Calculation of Z1 with the new ZDV in case of existing vanne levante
-            this._result = super.Calc("Z1", rInit);
+            this.currentResult = 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

src/pab/pab.ts

@@ -4,6 +4,7 @@ import { ParamCalculability, ParamDefinition } from "../param/param-definition";
 import { IParamDefinitionIterator, ParamsEquation, ParamsEquationArrayIterator } from "../param/params-equation";
 import { Props } from "../props";
 import { Session } from "../session";
+import { ParallelStructure } from "../structure/parallel_structure";
 import { StructureTriangularTruncWeirFree } from "../structure/structure_triangular_trunc_weir";
 import { Result } from "../util/result";
 import { CloisonAval, ParallelStructureParams } from "./cloison_aval";