Upgrade fvSolution to new format

tutorials/DNS/dnsFoam/boxTurb16/system/fvSolution

@@ -16,18 +16,20 @@ FoamFile
 
 solvers
 {
-    p PCG
+    p
     {
-        preconditioner   DIC;
+        solver           CG;
+        preconditioner   Cholesky;
         tolerance        1e-06;
         relTol           0;
-    };
+    }
-    U BiCGStab
+    U
     {
+        solver           BiCGStab;
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0;
-    };
+    }
 }
 
 PISO

tutorials/basic/laplacianFoam/Case1.1_mixingPlane_sector_AB_60deg/system/fvSolution

@@ -23,7 +23,7 @@ solvers
         preconditioner  diagonal;
         tolerance        1e-06;
         relTol           0;
-    };
+    }
     p
     {
         solver          BiCGStab;

tutorials/basic/scalarTransportFoam/swirlTest/system/fvSolution

@@ -22,7 +22,7 @@ solvers
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0;
-    };
+    }
 }
 
 SIMPLE

tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSolution

@@ -23,7 +23,7 @@ solvers
         preconditioner  DIC;
         tolerance       0;
         relTol          0;
-    };
+    }
 
     p
     {
@@ -35,7 +35,7 @@ solvers
         nCellsInCoarsestLevel   10;
         agglomerator    faceAreaPair;
         mergeLevels     1;
-    };
+    }
 
     pFinal
     {
@@ -47,7 +47,7 @@ solvers
         nCellsInCoarsestLevel 10;
         agglomerator     faceAreaPair;
         mergeLevels      1;
-    };
+    }
 
     ft
     {
@@ -56,7 +56,7 @@ solvers
         tolerance       1e-7;
         relTol          0;
         nSweeps         1;
-    };
+    }
 
     fu
     {
@@ -65,7 +65,7 @@ solvers
         tolerance       1e-7;
         relTol          0;
         nSweeps         1;
-    };
+    }
 
     U
     {
@@ -74,7 +74,7 @@ solvers
         tolerance       1e-7;
         relTol          0.1;
         nSweeps         1;
-    };
+    }
 
     UFinal
     {
@@ -83,7 +83,7 @@ solvers
         tolerance       1e-7;
         relTol          0;
         nSweeps         1;
-    };
+    }
 
     k
     {
@@ -92,7 +92,7 @@ solvers
         tolerance       1e-7;
         relTol          0;
         nSweeps         1;
-    };
+    }
 
     hs
     {
@@ -100,7 +100,7 @@ solvers
         preconditioner  DILU;
         tolerance       1e-7;
         relTol          0;
-    };
+    }
 
     Ii
     {

tutorials/compressible/dbnsFoam/forwardStep/system/controlDict

@@ -34,7 +34,7 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression compressed;
+writeCompression no;
 
 timeFormat      general;
 

tutorials/electromagnetics/electrostaticFoam/chargedWire/system/fvSolution

@@ -16,18 +16,20 @@ FoamFile
 
 solvers
 {
-    phi PCG
+    phi
     {
-        preconditioner   DIC;
+        solver           CG;
+        preconditioner   Cholesky;
         tolerance        1e-08;
         relTol           0.2;
-    };
+    }
-    rho BiCGStab
+    rho
     {
-        preconditioner   DILU;
+        solver           BiCGStab;
+        preconditioner   ILU0;
         tolerance        1e-08;
         relTol           0.2;
-    };
+    }
 }
 
 

tutorials/electromagnetics/mhdFoam/hartmann/system/fvSolution

@@ -16,30 +16,34 @@ FoamFile
 
 solvers
 {
-    p PCG
+    p
     {
-        preconditioner   DIC;
+        solver           CG;
+        preconditioner   Cholesky;
         tolerance        1e-06;
         relTol           0;
-    };
+    }
-    U BiCGStab
+    U
     {
+        solver           BiCGStab;
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0;
-    };
+    }
-    B BiCGStab
+    B
     {
+        solver           BiCGStab;
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0;
-    };
+    }
-    pB PCG
+    pB
     {
-        preconditioner   DIC;
+        solver           CG;
+        preconditioner   Cholesky;
         tolerance        1e-05;
         relTol           0;
-    };
+    }
 }
 
 PISO

tutorials/equationReader/equationReaderDemo/pitzDaily/system/fvSolution

@@ -22,42 +22,42 @@ solvers
         preconditioner   DIC;
         tolerance        1e-06;
         relTol           0.01;
-    };
+    }
     U
     {
         solver           BiCGStab;
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0.1;
-    };
+    }
     k
     {
         solver           BiCGStab;
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0.1;
-    };
+    }
     epsilon
     {
         solver           BiCGStab;
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0.1;
-    };
+    }
     R
     {
         solver           BiCGStab;
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0.1;
-    };
+    }
     nuTilda
     {
         solver           BiCGStab;
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0.1;
-    };
+    }
 }
 
 SIMPLE

tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/fvSolution

@@ -22,42 +22,42 @@ solvers
         preconditioner   DIC;
         tolerance        1e-08;
         relTol           0;
-    };
+    }
     U
     {
         solver           BiCGStab;
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0;
-    };
+    }
     h
     {
         solver           BiCGStab;
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0;
-    };
+    }
     k
     {
         solver           BiCGStab;
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0;
-    };
+    }
     epsilon
     {
         solver           BiCGStab;
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0;
-    };
+    }
     R
     {
         solver           BiCGStab;
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0;
-    };
+    }
 }
 
 SIMPLE

tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSolution

@@ -16,42 +16,48 @@ FoamFile
 
 solvers
 {
-    p PCG
+    p
     {
-        preconditioner   DIC;
+        solver           CG;
+        preconditioner   Cholesky;
         tolerance        1e-06;
         relTol           0.01;
-    };
+    }
-    U BiCGStab
+    U
     {
-        preconditioner   DILU;
+        solver           BiCGStab;
+        preconditioner   ILU0;
         tolerance        1e-05;
         relTol           0.1;
-    };
+    }
-    h BiCGStab
+    h
     {
-        preconditioner   DILU;
+        solver           BiCGStab;
+        preconditioner   ILU0;
         tolerance        1e-05;
         relTol           0.1;
-    };
+    }
-    k BiCGStab
+    k
     {
-        preconditioner   DILU;
+        solver           BiCGStab;
+        preconditioner   ILU0;
         tolerance        1e-05;
         relTol           0.1;
-    };
+    }
-    epsilon BiCGStab
+    epsilon
     {
-        preconditioner   DILU;
+        solver           BiCGStab;
+        preconditioner   ILU0;
         tolerance        1e-05;
         relTol           0.1;
-    };
+    }
     G PCG
     {
-        preconditioner   DIC;
+        solver           CG;
+        preconditioner   Cholesky;
         tolerance        1e-05;
         relTol           0.1;
-    };
+    }
 }
 
 SIMPLE

tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOMSpecularCeiling/system/fvSolution

@@ -23,10 +23,10 @@ solvers
         tolerance       1e-06;
         relTol          0.01;
         smoother        GaussSeidel;
-        cacheAgglomeration true;
+        cacheAgglomeration false;
         nCellsInCoarsestLevel 10;
         agglomerator    faceAreaPair;
-        mergeLevels     1;
+        mergeLevels     2;
     }
 
     U

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

@@ -22,7 +22,7 @@ solvers
         preconditioner   DIC;
         tolerance        1e-6;
         relTol           0;
-    };
+    }
     p
     {
         solver           GAMG;
@@ -35,7 +35,7 @@ solvers
         nCellsInCoarsestLevel 10;
         agglomerator     faceAreaPair;
         mergeLevels      1;
-    };
+    }
     pFinal
     {
         solver           GAMG;
@@ -48,21 +48,21 @@ solvers
         nCellsInCoarsestLevel 10;
         agglomerator     faceAreaPair;
         mergeLevels      1;
-    };
+    }
     U
     {
         solver           BiCGStab;
         preconditioner   DILU;
         tolerance        1e-08;
         relTol           0;
-    };
+    }
     h
     {
         solver           BiCGStab;
         preconditioner   DILU;
         tolerance        1e-06;
         relTol           0;
-    };
+    }
     hFinal
     {
         solver           BiCGStab;
@@ -76,21 +76,21 @@ solvers
         preconditioner   DILU;
         tolerance        1e-06;
         relTol           0;
-    };
+    }
     epsilon
     {
         solver           BiCGStab;
         preconditioner   DILU;
         tolerance        1e-06;
         relTol           0;
-    };
+    }
     R
     {
         solver           BiCGStab;
         preconditioner   DILU;
         tolerance        1e-06;
         relTol           0;
-    };
+    }
 }
 
 PIMPLE

tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/fvSolution

@@ -22,7 +22,7 @@ solvers
         preconditioner   DIC;
         tolerance        1e-6;
         relTol           0;
-    };
+    }
     p
     {
         solver           GAMG;
@@ -35,7 +35,7 @@ solvers
         nCellsInCoarsestLevel 10;
         agglomerator     faceAreaPair;
         mergeLevels      1;
-    };
+    }
     pFinal
     {
         solver           GAMG;
@@ -48,42 +48,42 @@ solvers
         nCellsInCoarsestLevel 10;
         agglomerator     faceAreaPair;
         mergeLevels      1;
-    };
+    }
     U
     {
         solver           BiCGStab;
         preconditioner   DILU;
         tolerance        1e-08;
         relTol           0;
-    };
+    }
     h
     {
         solver           BiCGStab;
         preconditioner   DILU;
         tolerance        1e-06;
         relTol           0;
-    };
+    }
     k
     {
         solver           BiCGStab;
         preconditioner   DILU;
         tolerance        1e-06;
         relTol           0;
-    };
+    }
     epsilon
     {
         solver           BiCGStab;
         preconditioner   DILU;
         tolerance        1e-06;
         relTol           0;
-    };
+    }
     R
     {
         solver           BiCGStab;
         preconditioner   DILU;
         tolerance        1e-06;
         relTol           0;
-    };
+    }
 }
 
 PIMPLE

tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSolution

@@ -22,7 +22,7 @@ solvers
         preconditioner   DIC;
         tolerance        1E-06;
         relTol           0;
-    };
+    }
 }
 
 PIMPLE

tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSolution

@@ -22,7 +22,7 @@ solvers
         preconditioner  DIC;
         tolerance       1e-8;
         relTol          0;
-    };
+    }
     p
     {
         solver           GAMG;
@@ -35,7 +35,7 @@ solvers
         nCellsInCoarsestLevel 10;
         agglomerator     faceAreaPair;
         mergeLevels      1;
-    };
+    }
     pFinal
     {
         solver           GAMG;
@@ -48,14 +48,14 @@ solvers
         nCellsInCoarsestLevel 10;
         agglomerator     faceAreaPair;
         mergeLevels      1;
-    };
+    }
     U
     {
         solver           BiCGStab;
         preconditioner   DILU;
         tolerance        1e-08;
         relTol           0;
-    };
+    }
 
     h
     {
@@ -63,14 +63,14 @@ solvers
         preconditioner   DILU;
         tolerance        1e-08;
         relTol           0.1;
-    };
+    }
     hFinal
     {
         solver           BiCGStab;
         preconditioner   DILU;
         tolerance        1e-08;
         relTol           0;
-    };
+    }
 
     k
     {
@@ -78,21 +78,21 @@ solvers
         preconditioner   DILU;
         tolerance        1e-08;
         relTol           0;
-    };
+    }
     epsilon
     {
         solver           BiCGStab;
         preconditioner   DILU;
         tolerance        1e-08;
         relTol           0;
-    };
+    }
     R
     {
         solver           BiCGStab;
         preconditioner   DILU;
         tolerance        1e-08;
         relTol           0;
-    };
+    }
 }
 
 PISO

tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSolution

@@ -22,7 +22,7 @@ solvers
         preconditioner   DIC;
         tolerance        1E-06;
         relTol           0;
-    };
+    }
 }
 
 PISO

tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSolution

@@ -22,7 +22,7 @@ solvers
         preconditioner   DIC;
         tolerance        1E-06;
         relTol           0;
-    };
+    }
 }
 
 PISO

tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSolution

@@ -22,7 +22,7 @@ solvers
         preconditioner   DIC;
         tolerance        1E-06;
         relTol           0;
-    };
+    }
 }
 
 PISO

tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSolution

@@ -22,7 +22,7 @@ solvers
         preconditioner  DIC;
         tolerance       1e-8;
         relTol          0;
-    };
+    }
     p
     {
         solver           GAMG;
@@ -35,7 +35,7 @@ solvers
         nCellsInCoarsestLevel 10;
         agglomerator     faceAreaPair;
         mergeLevels      1;
-    };
+    }
     pFinal
     {
         solver           GAMG;
@@ -48,14 +48,14 @@ solvers
         nCellsInCoarsestLevel 10;
         agglomerator     faceAreaPair;
         mergeLevels      1;
-    };
+    }
     U
     {
         solver           BiCGStab;
         preconditioner   DILU;
         tolerance        1e-08;
         relTol           0;
-    };
+    }
 
     h
     {
@@ -63,14 +63,14 @@ solvers
         preconditioner   DILU;
         tolerance        1e-08;
         relTol           0.1;
-    };
+    }
     hFinal
     {
         solver           BiCGStab;
         preconditioner   DILU;
         tolerance        1e-08;
         relTol           0;
-    };
+    }
 
     k
     {
@@ -78,21 +78,21 @@ solvers
         preconditioner   DILU;
         tolerance        1e-08;
         relTol           0;
-    };
+    }
     epsilon
     {
         solver           BiCGStab;
         preconditioner   DILU;
         tolerance        1e-08;
         relTol           0;
-    };
+    }
     R
     {
         solver           BiCGStab;
         preconditioner   DILU;
         tolerance        1e-08;
         relTol           0;
-    };
+    }
 }
 
 PISO

