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

STYLE: argList::opt method instead of the longer argList::lookupOrDefault

Browse Source 
- also replaced a few instances of readIfPresent with opt<> for
  constant values.
This commit is contained in:
Mark Olesen
2018-12-12 12:10:39 +01:00
parent f38190213c
commit 29a5793b5b
70 changed files with 112 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/utilities/surface/surfaceAdd/surfaceAdd.C
View File

@ -87,7 +87,7 @@ int main(int argc, char *argv[])
const bool addPoint = args.found("points");
const bool mergeRegions = args.found("mergeRegions");
const scalar scaleFactor = args.lookupOrDefault<scalar>("scale", -1);
const scalar scaleFactor = args.opt<scalar>("scale", -1);
if (addPoint)
{

2
applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
View File

@ -1593,7 +1593,7 @@ int main(int argc, char *argv[])
// Scale factor for both surfaces:
const scalar scaleFactor = args.lookupOrDefault<scalar>("scale", -1);
const scalar scaleFactor = args.opt<scalar>("scale", -1);
const word surf1Name(args[2]);
Info<< "Reading surface " << surf1Name << endl;

6
applications/utilities/surface/surfaceCheck/surfaceCheck.C
View File

@ -366,9 +366,9 @@ int main(int argc, char *argv[])
const fileName surfFileName = args[1];
const bool checkSelfIntersect = args.found("checkSelfIntersection");
const bool splitNonManifold = args.found("splitNonManifold");
const label outputThreshold = args.lookupOrDefault("outputThreshold", 10);
word surfaceFormat;
const bool writeSets = args.readIfPresent("writeSets", surfaceFormat);
const label outputThreshold = args.opt<label>("outputThreshold", 10);
const word surfaceFormat = args.opt<word>("writeSets", "");
const bool writeSets = !surfaceFormat.empty();
autoPtr<surfaceWriter> surfWriter;
word edgeFormat;

2
applications/utilities/surface/surfaceClean/surfaceClean.C
View File

@ -94,7 +94,7 @@ int main(int argc, char *argv[])
triSurface surf
(
inFileName,
args.lookupOrDefault<scalar>("scale", -1)
args.opt<scalar>("scale", -1)
);
surf.writeStats(Info);

2
applications/utilities/surface/surfaceCoarsen/surfaceCoarsen.C
View File

@ -102,7 +102,7 @@ int main(int argc, char *argv[])
<< exit(FatalError);
}
const scalar scaleFactor = args.lookupOrDefault<scalar>("scale", -1);
const scalar scaleFactor = args.opt<scalar>("scale", -1);
Info<< "Input surface :" << inFileName << nl
<< "Scaling factor :" << scaleFactor << nl

2
applications/utilities/surface/surfaceConvert/surfaceConvert.C
View File

@ -125,7 +125,7 @@ int main(int argc, char *argv[])
return 1;
}
const scalar scaleFactor = args.lookupOrDefault<scalar>("scale", -1);
const scalar scaleFactor = args.opt<scalar>("scale", -1);
Info<< "Reading : " << importName << endl;
triSurface surf(importName, scaleFactor);

6
applications/utilities/surface/surfaceFind/surfaceFind.C
View File

@ -61,9 +61,9 @@ int main(int argc, char *argv[])
const point samplePt
(
args.lookupOrDefault<scalar>("x", 0),
args.lookupOrDefault<scalar>("y", 0),
args.lookupOrDefault<scalar>("z", 0)
args.opt<scalar>("x", 0),
args.opt<scalar>("y", 0),
args.opt<scalar>("z", 0)
);
Info<< "Looking for nearest face/vertex to " << samplePt << endl;

2
applications/utilities/surface/surfaceInertia/surfaceInertia.C
View File

@ -86,7 +86,7 @@ int main(int argc, char *argv[])
argList args(argc, argv);
const fileName surfFileName = args[1];
const scalar density = args.lookupOrDefault<scalar>("density", 1);
const scalar density = args.opt<scalar>("density", 1);
vector refPt = Zero;
bool calcAroundRefPt = args.readIfPresent("referencePoint", refPt);

8
applications/utilities/surface/surfaceInflate/surfaceInflate.C
View File

