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

Conflicts:
	src/thermophysicalModels/radiationModels/derivedFvPatchFields/radiationCoupledBase/radiationCoupledBase.C
This commit is contained in:
sergio
2012-10-04 11:01:41 +01:00
153 changed files with 1237 additions and 1737 deletions

View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type heheuReactionThermo;
type heheuPsiThermo;
mixture inhomogeneousMixture;
transport sutherland;
thermo janaf;

View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type heheuReactionThermo;
type heheuPsiThermo;
mixture homogeneousMixture;
transport sutherland;
thermo janaf;

View File

@ -17,8 +17,8 @@ FoamFile
chemistryType
{
chemistryModel ODEChemistryModel;
chemistrySolver ode;
chemistryThermo psi;
}
chemistry on;

View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type hePsiReactionThermo;
type hePsiThermo;
mixture reactingMixture;
transport sutherland;
thermo janaf;

View File

@ -17,8 +17,8 @@ FoamFile
chemistryType
{
chemistryModel ODEChemistryModel;
chemistrySolver ode;
chemistryThermo psi;
}
chemistry on;

View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type hePsiReactionThermo;
type hePsiThermo;
mixture reactingMixture;
transport sutherland;
thermo janaf;

View File

@ -17,8 +17,8 @@ FoamFile
chemistryType
{
chemistryModel ODEChemistryModel;
chemistrySolver ode;
chemistryThermo psi;
}
chemistry on;

View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type hePsiReactionThermo;
type hePsiThermo;
mixture reactingMixture;
transport sutherland;
thermo janaf;

View File

@ -17,8 +17,8 @@ FoamFile
chemistryType
{
chemistryModel ODEChemistryModel;
chemistrySolver ode;
chemistryThermo psi;
}
chemistry on;

View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type hePsiReactionThermo;
type hePsiThermo;
mixture reactingMixture;
transport sutherland;
thermo janaf;

View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type heheuReactionThermo;
type heheuPsiThermo;
mixture inhomogeneousMixture;
transport sutherland;
thermo janaf;

View File

@ -14,7 +14,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heSolidThermo<reactingSolidMixture<constIso<const<hConst<rhoConst<specie>>,sensibleEnthalpy>>>>;
thermoType
{
type heSolidThermo;
mixture reactingSolidMixture;
transport constIso;
thermo hConst;
equationOfState rhoConst;
specie specie;
energy sensibleEnthalpy;
}
solidComponents
(

View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type hePsiReactionThermo;
type hePsiThermo;
mixture singleStepReactingMixture;
transport sutherland;
thermo janaf;

View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type hePsiReactionThermo;
type hePsiThermo;
mixture singleStepReactingMixture;
transport sutherland;
thermo janaf;

View File

@ -17,8 +17,8 @@ FoamFile
chemistryType
{
chemistryModel ODEChemistryModel;
chemistrySolver noChemistrySolver;
chemistryThermo psi;
}
chemistry off;

View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type hePsiReactionThermo;
type hePsiThermo;
mixture singleStepReactingMixture;
transport sutherland;
thermo janaf;

View File

@ -17,8 +17,8 @@ FoamFile
chemistryType
{
chemistryModel ODEChemistryModel;
chemistrySolver ode;
chemistryThermo psi;
}
chemistry on;

View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type hePsiReactionThermo;
type hePsiThermo;
mixture reactingMixture;
transport sutherland;
thermo janaf;