22564: EDF SMESH: Regression, FindNodeClosestTo does not return the right node on...

Refix 22511: EDF 2845 SMESH : error with UseExistingFaces

diff --git a/src/SMESHUtils/SMESH_OctreeNode.cxx b/src/SMESHUtils/SMESH_OctreeNode.cxx
index 1c85e046994b73f160fccc55b044ef8403bca546..f23cac0cab8bc5e0804e03d2c6c93535e676487a 100644 (file)
--- a/src/SMESHUtils/SMESH_OctreeNode.cxx
+++ b/src/SMESHUtils/SMESH_OctreeNode.cxx
@@ -30,6 +30,7 @@
 #include "SMESH_OctreeNode.hxx"
 
 #include "SMDS_SetIterator.hxx"
 #include "SMESH_OctreeNode.hxx"
 
 #include "SMDS_SetIterator.hxx"

+#include "SMESH_TypeDefs.hxx"

 #include <gp_Pnt.hxx>
 
 using namespace std;
 #include <gp_Pnt.hxx>
 
 using namespace std;


@@ -167,7 +168,7 @@ void SMESH_OctreeNode::NodesAround (const SMDS_MeshNode * Node,
                                     list<const SMDS_MeshNode*>* Result,
                                     const double precision)
 {
                                     list<const SMDS_MeshNode*>* Result,
                                     const double precision)
 {

-  gp_XYZ p(Node->X(), Node->Y(), Node->Z());
+  SMESH_TNodeXYZ p(Node);

   if (isInside(p, precision))
   {
     if (isLeaf())
   if (isInside(p, precision))
   {
     if (isLeaf())


@@ -191,7 +192,7 @@ void SMESH_OctreeNode::NodesAround (const SMDS_MeshNode * Node,
  *  \param node - node to find nodes closest to
  *  \param dist2Nodes - map of found nodes and their distances
  *  \param precision - radius of a sphere to check nodes inside
  *  \param node - node to find nodes closest to
  *  \param dist2Nodes - map of found nodes and their distances
  *  \param precision - radius of a sphere to check nodes inside

- *  \retval bool - true if an exact overlapping found
+ *  \retval bool - true if an exact overlapping found !!!

  */
 //================================================================================
 
  */
 //================================================================================
 


@@ -204,7 +205,6 @@ bool SMESH_OctreeNode::NodesAround(const gp_XYZ &node,
   else if ( precision == 0. )
     precision = maxSize() / 2;
 
   else if ( precision == 0. )
     precision = maxSize() / 2;
 

-  //gp_XYZ p(node->X(), node->Y(), node->Z());

   if (isInside(node, precision))
   {
     if (!isLeaf())
   if (isInside(node, precision))
   {
     if (!isLeaf())


@@ -222,21 +222,20 @@ bool SMESH_OctreeNode::NodesAround(const gp_XYZ &node,
     }
     else if ( NbNodes() > 0 )
     {
     }
     else if ( NbNodes() > 0 )
     {

-      size_t nbFoundBefore = dist2Nodes.size();

       double minDist = precision * precision;
       double minDist = precision * precision;

-      gp_Pnt p1 ( node.X(), node.Y(), node.Z() );

       TIDSortedNodeSet::iterator nIt = myNodes.begin();
       for ( ; nIt != myNodes.end(); ++nIt )
       {
       TIDSortedNodeSet::iterator nIt = myNodes.begin();
       for ( ; nIt != myNodes.end(); ++nIt )
       {

-        gp_Pnt p2 ( (*nIt)->X(), (*nIt)->Y(), (*nIt)->Z() );
-        double dist2 = p1.SquareDistance( p2 );
+        SMESH_TNodeXYZ p2( *nIt );
+        double dist2 = ( node - p2 ).SquareModulus();

         if ( dist2 < minDist )
         if ( dist2 < minDist )

-          dist2Nodes.insert( make_pair( minDist = dist2, *nIt ));
+          dist2Nodes.insert( make_pair( minDist = dist2, p2._node ));

       }
 //       if ( dist2Nodes.size() > 1 ) // leave only closest node in dist2Nodes
 //         dist2Nodes.erase( ++dist2Nodes.begin(), dist2Nodes.end());
 
       }
 //       if ( dist2Nodes.size() > 1 ) // leave only closest node in dist2Nodes
 //         dist2Nodes.erase( ++dist2Nodes.begin(), dist2Nodes.end());
 

-      return ( nbFoundBefore < dist2Nodes.size() );
+      // true if an exact overlapping found
+      return ( sqrt( minDist ) <= precision * 1e-12 );

     }
   }
   return false;
     }
   }
   return false;

diff --git a/src/StdMeshers/StdMeshers_Import_1D2D.cxx b/src/StdMeshers/StdMeshers_Import_1D2D.cxx
index 6aff7c2078072f33b097a32f716a5e43b500b2fe..e557bc60d6d549114405da755d186a0a3a8061f6 100644 (file)
--- a/src/StdMeshers/StdMeshers_Import_1D2D.cxx
+++ b/src/StdMeshers/StdMeshers_Import_1D2D.cxx
@@ -280,7 +280,8 @@ bool StdMeshers_Import_1D2D::Compute(SMESH_Mesh & theMesh, const TopoDS_Shape &
         {
           // find a pre-existing node
           dist2foundNodes.clear();
         {
           // find a pre-existing node
           dist2foundNodes.clear();

-          if ( existingNodeOcTr.NodesAround( SMESH_TNodeXYZ( *node ), dist2foundNodes, groupTol ))
+          existingNodeOcTr.NodesAround( SMESH_TNodeXYZ( *node ), dist2foundNodes, groupTol );
+          if ( !dist2foundNodes.empty() )

             (*n2nIt).second = dist2foundNodes.begin()->second;
         }
         if ( !n2nIt->second )
             (*n2nIt).second = dist2foundNodes.begin()->second;
         }
         if ( !n2nIt->second )