Merge branch 'master' of /home/noisy3/OpenFOAM/OpenFOAM-dev

This commit is contained in:
mattijs
2010-06-11 17:00:31 +01:00
50 changed files with 200 additions and 116 deletions

View File

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

View File

@ -32,8 +32,6 @@ divSchemes
div(phi,T) Gauss upwind;
div(phi,k) Gauss upwind;
div(phi,epsilon) Gauss upwind;
div(phi,R) Gauss upwind;
div(R) Gauss linear;
div((nuEff*dev(grad(U).T()))) Gauss linear;
}
@ -41,7 +39,7 @@ laplacianSchemes
{
default none;
laplacian(nuEff,U) Gauss linear corrected;
laplacian((1|A(U)),p) Gauss linear corrected;
laplacian((1|A(U)),p_rgh) Gauss linear corrected;
laplacian(kappaEff,T) Gauss linear corrected;
laplacian(DkEff,k) Gauss linear corrected;
laplacian(DepsilonEff,epsilon) Gauss linear corrected;
@ -61,7 +59,7 @@ snGradSchemes
fluxRequired
{
default no;
p ;
p_rgh ;
}

View File

@ -17,7 +17,7 @@ FoamFile
solvers
{
p
p_rgh
{
solver PCG;
preconditioner DIC;
@ -37,14 +37,15 @@ solvers
SIMPLE
{
nNonOrthogonalCorrectors 0;
pRefCell 0;
p_rghRefCell 0;
p_rghRefValue 0;
pRefValue 0;
}
relaxationFactors
{
rho 1;
p 0.7;
p_rgh 0.7;
U 0.2;
T 0.7;
"(k|epsilon|R)" 0.7;

View File

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

View File

@ -23,7 +23,7 @@ startTime 0;
stopAt endTime;
endTime 1000;
endTime 2000;
deltaT 1;

View File

@ -40,12 +40,12 @@ divSchemes
laplacianSchemes
{
default none;
laplacian(nuEff,U) Gauss linear corrected;
laplacian((1|A(U)),p) Gauss linear corrected;
laplacian(kappaEff,T) Gauss linear corrected;
laplacian(DkEff,k) Gauss linear corrected;
laplacian(DepsilonEff,epsilon) Gauss linear corrected;
laplacian(DREff,R) Gauss linear corrected;
laplacian(nuEff,U) Gauss linear limited 0.333;
laplacian((1|A(U)),p_rgh) Gauss linear limited 0.333;
laplacian(kappaEff,T) Gauss linear limited 0.333;
laplacian(DkEff,k) Gauss linear limited 0.333;
laplacian(DepsilonEff,epsilon) Gauss linear limited 0.333;
laplacian(DREff,R) Gauss linear limited 0.333;
}
interpolationSchemes
@ -55,13 +55,13 @@ interpolationSchemes
snGradSchemes
{
default corrected;
default limited 0.333;
}
fluxRequired
{
default no;
p ;
p_rgh ;
}

View File

@ -17,7 +17,7 @@ FoamFile
solvers
{
p
p_rgh
{
solver PCG;
preconditioner DIC;
@ -25,7 +25,7 @@ solvers
relTol 0.01;
}
"(U|T|k|epsilon|R)"
"(U|T|k|epsilon)"
{
solver PBiCG;
preconditioner DILU;
@ -37,17 +37,17 @@ solvers
SIMPLE
{
nNonOrthogonalCorrectors 0;
pRefCell 0;
p_rghRefCell 0;
p_rghRefValue 0;
pRefValue 0;
}
relaxationFactors
{
rho 1;
p 0.3;
U 0.7;
p_rgh 0.8;
U 0.2;
T 0.7;
"(k|epsilon|R)" 0.7;
"(k|epsilon)" 0.7;
}

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@ -39,7 +39,7 @@ laplacianSchemes
{
default none;
laplacian(muEff,U) Gauss linear uncorrected;
laplacian((rho*(1|A(U))),p) Gauss linear uncorrected;
laplacian((rho*(1|A(U))),p_rgh) Gauss linear uncorrected;
laplacian(alphaEff,h) Gauss linear uncorrected;
laplacian(DkEff,k) Gauss linear uncorrected;
laplacian(DepsilonEff,epsilon) Gauss linear uncorrected;
@ -59,7 +59,7 @@ snGradSchemes
fluxRequired
{
default no;
p;
p_rgh;
}

View File

@ -17,11 +17,11 @@ FoamFile
solvers
{
p
p_rgh
{
solver GAMG;
tolerance 1e-7;
relTol 0.1;
relTol 0.01;
smoother DICGaussSeidel;
@ -42,16 +42,18 @@ solvers
SIMPLE
{
momentumPredictor yes;
nNonOrthogonalCorrectors 0;
pRefCell 0;
p_rghRefCell 0;
p_rghRefValue 100000;
pRefValue 100000;
convergence 1e-04;
}
relaxationFactors
{
p 0.3;
U 0.7;
p_rgh 0.9;
U 0.3;
h 0.7;
"(k|epsilon|omega)" 0.7;
}

View File

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

View File

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

View File

@ -28,10 +28,10 @@ interpolationSchemes
divSchemes
{
default none;
div(phiv,rho) Gauss limitedLinear 0.2;
div(phi,U) Gauss limitedLinearV 0.2;
div(phiv,omega) Gauss limitedLinear 0.2;
div(phiv,k) Gauss limitedLinear 0.2;
div(phiv,rho) Gauss limitedLinear 1;
div(phi,U) Gauss limitedLinearV 1;
div(phiv,omega) Gauss limitedLinear 1;
div(phiv,k) Gauss limitedLinear 1;
}
gradSchemes

View File

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

View File

@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@ -16,7 +16,7 @@ FoamFile
dimensions [0 0 0 0 0 0 0];
internalField nonuniform List<scalar>
internalField nonuniform List<scalar>
2268
(
0
@ -2294,19 +2294,19 @@ boundaryField
{
leftWall
{
type alphaContactAngle;
type multiphaseAlphaContactAngle;
thetaProperties ( ( water air ) 90 0 0 0 ( oil air ) 90 0 0 0 ( mercury air ) 90 0 0 0 ( water oil ) 90 0 0 0 ( water mercury ) 90 0 0 0 ( oil mercury ) 90 0 0 0 );
value uniform 0;
}
rightWall
{
type alphaContactAngle;
type multiphaseAlphaContactAngle;
thetaProperties ( ( water air ) 90 0 0 0 ( oil air ) 90 0 0 0 ( mercury air ) 90 0 0 0 ( water oil ) 90 0 0 0 ( water mercury ) 90 0 0 0 ( oil mercury ) 90 0 0 0 );
value uniform 0;
}
lowerWall
{
type alphaContactAngle;
type multiphaseAlphaContactAngle;
thetaProperties ( ( water air ) 90 0 0 0 ( oil air ) 90 0 0 0 ( mercury air ) 90 0 0 0 ( water oil ) 90 0 0 0 ( water mercury ) 90 0 0 0 ( oil mercury ) 90 0 0 0 );
value uniform 0;
}

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -15,11 +15,48 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
phases ( water { transportModel Newtonian ; nu nu [ 0 2 -1 0 0 0 0 ] 1e-06 ; rho rho [ 1 -3 0 0 0 0 0 ] 1000 ; } oil { transportModel Newtonian ; nu nu [ 0 2 -1 0 0 0 0 ] 1e-06 ; rho rho [ 1 -3 0 0 0 0 0 ] 500 ; } mercury { transportModel Newtonian ; nu nu [ 0 2 -1 0 0 0 0 ] 1.125e-07 ; rho rho [ 1 -3 0 0 0 0 0 ] 13529 ; } air { transportModel Newtonian ; nu nu [ 0 2 -1 0 0 0 0 ] 1.48e-05 ; rho rho [ 1 -3 0 0 0 0 0 ] 1 ; } );
phases
(
water
{
transportModel Newtonian;
nu nu [ 0 2 -1 0 0 0 0 ] 1e-06;
rho rho [ 1 -3 0 0 0 0 0 ] 1000;
}
oil
{
transportModel Newtonian;
nu nu [ 0 2 -1 0 0 0 0 ] 1e-06;
rho rho [ 1 -3 0 0 0 0 0 ] 500;
}
mercury
{
transportModel Newtonian;
nu nu [ 0 2 -1 0 0 0 0 ] 1.125e-07;
rho rho [ 1 -3 0 0 0 0 0 ] 13529;
}
air
{
transportModel Newtonian;
nu nu [ 0 2 -1 0 0 0 0 ] 1.48e-05;
rho rho [ 1 -3 0 0 0 0 0 ] 1;
}
);
refPhase air;
sigmas ( ( air water ) 0.07 ( air oil ) 0.07 ( air mercury ) 0.07 ( water oil ) 0.07 ( water mercury ) 0.07 ( oil mercury ) 0.07 );
sigmas
(
(air water) 0.07
(air oil) 0.07
(air mercury) 0.07
(water oil) 0.07
(water mercury) 0.07
(oil mercury) 0.07
);
// ************************************************************************* //

View File

@ -30,7 +30,7 @@ gradSchemes
divSchemes
{
div(rho*phi,U) Gauss upwind;
div(phi,alpha) Gauss limitedLimitedLinear 1 -1e-05 1.00001;
div(phi,alpha) Gauss vanLeer;
div(phic,alpha) Gauss interfaceCompression;
}

View File

@ -94,7 +94,7 @@ PISO
nAlphaCorr 4;
nAlphaSubCycles 4;
cycleAlpha yes;
cAlpha 4;
cAlpha 2;
}

View File

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

View File

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

View File

@ -15,11 +15,48 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
phases ( water { transportModel Newtonian ; nu nu [ 0 2 -1 0 0 0 0 ] 1e-06 ; rho rho [ 1 -3 0 0 0 0 0 ] 1000 ; } oil { transportModel Newtonian ; nu nu [ 0 2 -1 0 0 0 0 ] 1e-06 ; rho rho [ 1 -3 0 0 0 0 0 ] 500 ; } mercury { transportModel Newtonian ; nu nu [ 0 2 -1 0 0 0 0 ] 1.125e-07 ; rho rho [ 1 -3 0 0 0 0 0 ] 13529 ; } air { transportModel Newtonian ; nu nu [ 0 2 -1 0 0 0 0 ] 1.48e-05 ; rho rho [ 1 -3 0 0 0 0 0 ] 1 ; } );
phases
(
water
{
transportModel Newtonian;
nu nu [ 0 2 -1 0 0 0 0 ] 1e-06;
rho rho [ 1 -3 0 0 0 0 0 ] 1000;
}
oil
{
transportModel Newtonian;
nu nu [ 0 2 -1 0 0 0 0 ] 1e-06;
rho rho [ 1 -3 0 0 0 0 0 ] 500;
}
mercury
{
transportModel Newtonian;
nu nu [ 0 2 -1 0 0 0 0 ] 1.125e-07;
rho rho [ 1 -3 0 0 0 0 0 ] 13529;
}
air
{
transportModel Newtonian;
nu nu [ 0 2 -1 0 0 0 0 ] 1.48e-05;
rho rho [ 1 -3 0 0 0 0 0 ] 1;
}
);
refPhase air;
sigmas ( ( air water ) 0.07 ( air oil ) 0.07 ( air mercury ) 0.07 ( water oil ) 0.07 ( water mercury ) 0.07 ( oil mercury ) 0.07 );
sigmas
(
(air water) 0.07
(air oil) 0.07
(air mercury) 0.07
(water oil) 0.07
(water mercury) 0.07
(oil mercury) 0.07
);
// ************************************************************************* //

View File

@ -30,7 +30,7 @@ gradSchemes
divSchemes
{
div(rho*phi,U) Gauss upwind;
div(phi,alpha) Gauss limitedLimitedLinear 1 -1e-05 1.00001;
div(phi,alpha) Gauss vanLeer;
div(phic,alpha) Gauss interfaceCompression;
}

View File

@ -81,7 +81,7 @@ solvers
{
solver smoothSolver;
smoother GaussSeidel;
tolerance 1e-08;
tolerance 1e-9;
relTol 0;
nSweeps 1;
}
@ -94,7 +94,7 @@ PISO
nAlphaCorr 4;
nAlphaSubCycles 4;
cycleAlpha yes;
cAlpha 4;
cAlpha 2;
}