X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FStdMeshers%2FStdMeshers_QuadToTriaAdaptor.cxx;h=1832f48e778e815474a8a009c5aaccce10350bfb;hb=fe7d1d57677486d8c546226dc2bf573fbfb6679d;hp=8ddd342ca519722167e21236d6cb4989f43209f2;hpb=5d68554076bbca0e1e95fb0db215a6c2b84b6c54;p=modules%2Fsmesh.git diff --git a/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.cxx b/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.cxx index 8ddd342ca..1832f48e7 100644 --- a/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.cxx +++ b/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2014 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -25,7 +25,6 @@ #include "StdMeshers_QuadToTriaAdaptor.hxx" #include "SMDS_SetIterator.hxx" - #include "SMESHDS_GroupBase.hxx" #include "SMESH_Algo.hxx" #include "SMESH_Group.hxx" @@ -41,6 +40,7 @@ #include #include #include + #include "utilities.h" #include @@ -119,7 +119,7 @@ namespace bool tooClose = ( angle < 15. * M_PI / 180. ); // Check if pyramids collide - if ( !tooClose && baI * baJ > 0 ) + if ( !tooClose && ( baI * baJ > 0 ) && ( nI * nJ > 0 )) { // find out if nI points outside of PrmI or inside int dInd = baseNodesIndI[1] - baseNodesIndI[0]; @@ -1290,7 +1290,7 @@ bool StdMeshers_QuadToTriaAdaptor::Compute2ndPart(SMESH_Mesh& nodesToMove.insert( aNode1 ); nodesToMove.insert( aNode2 ); } - // fix intersections that could appear after apex movement + // fix intersections that can appear after apex movement MergeAdjacent( PrmI, nodesToMove ); MergeAdjacent( PrmJ, nodesToMove );