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

ENH: Updates to ReactionList

Browse Source
This commit is contained in:
andy
2010-10-12 13:10:37 +01:00
parent 51920400c7
commit f2ba3c654b
6 changed files with 17 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/chemistryReader.H
View File

@ -108,7 +108,7 @@ public:
virtual const HashPtrTable<ThermoType>& speciesThermo() const = 0; virtual const HashPtrTable<ThermoType>& speciesThermo() const = 0;
virtual const PtrList<Reaction<ThermoType> >& reactions() const = 0; virtual const ReactionList<ThermoType>& reactions() const = 0;
}; };

6
src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.C
View File

@ -858,7 +858,8 @@ Foam::chemkinReader::chemkinReader
: :
lineNo_(1), lineNo_(1),
specieNames_(10), specieNames_(10),
speciesTable_() speciesTable_(),
reactions_(speciesTable_, speciesThermo_)
{ {
read(CHEMKINFileName, thermoFileName); read(CHEMKINFileName, thermoFileName);
} }
@ -868,7 +869,8 @@ Foam::chemkinReader::chemkinReader(const dictionary& thermoDict)
: :
lineNo_(1), lineNo_(1),
specieNames_(10), specieNames_(10),
speciesTable_() speciesTable_(),
reactions_(speciesTable_, speciesThermo_)
{ {
fileName chemkinFile fileName chemkinFile
( (

7
src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.H
View File

@ -205,7 +205,7 @@ private:
HashTable<List<specieElement> > specieComposition_; HashTable<List<specieElement> > specieComposition_;
//- List of the reactions //- List of the reactions
SLPtrList<Reaction<gasThermoPhysics> > reactions_; ReactionList<gasThermoPhysics> reactions_;
// Private Member Functions // Private Member Functions
@ -375,10 +375,9 @@ public:
} }
//- List of the reactions //- List of the reactions
const PtrList<Reaction<gasThermoPhysics> >& reactions() const const ReactionList<gasThermoPhysics>& reactions() const
{ {
return PtrList<Reaction<gasThermoPhysics> >(reactions_); return reactions_;
// return reactions_;
} }
}; };

4
src/thermophysicalModels/reactionThermo/chemistryReaders/foamChemistryReader/foamChemistryReader.H
View File

@ -117,9 +117,9 @@ public:
} }
//- List of the reactions //- List of the reactions
const PtrList<Reaction<ThermoType> >& reactions() const const ReactionList<ThermoType>& reactions() const
{ {
return reactions_.reactions(); return reactions_;
} }
}; };

25
src/thermophysicalModels/specie/reaction/Reactions/ReactionList/ReactionList.C
View File

@ -36,7 +36,7 @@ Foam::ReactionList<ThermoType>::ReactionList
const HashPtrTable<ThermoType>& thermoDb const HashPtrTable<ThermoType>& thermoDb
) )
: :
PtrList<Reaction<ThermoType> >(), SLPtrList<Reaction<ThermoType> >(),
species_(species), species_(species),
thermoDb_(thermoDb), thermoDb_(thermoDb),
dict_(dictionary::null) dict_(dictionary::null)
@ -51,7 +51,7 @@ Foam::ReactionList<ThermoType>::ReactionList
const dictionary& dict const dictionary& dict
) )
: :
PtrList<Reaction<ThermoType> >(), SLPtrList<Reaction<ThermoType> >(),
species_(species), species_(species),
thermoDb_(thermoDb), thermoDb_(thermoDb),
dict_(dict) dict_(dict)
@ -68,7 +68,7 @@ Foam::ReactionList<ThermoType>::ReactionList
const fileName& fName const fileName& fName
) )
: :
PtrList<Reaction<ThermoType> > SLPtrList<Reaction<ThermoType> >
( (
dictionary(IFstream(fName)()).lookup("reactions"), dictionary(IFstream(fName)()).lookup("reactions"),
Reaction<ThermoType>::iNew(species, thermoDb) Reaction<ThermoType>::iNew(species, thermoDb)
@ -82,7 +82,7 @@ Foam::ReactionList<ThermoType>::ReactionList
template<class ThermoType> template<class ThermoType>
Foam::ReactionList<ThermoType>::ReactionList(const ReactionList& reactions) Foam::ReactionList<ThermoType>::ReactionList(const ReactionList& reactions)
: :
PtrList<Reaction<ThermoType> >(reactions), SLPtrList<Reaction<ThermoType> >(reactions),
species_(reactions.species_), species_(reactions.species_),
thermoDb_(reactions.thermoDb_), thermoDb_(reactions.thermoDb_),
dict_(reactions.dict_) dict_(reactions.dict_)
@ -102,35 +102,22 @@ template<class ThermoType>
bool Foam::ReactionList<ThermoType>::readReactionDict() bool Foam::ReactionList<ThermoType>::readReactionDict()
{ {
const dictionary& reactions(dict_.subDict("reactions")); const dictionary& reactions(dict_.subDict("reactions"));
PtrList<Reaction<ThermoType> > newPtrs(reactions.size());
label i = 0;
forAllConstIter(dictionary, reactions, iter) forAllConstIter(dictionary, reactions, iter)
{ {
newPtrs.set this->append
( (
i++,
Reaction<ThermoType>::New Reaction<ThermoType>::New
( (
species_, species_,
thermoDb_, thermoDb_,
reactions.subDict(iter().keyword()) reactions.subDict(iter().keyword())
) ).ptr()
); );
} }
PtrList<Reaction<ThermoType> >::transfer(newPtrs);
return true; return true;
} }
template<class ThermoType>
const Foam::PtrList<Foam::Reaction<ThermoType> >&
Foam::ReactionList<ThermoType>::reactions() const
{
return *this;
}
// ************************************************************************* // // ************************************************************************* //

5
src/thermophysicalModels/specie/reaction/Reactions/ReactionList/ReactionList.H
View File

@ -54,7 +54,7 @@ namespace Foam
template<class ThermoType> template<class ThermoType>
class ReactionList class ReactionList
: :
private PtrList<Reaction<ThermoType> > public SLPtrList<Reaction<ThermoType> >
{ {
// Private data // Private data
@ -113,9 +113,6 @@ public:
//- Read reactions from dictionary //- Read reactions from dictionary
bool readReactionDict(); bool readReactionDict();
//- Return the list of reactions
const PtrList<Reaction<ThermoType> >& reactions() const;
}; };
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //