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

This commit is contained in:
mattijs
2012-03-01 12:52:06 +00:00
255 changed files with 1981 additions and 1950 deletions

View File

@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@ -52,7 +52,7 @@ solvers
solver GAMG;
tolerance 0;
relTol 0.1;
smoother GaussSeidel;
smoother DICGaussSeidel;
nPreSweeps 0;
nPostSweeps 2;
cacheAgglomeration true;

View File

@ -10,7 +10,7 @@ FoamFile
version 2.0;
format ascii;
class volVectorField;
object Ua;
object U1;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

View File

@ -10,7 +10,7 @@ FoamFile
version 2.0;
format ascii;
class volVectorField;
object Ub;
object U2;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

View File

@ -10,7 +10,7 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
object alpha;
object alpha1;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

View File

@ -10,7 +10,7 @@ FoamFile
version 2.0;
format ascii;
class volVectorField;
object Ua;
object U1;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

View File

@ -10,7 +10,7 @@ FoamFile
version 2.0;
format ascii;
class volVectorField;
object Ub;
object U2;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

View File

@ -10,7 +10,7 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
object alpha;
object alpha1;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

View File

@ -15,17 +15,17 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
rhoa rhoa [ 1 -3 0 0 0 0 0 ] 1;
rho1 rho1 [ 1 -3 0 0 0 0 0 ] 1;
rhob rhob [ 1 -3 0 0 0 0 0 ] 1000;
rho2 rho2 [ 1 -3 0 0 0 0 0 ] 1000;
nua nua [ 0 2 -1 0 0 0 0 ] 1.6e-05;
nu1 nu1 [ 0 2 -1 0 0 0 0 ] 1.6e-05;
nub nub [ 0 2 -1 0 0 0 0 ] 1e-06;
nu2 nu2 [ 0 2 -1 0 0 0 0 ] 1e-06;
da da [ 0 1 0 0 0 0 0 ] 0.003;
d1 d1 [ 0 1 0 0 0 0 0 ] 0.003;
db db [ 0 1 0 0 0 0 0 ] 0.0001;
d2 d2 [ 0 1 0 0 0 0 0 ] 0.0001;
Cvm Cvm [ 0 0 0 0 0 0 0 ] 0.5;

View File

@ -28,20 +28,20 @@ gradSchemes
divSchemes
{
default none;
div(phia,Ua) Gauss limitedLinearV 1;
div(phib,Ub) Gauss limitedLinearV 1;
div(phib,k) Gauss limitedLinear 1;
div(phib,epsilon) Gauss limitedLinear 1;
div(phi,alpha) Gauss limitedLinear01 1;
div((-nuEffa*T(grad(Ua)))) Gauss linear;
div((-nuEffb*T(grad(Ub)))) Gauss linear;
div(phi1,U1) Gauss limitedLinearV 1;
div(phi2,U2) Gauss limitedLinearV 1;
div(phi2,k) Gauss limitedLinear 1;
div(phi2,epsilon) Gauss limitedLinear 1;
div(phi,alpha1) Gauss limitedLinear01 1;
div((-nuEff1*T(grad(U1)))) Gauss linear;
div((-nuEff2*T(grad(U2)))) Gauss linear;
}
laplacianSchemes
{
default none;
laplacian(nuEffa,Ua) Gauss linear corrected;
laplacian(nuEffb,Ub) Gauss linear corrected;
laplacian(nuEff1,U1) Gauss linear corrected;
laplacian(nuEff2,U2) Gauss linear corrected;
laplacian((rho*(1|A(U))),p) Gauss linear corrected;
}

View File

@ -32,7 +32,7 @@ solvers
relTol 0;
}
alpha
alpha1
{
solver PBiCG;
preconditioner DILU;
@ -40,9 +40,9 @@ solvers
relTol 0.1;
}
alphaFinal
alpha1Final
{
$alpha;
$alpha1;
tolerance 1e-10;
relTol 0;
}

View File

@ -21,25 +21,25 @@ FoamFile
{
type patch;
nFaces 51;
startFace 15151;
startFace 57362;
}
outlet
{
type patch;
nFaces 51;
startFace 15202;
startFace 57413;
}
walls
{
type wall;
nFaces 436;
startFace 15253;
nFaces 836;
startFace 57464;
}
frontBack
{
type empty;
nFaces 15420;
startFace 15689;
nFaces 57540;
startFace 58300;
}
)

