From 32e7b52c8189dd621af2efde10725d1a742f7b74 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 24 Feb 2022 16:44:34 +0000
Subject: [PATCH] motionSmootherAlgoCheck::checkMesh: improved minVol test and
 removed unused tests

motionSmootherAlgoCheck::checkMesh is used by snappyHexMesh to check the mesh
after snapping and morphing.  The minVol test which checks for collapsed cells
is now relative to the cube of the minimum bounding box length so that it is
less dependent on the size of the geometry and less likely to need changing for
very small geometries.

The default value is set in
etc/caseDicts/mesh/generation/meshQualityDict
etc/caseDicts/mesh/generation/meshQualityDict.cfg

//- Minimum cell pyramid volume relative to min bounding box length^3
//  Set to a fraction of the smallest cell volume expected.
//  Set to very negative number (e.g. -1e30) to disable.
minVol 1e-10;

The unused minArea and minTriangleTwist tests have been removed
---
 etc/caseDicts/annotated/foamyHexMeshDict      | 10 +--
 etc/caseDicts/mesh/generation/meshQualityDict | 20 +----
 .../mesh/generation/meshQualityDict.cfg       | 13 +---
 .../motionSmoother/motionSmootherAlgoCheck.C  | 62 +---------------
 .../system/snappyHexMeshDict                  |  2 -
 .../RAS/propeller/system/snappyHexMeshDict    | 14 +---
 .../system/snappyHexMeshDict                  | 14 +---
 .../motorBike/system/snappyHexMeshDict        | 15 +---
 .../turbineSiting/system/snappyHexMeshDict    | 22 +-----
 .../foamyHexMesh/blob/system/meshQualityDict  | 12 +--
 .../flange/system/meshQualityDict             | 12 +--
 .../simpleShapes/system/meshQualityDict       | 12 +--
 .../RAS/DTCHull/system/meshQualityDict        | 19 +----
 .../RAS/DTCHullMoving/system/meshQualityDict  | 21 +-----
 .../RAS/DTCHullWave/system/meshQualityDict    | 19 +----
 .../mixerVesselAMI/system/snappyHexMeshDict   | 21 ++----
 .../RAS/planingHullW3/system/meshQualityDict  | 22 +-----
 .../RAS/propeller/system/snappyHexMeshDict    | 14 +---
 .../RAS/weirOverflow/system/blockMeshDict     | 74 ++++++++++++-------
 .../cavitatingBullet/system/snappyHexMeshDict | 13 +---
 20 files changed, 110 insertions(+), 301 deletions(-)

diff --git a/etc/caseDicts/annotated/foamyHexMeshDict b/etc/caseDicts/annotated/foamyHexMeshDict
index 975fd099d7..64a6f989cf 100644
--- a/etc/caseDicts/annotated/foamyHexMeshDict
+++ b/etc/caseDicts/annotated/foamyHexMeshDict
@@ -433,8 +433,8 @@ meshQualityControls
     //  Set to 180 to disable.
     maxConcave 80;
 
-    //- Minimum pyramid volume. Is absolute volume of cell pyramid.
-    //  Set to a sensible fraction of the smallest cell volume expected.
+    //- Minimum cell pyramid volume relative to min bounding box length^3
+    //  Set to a fraction of the smallest cell volume expected.
     //  Set to very negative number (e.g. -1e30) to disable.
     minVol -1e30;
 
@@ -449,9 +449,6 @@ meshQualityControls
     //      1 = regular tet
     minTetQuality 1e-30;
 
-    //- Minimum absolute face area. Set to <0 to disable.
-    minArea -1;
-
     //- Minimum face twist. Set to <-1 to disable. dot product of face normal
     //  and face centre triangles normal
     minTwist 0.02;
@@ -465,9 +462,6 @@ meshQualityControls
 
     //- minVolRatio (0 -> 1)
     minVolRatio 0.01;
-
-    // must be >0 for Fluent compatibility
-    minTriangleTwist -1;
 }
 
 
diff --git a/etc/caseDicts/mesh/generation/meshQualityDict b/etc/caseDicts/mesh/generation/meshQualityDict
index 3d2b18a6e9..cfe837b340 100644
--- a/etc/caseDicts/mesh/generation/meshQualityDict
+++ b/etc/caseDicts/mesh/generation/meshQualityDict
@@ -25,10 +25,10 @@ maxInternalSkewness 4;
 //  Set to 180 to disable.
 maxConcave 80;
 
-//- Minimum pyramid volume. Is absolute volume of cell pyramid.
-//  Set to a sensible fraction of the smallest cell volume expected.
+//- Minimum cell pyramid volume relative to min bounding box length^3
+//  Set to a fraction of the smallest cell volume expected.
 //  Set to very negative number (e.g. -1e30) to disable.
