From 0efac64b9199662e31b913789408306848c2830c Mon Sep 17 00:00:00 2001 From: laurence <laurence> Date: Fri, 19 Jul 2013 15:51:46 +0100 Subject: [PATCH] BUG: pointZone: Check point in same (or no) zone on all processors. --- .../meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C | 4 ++-- .../meshes/polyMesh/zones/pointZone/pointZone.C | 16 ++++++++++++---- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C b/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C index 33e17117c46..eeec0974d65 100644 --- a/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C +++ b/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -492,7 +492,7 @@ bool Foam::ZoneMesh<ZoneType, MeshType>::checkParallelSync << " of type " << zones[zoneI].type() << " is not correctly synchronised" << " across coupled boundaries." - << " (coupled faces are either not both " + << " (coupled faces are either not both" << " present in set or have same flipmap)" << endl; } } diff --git a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.C b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.C index ff15dcea3b2..30d1161bb7c 100644 --- a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.C +++ b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -154,8 +154,15 @@ bool Foam::pointZone::checkParallelSync(const bool report) const forAll(maxZone, pointI) { - // Check point in zone on both sides - if (maxZone[pointI] != minZone[pointI]) + // Check point in same (or no) zone on all processors + if + ( + ( + maxZone[pointI] != -1 + || minZone[pointI] != labelMax + ) + && (maxZone[pointI] != minZone[pointI]) + ) { if (report && !error) { @@ -167,7 +174,8 @@ bool Foam::pointZone::checkParallelSync(const bool report) const << (minZone[pointI] == labelMax ? -1 : minZone[pointI]) << " on some processors and in zone " << maxZone[pointI] - << " on some other processors." + << " on some other processors." << nl + << "(suppressing further warnings)" << endl; } error = true; -- GitLab