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

This commit is contained in:
mattijs 2014-01-23 17:14:57 +00:00
commit 00a02757f5
8 changed files with 21 additions and 41 deletions

View File

@ -28,7 +28,7 @@ gradSchemes
divSchemes
{
default none;
div(phi,U) Gauss filteredLinear2V 0.2 0.05;
div(phi,U) Gauss LUST grad(U);
div(phi,k) Gauss limitedLinear 1;
div(phi,K) Gauss limitedLinear 1;
div(phi,Yi_h) Gauss multivariateSelection

View File

@ -30,7 +30,7 @@ boundaryField
outlet
{
type inletOutlet;
type pressureInletOutletVelocity;
inletValue uniform (0 0 0);
value uniform (0 0 0);
}

View File

@ -28,14 +28,12 @@ boundaryField
outlet
{
type waveTransmissive;
field p;
phi phi;
rho rho;
psi thermo:psi;
gamma 1.3;
fieldInf 1e5;
lInf 0.3;
value uniform 1e5;
value $internalField;
}
upperWall

View File

@ -15,34 +15,15 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
gasThermoTypes
{
constant
{
type hePsiThermo;
mixture pureMixture;
transport const;
thermo hConst;
equationOfState perfectGas;
specie specie;
energy sensibleEnthalpy;
}
janaf
{
type hePsiThermo;
mixture pureMixture;
transport sutherland;
thermo janaf;
equationOfState perfectGas;
specie specie;
energy sensibleEnthalpy;
}
}
thermoType
{
${:gasThermoTypes.constant};
type hePsiThermo;
mixture pureMixture;
transport const;
thermo eConst;
equationOfState perfectGas;
specie specie;
energy sensibleInternalEnergy;
}
mixture
@ -54,7 +35,7 @@ mixture
}
thermodynamics
{
Cp 1000;
Cv 712;
Hf 0;
}
transport

View File

@ -17,7 +17,7 @@ FoamFile
application rhoPimpleFoam;
startFrom latestTime;
startFrom startTime;
startTime 0;

View File

@ -28,9 +28,10 @@ gradSchemes
divSchemes
{
default none;
div(phi,U) Gauss filteredLinear2V 0.2 0;
div(phi,h) Gauss filteredLinear2 0.2 0;
div(phi,U) Gauss LUST grad(U);
div(phi,e) Gauss LUST grad(e);
div(phi,K) Gauss linear;
div(phiv,p) Gauss linear;
div(phi,k) Gauss limitedLinear 1;
div(phi,B) Gauss limitedLinear 1;
div(phi,muTilda) Gauss limitedLinear 1;

View File

@ -31,15 +31,15 @@ solvers
relTol 0;
}
"(U|h|k|nuTilda)"
"(U|e|k|nuTilda)"
{
solver PBiCG;
preconditioner DILU;
solver smoothSolver;
smoother symGaussSeidel;
tolerance 1e-6;
relTol 0.01;
}
"(U|h|k|nuTilda)Final"
"(U|e|k|nuTilda)Final"
{
$U;
relTol 0;
@ -63,7 +63,7 @@ relaxationFactors
}
equations
{
"(U|h|k|epsilon|omega).*" 1;
".*" 1;
}
}

View File

@ -28,7 +28,7 @@ gradSchemes
divSchemes
{
default none;
div(phi,U) Gauss filteredLinear2V 0.2 0;
div(phi,U) Gauss LUST grad(U);
div(phi,k) Gauss limitedLinear 1;
div(phi,B) Gauss limitedLinear 1;
div(phi,nuTilda) Gauss limitedLinear 1;