Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev

src/meshTools/coordinateSystems/coordinateRotation/localAxesRotation.C

@@ -114,7 +114,7 @@ Foam::vector Foam::localAxesRotation::transform(const vector& st) const
     (
         "vector Foam::localAxesRotation::transform(const vector&) const"
     );
-    return vector(vector::zero);
+    return vector::zero;
 }
 
 
@@ -124,7 +124,7 @@ Foam::vector Foam::localAxesRotation::invTransform(const vector& st) const
     (
         "vector Foam::localAxesRotation::invTransform(const vector&) const"
     );
-    return vector(vector::zero);
+    return vector::zero;
 }
 
 
@@ -174,7 +174,7 @@ Foam::tensor Foam::localAxesRotation::transformTensor
 ) const
 {
     notImplemented("tensor localAxesRotation::transformTensor() const");
-    return tensor(tensor::zero);
+    return tensor::zero;
 }
 
 
@@ -235,7 +235,7 @@ Foam::symmTensor Foam::localAxesRotation::transformVector
     (
         "tensor localAxesRotation::transformVector(const vector&) const"
     );
-    return symmTensor(symmTensor::zero);
+    return symmTensor::zero;
 }
 
 
@@ -251,7 +251,7 @@ void Foam::localAxesRotation::init
     forAll(mesh.cellCentres(), cellI)
     {
         vector dir = mesh.cellCentres()[cellI] - origin_;
-        dir /= mag(dir);
+        dir /= mag(dir) + VSMALL;
 
         Rptr_()[cellI] = axesRotation(e3_, dir).R();
     }

tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/U

@@ -41,6 +41,10 @@ boundaryField
         type            pressureInletOutletVelocity;
         value           uniform (0 0 0);
     }
+    defaultFaces
+    {
+        type            empty;
+    }
     porous_half0
     {
         type            cyclic;
@@ -49,10 +53,6 @@ boundaryField
     {
         type            cyclic;
     }
-    defaultFaces
-    {
-        type            empty;
-    }
 }
 
 

tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/alpha1.org

@@ -39,6 +39,10 @@ boundaryField
         inletValue      uniform 0;
         value           uniform 0;
     }
+    defaultFaces
+    {
+        type            empty;
+    }
     porous_half0
     {
         type            cyclic;
@@ -47,10 +51,6 @@ boundaryField
     {
         type            cyclic;
     }
-    defaultFaces
-    {
-        type            empty;
-    }
 }
 
 

tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/epsilon

@@ -24,16 +24,25 @@ boundaryField
     leftWall
     {
         type            epsilonWallFunction;
+        Cmu             0.09;
+        kappa           0.41;
+        E               9.8;
         value           uniform 0.1;
     }
     rightWall
     {
         type            epsilonWallFunction;
+        Cmu             0.09;
+        kappa           0.41;
+        E               9.8;
         value           uniform 0.1;
     }
     lowerWall
     {
         type            epsilonWallFunction;
+        Cmu             0.09;
+        kappa           0.41;
+        E               9.8;
         value           uniform 0.1;
     }
     atmosphere
@@ -42,6 +51,10 @@ boundaryField
         inletValue      uniform 0.1;
         value           uniform 0.1;
     }
+    defaultFaces
+    {
+        type            empty;
+    }
     porous_half0
     {
         type            cyclic;
@@ -50,10 +63,6 @@ boundaryField
     {
         type            cyclic;
     }
-    defaultFaces
-    {
-        type            empty;
-    }
 }
 
 

tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/k

@@ -42,6 +42,10 @@ boundaryField
         inletValue      uniform 0.1;
         value           uniform 0.1;
     }
+    defaultFaces
+    {
+        type            empty;
+    }
     porous_half0
     {
         type            cyclic;
@@ -50,10 +54,6 @@ boundaryField
     {
         type            cyclic;
     }
-    defaultFaces
-    {
-        type            empty;
-    }
 }
 
 

tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/nuTilda

@@ -39,6 +39,10 @@ boundaryField
         inletValue      uniform 0;
         value           uniform 0;
     }
