Merge remote branch 'origin/testLoop/PhilipposeRajan' into testLoop/MartinBeaudoin

tutorials/incompressible/pimpleFoam/t-junction/0/U

@@ -22,7 +22,7 @@ boundaryField
 {
     inlet      
     {
-        type            pressureInletOutletVelocity;
+        type            pressureInletVelocity;
         value           uniform (0 0 0);
     }
 

tutorials/multiphase/cavitatingFoam/throttle/0/k

@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+| \\      /  F ield         | OpenFOAM Extend Project: Open source CFD        |
-|  \\    /   O peration     | Version:  1.5                                   |
+|  \\    /   O peration     | Version:  1.6-ext                               |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|   \\  /    A nd           | Web:      www.extend-project.de                 |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,11 +10,12 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      k;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [0 2 -2 0 0];
+dimensions      [0 2 -2 0 0 0 0];
 
 internalField   uniform 10.0;
 
@@ -34,7 +35,8 @@ boundaryField
 
     walls
     {
-        type            zeroGradient;
+        type            kqRWallFunction;
+        value           uniform 10.0;
     }
 
     frontBack

tutorials/multiphase/cavitatingFoam/throttle/0/nut

@@ -0,0 +1,51 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM Extend Project: Open source CFD        |
+|  \\    /   O peration     | Version:  1.6-ext                               |
+|   \\  /    A nd           | Web:      www.extend-project.de                 |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      nut;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 2 -1 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    inlet
+    {
+        type            calculated;
+        value           uniform 0;
+    }
+
+    outlet
+    {
+        type            calculated;
+        value           uniform 0;
+    }
+
+    walls
+    {
+        type            nutWallFunction;
+        Cmu             0.09;
+        kappa           0.41;
+        E               9.8;
+        value           uniform 0;
+    }
+
+    frontBack
+    {
+        type            empty;
+    }
+}
+
+// ************************************************************************* //

tutorials/multiphase/cavitatingFoam/throttle/0/omega

@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+| \\      /  F ield         | OpenFOAM Extend Project: Open source CFD        |
-|  \\    /   O peration     | Version:  1.5                                   |
+|  \\    /   O peration     | Version:  1.6-ext                               |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|   \\  /    A nd           | Web:      www.extend-project.de                 |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,11 +10,12 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      omega;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [0 0 -1 0 0];
+dimensions      [0 0 -1 0 0 0 0];
 
 internalField   uniform 77200;
 
@@ -23,7 +24,7 @@ boundaryField
     inlet
     {
         type            turbulentMixingLengthFrequencyInlet;
-        mixingLength    0.5e-03;
+        mixingLength    0.0005;
         k               k;
         value           uniform 77200;
     }
@@ -35,7 +36,12 @@ boundaryField
 
     walls
     {
-        type            zeroGradient;
+        type            omegaWallFunction;
+        Cmu             0.09;
+        kappa           0.41;
+        E               9.8;
+        beta1           0.075;
+        value           uniform 77200;
     }
 
     frontBack

tutorials/multiphase/cavitatingFoam/throttle/Allrun

