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

Merge branch 'master' into cvm

Browse Source 
Conflicts:
	applications/utilities/surface/surfaceFeatureConvert/surfaceFeatureConvert.C
	applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
	src/Allwmake
	src/edgeMesh/Make/files
	src/edgeMesh/edgeMesh.C
	src/edgeMesh/edgeMesh.H
	src/edgeMesh/edgeMeshI.H
	src/edgeMesh/edgeMeshIO.C
	src/edgeMesh/featureEdgeMesh.C
	src/edgeMesh/featureEdgeMesh.H
	src/edgeMesh/featureEdgeMesh/featureEdgeMesh.C
	src/edgeMesh/featureEdgeMesh/featureEdgeMesh.H
	src/meshTools/searchableSurface/closedTriSurfaceMesh.C
	src/meshTools/searchableSurface/closedTriSurfaceMesh.H

Merged Mark's work on edgeMesh with my featureEdgeMesh.
This commit is contained in:
graham
2009-12-21 15:52:03 +00:00
parent bd81a6643d d241c43ac7
commit ff671ff1bb
1006 changed files with 499018 additions and 58103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -104,13 +104,13 @@ int main(int argc, char *argv[])
argList::validArgs.append("surface");
argList::validArgs.append("output set");
argList::validOptions.insert("includedAngle", "included angle [0..180]");
argList::validOptions.insert("set", "input feature set");
argList::addOption("includedAngle", "included angle [0..180]");
argList::addOption("set", "input feature set");
argList::validOptions.insert("minLen", "cumulative length of feature");
argList::validOptions.insert("minElem", "number of edges in feature");
argList::validOptions.insert("subsetBox", "((x0 y0 z0)(x1 y1 z1))");
argList::validOptions.insert("deleteBox", "((x0 y0 z0)(x1 y1 z1))");
argList::addOption("minLen", "cumulative length of feature");
argList::addOption("minElem", "number of edges in feature");
argList::addOption("subsetBox", "((x0 y0 z0)(x1 y1 z1))");
argList::addOption("deleteBox", "((x0 y0 z0)(x1 y1 z1))");
# include "setRootCase.H"
# include "createTime.H"
@ -204,7 +204,7 @@ int main(int argc, char *argv[])
}
// Trim away small groups of features
if (minLen > 0 || minLen > 0)
if (minElem > 0 || minLen > 0)
{
set.trimFeatures(minLen, minElem);
Pout<< endl << "Removed small features" << endl;