zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests 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 6a27f7af46
commit 8c4f6b8fcb
849 changed files with 13266 additions and 13266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

146
src/meshTools/algorithms/MeshWave/FaceCellWave.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -73,7 +73,7 @@ namespace Foam
void operator()
(
Type& x,
const label faceI,
const label facei,
const Type& y,
const scalar weight
) const
@ -83,11 +83,11 @@ namespace Foam
label meshFaceI = -1;
if (patch_.owner())
{
meshFaceI = patch_.start() + faceI;
meshFaceI = patch_.start() + facei;
}
else
{
meshFaceI = patch_.neighbPatch().start() + faceI;
meshFaceI = patch_.neighbPatch().start() + facei;
}
x.updateFace
(
@ -106,7 +106,7 @@ namespace Foam
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
// Update info for cellI, at position pt, with information from
// Update info for celli, at position pt, with information from
// neighbouring face/cell.
// Updates:
// - changedCell_, changedCells_, nChangedCells_,
@ -114,7 +114,7 @@ namespace Foam
template<class Type, class TrackingData>
bool Foam::FaceCellWave<Type, TrackingData>::updateCell
(
const label cellI,
const label celli,
const label neighbourFaceI,
const Type& neighbourInfo,
const scalar tol,
@ -129,7 +129,7 @@ bool Foam::FaceCellWave<Type, TrackingData>::updateCell
cellInfo.updateCell
(
mesh_,
cellI,
celli,
neighbourFaceI,
neighbourInfo,
tol,
@ -138,10 +138,10 @@ bool Foam::FaceCellWave<Type, TrackingData>::updateCell
if (propagate)
{
if (!changedCell_[cellI])
if (!changedCell_[celli])
{
changedCell_[cellI] = true;
changedCells_[nChangedCells_++] = cellI;
changedCell_[celli] = true;
changedCells_[nChangedCells_++] = celli;
}
}
@ -154,7 +154,7 @@ bool Foam::FaceCellWave<Type, TrackingData>::updateCell
}
// Update info for faceI, at position pt, with information from
// Update info for facei, at position pt, with information from
// neighbouring face/cell.
// Updates:
// - changedFace_, changedFaces_, nChangedFaces_,
@ -162,7 +162,7 @@ bool Foam::FaceCellWave<Type, TrackingData>::updateCell
template<class Type, class TrackingData>
bool Foam::FaceCellWave<Type, TrackingData>::updateFace
(
const label faceI,
const label facei,
const label neighbourCellI,
const Type& neighbourInfo,
const scalar tol,
@ -177,7 +177,7 @@ bool Foam::FaceCellWave<Type, TrackingData>::updateFace
faceInfo.updateFace
(
mesh_,
faceI,
facei,
neighbourCellI,
neighbourInfo,
tol,
@ -186,10 +186,10 @@ bool Foam::FaceCellWave<Type, TrackingData>::updateFace
if (propagate)
{
if (!changedFace_[faceI])
if (!changedFace_[facei])
{
changedFace_[faceI] = true;
changedFaces_[nChangedFaces_++] = faceI;
changedFace_[facei] = true;
changedFaces_[nChangedFaces_++] = facei;
}
}
@ -202,7 +202,7 @@ bool Foam::FaceCellWave<Type, TrackingData>::updateFace
}
// Update info for faceI, at position pt, with information from
// Update info for facei, at position pt, with information from
// same face.
// Updates:
// - changedFace_, changedFaces_, nChangedFaces_,
@ -210,7 +210,7 @@ bool Foam::FaceCellWave<Type, TrackingData>::updateFace
template<class Type, class TrackingData>
bool Foam::FaceCellWave<Type, TrackingData>::updateFace
(
const label faceI,
const label facei,
const Type& neighbourInfo,
const scalar tol,
Type& faceInfo
@ -224,7 +224,7 @@ bool Foam::FaceCellWave<Type, TrackingData>::updateFace
faceInfo.updateFace
(
mesh_,
faceI,
facei,
neighbourInfo,
tol,
td_
@ -232,10 +232,10 @@ bool Foam::FaceCellWave<Type, TrackingData>::updateFace
if (propagate)
{
if (!changedFace_[faceI])
if (!changedFace_[facei])
{
changedFace_[faceI] = true;
changedFaces_[nChangedFaces_++] = faceI;
changedFace_[facei] = true;
changedFaces_[nChangedFaces_++] = facei;
}
}
@ -298,9 +298,9 @@ template<class Type, class TrackingData>
template<class PatchType>
bool Foam::FaceCellWave<Type, TrackingData>::hasPatch() const
{
forAll(mesh_.boundaryMesh(), patchI)
forAll(mesh_.boundaryMesh(), patchi)
{
if (isA<PatchType>(mesh_.boundaryMesh()[patchI]))
if (isA<PatchType>(mesh_.boundaryMesh()[patchi]))
{
return true;
}
@ -319,23 +319,23 @@ void Foam::FaceCellWave<Type, TrackingData>::setFaceInfo
{
forAll(changedFaces, changedFaceI)
{
label faceI = changedFaces[changedFaceI];
label facei = changedFaces[changedFaceI];
bool wasValid = allFaceInfo_[faceI].valid(td_);
bool wasValid = allFaceInfo_[facei].valid(td_);
// Copy info for faceI
allFaceInfo_[faceI] = changedFacesInfo[changedFaceI];
// Copy info for facei
allFaceInfo_[facei] = changedFacesInfo[changedFaceI];
// Maintain count of unset faces
if (!wasValid && allFaceInfo_[faceI].valid(td_))
if (!wasValid && allFaceInfo_[facei].valid(td_))
{
--nUnvisitedFaces_;
}
// Mark faceI as changed, both on list and on face itself.
// Mark facei as changed, both on list and on face itself.
changedFace_[faceI] = true;
changedFaces_[nChangedFaces_++] = faceI;
changedFace_[facei] = true;
changedFaces_[nChangedFaces_++] = facei;
}
}
@ -462,16 +462,16 @@ void Foam::FaceCellWave<Type, TrackingData>::transform
{
const tensor& T = rotTensor[0];
for (label faceI = 0; faceI < nFaces; faceI++)
for (label facei = 0; facei < nFaces; facei++)
{
faceInfo[faceI].transform(mesh_, T, td_);
faceInfo[facei].transform(mesh_, T, td_);
}
}
else
{
for (label faceI = 0; faceI < nFaces; faceI++)
for (label facei = 0; facei < nFaces; facei++)
{
faceInfo[faceI].transform(mesh_, rotTensor[faceI], td_);
faceInfo[facei].transform(mesh_, rotTensor[facei], td_);
}
}
}
@ -487,9 +487,9 @@ void Foam::FaceCellWave<Type, TrackingData>::offset
labelList& faces
)
{
for (label faceI = 0; faceI < nFaces; faceI++)
for (label facei = 0; facei < nFaces; facei++)
{
faces[faceI] += cycOffset;
faces[facei] += cycOffset;
}
}
@ -509,10 +509,10 @@ void Foam::FaceCellWave<Type, TrackingData>::handleProcPatches()
forAll(procPatches, i)
{
label patchI = procPatches[i];
label patchi = procPatches[i];
const processorPolyPatch& procPatch =
refCast<const processorPolyPatch>(mesh_.boundaryMesh()[patchI]);
refCast<const processorPolyPatch>(mesh_.boundaryMesh()[patchi]);
// Allocate buffers
label nSendFaces;
@ -540,7 +540,7 @@ void Foam::FaceCellWave<Type, TrackingData>::handleProcPatches()
if (debug & 2)
{
Pout<< " Processor patch " << patchI << ' ' << procPatch.name()
Pout<< " Processor patch " << patchi << ' ' << procPatch.name()
<< " communicating with " << procPatch.neighbProcNo()
<< " Sending:" << nSendFaces
<< endl;
@ -559,10 +559,10 @@ void Foam::FaceCellWave<Type, TrackingData>::handleProcPatches()
forAll(procPatches, i)
{
label patchI = procPatches[i];
label patchi = procPatches[i];
const processorPolyPatch& procPatch =
refCast<const processorPolyPatch>(mesh_.boundaryMesh()[patchI]);
refCast<const processorPolyPatch>(mesh_.boundaryMesh()[patchi]);
// Allocate buffers
labelList receiveFaces;
@ -575,7 +575,7 @@ void Foam::FaceCellWave<Type, TrackingData>::handleProcPatches()
if (debug & 2)
{
Pout<< " Processor patch " << patchI << ' ' << procPatch.name()
Pout<< " Processor patch " << patchi << ' ' << procPatch.name()
<< " communicating with " << procPatch.neighbProcNo()
<< " Receiving:" << receiveFaces.size()
<< endl;
@ -617,9 +617,9 @@ void Foam::FaceCellWave<Type, TrackingData>::handleProcPatches()
template<class Type, class TrackingData>
void Foam::FaceCellWave<Type, TrackingData>::handleCyclicPatches()
{
forAll(mesh_.boundaryMesh(), patchI)
forAll(mesh_.boundaryMesh(), patchi)
{
const polyPatch& patch = mesh_.boundaryMesh()[patchI];
const polyPatch& patch = mesh_.boundaryMesh()[patchi];
if (isA<cyclicPolyPatch>(patch))
{
@ -666,7 +666,7 @@ void Foam::FaceCellWave<Type, TrackingData>::handleCyclicPatches()
if (debug & 2)
{
Pout<< " Cyclic patch " << patchI << ' ' << cycPatch.name()
Pout<< " Cyclic patch " << patchi << ' ' << cycPatch.name()
<< " Changed : " << nReceiveFaces
<< endl;
}
@ -702,9 +702,9 @@ void Foam::FaceCellWave<Type, TrackingData>::handleCyclicPatches()
template<class Type, class TrackingData>
void Foam::FaceCellWave<Type, TrackingData>::handleAMICyclicPatches()
{
forAll(mesh_.boundaryMesh(), patchI)
forAll(mesh_.boundaryMesh(), patchi)
{
const polyPatch& patch = mesh_.boundaryMesh()[patchI];
const polyPatch& patch = mesh_.boundaryMesh()[patchi];
if (isA<cyclicAMIPolyPatch>(patch))
{
@ -951,30 +951,30 @@ Foam::label Foam::FaceCellWave<Type, TrackingData>::faceToCell()
changedFaceI++
)
{
label faceI = changedFaces_[changedFaceI];
if (!changedFace_[faceI])
label facei = changedFaces_[changedFaceI];
if (!changedFace_[facei])
{
FatalErrorInFunction
<< "Face " << faceI
<< "Face " << facei
<< " not marked as having been changed"
<< abort(FatalError);
}
const Type& neighbourWallInfo = allFaceInfo_[faceI];
const Type& neighbourWallInfo = allFaceInfo_[facei];
// Evaluate all connected cells
// Owner
label cellI = owner[faceI];
Type& currentWallInfo = allCellInfo_[cellI];
label celli = owner[facei];
Type& currentWallInfo = allCellInfo_[celli];
if (!currentWallInfo.equal(neighbourWallInfo, td_))
{
updateCell
(
cellI,
faceI,
celli,
facei,
neighbourWallInfo,
propagationTol_,
currentWallInfo
@ -982,17 +982,17 @@ Foam::label Foam::FaceCellWave<Type, TrackingData>::faceToCell()
}
// Neighbour.
if (faceI < nInternalFaces)
if (facei < nInternalFaces)
{
cellI = neighbour[faceI];
Type& currentWallInfo2 = allCellInfo_[cellI];
celli = neighbour[facei];
Type& currentWallInfo2 = allCellInfo_[celli];
if (!currentWallInfo2.equal(neighbourWallInfo, td_))
{
updateCell
(
cellI,
faceI,
celli,
facei,
neighbourWallInfo,
propagationTol_,
currentWallInfo2
@ -1001,7 +1001,7 @@ Foam::label Foam::FaceCellWave<Type, TrackingData>::faceToCell()
}
// Reset status of face
changedFace_[faceI] = false;
changedFace_[facei] = false;
}
// Handled all changed faces by now
@ -1034,30 +1034,30 @@ Foam::label Foam::FaceCellWave<Type, TrackingData>::cellToFace()
changedCellI++
)
{
label cellI = changedCells_[changedCellI];
if (!changedCell_[cellI])
label celli = changedCells_[changedCellI];
if (!changedCell_[celli])
{
FatalErrorInFunction
<< "Cell " << cellI << " not marked as having been changed"
<< "Cell " << celli << " not marked as having been changed"
<< abort(FatalError);
}
const Type& neighbourWallInfo = allCellInfo_[cellI];
const Type& neighbourWallInfo = allCellInfo_[celli];
// Evaluate all connected faces
const labelList& faceLabels = cells[cellI];
const labelList& faceLabels = cells[celli];
forAll(faceLabels, faceLabelI)
{
label faceI = faceLabels[faceLabelI];
Type& currentWallInfo = allFaceInfo_[faceI];
label facei = faceLabels[faceLabelI];
Type& currentWallInfo = allFaceInfo_[facei];
if (!currentWallInfo.equal(neighbourWallInfo, td_))
{
updateFace
(
faceI,
cellI,
facei,
celli,
neighbourWallInfo,
propagationTol_,
currentWallInfo
@ -1066,7 +1066,7 @@ Foam::label Foam::FaceCellWave<Type, TrackingData>::cellToFace()
}
// Reset status of cell
changedCell_[cellI] = false;
changedCell_[celli] = false;
}
// Handled all changed cells by now

6
src/meshTools/algorithms/MeshWave/FaceCellWave.H
View File

@ -131,7 +131,7 @@ class FaceCellWave
// statistics.
bool updateCell
(
const label cellI,
const label celli,
const label neighbourFaceI,
const Type& neighbourInfo,
const scalar tol,
@ -142,7 +142,7 @@ class FaceCellWave
// statistics.
bool updateFace
(
const label faceI,
const label facei,
const label neighbourCellI,
const Type& neighbourInfo,
const scalar tol,
@ -153,7 +153,7 @@ class FaceCellWave
// statistics.
bool updateFace
(
const label faceI,
const label facei,
const Type& neighbourInfo,
const scalar tol,
Type& faceInfo

32
src/meshTools/algorithms/PatchEdgeFaceWave/PatchEdgeFaceWave.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -106,7 +106,7 @@ updateEdge
}
// Update info for faceI, at position pt, with information from
// Update info for facei, at position pt, with information from
// neighbouring edge.
// Updates:
// - changedFace_, changedFaces_,
@ -120,7 +120,7 @@ template
bool Foam::PatchEdgeFaceWave<PrimitivePatchType, Type, TrackingData>::
updateFace
(
const label faceI,
const label facei,
const label neighbourEdgeI,
const Type& neighbourInfo,
Type& faceInfo
@ -135,7 +135,7 @@ updateFace
(
mesh_,
patch_,
faceI,
facei,
neighbourEdgeI,
neighbourInfo,
propagationTol_,
@ -144,10 +144,10 @@ updateFace
if (propagate)
{
if (!changedFace_[faceI])
if (!changedFace_[facei])
{
changedFace_[faceI] = true;
changedFaces_.append(faceI);
changedFace_[facei] = true;
changedFaces_.append(facei);
}
}
@ -495,21 +495,21 @@ faceToEdge()
forAll(changedFaces_, changedFaceI)
{
label faceI = changedFaces_[changedFaceI];
label facei = changedFaces_[changedFaceI];
if (!changedFace_[faceI])
if (!changedFace_[facei])
{
FatalErrorInFunction
<< "face " << faceI
<< "face " << facei
<< " not marked as having been changed" << nl
<< "This might be caused by multiple occurences of the same"
<< " seed edge." << abort(FatalError);
}
const Type& neighbourWallInfo = allFaceInfo_[faceI];
const Type& neighbourWallInfo = allFaceInfo_[facei];
// Evaluate all connected edges
const labelList& fEdges = patch_.faceEdges()[faceI];
const labelList& fEdges = patch_.faceEdges()[facei];
forAll(fEdges, fEdgeI)
{
@ -522,7 +522,7 @@ faceToEdge()
updateEdge
(
edgeI,
faceI,
facei,
neighbourWallInfo,
currentWallInfo
);
@ -578,15 +578,15 @@ edgeToFace()
const labelList& eFaces = edgeFaces[edgeI];
forAll(eFaces, eFaceI)
{
label faceI = eFaces[eFaceI];
label facei = eFaces[eFaceI];
Type& currentWallInfo = allFaceInfo_[faceI];
Type& currentWallInfo = allFaceInfo_[facei];
if (!currentWallInfo.equal(neighbourWallInfo, td_))
{
updateFace
(
faceI,
facei,
edgeI,
neighbourWallInfo,
currentWallInfo

2
src/meshTools/algorithms/PatchEdgeFaceWave/PatchEdgeFaceWave.H
View File

@ -142,7 +142,7 @@ class PatchEdgeFaceWave
// statistics.
bool updateFace
(
const label faceI,
const label facei,
const label neighbourEdgeI,
const Type& neighbourInfo,
Type& faceInfo

6
src/meshTools/algorithms/PatchEdgeFaceWave/patchEdgeFaceInfo.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -139,7 +139,7 @@ public:
const polyMesh& mesh,
const primitivePatch& patch,
const label edgeI,
const label faceI,
const label facei,
const patchEdgeFaceInfo& faceInfo,
const scalar tol,
TrackingData& td
@ -163,7 +163,7 @@ public:
(
const polyMesh& mesh,
const primitivePatch& patch,
const label faceI,
const label facei,
const label edgeI,
const patchEdgeFaceInfo& edgeInfo,
const scalar tol,

8
src/meshTools/algorithms/PatchEdgeFaceWave/patchEdgeFaceInfoI.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -186,7 +186,7 @@ inline bool Foam::patchEdgeFaceInfo::updateEdge
const polyMesh& mesh,
const primitivePatch& patch,
const label edgeI,
const label faceI,
const label facei,
const patchEdgeFaceInfo& faceInfo,
const scalar tol,
TrackingData& td
@ -223,14 +223,14 @@ inline bool Foam::patchEdgeFaceInfo::updateFace
(
const polyMesh& mesh,
const primitivePatch& patch,
const label faceI,
const label facei,
const label edgeI,
const patchEdgeFaceInfo& edgeInfo,
const scalar tol,
TrackingData& td
)
{
return update(patch.faceCentres()[faceI], edgeInfo, tol, td);
return update(patch.faceCentres()[facei], edgeInfo, tol, td);
}

6
src/meshTools/algorithms/PatchEdgeFaceWave/patchEdgeFaceRegion.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -120,7 +120,7 @@ public:
const polyMesh& mesh,
const indirectPrimitivePatch& patch,
const label edgeI,
const label faceI,
const label facei,
const patchEdgeFaceRegion& faceInfo,
const scalar tol,
TrackingData& td
@ -144,7 +144,7 @@ public:
(
const polyMesh& mesh,
const indirectPrimitivePatch& patch,
const label faceI,
const label facei,
const label edgeI,
const patchEdgeFaceRegion& edgeInfo,
const scalar tol,

6
src/meshTools/algorithms/PatchEdgeFaceWave/patchEdgeFaceRegionI.H
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
@ -122,7 +122,7 @@ inline bool Foam::patchEdgeFaceRegion::updateEdge
const polyMesh& mesh,
const indirectPrimitivePatch& patch,
const label edgeI,
const label faceI,
const label facei,
const patchEdgeFaceRegion& faceInfo,
const scalar tol,
TrackingData& td
@ -152,7 +152,7 @@ inline bool Foam::patchEdgeFaceRegion::updateFace
(
const polyMesh& mesh,
const indirectPrimitivePatch& patch,
const label faceI,
const label facei,
const label edgeI,
const patchEdgeFaceRegion& edgeInfo,
const scalar tol,

6
src/meshTools/algorithms/PatchEdgeFaceWave/patchEdgeFaceRegions.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -108,7 +108,7 @@ public:
const polyMesh& mesh,
const Patch& patch,
const label edgeI,
const label faceI,
const label facei,
const patchEdgeFaceRegions& faceInfo,
const scalar tol,
TrackingData& td
@ -132,7 +132,7 @@ public:
(
const polyMesh& mesh,
const Patch& patch,
const label faceI,
const label facei,
const label edgeI,
const patchEdgeFaceRegions& edgeInfo,
const scalar tol,

14
src/meshTools/algorithms/PatchEdgeFaceWave/patchEdgeFaceRegionsI.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -85,16 +85,16 @@ inline bool Foam::patchEdgeFaceRegions::updateEdge
const polyMesh& mesh,
const Patch& patch,
const label edgeI,
const label faceI,
const label facei,
const patchEdgeFaceRegions& faceInfo,
const scalar tol,
TrackingData& td
)
{
const face& f = patch.localFaces()[faceI];
const face& f = patch.localFaces()[facei];
const edge& e = patch.edges()[edgeI];
label index = findIndex(patch.faceEdges()[faceI], edgeI);
label index = findIndex(patch.faceEdges()[facei], edgeI);
bool sameOrientation = (f[index] == e.start());
// Get information in edge-order
@ -188,18 +188,18 @@ inline bool Foam::patchEdgeFaceRegions::updateFace
(
const polyMesh& mesh,
const Patch& patch,
const label faceI,
const label facei,
const label edgeI,
const patchEdgeFaceRegions& edgeInfo,
const scalar tol,
TrackingData& td
)
{
const face& f = patch.localFaces()[faceI];
const face& f = patch.localFaces()[facei];
const edge& e = patch.edges()[edgeI];
// Find starting point of edge on face.
label index0 = findIndex(patch.faceEdges()[faceI], edgeI);
label index0 = findIndex(patch.faceEdges()[facei], edgeI);
label index1 = f.fcIndex(index0);
bool sameOrientation = (f[index0] == e.start());

8
src/meshTools/algorithms/PatchEdgeFaceWave/patchPatchDist.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -156,11 +156,11 @@ void Foam::patchPatchDist::correct()
// Extract into *this
setSize(patch_.size());
nUnset_ = 0;
forAll(allFaceInfo, faceI)
forAll(allFaceInfo, facei)
{
if (allFaceInfo[faceI].valid(calc.data()))
if (allFaceInfo[facei].valid(calc.data()))
{
operator[](faceI) = Foam::sqrt(allFaceInfo[faceI].distSqr());
operator[](facei) = Foam::sqrt(allFaceInfo[facei].distSqr());
}
else
{

24
src/meshTools/algorithms/PointEdgeWave/PointEdgeWave.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -294,9 +294,9 @@ Foam::label Foam::PointEdgeWave<Type, TrackingData>::countPatchType() const
{
label nPatches = 0;
forAll(mesh_.boundaryMesh(), patchI)
forAll(mesh_.boundaryMesh(), patchi)
{
if (isA<PatchType>(mesh_.boundaryMesh()[patchI]))
if (isA<PatchType>(mesh_.boundaryMesh()[patchi]))
{
nPatches++;
}
@ -319,9 +319,9 @@ void Foam::PointEdgeWave<Type, TrackingData>::handleProcPatches()
forAll(mesh_.globalData().processorPatches(), i)
{
label patchI = mesh_.globalData().processorPatches()[i];
label patchi = mesh_.globalData().processorPatches()[i];
const processorPolyPatch& procPatch =
refCast<const processorPolyPatch>(mesh_.boundaryMesh()[patchI]);
refCast<const processorPolyPatch>(mesh_.boundaryMesh()[patchi]);
patchInfo.clear();
patchInfo.reserve(procPatch.nPoints());
@ -348,7 +348,7 @@ void Foam::PointEdgeWave<Type, TrackingData>::handleProcPatches()
//if (debug)
//{
// Pout<< "Processor patch " << patchI << ' ' << procPatch.name()
// Pout<< "Processor patch " << patchi << ' ' << procPatch.name()
// << " communicating with " << procPatch.neighbProcNo()
// << " Sending:" << patchInfo.size() << endl;
//}
@ -366,9 +366,9 @@ void Foam::PointEdgeWave<Type, TrackingData>::handleProcPatches()
forAll(mesh_.globalData().processorPatches(), i)
{
label patchI = mesh_.globalData().processorPatches()[i];
label patchi = mesh_.globalData().processorPatches()[i];
const processorPolyPatch& procPatch =
refCast<const processorPolyPatch>(mesh_.boundaryMesh()[patchI]);
refCast<const processorPolyPatch>(mesh_.boundaryMesh()[patchi]);
List<Type> patchInfo;
labelList patchPoints;
@ -380,7 +380,7 @@ void Foam::PointEdgeWave<Type, TrackingData>::handleProcPatches()
//if (debug)
//{
// Pout<< "Processor patch " << patchI << ' ' << procPatch.name()
// Pout<< "Processor patch " << patchi << ' ' << procPatch.name()
// << " communicating with " << procPatch.neighbProcNo()
// << " Received:" << patchInfo.size() << endl;
//}
@ -428,9 +428,9 @@ void Foam::PointEdgeWave<Type, TrackingData>::handleCyclicPatches()
DynamicList<label> nbrPoints;
DynamicList<label> thisPoints;
forAll(mesh_.boundaryMesh(), patchI)
forAll(mesh_.boundaryMesh(), patchi)
{
const polyPatch& patch = mesh_.boundaryMesh()[patchI];
const polyPatch& patch = mesh_.boundaryMesh()[patchi];
if (isA<cyclicPolyPatch>(patch))
{
@ -479,7 +479,7 @@ void Foam::PointEdgeWave<Type, TrackingData>::handleCyclicPatches()
//if (debug)
//{
// Pout<< "Cyclic patch " << patchI << ' ' << patch.name()
// Pout<< "Cyclic patch " << patchi << ' ' << patch.name()
// << " Changed : " << nbrInfo.size()
// << endl;
//}