Merge branch 'master' into particleInteractions

This commit is contained in:
graham
2010-05-18 17:14:32 +01:00
275 changed files with 12196 additions and 6434 deletions

View File

@ -27,7 +27,7 @@ License
#include "fvMesh.H"
#include "cyclicPolyPatch.H"
#include "emptyPolyPatch.H"
#include "processorPolyPatch.H"
#include "coupledPolyPatch.H"
#include "surfaceFields.H"
#include "volFields.H"
@ -96,9 +96,9 @@ void Foam::fieldValues::faceSource::setFaceZoneFaces()
{
facePatchId = mesh().boundaryMesh().whichPatch(faceI);
const polyPatch& pp = mesh().boundaryMesh()[facePatchId];
if (isA<processorPolyPatch>(pp))
if (isA<coupledPolyPatch>(pp))
{
if (refCast<const processorPolyPatch>(pp).owner())
if (refCast<const coupledPolyPatch>(pp).owner())
{
faceId = pp.whichFace(faceI);
}
@ -107,18 +107,6 @@ void Foam::fieldValues::faceSource::setFaceZoneFaces()
faceId = -1;
}
}
else if (isA<cyclicPolyPatch>(pp))
{
label patchFaceI = faceI - pp.start();
if (patchFaceI < pp.size()/2)
{
faceId = patchFaceI;
}
else
{
faceId = -1;
}
}
else if (!isA<emptyPolyPatch>(pp))
{
faceId = faceI - pp.start();