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

This commit is contained in:
andy
2012-05-31 17:08:50 +01:00
471 changed files with 5285 additions and 23706 deletions

View File

@ -29,7 +29,7 @@ solution
rho explicit 1;
U explicit 1;
Yi explicit 1;
hs explicit 1;
h explicit 1;
}
}

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hsPsiMixtureThermo<reactingMixture<gasThermoPhysics>>;
thermoType hePsiReactionThermo<reactingMixture<gasThermoPhysics>>;
chemistryReader foamChemistryReader;

View File

@ -36,7 +36,7 @@ divSchemes
div(phi,epsilon) Gauss upwind;
div(U) Gauss linear;
div((muEff*dev2(T(grad(U))))) Gauss linear;
div(phi,Yi_hs) Gauss upwind;
div(phi,Yi_h) Gauss upwind;
}
laplacianSchemes

View File

@ -32,7 +32,7 @@ solvers
relTol 0;
}
"(U|hs)"
"(U|h)"
{
solver PBiCG;
preconditioner DILU;
@ -40,7 +40,7 @@ solvers
relTol 0.1;
}
"(U|hs)Final"
"(U|h)Final"
{
$U;
relTol 0;
@ -69,7 +69,7 @@ solvers
"(Yi|O2|N2|H2O)"
{
$hsFinal;
$hFinal;
}
}

View File

@ -21,7 +21,7 @@ ddtSchemes
ddt(deltaf*rhof) Euler;
ddt(rhof,deltaf) Euler;
ddt(deltaf*rhof,Uf) Euler;
ddt(deltaf*rhof,hsf) Euler;
ddt(deltaf*rhof,hf) Euler;
}
divSchemes
@ -29,7 +29,7 @@ divSchemes
default none;
div(phi,Uf) Gauss upwind;
div(phid,deltaf) Gauss upwind;
div(phi,hsf) Gauss upwind;
div(phi,hf) Gauss upwind;
div(nHat) Gauss linear;
div(grad(nHat)) Gauss linear;

View File

@ -17,7 +17,7 @@ FoamFile
solvers
{
"(Uf|hsf|deltaf\*rhof)"
"(Uf|hf|deltaf\*rhof)"
{
solver PBiCG;
preconditioner DILU;

View File

@ -29,7 +29,7 @@ solution
rho explicit 1;
U explicit 1;
Yi explicit 1;
hs explicit 1;
h explicit 1;
}
}

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hsPsiMixtureThermo<reactingMixture<gasThermoPhysics>>;
thermoType hePsiReactionThermo<reactingMixture<gasThermoPhysics>>;
chemistryReader foamChemistryReader;

View File

@ -36,7 +36,7 @@ divSchemes
div(phi,epsilon) Gauss upwind;
div(U) Gauss linear;
div((muEff*dev2(T(grad(U))))) Gauss linear;
div(phi,Yi_hs) Gauss upwind;
div(phi,Yi_h) Gauss upwind;
}
laplacianSchemes

View File

@ -32,7 +32,7 @@ solvers
relTol 0;
}
"(U|hs|k|epsilon)"
"(U|h|k|epsilon)"
{
solver PBiCG;
preconditioner DILU;
@ -40,7 +40,7 @@ solvers
relTol 0.1;
}
"(U|hs|k|epsilon)Final"
"(U|h|k|epsilon)Final"
{
$U;
relTol 0;
@ -71,7 +71,7 @@ solvers
"(Yi|O2|N2|H2O)"
{
$hsFinal;
$hFinal;
}
}

View File

@ -21,7 +21,7 @@ ddtSchemes
ddt(deltaf*rhof) Euler;
ddt(rhof,deltaf) Euler;
ddt(deltaf*rhof,Uf) Euler;
ddt(deltaf*rhof,hsf) Euler;
ddt(deltaf*rhof,hf) Euler;
}
divSchemes
@ -29,7 +29,7 @@ divSchemes
default none;
div(phi,Uf) Gauss upwind;
div(phid,deltaf) Gauss upwind;
div(phi,hsf) Gauss upwind;
div(phi,hf) Gauss upwind;
div(nHat) Gauss linear;
}

View File

