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

tutorials/combustion/fireFoam/les/smallPoolFire2D/0/p_rgh

@@ -24,12 +24,17 @@ boundaryField
     outlet
     {
         type            buoyantPressure;
-        value           uniform 101325;
+        value           $internalField;
     }
-
     sides
     {
-        type            fixedValue;
+        type            totalPressure;
+        p0              $internalField;
+        U               U;
+        phi             phi;
+        rho             none;
+        psi             none;
+        gamma           1;
         value           $internalField;
     }
     base

tutorials/combustion/fireFoam/les/smallPoolFire3D/0/p_rgh

@@ -26,10 +26,15 @@ boundaryField
         type            buoyantPressure;
         value           $internalField;
     }
-
     sides
     {
-        type            fixedValue;
+        type            totalPressure;
+        p0              $internalField;
+        U               U;
+        phi             phi;
+        rho             none;
+        psi             none;
+        gamma           1;
         value           $internalField;
     }
     base

tutorials/combustion/fireFoam/les/smallPoolFire3D/system/fvSolution

@@ -18,18 +18,11 @@ FoamFile
 
 solvers
 {
-    rho
+    "(rho|rhoFinal)"
     {
         solver              PCG;
         preconditioner      DIC;
         tolerance           1e-7;
-        relTol              0.1;
-    };
-
-    rhoFinal
-    {
-        $rho;
-        tolerance           1e-7;
         relTol              0;
     };
 
@@ -69,7 +62,6 @@ solvers
         relTol          0;
     };
 
-
     Ii
     {
         solver              GAMG;

tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/turbulenceProperties

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

tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/turbulenceProperties

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

tutorials/compressible/rhoCentralFoam/forwardStep/constant/turbulenceProperties

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

tutorials/compressible/rhoCentralFoam/obliqueShock/constant/turbulenceProperties

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

tutorials/compressible/rhoCentralFoam/shockTube/constant/turbulenceProperties

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

tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/turbulenceProperties

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

tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/fvSolution

@@ -52,6 +52,8 @@ PIMPLE
     nOuterCorrectors 2;
     nCorrectors     1;
     nNonOrthogonalCorrectors 0;
+    rhoMin          rhoMin [ 1 -3 0 0 0 ] 0.5;
+    rhoMax          rhoMax [ 1 -3 0 0 0 ] 2.0;
 }
 
 relaxationFactors

tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSolution

@@ -55,6 +55,8 @@ PIMPLE
     nOuterCorrectors 50;
     nCorrectors     1;
     nNonOrthogonalCorrectors 0;
+    rhoMin          rhoMin [ 1 -3 0 0 0 ] 0.5;
+    rhoMax          rhoMax [ 1 -3 0 0 0 ] 2.0;
 }
 
 relaxationFactors

tutorials/compressible/rhoPimpleFoam/ras/cavity/system/fvSolution

@@ -59,6 +59,8 @@ PIMPLE
     nOuterCorrectors 1;
     nCorrectors     2;
     nNonOrthogonalCorrectors 0;
+    rhoMin          rhoMin [ 1 -3 0 0 0 ] 0.5;
+    rhoMax          rhoMax [ 1 -3 0 0 0 ] 2.0;
 }
 
 

tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctExplicit/system/controlDict

@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application     rhoPorousSimpleFoam;
+application     rhoPorousMRFSimpleFoam;
 
 startFrom       startTime;
 

tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctExplicit/system/fvSchemes

@@ -23,8 +23,6 @@ ddtSchemes
 gradSchemes
 {
     default         Gauss linear;
-    grad(U)         Gauss linear;
-    grad(p)         Gauss linear;
 }
 
 divSchemes
@@ -34,6 +32,7 @@ divSchemes
     div(phi,h)      Gauss upwind;
     div(phi,epsilon) Gauss upwind;
     div(phi,k)      Gauss upwind;
+    div(U,p)        Gauss upwind;
 }
 
 laplacianSchemes
@@ -50,7 +49,6 @@ laplacianSchemes
 interpolationSchemes
 {
     default         linear;
-    div(U,p)        upwind phi;
 }
 
 snGradSchemes

tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctExplicit/system/fvSolution

@@ -57,7 +57,7 @@ solvers
 SIMPLE
 {
     nNonOrthogonalCorrectors 0;
-    rhoMin          rhoMin [ 1 -3 0 0 0 ] 1.0;
+    rhoMin          rhoMin [ 1 -3 0 0 0 ] 0.5;
     rhoMax          rhoMax [ 1 -3 0 0 0 ] 1.5;
 }
 

tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary

@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      ascii;
+    format      binary;
     class       polyBoundaryMesh;
     location    "constant/polyMesh";
     object      boundary;

tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/system/controlDict

@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application     rhoPorousSimpleFoam;
+application     rhoPorousMRFSimpleFoam;
 
 startFrom       startTime;
 

tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/system/fvSchemes

@@ -23,8 +23,6 @@ ddtSchemes
 gradSchemes
 {
     default         Gauss linear;
-    grad(U)         Gauss linear;
-    grad(p)         Gauss linear;
 }
 
 divSchemes
@@ -34,6 +32,7 @@ divSchemes
     div(phi,h)      Gauss upwind;
     div(phi,epsilon) Gauss upwind;
     div(phi,k)      Gauss upwind;
+    div(U,p)        Gauss upwind;
 }
 
 laplacianSchemes
@@ -49,7 +48,6 @@ laplacianSchemes
 interpolationSchemes
 {
     default         linear;
-    div(U,p)        upwind phi;
 }
 
 snGradSchemes

tutorials/compressible/sonicFoam/laminar/shockTube/system/sampleDict

@@ -25,13 +25,12 @@ sets
     {
         type    uniform;
         axis    x;
-        start   ( -4.995 0 0 );
-        end     ( 4.995 0 0 );
+        start   (-4.995 0 0);
+        end     (4.995 0 0);
         nPoints 1000;
     }
 );
 
-fields          ( T magU p );
-
+fields          (T magU p);
 
 // ************************************************************************* //