0023064: [CEA 1471] Create and support quadratic polygons in SMESH

[modules/smesh.git] / src / SMDS / SMDS_VolumeTool.cxx

diff --git a/src/SMDS/SMDS_VolumeTool.cxx b/src/SMDS/SMDS_VolumeTool.cxx
index 001387c5f4daa5b10efcb231c31277645c5cc80d..b86dc16c377a99bae4f78b2a322e75bc97aecd23 100644 (file)
--- a/src/SMDS/SMDS_VolumeTool.cxx
+++ b/src/SMDS/SMDS_VolumeTool.cxx
@@ -43,6 +43,8 @@
 
 using namespace std;
 
 
 using namespace std;
 

+namespace
+{

 // ======================================================
 // Node indices in faces depending on volume orientation
 // making most faces normals external
 // ======================================================
 // Node indices in faces depending on volume orientation
 // making most faces normals external


@@ -349,8 +351,6 @@ static int TriQuadHexa_nbN [] = { 9, 9, 9, 9, 9, 9 };
 // ========================================================
 // to perform some calculations without linkage to CASCADE
 // ========================================================
 // ========================================================
 // to perform some calculations without linkage to CASCADE
 // ========================================================

-namespace
-{

 struct XYZ {
   double x;
   double y;
 struct XYZ {
   double x;
   double y;


@@ -1498,6 +1498,7 @@ double SMDS_VolumeTool::MaxLinearSize2() const
 //================================================================================
 /*!
  * \brief fast check that only one volume is build on the face nodes
 //================================================================================
 /*!
  * \brief fast check that only one volume is build on the face nodes

+ *        This check is valid for conformal meshes only

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


@@ -1510,19 +1511,30 @@ bool SMDS_VolumeTool::IsFreeFace( int faceIndex, const SMDS_MeshElement** otherV
 
   const SMDS_MeshNode** nodes = GetFaceNodes( faceIndex );
 
 
   const SMDS_MeshNode** nodes = GetFaceNodes( faceIndex );
 

-  const int di = myVolume->IsQuadratic() ? 2 : 1;
-  const SMDS_MeshNode* n1 = nodes[di*0];
-  const SMDS_MeshNode* n2 = nodes[di*1];
-  const SMDS_MeshNode* n3 = nodes[di*2];
+  const int  di = myVolume->IsQuadratic() ? 2 : 1;
+  const int nbN = ( myFaceNbNodes/di <= 4 && !IsPoly()) ? 3 : myFaceNbNodes/di; // nb nodes to check

 
 

-  SMDS_ElemIteratorPtr eIt = n1->GetInverseElementIterator( SMDSAbs_Volume );
-  SMDS_ElemIteratorPtr nIt;
-  while ( eIt->more() ) {
+  SMDS_ElemIteratorPtr eIt = nodes[0]->GetInverseElementIterator( SMDSAbs_Volume );
+  while ( eIt->more() )
+  {

     const SMDS_MeshElement* vol = eIt->next();
     const SMDS_MeshElement* vol = eIt->next();

-    if ( vol != myVolume &&
-         vol->GetNodeIndex( n2 ) >= 0 &&
-         vol->GetNodeIndex( n3 ) >= 0 )
+    if ( vol == myVolume )
+      continue;
+    int iN;
+    for ( iN = 1; iN < nbN; ++iN )
+      if ( vol->GetNodeIndex( nodes[ iN*di ]) < 0 )
+        break;
+    if ( iN == nbN ) // nbN nodes are shared with vol

     {
     {

+      // if ( vol->IsPoly() || vol->NbFaces() > 6 ) // vol is polyhed or hex prism 
+      // {
+      //   int nb = myFaceNbNodes;
+      //   if ( myVolume->GetEntityType() != vol->GetEntityType() )
+      //     nb -= ( GetCenterNodeIndex(0) > 0 );
+      //   set<const SMDS_MeshNode*> faceNodes( nodes, nodes + nb );
+      //   if ( SMDS_VolumeTool( vol ).GetFaceIndex( faceNodes ) < 0 )
+      //     continue;
+      // }

       if ( otherVol ) *otherVol = vol;
       return !isFree;
     }
       if ( otherVol ) *otherVol = vol;
       return !isFree;
     }