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

ENH: Creating nonBlocking comms to exchange referredParticles.

Browse Source 
Currently operating within one function call and not doing local comms
separately.

Using inplaceSubset instead of inplaceReorder and setSize.
This commit is contained in:
graham
2010-04-07 16:29:29 +01:00
parent c141866d11
commit c22fce2006
2 changed files with 170 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

215
src/lagrangian/basic/InteractionLists/InteractionLists.C
View File

@ -307,6 +307,44 @@ void Foam::InteractionLists<ParticleType>::buildMap
); );
} }
template<class ParticleType>
void Foam::InteractionLists<ParticleType>::prepareParticlesToRefer
(
const List<DynamicList<ParticleType*> >& cellOccupancy
)
{
// Clear all existing referred particles
forAll(referredParticles_, i)
{
referredParticles_[i].clear();
}
referredParticles_.setSize(cellIndexAndTransformToDistribute_.size());
forAll(cellIndexAndTransformToDistribute_, i)
{
const labelPair giat = cellIndexAndTransformToDistribute_[i];
label cellIndex = globalTransforms_.index(giat);
List<ParticleType*> realParticles = cellOccupancy[cellIndex];
IDLList<ParticleType>& particlesToRefer = referredParticles_[i];
forAll (realParticles, rM)
{
const ParticleType& particle = *realParticles[rM];
particlesToRefer.append(particle.clone().ptr());
prepareParticleToBeReferred(particlesToRefer.last(), giat);
}
}
}
template<class ParticleType> template<class ParticleType>
void InteractionLists<ParticleType>::prepareParticleToBeReferred void InteractionLists<ParticleType>::prepareParticleToBeReferred
( (
@ -323,6 +361,32 @@ void InteractionLists<ParticleType>::prepareParticleToBeReferred
} }
template<class ParticleType>
void InteractionLists<ParticleType>::writeReferredParticleCloud()
{
bool writeCloud = true;
if (mesh_.time().outputTime() && writeCloud)
{
cloud_.clear();
forAll(referredParticles_, refCellI)
{
const IDLList<ParticleType>& refCell = referredParticles_[refCellI];
forAllConstIter(typename IDLList<ParticleType>, refCell, iter)
{
cloud_.addParticle(iter().clone().ptr());
}
}
Particle<ParticleType>::writeFields(cloud_);
cloud_.clear();
}
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class ParticleType> template<class ParticleType>
@ -525,21 +589,23 @@ Foam::InteractionLists<ParticleType>::InteractionLists
// the order and structure is preserved, i.e. it, is as if the // the order and structure is preserved, i.e. it, is as if the
// cell had never been referred in the first place. // cell had never been referred in the first place.
labelList oldToNew(globalIAndTToExchange.size(), -1); // labelList oldToNew(globalIAndTToExchange.size(), -1);
label refCellI = 0; // label refCellI = 0;
forAll(bbRequiredByAnyCell, bbReqI) // forAll(bbRequiredByAnyCell, bbReqI)
{ // {
if (bbRequiredByAnyCell[bbReqI]) // if (bbRequiredByAnyCell[bbReqI])
{ // {
oldToNew[bbReqI] = refCellI++; // oldToNew[bbReqI] = refCellI++;
} // }
} // }
inplaceReorder(oldToNew, ril_); // inplaceReorder(oldToNew, ril_);
ril_.setSize(refCellI); // ril_.setSize(refCellI);
inplaceSubset(bbRequiredByAnyCell, ril_);
} }
// Send information about which cells are actually required back // Send information about which cells are actually required back
@ -571,32 +637,36 @@ Foam::InteractionLists<ParticleType>::InteractionLists
// and truncate it // and truncate it
{ {
labelList oldToNew(globalIAndTToExchange.size(), -1); // labelList oldToNew(globalIAndTToExchange.size(), -1);
label refCellI = 0; // label refCellI = 0;
forAll(bbRequiredByAnyCell, bbReqI) // forAll(bbRequiredByAnyCell, bbReqI)
{ // {
if (bbRequiredByAnyCell[bbReqI]) // if (bbRequiredByAnyCell[bbReqI])
{ // {
oldToNew[bbReqI] = refCellI++; // oldToNew[bbReqI] = refCellI++;
} // }
} // }
inplaceReorder // inplaceReorder
( // (
oldToNew, // oldToNew,
static_cast<List<labelPair>&>(globalIAndTToExchange) // globalIAndTToExchange
); // );
inplaceReorder // inplaceReorder
( // (
oldToNew, // oldToNew,
static_cast<List<label>&>(procToDistributeTo) // procToDistributeTo
); // );
globalIAndTToExchange.setSize(refCellI); // globalIAndTToExchange.setSize(refCellI);
procToDistributeTo.setSize(refCellI); // procToDistributeTo.setSize(refCellI);
inplaceSubset(bbRequiredByAnyCell, globalIAndTToExchange);
inplaceSubset(bbRequiredByAnyCell, procToDistributeTo);
} }
preDistributionSize = procToDistributeTo.size(); preDistributionSize = procToDistributeTo.size();
@ -699,62 +769,73 @@ Foam::InteractionLists<ParticleType>::~InteractionLists()
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
template<class ParticleType> template<class ParticleType>
void Foam::InteractionLists<ParticleType>::prepareParticlesToRefer void Foam::InteractionLists<ParticleType>::sendReferredParticles
( (
const List<DynamicList<ParticleType*> >& cellOccupancy const List<DynamicList<ParticleType*> >& cellOccupancy
) )
{ {
// Clear all existing referred particles prepareParticlesToRefer(cellOccupancy);
forAll(referredParticles_, i) PstreamBuffers pBufs(Pstream::nonBlocking);
// Stream data into buffer
for (label domain = 0; domain < Pstream::nProcs(); domain++)
{ {
referredParticles_[i].clear(); const labelList& subMap = map().subMap()[domain];
if (subMap.size())
{
// Put data into send buffer
UOPstream toDomain(domain, pBufs);
UIndirectList<IDLList<ParticleType> > subMappedParticles
(
referredParticles_,
subMap
);
forAll(subMappedParticles, i)
{
toDomain << subMappedParticles[i];
} }
referredParticles_.setSize(cellIndexAndTransformToDistribute_.size());
forAll(cellIndexAndTransformToDistribute_, i)
{
const labelPair giat = cellIndexAndTransformToDistribute_[i];
label cellIndex = globalTransforms_.index(giat);
List<ParticleType*> realParticles = cellOccupancy[cellIndex];
IDLList<ParticleType>& particlesToRefer = referredParticles_[i];
forAll (realParticles, rM)
{
const ParticleType& particle = *realParticles[rM];
particlesToRefer.append(particle.clone().ptr());
prepareParticleToBeReferred(particlesToRefer.last(), giat);
} }
} }
// map().distribute(referredParticles_); // Start sending and receiving but do not block.
pBufs.finishedSends(false);
bool writeCloud = true; // DO OTHER STUFF HERE;
if (mesh_.time().outputTime() && writeCloud) Pstream::waitRequests();
referredParticles_.setSize(map().constructSize());
for (label domain = 0; domain < Pstream::nProcs(); domain++)
{ {
cloud_.clear(); const labelList& constructMap = map().constructMap()[domain];
forAll(referredParticles_, refCellI) if (constructMap.size())
{ {
const IDLList<ParticleType>& refCell = referredParticles_[refCellI]; UIPstream str(domain, pBufs);
forAllConstIter(typename IDLList<ParticleType>, refCell, iter) forAll (constructMap, i)
{ {
cloud_.addParticle(iter().clone().ptr()); referredParticles_[constructMap[i]] = IDLList<ParticleType>
(
str,
typename ParticleType::iNew(cloud_)
);
}
} }
} }
Particle<ParticleType>::writeFields(cloud_); writeReferredParticleCloud();
};
cloud_.clear();
} template<class ParticleType>
void Foam::InteractionLists<ParticleType>::receiveReferredParticles()
{
} }

