99 lines
4.4 KiB
Diff
99 lines
4.4 KiB
Diff
--- a/src/3rdParty/salomesmesh/inc/SMDS_UnstructuredGrid.hxx
|
|
+++ b/src/3rdParty/salomesmesh/inc/SMDS_UnstructuredGrid.hxx
|
|
@@ -96,7 +96,7 @@
|
|
vtkCellLinks* GetLinks()
|
|
{
|
|
#ifdef VTK_CELL_ARRAY_V2
|
|
- return static_cast<vtkCellLinks*>(GetCellLinks());
|
|
+ return static_cast<vtkCellLinks*>(GetLinks());
|
|
#else
|
|
return Links;
|
|
#endif
|
|
--- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp
|
|
+++ b/src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp
|
|
@@ -4713,7 +4713,7 @@
|
|
}
|
|
ficcon << "-------------------------------- connectivity " << nbPoints << endl;
|
|
#ifdef VTK_CELL_ARRAY_V2
|
|
- vtkCellLinks *links = static_cast<vtkCellLinks*>(myGrid->GetCellLinks());
|
|
+ vtkCellLinks *links = static_cast<vtkCellLinks*>(myGrid->GetLinks());
|
|
#else
|
|
vtkCellLinks *links = myGrid->GetCellLinks();
|
|
#endif
|
|
--- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_MeshNode.cpp
|
|
+++ b/src/3rdParty/salomesmesh/src/SMDS/SMDS_MeshNode.cpp
|
|
@@ -69,7 +69,7 @@
|
|
SMDS_UnstructuredGrid * grid = mesh->getGrid();
|
|
vtkPoints *points = grid->GetPoints();
|
|
points->InsertPoint(myVtkID, x, y, z);
|
|
- SMDS_CellLinks *cellLinks = dynamic_cast<SMDS_CellLinks*>(grid->GetCellLinks());
|
|
+ SMDS_CellLinks *cellLinks = dynamic_cast<SMDS_CellLinks*>(grid->GetLinks());
|
|
assert(cellLinks);
|
|
cellLinks->ResizeForPoint( myVtkID );
|
|
}
|
|
@@ -191,7 +191,7 @@
|
|
SMDS_ElemIteratorPtr SMDS_MeshNode::
|
|
GetInverseElementIterator(SMDSAbs_ElementType type) const
|
|
{
|
|
- vtkCellLinks::Link l = static_cast<vtkCellLinks*>(SMDS_Mesh::_meshList[myMeshId]->getGrid()->GetCellLinks())->GetLink(myVtkID);
|
|
+ vtkCellLinks::Link l = static_cast<vtkCellLinks*>(SMDS_Mesh::_meshList[myMeshId]->getGrid()->GetLinks())->GetLink(myVtkID);
|
|
//MESSAGE("myID " << myID << " ncells " << l.ncells);
|
|
return SMDS_ElemIteratorPtr(new SMDS_MeshNode_MyInvIterator(SMDS_Mesh::_meshList[myMeshId], l.cells, l.ncells, type));
|
|
}
|
|
@@ -251,7 +251,7 @@
|
|
return SMDS_MeshElement::elementsIterator(SMDSAbs_Node);
|
|
else
|
|
{
|
|
- vtkCellLinks::Link l = static_cast<vtkCellLinks*>(SMDS_Mesh::_meshList[myMeshId]->getGrid()->GetCellLinks())->GetLink(myVtkID);
|
|
+ vtkCellLinks::Link l = static_cast<vtkCellLinks*>(SMDS_Mesh::_meshList[myMeshId]->getGrid()->GetLinks())->GetLink(myVtkID);
|
|
return SMDS_ElemIteratorPtr(new SMDS_MeshNode_MyIterator(SMDS_Mesh::_meshList[myMeshId], l.cells, l.ncells, type));
|
|
}
|
|
}
|
|
@@ -350,7 +350,7 @@
|
|
const SMDS_MeshCell *cell = dynamic_cast<const SMDS_MeshCell*> (ME);
|
|
assert(cell);
|
|
SMDS_UnstructuredGrid* grid = SMDS_Mesh::_meshList[myMeshId]->getGrid();
|
|
- vtkCellLinks *Links = static_cast<vtkCellLinks*>(grid->GetCellLinks());
|
|
+ vtkCellLinks *Links = static_cast<vtkCellLinks*>(grid->GetLinks());
|
|
Links->ResizeCellList(myVtkID, 1);
|
|
Links->AddCellReference(cell->getVtkId(), myVtkID);
|
|
}
|
|
@@ -366,7 +366,7 @@
|
|
|
|
bool SMDS_MeshNode::emptyInverseElements()
|
|
{
|
|
- vtkCellLinks::Link l = static_cast<vtkCellLinks*>(SMDS_Mesh::_meshList[myMeshId]->getGrid()->GetCellLinks())->GetLink(myVtkID);
|
|
+ vtkCellLinks::Link l = static_cast<vtkCellLinks*>(SMDS_Mesh::_meshList[myMeshId]->getGrid()->GetLinks())->GetLink(myVtkID);
|
|
return (l.ncells == 0);
|
|
}
|
|
|
|
@@ -378,7 +378,7 @@
|
|
|
|
int SMDS_MeshNode::NbInverseElements(SMDSAbs_ElementType type) const
|
|
{
|
|
- vtkCellLinks::Link l = static_cast<vtkCellLinks*>(SMDS_Mesh::_meshList[myMeshId]->getGrid()->GetCellLinks())->GetLink(myVtkID);
|
|
+ vtkCellLinks::Link l = static_cast<vtkCellLinks*>(SMDS_Mesh::_meshList[myMeshId]->getGrid()->GetLinks())->GetLink(myVtkID);
|
|
|
|
if ( type == SMDSAbs_All )
|
|
return l.ncells;
|
|
--- a/src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshEditor.cpp
|
|
+++ b/src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshEditor.cpp
|
|
@@ -11348,7 +11348,7 @@
|
|
{
|
|
int oldId = *itn;
|
|
//MESSAGE(" node " << oldId);
|
|
- vtkCellLinks::Link l = static_cast<vtkCellLinks*>(grid->GetCellLinks())->GetLink(oldId);
|
|
+ vtkCellLinks::Link l = static_cast<vtkCellLinks*>(grid->GetLinks())->GetLink(oldId);
|
|
for (int i=0; i<l.ncells; i++)
|
|
{
|
|
int vtkId = l.cells[i];
|
|
@@ -11708,7 +11708,7 @@
|
|
{
|
|
int oldId = itnod->first;
|
|
//MESSAGE(" node " << oldId);
|
|
- vtkCellLinks::Link l = static_cast<vtkCellLinks*>(grid->GetCellLinks())->GetLink(oldId);
|
|
+ vtkCellLinks::Link l = static_cast<vtkCellLinks*>(grid->GetLinks())->GetLink(oldId);
|
|
for (int i = 0; i < l.ncells; i++)
|
|
{
|
|
int vtkId = l.cells[i];
|