X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FINTERP_KERNEL%2FCurveIntersectorP1P1.txx;h=dd91ee5f288dd07af06b12e17979e43beeb597d5;hb=f92459c4cde6b0f4a9d12e9b0361591fc514ab2c;hp=4363d8fb31e15ef6b6e1fcbb524c71404353605e;hpb=8763c12d01e33d6845dd53be65b001514d00bd42;p=tools%2Fmedcoupling.git diff --git a/src/INTERP_KERNEL/CurveIntersectorP1P1.txx b/src/INTERP_KERNEL/CurveIntersectorP1P1.txx index 4363d8fb3..dd91ee5f2 100644 --- a/src/INTERP_KERNEL/CurveIntersectorP1P1.txx +++ b/src/INTERP_KERNEL/CurveIntersectorP1P1.txx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2014 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 @@ -37,14 +37,14 @@ namespace INTERP_KERNEL } template - int CurveIntersectorP1P1 + typename MyMeshType::MyConnType CurveIntersectorP1P1 ::getNumberOfRowsOfResMatrix() const { return BASE_INTERSECTOR::_meshT.getNumberOfNodes(); } template - int CurveIntersectorP1P1 + typename MyMeshType::MyConnType CurveIntersectorP1P1 ::getNumberOfColsOfResMatrix() const { return BASE_INTERSECTOR::_meshS.getNumberOfNodes(); @@ -56,22 +56,22 @@ namespace INTERP_KERNEL { std::vector segmentsT, segmentsS; BASE_INTERSECTOR::getDualSegments( icellT, BASE_INTERSECTOR::_meshT, segmentsT); - for ( int t = 0; t < (int)segmentsT.size(); ++t ) + for ( ConnType t = 0; t < (ConnType)segmentsT.size(); ++t ) { typename MyMatrix::value_type& resRow = res[ OTT::ind2C( segmentsT[t]._nodeId )]; for(typename std::vector::const_iterator iter=icellsS.begin(); iter!=icellsS.end(); iter++) { - int iS = *iter; + ConnType iS = *iter; BASE_INTERSECTOR::getDualSegments( OTT::ind2C(iS), BASE_INTERSECTOR::_meshS, segmentsS); - for ( int s = 0; s < (int)segmentsS.size(); ++s ) + for ( ConnType s = 0; s < (ConnType)segmentsS.size(); ++s ) { double surf = BASE_INTERSECTOR::intersectSegments(&segmentsT[t]._coords[0], &segmentsS[s]._coords[0]); if(surf!=0.) { - int nS = segmentsS[s]._nodeId; + ConnType nS = segmentsS[s]._nodeId; typename MyMatrix::value_type::const_iterator iterRes=resRow.find(nS); if(iterRes==resRow.end()) resRow.insert(std::make_pair(nS,surf));