mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
adjust solvers and utilities to use new argList methods
- also drop various unused time options from src/OpenFOAM/include
This commit is contained in:
@ -83,10 +83,10 @@ int main(int argc, char *argv[])
|
||||
word regionName;
|
||||
fileName polyMeshDir;
|
||||
|
||||
if (args.options().found("region"))
|
||||
if (args.optionFound("region"))
|
||||
{
|
||||
// constant/<region>/polyMesh/blockMeshDict
|
||||
regionName = args.options()["region"];
|
||||
regionName = args.option("region");
|
||||
polyMeshDir = regionName/polyMesh::meshSubDir;
|
||||
|
||||
Info<< nl << "Generating mesh for region " << regionName << endl;
|
||||
@ -100,9 +100,9 @@ int main(int argc, char *argv[])
|
||||
|
||||
autoPtr<IOobject> meshDictIoPtr;
|
||||
|
||||
if (args.options().found("dict"))
|
||||
if (args.optionFound("dict"))
|
||||
{
|
||||
fileName dictPath(args.options()["dict"]);
|
||||
fileName dictPath(args.option("dict"));
|
||||
|
||||
meshDictIoPtr.set
|
||||
(
|
||||
@ -110,7 +110,7 @@ int main(int argc, char *argv[])
|
||||
(
|
||||
(
|
||||
isDir(dictPath)
|
||||
? dictPath/dictName
|
||||
? dictPath/dictName
|
||||
: dictPath
|
||||
),
|
||||
runTime,
|
||||
@ -153,7 +153,7 @@ int main(int argc, char *argv[])
|
||||
blockMesh blocks(meshDict);
|
||||
|
||||
|
||||
if (args.options().found("blockTopology"))
|
||||
if (args.optionFound("blockTopology"))
|
||||
{
|
||||
// Write mesh as edges.
|
||||
{
|
||||
|
||||
@ -66,7 +66,7 @@ int main(int argc, char *argv[])
|
||||
const word oldInstance = mesh.pointsInstance();
|
||||
|
||||
scalar thickness(readScalar(IStringStream(args.additionalArgs()[0])()));
|
||||
bool overwrite = args.options().found("overwrite");
|
||||
bool overwrite = args.optionFound("overwrite");
|
||||
|
||||
|
||||
// Check that mesh is 2D
|
||||
|
||||
@ -55,7 +55,7 @@ int main(int argc, char *argv[])
|
||||
#include "setRoots.H"
|
||||
#include "createTimeExtruded.H"
|
||||
|
||||
if (args.options().found("sourceCase") == args.options().found("surface"))
|
||||
if (args.optionFound("sourceCase") == args.optionFound("surface"))
|
||||
{
|
||||
FatalErrorIn(args.executable())
|
||||
<< "Specify either -sourceCase and -sourcePatch"
|
||||
@ -83,12 +83,12 @@ int main(int argc, char *argv[])
|
||||
)
|
||||
);
|
||||
|
||||
if (args.options().found("sourceCase"))
|
||||
if (args.optionFound("sourceCase"))
|
||||
{
|
||||
fileName sourceCasePath(args.options()["sourceCase"]);
|
||||
fileName sourceCasePath(args.option("sourceCase"));
|
||||
fileName sourceRootDir = sourceCasePath.path();
|
||||
fileName sourceCaseDir = sourceCasePath.name();
|
||||
word patchName(args.options()["sourcePatch"]);
|
||||
word patchName(args.option("sourcePatch"));
|
||||
|
||||
Info<< "Extruding patch " << patchName
|
||||
<< " on mesh " << sourceCasePath << nl
|
||||
@ -144,7 +144,7 @@ int main(int argc, char *argv[])
|
||||
else
|
||||
{
|
||||
// Read from surface
|
||||
fileName surfName(args.options()["surface"]);
|
||||
fileName surfName(args.option("surface"));
|
||||
|
||||
Info<< "Extruding surfaceMesh read from file " << surfName << nl
|
||||
<< endl;
|
||||
@ -250,7 +250,7 @@ int main(int argc, char *argv[])
|
||||
// Merging front and back patch faces
|
||||
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
if (args.options().found("mergeFaces"))
|
||||
if (args.optionFound("mergeFaces"))
|
||||
{
|
||||
Info<< "Assuming full 360 degree axisymmetric case;"
|
||||
<< " stitching faces on patches "
|
||||
|
||||
Reference in New Issue
Block a user