ENH: simplify method names for reading argList options and arguments

- use succincter method names that more closely resemble dictionary
  and HashTable method names. This improves method name consistency
  between classes and also requires less typing effort:

    args.found(optName)        vs.  args.optionFound(optName)
    args.readIfPresent(..)     vs.  args.optionReadIfPresent(..)
    ...
    args.opt<scalar>(optName)  vs.  args.optionRead<scalar>(optName)
    args.read<scalar>(index)   vs.  args.argRead<scalar>(index)

- the older method names forms have been retained for code compatibility,
  but are now deprecated
This commit is contained in:
Mark Olesen
2018-01-08 15:35:18 +01:00
parent 2feb11dbeb
commit 345a2a42f1
168 changed files with 1161 additions and 1040 deletions

View File

@ -200,7 +200,7 @@ int main(int argc, char *argv[])
Info<< "Source: " << rootDirSource << " " << caseDirSource << endl;
word sourceRegion = fvMesh::defaultRegion;
if (args.optionFound("sourceRegion"))
if (args.found("sourceRegion"))
{
sourceRegion = args["sourceRegion"];
Info<< "Source region: " << sourceRegion << endl;
@ -208,13 +208,13 @@ int main(int argc, char *argv[])
Info<< "Target: " << rootDirTarget << " " << caseDirTarget << endl;
word targetRegion = fvMesh::defaultRegion;
if (args.optionFound("targetRegion"))
if (args.found("targetRegion"))
{
targetRegion = args["targetRegion"];
Info<< "Target region: " << targetRegion << endl;
}
const bool consistent = args.optionFound("consistent");
const bool consistent = args.found("consistent");
word mapMethod = meshToMesh::interpolationMethodNames_
@ -222,7 +222,7 @@ int main(int argc, char *argv[])
meshToMesh::imCellVolumeWeight
];
if (args.optionReadIfPresent("mapMethod", mapMethod))
if (args.readIfPresent("mapMethod", mapMethod))
{
Info<< "Mapping method: " << mapMethod << endl;
}
@ -242,7 +242,7 @@ int main(int argc, char *argv[])
}
// Optionally override
if (args.optionFound("patchMapMethod"))
if (args.found("patchMapMethod"))
{
patchMapMethod = args["patchMapMethod"];
@ -258,19 +258,19 @@ int main(int argc, char *argv[])
<< exit(FatalError);
}
const bool subtract = args.optionFound("subtract");
const bool subtract = args.found("subtract");
if (subtract)
{
Info<< "Subtracting mapped source field from target" << endl;
}
HashSet<word> selectedFields;
if (args.optionFound("fields"))
if (args.found("fields"))
{
args.optionLookup("fields")() >> selectedFields;
args.lookup("fields")() >> selectedFields;
}
const bool noLagrangian = args.optionFound("noLagrangian");
const bool noLagrangian = args.found("noLagrangian");
#include "createTimes.H"