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

Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev

Browse Source
This commit is contained in:
andy
2013-04-05 11:37:32 +01:00
parent 26c2c3f627 fcf165f8f2
commit 5a62444c6a
8 changed files with 90 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchTools.H
View File

@ -254,8 +254,8 @@ public:
);
//- Gather points and faces onto master and merge (geometrically) into
// single patch.
//- Gather points and faces onto master and merge into single patch.
// Note: uses faces/points, not localFaces/localPoints.
template
<
class Face,

7
src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsGatherAndMerge.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -52,7 +52,8 @@ void Foam::PatchTools::gatherAndMerge
labelList pointSizes;
{
List<Field<PointType> > gatheredPoints(Pstream::nProcs());
gatheredPoints[Pstream::myProcNo()] = p.localPoints();
gatheredPoints[Pstream::myProcNo()] = p.points();
Pstream::gatherList(gatheredPoints);
if (Pstream::master())
@ -75,7 +76,7 @@ void Foam::PatchTools::gatherAndMerge
// gathered points
{
List<List<Face> > gatheredFaces(Pstream::nProcs());
gatheredFaces[Pstream::myProcNo()] = p.localFaces();
gatheredFaces[Pstream::myProcNo()] = p;
Pstream::gatherList(gatheredFaces);
if (Pstream::master())

19
src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C
View File

@ -1529,13 +1529,18 @@ void Foam::autoSnapDriver::doSnap
if (!meshOk)
{
Info<< "Did not succesfully snap mesh. Giving up."
<< nl << endl;
// Use current mesh as base mesh
meshMover.correct();
break;
WarningIn("autoSnapDriver::doSnap(..)")
<< "Did not succesfully snap mesh."
<< " Continuing to snap to resolve easy surfaces but the"
<< " resulting mesh will not satisfy your quality"
<< " constraints" << nl << endl;
//Info<< "Did not succesfully snap mesh. Giving up."
// << nl << endl;
//
//// Use current mesh as base mesh
//meshMover.correct();
//
//break;
}
if (debug&meshRefinement::MESH)