adjust solvers and utilities to use new argList methods

- 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

View File

@ -89,6 +89,7 @@ int main(int argc, char *argv[])
fileName exportName(params[0]);
word importName("default");
args.optionReadIfPresent("name", importName);
// check that writing is supported
if (!MeshedSurface<face>::canWriteType(exportName.ext(), true))
@ -96,23 +97,18 @@ int main(int argc, char *argv[])
return 1;
}
if (args.options().found("name"))
{
importName = args.options()["name"];
}
// get the coordinate transformations
autoPtr<coordinateSystem> fromCsys;
autoPtr<coordinateSystem> toCsys;
if (args.options().found("from") || args.options().found("to"))
if (args.optionFound("from") || args.optionFound("to"))
{
autoPtr<IOobject> ioPtr;
if (args.options().found("dict"))
if (args.optionFound("dict"))
{
fileName dictPath(args.options()["dict"]);
fileName dictPath(args.option("dict"));
ioPtr.set
(
@ -157,9 +153,9 @@ int main(int argc, char *argv[])
coordinateSystems csLst(ioPtr());
if (args.options().found("from"))
if (args.optionFound("from"))
{
const word csName(args.options()["from"]);
const word csName(args.option("from"));
label csId = csLst.find(csName);
if (csId < 0)
@ -173,9 +169,9 @@ int main(int argc, char *argv[])
fromCsys.reset(new coordinateSystem(csLst[csId]));
}
if (args.options().found("to"))
if (args.optionFound("to"))
{
const word csName(args.options()["to"]);
const word csName(args.option("to"));
label csId = csLst.find(csName);
if (csId < 0)
@ -219,24 +215,13 @@ int main(int argc, char *argv[])
MeshedSurface<face> surf(smesh);
if (args.options().found("clean"))
if (args.optionFound("clean"))
{
surf.cleanup(true);
}
scalar scaleIn = 0;
scalar scaleOut = 0;
if (args.options().found("scaleIn"))
{
IStringStream(args.options()["scaleIn"])() >> scaleIn;
}
if (args.options().found("scaleOut"))
{
IStringStream(args.options()["scaleOut"])() >> scaleOut;
}
if (scaleIn > 0)
if (args.optionReadIfPresent("scaleIn", scaleIn) && scaleIn > 0)
{
Info<< " -scaleIn " << scaleIn << endl;
surf.scalePoints(scaleIn);
@ -256,7 +241,8 @@ int main(int argc, char *argv[])
surf.movePoints(tpf());
}
if (scaleOut > 0)
scalar scaleOut = 0;
if (args.optionReadIfPresent("scaleOut", scaleOut) && scaleOut > 0)
{
Info<< " -scaleOut " << scaleOut << endl;
surf.scalePoints(scaleOut);