Commit aa6f0170 authored by laurence's avatar laurence
Browse files

ENH: Add surfaceLambdaMuSmooth utility and remove surfaceSmooth

Set lambda to the relaxation factor and mu to zero to replicate
laplacian smoothing from surfaceSmooth in the new utility
parent 28868e97
surfaceLambdaMuSmooth.C
EXE = $(FOAM_APPBIN)/surfaceLambdaMuSmooth
EXE_INC = \
-I$(LIB_SRC)/surfMesh/lnInclude
-I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/edgeMesh/lnInclude
EXE_LIBS = \
-lmeshTools \
-ledgeMesh \
-lsurfMesh
......@@ -22,91 +22,215 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Application
surfaceSmooth
surfaceLambdaMuSmooth
Description
Example of a simple laplacian smoother.
Smooths a surface using lambda/mu smoothing.
To get laplacian smoothing, set lambda to the relaxation factor and mu to
zero.
Provide an edgeMesh file containing points that are not to be moved during
smoothing in order to preserve features.
\*---------------------------------------------------------------------------*/
#include "argList.H"
#include "OFstream.H"
#include "boundBox.H"
#include "edgeMesh.H"
#include "matchPoints.H"
#include "MeshedSurfaces.H"
using namespace Foam;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
tmp<pointField> avg
(
const meshedSurface& s,
const PackedBoolList& fixedPoints
)
{
const labelListList& pointEdges = s.pointEdges();
tmp<pointField> tavg(new pointField(s.nPoints(), vector::zero));
pointField& avg = tavg();
forAll(pointEdges, vertI)
{
vector& avgPos = avg[vertI];
if (fixedPoints[vertI])
{
avgPos = s.localPoints()[vertI];
}
else
{
const labelList& pEdges = pointEdges[vertI];
forAll(pEdges, myEdgeI)
{
const edge& e = s.edges()[pEdges[myEdgeI]];
label otherVertI = e.otherVertex(vertI);
avgPos += s.localPoints()[otherVertI];
}
avgPos /= pEdges.size();
}
}
return tavg;
}
void getFixedPoints
(
const edgeMesh& feMesh,
const pointField& points,
PackedBoolList& fixedPoints
)
{
scalarList matchDistance(feMesh.points().size(), 1e-1);
labelList from0To1;
bool matchedAll = matchPoints
(
feMesh.points(),
points,
matchDistance,
false,
from0To1
);
if (!matchedAll)
{
WarningIn("getFixedPoints(const edgeMesh&, const pointField&)")
<< "Did not match all feature points to points on the surface"
<< endl;
}
forAll(from0To1, fpI)
{
if (from0To1[fpI] != -1)
{
fixedPoints[from0To1[fpI]] = true;
}
}
}
// Main program:
int main(int argc, char *argv[])
{
argList::noParallel();
argList::validOptions.clear();
argList::validArgs.append("surfaceFile");
argList::validArgs.append("underrelax factor (0..1)");
argList::validArgs.append("lambda (0..1)");
argList::validArgs.append("mu (0..1)");
argList::validArgs.append("iterations");
argList::validArgs.append("output surfaceFile");
argList::addOption
(
"featureFile",
"fix points from a file containing feature points and edges"
);
argList args(argc, argv);
const fileName surfFileName = args[1];
const scalar relax = args.argRead<scalar>(2);
const label iters = args.argRead<label>(3);
const fileName outFileName = args[4];
const scalar lambda = args.argRead<scalar>(2);
const scalar mu = args.argRead<scalar>(3);
const label iters = args.argRead<label>(4);
const fileName outFileName = args[5];
if (relax <= 0 || relax > 1)
if (lambda < 0 || lambda > 1)
{
FatalErrorIn(args.executable()) << "Illegal relaxation factor "
<< lambda << endl
<< "0: no change 1: move vertices to average of neighbours"
<< exit(FatalError);
}
if (mu < 0 || mu > 1)
{
FatalErrorIn(args.executable()) << "Illegal relaxation factor "
<< relax << endl
<< mu << endl
<< "0: no change 1: move vertices to average of neighbours"
<< exit(FatalError);
}
Info<< "Relax:" << relax << nl
<< "Iters:" << iters << nl
Info<< "lambda : " << lambda << nl
<< "mu : " << mu << nl
<< "Iters : " << iters << nl
<< "Reading surface from " << surfFileName << " ..." << endl;
meshedSurface surf1(surfFileName);
Info<< "Faces : " << surf1.size() << nl
<< "Vertices : " << surf1.nPoints() << nl
<< "Bounding Box : " << boundBox(surf1.localPoints()) << endl;
Info<< "Faces : " << surf1.size() << nl
<< "Vertices : " << surf1.nPoints() << nl
<< "Bounding Box: " << boundBox(surf1.localPoints()) << endl;
pointField newPoints(surf1.localPoints());
PackedBoolList fixedPoints(surf1.localPoints().size(), false);
if (args.optionFound("featureFile"))
{
const fileName featureFileName(args.option("featureFile"));
Info<< "Reading features from " << featureFileName << " ..." << endl;
edgeMesh feMesh(featureFileName);
const labelListList& pointEdges = surf1.pointEdges();
getFixedPoints(feMesh, surf1.localPoints(), fixedPoints);
Info<< "Number of fixed points on surface = " << fixedPoints.count()
<< endl;
}
pointField newPoints(surf1.localPoints());
for (label iter = 0; iter < iters; iter++)
{
forAll(pointEdges, vertI)
// Lambda
{
vector avgPos(vector::zero);
pointField newLocalPoints
(
(1 - lambda)*surf1.localPoints()
+ lambda*avg(surf1, fixedPoints)
);
const labelList& myEdges = pointEdges[vertI];
pointField newPoints(surf1.points());
UIndirectList<point>(newPoints, surf1.meshPoints()) =
newLocalPoints;
forAll(myEdges, myEdgeI)
{
const edge& e = surf1.edges()[myEdges[myEdgeI]];
surf1.movePoints(newPoints);
}
label otherVertI = e.otherVertex(vertI);
// Mu
{
pointField newLocalPoints
(
(1 + mu)*surf1.localPoints()
- mu*avg(surf1, fixedPoints)
);
avgPos += surf1.localPoints()[otherVertI];
}
avgPos /= myEdges.size();
pointField newPoints(surf1.points());
UIndirectList<point>(newPoints, surf1.meshPoints()) =
newLocalPoints;
newPoints[vertI] = (1-relax)*newPoints[vertI] + relax*avgPos;
surf1.movePoints(newPoints);
}
}
Info<< "Writing surface to " << outFileName << " ..." << endl;
meshedSurface
(
xferMove(newPoints),
xferCopy(surf1.localFaces()),
xferCopy(surf1.surfZones())
).write(outFileName);
// meshedSurface
// (
// xferMove(newPoints),
// xferCopy(surf1.localFaces()),
// xferCopy(surf1.surfZones())
// ).write(outFileName);
surf1.write(outFileName);
Info<< "End\n" << endl;
......
surfaceSmooth.C
EXE = $(FOAM_APPBIN)/surfaceSmooth
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment