diff --git a/spec/remous/remous_rect_trapezes_pentefaible.spec.ts b/spec/remous/remous_rect_trapezes_pentefaible.spec.ts index a239e5748c28e750aec6bbefa5e8303d2b9ece8b..33f0b3ddc8df2a648aff081d7e7a02ec02162695 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 43412c3e54c328385341bc573592af2e77be8d00..6575c401e3915959bc929fb65bfd19a00f9faa22 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 b0d7c88dedd09b8830ecf00703cf5a75088d33c4..a5e0a542ffae757cff0c3da957007f96f06c78ea 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); } } }