22360]: EDF SMESH: Body Fitting algorithm: incorporate edges

[modules/smesh.git] / src / StdMeshers / StdMeshers_Cartesian_3D.cxx

diff --git a/src/StdMeshers/StdMeshers_Cartesian_3D.cxx b/src/StdMeshers/StdMeshers_Cartesian_3D.cxx
index 9683661080c4660a74b8439935a67eff58678901..e880bb1a798f54fbb29fbe1c0aafe03729657b42 100644 (file)
--- a/src/StdMeshers/StdMeshers_Cartesian_3D.cxx
+++ b/src/StdMeshers/StdMeshers_Cartesian_3D.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2014  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -6,7 +6,7 @@
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -1934,6 +1934,22 @@ namespace
         }
       } // while ( nbSplits > 0 )
 
+      if ( quad._edgeNodes.size() > nbUsedEdgeNodes )
+      {
+        // make _vertexNodes from not used _edgeNodes
+        const double tol = 0.05 * Min( Min( _sideLength[0], _sideLength[1] ), _sideLength[0] );
+        for ( size_t iP = 0; iP < quad._edgeNodes.size(); ++iP )
+        {
+          if ( quad._edgeNodes[ iP ]._isUsedInFace ) continue;
+          _Node* equalNode =
+            FindEqualNode( _vertexNodes, quad._edgeNodes[ iP ].EdgeIntPnt(), tol*tol );
+          if ( equalNode )
+            equalNode->Add( quad._edgeNodes[ iP ].EdgeIntPnt() );
+          else
+            _vertexNodes.push_back( quad._edgeNodes[ iP ]);
+        }
+      }
+
       if ( polygon->_links.size() < 3 )
         _polygons.pop_back();