diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C index 79a79c388317fb002c0da258e1f22279f0c6eca3..9bc2512f58eb0bf48d108b1bc4ff952795c3d93d 100644 --- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C +++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C @@ -41,10 +41,10 @@ void Foam::conformalVoronoiMesh::conformToSurface() { reconformationMode reconfMode = reconformationControl(); - if (Pstream::parRun()) - { - seedProcessorBoundarySurfaces(true); - } +// if (Pstream::parRun()) +// { +// seedProcessorBoundarySurfaces(true); +// } if (reconfMode == rmNone) { @@ -74,15 +74,15 @@ void Foam::conformalVoronoiMesh::conformToSurface() storeSurfaceConformation(); } - if (Pstream::parRun()) - { - label nFarPoints = removeProcessorBoundarySeeds(true); - - reduce(nFarPoints, sumOp<label>()); - - Info<< " Removed " << nFarPoints - << " far points from the mesh." << endl; - } +// if (Pstream::parRun()) +// { +// label nFarPoints = removeProcessorBoundarySeeds(true); +// +// reduce(nFarPoints, sumOp<label>()); +// +// Info<< " Removed " << nFarPoints +// << " far points from the mesh." << endl; +// } // reportSurfaceConformationQuality(); } @@ -915,7 +915,7 @@ void Foam::conformalVoronoiMesh::seedProcessorBoundarySurfaces label nFarPoints = 0; - const scalar normalDistance = 5.0; + const scalar normalDistance = 2.0; const scalar pert = 0.1*(rndGen_.scalar01() - 0.5); forAll(bMesh, patchI) @@ -1465,7 +1465,7 @@ void Foam::conformalVoronoiMesh::buildParallelInterfaceInfluence label cIInner = 0; label cIOuter = 0; -// seedProcessorBoundarySurfaces(true); + seedProcessorBoundarySurfaces(true); label cellIndexCount = 0; for @@ -1530,7 +1530,7 @@ void Foam::conformalVoronoiMesh::buildParallelInterfaceInfluence if ( (testCellInfluence[cit->cellIndex()] == 0) - //&& (cit->real() || cit->hasFarPoint()) + && (cit->real() || cit->hasFarPoint()) ) { const Foam::point& cc = cit->dual(); @@ -1553,15 +1553,18 @@ void Foam::conformalVoronoiMesh::buildParallelInterfaceInfluence timeCheck("End of testing cell influence"); - Pout<< "Number of quick rejections = " << nQuickRejections << endl; +// Pout<< "Number of quick rejections = " << nQuickRejections << endl; Pout<< "Number of influences = " << circumcentre.size() << endl; // Increasing the circumspheres to increase the overlaps and compensate for // floating point errors missing some referrals labelListList circumsphereOverlaps - ( - overlapsProc(circumcentre, sqr(1.01)*circumradiusSqr) - ); + = decomposition_().overlapsProcessors + ( + circumcentre, + sqr(1.01)*circumradiusSqr, + false + ); timeCheck("End of increasing overlaps"); @@ -1624,13 +1627,12 @@ void Foam::conformalVoronoiMesh::buildParallelInterfaceInfluence cIOuter++; } + label nFarPoints = removeProcessorBoundarySeeds(true); -// label nFarPoints = removeProcessorBoundarySeeds(true); -// -// reduce(nFarPoints, sumOp<label>()); -// -// Info<< " Removed " << nFarPoints -// << " far points from the mesh." << endl; + reduce(nFarPoints, sumOp<label>()); + + Info<< " Removed " << nFarPoints + << " far points from the mesh." << endl; // seedProcessorBoundarySurfaces(false); @@ -1745,6 +1747,8 @@ void Foam::conformalVoronoiMesh::referVertices timeCheck("Start of referVertices " + stageName + " insertion."); + label inserted = 0; + for (label procI = 0; procI < Pstream::nProcs(); procI++) { const labelList& constructMap = pointMap.constructMap()[procI]; @@ -1774,12 +1778,18 @@ void Foam::conformalVoronoiMesh::referVertices encodedProcI ); + inserted++; + receivedVertices[procI].insert(origIndex); } } } } + reduce(inserted, sumOp<label>()); + + Info<< " Inserted " << stageName << " vertices " << inserted << endl; + Info<< " Total " << stageName << " vertices " << totalVertices << endl; timeCheck("End of referVertices " + stageName);