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

@ -3,7 +3,7 @@
# ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
# \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
# \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
# \\/ M anipulation |
#------------------------------------------------------------------------------
# License
@ -88,13 +88,13 @@ gradSchemes { default Gauss linear; }
divSchemes
{
default Gauss linear;
div(phi,fu_ft_h) Gauss multivariateSelection
div(phi,fu_ft_ha) Gauss multivariateSelection
{
fu upwind;
ft upwind;
h upwind;
};
div(phi,ft_b_h_hu) Gauss multivariateSelection
div(phi,ft_b_ha_hau) Gauss multivariateSelection
{
fu upwind;
ft upwind;

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hhuMixtureThermo<inhomogeneousMixture<sutherlandTransport<specieThermo<janafThermo<perfectGas>>>>>;
thermoType heheuReactionThermo<inhomogeneousMixture<sutherlandTransport<specieThermo<janafThermo<perfectGas>,absoluteEnthalpy>>>>;
stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [0 0 0 0 0 0 0] 15.5776;

View File

@ -39,13 +39,13 @@ divSchemes
div(phiXi,Xi) Gauss limitedLinear 1;
div(phiSt,b) Gauss limitedLinear01 1;
div(phi,ft_b_h_hu) Gauss multivariateSelection
div(phi,ft_b_ha_hau) Gauss multivariateSelection
{
ft limitedLinear01 1;
b limitedLinear01 1;
Xi limitedLinear 1;
h limitedLinear 1;
hu limitedLinear 1;
ha limitedLinear 1;
hau limitedLinear 1;
};
div((Su*grad(b))) Gauss linear;
@ -63,8 +63,8 @@ laplacianSchemes
laplacian((rho*inv((((1)*A(U))+tDragDcu))),p) Gauss linear limited 0.333;
laplacian(Db,b) Gauss linear limited 0.333;
laplacian(Db,ft) Gauss linear limited 0.333;
laplacian(Db,h) Gauss linear limited 0.333;
laplacian(Db,hu) Gauss linear limited 0.333;
laplacian(Db,ha) Gauss linear limited 0.333;
laplacian(Db,hau) Gauss linear limited 0.333;
}
interpolationSchemes

View File

@ -47,7 +47,7 @@ solvers
relTol 0;
};
"(b|Xi|ft|h|hu|k|epsilon)"
"(b|Xi|ft|ha|hau|k|epsilon)"
{
solver PBiCG;
preconditioner DILU;
@ -55,7 +55,7 @@ solvers
relTol 0.1;
}
"(b|Xi|ft|h|hu|k|epsilon)Final"
"(b|Xi|ft|ha|hau|k|epsilon)Final"
{
solver PBiCG;
preconditioner DILU;

View File

@ -33,14 +33,14 @@ boundaryField
upperWall
{
type alphaSgsJayatillekeWallFunction;
hs h;
he ha;
value uniform 0;
}
lowerWall
{
type alphaSgsJayatillekeWallFunction;
hs h;
he ha;
value uniform 0;
}

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hhuMixtureThermo<homogeneousMixture<sutherlandTransport<specieThermo<janafThermo<perfectGas>>>>>;
thermoType heheuReactionThermo<homogeneousMixture<sutherlandTransport<specieThermo<janafThermo<perfectGas>,absoluteEnthalpy>>>>;
stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [ 0 0 0 0 0 0 0 ] 15.675;

View File

@ -34,12 +34,12 @@ divSchemes
div(phiXi,Xi) Gauss limitedLinear01 0.1;
div(phiXi,Su) Gauss limitedLinear01 0.1;
div(phiSt,b) Gauss limitedLinear01 0.1;
div(phi,ft_b_h_hu) Gauss multivariateSelection
div(phi,ft_b_ha_hau) Gauss multivariateSelection
{
ft limitedLinear01 0.1;
b limitedLinear01 0.1;
h limitedLinear 0.1;
hu limitedLinear 0.1;
ft limitedLinear01 0.1;
b limitedLinear01 0.1;
ha limitedLinear 0.1;
hau limitedLinear 0.1;
};
div(U) Gauss linear;
div((Su*grad(b))) Gauss linear;
@ -56,8 +56,8 @@ laplacianSchemes
laplacian((rho*(1|A(U))),p) Gauss linear corrected;
laplacian(alphaEff,b) Gauss linear corrected;
laplacian(alphaEff,ft) Gauss linear corrected;
laplacian(alphaEff,h) Gauss linear corrected;
laplacian(alphaEff,hu) Gauss linear corrected;
laplacian(alphaEff,ha) Gauss linear corrected;
laplacian(alphaEff,hau) Gauss linear corrected;
}
interpolationSchemes

