From 860b1bf1eb6f05c76fa28f42f390f77454882b53 Mon Sep 17 00:00:00 2001
From: laurence <laurence>
Date: Tue, 7 Feb 2012 12:42:23 +0000
Subject: [PATCH] BUG: cvMesh: Update tutorial dictionaries

---
 tutorials/mesh/cvMesh/blob/system/cvMeshDict  | 58 ++++++++-----------
 .../mesh/cvMesh/flange/system/cvMeshDict      | 49 +++++++---------
 .../cvMesh/simpleShapes/system/cvMeshDict     | 28 ++++-----
 3 files changed, 57 insertions(+), 78 deletions(-)

diff --git a/tutorials/mesh/cvMesh/blob/system/cvMeshDict b/tutorials/mesh/cvMesh/blob/system/cvMeshDict
index f04672b2eea..3c50fbb81d5 100644
--- a/tutorials/mesh/cvMesh/blob/system/cvMeshDict
+++ b/tutorials/mesh/cvMesh/blob/system/cvMeshDict
@@ -59,6 +59,7 @@ initialPoints
 
     autoDensityCoeffs
     {
+        minCellSizeLimit 0.04;
         minLevels 0;
         maxSizeRatio 5.0;
         sampleResolution 5;
@@ -92,44 +93,34 @@ surfaceConformation
 
     surfaceConformationRebuildFrequency 10;
 
-    coarseConformationControls
+    conformationControls
     {
         initial
         {
-            edgeSearchDistCoeff         1.1;
-            surfacePtReplaceDistCoeff   0.5;
+            edgeSearchDistCoeff             2;
+            surfacePtReplaceDistCoeff       0.5;
+            surfacePtExclusionDistanceCoeff 0.5;
         }
 
         iteration
         {
-            edgeSearchDistCoeff         1.25;
+            edgeSearchDistCoeff         1.5;
             surfacePtReplaceDistCoeff   0.7;
         }
 
         maxIterations 15;
 
-        iterationToIntialHitRatioLimit 0.01;
-        iterationToInitialHitRatioLimit 0.01;
+        iterationToInitialHitRatioLimit 0.0001;
     }
 
-    fineConformationControls
+    coarseConformationControls
     {
-        initial
-        {
-            edgeSearchDistCoeff         1.1;
-            surfacePtReplaceDistCoeff   0.5;
-        }
-
-        iteration
-        {
-            edgeSearchDistCoeff         1.25;
-            surfacePtReplaceDistCoeff   0.7;
-        }
-
-        maxIterations 15;
+        $conformationControls;
+    }
 
-        iterationToInitialHitRatioLimit 0.002;
-        iterationToIntialHitRatioLimit 0.002;
+    fineConformationControls
+    {
+        $conformationControls;
     }
 
     geometryToConformTo
@@ -197,7 +188,7 @@ motionControl
 
     pointRemovalCriteria
     {
-        cellCentreDistCoeff  0.65;
+        cellCentreDistCoeff     0.65;
     }
 
     faceAreaWeightModel piecewiseLinearRamp;
@@ -225,20 +216,21 @@ polyMeshFiltering
     maxCollapseFaceToPointSideLengthCoeff   0.35;
 }
 
+
 meshQualityControls
 {
-    maxNonOrtho 65;
+    maxNonOrtho         65;
     maxBoundarySkewness 50;
     maxInternalSkewness 10;
-    maxConcave 80;
-    minVol 1e-20;
-    minTetQuality 1e-30;
-    minArea -1;
-    minTwist 0.0;
-    minDeterminant 0.001;
-    minFaceWeight 0.02;
-    minVolRatio 0.01;
-    minTriangleTwist -1;
+    maxConcave          80;
+    minVol              1e-20;
+    minTetQuality       1e-30;
+    minArea             -1;
+    minTwist            0.0;
+    minDeterminant      0.001;
+    minFaceWeight       0.02;
+    minVolRatio         0.01;
+    minTriangleTwist    -1;
 }
 
 // ************************************************************************* //
diff --git a/tutorials/mesh/cvMesh/flange/system/cvMeshDict b/tutorials/mesh/cvMesh/flange/system/cvMeshDict
index 9a70592ff66..eba392103d9 100644
--- a/tutorials/mesh/cvMesh/flange/system/cvMeshDict
+++ b/tutorials/mesh/cvMesh/flange/system/cvMeshDict
@@ -63,17 +63,18 @@ surfaceConformation
 
     surfaceConformationRebuildFrequency 10;
 
