X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FINTERP_KERNEL%2FPolyhedronIntersectorP1P1.txx;h=79731b9d389ee28930b0f1943e867197bb295b9e;hb=b219559763498c4bd10c730cd3d2c62b1eed45db;hp=38634d4ce4f54cc5b6a99929568df650595deae8;hpb=9727e779d56acece98be02cdccd0f99cc5ef0fa2;p=tools%2Fmedcoupling.git diff --git a/src/INTERP_KERNEL/PolyhedronIntersectorP1P1.txx b/src/INTERP_KERNEL/PolyhedronIntersectorP1P1.txx old mode 100644 new mode 100755 index 38634d4ce..79731b9d3 --- a/src/INTERP_KERNEL/PolyhedronIntersectorP1P1.txx +++ b/src/INTERP_KERNEL/PolyhedronIntersectorP1P1.txx @@ -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::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::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 > subTetraNodes[24]; // a node of sub tetra and its coordinates - const double* nodes[4]; int conn[4]; + std::pair< ConnType, std::vector > 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::indFC(targetCell), Intersector3D::_target_mesh,conn[node]);