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

merging master, fixing conflict in surfaceFeatureExtract.

Browse Source
This commit is contained in:
graham
2009-05-20 18:40:50 +01:00
parent a0d9d0690a 8edf105c45
commit 8416ec4ebc
192 changed files with 1487 additions and 1635 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
View File

@ -144,20 +144,17 @@ int main(int argc, char *argv[])
surfaceFeatures set(surf);
if (args.options().found("set"))
if (args.optionFound("set"))
{
fileName setName(args.options()["set"]);
fileName setName(args.option("set"));
Pout<< "Reading existing feature set from file " << setName << endl;
set = surfaceFeatures(surf, setName);
}
else if (args.options().found("includedAngle"))
else if (args.optionFound("includedAngle"))
{
scalar includedAngle
(
readScalar(IStringStream(args.options()["includedAngle"])())
);
scalar includedAngle = args.optionRead<scalar>("includedAngle");
Pout<< "Constructing feature set from included angle " << includedAngle
<< endl;
@ -195,16 +192,14 @@ int main(int argc, char *argv[])
// ~~~~~~~~
scalar minLen = -GREAT;
if (args.options().found("minLen"))
if (args.optionReadIfPresent("minLen", minLen))
{
minLen = readScalar(IStringStream(args.options()["minLen"])());
Pout<< "Removing features of length < " << minLen << endl;
}
label minElem = 0;
if (args.options().found("minElem"))
if (args.optionReadIfPresent("minElem", minElem))
{
minElem = readLabel(IStringStream(args.options()["minElem"])());
Pout<< "Removing features with number of edges < " << minElem << endl;
}
@ -223,9 +218,9 @@ int main(int argc, char *argv[])
// Convert to marked edges, points
List<surfaceFeatures::edgeStatus> edgeStat(set.toStatus());
if (args.options().found("subsetBox"))
if (args.optionFound("subsetBox"))
{
treeBoundBox bb(IStringStream(args.options()["subsetBox"])());
treeBoundBox bb(args.optionLookup("subsetBox")());
Pout<< "Removing all edges outside bb " << bb << endl;
dumpBox(bb, "subsetBox.obj");
@ -238,9 +233,9 @@ int main(int argc, char *argv[])
edgeStat
);
}
else if (args.options().found("deleteBox"))
else if (args.optionFound("deleteBox"))
{
treeBoundBox bb(IStringStream(args.options()["deleteBox"])());
treeBoundBox bb(args.optionLookup("deleteBox")());
Pout<< "Removing all edges inside bb " << bb << endl;
dumpBox(bb, "deleteBox.obj");