View File

@ -32,7 +32,7 @@ solvers
relTol 0;
}
"(U|b|Su|Xi|h|hu|k)"
"(U|b|Su|Xi|ha|hau|k)"
{
solver PBiCG;
preconditioner DILU;
@ -40,7 +40,7 @@ solvers
relTol 0.1;
}
"(U|b|Su|Xi|h|hu|k)Final"
"(U|b|Su|Xi|ha|hau|k)Final"
{
solver PBiCG;
preconditioner DILU;

View File

@ -32,13 +32,13 @@ boundaryField
upperWall
{
type alphaSgsJayatillekeWallFunction;
hs h;
he ha;
value uniform 0;
}
lowerWall
{
type alphaSgsJayatillekeWallFunction;
hs h;
he ha;
value uniform 0;
}
front

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hhuMixtureThermo<homogeneousMixture<sutherlandTransport<specieThermo<janafThermo<perfectGas>>>>>;
thermoType heheuReactionThermo<homogeneousMixture<sutherlandTransport<specieThermo<janafThermo<perfectGas>,absoluteEnthalpy>>>>;
stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [ 0 0 0 0 0 0 0 ] 15.675;

View File

@ -34,12 +34,12 @@ divSchemes
div(phiXi,Xi) Gauss limitedLinear01 0.1;
div(phiXi,Su) Gauss limitedLinear01 0.1;
div(phiSt,b) Gauss limitedLinear01 0.1;
div(phi,ft_b_h_hu) Gauss multivariateSelection
div(phi,ft_b_ha_hau) Gauss multivariateSelection
{
ft limitedLinear01 0.1;
b limitedLinear01 0.1;
h limitedLinear 0.1;
hu limitedLinear 0.1;
ft limitedLinear01 0.1;
b limitedLinear01 0.1;
ha limitedLinear 0.1;
hau limitedLinear 0.1;
};
div(U) Gauss linear;
div((Su*grad(b))) Gauss linear;
@ -56,8 +56,8 @@ laplacianSchemes
laplacian((rho*(1|A(U))),p) Gauss linear corrected;
laplacian(alphaEff,b) Gauss linear corrected;
laplacian(alphaEff,ft) Gauss linear corrected;
laplacian(alphaEff,h) Gauss linear corrected;
laplacian(alphaEff,hu) Gauss linear corrected;
laplacian(alphaEff,ha) Gauss linear corrected;
laplacian(alphaEff,hau) Gauss linear corrected;
}
interpolationSchemes

View File