@ -17,7 +17,7 @@ FoamFile
solvers
{
"(Uf|hsf|deltaf\*rhof)"
"(Uf|hf|deltaf\*rhof)"
{
solver smoothSolver;
smoother GaussSeidel;

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hsPsiMixtureThermo<reactingMixture<gasThermoPhysics>>;
thermoType hePsiReactionThermo<reactingMixture<gasThermoPhysics>>;
chemistryReader foamChemistryReader;

View File

@ -36,7 +36,7 @@ divSchemes
div(phi,epsilon) Gauss upwind;
div(U) Gauss linear;
div((muEff*dev2(T(grad(U))))) Gauss linear;
div(phi,Yi_hs) Gauss upwind;
div(phi,Yi_h) Gauss upwind;
}
laplacianSchemes

View File

@ -32,7 +32,7 @@ solvers
relTol 0;
}
"(U|hs)"
"(U|h)"
{
solver PBiCG;
preconditioner DILU;
@ -40,7 +40,7 @@ solvers
relTol 0.1;
}
"(U|hs)Final"
"(U|h)Final"
{
$U;
relTol 0;
@ -69,7 +69,7 @@ solvers
"(Yi|O2|N2|H2O)"
{
$hsFinal;
$hFinal;
}
}

View File

@ -21,7 +21,7 @@ ddtSchemes
ddt(deltaf*rhof) Euler;
ddt(rhof,deltaf) Euler;
ddt(deltaf*rhof,Uf) Euler;
ddt(deltaf*rhof,hsf) Euler;
ddt(deltaf*rhof,hf) Euler;
}
divSchemes
@ -29,7 +29,7 @@ divSchemes
default none;
div(phi,Uf) Gauss upwind;
div(phid,deltaf) Gauss upwind;
div(phi,hsf) Gauss upwind;
div(phi,hf) Gauss upwind;
}
gradSchemes

View File

@ -17,7 +17,7 @@ FoamFile
solvers
{
"(Uf|hsf|deltaf\*rhof)"
"(Uf|hf|deltaf\*rhof)"
{
solver PBiCG;
preconditioner DILU;

View File

@ -29,7 +29,7 @@ solution
rho explicit 1;
U explicit 1;
Yi explicit 1;
hs explicit 1;
h explicit 1;
}
}

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hsPsiMixtureThermo<reactingMixture<gasThermoPhysics>>;
thermoType hePsiReactionThermo<reactingMixture<gasThermoPhysics>>;
chemistryReader foamChemistryReader;

View File

@ -36,7 +36,7 @@ divSchemes
div(phi,epsilon) Gauss upwind;
div(U) Gauss linear;
div((muEff*dev2(T(grad(U))))) Gauss linear;
div(phi,Yi_hs) Gauss upwind;
div(phi,Yi_h) Gauss upwind;
}
laplacianSchemes

View File

@ -32,7 +32,7 @@ solvers
relTol 0;
}
"(U|hs)"
"(U|h)"
{
solver PBiCG;
preconditioner DILU;
@ -40,7 +40,7 @@ solvers
relTol 0.1;
}
"(U|hs)Final"
"(U|h)Final"
{
$U;
relTol 0;
@ -69,7 +69,7 @@ solvers
"(Yi|O2|N2|H2O)"
{
$hsFinal;
$hFinal;
}
}

View File

@ -21,7 +21,7 @@ ddtSchemes
ddt(deltaf*rhof) Euler;
ddt(rhof,deltaf) Euler;
ddt(deltaf*rhof,Uf) Euler;
ddt(deltaf*rhof,hsf) Euler;
ddt(deltaf*rhof,hf) Euler;
}
divSchemes
@ -29,7 +29,7 @@ divSchemes
default none;
div(phi,Uf) Gauss upwind;
div(phid,deltaf) Gauss upwind;
div(phi,hsf) Gauss upwind;
div(phi,hf) Gauss upwind;
}
gradSchemes

View File

@ -17,7 +17,7 @@ FoamFile
solvers
{
"(Uf|hsf|deltaf\*rhof)"
"(Uf|hf|deltaf\*rhof)"
{
solver PBiCG;
preconditioner DILU;