Merge branch 'master' of /home/dm4/OpenFOAM/repositories/OpenFOAM-dev

This commit is contained in:
william
2014-01-24 16:17:58 +00:00
72 changed files with 448 additions and 948 deletions

View File

@ -25,7 +25,7 @@ solvers
p
{
solver GAMG;
tolerance 0;
tolerance 1e-6;
relTol 0.1;
smoother GaussSeidel;
nPreSweeps 0;

View File

@ -20,7 +20,7 @@ solvers
p
{
solver GAMG;
tolerance 0;
tolerance 1e-6;
relTol 0.01;
smoother GaussSeidel;
nPreSweeps 0;

View File

@ -32,15 +32,16 @@ solvers
relTol 0;
}
"(U|h)"
U
{
solver smoothSolver;
smoother symGaussSeidel;
tolerance 0;
relTol 0.1;
maxIter 50;
}
"(U|h)Final"
UFinal
{
$U;
relTol 0;
@ -73,9 +74,19 @@ solvers
relTol 0;
}
"(Yi|O2|N2|H2O)"
"(h|Yi|O2|N2|H2O)"
{
$hFinal;
solver PBiCG;
preconditioner DILU;
tolerance 1e-6;
relTol 0;
}
hFinal
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-6;
relTol 0;
}
}

View File

@ -83,12 +83,12 @@ subModels
((0.6 0.35 1.45) (0 0 -1))
);
massTotal 10;
massTotal 5;
parcelsPerInjector 20000;
parcelsPerSecond 500;
parcelBasisType mass;
flowRateProfile constant 0.1;
Umag constant 3.0;
flowRateProfile constant 1;
Umag constant 1;
thetaInner constant 0;
thetaOuter constant 45;

View File

@ -34,9 +34,9 @@ solvers
"(U|h|k|epsilon)"
{
solver smoothSolver;
smoother symGaussSeidel;
tolerance 0;
solver PBiCG;
preconditioner DILU;
tolerance 1e-5;
relTol 0.1;
}

View File

