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

This commit is contained in:
andy
2012-03-02 18:19:24 +00:00
196 changed files with 981 additions and 427 deletions

View File

@ -21,7 +21,7 @@ equilibrium on;
e e [ 0 0 0 0 0 0 0 ] 0.9;
alphaMax alphaMax [ 0 0 0 0 0 0 0 ] 0.6;
alphaMax alphaMax [ 0 0 0 0 0 0 0 ] 0.6;
alphaMinFriction alphaMinFriction [ 0 0 0 0 0 0 0 ] 0.5;

View File

@ -21,9 +21,9 @@ equilibrium on;
e e [ 0 0 0 0 0 0 0 ] 0.9;
alpha1Max alpha1Max [ 0 0 0 0 0 0 0 ] 0.6;
alphaMax alphaMax [ 0 0 0 0 0 0 0 ] 0.6;
alpha1MinFriction alpha1MinFriction [ 0 0 0 0 0 0 0 ] 0.5;
alphaMinFriction alphaMinFriction [ 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;
alpha1Max 0.6;
alphaMax 0.6;
g0 g0 [ 1 -1 -2 0 0 0 0 ] 1000;

View File

@ -21,9 +21,9 @@ equilibrium on;
e e [ 0 0 0 0 0 0 0 ] 0.8;
alpha1Max alpha1Max [ 0 0 0 0 0 0 0 ] 0.62;
alphaMax alphaMax [ 0 0 0 0 0 0 0 ] 0.62;
alpha1MinFriction alpha1MinFriction [ 0 0 0 0 0 0 0 ] 0.65;
alphaMinFriction alphaMinFriction [ 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;
alpha1Max 0.62;
alphaMax 0.62;
g0 g0 [ 1 -1 -2 0 0 0 0 ] 0;

View File

@ -21,9 +21,9 @@ equilibrium on;
e e [ 0 0 0 0 0 0 0 ] 0.9;
alpha1Max alpha1Max [ 0 0 0 0 0 0 0 ] 0.6;
alphaMax alphaMax [ 0 0 0 0 0 0 0 ] 0.6;
alpha1MinFriction alpha1MinFriction [ 0 0 0 0 0 0 0 ] 0.5;
alphaMinFriction alphaMinFriction [ 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;
alpha1Max 0.6;
alphaMax 0.6;
g0 g0 [ 1 -1 -2 0 0 0 0 ] 0;

View File

@ -86,7 +86,7 @@ relaxationFactors
{
"U.*" 1;
"T.*" 1;
"alpha1.*" 1;
"alpha1.*" 1;
"Theta.*" 1;
"k.*" 1;
"epsilon.*" 1;