MEDMEM Industrialization 2008

diff --git a/src/INTERP_KERNEL/InterpolationUtils.hxx b/src/INTERP_KERNEL/InterpolationUtils.hxx
index 87f5d4ec8a4ed7746e3b1ce68c569eaed952dee6..004aff22c693a4159f0d698e9c323575e739a50b 100644 (file)
--- a/src/INTERP_KERNEL/InterpolationUtils.hxx
+++ b/src/INTERP_KERNEL/InterpolationUtils.hxx
@@ -273,16 +273,6 @@ namespace INTERP_KERNEL
       tRow[ 3 ] /= tRow[ 2 ];
       // calculate solution: backward substitution
 
-      int r0 = iR[0], r1 = iR[1]/*, r2 = iR[2], r3 = 3*/;
-//       bc[ r2 ] = tRow[ 3 ] / tRow[ 2 ];
-
-//       tRow = T[ r1 ];
-//       bc[ r1 ] = (tRow[ 3 ] - bc[r2]*tRow[ 2 ]) / tRow[ 1 ];
-
-//       tRow = T[ r0 ];
-//       bc[ r0 ] = (tRow[ 3 ] - bc[r2]*tRow[ 2 ] - bc[r1]*tRow[ 1 ]) / tRow[ 0 ];
-
-//       bc[ r3 ] = 1. - bc[0] - bc[1] - bc[2];
       bc[ 2 ] = tRow[ 3 ];
 
       tRow = T[ iR[1] ];

diff --git a/src/INTERP_KERNEL/Test/UnitTetraIntersectionBaryTest.cxx b/src/INTERP_KERNEL/Test/UnitTetraIntersectionBaryTest.cxx
index a4930cdcb3c915a0a0afe288879e742d48591792..7165f13d24cddeaf27fa5ee10c3cde4d53839627 100644 (file)
--- a/src/INTERP_KERNEL/Test/UnitTetraIntersectionBaryTest.cxx
+++ b/src/INTERP_KERNEL/Test/UnitTetraIntersectionBaryTest.cxx
@@ -118,9 +118,9 @@ namespace INTERP_TEST
          << " VOL: " << vol << endl;
     CPPUNIT_ASSERT( ok );
 //     CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.166667, vol, 1e-5);
-//     CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.25, baryCenter[0], 1e-5);
-//     CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.25, baryCenter[1], 1e-5);
-//     CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.25, baryCenter[2], 1e-5);
+    CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.125, baryCenter[0], 1e-5);
+    CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.125, baryCenter[1], 1e-5);
+    CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.625, baryCenter[2], 1e-5);
   }
   void UnitTetraIntersectionBaryTest::test_UnitTetraIntersectionBary_5()
   {

diff --git a/src/ParaMEDMEM/Test/ParaMEDMEMTest.cxx b/src/ParaMEDMEM/Test/ParaMEDMEMTest.cxx
index 2392cf0ba32f10e509cb000cc3ac540a0e4e60c3..4b05fdd0c3c56f8c222f78ba6b2279680549cff3 100644 (file)
--- a/src/ParaMEDMEM/Test/ParaMEDMEMTest.cxx
+++ b/src/ParaMEDMEM/Test/ParaMEDMEMTest.cxx
@@ -36,6 +36,9 @@ using namespace std;
  */
 ParaMEDMEMTest_TmpFilesRemover::~ParaMEDMEMTest_TmpFilesRemover()
 {
+#ifdef _DEBUG_
+  if ( myNoRemove ) return;
+#endif
   set<string>::iterator it = myTmpFiles.begin();
   for (; it != myTmpFiles.end(); it++) {
     if (access((*it).data(), F_OK) == 0)
@@ -47,5 +50,7 @@ ParaMEDMEMTest_TmpFilesRemover::~ParaMEDMEMTest_TmpFilesRemover()
 
 bool ParaMEDMEMTest_TmpFilesRemover::Register(const string theTmpFile)
 {
+//   if (access(theTmpFile.data(), F_OK) == 0)
+//     remove(theTmpFile.data());
   return (myTmpFiles.insert(theTmpFile)).second;
 }

diff --git a/src/ParaMEDMEM_Swig/Makefile.am b/src/ParaMEDMEM_Swig/Makefile.am
index e5a53f83226da5f3b2ff8a9003d6f2bfb478f9b4..000041aa0f51dc33de38037c5c66da1a6ea281fd 100644 (file)
--- a/src/ParaMEDMEM_Swig/Makefile.am
+++ b/src/ParaMEDMEM_Swig/Makefile.am
@@ -56,7 +56,7 @@ CLEANFILES = libParaMEDMEM_Swig_wrap.cxx libParaMEDMEM_Swig.py
 
 nodist_salomescript_DATA= libParaMEDMEM_Swig.py
 
-dist_salomescript_DATA= test_intersectiondec.py \
-                       test_noncoincidentdec.py \
-                       test_structuredcoincodentdec.py \
+dist_salomescript_DATA= test_IntersectionDEC.py \
+                       test_NonCoincidentDEC.py \
+                       test_StructuredCoincodentDEC.py \
                        ParaMEDMEM.py
\ No newline at end of file