@@ -3,7 +3,7 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-application="rasCavitatingFoam"
+application="cavitatingFoam"
 
 refineMeshByCellSet()
 {

tutorials/multiphase/cavitatingFoam/throttle/constant/turbulenceProperties

@@ -0,0 +1,19 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType RASModel;
+
+// ************************************************************************* //

tutorials/multiphase/cavitatingFoam/throttle/system/fvSolution

@@ -16,36 +16,58 @@ FoamFile
 
 solvers
 {
-    omega PBiCG
+    omega
     {
+        solver           PBiCG;
         preconditioner   DILU;
         tolerance        1e-08;
         relTol           0;
     };
 
-    k PBiCG
+    k
     {
+        solver           PBiCG;
         preconditioner   DILU;
         tolerance        1e-08;
         relTol           0;
     };
 
-    rho PBiCG
+    rho
     {
+        solver           PBiCG;
         preconditioner   DILU;
         tolerance        1e-08;
         relTol           0;
     };
 
-    U PBiCG
+    U
     {
+        solver           PBiCG;
         preconditioner   DILU;
         tolerance        1e-08;
         relTol           0;
     };
 
-    p GAMG
+    p
     {
+        solver           GAMG;
+        tolerance        1e-8;
+        relTol           0;
+
+        smoother         GaussSeidel;
+        nPreSweeps       0;
+        nPostSweeps      2;
+
+        cacheAgglomeration true;
+
+        nCellsInCoarsestLevel 10;
+        agglomerator     faceAreaPair;
+        mergeLevels      1;
+    };
+
+    pFinal
+    {
+        solver           GAMG;
         tolerance        1e-8;
         relTol           0;
 

tutorials/multiphase/compressibleInterFoam/depthCharge2D/0/p.org

@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      pd;
+    object      p;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

tutorials/multiphase/compressibleInterFoam/depthCharge2D/Allclean

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+foamCleanTutorials cases
+rm -rf processor*
+rm -rf 0/p.gz 0/alpha1.gz

tutorials/multiphase/compressibleInterFoam/depthCharge2D/Allrun

@@ -3,10 +3,10 @@
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Get application name from directory
-application="compressibleLesInterFoam"
+application="compressibleInterFoam"
 
 runApplication blockMesh
 cp 0/alpha1.org 0/alpha1
-cp 0/pd.org 0/pd
+cp 0/p.org 0/p
 runApplication setFields
 runApplication $application

tutorials/multiphase/compressibleInterFoam/depthCharge2D/constant/g

@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.6                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       uniformDimensionedVectorField;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 -9.81 0 );
+
+
+// ************************************************************************* //

tutorials/multiphase/compressibleInterFoam/depthCharge2D/constant/polyMesh/boundary

@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+| \\      /  F ield         | OpenFOAM Extend Project: Open source CFD        |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  1.6-ext                               |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|   \\  /    A nd           | Web:      www.extend-project.de                 |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       polyBoundaryMesh;
+    location    "constant/polyMesh";
     object      boundary;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

tutorials/multiphase/compressibleInterFoam/depthCharge2D/constant/turbulenceProperties

@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.6                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType  LESModel;
+
+
+// ************************************************************************* //

tutorials/multiphase/compressibleInterFoam/depthCharge2D/system/fvSchemes

@@ -31,7 +31,7 @@ divSchemes
     div(phi,alpha)  Gauss vanLeer;
     div(phirb,alpha) Gauss interfaceCompression 1.0;
 
-    div(phi,pd)     Gauss upwind; //vanLeer; //linear;
+    div(phi,p)     Gauss upwind; //vanLeer; //linear;
 
     div(phi,k)      Gauss vanLeer;
 
@@ -56,7 +56,7 @@ snGradSchemes
 fluxRequired
 {
     default         no;
-    pd;
+    p;
     pcorr;
     gamma;
 }

tutorials/multiphase/compressibleInterFoam/depthCharge2D/system/fvSolution

@@ -16,8 +16,9 @@ FoamFile
 
 solvers
 {
-    pcorr PCG
+    pcorr
     {
+        solver               PCG;
         preconditioner
         {
             type             GAMG;
@@ -40,11 +41,14 @@ solvers
         maxIter          100;
     };
 
-    rho diagonal
+    rho
-    {};
-
-    pd GAMG
     {
+        solver           diagonal;  
+    };
+
+    p
+    {
+        solver           GAMG;
         tolerance        1e-7;
         relTol           0.01;
 
@@ -59,8 +63,9 @@ solvers
         mergeLevels      1;
     };
 
-    pdFinal PCG
+    pFinal
     {
+        solver               PCG;
         preconditioner
         {
             type             GAMG;
@@ -85,28 +90,32 @@ solvers
         maxIter          20;
     };
 
-    U smoothSolver
+    U
     {
+        solver           smoothSolver;
         smoother         GaussSeidel;
         tolerance        1e-6;
         relTol           0;
         nSweeps          1;
     };
 
-    k PBiCG
+    k
     {
+        solver           PBiCG;
         preconditioner   DILU;
         tolerance        1e-08;
         relTol           0;
     };
-    B PBiCG
+    B
     {
+        solver           PBiCG;
         preconditioner   DILU;
         tolerance        1e-08;
         relTol           0;
     };
-    nuTilda PBiCG
+    nuTilda
     {
+        solver           PBiCG;
         preconditioner   DILU;
         tolerance        1e-08;
         relTol           0;
@@ -122,7 +131,7 @@ PISO
     nNonOrthogonalCorrectors 0;
     nAlphaCorr      1;
     nAlphaSubCycles 1;
-    cGamma          1;
+    cAlpha          4;
 }
 
 // ************************************************************************* //

tutorials/multiphase/compressibleInterFoam/depthCharge2D/system/setFieldsDict

@@ -17,7 +17,7 @@ FoamFile
 defaultFieldValues
 (
     volScalarFieldValue alpha1 1
-    volScalarFieldValue pd 1e5
+    volScalarFieldValue p 1e5
 );
 
 regions
@@ -30,7 +30,7 @@ regions
         fieldValues
         (
             volScalarFieldValue alpha1 0
-            volScalarFieldValue pd 10e5
+            volScalarFieldValue p 10e5
         );
     }
 

tutorials/multiphase/compressibleInterFoam/depthCharge3D/0/p.org

@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      pd.org;
+    object      p;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

tutorials/multiphase/compressibleInterFoam/depthCharge3D/Allclean

@@ -2,4 +2,4 @@
 
 foamCleanTutorials cases
 rm -rf processor*
-rm -rf 0/pd.gz 0/alpha1.gz
+rm -rf 0/p.gz 0/alpha1.gz

tutorials/multiphase/compressibleInterFoam/depthCharge3D/Allrun

@@ -3,12 +3,13 @@
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Get application name from directory
-application="compressibleLesInterFoam"
+application="compressibleInterFoam"
 
 runApplication blockMesh
 cp 0/alpha1.org 0/alpha1
-cp 0/pd.org 0/pd
+cp 0/p.org 0/p
 runApplication setFields
+# runApplication $application
 runApplication decomposePar
 hostname > system/machines
 runParallel $application 4 system/machines

tutorials/multiphase/compressibleInterFoam/depthCharge3D/constant/g

@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.6                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       uniformDimensionedVectorField;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 -9.81 0 );
+
+
+// ************************************************************************* //

tutorials/multiphase/compressibleInterFoam/depthCharge3D/constant/polyMesh/boundary

@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+| \\      /  F ield         | OpenFOAM Extend Project: Open source CFD        |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  1.6-ext                               |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|   \\  /    A nd           | Web:      www.extend-project.de                 |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       polyBoundaryMesh;
+    location    "constant/polyMesh";
     object      boundary;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

tutorials/multiphase/compressibleInterFoam/depthCharge3D/constant/turbulenceProperties

@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.6                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType  LESModel;
+
+
+// ************************************************************************* //

tutorials/multiphase/compressibleInterFoam/depthCharge3D/system/fvSchemes

@@ -31,7 +31,7 @@ divSchemes
     div(phi,alpha)  Gauss vanLeer;
     div(phirb,alpha) Gauss interfaceCompression 1.0;
 
-    div(phi,pd)     Gauss upwind; //vanLeer; //linear;
+    div(phi,p)     Gauss upwind; //vanLeer; //linear;
 
     div(phi,k)      Gauss vanLeer;
 
@@ -56,7 +56,7 @@ snGradSchemes
 fluxRequired
 {
     default         no;
-    pd;
+    p;
     pcorr;
     gamma;
 }

tutorials/multiphase/compressibleInterFoam/depthCharge3D/system/fvSolution

@@ -16,8 +16,9 @@ FoamFile
 
 solvers
 {
-    pcorr PCG
+    pcorr
     {
+        solver               PCG;
         preconditioner
         {
             type             GAMG;
@@ -40,11 +41,14 @@ solvers
         maxIter          100;
     };
 
-    rho diagonal
+    rho
-    {};
-
-    pd GAMG
     {
+        solver           diagonal;
+    };
+
+    p
+    {
+        solver           GAMG;
         tolerance        1e-7;
         relTol           0.01;
 
@@ -59,8 +63,9 @@ solvers
         mergeLevels      1;
     };
 
-    pdFinal PCG
+    pFinal
     {
+        solver               PCG;
         preconditioner
         {
             type             GAMG;
@@ -85,28 +90,32 @@ solvers
         maxIter          20;
     };
 
-    U smoothSolver
+    U
     {
+        solver           smoothSolver;
         smoother         GaussSeidel;
         tolerance        1e-6;
         relTol           0;
         nSweeps          1;
     };
 
-    k PBiCG
+    k
     {
+        solver           PBiCG;
         preconditioner   DILU;
         tolerance        1e-08;
         relTol           0;
     };
-    B PBiCG
+    B
     {
+        solver           PBiCG;
         preconditioner   DILU;
         tolerance        1e-08;
         relTol           0;
     };
-    nuTilda PBiCG
+    nuTilda
     {
+        solver           PBiCG;
         preconditioner   DILU;
         tolerance        1e-08;
         relTol           0;
@@ -122,7 +131,7 @@ PISO
     nNonOrthogonalCorrectors 0;
     nAlphaCorr      1;
     nAlphaSubCycles 1;
-    cGamma          1;
+    cAlpha          4;
 }
 
 // ************************************************************************* //

tutorials/multiphase/compressibleInterFoam/depthCharge3D/system/setFieldsDict

@@ -17,7 +17,7 @@ FoamFile
 defaultFieldValues
 (
     volScalarFieldValue alpha1 1
-    volScalarFieldValue pd 1e5
+    volScalarFieldValue p 1e5
 );
 
 regions
@@ -30,7 +30,7 @@ regions
         fieldValues
         (
             volScalarFieldValue alpha1 0
-            volScalarFieldValue pd 10e5
+            volScalarFieldValue p 10e5
         );
     }
 

wmake/rules/linuxGcc/general

@@ -1,4 +1,4 @@
-CPP        = cpp $(GFLAGS)
+CPP        = cpp $(GFLAGS) -P
 LD         = ld -melf_i386
 
 PROJECT_LIBS = -l$(WM_PROJECT) -ldl