tutorials/immersedBoundary/cylinderInChannelFineIcoIbFoam/system/fvSolution

@@ -20,7 +20,7 @@ solvers
     {
         solver          amgSolver;
         cycle           W-cycle;
-        policy          PAMG;
+        policy          cluster;
         nPreSweeps      2;
         nPostSweeps     2;
         groupSize       4;
@@ -39,7 +39,7 @@ solvers
     {
         solver          amgSolver;
         cycle           W-cycle;
-        policy          PAMG;
+        policy          cluster;
         nPreSweeps      2;
         nPostSweeps     2;
         groupSize       4;

tutorials/immersedBoundary/cylinderInChannelPotential/system/fvSolution

@@ -49,7 +49,7 @@ solvers
         maxIter          1000;
         tolerance        1e-08;
         relTol           0;
-    };
+    }
 }
 
 SIMPLE

tutorials/immersedBoundary/cylinderInChannelScalarTransport/system/fvSolution

@@ -33,7 +33,7 @@ solvers
         preconditioner   ILU0;
         tolerance        1e-08;
         relTol           0;
-    };
+    }
 }
 
 SIMPLE

tutorials/immersedBoundary/cylinderInSquarePotential/system/fvSolution

@@ -49,7 +49,7 @@ solvers
         maxIter          1000;
         tolerance        1e-08;
         relTol           0;
-    };
+    }
 }
 
 SIMPLE

tutorials/immersedBoundary/pitzDailyLaminarIcoIbFoam/system/fvSolution

@@ -77,7 +77,7 @@ solvers
         maxIter          1000;
         tolerance        1e-06;
         relTol           0;
-    };
+    }
 }
 
 SIMPLE

tutorials/immersedBoundary/pitzDailyLaminarSimpleIbFoam/system/fvSolution

@@ -61,7 +61,7 @@ solvers
         maxIter          1000;
         tolerance        1e-06;
         relTol           0;
-    };
+    }
 }
 
 SIMPLE

tutorials/immersedBoundary/simpleSilencerLaminarIcoIbFoam/system/fvSolution

@@ -63,7 +63,7 @@ solvers
         maxIter          1000;
         tolerance        1e-06;
         relTol           0;
-    };
+    }
 }
 
 SIMPLE

tutorials/immersedBoundary/sphereInChannel/system/fvSolution

@@ -79,7 +79,7 @@ solvers
         maxIter          1000;
         tolerance        1e-08;
         relTol           0;
-    };
+    }
 }
 
 SIMPLE

tutorials/immersedBoundary/thickPlateRefinedMesh/system/fvSolution

@@ -65,7 +65,7 @@ solvers
         maxIter          1000;
         tolerance        1e-06;
         relTol           0;
-    };
+    }
 }
 
 SIMPLE

tutorials/incompressible/MRFSimpleFoam/axialTurbine_mixingPlane/system/fvSolution

@@ -26,28 +26,28 @@ solvers
         preconditioner   DILU;
         tolerance        1e-08;
         relTol           0.05;
-    };
+    }
     U
     {
         solver           BiCGStab;
         preconditioner   DILU;
         tolerance        1e-07;
         relTol           0.1;
-    };
+    }
     k
     {
         solver           BiCGStab;
         preconditioner   DILU;
         tolerance        1e-07;
         relTol           0.1;
-    };
+    }
     epsilon
     {
         solver           BiCGStab;
         preconditioner   DILU;
         tolerance        1e-07;
         relTol           0.1;
-    };
+    }
 }
 
 SIMPLE

tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/fvSolution

@@ -16,36 +16,41 @@ FoamFile
 
 solvers
 {
-    U PCG
+    U
     {
-        preconditioner   DIC;
+        solver           CG;
+        preconditioner   Cholesky;
         tolerance        1e-06;
         relTol           0;
-    };
+    }
-    k BiCGStab
+    k
     {
-        preconditioner   DILU;
+        solver           BiCGStab;
+        preconditioner   ILU0;
         tolerance        1e-06;
         relTol           0;
-    };
+    }
-    epsilon BiCGStab
+    epsilon
     {
-        preconditioner   DILU;
+        solver           BiCGStab;
+        preconditioner   ILU0;
         tolerance        1e-06;
         relTol           0;
-    };
+    }
-    R BiCGStab
+    R
     {
-        preconditioner   DILU;
+        solver           BiCGStab;
+        preconditioner   ILU0;
         tolerance        1e-06;
         relTol           0;
-    };
+    }
-    nuTilda BiCGStab
+    nuTilda
     {
-        preconditioner   DILU;
+        solver           BiCGStab;
+        preconditioner   ILU0;
         tolerance        1e-06;
         relTol           0;
-    };
+    }
 }
 
 PISO

tutorials/incompressible/boundaryFoam/boundaryTwoWallsFlowSolution/system/fvSolution

@@ -16,41 +16,57 @@ FoamFile
 
 solvers
 {
-    // Solver for the U equation
+    U
-    U               ICCG 1e-12 0;
+    {
-    // Solver for the k equation
+        solver           CG;
-    k               BICCG 1e-06 0;
+        preconditioner   Cholesky;
-    // Solver for the epsilon equation
+        tolerance        1e-06;
-    epsilon         BICCG 1e-06 0;
+        relTol           0;
-    // Solver for the R equation
+    }
-    R               BICCG 1e-06 0;
+    k
-    // Solver for the nuTilda equation
+    {
-    nuTilda         BICCG 1e-06 0;
+        solver           BiCGStab;
+        preconditioner   ILU0;
+        tolerance        1e-06;
+        relTol           0;
+    }
+    epsilon
+    {
+        solver           BiCGStab;
+        preconditioner   ILU0;
+        tolerance        1e-06;
+        relTol           0;
+    }
+    R
+    {
+        solver           BiCGStab;
+        preconditioner   ILU0;
+        tolerance        1e-06;
+        relTol           0;
+    }
+    nuTilda
+    {
+        solver           BiCGStab;
+        preconditioner   ILU0;
+        tolerance        1e-06;
+        relTol           0;
+    }
 }
 
 PISO
 {
-    // Number of PISO correctors
     nCorrectors     2;
-    // Number of non-orthogonal correctors
     nNonOrthogonalCorrectors 0;
-    // momentumPredictor?
     momentumPredictor yes;
-    // fluxGradp?
     fluxGradp       no;
 }
 
 relaxationFactors
 {
-    // U
     U               0.1;
-    // k
     k               0.7;
-    // epsilon
     epsilon         0.7;
-    // R
     R               0.7;
-    // nuTilda
     nuTilda         0.7;
 }
 

tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/fvSolution

@@ -16,96 +16,55 @@ FoamFile
 
 solvers
 {
-    // Solver for the U equation
+    U
-    U PCG
     {
-        preconditioner
+        solver           CG;
-        {
+        preconditioner   Cholesky;
-            preconditioner DIC;
-        }
-
-        minIter          0;
-        maxIter          2000;
         tolerance        1e-06;
         relTol           0;
-    };
-    // Solver for the k equation
-    k BiCGStab
-    {
-        preconditioner
-        {
-            preconditioner DILU;
     }
-
+    k
-        minIter          0;
+    {
-        maxIter          500;
+        solver           BiCGStab;
+        preconditioner   ILU0;
         tolerance        1e-06;
         relTol           0;
-    };
-    // Solver for the epsilon equation
-    epsilon BiCGStab
-    {
-        preconditioner
-        {
-            preconditioner DILU;
     }
-
+    epsilon
-        minIter          0;
+    {
-        maxIter          500;
+        solver           BiCGStab;
+        preconditioner   ILU0;
         tolerance        1e-06;
         relTol           0;
-    };
-    // Solver for the R equation
-    R BiCGStab
-    {
-        preconditioner
-        {
-            preconditioner DILU;
     }
-
+    R
-        minIter          0;
+    {
-        maxIter          500;
+        solver           BiCGStab;
+        preconditioner   ILU0;
         tolerance        1e-06;
         relTol           0;
-    };
-    // Solver for the nuTilda equation
-    nuTilda BiCGStab
-    {
-        preconditioner
-        {
-            preconditioner DILU;
     }
-
+    nuTilda
-        minIter          0;
+    {
-        maxIter          500;
+        solver           BiCGStab;
+        preconditioner   ILU0;
         tolerance        1e-06;
         relTol           0;
-    };
+    }
 }
 
 PISO
 {
-    // Number of PISO correctors
     nCorrectors     2;
-    // Number of non-orthogonal correctors
     nNonOrthogonalCorrectors 0;
-    // momentumPredictor?
-    momentumPredictor yes;
-    // fluxGradp?
-    fluxGradp       no;
 }
 
 relaxationFactors
 {
-    // U
     U               0.5;
-    // k
     k               0.7;
-    // epsilon
     epsilon         0.7;
-    // R
     R               0.7;
-    // nuTilda
     nuTilda         0.7;
 }
 

tutorials/incompressible/channelFoam/channel395/system/fvSolution

@@ -16,42 +16,48 @@ FoamFile
 
 solvers
 {
-    p PCG
+    p
     {
-        preconditioner   DIC;
+        solver           CG;
+        preconditioner   Cholesky;
         tolerance        1e-06;
         relTol           0.05;
-    };
+    }
-    pFinal PCG
+    pFinal
     {
-        preconditioner   DIC;
+        solver           CG;
+        preconditioner   Cholesky;
         tolerance        1e-06;
         relTol           0;
-    };
+    }
-    U BiCGStab
+    U
     {
-        preconditioner   DILU;
+        solver           BiCGStab;
+        preconditioner   ILU0;
         tolerance        1e-05;
         relTol           0;
-    };
+    }
-    k BiCGStab
+    k
     {
-        preconditioner   DILU;
+        solver           BiCGStab;
+        preconditioner   ILU0;
         tolerance        1e-05;
         relTol           0;
-    };
+    }
-    B BiCGStab
+    B
     {
-        preconditioner   DILU;
+        solver           BiCGStab;
+        preconditioner   ILU0;
         tolerance        1e-05;
         relTol           0;
-    };
+    }
-    nuTilda BiCGStab
+    nuTilda
     {
-        preconditioner   DILU;
+        solver           BiCGStab;
+        preconditioner   ILU0;
         tolerance        1e-05;
         relTol           0;
-    };
+    }
 }
 
 PISO

tutorials/incompressible/icoDyMFoam/mixer2D/system/fvSolution

@@ -25,7 +25,7 @@ solvers
         maxIter          1000;
         tolerance        1e-02;
         relTol           0;
-    };
+    }
 
     p
     {
@@ -36,7 +36,7 @@ solvers
         maxIter          1000;
         tolerance        1e-07;
         relTol           0.0;
-    };
+    }
 
     pFinal
     {
@@ -47,7 +47,7 @@ solvers
         maxIter          1000;
         tolerance        1e-07;
         relTol           0;
-    };
+    }
 
     U
     {
@@ -58,7 +58,7 @@ solvers
         maxIter          1000;
         tolerance        1e-07;
         relTol           0;
-    };
+    }
 }
 
 PISO

tutorials/incompressible/icoDyMFoam/movingBlockRBF/system/fvSolution

@@ -23,7 +23,7 @@ solvers
 
         tolerance        1e-06;
         relTol           0;
-    };
+    }
 
     pFinal
     {
@@ -32,7 +32,7 @@ solvers
 
         tolerance        1e-06;
         relTol           0;
-    };
+    }
 
     U
     {
@@ -41,7 +41,7 @@ solvers
 
         tolerance        1e-7;
         relTol           0;
-    };
+    }
 }
 
 PISO

tutorials/incompressible/icoDyMFoam/movingConeMotion/system/fvSolution

@@ -25,7 +25,7 @@ solvers
         maxIter          1000;
         tolerance        1e-02;
         relTol           0;
-    };
+    }
 
     p
     {
@@ -36,7 +36,7 @@ solvers
         maxIter          1000;
         tolerance        1e-06;
         relTol           0.05;
-    };
+    }
 
     pFinal
     {
@@ -47,7 +47,7 @@ solvers
         maxIter          1000;
         tolerance        1e-06;
         relTol           0;
-    };
+    }
 
     U
     {
@@ -58,7 +58,7 @@ solvers
         maxIter          1000;
         tolerance        1e-05;
         relTol           0;
-    };
+    }
 }
 
 PISO

tutorials/incompressible/icoDyMFoam/movingConeTopo/system/fvSolution

@@ -25,7 +25,7 @@ solvers
         maxIter          1000;
         tolerance        1e-02;
         relTol           0;
