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

adjust solvers and utilities to use new argList methods

Browse Source 
- also drop various unused time options from src/OpenFOAM/include
This commit is contained in:
Mark Olesen
2009-05-19 20:21:50 +02:00
parent 724b034cc7
commit d1295da31f
96 changed files with 344 additions and 513 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
applications/utilities/miscellaneous/foamDebugSwitches/foamDebugSwitches.C
View File

@ -50,7 +50,7 @@ int main(int argc, char *argv[])
wordList currInfo(debug::infoSwitches().toc());
wordList currOpt(debug::optimisationSwitches().toc());
if (args.options().found("old") || args.options().found("new"))
if (args.optionFound("old") || args.optionFound("new"))
{
dictionary controlDict(IFstream(findEtcFile("controlDict", true))());
@ -80,7 +80,7 @@ int main(int argc, char *argv[])
// 1. run without any options (get complete list)
// 2. comment out DebugSwitches, run again with -new to find new ones
// and do a diff
if (args.options().found("old"))
if (args.optionFound("old"))
{
IOobject::writeDivider(Info);
@ -104,7 +104,7 @@ int main(int argc, char *argv[])
}
// list new switches
if (args.options().found("new"))
if (args.optionFound("new"))
{
IOobject::writeDivider(Info);

26
applications/utilities/miscellaneous/foamInfoExec/foamInfoExec.C
View File

@ -49,9 +49,9 @@ int main(int argc, char *argv[])
Info<< endl;
if (args.options().found("times"))
if (args.optionFound("times"))
{
instantList times
instantList times
(
Foam::Time::findTimes(args.rootPath()/args.caseName())
);
@ -62,11 +62,11 @@ int main(int argc, char *argv[])
}
}
if (args.options().found("dictionary"))
if (args.optionFound("dictionary"))
{
fileName dictFileName
(
args.rootPath()/args.caseName()/args.options()["dictionary"]
args.rootPath()/args.caseName()/args.option("dictionary")
);
IFstream dictFile(dictFileName);
@ -75,11 +75,7 @@ int main(int argc, char *argv[])
{
dictionary dict(dictFile);
if
(
args.options().found("keywords")
&& !args.options().found("entry")
)
if (args.optionFound("keywords") && !args.optionFound("entry"))
{
for
(
@ -91,11 +87,11 @@ int main(int argc, char *argv[])
Info<< iter().keyword() << endl;
}
}
else if (args.options().found("entry"))
else if (args.optionFound("entry"))
{
wordList entryNames
(
fileName(args.options()["entry"]).components(':')
fileName(args.option("entry")).components(':')
);
if (dict.found(entryNames[0]))
@ -122,20 +118,20 @@ int main(int argc, char *argv[])
{
FatalErrorIn(args.executable())
<< "Cannot find sub-entry " << entryNames[i]
<< " in entry " << args.options()["entry"]
<< " in entry " << args.option("entry")
<< " in dictionary " << dictFileName;
FatalError.exit(3);
}
}
if (args.options().found("keywords"))
if (args.optionFound("keywords"))
{
/*
if (ent[1] != token::BEGIN_BLOCK)
{
FatalErrorIn(args.executable())
<< "Cannot find entry "
<< args.options()["entry"]
<< args.option("entry")
<< " in dictionary " << dictFileName
<< " is not a sub-dictionary";
FatalError.exit(4);