Merge branch 'master' of github.com:OpenFOAM/OpenFOAM-2.3.x

This commit is contained in:
andy 2014-05-21 19:38:12 +01:00
commit d2a3ba5d56
2 changed files with 30 additions and 31 deletions

View file

@ -65,7 +65,6 @@ int main(int argc, char *argv[])
pimpleControl pimple(mesh); pimpleControl pimple(mesh);
#include "createPrghCorrTypes.H" #include "createPrghCorrTypes.H"
#include "../interFoam/correctPhi.H"
#include "CourantNo.H" #include "CourantNo.H"
#include "setInitialDeltaT.H" #include "setInitialDeltaT.H"

View file

@ -29,78 +29,78 @@ solvers
smoother symGaussSeidel; smoother symGaussSeidel;
tolerance 1e-8; tolerance 1e-8;
relTol 0; relTol 0;
maxIter 10;
}; };
"U.*" "U.*"
{ {
solver smoothSolver; solver smoothSolver;
smoother symGaussSeidel; smoother symGaussSeidel;
tolerance 1e-6; tolerance 1e-6;
relTol 0; relTol 0;
}; };
p_rgh p_rgh
{ {
solver GAMG; solver GAMG;
tolerance 1e-8; tolerance 1e-8;
relTol 0.1; relTol 0.1;
smoother DICGaussSeidel; smoother DICGaussSeidel;
nPreSweeps 0; nPreSweeps 0;
nPostSweeps 2; nPostSweeps 2;
cacheAgglomeration true; cacheAgglomeration true;
nCellsInCoarsestLevel 10; nCellsInCoarsestLevel 10;
agglomerator faceAreaPair; agglomerator faceAreaPair;
mergeLevels 1; mergeLevels 1;
maxIter 50; maxIter 50;
}; };
pcorr pcorr
{ {
$p_rgh; $p_rgh;
relTol 0; relTol 0;
}; };
p_rghFinal p_rghFinal
{ {
solver PCG; solver PCG;
preconditioner preconditioner
{ {
preconditioner GAMG; preconditioner GAMG;
tolerance 1e-6; tolerance 1e-6;
relTol 0; relTol 0;
nVcycles 2; nVcycles 2;
smoother DICGaussSeidel; smoother DICGaussSeidel;
nPreSweeps 0; nPreSweeps 0;
nPostSweeps 2; nPostSweeps 2;
nFinestSweeps 2; nFinestSweeps 2;
cacheAgglomeration true; cacheAgglomeration true;
nCellsInCoarsestLevel 10; nCellsInCoarsestLevel 10;
agglomerator faceAreaPair; agglomerator faceAreaPair;
mergeLevels 1; mergeLevels 1;
}; };
tolerance 1e-7; tolerance 1e-7;
relTol 0; relTol 0;
maxIter 50; maxIter 50;
}; };
} }
PIMPLE PIMPLE
{ {
momentumPredictor no; momentumPredictor no;
nOuterCorrectors 1; nOuterCorrectors 1;
nCorrectors 3; nCorrectors 3;
nNonOrthogonalCorrectors 0; nNonOrthogonalCorrectors 0;
} }
relaxationFactors relaxationFactors
{ {
fields fields