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

This commit is contained in:
mattijs
2012-09-25 09:51:31 +01:00
26 changed files with 608 additions and 349 deletions

View File

@ -36,15 +36,16 @@ Description
#include "IFstream.H"
#include "OSspecific.H"
#include "thermo.H"
#include "absoluteEnthalpy.H"
#include "janafThermo.H"
#include "specie.H"
#include "perfectGas.H"
#include "thermo.H"
#include "janafThermo.H"
#include "absoluteEnthalpy.H"
using namespace Foam;
typedef species::thermo<janafThermo<perfectGas>, absoluteEnthalpy> thermo;
typedef species::thermo<janafThermo<perfectGas<specie> >, absoluteEnthalpy>
thermo;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

View File

@ -35,15 +35,18 @@ Description
#include "OSspecific.H"
#include "IOmanip.H"
#include "thermo.H"
#include "absoluteEnthalpy.H"
#include "janafThermo.H"
#include "specie.H"
#include "perfectGas.H"
#include "thermo.H"
#include "janafThermo.H"
#include "absoluteEnthalpy.H"
#include "SLPtrList.H"
using namespace Foam;
typedef species::thermo<janafThermo<perfectGas>, absoluteEnthalpy> thermo;
typedef species::thermo<janafThermo<perfectGas<specie> >, absoluteEnthalpy>
thermo;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// Main program:

View File

@ -38,14 +38,16 @@ Description
#include "OSspecific.H"
#include "IOmanip.H"
#include "thermo.H"
#include "absoluteEnthalpy.H"
#include "janafThermo.H"
#include "specie.H"
#include "perfectGas.H"
#include "thermo.H"
#include "janafThermo.H"
#include "absoluteEnthalpy.H"
using namespace Foam;
typedef species::thermo<janafThermo<perfectGas>, absoluteEnthalpy> thermo;
typedef species::thermo<janafThermo<perfectGas<specie> >, absoluteEnthalpy>
thermo;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

View File

@ -35,16 +35,17 @@ Description
#include "IFstream.H"
#include "OSspecific.H"
#include "thermo.H"
#include "absoluteEnthalpy.H"
#include "janafThermo.H"
#include "specie.H"
#include "perfectGas.H"
#include "thermo.H"
#include "janafThermo.H"
#include "absoluteEnthalpy.H"
#include "mixture.H"
using namespace Foam;
typedef species::thermo<janafThermo<perfectGas>, absoluteEnthalpy> thermo;
typedef species::thermo<janafThermo<perfectGas<specie> >, absoluteEnthalpy>
thermo;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //