Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Mark Olesen
2017-06-14 14:22:59 +02:00
2 changed files with 9 additions and 6 deletions

View File

@ -129,11 +129,11 @@ void Foam::patchProbes::findElements(const fvMesh& mesh)
if (isA<emptyPolyPatch>(bm[patchi]))
{
WarningInFunction
<< " The sample point: " << sample
<< " belongs to " << patchi
<< " which is an empty patch. This is not permitted. "
<< " This sample will not be included "
<< endl;
<< " The sample point: " << sample
<< " belongs to " << patchi
<< " which is an empty patch. This is not permitted. "
<< " This sample will not be included "
<< endl;
}
else if (info.hit())
{
@ -197,12 +197,15 @@ void Foam::patchProbes::findElements(const fvMesh& mesh)
elementList_ = -1;
faceList_.setSize(nearest.size());
faceList_ = -1;
processor_.setSize(nearest.size());
processor_ = -1;
processor_.setSize(size());
processor_ = -1;
forAll(nearest, sampleI)
{
processor_[sampleI] = nearest[sampleI].second().second();
if (nearest[sampleI].second().second() == Pstream::myProcNo())
{
// Store the face to sample

View File

@ -71,7 +71,7 @@ runParallel checkMesh -allTopology -allGeometry -latestTime
# Copy the mesh from the latest time folder into polyMesh and delete that
# latest time folder
latestTime=$(foamInfoExec -case processor0 -latestTime)
latestTime=$(foamListTimes -latestTime -processor)
if [ "$latestTime" != "constant" ] && [ -d processor0/$latestTime/polyMesh ]
then
runApplication reconstructParMesh -latestTime