}
}
+void SMDS_CellLinks::BuildLinks(vtkDataSet *data, vtkCellArray *Connectivity, vtkUnsignedCharArray* types)
+{
+ // build links taking into account removed cells
+
+ vtkIdType numPts = data->GetNumberOfPoints();
+ vtkIdType j, cellId = 0;
+ unsigned short *linkLoc;
+ vtkIdType npts=0;
+ vtkIdType *pts=0;
+ vtkIdType loc = Connectivity->GetTraversalLocation();
+
+ // traverse data to determine number of uses of each point
+ cellId = 0;
+ for (Connectivity->InitTraversal();
+ Connectivity->GetNextCell(npts,pts); cellId++)
+ {
+ if ( types->GetValue( cellId ) != VTK_EMPTY_CELL )
+ for (j=0; j < npts; j++)
+ {
+ this->IncrementLinkCount(pts[j]);
+ }
+ }
+
+ // now allocate storage for the links
+ this->AllocateLinks(numPts);
+ this->MaxId = numPts - 1;
+
+ // fill out lists with references to cells
+ linkLoc = new unsigned short[numPts];
+ memset(linkLoc, 0, numPts*sizeof(unsigned short));
+
+ cellId = 0;
+ for (Connectivity->InitTraversal();
+ Connectivity->GetNextCell(npts,pts); cellId++)
+ {
+ if ( types->GetValue( cellId ) != VTK_EMPTY_CELL )
+ for (j=0; j < npts; j++)
+ {
+ this->InsertCellReference(pts[j], (linkLoc[pts[j]])++, cellId);
+ }
+ }
+ delete [] linkLoc;
+ Connectivity->SetTraversalLocation(loc);
+}
+
SMDS_CellLinks::SMDS_CellLinks() :
vtkCellLinks()
{
{
}
-unsigned long SMDS_UnstructuredGrid::GetMTime()
+vtkMTimeType SMDS_UnstructuredGrid::GetMTime()
{
- unsigned long mtime = vtkUnstructuredGrid::GetMTime();
+ vtkMTimeType mtime = vtkUnstructuredGrid::GetMTime();
return mtime;
}
-// OUV_PORTING_VTK6: seems to be useless
-/*
-void SMDS_UnstructuredGrid::Update()
-{
- return vtkUnstructuredGrid::Update();
-}
-void SMDS_UnstructuredGrid::UpdateInformation()
-{
- return vtkUnstructuredGrid::UpdateInformation();
-}
-*/
vtkPoints* SMDS_UnstructuredGrid::GetPoints()
{
// TODO erreur incomprehensible de la macro vtk GetPoints apparue avec la version paraview de fin aout 2010
return this->Points;
}
-//#ifdef VTK_HAVE_POLYHEDRON
int SMDS_UnstructuredGrid::InsertNextLinkedCell(int type, int npts, vtkIdType *pts)
{
- if (type != VTK_POLYHEDRON)
+ if ( !this->Links ) // don't create Links until they are needed
+ {
+ return this->InsertNextCell(type, npts, pts);
+ }
+
+ if ( type != VTK_POLYHEDRON )
return vtkUnstructuredGrid::InsertNextLinkedCell(type, npts, pts);
// --- type = VTK_POLYHEDRON
int nbfaces = npts;
int i = 0;
for (int nf = 0; nf < nbfaces; nf++)
+ {
+ int nbnodes = pts[i];
+ i++;
+ for (int k = 0; k < nbnodes; k++)
{
- int nbnodes = pts[i];
+ setOfNodes.insert(pts[i]);
i++;
- for (int k = 0; k < nbnodes; k++)
- {
- setOfNodes.insert(pts[i]);
- i++;
- }
}
+ }
set<vtkIdType>::iterator it = setOfNodes.begin();
for (; it != setOfNodes.end(); ++it)
- {
- this->Links->ResizeCellList(*it, 1);
- this->Links->AddCellReference(cellid, *it);
- }
+ {
+ this->Links->ResizeCellList(*it, 1);
+ this->Links->AddCellReference(cellid, *it);
+ }
return cellid;
}
-//#endif
void SMDS_UnstructuredGrid::setSMDS_mesh(SMDS_Mesh *mesh)
{
void SMDS_UnstructuredGrid::compactGrid(std::vector<int>& idNodesOldToNew, int newNodeSize,
std::vector<int>& idCellsOldToNew, int newCellSize)
{
- //MESSAGE("------------------------- compactGrid " << newNodeSize << " " << newCellSize);//CHRONO(1);
int alreadyCopied = 0;
+ this->DeleteLinks();
+
// --- if newNodeSize, create a new compacted vtkPoints
- vtkPoints *newPoints = vtkPoints::New();
- newPoints->SetDataType(VTK_DOUBLE);
- newPoints->SetNumberOfPoints(newNodeSize);
- if (newNodeSize)
- {
- // rnv: to fix bug "21125: EDF 1233 SMESH: Degradation of precision in a test case for quadratic conversion"
- // using double type for storing coordinates of nodes instead float.
- int oldNodeSize = idNodesOldToNew.size();
+ if ( newNodeSize )
+ {
+ // rnv: to fix bug "21125: EDF 1233 SMESH: Degradation of precision in a test case for quadratic conversion"
+ // using double type for storing coordinates of nodes instead float.
+ vtkPoints *newPoints = vtkPoints::New();
+ newPoints->SetDataType(VTK_DOUBLE);
+ newPoints->SetNumberOfPoints(newNodeSize);
- int i = 0;
- while ( i < oldNodeSize )
- {
- // skip a hole if any
- while ( i < oldNodeSize && idNodesOldToNew[i] < 0 )
- ++i;
- int startBloc = i;
- // look for a block end
- while ( i < oldNodeSize && idNodesOldToNew[i] >= 0 )
- ++i;
- int endBloc = i;
- copyNodes(newPoints, idNodesOldToNew, alreadyCopied, startBloc, endBloc);
- }
- newPoints->Squeeze();
+ int oldNodeSize = idNodesOldToNew.size();
+
+ int i = 0;
+ while ( i < oldNodeSize )
+ {
+ // skip a hole if any
+ while ( i < oldNodeSize && idNodesOldToNew[i] < 0 )
+ ++i;
+ int startBloc = i;
+ // look for a block end
+ while ( i < oldNodeSize && idNodesOldToNew[i] >= 0 )
+ ++i;
+ int endBloc = i;
+ copyNodes(newPoints, idNodesOldToNew, alreadyCopied, startBloc, endBloc);
}
+ this->SetPoints(newPoints);
+ newPoints->Delete();
+ }
+ this->Points->Squeeze();
// --- create new compacted Connectivity, Locations and Types
int oldCellSize = this->Types->GetNumberOfTuples();
+ if ( !newNodeSize && oldCellSize == newCellSize ) // no holes in elements
+ {
+ this->Connectivity->Squeeze();
+ this->Locations->Squeeze();
+ this->Types->Squeeze();
+ if ( this->FaceLocations )
+ {
+ this->FaceLocations->Squeeze();
+ this->Faces->Squeeze();
+ }
+ for ( int i = 0; i < oldCellSize; ++i )
+ idCellsOldToNew[i] = i;
+ return;
+ }
vtkCellArray *newConnectivity = vtkCellArray::New();
newConnectivity->Initialize();
int oldCellDataSize = this->Connectivity->GetData()->GetSize();
}
newConnectivity->Squeeze();
- if (1/*newNodeSize*/)
- {
- this->SetPoints(newPoints);
- }
-
if (vtkDoubleArray* diameters =
vtkDoubleArray::SafeDownCast( vtkDataSet::CellData->GetScalars() )) // Balls
{
this->SetCells(newTypes, newLocations, newConnectivity, FaceLocations, Faces);
}
- newPoints->Delete();
newTypes->Delete();
newLocations->Delete();
newConnectivity->Delete();
- this->BuildLinks();
}
void SMDS_UnstructuredGrid::copyNodes(vtkPoints * newPoints,
void *source = this->Points->GetVoidPointer(3 * start);
int nbPoints = end - start;
if (nbPoints > 0)
- {
- memcpy(target, source, 3 * sizeof(double) * nbPoints);
- for (int j = start; j < end; j++)
- idNodesOldToNew[j] = alreadyCopied++; // old vtkId --> new vtkId
- }
+ {
+ memcpy(target, source, 3 * sizeof(double) * nbPoints);
+ for (int j = start; j < end; j++)
+ idNodesOldToNew[j] = alreadyCopied++; // old vtkId --> new vtkId
+ }
}
void SMDS_UnstructuredGrid::copyBloc(vtkUnsignedCharArray *newTypes,
int end)
{
for (int j = start; j < end; j++)
+ {
+ newTypes->SetValue(alreadyCopied, this->Types->GetValue(j));
+ idCellsOldToNew[j] = alreadyCopied; // old vtkId --> new vtkId
+ vtkIdType oldLoc = this->Locations->GetValue(j);
+ vtkIdType nbpts;
+ vtkIdType *oldPtsCell = 0;
+ this->Connectivity->GetCell(oldLoc, nbpts, oldPtsCell);
+ assert(nbpts < NBMAXNODESINCELL);
+ for (int l = 0; l < nbpts; l++)
{
- newTypes->SetValue(alreadyCopied, this->Types->GetValue(j));
- idCellsOldToNew[j] = alreadyCopied; // old vtkId --> new vtkId
- vtkIdType oldLoc = this->Locations->GetValue(j);
- vtkIdType nbpts;
- vtkIdType *oldPtsCell = 0;
- this->Connectivity->GetCell(oldLoc, nbpts, oldPtsCell);
- assert(nbpts < NBMAXNODESINCELL);
- for (int l = 0; l < nbpts; l++)
- {
- int oldval = oldPtsCell[l];
- pointsCell[l] = idNodesOldToNew[oldval];
- }
- /*int newcnt = */newConnectivity->InsertNextCell(nbpts, pointsCell);
- int newLoc = newConnectivity->GetInsertLocation(nbpts);
- newLocations->SetValue(alreadyCopied, newLoc);
- alreadyCopied++;
+ int oldval = oldPtsCell[l];
+ pointsCell[l] = idNodesOldToNew[oldval];
}
+ /*int newcnt = */newConnectivity->InsertNextCell(nbpts, pointsCell);
+ int newLoc = newConnectivity->GetInsertLocation(nbpts);
+ newLocations->SetValue(alreadyCopied, newLoc);
+ alreadyCopied++;
+ }
}
int SMDS_UnstructuredGrid::CellIdToDownId(int vtkCellId)
{
// Remove the old links if they are already built
if (this->Links)
- {
+ {
this->Links->UnRegister(this);
- }
+ }
- this->Links = SMDS_CellLinks::New();
+ SMDS_CellLinks* links;
+ this->Links = links = SMDS_CellLinks::New();
this->Links->Allocate(this->GetNumberOfPoints());
this->Links->Register(this);
- this->Links->BuildLinks(this, this->Connectivity);
+ links->BuildLinks(this, this->Connectivity,this->GetCellTypesArray() );
this->Links->Delete();
}
+void SMDS_UnstructuredGrid::DeleteLinks()
+{
+ // Remove the old links if they are already built
+ if (this->Links)
+ {
+ this->Links->UnRegister(this);
+ this->Links = NULL;
+ }
+}
+SMDS_CellLinks* SMDS_UnstructuredGrid::GetLinks()
+{
+ if ( !this->Links )
+ BuildLinks();
+ return static_cast< SMDS_CellLinks* >( this->Links );
+}
+
/*! Create a volume (prism or hexahedron) by duplication of a face.
* Designed for use in creation of flat elements separating volume domains.
* A face separating two domains is shared by two volume cells.