-minVol 1e-13;
+minVol 1e-10;
 
 //- Minimum quality of the tet formed by the face-centre
 //  and variable base point minimum decomposition triangles and
@@ -39,9 +39,6 @@ minVol 1e-13;
 //      1 = regular tet
 minTetQuality 1e-15;
 
-//- Minimum face area. Set to <0 to disable.
-minArea -1;
-
 //- Minimum face twist. Set to <-1 to disable. dot product of face normal
 // and face centre triangles normal
 minTwist 0.02;
@@ -61,20 +58,9 @@ minFaceWeight 0.05;
 //- Volume ratio of neighbouring cells (0 -> 1)
 minVolRatio 0.01;
 
-//- Per triangle normal compared to average normal. Like face twist
-//  but now per (face-centre decomposition) triangle. Must be >0 for Fluent
-//  compatibility
-minTriangleTwist -1;
-
 nSmoothScale   4;
 
 errorReduction 0.75;
 
-//- If >0 : preserve cells with all points on the surface if the
-//  resulting volume after snapping (by approximation) is larger than
-//  minVolCollapseRatio times old volume (i.e. not collapsed to flat cell).
-//  If <0 : delete always.
-//minVolCollapseRatio 0.1;
-
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/mesh/generation/meshQualityDict.cfg b/etc/caseDicts/mesh/generation/meshQualityDict.cfg
index b8a1f8f6a7..df7b2610b5 100644
--- a/etc/caseDicts/mesh/generation/meshQualityDict.cfg
+++ b/etc/caseDicts/mesh/generation/meshQualityDict.cfg
@@ -14,19 +14,10 @@ maxInternalSkewness 4;
 
 maxConcave        80;
 
-// Minimum cell pyramid volume; case dependent
-minVol            1e-13;
+minVol            1e-10;
 
 minTetQuality    -1e30;
 
-// if >0 : preserve single cells with all points on the surface if the
-// resulting volume after snapping (by approximation) is larger than
-// minVolCollapseRatio times old volume (i.e. not collapsed to flat cell).
-//  If <0 : delete always.
-//minVolCollapseRatio 0.5;
-
-minArea          -1;
-
 minTwist          0.02;
 
 minDeterminant    0.001;
@@ -35,8 +26,6 @@ minFaceWeight     0.05;
 
 minVolRatio       0.01;
 
-minTriangleTwist -1;
-
 nSmoothScale      4;
 
 errorReduction    0.75;
diff --git a/src/dynamicMesh/motionSmoother/motionSmootherAlgoCheck.C b/src/dynamicMesh/motionSmoother/motionSmootherAlgoCheck.C
index d002c35953..b8386e5112 100644
--- a/src/dynamicMesh/motionSmoother/motionSmootherAlgoCheck.C
+++ b/src/dynamicMesh/motionSmoother/motionSmootherAlgoCheck.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -76,10 +76,6 @@ bool Foam::motionSmootherAlgo::checkMesh
     (
         dict.lookup<scalar>("maxConcave", true)
     );