+    defaultFaces
+    {
+        type            empty;
+    }
     porous_half0
     {
         type            cyclic;
@@ -47,10 +51,6 @@ boundaryField
     {
         type            cyclic;
     }
-    defaultFaces
-    {
-        type            empty;
-    }
 }
 
 

tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/nut

@@ -24,16 +24,25 @@ boundaryField
     leftWall
     {
         type            nutkWallFunction;
+        Cmu             0.09;
+        kappa           0.41;
+        E               9.8;
         value           uniform 0;
     }
     rightWall
     {
         type            nutkWallFunction;
+        Cmu             0.09;
+        kappa           0.41;
+        E               9.8;
         value           uniform 0;
     }
     lowerWall
     {
         type            nutkWallFunction;
+        Cmu             0.09;
+        kappa           0.41;
+        E               9.8;
         value           uniform 0;
     }
     atmosphere
@@ -41,6 +50,10 @@ boundaryField
         type            calculated;
         value           uniform 0;
     }
+    defaultFaces
+    {
+        type            empty;
+    }
     porous_half0
     {
         type            cyclic;
@@ -49,10 +62,6 @@ boundaryField
     {
         type            cyclic;
     }
-    defaultFaces
-    {
-        type            empty;
-    }
 }
 
 

tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/p_rgh

@@ -25,19 +25,16 @@ boundaryField
     {
         type            fixedFluxPressure;
         gradient        uniform 0;
-        value           uniform 0;
     }
     rightWall
     {
         type            fixedFluxPressure;
         gradient        uniform 0;
-        value           uniform 0;
     }
     lowerWall
     {
         type            fixedFluxPressure;
         gradient        uniform 0;
-        value           uniform 0;
     }
     atmosphere
     {
@@ -48,29 +45,28 @@ boundaryField
         p0              uniform 0;
         value           uniform 0;
     }
+    defaultFaces
+    {
+        type            empty;
+    }
     porous_half0
     {
         type            porousBafflePressure;
         patchType       cyclic;
         jump            uniform 0;
+        value           uniform 0;
         D               700;
         I               500;
         length          1.05;
-        value           uniform 0;
     }
     porous_half1
     {
         type            porousBafflePressure;
         patchType       cyclic;
-        jump            uniform 0;
+        value           uniform 0;
         D               700;
         I               500;
         length          1.05;
-        value           uniform 0;
-    }
-    defaultFaces
-    {
-        type            empty;
     }
 }
 

tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/constant/polyMesh/boundary

@@ -0,0 +1,73 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       polyBoundaryMesh;
+    location    "constant/polyMesh";
+    object      boundary;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+7
+(
+    leftWall
+    {
+        type            wall;
+        nFaces          50;
+        startFace       4419;
+    }
+    rightWall
+    {
+        type            wall;
+        nFaces          50;
+        startFace       4469;
+    }
+    lowerWall
+    {
+        type            wall;
+        nFaces          62;
+        startFace       4519;
+    }
+    atmosphere
+    {
+        type            patch;
+        nFaces          46;
+        startFace       4581;
+    }
+    defaultFaces
+    {
+        type            empty;
+        inGroups        1(empty);
+        nFaces          4536;
+        startFace       4627;
+    }
+    porous_half0
+    {
+        type            cyclic;
+        inGroups        1(cyclic);
+        nFaces          13;
+        startFace       9163;
+        matchTolerance  0.0001;
+        transform       unknown;
+        neighbourPatch  porous_half1;
+    }
+    porous_half1
+    {
+        type            cyclic;
+        inGroups        1(cyclic);
+        nFaces          13;
+        startFace       9176;
+        matchTolerance  0.0001;
+        transform       unknown;
+        neighbourPatch  porous_half0;
+    }
+)
+
+// ************************************************************************* //

tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/createBafflesDict

@@ -65,7 +65,10 @@ baffles
                 type            cyclic;
                 neighbourPatch  porous_half0;
 
-                ${..master.patchFields}
+                patchFields
+                {
+                    ${...master.patchFields}
+                }
             }
         }
     }