From 5b0f2540d7723de44bf4bd9e27c6b62067482f54 Mon Sep 17 00:00:00 2001
From: ifv <ifv@opencascade.com>
Date: Thu, 1 Oct 2015 13:48:27 +0300
Subject: [PATCH] 0026607: Wrong value of area.

Test case for issue CR26607

Fix regressions

Correction of test cases for issue CR26607
---
 src/BRepGProp/BRepGProp.cxx                   | 152 +++++++++---------
 src/BRepGProp/BRepGProp_Face.hxx              |   3 +
 src/BRepGProp/BRepGProp_Face.lxx              |  10 ++
 src/BRepGProp/BRepGProp_Gauss.cxx             |   8 +-
 tests/blend/bfuseblend/B7                     |   2 +-
 tests/blend/buildevol/F1                      |   2 +-
 tests/blend/encoderegularity/A3               |   2 +-
 tests/blend/simple/U5                         |   2 +-
 tests/bugs/modalg_1/buc60531_1                |   2 +-
 tests/bugs/modalg_1/buc60533                  |   2 +-
 tests/bugs/modalg_1/buc60555_1                |   2 +-
 tests/bugs/modalg_1/buc60555_2                |   2 +-
 tests/bugs/modalg_1/bug10160_6                |   2 +-
 tests/bugs/modalg_1/bug10160_7                |   2 +-
 tests/bugs/modalg_1/bug13140                  |   2 +-
 tests/bugs/modalg_2/bug21261_16               |   2 +-
 tests/bugs/modalg_2/bug22586                  |   2 +-
 tests/bugs/modalg_2/bug22727                  |   2 +-
 tests/bugs/modalg_2/bug22818_1                |   4 +-
 tests/bugs/modalg_2/bug22818_2                |   4 +-
 tests/bugs/modalg_2/bug22864                  |   4 +-
 tests/bugs/modalg_4/bug636                    |   3 +-
 tests/bugs/modalg_5/bug22981                  |   2 +-
 tests/bugs/modalg_5/bug23706_2                |   2 +-
 tests/bugs/modalg_5/bug23706_3                |   6 +-
 tests/bugs/modalg_5/bug23870_2                |   2 +-
 tests/bugs/modalg_6/bug26607                  |  21 +++
 tests/bugs/moddata_3/bug20866                 |   2 +-
 tests/bugs/vis/bug22188                       |   2 +-
 tests/bugs/vis/bug288_10                      |   2 +-
 tests/bugs/xde/bug22492                       |   2 +-
 tests/bugs/xde/bug22805                       |   2 +-
 tests/heal/data/advanced/U9                   |   6 +-
 tests/heal/data/advanced/V4                   |   6 +-
 tests/heal/data/advanced/V5                   |   6 +-
 tests/heal/data/advanced/Y3                   |   6 +-
 tests/heal/data/advanced/Y5                   |   6 +-
 tests/heal/data/advanced/Z7                   |   6 +-
 tests/heal/data/advanced/ZB1                  |   6 +-
 tests/heal/data/advanced/ZB5                  |   6 +-
 tests/heal/data/standard/A5                   |   1 +
 tests/heal/data/standard/C8                   |   6 +-
 tests/heal/data/standard/E5                   |   6 +-
 tests/heal/data/standard/ZW1                  |   6 +-
 tests/heal/data/standard/ZZ4                  |   6 +-
 .../heal/surface_to_revolution_advanced/begin |   1 +
 tests/heal/surface_to_revolution_advanced/end |   3 +-
 .../heal/surface_to_revolution_standard/begin |   1 +
 tests/heal/surface_to_revolution_standard/end |   5 +-
 tests/mesh/data/advanced/B4                   |   6 +-
 tests/mesh/data/standard/K4                   |   6 +-
 tests/mesh/data/standard/K9                   |   2 +-
 tests/mesh/data/standard/M3                   |   6 +-
 tests/mesh/data/standard/M4                   |   6 +-
 tests/mesh/data/standard/O5                   |   6 +-
 tests/mesh/data/standard/Q7                   |   6 +-
 tests/pipe/specific/K3                        |   2 +-
 tests/pipe/specific/K5                        |   2 +-
 tests/pipe/specific/K6                        |   2 +-
 tests/pipe/specific/K9                        |   2 +-
 tests/pipe/specific/L2                        |   2 +-
 tests/pipe/specific/L3                        |   2 +-
 tests/pipe/specific/L6                        |   2 +-
 tests/pipe/specific/L8                        |   2 +-
 tests/pipe/specific/M1                        |   2 +-
 tests/pipe/specific/M3                        |   2 +-
 tests/pipe/specific/M5                        |   2 +-
 tests/pipe/specific/M7                        |   2 +-
 tests/pipe/specific/M8                        |   2 +-
 tests/pipe/specific/N2                        |   2 +-
 tests/pipe/specific/N3                        |   2 +-
 tests/pipe/specific/N6                        |   2 +-
 tests/pipe/specific/N8                        |   2 +-
 tests/pipe/specific/O1                        |   2 +-
 tests/pipe/specific/O3                        |   2 +-
 tests/pipe/specific/O5                        |   2 +-
 tests/pipe/specific/O7                        |   2 +-
 tests/pipe/specific/O9                        |   2 +-
 tests/pipe/specific/P2                        |   2 +-
 tests/pipe/specific/P4                        |   2 +-
 tests/pipe/specific/P6                        |   2 +-
 tests/pipe/specific/P8                        |   2 +-
 tests/pipe/specific/Q1                        |   2 +-
 tests/pipe/specific/Q3                        |   2 +-
 tests/pipe/specific/Q5                        |   2 +-
 tests/pipe/specific/Q7                        |   2 +-
 tests/pipe/specific/Q9                        |   2 +-
 tests/pipe/specific/R2                        |   2 +-
 tests/pipe/specific/R4                        |   2 +-
 tests/pipe/specific/R6                        |   2 +-
 tests/pipe/specific/R8                        |   2 +-
 tests/pipe/specific/S1                        |   2 +-
 tests/pipe/specific/S3                        |   2 +-
 tests/pipe/specific/S5                        |   2 +-
 tests/pipe/standard/A2                        |   2 +-
 tests/pipe/standard/A3                        |   2 +-
 tests/pipe/standard/A4                        |   2 +-
 tests/pipe/standard/A5                        |   2 +-
 tests/pipe/standard/B2                        |   2 +-
 tests/pipe/standard/B3                        |   2 +-
 tests/pipe/standard/C5                        |   2 +-
 tests/pipe/standard/C6                        |   2 +-
 tests/pipe/standard/C8                        |   2 +-
 tests/pipe/standard/D3                        |   2 +-
 tests/pipe/standard/D4                        |   2 +-
 tests/pipe/standard/D6                        |   2 +-
 tests/pipe/standard/E2                        |   2 +-
 tests/pipe/standard/E3                        |   2 +-
 tests/pipe/standard/E4                        |   2 +-
 tests/pipe/standard/E9                        |   2 +-
 tests/pipe/standard/F1                        |   2 +-
 tests/pipe/standard/F2                        |   2 +-
 tests/pipe/standard/F7                        |   2 +-
 tests/thrusection/specific/B6                 |   2 +-
 tests/thrusection/specific/B7                 |   2 +-
 tests/thrusection/specific/D4                 |   2 +-
 tests/thrusection/specific/D5                 |   2 +-
 tests/thrusection/specific/E3                 |   2 +-
 tests/thrusection/specific/J2                 |   2 +-
 tests/thrusection/specific/L4                 |   2 +-
 tests/thrusection/specific/M6                 |   2 +-
 tests/thrusection/specific/M7                 |   2 +-
 tests/thrusection/specific/M8                 |   2 +-
 tests/thrusection/specific/M9                 |   2 +-
 tests/thrusection/specific/N1                 |   2 +-
 tests/thrusection/specific/N2                 |   2 +-
 tests/thrusection/specific/N3                 |   2 +-
 tests/thrusection/specific/N4                 |   2 +-
 128 files changed, 292 insertions(+), 232 deletions(-)
 create mode 100644 tests/bugs/modalg_6/bug26607