-    };
+    }
 
     p
     {
@@ -36,7 +36,7 @@ solvers
         maxIter          1000;
         tolerance        1e-06;
         relTol           0.0;
-    };
+    }
 
     pFinal
     {
@@ -47,7 +47,7 @@ solvers
         maxIter          1000;
         tolerance        1e-06;
         relTol           0;
-    };
+    }
 
     U
     {
@@ -58,7 +58,7 @@ solvers
         maxIter          1000;
         tolerance        1e-05;
         relTol           0;
-    };
+    }
 }
 
 PISO

tutorials/incompressible/icoFoam/cavity/system/fvSolution

@@ -22,7 +22,7 @@ solvers
         preconditioner   DIC;
         tolerance        1e-06;
         relTol           0;
-    };
+    }
 
     U
     {
@@ -30,7 +30,7 @@ solvers
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0;
-    };
+    }
 }
 
 PISO

tutorials/incompressible/icoFoam/cavityClipped/system/fvSolution

@@ -22,14 +22,14 @@ solvers
         preconditioner   DIC;
         tolerance        1e-06;
         relTol           0;
-    };
+    }
     U
     {
         solver           BiCGStab;
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0;
-    };
+    }
 }
 
 PISO

tutorials/incompressible/icoFoam/cavityGrade/system/fvSolution

@@ -22,14 +22,14 @@ solvers
         preconditioner   DIC;
         tolerance        1e-06;
         relTol           0;
-    };
+    }
     U
     {
         solver           BiCGStab;
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0;
-    };
+    }
 }
 
 PISO

tutorials/incompressible/icoFoam/mixingPlane/twoBlocksMixingPlaneMismatch_dirY_spanZ/system/fvSolution

@@ -22,7 +22,7 @@ solvers
         preconditioner   DIC;
         tolerance        1e-06;
         relTol           0;
-    };
+    }
 
     U
     {
@@ -30,7 +30,7 @@ solvers
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0;
-    };
+    }
 }
 
 PISO

tutorials/incompressible/icoFoam/mixingPlane/twoBlocksMixingPlane_dirY_spanZ/system/fvSolution

@@ -22,7 +22,7 @@ solvers
         preconditioner   DIC;
         tolerance        1e-06;
         relTol           0;
-    };
+    }
 
     U
     {
@@ -30,7 +30,7 @@ solvers
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0;
-    };
+    }
 }
 
 PISO

tutorials/incompressible/icoFoam/mixingPlane/twoBlocksMixingPlane_dirZ_spanY/system/fvSolution

@@ -22,7 +22,7 @@ solvers
         preconditioner   DIC;
         tolerance        1e-06;
         relTol           0;
-    };
+    }
 
     U
     {
@@ -30,7 +30,7 @@ solvers
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0;
-    };
+    }
 }
 
 PISO

tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/fvSolution

@@ -16,18 +16,20 @@ FoamFile
 
 solvers
 {
-    p PCG
+    p
     {
-        preconditioner   DIC;
+        solver           CG;
+        preconditioner   Cholesky;
         tolerance        1e-06;
         relTol           0;
-    };
+    }
-    U BiCGStab
+    U
     {
-        preconditioner   DILU;
+        solver           BiCGStab;
+        preconditioner   ILU0;
         tolerance        1e-05;
         relTol           0;
-    };
+    }
 }
 
 PISO

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

@@ -24,10 +24,10 @@ solvers
         smoother         GaussSeidel;
         nPreSweeps       0;
         nPostSweeps      2;
-        cacheAgglomeration on;
+        cacheAgglomeration false;
         agglomerator     faceAreaPair;
         nCellsInCoarsestLevel 10;
-        mergeLevels      1;
+        mergeLevels      2;
     }
 
     pFinal
@@ -38,16 +38,16 @@ solvers
         smoother         GaussSeidel;
         nPreSweeps       0;
         nPostSweeps      2;
-        cacheAgglomeration on;
+        cacheAgglomeration false;
         agglomerator     faceAreaPair;
         nCellsInCoarsestLevel 10;
-        mergeLevels      1;
+        mergeLevels      2;
     }
 
     "(U|UFinal|k|omega)"
     {
         solver          BiCGStab;
-        preconditioner  DILU;
+        preconditioner  ILU0;
         tolerance       1e-06;
         relTol          0;
     }

tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/fvSolution

@@ -27,8 +27,8 @@ solvers
 
     rho
     {
-        solver          PCG;
+        solver          CG;
-        preconditioner  DIC;
+        preconditioner  Cholesky;
         tolerance       1e-08;
         relTol          0;
     }

tutorials/incompressible/shallowWaterFoam/squareBump/system/fvSolution

@@ -22,7 +22,7 @@ solvers
         preconditioner  DIC;
         tolerance       1e-6;
         relTol          0.01;
-    };
+    }
 
     hFinal
     {
@@ -30,7 +30,7 @@ solvers
         preconditioner  DIC;
         tolerance       1e-8;
         relTol          0;
-    };
+    }
 
     hU
     {

tutorials/incompressible/simpleFoam/mixingPlaneAxial/system/fvSolution

@@ -24,7 +24,7 @@ solvers
         //preconditioner  DILU;
         tolerance        1e-06;
         relTol           0;
-    };
+    }
     p
     {
         solver          BiCGStab;

tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/fvSolution

@@ -22,42 +22,42 @@ solvers
         preconditioner   DIC;
         tolerance        1e-06;
         relTol           0.01;
-    };
+    }
     U
     {
         solver           BiCGStab;
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0.1;
-    };
+    }
     k
     {
         solver           BiCGStab;
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0.1;
-    };
+    }
     epsilon
     {
         solver           BiCGStab;
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0.1;
-    };
+    }
     R
     {
         solver           BiCGStab;
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0.1;
-    };
+    }
     nuTilda
     {
         solver           BiCGStab;
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0.1;
-    };
+    }
 }
 
 SIMPLE

tutorials/incompressible/simpleSRFFoam/axialTurbine/system/fvSolution

@@ -22,49 +22,49 @@ solvers
         preconditioner   DIC;
         tolerance        1e-06;
         relTol           0.01;
-    };
+    }
     Urel
     {
         solver           BiCGStab;
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0.1;
-    };
+    }
     k
     {
         solver           BiCGStab;
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0.1;
-    };
+    }
     epsilon
     {
         solver           BiCGStab;
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0.1;
-    };
+    }
     omega
     {
         solver           BiCGStab;
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0.1;
-    };
+    }
     R
     {
         solver           BiCGStab;
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0.1;
-    };
+    }
     nuTilda
     {
         solver           BiCGStab;
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0.1;
-    };
+    }
 }
 
 SIMPLE

tutorials/incompressible/simpleSRFFoam/mixer/system/fvSolution

@@ -22,49 +22,49 @@ solvers
         preconditioner   DIC;
         tolerance        1e-06;
         relTol           0.01;
