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

This commit is contained in:
Sergio Ferraris
2014-01-06 09:39:37 +00:00
111 changed files with 1583 additions and 834 deletions

View File

@ -86,7 +86,7 @@ castellatedMeshControls
features
(
{
file "flange.eMesh";
file "flange.extendedFeatureEdgeMesh";
level 0;
}
);
@ -301,12 +301,13 @@ meshQualityControls
// Advanced
// Flags for optional output
// 0 : only write final meshes
// 1 : write intermediate meshes
// 2 : write volScalarField with cellLevel for postprocessing
// 4 : write current intersections as .obj files
debug 0;
// Write flags
writeFlags
(
scalarLevels // write volScalarField with cellLevel for postprocessing
layerSets // write cellSets, faceSets of faces in layer
layerFields // write volScalarField for layer coverage
);
// Merge tolerance. Is fraction of overall bounding box of initial mesh.

View File

@ -17,14 +17,14 @@ FoamFile
solvers
{
alpha.water
"alpha.water.*"
{
nAlphaCorr 1;
nAlphaSubCycles 3;
cAlpha 1;
}
pcorr
"pcorr.*"
{
solver PCG;
preconditioner

View File

@ -17,7 +17,7 @@ FoamFile
solvers
{
alpha.water
"alpha.water.*"
{
nAlphaCorr 1;
nAlphaSubCycles 2;
@ -38,7 +38,7 @@ solvers
mergeLevels 1;
}
pcorr
"pcorr.*"
{
$p_rgh;
tolerance 0.1;

View File

@ -54,5 +54,6 @@ runTimeModifiable true;
adjustTimeStep yes;
maxCo 2;
maxAlphaCo 2;
// ************************************************************************* //

View File

@ -16,7 +16,7 @@ FoamFile
solvers
{
alpha.water
"alpha.water.*"
{
cAlpha 0;
nAlphaCorr 2;
@ -32,7 +32,7 @@ solvers
maxIter 10;
};
pcorr
"pcorr.*"
{
solver GAMG;
tolerance 1e-2;

View File

@ -51,6 +51,26 @@ heatTransfer
water RanzMarshall;
}
lift
{
air
{
type constantCoefficient;
constantCoefficientCoeffs
{
Cl 0;
}
}
water
{
type constantCoefficient;
constantCoefficientCoeffs
{
Cl 0;
}
}
}
dispersedPhase both;
residualPhaseFraction 1e-3;
@ -59,9 +79,6 @@ residualSlip 1e-2;
// Virtual-mass coefficient
Cvm 0.5;
// Lift coefficient
Cl 0;
// Dispersed-phase turbulence coefficient
Ct 1;

View File

@ -51,6 +51,26 @@ heatTransfer
water RanzMarshall;
}
lift
{
air
{
type constantCoefficient;
constantCoefficientCoeffs
{
Cl 0;
}
}
water
{
type constantCoefficient;
constantCoefficientCoeffs
{
Cl 0;
}
}
}
dispersedPhase both;
residualPhaseFraction 1e-3;
@ -59,9 +79,6 @@ residualSlip 1e-2;
// Virtual-mass coefficient
Cvm 0.5;
// Lift coefficient
Cl 0;
// Dispersed-phase turbulence coefficient
Ct 1;

View File

@ -50,6 +50,26 @@ heatTransfer
air RanzMarshall;
}
lift
{
particles
{
type constantCoefficient;
constantCoefficientCoeffs
{
Cl 0;
}
}
air
{
type constantCoefficient;
constantCoefficientCoeffs
{
Cl 0;
}
}
}
dispersedPhase particles;
residualPhaseFraction 1e-3;
@ -58,9 +78,6 @@ residualSlip 1e-2;
// Virtual-mass coefficient
Cvm 0;
// Lift coefficient
Cl 0;
// Minimum allowable pressure
pMin 10000;

View File

@ -51,6 +51,26 @@ heatTransfer
water RanzMarshall;
}
lift
{
air
{
type constantCoefficient;
constantCoefficientCoeffs
{
Cl 0;
}
}
water
{
type constantCoefficient;
constantCoefficientCoeffs
{
Cl 0;
}
}
}
dispersedPhase both;
residualPhaseFraction 1e-3;
@ -59,9 +79,6 @@ residualSlip 1e-2;
// Virtual-mass ceofficient
Cvm 0.5;
// Lift coefficient
Cl 0;
// Minimum allowable pressure
pMin 10000;

View File

@ -71,6 +71,26 @@ heatTransfer
water RanzMarshall;
}
lift
{
air
{
type constantCoefficient;
constantCoefficientCoeffs
{
Cl 0;
}
}
water
{
type constantCoefficient;
constantCoefficientCoeffs
{
Cl 0;
}
}
}
dispersedPhase both;
residualPhaseFraction 1e-3;
@ -79,9 +99,6 @@ residualSlip 1e-2;
// Virtual-mass ceofficient
Cvm 0.5;
// Lift coefficient
Cl 0;
// Minimum allowable pressure
pMin 10000;

View File

@ -50,6 +50,26 @@ heatTransfer
air RanzMarshall;
}
lift
{
particles
{
type constantCoefficient;
constantCoefficientCoeffs
{
Cl 0;
}
}
air
{
type constantCoefficient;
constantCoefficientCoeffs
{
Cl 0;
}
}
}
dispersedPhase particles;
residualPhaseFraction 1e-3;
@ -58,9 +78,6 @@ residualSlip 1e-2;
// Virtual-mass ceofficient
Cvm 0;
// Lift coefficient
Cl 0;
// Minimum allowable pressure
pMin 10000;

View File

@ -51,6 +51,26 @@ heatTransfer
water RanzMarshall;
}
lift
{
air
{
type constantCoefficient;
constantCoefficientCoeffs
{
Cl 0;
}
}
water
{
type constantCoefficient;
constantCoefficientCoeffs
{
Cl 0;
}
}
}
dispersedPhase both;
residualPhaseFraction 1e-3;
@ -59,9 +79,6 @@ residualSlip 1e-2;
// Virtual-mass coefficient
Cvm 0.5;
// Lift coefficient
Cl 0;
// Minimum allowable pressure
pMin 10000;