Merge branch 'master' into particleInteractions

This commit is contained in:
graham
2010-04-29 15:24:56 +01:00
9 changed files with 7 additions and 71 deletions

View File

@ -1,2 +0,0 @@
The 0/ field files contain nonsense patchFields. All interesting
work is done using the changeDictionaryDicts.

View File

@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\ /*--------------------------------*- C++ -*----------------------------------*\
| ========= | | | ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev | | \\ / O peration | Version: 1.6.x |
| \\ / A nd | Web: www.OpenFOAM.org | | \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | | | \\/ M anipulation | |
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/

View File

@ -15,8 +15,6 @@ FoamFile
} }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
libs ("libOpenFOAM.so" "libcompressibleTurbulenceModel.so" "libcompressibleRASModels.so");
application chtMultiRegionSimpleFoam; application chtMultiRegionSimpleFoam;
startFrom startTime; startFrom startTime;

View File

@ -14,9 +14,4 @@ FoamFile
} }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
PIMPLE
{
nOuterCorrectors 1;
}
// ************************************************************************* // // ************************************************************************* //

View File

@ -16,7 +16,7 @@ FoamFile
ddtSchemes ddtSchemes
{ {
default Euler; default steadyState;
} }
gradSchemes gradSchemes

View File

@ -20,25 +20,14 @@ solvers
{ {
solver PCG; solver PCG;
preconditioner DIC; preconditioner DIC;
tolerance 1E-06; tolerance 1e-06;
relTol 0; relTol 0.1;
} }
} }
PISO
{
nNonOrthogonalCorrectors 1;
}
PIMPLE
{
nNonOrthogonalCorrectors 1;
}
SIMPLE SIMPLE
{ {
nNonOrthogonalCorrectors 0; nNonOrthogonalCorrectors 0;
//convergence 0.001;
} }
relaxationFactors relaxationFactors

View File

@ -140,10 +140,7 @@ dictionaryReplacement
maxX maxX
{ {
type waveTransmissive; type fixedValue;
gamma 1.4;
fieldInf 100000;
lInf 0.4;
value uniform 100000; value uniform 100000;
} }
} }

View File

@ -16,14 +16,12 @@ FoamFile
ddtSchemes ddtSchemes
{ {
default Euler; default steadyState;
//default CoEuler phi rho 0.1;
} }
gradSchemes gradSchemes
{ {
default Gauss linear; default Gauss linear;
// grad(U) cellLimited Gauss linear 1;
} }
divSchemes divSchemes

View File

@ -38,50 +38,13 @@ solvers
mergeLevels 1; mergeLevels 1;
} }
pFinal "(U|h|k|epsilon)"
{
$p;
tolerance 1e-8;
relTol 0;
}
U
{ {
solver PBiCG; solver PBiCG;
preconditioner DILU; preconditioner DILU;
tolerance 1e-08; tolerance 1e-08;
relTol 0;
}
h
{
$U;
tolerance 1e-08;
relTol 0.1; relTol 0.1;
} }
"(hFinal|k|epsilon|R)"
{
$U;
}
}
PISO
{
momentumPredictor off;
nOuterCorrectors 1;
nCorrectors 2;
nNonOrthogonalCorrectors 1;
pRefPoint (-0.081 -0.0257 8.01);
pRefValue 1e5;
}
PIMPLE
{
momentumPredictor on;
nCorrectors 2;
nNonOrthogonalCorrectors 0;
} }
SIMPLE SIMPLE
@ -89,8 +52,6 @@ SIMPLE
nNonOrthogonalCorrectors 0; nNonOrthogonalCorrectors 0;
pRefCell 0; pRefCell 0;
pRefValue 100000; pRefValue 100000;
//convergence 0.001;
} }
relaxationFactors relaxationFactors