ENH: surfaceMeshConvert: dict option handling

This commit is contained in:
mattijs
2012-12-05 15:04:35 +00:00
parent 4d6a8cbd56
commit b2edaba7a1

View File

@ -96,12 +96,8 @@ int main(int argc, char *argv[])
"factor", "factor",
"geometry scaling factor on output" "geometry scaling factor on output"
); );
argList::addOption #include "addDictOption.H"
(
"dict",
"file",
"specify alternative dictionary for the coordinateSystems descriptions"
);
argList::addOption argList::addOption
( (
"from", "from",
@ -154,19 +150,28 @@ int main(int argc, char *argv[])
{ {
autoPtr<IOobject> csDictIoPtr; autoPtr<IOobject> csDictIoPtr;
const word dictName("coordinateSystems::typeName");
// Note: cannot use setSystemRunTimeDictionaryIO.H since dictionary
// is in constant
fileName dictPath = "";
if (args.optionFound("dict")) if (args.optionFound("dict"))
{ {
const fileName dictPath = args["dict"]; dictPath = args["dict"];
if (isDir(dictPath))
{
dictPath = dictPath / dictName;
}
}
if (dictPath.size())
{
csDictIoPtr.set csDictIoPtr.set
( (
new IOobject new IOobject
( (
( dictPath,
isDir(dictPath)
? dictPath/coordinateSystems::typeName
: dictPath
),
runTime, runTime,
IOobject::MUST_READ, IOobject::MUST_READ,
IOobject::NO_WRITE, IOobject::NO_WRITE,
@ -180,7 +185,7 @@ int main(int argc, char *argv[])
( (
new IOobject new IOobject
( (
coordinateSystems::typeName, dictName,
runTime.constant(), runTime.constant(),
runTime, runTime,
IOobject::MUST_READ, IOobject::MUST_READ,