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

This commit is contained in:
mattijs
2012-10-08 16:36:56 +01:00
5 changed files with 41 additions and 42 deletions

View File

@ -41,7 +41,7 @@ ODESolidChemistryModel
pyrolisisGases_
(
mesh.lookupObject<dictionary>
("chemistryProperties").lookup("species")
("thermophysicalProperties").lookup("gaseousSpecies")
),
reactions_
(
@ -183,8 +183,8 @@ ODESolidChemistryModel
dictionary thermoDict =
mesh.lookupObject<dictionary>
(
"chemistryProperties"
).subDict(pyrolisisGases_[gasI]);
"thermophysicalProperties"
).subDict(pyrolisisGases_[gasI] + "Coeffs");
gasThermo_.set
(

View File

@ -92,7 +92,7 @@ Foam::autoPtr<Foam::solidChemistryModel> Foam::solidChemistryModel::New
+ word(solidThermoTypeDict.lookup("energy")) + ">"
);
const dictionary& gasThermoTypeDict(chemistryDict.subDict("gasThermoType"));
const dictionary& gasThermoTypeDict(thermoDict.subDict("gasThermoType"));
word gasThermoTypeName
(
word(gasThermoTypeDict.lookup("transport")) + '<'

View File

@ -48,7 +48,7 @@ Foam::reactingSolidMixture<ThermoSolidType>::reactingSolidMixture
(
this->components_,
mesh.lookupObject<dictionary>
("chemistryProperties").lookup("species")
("thermophysicalProperties").lookup("gaseousSpecies")
)
)
{}

View File

@ -23,15 +23,6 @@ chemistryType
chemistry on;
gasThermoType
{
transport sutherland;
thermo janaf;
equationOfState perfectGas;
specie specie;
energy sensibleEnthalpy;
}
initialChemicalTimeStep 1e-07;
odeCoeffs
@ -40,34 +31,6 @@ odeCoeffs
eps 0.05;
}
species
(
gas
);
gas
{
specie
{
nMoles 1;
molWeight 18.0153;
}
thermodynamics
{
Tlow 200;
Thigh 5000;
Tcommon 1000;
highCpCoeffs ( 2.67215 0.00305629 -8.73026e-07 1.20100e-10 -6.39162e-15 -29899.2 6.86282 );
lowCpCoeffs ( 3.38684 0.00347498 -6.35470e-06 6.96858e-09 -2.50659e-12 -30208.1 2.59023 );
}
transport
{
As 1.67212e-06;
Ts 170.672;
}
}
reactions
(
irreversibleSolidArrheniusReaction

View File

@ -25,11 +25,25 @@ thermoType
energy sensibleEnthalpy;
}
gasThermoType
{
transport sutherland;
thermo janaf;
equationOfState perfectGas;
specie specie;
energy sensibleEnthalpy;
}
solidComponents
(
v char
);
gaseousSpecies
(
gas
);
vCoeffs
{
specie
@ -74,5 +88,27 @@ charCoeffs
}
};
gasCoeffs
{
specie
{
nMoles 1;
molWeight 18.0153;
}
thermodynamics
{
Tlow 200;
Thigh 5000;
Tcommon 1000;
highCpCoeffs ( 2.67215 0.00305629 -8.73026e-07 1.20100e-10 -6.39162e-15 -29899.2 6.86282 );
lowCpCoeffs ( 3.38684 0.00347498 -6.35470e-06 6.96858e-09 -2.50659e-12 -30208.1 2.59023 );
}
transport
{
As 1.67212e-06;
Ts 170.672;
}
}
// ************************************************************************* //