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

tutorials/combustion/fireFoam/les/smallPoolFire3D/system/fvSchemes

@@ -30,7 +30,7 @@ divSchemes
     default        none;
     div(phi,U)      Gauss linear;
     div(phi,K)      Gauss linear;
-    div(phi,k)      Gauss limitedLinear 0.1;
+    div(phi,k)      Gauss limitedLinear 1;
     div(phi,Yi_h) Gauss multivariateSelection
     {
         O2              limitedLinear01 1;

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

@@ -29,7 +29,7 @@ solvers
     {
         solver              GAMG;
         tolerance           1e-7;
-        relTol              0.01;
+        relTol              0.1;
         smoother            GaussSeidel;
         cacheAgglomeration  true;
         nCellsInCoarsestLevel   10;
@@ -88,7 +88,7 @@ PIMPLE
 {
     momentumPredictor yes;
     nOuterCorrectors  1;
-    nCorrectors       1;
+    nCorrectors       2;
     nNonOrthogonalCorrectors 0;
 }
 
@@ -100,7 +100,7 @@ relaxationFactors
     equations
     {
         "(U|k).*"                   1;
-        "(CH4|O2|H2O|CO2|h).*"    0.9;
+        "(CH4|O2|H2O|CO2|h).*"      1;
     }
 }
 

tutorials/incompressible/simpleFoam/turbineSiting/constant/sourcesProperties

@@ -27,7 +27,7 @@ disk1
     actuationDiskSourceCoeffs
     {
         fieldNames  (U);
-        diskDir     (-1 0 0);   // orientation of the disk
+        diskDir     (1 0 0);   // orientation of the disk
         Cp          0.386;      // Cp
         Ct          0.58;       // Ct
         diskArea    40;         // disk area
@@ -47,7 +47,7 @@ disk2
     actuationDiskSourceCoeffs
     {
         fieldNames  (U);
-        diskDir     (-1 0 0);
+        diskDir     (1 0 0);
         Cp          0.53;
         Ct          0.58;
         diskArea    40;

tutorials/incompressible/simpleFoam/turbineSiting/system/fvSolution

@@ -64,9 +64,9 @@ SIMPLE
 
     residualControl
     {
-        p               1e-2;
-        U               1e-3;
-        "(k|epsilon)"   1e-3;
+        p               1e-3;
+        U               1e-4;
+        "(k|epsilon)"   1e-4;
     }
 }