diff --git a/src/BRepGProp/BRepGProp.cxx b/src/BRepGProp/BRepGProp.cxx
index c2f363d121..8367ddaa30 100644
--- a/src/BRepGProp/BRepGProp.cxx
+++ b/src/BRepGProp/BRepGProp.cxx
@@ -47,7 +47,7 @@ void  BRepGProp::LinearProperties(const TopoDS_Shape& S, GProp_GProps& SProps){
   SProps = GProp_GProps(P);
 
   BRepAdaptor_Curve   BAC;
-//  Standard_Integer n,i;
+  //  Standard_Integer n,i;
   TopExp_Explorer ex;
   for (ex.Init(S,TopAbs_EDGE); ex.More(); ex.Next()) {
     BAC.Initialize(TopoDS::Edge(ex.Current()));
@@ -72,7 +72,9 @@ static Standard_Real surfaceProperties(const TopoDS_Shape& S, GProp_GProps& Prop
   for (ex.Init(S,TopAbs_FACE), i = 1; ex.More(); ex.Next(), i++) {
     const TopoDS_Face& F = TopoDS::Face(ex.Current());
     BF.Load(F);
-    if(!BF.NaturalRestriction()) BD.Init(F);
+    TopoDS_Iterator aWIter(F);
+    Standard_Boolean IsNatRestr = !aWIter.More();
+    if(!IsNatRestr) BD.Init(F);
     if(Eps < 1.0) {
       G.Perform(BF, BD, Eps); 
       Error = G.GetEpsilon();
@@ -83,7 +85,7 @@ static Standard_Real surfaceProperties(const TopoDS_Shape& S, GProp_GProps& Prop
 #endif
       }
     } else {
-      if(BF.NaturalRestriction()) G.Perform(BF);
+      if(IsNatRestr) G.Perform(BF);
       else G.Perform(BF, BD);
     }
     Props.Add(G);
@@ -133,20 +135,22 @@ static Standard_Real volumeProperties(const TopoDS_Shape& S, GProp_GProps& Props
     const TopoDS_Face& F = TopoDS::Face(ex.Current());
     if ((F.Orientation() == TopAbs_FORWARD) || (F.Orientation() == TopAbs_REVERSED)){
       BF.Load(F);
-      if(!BF.NaturalRestriction()) BD.Init(F);
+      TopoDS_Iterator aWIter(F);
+      Standard_Boolean IsNatRestr = !aWIter.More();
+      if(!IsNatRestr) BD.Init(F);
       if(Eps < 1.0) {
-	G.Perform(BF, BD, Eps); 
-	Error = G.GetEpsilon();
-	if(ErrorMax < Error) {
-	  ErrorMax = Error;
+        G.Perform(BF, BD, Eps); 
+        Error = G.GetEpsilon();
+        if(ErrorMax < Error) {
+          ErrorMax = Error;
 #ifdef OCCT_DEBUG
-	  iErrorMax = i;
+          iErrorMax = i;
 #endif
-	}
+        }
       }
       else {
-	if(BF.NaturalRestriction()) G.Perform(BF);
-	else G.Perform(BF, BD);
+        if(IsNatRestr) G.Perform(BF);
+        else G.Perform(BF, BD);
       }
       Props.Add(G);
 #ifdef OCCT_DEBUG
@@ -178,7 +182,7 @@ void  BRepGProp::VolumeProperties(const TopoDS_Shape& S, GProp_GProps& Props, co
 //=======================================================================
 
 Standard_Real BRepGProp::VolumeProperties(const TopoDS_Shape& S, GProp_GProps& Props, 
-					  const Standard_Real Eps, const Standard_Boolean OnlyClosed)
+  const Standard_Real Eps, const Standard_Boolean OnlyClosed)
 { 
   // find the origin
   gp_Pnt P(0,0,0);  P.Transform(S.Location());
@@ -193,13 +197,13 @@ Standard_Real BRepGProp::VolumeProperties(const TopoDS_Shape& S, GProp_GProps& P
     for (i = 1; ex.More(); ex.Next(), i++) {
       const TopoDS_Shape& Sh = ex.Current();
       if(BRep_Tool::IsClosed(Sh)) {
-	Error = volumeProperties(Sh,Props,Eps);
-	if(ErrorMax < Error) {
-	  ErrorMax = Error;
+        Error = volumeProperties(Sh,Props,Eps);
+        if(ErrorMax < Error) {
+          ErrorMax = Error;
 #ifdef OCCT_DEBUG
-	  iErrorMax = i;
+          iErrorMax = i;
 #endif
-	}
+        }
       }
     }
   } else ErrorMax = volumeProperties(S,Props,Eps);
@@ -218,15 +222,15 @@ Standard_Real BRepGProp::VolumeProperties(const TopoDS_Shape& S, GProp_GProps& P
 //=======================================================================
 
 static Standard_Real volumePropertiesGK(const TopoDS_Shape     &theShape,
-				              GProp_GProps     &theProps,
-					const Standard_Real     theTol,
-					const Standard_Boolean  IsUseSpan,
-					const Standard_Boolean  CGFlag,
-					const Standard_Boolean  IFlag)
+  GProp_GProps     &theProps,
+  const Standard_Real     theTol,
+  const Standard_Boolean  IsUseSpan,
+  const Standard_Boolean  CGFlag,
+  const Standard_Boolean  IFlag)
 {
   TopExp_Explorer  anExp;
   anExp.Init(theShape, TopAbs_FACE);
- 
+
   Standard_Real aTol = theTol;
 
   // Compute properties.
@@ -243,21 +247,23 @@ static Standard_Real volumePropertiesGK(const TopoDS_Shape     &theShape,
     TopoDS_Face aFace = TopoDS::Face(anExp.Current());
 
     if (aFace.Orientation() == TopAbs_FORWARD ||
-	aFace.Orientation() == TopAbs_REVERSED) {
-      aPropFace.Load(aFace);
+      aFace.Orientation() == TopAbs_REVERSED) {
+        aPropFace.Load(aFace);
 
-      if(aPropFace.NaturalRestriction())
-	aLocalError = aVProps.Perform(aPropFace, aTol, CGFlag, IFlag);
-      else {
-	aPropDomain.Init(aFace);
-	aLocalError = aVProps.Perform(aPropFace, aPropDomain, aTol, CGFlag, IFlag);
-      }
+        TopoDS_Iterator aWIter(aFace);
+        Standard_Boolean IsNatRestr = !aWIter.More();
+        if(IsNatRestr)
+          aLocalError = aVProps.Perform(aPropFace, aTol, CGFlag, IFlag);
+        else {
+          aPropDomain.Init(aFace);
+          aLocalError = aVProps.Perform(aPropFace, aPropDomain, aTol, CGFlag, IFlag);
+        }
 
-      if (aLocalError < 0.)
-	return aLocalError;
+        if (aLocalError < 0.)
+          return aLocalError;
 
-      anError += aLocalError;
-      theProps.Add(aVProps);
+        anError += aLocalError;
+        theProps.Add(aVProps);
     }
   }
 
@@ -270,12 +276,12 @@ static Standard_Real volumePropertiesGK(const TopoDS_Shape     &theShape,
 //=======================================================================
 
 Standard_Real BRepGProp::VolumePropertiesGK(const TopoDS_Shape     &S,
-					          GProp_GProps     &Props, 
-					    const Standard_Real     Eps,
-					    const Standard_Boolean  OnlyClosed,
-					    const Standard_Boolean  IsUseSpan,
-					    const Standard_Boolean  CGFlag,
-					    const Standard_Boolean  IFlag)
+  GProp_GProps     &Props, 
+  const Standard_Real     Eps,
+  const Standard_Boolean  OnlyClosed,
+  const Standard_Boolean  IsUseSpan,
+  const Standard_Boolean  CGFlag,
+  const Standard_Boolean  IFlag)
 { 
   gp_Pnt        P(0,0,0);
   Standard_Real anError = 0.;
@@ -297,7 +303,7 @@ Standard_Real BRepGProp::VolumePropertiesGK(const TopoDS_Shape     &S,
       BRepCheck_Status aStatus = aChecker.Closed(Standard_False);
 
       if(aStatus == BRepCheck_NoError) 
-	aClosedShells.Append(aShell);
+        aClosedShells.Append(aShell);
 
     }
 
@@ -315,11 +321,11 @@ Standard_Real BRepGProp::VolumePropertiesGK(const TopoDS_Shape     &S,
       aLocalError = volumePropertiesGK(aShell, Props, aTol, IsUseSpan, CGFlag, IFlag);
 
       if (aLocalError < 0)
-	return aLocalError;
+        return aLocalError;
 
       anError += aLocalError;
     }
-  
+
   } else
     anError = volumePropertiesGK(S, Props, Eps, IsUseSpan, CGFlag, IFlag);
 
@@ -334,12 +340,12 @@ Standard_Real BRepGProp::VolumePropertiesGK(const TopoDS_Shape     &S,
 //=======================================================================
 
 static Standard_Real volumePropertiesGK(const TopoDS_Shape     &theShape,
-				              GProp_GProps     &theProps,
-					const gp_Pln           &thePln,
-					const Standard_Real     theTol,
-					const Standard_Boolean  IsUseSpan,
-					const Standard_Boolean  CGFlag,
-					const Standard_Boolean  IFlag)
+  GProp_GProps     &theProps,
+  const gp_Pln           &thePln,
+  const Standard_Real     theTol,
+  const Standard_Boolean  IsUseSpan,
+  const Standard_Boolean  CGFlag,
+  const Standard_Boolean  IFlag)
 {
   TopExp_Explorer  anExp;
   anExp.Init(theShape, TopAbs_FACE);
@@ -360,21 +366,23 @@ static Standard_Real volumePropertiesGK(const TopoDS_Shape     &theShape,
     TopoDS_Face aFace = TopoDS::Face(anExp.Current());
 
     if (aFace.Orientation() == TopAbs_FORWARD ||
-	aFace.Orientation() == TopAbs_REVERSED) {
-      aPropFace.Load(aFace);
+      aFace.Orientation() == TopAbs_REVERSED) {
+        aPropFace.Load(aFace);
 
-      if(aPropFace.NaturalRestriction())
-	aLocalError = aVProps.Perform(aPropFace, thePln, aTol, CGFlag, IFlag);
-      else {
-	aPropDomain.Init(aFace);
-	aLocalError = aVProps.Perform(aPropFace, aPropDomain, thePln, aTol, CGFlag, IFlag);
-      }
+        TopoDS_Iterator aWIter(aFace);
+        Standard_Boolean IsNatRestr = !aWIter.More();
+        if(IsNatRestr)
+          aLocalError = aVProps.Perform(aPropFace, thePln, aTol, CGFlag, IFlag);
+        else {
+          aPropDomain.Init(aFace);
+          aLocalError = aVProps.Perform(aPropFace, aPropDomain, thePln, aTol, CGFlag, IFlag);
+        }
 
-      if (aLocalError < 0.)
-	return aLocalError;
+        if (aLocalError < 0.)
+          return aLocalError;
 
-      anError += aLocalError;
-      theProps.Add(aVProps);
+        anError += aLocalError;
+        theProps.Add(aVProps);
     }
   }
 
@@ -387,13 +395,13 @@ static Standard_Real volumePropertiesGK(const TopoDS_Shape     &theShape,
 //=======================================================================
 
 Standard_Real BRepGProp::VolumePropertiesGK(const TopoDS_Shape     &S,
-					          GProp_GProps     &Props,
-					    const gp_Pln           &thePln,
-					    const Standard_Real     Eps,
-					    const Standard_Boolean  OnlyClosed,
-					    const Standard_Boolean  IsUseSpan,
-					    const Standard_Boolean  CGFlag,
-					    const Standard_Boolean  IFlag)
+  GProp_GProps     &Props,
+  const gp_Pln           &thePln,
+  const Standard_Real     Eps,
+  const Standard_Boolean  OnlyClosed,
+  const Standard_Boolean  IsUseSpan,
+  const Standard_Boolean  CGFlag,
+  const Standard_Boolean  IFlag)
 { 
   gp_Pnt        P(0,0,0);
   Standard_Real anError = 0.;
@@ -415,7 +423,7 @@ Standard_Real BRepGProp::VolumePropertiesGK(const TopoDS_Shape     &S,
       BRepCheck_Status aStatus = aChecker.Closed(Standard_False);
 
       if(aStatus == BRepCheck_NoError) 
-	aClosedShells.Append(aShell);
+        aClosedShells.Append(aShell);
 
     }
 
@@ -433,7 +441,7 @@ Standard_Real BRepGProp::VolumePropertiesGK(const TopoDS_Shape     &S,
       aLocalError = volumePropertiesGK(aShell, Props, thePln, aTol, IsUseSpan, CGFlag, IFlag);
 
       if (aLocalError < 0)
-	return aLocalError;
+        return aLocalError;
 
       anError += aLocalError;
     }
diff --git a/src/BRepGProp/BRepGProp_Face.hxx b/src/BRepGProp/BRepGProp_Face.hxx
index 96416f936a..855d7de7cd 100644
--- a/src/BRepGProp/BRepGProp_Face.hxx
+++ b/src/BRepGProp/BRepGProp_Face.hxx
@@ -65,6 +65,9 @@ public:
   
   //! Returns Standard_True if the face is not trimmed.
     Standard_Boolean NaturalRestriction() const;
+
+  //! Returns the TopoDS face.
+  const TopoDS_Face& GetFace() const; 
   
   //! Returns the value of the boundary curve of the face.
     gp_Pnt2d Value2d (const Standard_Real U) const;
diff --git a/src/BRepGProp/BRepGProp_Face.lxx b/src/BRepGProp/BRepGProp_Face.lxx
index e403e45d4d..4c5661c3ae 100644
--- a/src/BRepGProp/BRepGProp_Face.lxx
+++ b/src/BRepGProp/BRepGProp_Face.lxx
@@ -48,6 +48,16 @@ inline Standard_Boolean BRepGProp_Face::NaturalRestriction() const
 {
   return BRep_Tool::NaturalRestriction(mySurface.Face());
 }
+//
+//=======================================================================
+//function : GetFace
+//purpose  : Returns TopoDS Face.
+//=======================================================================
+
+inline const TopoDS_Face& BRepGProp_Face::GetFace() const
+{
+  return mySurface.Face();
+}
 
 //=======================================================================
 //function : Value2d
diff --git a/src/BRepGProp/BRepGProp_Gauss.cxx b/src/BRepGProp/BRepGProp_Gauss.cxx
index 2db9abbc3b..039513fc58 100644
--- a/src/BRepGProp/BRepGProp_Gauss.cxx
+++ b/src/BRepGProp/BRepGProp_Gauss.cxx
@@ -584,7 +584,9 @@ Standard_Real BRepGProp_Gauss::Compute(
 
   //
   const Standard_Integer NumSubs = SUBS_POWER;
-  const Standard_Boolean isNaturalRestriction = theSurface.NaturalRestriction();
+  const TopoDS_Face& aF = theSurface.GetFace(); 
+  TopoDS_Iterator aWIter(aF);
+  const Standard_Boolean isNaturalRestriction = !aWIter.More(); //theSurface.NaturalRestriction();
 
   Standard_Real CIx, CIy, CIz, CIxy, CIxz, CIyz;
   Standard_Real CDim[2], CIxx[2], CIyy[2], CIzz[2];
@@ -1111,9 +1113,11 @@ void BRepGProp_Gauss::Compute(BRepGProp_Face&   theSurface,
   {
     theSurface.Load(theDomain.Value());
 
-    const Standard_Integer NbCGaussgp_Pnts =
+    Standard_Integer NbCGaussgp_Pnts =
       Min(theSurface.IntegrationOrder(), math::GaussPointsMax());
 
+    NbCGaussgp_Pnts = Max(NbCGaussgp_Pnts, NbGaussgp_Pnts);
+
     math_Vector GaussCP(1, NbCGaussgp_Pnts);
     math_Vector GaussCW(1, NbCGaussgp_Pnts);
     math::GaussPoints (NbCGaussgp_Pnts, GaussCP);
diff --git a/tests/blend/bfuseblend/B7 b/tests/blend/bfuseblend/B7
index 8fc8db94af..526ed30a1a 100644
--- a/tests/blend/bfuseblend/B7
+++ b/tests/blend/bfuseblend/B7
@@ -6,4 +6,4 @@ tscale s1 0 0 0 SCALE1
 tscale s2 0 0 0 SCALE1
 bfuseblend result s1 s2 1*SCALE1
 
-set square 53457.8
+set square 52754.1
diff --git a/tests/blend/buildevol/F1 b/tests/blend/buildevol/F1
index d28d3538f8..db3472acdc 100644
--- a/tests/blend/buildevol/F1
+++ b/tests/blend/buildevol/F1
@@ -9,4 +9,4 @@ mkevol result s
 updatevol s_3 0 1*SCALE1 1 2*SCALE1 2 1*SCALE1
 buildevol
  
-set square 78053.9
+set square 76962.6
diff --git a/tests/blend/encoderegularity/A3 b/tests/blend/encoderegularity/A3
index 0a8312f923..49cfeb2fe5 100644
--- a/tests/blend/encoderegularity/A3
+++ b/tests/blend/encoderegularity/A3
@@ -9,4 +9,4 @@ blend result m 10 m_5 10 m_6 \
 explode result Sh
 renamevar result_1 result
 
-set square 5824.68
+set square 5884.39
diff --git a/tests/blend/simple/U5 b/tests/blend/simple/U5
index 1e0fc26c7c..f1f2776e16 100644
--- a/tests/blend/simple/U5
+++ b/tests/blend/simple/U5
@@ -10,4 +10,4 @@ tscale s 0 0 0 SCALE2
 explode s E
 blend result s 2.5*SCALE2 s_6
 
-set square 652.96
+set square 638.478
diff --git a/tests/bugs/modalg_1/buc60531_1 b/tests/bugs/modalg_1/buc60531_1
index 6bc69bb76a..441772ea89 100755
--- a/tests/bugs/modalg_1/buc60531_1
+++ b/tests/bugs/modalg_1/buc60531_1
@@ -10,6 +10,6 @@ checkshape pl1
 
 bcut result r1 pl1
 
-set square 115935
+set square 119983
 set 2dviewer 0
 
diff --git a/tests/bugs/modalg_1/buc60533 b/tests/bugs/modalg_1/buc60533
index 6d6a276cc7..fffdb9fb9a 100755
--- a/tests/bugs/modalg_1/buc60533
+++ b/tests/bugs/modalg_1/buc60533
@@ -66,5 +66,5 @@ copy r_1 result
 #  An exception was caught Standard_ConstructionError: 
 #  ** Exception ** Standard_ConstructionError: 
  
-set square 1.65227e+07
+set square 1.59518e+07
 set 2dviewer 0
diff --git a/tests/bugs/modalg_1/buc60555_1 b/tests/bugs/modalg_1/buc60555_1
index 026e2afe2c..8f988fa8be 100755
--- a/tests/bugs/modalg_1/buc60555_1
+++ b/tests/bugs/modalg_1/buc60555_1
@@ -33,5 +33,5 @@ if { $MaxFaceTolerance > 1 || $MaxEdgeTolerance > 1 || $MaxVertexTolerance > 1 }
     puts "Tolerance of shape is less then 1.0"
 }
 
-set square 4.10276e+007
+set square 4.21741e+007
 set 2dviewer 0
diff --git a/tests/bugs/modalg_1/buc60555_2 b/tests/bugs/modalg_1/buc60555_2
index 855a67d231..a9ff829af8 100755
--- a/tests/bugs/modalg_1/buc60555_2
+++ b/tests/bugs/modalg_1/buc60555_2
@@ -50,5 +50,5 @@ if { $MaxFaceTolerance > 1 || $MaxEdgeTolerance > 1 || $MaxVertexTolerance > 1 }
 } else {
     puts "Tolerance of shape is less then 1.0"
 }
-set square 3.92639e+007
+set square 4.03996e+007
 set 2dviewer 0
diff --git a/tests/bugs/modalg_1/bug10160_6 b/tests/bugs/modalg_1/bug10160_6
index 029f0ce478..9613a54374 100755
--- a/tests/bugs/modalg_1/bug10160_6
+++ b/tests/bugs/modalg_1/bug10160_6
@@ -39,7 +39,7 @@ puts "CPU_user_time=${CPU_user_time}"
 set CPU_user_time [expr ${CPU_user_time} / ${NbTests}]
 puts "CPU_user_time=${CPU_user_time}"
 
-set square 3.61484e+07
+set square 3.65961e+07
 
 # Analysis of "nbshapes res"
 set nb_v_good 121
diff --git a/tests/bugs/modalg_1/bug10160_7 b/tests/bugs/modalg_1/bug10160_7
index bbbc95e988..751c3ed39b 100755
--- a/tests/bugs/modalg_1/bug10160_7
+++ b/tests/bugs/modalg_1/bug10160_7
@@ -40,7 +40,7 @@ puts "CPU_user_time=${CPU_user_time}"
 set CPU_user_time [expr ${CPU_user_time} / ${NbTests}]
 puts "CPU_user_time=${CPU_user_time}"
 
-set square 3.00597e+07
+set square 3.05118e+07
 
 # Analysis of "nbshapes res"
 set nb_v_good 61
diff --git a/tests/bugs/modalg_1/bug13140 b/tests/bugs/modalg_1/bug13140
index 4f6182227d..8feff981e4 100755
--- a/tests/bugs/modalg_1/bug13140
+++ b/tests/bugs/modalg_1/bug13140
@@ -11,7 +11,7 @@ restore [locate_data_file OCC13140_Profile.brep] Profile
 
 pipe result Spine Profile
 
-set square 3.48689
+set square 3.68518
 set good_vertex 2
 set good_edge 3
 set good_wire 1
diff --git a/tests/bugs/modalg_2/bug21261_16 b/tests/bugs/modalg_2/bug21261_16
index 89c81c4b61..55d1c839dc 100755
--- a/tests/bugs/modalg_2/bug21261_16
+++ b/tests/bugs/modalg_2/bug21261_16
@@ -12,7 +12,7 @@ restore [locate_data_file OCC21261-1988_ellipsepipesrf_1.brep] s
 
 thickshell result s -5
 
-set square 17366.2
+set square 17592.2
 
 set nb_v_good 4
 set nb_e_good 8
diff --git a/tests/bugs/modalg_2/bug22586 b/tests/bugs/modalg_2/bug22586
index 041b449a8e..c0a48273ba 100755
--- a/tests/bugs/modalg_2/bug22586
+++ b/tests/bugs/modalg_2/bug22586
@@ -19,4 +19,4 @@ if { [catch { OCC22586 shape result } catch_result] } {
 }
 
 set 3dviewer 1 
-set square 11275.7
+set square 10975
diff --git a/tests/bugs/modalg_2/bug22727 b/tests/bugs/modalg_2/bug22727
index 7946cd245d..b6dea86a77 100755
--- a/tests/bugs/modalg_2/bug22727
+++ b/tests/bugs/modalg_2/bug22727
@@ -14,7 +14,7 @@ tscale t 0.0507219 -0.0399294 -0.00324254 1000
 explode t e
 blend result t 2. t_3
 
-set square 3471.94
+set square 3545.26
 
 set nb_v_good 12
 set nb_e_good 14
diff --git a/tests/bugs/modalg_2/bug22818_1 b/tests/bugs/modalg_2/bug22818_1
index 47bfffd9ae..03048d583f 100755
--- a/tests/bugs/modalg_2/bug22818_1
+++ b/tests/bugs/modalg_2/bug22818_1
@@ -1,5 +1,3 @@
-puts "TODO OCC23832 ALL: Error   : area by triangles differs from the actual area by"
-
 puts "================"
 puts "OCC22818"
 puts "================"
@@ -24,7 +22,7 @@ don f1
 revol result f1 0 10 0 0 0 1 180
 checkshape result
 
-set square 823.385
+set square 673.385
 
 set nb_v_good 3
 set nb_e_good 8
diff --git a/tests/bugs/modalg_2/bug22818_2 b/tests/bugs/modalg_2/bug22818_2
index 6e89e4d4be..676b5bdab2 100755
--- a/tests/bugs/modalg_2/bug22818_2
+++ b/tests/bugs/modalg_2/bug22818_2
@@ -1,5 +1,3 @@
-puts "TODO OCC23832 ALL: Error   : area by triangles differs from the actual area by"
-
 puts "================"
 puts "OCC22818"
 puts "================"
@@ -25,7 +23,7 @@ don f1
 revol result f1 0 10 0 0 0 1 180
 checkshape result
 
-set square 186.072
+set square 161.072
 
 set nb_v_good 3
 set nb_e_good 8
diff --git a/tests/bugs/modalg_2/bug22864 b/tests/bugs/modalg_2/bug22864
index a6162db40d..26e4fc8ceb 100755
--- a/tests/bugs/modalg_2/bug22864
+++ b/tests/bugs/modalg_2/bug22864
@@ -95,7 +95,5 @@ if {${status} == 0} {
     puts "Faulty ${BugNumber}"
 }
 
-set square 6606.88
+set square 8464.91
 set 2dviewer 0
-
-
diff --git a/tests/bugs/modalg_4/bug636 b/tests/bugs/modalg_4/bug636
index 88f5cf23c3..ef86394fb1 100755
--- a/tests/bugs/modalg_4/bug636
+++ b/tests/bugs/modalg_4/bug636
@@ -26,6 +26,5 @@ if [catch { buildsweep result } catch_result] {
     puts "OCC636 OK: function buildsweep works properly"
 }
 
-set square 3836.92
+set square 3934.22
 set 2dviewer 0
-
diff --git a/tests/bugs/modalg_5/bug22981 b/tests/bugs/modalg_5/bug22981
index 12738b02aa..add8e01660 100644
--- a/tests/bugs/modalg_5/bug22981
+++ b/tests/bugs/modalg_5/bug22981
@@ -12,7 +12,7 @@ explode t
 thrusections result 0 0 t_1 t_2
 thrusections result 0 0 t_2 t_3 t_4 t_5 t_6 t_7 t_8 t_9 t_10 t_11
 
-set square 6733.76
+set square 6234.87
 set 2dviewer 0
 
 
diff --git a/tests/bugs/modalg_5/bug23706_2 b/tests/bugs/modalg_5/bug23706_2
index e7c594bbfd..d7d1715525 100755
--- a/tests/bugs/modalg_5/bug23706_2
+++ b/tests/bugs/modalg_5/bug23706_2
@@ -19,7 +19,7 @@ offset o1 ss 2
 mkface res o1
 set info [sprops res]
 regexp {Mass +: +([-0-9.+eE]+)} $info full sq
-set sq_check 248.667
+set sq_check 240.865
 
 if { [expr 1.*abs($sq_check - $sq)/$sq_check] > 0.01 } {
    puts "Error : The square of result shape is $sq"
diff --git a/tests/bugs/modalg_5/bug23706_3 b/tests/bugs/modalg_5/bug23706_3
index 71c5592d2c..de051df146 100755
--- a/tests/bugs/modalg_5/bug23706_3
+++ b/tests/bugs/modalg_5/bug23706_3
@@ -16,8 +16,4 @@ don result
 fit
 checkshape result
 
-set square 1.86489
-
-
-
-
+set square 1.67216
diff --git a/tests/bugs/modalg_5/bug23870_2 b/tests/bugs/modalg_5/bug23870_2
index 8e042418b3..56773f8ce6 100755
--- a/tests/bugs/modalg_5/bug23870_2
+++ b/tests/bugs/modalg_5/bug23870_2
@@ -20,7 +20,7 @@ wire profile profile
 
 pipe result spine profile 2 approx
 
-set square 8997.97
+set square 8772.95
 
 set nb_v_good 2
 set nb_e_good 3
diff --git a/tests/bugs/modalg_6/bug26607 b/tests/bugs/modalg_6/bug26607
new file mode 100644
index 0000000000..c3f8228c1e
--- /dev/null
+++ b/tests/bugs/modalg_6/bug26607
@@ -0,0 +1,21 @@
+puts "=========="
+puts "OCC26607"
+puts "=========="
+puts ""
+###########################################
+# Wrong value of area.
+###########################################
+
+box b1 10 10 10
+box b2 20 0 0 10 10 10
+explode b1 f
+explode b2 f
+explode b1_5 
+explode b2_5 
+ 
+mksurface s b1_5 
+mkface fs s
+add b1_5_1 fs
+add b2_5_1 fs
+ 
+checkarea fs -200 1e-06 0.01
diff --git a/tests/bugs/moddata_3/bug20866 b/tests/bugs/moddata_3/bug20866
index 8b814149c4..c56a19dbc8 100644
--- a/tests/bugs/moddata_3/bug20866
+++ b/tests/bugs/moddata_3/bug20866
@@ -26,7 +26,7 @@ if [catch { buildsweep result } ] {
   puts "Faulty ${BugNumber} : buildsweep is wrong"
 } else {
 
-    set square 1.87535e+06
+    set square 1.94998e+06
 
     set nb_v_good 161
     set nb_e_good 299
diff --git a/tests/bugs/vis/bug22188 b/tests/bugs/vis/bug22188
index e7d8b9898e..cf6edd9008 100755
--- a/tests/bugs/vis/bug22188
+++ b/tests/bugs/vis/bug22188
@@ -75,7 +75,7 @@ if { ${deflection_percent} > ${percent_max} } {
    puts "deflection: OK ${BugNumber}"
 }
 
-set square 33561.4
+set square 32416.7
 
 set nb_v_good 2
 set nb_e_good 3
diff --git a/tests/bugs/vis/bug288_10 b/tests/bugs/vis/bug288_10
index 3ef962e15a..0ce4cc2711 100755
--- a/tests/bugs/vis/bug288_10
+++ b/tests/bugs/vis/bug288_10
@@ -10,7 +10,7 @@ set BugNumber OCC288
 
 restore [locate_data_file shading_151.brep] result
 
-set square 54328.8
+set square 52620.1
 
 set nb_v_good 20
 set nb_e_good 37
diff --git a/tests/bugs/xde/bug22492 b/tests/bugs/xde/bug22492
index 3b6ff9a5f9..4ebef2d7a7 100755
--- a/tests/bugs/xde/bug22492
+++ b/tests/bugs/xde/bug22492
@@ -19,7 +19,7 @@ stepread $imagedir/${test_image}.step sc2 *
 tpcompound sc2
 renamevar sc2 result
 
-set square 285636
+set square 271280
 
 set nb_v_good 2
 set nb_e_good 3
diff --git a/tests/bugs/xde/bug22805 b/tests/bugs/xde/bug22805
index 08cdd1c392..0a83c758be 100755
--- a/tests/bugs/xde/bug22805
+++ b/tests/bugs/xde/bug22805
@@ -20,6 +20,6 @@ if { [regexp {This shape seems to be valid} $info]} {
 }
 
 renamevar result_1 result
-set square 15121.2
+set square 14447.5
 set 3dviewer 0
 
diff --git a/tests/heal/data/advanced/U9 b/tests/heal/data/advanced/U9
index 4578bf26d8..844920a061 100644
--- a/tests/heal/data/advanced/U9
+++ b/tests/heal/data/advanced/U9
@@ -1,6 +1,6 @@
-if { [string compare $command "ShapeConvertRev"] == 0 } {
-   puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
-}
+#if { [string compare $command "ShapeConvertRev"] == 0 } {
+#   puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
+#}
 if {[string compare $command "SplitAngle"] == 0 } {
     puts "TODO OCC23127 ALL: Faulty shapes in variables faulty_1 to faulty_3 "
 }
diff --git a/tests/heal/data/advanced/V4 b/tests/heal/data/advanced/V4
index 7336a07575..34b8aad935 100644
--- a/tests/heal/data/advanced/V4
+++ b/tests/heal/data/advanced/V4
@@ -1,6 +1,6 @@
-if { [string compare $command "ShapeConvertRev"] == 0 } {
-   puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
-}
+#if { [string compare $command "ShapeConvertRev"] == 0 } {
+#   puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
+#}
 
 restore [locate_data_file BORNIER80.brep] a
 
diff --git a/tests/heal/data/advanced/V5 b/tests/heal/data/advanced/V5
index 174cd65dc8..93d4a91cdb 100644
--- a/tests/heal/data/advanced/V5
+++ b/tests/heal/data/advanced/V5
@@ -1,6 +1,6 @@
-if { [string compare $command "ShapeConvertRev"] == 0 } {
-   puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
-}
+#if { [string compare $command "ShapeConvertRev"] == 0 } {
+#   puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
+#}
 if {[string compare $command "SplitAngle"] == 0 } {
     puts "TODO OCC23127 ALL: Faulty shapes in variables faulty_1 to faulty_4 "
 }
diff --git a/tests/heal/data/advanced/Y3 b/tests/heal/data/advanced/Y3
index bfb4398f7e..76936e3bcf 100644
--- a/tests/heal/data/advanced/Y3
+++ b/tests/heal/data/advanced/Y3
@@ -1,5 +1,5 @@
-if { [string compare $command "ShapeConvertRev"] == 0 } {
-   puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
-}
+#if { [string compare $command "ShapeConvertRev"] == 0 } {
+#   puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
+#}
 restore [locate_data_file METABO11.brep] a
 
diff --git a/tests/heal/data/advanced/Y5 b/tests/heal/data/advanced/Y5
index ed68e31d3f..9921f5c2b3 100644
--- a/tests/heal/data/advanced/Y5
+++ b/tests/heal/data/advanced/Y5
@@ -1,5 +1,5 @@
-if { [string compare $command "ShapeConvertRev"] == 0 } {
-   puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
-}
+#if { [string compare $command "ShapeConvertRev"] == 0 } {
+#   puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
+#}
 restore [locate_data_file METABO2.brep] a
 
diff --git a/tests/heal/data/advanced/Z7 b/tests/heal/data/advanced/Z7
index b60d090183..424a8398e0 100644
--- a/tests/heal/data/advanced/Z7
+++ b/tests/heal/data/advanced/Z7
@@ -1,5 +1,5 @@
-if {[string compare $command "ShapeConvertRev"] == 0 } {
-    puts "TODO OCC23127 ALL: Error : The area of the resulting shape is "
-}
+#if {[string compare $command "ShapeConvertRev"] == 0 } {
+#    puts "TODO OCC23127 ALL: Error : The area of the resulting shape is "
+#}
 restore [locate_data_file PB_COPCOLL.brep] a
 
diff --git a/tests/heal/data/advanced/ZB1 b/tests/heal/data/advanced/ZB1
index 89d632e425..67c0caefae 100644
--- a/tests/heal/data/advanced/ZB1
+++ b/tests/heal/data/advanced/ZB1
@@ -1,5 +1,5 @@
-if { [string compare $command "ShapeConvertRev"] == 0 } {
-   puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
-}
+#if { [string compare $command "ShapeConvertRev"] == 0 } {
+#   puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
+#}
 restore [locate_data_file SFR2.brep] a
 
diff --git a/tests/heal/data/advanced/ZB5 b/tests/heal/data/advanced/ZB5
index aa8bb65c07..952d8fa674 100644
--- a/tests/heal/data/advanced/ZB5
+++ b/tests/heal/data/advanced/ZB5
@@ -1,5 +1,5 @@
-if { [string compare $command "ShapeConvertRev"] == 0 } {
-   puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
-}
+#if { [string compare $command "ShapeConvertRev"] == 0 } {
+#   puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
+#}
 restore [locate_data_file TOP01245_2.brep] a
 
diff --git a/tests/heal/data/standard/A5 b/tests/heal/data/standard/A5
index f3df7d2418..e934d54e96 100644
--- a/tests/heal/data/standard/A5
+++ b/tests/heal/data/standard/A5
@@ -1,2 +1,3 @@
 restore [locate_data_file arx.rle] a
 
+set rel_tol 0.015
diff --git a/tests/heal/data/standard/C8 b/tests/heal/data/standard/C8
index 4e68d53c67..b618dc16e1 100644
--- a/tests/heal/data/standard/C8
+++ b/tests/heal/data/standard/C8
@@ -1,5 +1,5 @@
-if { [string compare $command "ShapeConvertRev"] == 0 } {
-   puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
-}
+#if { [string compare $command "ShapeConvertRev"] == 0 } {
+#   puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
+#}
 restore [locate_data_file heal-Face1.rle] a
 
diff --git a/tests/heal/data/standard/E5 b/tests/heal/data/standard/E5
index 7baffee5dc..9e7add3ec0 100644
--- a/tests/heal/data/standard/E5
+++ b/tests/heal/data/standard/E5
@@ -1,5 +1,5 @@
-if { [string compare $command "ShapeConvertRev"] == 0 } {
-   puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
-}
+#if { [string compare $command "ShapeConvertRev"] == 0 } {
+#   puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
+#}
 restore [locate_data_file ma-test2.rle] a
 
diff --git a/tests/heal/data/standard/ZW1 b/tests/heal/data/standard/ZW1
index 77db1287bc..b6ab694b53 100644
--- a/tests/heal/data/standard/ZW1
+++ b/tests/heal/data/standard/ZW1
@@ -1,6 +1,6 @@
-if { [string compare $command "ShapeConvertRev"] == 0 } {
-    puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
-}
+#if { [string compare $command "ShapeConvertRev"] == 0 } {
+#    puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
+#}
 restore [locate_data_file heal-Face1.rle] a
 
 
diff --git a/tests/heal/data/standard/ZZ4 b/tests/heal/data/standard/ZZ4
index f949c59085..83746592ac 100644
--- a/tests/heal/data/standard/ZZ4
+++ b/tests/heal/data/standard/ZZ4
@@ -1,5 +1,5 @@
-if { [string compare $command "ShapeConvertRev"] == 0 } {
-   puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
-}
+#if { [string compare $command "ShapeConvertRev"] == 0 } {
+#   puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
+#}
 restore [locate_data_file BUG-CAPAR.brep] a
 
diff --git a/tests/heal/surface_to_revolution_advanced/begin b/tests/heal/surface_to_revolution_advanced/begin
index ccfadb87c1..ec39fef7c4 100644
--- a/tests/heal/surface_to_revolution_advanced/begin
+++ b/tests/heal/surface_to_revolution_advanced/begin
@@ -1,2 +1,3 @@
 set command ShapeConvertRev
 
+set rel_tol 0.01
diff --git a/tests/heal/surface_to_revolution_advanced/end b/tests/heal/surface_to_revolution_advanced/end
index eea980d3ad..63ab3db33e 100644
--- a/tests/heal/surface_to_revolution_advanced/end
+++ b/tests/heal/surface_to_revolution_advanced/end
@@ -15,9 +15,8 @@ if { $nb_plane != 0 || $nb_other_surf != 0 || $nb_curve != 0 || $nb_pcurve != 0}
 regexp {Mass +: +([-0-9.+eE]+)} [sprops a] full mass
 regexp {Mass +: +([-0-9.+eE]+)} [sprops result] full m
 
-if { ($mass != 0 && [expr 1.*abs($mass - $m)/$mass] > 0.01) || ($mass == 0 && $m != 0) } {
+if { ($mass != 0 && [expr 1.*abs($mass - $m)/$mass] > $rel_tol) || ($mass == 0 && $m != 0) } {
    puts "Error : The area of the resulting shape is $m"
 } else {
    puts "The areas of the initial and the resulting shape are equal"
 }
-
diff --git a/tests/heal/surface_to_revolution_standard/begin b/tests/heal/surface_to_revolution_standard/begin
index ccfadb87c1..ec39fef7c4 100644
--- a/tests/heal/surface_to_revolution_standard/begin
+++ b/tests/heal/surface_to_revolution_standard/begin
@@ -1,2 +1,3 @@
 set command ShapeConvertRev
 
+set rel_tol 0.01
diff --git a/tests/heal/surface_to_revolution_standard/end b/tests/heal/surface_to_revolution_standard/end
index 09b53a644e..63ab3db33e 100644
--- a/tests/heal/surface_to_revolution_standard/end
+++ b/tests/heal/surface_to_revolution_standard/end
@@ -15,9 +15,8 @@ if { $nb_plane != 0 || $nb_other_surf != 0 || $nb_curve != 0 || $nb_pcurve != 0}
 regexp {Mass +: +([-0-9.+eE]+)} [sprops a] full mass
 regexp {Mass +: +([-0-9.+eE]+)} [sprops result] full m
 
-if { ($mass != 0 && [expr 1.*abs($mass - $m)/$mass] > 0.01) || ($mass == 0 && $m != 0) } {
+if { ($mass != 0 && [expr 1.*abs($mass - $m)/$mass] > $rel_tol) || ($mass == 0 && $m != 0) } {
    puts "Error : The area of the resulting shape is $m"
 } else {
-   puts "The areas the initial and the resulting shape are equal"
+   puts "The areas of the initial and the resulting shape are equal"
 }
-
diff --git a/tests/mesh/data/advanced/B4 b/tests/mesh/data/advanced/B4
index 8073f936f3..01a1cd802c 100755
--- a/tests/mesh/data/advanced/B4
+++ b/tests/mesh/data/advanced/B4
@@ -1,3 +1,7 @@
 set TheFileName OCC22188.brep
 set bug_area "OCC22687"
-set rel_tol 3.3
+if { [string compare $command "shading"] == 0 } {
+   set rel_tol 0.793
+} else {
+   set rel_tol 0.052
+}
diff --git a/tests/mesh/data/standard/K4 b/tests/mesh/data/standard/K4
index a50e8d9dc5..89b1e726b9 100755
--- a/tests/mesh/data/standard/K4
+++ b/tests/mesh/data/standard/K4
@@ -1,3 +1,7 @@
 set TheFileName shading_094.brep
 set bug_area "OCC22687"
-set rel_tol 3.5
+if { [string compare $command "shading"] == 0 } {
+   set rel_tol 0.21
+} else {
+   set rel_tol 0.67
+}
diff --git a/tests/mesh/data/standard/K9 b/tests/mesh/data/standard/K9
index a26b2be1cf..51ba71221b 100755
--- a/tests/mesh/data/standard/K9
+++ b/tests/mesh/data/standard/K9
@@ -1,3 +1,3 @@
 set TheFileName shading_099.brep
 set bug_area "OCC22687"
-set rel_tol 1.5
+set rel_tol 0.298
diff --git a/tests/mesh/data/standard/M3 b/tests/mesh/data/standard/M3
index db15ca6189..9d6fe327d8 100755
--- a/tests/mesh/data/standard/M3
+++ b/tests/mesh/data/standard/M3
@@ -1,3 +1,7 @@
 set TheFileName shading_111.brep
 set bug_area "OCC22687"
-set rel_tol 2.8
+if { [string compare $command "shading"] == 0 } {
+   set rel_tol 0.317
+} else {
+   set rel_tol 0.103
+}
diff --git a/tests/mesh/data/standard/M4 b/tests/mesh/data/standard/M4
index b6a258a17e..14a7e2a338 100755
--- a/tests/mesh/data/standard/M4
+++ b/tests/mesh/data/standard/M4
@@ -1,3 +1,7 @@
 set TheFileName shading_112.brep
 set bug_area "OCC22687"
-set rel_tol 10.9
+if { [string compare $command "shading"] == 0 } {
+   set rel_tol 1.71
+} else {
+   set rel_tol 1.55
+}
diff --git a/tests/mesh/data/standard/O5 b/tests/mesh/data/standard/O5
index b47213ab5f..230baecfe9 100755
--- a/tests/mesh/data/standard/O5
+++ b/tests/mesh/data/standard/O5
@@ -1,5 +1,9 @@
 set TheFileName shading_131.brep
 set bug_area "OCC22687"
-set rel_tol 1.34
 set bug_withouttri "OCC22687"
 set nbwithouttri(ALL) 1
+if { [string compare $command "shading"] == 0 } {
+   set rel_tol 0.13
+} else {
+   set rel_tol 0.21
+}
diff --git a/tests/mesh/data/standard/Q7 b/tests/mesh/data/standard/Q7
index a18ed5e62d..287ff8de3d 100755
--- a/tests/mesh/data/standard/Q7
+++ b/tests/mesh/data/standard/Q7
@@ -1,3 +1,7 @@
 set TheFileName shading_151.brep
 set bug_area "OCC22687"
-set rel_tol 3.15
+if { [string compare $command "shading"] == 0 } {
+   set rel_tol 0.018
+} else {
+   set rel_tol 0.631
+}
diff --git a/tests/pipe/specific/K3 b/tests/pipe/specific/K3
index 160cc3ba23..457b83f90e 100755
--- a/tests/pipe/specific/K3
+++ b/tests/pipe/specific/K3
@@ -19,7 +19,7 @@ set setsweepOptions ""
 set addsweepOptions ""
 set buildsweepOptions ""
 
-set square 32077.2
+set square 30253.5
 
 set nb_v_good 3
 set nb_e_good 5
diff --git a/tests/pipe/specific/K5 b/tests/pipe/specific/K5
index 58480ef6df..7f9f3bccb2 100755
--- a/tests/pipe/specific/K5
+++ b/tests/pipe/specific/K5
@@ -19,7 +19,7 @@ set setsweepOptions ""
 set addsweepOptions "-T"
 set buildsweepOptions ""
 
-set square 33790.1
+set square 32349.5
 
 set nb_v_good 3
 set nb_e_good 5
diff --git a/tests/pipe/specific/K6 b/tests/pipe/specific/K6
index 65875120d4..577876ee07 100755
--- a/tests/pipe/specific/K6
+++ b/tests/pipe/specific/K6
@@ -19,7 +19,7 @@ set setsweepOptions ""
 set addsweepOptions "-T"
 set buildsweepOptions "-R"
 
-set square 34911.3
+set square 33467.5
 
 set nb_v_good 3
 set nb_e_good 8
diff --git a/tests/pipe/specific/K9 b/tests/pipe/specific/K9
index 8fae85277c..4cbbeaad19 100755
--- a/tests/pipe/specific/K9
+++ b/tests/pipe/specific/K9
@@ -19,7 +19,7 @@ set setsweepOptions ""
 set addsweepOptions "-R"
 set buildsweepOptions ""
 
-set square 32119.4
+set square 30131.6
 
 set nb_v_good 3
 set nb_e_good 5
diff --git a/tests/pipe/specific/L2 b/tests/pipe/specific/L2
index ab478460d1..ca68a5e34c 100755
--- a/tests/pipe/specific/L2
+++ b/tests/pipe/specific/L2
@@ -19,7 +19,7 @@ set setsweepOptions ""
 set addsweepOptions "-T -R"
 set buildsweepOptions ""
 
-set square 33656
+set square 32064.4
 
 set nb_v_good 3
 set nb_e_good 5
diff --git a/tests/pipe/specific/L3 b/tests/pipe/specific/L3
index 3c524d03a7..dac18dc65e 100755
--- a/tests/pipe/specific/L3
+++ b/tests/pipe/specific/L3
@@ -19,7 +19,7 @@ set setsweepOptions ""
 set addsweepOptions "-T -R"
 set buildsweepOptions "-R"
 
-set square 37899.3
+set square 36309.2
 
 set nb_v_good 4
 set nb_e_good 9
diff --git a/tests/pipe/specific/L6 b/tests/pipe/specific/L6
index a9e0502189..baf7c49f21 100755
--- a/tests/pipe/specific/L6
+++ b/tests/pipe/specific/L6
@@ -19,7 +19,7 @@ set setsweepOptions "-FR"
 set addsweepOptions ""
 set buildsweepOptions ""
 
-set square 29675.6
+set square 27860.8
 
 set nb_v_good 3
 set nb_e_good 5
diff --git a/tests/pipe/specific/L8 b/tests/pipe/specific/L8
index 6dc9488e29..d2d3a322cb 100755
--- a/tests/pipe/specific/L8
+++ b/tests/pipe/specific/L8
@@ -19,7 +19,7 @@ set setsweepOptions "-FR"
 set addsweepOptions "-T"
 set buildsweepOptions ""
 
-set square 31762.6
+set square 30617.5
 
 set nb_v_good 3
 set nb_e_good 5
diff --git a/tests/pipe/specific/M1 b/tests/pipe/specific/M1
index 30b78c7cff..06573b600b 100755
--- a/tests/pipe/specific/M1
+++ b/tests/pipe/specific/M1
@@ -19,7 +19,7 @@ set setsweepOptions "-FR"
 set addsweepOptions "-R"
 set buildsweepOptions ""
 
-set square 32119.4
+set square 30131.6
 
 set nb_v_good 3
 set nb_e_good 5
diff --git a/tests/pipe/specific/M3 b/tests/pipe/specific/M3
index f22691d2a0..0ba5f78f43 100755
--- a/tests/pipe/specific/M3
+++ b/tests/pipe/specific/M3
@@ -19,7 +19,7 @@ set setsweepOptions "-FR"
 set addsweepOptions "-T -R"
 set buildsweepOptions ""
 
-set square 34023.2
+set square 32800.5
 
 set nb_v_good 3
 set nb_e_good 5
diff --git a/tests/pipe/specific/M5 b/tests/pipe/specific/M5
index 54257b3d1b..1af117f5f4 100755
--- a/tests/pipe/specific/M5
+++ b/tests/pipe/specific/M5
@@ -19,7 +19,7 @@ set setsweepOptions "-CF"
 set addsweepOptions ""
 set buildsweepOptions ""
 
-set square 32077.2
+set square 30253.5
 
 set nb_v_good 3
 set nb_e_good 5
diff --git a/tests/pipe/specific/M7 b/tests/pipe/specific/M7
index 148a62f97e..8900034167 100755
--- a/tests/pipe/specific/M7
+++ b/tests/pipe/specific/M7
@@ -19,7 +19,7 @@ set setsweepOptions "-CF"
 set addsweepOptions "-T"
 set buildsweepOptions ""
 
-set square 33790.1
+set square 32349.5
 
 set nb_v_good 3
 set nb_e_good 5
diff --git a/tests/pipe/specific/M8 b/tests/pipe/specific/M8
index bbbe4df4ce..6d2cc425b6 100755
--- a/tests/pipe/specific/M8
+++ b/tests/pipe/specific/M8
@@ -19,7 +19,7 @@ set setsweepOptions "-CF"
 set addsweepOptions "-T"
 set buildsweepOptions "-R"
 
-set square 34911.3
+set square 33467.5
 
 set nb_v_good 3
 set nb_e_good 8
diff --git a/tests/pipe/specific/N2 b/tests/pipe/specific/N2
index a2bb9921a8..4ef007393f 100755
--- a/tests/pipe/specific/N2
+++ b/tests/pipe/specific/N2
@@ -19,7 +19,7 @@ set setsweepOptions "-CF"
 set addsweepOptions "-R"
 set buildsweepOptions ""
 
-set square 32119.4
+set square 30131.6
 
 set nb_v_good 3
 set nb_e_good 5
diff --git a/tests/pipe/specific/N3 b/tests/pipe/specific/N3
index b34216282b..df82af09b8 100755
--- a/tests/pipe/specific/N3
+++ b/tests/pipe/specific/N3
@@ -19,7 +19,7 @@ set setsweepOptions "-CF"
 set addsweepOptions "-T -R"
 set buildsweepOptions "-R"
 
-set square 37899.3
+set square 36309.2
 
 set nb_v_good 4
 set nb_e_good 9
diff --git a/tests/pipe/specific/N6 b/tests/pipe/specific/N6
index a0cd9d8ecc..a9c662ef36 100755
--- a/tests/pipe/specific/N6
+++ b/tests/pipe/specific/N6
@@ -19,7 +19,7 @@ set setsweepOptions ""
 set addsweepOptions ""
 set buildsweepOptions ""
 
-set square 29697.4
+set square 28006.9
 
 set nb_v_good 15
 set nb_e_good 25
diff --git a/tests/pipe/specific/N8 b/tests/pipe/specific/N8
index 99e167c6ad..2ff36f6058 100755
--- a/tests/pipe/specific/N8
+++ b/tests/pipe/specific/N8
@@ -19,7 +19,7 @@ set setsweepOptions ""
 set addsweepOptions "-T"
 set buildsweepOptions ""
 
-set square 30656.7
+set square 29295.4
 
 set nb_v_good 15
 set nb_e_good 25
diff --git a/tests/pipe/specific/O1 b/tests/pipe/specific/O1
index b9227d0150..feb7d20687 100755
--- a/tests/pipe/specific/O1
+++ b/tests/pipe/specific/O1
@@ -19,7 +19,7 @@ set setsweepOptions ""
 set addsweepOptions "-R"
 set buildsweepOptions ""
 
-set square 29764.3
+set square 27924.2
 
 set nb_v_good 15
 set nb_e_good 25
diff --git a/tests/pipe/specific/O3 b/tests/pipe/specific/O3
index d5267dd5fc..b87c2f611c 100755
--- a/tests/pipe/specific/O3
+++ b/tests/pipe/specific/O3
@@ -19,7 +19,7 @@ set setsweepOptions ""
 set addsweepOptions "-T -R"
 set buildsweepOptions ""
 
-set square 30745.8
+set square 29267.5
 
 set nb_v_good 15
 set nb_e_good 25
diff --git a/tests/pipe/specific/O5 b/tests/pipe/specific/O5
index ad8a0a1b36..4bf5fe843a 100755
--- a/tests/pipe/specific/O5
+++ b/tests/pipe/specific/O5
@@ -19,7 +19,7 @@ set setsweepOptions "-FR"
 set addsweepOptions ""
 set buildsweepOptions ""
 
-set square 27506.6
+set square 25814.6
 
 set nb_v_good 15
 set nb_e_good 25
diff --git a/tests/pipe/specific/O7 b/tests/pipe/specific/O7
index aa3a8b43d3..68d4cc0b6a 100755
--- a/tests/pipe/specific/O7
+++ b/tests/pipe/specific/O7
@@ -19,7 +19,7 @@ set setsweepOptions "-FR"
 set addsweepOptions "-T"
 set buildsweepOptions ""
 
-set square 27367.2
+set square 25419.9
 
 set nb_v_good 15
 set nb_e_good 25
diff --git a/tests/pipe/specific/O9 b/tests/pipe/specific/O9
index 3f81697cb3..3ff5140944 100755
--- a/tests/pipe/specific/O9
+++ b/tests/pipe/specific/O9
@@ -19,7 +19,7 @@ set setsweepOptions "-FR"
 set addsweepOptions "-R"
 set buildsweepOptions ""
 
-set square 29732.8
+set square 27882.1
 
 set nb_v_good 15
 set nb_e_good 25
diff --git a/tests/pipe/specific/P2 b/tests/pipe/specific/P2
index 104c283cba..ab8997ecd1 100755
--- a/tests/pipe/specific/P2
+++ b/tests/pipe/specific/P2
@@ -19,7 +19,7 @@ set setsweepOptions "-FR"
 set addsweepOptions "-T -R"
 set buildsweepOptions ""
 
-set square 29264.2
+set square 27282.7
 
 set nb_v_good 15
 set nb_e_good 25
diff --git a/tests/pipe/specific/P4 b/tests/pipe/specific/P4
index 29a6ac90b8..8a1693804b 100755
--- a/tests/pipe/specific/P4
+++ b/tests/pipe/specific/P4
@@ -19,7 +19,7 @@ set setsweepOptions "-CF"
 set addsweepOptions ""
 set buildsweepOptions ""
 
-set square 29697.4
+set square 28006.9
 
 set nb_v_good 15
 set nb_e_good 25
diff --git a/tests/pipe/specific/P6 b/tests/pipe/specific/P6
index 84d16304db..0480585717 100755
--- a/tests/pipe/specific/P6
+++ b/tests/pipe/specific/P6
@@ -19,7 +19,7 @@ set setsweepOptions "-CF"
 set addsweepOptions "-T"
 set buildsweepOptions ""
 
-set square 30656.7
+set square 29295.4
 
 set nb_v_good 15
 set nb_e_good 25
diff --git a/tests/pipe/specific/P8 b/tests/pipe/specific/P8
index 06684afc35..39609b2b37 100755
--- a/tests/pipe/specific/P8
+++ b/tests/pipe/specific/P8
@@ -19,7 +19,7 @@ set setsweepOptions "-CF"
 set addsweepOptions "-R"
 set buildsweepOptions ""
 
-set square 29764.3
+set square 27924.2
 
 set nb_v_good 15
 set nb_e_good 25
diff --git a/tests/pipe/specific/Q1 b/tests/pipe/specific/Q1
index fe55bc7f14..6740af080d 100755
--- a/tests/pipe/specific/Q1
+++ b/tests/pipe/specific/Q1
@@ -19,7 +19,7 @@ set setsweepOptions "-CF"
 set addsweepOptions "-T -R"
 set buildsweepOptions ""
 
-set square 30745.8
+set square 29267.5
 
 set nb_v_good 15
 set nb_e_good 25
diff --git a/tests/pipe/specific/Q3 b/tests/pipe/specific/Q3
index 4e4fa9262f..40694d46e5 100755
--- a/tests/pipe/specific/Q3
+++ b/tests/pipe/specific/Q3
@@ -19,7 +19,7 @@ set setsweepOptions ""
 set addsweepOptions ""
 set buildsweepOptions ""
 
-set square 28767.8
+set square 27135.6
 
 set nb_v_good 12
 set nb_e_good 20
diff --git a/tests/pipe/specific/Q5 b/tests/pipe/specific/Q5
index fb1bb40205..a7e473c59d 100755
--- a/tests/pipe/specific/Q5
+++ b/tests/pipe/specific/Q5
@@ -19,7 +19,7 @@ set setsweepOptions ""
 set addsweepOptions "-T"
 set buildsweepOptions ""
 
-set square 29829.6
+set square 28434.6
 
 set nb_v_good 12
 set nb_e_good 20
diff --git a/tests/pipe/specific/Q7 b/tests/pipe/specific/Q7
index ef69bbdf58..e932fab717 100755
--- a/tests/pipe/specific/Q7
+++ b/tests/pipe/specific/Q7
@@ -19,7 +19,7 @@ set setsweepOptions ""
 set addsweepOptions "-R"
 set buildsweepOptions ""
 
-set square 29069.5
+set square 27289.6
 
 set nb_v_good 12
 set nb_e_good 20
diff --git a/tests/pipe/specific/Q9 b/tests/pipe/specific/Q9
index d88e9b7518..1398d0aa2b 100755
--- a/tests/pipe/specific/Q9
+++ b/tests/pipe/specific/Q9
@@ -19,7 +19,7 @@ set setsweepOptions ""
 set addsweepOptions "-T -R"
 set buildsweepOptions ""
 
-set square 30024.7
+set square 28489.1
 
 set nb_v_good 12
 set nb_e_good 20
diff --git a/tests/pipe/specific/R2 b/tests/pipe/specific/R2
index 4d196db4e5..6ed21cff62 100755
--- a/tests/pipe/specific/R2
+++ b/tests/pipe/specific/R2
@@ -19,7 +19,7 @@ set setsweepOptions "-FR"
 set addsweepOptions ""
 set buildsweepOptions ""
 
-set square 27154.8
+set square 25522.2
 
 set nb_v_good 12
 set nb_e_good 20
diff --git a/tests/pipe/specific/R4 b/tests/pipe/specific/R4
index 54e60da833..49f89afff9 100755
--- a/tests/pipe/specific/R4
+++ b/tests/pipe/specific/R4
@@ -19,7 +19,7 @@ set setsweepOptions "-FR"
 set addsweepOptions "-T"
 set buildsweepOptions ""
 
-set square 28422
+set square 27210.9
 
 set nb_v_good 12
 set nb_e_good 20
diff --git a/tests/pipe/specific/R6 b/tests/pipe/specific/R6
index b62bca81ce..70508b6176 100755
--- a/tests/pipe/specific/R6
+++ b/tests/pipe/specific/R6
@@ -19,7 +19,7 @@ set setsweepOptions "-FR"
 set addsweepOptions "-R"
 set buildsweepOptions ""
 
-set square 29081.3
+set square 27294.9
 
 set nb_v_good 12
 set nb_e_good 20
diff --git a/tests/pipe/specific/R8 b/tests/pipe/specific/R8
index 210d199c71..2e7b843b0d 100755
--- a/tests/pipe/specific/R8
+++ b/tests/pipe/specific/R8
@@ -19,7 +19,7 @@ set setsweepOptions "-FR"
 set addsweepOptions "-T -R"
 set buildsweepOptions ""
 
-set square 30243.2
+set square 28939
 
 set nb_v_good 12
 set nb_e_good 20
diff --git a/tests/pipe/specific/S1 b/tests/pipe/specific/S1
index ea48f6e6a4..1c8b70e397 100755
--- a/tests/pipe/specific/S1
+++ b/tests/pipe/specific/S1
@@ -19,7 +19,7 @@ set setsweepOptions "-CF"
 set addsweepOptions ""
 set buildsweepOptions ""
 
-set square 28767.8
+set square 27135.6
 
 set nb_v_good 12
 set nb_e_good 20
diff --git a/tests/pipe/specific/S3 b/tests/pipe/specific/S3
index 4f3c4ed1a9..cec0b807dc 100755
--- a/tests/pipe/specific/S3
+++ b/tests/pipe/specific/S3
@@ -19,7 +19,7 @@ set setsweepOptions "-CF"
 set addsweepOptions "-T"
 set buildsweepOptions ""
 
-set square 29829.6
+set square 28434.6
 
 set nb_v_good 12
 set nb_e_good 20
diff --git a/tests/pipe/specific/S5 b/tests/pipe/specific/S5
index a8a1bebed0..707b8888c8 100755
--- a/tests/pipe/specific/S5
+++ b/tests/pipe/specific/S5
@@ -19,7 +19,7 @@ set setsweepOptions "-CF"
 set addsweepOptions "-R"
 set buildsweepOptions ""
 
-set square 29069.5
+set square 27289.6
 
 set nb_v_good 12
 set nb_e_good 20
diff --git a/tests/pipe/standard/A2 b/tests/pipe/standard/A2
index 161999b320..d56a214682 100644
--- a/tests/pipe/standard/A2
+++ b/tests/pipe/standard/A2
@@ -7,4 +7,4 @@ mkedge w w
 wire w w
 pipe result w profile
 
-set square 7516.8
+set square 7833.49
diff --git a/tests/pipe/standard/A3 b/tests/pipe/standard/A3
index 973530afec..e1024761b5 100644
--- a/tests/pipe/standard/A3
+++ b/tests/pipe/standard/A3
@@ -6,4 +6,4 @@ mkedge w w
 wire w w
 pipe result w profile
 
-set square 113874
+set square 168406
diff --git a/tests/pipe/standard/A4 b/tests/pipe/standard/A4
index a466f32805..2c7c6df8a0 100644
--- a/tests/pipe/standard/A4
+++ b/tests/pipe/standard/A4
@@ -7,4 +7,4 @@ mkedge w w
 wire w w
 pipe result w profile
 
-set square 8385.98
+set square 8497.19
diff --git a/tests/pipe/standard/A5 b/tests/pipe/standard/A5
index 1466bcc693..b453fc7fc8 100644
--- a/tests/pipe/standard/A5
+++ b/tests/pipe/standard/A5
@@ -7,4 +7,4 @@ mkedge w w
 wire w w
 pipe result w profile
 
-set square 7767.04
+set square 7262.6
diff --git a/tests/pipe/standard/B2 b/tests/pipe/standard/B2
index 54b3ddb87d..f6e28ff9e3 100644
--- a/tests/pipe/standard/B2
+++ b/tests/pipe/standard/B2
@@ -7,4 +7,4 @@ mkedge w w
 wire w w
 pipe result w profile
 
-set square 12789.7
+set square 12045
diff --git a/tests/pipe/standard/B3 b/tests/pipe/standard/B3
index 9ad56f4848..6359c7028b 100644
--- a/tests/pipe/standard/B3
+++ b/tests/pipe/standard/B3
@@ -7,4 +7,4 @@ mkedge w w
 wire w w
 pipe result w profile
 
-set square 5094.14
+set square 4755.96
diff --git a/tests/pipe/standard/C5 b/tests/pipe/standard/C5
index e3e21ccea9..0001790cc7 100644
--- a/tests/pipe/standard/C5
+++ b/tests/pipe/standard/C5
@@ -6,4 +6,4 @@ mkedge w w
 wire w w
 pipe result w profile
 
-set square 149159
+set square 156102
diff --git a/tests/pipe/standard/C6 b/tests/pipe/standard/C6
index 1ed4efc17e..77c3c1928a 100644
--- a/tests/pipe/standard/C6
+++ b/tests/pipe/standard/C6
@@ -6,4 +6,4 @@ mkedge w w
 wire w w
 pipe result w profile
 
-set square 192613
+set square 187196
diff --git a/tests/pipe/standard/C8 b/tests/pipe/standard/C8
index 3c9f92ad17..b4105748eb 100644
--- a/tests/pipe/standard/C8
+++ b/tests/pipe/standard/C8
@@ -4,4 +4,4 @@ mkedge w w
 wire w w
 pipe result w profile
 
-set square 580.979
+set square 527.039
diff --git a/tests/pipe/standard/D3 b/tests/pipe/standard/D3
index 0b62cadcb7..cf4198735d 100644
--- a/tests/pipe/standard/D3
+++ b/tests/pipe/standard/D3
@@ -4,4 +4,4 @@ mkedge w w
 wire w w
 pipe result w profile
 
-set square 7950.38
+set square 8049.06
diff --git a/tests/pipe/standard/D4 b/tests/pipe/standard/D4
index 93ff0ab3eb..37391895a3 100644
--- a/tests/pipe/standard/D4
+++ b/tests/pipe/standard/D4
@@ -4,4 +4,4 @@ mkedge w w
 wire w w
 pipe result w profile
 
-set square 2565.03
+set square 2669.45
diff --git a/tests/pipe/standard/D6 b/tests/pipe/standard/D6
index 561732c978..090c7a7445 100644
--- a/tests/pipe/standard/D6
+++ b/tests/pipe/standard/D6
@@ -6,4 +6,4 @@ mkedge w w
 wire w w
 pipe result w profile
 
-set square 123710
+set square 115411
diff --git a/tests/pipe/standard/E2 b/tests/pipe/standard/E2
index 853c600ab4..0bae0f810b 100644
--- a/tests/pipe/standard/E2
+++ b/tests/pipe/standard/E2
@@ -6,4 +6,4 @@ mkedge w w
 wire w w
 pipe result w profile
 
-set square 328270
+set square 318347
diff --git a/tests/pipe/standard/E3 b/tests/pipe/standard/E3
index 6e7a7a8fd6..cea4dab12f 100644
--- a/tests/pipe/standard/E3
+++ b/tests/pipe/standard/E3
@@ -7,4 +7,4 @@ mkedge w w
 wire w w
 pipe result w profile
 
-set square 354.016
+set square 329.199
diff --git a/tests/pipe/standard/E4 b/tests/pipe/standard/E4
index 071807ec86..38f9d3353d 100644
--- a/tests/pipe/standard/E4
+++ b/tests/pipe/standard/E4
@@ -7,4 +7,4 @@ mkedge w w
 wire w w
 pipe result w profile
 
-set square 510.092
+set square 482.227
diff --git a/tests/pipe/standard/E9 b/tests/pipe/standard/E9
index f02352ef3d..660a7a0b0c 100644
--- a/tests/pipe/standard/E9
+++ b/tests/pipe/standard/E9
@@ -7,4 +7,4 @@ mkedge w w
 wire w w
 pipe result w profile
 
-set square 309430
+set square 304960
diff --git a/tests/pipe/standard/F1 b/tests/pipe/standard/F1
index c023267358..2708880ddf 100644
--- a/tests/pipe/standard/F1
+++ b/tests/pipe/standard/F1
@@ -7,4 +7,4 @@ mkedge w w
 wire w w
 pipe result w profile
 
-set square 30818.9
+set square 29584.3
diff --git a/tests/pipe/standard/F2 b/tests/pipe/standard/F2
index 848f1a1fce..77ceacb4a2 100644
--- a/tests/pipe/standard/F2
+++ b/tests/pipe/standard/F2
@@ -7,4 +7,4 @@ mkedge w w
 wire w w
 pipe result w profile
 
-set square 45793.5
+set square 43171.5
diff --git a/tests/pipe/standard/F7 b/tests/pipe/standard/F7
index fc77e959b4..e7525ef8ac 100644
--- a/tests/pipe/standard/F7
+++ b/tests/pipe/standard/F7
@@ -7,4 +7,4 @@ mkedge w w
 wire w w
 pipe result w profile
 
-set square 305504
+set square 301365
diff --git a/tests/thrusection/specific/B6 b/tests/thrusection/specific/B6
index efe40fe891..085b9f56b0 100755
--- a/tests/thrusection/specific/B6
+++ b/tests/thrusection/specific/B6
@@ -20,7 +20,7 @@ set isruled 0
 catch {thrusections result ${issolid} ${isruled} v1 w1 v2}
 
 
-set square 2598.48
+set square 2556.25
 
 set nb_v_good 2
 set nb_e_good 3
diff --git a/tests/thrusection/specific/B7 b/tests/thrusection/specific/B7
index 74c6d8a36c..9c9b6c3747 100755
--- a/tests/thrusection/specific/B7
+++ b/tests/thrusection/specific/B7
@@ -20,7 +20,7 @@ set isruled 0
 catch {thrusections result ${issolid} ${isruled} v1 w1 v2 }
 
 
-set square 2597.01
+set square 2556.25
 
 
 set nb_v_good 2
diff --git a/tests/thrusection/specific/D4 b/tests/thrusection/specific/D4
index 334c2b286a..a71b075c21 100755
--- a/tests/thrusection/specific/D4
+++ b/tests/thrusection/specific/D4
@@ -20,7 +20,7 @@ set isruled 0
 catch {thrusections result ${issolid} ${isruled} v1 w1 v2}
 
 
-set square 892.672
+set square 881.045
 
 set nb_v_good 2
 set nb_e_good 3
diff --git a/tests/thrusection/specific/D5 b/tests/thrusection/specific/D5
index cff590ae34..23acfb37a5 100755
--- a/tests/thrusection/specific/D5
+++ b/tests/thrusection/specific/D5
@@ -20,7 +20,7 @@ set isruled 0
 catch {thrusections result ${issolid} ${isruled} v1 w1 v2 }
 
 
-set square 892.672
+set square 881.045
 
 
 set nb_v_good 2
diff --git a/tests/thrusection/specific/E3 b/tests/thrusection/specific/E3
index 50013dd795..79b01cbe41 100755
--- a/tests/thrusection/specific/E3
+++ b/tests/thrusection/specific/E3
@@ -20,7 +20,7 @@ set isruled 0
 catch {thrusections result ${issolid} ${isruled} v1 w1 v2}
 
 
-set square 485.498
+set square 478.063
 
 set nb_v_good 2
 set nb_e_good 3
diff --git a/tests/thrusection/specific/J2 b/tests/thrusection/specific/J2
index cdc1ac4cd3..2740023149 100755
--- a/tests/thrusection/specific/J2
+++ b/tests/thrusection/specific/J2
@@ -31,7 +31,7 @@ addsweep v2
 buildsweep result
 
 
-set square 1277.32
+set square 1259.14
 
 set nb_v_good 2
 set nb_e_good 3
diff --git a/tests/thrusection/specific/L4 b/tests/thrusection/specific/L4
index a05c8af6b9..d871bba098 100755
--- a/tests/thrusection/specific/L4
+++ b/tests/thrusection/specific/L4
@@ -31,7 +31,7 @@ addsweep v2
 buildsweep result
 
 
-set square 892.672
+set square 881.045
 
 set nb_v_good 2
 set nb_e_good 3
diff --git a/tests/thrusection/specific/M6 b/tests/thrusection/specific/M6
index cb9292f291..3715686e86 100755
--- a/tests/thrusection/specific/M6
+++ b/tests/thrusection/specific/M6
@@ -104,7 +104,7 @@ addsweep v5
 catch {buildsweep result}
 
 
-set square 89897.2
+set square 181746
 
 set nb_v_good 2
 set nb_e_good 33
diff --git a/tests/thrusection/specific/M7 b/tests/thrusection/specific/M7
index 85ad70136d..cc169434eb 100755
--- a/tests/thrusection/specific/M7
+++ b/tests/thrusection/specific/M7
@@ -104,7 +104,7 @@ addsweep v5
 catch {buildsweep result}
 
 
-set square 270505
+set square 591941
 
 set nb_v_good 2
 set nb_e_good 33
diff --git a/tests/thrusection/specific/M8 b/tests/thrusection/specific/M8
index 2ea1ae8109..952e5f0295 100755
--- a/tests/thrusection/specific/M8
+++ b/tests/thrusection/specific/M8
@@ -104,7 +104,7 @@ addsweep v5 -T
 catch {buildsweep result}
 
 
-set square 89897.2
+set square 181746
 
 set nb_v_good 2
 set nb_e_good 33
diff --git a/tests/thrusection/specific/M9 b/tests/thrusection/specific/M9
index 2f75922945..35e04777c7 100755
--- a/tests/thrusection/specific/M9
+++ b/tests/thrusection/specific/M9
@@ -104,7 +104,7 @@ addsweep v5 -T
 catch {buildsweep result}
 
 
-set square 270505
+set square 591941
 
 set nb_v_good 2
 set nb_e_good 33
diff --git a/tests/thrusection/specific/N1 b/tests/thrusection/specific/N1
index 35ae096468..b909fa854e 100755
--- a/tests/thrusection/specific/N1
+++ b/tests/thrusection/specific/N1
@@ -104,7 +104,7 @@ addsweep v5
 catch {buildsweep result}
 
 
-set square 91551
+set square 182717
 
 set nb_v_good 2
 set nb_e_good 33
diff --git a/tests/thrusection/specific/N2 b/tests/thrusection/specific/N2
index 6560edbbd8..a6dd4cd22d 100755
--- a/tests/thrusection/specific/N2
+++ b/tests/thrusection/specific/N2
@@ -104,7 +104,7 @@ addsweep v5
 catch {buildsweep result}
 
 
-set square 254037
+set square 592023
 
 set nb_v_good 2
 set nb_e_good 33
diff --git a/tests/thrusection/specific/N3 b/tests/thrusection/specific/N3
index f0d8911471..0035bfbbbe 100755
--- a/tests/thrusection/specific/N3
+++ b/tests/thrusection/specific/N3
@@ -104,7 +104,7 @@ addsweep v5 -T
 catch {buildsweep result}
 
 
-set square 89897.2
+set square 181746
 
 set nb_v_good 2
 set nb_e_good 33
diff --git a/tests/thrusection/specific/N4 b/tests/thrusection/specific/N4
index 85e63e2455..59b577ce20 100755
--- a/tests/thrusection/specific/N4
+++ b/tests/thrusection/specific/N4
@@ -104,7 +104,7 @@ addsweep v5 -T
 catch {buildsweep result}
 
 
-set square 270505
+set square 591941
 
 set nb_v_good 2
 set nb_e_good 33