Merge branch 'master' into cvm

tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/fvSolution

@@ -77,7 +77,7 @@ PIMPLE
 
 relaxationFactors
 {
-    "h.*            1;
+    "h.*"           1;
     "U.*"           1;
 }
 

tutorials/incompressible/simpleFoam/motorBike/0.org/U

@@ -35,7 +35,7 @@ boundaryField
     lowerWall
     {
         type            fixedValue;
-        value           uniform (20 0 0);
+        value           $internalField;
     }
 
     "motorBike_.*"

tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/surfaceFilmProperties

@@ -15,34 +15,27 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-//surfaceFilmModel kinematicSingleLayer;
 surfaceFilmModel thermoSingleLayer;
 
 regionName      wallFilmRegion;
 
 active          true;
 
-kinematicSingleLayerCoeffs
-{
-    thermoModel constant;
-    rho0        rho0 [1 -3 0 0 0] 1000;
-    mu0         mu0 [1 -1 -1 0 0] 1e-3;
-    sigma0      sigma0 [1 0 -2 0 0] 0.07;
-
-    deltaStable deltaStable [0 1 0 0 0] 0;
-    Cf          0.005;
-
-    injectionModels ();
-}
-
-
 thermoSingleLayerCoeffs
 {
     thermoModel singleComponent;
     liquid      H2O;
 
-    deltaStable deltaStable [0 1 0 0 0] 0;
-    Cf          0.005;
+    forces
+    (
+        surfaceShear
+        thermocapillary
+    );
+
+    surfaceShearCoeffs
+    {
+        Cf          0.005;
+    }
 
     injectionModels ();
 

tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/surfaceFilmProperties

@@ -25,9 +25,8 @@ active          true;
 thermoSingleLayerCoeffs
 {
     thermoModel singleComponent; // constant
-    liquid      H2O;
 
-    Cf          0.005;
+    liquid      H2O;
 
     radiationModel  none;
 
@@ -52,6 +51,35 @@ thermoSingleLayerCoeffs
         }
     }
 
+    forces
+    (
+        surfaceShear
+        thermocapillary
+        contactAngle
+    );
+
+    surfaceShearCoeffs
+    {
+        Cf          0.005;
+    }
+
+    contactAngleCoeffs
+    {
+        deltaWet        1e-4;
+        Ccf             0.085;
+        contactAngleDistribution
+        {
+            type            normal;
+            normalDistribution
+            {
+                minValue        50;
+                maxValue        100;
+                expectation     75;
+                variance        100;
+            }
+        }
+    }
+
     injectionModels
     (
         curvatureSeparation

tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/wallFilmRegion.org/fvSchemes

@@ -42,6 +42,7 @@ gradSchemes
     snGradCorr(pp) Gauss linear;
     snGradCorr(pu) Gauss linear;
     grad(nHat)  Gauss linear;
+    grad(alpha) Gauss linear;
 }
 
 laplacianSchemes

tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/surfaceFilmProperties

@@ -15,32 +15,28 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-//surfaceFilmModel kinematicSingleLayer;
 surfaceFilmModel thermoSingleLayer;
 
 regionName      wallFilmRegion;
 
 active          true;
 
-kinematicSingleLayerCoeffs
-{
-    thermoModel constant;
-    rho0        rho0 [1 -3 0 0 0] 1000;
-    mu0         mu0 [1 -1 -1 0 0] 1e-3;
-    sigma0      sigma0 [1 0 -2 0 0] 0.07;
-
-    Cf          0.005;
-
-    injectionModels ();
-}
-
-
 thermoSingleLayerCoeffs
 {
     thermoModel singleComponent;
+
     liquid      H2O;
 
-    Cf          0.005;
+    forces
+    (
+        surfaceShear
+        thermocapillary
+    );
+
+    surfaceShearCoeffs
+    {
+        Cf          0.005;
+    }
 
     injectionModels
     ();

tutorials/mesh/snappyHexMesh/flange/Allclean

@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1    # run from this directory
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 rm -rf 0 > /dev/null 2>&1
-rm -f ./*.obj > /dev/null 2>&1
+rm -f ./flange ./*.obj > /dev/null 2>&1
 rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
 rm -f constant/triSurface/flange.eMesh > /dev/null 2>&1
 rm -f constant/polyMesh/boundary