@ -32,7 +32,7 @@ solvers
relTol 0;
}
"(U|b|Su|Xi|h|hu|k)"
"(U|b|Su|Xi|ha|hau|k)"
{
solver PBiCG;
preconditioner DILU;
@ -40,7 +40,7 @@ solvers
relTol 0.1;
}
"(U|b|Su|Xi|h|hu|k)Final"
"(U|b|Su|Xi|ha|hau|k)Final"
{
solver PBiCG;
preconditioner DILU;

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hhuMixtureThermo<homogeneousMixture<sutherlandTransport<specieThermo<janafThermo<perfectGas>>>>>;
thermoType heheuReactionThermo<homogeneousMixture<sutherlandTransport<specieThermo<janafThermo<perfectGas>,absoluteEnthalpy>>>>;
stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [ 0 0 0 0 0 0 0 ] 15.675;

View File

@ -38,13 +38,13 @@ divSchemes
div(phiXi,Xi) Gauss limitedLinear 1;
div(phiXi,Su) Gauss limitedLinear 1;
div(phiSt,b) Gauss limitedLinear01 1;
div(phi,ft_b_h_hu) Gauss multivariateSelection
div(phi,ft_b_ha_hau) Gauss multivariateSelection
{
fu limitedLinear01 1;
ft limitedLinear01 1;
b limitedLinear01 1;
h limitedLinear 1;
hu limitedLinear 1;
fu limitedLinear01 1;
ft limitedLinear01 1;
b limitedLinear01 1;
ha limitedLinear 1;
hau limitedLinear 1;
};
div(U) Gauss linear;
div((Su*grad(b))) Gauss linear;
@ -62,8 +62,8 @@ laplacianSchemes
laplacian((rho*(1|A(U))),p) Gauss linear corrected;
laplacian(alphaEff,b) Gauss linear corrected;
laplacian(alphaEff,ft) Gauss linear corrected;
laplacian(alphaEff,h) Gauss linear corrected;
laplacian(alphaEff,hu) Gauss linear corrected;
laplacian(alphaEff,ha) Gauss linear corrected;
laplacian(alphaEff,hau) Gauss linear corrected;
}
interpolationSchemes

View File

@ -32,7 +32,7 @@ solvers
relTol 0;
}
"(U|b|Su|Xi|h|hu|k|epsilon)"
"(U|b|Su|Xi|ha|hau|k|epsilon)"
{
solver PBiCG;
preconditioner DILU;
@ -40,7 +40,7 @@ solvers
relTol 0.1;
}
"(U|b|Su|Xi|h|hu|k|epsilon)Final"
"(U|b|Su|Xi|ha|hau|k|epsilon)Final"
{
solver PBiCG;
preconditioner DILU;

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hsPsiMixtureThermo<reactingMixture<gasThermoPhysics>>;
thermoType hePsiReactionThermo<reactingMixture<gasThermoPhysics>>;
CHEMKINFile "$FOAM_CASE/chemkin/chem.inp";

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hsPsiMixtureThermo<reactingMixture<gasThermoPhysics>>;
thermoType hePsiReactionThermo<reactingMixture<gasThermoPhysics>>;
CHEMKINFile "$FOAM_CASE/chemkin/chem.inp";

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hsPsiMixtureThermo<reactingMixture<gasThermoPhysics>>;
thermoType hePsiReactionThermo<reactingMixture<gasThermoPhysics>>;
CHEMKINFile "$FOAM_CASE/chemkin/chem.inp";

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hsPsiMixtureThermo<reactingMixture<gasThermoPhysics>>;
thermoType hePsiReactionThermo<reactingMixture<gasThermoPhysics>>;
CHEMKINFile "$FOAM_CASE/chemkin/chem.inp";

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hhuMixtureThermo<inhomogeneousMixture<sutherlandTransport<specieThermo<janafThermo<perfectGas>>>>>;
thermoType heheuReactionThermo<inhomogeneousMixture<sutherlandTransport<specieThermo<janafThermo<perfectGas>,absoluteEnthalpy>>>>;
stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [ 0 0 0 0 0 0 0 ] 15.0336;

View File

@ -38,13 +38,13 @@ divSchemes
div(phiXi,Xi) Gauss upwind;
div(phiXi,Su) Gauss upwind;
div(phiSt,b) Gauss limitedLinear01 1;
div(phi,ft_b_h_hu) Gauss multivariateSelection
div(phi,ft_b_ha_hau) Gauss multivariateSelection
{
fu limitedLinear01 1;
ft limitedLinear01 1;
b limitedLinear01 1;
h limitedLinear 1;
hu limitedLinear 1;
fu limitedLinear01 1;
ft limitedLinear01 1;
b limitedLinear01 1;
ha limitedLinear 1;
hau limitedLinear 1;
};
div(U) Gauss linear;
div((Su*grad(b))) Gauss linear;
@ -62,8 +62,8 @@ laplacianSchemes
laplacian((rho*(1|A(U))),p) Gauss linear limited 0.5;
laplacian(alphaEff,b) Gauss linear limited 0.5;
laplacian(muEff,ft) Gauss linear limited 0.5;
laplacian(alphaEff,h) Gauss linear limited 0.5;
laplacian(alphaEff,hu) Gauss linear limited 0.5;
laplacian(alphaEff,ha) Gauss linear limited 0.5;
laplacian(alphaEff,hau) Gauss linear limited 0.5;
laplacian(alphaEff,ft) Gauss linear limited 0.5;
}