-    };
+    }
     Urel
     {
         solver           smoothSolver;
         smoother         GaussSeidel;
         tolerance        1e-05;
         relTol           0.1;
-    };
+    }
     k
     {
         solver           BiCGStab;
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0.1;
-    };
+    }
     epsilon
     {
         solver           BiCGStab;
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0.1;
-    };
+    }
     omega
     {
         solver           BiCGStab;
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0.1;
-    };
+    }
     R
     {
         solver           BiCGStab;
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0.1;
-    };
+    }
     nuTilda
     {
         solver           BiCGStab;
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0.1;
-    };
+    }
 }
 
 SIMPLE

tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/system/fvSolution

@@ -35,34 +35,34 @@ solvers
         mergeLevels      1;
 
         maxIter          100;
-    };
+    }
     pFinal
     {
         $p
         tolerance        1e-6;
         relTol           0;
-    };
+    }
     "(rho|G)"
     {
         solver          PCG;
         preconditioner  DIC;
         tolerance       1e-06;
         relTol          0;
-    };
+    }
     "(Yi|hs)"
     {
         solver          BiCGStab;
         preconditioner  DILU;
         tolerance       1e-06;
         relTol          0;
-    };
+    }
     "(U|k|omega)"
     {
         solver          smoothSolver;
         smoother        GaussSeidel;
         tolerance       1e-06;
         relTol          0;
-    };
+    }
 }
 
 PISO

tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/system/fvSolution

@@ -34,13 +34,13 @@ solvers
         mergeLevels      1;
 
         maxIter          50;
-    };
+    }
     pFinal
     {
         $p
         tolerance        1e-6;
         relTol           0;
-    };
+    }
     "(rho|G)"
     {
         solver          PCG;
@@ -48,7 +48,7 @@ solvers
         maxIter         200;
         tolerance       1e-06;
         relTol          0;
-    };
+    }
     "(Yi|hs)"
     {
         solver          BiCGStab;
@@ -56,7 +56,7 @@ solvers
         maxIter         200;
         tolerance       1e-06;
         relTol          0;
-    };
+    }
     "(U|k|omega)"
     {
         solver          smoothSolver;
@@ -64,7 +64,7 @@ solvers
         maxIter         200;
         tolerance       1e-06;
         relTol          0;
-    };
+    }
 }
 
 PISO

tutorials/mesh/cfMesh/cartesian2DMesh/hatOctree/system/fvSolution

@@ -23,7 +23,7 @@ solvers
         preconditioner   DIC;
         tolerance        1e-06;
         relTol           0;
-    };
+    }
 
     U
     {
@@ -31,7 +31,7 @@ solvers
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0;
-    };
+    }
 }
 
 PISO

tutorials/mesh/cfMesh/cartesianMesh/asmoOctree/system/fvSolution

@@ -23,7 +23,7 @@ solvers
         preconditioner   DIC;
         tolerance        1e-06;
         relTol           0;
-    };
+    }
 
     U
     {
@@ -31,7 +31,7 @@ solvers
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0;
-    };
+    }
 }
 
 PISO

tutorials/mesh/cfMesh/cartesianMesh/bunnyOctree/system/fvSolution

@@ -23,7 +23,7 @@ solvers
         preconditioner   DIC;
         tolerance        1e-06;
         relTol           0;
-    };
+    }
 
     U
     {
@@ -31,7 +31,7 @@ solvers
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0;
-    };
+    }
 }
 
 PISO

tutorials/mesh/cfMesh/cartesianMesh/elbow_90degree/system/fvSolution

@@ -23,7 +23,7 @@ solvers
         preconditioner   DIC;
         tolerance        1e-06;
         relTol           0;
-    };
+    }
 
     U
     {
@@ -31,7 +31,7 @@ solvers
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0;
-    };
+    }
 }
 
 PISO

tutorials/mesh/cfMesh/cartesianMesh/intakePortOctree/system/fvSolution

@@ -23,7 +23,7 @@ solvers
         preconditioner   DIC;
         tolerance        1e-06;
         relTol           0;
-    };
+    }
 
     U
     {
@@ -31,7 +31,7 @@ solvers
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0;
-    };
+    }
 }
 
 PISO

tutorials/mesh/cfMesh/cartesianMesh/multipleOrifices/system/fvSolution

@@ -23,7 +23,7 @@ solvers
         preconditioner   DIC;
         tolerance        1e-06;
         relTol           0;
-    };
+    }
 
     U
     {
@@ -31,7 +31,7 @@ solvers
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0;
-    };
+    }
 }
 
 PISO

tutorials/mesh/cfMesh/cartesianMesh/sBendOctree/system/fvSolution

@@ -23,7 +23,7 @@ solvers
         preconditioner   DIC;
         tolerance        1e-06;
         relTol           0;
-    };
+    }
 
     U
     {
@@ -31,7 +31,7 @@ solvers
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0;
-    };
+    }
 }
 
 PISO

tutorials/mesh/cfMesh/cartesianMesh/sawOctree/system/fvSolution

@@ -23,7 +23,7 @@ solvers
         preconditioner   DIC;
         tolerance        1e-06;
         relTol           0;
-    };
+    }
 
     U
     {
@@ -31,7 +31,7 @@ solvers
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0;
-    };
+    }
 }
 
 PISO

tutorials/mesh/cfMesh/cartesianMesh/singleOrifice/system/fvSolution

@@ -23,7 +23,7 @@ solvers
         preconditioner   DIC;
         tolerance        1e-06;
         relTol           0;
-    };
+    }
 
     U
     {
@@ -31,7 +31,7 @@ solvers
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0;
-    };
+    }
 }
 
 PISO

tutorials/mesh/cfMesh/pMesh/bunnyPoly/system/fvSolution

@@ -23,7 +23,7 @@ solvers
         preconditioner   DIC;
         tolerance        1e-06;
         relTol           0;
-    };
+    }
 
     U
     {
@@ -31,7 +31,7 @@ solvers
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0;
-    };
+    }
 }
 
 PISO

tutorials/mesh/cfMesh/pMesh/multipleOrifices/system/fvSolution

@@ -23,7 +23,7 @@ solvers
         preconditioner   DIC;
         tolerance        1e-06;
         relTol           0;
-    };
+    }
 
     U
     {
@@ -31,7 +31,7 @@ solvers
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0;
-    };
+    }
 }
 
 PISO

tutorials/mesh/cfMesh/tetMesh/cutCubeOctree/system/fvSolution

@@ -23,7 +23,7 @@ solvers
         preconditioner   DIC;
         tolerance        1e-06;
         relTol           0;
-    };
+    }
 
     U
     {
@@ -31,7 +31,7 @@ solvers
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0;
-    };
+    }
 }
 
 PISO

