Salome HOME
Regression of doc/salome/examples/transforming_meshes_ex10.py
authoreap <eap@opencascade.com>
Mon, 19 Dec 2016 10:49:10 +0000 (13:49 +0300)
committereap <eap@opencascade.com>
Mon, 19 Dec 2016 10:49:10 +0000 (13:49 +0300)
src/SMDS/SMDS_MeshNode.cxx
src/StdMeshers/StdMeshers_Hexa_3D.cxx
src/StdMeshers/StdMeshers_Quadrangle_2D.cxx
src/StdMeshers_I/StdMeshers_Hexa_3D_i.cxx
src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx
src/StdMeshers_I/StdMeshers_ProjectionSource2D_i.cxx
src/StdMeshers_I/StdMeshers_Projection_1D_2D_3D_i.cxx

index 553d568..53054f8 100644 (file)
@@ -67,7 +67,8 @@ void SMDS_MeshNode::init(int id, int meshId, int shapeId, double x, double y, do
   SMDS_UnstructuredGrid * grid = SMDS_Mesh::_meshList[myMeshId]->getGrid();
   vtkPoints *points = grid->GetPoints();
   points->InsertPoint(myVtkID, x, y, z);
-  grid->GetLinks()->ResizeForPoint( myVtkID );
+  if ( grid->HasLinks() )
+    grid->GetLinks()->ResizeForPoint( myVtkID );
 }
 
 SMDS_MeshNode::~SMDS_MeshNode()
@@ -162,9 +163,9 @@ public:
             cellList.push_back(vtkId);
           }
         }
-        myCells = cellList.empty() ? 0 : &cellList[0];
-        myNcells = cellList.size();
       }
+      myCells = cellList.empty() ? 0 : &cellList[0];
+      myNcells = cellList.size();
     }
   }
 
@@ -275,9 +276,12 @@ vtkIdType SMDS_MeshNode::GetVtkType() const
 void SMDS_MeshNode::AddInverseElement(const SMDS_MeshElement* ME)
 {
   SMDS_UnstructuredGrid* grid = SMDS_Mesh::_meshList[myMeshId]->getGrid();
-  vtkCellLinks *Links = grid->GetLinks();
-  Links->ResizeCellList(myVtkID, 1);
-  Links->AddCellReference(ME->getVtkId(), myVtkID);
+  if ( grid->HasLinks() )
+  {
+    vtkCellLinks *Links = grid->GetLinks();
+    Links->ResizeCellList(myVtkID, 1);
+    Links->AddCellReference(ME->getVtkId(), myVtkID);
+  }
 }
 
 //=======================================================================
