Debug on GENERAL_24 and GENERAL_48

[tools/medcoupling.git] / src / INTERP_KERNEL / TransformedTriangleMath.cxx

diff --git a/src/INTERP_KERNEL/TransformedTriangleMath.cxx b/src/INTERP_KERNEL/TransformedTriangleMath.cxx
index 4dd23859cb58022737228ee627aa1c0bd325e28f..d5e340f6585e00c03e645f8ce56db559fcd61bfe 100644 (file)
--- a/src/INTERP_KERNEL/TransformedTriangleMath.cxx
+++ b/src/INTERP_KERNEL/TransformedTriangleMath.cxx
@@ -1,21 +1,22 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2013  CEA/DEN, EDF R&D
 //
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License.
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
 //
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
 //
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 #include "TransformedTriangle.hxx"
 #include <iostream>
 #include <fstream>
@@ -72,6 +73,15 @@ namespace INTERP_KERNEL
   /// Threshold for what is considered a small enough angle to warrant correction of triple products by Grandy, [57]
   const double TransformedTriangle::TRIPLE_PRODUCT_ANGLE_THRESHOLD = 0.1;
 
+
+  // after transformation to the U-space, coordinates are inaccurate
+  // small variations around zero should not be taken into account
+  void TransformedTriangle::resetNearZeroCoordinates()
+  {
+    for (int i=0; i<15; i++)
+      if (fabs(_coords[i])<TransformedTriangle::MACH_EPS*20.0) _coords[i]=0.0;
+  }
+  
   // ----------------------------------------------------------------------------------
   //  Double and triple product calculations                           
   // ----------------------------------------------------------------------------------
@@ -354,7 +364,10 @@ namespace INTERP_KERNEL
     
     //? is this more stable? -> no subtraction
     //    return asin( dotProd / ( lenNormal * lenEdgeVec ) ) + 3.141592625358979 / 2.0;
-    return atan(1.0)*4.0 - acos( dotProd / ( lenNormal * lenEdgeVec ) );
+    double tmp=dotProd / ( lenNormal * lenEdgeVec );
+    tmp=std::max(tmp,-1.);
+    tmp=std::min(tmp,1.);
+    return atan(1.0)*4.0 - acos(tmp);
 
   }