diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSolution b/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSolution index 6213437696..1f4e90f580 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSolution +++ b/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -17,22 +17,6 @@ FoamFile solvers { - rho - { - solver PCG; - preconditioner DIC; - tolerance 1e-05; - relTol 0; - } - - U - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - p { solver PCG; @@ -41,79 +25,13 @@ solvers relTol 0; } - ft + rho { - solver PBiCG; - preconditioner DILU; + $p; tolerance 1e-05; - relTol 0; } - fu - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - b - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - Xi - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - Su - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - h - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - hu - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - R - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - k - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - epsilon + "(U|ft|fu|b|Xi|Su|h|hu|R|k|epsilon)" { solver PBiCG; preconditioner DILU; diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSolution b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSolution index 6213437696..6fe4799640 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSolution +++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -17,22 +17,6 @@ FoamFile solvers { - rho - { - solver PCG; - preconditioner DIC; - tolerance 1e-05; - relTol 0; - } - - U - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - p { solver PCG; @@ -41,79 +25,14 @@ solvers relTol 0; } - ft + rho { - solver PBiCG; - preconditioner DILU; + $p; tolerance 1e-05; relTol 0; } - fu - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - b - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - Xi - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - Su - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - h - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - hu - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - R - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - k - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - epsilon + "(U|ft|fu|b|Xi|Su|h|hu|R|k|epsilon)" { solver PBiCG; preconditioner DILU; diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/fvSolution b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/fvSolution index d7814dd904..f9fbedc096 100644 --- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/fvSolution +++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -17,22 +17,6 @@ FoamFile solvers { - rho - { - solver PCG; - preconditioner DIC; - tolerance 1e-05; - relTol 0; - } - - U - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - p { solver PCG; @@ -41,79 +25,14 @@ solvers relTol 0; } - ft + rho { - solver PBiCG; - preconditioner DILU; + $p; tolerance 1e-05; relTol 0; } - fu - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - b - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - Xi - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - Su - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - h - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - hu - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - R - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - k - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - epsilon + "(U|ft|fu|b|Xi|Su|h|hu|R|k|epsilon)" { solver PBiCG; preconditioner DILU; diff --git a/tutorials/combustion/dieselFoam/aachenBomb/system/fvSolution b/tutorials/combustion/dieselFoam/aachenBomb/system/fvSolution index 0d7e29c2b5..d5b1de2e9a 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/system/fvSolution +++ b/tutorials/combustion/dieselFoam/aachenBomb/system/fvSolution @@ -1,14 +1,14 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "system"; object fvSolution; @@ -17,22 +17,6 @@ FoamFile solvers { - rho - { - solver PCG; - preconditioner DIC; - tolerance 1e-06; - relTol 0; - } - - U - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-06; - relTol 0; - } - p { solver PCG; @@ -41,31 +25,13 @@ solvers relTol 0; } - Yi + rho { - solver PBiCG; - preconditioner DILU; + $p; tolerance 1e-06; - relTol 0; } - h - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-06; - relTol 0; - } - - k - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-06; - relTol 0; - } - - epsilon + "(U|Yi|h|k|epsilon)" { solver PBiCG; preconditioner DILU; diff --git a/tutorials/combustion/engineFoam/kivaTest/system/fvSolution b/tutorials/combustion/engineFoam/kivaTest/system/fvSolution index 1891fe83bf..6184f55f0c 100644 --- a/tutorials/combustion/engineFoam/kivaTest/system/fvSolution +++ b/tutorials/combustion/engineFoam/kivaTest/system/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -17,22 +17,6 @@ FoamFile solvers { - rho - { - solver PCG; - preconditioner DIC; - tolerance 1e-05; - relTol 0; - } - - U - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - p { solver PCG; @@ -41,79 +25,14 @@ solvers relTol 0; } - ft + rho { - solver PBiCG; - preconditioner DILU; + $p; tolerance 1e-05; relTol 0; } - fu - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - b - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - Xi - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - Su - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - h - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - hu - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - R - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - k - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - epsilon + "(U|ft|fu|b|Xi|Su|h|hu|R|k|epsilon)" { solver PBiCG; preconditioner DILU; diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/system/fvSolution b/tutorials/compressible/rhoPimpleFoam/angledDuct/system/fvSolution index 583c3637aa..2db2f5c065 100644 --- a/tutorials/compressible/rhoPimpleFoam/angledDuct/system/fvSolution +++ b/tutorials/compressible/rhoPimpleFoam/angledDuct/system/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -17,10 +17,24 @@ FoamFile solvers { - rho + p { solver PCG; preconditioner DIC; + tolerance 1e-06; + relTol 0.01; + } + + pFinal + { + $p; + tolerance 1e-06; + relTol 0; + } + + rho + { + $p; tolerance 1e-05; relTol 0; } @@ -33,77 +47,15 @@ solvers relTol 0.1; } - UFinal + h { $U; } + + "(UFinal|hFinal|R|k|epsilon|omega)" { - solver PBiCG; - preconditioner DILU; + $U; tolerance 1e-05; relTol 0; } - p - { - solver PCG; - preconditioner DIC; - tolerance 1e-06; - relTol 0.01; - } - - pFinal - { - solver PCG; - preconditioner DIC; - tolerance 1e-06; - relTol 0; - } - - h - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0.1; - } - - hFinal - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - R - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - k - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - epsilon - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - omega - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } } PIMPLE @@ -117,12 +69,11 @@ PIMPLE relaxationFactors { - U 0.7; p 0.3; rho 0.05; + U 0.7; h 0.7; - k 0.7; - omega 0.7; + "(k|epsilon|omega)" 0.7; } diff --git a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/fvSolution b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/fvSolution index a945332784..01450c89ea 100644 --- a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/fvSolution +++ b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -17,7 +17,7 @@ FoamFile solvers { - rho + "(p|rho)" { solver PCG; preconditioner DIC; @@ -33,42 +33,9 @@ solvers relTol 0; } - p + "(U|k|B|nuTilda)" { - solver PCG; - preconditioner DIC; - tolerance 1e-06; - relTol 0; - } - - U - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - k - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - B - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - nuTilda - { - solver PBiCG; - preconditioner DILU; + $h; tolerance 1e-05; relTol 0; } diff --git a/tutorials/compressible/rhoPisoFoam/ras/cavity/system/fvSolution b/tutorials/compressible/rhoPisoFoam/ras/cavity/system/fvSolution index 72b829ca39..fd30592f44 100644 --- a/tutorials/compressible/rhoPisoFoam/ras/cavity/system/fvSolution +++ b/tutorials/compressible/rhoPisoFoam/ras/cavity/system/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -17,22 +17,6 @@ FoamFile solvers { - rho - { - solver PCG; - preconditioner DIC; - tolerance 1e-05; - relTol 0; - } - - U - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - p { solver PCG; @@ -41,39 +25,14 @@ solvers relTol 0; } - h + rho { - solver PBiCG; - preconditioner DILU; + $p; tolerance 1e-05; relTol 0; } - R - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - k - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - epsilon - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - omega + "(U|h|R|k|epsilon|omega)" { solver PBiCG; preconditioner DILU; diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSolution b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSolution index 844c55c57c..9dac9d2fb0 100644 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSolution +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -46,20 +46,9 @@ solvers relTol 0.1; } - k + "(k|epsilon)" { - solver smoothSolver; - smoother GaussSeidel; - nSweeps 2; - tolerance 1e-07; - relTol 0.1; - } - - epsilon - { - solver smoothSolver; - smoother GaussSeidel; - nSweeps 2; + $U; tolerance 1e-07; relTol 0.1; } @@ -76,8 +65,7 @@ relaxationFactors p 0.3; rho 0.05; U 0.7; - k 0.7; - epsilon 0.7; + "(k|epsilon)" 0.7; h 0.5; } diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSolution b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSolution index 334b1287bd..69ed2df45a 100644 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSolution +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSolution @@ -1,14 +1,14 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "system"; object fvSolution; @@ -37,16 +37,7 @@ solvers relTol 0.1; } - k - { - solver smoothSolver; - smoother GaussSeidel; - nSweeps 2; - tolerance 1e-07; - relTol 0.1; - } - - epsilon + "(k|epsilon)" { solver smoothSolver; smoother GaussSeidel; @@ -68,8 +59,7 @@ relaxationFactors p 0.3; rho 1; U 0.7; - k 0.9; - epsilon 0.9; + "(k|epsilon)" 0.9; h 0.9; } diff --git a/tutorials/compressible/rhoSonicFoam/forwardStep/system/fvSolution b/tutorials/compressible/rhoSonicFoam/forwardStep/system/fvSolution index 9a29517e84..53a811563e 100644 --- a/tutorials/compressible/rhoSonicFoam/forwardStep/system/fvSolution +++ b/tutorials/compressible/rhoSonicFoam/forwardStep/system/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -17,31 +17,7 @@ FoamFile solvers { - p - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-15; - relTol 0; - } - - rho - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-15; - relTol 0; - } - - rhoU - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-15; - relTol 0; - } - - rhoE + "(p|rho|rhoU|rhoE)" { solver PBiCG; preconditioner DILU; diff --git a/tutorials/compressible/rhoSonicFoam/shockTube/system/fvSolution b/tutorials/compressible/rhoSonicFoam/shockTube/system/fvSolution index 9a29517e84..53a811563e 100644 --- a/tutorials/compressible/rhoSonicFoam/shockTube/system/fvSolution +++ b/tutorials/compressible/rhoSonicFoam/shockTube/system/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -17,31 +17,7 @@ FoamFile solvers { - p - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-15; - relTol 0; - } - - rho - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-15; - relTol 0; - } - - rhoU - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-15; - relTol 0; - } - - rhoE + "(p|rho|rhoU|rhoE)" { solver PBiCG; preconditioner DILU; diff --git a/tutorials/compressible/rhopSonicFoam/shockTube/system/fvSolution b/tutorials/compressible/rhopSonicFoam/shockTube/system/fvSolution index 202961f804..aad563c1fd 100644 --- a/tutorials/compressible/rhopSonicFoam/shockTube/system/fvSolution +++ b/tutorials/compressible/rhopSonicFoam/shockTube/system/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -25,31 +25,7 @@ solvers relTol 0; } - rho - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-15; - relTol 0; - } - - rhoU - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-15; - relTol 0; - } - - rhoE - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-15; - relTol 0; - } - - rhoH + "(rho|rhoU|rhoE|rhoH)" { solver PBiCG; preconditioner DILU; diff --git a/tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/fvSolution b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/fvSolution index 296ffb3319..a7d876eeb2 100644 --- a/tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/fvSolution +++ b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -25,31 +25,7 @@ solvers relTol 0; } - rho - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-15; - relTol 0; - } - - rhoU - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-15; - relTol 0; - } - - rhoE - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-15; - relTol 0; - } - - rhoH + "(rho|rhoU|rhoE|rhoH)" { solver PBiCG; preconditioner DILU; diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSolution b/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSolution index 93b01a8285..45bb949628 100644 --- a/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSolution +++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -25,10 +25,9 @@ solvers relTol 0; } - U + "(U|e)" { - solver PBiCG; - preconditioner DILU; + $p; tolerance 1e-05; relTol 0; } @@ -40,14 +39,6 @@ solvers tolerance 1e-05; relTol 0; } - - e - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } } PISO diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSolution b/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSolution index 58c5fb5202..b894099c4c 100644 --- a/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSolution +++ b/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -17,15 +17,7 @@ FoamFile solvers { - p - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-15; - relTol 0; - } - - U + "(p|U|e)" { solver PBiCG; preconditioner DILU; @@ -40,14 +32,6 @@ solvers tolerance 1e-15; relTol 0; } - - e - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-15; - relTol 0; - } } PISO diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSolution b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSolution index b7e967eeb2..7c31faeadb 100644 --- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSolution +++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -33,42 +33,9 @@ solvers relTol 0; } - U + "(U|e|k|epsilon|R)" { - solver PBiCG; - preconditioner DILU; - tolerance 1e-08; - relTol 0; - } - - e - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-08; - relTol 0; - } - - k - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-08; - relTol 0; - } - - epsilon - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-08; - relTol 0; - } - - R - { - solver PBiCG; - preconditioner DILU; + $p; tolerance 1e-08; relTol 0; } diff --git a/tutorials/compressible/sonicFoam/ras/prism/system/fvSolution b/tutorials/compressible/sonicFoam/ras/prism/system/fvSolution index 20afd845a0..fc9fc84695 100644 --- a/tutorials/compressible/sonicFoam/ras/prism/system/fvSolution +++ b/tutorials/compressible/sonicFoam/ras/prism/system/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -33,45 +33,20 @@ solvers relTol 0; } - U + "(U|e|R)" { - solver PBiCG; - preconditioner DILU; + $p; tolerance 1e-05; relTol 0; } - e + "(k|epsilon)" { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - k - { - solver PBiCG; - preconditioner DILU; + $p; tolerance 1e-08; relTol 0; } - epsilon - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-08; - relTol 0; - } - - R - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } } PISO diff --git a/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/fvSolution b/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/fvSolution index 0b8bc2b1c3..f63bb3a65b 100644 --- a/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/fvSolution +++ b/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -27,8 +27,7 @@ solvers U { - solver PBiCG; - preconditioner DILU; + $p; tolerance 1e-05; relTol 0; } diff --git a/tutorials/electromagnetics/mhdFoam/hartmann/system/fvSolution b/tutorials/electromagnetics/mhdFoam/hartmann/system/fvSolution index 177af26b52..8e277b7c41 100644 --- a/tutorials/electromagnetics/mhdFoam/hartmann/system/fvSolution +++ b/tutorials/electromagnetics/mhdFoam/hartmann/system/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -25,26 +25,17 @@ solvers relTol 0; } - U - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - B - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - pB { - solver PCG; - preconditioner DIC; + $p; + tolerance 1e-05; + relTol 0; + } + + "(U|B)" + { + solver PBiCG; + preconditioner DILU; tolerance 1e-05; relTol 0; } diff --git a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/system/fvSolution b/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/system/fvSolution index 39cc9a45f4..f0a55b12f3 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/system/fvSolution +++ b/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/system/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -27,45 +27,12 @@ solvers pFinal { - solver PCG; - preconditioner DIC; + $p; tolerance 1e-07; relTol 0; } - U - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - T - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - k - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - epsilon - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - R + "(U|T|k|epsilon|R)" { solver PBiCG; preconditioner DILU; diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSolution b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSolution index 8524660a6a..60b3f8c4c8 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSolution +++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -25,39 +25,7 @@ solvers relTol 0.01; } - U - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0.1; - } - - T - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0.1; - } - - k - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0.1; - } - - epsilon - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0.1; - } - - R + "(U|T|k|epsilon|R)" { solver PBiCG; preconditioner DILU; @@ -79,9 +47,7 @@ relaxationFactors p 0.7; U 0.2; T 0.7; - k 0.7; - epsilon 0.7; - R 0.7; + "(k|epsilon|R)" 0.7; } diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSolution b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSolution index f24144294e..cb7432a54a 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSolution +++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -25,39 +25,7 @@ solvers relTol 0.01; } - U - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0.1; - } - - T - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0.1; - } - - k - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0.1; - } - - epsilon - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0.1; - } - - R + "(U|T|k|epsilon|R)" { solver PBiCG; preconditioner DILU; @@ -79,9 +47,7 @@ relaxationFactors p 0.3; U 0.7; T 0.7; - k 0.7; - epsilon 0.7; - R 0.7; + "(k|epsilon|R)" 0.7; } diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/system/fvSolution b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/system/fvSolution index 2d5e8be034..3fb15a9cba 100644 --- a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/system/fvSolution +++ b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/system/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -35,45 +35,12 @@ solvers pFinal { - solver PCG; - preconditioner DIC; + $p; tolerance 1e-06; relTol 0; } - U - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - h - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - k - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - epsilon - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - R + "(U|h|k|epsilon|R)" { solver PBiCG; preconditioner DILU; diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/fvSolution b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/fvSolution index 8d67100cf8..50c1592526 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/fvSolution +++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -25,39 +25,7 @@ solvers relTol 0; } - U - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - h - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - k - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - epsilon - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - R + "(U|h|k|epsilon|R)" { solver PBiCG; preconditioner DILU; @@ -70,7 +38,7 @@ SIMPLE { nNonOrthogonalCorrectors 0; pRefCell 0; - pRefValue 1e5; + pRefValue 100000; } relaxationFactors @@ -79,9 +47,7 @@ relaxationFactors p 0.7; U 0.2; h 0.7; - k 0.7; - epsilon 0.7; - R 0.7; + "(k|epsilon|R)" 0.7; } diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSolution b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSolution index b450f1eb75..048416fff6 100644 --- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSolution +++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -25,31 +25,7 @@ solvers relTol 0.01; } - U - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0.1; - } - - h - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0.1; - } - - k - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0.1; - } - - epsilon + "(U|h|k|epsilon)" { solver PBiCG; preconditioner DILU; @@ -59,8 +35,7 @@ solvers G { - solver PCG; - preconditioner DIC; + $p; tolerance 1e-05; relTol 0.1; } @@ -69,8 +44,8 @@ solvers SIMPLE { nNonOrthogonalCorrectors 0; - pRefCell 0; - pRefValue 0; + pRefCell 0; + pRefValue 0; } relaxationFactors @@ -79,8 +54,7 @@ relaxationFactors p 0.3; U 0.7; h 0.7; - k 0.7; - epsilon 0.7; + "(k|epsilon)" 0.7; G 0.7; } diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/fvSolution b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/fvSolution index 14ade54123..1fa2231e58 100644 --- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/fvSolution +++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -29,39 +29,7 @@ solvers mergeLevels 1; } - U - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0.1; - } - - h - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0.1; - } - - k - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0.1; - } - - epsilon - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0.1; - } - - Ii + "(U|h|k|epsilon|Ii)" { solver PBiCG; preconditioner DILU; @@ -73,18 +41,17 @@ solvers SIMPLE { nNonOrthogonalCorrectors 0; - pRefCell 0; - pRefValue 0; + pRefCell 0; + pRefValue 0; } relaxationFactors { - rho 1.0; + rho 1; p 0.3; U 0.7; h 0.7; - k 0.7; - epsilon 0.7; + "(k|epsilon)" 0.7; "ILambda.*" 0.7; } diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSolution index 3248e05562..16947842af 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSolution +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSolution @@ -22,7 +22,8 @@ solvers preconditioner DIC; tolerance 1e-8; relTol 0; - }; + } + p { solver GAMG; @@ -31,68 +32,38 @@ solvers smoother GaussSeidel; - cacheAgglomeration true; + cacheAgglomeration true; nCellsInCoarsestLevel 10; agglomerator faceAreaPair; mergeLevels 1; - }; + } + pFinal { - solver GAMG; + $p; tolerance 1e-8; relTol 0; + } - smoother GaussSeidel; - - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; - }; U { solver PBiCG; preconditioner DILU; tolerance 1e-08; relTol 0; - }; + } h { - solver PBiCG; - preconditioner DILU; + $U; tolerance 1e-08; relTol 0.1; - }; - hFinal - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-08; - relTol 0; - }; + } - k + "(hFinal|k|epsilon|R)" { - solver PBiCG; - preconditioner DILU; - tolerance 1e-08; - relTol 0; - }; - epsilon - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-08; - relTol 0; - }; - R - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-08; - relTol 0; - }; + $U; + } } PISO diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSolution index be20334b74..19370a0e39 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSolution +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSolution @@ -22,7 +22,7 @@ solvers preconditioner DIC; tolerance 1E-06; relTol 0; - }; + } } PISO diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSolution index be20334b74..19370a0e39 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSolution +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSolution @@ -22,7 +22,7 @@ solvers preconditioner DIC; tolerance 1E-06; relTol 0; - }; + } } PISO diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSolution index be20334b74..19370a0e39 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSolution +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSolution @@ -22,7 +22,7 @@ solvers preconditioner DIC; tolerance 1E-06; relTol 0; - }; + } } PISO diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSolution index 3248e05562..27f5cfb1dd 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSolution +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSolution @@ -22,7 +22,8 @@ solvers preconditioner DIC; tolerance 1e-8; relTol 0; - }; + } + p { solver GAMG; @@ -35,64 +36,34 @@ solvers nCellsInCoarsestLevel 10; agglomerator faceAreaPair; mergeLevels 1; - }; + } + pFinal { - solver GAMG; + $p; tolerance 1e-8; relTol 0; + } - smoother GaussSeidel; - - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; - }; U { solver PBiCG; preconditioner DILU; tolerance 1e-08; relTol 0; - }; + } h { - solver PBiCG; - preconditioner DILU; + $U; tolerance 1e-08; relTol 0.1; - }; - hFinal - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-08; - relTol 0; - }; + } - k + "(hFinal|k|epsilon|R)" { - solver PBiCG; - preconditioner DILU; - tolerance 1e-08; - relTol 0; - }; - epsilon - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-08; - relTol 0; - }; - R - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-08; - relTol 0; - }; + $U; + } } PISO diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSolution index 3248e05562..a2f76a21ca 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSolution +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSolution @@ -22,7 +22,8 @@ solvers preconditioner DIC; tolerance 1e-8; relTol 0; - }; + } + p { solver GAMG; @@ -35,64 +36,35 @@ solvers nCellsInCoarsestLevel 10; agglomerator faceAreaPair; mergeLevels 1; - }; + } + pFinal { - solver GAMG; + $p; tolerance 1e-8; relTol 0; + } - smoother GaussSeidel; - - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; - }; U { solver PBiCG; preconditioner DILU; tolerance 1e-08; relTol 0; - }; + } h { - solver PBiCG; - preconditioner DILU; + $U; tolerance 1e-08; relTol 0.1; - }; - hFinal - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-08; - relTol 0; - }; + } - k + + "(hFinal|k|epsilon|R)" { - solver PBiCG; - preconditioner DILU; - tolerance 1e-08; - relTol 0; - }; - epsilon - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-08; - relTol 0; - }; - R - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-08; - relTol 0; - }; + $U; + } } PISO diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSolution index be20334b74..19370a0e39 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSolution +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSolution @@ -22,7 +22,7 @@ solvers preconditioner DIC; tolerance 1E-06; relTol 0; - }; + } } PISO diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSolution index be20334b74..19370a0e39 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSolution +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSolution @@ -22,7 +22,7 @@ solvers preconditioner DIC; tolerance 1E-06; relTol 0; - }; + } } PISO diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSolution index be20334b74..19370a0e39 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSolution +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSolution @@ -22,7 +22,7 @@ solvers preconditioner DIC; tolerance 1E-06; relTol 0; - }; + } } PISO diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSolution index 3248e05562..27f5cfb1dd 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSolution +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSolution @@ -22,7 +22,8 @@ solvers preconditioner DIC; tolerance 1e-8; relTol 0; - }; + } + p { solver GAMG; @@ -35,64 +36,34 @@ solvers nCellsInCoarsestLevel 10; agglomerator faceAreaPair; mergeLevels 1; - }; + } + pFinal { - solver GAMG; + $p; tolerance 1e-8; relTol 0; + } - smoother GaussSeidel; - - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; - }; U { solver PBiCG; preconditioner DILU; tolerance 1e-08; relTol 0; - }; + } h { - solver PBiCG; - preconditioner DILU; + $U; tolerance 1e-08; relTol 0.1; - }; - hFinal - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-08; - relTol 0; - }; + } - k + "(hFinal|k|epsilon|R)" { - solver PBiCG; - preconditioner DILU; - tolerance 1e-08; - relTol 0; - }; - epsilon - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-08; - relTol 0; - }; - R - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-08; - relTol 0; - }; + $U; + } } PISO diff --git a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/fvSolution b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/fvSolution index 45a1d6fdeb..7aa408cd0e 100644 --- a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/fvSolution +++ b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -29,25 +29,7 @@ solvers mergeLevels 1; } - U - { - solver smoothSolver; - smoother GaussSeidel; - nSweeps 2; - tolerance 1e-07; - relTol 0.1; - } - - k - { - solver smoothSolver; - smoother GaussSeidel; - nSweeps 2; - tolerance 1e-07; - relTol 0.1; - } - - epsilon + "(U|k|epsilon)" { solver smoothSolver; smoother GaussSeidel; @@ -68,8 +50,7 @@ relaxationFactors { p 0.3; U 0.5; - k 0.5; - epsilon 0.5; + "(k|epsilon)" 0.5; } diff --git a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/fvSolution b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/fvSolution index 25a2d8138d..0eb08d2b49 100644 --- a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/fvSolution +++ b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -25,31 +25,7 @@ solvers relTol 0; } - k - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-06; - relTol 0; - } - - epsilon - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-06; - relTol 0; - } - - R - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-06; - relTol 0; - } - - nuTilda + "(k|epsilon|R|nuTilda)" { solver PBiCG; preconditioner DILU; @@ -67,9 +43,7 @@ PISO relaxationFactors { U 0.5; - k 0.7; - epsilon 0.7; - R 0.7; + "(k|epsilon|R)" 0.7; nuTilda 0.7; } diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/fvSolution b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/fvSolution index a165f8313b..a8d9091ac9 100644 --- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/fvSolution +++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -25,31 +25,7 @@ solvers relTol 0; } - k - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-06; - relTol 0; - } - - epsilon - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-06; - relTol 0; - } - - R - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-06; - relTol 0; - } - - nuTilda + "(k|epsilon|R|nuTilda)" { solver PBiCG; preconditioner DILU; @@ -69,9 +45,7 @@ PISO relaxationFactors { U 0.5; - k 0.7; - epsilon 0.7; - R 0.7; + "(k|epsilon|R)" 0.7; nuTilda 0.7; } diff --git a/tutorials/incompressible/channelFoam/channel395/system/fvSolution b/tutorials/incompressible/channelFoam/channel395/system/fvSolution index 09f4077520..75827c6adc 100644 --- a/tutorials/incompressible/channelFoam/channel395/system/fvSolution +++ b/tutorials/incompressible/channelFoam/channel395/system/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -27,37 +27,12 @@ solvers pFinal { - solver PCG; - preconditioner DIC; + $p; tolerance 1e-06; relTol 0; } - U - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - k - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - B - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - nuTilda + "(U|k|B|nuTilda)" { solver PBiCG; preconditioner DILU; diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSolution b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSolution index 98831f2c8f..5e3959e489 100644 --- a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSolution +++ b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSolution @@ -17,14 +17,6 @@ FoamFile solvers { - pcorr - { - solver PCG; - preconditioner DIC; - tolerance 0.01; - relTol 0; - } - p { solver PCG; @@ -33,14 +25,27 @@ solvers relTol 0.05; } + pcorr + { + $p; + tolerance 0.01; + relTol 0; + } + pFinal { - solver PCG; - preconditioner DIC; + $p; tolerance 1e-06; relTol 0; } + cellMotionUx + { + $p; + tolerance 1e-08; + relTol 0; + } + U { solver PBiCG; @@ -48,14 +53,6 @@ solvers tolerance 1e-05; relTol 0; } - - cellMotionUx - { - solver PCG; - preconditioner DIC; - tolerance 1e-08; - relTol 0; - } } PIMPLE diff --git a/tutorials/incompressible/pimpleFoam/t-junction/system/fvSolution b/tutorials/incompressible/pimpleFoam/t-junction/system/fvSolution index 5a9f970576..ee386897ef 100644 --- a/tutorials/incompressible/pimpleFoam/t-junction/system/fvSolution +++ b/tutorials/incompressible/pimpleFoam/t-junction/system/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -31,14 +31,9 @@ solvers pFinal { - solver GAMG; + $p; tolerance 1e-06; relTol 0; - smoother GaussSeidel; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } U @@ -49,26 +44,9 @@ solvers relTol 0.1; } - UFinal + "(UFinal|k|epsilon)" { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - k - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - epsilon - { - solver PBiCG; - preconditioner DILU; + $U; tolerance 1e-05; relTol 0; } @@ -86,8 +64,7 @@ PIMPLE relaxationFactors { U 1; - k 1; - epsilon 1; + "(k|epsilon)" 1; } diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/system/fvSolution b/tutorials/incompressible/pisoFoam/les/pitzDaily/system/fvSolution index 80345d9518..cc3d066237 100644 --- a/tutorials/incompressible/pisoFoam/les/pitzDaily/system/fvSolution +++ b/tutorials/incompressible/pisoFoam/les/pitzDaily/system/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -27,37 +27,12 @@ solvers pFinal { - solver PCG; - preconditioner DIC; + $p; tolerance 1e-06; relTol 0; } - U - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - k - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - B - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - nuTilda + "(U|k|B|nuTilda)" { solver PBiCG; preconditioner DILU; diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/fvSolution b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/fvSolution index 80345d9518..cc3d066237 100644 --- a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/fvSolution +++ b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -27,37 +27,12 @@ solvers pFinal { - solver PCG; - preconditioner DIC; + $p; tolerance 1e-06; relTol 0; } - U - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - k - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - B - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - nuTilda + "(U|k|B|nuTilda)" { solver PBiCG; preconditioner DILU; diff --git a/tutorials/incompressible/pisoFoam/ras/cavity/system/fvSolution b/tutorials/incompressible/pisoFoam/ras/cavity/system/fvSolution index aeb8d20166..1441d37bd8 100644 --- a/tutorials/incompressible/pisoFoam/ras/cavity/system/fvSolution +++ b/tutorials/incompressible/pisoFoam/ras/cavity/system/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -27,45 +27,12 @@ solvers pFinal { - solver PCG; - preconditioner DIC; + $p; tolerance 1e-06; relTol 0; } - U - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - k - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - epsilon - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - R - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - nuTilda + "(U|k|epsilon|R|nuTilda)" { solver PBiCG; preconditioner DILU; diff --git a/tutorials/incompressible/shallowWaterFoam/squareBump/system/fvSolution b/tutorials/incompressible/shallowWaterFoam/squareBump/system/fvSolution index 8bc3472e95..1f0138d380 100644 --- a/tutorials/incompressible/shallowWaterFoam/squareBump/system/fvSolution +++ b/tutorials/incompressible/shallowWaterFoam/squareBump/system/fvSolution @@ -22,15 +22,14 @@ solvers preconditioner DIC; tolerance 1e-6; relTol 0.01; - }; + } hFinal { - solver PCG; - preconditioner DIC; + $h; tolerance 1e-8; relTol 0; - }; + } hU { diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/system/fvSolution b/tutorials/incompressible/simpleFoam/airFoil2D/system/fvSolution index 8088687562..27efb646e8 100644 --- a/tutorials/incompressible/simpleFoam/airFoil2D/system/fvSolution +++ b/tutorials/incompressible/simpleFoam/airFoil2D/system/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -31,16 +31,7 @@ solvers mergeLevels 1; } - U - { - solver smoothSolver; - smoother GaussSeidel; - nSweeps 2; - tolerance 1e-08; - relTol 0.1; - } - - nuTilda + "(U|nuTilda)" { solver smoothSolver; smoother GaussSeidel; diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/fvSolution b/tutorials/incompressible/simpleFoam/motorBike/system/fvSolution index 2dcaef0c14..e93978fccf 100644 --- a/tutorials/incompressible/simpleFoam/motorBike/system/fvSolution +++ b/tutorials/incompressible/simpleFoam/motorBike/system/fvSolution @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -18,44 +19,26 @@ solvers { p { - solver GAMG; - tolerance 1e-7; - relTol 0.1; - smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; + solver GAMG; + tolerance 1e-07; + relTol 0.1; + smoother GaussSeidel; + nPreSweeps 0; + nPostSweeps 2; cacheAgglomeration on; - agglomerator faceAreaPair; + agglomerator faceAreaPair; nCellsInCoarsestLevel 10; - mergeLevels 1; - }; + mergeLevels 1; + } - U + "(U|k|omega)" { - solver smoothSolver; - smoother GaussSeidel; - tolerance 1e-8; - relTol 0.1; - nSweeps 1; - }; - - k - { - solver smoothSolver; - smoother GaussSeidel; - tolerance 1e-8; - relTol 0.1; - nSweeps 1; - }; - - omega - { - solver smoothSolver; - smoother GaussSeidel; - tolerance 1e-8; - relTol 0.1; - nSweeps 1; - }; + solver smoothSolver; + smoother GaussSeidel; + tolerance 1e-08; + relTol 0.1; + nSweeps 1; + } } SIMPLE @@ -67,8 +50,8 @@ relaxationFactors { p 0.3; U 0.7; - k 0.7; - omega 0.7; + "(k|omega)" 0.7; } + // ************************************************************************* // diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/system/fvSolution b/tutorials/incompressible/simpleFoam/pitzDaily/system/fvSolution index b0b6699e0d..72642670c3 100644 --- a/tutorials/incompressible/simpleFoam/pitzDaily/system/fvSolution +++ b/tutorials/incompressible/simpleFoam/pitzDaily/system/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -25,39 +25,7 @@ solvers relTol 0.01; } - U - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0.1; - } - - k - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0.1; - } - - epsilon - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0.1; - } - - R - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0.1; - } - - nuTilda + "(U|k|epsilon|R|nuTilda)" { solver PBiCG; preconditioner DILU; @@ -75,9 +43,7 @@ relaxationFactors { p 0.3; U 0.7; - k 0.7; - epsilon 0.7; - R 0.7; + "(k|epsilon|R)" 0.7; nuTilda 0.7; } diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/fvSolution b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/fvSolution index b0b6699e0d..72642670c3 100644 --- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/fvSolution +++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -25,39 +25,7 @@ solvers relTol 0.01; } - U - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0.1; - } - - k - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0.1; - } - - epsilon - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0.1; - } - - R - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0.1; - } - - nuTilda + "(U|k|epsilon|R|nuTilda)" { solver PBiCG; preconditioner DILU; @@ -75,9 +43,7 @@ relaxationFactors { p 0.3; U 0.7; - k 0.7; - epsilon 0.7; - R 0.7; + "(k|epsilon|R)" 0.7; nuTilda 0.7; } diff --git a/tutorials/incompressible/simpleSRFFoam/mixer/system/fvSolution b/tutorials/incompressible/simpleSRFFoam/mixer/system/fvSolution index a74ada8eae..eb1821dab7 100644 --- a/tutorials/incompressible/simpleSRFFoam/mixer/system/fvSolution +++ b/tutorials/incompressible/simpleSRFFoam/mixer/system/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -25,47 +25,7 @@ solvers relTol 0.01; } - Urel - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0.1; - } - - k - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0.1; - } - - epsilon - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0.1; - } - - omega - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0.1; - } - - R - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0.1; - } - - nuTilda + "(Urel|k|epsilon|omega|R|nuTilda)" { solver PBiCG; preconditioner DILU; @@ -83,10 +43,7 @@ relaxationFactors { p 0.3; Urel 0.7; - k 0.7; - epsilon 0.7; - omega 0.7; - R 0.7; + "(k|epsilon|omega|R)" 0.7; nuTilda 0.7; } diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution index 5e1041dd83..9649868ce8 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -17,118 +17,37 @@ FoamFile solvers { - rho + "(rho|G)" { solver PCG; preconditioner DIC; tolerance 1e-05; relTol 0; - }; - U - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; + } + p { solver PBiCG; preconditioner DILU; tolerance 1e-06; relTol 0; - }; - G - { - solver PCG; - preconditioner DIC; - tolerance 1e-05; - relTol 0; - }; - Yi - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-06; - relTol 0; - }; - CO2 - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-06; - relTol 0; - }; - O2 - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-06; - relTol 0; - }; - N2 - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-06; - relTol 0; - }; - CH4 - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-06; - relTol 0; - }; - H2 - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-06; - relTol 0; - }; - H2O - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-06; - relTol 0; - }; - CO - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-06; - relTol 0; - }; - h + } + + "(U|h|R|k|epsilon)" { solver PBiCG; preconditioner DILU; tolerance 1e-05; relTol 0; - }; - R + } + + "(Yi|CO2|O2|N2|CH4|H2|H2O|CO)" { solver PBiCG; preconditioner DILU; - tolerance 1e-05; + tolerance 1e-06; relTol 0; - }; - k - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - epsilon - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; + } } PISO diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/fvSolution b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/fvSolution index cdefcfb103..ea76163b1f 100644 --- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/fvSolution +++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -17,108 +17,50 @@ FoamFile solvers { - rho + "(rho|G)" { solver PCG; preconditioner DIC; tolerance 1e-05; relTol 0; - }; - U + } + + "(U|h|k|epsilon)" { solver PBiCG; preconditioner DILU; tolerance 1e-05; relTol 0; - }; + } + p { - solver GAMG; - tolerance 0; - relTol 0.1; - - smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - + solver GAMG; + tolerance 0; + relTol 0.1; + smoother GaussSeidel; + nPreSweeps 0; + nPostSweeps 2; cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; - }; + agglomerator faceAreaPair; + mergeLevels 1; + } + pFinal { - solver GAMG; - tolerance 1e-6; - relTol 0; + $p; + tolerance 1e-06; + relTol 0; + } - smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - - cacheAgglomeration true; - - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; - }; - G - { - solver PCG; - preconditioner DIC; - tolerance 1e-05; - relTol 0; - }; - Yi + "(Yi|O2|N2|H2O)" { solver PBiCG; preconditioner DILU; tolerance 1e-06; relTol 0; - }; - O2 - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-06; - relTol 0; - }; - N2 - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-06; - relTol 0; - }; - H2O - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-06; - relTol 0; - }; - h - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - k - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - epsilon - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; + } } PISO @@ -128,7 +70,6 @@ PISO nCorrectors 2; nNonOrthogonalCorrectors 0; momentumPredictor yes; -// nUCorrectors 2; } additional @@ -140,14 +81,7 @@ additional relaxationFactors { -/* - U 1; - k 1; - kepsilon 1; - h 1; - rho 1; - p 1; -*/ } + // ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/fvSolution index f0ef609117..6c2c92da9f 100644 --- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/fvSolution +++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -17,20 +17,22 @@ FoamFile solvers { - rho + "(rho|G)" { solver PCG; preconditioner DIC; tolerance 1e-05; relTol 0; } - U + + "(U|h|k|epsilon)" { solver PBiCG; preconditioner DILU; tolerance 1e-05; relTol 0; } + p { solver PCG; @@ -38,62 +40,14 @@ solvers tolerance 1e-06; relTol 0; } - G - { - solver PCG; - preconditioner DIC; - tolerance 1e-05; - relTol 0; - } - Yi + + "(Yi|O2|N2|H2O)" { solver PBiCG; preconditioner DILU; tolerance 1e-06; relTol 0; } - O2 - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-06; - relTol 0; - } - N2 - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-06; - relTol 0; - } - H2O - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-06; - relTol 0; - } - h - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - k - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - epsilon - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } } PISO diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/system/fvSolution b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/system/fvSolution index 9b1a12fa2b..944868efc4 100644 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/system/fvSolution +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/system/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -17,7 +17,7 @@ FoamFile solvers { - rho + "(rho|G)" { solver PCG; preconditioner DIC; @@ -25,14 +25,6 @@ solvers relTol 0; } - U - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - p { solver PBiCG; @@ -41,108 +33,16 @@ solvers relTol 0; } - G + "(U|h|R|k|epsilon)" { - solver PCG; - preconditioner DIC; + $p; tolerance 1e-05; relTol 0; } - Yi + "(Yi|CO2|O2|N2|CH4|H2|H2O|CO)" { - solver PBiCG; - preconditioner DILU; - tolerance 1e-06; - relTol 0; - } - - CO2 - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-06; - relTol 0; - } - - O2 - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-06; - relTol 0; - } - - N2 - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-06; - relTol 0; - } - - CH4 - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-06; - relTol 0; - } - - H2 - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-06; - relTol 0; - } - - H2O - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-06; - relTol 0; - } - - CO - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-06; - relTol 0; - } - - h - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - R - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - k - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - epsilon - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; + $p; } } diff --git a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/fvSolution b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/fvSolution index eab8882126..898ec2420b 100644 --- a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/fvSolution +++ b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -19,44 +19,38 @@ solvers { p { - solver PCG; - preconditioner DIC; - tolerance 1e-06; - relTol 0; - }; + solver PCG; + preconditioner DIC; + tolerance 1e-06; + relTol 0; + } U { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + cellDisplacement { solver GAMG; - tolerance 1e-8; + tolerance 1e-08; relTol 0; smoother GaussSeidel; cacheAgglomeration true; nCellsInCoarsestLevel 10; agglomerator faceAreaPair; mergeLevels 1; - }; - cellMotionU + } + + "(cellMotionU|cellMotionUz)" { - solver PCG; - preconditioner DIC; - tolerance 1e-08; - relTol 0; - }; - cellMotionUz - { - solver PCG; - preconditioner DIC; - tolerance 1e-08; - relTol 0; - }; + $p; + tolerance 1e-08; + relTol 0; + } } diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/system/fvSolution b/tutorials/multiphase/bubbleFoam/bubbleColumn/system/fvSolution index d59f49c6ca..8b5c05a6d2 100644 --- a/tutorials/multiphase/bubbleFoam/bubbleColumn/system/fvSolution +++ b/tutorials/multiphase/bubbleFoam/bubbleColumn/system/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -25,7 +25,7 @@ solvers relTol 0; } - Ua + "(Ua|Ub|k|epsilon)" { solver PBiCG; preconditioner DILU; @@ -33,45 +33,13 @@ solvers relTol 0; } - Ub - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - alpha + "(alpha|beta)" { solver PBiCG; preconditioner DILU; tolerance 1e-10; relTol 0; } - - beta - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-10; - relTol 0; - } - - k - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - epsilon - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } } PISO diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSolution b/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSolution index ae28961258..faf3b65941 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSolution +++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSolution @@ -1,14 +1,14 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "system"; object fvSolution; @@ -17,31 +17,7 @@ FoamFile solvers { - omega - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-08; - relTol 0; - } - - k - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-08; - relTol 0; - } - - rho - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-08; - relTol 0; - } - - U + "(rho|U|k|omega)" { solver PBiCG; preconditioner DILU; @@ -65,16 +41,9 @@ solvers pFinal { - solver GAMG; + $p; tolerance 1e-08; relTol 0; - smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } } diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSolution b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSolution index ae28961258..faf3b65941 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSolution +++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSolution @@ -1,14 +1,14 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "system"; object fvSolution; @@ -17,31 +17,7 @@ FoamFile solvers { - omega - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-08; - relTol 0; - } - - k - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-08; - relTol 0; - } - - rho - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-08; - relTol 0; - } - - U + "(rho|U|k|omega)" { solver PBiCG; preconditioner DILU; @@ -65,16 +41,9 @@ solvers pFinal { - solver GAMG; + $p; tolerance 1e-08; relTol 0; - smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } } diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSolution b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSolution index 188e593e19..7ab713bdc0 100644 --- a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSolution +++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -17,31 +17,7 @@ FoamFile solvers { - omega - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-08; - relTol 0; - } - - k - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-08; - relTol 0; - } - - rho - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-08; - relTol 0; - } - - U + "(rho|U|k|omega)" { solver PBiCG; preconditioner DILU; @@ -65,16 +41,9 @@ solvers pFinal { - solver GAMG; + $p; tolerance 1e-08; relTol 0; - smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } } diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/fvSolution b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/fvSolution index 872b88e305..9a128b27fd 100644 --- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/fvSolution +++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -34,7 +34,6 @@ solvers agglomerator faceAreaPair; mergeLevels 1; } - tolerance 1e-05; relTol 0; maxIter 100; @@ -78,7 +77,6 @@ solvers agglomerator faceAreaPair; mergeLevels 1; } - tolerance 1e-07; relTol 0; maxIter 20; @@ -93,23 +91,7 @@ solvers nSweeps 1; } - k - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-08; - relTol 0; - } - - B - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-08; - relTol 0; - } - - nuTilda + "(k|B|nuTilda)" { solver PBiCG; preconditioner DILU; diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/fvSolution b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/fvSolution index 872b88e305..9a128b27fd 100644 --- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/fvSolution +++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -34,7 +34,6 @@ solvers agglomerator faceAreaPair; mergeLevels 1; } - tolerance 1e-05; relTol 0; maxIter 100; @@ -78,7 +77,6 @@ solvers agglomerator faceAreaPair; mergeLevels 1; } - tolerance 1e-07; relTol 0; maxIter 20; @@ -93,23 +91,7 @@ solvers nSweeps 1; } - k - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-08; - relTol 0; - } - - B - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-08; - relTol 0; - } - - nuTilda + "(k|B|nuTilda)" { solver PBiCG; preconditioner DILU; diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSolution index 577db9c0f6..0ca3851b34 100644 --- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSolution +++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -34,7 +34,6 @@ solvers agglomerator faceAreaPair; mergeLevels 1; } - tolerance 0.0001; relTol 0; maxIter 100; @@ -73,7 +72,6 @@ solvers agglomerator faceAreaPair; mergeLevels 1; } - tolerance 1e-08; relTol 0; maxIter 20; @@ -88,23 +86,7 @@ solvers nSweeps 1; } - k - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-08; - relTol 0; - } - - B - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-08; - relTol 0; - } - - nuTilda + "(k|B|nuTilda)" { solver PBiCG; preconditioner DILU; @@ -121,9 +103,8 @@ PISO nAlphaCorr 1; nAlphaSubCycles 3; cAlpha 1; - - pRefPoint (0.51 0.51 0.51); - pRefValue 0; + pRefPoint ( 0.51 0.51 0.51 ); + pRefValue 0; } diff --git a/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/system/fvSolution b/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/system/fvSolution index b9b4490f4c..53033e72f4 100644 --- a/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/system/fvSolution +++ b/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/system/fvSolution @@ -35,8 +35,7 @@ solvers pFinal { - solver PCG; - preconditioner DIC; + $p; tolerance 1e-07; relTol 0; } diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSolution b/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSolution index fe91ceb9b0..a4167c7f07 100644 --- a/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSolution +++ b/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSolution @@ -35,8 +35,7 @@ solvers pFinal { - solver PCG; - preconditioner DIC; + $p; tolerance 1e-07; relTol 0; } diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSolution b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSolution index 296fc3df64..9aa23c131a 100644 --- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSolution +++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -34,7 +34,6 @@ solvers agglomerator faceAreaPair; mergeLevels 1; } - tolerance 1e-05; relTol 0; maxIter 100; @@ -73,7 +72,6 @@ solvers agglomerator faceAreaPair; mergeLevels 1; } - tolerance 1e-07; relTol 0; maxIter 20; @@ -88,23 +86,7 @@ solvers nSweeps 1; } - k - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-08; - relTol 0; - } - - B - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-08; - relTol 0; - } - - nuTilda + "(k|B|nuTilda)" { solver PBiCG; preconditioner DILU; diff --git a/tutorials/multiphase/interFoam/ras/damBreak/system/fvSolution b/tutorials/multiphase/interFoam/ras/damBreak/system/fvSolution index 921889c586..322cb00b5a 100644 --- a/tutorials/multiphase/interFoam/ras/damBreak/system/fvSolution +++ b/tutorials/multiphase/interFoam/ras/damBreak/system/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -35,8 +35,7 @@ solvers pFinal { - solver PCG; - preconditioner DIC; + $p; tolerance 1e-07; relTol 0; } @@ -49,34 +48,9 @@ solvers relTol 0; } - k + "(k|epsilon|R|nuTilda)" { - solver PBiCG; - preconditioner DILU; - tolerance 1e-08; - relTol 0; - } - - epsilon - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-08; - relTol 0; - } - - R - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-08; - relTol 0; - } - - nuTilda - { - solver PBiCG; - preconditioner DILU; + $U; tolerance 1e-08; relTol 0; } diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution index 9f6930eccf..a423ce36b6 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -34,7 +34,6 @@ solvers agglomerator faceAreaPair; mergeLevels 2; } - tolerance 1e-05; relTol 0; maxIter 100; @@ -73,22 +72,12 @@ solvers agglomerator faceAreaPair; mergeLevels 1; } - tolerance 1e-07; relTol 0; maxIter 20; } - U - { - solver smoothSolver; - smoother GaussSeidel; - tolerance 1e-08; - relTol 0; - nSweeps 1; - } - - alpha + "(U|alpha)" { solver smoothSolver; smoother GaussSeidel; diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution index 9f6930eccf..a423ce36b6 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -34,7 +34,6 @@ solvers agglomerator faceAreaPair; mergeLevels 2; } - tolerance 1e-05; relTol 0; maxIter 100; @@ -73,22 +72,12 @@ solvers agglomerator faceAreaPair; mergeLevels 1; } - tolerance 1e-07; relTol 0; maxIter 20; } - U - { - solver smoothSolver; - smoother GaussSeidel; - tolerance 1e-08; - relTol 0; - nSweeps 1; - } - - alpha + "(U|alpha)" { solver smoothSolver; smoother GaussSeidel; diff --git a/tutorials/multiphase/settlingFoam/ras/dahl/system/fvSolution b/tutorials/multiphase/settlingFoam/ras/dahl/system/fvSolution index 148cdcddc5..ba4fe0665d 100644 --- a/tutorials/multiphase/settlingFoam/ras/dahl/system/fvSolution +++ b/tutorials/multiphase/settlingFoam/ras/dahl/system/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -17,7 +17,7 @@ FoamFile solvers { - p + "(p|rho)" { solver PCG; preconditioner DIC; @@ -25,39 +25,7 @@ solvers relTol 0; } - U - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-07; - relTol 0; - } - - k - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-07; - relTol 0; - } - - epsilon - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-07; - relTol 0; - } - - rho - { - solver PCG; - preconditioner DIC; - tolerance 1e-07; - relTol 0; - } - - Alpha + "(U|k|epsilon|Alpha)" { solver PBiCG; preconditioner DILU; diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/system/fvSolution b/tutorials/multiphase/settlingFoam/ras/tank3D/system/fvSolution index 148cdcddc5..ba4fe0665d 100644 --- a/tutorials/multiphase/settlingFoam/ras/tank3D/system/fvSolution +++ b/tutorials/multiphase/settlingFoam/ras/tank3D/system/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -17,7 +17,7 @@ FoamFile solvers { - p + "(p|rho)" { solver PCG; preconditioner DIC; @@ -25,39 +25,7 @@ solvers relTol 0; } - U - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-07; - relTol 0; - } - - k - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-07; - relTol 0; - } - - epsilon - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-07; - relTol 0; - } - - rho - { - solver PCG; - preconditioner DIC; - tolerance 1e-07; - relTol 0; - } - - Alpha + "(U|k|epsilon|Alpha)" { solver PBiCG; preconditioner DILU; diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/bed/system/fvSolution index 0589345336..d346fa4ee0 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bed/system/fvSolution +++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/system/fvSolution @@ -1,14 +1,14 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "system"; object fvSolution; @@ -32,7 +32,7 @@ solvers mergeLevels 1; } - Ua + "(Ua|Ub|Theta|k|epsilon)" { solver PBiCG; preconditioner DILU; @@ -40,53 +40,13 @@ solvers relTol 0; } - Ub - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - alpha + "(alpha|beta)" { solver PBiCG; preconditioner DILU; tolerance 1e-10; relTol 0; } - - beta - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-10; - relTol 0; - } - - Theta - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - k - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - epsilon - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } } PISO diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/fvSolution index 733ad77e71..698e72f16d 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/fvSolution +++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -32,7 +32,7 @@ solvers mergeLevels 1; } - Ua + "(Ua|Ub|Theta|k|epsilon)" { solver PBiCG; preconditioner DILU; @@ -40,53 +40,13 @@ solvers relTol 0; } - Ub - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - alpha + "(alpha|beta)" { solver PBiCG; preconditioner DILU; tolerance 1e-10; relTol 0; } - - beta - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-10; - relTol 0; - } - - Theta - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - k - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - epsilon - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } } PISO @@ -106,8 +66,7 @@ relaxationFactors alpha 1; beta 1; Theta 1; - k 1; - epsilon 1; + "(k|epsilon)" 1; } diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/fvSolution index efb0cb6b6a..5844dc4fef 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/fvSolution +++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -32,7 +32,7 @@ solvers mergeLevels 1; } - Ua + "(Ua|Ub|Theta|k|epsilon)" { solver PBiCG; preconditioner DILU; @@ -40,53 +40,13 @@ solvers relTol 0; } - Ub - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - alpha + "(alpha|beta)" { solver PBiCG; preconditioner DILU; tolerance 1e-10; relTol 0; } - - beta - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-10; - relTol 0; - } - - Theta - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - k - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } - - epsilon - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } } PISO diff --git a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/fvSolution b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/fvSolution index e921d9233a..94b968c1c9 100644 --- a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/fvSolution +++ b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -17,19 +17,7 @@ FoamFile solvers { - D - { - solver GAMG; - tolerance 1e-06; - relTol 0.9; - smoother GaussSeidel; - cacheAgglomeration true; - nCellsInCoarsestLevel 20; - agglomerator faceAreaPair; - mergeLevels 1; - } - - T + "(D|T)" { solver GAMG; tolerance 1e-06; diff --git a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/fvSolution b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/fvSolution index fd610d55c5..8dabfdac0a 100644 --- a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/fvSolution +++ b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -17,25 +17,13 @@ FoamFile solvers { - D + "(D|Dcorr)" { solver GAMG; tolerance 1e-06; relTol 0.99; smoother GaussSeidel; - cacheAgglomeration true; - nCellsInCoarsestLevel 6; - agglomerator faceAreaPair; - mergeLevels 1; - } - - Dcorr - { - solver GAMG; - tolerance 1e-06; - relTol 0.99; - smoother GaussSeidel; - cacheAgglomeration true; + cacheAgglomeration true; nCellsInCoarsestLevel 6; agglomerator faceAreaPair; mergeLevels 1;