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

Standardized cell, patch and face loop index names

Browse Source
This commit is contained in:
Henry Weller
2016-04-25 10:28:32 +01:00
parent 2d5ff31649
commit 43beb06018
849 changed files with 13266 additions and 13266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -115,12 +115,12 @@ void Foam::vtkUnstructuredReader::extractCells
labelList prismPoints(6);
labelList hexPoints(8);
label cellI = cells_.size();
cells_.setSize(cellI+cellTypes.size());
label celli = cells_.size();
cells_.setSize(celli+cellTypes.size());
cellMap_.setSize(cells_.size(), -1);
label faceI = faces_.size();
faces_.setSize(faceI+cellTypes.size());
label facei = faces_.size();
faces_.setSize(facei+cellTypes.size());
faceMap_.setSize(faces_.size(), -1);
label lineI = lines_.size();
@ -197,8 +197,8 @@ void Foam::vtkUnstructuredReader::extractCells
case VTK_TRIANGLE:
{
faceMap_[faceI] = i;
face& f = faces_[faceI++];
faceMap_[facei] = i;
face& f = faces_[facei++];
f.setSize(3);
label nRead = cellVertData[dataIndex++];
if (nRead != 3)
@ -217,8 +217,8 @@ void Foam::vtkUnstructuredReader::extractCells
case VTK_QUAD:
{
faceMap_[faceI] = i;
face& f = faces_[faceI++];
faceMap_[facei] = i;
face& f = faces_[facei++];
f.setSize(4);
label nRead = cellVertData[dataIndex++];
if (nRead != 4)
@ -238,8 +238,8 @@ void Foam::vtkUnstructuredReader::extractCells
case VTK_POLYGON:
{
faceMap_[faceI] = i;
face& f = faces_[faceI++];
faceMap_[facei] = i;
face& f = faces_[facei++];
label nRead = cellVertData[dataIndex++];
f.setSize(nRead);
forAll(f, fp)
@ -264,8 +264,8 @@ 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);
cellMap_[celli] = i;
cells_[celli++] = cellShape(tet, tetPoints, true);
}
break;
@ -285,8 +285,8 @@ 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);
cellMap_[celli] = i;
cells_[celli++] = cellShape(pyr, pyrPoints, true);
}
break;
@ -307,8 +307,8 @@ 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);
cellMap_[celli] = i;
cells_[celli++] = cellShape(prism, prismPoints, true);
}
break;
@ -331,8 +331,8 @@ 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);
cellMap_[celli] = i;
cells_[celli++] = cellShape(hex, hexPoints, true);
}
break;
@ -345,12 +345,12 @@ void Foam::vtkUnstructuredReader::extractCells
if (debug)
{
Info<< "Read " << cellI << " cells;" << faceI << " faces." << endl;
Info<< "Read " << celli << " cells;" << facei << " faces." << endl;
}
cells_.setSize(cellI);
cellMap_.setSize(cellI);
faces_.setSize(faceI);
faceMap_.setSize(faceI);
cells_.setSize(celli);
cellMap_.setSize(celli);
faces_.setSize(facei);
faceMap_.setSize(facei);
lines_.setSize(lineI);
lineMap_.setSize(lineI);
}
@ -696,21 +696,21 @@ void Foam::vtkUnstructuredReader::read(ISstream& inFile)
labelList faceVerts;
readBlock(inFile, nNumbers, faceVerts);
label faceI = faces_.size();
faces_.setSize(faceI+nFaces);
label facei = faces_.size();
faces_.setSize(facei+nFaces);
faceMap_.setSize(faces_.size());
label elemI = 0;
for (label i = 0; i < nFaces; i++)
{
faceMap_[faceI] = faceI;
face& f = faces_[faceI];
faceMap_[facei] = facei;
face& f = faces_[facei];
f.setSize(faceVerts[elemI++]);
forAll(f, fp)
{
f[fp] = faceVerts[elemI++];
}
faceI++;
facei++;
}
}
else if (tag == "POINT_DATA")
@ -883,8 +883,8 @@ void Foam::vtkUnstructuredReader::read(ISstream& inFile)
// Store
label faceI = faces_.size();
faces_.setSize(faceI+nTris);
label facei = faces_.size();
faces_.setSize(facei+nTris);
faceMap_.setSize(faces_.size());
elemI = 0;
for (label i = 0; i < nStrips; i++)
@ -893,16 +893,16 @@ void Foam::vtkUnstructuredReader::read(ISstream& inFile)
label nTris = nVerts-2;
// Read first triangle
faceMap_[faceI] = faceI;
face& f = faces_[faceI++];
faceMap_[facei] = facei;
face& f = faces_[facei++];
f.setSize(3);
f[0] = faceVerts[elemI++];
f[1] = faceVerts[elemI++];
f[2] = faceVerts[elemI++];
for (label triI = 1; triI < nTris; triI++)
{
faceMap_[faceI] = faceI;
face& f = faces_[faceI++];
faceMap_[facei] = facei;
face& f = faces_[facei++];
f.setSize(3);
f[0] = faceVerts[elemI-1];
f[1] = faceVerts[elemI-2];