-    const scalar minArea
-    (
-        dict.lookup<scalar>("minArea", true)
-    );
     const scalar maxIntSkew
     (
         dict.lookup<scalar>("maxInternalSkewness", true)
@@ -100,10 +96,6 @@ bool Foam::motionSmootherAlgo::checkMesh
     (
         dict.lookup<scalar>("minTwist", true)
     );
-    const scalar minTriangleTwist
-    (
-        dict.lookup<scalar>("minTriangleTwist", true)
-    );
     scalar minFaceFlatness = -1.0;
     dict.readIfPresent("minFaceFlatness", minFaceFlatness, true);
     const scalar minDet
@@ -141,10 +133,12 @@ bool Foam::motionSmootherAlgo::checkMesh
 
     if (minVol > -great)
     {
+        const scalar refVol = pow3(mesh.bounds().minDim());
+
         polyMeshCheck::checkFacePyramids
         (
             report,
-            minVol,
+            minVol*refVol,
             mesh,
             mesh.cellCentres(),
             mesh.points(),
@@ -209,28 +203,6 @@ bool Foam::motionSmootherAlgo::checkMesh
         nWrongFaces = nNewWrongFaces;
     }
 
-    if (minArea > -small)
-    {
-        polyMeshCheck::checkFaceArea
-        (
-            report,
-            minArea,
-            mesh,
-            mesh.faceAreas(),
-            checkFaces,
-            &wrongFaces
-        );
-
-        label nNewWrongFaces = returnReduce(wrongFaces.size(), sumOp<label>());
-
-        Info<< "    faces with area < "
-            << setw(5) << minArea
-            << " m^2                            : "
-            << nNewWrongFaces-nWrongFaces << endl;
-
-        nWrongFaces = nNewWrongFaces;
-    }
-
     if (maxIntSkew > 0 || maxBounSkew > 0)
     {
         polyMeshCheck::checkFaceSkewness
@@ -333,32 +305,6 @@ bool Foam::motionSmootherAlgo::checkMesh
         nWrongFaces = nNewWrongFaces;
     }
 
-    if (minTriangleTwist > -1)
-    {
-        // Pout<< "Checking triangle twist: dot product of consecutive triangle"
-        //    << " normals resulting from face-centre decomposition" << endl;
-        polyMeshCheck::checkTriangleTwist
-        (
-            report,
-            minTriangleTwist,
-            mesh,
-            mesh.faceAreas(),
-            mesh.faceCentres(),
-            mesh.points(),
-            checkFaces,
-            &wrongFaces
-        );
-
-        label nNewWrongFaces = returnReduce(wrongFaces.size(), sumOp<label>());
-
-        Info<< "    faces with triangle twist < "
-            << setw(5) << minTriangleTwist
-            << "                      : "
-            << nNewWrongFaces-nWrongFaces << endl;
-
-        nWrongFaces = nNewWrongFaces;
-    }
-
     if (minFaceFlatness > -small)
     {
         polyMeshCheck::checkFaceFlatness
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/system/snappyHexMeshDict b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/system/snappyHexMeshDict
index 8046e28ec1..7ef24fffb1 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/system/snappyHexMeshDict
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/system/snappyHexMeshDict
@@ -249,12 +249,10 @@ meshQualityControls
     maxConcave 80;
     minVol 1e-13;
     minTetQuality -1;
-    minArea -1;
     minTwist 0.01;
     minDeterminant 0.001;
     minFaceWeight 0.05;
     minVolRatio 0.01;
-    minTriangleTwist -1;
     nSmoothScale 4;
     errorReduction 0.75;
     relaxed
diff --git a/tutorials/incompressible/pimpleFoam/RAS/propeller/system/snappyHexMeshDict b/tutorials/incompressible/pimpleFoam/RAS/propeller/system/snappyHexMeshDict
index 90288d3fc4..eeb931159c 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/propeller/system/snappyHexMeshDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/propeller/system/snappyHexMeshDict
@@ -388,10 +388,10 @@ meshQualityControls
     //  Set to 180 to disable.
     maxConcave 80;
 
-    //- Minimum pyramid volume. Is absolute volume of cell pyramid.
-    //  Set to a sensible fraction of the smallest cell volume expected.
+    //- Minimum cell pyramid volume relative to min bounding box length^3
+    //  Set to a fraction of the smallest cell volume expected.
     //  Set to very negative number (e.g. -1e30) to disable.
-    minVol 1e-13;
+    minVol 1e-10;
 
     //- Minimum quality of the tet formed by the face-centre
     //  and variable base point minimum decomposition triangles and
@@ -403,9 +403,6 @@ meshQualityControls
     //      1 = regular tet
     minTetQuality -1; // 1e-30;
 
-    //- Minimum face area. Set to <0 to disable.
-    minArea -1;
-
     //- Minimum face twist. Set to <-1 to disable. dot product of face normal
     //  and face centre triangles normal
     minTwist 0.01;
@@ -420,14 +417,11 @@ meshQualityControls
     //- minVolRatio (0 -> 1)
     minVolRatio 0.01;
 
-    // must be >0 for Fluent compatibility
-    minTriangleTwist -1;
-
-
     // Advanced
 
     //- Number of error distribution iterations
     nSmoothScale 4;
+
     //- Amount to scale back displacement at error points
     errorReduction 0.75;
 
diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion_snappyHexMesh/system/snappyHexMeshDict b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion_snappyHexMesh/system/snappyHexMeshDict
index 53cc73718c..1c2faebcf1 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion_snappyHexMesh/system/snappyHexMeshDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion_snappyHexMesh/system/snappyHexMeshDict
@@ -265,10 +265,10 @@ meshQualityControls
     //  Set to 180 to disable.
     maxConcave 80;
 
-    //- Minimum pyramid volume. Is absolute volume of cell pyramid.
-    //  Set to a sensible fraction of the smallest cell volume expected.
+    //- Minimum cell pyramid volume relative to min bounding box length^3
+    //  Set to a fraction of the smallest cell volume expected.
     //  Set to very negative number (e.g. -1e30) to disable.
-    minVol 1e-13;
+    minVol 1e-10;
 
     //- Minimum quality of the tet formed by the face-centre
     //  and variable base point minimum decomposition triangles and
@@ -279,9 +279,6 @@ meshQualityControls
     //      1 = regular tet
     minTetQuality 1e-30;
 
-    //- Minimum face area. Set to <0 to disable.
-    minArea -1;
-
     //- Minimum face twist. Set to <-1 to disable. dot product of face normal
     //  and face centre triangles normal
     minTwist 0.05;
@@ -296,14 +293,11 @@ meshQualityControls
     //- minVolRatio (0 -> 1)
     minVolRatio 0.01;
 
-    // must be >0 for Fluent compatibility
-    minTriangleTwist -1;
-
-
     // Advanced
 
     //- Number of error distribution iterations
     nSmoothScale 4;
+
     //- Amount to scale back displacement at error points
     errorReduction 0.75;
 }
diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/snappyHexMeshDict b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/snappyHexMeshDict
index 0e3e630337..8871133c55 100644
--- a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/snappyHexMeshDict
+++ b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/snappyHexMeshDict
@@ -47,7 +47,6 @@ geometry
 // Settings for the castellatedMesh generation.
 castellatedMeshControls
 {
-
     // Refinement parameters
     // ~~~~~~~~~~~~~~~~~~~~~
 
@@ -277,14 +276,12 @@ meshQualityControls
     //- Minimum projected area v.s. actual area. Set to -1 to disable.
     minFlatness 0.5;
 
-    //- Minimum pyramid volume. Is absolute volume of cell pyramid.
-    //  Set to a sensible fraction of the smallest cell volume expected.
+    //- Minimum cell pyramid volume relative to min bounding box length^3
+    //  Set to a fraction of the smallest cell volume expected.
     //  Set to very negative number (e.g. -1e30) to disable.
-    minVol 1e-13;
-    minTetQuality 1e-30;
+    minVol 1e-10;
 
-    //- Minimum face area. Set to <0 to disable.
-    minArea -1;
+    minTetQuality 1e-30;
 
     //- Minimum face twist. Set to <-1 to disable. dot product of face normal
     //  and face centre triangles normal
@@ -300,10 +297,6 @@ meshQualityControls
     //- minVolRatio (0 -> 1)
     minVolRatio 0.01;
 
-    // must be >0 for Fluent compatibility
-    minTriangleTwist -1;
-
-
     // Advanced
 
     //- Number of error distribution iterations
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/system/snappyHexMeshDict b/tutorials/incompressible/simpleFoam/turbineSiting/system/snappyHexMeshDict
index bb652c555b..a25152680a 100644
--- a/tutorials/incompressible/simpleFoam/turbineSiting/system/snappyHexMeshDict
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/system/snappyHexMeshDict
@@ -324,10 +324,10 @@ meshQualityControls
     //  Set to 180 to disable.
     maxConcave 80;
 
-    //- Minimum pyramid volume. Is absolute volume of cell pyramid.
-    //  Set to a sensible fraction of the smallest cell volume expected.
+    //- Minimum cell pyramid volume relative to min bounding box length^3
+    //  Set to a fraction of the smallest cell volume expected.
     //  Set to very negative number (e.g. -1e30) to disable.
-    minVol 1e-13;
+    minVol 1e-10;
 
     //- Minimum quality of the tet formed by the face-centre
     //  and variable base point minimum decomposition triangles and
@@ -338,9 +338,6 @@ meshQualityControls
     //      1 = regular tet
     minTetQuality 1e-30;
 
-    //- Minimum face area. Set to <0 to disable.
-    minArea -1;
-
     //- Minimum face twist. Set to <-1 to disable. dot product of face normal
     //  and face centre triangles normal
     minTwist 0.05;
@@ -355,25 +352,14 @@ meshQualityControls
     //- minVolRatio (0 -> 1)
     minVolRatio 0.01;
 
-    // must be >0 for Fluent compatibility
-    minTriangleTwist -1;
-
-    //- If >0 : preserve single cells with all points on the surface if the
-    //  resulting volume after snapping (by approximation) is larger than
-    //  minVolCollapseRatio times old volume (i.e. not collapsed to flat cell).
-    //  If <0 : delete always.
-    // minVolCollapseRatio 0.5;
-
-
     // Advanced
 
     //- Number of error distribution iterations
     nSmoothScale 4;
+
     //- Amount to scale back displacement at error points
     errorReduction 0.75;
 
-
-
     // Optional : some meshing phases allow usage of relaxed rules.
     // See e.g. addLayersControls::nRelaxedIter.
     relaxed
diff --git a/tutorials/mesh/foamyHexMesh/blob/system/meshQualityDict b/tutorials/mesh/foamyHexMesh/blob/system/meshQualityDict
index 3342b44aec..9239dc9d8b 100644
--- a/tutorials/mesh/foamyHexMesh/blob/system/meshQualityDict
+++ b/tutorials/mesh/foamyHexMesh/blob/system/meshQualityDict
@@ -35,13 +35,10 @@ maxConcave          80;
 //      1 = regular tet
 minTetQuality       1e-30;
 
-//- Minimum pyramid volume. Is absolute volume of cell pyramid.
-//  Set to a sensible fraction of the smallest cell volume expected.
+//- Minimum cell pyramid volume relative to min bounding box length^3
+//  Set to a fraction of the smallest cell volume expected.
 //  Set to very negative number (e.g. -1e30) to disable.
-minVol              1e-20;
-
-//- Minimum face area. Set to <0 to disable.
-minArea             -1;
+minVol 1e-10;
 
 //- Minimum face twist. Set to <-1 to disable. dot product of face normal
 //  and face centre triangles normal
@@ -57,8 +54,5 @@ minFaceWeight       0.02;
 //- minVolRatio (0 -> 1)
 minVolRatio         0.01;
 
-//must be >0 for Fluent compatibility
-minTriangleTwist    -1;
-
 
 // ************************************************************************* //
diff --git a/tutorials/mesh/foamyHexMesh/flange/system/meshQualityDict b/tutorials/mesh/foamyHexMesh/flange/system/meshQualityDict
index 124e0a47ab..a2546e6620 100644
--- a/tutorials/mesh/foamyHexMesh/flange/system/meshQualityDict
+++ b/tutorials/mesh/foamyHexMesh/flange/system/meshQualityDict
@@ -35,13 +35,10 @@ maxConcave          80;
 //      1 = regular tet
 minTetQuality       1e-30;
 
-//- Minimum pyramid volume. Is absolute volume of cell pyramid.
-//  Set to a sensible fraction of the smallest cell volume expected.
+//- Minimum cell pyramid volume relative to min bounding box length^3
+//  Set to a fraction of the smallest cell volume expected.
 //  Set to very negative number (e.g. -1e30) to disable.
-minVol              0;
-
-//- Minimum face area. Set to <0 to disable.
-minArea             -1;
+minVol 0;
 
 //- Minimum face twist. Set to <-1 to disable. dot product of face normal
 //  and face centre triangles normal
@@ -57,8 +54,5 @@ minFaceWeight       0.02;
 //- minVolRatio (0 -> 1)
 minVolRatio         0.01;
 
-//must be >0 for Fluent compatibility
-minTriangleTwist    -1;
-
 
 // ************************************************************************* //
diff --git a/tutorials/mesh/foamyHexMesh/simpleShapes/system/meshQualityDict b/tutorials/mesh/foamyHexMesh/simpleShapes/system/meshQualityDict
index 2a6399f3c9..6044841568 100644
--- a/tutorials/mesh/foamyHexMesh/simpleShapes/system/meshQualityDict
+++ b/tutorials/mesh/foamyHexMesh/simpleShapes/system/meshQualityDict
@@ -35,13 +35,10 @@ maxConcave          80;
 //      1 = regular tet
 minTetQuality       1e-30;
 
-//- Minimum pyramid volume. Is absolute volume of cell pyramid.
-//  Set to a sensible fraction of the smallest cell volume expected.
+//- Minimum cell pyramid volume relative to min bounding box length^3
+//  Set to a fraction of the smallest cell volume expected.
 //  Set to very negative number (e.g. -1e30) to disable.
-minVol              0;
-
-//- Minimum face area. Set to <0 to disable.
-minArea             -1;
+minVol 0;
 
 //- Minimum face twist. Set to <-1 to disable. dot product of face normal
 //  and face centre triangles normal
@@ -57,8 +54,5 @@ minFaceWeight       0.02;
 //- minVolRatio (0 -> 1)
 minVolRatio         0.01;
 
-//must be >0 for Fluent compatibility
-minTriangleTwist    -1;
-
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/meshQualityDict b/tutorials/multiphase/interFoam/RAS/DTCHull/system/meshQualityDict
index 49973b1677..89d91b5160 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/meshQualityDict
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/system/meshQualityDict
@@ -26,10 +26,10 @@ maxInternalSkewness 4;
 //  Set to 180 to disable.
 maxConcave 80;
 
-//- Minimum pyramid volume. Is absolute volume of cell pyramid.
-//  Set to a sensible fraction of the smallest cell volume expected.
+//- Minimum cell pyramid volume relative to min bounding box length^3
+//  Set to a fraction of the smallest cell volume expected.
 //  Set to very negative number (e.g. -1e30) to disable.
-minVol 1e-13;
+minVol 1e-10;
 
 //- Minimum quality of the tet formed by the face-centre
 //  and variable base point minimum decomposition triangles and
@@ -40,9 +40,6 @@ minVol 1e-13;
 //      1 = regular tet
 minTetQuality 1e-30;
 
-//- Minimum face area. Set to <0 to disable.
-minArea -1;
-
 //- Minimum face twist. Set to <-1 to disable. dot product of face normal
 //  and face centre triangles normal
 minTwist 0.05;
@@ -57,16 +54,6 @@ minFaceWeight 0.05;
 //- minVolRatio (0 -> 1)
 minVolRatio 0.01;
 
-//must be >0 for Fluent compatibility
-minTriangleTwist -1;
-
-//- If >0 : preserve single cells with all points on the surface if the
-//  resulting volume after snapping (by approximation) is larger than
-//  minVolCollapseRatio times old volume (i.e. not collapsed to flat cell).
-//  If <0 : delete always.
-//minVolCollapseRatio 0.5;
-
-
 // Advanced
 
 //- Number of error distribution iterations
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/meshQualityDict b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/meshQualityDict
index 49973b1677..4cda897dd9 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/meshQualityDict
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/meshQualityDict
@@ -26,10 +26,10 @@ maxInternalSkewness 4;
 //  Set to 180 to disable.
 maxConcave 80;
 
-//- Minimum pyramid volume. Is absolute volume of cell pyramid.
-//  Set to a sensible fraction of the smallest cell volume expected.
+//- Minimum cell pyramid volume relative to min bounding box length^3
+//  Set to a fraction of the smallest cell volume expected.
 //  Set to very negative number (e.g. -1e30) to disable.
-minVol 1e-13;
+minVol 1e-10;
 
 //- Minimum quality of the tet formed by the face-centre
 //  and variable base point minimum decomposition triangles and
@@ -40,9 +40,6 @@ minVol 1e-13;
 //      1 = regular tet
 minTetQuality 1e-30;
 
-//- Minimum face area. Set to <0 to disable.
-minArea -1;
-
 //- Minimum face twist. Set to <-1 to disable. dot product of face normal
 //  and face centre triangles normal
 minTwist 0.05;
@@ -57,16 +54,6 @@ minFaceWeight 0.05;
 //- minVolRatio (0 -> 1)
 minVolRatio 0.01;
 
-//must be >0 for Fluent compatibility
-minTriangleTwist -1;
-
-//- If >0 : preserve single cells with all points on the surface if the
-//  resulting volume after snapping (by approximation) is larger than
-//  minVolCollapseRatio times old volume (i.e. not collapsed to flat cell).
-//  If <0 : delete always.
-//minVolCollapseRatio 0.5;
-
-
 // Advanced
 
 //- Number of error distribution iterations
@@ -74,8 +61,6 @@ nSmoothScale 4;
 //- Amount to scale back displacement at error points
 errorReduction 0.75;
 
-
-
 // Optional : some meshing phases allow usage of relaxed rules.
 // See e.g. addLayersControls::nRelaxedIter.
 relaxed
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/meshQualityDict b/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/meshQualityDict
index 49973b1677..89d91b5160 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/meshQualityDict
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/meshQualityDict
@@ -26,10 +26,10 @@ maxInternalSkewness 4;
 //  Set to 180 to disable.
 maxConcave 80;
 
-//- Minimum pyramid volume. Is absolute volume of cell pyramid.
-//  Set to a sensible fraction of the smallest cell volume expected.
+//- Minimum cell pyramid volume relative to min bounding box length^3
+//  Set to a fraction of the smallest cell volume expected.
 //  Set to very negative number (e.g. -1e30) to disable.
-minVol 1e-13;
+minVol 1e-10;
 
 //- Minimum quality of the tet formed by the face-centre
 //  and variable base point minimum decomposition triangles and
@@ -40,9 +40,6 @@ minVol 1e-13;
 //      1 = regular tet
 minTetQuality 1e-30;
 
-//- Minimum face area. Set to <0 to disable.
-minArea -1;
-
 //- Minimum face twist. Set to <-1 to disable. dot product of face normal
 //  and face centre triangles normal
 minTwist 0.05;
@@ -57,16 +54,6 @@ minFaceWeight 0.05;
 //- minVolRatio (0 -> 1)
 minVolRatio 0.01;
 
-//must be >0 for Fluent compatibility
-minTriangleTwist -1;
-
-//- If >0 : preserve single cells with all points on the surface if the
-//  resulting volume after snapping (by approximation) is larger than
-//  minVolCollapseRatio times old volume (i.e. not collapsed to flat cell).
-//  If <0 : delete always.
-//minVolCollapseRatio 0.5;
-
-
 // Advanced
 
 //- Number of error distribution iterations
diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/snappyHexMeshDict b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/snappyHexMeshDict
index d558078123..27ca9a5f9f 100644
--- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/snappyHexMeshDict
+++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/snappyHexMeshDict
@@ -513,10 +513,10 @@ meshQualityControls
     // Set to 180 to disable.
     maxConcave 80;
 
-    // Minimum pyramid volume. Is absolute volume of cell pyramid.
-    // Set to a sensible fraction of the smallest cell volume expected.
-    // Set to very negative number (e.g. -1e30) to disable.
-    minVol 1e-13;
+    //- Minimum cell pyramid volume relative to min bounding box length^3
+    //  Set to a fraction of the smallest cell volume expected.
+    //  Set to very negative number (e.g. -1e30) to disable.
+    minVol 1e-10;
 
     // Minimum quality of the tet formed by the face-centre
     // and variable base point minimum decomposition triangles and
@@ -528,9 +528,6 @@ meshQualityControls
     //     1 = regular tet
     minTetQuality -1e-30;
 
-    // Minimum face area. Set to <0 to disable.
-    minArea -1;
-
     // Minimum face twist. Set to <-1 to disable. dot product of face normal
     // and face centre triangles normal
     minTwist 0.05;
@@ -545,19 +542,11 @@ meshQualityControls
     // minVolRatio (0 -> 1)
     minVolRatio 0.01;
 
-    // must be >0 for Fluent compatibility
-    minTriangleTwist -1;
-
-    //- If >0 : preserve single cells with all points on the surface if the
-    //  resulting volume after snapping (by approximation) is larger than
-    //  minVolCollapseRatio times old volume (i.e. not collapsed to flat cell).
-    //  If <0 : delete always.
-    // minVolCollapseRatio 0.5;
-
     // Advanced
 
     // Number of error distribution iterations
     nSmoothScale 4;
+
     // amount to scale back displacement at error points
     errorReduction 0.75;
 
diff --git a/tutorials/multiphase/interFoam/RAS/planingHullW3/system/meshQualityDict b/tutorials/multiphase/interFoam/RAS/planingHullW3/system/meshQualityDict
index 49973b1677..6e7239690d 100644
--- a/tutorials/multiphase/interFoam/RAS/planingHullW3/system/meshQualityDict
+++ b/tutorials/multiphase/interFoam/RAS/planingHullW3/system/meshQualityDict
@@ -26,10 +26,10 @@ maxInternalSkewness 4;
 //  Set to 180 to disable.
 maxConcave 80;
 
-//- Minimum pyramid volume. Is absolute volume of cell pyramid.
-//  Set to a sensible fraction of the smallest cell volume expected.
+//- Minimum cell pyramid volume relative to min bounding box length^3
+//  Set to a fraction of the smallest cell volume expected.
 //  Set to very negative number (e.g. -1e30) to disable.
-minVol 1e-13;
+minVol 1e-10;
 
 //- Minimum quality of the tet formed by the face-centre
 //  and variable base point minimum decomposition triangles and
@@ -40,9 +40,6 @@ minVol 1e-13;
 //      1 = regular tet
 minTetQuality 1e-30;
 
-//- Minimum face area. Set to <0 to disable.
-minArea -1;
-
 //- Minimum face twist. Set to <-1 to disable. dot product of face normal
 //  and face centre triangles normal
 minTwist 0.05;
@@ -57,25 +54,14 @@ minFaceWeight 0.05;
 //- minVolRatio (0 -> 1)
 minVolRatio 0.01;
 
-//must be >0 for Fluent compatibility
-minTriangleTwist -1;
-
-//- If >0 : preserve single cells with all points on the surface if the
-//  resulting volume after snapping (by approximation) is larger than
-//  minVolCollapseRatio times old volume (i.e. not collapsed to flat cell).
-//  If <0 : delete always.
-//minVolCollapseRatio 0.5;
-
-
 // Advanced
 
 //- Number of error distribution iterations
 nSmoothScale 4;
+
 //- Amount to scale back displacement at error points
 errorReduction 0.75;
 
-
-
 // Optional : some meshing phases allow usage of relaxed rules.
 // See e.g. addLayersControls::nRelaxedIter.
 relaxed
diff --git a/tutorials/multiphase/interFoam/RAS/propeller/system/snappyHexMeshDict b/tutorials/multiphase/interFoam/RAS/propeller/system/snappyHexMeshDict
index 90288d3fc4..eeb931159c 100644
--- a/tutorials/multiphase/interFoam/RAS/propeller/system/snappyHexMeshDict
+++ b/tutorials/multiphase/interFoam/RAS/propeller/system/snappyHexMeshDict
@@ -388,10 +388,10 @@ meshQualityControls
     //  Set to 180 to disable.
     maxConcave 80;
 
-    //- Minimum pyramid volume. Is absolute volume of cell pyramid.
-    //  Set to a sensible fraction of the smallest cell volume expected.
+    //- Minimum cell pyramid volume relative to min bounding box length^3
+    //  Set to a fraction of the smallest cell volume expected.
     //  Set to very negative number (e.g. -1e30) to disable.
-    minVol 1e-13;
+    minVol 1e-10;
 
     //- Minimum quality of the tet formed by the face-centre
     //  and variable base point minimum decomposition triangles and
@@ -403,9 +403,6 @@ meshQualityControls
     //      1 = regular tet
     minTetQuality -1; // 1e-30;
 
-    //- Minimum face area. Set to <0 to disable.
-    minArea -1;
-
     //- Minimum face twist. Set to <-1 to disable. dot product of face normal
     //  and face centre triangles normal
     minTwist 0.01;
@@ -420,14 +417,11 @@ meshQualityControls
     //- minVolRatio (0 -> 1)
     minVolRatio 0.01;
 
-    // must be >0 for Fluent compatibility
-    minTriangleTwist -1;
-
-
     // Advanced
 
     //- Number of error distribution iterations
     nSmoothScale 4;
+
     //- Amount to scale back displacement at error points
     errorReduction 0.75;
 
diff --git a/tutorials/multiphase/interFoam/RAS/weirOverflow/system/blockMeshDict b/tutorials/multiphase/interFoam/RAS/weirOverflow/system/blockMeshDict
index 82adfc5262..5c9e3ddcb4 100644
--- a/tutorials/multiphase/interFoam/RAS/weirOverflow/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/RAS/weirOverflow/system/blockMeshDict
@@ -53,32 +53,56 @@ blocks
     hex (6 7 11 10 18 19 23 22) (60 24 1) simpleGrading (1 1 1)
 );
 
-patches
+defaultPatch
+{
+    type empty;
+}
+
+boundary
 (
-    patch inlet
-    (
-        (0 12 16 4)
-        (4 16 20 8)
-    )
-    patch outlet
-    (
-        (7 19 15 3)
-        (11 23 19 7)
-    )
-    wall lowerWall
-    (
-        (0 1 13 12)
-        (1 5 17 13)
-        (5 6 18 17)
-        (2 14 18 6)
-        (2 3 15 14)
-    )
-    patch atmosphere
-    (
-        (8 20 21 9)
-        (9 21 22 10)
-        (10 22 23 11)
-    )
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (0 12 16 4)
+            (4 16 20 8)
+        );
+    }
+
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (7 19 15 3)
+            (11 23 19 7)
+        );
+    }
+
+    lowerWall
+    {
+        type wall;
+        faces
+        (
+            (0 1 13 12)
+            (1 5 17 13)
+            (5 6 18 17)
+            (2 14 18 6)
+            (2 3 15 14)
+        );
+    }
+
+    atmosphere
+    {
+        type patch;
+        faces
+        (
+            (8 20 21 9)
+            (9 21 22 10)
+            (10 22 23 11)
+        );
+    }
 );
 
 
