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

This commit is contained in:
andy
2013-03-26 12:30:28 +00:00
61 changed files with 1134 additions and 858 deletions

View File

@ -27,14 +27,17 @@ gradSchemes
divSchemes
{
div(rho*phi,U) Gauss upwind;
div(phi,alpha) Gauss vanLeer;
div(phirb,alpha) Gauss interfaceCompression 1;
div(phid1,p_rgh) Gauss upwind;
div(phid2,p_rgh) Gauss upwind;
div(rho*phi,U) Gauss upwind;
div(phi,thermo:rhowater) Gauss upwind;
div(phi,thermo:rhoair) Gauss upwind;
div(rho*phi,T) Gauss upwind;
div(rho*phi,K) Gauss upwind;
div(phi,k) Gauss vanLeer;
div(phi,p) Gauss upwind;
div(phi,k) Gauss upwind;
div((muEff*dev2(T(grad(U))))) Gauss linear;
}

View File

@ -103,9 +103,9 @@ solvers
PIMPLE
{
momentumPredictor no;
transSonic no;
nOuterCorrectors 3;
nCorrectors 1;
transonic no;
nOuterCorrectors 1;
nCorrectors 2;
nNonOrthogonalCorrectors 0;
nAlphaCorr 1;
nAlphaSubCycles 1;

View File

@ -1,59 +0,0 @@
/*--------------------------------*- 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 transportProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
phases (water air);
water
{
transportModel Newtonian;
nu 1e-06;
rho 1000;
k 0; // 0.613;
Cv 4179;
equationOfState
{
type perfectFluid;
rho0 1000;
R 3000;
}
}
air
{
transportModel Newtonian;
nu 1.589e-05;
rho 1;
k 0; // 2.63e-2;
Cv 721;
equationOfState
{
type perfectFluid;
rho0 0;
R 287;
}
}
pMin pMin [ 1 -1 -2 0 0 0 0 ] 10000;
sigma sigma [ 1 0 -2 0 0 0 0 ] 0.07;
// ************************************************************************* //

View File

@ -27,14 +27,17 @@ gradSchemes
divSchemes
{
div(rho*phi,U) Gauss upwind;
div(phi,alpha) Gauss vanLeer;
div(phirb,alpha) Gauss interfaceCompression 1;
div(phid1,p_rgh) Gauss upwind;
div(phid2,p_rgh) Gauss upwind;
div(rho*phi,U) Gauss upwind;
div(phi,thermo:rhowater) Gauss upwind;
div(phi,thermo:rhoair) Gauss upwind;
div(rho*phi,T) Gauss upwind;
div(rho*phi,K) Gauss upwind;
div(phi,k) Gauss vanLeer;
div(phi,p) Gauss upwind;
div(phi,k) Gauss upwind;
div((muEff*dev2(T(grad(U))))) Gauss linear;
}

View File

@ -103,9 +103,9 @@ solvers
PIMPLE
{
momentumPredictor no;
transSonic no;
nOuterCorrectors 3;
nCorrectors 1;
transonic no;
nOuterCorrectors 1;
nCorrectors 2;
nNonOrthogonalCorrectors 0;
nAlphaCorr 1;
nAlphaSubCycles 1;

View File

@ -29,6 +29,7 @@ boundaryField
outlet
{
type inletOutlet;
phi phiwater;
inletValue uniform 0.1;
value uniform 0.1;
}

View File

@ -29,6 +29,7 @@ boundaryField
outlet
{
type inletOutlet;
phi phiwater;
inletValue uniform 1e-8;
value uniform 1e-8;
}

View File

@ -35,7 +35,7 @@ divSchemes
"div\(alphaPhi.*,U.*\)" Gauss limitedLinearV 1;
"div\(phi.*,U.*\)" Gauss limitedLinearV 1;
"div\(\(alpha.*Rc\)\)" Gauss linear;
"div\(phid.*,p\)" Gauss upwind;
"div\(phi.*,.*rho.*\)" Gauss linear;
"div\(alphaPhi.*,h.*\)" Gauss limitedLinear 1;
"div\(alphaPhi.*,K.*\)" Gauss limitedLinear 1;

View File

@ -31,6 +31,7 @@ boundaryField
outlet
{
type inletOutlet;
phi phi2;
inletValue uniform 10.0;
value uniform 10.0;
}

View File

@ -31,6 +31,7 @@ boundaryField
outlet
{
type inletOutlet;
phi phi2;
inletValue uniform 1.0;
value uniform 1.0;
}

View File

@ -35,7 +35,7 @@ divSchemes
"div\(alphaPhi.,U.\)" Gauss limitedLinearV 1;
"div\(phi.,U.\)" Gauss limitedLinearV 1;
"div\(\(alpha.*Rc\)\)" Gauss linear;
"div\(phid.,p\)" Gauss upwind;
"div\(phi.*,.*rho.*\)" Gauss linear;
"div\(alphaPhi.,(h|e).\)" Gauss limitedLinear 1;
"div\(alphaPhi.,(K.|p)\)" Gauss limitedLinear 1;

View File

@ -35,7 +35,7 @@ divSchemes
"div\(alphaPhi.,U.\)" Gauss limitedLinearV 1;
"div\(phi.,U.\)" Gauss limitedLinearV 1;
"div\(\(alpha.*Rc\)\)" Gauss linear;
"div\(phid.,p\)" Gauss linear;
"div\(phi.*,.*rho.*\)" Gauss linear;
"div\(alphaPhi.,h.\)" Gauss limitedLinear 1;
"div\(alphaPhi.,K.\)" Gauss limitedLinear 1;

View File

@ -30,6 +30,7 @@ boundaryField
top
{
type inletOutlet;
phi phi1;
inletValue uniform 1.0e-8;
}

View File

@ -29,6 +29,7 @@ boundaryField
top
{
type inletOutlet;
phi phi2;
inletValue uniform 10.0;
value uniform 10.0;
}

View File

@ -29,6 +29,7 @@ boundaryField
top
{
type inletOutlet;
phi phi2;
inletValue uniform 1.0;
value uniform 1.0;
}

View File

@ -27,6 +27,7 @@ boundaryField
outlet
{
type inletOutlet;
phi phi2;
inletValue uniform 10.0;
value uniform 10.0;
}

View File

@ -27,6 +27,7 @@ boundaryField
outlet
{
type inletOutlet;
phi phi2;
inletValue uniform 1.0;
value uniform 1.0;
}

View File

@ -29,6 +29,7 @@ boundaryField
outlet
{
type inletOutlet;
phi phi1;
inletValue uniform 1.0e-7;
value uniform 1.0e-7;
}

View File

@ -29,6 +29,7 @@ boundaryField
outlet
{
type inletOutlet;
phi phi2;
inletValue uniform 0.1;
value uniform 0.1;
}

View File

@ -29,6 +29,7 @@ boundaryField
outlet
{
type inletOutlet;
phi phi2;
inletValue uniform 1e-8;
value uniform 1e-8;
}