Commit 0a6d5525 authored by Mark Olesen's avatar Mark Olesen
Browse files

STYLE: remove '-roots' option too with noParallel

parent fd7bf0fa
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. \\ / A nd | Copyright (C) 1991-2011 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
...@@ -58,10 +58,10 @@ Foam::argList::initValidTables::initValidTables() ...@@ -58,10 +58,10 @@ Foam::argList::initValidTables::initValidTables()
validParOptions.set("parallel", ""); validParOptions.set("parallel", "");
argList::addOption argList::addOption
( (
"roots", "(dir1 .. dirn)", "roots", "(dir1 .. dirN)",
"slave root directories for distributed running" "slave root directories for distributed running"
); );
validParOptions.set("roots", "(dir1 .. dirn)"); validParOptions.set("roots", "(dir1 .. dirN)");
Pstream::addValidParOptions(validParOptions); Pstream::addValidParOptions(validParOptions);
} }
...@@ -138,8 +138,8 @@ void Foam::argList::noBanner() ...@@ -138,8 +138,8 @@ void Foam::argList::noBanner()
void Foam::argList::noParallel() void Foam::argList::noParallel()
{ {
optionUsage.erase("parallel"); removeOption("parallel");
validOptions.erase("parallel"); removeOption("roots");
validParOptions.clear(); validParOptions.clear();
} }
...@@ -537,10 +537,10 @@ Foam::argList::argList ...@@ -537,10 +537,10 @@ Foam::argList::argList
if (options_.found("roots")) if (options_.found("roots"))
{ {
source = "'-roots' option";
IStringStream str(options_["roots"]); IStringStream str(options_["roots"]);
str >> roots; str >> roots;
dictNProcs = roots.size()+1; dictNProcs = roots.size()+1;
source = "roots-command-line";
} }
else else
{ {
...@@ -593,7 +593,7 @@ Foam::argList::argList ...@@ -593,7 +593,7 @@ Foam::argList::argList
{ {
forAll(roots, i) forAll(roots, i)
{ {
roots[i] = roots[i].expand(); roots[i].expand();
} }
if (roots.size() != Pstream::nProcs()-1) if (roots.size() != Pstream::nProcs()-1)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment