Commit 8931e443 authored by mattijs's avatar mattijs
Browse files

ENH: collated support. Fixes lumpedPointMotion in #675.

parent 2967be7d
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. \\/ M anipulation | Copyright (C) 2016-2017 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
...@@ -1094,7 +1094,9 @@ int main(int argc, char *argv[]) ...@@ -1094,7 +1094,9 @@ int main(int argc, char *argv[])
// Update proc maps // Update proc maps
if (cellProcAddressing.headerOk()) if (cellProcAddressing.headerOk())
{ {
if (cellProcAddressing.size() == mesh.nCells()) bool localOk = (cellProcAddressing.size() == mesh.nCells());
if (returnReduce(localOk, andOp<bool>()))
{ {
Info<< "Renumbering processor cell decomposition map " Info<< "Renumbering processor cell decomposition map "
<< cellProcAddressing.name() << endl; << cellProcAddressing.name() << endl;
...@@ -1118,7 +1120,9 @@ int main(int argc, char *argv[]) ...@@ -1118,7 +1120,9 @@ int main(int argc, char *argv[])
if (faceProcAddressing.headerOk()) if (faceProcAddressing.headerOk())
{ {
if (faceProcAddressing.size() == mesh.nFaces()) bool localOk = (faceProcAddressing.size() == mesh.nFaces());
if (returnReduce(localOk, andOp<bool>()))
{ {
Info<< "Renumbering processor face decomposition map " Info<< "Renumbering processor face decomposition map "
<< faceProcAddressing.name() << endl; << faceProcAddressing.name() << endl;
...@@ -1158,7 +1162,9 @@ int main(int argc, char *argv[]) ...@@ -1158,7 +1162,9 @@ int main(int argc, char *argv[])
if (pointProcAddressing.headerOk()) if (pointProcAddressing.headerOk())
{ {
if (pointProcAddressing.size() == mesh.nPoints()) bool localOk = (pointProcAddressing.size() == mesh.nPoints());
if (returnReduce(localOk, andOp<bool>()))
{ {
Info<< "Renumbering processor point decomposition map " Info<< "Renumbering processor point decomposition map "
<< pointProcAddressing.name() << endl; << pointProcAddressing.name() << endl;
...@@ -1182,7 +1188,16 @@ int main(int argc, char *argv[]) ...@@ -1182,7 +1188,16 @@ int main(int argc, char *argv[])
if (boundaryProcAddressing.headerOk()) if (boundaryProcAddressing.headerOk())
{ {
if (boundaryProcAddressing.size() != mesh.boundaryMesh().size()) bool localOk =
(
boundaryProcAddressing.size()
== mesh.boundaryMesh().size()
);
if (returnReduce(localOk, andOp<bool>()))
{
// No renumbering needed
}
else
{ {
Info<< "Not writing inconsistent processor patch decomposition" Info<< "Not writing inconsistent processor patch decomposition"
<< " map " << boundaryProcAddressing.filePath() << endl; << " map " << boundaryProcAddressing.filePath() << endl;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment