From 5ba31cd5dec2777988286be0cfeaac414341c863 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Tue, 23 Mar 2021 09:59:38 +0100 Subject: [PATCH] BUG: avoid blocking on redistributePar (continuation of #2027) - adjust sync condition (continuation of 201f117f5f02) --- .../global/fileOperations/fileOperation/fileOperation.C | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.C b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.C index 54803fdc85..2d663b6f9a 100644 --- a/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.C +++ b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.C @@ -542,7 +542,7 @@ Foam::fileOperation::lookupAndCacheProcessorsPath << " detected:" << procDirs << endl; } - if (Pstream::parRun()) + if (Pstream::parRun() && (!distributed() || syncPar)) { reduce(procDirsStatus, bitOrOp()); // worldComm @@ -612,11 +612,9 @@ Foam::fileOperation::lookupAndCacheProcessorsPath } } } - else + else if (!Pstream::parRun()) { - // Serial - // If (as a side effect) we found the number of decompositions - // use it + // Serial: use the number of decompositions (if found) if (nProcs) { const_cast(*this).setNProcs(nProcs);