staffan :

	* test update

diff --git a/src/INTERP_KERNEL/Test/Interpolation3DTest.hxx b/src/INTERP_KERNEL/Test/Interpolation3DTest.hxx
index b52bb16c499d900b20494a0dcceb9835887a9f5c..b5350a315681c8b3a67a125f87421398c6bcabb2 100644 (file)
--- a/src/INTERP_KERNEL/Test/Interpolation3DTest.hxx
+++ b/src/INTERP_KERNEL/Test/Interpolation3DTest.hxx
@@ -14,7 +14,7 @@ class Interpolation3DTest : public CppUnit::TestFixture
 
   // single - element
   CPPUNIT_TEST_SUITE( Interpolation3DTest );
-#if 0
+
   CPPUNIT_TEST( tetraReflexiveUnit );
   CPPUNIT_TEST( tetraReflexiveGeneral );
 
@@ -47,15 +47,15 @@ class Interpolation3DTest : public CppUnit::TestFixture
   CPPUNIT_TEST( boxReflexiveModerate );
   CPPUNIT_TEST( tetraBoxes );
   CPPUNIT_TEST( moderateBoxes );
-#endif
+
   CPPUNIT_TEST( moderateBoxesSmaller );
   CPPUNIT_TEST( moderateBoxSmallReflexive );
-#if 0
+
   CPPUNIT_TEST( moderateBoxEvenSmallerReflexive );
   CPPUNIT_TEST( tinyBoxReflexive );
 
   CPPUNIT_TEST( simpleHexaBox );
-#endif
+
   CPPUNIT_TEST_SUITE_END();
 
 

diff --git a/src/INTERP_KERNEL/Test/Makefile.in b/src/INTERP_KERNEL/Test/Makefile.in
index c3fdbfae93b4b8bfb89473493a6b39efb8217f1c..8d235922dfd6c603e23e6d534fa3d4cb2734cd4b 100644 (file)
--- a/src/INTERP_KERNEL/Test/Makefile.in
+++ b/src/INTERP_KERNEL/Test/Makefile.in
@@ -69,8 +69,8 @@ CXXFLAGS+= -I/usr/include/cppunit
 CPPFLAGS+= -I/usr/include/cppunit
 
 # for log
-CXXFLAGS+= -DLOG_LEVEL=3 #-DOPTIMIZE -O2
-CPPFLAGS+= -DLOG_LEVEL=3 #-DOPTIMIZE -O2
+CXXFLAGS+= -DLOG_LEVEL=3 -DOPTIMIZE -O2
+CPPFLAGS+= -DLOG_LEVEL=3 -DOPTIMIZE -O2
 
 # for gcov
 #CXXFLAGS+=-fprofile-arcs -ftest-coverage 

diff --git a/src/INTERP_KERNEL/TransformedTriangle.hxx b/src/INTERP_KERNEL/TransformedTriangle.hxx
index df91c099d0b34110a3485ba79263c0987a48fb50..73c5a8eadc933f0350d06f6f635a43f78034d4c5 100644 (file)
--- a/src/INTERP_KERNEL/TransformedTriangle.hxx
+++ b/src/INTERP_KERNEL/TransformedTriangle.hxx
@@ -22,7 +22,6 @@ class TransformedTriangleTest;
 class TransformedTriangleIntersectTest;
 
 
-
 namespace INTERP_UTILS
 {
 
@@ -120,10 +119,6 @@ namespace INTERP_UTILS
 
   private:
     
-    ////////////////////////////////////////////////////////////////////////////////////
-    /// High-level methods called directly by calculateIntersectionVolume()     ////////
-    ////////////////////////////////////////////////////////////////////////////////////
- 
     void calculateIntersectionPolygons(); 
 
     void calculatePolygonBarycenter(const IntersectionPolygon poly, double* barycenter);