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' into cvm

Browse Source 
Conflicts:
	src/OpenFOAM/meshes/boundBox/boundBox.H
This commit is contained in:
graham
2011-01-05 11:53:37 +00:00
parent 50b1ae648d 2e1e671d96
commit 8c04b4e692
5860 changed files with 15156 additions and 11933 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
\\ / A nd | Copyright (C) 1991-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -63,6 +63,7 @@ namespace Foam
};
}
const Foam::NamedEnum<Foam::distributedTriSurfaceMesh::distributionType, 3>
Foam::distributedTriSurfaceMesh::distributionTypeNames_;
@ -871,18 +872,13 @@ Foam::distributedTriSurfaceMesh::independentlyDistributedBbs
point& bbMin = bbs[distribution[triI]][0].min();
point& bbMax = bbs[distribution[triI]][0].max();
const labelledTri& f = s[triI];
const point& p0 = s.points()[f[0]];
const point& p1 = s.points()[f[1]];
const point& p2 = s.points()[f[2]];
bbMin = min(bbMin, p0);
bbMin = min(bbMin, p1);
bbMin = min(bbMin, p2);
bbMax = max(bbMax, p0);
bbMax = max(bbMax, p1);
bbMax = max(bbMax, p2);
const triSurface::FaceType& f = s[triI];
forAll(f, fp)
{
const point& pt = s.points()[f[fp]];
bbMin = ::Foam::min(bbMin, pt);
bbMax = ::Foam::max(bbMax, pt);
}
}
// Now combine for all processors and convert to correct format.
@ -971,12 +967,12 @@ void Foam::distributedTriSurfaceMesh::subsetMeshMap
// Store new faces compact
newToOldFaces[faceI++] = oldFacei;
// Renumber labels for triangle
const labelledTri& tri = s[oldFacei];
// Renumber labels for face
const triSurface::FaceType& f = s[oldFacei];
forAll(tri, fp)
forAll(f, fp)
{
label oldPointI = tri[fp];
label oldPointI = f[fp];
if (oldToNewPoints[oldPointI] == -1)
{
@ -1090,12 +1086,12 @@ Foam::triSurface Foam::distributedTriSurfaceMesh::subsetMesh
{
if (include[oldFacei])
{
// Renumber labels for triangle
const labelledTri& tri = s[oldFacei];
// Renumber labels for face
const triSurface::FaceType& f = s[oldFacei];
forAll(tri, fp)
forAll(f, fp)
{
label oldPointI = tri[fp];
label oldPointI = f[fp];
if (oldToNewPoints[oldPointI] == -1)
{

2
src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
\\ / A nd | Copyright (C) 1991-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License

2
src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMeshTemplates.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
\\ / A nd | Copyright (C) 1991-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License