Fix testHeapMem1 test to make it run on Scibian9

diff --git a/src/INTERP_KERNEL/CurveIntersectorP1P1PL.txx b/src/INTERP_KERNEL/CurveIntersectorP1P1PL.txx
index 820fbd5259f382c42d9b43e744fae38863777bd9..2f9d0d9236e151e8953e2e719156a5d6fa9caa25 100644 (file)
--- a/src/INTERP_KERNEL/CurveIntersectorP1P1PL.txx
+++ b/src/INTERP_KERNEL/CurveIntersectorP1P1PL.txx
@@ -76,7 +76,7 @@ namespace INTERP_KERNEL
     std::vector<double> coordsT;
     if(this->getRealTargetCoordinates(icellT,coordsT))
       throw INTERP_KERNEL::Exception("Invalid target cell detected for meshdim==1. Only SEG2 supported !");
-    std::size_t nbOfNodesT(coordsT.size()/SPACEDIM);
+    mcIdType nbOfNodesT(ToIdType(coordsT.size()/SPACEDIM));
     for(typename std::vector<ConnType>::const_iterator iter=icellsS.begin();iter!=icellsS.end();iter++)
       {
         std::vector<double> coordsS;
@@ -85,7 +85,7 @@ namespace INTERP_KERNEL
         assert(coordsS.size()/SPACEDIM==2);
         ConnType nodeIdS0(this->getNodeIdOfSourceCellAt(*iter,0));
         ConnType nodeIdS1(this->getNodeIdOfSourceCellAt(*iter,1));
-        for(std::size_t nodeIdT = 0 ; nodeIdT<nbOfNodesT ; ++nodeIdT)
+        for(mcIdType nodeIdT = 0 ; nodeIdT<nbOfNodesT ; ++nodeIdT)
           {
             ConnType nodeIdT0(this->getNodeIdOfTargetCellAt(icellT,nodeIdT));
             double xs0,xs1,xt;

diff --git a/src/MEDLoader/Swig/MEDLoaderTest3.py b/src/MEDLoader/Swig/MEDLoaderTest3.py
index 6596505fa31f68650dcf80e7ec8c4581480a073e..5c37e3996098fefa5794495fc863be7d07233a65 100644 (file)
--- a/src/MEDLoader/Swig/MEDLoaderTest3.py
+++ b/src/MEDLoader/Swig/MEDLoaderTest3.py
@@ -2261,11 +2261,12 @@ class MEDLoaderTest3(unittest.TestCase):
         indexMem = 82 * MEDCouplingSizeOfIDs()//8
         meshMem = cooMem + nodalMem + indexMem
         self.assertIn(m.getHeapMemorySize(), list(range(meshMem - 100, meshMem + 100 + 4 * strMulFac)))
-        self.assertIn(f.getHeapMemorySize(), list(range(meshMem + 81*8 - 100, meshMem + 81*8 + 100 + 8 * strMulFac)))
+        delta = (m.getHeapMemorySize()-meshMem)//3 # std::string::capacity behaves differently
+        self.assertIn(f.getHeapMemorySize(), list(range(meshMem + 81*8 - (100 + 3*delta), meshMem + 81*8 + (100+3*delta) + 8 * strMulFac)))
         #
         mm=MEDFileUMesh()
         mm.setMeshAtLevel(0,m)
-        self.assertIn(mm.getHeapMemorySize(), list(range(meshMem + 81*(MEDCouplingSizeOfIDs()//8) - 100, meshMem + 81*(MEDCouplingSizeOfIDs()//8) + 100 + 10 * strMulFac)))
+        self.assertIn(mm.getHeapMemorySize(), list(range(meshMem + 81*(MEDCouplingSizeOfIDs()//8) - (100+3*delta), meshMem + 81*(MEDCouplingSizeOfIDs()//8) + (100+3*delta) + 10 * strMulFac)))
         ff=MEDFileField1TS()
         ff.setFieldNoProfileSBT(f)
         self.assertIn(ff.getHeapMemorySize(), list(range(771 - 40, 871 + 21 + (4 + 1) * strMulFac)))