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

This commit is contained in:
mattijs
2014-01-24 12:59:43 +00:00
149 changed files with 9279 additions and 1350 deletions

View File

@ -36,47 +36,124 @@ water
}
}
// Surface tension coefficient
sigma 0.07;
blending
{
default
{
type linear;
residualAlpha 1e-6;
maxFullyDispersedAlpha.air 0.3;
maxPartlyDispersedAlpha.air 0.5;
maxFullyDispersedAlpha.water 0.3;
maxPartlyDispersedAlpha.water 0.5;
}
}
sigma
(
(air and water) 0.07
);
aspectRatio
(
(air in water)
{
type constant;
E0 1.0;
}
(water in air)
{
type constant;
E0 1.0;
}
);
drag
{
air SchillerNaumann;
water SchillerNaumann;
}
(
(air in water)
{
type SchillerNaumann;
residualAlpha 1e-6;
residualSlip 1e-3;
residualRe 1e-3;
swarmCorrection
{
type none;
}
}
(water in air)
{
type SchillerNaumann;
residualAlpha 1e-6;
residualSlip 1e-3;
residualRe 1e-3;
swarmCorrection
{
type none;
}
}
(air and water)
{
type segregated;
residualAlpha 1e-6;
residualSlip 1e-3;
residualRe 1e-3;
m 0.5;
n 8;
swarmCorrection
{
type none;
}
}
);
virtualMass
(
(air in water)
{
type constantCoefficient;
Cvm 0.5;
}
(water in air)
{
type constantCoefficient;
Cvm 0.5;
}
);
heatTransfer
{
air RanzMarshall;
water RanzMarshall;
}
(
(air in water)
{
type RanzMarshall;
residualRe 1e-3;
}
(water in air)
{
type RanzMarshall;
residualRe 1e-3;
}
);
lift
{
air
{
type none;
}
water
{
type none;
}
}
(
);
dispersedPhase both;
wallLubrication
(
);
residualPhaseFraction 1e-3;
residualSlip 1e-2;
// Virtual-mass coefficient
Cvm 0.5;
// Dispersed-phase turbulence coefficient
Ct 1;
turbulentDispersion
(
);
// Minimum allowable pressure
pMin 10000;
// ************************************************************************* //

View File

@ -36,47 +36,124 @@ water
}
}
// Surface tension coefficient
sigma 0.07;
blending
{
default
{
type linear;
residualAlpha 1e-6;
maxFullyDispersedAlpha.air 0.3;
maxPartlyDispersedAlpha.air 0.5;
maxFullyDispersedAlpha.water 0.3;
maxPartlyDispersedAlpha.water 0.5;
}
}
sigma
(
(air and water) 0.07
);
aspectRatio
(
(air in water)
{
type constant;
E0 1.0;
}
(water in air)
{
type constant;
E0 1.0;
}
);
drag
{
air SchillerNaumann;
water SchillerNaumann;
}
(
(air in water)
{
type SchillerNaumann;
residualAlpha 1e-6;
residualSlip 1e-3;
residualRe 1e-3;
swarmCorrection
{
type none;
}
}
(water in air)
{
type SchillerNaumann;
residualAlpha 1e-6;
residualSlip 1e-3;
residualRe 1e-3;
swarmCorrection
{
type none;
}
}
(air and water)
{
type segregated;
residualAlpha 1e-6;
residualSlip 1e-3;
residualRe 1e-3;
m 0.5;
n 8;
swarmCorrection
{
type none;
}
}
);
virtualMass
(
(air in water)
{
type constantCoefficient;
Cvm 0.5;
}
(water in air)
{
type constantCoefficient;
Cvm 0.5;
}
);
heatTransfer
{
air RanzMarshall;
water RanzMarshall;
}
(
(air in water)
{
type RanzMarshall;
residualRe 1e-3;
}
(water in air)
{
type RanzMarshall;
residualRe 1e-3;
}
);
lift
{
air
{
type none;
}
water
{
type none;
}
}
(
);
dispersedPhase both;
wallLubrication
(
);
residualPhaseFraction 1e-3;
residualSlip 1e-2;
// Virtual-mass coefficient
Cvm 0.5;
// Dispersed-phase turbulence coefficient
Ct 1;
turbulentDispersion
(
);
// Minimum allowable pressure
pMin 10000;
// ************************************************************************* //

View File