View File

@ -21,25 +21,25 @@ FoamFile
{
type patch;
nFaces 510;
startFace 220900;
startFace 4413730;
}
outlet
{
type patch;
nFaces 510;
startFace 221410;
startFace 4414240;
}
walls
{
type wall;
nFaces 4360;
startFace 221920;
nFaces 37840;
startFace 4414750;
}
frontBack
{
type wall;
nFaces 15420;
startFace 226280;
nFaces 57540;
startFace 4452590;
}
)

View File

@ -21,25 +21,25 @@ FoamFile
{
type patch;
nFaces 51;
startFace 15151;
startFace 57362;
}
outlet
{
type patch;
nFaces 51;
startFace 15202;
startFace 57413;
}
walls
{
type wall;
nFaces 436;
startFace 15253;
nFaces 836;
startFace 57464;
}
frontBack
{
type empty;
nFaces 15420;
startFace 15689;
nFaces 57540;
startFace 58300;
}
)

View File

@ -21,19 +21,19 @@ FoamFile
{
type wall;
nFaces 11200;
startFace 281600;
startFace 277808;
}
atmosphere
{
type patch;
nFaces 1600;
startFace 292800;
startFace 289008;
}
floatingObject
{
type wall;
nFaces 0;
startFace 294400;
nFaces 672;
startFace 290608;
}
)

View File

@ -15,25 +15,31 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
3
4
(
inlet
{
type patch;
nFaces 225;
startFace 32025;
startFace 1129981;
}
outlet
{
type patch;
nFaces 225;
startFace 32250;
startFace 1130206;
}
walls
{
type symmetryPlane;
nFaces 3000;
startFace 32475;
startFace 1130431;
}
bullet
{
type wall;
nFaces 37743;
startFace 1133431;
}
)

View File

@ -10,7 +10,7 @@ FoamFile
version 2.0;
format ascii;
class volVectorField;
object Ua;
object U1;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -29,7 +29,7 @@ boundaryField
top
{
type pressureInletOutletVelocity;
phi phia;
phi phi1;
value $internalField;
}

View File

@ -10,7 +10,7 @@ FoamFile
version 2.0;
format ascii;
class volVectorField;
object Ub;
object U2;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -29,7 +29,7 @@ boundaryField
top
{
type pressureInletOutletVelocity;
phi phib;
phi phi2;
value $internalField;
}

View File

@ -10,7 +10,7 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
object alpha;
object alpha1;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

View File

@ -15,11 +15,11 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dragModela GidaspowSchillerNaumann;
dragModel1 GidaspowSchillerNaumann;
dragModelb GidaspowSchillerNaumann;
dragModel2 GidaspowSchillerNaumann;
dragPhase a;
dragPhase "1";
residualSlip 0;

View File

@ -21,9 +21,9 @@ equilibrium on;
e e [ 0 0 0 0 0 0 0 ] 0.9;
alphaMax alphaMax [ 0 0 0 0 0 0 0 ] 0.6;
alpha1Max alpha1Max [ 0 0 0 0 0 0 0 ] 0.6;
alphaMinFriction alphaMinFriction [ 0 0 0 0 0 0 0 ] 0.5;
alpha1MinFriction alpha1MinFriction [ 0 0 0 0 0 0 0 ] 0.5;
Fr Fr [ 1 -1 -2 0 0 0 0 ] 0.05;

View File

@ -19,7 +19,7 @@ preAlphaExp 500;
expMax 1000;
alphaMax 0.6;
alpha1Max 0.6;
g0 g0 [ 1 -1 -2 0 0 0 0 ] 1000;

View File

