From: ageay <ageay>
Date: Wed, 16 Oct 2013 13:20:39 +0000 (+0000)
Subject: Win7 32 bits porting.
X-Git-Tag: V7_3_1b1~109
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=c97bcc3f42b6d588cccf7786943d35a5f266280a;p=tools%2Fmedcoupling.git

Win7 32 bits porting.
---

diff --git a/resources/agitateur.med b/resources/agitateur.med
index 10529512c..73c62e127 100644
Binary files a/resources/agitateur.med and b/resources/agitateur.med differ
diff --git a/src/MEDCoupling_Swig/MEDCouplingBasicsTest.py b/src/MEDCoupling_Swig/MEDCouplingBasicsTest.py
index b820e9192..16f02e056 100644
--- a/src/MEDCoupling_Swig/MEDCouplingBasicsTest.py
+++ b/src/MEDCoupling_Swig/MEDCouplingBasicsTest.py
@@ -12991,8 +12991,9 @@ class MEDCouplingBasicsTest(unittest.TestCase):
         cm.setCoords(arr0,arr1,arr1) ; um=cm.buildUnstructured()
         #
         m=MEDCoupling1SGTUMesh("m",NORM_QUAD4)
+        mem_m=m.getHeapMemorySize()
         m.allocateCells(5)
-        self.assertIn(m.getHeapMemorySize(),xrange(80,90))
+        self.assertIn(m.getHeapMemorySize()-mem_m,xrange(5*4*4,5*4*4+32))
         self.assertEqual(m.getNodalConnectivity().getNbOfElemAllocated(),20)
         m.setCoords(um.getCoords())
         m.insertNextCell([1,0,6,7])
diff --git a/src/MEDLoader/Swig/SauvLoaderTest.py b/src/MEDLoader/Swig/SauvLoaderTest.py
index fbdc3c1a1..c4f70d342 100644
--- a/src/MEDLoader/Swig/SauvLoaderTest.py
+++ b/src/MEDLoader/Swig/SauvLoaderTest.py
@@ -156,9 +156,9 @@ class SauvLoaderTest(unittest.TestCase):
             io1 = fieldOnFaces.getIterations()
             fof = fieldOnFaces.getFieldOnMeshAtLevel(f1.getTypeOfField(),io1[i][0],io1[i][1],um1)
             self.assertTrue( d.isEqual( fof.getArray(), 1e-12 ))
-
-            os.remove( sauvFile )
             pass
+        del sr
+        os.remove( sauvFile )
         pass
 
     def testSauv2MedWONodeFamilyNum(self):
@@ -234,6 +234,7 @@ class SauvLoaderTest(unittest.TestCase):
         mesh = mfMesh.getMeshAtLevel(0)
         self.assertTrue(mesh.getNodalConnectivity().isEqual(m.getNodalConnectivity()))
         #
+        del sr
         os.remove(sauvFile)
         pass
 
@@ -298,7 +299,7 @@ class SauvLoaderTest(unittest.TestCase):
         mfd.setMeshes( mfm )
 
         # convert the MED file to a SAUV file
-        sauvFile = "SauvLoaderTest::testGaussPt.sauv"
+        sauvFile = "SauvLoaderTest_testGaussPt.sauv"
         sw=SauvWriter.New();
         sw.setMEDFileDS(mfd);
         sw.write(sauvFile);
@@ -317,7 +318,7 @@ class SauvLoaderTest(unittest.TestCase):
         #f2.setOrder( f.getTime()[2] ) # not stored in SAUV
         self.assertTrue( m2.isEqual( m, 1e-12 ))
         self.assertTrue( f2.isEqual( f, 1e-12, 1e-12 ))
-
+        del sr
         os.remove( sauvFile )