diff --git a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C index 2a8a5ca1e1..9624749b1a 100644 --- a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C +++ b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -113,7 +113,7 @@ void Foam::Reaction::setThermo { if (rhs_.size() > 0) { - ReactionThermo::operator= + ReactionThermo::thermoType::operator= ( rhs_[0].stoichCoeff*(*thermoDatabase[species_[rhs_[0].index]]) ); @@ -149,7 +149,7 @@ Foam::Reaction::Reaction const HashPtrTable& thermoDatabase ) : - ReactionThermo(*thermoDatabase[species[0]]), + ReactionThermo::thermoType(*thermoDatabase[species[0]]), name_("un-named-reaction-" + Foam::name(getNewReactionID())), species_(species), lhs_(lhs), @@ -166,7 +166,7 @@ Foam::Reaction::Reaction const speciesTable& species ) : - ReactionThermo(r), + ReactionThermo::thermoType(r), name_(r.name() + "Copy"), species_(species), lhs_(r.lhs_), @@ -320,7 +320,7 @@ Foam::Reaction::Reaction Istream& is ) : - ReactionThermo(*thermoDatabase[species[0]]), + ReactionThermo::thermoType(*thermoDatabase[species[0]]), name_("un-named-reaction" + Foam::name(getNewReactionID())), species_(species) { @@ -337,7 +337,7 @@ Foam::Reaction::Reaction const dictionary& dict ) : - ReactionThermo(*thermoDatabase[species[0]]), + ReactionThermo::thermoType(*thermoDatabase[species[0]]), name_(dict.dictName()), species_(species) { diff --git a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.H b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.H index 2679fc1bbb..8ba7d40d8a 100644 --- a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.H +++ b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -64,7 +64,7 @@ inline Ostream& operator<<(Ostream&, const Reaction&); template class Reaction : - public ReactionThermo + public ReactionThermo::thermoType { protected: diff --git a/src/thermophysicalModels/specie/thermo/thermo/thermo.H b/src/thermophysicalModels/specie/thermo/thermo/thermo.H index 974582b529..f545b798fa 100644 --- a/src/thermophysicalModels/specie/thermo/thermo/thermo.H +++ b/src/thermophysicalModels/specie/thermo/thermo/thermo.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -122,6 +122,10 @@ class thermo public: + //- The thermodynamics of the individual species' + typedef thermo thermoType; + + // Constructors //- construct from components