Merge branch 'master' of ssh://dm/home/dm4/OpenFOAM/OpenFOAM-dev

This commit is contained in:
Henry
2012-06-22 11:54:02 +01:00
105 changed files with 2041 additions and 1089 deletions

View File

@ -15,18 +15,13 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
combustionModel PaSR<psiChemistryCombustionModel>;
combustionModel PaSR<psiChemistryCombustion>;
active true;
infinitelyFastChemistryCoeffs
{
C 10.0;
}
PaSRCoeffs
{
Cmix Cmix [ 0 0 0 0 0 0 0 ] 0.1;
Cmix 0.1;
turbulentReaction on;
}

View File

@ -27,7 +27,7 @@ k 5;
epsilon 6;
gamma 150;
alpha1 150;
// ************************************************************************* //

View File

@ -15,13 +15,13 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
combustionModel PaSR<rhoChemistryCombustionModel>;
combustionModel PaSR<rhoChemistryCombustion>;
active true;
PaSRCoeffs
{
Cmix Cmix [ 0 0 0 0 0 0 0 ] 0.1;
Cmix 0.1;
turbulentReaction on;
useReactionRate true;
}

View File

@ -15,13 +15,13 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
combustionModel PaSR<rhoChemistryCombustionModel>;
combustionModel PaSR<rhoChemistryCombustion>;
active false;
PaSRCoeffs
{
Cmix Cmix [ 0 0 0 0 0 0 0 ] 0.1;
Cmix 0.1;
turbulentReaction off;
useReactionRate true;
}

View File

@ -15,14 +15,14 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
combustionModel PaSR<psiChemistryCombustionModel>;
combustionModel PaSR<psiChemistryCombustion>;
active true;
PaSRCoeffs
{
Cmix Cmix [ 0 0 0 0 0 0 0 ] 1.0;
Cmix 1.0;
turbulentReaction on;
}

View File

@ -15,13 +15,13 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
combustionModel PaSR<rhoChemistryCombustionModel>;
combustionModel PaSR<rhoChemistryCombustion>;
active false;
PaSRCoeffs
{
Cmix Cmix [ 0 0 0 0 0 0 0 ] 1.0;
Cmix 1.0;
turbulentReaction off;
}

View File

@ -15,13 +15,13 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
combustionModel PaSR<rhoChemistryCombustionModel>;
combustionModel PaSR<rhoChemistryCombustion>;
active false;
PaSRCoeffs
{
Cmix Cmix [ 0 0 0 0 0 0 0 ] 1.0;
Cmix 1.0;
turbulentReaction off;
}

View File

@ -15,13 +15,13 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
combustionModel PaSR<rhoChemistryCombustionModel>;
combustionModel PaSR<rhoChemistryCombustion>;
active false;
PaSRCoeffs
{
Cmix Cmix [ 0 0 0 0 0 0 0 ] 1.0;
Cmix 1.0;
turbulentReaction off;
}

View File

@ -15,13 +15,13 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
combustionModel PaSR<psiChemistryCombustionModel>;
combustionModel PaSR<psiChemistryCombustion>;
active false;
PaSRCoeffs
{
Cmix Cmix [ 0 0 0 0 0 0 0 ] 1.0;
Cmix 1.0;
turbulentReaction on;
}

View File

@ -15,13 +15,13 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
combustionModel PaSR<psiChemistryCombustionModel>;
combustionModel PaSR<psiChemistryCombustion>;
active false;
PaSRCoeffs
{
Cmix Cmix [ 0 0 0 0 0 0 0 ] 1.0;
Cmix 1.0;
turbulentReaction off;
}

View File

@ -15,13 +15,13 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
combustionModel PaSR<psiChemistryCombustionModel>;
combustionModel PaSR<psiChemistryCombustion>;
active false;
PaSRCoeffs
{
Cmix Cmix [ 0 0 0 0 0 0 0 ] 1.0;
Cmix 1.0;
turbulentReaction off;
}

View File

@ -15,13 +15,13 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
combustionModel PaSR<psiChemistryCombustionModel>;
combustionModel PaSR<psiChemistryCombustion>;
active false;
PaSRCoeffs
{
Cmix Cmix [ 0 0 0 0 0 0 0 ] 1.0;
Cmix 1.0;
turbulentReaction off;
}

View File

@ -15,13 +15,13 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
combustionModel PaSR<psiChemistryCombustionModel>;
combustionModel PaSR<psiChemistryCombustion>;
active false;
PaSRCoeffs
{
Cmix Cmix [ 0 0 0 0 0 0 0 ] 1.0;
Cmix 1.0;
turbulentReaction off;
}

View File

@ -32,12 +32,11 @@ divSchemes
div(phi,U) Gauss upwind;
div(phid,p) Gauss upwind;
div(phi,K) Gauss linear;
div(phi,h) Gauss upwind;
div(phi,k) Gauss upwind;
div(phi,epsilon) Gauss upwind;
div(U) Gauss linear;
div((muEff*dev2(T(grad(U))))) Gauss linear;
div(phi,Yi_h) Gauss upwind;
div(phi,Yi_hs) Gauss upwind;
}
laplacianSchemes
@ -49,7 +48,6 @@ laplacianSchemes
laplacian(DepsilonEff,epsilon) Gauss linear corrected;
laplacian(DREff,R) Gauss linear corrected;
laplacian((rho*(1|A(U))),p) Gauss linear corrected;
laplacian(alphaEff,h) Gauss linear corrected;
}
interpolationSchemes

View File

@ -15,13 +15,13 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
combustionModel PaSR<psiChemistryCombustionModel>;
combustionModel PaSR<psiChemistryCombustion>;
active false;
PaSRCoeffs
{
Cmix Cmix [ 0 0 0 0 0 0 0 ] 1.0;
Cmix 1.0;
turbulentReaction yes;
}

View File

@ -32,12 +32,11 @@ divSchemes
div(phi,U) Gauss upwind;
div(phid,p) Gauss upwind;
div(phi,K) Gauss linear;
div(phi,h) Gauss upwind;
div(phi,k) Gauss upwind;
div(phi,epsilon) Gauss upwind;
div(U) Gauss linear;
div((muEff*dev2(T(grad(U))))) Gauss linear;
div(phi,Yi_h) Gauss upwind;
div(phi,Yi_hs) Gauss upwind;
}
laplacianSchemes