index 0dfff42..4e1ee65 100644 (file)
@@ -73,7 +73,6 @@ static bool EvaluatePentahedralMesh(SMESH_Mesh &, const TopoDS_Shape &,
 StdMeshers_Hexa_3D::StdMeshers_Hexa_3D(int hypId, int studyId, SMESH_Gen * gen)
   :SMESH_3D_Algo(hypId, studyId, gen)
 {
-  MESSAGE("StdMeshers_Hexa_3D::StdMeshers_Hexa_3D");
   _name = "Hexa_3D";
   _shapeType = (1 << TopAbs_SHELL) | (1 << TopAbs_SOLID);       // 1 bit /shape type
   _requireShape = false;
@@ -88,7 +87,6 @@ StdMeshers_Hexa_3D::StdMeshers_Hexa_3D(int hypId, int studyId, SMESH_Gen * gen)
 
 StdMeshers_Hexa_3D::~StdMeshers_Hexa_3D()
 {
-  MESSAGE("StdMeshers_Hexa_3D::~StdMeshers_Hexa_3D");
 }
 
 //=============================================================================
index d9b807c..d724345 100644 (file)
@@ -94,7 +94,6 @@ StdMeshers_Quadrangle_2D::StdMeshers_Quadrangle_2D (int hypId, int studyId,
     myQuadType(QUAD_STANDARD),
     myHelper( NULL )
 {
-  MESSAGE("StdMeshers_Quadrangle_2D::StdMeshers_Quadrangle_2D");
   _name = "Quadrangle_2D";
   _shapeType = (1 << TopAbs_FACE);
   _compatibleHypothesis.push_back("QuadrangleParams");
@@ -111,7 +110,6 @@ StdMeshers_Quadrangle_2D::StdMeshers_Quadrangle_2D (int hypId, int studyId,
 
 StdMeshers_Quadrangle_2D::~StdMeshers_Quadrangle_2D()
 {
-  MESSAGE("StdMeshers_Quadrangle_2D::~StdMeshers_Quadrangle_2D");
 }
 
 //=============================================================================
index 739bda3..88e418e 100644 (file)
@@ -50,7 +50,6 @@ StdMeshers_Hexa_3D_i::StdMeshers_Hexa_3D_i( PortableServer::POA_ptr thePOA,
     SMESH_Algo_i( thePOA ),
     SMESH_3D_Algo_i( thePOA )
 {
-  MESSAGE( "StdMeshers_Hexa_3D_i::StdMeshers_Hexa_3D_i" );
   myBaseImpl = new ::StdMeshers_Hexa_3D( theGenImpl->GetANewId(),
                                          theStudyId,
                                          theGenImpl );
@@ -66,7 +65,6 @@ StdMeshers_Hexa_3D_i::StdMeshers_Hexa_3D_i( PortableServer::POA_ptr thePOA,
 
 StdMeshers_Hexa_3D_i::~StdMeshers_Hexa_3D_i()
 {
-  MESSAGE( "StdMeshers_Hexa_3D_i::~StdMeshers_Hexa_3D_i" );
 }
 
 //=============================================================================
@@ -79,7 +77,6 @@ StdMeshers_Hexa_3D_i::~StdMeshers_Hexa_3D_i()
 
 ::StdMeshers_Hexa_3D* StdMeshers_Hexa_3D_i::GetImpl()
 {
-  MESSAGE( "StdMeshers_Hexa_3D_i::GetImpl" );
   return ( ::StdMeshers_Hexa_3D* )myBaseImpl;
 }
 
index e512a74..5a75bf7 100644 (file)
@@ -51,7 +51,6 @@ StdMeshers_NumberOfSegments_i::StdMeshers_NumberOfSegments_i( PortableServer::PO
      : SALOME::GenericObj_i( thePOA ), 
        SMESH_Hypothesis_i( thePOA )
 {
-  MESSAGE( "StdMeshers_NumberOfSegments_i::StdMeshers_NumberOfSegments_i" );
   myBaseImpl = new ::StdMeshers_NumberOfSegments( theGenImpl->GetANewId(),
                                              theStudyId,
                                              theGenImpl );
@@ -67,7 +66,6 @@ StdMeshers_NumberOfSegments_i::StdMeshers_NumberOfSegments_i( PortableServer::PO
 
 StdMeshers_NumberOfSegments_i::~StdMeshers_NumberOfSegments_i()
 {
-  MESSAGE( "StdMeshers_NumberOfSegments_i::~StdMeshers_NumberOfSegments_i" );
 }
 
 //=============================================================================
@@ -247,7 +245,6 @@ char* StdMeshers_NumberOfSegments_i::GetObjectEntry()
 
 SMESH::long_array* StdMeshers_NumberOfSegments_i::GetReversedEdges()
 {
-  MESSAGE( "StdMeshers_NumberOfSegments_i::GetReversedEdges" );
   ASSERT( myBaseImpl );
   SMESH::long_array_var anArray = new SMESH::long_array;
   std::vector<int> ids = this->GetImpl()->GetReversedEdges();
index 0c030a0..369cc29 100644 (file)
@@ -52,7 +52,6 @@ StdMeshers_ProjectionSource2D_i::StdMeshers_ProjectionSource2D_i
   ::SMESH_Gen*            theGenImpl ) : SALOME::GenericObj_i( thePOA ), 
                                          SMESH_Hypothesis_i( thePOA )
 {
-  MESSAGE( "StdMeshers_ProjectionSource2D_i::StdMeshers_ProjectionSource2D_i" );
   myBaseImpl = new ::StdMeshers_ProjectionSource2D( theGenImpl->GetANewId(),
                                                     theStudyId,
                                                     theGenImpl );
@@ -68,7 +67,6 @@ StdMeshers_ProjectionSource2D_i::StdMeshers_ProjectionSource2D_i
 
 StdMeshers_ProjectionSource2D_i::~StdMeshers_ProjectionSource2D_i()
 {
-  MESSAGE( "StdMeshers_ProjectionSource2D_i::~StdMeshers_ProjectionSource2D_i" );
 }
 
 //=============================================================================
index a86b40f..515b7e8 100644 (file)
@@ -47,7 +47,6 @@ StdMeshers_Projection_3D_i::StdMeshers_Projection_3D_i( PortableServer::POA_ptr
        SMESH_Algo_i( thePOA ),
        SMESH_3D_Algo_i( thePOA )
 {
-  MESSAGE( "StdMeshers_Projection_3D_i::StdMeshers_Projection_3D_i" );
   myBaseImpl = new ::StdMeshers_Projection_3D( theGenImpl->GetANewId(),
                                     theStudyId,
                                     theGenImpl );
@@ -56,13 +55,11 @@ StdMeshers_Projection_3D_i::StdMeshers_Projection_3D_i( PortableServer::POA_ptr
 
 StdMeshers_Projection_3D_i::~StdMeshers_Projection_3D_i()
 {
-  MESSAGE( "StdMeshers_Projection_3D_i::~StdMeshers_Projection_3D_i" );
 }
 //-----------------------------------------------------------------------------
 
 ::StdMeshers_Projection_3D* StdMeshers_Projection_3D_i::GetImpl()
 {
-  MESSAGE( "StdMeshers_Projection_3D_i::GetImpl" );
   return ( ::StdMeshers_Projection_3D* )myBaseImpl;
 }
 
@@ -92,7 +89,6 @@ StdMeshers_Projection_2D_i::StdMeshers_Projection_2D_i( PortableServer::POA_ptr
        SMESH_Algo_i( thePOA ),
        SMESH_2D_Algo_i( thePOA )
 {
-  MESSAGE( "StdMeshers_Projection_2D_i::StdMeshers_Projection_2D_i" );
   myBaseImpl = new ::StdMeshers_Projection_2D( theGenImpl->GetANewId(),
                                     theStudyId,
                                     theGenImpl );
@@ -101,13 +97,11 @@ StdMeshers_Projection_2D_i::StdMeshers_Projection_2D_i( PortableServer::POA_ptr
 
 StdMeshers_Projection_2D_i::~StdMeshers_Projection_2D_i()
 {
-  MESSAGE( "StdMeshers_Projection_2D_i::~StdMeshers_Projection_2D_i" );
 }
 //-----------------------------------------------------------------------------
 
 ::StdMeshers_Projection_2D* StdMeshers_Projection_2D_i::GetImpl()
 {
-  MESSAGE( "StdMeshers_Projection_2D_i::GetImpl" );
   return ( ::StdMeshers_Projection_2D* )myBaseImpl;
 }
 
@@ -126,7 +120,6 @@ StdMeshers_Projection_1D2D_i::StdMeshers_Projection_1D2D_i( PortableServer::POA_
        SMESH_Algo_i( thePOA ),
        SMESH_2D_Algo_i( thePOA )
 {
-  MESSAGE( "StdMeshers_Projection_1D2D_i::StdMeshers_Projection_1D2D_i" );
   myBaseImpl = new ::StdMeshers_Projection_1D2D( theGenImpl->GetANewId(),
                                                  theStudyId,
                                                  theGenImpl );
@@ -135,13 +128,11 @@ StdMeshers_Projection_1D2D_i::StdMeshers_Projection_1D2D_i( PortableServer::POA_
 
 StdMeshers_Projection_1D2D_i::~StdMeshers_Projection_1D2D_i()
 {
-  MESSAGE( "StdMeshers_Projection_1D2D_i::~StdMeshers_Projection_1D2D_i" );
 }
 //-----------------------------------------------------------------------------
 
 ::StdMeshers_Projection_1D2D* StdMeshers_Projection_1D2D_i::GetImpl()
 {
-  MESSAGE( "StdMeshers_Projection_1D2D_i::GetImpl" );
   return ( ::StdMeshers_Projection_1D2D* )myBaseImpl;
 }
 
@@ -160,7 +151,6 @@ StdMeshers_Projection_1D_i::StdMeshers_Projection_1D_i( PortableServer::POA_ptr
        SMESH_Algo_i( thePOA ),
        SMESH_1D_Algo_i( thePOA )
 {
-  MESSAGE( "StdMeshers_Projection_1D_i::StdMeshers_Projection_1D_i" );
   myBaseImpl = new ::StdMeshers_Projection_1D( theGenImpl->GetANewId(),
                                     theStudyId,
                                     theGenImpl );
@@ -169,12 +159,10 @@ StdMeshers_Projection_1D_i::StdMeshers_Projection_1D_i( PortableServer::POA_ptr
 
 StdMeshers_Projection_1D_i::~StdMeshers_Projection_1D_i()
 {
-  MESSAGE( "StdMeshers_Projection_1D_i::~StdMeshers_Projection_1D_i" );
 }
 //-----------------------------------------------------------------------------
 
 ::StdMeshers_Projection_1D* StdMeshers_Projection_1D_i::GetImpl()
 {
-  MESSAGE( "StdMeshers_Projection_1D_i::GetImpl" );
   return ( ::StdMeshers_Projection_1D* )myBaseImpl;
 }