zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

STYLE: more consistency in handling of -region vs -allRegions

Browse Source
This commit is contained in:
Mark Olesen
2018-07-19 09:15:33 +02:00
parent 8042647610
commit 7cb5b638ad
4 changed files with 20 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
applications/test/checkDecomposePar/Test-checkDecomposePar.C
View File

@ -108,16 +108,12 @@ int main(int argc, char *argv[])
} }
else else
{ {
word regionName; regionNames.resize(1, fvMesh::defaultRegion);
if (args.readIfPresent("region", regionName)) regionDirs.resize(1, word::null);
if (args.readIfPresent("region", regionNames.first()))
{ {
regionNames = wordList(1, regionName); regionDirs.first() = regionNames.first();
regionDirs = regionNames;
}
else
{
regionNames = wordList(1, fvMesh::defaultRegion);
regionDirs = wordList(1, word::null);
} }
} }

14
applications/test/decomposePar/Test-decomposePar.C
View File

@ -146,16 +146,12 @@ int main(int argc, char *argv[])
} }
else else
{ {
word regionName; regionNames.resize(1, fvMesh::defaultRegion);
if (args.readIfPresent("region", regionName)) regionDirs.resize(1, word::null);
if (args.readIfPresent("region", regionNames.first()))
{ {
regionNames = wordList(1, regionName); regionDirs.first() = regionNames.first();
regionDirs = regionNames;
}
else
{
regionNames = wordList(1, fvMesh::defaultRegion);
regionDirs = wordList(1, word::null);
} }
} }

9
applications/utilities/parallelProcessing/decomposePar/decomposePar.C
View File

@ -247,7 +247,7 @@ int main(int argc, char *argv[])
argList::addBoolOption argList::addBoolOption
( (
"copyZero", "copyZero",
"Copy \a 0 directory to processor* rather than decompose the fields" "Copy a 0 directory to processor* rather than decompose the fields"
); );
argList::addBoolOption argList::addBoolOption
( (
@ -318,15 +318,16 @@ int main(int argc, char *argv[])
} }
else else
{ {
regionNames = {fvMesh::defaultRegion}; regionNames.resize(1);
args.readIfPresent("region", regionNames[0]); regionNames.first() =
args.lookupOrDefault<word>("region", fvMesh::defaultRegion);
} }
forAll(regionNames, regioni) forAll(regionNames, regioni)
{ {
const word& regionName = regionNames[regioni]; const word& regionName = regionNames[regioni];
const word& regionDir = const word& regionDir =
regionName == fvMesh::defaultRegion ? word::null : regionName; (regionName == fvMesh::defaultRegion ? word::null : regionName);
Info<< "\n\nDecomposing mesh " << regionName << nl << endl; Info<< "\n\nDecomposing mesh " << regionName << nl << endl;

12
applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
View File

@ -194,14 +194,12 @@ int main(int argc, char *argv[])
} }
else else
{ {
regionNames = {fvMesh::defaultRegion}; regionNames.resize(1, fvMesh::defaultRegion);
if (args.readIfPresent("region", regionNames[0])) regionDirs.resize(1, word::null);
if (args.readIfPresent("region", regionNames.first()))
{ {
regionDirs = regionNames; regionDirs.first() = regionNames.first();
}
else
{
regionDirs = {word::null};
} }
} }