Indices are stored as mcIdType type instead of int to support switch to 64bits indexing

[tools/medcoupling.git] / src / INTERP_KERNEL / PolyhedronIntersectorP1P1.txx

diff --git a/src/INTERP_KERNEL/PolyhedronIntersectorP1P1.txx b/src/INTERP_KERNEL/PolyhedronIntersectorP1P1.txx
old mode 100644 (file)
new mode 100755 (executable)
index f24f137..79731b9
--- a/src/INTERP_KERNEL/PolyhedronIntersectorP1P1.txx
+++ b/src/INTERP_KERNEL/PolyhedronIntersectorP1P1.txx
@@ -1,9 +1,9 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2019  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -46,13 +46,13 @@ namespace INTERP_KERNEL
     // Check types of elements here rather than in intersectCells() since a wrong type can be
     // found late after a long time of calculation.
 
-    const unsigned long numSrcElems = srcMesh.getNumberOfElements();
-    for(unsigned long i = 0 ; i < numSrcElems ; ++i)
+    const ConnType numSrcElems = srcMesh.getNumberOfElements();
+    for(ConnType i = 0 ; i < numSrcElems ; ++i)
       if ( srcMesh.getTypeOfElement( OTT<ConnType,numPol>::indFC( i )) != NORM_TETRA4 )
         throw INTERP_KERNEL::Exception("P1P1 3D algorithm works only with tetrahedral meshes");
 
-    const unsigned long numTgtElems = targetMesh.getNumberOfElements();
-    for(unsigned long i = 0 ; i < numTgtElems ; ++i)
+    const ConnType numTgtElems = targetMesh.getNumberOfElements();
+    for(ConnType i = 0 ; i < numTgtElems ; ++i)
       if ( targetMesh.getTypeOfElement( OTT<ConnType,numPol>::indFC( i )) != NORM_TETRA4 )
         throw INTERP_KERNEL::Exception("P1P1 3D algorithm works only with tetrahedral meshes");
   }
@@ -79,8 +79,8 @@ namespace INTERP_KERNEL
     UnitTetraIntersectionBary b; b.init();
 #endif
     // split the targetCell into dual cells
-    std::pair< int, std::vector<double> > subTetraNodes[24]; // a node of sub tetra and its coordinates
-    const double* nodes[4]; int conn[4];
+    std::pair< ConnType, std::vector<double> > subTetraNodes[24]; // a node of sub tetra and its coordinates
+    const double* nodes[4]; ConnType conn[4];
     for(int node = 0; node < 4 ; ++node)
       nodes[node]=getCoordsOfNode2(node, OTT<ConnType,numPol>::indFC(targetCell),
                                    Intersector3D<MyMeshType,MyMatrix>::_target_mesh,conn[node]);