@ -35,40 +35,69 @@ air
}
}
// Surface tension coefficient
sigma 0;
blending
{
default
{
type none;
residualAlpha 1e-6;
continuousPhase air;
}
}
sigma
(
(particles and air) 0
);
aspectRatio
(
);
drag
{
particles GidaspowErgunWenYu;
air GidaspowErgunWenYu;
}
(
(particles in air)
{
type GidaspowErgunWenYu;
residualAlpha 1e-6;
residualSlip 1e-3;
residualRe 1e-3;
swarmCorrection
{
type none;
}
}
);
virtualMass
(
(particles in air)
{
type constantCoefficient;
Cvm 0.5;
}
);
heatTransfer
{
particles RanzMarshall;
air RanzMarshall;
}
(
(particles in air)
{
type RanzMarshall;
residualRe 1e-3;
}
);
lift
{
particles
{
type none;
}
air
{
type none;
}
}
(
);
dispersedPhase particles;
wallLubrication
(
);
residualPhaseFraction 1e-3;
residualSlip 1e-2;
// Virtual-mass coefficient
Cvm 0;
turbulentDispersion
(
);
// Minimum allowable pressure
pMin 10000;

View File

@ -31,6 +31,7 @@ RAS
e 0.8;
alphaMax 0.62;
alphaMinFriction 0.5;
residualAlpha 1e-6;
viscosityModel Gidaspow;
conductivityModel Gidaspow;

View File

@ -36,44 +36,124 @@ water
}
}
// Surface tension coefficient
sigma 0.07;
blending
{
default
{
type linear;
residualAlpha 1e-6;
maxFullyDispersedAlpha.air 0.3;
maxPartlyDispersedAlpha.air 0.5;
maxFullyDispersedAlpha.water 0.3;
maxPartlyDispersedAlpha.water 0.5;
}
}
sigma
(
(air and water) 0.07
);
aspectRatio
(
(air in water)
{
type constant;
E0 1.0;
}
(water in air)
{
type constant;
E0 1.0;
}
);
drag
{
air SchillerNaumann;
water SchillerNaumann;
}
(
(air in water)
{
type SchillerNaumann;
residualAlpha 1e-6;
residualSlip 1e-3;
residualRe 1e-3;
swarmCorrection
{
type none;
}
}
(water in air)
{
type SchillerNaumann;
residualAlpha 1e-6;
residualSlip 1e-3;
residualRe 1e-3;
swarmCorrection
{
type none;
}
}
(air and water)
{
type segregated;
residualAlpha 1e-6;
residualSlip 1e-3;
residualRe 1e-3;
m 0.5;
n 8;
swarmCorrection
{
type none;
}
}
);
virtualMass
(
(air in water)
{
type constantCoefficient;
Cvm 0.5;
}
(water in air)
{
type constantCoefficient;
Cvm 0.5;
}
);
heatTransfer
{
air RanzMarshall;
water RanzMarshall;
}
(
(air in water)
{
type RanzMarshall;
residualRe 1e-3;
}
(water in air)
{
type RanzMarshall;
residualRe 1e-3;
}
);
lift
{
air
{
type none;
}
water
{
type none;
}
}
(
);
dispersedPhase both;
wallLubrication
(
);
residualPhaseFraction 1e-3;
residualSlip 1e-2;
// Virtual-mass ceofficient
Cvm 0.5;
turbulentDispersion
(
);
// Minimum allowable pressure
pMin 10000;
// ************************************************************************* //

View File

