From e1f953e19e83c32be21d7cd03300255701d98073 Mon Sep 17 00:00:00 2001
From: graham <g.macpherson@opencfd.co.uk>
Date: Thu, 14 Jan 2010 19:05:43 +0000
Subject: [PATCH] Progressively limited face filtering based on value of
 filterCount.

---
 .../conformalVoronoiMesh.H                    |  3 +-
 .../conformalVoronoiMeshCalcDualMesh.C        | 56 ++++++++++++-------
 .../cvControls/cvControls.C                   | 10 ++++
 .../cvControls/cvControls.H                   | 16 ++++++
 .../cvControls/cvControlsI.H                  | 14 +++++
 5 files changed, 77 insertions(+), 22 deletions(-)

diff --git a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
index 0a62fc2ee0..ee6fcf10a0 100644
--- a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
+++ b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
@@ -545,7 +545,8 @@ private:
             pointField& pts,
             Map<label>& dualPtIndexMap,
             scalar targetFaceSize,
-            scalar collapseSizeLimitCoeff
+            scalar collapseSizeLimitCoeff,
+            label maxFC
         ) const;
 
         //- Identify the face labels of the deferred collapse faces
diff --git a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
index 1fcff45b23..f46b03d4c6 100644
--- a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
+++ b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
@@ -497,9 +497,11 @@ void Foam::conformalVoronoiMesh::smoothSurface(pointField& pts)
     {
         label ptI = cit->cellIndex();
 
-        if (cit->filterCount() > 0)
+        label fC = cit->filterCount();
+
+        if (fC > cvMeshControls().filterCountSkipThreshold())
         {
-            // This vertex has been limited, skip
+            // This vertex has been limited too many times, skip
             continue;
         }
 
@@ -533,7 +535,11 @@ void Foam::conformalVoronoiMesh::smoothSurface(pointField& pts)
 
                 if (surfHit.hit())
                 {
-                    pt = surfHit.hitPoint();
+                    pt +=
+                    (surfHit.hitPoint() - pt)
+                   *pow(cvMeshControls().filterErrorReductionCoeff(), fC);
+
+                    // pt = surfHit.hitPoint();
                 }
             }
         }
@@ -600,9 +606,10 @@ Foam::label Foam::conformalVoronoiMesh::smoothSurfaceDualFaces
 
             label maxFC = maxFilterCount(eit);
 
-            if (maxFC > 0)
+            if (maxFC > cvMeshControls().filterCountSkipThreshold())
             {
-                // A vertex on this face has been limited, skip
+                // A vertex on this face has been limited too many
+                // times, skip
                 continue;
             }
 
@@ -665,7 +672,8 @@ Foam::label Foam::conformalVoronoiMesh::smoothSurfaceDualFaces
                     pts,
                     dualPtIndexMap,
                     targetFaceSize,
-                    GREAT
+                    GREAT,
+                    maxFC
                 );
 
                 if (mode == fcmPoint || mode == fcmEdge)
@@ -777,9 +785,10 @@ Foam::label Foam::conformalVoronoiMesh::collapseFaces
 
             label maxFC = maxFilterCount(eit);
 
-            if (maxFC > 0)
+            if (maxFC > cvMeshControls().filterCountSkipThreshold())
             {
-                // A vertex on this face has been limited, skip
+                // A vertex on this face has been limited too many
+                // times, skip
                 continue;
             }
 
@@ -791,7 +800,8 @@ Foam::label Foam::conformalVoronoiMesh::collapseFaces
                 pts,
                 dualPtIndexMap,
                 targetFaceSize,
-                collapseSizeLimitCoeff
+                collapseSizeLimitCoeff,
+                maxFC
             );
 
             if (mode != fcmNone)
@@ -834,13 +844,27 @@ Foam::conformalVoronoiMesh::collapseFace
     pointField& pts,
     Map<label>& dualPtIndexMap,
     scalar targetFaceSize,
