Merge branch 'master' of ssh://opencfd:8007/home/dm4/OpenFOAM/repositories/OpenFOAM-dev

This commit is contained in:
Henry
2013-12-06 15:49:50 +00:00
2 changed files with 10 additions and 2 deletions

View File

@ -210,6 +210,14 @@ int main(int argc, char *argv[])
outFile << pt.x() << ' ' << pt.y() << ' ' << pt.z() << nl;
}
outFile
<< "VERTICES " << points.size() << ' ' << (2 * points.size()) << nl;
forAll(points, i)
{
outFile << 1 << ' ' << i << nl;
}
label nItems = 0;
forAll(polyLines, polyI)
{

View File

@ -103,7 +103,7 @@ void Foam::regionModels::regionModel::initialise()
forAll(rbm, patchI)
{
const polyPatch& regionPatch = rbm[patchI];
if (isA<mappedWallPolyPatch>(regionPatch))
if (isA<mappedPatchBase>(regionPatch))
{
if (debug)
{
@ -136,7 +136,7 @@ void Foam::regionModels::regionModel::initialise()
primaryPatchIDs_.transfer(primaryPatchIDs);
intCoupledPatchIDs_.transfer(intCoupledPatchIDs);
if (nBoundaryFaces == 0)
if (returnReduce(nBoundaryFaces, sumOp<label>()) == 0)
{
WarningIn("regionModel::initialise()")
<< "Region model has no mapped boundary conditions - transfer "