zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ENH: triSurface: unstructured ascii vtk reading

Browse Source
This commit is contained in:
mattijs
2012-03-05 14:13:31 +00:00
parent 5242bcf9b8
commit f0d680d4c0
10 changed files with 235 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/fileFormats/vtk/vtkUnstructuredReader.C
View File

@ -125,8 +125,11 @@ void Foam::vtkUnstructuredReader::extractCells
cells_.setSize(cellTypes.size());
cellMap_.setSize(cellTypes.size(), -1);
faces_.setSize(cellTypes.size());
faceMap_.setSize(cellTypes.size(), -1);
lines_.setSize(cellTypes.size());
lineMap_.setSize(cellTypes.size(), -1);
label dataIndex = 0;
label cellI = 0;
@ -179,6 +182,7 @@ void Foam::vtkUnstructuredReader::extractCells
) << "Expected size 2 for VTK_LINE but found "
<< nRead << exit(FatalIOError);
}
lineMap_[lineI] = i;
labelList& segment = lines_[lineI++];
segment.setSize(2);
segment[0] = cellVertData[dataIndex++];
@ -190,6 +194,7 @@ void Foam::vtkUnstructuredReader::extractCells
{
//warnUnhandledType(inFile, cellTypes[i], warningGiven);
label nRead = cellVertData[dataIndex++];
lineMap_[lineI] = i;
labelList& segment = lines_[lineI++];
segment.setSize(nRead);
forAll(segment, i)
@ -201,6 +206,7 @@ void Foam::vtkUnstructuredReader::extractCells
case VTK_TRIANGLE:
{
faceMap_[faceI] = i;
face& f = faces_[faceI++];
f.setSize(3);
label nRead = cellVertData[dataIndex++];
@ -221,6 +227,7 @@ void Foam::vtkUnstructuredReader::extractCells
case VTK_QUAD:
{
faceMap_[faceI] = i;
face& f = faces_[faceI++];
f.setSize(4);
label nRead = cellVertData[dataIndex++];
@ -242,6 +249,7 @@ void Foam::vtkUnstructuredReader::extractCells
case VTK_POLYGON:
{
faceMap_[faceI] = i;
face& f = faces_[faceI++];
label nRead = cellVertData[dataIndex++];
f.setSize(nRead);
@ -268,6 +276,7 @@ void Foam::vtkUnstructuredReader::extractCells
tetPoints[1] = cellVertData[dataIndex++];
tetPoints[2] = cellVertData[dataIndex++];
tetPoints[3] = cellVertData[dataIndex++];
cellMap_[cellI] = i;
cells_[cellI++] = cellShape(tet, tetPoints, true);
}
break;
@ -289,6 +298,7 @@ void Foam::vtkUnstructuredReader::extractCells
pyrPoints[2] = cellVertData[dataIndex++];
pyrPoints[3] = cellVertData[dataIndex++];
pyrPoints[4] = cellVertData[dataIndex++];
cellMap_[cellI] = i;
cells_[cellI++] = cellShape(pyr, pyrPoints, true);
}
break;
@ -311,6 +321,7 @@ void Foam::vtkUnstructuredReader::extractCells
prismPoints[3] = cellVertData[dataIndex++];
prismPoints[4] = cellVertData[dataIndex++];
prismPoints[5] = cellVertData[dataIndex++];
cellMap_[cellI] = i;
cells_[cellI++] = cellShape(prism, prismPoints, true);
}
break;
@ -335,6 +346,7 @@ void Foam::vtkUnstructuredReader::extractCells
hexPoints[5] = cellVertData[dataIndex++];
hexPoints[6] = cellVertData[dataIndex++];
hexPoints[7] = cellVertData[dataIndex++];
cellMap_[cellI] = i;
cells_[cellI++] = cellShape(hex, hexPoints, true);
}
break;
@ -351,8 +363,11 @@ void Foam::vtkUnstructuredReader::extractCells
Info<< "Read " << cellI << " cells;" << faceI << " faces." << endl;
}
cells_.setSize(cellI);
cellMap_.setSize(cellI);
faces_.setSize(faceI);
faceMap_.setSize(faceI);
lines_.setSize(lineI);
lineMap_.setSize(lineI);
}
@ -655,9 +670,11 @@ void Foam::vtkUnstructuredReader::read(ISstream& inFile)
labelList lineVerts;
readBlock(inFile, nNumbers, lineVerts);
lines_.setSize(nLines);
lineMap_.setSize(nLines);
label elemI = 0;
forAll(lines_, lineI)
{
lineMap_[lineI] = lineI;
labelList& f = lines_[lineI];
f.setSize(lineVerts[elemI++]);
forAll(f, fp)
@ -682,6 +699,7 @@ void Foam::vtkUnstructuredReader::read(ISstream& inFile)
label elemI = 0;
forAll(faces_, faceI)
{
faceMap_[faceI] = faceI;
face& f = faces_[faceI];
f.setSize(faceVerts[elemI++]);
forAll(f, fp)

29
src/fileFormats/vtk/vtkUnstructuredReader.H
View File

@ -25,7 +25,8 @@ Class
Foam::vtkUnstructuredReader
Description
Reader for vtk unstructured legacy files
Reader for vtk unstructured legacy files. Supports single CELLS, POINTS
etc. entry only.
SourceFiles
vtkUnstructuredReader.C
@ -45,9 +46,6 @@ SourceFiles
namespace Foam
{
// Forward declaration of friend functions and operators
/*---------------------------------------------------------------------------*\
Class vtkUnstructuredReader Declaration
\*---------------------------------------------------------------------------*/
@ -137,12 +135,20 @@ private:
//- 3D cells.
cellShapeList cells_;
//- Map from cells back to original ID
labelList cellMap_;
//- 2D cells (=faces)
faceList faces_;
//- Map from faces back to original ID
labelList faceMap_;
//- 1D cells (=edges)
labelListList lines_;
labelList lineMap_;
// Data
@ -258,6 +264,11 @@ public:
return cells_;
}
const labelList& cellMap() const
{
return cellMap_;
}
//- 2D cells (=faces)
const faceList& faces() const
{
@ -269,6 +280,11 @@ public:
return faces_;
}
const labelList& faceMap() const
{
return faceMap_;
}
//- 1D cells (=open lines)
const labelListList& lines() const
{
@ -280,6 +296,11 @@ public:
return lines_;
}
const labelList& lineMap() const
{
return lineMap_;
}
//- cell based fields
const objectRegistry& cellData() const
{