Skip to content
Snippets Groups Projects
Commit c9b123cb authored by Henry's avatar Henry
Browse files

Merge branch 'master' of ssh://dm/home/dm4/OpenFOAM/OpenFOAM-dev

parents 03c8cf06 740c4fa8
No related branches found
No related tags found
No related merge requests found
...@@ -566,7 +566,8 @@ Foam::label Foam::PointEdgeWave<Type, TrackingData>::handleCollocatedPoints() ...@@ -566,7 +566,8 @@ Foam::label Foam::PointEdgeWave<Type, TrackingData>::handleCollocatedPoints()
elems[pointI] = allPointInfo_[meshPoints[pointI]]; elems[pointI] = allPointInfo_[meshPoints[pointI]];
} }
// Pull slave data onto master. No need to update transformed slots. // Pull slave data onto master (which might or might not have any
// initialised points). No need to update transformed slots.
slavesMap.distribute(elems, false); slavesMap.distribute(elems, false);
// Combine master data with slave data // Combine master data with slave data
...@@ -597,26 +598,34 @@ Foam::label Foam::PointEdgeWave<Type, TrackingData>::handleCollocatedPoints() ...@@ -597,26 +598,34 @@ Foam::label Foam::PointEdgeWave<Type, TrackingData>::handleCollocatedPoints()
// Extract back onto mesh // Extract back onto mesh
forAll(meshPoints, pointI) forAll(meshPoints, pointI)
{ {
Type& elem = allPointInfo_[meshPoints[pointI]]; if (elems[pointI].valid(td_))
// Like updatePoint but bypass Type::updatePoint with its tolerance
// checking
if (!elem.valid(td_) || !elem.equal(elems[pointI], td_))
{ {
nEvals_++; label meshPointI = meshPoints[pointI];
elem = elems[pointI];
// See if element now valid Type& elem = allPointInfo_[meshPointI];
if (elem.valid(td_))
{
--nUnvisitedPoints_;
}
// Update database of changed points bool wasValid = elem.valid(td_);
if (!changedPoint_[pointI])
// Like updatePoint but bypass Type::updatePoint with its tolerance
// checking
//if (!elem.valid(td_) || !elem.equal(elems[pointI], td_))
if (!elem.equal(elems[pointI], td_))
{ {
changedPoint_[pointI] = true; nEvals_++;
changedPoints_[nChangedPoints_++] = pointI; elem = elems[pointI];
// See if element now valid
if (!wasValid && elem.valid(td_))
{
--nUnvisitedPoints_;
}
// Update database of changed points
if (!changedPoint_[meshPointI])
{
changedPoint_[meshPointI] = true;
changedPoints_[nChangedPoints_++] = meshPointI;
}
} }
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment