Rationalised the handling of "Final" solver and relaxation factor settings

Now for transient simulations "Final" solver settings are required for ALL
equations providing consistency between the solution of velocity, energy,
composition and radiation properties.

However "Final" relaxation factors are no longer required for fields or
equations and if not present the standard value for the variable will be
applied.  Given that relaxation factors other than 1 are rarely required for
transient runs and hence the same for all iterations including the final one
this approach provide simpler input while still providing the flexibility to
specify a different value for the final iteration if required.  For steady cases
it is usual to execute just 1 outer iteration per time-step for which the
standard relaxation factors are appropriate, and if more than one iteration is
executed it is common to use the same factors for both.  In the unlikely event
of requiring different relaxation factors for the final iteration this is still
possible to specify via the now optional "Final" specification.
This commit is contained in:
Henry Weller
2018-11-17 19:42:23 +00:00
parent ae28cb34d2
commit ee443e201f
133 changed files with 376 additions and 325 deletions

View File

@ -17,7 +17,7 @@ FoamFile
solvers
{
Yi
"Yi.*"
{
solver PBiCGStab;
preconditioner DILU;

View File

@ -17,7 +17,7 @@ FoamFile
solvers
{
Yi
"Yi.*"
{
solver PBiCGStab;
preconditioner DILU;

View File

@ -17,7 +17,7 @@ FoamFile
solvers
{
Yi
"Yi.*"
{
solver PBiCGStab;
preconditioner DILU;

View File

@ -17,7 +17,7 @@ FoamFile
solvers
{
Yi
"Yi.*"
{
solver PBiCGStab;
preconditioner DILU;

View File

@ -17,7 +17,7 @@ FoamFile
solvers
{
Yi
"Yi.*"
{
solver PBiCGStab;
preconditioner DILU;

View File

@ -70,7 +70,7 @@ solvers
relTol 0;
};
Ii
"Ii.*"
{
solver GAMG;
tolerance 1e-4;

View File

@ -60,7 +60,7 @@ solvers
relTol 0;
};
Ii
"Ii.*"
{
solver GAMG;
tolerance 1e-4;

View File

@ -71,7 +71,7 @@ solvers
};
Ii
"Ii.*"
{
solver GAMG;
tolerance 1e-4;
@ -81,7 +81,7 @@ solvers
nPostSweeps 1;
}
G
"G.*"
{
solver PCG;
preconditioner DIC;

View File

@ -62,7 +62,7 @@ solvers
relTol 0;
};
Ii
"Ii.*"
{
solver GAMG;
tolerance 1e-4;
@ -72,7 +72,7 @@ solvers
nPostSweeps 1;
}
G
"G.*"
{
solver PCG;
preconditioner DIC;

View File

@ -49,7 +49,7 @@ solvers
$U;
}
Yi
"Yi.*"
{
solver PBiCG;
preconditioner DILU;

View File

@ -49,7 +49,7 @@ solvers
$U;
}
Yi
"Yi.*"
{
solver PBiCGStab;
preconditioner DILU;
@ -57,7 +57,7 @@ solvers
relTol 0.1;
}
G
"G.*"
{
solver PCG;
preconditioner DIC;

View File

@ -51,7 +51,7 @@ solvers
relTol 0;
}
Yi
"Yi.*"
{
$hFinal;
}

View File

@ -51,7 +51,7 @@ solvers
relTol 0;
}
Yi
"Yi.*"
{
$hFinal;
}

View File

@ -50,7 +50,7 @@ solvers
relTol 0.1;
}
Yi
"Yi.*"
{
$U;
relTol 0.1;

View File

@ -50,7 +50,7 @@ solvers
relTol 0.1;
}
Yi
"Yi.*"
{
$U;
relTol 0.1;

View File

@ -51,7 +51,7 @@ solvers
relTol 0;
}
Yi
"Yi.*"
{
$hFinal;
}

View File

@ -51,7 +51,7 @@ solvers
relTol 0;
}
Yi
"Yi.*"
{
$hFinal;
}

View File

@ -75,14 +75,14 @@ relaxationFactors
{
fields
{
"p.*" 1;
"rho.*" 1;
p 1;
rho 1;
}
equations
{
"U.*" 0.9;
"e.*" 0.7;
"(k|epsilon|omega).*" 0.8;
U 0.9;
e 0.7;
"(k|epsilon|omega)" 0.8;
}
}

View File

@ -97,10 +97,7 @@ relaxationFactors
{
equations
{
"U.*" 1;
"h.*" 1;
"k.*" 1;
"epsilon.*" 1;
".*" 1;
}
}

View File

@ -33,7 +33,7 @@ solvers
relTol 0.1;
}
G
"G.*"
{
$p_rgh;
tolerance 1e-05;

View File

@ -25,7 +25,7 @@ solvers
relTol 0.01;
}
Ii
"Ii.*"
{
solver GAMG;
tolerance 1e-4;

View File

@ -44,16 +44,16 @@ relaxationFactors
{
fields
{
"rho.*" 1;
"p_rgh.*" 0.7;
rho 1;
p_rgh 0.7;
}
equations
{
"U.*" 0.3;
"(h|e).*" 0.3;
"k.*" 0.3;
"epsilon.*" 0.3;
U 0.3;
"(h|e)" 0.3;
k 0.3;
epsilon 0.3;
}
}

View File

@ -44,15 +44,16 @@ relaxationFactors
{
fields
{
"rho.*" 1;
"p_rgh.*" 0.7;
rho 1;
p_rgh 0.7;
}
equations
{
"U.*" 0.3;
"(h|e).*" 0.3;
"k.*" 0.3;
"epsilon.*" 0.3;
U 0.3;
"(h|e)" 0.3;
k 0.3;
epsilon 0.3;
}
}

View File

@ -65,8 +65,8 @@ relaxationFactors
{
equations
{
"h.*" 1;
"U.*" 1;
h 1;
U 1;
}
}

View File

@ -75,8 +75,8 @@ relaxationFactors
{
equations
{
"h.*" 1;
"U.*" 1;
h 1;
U 1;
}
}

View File

@ -47,15 +47,15 @@ relaxationFactors
{
fields
{
"rho.*" 1.0;
"p_rgh.*" 0.7;
rho 1.0;
p_rgh 0.7;
}
equations
{
"U.*" 0.3;
"h.*" 0.7;
"(k|epsilon|omega).*" 0.7;
"qr.*" 0.7;
U 0.3;
h 0.7;
"(k|epsilon|omega)" 0.7;
qr 0.7;
}
}

View File

@ -34,7 +34,7 @@ relaxationFactors
{
equations
{
"h.*" 0.7;
h 0.7;
}
}

View File

@ -73,8 +73,8 @@ relaxationFactors
{
equations
{
"h.*" 1;
"U.*" 1;
h 1;
U 1;
}
}

View File

@ -68,8 +68,8 @@ relaxationFactors
{
equations
{
"h.*" 1;
"U.*" 1;
h 1;
U 1;
}
}

View File

@ -73,9 +73,7 @@ relaxationFactors
{
equations
{
"Urel.*" 1;
"k.*" 1;
"epsilon.*" 1;
".*" 1;
}
}

View File

@ -62,9 +62,7 @@ relaxationFactors
{
equations
{
"U.*" 1;
"k.*" 1;
"epsilon.*" 1;
".*" 1;
}
}

View File

@ -94,7 +94,7 @@ baffles
{
p
{
type fan;
type fanPressureJump;
patchType cyclic;
jump uniform 0;
value uniform 0;

View File

@ -62,9 +62,7 @@ relaxationFactors
{
equations
{
"U.*" 1;
"k.*" 1;
"epsilon.*" 1;
".*" 1;
}
}

View File

@ -80,7 +80,7 @@ relaxationFactors
{
equations
{
"U.*" 1;
".*" 1;
}
}

View File

@ -76,7 +76,7 @@ relaxationFactors
{
equations
{
"U.*" 1;
".*" 1;
}
}

View File

@ -75,11 +75,12 @@ relaxationFactors
{
p 0.3;
}
equations
{
U 0.7;
k 0.7;
"epsilon.*" 0.7;
epsilon 0.7;
}
}

View File

@ -50,7 +50,7 @@ solvers
relTol 0.1;
}
Yi
"Yi.*"
{
$U;
relTol 0.1;

View File

@ -48,7 +48,7 @@ solvers
tolerance 1e-05;
}
"(k|epsilon)"
"(k|epsilon).*"
{
$UFinal;
}
@ -68,14 +68,7 @@ solvers
relTol 0;
}
"(h|Yi|O2|N2|H2O)"
{
solver PBiCGStab;
preconditioner DILU;
tolerance 1e-6;
relTol 0;
}
hFinal
"(h|Yi|O2|N2|H2O).*"
{
solver PBiCGStab;
preconditioner DILU;
@ -99,7 +92,7 @@ relaxationFactors
{
equations
{
".*Final" 1;
".*" 1;
}
}

View File

@ -62,7 +62,7 @@ solvers
relTol 0;
}
"(Yi|O2|N2|H2O)"
"(Yi|O2|N2|H2O).*"
{
solver PBiCGStab;
preconditioner DILU;

View File

@ -63,7 +63,7 @@ solvers
relTol 0;
}
"(Yi|O2|N2|H2O)"
"(Yi|O2|N2|H2O).*"
{
$hFinal;
}
@ -80,7 +80,7 @@ relaxationFactors
{
equations
{
".*Final" 1;
".*" 1;
}
}

View File

@ -63,7 +63,7 @@ solvers
relTol 0;
}
"(Yi|O2|N2|H2O)"
"(Yi|O2|N2|H2O).*"
{
solver PBiCGStab;
preconditioner DILU;

View File

@ -64,14 +64,7 @@ solvers
relTol 0;
}
"(h|Yi|O2|N2|H2O)"
{
solver PBiCGStab;
preconditioner DILU;
tolerance 1e-6;
relTol 0;
}
hFinal
"(h|Yi|O2|N2|H2O).*"
{
solver PBiCGStab;
preconditioner DILU;
@ -91,7 +84,7 @@ relaxationFactors
{
equations
{
".*" 1;
".*" 1;
}
}

View File

@ -57,7 +57,7 @@ solvers
relTol 0;
}
"(Yi|O2|N2|H2O)"
"(Yi|O2|N2|H2O).*"
{
solver PBiCGStab;
preconditioner DILU;
@ -99,7 +99,7 @@ relaxationFactors
{
equations
{
".*" 1;
".*" 1;
}
}

View File

@ -62,23 +62,18 @@ solvers
relTol 0;
}
"(Yi|O2|N2|H2O)"
"(h|Yi|O2|N2|H2O)"
{
solver PBiCGStab;
preconditioner DILU;
tolerance 1e-6;
relTol 0;
}
h
{
$Yi;
relTol 0.1;
}
hFinal
"(h|Yi|O2|N2|H2O)Final"
{
$Yi;
relTol 0;
}
}
@ -94,7 +89,7 @@ relaxationFactors
{
equations
{
".*Final" 1;
".*" 1;
}
}

View File

@ -90,10 +90,7 @@ relaxationFactors
{
equations
{
"U.*" 1;
"k.*" 1;
"epsilon.*" 1;
"T.*" 1;
".*" 1;
}
}

View File

@ -90,10 +90,7 @@ relaxationFactors
{
equations
{
"U.*" 1;
"k.*" 1;
"epsilon.*" 1;
"T.*" 1;
".*" 1;
}
}

View File

@ -104,7 +104,7 @@ relaxationFactors
{
equations
{
"U.*" 1;
".*" 1;
}
}

View File

@ -93,7 +93,7 @@ relaxationFactors
{
equations
{
"U.*" 1;
".*" 1;
}
}

View File

@ -73,10 +73,7 @@ relaxationFactors
{
equations
{
"U.*" 1;
"k.*" 1;
"epsilon.*" 1;
"T.*" 1;
".*" 1;
}
}

View File

@ -81,7 +81,7 @@ relaxationFactors
{
equations
{
"U.*" 1;
".*" 1;
}
}

View File

@ -92,7 +92,7 @@ relaxationFactors
{
equations
{
"U.*" 1;
".*" 1;
}
}

View File

@ -92,7 +92,7 @@ relaxationFactors
{
equations
{
"U.*" 1;
".*" 1;
}
}

View File

@ -92,7 +92,7 @@ relaxationFactors
{
equations
{
"U.*" 1;
".*" 1;
}
}

View File

@ -92,7 +92,7 @@ relaxationFactors
{
equations
{
"U.*" 1;
".*" 1;
}
}

View File

@ -92,7 +92,7 @@ relaxationFactors
{
equations
{
"U.*" 1;
".*" 1;
}
}

View File

@ -92,7 +92,7 @@ relaxationFactors
{
equations
{
"U.*" 1;
".*" 1;
}
}

View File

@ -103,7 +103,7 @@ relaxationFactors
{
equations
{
"U.*" 1;
".*" 1;
}
}

View File

@ -89,7 +89,7 @@ relaxationFactors
{
equations
{
"U.*" 1;
".*" 1;
}
}

View File

@ -83,7 +83,7 @@ relaxationFactors
{
equations
{
"U.*" 1;
".*" 1;
}
}

View File

@ -71,7 +71,7 @@ relaxationFactors
{
equations
{
"U.*" 1;
".*" 1;
}
}

View File

@ -67,7 +67,7 @@ solvers
minIter 1;
}
Yi
"Yi.*"
{
solver smoothSolver;
smoother symGaussSeidel;
@ -97,10 +97,10 @@ relaxationFactors
equations
{
".*" 1;
"h.*" 0.5;
"e.*" 0.5;
"k.*" 0.5;
"epsilon.*" 0.5;
h 0.5;
e 0.5;
k 0.5;
epsilon 0.5;
}
}

View File

@ -67,7 +67,7 @@ solvers
minIter 1;
}
Yi
"Yi.*"
{
solver smoothSolver;
smoother symGaussSeidel;
@ -97,10 +97,10 @@ relaxationFactors
equations
{
".*" 1;
"h.*" 0.5;
"e.*" 0.5;
"k.*" 0.5;
"epsilon.*" 0.5;
h 0.5;
e 0.5;
k 0.5;
epsilon 0.5;
}
}

View File

@ -64,7 +64,7 @@ solvers
minIter 1;
}
Yi
"Yi.*"
{
solver smoothSolver;
smoother symGaussSeidel;

View File

@ -67,7 +67,7 @@ solvers
minIter 1;
}
Yi
"Yi.*"
{
solver smoothSolver;
smoother symGaussSeidel;
@ -97,8 +97,8 @@ relaxationFactors
equations
{
".*" 1;
"h.*" 0.3;
"e.*" 0.3;
h 0.3;
e 0.3;
}
}