-    coarseConformationControls
+    conformationControls
     {
         initial
         {
-            edgeSearchDistCoeff         1.1;
+            edgeSearchDistCoeff         2;
             surfacePtReplaceDistCoeff   0.5;
+            surfacePtExclusionDistanceCoeff 0.5;
         }
 
         iteration
         {
-            edgeSearchDistCoeff         1.25;
+            edgeSearchDistCoeff         1.5;
             surfacePtReplaceDistCoeff   0.7;
         }
 
@@ -82,23 +83,14 @@ surfaceConformation
         iterationToInitialHitRatioLimit 0.001;
     }
 
-    fineConformationControls
+    coarseConformationControls
     {
-        initial
-        {
-            edgeSearchDistCoeff         1.1;
-            surfacePtReplaceDistCoeff   0.5;
-        }
-
-        iteration
-        {
-            edgeSearchDistCoeff         1.25;
-            surfacePtReplaceDistCoeff   0.7;
-        }
-
-        maxIterations 15;
+        $conformationControls;
+    }
 
-        iterationToInitialHitRatioLimit 0.001;
+    fineConformationControls
+    {
+        $conformationControls;
     }
 
     geometryToConformTo
@@ -125,6 +117,7 @@ initialPoints
 
     autoDensityCoeffs
     {
+        minCellSizeLimit 0.001;
         minLevels 1;
         maxSizeRatio 3.0;
         sampleResolution 4;
@@ -221,18 +214,18 @@ polyMeshFiltering
 
 meshQualityControls
 {
-    maxNonOrtho 65;
+    maxNonOrtho         65;
     maxBoundarySkewness 50;
     maxInternalSkewness 10;
-    maxConcave 80;
-    minTetQuality 1e-30;
-    minVol 0;
-    minArea -1;
-    minTwist 0.001;
-    minDeterminant 0.001;
-    minFaceWeight 0.02;
-    minVolRatio 0.01;
-    minTriangleTwist -1;
+    maxConcave          80;
+    minTetQuality       1e-30;
+    minVol              0;
+    minArea             -1;
+    minTwist            0.001;
+    minDeterminant      0.001;
+    minFaceWeight       0.02;
+    minVolRatio         0.01;
+    minTriangleTwist    -1;
 }
 
 
diff --git a/tutorials/mesh/cvMesh/simpleShapes/system/cvMeshDict b/tutorials/mesh/cvMesh/simpleShapes/system/cvMeshDict
index 0d6d392f78f..2d7c9faed29 100644
--- a/tutorials/mesh/cvMesh/simpleShapes/system/cvMeshDict
+++ b/tutorials/mesh/cvMesh/simpleShapes/system/cvMeshDict
@@ -121,7 +121,7 @@ surfaceConformation
     surfaceConformationRebuildFrequency 10;
 
     // Initial and intermediate controls
-    coarseConformationControls
+    conformationControls
     {
         // Initial conformation
         initial
@@ -138,6 +138,9 @@ surfaceConformation
             // - fraction of the local target cell size. Coarse
             // conformation, initial protrusion tests.
             surfacePtReplaceDistCoeff   0.5;
+
+            
+            surfacePtExclusionDistanceCoeff 0.5;
         }
 
         // Same for iterations
@@ -156,24 +159,14 @@ surfaceConformation
         iterationToInitialHitRatioLimit 0.001;
     }
 
-    // Final (at endTime) controls
-    fineConformationControls
+    coarseConformationControls
     {
-        initial
-        {
-            edgeSearchDistCoeff         1.1;
-            surfacePtReplaceDistCoeff   0.5;
-        }
-
-        iteration
-        {
-            edgeSearchDistCoeff         1.25;
-            surfacePtReplaceDistCoeff   0.7;
-        }
-
-        maxIterations 15;
+        $conformationControls;
+    }
 
-        iterationToInitialHitRatioLimit 0.001;
+    fineConformationControls
+    {
+        $conformationControls;
     }
 
     // Geometry to mesh to
@@ -213,6 +206,7 @@ initialPoints
     // samples (due to target cell size) in box split box.
     autoDensityCoeffs
     {
+        minCellSizeLimit 0.1;
         // Initial number of refinement levels. Needs to be enough to pick
         // up features due to size ratio. If not enough it will take longer
         // to determine point seeding.
-- 
GitLab