zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

BUG: Mantis #1314: removed transport modelling from Reaction class

Browse Source
This commit is contained in:
william
2014-06-05 17:36:12 +01:00
committed by Andrew Heather
parent 5d11952429
commit c264c10439
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -113,7 +113,7 @@ void Foam::Reaction<ReactionThermo>::setThermo
{ {
if (rhs_.size() > 0) if (rhs_.size() > 0)
{ {
ReactionThermo::operator= ReactionThermo::thermoType::operator=
( (
rhs_[0].stoichCoeff*(*thermoDatabase[species_[rhs_[0].index]]) rhs_[0].stoichCoeff*(*thermoDatabase[species_[rhs_[0].index]])
); );
@ -149,7 +149,7 @@ Foam::Reaction<ReactionThermo>::Reaction
const HashPtrTable<ReactionThermo>& thermoDatabase const HashPtrTable<ReactionThermo>& thermoDatabase
) )
: :
ReactionThermo(*thermoDatabase[species[0]]), ReactionThermo::thermoType(*thermoDatabase[species[0]]),
name_("un-named-reaction-" + Foam::name(getNewReactionID())), name_("un-named-reaction-" + Foam::name(getNewReactionID())),
species_(species), species_(species),
lhs_(lhs), lhs_(lhs),
@ -166,7 +166,7 @@ Foam::Reaction<ReactionThermo>::Reaction
const speciesTable& species const speciesTable& species
) )
: :
ReactionThermo(r), ReactionThermo::thermoType(r),
name_(r.name() + "Copy"), name_(r.name() + "Copy"),
species_(species), species_(species),
lhs_(r.lhs_), lhs_(r.lhs_),
@ -320,7 +320,7 @@ Foam::Reaction<ReactionThermo>::Reaction
Istream& is Istream& is
) )
: :
ReactionThermo(*thermoDatabase[species[0]]), ReactionThermo::thermoType(*thermoDatabase[species[0]]),
name_("un-named-reaction" + Foam::name(getNewReactionID())), name_("un-named-reaction" + Foam::name(getNewReactionID())),
species_(species) species_(species)
{ {
@ -337,7 +337,7 @@ Foam::Reaction<ReactionThermo>::Reaction
const dictionary& dict const dictionary& dict
) )
: :
ReactionThermo(*thermoDatabase[species[0]]), ReactionThermo::thermoType(*thermoDatabase[species[0]]),
name_(dict.dictName()), name_(dict.dictName()),
species_(species) species_(species)
{ {

4
src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -64,7 +64,7 @@ inline Ostream& operator<<(Ostream&, const Reaction<ReactionThermo>&);
template<class ReactionThermo> template<class ReactionThermo>
class Reaction class Reaction
: :
public ReactionThermo public ReactionThermo::thermoType
{ {
protected: protected:

6
src/thermophysicalModels/specie/thermo/thermo/thermo.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -122,6 +122,10 @@ class thermo
public: public:
//- The thermodynamics of the individual species'
typedef thermo<Thermo, Type> thermoType;
// Constructors // Constructors
//- construct from components //- construct from components