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

ENH: Parallel reduce size of sets and numbers.

Browse Source
This commit is contained in:
graham
2011-07-05 15:43:29 +01:00
parent 471a6becc1
commit 3598a450fb
2 changed files with 31 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
View File

@ -1110,7 +1110,7 @@ Foam::conformalVoronoiMesh::collapseFace
// Output face and collapse axis for visualisation // Output face and collapse axis for visualisation
Info<< "# Aspect ratio = " << aspectRatio << nl Pout<< "# Aspect ratio = " << aspectRatio << nl
<< "# inertia = " << J << nl << "# inertia = " << J << nl
<< "# determinant = " << detJ << nl << "# determinant = " << detJ << nl
<< "# eigenvalues = " << eigenValues(J) << nl << "# eigenvalues = " << eigenValues(J) << nl
@ -1120,17 +1120,17 @@ Foam::conformalVoronoiMesh::collapseFace
forAll(f, fPtI) forAll(f, fPtI)
{ {
meshTools::writeOBJ(Info, pts[f[fPtI]]); meshTools::writeOBJ(Pout, pts[f[fPtI]]);
} }
Info<< "f"; Pout<< "f";
forAll(f, fPtI) forAll(f, fPtI)
{ {
Info << " " << fPtI + 1; Pout << " " << fPtI + 1;
} }
Info<< endl; Pout<< endl;
return fcmNone; return fcmNone;
} }
@ -1402,7 +1402,7 @@ Foam::conformalVoronoiMesh::collapseFace
// { // {
// // Output face and collapse axis for visualisation // // Output face and collapse axis for visualisation
// Info<< "# Aspect ratio = " << aspectRatio << nl // Pout<< "# Aspect ratio = " << aspectRatio << nl
// << "# determinant = " << detJ << nl // << "# determinant = " << detJ << nl
// << "# collapseAxis = " << collapseAxis << nl // << "# collapseAxis = " << collapseAxis << nl
// << "# mode = " << mode << nl // << "# mode = " << mode << nl
@ -1412,33 +1412,33 @@ Foam::conformalVoronoiMesh::collapseFace
// scalar scale = 2.0*mag(fC - pts[f[0]]); // scalar scale = 2.0*mag(fC - pts[f[0]]);
// meshTools::writeOBJ(Info, fC); // meshTools::writeOBJ(Pout, fC);
// meshTools::writeOBJ(Info, fC + scale*collapseAxis); // meshTools::writeOBJ(Pout, fC + scale*collapseAxis);
// Info<< "f 1 2" << endl; // Pout<< "f 1 2" << endl;
// forAll(f, fPtI) // forAll(f, fPtI)
// { // {
// meshTools::writeOBJ(Info, pts[f[fPtI]]); // meshTools::writeOBJ(Pout, pts[f[fPtI]]);
// } // }
// Info<< "f"; // Pout<< "f";
// forAll(f, fPtI) // forAll(f, fPtI)
// { // {
// Info << " " << fPtI + 3; // Pout << " " << fPtI + 3;
// } // }
// Info<< nl << "# " << d << endl; // Pout<< nl << "# " << d << endl;
// Info<< "# " << d.first() << " " << d.last() << endl; // Pout<< "# " << d.first() << " " << d.last() << endl;
// forAll(d, dI) // forAll(d, dI)
// { // {
// meshTools::writeOBJ(Info, fC + (d[dI] - dShift)*collapseAxis); // meshTools::writeOBJ(Pout, fC + (d[dI] - dShift)*collapseAxis);
// } // }
// Info<< endl; // Pout<< endl;
// } // }
return mode; return mode;
@ -1490,7 +1490,7 @@ void Foam::conformalVoronoiMesh::deferredCollapseFaceSet
} }
} }
Info<< "facesToCollapse" << nl << faceLabels << endl; Pout<< "facesToCollapse" << nl << faceLabels << endl;
} }
@ -1632,7 +1632,8 @@ Foam::labelHashSet Foam::conformalVoronoiMesh::checkPolyMeshQuality
if (checkFaces.size() < fAreas.size()) if (checkFaces.size() < fAreas.size())
{ {
Info<< "Excluding " << fAreas.size() - checkFaces.size() Info<< "Excluding "
<< returnReduce(fAreas.size() - checkFaces.size(), sumOp<label>())
<< " faces from check, < " << faceAreaLimit << " area" << endl; << " faces from check, < " << faceAreaLimit << " area" << endl;
} }
@ -1655,7 +1656,7 @@ Foam::labelHashSet Foam::conformalVoronoiMesh::checkPolyMeshQuality
{ {
if (cells[cI].size() < 4 && cells[cI].size() > 0) if (cells[cI].size() < 4 && cells[cI].size() > 0)
{ {
// Info<< "cell " << cI << " " << cells[cI] // Pout<< "cell " << cI << " " << cells[cI]
// << " has " << cells[cI].size() << " faces." // << " has " << cells[cI].size() << " faces."
// << endl; // << endl;
@ -1669,7 +1670,8 @@ Foam::labelHashSet Foam::conformalVoronoiMesh::checkPolyMeshQuality
} }
Info<< " cells with more than 1 but fewer than 4 faces : " Info<< " cells with more than 1 but fewer than 4 faces : "
<< nInvalidPolyhedra << endl; << returnReduce(nInvalidPolyhedra, sumOp<label>())
<< endl;
// Check for cells with one internal face only // Check for cells with one internal face only
@ -1712,7 +1714,8 @@ Foam::labelHashSet Foam::conformalVoronoiMesh::checkPolyMeshQuality
} }
Info<< " cells with with zero or one non-boundary face : " Info<< " cells with with zero or one non-boundary face : "
<< oneInternalFaceCells << endl; << returnReduce(oneInternalFaceCells, sumOp<label>())
<< endl;
} }
@ -1795,7 +1798,7 @@ Foam::labelHashSet Foam::conformalVoronoiMesh::checkPolyMeshQuality
} }
Info<< nl << "Maximum number of filter limits applied: " Info<< nl << "Maximum number of filter limits applied: "
<< maxFilterCount << endl; << returnReduce(maxFilterCount, maxOp<label>()) << endl;
return wrongFaces; return wrongFaces;
} }
@ -2489,7 +2492,9 @@ void Foam::conformalVoronoiMesh::removeUnusedPoints
inplaceReorder(oldToNew, pts); inplaceReorder(oldToNew, pts);
Info<< " Removing " << pts.size() - pointI << " unused points" Info<< " Removing "
<< returnReduce(pts.size() - pointI, sumOp<label>())
<< " unused points"
<< endl; << endl;
pts.setSize(pointI); pts.setSize(pointI);

5
src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
View File

@ -696,9 +696,10 @@ void Foam::conformalVoronoiMesh::findRemainingProtrusionSet
} }
} }
if (!protrudingCells.empty()) if (returnReduce(protrudingCells.size(), sumOp<label>()) > 0)
{ {
Pout<< nl << "Found " << protrudingCells.size() Info<< nl << "Found "
<< returnReduce(protrudingCells.size(), sumOp<label>())
<< " cells protruding from the surface, writing cellSet " << " cells protruding from the surface, writing cellSet "
<< protrudingCells.name() << protrudingCells.name()
<< endl; << endl;