-    scalar collapseSizeLimitCoeff
+    scalar collapseSizeLimitCoeff,
+    label maxFC
 ) const
 {
     bool limitToQuadsOrTris = false;
 
     bool allowEarlyCollapseToPoint = true;
 
+    // if (maxFC > cvMeshControls().filterCountSkipThreshold() - 3)
+    // {
+    //     limitToQuadsOrTris = true;
+
+    //     allowEarlyCollapseToPoint = false;
+    // }
+
+    collapseSizeLimitCoeff *= pow
+    (
+        cvMeshControls().filterErrorReductionCoeff(),
+        maxFC
+    );
+
     const vector fC = f.centre(pts);
 
     vector fN = f.normal(pts);
@@ -934,11 +958,6 @@ Foam::conformalVoronoiMesh::collapseFace
         WarningIn
         (
             "Foam::conformalVoronoiMesh::collapseFace"
-            "("
-                "const face& f,"
-                "pointField& pts,"
-                "Map<label>& dualPtIndexMap"
-            ") const"
         )
             << "No collapse axis found for face, not collapsing."
             << endl;
@@ -1019,11 +1038,6 @@ Foam::conformalVoronoiMesh::collapseFace
         WarningIn
         (
             "Foam::conformalVoronoiMesh::collapseFace"
-            "("
-                "const face& f,"
-                "pointField& pts,"
-                "Map<label>& dualPtIndexMap"
-            ") const"
         )
             << "All points on one side of face centre, not collapsing."
             << endl;
@@ -1290,7 +1304,7 @@ Foam::label Foam::conformalVoronoiMesh::checkPolyMeshQuality
 
     motionSmoother::checkMesh
     (
-        false,  // report
+        false,
         pMesh,
         cvMeshControls().cvMeshDict().subDict("meshQualityControls"),
         wrongFaces
diff --git a/src/mesh/conformalVoronoiMesh/cvControls/cvControls.C b/src/mesh/conformalVoronoiMesh/cvControls/cvControls.C
index 53e1d5309b..1c31cf0e1f 100644
--- a/src/mesh/conformalVoronoiMesh/cvControls/cvControls.C
+++ b/src/mesh/conformalVoronoiMesh/cvControls/cvControls.C
@@ -166,6 +166,16 @@ Foam::cvControls::cvControls
         )
     );
 
+    filterErrorReductionCoeff_ = readScalar
+    (
+        filteringDict.lookup("filterErrorReductionCoeff")
+    );
+
+    filterCountSkipThreshold_ = readLabel
+    (
+        filteringDict.lookup("filterCountSkipThreshold")
+    );
+
     surfaceStepFaceAngle_ = readScalar
     (
         filteringDict.lookup("surfaceStepFaceAngle")
diff --git a/src/mesh/conformalVoronoiMesh/cvControls/cvControls.H b/src/mesh/conformalVoronoiMesh/cvControls/cvControls.H
index 5d62f228cc..82435fa260 100644
--- a/src/mesh/conformalVoronoiMesh/cvControls/cvControls.H
+++ b/src/mesh/conformalVoronoiMesh/cvControls/cvControls.H
@@ -159,6 +159,16 @@ class cvControls
         //  with filtering anyway?
         Switch continueFilteringOnBadInitialPolyMesh_;
 
+        //- When a face is "bad", what fraction should the
+        //- filterSizeCoeff_ be reduced by.  Recursive, so for a
+        //- filterCount value of fC, the filterSizeCoeff is reduced
+        //- by pow(filterErrorReductionCoeff_, fC)
+        scalar filterErrorReductionCoeff_;
+
+        //- Maximum number of filterCount applications before a face
+        //  is not attempted to be filtered.
+        label filterCountSkipThreshold_;
+
         //- The maximum allowed angle between a boundary face normal
         //  and the local surface normal before face will be
         //  aggressively collapsed
@@ -277,6 +287,12 @@ public:
             //- Return the continueFilteringOnBadInitialPolyMesh Switch
             inline Switch continueFilteringOnBadInitialPolyMesh() const;
 
+            //- Return the filterErrorReductionCoeff
+            inline scalar filterErrorReductionCoeff() const;
+
+            //- Return the filterCountSkipThreshold
+            inline label filterCountSkipThreshold() const;
+
             //- Return the surfaceStepFaceAngle
             inline scalar surfaceStepFaceAngle() const;
 
diff --git a/src/mesh/conformalVoronoiMesh/cvControls/cvControlsI.H b/src/mesh/conformalVoronoiMesh/cvControls/cvControlsI.H
index 3fe37fe44d..9fe3c71995 100644
--- a/src/mesh/conformalVoronoiMesh/cvControls/cvControlsI.H
+++ b/src/mesh/conformalVoronoiMesh/cvControls/cvControlsI.H
@@ -159,6 +159,20 @@ Foam::cvControls::continueFilteringOnBadInitialPolyMesh() const
 }
 
 
+inline Foam::scalar
+Foam::cvControls::filterErrorReductionCoeff() const
+{
+    return filterErrorReductionCoeff_;
+}
+
+
+inline Foam::label
+Foam::cvControls::filterCountSkipThreshold() const
+{
+    return filterCountSkipThreshold_;
+}
+
+
 inline Foam::scalar Foam::cvControls::surfaceStepFaceAngle() const
 {
     return surfaceStepFaceAngle_;