0020943: EDF 1463 SMESH: additional fonctionnality to the feature 20749

Fix "bare faces" control problem

diff --git a/src/Controls/SMESH_Controls.cxx b/src/Controls/SMESH_Controls.cxx
index 42b5b6a1a366b3fea541a7ad325aa64194d89e5a..b3f46743698edf60d803ae13a872e837b54fcc8f 100644 (file)
--- a/src/Controls/SMESH_Controls.cxx
+++ b/src/Controls/SMESH_Controls.cxx
@@ -1956,11 +1956,13 @@ bool BareBorderVolume::IsSatisfy(long theElementId )
 
 bool BareBorderFace::IsSatisfy(long theElementId )
 {
 
 bool BareBorderFace::IsSatisfy(long theElementId )
 {

+  bool ok = false;

   if ( const SMDS_MeshElement* face = myMesh->FindElement(theElementId))
   if ( const SMDS_MeshElement* face = myMesh->FindElement(theElementId))

+  {

     if ( face->GetType() == SMDSAbs_Face )
     {
       int nbN = face->NbCornerNodes();
     if ( face->GetType() == SMDSAbs_Face )
     {
       int nbN = face->NbCornerNodes();

-      for ( int i = 0; i < nbN; ++i )
+      for ( int i = 0; i < nbN && !ok; ++i )

       {
         // check if a link is shared by another face
         const SMDS_MeshNode* n1 = face->GetNode( i );
       {
         // check if a link is shared by another face
         const SMDS_MeshNode* n1 = face->GetNode( i );


@@ -1979,11 +1981,12 @@ bool BareBorderFace::IsSatisfy(long theElementId )
           myLinkNodes[1] = n2;
           if ( face->IsQuadratic() )
             myLinkNodes[2] = face->GetNode( i+nbN );
           myLinkNodes[1] = n2;
           if ( face->IsQuadratic() )
             myLinkNodes[2] = face->GetNode( i+nbN );

-          return !myMesh->FindElement( myLinkNodes, SMDSAbs_Edge, /*noMedium=*/false);
+          ok = !myMesh->FindElement( myLinkNodes, SMDSAbs_Edge, /*noMedium=*/false);

         }
       }
     }
         }
       }
     }

-  return false;
+  }
+  return ok;

 }
 
 /*
 }
 
 /*