diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSolution b/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSolution
index 6213437696604a925aee421f428eb48be0cd672d..1f4e90f5809590fd1b6097431fb6865ecfdbb59a 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
- {
- solver PBiCG;
- preconditioner DILU;
- 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
+ rho
{
- solver PBiCG;
- preconditioner DILU;
+ $p;
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 6213437696604a925aee421f428eb48be0cd672d..6fe4799640a2189a96f348827d70c015e51e9e2e 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
- {
- solver PBiCG;
- preconditioner DILU;
- 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
+ rho
{
- solver PBiCG;
- preconditioner DILU;
+ $p;
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 d7814dd90404fa11897125d4c31991df00b0d1e0..f9fbedc09629a86c9f7e7046ea51e5c713fba02b 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
- {
- solver PBiCG;
- preconditioner DILU;
- 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
+ rho
{
- solver PBiCG;
- preconditioner DILU;
+ $p;
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 0d7e29c2b5942d11604a96e0d306e2ab2e219eb4..d5b1de2e9a5d40817b6c8e8f230eceef7bc73c8c 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
- {
- solver PBiCG;
- preconditioner DILU;
- tolerance 1e-06;
- relTol 0;
- }
-
- h
- {
- solver PBiCG;
- preconditioner DILU;
- tolerance 1e-06;
- relTol 0;
- }
-
- k
+ rho
{
- solver PBiCG;
- preconditioner DILU;
+ $p;
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 1891fe83bfbe3f12738be2949d4652b6db7ad2e8..6184f55f0cf0b7ca16cda0de2bf8075f7ef98bd2 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
- {
- solver PBiCG;
- preconditioner DILU;
- 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
+ rho
{
- solver PBiCG;
- preconditioner DILU;
+ $p;
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 583c3637aa6c42d8d548ef44bc09b0900cc2561d..2db2f5c065fb265a0807fcbdb2aee3e5b2019986 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,30 +17,6 @@ FoamFile
solvers
{
- rho
- {
- solver PCG;
- preconditioner DIC;
- tolerance 1e-05;
- relTol 0;
- }
-
- U
- {
- solver PBiCG;
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0.1;
- }
-
- UFinal
- {
- solver PBiCG;
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- }
-
p
{
solver PCG;
@@ -51,59 +27,35 @@ solvers
pFinal
{
- solver PCG;
- preconditioner DIC;
+ $p;
tolerance 1e-06;
relTol 0;
}
- h
- {
- solver PBiCG;
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0.1;
- }
-
- hFinal
+ rho
{
- solver PBiCG;
- preconditioner DILU;
+ $p;
tolerance 1e-05;
relTol 0;
}
- R
+ U
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-05;
- relTol 0;
+ relTol 0.1;
}
- k
- {
- solver PBiCG;
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- }
+ h { $U; }
- epsilon
+ "(UFinal|hFinal|R|k|epsilon|omega)"
{
- solver PBiCG;
- preconditioner DILU;
+ $U;
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 a94533278419b1171c513daf2eab79c4f4a25238..01450c89ea21a8c015ffb81200a275f12f1aa3aa 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 72b829ca3938ce372457c19eb1773cd19c8b5094..fd30592f448ffb54d0b13031bb82f05e0f02dc0c 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
- {
- 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
+ rho
{
- solver PBiCG;
- preconditioner DILU;
+ $p;
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 844c55c57c4178c8000e271c3c1e4fa5268b31d0..9dac9d2fb001c5dfc43f7cb1458976e803cf7454 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 334b1287bd274f31232a39ca57e07a2401544a01..69ed2df45a3296d48be598cb2344be94dcf1eb3b 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 9a29517e84378b9c8bfa173acc66363aebb5279d..53a811563e6d69c6815e88f8c4b1e4f756a0ae1c 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 9a29517e84378b9c8bfa173acc66363aebb5279d..53a811563e6d69c6815e88f8c4b1e4f756a0ae1c 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 202961f804a7b99de6b82d2ad88c614d8075fe42..aad563c1fdd9276b10f6ecc4b7438034af017e76 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 296ffb33199ac4ab8e2f0cd3c1846a110b75df9d..a7d876eeb28fa5e8ac9fb508428a8eb0442ba36d 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 93b01a82851e7c281eee0482653639fd3708e29e..45bb949628482ca06e9e8c15979e678f38f2517c 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 58c5fb52027619363dbd81abb2293dc49661d865..b894099c4c44ae64498d01ccd4a3268bd45e43af 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 b7e967eeb297c9f693ec427f13225caf2661e3d1..7c31faeadb24ffa805e69da6416d6b9ede855ecf 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 20afd845a08cf0d06dca06c4b9a9dd8d65ef8d01..fc9fc84695078acb73ae01ce57b08b9d5d0ea5de 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;
- tolerance 1e-05;
- relTol 0;
- }
-
- e
- {
- solver PBiCG;
- preconditioner DILU;
+ $p;
tolerance 1e-05;
relTol 0;
}
- k
- {
- solver PBiCG;
- preconditioner DILU;
- tolerance 1e-08;
- relTol 0;
- }
-
- epsilon
+ "(k|epsilon)"
{
- solver PBiCG;
- preconditioner DILU;
+ $p;
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 0b8bc2b1c35b27fb640f0974540de353e0db404d..f63bb3a65b7c73fac12c2fb369f1d84e8287b896 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 177af26b527f54c68b9bb00b75ad907b58ff8eb1..8e277b7c41b802a0df34fbed9292f0c967d57449 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,29 +25,20 @@ solvers
relTol 0;
}
- U
+ pB
{
- solver PBiCG;
- preconditioner DILU;
+ $p;
tolerance 1e-05;
relTol 0;
}
- B
+ "(U|B)"
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-05;
relTol 0;
}
-
- pB
- {
- solver PCG;
- preconditioner DIC;
- tolerance 1e-05;
- relTol 0;
- }
}
PISO
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/system/fvSolution b/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/system/fvSolution
index 39cc9a45f442bfb3997d3e46763cf01d8bbbd4e6..f0a55b12f3097977b4e5e465797d3dc853900912 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 8524660a6a2474b25fb848d00dc537c4d5fe46f2..60b3f8c4c89436071b1c4bccfacd0e01de9611e1 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 f24144294e45ccb88613c24933ee20b9dca38654..cb7432a54a54bfe8b6d842b436f8456124b69920 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 2d5e8be034077f506d349a78124bc73d4e7c08f6..3fb15a9cbaf911e823ee0ba9b5f054ca601662d0 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 8d67100cf8523148dd5c59041e609be529c4ee35..50c159252667e307c89d41edaf8882195c82f910 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 b450f1eb7582fc958f28a2d3415f4941e5c8099e..048416fff61e3ed6094fef1ad931261b962c17c5 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 14ade5412348534fe122968feca7b0e90c4842b5..1fa2231e58b4c0507764a1f224d75f167e3595e8 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 3248e05562676ddb8c239be642dbc5906dd69d15..16947842afa6f8a069354291de55d8810a5c1d5c 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 be20334b74674e75aa123e1ca2d800d5e2f7dee8..19370a0e39c4b42a7a58941a05170e9a33a37b4f 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 be20334b74674e75aa123e1ca2d800d5e2f7dee8..19370a0e39c4b42a7a58941a05170e9a33a37b4f 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 be20334b74674e75aa123e1ca2d800d5e2f7dee8..19370a0e39c4b42a7a58941a05170e9a33a37b4f 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 3248e05562676ddb8c239be642dbc5906dd69d15..27f5cfb1dd778872ef6c12a8acdda71bfa29a298 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
- {
- solver PBiCG;
- preconditioner DILU;
- tolerance 1e-08;
- relTol 0;
- };
- epsilon
+ "(hFinal|k|epsilon|R)"
{
- 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 3248e05562676ddb8c239be642dbc5906dd69d15..a2f76a21ca2233f2d049cf01c448ec0876fe66b0 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
- {
- solver PBiCG;
- preconditioner DILU;
- tolerance 1e-08;
- relTol 0;
- };
- epsilon
- {
- solver PBiCG;
- preconditioner DILU;
- tolerance 1e-08;
- relTol 0;
- };
- R
+
+ "(hFinal|k|epsilon|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 be20334b74674e75aa123e1ca2d800d5e2f7dee8..19370a0e39c4b42a7a58941a05170e9a33a37b4f 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 be20334b74674e75aa123e1ca2d800d5e2f7dee8..19370a0e39c4b42a7a58941a05170e9a33a37b4f 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 be20334b74674e75aa123e1ca2d800d5e2f7dee8..19370a0e39c4b42a7a58941a05170e9a33a37b4f 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 3248e05562676ddb8c239be642dbc5906dd69d15..27f5cfb1dd778872ef6c12a8acdda71bfa29a298 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
- {
- solver PBiCG;
- preconditioner DILU;
- tolerance 1e-08;
- relTol 0;
- };
- epsilon
+ "(hFinal|k|epsilon|R)"
{
- 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 45a1d6fdeb7f1eb87e80c39eb9fba8854d8ff676..7aa408cd0e7e92d6980cfdbbcb824db41844f7b9 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 25a2d8138daa68c02f6dfea70a0beb4cc3b7bafd..0eb08d2b4937fa60dcaba9fd7a91bd1b0e57ada7 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 a165f8313b928e5ee395e74d2b97fe3a1638782a..a8d9091ac9ed661b3244549d82a13ae7522319d8 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 09f407752061df0fcf127ea4972371475066a94c..75827c6adcbffa04ff82f4f0f6882dc364458190 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 98831f2c8fff414cf1466b1d82ae0c35019d0803..5e3959e48967e5beae54f6e1651389a893fe5219 100644
--- a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSolution
+++ b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSolution
@@ -17,27 +17,32 @@ FoamFile
solvers
{
- pcorr
+ p
{
solver PCG;
preconditioner DIC;
+ tolerance 1e-06;
+ relTol 0.05;
+ }
+
+ pcorr
+ {
+ $p;
tolerance 0.01;
relTol 0;
}
- p
+ pFinal
{
- solver PCG;
- preconditioner DIC;
+ $p;
tolerance 1e-06;
- relTol 0.05;
+ relTol 0;
}
- pFinal
+ cellMotionUx
{
- solver PCG;
- preconditioner DIC;
- tolerance 1e-06;
+ $p;
+ tolerance 1e-08;
relTol 0;
}
@@ -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 5a9f970576f5d40f5e374cdea918ed11b483351b..ee386897ef404048516ac1f504c37c9fa922d84e 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
- {
- solver PBiCG;
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- }
-
- k
+ "(UFinal|k|epsilon)"
{
- 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 80345d9518d5851cdfba57a65f59b688268fe93d..cc3d0662370d760fef3a91062b458c4b623abfc3 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 80345d9518d5851cdfba57a65f59b688268fe93d..cc3d0662370d760fef3a91062b458c4b623abfc3 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 aeb8d201668b236d68e90752507e2a45b5448523..1441d37bd8e1a0afb09cffc32e69a28dc8b120b5 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 8bc3472e959685d6699a8c5a95e1e3457f28933b..1f0138d38089503925fa67a5c36aff5be79b7835 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 8088687562f18dde1f35c160494d2a38efe3cb34..27efb646e8c1e0aab0b198b4f9a5ef2d4208e962 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 2dcaef0c14e2629e85f45680a6d60b704a33e229..e93978fccfc0db76cbfebd1c3980190deb5bb440 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 b0b6699e0d54537abd342ccab2dd6d6c0460365f..72642670c325be4f8403ec0bdb9b2a6243d7804d 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 b0b6699e0d54537abd342ccab2dd6d6c0460365f..72642670c325be4f8403ec0bdb9b2a6243d7804d 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 a74ada8eae3eaa2854eb4aeec574c0158a71986a..eb1821dab730517ef5a3f038b59de64deb1190a2 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 5e1041dd83f81ededa7075e1a821b63d28c64d78..9649868ce8b9b698d5fc9c69766448177b5cee6c 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
- {
- solver PBiCG;
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- R
- {
- solver PBiCG;
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- k
+ }
+
+ "(U|h|R|k|epsilon)"
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-05;
relTol 0;
- };
- epsilon
+ }
+
+ "(Yi|CO2|O2|N2|CH4|H2|H2O|CO)"
{
solver PBiCG;
preconditioner DILU;
- tolerance 1e-05;
+ tolerance 1e-06;
relTol 0;
- };
+ }
}
PISO
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/fvSolution b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/fvSolution
index cdefcfb1036eef04a4e8f5002c2fed76aa83d752..ea76163b1fefc3809832e503da56cd4817f28070 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;
- };
- pFinal
- {
- solver GAMG;
- tolerance 1e-6;
- relTol 0;
-
- smoother GaussSeidel;
- nPreSweeps 0;
- nPostSweeps 2;
-
- cacheAgglomeration true;
+ agglomerator faceAreaPair;
+ mergeLevels 1;
+ }
- nCellsInCoarsestLevel 10;
- agglomerator faceAreaPair;
- mergeLevels 1;
- };
- G
- {
- solver PCG;
- preconditioner DIC;
- tolerance 1e-05;
- relTol 0;
- };
- Yi
- {
- solver PBiCG;
- preconditioner DILU;
- tolerance 1e-06;
- relTol 0;
- };
- O2
- {
- solver PBiCG;
- preconditioner DILU;
- tolerance 1e-06;
- relTol 0;
- };
- N2
+ pFinal
{
- solver PBiCG;
- preconditioner DILU;
+ $p;
tolerance 1e-06;
relTol 0;
- };
- H2O
+ }
+
+ "(Yi|O2|N2|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 f0ef60911704bb22cec7620caeab2826027bd51b..6c2c92da9fbd9d242215d908a52583d5f7b9526c 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
- {
- 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
+
+ "(Yi|O2|N2|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 9b1a12fa2bc438dd8d8e64c0dd2396b89f8cc7c4..944868efc471d8175734918b2321349b6d5b0114 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
- {
- 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
+ "(U|h|R|k|epsilon)"
{
- 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;
+ $p;
tolerance 1e-05;
relTol 0;
}
- k
+ "(Yi|CO2|O2|N2|CH4|H2|H2O|CO)"
{
- 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 eab88821261bef2f86072ec34092655b9e411504..898ec2420b4482b3c3d4a1919eb4a0f45538be1a 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
- {
- solver PCG;
- preconditioner DIC;
- tolerance 1e-08;
- relTol 0;
- };
- cellMotionUz
+ }
+
+ "(cellMotionU|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 d59f49c6cacd64d4b6ddd465ef7b85d8b70e97b0..8b5c05a6d236837001fa907092e0acf75c20cb55 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
- {
- solver PBiCG;
- preconditioner DILU;
- tolerance 1e-10;
- relTol 0;
- }
-
- beta
+ "(alpha|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 ae28961258d27cce81f469bc593d7bdabb57a8a5..faf3b65941978f1b5a0b140e32915057fe562784 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 ae28961258d27cce81f469bc593d7bdabb57a8a5..faf3b65941978f1b5a0b140e32915057fe562784 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 188e593e19aa6dc1411a6089af1f58d52b42379c..7ab713bdc05597f94fb5688b2f1b78ad5ed7675a 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 872b88e305064461680491450ee55d6a5e729169..9a128b27fd5247af102f8058a0956cbbcad5b29a 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 872b88e305064461680491450ee55d6a5e729169..9a128b27fd5247af102f8058a0956cbbcad5b29a 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 577db9c0f6e4062bb8af74a05092fc60aa517c56..0ca3851b34d070430c9d3c90c59c7c4197483031 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 b9b4490f4c3de5727b5db80a2f083e05cb37aeb8..53033e72f4585f576191704c83a696f4ee0673a0 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 fe91ceb9b07c0e59383ac8712de68d02c00a79d0..a4167c7f07b2b01ac2795e728c62cd6f0dc52c4e 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 296fc3df647d2d5271001ce2f3e5ef0a0401d1a2..9aa23c131a923a1a645bde14f7b5b680fab8bddc 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 921889c5869ef5f41f4eaaf9fad9fe2659001aea..322cb00b5ae9830d4cadf25f4781125a9d288494 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 9f6930eccf0fce8fb8110fdfea1af1e006dda2ce..a423ce36b6f57316b74b39ec3f7aafc4fb3458b7 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 9f6930eccf0fce8fb8110fdfea1af1e006dda2ce..a423ce36b6f57316b74b39ec3f7aafc4fb3458b7 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 148cdcddc5c7ec956d8b96cf581f1b4743a3de8f..ba4fe0665d693a5cb9046d3a0a7199cb77fbe8c7 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 148cdcddc5c7ec956d8b96cf581f1b4743a3de8f..ba4fe0665d693a5cb9046d3a0a7199cb77fbe8c7 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 0589345336d8cafef044dc8ce4bbb528a5652abe..d346fa4ee05df4a7460c11303a0b7a18da70b0a8 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
- {
- solver PBiCG;
- preconditioner DILU;
- tolerance 1e-10;
- relTol 0;
- }
-
- beta
+ "(alpha|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 733ad77e71da262baa33734836576cfd78f37ef7..698e72f16d3f8ba57e7ddc9cfdbedaa21b3385bd 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
- {
- solver PBiCG;
- preconditioner DILU;
- tolerance 1e-10;
- relTol 0;
- }
-
- beta
+ "(alpha|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 efb0cb6b6a79f4ea8e89087e77c4b32c43dbc3b3..5844dc4fef9ebdf09f45ce7f7e7976b2f5815aef 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
- {
- solver PBiCG;
- preconditioner DILU;
- tolerance 1e-10;
- relTol 0;
- }
-
- beta
+ "(alpha|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 e921d9233ae41975c580c4524dd0ffae3e45c26e..94b968c1c9c548b519ffd02a50b07fa6916758d7 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 fd610d55c595beae79899feb1bdc620315b3dda9..8dabfdac0a8192e197f0550d41b1691f1c3b68e6 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;