View File

@ -47,14 +47,14 @@ solvers
relTol 0;
}
"(U|Xi|hu|ft|b|h|k|epsilon)"
"(U|Xi|hau|ft|b|ha|k|epsilon)"
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-05;
relTol 0.1;
}
"(U|ft|Xi|hu|b|h|k|epsilon)Final"
"(U|ft|Xi|hau|b|ha|k|epsilon)Final"
{
$U;
tolerance 1e-05;

View File

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

View File

@ -16,7 +16,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hsPsiMixtureThermo<singleStepReactingMixture<gasThermoPhysics>>;
thermoType hePsiReactionThermo<singleStepReactingMixture<gasThermoPhysics>>;
inertSpecie N2;

View File

@ -30,14 +30,14 @@ divSchemes
default none;
div(phi,U) Gauss limitedLinear 1;
div(phi,k) Gauss limitedLinear 1;
div(phi,Yi_hs) Gauss multivariateSelection
div(phi,Yi_h) Gauss multivariateSelection
{
O2 linearUpwind grad(O2);
N2 linearUpwind grad(N2);
C3H8 linearUpwind grad(C3H8);
H2O linearUpwind grad(H2O);
CO2 linearUpwind grad(CO2);
hs linearUpwind grad(hs);
h linearUpwind grad(h);
};
div((muEff*dev2(T(grad(U))))) Gauss linear;
div(phi,K) Gauss limitedLinear 1;
@ -50,7 +50,7 @@ laplacianSchemes
default Gauss linear corrected;
laplacian(muEff,U) Gauss linear corrected;
laplacian(DkEff,k) Gauss linear corrected;
laplacian(alphaEff,hs) Gauss linear corrected;
laplacian(alphaEff,h) Gauss linear corrected;
laplacian((((rho*(1|A(U)))*rho)*gh)) Gauss linear corrected;
laplacian(interpolate((rho*(1|A(U)))),p) Gauss linear corrected;
laplacian(gammaRad,G) Gauss linear corrected;

View File

@ -71,7 +71,7 @@ solvers
};
"(hs|hsFinal|Yi)"
"(h|hFinal|Yi)"
{
solver PBiCG;
preconditioner DILU;
@ -117,7 +117,7 @@ relaxationFactors
equations
{
"(U|k).*" 1;
"(C3H8|O2|H2O|CO2|hs).*" 1;
"(C3H8|O2|H2O|CO2|h).*" 1;
}
}

View File

@ -32,7 +32,7 @@ divSchemes
laplacianSchemes
{
default none;
laplacian(K,T) Gauss linear uncorrected;
laplacian(kappa,T) Gauss linear uncorrected;
}
interpolationSchemes

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<singleStepReactingMixture<gasThermoPhysics>>;
thermoType hePsiReactionThermo<singleStepReactingMixture<gasThermoPhysics>>;
inertSpecie N2;

View File

