STYLE: argList::opt method instead of the longer argList::lookupOrDefault

- also replaced a few instances of readIfPresent with opt<> for
  constant values.
This commit is contained in:
Mark Olesen
2018-12-12 12:10:39 +01:00
parent f38190213c
commit 29a5793b5b
70 changed files with 112 additions and 148 deletions

View File

@ -327,8 +327,7 @@ int main(int argc, char *argv[])
// Allow override of decomposeParDict location
fileName decompDictFile;
args.readIfPresent("decomposeParDict", decompDictFile);
const fileName decompDictFile = args.opt<fileName>("decomposeParDict", "");
// Get all region names
wordList regionNames;
@ -342,8 +341,7 @@ int main(int argc, char *argv[])
else
{
regionNames.resize(1);
regionNames.first() =
args.lookupOrDefault<word>("region", fvMesh::defaultRegion);
regionNames.first() = args.opt<word>("region", fvMesh::defaultRegion);
}
forAll(regionNames, regioni)

View File

@ -506,8 +506,7 @@ int main(int argc, char *argv[])
Info<< "Operating on region " << regionName << nl << endl;
}
scalar mergeTol = defaultMergeTol;
args.readIfPresent("mergeTol", mergeTol);
const scalar mergeTol = args.opt<scalar>("mergeTol", defaultMergeTol);
scalar writeTol = Foam::pow(10.0, -scalar(IOstream::defaultPrecision()));

View File

@ -114,8 +114,7 @@ scalar getMergeDistance
const boundBox& bb
)
{
scalar mergeTol = defaultMergeTol;
args.readIfPresent("mergeTol", mergeTol);
const scalar mergeTol = args.opt<scalar>("mergeTol", defaultMergeTol);
const scalar writeTol =
Foam::pow(scalar(10), -scalar(IOstream::defaultPrecision()));
@ -136,7 +135,7 @@ scalar getMergeDistance
<< exit(FatalError);
}
scalar mergeDist = mergeTol * bb.mag();
const scalar mergeDist = mergeTol * bb.mag();
Info<< "Overall meshes bounding box : " << bb << nl
<< "Relative tolerance : " << mergeTol << nl
@ -2497,8 +2496,7 @@ int main(int argc, char *argv[])
// Allow override of decomposeParDict location
fileName decompDictFile;
args.readIfPresent("decomposeParDict", decompDictFile);
const fileName decompDictFile = args.opt<fileName>("decomposeParDict", "");
// Get all region names
wordList regionNames;
@ -2512,8 +2510,7 @@ int main(int argc, char *argv[])
else
{
regionNames.resize(1);
regionNames.first() =
args.lookupOrDefault<word>("region", fvMesh::defaultRegion);
regionNames.first() = args.opt<word>("region", fvMesh::defaultRegion);
}