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

This commit is contained in:
william
2014-02-05 16:55:18 +00:00
12 changed files with 73 additions and 84 deletions

View File

@ -17,7 +17,7 @@ FoamFile
application interDyMFoam;
startFrom latestTime;
startFrom startTime;
startTime 0;
@ -47,8 +47,8 @@ runTimeModifiable yes;
adjustTimeStep yes;
maxCo 0.1;
maxAlphaCo 0.1;
maxCo 0.2;
maxAlphaCo 0.2;
maxDeltaT 1;

View File

@ -27,7 +27,7 @@ gradSchemes
divSchemes
{
div(rhoPhi,U) Gauss upwind;
div(rhoPhi,U) Gauss linearUpwind grad(U);
div(phi,alpha) Gauss vanLeer;
div(phirb,alpha) Gauss linear;
div((muEff*dev(T(grad(U))))) Gauss linear;

View File

@ -24,35 +24,12 @@ solvers
cAlpha 1;
}
"pcorr.*"
{
solver PCG;
preconditioner
{
preconditioner GAMG;
tolerance 0.001;
relTol 0;
smoother GaussSeidel;
nPreSweeps 0;
nPostSweeps 2;
nFinestSweeps 2;
cacheAgglomeration false;
nCellsInCoarsestLevel 10;
agglomerator faceAreaPair;
mergeLevels 1;
}
tolerance 0.0001;
relTol 0;
maxIter 100;
}
p_rgh
{
solver GAMG;
tolerance 1e-08;
relTol 0.05;
smoother GaussSeidel;
relTol 0.01;
smoother DIC;
nPreSweeps 0;
nPostSweeps 2;
nFinestSweeps 2;
@ -64,26 +41,14 @@ solvers
p_rghFinal
{
solver PCG;
preconditioner
{
preconditioner GAMG;
tolerance 1e-08;
relTol 0;
nVcycles 2;
smoother GaussSeidel;
nPreSweeps 0;
nPostSweeps 2;
nFinestSweeps 2;
cacheAgglomeration false;
nCellsInCoarsestLevel 10;
agglomerator faceAreaPair;
mergeLevels 1;
}
tolerance 1e-08;
$p_rgh;
relTol 0;
maxIter 20;
}
"pcorr.*"
{
$p_rghFinal;
tolerance 0.0001;
}
U

View File

@ -51,6 +51,7 @@ solvers
smoother symGaussSeidel;
tolerance 1e-7;
relTol 0;
minIter 1;
}
"h.*"
@ -59,6 +60,7 @@ solvers
smoother symGaussSeidel;
tolerance 1e-7;
relTol 0;
minIter 1;
}
"(k|epsilon|Theta).*"
@ -67,6 +69,7 @@ solvers
smoother symGaussSeidel;
tolerance 1e-7;
relTol 0;
minIter 1;
}
}
@ -79,9 +82,6 @@ PIMPLE
relaxationFactors
{
fields
{
}
equations
{
".*" 1;

View File

@ -51,6 +51,7 @@ solvers
smoother symGaussSeidel;
tolerance 1e-7;
relTol 0;
minIter 1;
}
"h.*"
@ -59,6 +60,7 @@ solvers
smoother symGaussSeidel;
tolerance 1e-7;
relTol 0;
minIter 1;
}
"(k|epsilon|Theta).*"
@ -67,6 +69,7 @@ solvers
smoother symGaussSeidel;
tolerance 1e-7;
relTol 0;
minIter 1;
}
}
@ -79,9 +82,6 @@ PIMPLE
relaxationFactors
{
fields
{
}
equations
{
".*" 1;

View File

@ -23,10 +23,11 @@ solvers
nAlphaSubCycles 2;
implicitPhasePressure yes;
solver PCG;
preconditioner DIC;
solver smoothSolver;
smoother symGaussSeidel;
tolerance 1e-9;
relTol 0;
minIter 1;
}
p
@ -57,6 +58,7 @@ solvers
smoother symGaussSeidel;
tolerance 1e-05;
relTol 0;
minIter 1;
}
"(h|e).*"
@ -65,6 +67,7 @@ solvers
smoother symGaussSeidel;
tolerance 1e-6;
relTol 0;
minIter 1;
}
"Theta.*"
@ -73,6 +76,7 @@ solvers
smoother symGaussSeidel;
tolerance 1e-6;
relTol 0;
minIter 1;
}
"(k|epsilon).*"
@ -81,6 +85,7 @@ solvers
smoother symGaussSeidel;
tolerance 1e-05;
relTol 0;
minIter 1;
}
}
@ -93,9 +98,6 @@ PIMPLE
relaxationFactors
{
fields
{
}
equations
{
".*" 1;

View File

@ -51,6 +51,7 @@ solvers
smoother symGaussSeidel;
tolerance 1e-05;
relTol 0;
minIter 1;
}
"h.*"
@ -59,6 +60,7 @@ solvers
smoother symGaussSeidel;
tolerance 1e-8;
relTol 0;
minIter 1;
}
}
@ -71,9 +73,6 @@ PIMPLE
relaxationFactors
{
fields
{
}
equations
{
".*" 1;

View File

@ -19,11 +19,32 @@ phases (air water);
air
{
diameterModel isothermal;
isothermalCoeffs
diameterModel IATE;
IATECoeffs
{
d0 3e-3;
p0 1e5;
dMax 1e-2;
dMin 1e-4;
residualAlpha 1e-6;
sources
(
wakeEntrainmentCoalescence
{
Cwe 0.002;
}
randomCoalescence
{
Crc 0.04;
C 3;
alphaMax 0.75;
}
turbulentBreakUp
{
Cti 0.085;
WeCr 6;
}
);
}
}

View File

@ -51,6 +51,7 @@ solvers
smoother symGaussSeidel;
tolerance 1e-05;
relTol 0;
minIter 1;
}
"h.*"
@ -59,6 +60,7 @@ solvers
smoother symGaussSeidel;
tolerance 1e-8;
relTol 0;
minIter 1;
}
}
@ -71,9 +73,6 @@ PIMPLE
relaxationFactors
{
fields
{
}
equations
{
".*" 1;

View File

@ -23,10 +23,11 @@ solvers
nAlphaSubCycles 2;
implicitPhasePressure yes;
solver PCG;
preconditioner DIC;
solver smoothSolver;
smoother symGaussSeidel;
tolerance 1e-9;
relTol 0;
minIter 1;
}
p
@ -57,6 +58,7 @@ solvers
smoother symGaussSeidel;
tolerance 1e-05;
relTol 0;
minIter 1;
}
"(h|e).*"
@ -65,6 +67,7 @@ solvers
smoother symGaussSeidel;
tolerance 1e-6;
relTol 0;
minIter 1;
}
"Theta.*"
@ -73,6 +76,7 @@ solvers
smoother symGaussSeidel;
tolerance 1e-6;
relTol 0;
minIter 1;
}
"(k|epsilon).*"
@ -81,6 +85,7 @@ solvers
smoother symGaussSeidel;
tolerance 1e-05;
relTol 0;
minIter 1;
}
}
@ -93,9 +98,6 @@ PIMPLE
relaxationFactors
{
fields
{
}
equations
{
".*" 1;

View File

@ -45,10 +45,11 @@ solvers
"U.*"
{
solver smoothSolver;
smoother GaussSeidel;
smoother symGaussSeidel;
nSweeps 2;
tolerance 1e-07;
relTol 0.1;
minIter 1;
}
"(k|epsilon|Theta|h).*"
@ -57,6 +58,7 @@ solvers
smoother symGaussSeidel;
tolerance 1e-06;
relTol 0;
minIter 1;
}
}
@ -72,9 +74,6 @@ PIMPLE
relaxationFactors
{
fields
{
}
equations
{
".*" 1;