Merge branch 'master' of ssh://dm/home/dm4/OpenFOAM/repositories/OpenFOAM-dev

This commit is contained in:
Henry
2014-02-03 18:05:02 +00:00
36 changed files with 88 additions and 168 deletions

View File

@ -75,7 +75,6 @@ drag
{
type SchillerNaumann;
residualAlpha 1e-6;
residualSlip 1e-3;
residualRe 1e-3;
swarmCorrection
{
@ -87,7 +86,6 @@ drag
{
type SchillerNaumann;
residualAlpha 1e-6;
residualSlip 1e-3;
residualRe 1e-3;
swarmCorrection
{
@ -99,8 +97,6 @@ drag
{
type segregated;
residualAlpha 1e-6;
residualSlip 1e-3;
residualRe 1e-3;
m 0.5;
n 8;
swarmCorrection
@ -130,13 +126,11 @@ heatTransfer
(air in water)
{
type RanzMarshall;
residualRe 1e-3;
}
(water in air)
{
type RanzMarshall;
residualRe 1e-3;
}
);

View File

@ -75,7 +75,6 @@ drag
{
type SchillerNaumann;
residualAlpha 1e-6;
residualSlip 1e-3;
residualRe 1e-3;
swarmCorrection
{
@ -87,7 +86,6 @@ drag
{
type SchillerNaumann;
residualAlpha 1e-6;
residualSlip 1e-3;
residualRe 1e-3;
swarmCorrection
{
@ -99,8 +97,6 @@ drag
{
type segregated;
residualAlpha 1e-6;
residualSlip 1e-3;
residualRe 1e-3;
m 0.5;
n 8;
swarmCorrection
@ -130,13 +126,11 @@ heatTransfer
(air in water)
{
type RanzMarshall;
residualRe 1e-3;
}
(water in air)
{
type RanzMarshall;
residualRe 1e-3;
}
);

View File

@ -40,7 +40,7 @@ blending
default
{
type none;
residualAlpha 1e-6;
residualAlpha 1e-3;
continuousPhase air;
}
}
@ -60,7 +60,6 @@ drag
{
type GidaspowErgunWenYu;
residualAlpha 1e-6;
residualSlip 1e-3;
residualRe 1e-3;
swarmCorrection
{
@ -74,7 +73,7 @@ virtualMass
(particles in air)
{
type constantCoefficient;
Cvm 0.5;
Cvm 0;
}
);
@ -83,7 +82,6 @@ heatTransfer
(particles in air)
{
type RanzMarshall;
residualRe 1e-3;
}
);

View File

@ -75,7 +75,6 @@ drag
{
type SchillerNaumann;
residualAlpha 1e-6;
residualSlip 1e-3;
residualRe 1e-3;
swarmCorrection
{
@ -87,7 +86,6 @@ drag
{
type SchillerNaumann;
residualAlpha 1e-6;
residualSlip 1e-3;
residualRe 1e-3;
swarmCorrection
{
@ -99,8 +97,6 @@ drag
{
type segregated;
residualAlpha 1e-6;
residualSlip 1e-3;
residualRe 1e-3;
m 0.5;
n 8;
swarmCorrection
@ -130,13 +126,11 @@ heatTransfer
(air in water)
{
type RanzMarshall;
residualRe 1e-3;
}
(water in air)
{
type RanzMarshall;
residualRe 1e-3;
}
);

View File

@ -75,7 +75,6 @@ drag
{
type SchillerNaumann;
residualAlpha 1e-6;
residualSlip 1e-3;
residualRe 1e-3;
swarmCorrection
{
@ -87,7 +86,6 @@ drag
{
type SchillerNaumann;
residualAlpha 1e-6;
residualSlip 1e-3;
residualRe 1e-3;
swarmCorrection
{
@ -99,8 +97,6 @@ drag
{
type segregated;
residualAlpha 1e-6;
residualSlip 1e-3;
residualRe 1e-3;
m 0.5;
n 8;
swarmCorrection
@ -130,13 +126,11 @@ heatTransfer
(air in water)
{
type RanzMarshall;
residualRe 1e-3;
}
(water in air)
{
type RanzMarshall;
residualRe 1e-3;
}
);

View File

@ -40,7 +40,7 @@ blending
default
{
type none;
residualAlpha 1e-6;
residualAlpha 1e-3;
continuousPhase air;
}
}
@ -60,7 +60,6 @@ drag
{
type GidaspowErgunWenYu;
residualAlpha 1e-6;
residualSlip 1e-3;
residualRe 1e-3;
swarmCorrection
{
@ -83,7 +82,6 @@ heatTransfer
(particles in air)
{
type RanzMarshall;
residualRe 1e-3;
}
);

View File

@ -75,7 +75,6 @@ drag
{
type SchillerNaumann;
residualAlpha 1e-6;
residualSlip 1e-3;
residualRe 1e-3;
swarmCorrection
{
@ -87,7 +86,6 @@ drag
{
type SchillerNaumann;
residualAlpha 1e-6;
residualSlip 1e-3;
residualRe 1e-3;
swarmCorrection
{
@ -99,8 +97,6 @@ drag
{
type segregated;
residualAlpha 1e-6;
residualSlip 1e-3;
residualRe 1e-3;
m 0.5;
n 8;
swarmCorrection
@ -130,13 +126,11 @@ heatTransfer
(air in water)
{
type RanzMarshall;
residualRe 1e-3;
}
(water in air)
{
type RanzMarshall;
residualRe 1e-3;
}
);