From a4bafc959d576f8ab752cb693365d3f4c7fca277 Mon Sep 17 00:00:00 2001 From: eap Date: Thu, 18 Dec 2008 17:40:05 +0000 Subject: [PATCH] MEDMEM Industrialization 2008 --- src/INTERP_KERNEL/InterpolationUtils.hxx | 10 ---------- .../Test/UnitTetraIntersectionBaryTest.cxx | 6 +++--- src/ParaMEDMEM/Test/ParaMEDMEMTest.cxx | 5 +++++ src/ParaMEDMEM_Swig/Makefile.am | 6 +++--- 4 files changed, 11 insertions(+), 16 deletions(-) diff --git a/src/INTERP_KERNEL/InterpolationUtils.hxx b/src/INTERP_KERNEL/InterpolationUtils.hxx index 87f5d4ec8..004aff22c 100644 --- 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 a4930cdcb..7165f13d2 100644 --- 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 2392cf0ba..4b05fdd0c 100644 --- 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::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 e5a53f832..000041aa0 100644 --- 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 -- 2.39.2