Merge branch 'enhancement-greedySmoothing' into development

meshLibrary/utilities/smoothers/geometry/meshOptimizer/optimizeMeshFV.C

@@ -340,9 +340,6 @@ void meshOptimizer::optimizeBoundaryLayer(const bool addBufferLayer)
         //- optimize mesh quality
         optimizeMeshFV(5, 1, 50, 0);
 
-        //- get rid of bad quality faces
-        optimizeLowQualityFaces(10);
-
         //- untangle remaining faces and lock the boundary layer cells
         untangleMeshFV(2, 50, 0);
 
@@ -514,7 +511,7 @@ void meshOptimizer::optimizeMeshNearBoundaries
     Info << "Iteration:" << flush;
     do
     {
-        tmo.optimiseUsingVolumeOptimizer(5);
+        tmo.optimiseUsingVolumeOptimizer(1);
 
         tetMesh.updateOrigMesh(&changedFace);
 
@@ -608,7 +605,7 @@ void meshOptimizer::optimizeMeshFVBestQuality
         //- update points in the mesh from the new coordinates in the tet mesh
         tetMesh.updateOrigMesh(&changedFace);
 
-    } while( ++nIter < maxNumIterations );
+    } while( (nIter < minIter+5) && (++nIter < maxNumIterations) );
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

utilities/improveMeshQuality/improveMeshQuality.C

@@ -31,8 +31,6 @@ Description
 #include "Time.H"
 #include "polyMeshGenModifier.H"
 #include "meshOptimizer.H"
-#include "meshSurfaceOptimizer.H"
-#include "meshSurfaceEngine.H"
 
 using namespace Foam;
 
@@ -111,10 +109,6 @@ int main(int argc, char *argv[])
     polyMeshGen pmg(runTime);
     pmg.read();
 
-    //- construct the surface smoother
-    meshSurfaceEngine mse(pmg);
-    meshSurfaceOptimizer surfOpt(mse);
-
     //- construct the smoother
     meshOptimizer mOpt(pmg);
 
@@ -132,19 +126,8 @@ int main(int argc, char *argv[])
         boolList activeCell(pmg.cells().size(), false);
         forAll(selectedCells, i)
             activeCell[selectedCells[i]] = true;
-
-        const labelList& faceOwner = mse.faceOwners();
-        forAll(faceOwner, bfI)
-            if( activeCell[faceOwner[bfI]] )
-                lockedBndFaces.append(bfI);
-
-        //- lock boundary faces
-        surfOpt.lockBoundaryFaces(lockedBndFaces);
     }
 
-    //- optimise mesh surface
-    surfOpt.optimizeSurface(nSurfaceIterations);
-
     //- clear geometry information before volume smoothing
     pmg.clearAddressingData();