diff --git a/tutorials/multiphase/interFoam/laminar/cavitatingBullet/system/snappyHexMeshDict b/tutorials/multiphase/interFoam/laminar/cavitatingBullet/system/snappyHexMeshDict
index b0d6f085f0..94e59334a6 100644
--- a/tutorials/multiphase/interFoam/laminar/cavitatingBullet/system/snappyHexMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/cavitatingBullet/system/snappyHexMeshDict
@@ -289,9 +289,10 @@ meshQualityControls
     //  Set to 180 to disable.
     maxConcave 80;
 
-    //- Minimum pyramid volume. Is absolute volume of cell pyramid.
+    //- Minimum cell pyramid volume relative to min bounding box length^3
+    //  Set to a fraction of the smallest cell volume expected.
     //  Set to very negative number (e.g. -1e30) to disable.
-    minVol 1e-20;
+    minVol 1e-10;
 
     //- Minimum quality of the tet formed by the face-centre
     //  and variable base point minimum decomposition triangles and
@@ -302,9 +303,6 @@ meshQualityControls
     //      1 = regular tet
     minTetQuality 1e-30;
 
-    //- Minimum face area. Set to <0 to disable.
-    minArea -1;
-
     //- Minimum face twist. Set to <-1 to disable. dot product of face normal
     //  and face centre triangles normal
     minTwist 0.02;
@@ -319,14 +317,11 @@ meshQualityControls
     //- minVolRatio (0 -> 1)
     minVolRatio 0.01;
 
-    // must be >0 for Fluent compatibility
-    minTriangleTwist -1;
-
-
     // Advanced
 
     //- Number of error distribution iterations
     nSmoothScale 4;
+
     //- Amount to scale back displacement at error points
     errorReduction 0.75;
 }