@ -15,14 +15,14 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
phasea
phase1
{
rho rho [ 1 -3 0 0 0 ] 2640;
nu nu [ 0 2 -1 0 0 ] 1e-06;
d d [ 0 1 0 0 0 0 0 ] 0.00048;
}
phaseb
phase2
{
rho rho [ 1 -3 0 0 0 ] 1.28;
nu nu [ 0 2 -1 0 0 ] 1.328e-05;
@ -35,7 +35,7 @@ Cl Cl [ 0 0 0 0 0 ] 0;
Ct Ct [ 0 0 0 0 0 ] 0;
alphaAlpha alphaAlpha [ 0 0 0 0 0 ] 0;
alpha1Alpha alpha1Alpha [ 0 0 0 0 0 ] 0;
// ************************************************************************* //

View File

@ -60,21 +60,21 @@ functions
outputControl outputTime;
fields
(
Ua
U1
{
mean on;
prime2Mean off;
base time;
}
Ub
U2
{
mean on;
prime2Mean off;
base time;
}
alpha
alpha1
{
mean on;
prime2Mean off;

View File

@ -28,24 +28,24 @@ gradSchemes
divSchemes
{
default none;
div(phia,Ua) Gauss limitedLinearV 1;
div(phib,Ub) Gauss limitedLinearV 1;
div(phib,k) Gauss limitedLinear 1;
div(phib,epsilon) Gauss limitedLinear 1;
div(phi,alpha) Gauss limitedLinear01 1;
div(phir,alpha) Gauss limitedLinear01 1;
div(phi1,U1) Gauss limitedLinearV 1;
div(phi2,U2) Gauss limitedLinearV 1;
div(phi2,k) Gauss limitedLinear 1;
div(phi2,epsilon) Gauss limitedLinear 1;
div(phi,alpha1) Gauss limitedLinear01 1;
div(phir,alpha1) Gauss limitedLinear01 1;
div(phi,Theta) Gauss limitedLinear 1;
div(Rca) Gauss linear;
div(Rcb) Gauss linear;
div(Rc1) Gauss linear;
div(Rc2) Gauss linear;
}
laplacianSchemes
{
default none;
laplacian(nuEffa,Ua) Gauss linear corrected;
laplacian(nuEffb,Ub) Gauss linear corrected;
laplacian(nuEff1,U1) Gauss linear corrected;
laplacian(nuEff2,U2) Gauss linear corrected;
laplacian(Dp,p) Gauss linear corrected;
laplacian(alphaPpMag,alpha) Gauss linear corrected;
laplacian(alpha1PpMag,alpha1) Gauss linear corrected;
laplacian(DkEff,k) Gauss linear corrected;
laplacian(DepsilonEff,epsilon) Gauss linear corrected;
}

View File

@ -63,7 +63,7 @@ solvers
relTol 0.1;
}
alphaFinal
alpha1Final
{
solver PBiCG;
preconditioner DILU;

View File

@ -10,7 +10,7 @@ FoamFile
version 2.0;
format ascii;
class volVectorField;
object Ua;
object U1;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -28,7 +28,7 @@ boundaryField
outlet
{
type pressureInletOutletVelocity;
phi phia;
phi phi1;
value $internalField;
}
inlet

View File

@ -10,7 +10,7 @@ FoamFile
version 2.0;
format ascii;
class volVectorField;
object Ub;
object U2;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -28,7 +28,7 @@ boundaryField
outlet
{
type pressureInletOutletVelocity;
phi phib;
phi phi2;
value $internalField;
}
inlet

View File

@ -10,7 +10,7 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
object alpha;
object alpha1;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

View File

@ -15,11 +15,11 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dragModela GidaspowErgunWenYu;
dragModel1 GidaspowErgunWenYu;
dragModelb GidaspowErgunWenYu;
dragModel2 GidaspowErgunWenYu;
dragPhase a;
dragPhase "1";
residualSlip 0;

View File

@ -21,9 +21,9 @@ equilibrium on;
e e [ 0 0 0 0 0 0 0 ] 0.8;
alphaMax alphaMax [ 0 0 0 0 0 0 0 ] 0.62;
alpha1Max alpha1Max [ 0 0 0 0 0 0 0 ] 0.62;
alphaMinFriction alphaMinFriction [ 0 0 0 0 0 0 0 ] 0.65;
alpha1MinFriction alpha1MinFriction [ 0 0 0 0 0 0 0 ] 0.65;
Fr Fr [ 1 -1 -2 0 0 0 0 ] 0.05;

View File

@ -19,7 +19,7 @@ preAlphaExp 500;
expMax 1000;
alphaMax 0.62;
alpha1Max 0.62;
g0 g0 [ 1 -1 -2 0 0 0 0 ] 0;

View File

@ -15,14 +15,14 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
phasea
phase1
{
rho rho [ 1 -3 0 0 0 ] 2500;
nu nu [ 0 2 -1 0 0 ] 1e-06;
d d [ 0 1 0 0 0 0 0 ] 0.0003;
}
phaseb
phase2
{
rho rho [ 1 -3 0 0 0 ] 1.2;
nu nu [ 0 2 -1 0 0 ] 1.5e-05;
@ -35,7 +35,7 @@ Cl Cl [ 0 0 0 0 0 ] 0;
Ct Ct [ 0 0 0 0 0 ] 0;
alphaAlpha alphaAlpha [ 0 0 0 0 0 ] 0;
alpha1Alpha alpha1Alpha [ 0 0 0 0 0 ] 0;
// ************************************************************************* //

View File

@ -60,21 +60,21 @@ functions
outputControl outputTime;
fields
(
Ua
U1
{
mean on;
prime2Mean off;
base time;
}
Ub
U2
{
mean on;
prime2Mean off;
base time;
}
alpha
alpha1
{
mean on;
prime2Mean off;

View File

@ -28,25 +28,25 @@ gradSchemes
divSchemes
{
default none;
div(phia,Ua) Gauss limitedLinearV 1;
div(phib,Ub) Gauss limitedLinearV 1;
div(phib,k) Gauss limitedLinear 1;
div(phib,epsilon) Gauss limitedLinear 1;
div(phi,alpha) Gauss limitedLinear01 1;
div(phir,alpha) Gauss limitedLinear01 1;
div(phi1,U1) Gauss limitedLinearV 1;
div(phi2,U2) Gauss limitedLinearV 1;
div(phi2,k) Gauss limitedLinear 1;
div(phi2,epsilon) Gauss limitedLinear 1;
div(phi,alpha1) Gauss limitedLinear01 1;
div(phir,alpha1) Gauss limitedLinear01 1;
div(phi,Theta) Gauss limitedLinear 1;
div(Rca) Gauss linear;
div(Rcb) Gauss linear;
div(Rc1) Gauss linear;
div(Rc2) Gauss linear;
}
laplacianSchemes
{
default none;
laplacian(nuEffa,Ua) Gauss linear corrected;
laplacian(nuEffb,Ub) Gauss linear corrected;
laplacian(nuEff1,U1) Gauss linear corrected;
laplacian(nuEff2,U2) Gauss linear corrected;
laplacian(Dp,p) Gauss linear corrected;
laplacian(alphaPpMag,alpha) Gauss linear corrected;
laplacian(Galphaf,alpha) Gauss linear corrected;
laplacian(alpha1PpMag,alpha1) Gauss linear corrected;
laplacian(Galpha1f,alpha1) Gauss linear corrected;
laplacian(DkEff,k) Gauss linear corrected;
laplacian(DepsilonEff,epsilon) Gauss linear corrected;
laplacian(kappa,Theta) Gauss linear corrected;

View File

@ -63,7 +63,7 @@ solvers
relTol 0.1;
}
alphaFinal
alpha1Final
{
solver PBiCG;
preconditioner DILU;

View File

@ -15,9 +15,9 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
defaultFieldValues ( volScalarFieldValue alpha 0 );
defaultFieldValues ( volScalarFieldValue alpha1 0 );
regions ( boxToCell { box ( 0 0 -0.1 ) ( 0.15 0.5 0.1 ) ; fieldValues ( volScalarFieldValue alpha 0.55 ) ; } );
regions ( boxToCell { box ( 0 0 -0.1 ) ( 0.15 0.5 0.1 ) ; fieldValues ( volScalarFieldValue alpha1 0.55 ) ; } );
// ************************************************************************* //

View File

@ -10,7 +10,7 @@ FoamFile
version 2.0;
format ascii;
class volVectorField;
object Ua;
object U1;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -1908,7 +1908,7 @@ boundaryField
outlet
{
type pressureInletOutletVelocity;
phi phia;
phi phi1;
value nonuniform List<vector>
25
(

View File

@ -10,7 +10,7 @@ FoamFile
version 2.0;
format ascii;
class volVectorField;
object Ub;
object U2;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -1908,7 +1908,7 @@ boundaryField
outlet
{
type pressureInletOutletVelocity;
phi phib;
phi phi2;
value nonuniform List<vector>
25
(

View File

@ -10,7 +10,7 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
object alpha;
object alpha1;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

View File

@ -15,9 +15,9 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dragModela SchillerNaumann;
dragModel1 SchillerNaumann;
dragModelb SchillerNaumann;
dragModel2 SchillerNaumann;
dragPhase blended;

View File

@ -21,9 +21,9 @@ equilibrium on;
e e [ 0 0 0 0 0 0 0 ] 0.9;
alphaMax alphaMax [ 0 0 0 0 0 0 0 ] 0.6;
alpha1Max alpha1Max [ 0 0 0 0 0 0 0 ] 0.6;
alphaMinFriction alphaMinFriction [ 0 0 0 0 0 0 0 ] 0.5;
alpha1MinFriction alpha1MinFriction [ 0 0 0 0 0 0 0 ] 0.5;
Fr Fr [ 1 -1 -2 0 0 0 0 ] 0.05;

View File

@ -19,7 +19,7 @@ preAlphaExp 300;
expMax 10;
alphaMax 0.6;
alpha1Max 0.6;
g0 g0 [ 1 -1 -2 0 0 0 0 ] 0;

View File

@ -15,20 +15,20 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
phaseb
{
nu nu [ 0 2 -1 0 0 0 0 ] 1e-06;
rho rho [ 1 -3 0 0 0 0 0 ] 1000;
d d [ 0 1 0 0 0 0 0 ] 0.0001;
}
phasea
phase1
{
nu nu [ 0 2 -1 0 0 0 0 ] 1.6e-05;
rho rho [ 1 -3 0 0 0 0 0 ] 1;
d d [ 0 1 0 0 0 0 0 ] 0.003;
}
phase2
{
nu nu [ 0 2 -1 0 0 0 0 ] 1e-06;
rho rho [ 1 -3 0 0 0 0 0 ] 1000;
d d [ 0 1 0 0 0 0 0 ] 0.0001;
}
Cvm Cvm [ 0 0 0 0 0 0 0 ] 0.5;
Cl Cl [ 0 0 0 0 0 0 0 ] 0;

View File

@ -60,21 +60,21 @@ functions
outputControl outputTime;
fields
(
Ua
U1
{
mean on;
prime2Mean off;
base time;
}
Ub
U2
{
mean on;
prime2Mean off;
base time;
}
alpha
alpha1
{
mean on;
prime2Mean off;

View File

@ -28,26 +28,26 @@ gradSchemes
divSchemes
{
default none;
div(phia,Ua) Gauss limitedLinearV 1;
div(phib,Ub) Gauss limitedLinearV 1;
div(phib,k) Gauss limitedLinear 1;
div(phib,epsilon) Gauss limitedLinear 1;
div(phi,alpha) Gauss limitedLinear01 1;
div(phir,alpha) Gauss limitedLinear01 1;
div(phi1,U1) Gauss limitedLinearV 1;
div(phi2,U2) Gauss limitedLinearV 1;
div(phi2,k) Gauss limitedLinear 1;
div(phi2,epsilon) Gauss limitedLinear 1;
div(phi,alpha1) Gauss limitedLinear01 1;
div(phir,alpha1) Gauss limitedLinear01 1;
div(phi,Theta) Gauss limitedLinear 1;
div(Rca) Gauss linear;
div(Rcb) Gauss linear;
div(Rc1) Gauss linear;
div(Rc2) Gauss linear;
}
laplacianSchemes
{
default none;
laplacian(nuEffa,Ua) Gauss linear corrected;
laplacian(nuEffb,Ub) Gauss linear corrected;
laplacian(nuEff1,U1) Gauss linear corrected;
laplacian(nuEff2,U2) Gauss linear corrected;
laplacian(Dp,p) Gauss linear corrected;
laplacian(alphaPpMag,alpha) Gauss linear corrected;
laplacian((alphak*nuEffb),k) Gauss linear corrected;
laplacian((alphaEps*nuEffb),epsilon) Gauss linear corrected;
laplacian(alpha1PpMag,alpha1) Gauss linear corrected;
laplacian((alpha1k*nuEff2),k) Gauss linear corrected;
laplacian((alpha1Eps*nuEff2),epsilon) Gauss linear corrected;
}
interpolationSchemes

View File

@ -63,7 +63,7 @@ solvers
relTol 0.1;
}
alphaFinal
alpha1Final
{
solver PBiCG;
preconditioner DILU;
@ -86,7 +86,7 @@ relaxationFactors
{
"U.*" 1;
"T.*" 1;
"alpha.*" 1;
"alpha1.*" 1;
"Theta.*" 1;
"k.*" 1;
"epsilon.*" 1;