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

Merge remote branch 'OpenCFD/master' into olesenm

Browse Source
This commit is contained in:
Mark Olesen
2011-02-21 09:14:07 +01:00
parent 6590b211e9 6cf70a7d52
commit afa8c88822
22 changed files with 75 additions and 707 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/OpenFOAM/fields/DimensionedFields/DimensionedTensorField/DimensionedTensorField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -46,11 +46,11 @@ UNARY_FUNCTION(tensor, tensor, dev2, transform)
UNARY_FUNCTION(scalar, tensor, det, transform)
UNARY_FUNCTION(tensor, tensor, cof, cof)
UNARY_FUNCTION(tensor, tensor, inv, inv)
UNARY_FUNCTION(vector, tensor, eigenValues, sign)
UNARY_FUNCTION(tensor, tensor, eigenVectors, transform)
UNARY_FUNCTION(vector, tensor, eigenValues, transform)
UNARY_FUNCTION(tensor, tensor, eigenVectors, sign)
UNARY_FUNCTION(vector, symmTensor, eigenValues, sign)
UNARY_FUNCTION(symmTensor, symmTensor, eigenVectors, transform)
UNARY_FUNCTION(vector, symmTensor, eigenValues, transform)
UNARY_FUNCTION(symmTensor, symmTensor, eigenVectors, sign)
// * * * * * * * * * * * * * * * global operators * * * * * * * * * * * * * //

10
src/OpenFOAM/fields/DimensionedFields/DimensionedTensorField/DimensionedTensorField.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -59,11 +59,11 @@ UNARY_FUNCTION(tensor, tensor, dev2, transform)
UNARY_FUNCTION(scalar, tensor, det, transform)
UNARY_FUNCTION(tensor, tensor, cof, cof)
UNARY_FUNCTION(tensor, tensor, inv, inv)
UNARY_FUNCTION(vector, tensor, eigenValues, sign)
UNARY_FUNCTION(tensor, tensor, eigenVectors, transform)
UNARY_FUNCTION(vector, tensor, eigenValues, transform)
UNARY_FUNCTION(tensor, tensor, eigenVectors, sign)
UNARY_FUNCTION(vector, symmTensor, eigenValues, sign)
UNARY_FUNCTION(symmTensor, symmTensor, eigenVectors, transform)
UNARY_FUNCTION(vector, symmTensor, eigenValues, transform)
UNARY_FUNCTION(symmTensor, symmTensor, eigenVectors, sign)
// * * * * * * * * * * * * * * * global operators * * * * * * * * * * * * * //

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

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -26,8 +26,21 @@ License
#include "Reaction.H"
#include "DynamicList.H"
// * * * * * * * * * * * * * * * * Static Data * * * * * * * * * * * * * * * //
template<class ReactionThermo>
Foam::label Foam::Reaction<ReactionThermo>::nUnNamedReactions = 0;
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
template<class ReactionThermo>
Foam::label Foam::Reaction<ReactionThermo>::getNewReactionID()
{
return nUnNamedReactions++;
}
template<class ReactionThermo>
Foam::string Foam::Reaction<ReactionThermo>::reactionStr() const
{
@ -114,6 +127,7 @@ Foam::Reaction<ReactionThermo>::Reaction
)
:
ReactionThermo(*thermoDatabase[species[0]]),
name_("un-named-reaction-" + Foam::name(getNewReactionID())),
species_(species),
lhs_(lhs),
rhs_(rhs)
@ -130,6 +144,7 @@ Foam::Reaction<ReactionThermo>::Reaction
)
:
ReactionThermo(r),
name_(r.name() + "Copy"),
species_(species),
lhs_(r.lhs_),
rhs_(r.rhs_)
@ -236,6 +251,7 @@ Foam::Reaction<ReactionThermo>::Reaction
)
:
ReactionThermo(*thermoDatabase[species[0]]),
name_("un-named-reaction" + Foam::name(getNewReactionID())),
species_(species)
{
setLRhs(is);
@ -252,6 +268,7 @@ Foam::Reaction<ReactionThermo>::Reaction
)
:
ReactionThermo(*thermoDatabase[species[0]]),
name_(dict.dictName()),
species_(species)
{
setLRhs(IStringStream(dict.lookup("reaction"))());
@ -318,7 +335,7 @@ Foam::Reaction<ReactionThermo>::New
const dictionary& dict
)
{
const word& reactionTypeName = dict.dictName();
const word& reactionTypeName = dict.lookup("type");
typename dictionaryConstructorTable::iterator cstrIter
= dictionaryConstructorTablePtr_->find(reactionTypeName);

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

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -69,6 +69,12 @@ class Reaction
public:
// Static data
//- Number of un-named reactions
static label nUnNamedReactions;
// Public data types
//- Class to hold the specie index and its coefficients in the
@ -112,6 +118,9 @@ private:
// Private data
//- Name of reaction
const word name_;
//- List of specie names present in reaction system
const speciesTable& species_;
@ -136,6 +145,9 @@ private:
//- Disallow default bitwise assignment
void operator=(const Reaction<ReactionThermo>&);
//- Return new reaction ID for un-named reactions
label getNewReactionID();
public:
@ -282,6 +294,9 @@ public:
// Access
inline word& name();
inline const word& name() const;
inline const List<specieCoeffs>& lhs() const;
inline const List<specieCoeffs>& rhs() const;

16
src/thermophysicalModels/specie/reaction/Reactions/Reaction/ReactionI.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -32,6 +32,20 @@ namespace Foam
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class ReactionThermo>
inline word& Reaction<ReactionThermo>::name()
{
return name_;
}
template<class ReactionThermo>
inline const word& Reaction<ReactionThermo>::name() const
{
return name_;
}
template<class ReactionThermo>
inline const List<typename Reaction<ReactionThermo>::specieCoeffs>&
Reaction<ReactionThermo>::lhs() const

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

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2010-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -105,13 +105,15 @@ bool Foam::ReactionList<ThermoType>::readReactionDict()
forAllConstIter(dictionary, reactions, iter)
{
const word reactionName = iter().keyword();
this->append
(
Reaction<ThermoType>::New
(
species_,
thermoDb_,
reactions.subDict(iter().keyword())
reactions.subDict(reactionName)
).ptr()
);
}
@ -129,8 +131,9 @@ void Foam::ReactionList<ThermoType>::write(Ostream& os) const
forAllConstIter(typename SLPtrList<Reaction<ThermoType> >, *this, iter)
{
const Reaction<ThermoType>& r = iter();
os << indent << r.type() << nl
os << indent << r.name() << nl
<< indent << token::BEGIN_BLOCK << incrIndent << nl;
os.writeKeyword("type") << r.type() << token::END_STATEMENT << nl;
r.write(os);
os << decrIndent << indent << token::END_BLOCK << nl;
}