View File

@ -67,7 +67,7 @@ solvers
minIter 1;
}
Yi
"Yi.*"
{
solver smoothSolver;
smoother symGaussSeidel;
@ -97,10 +97,10 @@ relaxationFactors
equations
{
".*" 1;
"h.*" 0.5;
"e.*" 0.5;
"k.*" 0.5;
"epsilon.*" 0.5;
h 0.5;
e 0.5;
k 0.5;
epsilon 0.5;
}
}

View File

@ -75,7 +75,7 @@ solvers
relTol 0;
}
Yi
"Yi.*"
{
solver smoothSolver;
smoother symGaussSeidel;
@ -105,8 +105,8 @@ relaxationFactors
equations
{
".*" 1;
"h.*" 0.3;
"e.*" 0.3;
h 0.3;
e 0.3;
}
}

View File

@ -76,7 +76,7 @@ solvers
minIter 1;
}
Yi
"Yi.*"
{
solver smoothSolver;
smoother symGaussSeidel;
@ -114,8 +114,8 @@ relaxationFactors
equations
{
".*" 1;
"h.*" 0.3;
"e.*" 0.3;
h 0.3;
e 0.3;
}
}

View File

@ -55,7 +55,7 @@ solvers
minIter 1;
}
Yi
"Yi.*"
{
solver smoothSolver;
smoother symGaussSeidel;

View File

@ -55,7 +55,7 @@ solvers
minIter 1;
}
Yi
"Yi.*"
{
solver smoothSolver;
smoother symGaussSeidel;

View File

@ -65,7 +65,7 @@ solvers
minIter 1;
}
Yi
"Yi.*"
{
solver smoothSolver;
smoother symGaussSeidel;