tutorials/mesh/cfMesh/tetMesh/socketOctree/system/fvSolution

@@ -23,7 +23,7 @@ solvers
         preconditioner   DIC;
         tolerance        1e-06;
         relTol           0;
-    };
+    }
 
     U
     {
@@ -31,7 +31,7 @@ solvers
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0;
-    };
+    }
 }
 
 PISO

tutorials/mesh/moveDynamicMesh/circCylinder3dHex/system/fvSolution

@@ -28,7 +28,7 @@ solvers
         maxIter          1000;
         tolerance        1e-02;
         relTol           0;
-    };
+    }
 
     p
     {
@@ -42,7 +42,7 @@ solvers
         maxIter          1000;
         tolerance        1e-06;
         relTol           0.05;
-    };
+    }
 
     pFinal
     {
@@ -56,7 +56,7 @@ solvers
         maxIter          1000;
         tolerance        1e-06;
         relTol           0;
-    };
+    }
 
     U
     {
@@ -70,7 +70,7 @@ solvers
         maxIter          1000;
         tolerance        1e-05;
         relTol           0;
-    };
+    }
 }
 
 PISO

tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSolution

@@ -22,7 +22,7 @@ solvers
         preconditioner   DILU;
         tolerance        1e-08;
         relTol           0;
-    };
+    }
 
     k
     {
@@ -30,7 +30,7 @@ solvers
         preconditioner   DILU;
         tolerance        1e-08;
         relTol           0;
-    };
+    }
 
     rho
     {
@@ -38,7 +38,7 @@ solvers
         preconditioner   DILU;
         tolerance        1e-08;
         relTol           0;
-    };
+    }
 
     U
     {
@@ -46,7 +46,7 @@ solvers
         preconditioner   DILU;
         tolerance        1e-08;
         relTol           0;
-    };
+    }
 
     p
     {
@@ -63,7 +63,7 @@ solvers
         nCellsInCoarsestLevel 10;
         agglomerator     faceAreaPair;
         mergeLevels      1;
-    };
+    }
 
     pFinal
     {
@@ -80,7 +80,7 @@ solvers
         nCellsInCoarsestLevel 10;
         agglomerator     faceAreaPair;
         mergeLevels      1;
-    };
+    }
 }
 
 PIMPLE

tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/fvSolution

@@ -34,17 +34,17 @@ solvers
             nCellsInCoarsestLevel 10;
             agglomerator     faceAreaPair;
             mergeLevels      1;
-        };
+        }
 
         tolerance        1e-5;
         relTol           0;
         maxIter          100;
-    };
+    }
 
     rho
     {
         solver           diagonal;
-    };
+    }
 
     p
     {
@@ -61,7 +61,7 @@ solvers
         nCellsInCoarsestLevel 10;
         agglomerator     faceAreaPair;
         mergeLevels      1;
-    };
+    }
 
     pFinal
     {
@@ -83,12 +83,12 @@ solvers
             nCellsInCoarsestLevel 10;
             agglomerator     faceAreaPair;
             mergeLevels      1;
-        };
+        }
 
         tolerance        1e-7;
         relTol           0;
         maxIter          20;
-    };
+    }
 
     U
     {
@@ -97,7 +97,7 @@ solvers
         tolerance        1e-6;
         relTol           0;
         nSweeps          1;
-    };
+    }
 
     k
     {
@@ -105,21 +105,21 @@ solvers
         preconditioner   DILU;
         tolerance        1e-08;
         relTol           0;
-    };
+    }
     B
     {
         solver           BiCGStab;
         preconditioner   DILU;
         tolerance        1e-08;
         relTol           0;
-    };
+    }
     nuTilda
     {
         solver           BiCGStab;
         preconditioner   DILU;
         tolerance        1e-08;
         relTol           0;
-    };
+    }
 }
 
 PISO

tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/fvSolution

@@ -34,17 +34,17 @@ solvers
             nCellsInCoarsestLevel 10;
             agglomerator     faceAreaPair;
             mergeLevels      1;
-        };
+        }
 
         tolerance        1e-5;
         relTol           0;
         maxIter          100;
-    };
+    }
 
     rho
     {
         solver           diagonal;
-    };
+    }
 
     p
     {
@@ -61,7 +61,7 @@ solvers
         nCellsInCoarsestLevel 10;
         agglomerator     faceAreaPair;
         mergeLevels      1;
-    };
+    }
 
     pFinal
     {
@@ -83,12 +83,12 @@ solvers
             nCellsInCoarsestLevel 10;
             agglomerator     faceAreaPair;
             mergeLevels      1;
-        };
+        }
 
         tolerance        1e-7;
         relTol           0;
         maxIter          20;
-    };
+    }
 
     U
     {
@@ -97,7 +97,7 @@ solvers
         tolerance        1e-6;
         relTol           0;
         nSweeps          1;
-    };
+    }
 
     k
     {
@@ -105,21 +105,21 @@ solvers
         preconditioner   DILU;
         tolerance        1e-08;
         relTol           0;
-    };
+    }
     B
     {
         solver           BiCGStab;
         preconditioner   DILU;
         tolerance        1e-08;
         relTol           0;
-    };
+    }
     nuTilda
     {
         solver           BiCGStab;
         preconditioner   DILU;
         tolerance        1e-08;
         relTol           0;
-    };
+    }
 }
 
 PISO

tutorials/multiphase/settlingFoam/dahl/system/fvSolution

@@ -16,42 +16,43 @@ FoamFile
 
 solvers
 {
-    p PCG
+    p
     {
-        preconditioner   DIC;
+        solver           CG;
+        preconditioner   Cholesky;
         tolerance        1e-07;
         relTol           0;
-    };
+    }
-    U BiCGStab
+    U
     {
-        preconditioner   DILU;
+        solver           BiCGStab;
+        preconditioner   ILU0;
         tolerance        1e-07;
         relTol           0;
-    };
+    }
-    k BiCGStab
+    k
     {
-        preconditioner   DILU;
+        solver           BiCGStab;
+        preconditioner   ILU0;
         tolerance        1e-07;
         relTol           0;
-    };
+    }
-    epsilon BiCGStab
+    epsilon
     {
-        preconditioner   DILU;
+        solver           BiCGStab;
+        preconditioner   ILU0;
         tolerance        1e-07;
         relTol           0;
-    };
+    }
-    rho PCG
+    rho
+    {}
+    Alpha
     {
-        preconditioner   DIC;
+        solver           BiCGStab;
+        preconditioner   ILU0;
         tolerance        1e-07;
         relTol           0;
-    };
+    }
-    Alpha BiCGStab
-    {
-        preconditioner   DILU;
-        tolerance        1e-07;
-        relTol           0;
-    };
 }
 
 PIMPLE

tutorials/multiphase/settlingFoam/tank3D/system/fvSolution

@@ -16,42 +16,43 @@ FoamFile
 
 solvers
 {
-    p PCG
+    p
     {
-        preconditioner   DIC;
+        solver           CG;
+        preconditioner   Cholesky;
         tolerance        1e-07;
         relTol           0;
-    };
+    }
-    U BiCGStab
+    U
     {
-        preconditioner   DILU;
+        solver           BiCGStab;
+        preconditioner   ILU0;
         tolerance        1e-07;
         relTol           0;
-    };
+    }
-    k BiCGStab
+    k
     {
-        preconditioner   DILU;
+        solver           BiCGStab;
+        preconditioner   ILU0;
         tolerance        1e-07;
         relTol           0;
-    };
+    }
-    epsilon BiCGStab
+    epsilon
     {
-        preconditioner   DILU;
+        solver           BiCGStab;
+        preconditioner   ILU0;
         tolerance        1e-07;
         relTol           0;
-    };
+    }
-    rho PCG
+    rho
+    {}
+    Alpha
     {
-        preconditioner   DIC;
+        solver           BiCGStab;
+        preconditioner   ILU0;
         tolerance        1e-07;
         relTol           0;
-    };
+    }
-    Alpha BiCGStab
-    {
-        preconditioner   DILU;
-        tolerance        1e-07;
-        relTol           0;
-    };
 }
 
 PIMPLE

tutorials/solidMechanics/deprecatedTutorials/solidDisplacementFoam/plateHole/constant/polyMesh/boundary

@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       polyBoundaryMesh;
+    location    "constant/polyMesh";
     object      boundary;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -22,35 +23,30 @@ left
         nFaces          30;
         startFace       1930;
     }
-
     right
     {
         type            patch;
         nFaces          30;
         startFace       1960;
     }
-
     down
     {
         type            symmetryPlane;
         nFaces          30;
         startFace       1990;
     }
-
     up
     {
         type            patch;
         nFaces          30;
         startFace       2020;
     }
-
     hole
     {
         type            patch;
         nFaces          20;
         startFace       2050;
     }
-
     frontAndBack
     {
         type            empty;

tutorials/solidMechanics/deprecatedTutorials/solidDisplacementFoam/plateHole/system/fvSolution

@@ -16,35 +16,36 @@ FoamFile
 
 solvers
 {
-    D GAMG
+    D
     {
+        solver           GAMG;
         tolerance        1e-06;
         relTol           0.9;
 
         smoother         GaussSeidel;
 
-        cacheAgglomeration true;
+        cacheAgglomeration false;
 
         nCellsInCoarsestLevel 20;
 
         agglomerator     faceAreaPair;
-        mergeLevels      1;
+        mergeLevels      2;
-    };
+    }
-
+    T
-    T GAMG
     {
+        solver           GAMG;
         tolerance        1e-06;
         relTol           0.9;
 
         smoother         GaussSeidel;
 
-        cacheAgglomeration true;
+        cacheAgglomeration false;
 
         nCellsInCoarsestLevel 20;
 
         agglomerator     faceAreaPair;
-        mergeLevels      1;
+        mergeLevels      2;
-    };
+    }
 }
 
 stressAnalysis

tutorials/solidMechanics/deprecatedTutorials/solidEquilibriumDisplacementFoam/beamEndLoad/system/fvSolution

@@ -29,7 +29,7 @@ solvers
 
         agglomerator     faceAreaPair;
         mergeLevels      1;
-    };
+    }
 
     Dcorr GAMG
     {
@@ -44,7 +44,7 @@ solvers
 
         agglomerator     faceAreaPair;
         mergeLevels      1;
-    };
+    }
 }
 
 stressAnalysis

tutorials/solidMechanics/icoFsiElasticNonLinULSolidFoam/HronTurekFsi/fluid/system/fvSolution

@@ -35,7 +35,7 @@ solvers
             nCellsInCoarsestLevel 20;
             agglomerator    faceAreaPair;
             mergeLevels     1;
-    };
+    }
 
     cellMotionU
     {
@@ -58,7 +58,7 @@ solvers
          nCellsInCoarsestLevel 20;
          agglomerator     faceAreaPair;
          mergeLevels      1;
-    };
+    }
 
     U
     {
@@ -66,7 +66,7 @@ solvers
         preconditioner   DILU;
             tolerance        1e-06;
             relTol           0;
-    };
+    }
 }
 
 PISO

tutorials/solidMechanics/icoFsiElasticNonLinULSolidFoam/HronTurekFsi/solid/system/fvSolution

@@ -38,7 +38,7 @@ solvers
         nCellsInCoarsestLevel 20;
         agglomerator     faceAreaPair;
         mergeLevels      1;
-    };
+    }
 
 //    DU
 //    {
@@ -57,7 +57,7 @@ solvers
 //        maxIter           1000;
 //        tolerance         1e-6;
 //        relTol            0.01;
-//    };
+//    }
 
 //    DU               AMG 1e-06 0.01 100;
 //    DU               ICCG 1e-07 0.01;

tutorials/viscoelastic/viscoelasticFluidFoam/FENE-CR/system/fvSolution

@@ -51,7 +51,7 @@ solvers
         minIter           0;
         maxIter           1000;
 
-    };
+    }
 
 }
 

tutorials/viscoelastic/viscoelasticFluidFoam/FENE-P/system/fvSolution

@@ -49,7 +49,7 @@ solvers
         minIter           0;
         maxIter           1000;
 
-    };
+    }
 
 }
 

tutorials/viscoelastic/viscoelasticFluidFoam/Leonov/system/fvSolution

@@ -51,7 +51,7 @@ solvers
         minIter           0;
         maxIter           1000;
 
-    };
+    }
 
 }
 

tutorials/viscoelastic/viscoelasticFluidFoam/Oldroyd-B/system/fvSolution

@@ -50,7 +50,7 @@ solvers
         minIter           0;
         maxIter           1000;
 
-    };
+    }
 
 }
 

tutorials/viscoelastic/viscoelasticFluidFoam/PTT-Linear/system/fvSolution

@@ -51,7 +51,7 @@ solvers
         minIter           0;
         maxIter           1000;
 
-    };
+    }
 
 }
 

tutorials/viscoelastic/viscoelasticFluidFoam/UCM/system/fvSolution

@@ -50,7 +50,7 @@ solvers
         minIter           0;
         maxIter           1000;
 
-    };
+    }
 
 }
 

tutorials/viscoelastic/viscoelasticFluidFoam/WhiteMetzner/CarreauYasuda/system/fvSolution

@@ -51,7 +51,7 @@ solvers
         minIter           0;
         maxIter           1000;
 
-    };
+    }
 
 }