18
src/lagrangian/basic/InteractionLists/InteractionLists.H
View File

@ -112,6 +112,13 @@ class InteractionLists
//- Build the mapDistribute //- Build the mapDistribute
void buildMap(const List<label>& toProc); void buildMap(const List<label>& toProc);
//- Fill the referredParticles container with particles that
// will be referred
void prepareParticlesToRefer
(
const List<DynamicList<ParticleType*> >& cellOccupancy
);
//- Prepare particle to be referred //- Prepare particle to be referred
void prepareParticleToBeReferred void prepareParticleToBeReferred
( (
@ -119,6 +126,9 @@ class InteractionLists
labelPair giat labelPair giat
); );
//- Write the referredParticles out to visualise
void writeReferredParticleCloud();
//- Disallow default bitwise copy construct //- Disallow default bitwise copy construct
InteractionLists(const InteractionLists&); InteractionLists(const InteractionLists&);
@ -144,13 +154,15 @@ public:
// Member Functions // Member Functions
//- Fill the referredParticles container with particles that //- Prepare and send referred particles, nonBlocking communication
// will be referred void sendReferredParticles
void prepareParticlesToRefer
( (
const List<DynamicList<ParticleType*> >& cellOccupancy const List<DynamicList<ParticleType*> >& cellOccupancy
); );
//- Receive referred particles
void receiveReferredParticles();
// Access // Access
//- Return access to the mesh //- Return access to the mesh