@ -30,14 +30,14 @@ divSchemes
default none;
div(phi,U) Gauss limitedLinear 1;
div(phi,k) Gauss limitedLinear 1;
div(phi,Yi_hs) Gauss multivariateSelection
div(phi,Yi_h) Gauss multivariateSelection
{
O2 limitedLinear01 1;
CH4 limitedLinear01 1;
N2 limitedLinear01 1;
H2O limitedLinear01 1;
CO2 limitedLinear01 1;
hs limitedLinear 1;
h limitedLinear 1;
};
div((muEff*dev2(T(grad(U))))) Gauss linear;
div(phi,omega) Gauss limitedLinear 1;

View File

@ -53,7 +53,7 @@ solvers
};
"(U|Yi|k|hs|omega)"
"(U|Yi|k|h|omega)"
{
solver PBiCG;
preconditioner DILU;
@ -62,7 +62,7 @@ solvers
nSweeps 1;
};
"(U|Yi|k|hs|omega)Final"
"(U|Yi|k|h|omega)Final"
{
$U;
tolerance 1e-7;
@ -108,7 +108,7 @@ relaxationFactors
equations
{
"(U|k).*" 1;
"(C3H8|O2|H2O|CO2|hs).*" 0.9;
"(C3H8|O2|H2O|CO2|h).*" 0.9;
}
}

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<singleStepReactingMixture<gasThermoPhysics>>;
thermoType hePsiReactionThermo<singleStepReactingMixture<gasThermoPhysics>>;
inertSpecie N2;

View File

@ -31,14 +31,14 @@ divSchemes
div(phi,U) Gauss linear;
div(phi,K) Gauss linear;
div(phi,k) Gauss limitedLinear 0.1;
div(phi,Yi_hs) Gauss multivariateSelection
div(phi,Yi_h) Gauss multivariateSelection
{
O2 limitedLinear01 1;
CH4 limitedLinear01 1;
N2 limitedLinear01 1;
H2O limitedLinear01 1;
CO2 limitedLinear01 1;
hs limitedLinear 1;
h limitedLinear 1;
};
div((muEff*dev2(T(grad(U))))) Gauss linear;
div(Ji,Ii_h) Gauss upwind;

View File

@ -45,7 +45,7 @@ solvers
};
"(U|Yi|k|hs)"
"(U|Yi|k|h)"
{
solver PBiCG;
preconditioner DILU;
@ -54,7 +54,7 @@ solvers
nSweeps 1;
};
"(U|Yi|k|hs)Final"
"(U|Yi|k|h)Final"
{
$U;
tolerance 1e-8;
@ -100,7 +100,7 @@ relaxationFactors
equations
{
"(U|k).*" 1;
"(CH4|O2|H2O|CO2|hs).*" 0.9;
"(CH4|O2|H2O|CO2|h).*" 0.9;
}
}

View File

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

View File

