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, face and processor loop index names

Browse Source
This commit is contained in:
Henry Weller
2016-04-25 12:00:53 +01:00
parent 43beb06018
commit 450728ea84
525 changed files with 6296 additions and 6296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedParticle.C
View File

@ -303,13 +303,13 @@ Foam::wallBoundedParticle::wallBoundedParticle
const polyMesh& mesh,
const vector& position,
const label celli,
const label tetFaceI,
const label tetFacei,
const label tetPtI,
const label meshEdgeStart,
const label diagEdge
)
:
particle(mesh, position, celli, tetFaceI, tetPtI),
particle(mesh, position, celli, tetFacei, tetPtI),
meshEdgeStart_(meshEdgeStart),
diagEdge_(diagEdge)
{}

2
src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedParticle.H
View File

@ -225,7 +225,7 @@ public:
const polyMesh& c,
const vector& position,
const label celli,
const label tetFaceI,
const label tetFacei,
const label tetPtI,
const label meshEdgeStart,
const label diagEdge

14
src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedParticleTemplates.C
View File

@ -42,10 +42,10 @@ void Foam::wallBoundedParticle::patchInteraction
if (!internalFace(facei_))
{
label origFaceI = facei_;
label origFacei = facei_;
label patchi = patch(facei_);
// No action taken for tetPtI_ for tetFaceI_ here, handled by
// No action taken for tetPtI_ for tetFacei_ here, handled by
// patch interaction call or later during processor transfer.
@ -66,7 +66,7 @@ void Foam::wallBoundedParticle::patchInteraction
{
// Did patch interaction model switch patches?
// Note: recalculate meshEdgeStart_, diagEdge_!
if (facei_ != origFaceI)
if (facei_ != origFacei)
{
patchi = patch(facei_);
}
@ -166,7 +166,7 @@ Foam::scalar Foam::wallBoundedParticle::trackToEdge
// check to the other internal tet on the edge.
if (mesh_.isInternalFace(tetFace()))
{
label nbrCellI =
label nbrCelli =
(
celli_ == mesh_.faceOwner()[facei_]
? mesh_.faceNeighbour()[facei_]
@ -175,13 +175,13 @@ Foam::scalar Foam::wallBoundedParticle::trackToEdge
// Check angle to nbrCell tet. Is it in the direction of the
// endposition? I.e. since volume of nbr tet is positive the
// tracking direction should be into the tet.
tetIndices nbrTi(nbrCellI, tetFaceI_, tetPtI_, mesh_);
tetIndices nbrTi(nbrCelli, tetFacei_, tetPtI_, mesh_);
if ((nbrTi.faceTri(mesh_).normal() & (endPosition-position())) < 0)
{
// Change into nbrCell. No need to change tetFace, tetPt.
//Pout<< " crossed from cell:" << celli_
// << " into " << nbrCellI << endl;
celli_ = nbrCellI;
// << " into " << nbrCelli << endl;
celli_ = nbrCelli;
patchInteraction(td, trackFraction);
}
else

20
src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.C
View File

@ -110,13 +110,13 @@ Foam::tetIndices Foam::wallBoundedStreamLine::findNearestTet
const cell& cFaces = mesh.cells()[celli];
label minFaceI = -1;
label minFacei = -1;
label minTetPtI = -1;
scalar minDistSqr = sqr(GREAT);
forAll(cFaces, cFaceI)
forAll(cFaces, cFacei)
{
label facei = cFaces[cFaceI];
label facei = cFaces[cFacei];
if (isWallPatch[facei])
{
@ -137,7 +137,7 @@ Foam::tetIndices Foam::wallBoundedStreamLine::findNearestTet
if (d2 < minDistSqr)
{
minDistSqr = d2;
minFaceI = facei;
minFacei = facei;
minTetPtI = i-1;
}
fp = nextFp;
@ -149,7 +149,7 @@ Foam::tetIndices Foam::wallBoundedStreamLine::findNearestTet
return tetIndices
(
celli,
minFaceI,
minFacei,
minTetPtI,
mesh
);
@ -589,9 +589,9 @@ void Foam::wallBoundedStreamLine::read(const dictionary& dict)
numFacesPerEdge.clear();
forAll(cFaces, cFaceI)
forAll(cFaces, cFacei)
{
label facei = cFaces[cFaceI];
label facei = cFaces[cFacei];
const face& f = mesh.faces()[facei];
forAll(f, fp)
{
@ -665,10 +665,10 @@ void Foam::wallBoundedStreamLine::write()
// processors.
label trackI = 0;
forAll(recvMap, procI)
forAll(recvMap, proci)
{
labelList& fromProc = recvMap[procI];
fromProc.setSize(globalTrackIDs.localSize(procI));
labelList& fromProc = recvMap[proci];
fromProc.setSize(globalTrackIDs.localSize(proci));
forAll(fromProc, i)
{
fromProc[i] = trackI++;

4
src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLineParticle.C
View File

@ -135,7 +135,7 @@ Foam::wallBoundedStreamLineParticle::wallBoundedStreamLineParticle
const polyMesh& mesh,
const vector& position,
const label celli,
const label tetFaceI,
const label tetFacei,
const label tetPtI,
const label meshEdgeStart,
const label diagEdge,
@ -147,7 +147,7 @@ Foam::wallBoundedStreamLineParticle::wallBoundedStreamLineParticle
mesh,
position,
celli,
tetFaceI,
tetFacei,
tetPtI,
meshEdgeStart,
diagEdge

2
src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLineParticle.H
View File

@ -161,7 +161,7 @@ public:
const polyMesh& c,
const vector& position,
const label celli,
const label tetFaceI,
const label tetFacei,
const label tetPtI,
const label meshEdgeStart,
const label diagEdge,