From aa6f0170a38507c781b39f66136d66cf134facea Mon Sep 17 00:00:00 2001 From: laurence Date: Mon, 3 Jun 2013 14:30:51 +0100 Subject: [PATCH] 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 --- .../surface/surfaceLambdaMuSmooth/Make/files | 3 + .../surfaceLambdaMuSmooth/Make/options | 7 + .../surfaceLambdaMuSmooth.C | 241 ++++++++++++++++++ .../surface/surfaceSmooth/Make/files | 3 - .../surface/surfaceSmooth/Make/options | 6 - .../surface/surfaceSmooth/surfaceSmooth.C | 117 --------- 6 files changed, 251 insertions(+), 126 deletions(-) create mode 100644 applications/utilities/surface/surfaceLambdaMuSmooth/Make/files create mode 100644 applications/utilities/surface/surfaceLambdaMuSmooth/Make/options create mode 100644 applications/utilities/surface/surfaceLambdaMuSmooth/surfaceLambdaMuSmooth.C delete mode 100644 applications/utilities/surface/surfaceSmooth/Make/files delete mode 100644 applications/utilities/surface/surfaceSmooth/Make/options delete mode 100644 applications/utilities/surface/surfaceSmooth/surfaceSmooth.C diff --git a/applications/utilities/surface/surfaceLambdaMuSmooth/Make/files b/applications/utilities/surface/surfaceLambdaMuSmooth/Make/files new file mode 100644 index 0000000000..5ea13225b8 --- /dev/null +++ b/applications/utilities/surface/surfaceLambdaMuSmooth/Make/files @@ -0,0 +1,3 @@ +surfaceLambdaMuSmooth.C + +EXE = $(FOAM_APPBIN)/surfaceLambdaMuSmooth diff --git a/applications/utilities/surface/surfaceLambdaMuSmooth/Make/options b/applications/utilities/surface/surfaceLambdaMuSmooth/Make/options new file mode 100644 index 0000000000..c35bf55e39 --- /dev/null +++ b/applications/utilities/surface/surfaceLambdaMuSmooth/Make/options @@ -0,0 +1,7 @@ +EXE_INC = \ + -I$(LIB_SRC)/surfMesh/lnInclude \ + -I$(LIB_SRC)/edgeMesh/lnInclude + +EXE_LIBS = \ + -ledgeMesh \ + -lsurfMesh diff --git a/applications/utilities/surface/surfaceLambdaMuSmooth/surfaceLambdaMuSmooth.C b/applications/utilities/surface/surfaceLambdaMuSmooth/surfaceLambdaMuSmooth.C new file mode 100644 index 0000000000..0553dd457c --- /dev/null +++ b/applications/utilities/surface/surfaceLambdaMuSmooth/surfaceLambdaMuSmooth.C @@ -0,0 +1,241 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +Application + surfaceLambdaMuSmooth + +Description + 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 "boundBox.H" +#include "edgeMesh.H" +#include "matchPoints.H" +#include "MeshedSurfaces.H" + +using namespace Foam; + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +tmp avg +( + const meshedSurface& s, + const PackedBoolList& fixedPoints +) +{ + const labelListList& pointEdges = s.pointEdges(); + + tmp 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("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 lambda = args.argRead(2); + const scalar mu = args.argRead(3); + const label iters = args.argRead