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

This commit is contained in:
andy
2013-01-18 08:25:18 +00:00
42 changed files with 310 additions and 179 deletions

View File

@ -29,8 +29,6 @@ air
water
{
//R 1e10;
diameterModel constant;
constantCoeffs
{

View File

@ -29,23 +29,23 @@ divSchemes
{
default none;
div(phi,alpha) Gauss limitedLinear01 1;
div(phir,alpha) Gauss limitedLinear01 1;
div(alphaPhi,Uair) Gauss limitedLinearV 1;
div(alphaPhi,Uwater) Gauss limitedLinearV 1;
div(phi,alpha) Gauss limitedLinear01 1;
div(phir,alpha) Gauss limitedLinear01 1;
div(alphaPhiair,Uair) Gauss limitedLinearV 1;
div(alphaPhiwater,Uwater) Gauss limitedLinearV 1;
div(phiair,Uair) Gauss limitedLinearV 1;
div(phiwater,Uwater) Gauss limitedLinearV 1;
div((alphaair*Rc)) Gauss linear;
div((alphawater*Rc)) Gauss linear;
div(alphaPhi,hair) Gauss limitedLinear 1;
div(alphaPhi,hwater) Gauss limitedLinear 1;
div(phiwater,Uwater) Gauss limitedLinearV 1;
div((alphaair*Rc)) Gauss linear;
div((alphawater*Rc)) Gauss linear;
div(alphaPhiair,hair) Gauss limitedLinear 1;
div(alphaPhiwater,hwater) Gauss limitedLinear 1;
div(alphaPhiwater,k) Gauss limitedLinear 1;
div(alphaPhiwater,epsilon) Gauss limitedLinear 1;
div(phi,Theta) Gauss limitedLinear 1;
div(phidair,p) Gauss upwind;
div(alphaPhiwater,epsilon) Gauss limitedLinear 1;
div(phi,Theta) Gauss limitedLinear 1;
div(phidair,p) Gauss upwind;
div(phidwater,p) Gauss upwind;
div(phiair,Kair) Gauss limitedLinear 1;
div(phiwater,Kwater) Gauss limitedLinear 1;
div(phiwater,Kwater) Gauss limitedLinear 1;
}
laplacianSchemes
@ -67,7 +67,6 @@ fluxRequired
{
default no;
p ;
alphaair ;
}

View File

@ -49,8 +49,8 @@ solvers
"h.*"
{
solver PCG; //PBiCG;
preconditioner DIC; //DILU;
solver PBiCG;
preconditioner DILU;
tolerance 1e-8;
relTol 0;
}
@ -93,8 +93,8 @@ PIMPLE
nOuterCorrectors 1;
nCorrectors 2;
nNonOrthogonalCorrectors 0;
nAlphaCorr 2;
correctAlpha no;
nAlphaCorr 1;
nAlphaSubCycles 2;
}
relaxationFactors

View File

@ -22,18 +22,20 @@ boundaryField
{
inlet
{
type zeroGradient;
type fixedFluxPressure;
value $internalField;
}
outlet
{
type fixedValue;
value uniform 1e5;
value $internalField;
}
walls
{
type zeroGradient;
type fixedFluxPressure;
value $internalField;
}
frontAndBackPlanes

View File

@ -38,6 +38,7 @@ FoamFile
frontAndBackPlanes
{
type empty;
inGroups 1(empty);
nFaces 12000;
startFace 12230;
}

View File

@ -0,0 +1,53 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class dictionary;
location "constant";
object thermophysicalProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType
{
type heRhoThermo;
mixture pureMixture;
transport const;
thermo hConst;
equationOfState rhoConst;
specie specie;
energy sensibleEnthalpy;
}
mixture
{
specie
{
nMoles 1;
molWeight 100;
}
equationOfState
{
rho 2500;
}
thermodynamics
{
Cp 6000;
Hf 0;
}
transport
{
mu 2.5e-03;
Pr 24.47;
}
}
// ************************************************************************* //

View File

@ -0,0 +1,49 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class dictionary;
location "constant";
object thermophysicalProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType
{
type heRhoThermo;
mixture pureMixture;
transport const;
thermo hConst;
equationOfState perfectGas;
specie specie;
energy sensibleEnthalpy;
}
mixture
{
specie
{
nMoles 1;
molWeight 28.9;
}
thermodynamics
{
Cp 1007;
Hf 0;
}
transport
{
mu 1.84e-05;
Pr 0.7;
}
}
// ************************************************************************* //

View File

@ -17,14 +17,6 @@ FoamFile
phase1
{
rho 2500;
rho0 2500;
R 1e10;
Cp 6000;
nu 1e-06;
kappa 0.613;
diameterModel constant;
constantCoeffs
{
@ -34,14 +26,6 @@ phase1
phase2
{
rho 1.2;
rho0 0;
R 287;
Cp 721;
nu 1.5e-05;
kappa 2.63e-2;
diameterModel constant;
constantCoeffs
{

View File

@ -29,23 +29,23 @@ divSchemes
{
default none;
div(alphaPhi1,U1) Gauss limitedLinearV 1;
div(alphaPhi2,U2) Gauss limitedLinearV 1;
div(phi1,U1) Gauss limitedLinearV 1;
div(phi2,U2) Gauss limitedLinearV 1;
div(alphaPhi1,T1) Gauss limitedLinear 1;
div(alphaPhi2,T2) Gauss limitedLinear 1;
div(alphaPhi2,k) Gauss limitedLinear 1;
div(alphaPhi2,epsilon) Gauss limitedLinear 1;
div(phi,alpha1) Gauss limitedLinear01 1;
div(phir,alpha1) Gauss limitedLinear01 1;
div(phi,Theta) Gauss limitedLinear 1;
div((alpha1*Rc1)) Gauss linear;
div((alpha2*Rc2)) Gauss linear;
div(phid1,p) Gauss upwind;
div(phid2,p) Gauss upwind;
div(phi1,K1) Gauss limitedLinear 1;
div(phi2,K2) Gauss limitedLinear 1;
div(alphaPhi1,U1) Gauss limitedLinearV 1;
div(alphaPhi2,U2) Gauss limitedLinearV 1;
div(phi1,U1) Gauss limitedLinearV 1;
div(phi2,U2) Gauss limitedLinearV 1;
div(alphaPhi1,h1) Gauss limitedLinear 1;
div(alphaPhi2,h2) Gauss limitedLinear 1;
div(alphaPhi2,k) Gauss limitedLinear 1;
div(alphaPhi2,epsilon) Gauss limitedLinear 1;
div(phi,alpha) Gauss limitedLinear01 1;
div(phir,alpha) Gauss limitedLinear01 1;
div(phi,Theta) Gauss limitedLinear 1;
div((alpha1*Rc)) Gauss linear;
div((alpha2*Rc)) Gauss linear;
div(phid1,p) Gauss upwind;
div(phid2,p) Gauss upwind;
div(phi1,K1) Gauss limitedLinear 1;
div(phi2,K2) Gauss limitedLinear 1;
}
laplacianSchemes

View File

@ -47,7 +47,7 @@ solvers
relTol 0;
}
"T.*"
"h.*"
{
solver PBiCG;
preconditioner DILU;
@ -93,8 +93,8 @@ PIMPLE
nOuterCorrectors 1;
nCorrectors 2;
nNonOrthogonalCorrectors 0;
nAlphaCorr 2;
correctAlpha yes;
nAlphaCorr 1;
nAlphaSubCycles 2;
}
relaxationFactors
@ -105,7 +105,7 @@ relaxationFactors
equations
{
"U.*" 1;
"T.*" 1;
"h.*" 1;
"alpha.*" 1;
"Theta.*" 1;
"k.*" 1;