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

View file

@ -59,7 +59,7 @@ bool Foam::matchPoints
SortableList<scalar> pts1MagSqr(magSqr(pts1 - compareOrigin)); SortableList<scalar> pts1MagSqr(magSqr(pts1 - compareOrigin));
forAll(pts0MagSqr, i) forAll (pts0MagSqr, i)
{ {
scalar dist0 = pts0MagSqr[i]; scalar dist0 = pts0MagSqr[i];
@ -78,7 +78,7 @@ bool Foam::matchPoints
// Go through range of equal mag and find nearest vector. // Go through range of equal mag and find nearest vector.
scalar minDistSqr = VGREAT; scalar minDistSqr = VGREAT;
label minFaceI = -1; label minFaceI = -1;
for for
( (
label j = startI; label j = startI;
@ -90,6 +90,7 @@ bool Foam::matchPoints
) )
{ {
label faceI = pts1MagSqr.indices()[j]; label faceI = pts1MagSqr.indices()[j];
// Compare actual vectors // Compare actual vectors
scalar distSqr = magSqr(pts0[face0I] - pts1[faceI]); scalar distSqr = magSqr(pts0[face0I] - pts1[faceI]);

View file

@ -27,9 +27,9 @@ Class
Description Description
Various mesh related information for a parallel run. Upon construction Various mesh related information for a parallel run. Upon construction
constructs all info by using parallel communication. constructs all info by using parallel communication.
Requires: Requires:
- all processor patches to have correct ordering. - all processor patches to have correct ordering.
- all processorPatches to have their transforms set ('makeTransforms') - all processorPatches to have their transforms set ('makeTransforms')
@ -148,7 +148,7 @@ class globalMeshData
// Processor patch addressing (be careful if not running in parallel!) // Processor patch addressing (be careful if not running in parallel!)
//- List of processor patch labels //- List of processor patch labels
// (size of list = number of processor patches) // (size of list = number of processor patches)
labelList processorPatches_; labelList processorPatches_;

View file

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

View file

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

View file

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

View file

@ -80,7 +80,7 @@ calcMeshData() const
// In <= 1.5 the meshPoints would be in increasing order but this gives // In <= 1.5 the meshPoints would be in increasing order but this gives
// problems in processor point synchronisation where we have to find out // problems in processor point synchronisation where we have to find out
// how the opposite side would have allocated points. // how the opposite side would have allocated points.
// Note: // Note:
// ~~~~~ // ~~~~~
// This is all garbage. All -ext versions will preserve strong ordering // This is all garbage. All -ext versions will preserve strong ordering

View file

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