mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
STYLE: argList::opt method instead of the longer argList::lookupOrDefault
- also replaced a few instances of readIfPresent with opt<> for constant values.
This commit is contained in:
@ -320,7 +320,7 @@ int main(int argc, char *argv[])
|
||||
FatalError.exit();
|
||||
}
|
||||
|
||||
const scalar scaleFactor = args.lookupOrDefault<scalar>("scale", 1);
|
||||
const scalar scaleFactor = args.opt<scalar>("scale", 1);
|
||||
|
||||
#include "createTime.H"
|
||||
|
||||
|
||||
@ -186,7 +186,7 @@ int main(int argc, char *argv[])
|
||||
}
|
||||
|
||||
// By default, no scaling
|
||||
const scalar scaleFactor = args.lookupOrDefault<scalar>("scale", 1);
|
||||
const scalar scaleFactor = args.opt<scalar>("scale", 1);
|
||||
|
||||
// Default to binary output, unless otherwise specified
|
||||
const IOstream::streamFormat format =
|
||||
|
||||
@ -69,7 +69,7 @@ int main(int argc, char *argv[])
|
||||
FatalError.exit();
|
||||
}
|
||||
|
||||
const scalar scaleFactor = args.lookupOrDefault<scalar>("scale", 1);
|
||||
const scalar scaleFactor = args.opt<scalar>("scale", 1);
|
||||
|
||||
#include "createTime.H"
|
||||
|
||||
|
||||
@ -103,7 +103,7 @@ int main(int argc, char *argv[])
|
||||
(
|
||||
args[1],
|
||||
// Default no scaling
|
||||
args.lookupOrDefault<scalar>("scale", 1)
|
||||
args.opt<scalar>("scale", 1)
|
||||
);
|
||||
|
||||
|
||||
|
||||
@ -902,7 +902,7 @@ int main(int argc, char *argv[])
|
||||
FatalError.exit();
|
||||
}
|
||||
|
||||
const scalar scaleFactor = args.lookupOrDefault<scalar>("scale", 1);
|
||||
const scalar scaleFactor = args.opt<scalar>("scale", 1);
|
||||
|
||||
const bool writeSets = args.found("writeSets");
|
||||
const bool writeZones = args.found("writeZones");
|
||||
|
||||
@ -96,7 +96,7 @@ int main(int argc, char *argv[])
|
||||
}
|
||||
|
||||
// Default rescale from [m] to [mm]
|
||||
const scalar scaleFactor = args.lookupOrDefault<scalar>("scale", 1000);
|
||||
const scalar scaleFactor = args.opt<scalar>("scale", 1000);
|
||||
const bool writeBndFile = !args.found("noBnd");
|
||||
|
||||
#include "createPolyMesh.H"
|
||||
|
||||
@ -81,8 +81,7 @@ int main(int argc, char *argv[])
|
||||
|
||||
fileName exportName = args[1];
|
||||
|
||||
scalar scaleFactor = 0;
|
||||
args.readIfPresent<scalar>("scale", scaleFactor);
|
||||
const scalar scaleFactor = args.opt<scalar>("scale", 0);
|
||||
const bool doTriangulate = args.found("tri");
|
||||
|
||||
fileName exportBase = exportName.lessExt();
|
||||
|
||||
@ -646,7 +646,7 @@ int main(int argc, char *argv[])
|
||||
FatalError.exit();
|
||||
}
|
||||
|
||||
const scalar scaleFactor = args.lookupOrDefault<scalar>("scale", 1);
|
||||
const scalar scaleFactor = args.opt<scalar>("scale", 1);
|
||||
|
||||
#include "createTime.H"
|
||||
|
||||
|
||||
@ -784,16 +784,11 @@ int main(int argc, char *argv[])
|
||||
#include "setRootCase.H"
|
||||
#include "createTime.H"
|
||||
|
||||
Foam::word regionName;
|
||||
word regionName = polyMesh::defaultRegion;
|
||||
|
||||
if (args.readIfPresent("region", regionName))
|
||||
{
|
||||
Foam::Info
|
||||
<< "Creating polyMesh for region " << regionName << endl;
|
||||
}
|
||||
else
|
||||
{
|
||||
regionName = Foam::polyMesh::defaultRegion;
|
||||
Info<< "Creating polyMesh for region " << regionName << endl;
|
||||
}
|
||||
|
||||
const bool keepOrientation = args.found("keepOrientation");
|
||||
|
||||
@ -85,8 +85,7 @@ int main(int argc, char *argv[])
|
||||
#include "setRootCase.H"
|
||||
#include "createTime.H"
|
||||
|
||||
const fileName kivaFileName =
|
||||
args.lookupOrDefault<fileName>("file", "otape17");
|
||||
const fileName kivaFileName = args.opt<fileName>("file", "otape17");
|
||||
|
||||
kivaVersions kivaVersion = kiva3v;
|
||||
if (args.found("version"))
|
||||
@ -112,8 +111,7 @@ int main(int argc, char *argv[])
|
||||
}
|
||||
}
|
||||
|
||||
scalar zHeadMin = -GREAT;
|
||||
args.readIfPresent("zHeadMin", zHeadMin);
|
||||
const scalar zHeadMin = args.opt<scalar>("zHeadMin", -GREAT);
|
||||
|
||||
#include "readKivaGrid.H"
|
||||
|
||||
|
||||
@ -94,7 +94,7 @@ int main(int argc, char *argv[])
|
||||
FatalError.exit();
|
||||
}
|
||||
|
||||
const scalar scaleFactor = args.lookupOrDefault<scalar>("scale", 1);
|
||||
const scalar scaleFactor = args.opt<scalar>("scale", 1);
|
||||
|
||||
const bool readBlank = !args.found("noBlank");
|
||||
const bool singleBlock = args.found("singleBlock");
|
||||
|
||||
@ -113,7 +113,7 @@ int main(int argc, char *argv[])
|
||||
prefix,
|
||||
runTime,
|
||||
// Default rescale from [mm] to [m]
|
||||
args.lookupOrDefault<scalar>("scale", 0.001),
|
||||
args.opt<scalar>("scale", 0.001),
|
||||
args.found("solids")
|
||||
);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user