exaFOAM/foam-extend4.1-coherent-io
Archived
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Parallel bugfixes in donorBasedLayeredOverlapFringe

Browse source
This commit is contained in:
Vuko Vukcevic 2019-04-16 11:23:13 +02:00
parent 9a178ce555
commit 7b4ec99683
1 changed files with 24 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
src/overset/oversetMesh/oversetFringe/donorBasedLayeredOverlapFringe/donorBasedLayeredOverlapFringe.C
View file

@ -340,14 +340,10 @@ void Foam::donorBasedLayeredOverlapFringe::calcAddressing() const
else
{
// User did not specify centre points and the centre point holds
// the sum of all the points. Reduce the data
// the sum of all the points. Reduce centre point and divide it
// with global number of unique donors
reduce(centrePoint, sumOp<vector>());
const label nUniqueDonors =
returnReduce(donors.size(), sumOp<label>());
// Calculate the final centre point by finding the arithmetic
// mean
centrePoint /= nUniqueDonors;
centrePoint /= returnReduce(donors.size(), sumOp<label>());
}
if (debug)
@ -640,6 +636,10 @@ void Foam::donorBasedLayeredOverlapFringe::calcAddressing() const
}
}
// Need to reduce nAddedHoles in order to have synced loops in
// parallel
reduce(nAddedHoles, sumOp<label>());
// We moved one layer "inside" the fringe. Keep going until
// there are no more holes to add
@ -786,9 +786,13 @@ bool Foam::donorBasedLayeredOverlapFringe::updateIteration
if
(
fringeHolesPtr_ && acceptorsPtr_
&& !fringeHolesPtr_->empty() && !acceptorsPtr_->empty()
&& returnReduce(!acceptorsPtr_->empty(), orOp<bool>())
)
{
// Note: we first check whether fringeHoles and acceptors pointers are
// allocated. If they are, there must be at least one processor with
// more than 0 acceptors in order for this fringe to be valid.
// Allocate the list by reusing the argument list
finalDonorAcceptorsPtr_ = new donorAcceptorList
(
@ -796,15 +800,17 @@ bool Foam::donorBasedLayeredOverlapFringe::updateIteration
true
);
// Set the flag to true
// Set the flag to true (for all processors due to reduction in the if
// statement)
updateSuitableOverlapFlag(true);
}
else
{
// Delete fringeHolesPtr and acceptorsPtr to trigger calculation of
// addressing, this time with other fringes up-to-date
deleteDemandDrivenData(fringeHolesPtr_);
deleteDemandDrivenData(acceptorsPtr_);
}
// else suitable overlap has not been found and there's nothing to do
return foundSuitableOverlap();
}
@ -812,22 +818,14 @@ bool Foam::donorBasedLayeredOverlapFringe::updateIteration
const Foam::labelList& Foam::donorBasedLayeredOverlapFringe::fringeHoles() const
{
// Note: updateIteration deletes fringeHolesPtr if the suitable overlap is
// not found, thus preparing it for the next iteration when the other
// fringes should be ready
if (!fringeHolesPtr_)
{
calcAddressing();
}
else if (fringeHolesPtr_->empty())
{
// Fringe holes pointer is empty, delete both acceptorPtr_ and
// fringeHolesPtr_ and calculate addressing. Since this fringe strategy
// depends on other fringes, we need to have a special control in the
// iterative algorithm that will start only when all the others are done
// See calcAddressing() for details
deleteDemandDrivenData(fringeHolesPtr_);
deleteDemandDrivenData(acceptorsPtr_);
calcAddressing();
}
return *fringeHolesPtr_;
}
@ -836,22 +834,14 @@ const Foam::labelList& Foam::donorBasedLayeredOverlapFringe::fringeHoles() const
const Foam::labelList&
Foam::donorBasedLayeredOverlapFringe::candidateAcceptors() const
{
// Note: updateIteration deletes acceptorsPtr if the suitable overlap is
// not found, thus preparing it for the next iteration when the other
// fringes should be ready
if (!acceptorsPtr_)
{
calcAddressing();
}
else if (acceptorsPtr_->empty())
{
// Acceptors pointer is empty, delete both acceptorPtr_ and
// fringeHolesPtr_ and calculate addressing. Since this fringe strategy
// depends on other fringes, we need to have a special control in the
// iterative algorithm that will start only when all the others are done
// See calcAddressing() for details
deleteDemandDrivenData(fringeHolesPtr_);
deleteDemandDrivenData(acceptorsPtr_);
calcAddressing();
}
return *acceptorsPtr_;
}