@ -24,7 +24,9 @@ boundaryField
{
sides
{
type zeroGradient;
type inletOutlet;
inletValue $internalField;
value $internalField;
}
region0_to_wallFilmRegion_wallFilmFaces
{

View File

@ -24,7 +24,9 @@ boundaryField
{
sides
{
type zeroGradient;
type inletOutlet;
inletValue $internalField;
value $internalField;
}
region0_to_wallFilmRegion_wallFilmFaces
{

View File

@ -24,7 +24,9 @@ boundaryField
{
sides
{
type zeroGradient;
type inletOutlet;
inletValue $internalField;
value $internalField;
}
region0_to_wallFilmRegion_wallFilmFaces
{

View File

@ -23,8 +23,9 @@ boundaryField
{
sides
{
type fixedValue;
value uniform 300;
type inletOutlet;
inletValue $internalField;
value $internalField;
}
region0_to_wallFilmRegion_wallFilmFaces
{

View File

@ -32,31 +32,27 @@ solvers
relTol 0;
}
"(U|h)"
U
{
solver smoothSolver;
smoother symGaussSeidel;
tolerance 0;
relTol 0.1;
maxIter 50;
}
"(U|h)Final"
UFinal
{
$U;
relTol 0;
tolerance 1e-05;
}
"(k|epsilon)"
{
$UFinal;
}
p_rgh
{
solver GAMG;
tolerance 0;
relTol 0.1;
relTol 0.01;
smoother GaussSeidel;
nPreSweeps 0;
nPostSweeps 2;
@ -64,18 +60,29 @@ solvers
nCellsInCoarsestLevel 10;
agglomerator faceAreaPair;
mergeLevels 1;
maxIter 50;
}
p_rghFinal
{
$p_rgh;
tolerance 1e-06;
tolerance 1e-05;
relTol 0;
}
"(Yi|O2|N2|H2O)"
"(h|Yi|O2|N2|H2O)"
{
$hFinal;
solver PBiCG;
preconditioner DILU;
tolerance 1e-6;
relTol 0;
}
hFinal
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-6;
relTol 0;
}
}
@ -90,11 +97,11 @@ relaxationFactors
{
fields
{
".*Final" 1;
".*" 1;
}
equations
{
".*Final" 1;
".*" 1;
}
}

View File

@ -19,15 +19,15 @@ solvers
{
"(Uf|hf|deltaf\*rhof)"
{
solver smoothSolver;
smoother symGaussSeidel;
solver PBiCG;
preconditioner DILU;
tolerance 1e-10;
relTol 0;
}
deltaf
{
solver smoothSolver;
smoother symGaussSeidel;
solver PBiCG;
preconditioner DILU;
tolerance 1e-10;
relTol 0;
}
@ -46,9 +46,11 @@ relaxationFactors
{
fields
{
".*" 1;
}
equations
{
".*" 1;
}
}

View File

@ -32,7 +32,7 @@ solvers
relTol 0;
}
"(U|h|k|epsilon)"
"(U|k|epsilon)"
{
solver smoothSolver;
smoother symGaussSeidel;
@ -40,7 +40,7 @@ solvers
relTol 0.1;
}
"(U|h|k|epsilon)Final"
"(U|k|epsilon)Final"
{
$U;
tolerance 1e-06;
@ -70,7 +70,21 @@ solvers
"(Yi|O2|N2|H2O)"
{
$hFinal;
solver PBiCG;
preconditioner DILU;
tolerance 1e-6;
relTol 0;
}
h
{
$Yi;
relTol 0.1;
}
hFinal
{
$Yi;
}
}

View File

@ -32,7 +32,7 @@ solvers
relTol 0;
}
"(U|h|k|epsilon)"
"(U|k|epsilon)"
{
solver smoothSolver;
smoother symGaussSeidel;
@ -40,7 +40,7 @@ solvers
relTol 0.1;
}
"(U|h|k|epsilon)Final"
"(U|k|epsilon)Final"
{
$U;
tolerance 1e-05;
@ -71,7 +71,19 @@ solvers
"(Yi|O2|N2|H2O)"
{
$hFinal;
solver PBiCG;
preconditioner DILU;
tolerance 1e-6;
relTol 0;
}
h
{
$Yi;
relTol 0.1;
}
hFinal
{
$Yi;
}
}

View File

@ -32,7 +32,7 @@ solvers
relTol 0;
}
"(U|h|k|omega)"
"(U|k|omega)"
{
solver smoothSolver;
smoother symGaussSeidel;
@ -40,7 +40,7 @@ solvers
relTol 0.1;
}
"(U|h|k|omega)Final"
"(U|k|omega)Final"
{
$U;
tolerance 1e-06;
@ -59,7 +59,6 @@ solvers
nCellsInCoarsestLevel 10;
agglomerator faceAreaPair;
mergeLevels 1;
maxIter 50;
}
pFinal
@ -71,23 +70,31 @@ solvers
"(Yi|O2|N2|H2O)"
{
$hFinal;
solver PBiCG;
preconditioner DILU;
tolerance 1e-6;
relTol 0;
}
h
{
$Yi;
relTol 0.1;
}
hFinal
{
$Yi;
}
}
PIMPLE
{
nCorrectors 3;
transonic no;
nOuterCorrectors 1;
nCorrectors 2;
nNonOrthogonalCorrectors 0;
momentumPredictor yes;
}
potentialFlow
{
// used for potentialFoam initialisation
nNonOrthogonalCorrectors 5;
}
relaxationFactors
{
fields
@ -95,8 +102,9 @@ relaxationFactors
}
equations
{
".*" 1;
".*Final" 1;
}
}
// ************************************************************************* //

View File

@ -32,11 +32,11 @@ solvers
relTol 0;
}
"(U|h)"
"(U|k|epsilon)"
{
solver smoothSolver;
smoother symGaussSeidel;
tolerance 1e-05;
tolerance 1e-06;
relTol 0.1;
}
@ -61,26 +61,30 @@ solvers
relTol 0;
}
"(U|h)Final"
"(U|k|epsilon)Final"
{
$U;
tolerance 1e-05;
tolerance 1e-06;
relTol 0;
}
"(k|epsilon)"
{
$U;
}
"(k|epsilon)Final"
{
$UFinal;
}
"(Yi|O2|N2|H2O)"
{
$UFinal;
solver PBiCG;
preconditioner DILU;
tolerance 1e-6;
relTol 0;
}
h
{
$Yi;
relTol 0.1;
}
hFinal
{
$Yi;
}
}