From f9d0895707ae78dc4d82183fe116f07edf74250b Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Fri, 16 Jun 2023 17:50:12 +0200 Subject: [PATCH] ENH: avoid spurious library loading for decomposePar, redistributePar - individual processor Time databases are purely for internal logistics and should not be introducing any new library symbols: these will already have been loaded in the outer loop. --- .../decomposePar/decomposePar.C | 9 ++++--- .../decomposePar/domainDecomposition.C | 11 +++----- .../redistributePar/redistributePar.C | 3 ++- .../faDecompose/faMeshDecomposition.C | 26 +++++++++---------- 4 files changed, 23 insertions(+), 26 deletions(-) diff --git a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C index 3ab664458e..333e2901e9 100644 --- a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C +++ b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C @@ -724,7 +724,9 @@ int main(int argc, char *argv[]) ( Time::controlDictName, args.rootPath(), - args.caseName()/("processor" + Foam::name(proci)) + args.caseName()/("processor" + Foam::name(proci)), + false, // No function objects + false // No extra controlDict libs ); // processorDb.setTime(runTime); @@ -1247,8 +1249,9 @@ int main(int argc, char *argv[]) ( Time::controlDictName, args.rootPath(), - args.caseName() - / ("processor" + Foam::name(proci)) + args.caseName()/("processor" + Foam::name(proci)), + false, // No function objects + false // No extra controlDict libs ); processorDb.setTime(runTime); diff --git a/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C b/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C index 5a72003470..b74b27975b 100644 --- a/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C +++ b/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C @@ -315,19 +315,14 @@ bool Foam::domainDecomposition::writeDecomposition(const bool decomposeSets) // Create processor mesh without a boundary - fileName processorCasePath - ( - time().caseName()/("processor" + Foam::name(proci)) - ); - // create a database Time processorDb ( Time::controlDictName, time().rootPath(), - processorCasePath, - word("system"), - word("constant") + time().caseName()/("processor" + Foam::name(proci)), + false, // No function objects + false // No extra controlDict libs ); processorDb.setTime(time()); diff --git a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C index 24c95b6377..7aeee6df86 100644 --- a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C +++ b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C @@ -1245,7 +1245,8 @@ int main(int argc, char *argv[]) runTime.globalCaseName(), runTime.system(), runTime.constant(), - false // enableFunctionObjects + false, // No function objects + false // No extra controlDict libs ); diff --git a/src/parallel/decompose/faDecompose/faMeshDecomposition.C b/src/parallel/decompose/faDecompose/faMeshDecomposition.C index 3ab6a59f60..49518eb545 100644 --- a/src/parallel/decompose/faDecompose/faMeshDecomposition.C +++ b/src/parallel/decompose/faDecompose/faMeshDecomposition.C @@ -53,7 +53,9 @@ void Foam::faMeshDecomposition::distributeFaces() ( Time::controlDictName, time().rootPath(), - time().caseName()/("processor" + Foam::name(proci)) + time().caseName()/("processor" + Foam::name(proci)), + false, // No function objects + false // No extra controlDict libs ); polyMesh procFvMesh @@ -235,7 +237,9 @@ void Foam::faMeshDecomposition::decomposeMesh() ( Time::controlDictName, time().rootPath(), - time().caseName()/("processor" + Foam::name(procI)) + time().caseName()/("processor" + Foam::name(procI)), + false, // No function objects + false // No extra controlDict libs ); polyMesh procFvMesh @@ -1012,17 +1016,14 @@ void Foam::faMeshDecomposition::decomposeMesh() for (label procI = 0; procI < nProcs(); procI++) { - fileName processorCasePath - ( - time().caseName()/("processor" + Foam::name(procI)) - ); - // create a database Time processorDb ( Time::controlDictName, time().rootPath(), - processorCasePath + time().caseName()/("processor" + Foam::name(procI)), + false, // No function objects + false // No extra controlDict libs ); @@ -1134,17 +1135,14 @@ bool Foam::faMeshDecomposition::writeDecomposition() { // Create processor mesh without a boundary - fileName processorCasePath - ( - time().caseName()/("processor" + Foam::name(procI)) - ); - // create a database Time processorDb ( Time::controlDictName, time().rootPath(), - processorCasePath + time().caseName()/("processor" + Foam::name(procI)), + false, // No function objects + false // No extra controlDict libs ); // Read volume mesh