#107 Add calculation of wall abscissas in extraResults.x

spec/pab/pab.spec.ts

@@ -118,6 +118,7 @@ function checkPabResults(p: Pab, vCalc: number) {
     expect(p.downWall.result.extraResults.DH).toBeCloseTo(0.217, 2);
     expect(p.downWall.result.extraResults.ZRAM).toBeCloseTo(73.435, 2);
     expect(p.downWall.result.extraResults.Q).toBeCloseTo(0.773, 2);
+    expect(p.downWall.result.extraResults.x).toBeCloseTo(3.1 * 14, 2);
     for (let i = 0; i < 14; i++) {
         // Cote de l'eau à l'amont de la cloison amont du bassin
         expect(p.children[i].result.vCalc).toBeCloseTo(tRef[i][0], 2);
@@ -134,6 +135,7 @@ function checkPabResults(p: Pab, vCalc: number) {
         expect(p.children[i].result.extraResults.ZRAM).toBeCloseTo(73.665 + (13 - i) * 0.23, 2);
         // Cote radier mi-bassin
         expect(p.children[i].result.extraResults.ZRMB).toBeCloseTo(73.550 + (13 - i) * 0.23, 2);
+        expect(p.children[i].result.extraResults.x).toBeCloseTo(3.1 * i, 2);
     }
 }
 

src/pab/pab.ts

@@ -122,7 +122,7 @@ export class Pab extends Nub {
         if (this.children.length > 0) {
             this.children[0].prms.Q.v = this.prms.Q.v;
         }
-        // tslint:disable-next-line:prefer-for-of
+        let l: number = 0; // Lenght of the fishway and wall abscissas
         for (let i = 0; i < this.children.length; i++) {
             let wall: ParallelStructure;
             if (i !== this.children.length - 1) {
@@ -130,6 +130,7 @@ export class Pab extends Nub {
             } else {
                 wall = this.downWall;
             }
+            l += this.children[i].prms.LB.v;
             // Set discharge for the next wall from the current basin
             wall.prms.Q.v = this.children[i].prms.Q.v + this.children[i].prms.QA.v;
         }
@@ -141,6 +142,7 @@ export class Pab extends Nub {
             this.children[this.children.length - 1].prms.ZRMB.v
             - this.children[this.children.length - 1].prms.DH.v / 2;
         this.downWall.result.extraResults.Q = this.downWall.prms.Q.v;
+        this.downWall.result.extraResults.x = l;
         if (this.debug) {
             console.log("Downstream wall");
             Pab.consoleDbgWall(this.downWall);
@@ -158,6 +160,8 @@ export class Pab extends Nub {
             cl.result.extraResults.YMOY = cl.prms.PB.v;
             cl.result.extraResults.Q = cl.prms.Q.v;
             cl.result.extraResults.QA = cl.prms.QA.v;
+            l -= cl.prms.LB.v;
+            cl.result.extraResults.x = l;
 
             if (this.debug) {
                 console.log("Bassin n°" + i);