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

80
src/meshTools/meshStructure/meshStructure.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -43,10 +43,10 @@ bool Foam::meshStructure::isStructuredCell
(
const polyMesh& mesh,
const label layerI,
const label cellI
const label celli
) const
{
const cell& cFaces = mesh.cells()[cellI];
const cell& cFaces = mesh.cells()[celli];
// Count number of side faces
label nSide = 0;
@ -142,10 +142,10 @@ void Foam::meshStructure::correct
cellToPatchFaceAddressing_.setSize(mesh.nCells());
cellLayer_.setSize(mesh.nCells());
forAll(cellToPatchFaceAddressing_, cellI)
forAll(cellToPatchFaceAddressing_, celli)
{
cellToPatchFaceAddressing_[cellI] = cellData[cellI].data();
cellLayer_[cellI] = cellData[cellI].distance();
cellToPatchFaceAddressing_[celli] = cellData[celli].data();
cellLayer_[celli] = cellData[celli].distance();
}
@ -158,43 +158,43 @@ void Foam::meshStructure::correct
faceToPatchEdgeAddressing_ = labelMin;
faceLayer_.setSize(mesh.nFaces());
forAll(faceToPatchFaceAddressing_, faceI)
forAll(faceToPatchFaceAddressing_, facei)
{
label own = mesh.faceOwner()[faceI];
label patchFaceI = faceData[faceI].data();
label patchDist = faceData[faceI].distance();
label own = mesh.faceOwner()[facei];
label patchFaceI = faceData[facei].data();
label patchDist = faceData[facei].distance();
if (mesh.isInternalFace(faceI))
if (mesh.isInternalFace(facei))
{
label nei = mesh.faceNeighbour()[faceI];
label nei = mesh.faceNeighbour()[facei];
if (cellData[own].distance() == cellData[nei].distance())
{
// side face
faceToPatchFaceAddressing_[faceI] = 0;
faceLayer_[faceI] = cellData[own].distance();
faceToPatchFaceAddressing_[facei] = 0;
faceLayer_[facei] = cellData[own].distance();
}
else if (cellData[own].distance() < cellData[nei].distance())
{
// unturned face
faceToPatchFaceAddressing_[faceI] = patchFaceI+1;
faceToPatchEdgeAddressing_[faceI] = -1;
faceLayer_[faceI] = patchDist;
faceToPatchFaceAddressing_[facei] = patchFaceI+1;
faceToPatchEdgeAddressing_[facei] = -1;
faceLayer_[facei] = patchDist;
}
else
{
// turned face
faceToPatchFaceAddressing_[faceI] = -(patchFaceI+1);
faceToPatchEdgeAddressing_[faceI] = -1;
faceLayer_[faceI] = patchDist;
faceToPatchFaceAddressing_[facei] = -(patchFaceI+1);
faceToPatchEdgeAddressing_[facei] = -1;
faceLayer_[facei] = patchDist;
}
}
else if (patchDist == cellData[own].distance())
{
// starting face
faceToPatchFaceAddressing_[faceI] = -(patchFaceI+1);
faceToPatchEdgeAddressing_[faceI] = -1;
faceLayer_[faceI] = patchDist;
faceToPatchFaceAddressing_[facei] = -(patchFaceI+1);
faceToPatchEdgeAddressing_[facei] = -1;
faceLayer_[facei] = patchDist;
}
else
{
@ -261,14 +261,14 @@ void Foam::meshStructure::correct
}
// Look up on faces
forAll(faceToPatchEdgeAddressing_, faceI)
forAll(faceToPatchEdgeAddressing_, facei)
{
if (faceToPatchEdgeAddressing_[faceI] == labelMin)
if (faceToPatchEdgeAddressing_[facei] == labelMin)
{
// Face not yet done. Check if all points on same level
// or if not see what edge it originates from
const face& f = mesh.faces()[faceI];
const face& f = mesh.faces()[facei];
label levelI = pointLayer_[f[0]];
for (label fp = 1; fp < f.size(); fp++)
@ -283,19 +283,19 @@ void Foam::meshStructure::correct
if (levelI != -1)
{
// All same level
//Pout<< "Horizontal boundary face " << faceI
// << " at:" << mesh.faceCentres()[faceI]
// << " data:" << faceData[faceI]
//Pout<< "Horizontal boundary face " << facei
// << " at:" << mesh.faceCentres()[facei]
// << " data:" << faceData[facei]
// << " pointDatas:"
// << UIndirectList<pointTopoDistanceData>(pointData, f)
// << endl;
label patchFaceI = faceData[faceI].data();
label patchDist = faceData[faceI].distance();
label patchFaceI = faceData[facei].data();
label patchDist = faceData[facei].distance();
faceToPatchEdgeAddressing_[faceI] = -1;
faceToPatchFaceAddressing_[faceI] = patchFaceI+1;
faceLayer_[faceI] = patchDist;
faceToPatchEdgeAddressing_[facei] = -1;
faceToPatchFaceAddressing_[facei] = patchFaceI+1;
faceLayer_[facei] = patchDist;
}
else
{
@ -317,10 +317,10 @@ void Foam::meshStructure::correct
);
if (fnd != pointsToEdge.end())
{
faceToPatchEdgeAddressing_[faceI] = fnd();
faceToPatchFaceAddressing_[faceI] = 0;
label own = mesh.faceOwner()[faceI];
faceLayer_[faceI] = cellData[own].distance();
faceToPatchEdgeAddressing_[facei] = fnd();
faceToPatchFaceAddressing_[facei] = 0;
label own = mesh.faceOwner()[facei];
faceLayer_[facei] = cellData[own].distance();
// Note: could test whether the other edges on the
// face are consistent
@ -346,13 +346,13 @@ void Foam::meshStructure::correct
forAll(lCells, lCellI)
{
label cellI = lCells[lCellI];
label celli = lCells[lCellI];
structured_ = isStructuredCell
(
mesh,
layerI,
cellI
celli
);
if (!structured_)

4
src/meshTools/meshStructure/meshStructure.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -88,7 +88,7 @@ class meshStructure
(
const polyMesh& mesh,
const label layerI,
const label cellI
const label celli
) const;
//- Calculate all maps.