@ -610,12 +610,8 @@ int main(int argc, char *argv[])
const scalar distance(args.get<scalar>(2));
const scalar extendFactor(args.get<scalar>(3));
const bool checkSelfIntersect = args.found("checkSelfIntersection");
const label nSmooth = args.lookupOrDefault("nSmooth", 10);
const scalar featureAngle = args.lookupOrDefault<scalar>
(
"featureAngle",
180
);
const label nSmooth = args.opt<label>("nSmooth", 10);
const scalar featureAngle = args.opt<scalar>("featureAngle", 180);
const bool debug = args.found("debug");

2
applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C
View File

@ -164,7 +164,7 @@ int main(int argc, char *argv[])
IOobject::NO_WRITE,
false
),
args.lookupOrDefault<fileName>("dict", "")
args.opt<fileName>("dict", "")
);
if (!ioCsys.typeHeaderOk<coordinateSystems>(false))

4
applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C
View File

@ -127,7 +127,7 @@ int main(int argc, char *argv[])
Time runTime(args.rootPath(), args.caseName());
const fileName exportName = args[1];
const word importName = args.lookupOrDefault<word>("name", "default");
const word importName = args.opt<word>("name", "default");
// check that writing is supported
if (!MeshedSurface<face>::canWriteType(exportName.ext(), true))
@ -153,7 +153,7 @@ int main(int argc, char *argv[])
IOobject::NO_WRITE,
false
),
args.lookupOrDefault<fileName>("dict", "")
args.opt<fileName>("dict", "")
);
if (!ioCsys.typeHeaderOk<coordinateSystems>(false))

4
applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C
View File

@ -140,7 +140,7 @@ int main(int argc, char *argv[])
const fileName importName = args[1];
const word exportName = args.lookupOrDefault<word>("name", "default");
const word exportName = args.opt<word>("name", "default");
// check that reading is supported
if (!MeshedSurface<face>::canRead(importName, true))
@ -166,7 +166,7 @@ int main(int argc, char *argv[])
IOobject::NO_WRITE,
false
),
args.lookupOrDefault<fileName>("dict", "")
args.opt<fileName>("dict", "")
);
if (!ioCsys.typeHeaderOk<coordinateSystems>(false))

2
applications/utilities/surface/surfaceMeshInfo/surfaceMeshInfo.C
View File

@ -119,7 +119,7 @@ int main(int argc, char *argv[])
// use UnsortedMeshedSurface, not MeshedSurface to maintain ordering
UnsortedMeshedSurface<face> surf(importName);
const scalar scaling = args.lookupOrDefault<scalar>("scale", -1);
const scalar scaling = args.opt<scalar>("scale", -1);
if (scaling > 0)
{
DetailInfo << " -scale " << scaling << nl;

2
applications/utilities/surface/surfaceOrient/surfaceOrient.C
View File

@ -93,7 +93,7 @@ int main(int argc, char *argv[])
Info<< "outside" << endl;
}
const scalar scaling = args.lookupOrDefault<scalar>("scale", -1);
const scalar scaling = args.opt<scalar>("scale", -1);
if (scaling > 0)
{
Info<< "Input scaling: " << scaling << nl;

2
applications/utilities/surface/surfacePointMerge/surfacePointMerge.C
View File

@ -68,7 +68,7 @@ int main(int argc, char *argv[])
const scalar mergeTol = args.get<scalar>(2);
const fileName outFileName = args[3];
const scalar scaling = args.lookupOrDefault<scalar>("scale", -1);
const scalar scaling = args.opt<scalar>("scale", -1);
Info<< "Reading surface from " << surfFileName << " ..." << nl
<< "Merging points within " << mergeTol << " metre." << nl;

2
applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C
View File

@ -174,7 +174,7 @@ int main(int argc, char *argv[])
IOobject::MUST_READ,
IOobject::NO_WRITE
),
args.lookupOrDefault<fileName>("decomposeParDict", "")
args.opt<fileName>("decomposeParDict", "")
)
);

2
applications/utilities/surface/surfaceToPatch/surfaceToPatch.C
View File

@ -211,7 +211,7 @@ int main(int argc, char *argv[])
<< " triangle ..." << endl;
}
const scalar searchTol = args.lookupOrDefault("tol", 1e-3);
const scalar searchTol = args.opt<scalar>("tol", 1e-3);
// Get search box. Anything not within this box will not be considered.
const boundBox& meshBb = mesh.bounds();