X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FINTERP_KERNEL%2FUnitTetraIntersectionBary.cxx;h=9b4c727cb64a19ae0d58e5f8157409049aeb87fb;hb=c4551c56aa89896595842e5b41b048044681b4e8;hp=0908beb8d02d4fdccc07bb018c1f4d7e71bb35f0;hpb=8763c12d01e33d6845dd53be65b001514d00bd42;p=tools%2Fmedcoupling.git diff --git a/src/INTERP_KERNEL/UnitTetraIntersectionBary.cxx b/src/INTERP_KERNEL/UnitTetraIntersectionBary.cxx index 0908beb8d..9b4c727cb 100644 --- a/src/INTERP_KERNEL/UnitTetraIntersectionBary.cxx +++ b/src/INTERP_KERNEL/UnitTetraIntersectionBary.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2014 CEA/DEN, EDF R&D +// Copyright (C) 2007-2016 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 @@ -35,7 +35,7 @@ namespace INTERP_KERNEL { - enum { _X=0, _Y, _Z }; + enum { _XX=0, _YY, _ZZ }; inline bool samePoint( const double* p1, const double* p2 ) { @@ -86,7 +86,7 @@ namespace INTERP_KERNEL const std::vector * pPolygonA = &triangle.getPolygonA(); if ( pPolygonA->size() < 3 ) { - if ( !epsilonEqual( triNormal[_Z], 0 )) + if ( !epsilonEqual( triNormal[_ZZ], 0 )) return; // not vertical triangle does not intersect the unit tetra // Vertical triangle. Use inherited methods of TransformedTriangle to @@ -378,8 +378,8 @@ namespace INTERP_KERNEL } // check if the segment p1-p2 is on the inclined side if ( sideFaces[3] && - epsilonEqual( p1[_X] + p1[_Y] + p1[_Z], 1.0 ) && - epsilonEqual( p2[_X] + p2[_Y] + p2[_Z], 1.0 )) + epsilonEqual( p1[_XX] + p1[_YY] + p1[_ZZ], 1.0 ) && + epsilonEqual( p2[_XX] + p2[_YY] + p2[_ZZ], 1.0 )) { sideFaces[3]->push_back( new double[3] ); copyVector3( p1, sideFaces[3]->back() );