Corrections pour le libellé de la variable extra des courbes de remous suite à...

Corrections pour le libellé de la variable extra des courbes de remous suite à b2b64ff29f025 dans ngHyd

spec/remous/remous_rect_trapezes_pentefaible.spec.ts

@@ -434,8 +434,8 @@ describe("Class Remous / section rectangulaire :", () => {
         // compareArray("abscisses", res.getExtraResult("trX"), x);
 
         const extraHS = { 0.000: 1.6, 5.000: 0.808, 10.000: 0.618 };
-        // compareObject("extra (Hs)", res.getExtraResult("tRes"), extraHS, 0.001);
-        compareExtraResult("extra (Hs)", res, "tRes", extraHS, 0.001);
+        // compareObject("extra (Hs)", res.getExtraResult("Hs"), extraHS, 0.001);
+        compareExtraResult("extra (Hs)", res, "Hs", extraHS, 0.001);
 
         const expLog = new cLog();
         let m = new Message(MessageCode.INFO_REMOUS_LARGEUR_BERGE);

spec/remous/remous_trapez.spec.ts

@@ -153,8 +153,8 @@ describe("Class Remous / section trapèze :", () => {
 
             // données de validation : version PHP (oct 2017)
             const hs = { 0.000: 1.507, 5.000: 0.735, 10.000: 0.731, 15.000: 0.727, 20.000: 0.723, 25.000: 0.719, 30.000: 0.715, 35.000: 0.71, 40.000: 0.704, 45.000: 0.699, 50.000: 0.693, 55.000: 0.687, 60.000: 0.68, 65.000: 0.673, 70.000: 0.665, 75.000: 0.656, 80.000: 0.646, 85.000: 0.634, 90.000: 0.62, 95.000: 0.603, 100.000: 0.572 };
-            // compareObject("Hs", res.getExtraResult("tRes"), hs, 0.002);
-            compareExtraResult("Hs", res, "tRes", hs, 0.002);
+            // compareObject("Hs", res.getExtraResult("Hs"), hs, 0.002);
+            compareExtraResult("Hs", res, "Hs", hs, 0.002);
         });
 
         xit("Hs (test 2)", () => { // désactivé car échoue depuis les modifs apportées depuis la version PHP (calcul du ressaut hydraulique)
@@ -185,8 +185,8 @@ describe("Class Remous / section trapèze :", () => {
             // données de validation : version PHP (oct 2017)
             // ici j'ai supprimé un point (x=2.5)
             const hs = { 0.000: 1.507, 2.600: 0.753, 2.700: 0.757, 2.800: 0.762, 2.900: 0.767, 3.000: 0.771, 3.100: 0.776, 3.200: 0.781, 3.300: 0.786, 3.400: 0.79, 3.500: 0.795, 3.600: 0.8, 3.700: 0.805, 3.800: 0.81, 3.900: 0.814, 4.000: 0.819, 4.100: 0.824, 4.200: 0.829, 4.300: 0.834, 4.400: 0.839, 4.500: 0.844, 4.600: 0.849, 4.700: 0.854, 4.800: 0.859, 4.900: 0.864, 5.000: 0.869, 5.100: 0.874, 5.200: 0.879, 5.300: 0.884, 5.400: 0.889, 5.500: 0.894, 5.600: 0.899, 5.700: 0.904, 5.800: 0.909, 5.900: 0.914, 6.000: 0.919, 6.100: 0.924, 6.200: 0.929, 6.300: 0.934, 6.400: 0.939, 6.500: 0.944, 6.600: 0.95, 6.700: 0.955, 6.800: 0.96, 6.900: 0.965, 7.000: 0.97, 7.100: 0.975, 7.200: 0.98, 7.300: 0.986, 7.400: 0.991, 7.500: 0.996, 7.600: 1.001, 7.700: 1.006, 7.800: 1.012, 7.900: 1.017, 8.000: 1.022 };
-            // compareObject("Hs", res.getExtraResult("tRes"), hs, 0.009);
-            compareExtraResult("Hs", res, "tRes", hs, 0.009);
+            // compareObject("Hs", res.getExtraResult("Hs"), hs, 0.009);
+            compareExtraResult("Hs", res, "Hs", hs, 0.009);
         });
     });
 });

src/remous.ts

@@ -468,7 +468,7 @@ export class CourbeRemous extends Nub {
                     if (!rVar.ok)
                         res.addLog(rVar.log);
                     else
-                        re.addExtraResult("tRes", rVar.vCalc);
+                        re.addExtraResult(val_a_cal, rVar.vCalc);
                 }
             }
         }