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

This commit is contained in:
andy
2013-01-09 17:21:01 +00:00
51 changed files with 590 additions and 446 deletions

View File

@ -10,7 +10,7 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
object T1;
object Tair;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -27,7 +27,7 @@ boundaryField
outlet
{
type inletOutlet;
phi phi1;
phi phiair;
inletValue $internalField;
value $internalField;
}

View File

@ -10,7 +10,7 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
object T2;
object Twater;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -27,7 +27,7 @@ boundaryField
outlet
{
type inletOutlet;
phi phi2;
phi phiwater;
inletValue uniform 300;
value $internalField;
}

View File

@ -10,7 +10,7 @@ FoamFile
version 2.0;
format binary;
class volVectorField;
object U1;
object Uair;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -28,7 +28,7 @@ boundaryField
outlet
{
type pressureInletOutletVelocity;
phi phi1;
phi phiair;
value $internalField;
}
walls

View File

@ -10,7 +10,7 @@ FoamFile
version 2.0;
format binary;
class volVectorField;
object U2;
object Uwater;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -28,7 +28,7 @@ boundaryField
outlet
{
type pressureInletOutletVelocity;
phi phi2;
phi phiwater;
value $internalField;
}
walls

View File

@ -1908,7 +1908,7 @@ boundaryField
outlet
{
type inletOutlet;
phi phi1;
phi phiair;
inletValue uniform 1;
value uniform 1;
}

View File

@ -10,7 +10,7 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
object alpha1;
object alphaair;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -28,7 +28,7 @@ boundaryField
outlet
{
type inletOutlet;
phi phi1;
phi phiair;
inletValue uniform 1;
value uniform 1;
}

View File

@ -15,13 +15,13 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dragModel1 SchillerNaumann;
dragModel2 SchillerNaumann;
dragModelair SchillerNaumann;
dragModelwater SchillerNaumann;
heatTransferModel1 RanzMarshall;
heatTransferModel2 RanzMarshall;
heatTransferModelair RanzMarshall;
heatTransferModelwater RanzMarshall;
dispersedPhase both;
dispersedPhase both;
residualPhaseFraction 1e-3;
residualSlip 1e-2;

View File

@ -38,6 +38,7 @@ FoamFile
defaultFaces
{
type empty;
inGroups 1(empty);
nFaces 3750;
startFace 3850;
}

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

@ -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 perfectFluid;
specie specie;
energy sensibleEnthalpy;
}
mixture
{
specie
{
nMoles 1;
molWeight 28.9;
}
equationOfState
{
rho0 1027;
}
thermodynamics
{
Cp 4195;
Hf 0;
}
transport
{
mu 3.645e-4;
Pr 2.289;
}
}
// ************************************************************************* //

View File

@ -15,16 +15,10 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
phase1
phases (air water);
air
{
rho 1;
rho0 0;
R 287;
Cp 1007;
nu 1.589e-05;
kappa 2.63e-2;
diameterModel isothermal;
isothermalCoeffs
{
@ -33,15 +27,9 @@ phase1
}
}
phase2
water
{
rho 1027;
rho0 1027;
R 1e10;
Cp 4195;
nu 3.55e-7;
kappa 0.668;
//R 1e10;
diameterModel constant;
constantCoeffs

View File

@ -60,21 +60,21 @@ functions
outputControl outputTime;
fields
(
U1
Uair
{
mean on;
prime2Mean off;
base time;
}
U2
Uwater
{
mean on;
prime2Mean off;
base time;
}
alpha1
alphaair
{
mean on;
prime2Mean off;

View File

@ -29,23 +29,23 @@ divSchemes
{
default none;
div(phi,alpha1) Gauss limitedLinear01 1;
div(phir,alpha1) Gauss limitedLinear01 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((alpha1*Rc1)) Gauss linear;
div((alpha2*Rc2)) Gauss linear;
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,alpha) Gauss limitedLinear01 1;
div(phir,alpha) Gauss limitedLinear01 1;
div(alphaPhi,Uair) Gauss limitedLinearV 1;
div(alphaPhi,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(alphaPhiwater,k) Gauss limitedLinear 1;
div(alphaPhiwater,epsilon) Gauss limitedLinear 1;
div(phi,Theta) Gauss limitedLinear 1;
div(phid1,p) Gauss upwind;
div(phid2,p) Gauss upwind;
div(phi1,K1) Gauss limitedLinear 1;
div(phi2,K2) 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;
}
laplacianSchemes
@ -67,7 +67,7 @@ fluxRequired
{
default no;
p ;
alpha1 ;
alphaair ;
}

View File

@ -47,10 +47,10 @@ solvers
relTol 0;
}
"T.*"
"h.*"
{
solver PBiCG;
preconditioner DILU;
solver PCG; //PBiCG;
preconditioner DIC; //DILU;
tolerance 1e-8;
relTol 0;
}
@ -105,7 +105,7 @@ relaxationFactors
equations
{
"U.*" 1;
"T.*" 1;
"h.*" 1;
"alpha.*" 1;
"Theta.*" 1;
"k.*" 1;

View File

@ -27,7 +27,7 @@ regions
box (0 0 -0.1) (0.15 0.701 0.1);
fieldValues
(
volScalarFieldValue alpha1 0
volScalarFieldValue alphaair 0
);
}
);