Merge branch 'master' into cvm

tutorials/combustion/XiFoam/les/pitzDaily/system/fvSolution

@@ -58,7 +58,7 @@ PIMPLE
 
 relaxationFactors
 {
-    "(Xi|Su)"     1;
+    "(Xi|Su)"       1;
 }
 
 

tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSolution

@@ -58,7 +58,7 @@ PIMPLE
 
 relaxationFactors
 {
-    "(Xi|Su)"     1;
+    "(Xi|Su)"       1;
 }
 
 

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

@@ -72,8 +72,8 @@ relaxationFactors
 {
     "p.*"           0.3;
     "rho.*"         1;
-    "(U|h|k|epsilon|omega)"  0.7;
-    "(U|h|k|epsilon|omega)Final"       1;
+    "(U|h|k|epsilon|omega)" 0.7;
+    "(U|h|k|epsilon|omega)Final" 1;
 }
 
 

tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctExplicit/system/fvSolution

@@ -62,9 +62,9 @@ SIMPLE
 
     residualControl
     {
-        p       1e-2;
-        U       1e-4;
-        T       1e-3;
+        p               1e-2;
+        U               1e-4;
+        T               1e-3;
 
         // possibly check turbulence fields
         "(k|epsilon|omega)" 1e-3;

tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/system/fvSolution

@@ -56,9 +56,9 @@ SIMPLE
 
     residualControl
     {
-        p       1e-3;
-        U       1e-4;
-        T       1e-3;
+        p               1e-3;
+        U               1e-4;
+        T               1e-3;
 
         // possibly check turbulence fields
         "(k|epsilon|omega)" 1e-3;

tutorials/compressible/rhoSimplecFoam/squareBend/system/fvSolution

@@ -172,29 +172,29 @@ solvers
 SIMPLE
 {
     nNonOrthogonalCorrectors 0;
-    rhoMin      rhoMin [1 -3 0 0 0] 0.1;
-    rhoMax      rhoMax [1 -3 0 0 0] 1.0;
-    transonic   yes;
+    rhoMin          rhoMin [1 -3 0 0 0] 0.1;
+    rhoMax          rhoMax [1 -3 0 0 0] 1.0;
+    transonic       yes;
 }
 
 relaxationFactors
 {
-    p           1;
-    rho         1; //0.1;
-    U           0.9;
-    h           0.95;
-    k           0.9;
-    epsilon     0.9;
+    p               1;
+    rho             1; //0.1;
+    U               0.9;
+    h               0.95;
+    k               0.9;
+    epsilon         0.9;
 }
 
 relaxationFactors0
 {
-    p           0.3;
-    rho         0.1;
-    U           0.7;
-    h           0.7;
-    k           0.7;
-    epsilon     0.7;
+    p               0.3;
+    rho             0.1;
+    U               0.7;
+    h               0.7;
+    k               0.7;
+    epsilon         0.7;
 }
 
 // ************************************************************************* //

tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSolution

@@ -42,9 +42,9 @@ SIMPLE
 
     residualControl
     {
-        p_rgh   1e-2;
-        U       1e-4;
-        T       1e-2;
+        p_rgh           1e-2;
+        U               1e-4;
+        T               1e-2;
 
         // possibly check turbulence fields
         "(k|epsilon|omega)" 1e-3;

tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSolution

@@ -42,9 +42,9 @@ SIMPLE
 
     residualControl
     {
-        p_rgh   1e-2;
-        U       1e-4;
-        T       1e-3;
+        p_rgh           1e-2;
+        U               1e-4;
+        T               1e-3;
 
         // possibly check turbulence fields
         "(k|epsilon|omega)" 1e-3;

tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSolution

@@ -49,9 +49,9 @@ SIMPLE
 
     residualControl
     {
-        p_rgh   1e-2;
-        U       1e-3;
-        h       1e-3;
+        p_rgh           1e-2;
+        U               1e-3;
+        h               1e-3;
 
         // possibly check turbulence fields
         "(k|epsilon|omega)" 1e-3;

tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/fvSolution

@@ -42,9 +42,9 @@ SIMPLE
 
     residualControl
     {
-        p_rgh   1e-2;
-        U       1e-3;
-        h       1e-3;
+        p_rgh           1e-2;
+        U               1e-3;
+        h               1e-3;
 
         // possibly check turbulence fields
         "(k|epsilon|omega)" 1e-3;

tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSolution

@@ -49,10 +49,10 @@ SIMPLE
 
     residualControl
     {
-        p_rgh   1e-2;
-        U       1e-3;
-        h       1e-3;
-        G       1e-3;
+        p_rgh           1e-2;
+        U               1e-3;
+        h               1e-3;
+        G               1e-3;
 
         // possibly check turbulence fields
         "(k|epsilon|omega)" 1e-3;

tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/fvSolution

@@ -46,10 +46,10 @@ SIMPLE
 
     residualControl
     {
-        p_rgh   1e-2;
-        U       1e-3;
-        h       1e-3;
-        G       1e-3;
+        p_rgh           1e-2;
+        U               1e-3;
+        h               1e-3;
+        G               1e-3;
 
         // possibly check turbulence fields
         "(k|epsilon|omega)" 1e-3;

tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSolution

@@ -70,8 +70,8 @@ solvers
 
 PIMPLE
 {
-    momentumPredictor   on;
-    nCorrectors         2;
+    momentumPredictor on;
+    nCorrectors      2;
     nNonOrthogonalCorrectors 0;
 }
 

tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSolution

@@ -72,8 +72,8 @@ solvers
 
 PIMPLE
 {
-    momentumPredictor   on;
-    nCorrectors         2;
+    momentumPredictor on;
+    nCorrectors      2;
     nNonOrthogonalCorrectors 0;
 }
 

tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/bottomAir/fvSolution

@@ -51,23 +51,23 @@ SIMPLE
 {
     momentumPredictor on;
     nNonOrthogonalCorrectors 0;
-    pRefCell                0;
-    pRefValue               100000;
-    rhoMin      rhoMin [1 -3 0 0 0] 0.2;
-    rhoMax      rhoMax [1 -3 0 0 0] 2;
+    pRefCell        0;
+    pRefValue       100000;
+    rhoMin          rhoMin [1 -3 0 0 0] 0.2;
+    rhoMax          rhoMax [1 -3 0 0 0] 2;
 }
 
 relaxationFactors
 {
-    rho         1;
-    p_rgh       0.7;
-    U           0.3;
-    h           0.7;
-    nuTilda     0.7;
-    k           0.7;
-    epsilon     0.7;
-    omega       0.7;
-    "ILambda.*" 0.7;
+    rho             1;
+    p_rgh           0.7;
+    U               0.3;
+    h               0.7;
+    nuTilda         0.7;
+    k               0.7;
+    epsilon         0.7;
+    omega           0.7;
+    "ILambda.*"     0.7;
 }
 
 // ************************************************************************* //

tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/fvSolution

@@ -32,7 +32,7 @@ SIMPLE
 
 relaxationFactors
 {
-    T           0.7;
+    T               0.7;
 }
 
 // ************************************************************************* //

tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/leftSolid/fvSolution

@@ -32,7 +32,7 @@ SIMPLE
 
 relaxationFactors
 {
-    T           0.7;
+    T               0.7;
 }
 
 // ************************************************************************* //

tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/rightSolid/fvSolution

@@ -32,7 +32,7 @@ SIMPLE
 
 relaxationFactors
 {
-    T           0.7;
+    T               0.7;
 }
 
 // ************************************************************************* //

tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/fvSolution

@@ -53,23 +53,23 @@ SIMPLE
 {
     momentumPredictor on;
     nNonOrthogonalCorrectors 0;
-    pRefCell                0;
-    pRefValue               100000;
-    rhoMin      rhoMin [1 -3 0 0 0] 0.2;
-    rhoMax      rhoMax [1 -3 0 0 0] 2;
+    pRefCell        0;
+    pRefValue       100000;
+    rhoMin          rhoMin [1 -3 0 0 0] 0.2;
+    rhoMax          rhoMax [1 -3 0 0 0] 2;
 }
 
 relaxationFactors
 {
-    rho         1;
-    p_rgh       0.7;
-    U           0.3;
-    h           0.7;
-    nuTilda     0.7;
-    k           0.7;
-    epsilon     0.7;
-    omega       0.7;
-    "ILambda.*" 0.7;
+    rho             1;
+    p_rgh           0.7;
+    U               0.3;
+    h               0.7;
+    nuTilda         0.7;
+    k               0.7;
+    epsilon         0.7;
+    omega           0.7;
+    "ILambda.*"     0.7;
 }
 
 // ************************************************************************* //

tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/fvSolution

@@ -58,10 +58,10 @@ SIMPLE
 {
     momentumPredictor on;
     nNonOrthogonalCorrectors 0;
-    pRefCell                0;
-    pRefValue               100000;
-    rhoMin      rhoMin [1 -3 0 0 0] 0.2;
-    rhoMax      rhoMax [1 -3 0 0 0] 2;
+    pRefCell        0;
+    pRefValue       100000;
+    rhoMin          rhoMin [1 -3 0 0 0] 0.2;
+    rhoMax          rhoMax [1 -3 0 0 0] 2;
 }
 
 relaxationFactors

tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/fvSolution

@@ -32,7 +32,7 @@ SIMPLE
 
 relaxationFactors
 {
-    T           0.7;
+    T               0.7;
 }
 
 // ************************************************************************* //

tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/fvSolution

@@ -32,7 +32,7 @@ SIMPLE
 
 relaxationFactors
 {
-    T           0.7;
+    T               0.7;
 }
 
 // ************************************************************************* //

tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/fvSolution

@@ -32,7 +32,7 @@ SIMPLE
 
 relaxationFactors
 {
-    T           0.7;
+    T               0.7;
 }
 
 // ************************************************************************* //

tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/fvSolution

@@ -60,10 +60,10 @@ SIMPLE
 {
     momentumPredictor on;
     nNonOrthogonalCorrectors 0;
-    pRefCell                0;
-    pRefValue               100000;
-    rhoMin      rhoMin [1 -3 0 0 0] 0.2;
-    rhoMax      rhoMax [1 -3 0 0 0] 2;
+    pRefCell        0;
+    pRefValue       100000;
+    rhoMin          rhoMin [1 -3 0 0 0] 0.2;
+    rhoMax          rhoMax [1 -3 0 0 0] 2;
 }
 
 relaxationFactors

tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSolution

@@ -74,7 +74,7 @@ PIMPLE
 
 relaxationFactors
 {
-    "U.*"    1;
+    "U.*"           1;
 }
 
 // ************************************************************************* //

tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSolution

@@ -83,9 +83,8 @@ PIMPLE
 relaxationFactors
 {
     p               0.3;
-    U               0.7;
-    k               0.7;
-    omega           0.7;
+    "(U|k|omega)"   0.7;
+    "(U|k|omega)Final" 1.0;
 }
 
 cache

tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/fvSolution

@@ -66,9 +66,8 @@ SIMPLE
 relaxationFactors
 {
     p               0.3;
-    U               0.7;
-    k               0.7;
-    omega           0.7;
+    "(U|k|omega)"   0.7;
+    "(U|k|omega)Final" 1.0;
 }
 
 cache

tutorials/incompressible/simpleFoam/airFoil2D/system/fvSolution

@@ -55,6 +55,13 @@ SIMPLE
     nNonOrthogonalCorrectors 0;
     pRefCell        0;
     pRefValue       0;
+
+    residualControl
+    {
+        p               1e-5;
+        U               1e-5;
+        nuTilda         1e-5;
+    }
 }
 
 relaxationFactors

tutorials/incompressible/simpleFoam/pitzDaily/system/fvSolution

@@ -72,8 +72,8 @@ SIMPLE
 
     residualControl
     {
-        p       1e-2;
-        U       1e-3;
+        p               1e-2;
+        U               1e-3;
         "(k|epsilon|omega)" 1e-3;
     }
 }

tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/fvSolution

@@ -72,8 +72,8 @@ SIMPLE
 
     residualControl
     {
-        p       1e-2;
-        U       1e-3;
+        p               1e-2;
+        U               1e-3;
         "(k|epsilon|omega)" 1e-3;
     }
 }

tutorials/incompressible/windSimpleFoam/turbineSiting/system/fvSolution

@@ -60,16 +60,22 @@ solvers
 
 SIMPLE
 {
-    nNonOrthogonalCorrectors     0;
-    convergence                  1e-3;
+    nNonOrthogonalCorrectors 0;
+
+    residualControl
+    {
+        p               1e-2;
+        U               1e-3;
+        "(k|epsilon)"   1e-3;
+    }
 }
 
 relaxationFactors
 {
-    p           0.3;
-    U           0.7;
-    k           0.7;
-    epsilon     0.7;
+    p               0.3;
+    U               0.7;
+    k               0.7;
+    epsilon         0.7;
 }
 
 cache

tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSolution

@@ -78,15 +78,16 @@ solvers
 
 PIMPLE
 {
-    nCorrectors         2;
+    nCorrectors     2;
     nNonOrthogonalCorrectors 0;
     momentumPredictor yes;
-    rhoMin rhoMin [1 -3 0 0 0] 0.1;
-    rhoMax rhoMax [1 -3 0 0 0] 1.5;
+    rhoMin          rhoMin [1 -3 0 0 0] 0.1;
+    rhoMax          rhoMax [1 -3 0 0 0] 1.5;
 
     maxCo           0.5;
+    rDeltaTSmoothingCoeff 0.1;
     maxDeltaT       1;
-    alphaTauTemp    0.005;
+    alphaTemp       0.005;
 }
 
 additional

tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties

@@ -110,13 +110,10 @@ subModels
 
     surfaceReactionModel none;
 
-    postProcessingModel particleTracks;
-
     surfaceFilmModel none;
 
     radiation       off;
 
-
     patchInjectionCoeffs
     {
         massFlowRate    0.8e-03;
@@ -190,14 +187,18 @@ subModels
         enthalpyTransfer enthalpyDifference;
         activeLiquids   ( H2O );
     }
+}
 
-    patchPostProcessingCoeffs
+
+cloudFunctions
+{
+    patchPostProcessing
     {
         maxStoredParcels 100;
         patches         ( outlet );
     }
 
-    particleTracksCoeffs
+    particleTracks
     {
         trackInterval   5;
         maxSamples      1000000;

tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/system/fvSolution

@@ -64,16 +64,16 @@ solvers
 
 PIMPLE
 {
-    nOuterCorrectors    1;
-    nCorrectors         2;
+    nOuterCorrectors 1;
+    nCorrectors     2;
     nNonOrthogonalCorrectors 0;
     momentumPredictor yes;
-    rhoMin rhoMin [1 -3 0 0 0] 0.1;
-    rhoMax rhoMax [1 -3 0 0 0] 1.5;
+    rhoMin          rhoMin [1 -3 0 0 0] 0.1;
+    rhoMax          rhoMax [1 -3 0 0 0] 1.5;
 
     maxCo           5;
-    alphaTauSmooth  1;
-    alphaTauTemp    1;
+    rDeltaTSmoothingCoeff 1;
+    alphaTemp       1;
     maxDeltaT       1;
 }
 

tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties

@@ -103,8 +103,6 @@ subModels
 
     surfaceReactionModel COxidationKineticDiffusionLimitedRate;
 
-    postProcessingModel none;
-
     surfaceFilmModel none;
 
     radiation       on;
@@ -195,4 +193,8 @@ subModels
 }
 
 
+cloudFunctions
+{}
+
+
 // ************************************************************************* //

tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/energySourceProperties

@@ -23,7 +23,7 @@ FoamFile
         duration        0.2;
         selectionMode   cellSet;
         volumeMode      absolute;
-        fieldData       15000;
+        fieldData       20000;
         cellSet         ignitionCells;
     }
 );

tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties

@@ -85,8 +85,6 @@ subModels
 
     heatTransferModel RanzMarshall;
 
-    postProcessingModel none;
-
     surfaceFilmModel none;
 
     radiation       on;
@@ -125,4 +123,8 @@ subModels
 }
 
 
+cloudFunctions
+{}
+
+
 // ************************************************************************* //

tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution

@@ -95,4 +95,9 @@ PIMPLE
 }
 
 
+relaxationFactors
+{
+    ".*Final"       1;
+}
+
 // ************************************************************************* //

tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/kinematicCloudProperties

@@ -42,6 +42,7 @@ solution
     }
 }
 
+
 constantProperties
 {
     parcelTypeId    1;
@@ -56,6 +57,7 @@ constantProperties
     constantVolume  false;
 }
 
+
 subModels
 {
     particleForces
@@ -72,8 +74,6 @@ subModels
 
     heatTransferModel none;
 
-    postProcessingModel none;
-
     surfaceFilmModel none;
 
     collisionModel pairCollision;
@@ -129,4 +129,8 @@ subModels
 }
 
 
+cloudFunctions
+{}
+
+
 // ************************************************************************* //

tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/kinematicCloudProperties

@@ -65,8 +65,6 @@ subModels
 
     heatTransferModel none;
 
-    postProcessingModel none;
-
     surfaceFilmModel none;
 
     collisionModel pairCollision;
@@ -140,4 +138,8 @@ subModels
 }
 
 
+cloudFunctions
+{}
+
+
 // ************************************************************************* //