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

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

Browse Source
This commit is contained in:
Mark Olesen
2017-06-14 14:22:59 +02:00
parent 7eec9f0dd6 518089e722
commit 9bb6d896fa
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/sampling/probes/patchProbes.C
View File

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

2
tutorials/mesh/foamyHexMesh/mixerVessel/Allrun-pre
View File

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