reactionThermo: Select singleComponentMixture as pureMixture

A pureMixture can now be specified in a reacting solver. This further
enhances compatibility between non-reacting and reacting solvers.

To achieve this, mixtures now have a typeName function of the same form
as the lower thermodyanmic models. In addition, to avoid name clashes,
the reacting thermo make macros have been split into those that create
entries on multiple selection tables, and those that just add to the
reaction thermo table.
This commit is contained in:
Will Bainbridge
2017-12-14 15:23:27 +00:00
parent 18f4d60690
commit 233d8dea12
21 changed files with 409 additions and 282 deletions

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -66,9 +66,9 @@ defineTemplateTypeNameAndDebugWithName \
( \
Cthermo##Mixture##Transport##Type##Thermo##EqnOfState##Specie, \
( \
#Cthermo"<"#Mixture"<" \
+ Transport##Type##Thermo##EqnOfState##Specie::typeName() \
+ ">>" \
#Cthermo"<" \
+ Mixture<Transport##Type##Thermo##EqnOfState##Specie>::typeName() \
+ ">" \
).c_str(), \
0 \
);

View File

@ -73,6 +73,12 @@ public:
// Member functions
//- Return the instantiated type name
static word typeName()
{
return "pureMixture<" + ThermoType::typeName() + '>';
}
const ThermoType& mixture() const
{
return mixture_;