From d749aac04defba04fc4cbd5d3fd36302721d780f Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Sat, 1 Aug 2009 14:51:59 +0200
Subject: [PATCH] adjust tutorial fvSolution to use regular expressions and
$variable
---
.../XiFoam/les/pitzDaily/system/fvSolution | 90 +-------------
.../XiFoam/les/pitzDaily3D/system/fvSolution | 89 +-------------
.../moriyoshiHomogeneous/system/fvSolution | 89 +-------------
.../dieselFoam/aachenBomb/system/fvSolution | 44 +------
.../engineFoam/kivaTest/system/fvSolution | 89 +-------------
.../angledDuct/system/fvSolution | 71 ++---------
.../les/pitzDaily/system/fvSolution | 41 +------
.../rhoPisoFoam/ras/cavity/system/fvSolution | 49 +-------
.../angledDuctExplicit/system/fvSolution | 20 +---
.../angledDuctImplicit/system/fvSolution | 18 +--
.../forwardStep/system/fvSolution | 28 +----
.../rhoSonicFoam/shockTube/system/fvSolution | 28 +----
.../rhopSonicFoam/shockTube/system/fvSolution | 28 +----
.../wedge15Ma5/system/fvSolution | 28 +----
.../laminar/forwardStep/system/fvSolution | 15 +--
.../laminar/shockTube/system/fvSolution | 20 +---
.../ras/nacaAirfoil/system/fvSolution | 39 +-----
.../sonicFoam/ras/prism/system/fvSolution | 35 +-----
.../decompressionTank/system/fvSolution | 5 +-
.../mhdFoam/hartmann/system/fvSolution | 17 +--
.../hotRoom/system/fvSolution | 39 +-----
.../hotRoom/system/fvSolution | 40 +------
.../iglooWithFridges/system/fvSolution | 40 +------
.../buoyantPisoFoam/hotRoom/system/fvSolution | 39 +-----
.../hotRoom/system/fvSolution | 42 +------
.../hotRadiationRoom/system/fvSolution | 38 +-----
.../hotRadiationRoomFvDOM/system/fvSolution | 45 +------
.../system/bottomAir/fvSolution | 55 ++-------
.../system/heater/fvSolution | 2 +-
.../system/leftSolid/fvSolution | 2 +-
.../system/rightSolid/fvSolution | 2 +-
.../system/topAir/fvSolution | 53 ++-------
.../system/bottomAir/fvSolution | 54 ++-------
.../system/heater/fvSolution | 2 +-
.../system/leftSolid/fvSolution | 2 +-
.../system/rightSolid/fvSolution | 2 +-
.../system/topAir/fvSolution | 53 ++-------
.../mixerVessel2D/system/fvSolution | 25 +---
.../boundaryLaunderSharma/system/fvSolution | 32 +----
.../boundaryWallFunctions/system/fvSolution | 32 +----
.../channelFoam/channel395/system/fvSolution | 31 +----
.../movingCone/system/fvSolution | 31 +++--
.../pimpleFoam/t-junction/system/fvSolution | 33 +-----
.../pisoFoam/les/pitzDaily/system/fvSolution | 31 +----
.../pitzDailyDirectMapped/system/fvSolution | 31 +----
.../pisoFoam/ras/cavity/system/fvSolution | 39 +-----
.../squareBump/system/fvSolution | 7 +-
.../simpleFoam/airFoil2D/system/fvSolution | 13 +-
.../simpleFoam/motorBike/system/fvSolution | 59 ++++-----
.../simpleFoam/pitzDaily/system/fvSolution | 40 +------
.../pitzDailyExptInlet/system/fvSolution | 40 +------
.../simpleSRFFoam/mixer/system/fvSolution | 49 +-------
.../simplifiedSiwek/system/fvSolution | 105 ++--------------
.../filter/system/fvSolution | 112 ++++--------------
.../evaporationTest/system/fvSolution | 60 ++--------
.../simplifiedSiwek/system/fvSolution | 112 +-----------------
.../SnakeRiverCanyon/system/fvSolution | 46 ++++---
.../bubbleFoam/bubbleColumn/system/fvSolution | 38 +-----
.../les/throttle/system/fvSolution | 39 +-----
.../les/throttle3D/system/fvSolution | 39 +-----
.../ras/throttle/system/fvSolution | 37 +-----
.../les/depthCharge2D/system/fvSolution | 22 +---
.../les/depthCharge3D/system/fvSolution | 22 +---
.../damBreakWithObstacle/system/fvSolution | 27 +----
.../mixerVessel2D/system/fvSolution | 3 +-
.../laminar/damBreak/system/fvSolution | 3 +-
.../les/nozzleFlow2D/system/fvSolution | 22 +---
.../interFoam/ras/damBreak/system/fvSolution | 34 +-----
.../laminar/damBreak4phase/system/fvSolution | 15 +--
.../damBreak4phaseFine/system/fvSolution | 15 +--
.../settlingFoam/ras/dahl/system/fvSolution | 38 +-----
.../settlingFoam/ras/tank3D/system/fvSolution | 38 +-----
.../twoPhaseEulerFoam/bed/system/fvSolution | 48 +-------
.../twoPhaseEulerFoam/bed2/system/fvSolution | 49 +-------
.../bubbleColumn/system/fvSolution | 46 +------
.../plateHole/system/fvSolution | 16 +--
.../beamEndLoad/system/fvSolution | 18 +--
77 files changed, 358 insertions(+), 2492 deletions(-)
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSolution b/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSolution
index 62134376966..1f4e90f5809 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 62134376966..6fe4799640a 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 d7814dd9040..f9fbedc0962 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 0d7e29c2b59..d5b1de2e9a5 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 1891fe83bfb..6184f55f0cf 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 583c3637aa6..2db2f5c065f 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 a9453327841..01450c89ea2 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 72b829ca393..fd30592f448 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 844c55c57c4..9dac9d2fb00 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 334b1287bd2..69ed2df45a3 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 9a29517e843..53a811563e6 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 9a29517e843..53a811563e6 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 202961f804a..aad563c1fdd 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 296ffb33199..a7d876eeb28 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 93b01a82851..45bb9496284 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 58c5fb52027..b894099c4c4 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 b7e967eeb29..7c31faeadb2 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 20afd845a08..fc9fc846950 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 0b8bc2b1c35..f63bb3a65b7 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 177af26b527..8e277b7c41b 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 39cc9a45f44..f0a55b12f30 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 8524660a6a2..60b3f8c4c89 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 f24144294e4..cb7432a54a5 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 2d5e8be0340..3fb15a9cbaf 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 8d67100cf85..50c15925266 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 b450f1eb758..048416fff61 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 14ade541234..1fa2231e58b 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 3248e055626..16947842afa 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 be20334b746..19370a0e39c 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 be20334b746..19370a0e39c 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 be20334b746..19370a0e39c 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 3248e055626..27f5cfb1dd7 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 3248e055626..a2f76a21ca2 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 be20334b746..19370a0e39c 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 be20334b746..19370a0e39c 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 be20334b746..19370a0e39c 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 3248e055626..27f5cfb1dd7 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 45a1d6fdeb7..7aa408cd0e7 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 25a2d8138da..0eb08d2b493 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 a165f8313b9..a8d9091ac9e 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 09f40775206..75827c6adcb 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 98831f2c8ff..5e3959e4896 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 5a9f970576f..ee386897ef4 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 80345d9518d..cc3d0662370 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 80345d9518d..cc3d0662370 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 aeb8d201668..1441d37bd8e 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 8bc3472e959..1f0138d3808 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 8088687562f..27efb646e8c 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 2dcaef0c14e..e93978fccfc 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 b0b6699e0d5..72642670c32 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 b0b6699e0d5..72642670c32 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 a74ada8eae3..eb1821dab73 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 5e1041dd83f..9649868ce8b 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 cdefcfb1036..ea76163b1fe 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 f0ef6091170..6c2c92da9fb 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 9b1a12fa2bc..944868efc47 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 eab88821261..898ec2420b4 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 d59f49c6cac..8b5c05a6d23 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 ae28961258d..faf3b659419 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 ae28961258d..faf3b659419 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 188e593e19a..7ab713bdc05 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 872b88e3050..9a128b27fd5 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 872b88e3050..9a128b27fd5 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 577db9c0f6e..0ca3851b34d 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 b9b4490f4c3..53033e72f45 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 fe91ceb9b07..a4167c7f07b 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 296fc3df647..9aa23c131a9 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 921889c5869..322cb00b5ae 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 9f6930eccf0..a423ce36b6f 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 9f6930eccf0..a423ce36b6f 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 148cdcddc5c..ba4fe0665d6 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 148cdcddc5c..ba4fe0665d6 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 0589345336d..d346fa4ee05 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 733ad77e71d..698e72f16d3 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 efb0cb6b6a7..5844dc4fef9 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 e921d9233ae..94b968c1c9c 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 fd610d55c59..8dabfdac0a8 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;
--
GitLab