From 85b6bb3432b3cb2cf737a6e9edf536cf60ec1f1f Mon Sep 17 00:00:00 2001 From: "mathias.chouet" <mathias.chouet@irstea.fr> Date: Tue, 1 Oct 2019 10:08:50 +0200 Subject: [PATCH] #146 - set Hs and Hsc to elevations (add bottom elevation) --- spec/remous/remous_rect_trapezes_pentefaible.spec.ts | 2 +- spec/remous/remous_trapez.spec.ts | 4 ++++ src/remous/remous.ts | 6 +++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/spec/remous/remous_rect_trapezes_pentefaible.spec.ts b/spec/remous/remous_rect_trapezes_pentefaible.spec.ts index a239e574..33f0b3dd 100644 --- a/spec/remous/remous_rect_trapezes_pentefaible.spec.ts +++ b/spec/remous/remous_rect_trapezes_pentefaible.spec.ts @@ -693,7 +693,7 @@ describe("Class Remous / section rectangulaire :", () => { // const x = [0.000, 5.000, 10.000]; // compareArray("abscisses", res.getValue("trX"), x); - const extraHS: any = { 0.000: 1.6, 5.000: 0.808, 10.000: 0.618 }; + const extraHS: any = { 0.000: 101.7, 5.000: 100.903, 10.000: 100.708 }; // compareObject("extra (Hs)", res.getValue("Hs"), extraHS, 0.001); compareExtraResult("extra (Hs)", res, "Hs", extraHS, 0.001); diff --git a/spec/remous/remous_trapez.spec.ts b/spec/remous/remous_trapez.spec.ts index 43412c3e..6575c401 100644 --- a/spec/remous/remous_trapez.spec.ts +++ b/spec/remous/remous_trapez.spec.ts @@ -147,6 +147,10 @@ describe("Class Remous / section trapèze :", () => { 95.000: 0.603, 100.000: 0.572 }; + // mà j pour jalhyd#146 : ajout de la cote de fond aux valeurs attendues + for (const hsk of Object.keys(hs)) { + hs[hsk] = hs[hsk] + rem.getCoteFond(Number(hsk)); + } // compareObject("Hs", res.getValue("Hs"), hs, 0.002); compareExtraResult("Hs", res, "Hs", hs, 0.002); }); diff --git a/src/remous/remous.ts b/src/remous/remous.ts index b0d7c88d..a5e0a542 100644 --- a/src/remous/remous.ts +++ b/src/remous/remous.ts @@ -421,7 +421,11 @@ export class CourbeRemous extends SectionNub { if (!rVar.ok) { res.addLog(rVar.log); } else { - re.addExtraResult(valACal, rVar.vCalc); + let val = rVar.vCalc; + if ([ "Hs", "Hsc" ].includes(valACal)) { + val += this.getCoteFond(x); + } + re.addExtraResult(valACal, val); } } } -- GitLab