From dbe2b2c5fd368920bb11ec9bd35977bfaade1de3 Mon Sep 17 00:00:00 2001 From: mattijs Date: Wed, 15 Apr 2009 12:30:18 +0100 Subject: [PATCH] added region option --- .../decomposePar/decomposePar.C | 28 +++++++++++++++---- .../decomposePar/domainDecomposition.C | 2 +- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C index 5edafcf561..476f477373 100644 --- a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C +++ b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C @@ -83,6 +83,7 @@ Usage int main(int argc, char *argv[]) { argList::noParallel(); +# include "addRegionOption.H" argList::validOptions.insert("cellDist", ""); argList::validOptions.insert("copyUniform", ""); argList::validOptions.insert("fields", ""); @@ -92,6 +93,16 @@ int main(int argc, char *argv[]) # include "setRootCase.H" + word regionName = fvMesh::defaultRegion; + + if (args.options().found("region")) + { + regionName = args.options()["region"]; + + Info<< "Decomposing mesh " << regionName << nl << endl; + } + + bool writeCellDist(args.options().found("cellDist")); bool copyUniform(args.options().found("copyUniform")); bool decomposeFieldsOnly(args.options().found("fields")); @@ -119,6 +130,7 @@ int main(int argc, char *argv[]) ( "decomposeParDict", runTime.time().system(), + regionName, runTime, IOobject::MUST_READ, IOobject::NO_WRITE, @@ -196,7 +208,7 @@ int main(int argc, char *argv[]) ( IOobject ( - domainDecomposition::defaultRegion, + regionName, runTime.timeName(), runTime ) @@ -219,7 +231,7 @@ int main(int argc, char *argv[]) ( runTime.path() / mesh.facesInstance() - / polyMesh::defaultRegion + / regionName / "cellDecomposition" ); @@ -383,7 +395,12 @@ int main(int argc, char *argv[]) label i = 0; - forAllIter(Cloud, lagrangianPositions[cloudI], iter) + forAllIter + ( + Cloud, + lagrangianPositions[cloudI], + iter + ) { iter().index() = i++; @@ -405,7 +422,8 @@ int main(int argc, char *argv[]) if (!cellParticles[cloudI][celli]) { - cellParticles[cloudI][celli] = new SLList(); + cellParticles[cloudI][celli] = new SLList + (); } cellParticles[cloudI][celli]->append(&iter()); @@ -513,7 +531,7 @@ int main(int argc, char *argv[]) ( IOobject ( - fvMesh::defaultRegion, + regionName, processorDb.timeName(), processorDb ) diff --git a/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C b/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C index 989d384e40..2940577d16 100644 --- a/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C +++ b/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C @@ -268,7 +268,7 @@ bool domainDecomposition::writeDecomposition() ( IOobject ( - polyMesh::defaultRegion, + this->polyMesh::name(), // region name of undecomposed mesh "constant", processorDb ),