Merge branch 'master' of ssh://noisy/home/noisy3/OpenFOAM/OpenFOAM-dev

applications/solvers/multiphase/bubbleFoam/alphaEqn.H

@@ -46,3 +46,5 @@
         << "  Max(alpha) = " << max(alpha).value()
         << endl;
 }
+
+rho = alpha*rhoa + beta*rhob;

applications/solvers/multiphase/bubbleFoam/createFields.H

@@ -156,6 +156,16 @@
       + fvc::interpolate(beta)*phib
     );
 
+    volScalarField rho
+    (
+        IOobject
+        (
+            "rho",
+            runTime.timeName(),
+            mesh
+        ),
+        alpha*rhoa + beta*rhob
+    );
 
     #include "createRASTurbulence.H"
 

applications/solvers/multiphase/twoPhaseEulerFoam/alphaEqn.H

@@ -52,3 +52,5 @@
             << endl;
     }
 }
+
+rho = alpha*rhoa + beta*rhob;

applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H

@@ -145,6 +145,16 @@
         fvc::interpolate(alpha)*phia + fvc::interpolate(beta)*phib
     );
 
+    volScalarField rho
+    (
+        IOobject
+        (
+            "rho",
+            runTime.timeName(),
+            mesh
+        ),
+        alpha*rhoa + beta*rhob
+    );
 
     IOdictionary RASProperties
     (

bin/tools/RunFunctions

@@ -37,12 +37,13 @@ getApplication ()
 runApplication ()
 {
     APP_RUN=$1; shift
+    APP_NAME=${APP_RUN##*/}
 
-    if [ -f log.$APP_RUN ] ; then
-        echo "$APP_RUN already run on $PWD: remove log file to run"
+    if [ -f log.$APP_NAME ] ; then
+        echo "$APP_NAME already run on $PWD: remove log file to run"
     else
         echo "Running $APP_RUN on $PWD"
-        $APP_RUN $* > log.$APP_RUN 2>&1
+        $APP_RUN $* > log.$APP_NAME 2>&1
     fi
 }
 

tutorials/combustion/XiFoam/les/pitzDaily/constant/g

@@ -16,7 +16,6 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 dimensions      [0 1 -2 0 0 0 0];
-value           ( 0 -9.81 0 );
-
+value           (0 0 0);
 
 // ************************************************************************* //

tutorials/combustion/XiFoam/les/pitzDaily3D/constant/g

@@ -16,7 +16,6 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 dimensions      [0 1 -2 0 0 0 0];
-value           ( 0 0 0 );
-
+value           (0 0 0);
 
 // ************************************************************************* //

tutorials/combustion/dieselFoam/aachenBomb/0/p

@@ -22,19 +22,19 @@ boundaryField
 {
     walls
     {
-        type                zeroGradient;
+        type            buoyantPressure;
+        value           uniform 5e+06;
     }
-    
+
     front
     {
-        type                wedge;
+        type            wedge;
     }
 
     back
     {
-        type                wedge;
+        type            wedge;
     }
-
 }
 
 // ************************************************************************* //

tutorials/combustion/engineFoam/kivaTest/-180/epsilon

@@ -23,17 +23,17 @@ boundaryField
 {
     piston
     {
-        type            epsilonWallFunction;
+        type            compressible::epsilonWallFunction;
         value           uniform 450;
     }
     liner
     {
-        type            epsilonWallFunction;
+        type            compressible::epsilonWallFunction;
         value           uniform 450;
     }
     cylinderHead
     {
-        type            epsilonWallFunction;
+        type            compressible::epsilonWallFunction;
         value           uniform 450;
     }
 }

tutorials/combustion/engineFoam/kivaTest/-180/k

@@ -23,17 +23,17 @@ boundaryField
 {
     piston
     {
-        type            kQRWallFunction;
+        type            compressible::kQRWallFunction;
         value           uniform 4;
     }
     liner
     {
-        type            kQRWallFunction;
+        type            compressible::kQRWallFunction;
         value           uniform 4;
     }
     cylinderHead
     {
-        type            kQRWallFunction;
+        type            compressible::kQRWallFunction;
         value           uniform 4;
     }
 }

tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/topAir/g

+../bottomAir/g
\ No newline at end of file

tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/p

@@ -20,23 +20,24 @@ internalField   uniform 0;
 
 boundaryField
 {
-    inlet           
+    inlet
     {
         type            zeroGradient;
     }
 
-    outlet          
+    outlet
     {
         type            fixedValue;
         value           uniform 0;
     }
 
-    walls           
+    walls
     {
-        type            zeroGradient;
+        type            buoyantPressure;
+        value           uniform 0;
     }
 
-    defaultFaces    
+    defaultFaces
     {
         type            empty;
     }

tutorials/multiphase/bubbleFoam/bubbleColumn/0/p

@@ -16,7 +16,7 @@ FoamFile
 
 dimensions      [1 -1 -2 0 0 0 0];
 
-internalField   nonuniform List<scalar> 
+internalField   nonuniform List<scalar>
 1875
 (
 6296.13
@@ -1899,23 +1899,24 @@ internalField   nonuniform List<scalar>
 
 boundaryField
 {
-    inlet           
+    inlet
     {
         type            zeroGradient;
     }
 
-    outlet          
+    outlet
     {
         type            fixedValue;
         value           uniform 0;
     }
 
-    walls           
+    walls
     {
-        type            zeroGradient;
+        type            buoyantPressure;
+        value           uniform 0;
     }
 
-    defaultFaces    
+    defaultFaces
     {
         type            empty;
     }

tutorials/multiphase/cavitatingFoam/ras/throttle/constant/polyMesh/boundary

 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -21,25 +21,25 @@ FoamFile
     {
         type            patch;
         nFaces          51;
-        startFace       15151;
+        startFace       57362;
     }
     outlet
     {
         type            patch;
         nFaces          51;
-        startFace       15202;
+        startFace       57413;
     }
     walls
     {
         type            wall;
-        nFaces          436;
-        startFace       15253;
+        nFaces          836;
+        startFace       57464;
     }
     frontBack
     {
         type            empty;
-        nFaces          15420;
-        startFace       15689;
+        nFaces          57540;
+        startFace       58300;
     }
 )
 

tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/Allrun

@@ -5,5 +5,5 @@
 
 application=`getApplication`
 
-./makeMesh
+runApplication ./makeMesh
 runApplication $application

tutorials/multiphase/interFoam/laminar/damBreak/0/p

@@ -22,17 +22,20 @@ boundaryField
 {
     leftWall
     {
-        type            zeroGradient;
+        type            buoyantPressure;
+        value           uniform 0;
     }
 
     rightWall
     {
-        type            zeroGradient;
+        type            buoyantPressure;
+        value           uniform 0;
     }
 
     lowerWall
     {
-        type            zeroGradient;
+        type            buoyantPressure;
+        value           uniform 0;
     }
 
     atmosphere

tutorials/multiphase/interFoam/ras/damBreak/0/p

@@ -22,17 +22,20 @@ boundaryField
 {
     leftWall
     {
-        type            zeroGradient;
+        type            buoyantPressure;
+        value           uniform 0;
     }
 
     rightWall
     {
-        type            zeroGradient;
+        type            buoyantPressure;
+        value           uniform 0;
     }
 
     lowerWall
     {
-        type            zeroGradient;
+        type            buoyantPressure;
+        value           uniform 0;
     }
 
     atmosphere

tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/p

@@ -22,17 +22,20 @@ boundaryField
 {
     leftWall
     {
-        type            zeroGradient;
+        type            buoyantPressure;
+        value           uniform 0;
     }
 
     rightWall
     {
-        type            zeroGradient;
+        type            buoyantPressure;
+        value           uniform 0;
     }
 
     lowerWall
     {
-        type            zeroGradient;
+        type            buoyantPressure;
+        value           uniform 0;
     }
 
     atmosphere

tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/p

@@ -22,17 +22,20 @@ boundaryField
 {
     leftWall
     {
-        type            zeroGradient;
+        type            buoyantPressure;
+        value           uniform 0;
     }
 
     rightWall
     {
-        type            zeroGradient;
+        type            buoyantPressure;
+        value           uniform 0;
     }
 
     lowerWall
     {
-        type            zeroGradient;
+        type            buoyantPressure;
+        value           uniform 0;
     }
 
     atmosphere