0020982: EDF 1547 SMESH: Creation of non-conformal quadratic pyramids

   Replace VTK_CONVEX_POINT_SET with VTK_QUADRATIC_PYRAMID

diff --git a/src/OBJECT/SMESH_Actor.cxx b/src/OBJECT/SMESH_Actor.cxx
index 33acca12248303dc2c0eed49e8be11d88cd4f156..38dddb2ae6ff5c816ee76b5139f045068ae027f4 100644 (file)
--- a/src/OBJECT/SMESH_Actor.cxx
+++ b/src/OBJECT/SMESH_Actor.cxx
@@ -196,6 +196,7 @@ SMESH_ActorDef::SMESH_ActorDef()
   aFilter->RegisterCellsWithType(VTK_QUADRATIC_TETRA);
   aFilter->RegisterCellsWithType(VTK_QUADRATIC_HEXAHEDRON);
   aFilter->RegisterCellsWithType(VTK_QUADRATIC_WEDGE);
+  aFilter->RegisterCellsWithType(VTK_QUADRATIC_PYRAMID);
   aFilter->RegisterCellsWithType(VTK_CONVEX_POINT_SET);
 
   //Definition 1D device of the actor
@@ -1346,6 +1347,7 @@ void SMESH_ActorDef::SetEntityMode(unsigned int theMode)
     aHightFilter->RegisterCellsWithType(VTK_QUADRATIC_TETRA);
     aHightFilter->RegisterCellsWithType(VTK_QUADRATIC_HEXAHEDRON);
     aHightFilter->RegisterCellsWithType(VTK_QUADRATIC_WEDGE);
+    aHightFilter->RegisterCellsWithType(VTK_QUADRATIC_PYRAMID);
     aHightFilter->RegisterCellsWithType(VTK_CONVEX_POINT_SET);
   }
   aFilter->Update();

diff --git a/src/OBJECT/SMESH_Object.cxx b/src/OBJECT/SMESH_Object.cxx
index eb43a6b5f89828f48ffedb925249431b046ce7d3..480a0fe3fa8f61d76ce405dc8aeb7a80cee9a82b 100644 (file)
--- a/src/OBJECT/SMESH_Object.cxx
+++ b/src/OBJECT/SMESH_Object.cxx
@@ -119,7 +119,7 @@ static inline vtkIdType getCellType( const SMDSAbs_ElementType theType,
         return VTK_QUADRATIC_WEDGE;
       }
       else if ( theNbNodes==13 )  {
-        return VTK_CONVEX_POINT_SET;
+        return VTK_QUADRATIC_PYRAMID; //VTK_CONVEX_POINT_SET;
       }
       else return VTK_EMPTY_CELL;