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

6
applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.C
View File

@ -712,10 +712,10 @@ void Foam::vtkPVFoam::renderPatchNames
}
// Do averaging per individual zone
forAll(pp, faceI)
forAll(pp, facei)
{
label zoneI = pZones[faceI];
zoneCentre[patchi][zoneI] += pp[faceI].centre(pp.points());
label zoneI = pZones[facei];
zoneCentre[patchi][zoneI] += pp[facei].centre(pp.points());
zoneNFaces[zoneI]++;
}

6
applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamFaceField.H
View File

@ -74,9 +74,9 @@ void Foam::vtkPVFoam::convertFaceField
// for interior faces: average owner/neighbour
// for boundary faces: owner
forAll(faceLabels, faceI)
forAll(faceLabels, facei)
{
const label faceNo = faceLabels[faceI];
const label faceNo = faceLabels[facei];
if (faceNo < nInternalFaces)
{
Type t = 0.5*(tf[faceOwner[faceNo]] + tf[faceNeigh[faceNo]]);
@ -96,7 +96,7 @@ void Foam::vtkPVFoam::convertFaceField
}
vtkOpenFOAMTupleRemap<Type>(vec);
cellData->InsertTuple(faceI, vec);
cellData->InsertTuple(facei, vec);
}

8
applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshSet.C
View File

@ -55,10 +55,10 @@ vtkPolyData* Foam::vtkPVFoam::faceSetVTKMesh
const faceList& meshFaces = mesh.faces();
faceList patchFaces(fSet.size());
label faceI = 0;
label facei = 0;
forAllConstIter(faceSet, fSet, iter)
{
patchFaces[faceI++] = meshFaces[iter.key()];
patchFaces[facei++] = meshFaces[iter.key()];
}
primitiveFacePatch p(patchFaces, mesh.points());
@ -83,9 +83,9 @@ vtkPolyData* Foam::vtkPVFoam::faceSetVTKMesh
vtkCellArray* vtkcells = vtkCellArray::New();
vtkcells->Allocate(faces.size());
forAll(faces, faceI)
forAll(faces, facei)
{
const face& f = faces[faceI];
const face& f = faces[facei];
vtkIdType nodeIds[f.size()];
forAll(f, fp)

28
applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshVolume.C
View File

@ -83,9 +83,9 @@ vtkUnstructuredGrid* Foam::vtkPVFoam::volumeVTKMesh
Info<< "... scanning for polyhedra" << endl;
}
forAll(cellShapes, cellI)
forAll(cellShapes, celli)
{
const cellModel& model = cellShapes[cellI].model();
const cellModel& model = cellShapes[celli].model();
if
(
@ -97,7 +97,7 @@ vtkUnstructuredGrid* Foam::vtkPVFoam::volumeVTKMesh
&& model != tetWedge
)
{
const cell& cFaces = mesh.cells()[cellI];
const cell& cFaces = mesh.cells()[celli];
forAll(cFaces, cFaceI)
{
@ -168,12 +168,12 @@ vtkUnstructuredGrid* Foam::vtkPVFoam::volumeVTKMesh
// [numFace0Pts, id1, id2, id3, numFace1Pts, id1, id2, id3, ...]
DynamicList<vtkIdType> faceStream(256);
forAll(cellShapes, cellI)
forAll(cellShapes, celli)
{
const cellShape& cellShape = cellShapes[cellI];
const cellShape& cellShape = cellShapes[celli];
const cellModel& cellModel = cellShape.model();
superCells[addCellI++] = cellI;
superCells[addCellI++] = celli;
if (cellModel == tet)
{
@ -273,7 +273,7 @@ vtkUnstructuredGrid* Foam::vtkPVFoam::volumeVTKMesh
else if (reader_->GetUseVTKPolyhedron())
{
// Polyhedral cell - use VTK_POLYHEDRON
const labelList& cFaces = mesh.cells()[cellI];
const labelList& cFaces = mesh.cells()[celli];
#ifdef HAS_VTK_POLYHEDRON
vtkIdType nFaces = cFaces.size();
@ -295,7 +295,7 @@ vtkUnstructuredGrid* Foam::vtkPVFoam::volumeVTKMesh
forAll(cFaces, cFaceI)
{
const face& f = mesh.faces()[cFaces[cFaceI]];
const bool isOwner = (owner[cFaces[cFaceI]] == cellI);
const bool isOwner = (owner[cFaces[cFaceI]] == celli);
const label nFacePoints = f.size();
// number of labels for this face
@ -353,20 +353,20 @@ vtkUnstructuredGrid* Foam::vtkPVFoam::volumeVTKMesh
// Polyhedral cell. Decompose into tets + prisms.
// Mapping from additional point to cell
addPointCellLabels[addPointI] = cellI;
addPointCellLabels[addPointI] = celli;
// The new vertex from the cell-centre
const label newVertexLabel = mesh.nPoints() + addPointI;
vtkInsertNextOpenFOAMPoint(vtkpoints, mesh.C()[cellI]);
vtkInsertNextOpenFOAMPoint(vtkpoints, mesh.C()[celli]);
// Whether to insert cell in place of original or not.
bool substituteCell = true;
const labelList& cFaces = mesh.cells()[cellI];
const labelList& cFaces = mesh.cells()[celli];
forAll(cFaces, cFaceI)
{
const face& f = mesh.faces()[cFaces[cFaceI]];
const bool isOwner = (owner[cFaces[cFaceI]] == cellI);
const bool isOwner = (owner[cFaces[cFaceI]] == celli);
// Number of triangles and quads in decomposition
label nTris = 0;
@ -388,7 +388,7 @@ vtkUnstructuredGrid* Foam::vtkPVFoam::volumeVTKMesh
}
else
{
superCells[addCellI++] = cellI;
superCells[addCellI++] = celli;
}
const face& quad = quadFcs[quadI];
@ -431,7 +431,7 @@ vtkUnstructuredGrid* Foam::vtkPVFoam::volumeVTKMesh
}
else
{
superCells[addCellI++] = cellI;
superCells[addCellI++] = celli;
}
const face& tri = triFcs[triI];

4
applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamTemplates.C
View File

@ -71,9 +71,9 @@ vtkPolyData* Foam::vtkPVFoam::patchVTKMesh
vtkCellArray* vtkcells = vtkCellArray::New();
vtkcells->Allocate(faces.size());
forAll(faces, faceI)
forAll(faces, facei)
{
const face& f = faces[faceI];
const face& f = faces[facei];
vtkIdType nodeIds[f.size()];
forAll(f, fp)