This commit is contained in:
Hrvoje Jasak 2011-03-11 16:33:04 +00:00
parent fd95610120
commit 7ba2ddce9f
7 changed files with 24 additions and 21 deletions

View file

@ -59,7 +59,7 @@ bool Foam::matchPoints
SortableList<scalar> pts1MagSqr(magSqr(pts1 - compareOrigin));
forAll(pts0MagSqr, i)
forAll (pts0MagSqr, i)
{
scalar dist0 = pts0MagSqr[i];
@ -90,6 +90,7 @@ bool Foam::matchPoints
)
{
label faceI = pts1MagSqr.indices()[j];
// Compare actual vectors
scalar distSqr = magSqr(pts0[face0I] - pts1[faceI]);

View file

@ -506,8 +506,10 @@ Foam::polyMesh::polyMesh
if (!found)
{
FatalErrorIn("polyMesh::polyMesh(... construct from shapes...)")
<< "face " << faceI << " of patch " << patchI
FatalErrorIn
(
"polyMesh::polyMesh(... construct from shapes...)"
) << "face " << faceI << " of patch " << patchI
<< " does not seem to belong to cell " << cellInside
<< " which, according to the addressing, "
<< "should be next to it."

View file

@ -136,9 +136,9 @@ bool cohesivePolyPatch::order
}
label oldFacesStartIndex = -1;
for(label i=0; i<topoFaceMap.size(); i=i+2)
for (label i = 0; i < topoFaceMap.size(); i += 2)
{
if(topoFaceMap[i+1]-topoFaceMap[i] == 1)
if (topoFaceMap[i + 1] - topoFaceMap[i] == 1)
{
oldFacesStartIndex = i;
break;
@ -146,10 +146,10 @@ bool cohesivePolyPatch::order
}
label oldFacesSize = 0;
if(oldFacesStartIndex != -1)
if (oldFacesStartIndex != -1)
{
oldFacesSize = oldFacesSize + 2;
for (label i = oldFacesStartIndex+2; i < topoFaceMap.size(); i += 2)
for (label i = oldFacesStartIndex + 2; i < topoFaceMap.size(); i += 2)
{
oldFacesSize += 2*(topoFaceMap[i + 1]-topoFaceMap[i]);
}
@ -164,7 +164,7 @@ bool cohesivePolyPatch::order
// Calculate normals
vectorField normals(pp.size());
forAll(pp, faceI)
forAll (pp, faceI)
{
normals[faceI] = pp[faceI].normal(pp.points());
}
@ -176,7 +176,7 @@ bool cohesivePolyPatch::order
label sizeByTwo = oldFacesSize/2;
if(oldFacesStartIndex != -1)
if (oldFacesStartIndex != -1)
{
for
(
@ -189,7 +189,7 @@ bool cohesivePolyPatch::order
half1ToPatch[n1Faces++] = i + sizeByTwo;
}
for (label i=0; i<oldFacesStartIndex; i += 2)
for (label i = 0; i < oldFacesStartIndex; i += 2)
{
half0ToPatch[n0Faces++] = i;
half1ToPatch[n1Faces++] = i + 1;
@ -199,7 +199,7 @@ bool cohesivePolyPatch::order
(
label i=oldFacesStartIndex+oldFacesSize;
i<topoFaceMap.size();
i=i+2
i = i + 2
)
{
half0ToPatch[n0Faces++] = i;
@ -210,9 +210,9 @@ bool cohesivePolyPatch::order
{
for
(
label i=0;
i<topoFaceMap.size();
i=i+2
label i = 0;
i < topoFaceMap.size();
i += 2
)
{
half0ToPatch[n0Faces++] = i;
@ -259,7 +259,7 @@ bool cohesivePolyPatch::order
faceMap[patchFaceI] = half0ToPatch.size() + faceI;
}
forAll(faceMap, faceI)
forAll (faceMap, faceI)
{
if (faceMap[faceI] != faceI)
{

View file

@ -256,6 +256,7 @@ Foam::scalarField Foam::polyPatch::calcFaceTol
tols[faceI] = matchTol_*maxLen;
}
return tols;
}

View file

@ -751,7 +751,6 @@ bool Foam::primitiveMesh::checkFaceSkewness
{
Info<< " ***Max skewness = " << maxSkew
<< ", " << nWarnSkew << " highly skew faces detected"
<< " which may impair the quality of the results"
<< " Threshold = " << skewThreshold_
<< endl;
}