@ -47,7 +47,7 @@ solvers
relTol 0.0;
}
"(U|hs||k|epsilon)"
"(U|h|k|epsilon)"
{
solver PBiCG;
preconditioner DILU;
@ -55,7 +55,7 @@ solvers
relTol 0.1;
}
"(U|hs||k|epsilon)Final"
"(U|h|k|epsilon)Final"
{
solver PBiCG;
preconditioner DILU;
@ -65,7 +65,7 @@ solvers
Yi
{
$hsFinal;
$hFinal;
}
}

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType ePsiThermo<pureMixture<sutherlandTransport<specieThermo<hConstThermo<perfectGas>>>>>;
thermoType hePsiThermo<pureMixture<sutherlandTransport<specieThermo<hConstThermo<perfectGas>,sensibleInternalEnergy>>>>;
mixture
{

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType ePsiThermo<pureMixture<sutherlandTransport<specieThermo<janafThermo<perfectGas>>>>>;
thermoType hePsiThermo<pureMixture<sutherlandTransport<specieThermo<janafThermo<perfectGas>,sensibleInternalEnergy>>>>;
mixture
{

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType ePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
thermoType hePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>,sensibleInternalEnergy>>>>;
// Note: these are the properties for a "normalised" inviscid gas
// for which the speed of sound is 1 m/s at a temperature of 1K

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType ePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
thermoType hePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>,sensibleInternalEnergy>>>>;
mixture
{

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType ePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
thermoType hePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>,sensibleInternalEnergy>>>>;
mixture
{

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType ePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
thermoType hePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>,sensibleInternalEnergy>>>>;
mixture
{

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hPsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
thermoType hePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>,sensibleEnthalpy>>>>;
mixture
{

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hPsiThermo<pureMixture<sutherlandTransport<specieThermo<hConstThermo<perfectGas>>>>>;
thermoType hePsiThermo<pureMixture<sutherlandTransport<specieThermo<hConstThermo<perfectGas>,sensibleEnthalpy>>>>;
mixture
{

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hPsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
thermoType hePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>,sensibleEnthalpy>>>>;
mixture
{

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hPsiThermo<pureMixture<sutherlandTransport<specieThermo<hConstThermo<perfectGas>>>>>;
thermoType hePsiThermo<pureMixture<sutherlandTransport<specieThermo<hConstThermo<perfectGas>,sensibleEnthalpy>>>>;
mixture
{

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hPsiThermo<pureMixture<sutherlandTransport<specieThermo<hConstThermo<perfectGas>>>>>;
thermoType hePsiThermo<pureMixture<sutherlandTransport<specieThermo<hConstThermo<perfectGas>,sensibleEnthalpy>>>>;
mixture
{

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hPsiThermo<pureMixture<sutherlandTransport<specieThermo<hConstThermo<perfectGas>>>>>;
thermoType hePsiThermo<pureMixture<sutherlandTransport<specieThermo<hConstThermo<perfectGas>,sensibleEnthalpy>>>>;
mixture
{

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType ePsiThermo<pureMixture<sutherlandTransport<specieThermo<eConstThermo<perfectGas>>>>>;
thermoType hePsiThermo<pureMixture<sutherlandTransport<specieThermo<eConstThermo<perfectGas>,sensibleInternalEnergy>>>>;
mixture
{

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType ePsiThermo<pureMixture<sutherlandTransport<specieThermo<eConstThermo<perfectGas>>>>>;
thermoType hePsiThermo<pureMixture<sutherlandTransport<specieThermo<eConstThermo<perfectGas>,sensibleInternalEnergy>>>>;
mixture
{

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType ePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
thermoType hePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>,sensibleInternalEnergy>>>>;
// Note: these are the properties for a "normalised" inviscid gas
// for which the speed of sound is 1 m/s at a temperature of 1K

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType ePsiThermo<pureMixture<constTransport<specieThermo<eConstThermo<perfectGas>>>>>;
thermoType hePsiThermo<pureMixture<constTransport<specieThermo<eConstThermo<perfectGas>,sensibleInternalEnergy>>>>;
mixture
{

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType ePsiThermo<pureMixture<constTransport<specieThermo<eConstThermo<perfectGas>>>>>;
thermoType hePsiThermo<pureMixture<constTransport<specieThermo<eConstThermo<perfectGas>,sensibleInternalEnergy>>>>;
mixture
{

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType ePsiThermo<pureMixture<constTransport<specieThermo<eConstThermo<perfectGas>>>>>;
thermoType hePsiThermo<pureMixture<constTransport<specieThermo<eConstThermo<perfectGas>,sensibleInternalEnergy>>>>;
mixture
{

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
thermoType heRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>,sensibleEnthalpy>>>>;
pRef 100000;

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hPsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
thermoType hePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>,sensibleEnthalpy>>>>;
mixture
{

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hPsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
thermoType hePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>,sensibleEnthalpy>>>>;
mixture
{

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hPsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
thermoType hePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>,sensibleEnthalpy>>>>;
pRef 100000;

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hPsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
thermoType hePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>,sensibleEnthalpy>>>>;
pRef 100000;

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hPsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
thermoType hePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>,sensibleEnthalpy>>>>;
pRef 100000;

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
thermoType heRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>,sensibleEnthalpy>>>>;
mixture
{

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
thermoType heRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>,sensibleEnthalpy>>>>;
mixture
{

View File

@ -14,8 +14,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType
hRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<incompressible>>>>>;
thermoType heRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<incompressible>,sensibleEnthalpy>>>>;
mixture
{

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
thermoType heRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>,sensibleEnthalpy>>>>;
mixture
{

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
thermoType heRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>,sensibleEnthalpy>>>>;
mixture
{

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
thermoType heRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>,sensibleEnthalpy>>>>;
mixture
{

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
thermoType heRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>,sensibleEnthalpy>>>>;
mixture
{

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
thermoType heRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>,sensibleEnthalpy>>>>;
mixture
{

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
thermoType heRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>,sensibleEnthalpy>>>>;
mixture
{

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
thermoType heRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>,sensibleEnthalpy>>>>;
mixture
{

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hsRhoMixtureThermo<reactingMixture<icoPoly8ThermoPhysics>>;
thermoType heRhoReactionThermo<reactingMixture<icoPoly8ThermoPhysics>>;
inertSpecie N2;

View File

@ -59,7 +59,7 @@ solvers
relTol 0;
};
"(U|Yi|hs|k|epsilon)"
"(U|Yi|h|k|epsilon)"
{
solver smoothSolver;
smoother GaussSeidel;
@ -67,7 +67,7 @@ solvers
relTol 0.1;
}
"(U|Yi|hs|k|epsilon)Final"
"(U|Yi|h|k|epsilon)Final"
{
solver smoothSolver;
smoother GaussSeidel;

View File

@ -35,7 +35,7 @@ solution
rho semiImplicit 1;
U semiImplicit 1;
Yi semiImplicit 1;
hs semiImplicit 1;
h semiImplicit 1;
}
}

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hsRhoMixtureThermo<reactingMixture<icoPoly8ThermoPhysics>>;
thermoType heRhoReactionThermo<reactingMixture<icoPoly8ThermoPhysics>>;
chemistryReader foamChemistryReader;

View File

@ -32,7 +32,7 @@ divSchemes
div(phi,U) Gauss upwind;
div(phid,p) Gauss upwind;
div(phi,K) Gauss linear;
div(phi,hs) Gauss upwind;
div(phi,h) Gauss upwind;
div(phi,k) Gauss upwind;
div(phi,epsilon) Gauss upwind;
div(phi,omega) Gauss upwind;

View File

@ -52,7 +52,7 @@ solvers
tolerance 1e-4;
}
"(U|Yi|hs|k|omega|.*Final)"
"(U|Yi|h|k|omega|.*Final)"
{
solver smoothSolver;
smoother GaussSeidel;

View File

@ -26,10 +26,10 @@ solution
{
schemes
{
rho explicit 1;
U explicit 1;
Yi explicit 1;
hs explicit 1;
rho semiImplicit 1;
U semiImplicit 1;
Yi semiImplicit 1;
h semiImplicit 1;
}
}

View File

@ -27,7 +27,7 @@ solution
schemes
{
U explicit 1;
hs explicit 1;
h explicit 1;
}
}

View File

@ -29,7 +29,7 @@ source1
volumeMode absolute;
injectionRate
{
hs 12000;
h 12000;
}
}
}

View File

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

View File

@ -32,7 +32,7 @@ divSchemes
div(phi,U) Gauss upwind;
div(phid,p) Gauss upwind;
div(phi,K) Gauss linear;
div(phi,hs) Gauss upwind;
div(phi,h) Gauss upwind;
div(phi,k) Gauss upwind;
div(phi,epsilon) Gauss upwind;
div(U) Gauss linear;
@ -49,7 +49,7 @@ laplacianSchemes
laplacian(DepsilonEff,epsilon) Gauss linear orthogonal;
laplacian(DREff,R) Gauss linear orthogonal;
laplacian((rho*(1|A(U))),p) Gauss linear orthogonal;
laplacian(alphaEff,hs) Gauss linear orthogonal;
laplacian(alphaEff,h) Gauss linear orthogonal;
}
interpolationSchemes

View File

@ -54,7 +54,7 @@ solvers
relTol 0;
}
"(U|hs|R|k|epsilon)"
"(U|h|R|k|epsilon)"
{
solver PBiCG;
preconditioner DILU;
@ -62,7 +62,7 @@ solvers
relTol 0.1;
}
"(U|hs|R|k|epsilon)Final"
"(U|h|R|k|epsilon)Final"
{
$U;
tolerance 1e-05;

View File

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

View File

@ -79,7 +79,7 @@ energySource1
volumeMode absolute;
injectionRate
{
hs 10;
h 10;
}
}
}

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hsRhoMixtureThermo<reactingMixture<icoPoly8ThermoPhysics>>;
thermoType heRhoReactionThermo<reactingMixture<icoPoly8ThermoPhysics>>;
chemistryReader foamChemistryReader;

View File

@ -32,7 +32,7 @@ divSchemes
div(phi,U) Gauss upwind;
div(phid,p) Gauss upwind;
div(phi,K) Gauss linear;
div(phi,hs) Gauss upwind;
div(phi,h) Gauss upwind;
div(phi,k) Gauss upwind;
div(phi,epsilon) Gauss upwind;
div(U) Gauss linear;
@ -49,7 +49,7 @@ laplacianSchemes
laplacian(DepsilonEff,epsilon) Gauss linear corrected;
laplacian(DREff,R) Gauss linear corrected;
laplacian((rho*(1|A(U))),p) Gauss linear corrected;
laplacian(alphaEff,hs) Gauss linear corrected;
laplacian(alphaEff,h) Gauss linear corrected;
}
interpolationSchemes

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;
tolerance 1e-06;
@ -70,7 +70,7 @@ solvers
"(Yi|O2|N2|H2O)"
{
$hsFinal;
$hFinal;
}
}

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 hsRhoMixtureThermo<reactingMixture<icoPoly8ThermoPhysics>>;
thermoType heRhoReactionThermo<reactingMixture<icoPoly8ThermoPhysics>>;
chemistryReader foamChemistryReader;

View File

@ -32,7 +32,7 @@ divSchemes
div(phi,U) Gauss upwind;
div(phid,p) Gauss upwind;
div(phi,K) Gauss upwind;
div(phi,hs) Gauss upwind;
div(phi,h) Gauss upwind;
div(phi,k) Gauss upwind;
div(phi,epsilon) Gauss upwind;
div(phi,omega) Gauss upwind;

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;
tolerance 1e-05;
@ -71,7 +71,7 @@ solvers
"(Yi|O2|N2|H2O)"
{
$hsFinal;
$hFinal;
}
}

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 hsRhoMixtureThermo<reactingMixture<icoPoly8ThermoPhysics>>;
thermoType heRhoReactionThermo<reactingMixture<icoPoly8ThermoPhysics>>;
chemistryReader foamChemistryReader;

View File

@ -34,7 +34,7 @@ divSchemes
div(phi,U) Gauss upwind;
div(phid,p) Gauss upwind;
div(phi,K) Gauss upwind;
div(phi,hs) Gauss upwind;
div(phi,h) Gauss upwind;
div(phi,k) Gauss upwind;
div(phi,epsilon) Gauss upwind;
div(phi,omega) Gauss upwind;

View File

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

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;
}
}

Some files were not shown because too many files have changed in this diff Show More