mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
COMP: moved distributedTriSurfaceMesh to break cyclic dependency
structuredDecomp uses finiteVolume which uses meshTools which used to use decompositionMethods
This commit is contained in:
mattijs
10
src/parallel/Allwmake
Executable file
10
src/parallel/Allwmake
Executable file
@ -0,0 +1,10 @@
|
||||
#!/bin/sh
|
||||
cd ${0%/*} || exit 1 # run from this directory
|
||||
set -x
|
||||
|
||||
decompose/Allwmake
|
||||
reconstruct/Allwmake
|
||||
wmake libso distributed
|
||||
|
||||
|
||||
# ----------------------------------------------------------------- end-of-file
|
||||
3
src/parallel/distributed/Make/files
Normal file
3
src/parallel/distributed/Make/files
Normal file
@ -0,0 +1,3 @@
|
||||
distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
|
||||
|
||||
LIB = $(FOAM_LIBBIN)/libdistributed
|
||||
9
src/parallel/distributed/Make/options
Normal file
9
src/parallel/distributed/Make/options
Normal file
@ -0,0 +1,9 @@
|
||||
EXE_INC = \
|
||||
-I$(LIB_SRC)/triSurface/lnInclude \
|
||||
-I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
|
||||
-I$(LIB_SRC)/meshTools/lnInclude
|
||||
|
||||
LIB_LIBS = \
|
||||
-ltriSurface \
|
||||
-ldecompositionMethods \
|
||||
-lmeshTools
|
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,473 @@
|
||||
/*---------------------------------------------------------------------------*\
|
||||
========= |
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration |
|
||||
\\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
This file is part of OpenFOAM.
|
||||
|
||||
OpenFOAM is free software: you can redistribute it and/or modify it
|
||||
under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
|
||||
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
Class
|
||||
Foam::distributedTriSurfaceMesh
|
||||
|
||||
Description
|
||||
IOoject and searching on distributed triSurface. All processor hold
|
||||
(possibly overlapping) part of the overall surface. All queries are
|
||||
distributed to the processor that can answer it and the result sent back.
|
||||
|
||||
Can work in three modes:
|
||||
- follow : makes sure each processor has all the triangles inside the
|
||||
externally provided bounding box (usually the mesh bounding box).
|
||||
Guarantees minimum amount of communication since mesh-local queries
|
||||
should be answerable without any comms.
|
||||
- independent : surface is decomposed according to the triangle centres
|
||||
so the decomposition might be radically different from the mesh
|
||||
decomposition. Guarantees best memory balance but at the expense of
|
||||
more communication.
|
||||
- frozen : no change
|
||||
|
||||
SourceFiles
|
||||
distributedTriSurfaceMesh.C
|
||||
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#ifndef distributedTriSurfaceMesh_H
|
||||
#define distributedTriSurfaceMesh_H
|
||||
|
||||
#include "triSurfaceMesh.H"
|
||||
#include "IOdictionary.H"
|
||||
#include "Pair.H"
|
||||
#include "globalIndex.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
namespace Foam
|
||||
{
|
||||
|
||||
class mapDistribute;
|
||||
class decompositionMethod;
|
||||
|
||||
// Typedefs
|
||||
typedef Pair<point> segment;
|
||||
template<>
|
||||
inline bool contiguous<segment>() {return contiguous<point>();}
|
||||
|
||||
|
||||
/*---------------------------------------------------------------------------*\
|
||||
Class distributedTriSurfaceMesh Declaration
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
class distributedTriSurfaceMesh
|
||||
:
|
||||
public triSurfaceMesh
|
||||
{
|
||||
public:
|
||||
|
||||
// Static data
|
||||
|
||||
enum distributionType
|
||||
{
|
||||
FOLLOW = 0,
|
||||
INDEPENDENT = 1,
|
||||
FROZEN = 2
|
||||
};
|
||||
|
||||
static const NamedEnum<distributionType, 3> distributionTypeNames_;
|
||||
|
||||
private:
|
||||
|
||||
// Private member data
|
||||
|
||||
//- Merging distance
|
||||
scalar mergeDist_;
|
||||
|
||||
//- Decomposition used when independently decomposing surface.
|
||||
autoPtr<decompositionMethod> decomposer_;
|
||||
|
||||
//- Bounding box settings
|
||||
IOdictionary dict_;
|
||||
|
||||
//- bounding boxes of all processors
|
||||
List<List<treeBoundBox> > procBb_;
|
||||
|
||||
//- Global triangle numbering
|
||||
mutable autoPtr<globalIndex> globalTris_;
|
||||
|
||||
//- The distribution type.
|
||||
distributionType distType_;
|
||||
|
||||
|
||||
// Private Member Functions
|
||||
|
||||
// Read
|
||||
|
||||
//- Read my additional data
|
||||
bool read();
|
||||
|
||||
|
||||
// Line intersection
|
||||
|
||||
static bool isLocal
|
||||
(
|
||||
const List<treeBoundBox>& myBbs,
|
||||
const point& start,
|
||||
const point& end
|
||||
);
|
||||
|
||||
//- Split segment into subsegments overlapping the processor
|
||||
// bounding box.
|
||||
//void Foam::distributedTriSurfaceMesh::splitSegment
|
||||
//(
|
||||
// const label segmentI,
|
||||
// const point& start,
|
||||
// const point& end,
|
||||
// const treeBoundBox& bb,
|
||||
//
|
||||
// DynamicList<segment>& allSegments,
|
||||
// DynamicList<label>& allSegmentMap,
|
||||
// DynamicList<label> sendMap
|
||||
//) const
|
||||
|
||||
//- Distribute segments into overlapping processor
|
||||
// bounding boxes. Sort per processor.
|
||||
void distributeSegment
|
||||
(
|
||||
const label,
|
||||
const point& start,
|
||||
const point& end,
|
||||
|
||||
DynamicList<segment>&,
|
||||
DynamicList<label>&,
|
||||
List<DynamicList<label> >&
|
||||
) const;
|
||||
|
||||
//- Divide edges into local and remote segments. Construct map to
|
||||
// distribute and collect data.
|
||||
autoPtr<mapDistribute> distributeSegments
|
||||
(
|
||||
const pointField& start,
|
||||
const pointField& end,
|
||||
|
||||
List<segment>& allSegments,
|
||||
List<label>& allSegmentMap
|
||||
) const;
|
||||
|
||||
//- Split edges, distribute, test and collect.
|
||||
void findLine
|
||||
(
|
||||
const bool nearestIntersection,
|
||||
const pointField& start,
|
||||
const pointField& end,
|
||||
List<pointIndexHit>& info
|
||||
) const;
|
||||
|
||||
|
||||
// Triangle index
|
||||
|
||||
//- Obtains global indices from pointIndexHit and swaps them back
|
||||
// to their original processor. Used to calculate local region
|
||||
// and normal.
|
||||
autoPtr<mapDistribute> calcLocalQueries
|
||||
(
|
||||
const List<pointIndexHit>&,
|
||||
labelList& triangleIndex
|
||||
) const;
|
||||
|
||||
|
||||
// Nearest
|
||||
|
||||
label calcOverlappingProcs
|
||||
(
|
||||
const point& centre,
|
||||
const scalar radiusSqr,
|
||||
boolList& overlaps
|
||||
) const;
|
||||
|
||||
autoPtr<mapDistribute> calcLocalQueries
|
||||
(
|
||||
const pointField& centres,
|
||||
const scalarField& radiusSqr,
|
||||
|
||||
pointField& allCentres,
|
||||
scalarField& allRadiusSqr,
|
||||
labelList& allSegmentMap
|
||||
) const;
|
||||
|
||||
|
||||
// Surface redistribution
|
||||
|
||||
//- Finds new bounds based on an indepedent decomposition.
|
||||
List<List<treeBoundBox> > independentlyDistributedBbs
|
||||
(
|
||||
const triSurface&
|
||||
);
|
||||
|
||||
//- Does any part of triangle overlap bb.
|
||||
static bool overlaps
|
||||
(
|
||||
const List<treeBoundBox>& bb,
|
||||
const point& p0,
|
||||
const point& p1,
|
||||
const point& p2
|
||||
);
|
||||
|
||||
//- Find points used in subset
|
||||
static void subsetMeshMap
|
||||
(
|
||||
const triSurface& s,
|
||||
const boolList& include,
|
||||
const label nIncluded,
|
||||
labelList& newToOldPoints,
|
||||
labelList& oldToNewPoints,
|
||||
labelList& newToOldFaces
|
||||
);
|
||||
|
||||
//- Construct subsetted surface
|
||||
static triSurface subsetMesh
|
||||
(
|
||||
const triSurface& s,
|
||||
const labelList& newToOldPoints,
|
||||
const labelList& oldToNewPoints,
|
||||
const labelList& newToOldFaces
|
||||
);
|
||||
|
||||
//- Subset given marked faces
|
||||
static triSurface subsetMesh
|
||||
(
|
||||
const triSurface& s,
|
||||
const boolList& include,
|
||||
labelList& newToOldPoints,
|
||||
labelList& newToOldFaces
|
||||
);
|
||||
|
||||
//- Subset given marked faces
|
||||
static triSurface subsetMesh
|
||||
(
|
||||
const triSurface& s,
|
||||
const labelList& newToOldFaces,
|
||||
labelList& newToOldPoints
|
||||
);
|
||||
|
||||
//- Find triangle otherF in allFaces.
|
||||
static label findTriangle
|
||||
(
|
||||
const List<labelledTri>& allFaces,
|
||||
const labelListList& allPointFaces,
|
||||
const labelledTri& otherF
|
||||
);
|
||||
|
||||
//- Merge triSurface (subTris, subPoints) into allTris, allPoints.
|
||||
static void merge
|
||||
(
|
||||
const scalar mergeDist,
|
||||
const List<labelledTri>& subTris,
|
||||
const pointField& subPoints,
|
||||
|
||||
List<labelledTri>& allTris,
|
||||
pointField& allPoints,
|
||||
|
||||
labelList& faceConstructMap,
|
||||
labelList& pointConstructMap
|
||||
);
|
||||
|
||||
//- Distribute stored fields
|
||||
template<class Type>
|
||||
void distributeFields(const mapDistribute& map);
|
||||
|
||||
|
||||
//- Disallow default bitwise copy construct
|
||||
distributedTriSurfaceMesh(const distributedTriSurfaceMesh&);
|
||||
|
||||
//- Disallow default bitwise assignment
|
||||
void operator=(const distributedTriSurfaceMesh&);
|
||||
|
||||
|
||||
public:
|
||||
|
||||
//- Runtime type information
|
||||
TypeName("distributedTriSurfaceMesh");
|
||||
|
||||
|
||||
// Constructors
|
||||
|
||||
//- Construct from triSurface
|
||||
distributedTriSurfaceMesh
|
||||
(
|
||||
const IOobject&,
|
||||
const triSurface&,
|
||||
const dictionary& dict
|
||||
);
|
||||
|
||||
//- Construct read. Does findInstance to find io.local().
|
||||
distributedTriSurfaceMesh(const IOobject& io);
|
||||
|
||||
//- Construct from dictionary (used by searchableSurface).
|
||||
// Does read. Does findInstance to find io.local().
|
||||
distributedTriSurfaceMesh
|
||||
(
|
||||
const IOobject& io,
|
||||
const dictionary& dict
|
||||
);
|
||||
|
||||
|
||||
//- Destructor
|
||||
virtual ~distributedTriSurfaceMesh();
|
||||
|
||||
//- Clear storage
|
||||
void clearOut();
|
||||
|
||||
|
||||
// Member Functions
|
||||
|
||||
//- Triangle indexing (demand driven)
|
||||
const globalIndex& globalTris() const;
|
||||
|
||||
|
||||
// searchableSurface implementation
|
||||
|
||||
//- Whether supports volume type below. I.e. whether is closed.
|
||||
// Not supported.
|
||||
virtual bool hasVolumeType() const
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
//- Range of global indices that can be returned.
|
||||
virtual label globalSize() const
|
||||
{
|
||||
return globalTris().size();
|
||||
}
|
||||
|
||||
virtual void findNearest
|
||||
(
|
||||
const pointField& sample,
|
||||
const scalarField& nearestDistSqr,
|
||||
List<pointIndexHit>&
|
||||
) const;
|
||||
|
||||
virtual void findLine
|
||||
(
|
||||
const pointField& start,
|
||||
const pointField& end,
|
||||
List<pointIndexHit>&
|
||||
) const;
|
||||
|
||||
virtual void findLineAny
|
||||
(
|
||||
const pointField& start,
|
||||
const pointField& end,
|
||||
List<pointIndexHit>&
|
||||
) const;
|
||||
|
||||
//- Get all intersections in order from start to end.
|
||||
virtual void findLineAll
|
||||
(
|
||||
const pointField& start,
|
||||
const pointField& end,
|
||||
List<List<pointIndexHit> >&
|
||||
) const;
|
||||
|
||||
//- From a set of points and indices get the region
|
||||
virtual void getRegion
|
||||
(
|
||||
const List<pointIndexHit>&,
|
||||
labelList& region
|
||||
) const;
|
||||
|
||||
//- From a set of points and indices get the normal
|
||||
virtual void getNormal
|
||||
(
|
||||
const List<pointIndexHit>&,
|
||||
vectorField& normal
|
||||
) const;
|
||||
|
||||
//- Determine type (inside/outside/mixed) for point. unknown if
|
||||
// cannot be determined (e.g. non-manifold surface)
|
||||
virtual void getVolumeType
|
||||
(
|
||||
const pointField&,
|
||||
List<volumeType>&
|
||||
) const;
|
||||
|
||||
//- Set bounds of surface. Bounds currently set as list of
|
||||
// bounding boxes. Will do redistribution of surface to locally
|
||||
// have all triangles overlapping bounds.
|
||||
// Larger bounds: more triangles (memory), more fully local tests
|
||||
// (quick).
|
||||
// keepNonLocal = true : keep triangles that do not overlap
|
||||
// any processor bounds.
|
||||
// Should really be split into a routine to determine decomposition
|
||||
// and one that does actual distribution but determining
|
||||
// decomposition with duplicate triangle merging requires
|
||||
// same amount as work as actual distribution.
|
||||
virtual void distribute
|
||||
(
|
||||
const List<treeBoundBox>&,
|
||||
const bool keepNonLocal,
|
||||
autoPtr<mapDistribute>& faceMap,
|
||||
autoPtr<mapDistribute>& pointMap
|
||||
);
|
||||
|
||||
|
||||
// Other
|
||||
|
||||
//- WIP. From a set of hits (points and
|
||||
// indices) get the specified field. Misses do not get set.
|
||||
virtual void getField(const List<pointIndexHit>&, labelList&) const;
|
||||
|
||||
//- Subset the part of surface that is overlapping bounds.
|
||||
static triSurface overlappingSurface
|
||||
(
|
||||
const triSurface&,
|
||||
const List<treeBoundBox>&,
|
||||
labelList& subPointMap,
|
||||
labelList& subFaceMap
|
||||
);
|
||||
|
||||
//- Print some stats. Parallel aware version of
|
||||
// triSurface::writeStats.
|
||||
void writeStats(Ostream& os) const;
|
||||
|
||||
|
||||
// regIOobject implementation
|
||||
|
||||
//- Write using given format, version and compression
|
||||
virtual bool writeObject
|
||||
(
|
||||
IOstream::streamFormat fmt,
|
||||
IOstream::versionNumber ver,
|
||||
IOstream::compressionType cmp
|
||||
) const;
|
||||
|
||||
};
|
||||
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
} // End namespace Foam
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
#ifdef NoRepository
|
||||
# include "distributedTriSurfaceMeshTemplates.C"
|
||||
#endif
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
#endif
|
||||
|
||||
// ************************************************************************* //
|
||||
@ -0,0 +1,138 @@
|
||||
/*---------------------------------------------------------------------------*\
|
||||
========= |
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration |
|
||||
\\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
This file is part of OpenFOAM.
|
||||
|
||||
OpenFOAM is free software: you can redistribute it and/or modify it
|
||||
under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
|
||||
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#include "distributedTriSurfaceMesh.H"
|
||||
#include "triSurfaceFields.H"
|
||||
#include "mapDistribute.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
|
||||
|
||||
//template<class Type>
|
||||
//void Foam::distributedTriSurfaceMesh::getField
|
||||
//(
|
||||
// const word& fieldName,
|
||||
// const List<pointIndexHit>& info,
|
||||
// List<Type>& values
|
||||
//) const
|
||||
//{
|
||||
// typedef DimensionedField<Type, triSurfaceGeoMesh> DimensionedSurfField;
|
||||
//
|
||||
//
|
||||
// // Get query data (= local index of triangle)
|
||||
// // ~~~~~~~~~~~~~~
|
||||
//
|
||||
// labelList triangleIndex(info.size());
|
||||
// autoPtr<mapDistribute> mapPtr
|
||||
// (
|
||||
// calcLocalQueries
|
||||
// (
|
||||
// info,
|
||||
// triangleIndex
|
||||
// )
|
||||
// );
|
||||
// const mapDistribute& map = mapPtr();
|
||||
//
|
||||
//
|
||||
// // Do my tests
|
||||
// // ~~~~~~~~~~~
|
||||
//
|
||||
// const DimensionedSurfField& fld = lookupObject<DimensionedSurfField>
|
||||
// (
|
||||
// fieldName
|
||||
// );
|
||||
// const triSurface& s = static_cast<const triSurface&>(*this);
|
||||
//
|
||||
// values.setSize(triangleIndex.size());
|
||||
//
|
||||
// forAll(triangleIndex, i)
|
||||
// {
|
||||
// label triI = triangleIndex[i];
|
||||
// values[i] = fld[triI];
|
||||
// }
|
||||
//
|
||||
//
|
||||
// // Send back results
|
||||
// // ~~~~~~~~~~~~~~~~~
|
||||
//
|
||||
// map.distribute
|
||||
// (
|
||||
// Pstream::nonBlocking,
|
||||
// List<labelPair>(0),
|
||||
// info.size(),
|
||||
// map.constructMap(), // what to send
|
||||
// map.subMap(), // what to receive
|
||||
// values
|
||||
// );
|
||||
//}
|
||||
|
||||
|
||||
template<class Type>
|
||||
void Foam::distributedTriSurfaceMesh::distributeFields
|
||||
(
|
||||
const mapDistribute& map
|
||||
)
|
||||
{
|
||||
typedef DimensionedField<Type, triSurfaceGeoMesh> DimensionedSurfField;
|
||||
|
||||
HashTable<const DimensionedSurfField*> fields
|
||||
(
|
||||
objectRegistry::lookupClass
|
||||
<DimensionedSurfField >()
|
||||
);
|
||||
|
||||
for
|
||||
(
|
||||
typename HashTable<const DimensionedSurfField*>::iterator fieldIter =
|
||||
fields.begin();
|
||||
fieldIter != fields.end();
|
||||
++fieldIter
|
||||
)
|
||||
{
|
||||
DimensionedSurfField& field =
|
||||
const_cast<DimensionedSurfField&>(*fieldIter());
|
||||
|
||||
label oldSize = field.size();
|
||||
|
||||
map.distribute
|
||||
(
|
||||
Pstream::nonBlocking,
|
||||
List<labelPair>(0),
|
||||
map.constructSize(),
|
||||
map.subMap(),
|
||||
map.constructMap(),
|
||||
field
|
||||
);
|
||||
|
||||
if (debug)
|
||||
{
|
||||
Info<< "Mapped " << field.typeName << ' ' << field.name()
|
||||
<< " from size " << oldSize << " to size " << field.size()
|
||||
<< endl;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// ************************************************************************* //
|
||||
Reference in New Issue
Block a user