@ -19,31 +19,11 @@ phases (air water);
air
{
diameterModel IATE;
IATECoeffs
diameterModel isothermal;
isothermalCoeffs
{
dMax 1e-2;
dMin 1e-4;
sources
(
wakeEntrainmentCoalescence
{
Cwe 0.002;
}
randomCoalescence
{
Crc 0.04;
C 3;
alphaMax 0.75;
}
turbulentBreakUp
{
Cti 0.085;
WeCr 6;
}
);
d0 3e-3;
p0 1e5;
}
}
@ -56,44 +36,124 @@ water
}
}
// Surface tension coefficient
sigma 0.07;
blending
{
default
{
type linear;
residualAlpha 1e-6;
maxFullyDispersedAlpha.air 0.3;
maxPartlyDispersedAlpha.air 0.5;
maxFullyDispersedAlpha.water 0.3;
maxPartlyDispersedAlpha.water 0.5;
}
}
sigma
(
(air and water) 0.07
);
aspectRatio
(
(air in water)
{
type constant;
E0 1.0;
}
(water in air)
{
type constant;
E0 1.0;
}
);
drag
{
air SchillerNaumann;
water SchillerNaumann;
}
(
(air in water)
{
type SchillerNaumann;
residualAlpha 1e-6;
residualSlip 1e-3;
residualRe 1e-3;
swarmCorrection
{
type none;
}
}
(water in air)
{
type SchillerNaumann;
residualAlpha 1e-6;
residualSlip 1e-3;
residualRe 1e-3;
swarmCorrection
{
type none;
}
}
(air and water)
{
type segregated;
residualAlpha 1e-6;
residualSlip 1e-3;
residualRe 1e-3;
m 0.5;
n 8;
swarmCorrection
{
type none;
}
}
);
virtualMass
(
(air in water)
{
type constantCoefficient;
Cvm 0.5;
}
(water in air)
{
type constantCoefficient;
Cvm 0.5;
}
);
heatTransfer
{
air RanzMarshall;
water RanzMarshall;
}
(
(air in water)
{
type RanzMarshall;
residualRe 1e-3;
}
(water in air)
{
type RanzMarshall;
residualRe 1e-3;
}
);
lift
{
air
{
type none;
}
water
{
type none;
}
}
(
);
dispersedPhase both;
wallLubrication
(
);
residualPhaseFraction 1e-3;
residualSlip 1e-2;
// Virtual-mass ceofficient
Cvm 0.5;
turbulentDispersion
(
);
// Minimum allowable pressure
pMin 10000;
// ************************************************************************* //

View File

@ -35,40 +35,69 @@ air
}
}
// Surface tension coefficient
sigma 0;
blending
{
default
{
type none;
residualAlpha 1e-6;
continuousPhase air;
}
}
sigma
(
(particles and air) 0
);
aspectRatio
(
);
drag
{
particles GidaspowErgunWenYu;
air GidaspowErgunWenYu;
}
(
(particles in air)
{
type GidaspowErgunWenYu;
residualAlpha 1e-6;
residualSlip 1e-3;
residualRe 1e-3;
swarmCorrection
{
type none;
}
}
);
virtualMass
(
(particles in air)
{
type constantCoefficient;
Cvm 0.5;
}
);
heatTransfer
{
particles RanzMarshall;
air RanzMarshall;
}
(
(particles in air)
{
type RanzMarshall;
residualRe 1e-3;
}
);
lift
{
particles
{
type none;
}
air
{
type none;
}
}
(
);
dispersedPhase particles;
wallLubrication
(
);
residualPhaseFraction 1e-3;
residualSlip 1e-2;
// Virtual-mass ceofficient
Cvm 0;
turbulentDispersion
(
);
// Minimum allowable pressure
pMin 10000;

View File

@ -36,40 +36,121 @@ water
}
}
// Surface tension coefficient
sigma 0.07;
blending
{
default
{
type linear;
residualAlpha 1e-6;
maxFullyDispersedAlpha.air 0.3;
maxPartlyDispersedAlpha.air 0.5;
maxFullyDispersedAlpha.water 0.3;
maxPartlyDispersedAlpha.water 0.5;
}
}
sigma
(
(air and water) 0.07
);
aspectRatio
(
(air in water)
{
type constant;
E0 1.0;
}
(water in air)
{
type constant;
E0 1.0;
}
);
drag
{
air SchillerNaumann;
water SchillerNaumann;
}
(
(air in water)
{
type SchillerNaumann;
residualAlpha 1e-6;
residualSlip 1e-3;
residualRe 1e-3;
swarmCorrection
{
type none;
}
}
(water in air)
{
type SchillerNaumann;
residualAlpha 1e-6;
residualSlip 1e-3;
residualRe 1e-3;
swarmCorrection
{
type none;
}
}
(air and water)
{
type segregated;
residualAlpha 1e-6;
residualSlip 1e-3;
residualRe 1e-3;
m 0.5;
n 8;
swarmCorrection
{
type none;
}
}
);
virtualMass
(
(air in water)
{
type constantCoefficient;
Cvm 0.5;
}
(water in air)
{
type constantCoefficient;
Cvm 0.5;
}
);
heatTransfer
{
air RanzMarshall;
water RanzMarshall;
}
(
(air in water)
{
type RanzMarshall;
residualRe 1e-3;
}
(water in air)
{
type RanzMarshall;
residualRe 1e-3;
}
);
lift
{
air
{
type none;
}
water
{
type none;
}
}
(
);
dispersedPhase both;
wallLubrication
(
);
residualPhaseFraction 1e-3;
residualSlip 1e-2;
// Virtual-mass coefficient
Cvm 0.5;
turbulentDispersion
(
);
// Minimum allowable pressure
pMin 10000;