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

GIT: Initial commit after latest foundation merge

Browse Source
This commit is contained in:
andy
2016-04-25 11:40:48 +01:00
parent 69ae5a9a78 e5a029c187
commit fd9d801e2d
4003 changed files with 74634 additions and 37783 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
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) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
@ -181,7 +181,7 @@ void Foam::distributedTriSurfaceMesh::distributeSegment
DynamicList<segment>& allSegments,
DynamicList<label>& allSegmentMap,
List<DynamicList<label> >& sendMap
List<DynamicList<label>>& sendMap
) const
{
// 1. Fully local already handled outside. Note: retest is cheap.
@ -278,7 +278,7 @@ Foam::distributedTriSurfaceMesh::distributeSegments
// Original index of segment
DynamicList<label> dynAllSegmentMap(start.size());
// Per processor indices into allSegments to send
List<DynamicList<label> > dynSendMap(Pstream::nProcs());
List<DynamicList<label>> dynSendMap(Pstream::nProcs());
forAll(start, segmentI)
{
@ -712,7 +712,7 @@ Foam::distributedTriSurfaceMesh::calcLocalQueries
// Original index of segment
DynamicList<label> dynAllSegmentMap(centres.size());
// Per processor indices into allSegments to send
List<DynamicList<label> > dynSendMap(Pstream::nProcs());
List<DynamicList<label>> dynSendMap(Pstream::nProcs());
// Work array - whether processor bb overlaps the bounding sphere.
boolList procBbOverlaps(Pstream::nProcs());
@ -808,7 +808,7 @@ Foam::distributedTriSurfaceMesh::calcLocalQueries
// Returns a per processor a list of bounding boxes that most accurately
// describe the shape. For now just a single bounding box per processor but
// optimisation might be to determine a better fitting shape.
Foam::List<Foam::List<Foam::treeBoundBox> >
Foam::List<Foam::List<Foam::treeBoundBox>>
Foam::distributedTriSurfaceMesh::independentlyDistributedBbs
(
const triSurface& s
@ -892,7 +892,7 @@ Foam::distributedTriSurfaceMesh::independentlyDistributedBbs
// Find bounding box for all triangles on new distribution.
// Initialise to inverted box (VGREAT, -VGREAT)
List<List<treeBoundBox> > bbs(Pstream::nProcs());
List<List<treeBoundBox>> bbs(Pstream::nProcs());
forAll(bbs, procI)
{
bbs[procI].setSize(1);
@ -948,7 +948,7 @@ bool Foam::distributedTriSurfaceMesh::overlaps
triBb.max() = max(triBb.max(), p1);
triBb.max() = max(triBb.max(), p2);
//- Exact test of triangle intersecting bb
// Exact test of triangle intersecting bb
// Quick rejection. If whole bounding box of tri is outside cubeBb then
// there will be no intersection.
@ -1339,7 +1339,7 @@ Foam::distributedTriSurfaceMesh::distributedTriSurfaceMesh
if (debug)
{
Info<< "Constructed from triSurface:" << endl;
InfoInFunction << "Constructed from triSurface:" << endl;
writeStats(Info);
labelList nTris(Pstream::nProcs());
@ -1395,7 +1395,7 @@ Foam::distributedTriSurfaceMesh::distributedTriSurfaceMesh(const IOobject& io)
if (debug)
{
Info<< "Read distributedTriSurface from " << io.objectPath()
InfoInFunction << "Read distributedTriSurface from " << io.objectPath()
<< ':' << endl;
writeStats(Info);
@ -1457,7 +1457,7 @@ Foam::distributedTriSurfaceMesh::distributedTriSurfaceMesh
if (debug)
{
Info<< "Read distributedTriSurface from " << io.objectPath()
InfoInFunction << "Read distributedTriSurface from " << io.objectPath()
<< " and dictionary:" << endl;
writeStats(Info);
@ -1699,7 +1699,7 @@ void Foam::distributedTriSurfaceMesh::findLineAll
(
const pointField& start,
const pointField& end,
List<List<pointIndexHit> >& info
List<List<pointIndexHit>>& info
) const
{
// Reuse fineLine. We could modify all of findLine to do multiple
@ -2040,7 +2040,7 @@ void Foam::distributedTriSurfaceMesh::distribute
// ~~~~~~~~~~~~~~~~~~~~~~
{
List<List<treeBoundBox> > newProcBb(Pstream::nProcs());
List<List<treeBoundBox>> newProcBb(Pstream::nProcs());
switch(distType_)
{
@ -2068,13 +2068,6 @@ void Foam::distributedTriSurfaceMesh::distribute
break;
}
//if (debug)
//{
// Info<< "old bb:" << procBb_ << endl << endl;
// Info<< "new bb:" << newProcBb << endl << endl;
// Info<< "Same:" << (newProcBb == procBb_) << endl;
//}
if (newProcBb == procBb_)
{
return;
@ -2095,9 +2088,8 @@ void Foam::distributedTriSurfaceMesh::distribute
Pstream::gatherList(nTris);
Pstream::scatterList(nTris);
Info<< "distributedTriSurfaceMesh::distribute : before distribution:"
<< endl
<< "\tproc\ttris" << endl;
InfoInFunction
<< "before distribution:" << endl << "\tproc\ttris" << endl;
forAll(nTris, procI)
{
@ -2354,9 +2346,8 @@ void Foam::distributedTriSurfaceMesh::distribute
Pstream::gatherList(nTris);
Pstream::scatterList(nTris);
Info<< "distributedTriSurfaceMesh::distribute : after distribution:"
<< endl
<< "\tproc\ttris" << endl;
InfoInFunction
<< "after distribution:" << endl << "\tproc\ttris" << endl;
forAll(nTris, procI)
{
@ -2381,7 +2372,6 @@ void Foam::distributedTriSurfaceMesh::distribute
}
//- Write using given format, version and compression
bool Foam::distributedTriSurfaceMesh::writeObject
(
IOstream::streamFormat fmt,