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

@ -128,7 +128,7 @@ int main(int argc, char *argv[])
#include "setRootCase.H"
#include "createTime.H"
const scalar scaleFactor = args.optionLookupOrDefault<scalar>("scale", -1);
const scalar scaleFactor = args.lookupOrDefault<scalar>("scale", -1);
const word outputFile(args.executable() + ".obj");
@ -145,18 +145,18 @@ int main(int argc, char *argv[])
Info<< endl;
if (args.optionFound("debug2"))
if (args.found("debug2"))
{
surfaceIntersection::debug |= 2;
}
if (args.optionFound("debug4"))
if (args.found("debug4"))
{
surfaceIntersection::debug |= 4;
}
const bool optPrint = args.optionFound("print");
const bool optPrint = args.found("print");
dictionary intersectOptions;
if (args.optionFound("dict"))
if (args.found("dict"))
{
intersectOptions = IOdictionary
(
@ -190,12 +190,12 @@ int main(int argc, char *argv[])
}
word mergeOp;
if (args.optionFound("mergePoints"))
if (args.found("mergePoints"))
{
cuts.mergePoints(args.optionRead<scalar>("mergePoints"));
cuts.mergePoints(args.opt<scalar>("mergePoints"));
mergeOp = "mergePoints";
}
else if (args.optionFound("mergeEdges"))
else if (args.found("mergeEdges"))
{
cuts.mergeEdges();
mergeOp = "mergeEdges";