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

dimensionedType: Added missing cmpt functions

Browse Source
This commit is contained in:
Henry
2013-07-04 10:00:44 +01:00
parent 39fc457726
commit 144a2b232e
2 changed files with 97 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
applications/test/dimensionedType/Test-dimensionedType.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-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -21,8 +21,6 @@ License
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>. along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "dimensionedTensor.H" #include "dimensionedTensor.H"
@ -33,16 +31,19 @@ using namespace Foam;
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
dimensionedTensor dt("dt", dimless, tensor(0, 1, 2, 3, 4, 5, 6, 7, 8)); dimensionedTensor dt("dt", dimLength, tensor(0, 1, 2, 3, 4, 5, 6, 7, 8));
Info<< dt.component(tensor::XX) << endl; Info<< "dt.component(tensor::XX): " << dt.component(tensor::XX) << endl;
dimensionedScalar ds("ds", dimless, 1.0); dimensionedScalar ds("ds", dimTime, 1.0);
Info<< ds*dt << " " << dt*ds << endl; Info<< "ds*dt dt*ds: " << ds*dt << " " << dt*ds << endl;
dimensionedTensor dt2("dt2", dimLength, tensor(1, 1, 2, 3, 4, 5, 6, 7, 8));
Info<< "cmptMultiply(dt, dt2): " << cmptMultiply(dt, dt2) << endl;
Info<< "cmptDivide(dt, dt2): " << cmptDivide(dt, dt2) << endl;
// dimensionSet
{ {
Pout<< "dimensionSet construct from is:" Pout<< "dimensionSet construct from is:"
<< dimensionSet(IStringStream("[Pa m^2 s^-2]")()) << dimensionSet(IStringStream("[Pa m^2 s^-2]")())
@ -53,7 +54,7 @@ int main(int argc, char *argv[])
is >> dset; is >> dset;
Pout<< "dimensionSet read:" << dset << endl; Pout<< "dimensionSet read:" << dset << endl;
} }
// dimensionedType
{ {
Pout<< "construct from is:" Pout<< "construct from is:"
<< dimensionedScalar(IStringStream("bla [Pa mm^2 s^-2] 3.0")()) << dimensionedScalar(IStringStream("bla [Pa mm^2 s^-2] 3.0")())

144
src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
View File

@ -27,15 +27,10 @@ License
#include "pTraits.H" #include "pTraits.H"
#include "dictionary.H" #include "dictionary.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
template<class Type> template<class Type>
dimensioned<Type> dimensioned<Type>::lookupOrDefault Foam::dimensioned<Type> Foam::dimensioned<Type>::lookupOrDefault
( (
const word& name, const word& name,
const dictionary& dict, const dictionary& dict,
@ -49,7 +44,7 @@ dimensioned<Type> dimensioned<Type>::lookupOrDefault
template<class Type> template<class Type>
dimensioned<Type> dimensioned<Type>::lookupOrAddToDict Foam::dimensioned<Type> Foam::dimensioned<Type>::lookupOrAddToDict
( (
const word& name, const word& name,
dictionary& dict, dictionary& dict,
@ -65,7 +60,7 @@ dimensioned<Type> dimensioned<Type>::lookupOrAddToDict
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Type> template<class Type>
dimensioned<Type>::dimensioned Foam::dimensioned<Type>::dimensioned
( (
const word& name, const word& name,
const dimensionSet& dimSet, const dimensionSet& dimSet,
@ -79,7 +74,7 @@ dimensioned<Type>::dimensioned
template<class Type> template<class Type>
dimensioned<Type>::dimensioned Foam::dimensioned<Type>::dimensioned
( (
const word& name, const word& name,
const dimensioned<Type>& dt const dimensioned<Type>& dt
@ -92,7 +87,7 @@ dimensioned<Type>::dimensioned
template<class Type> template<class Type>
dimensioned<Type>::dimensioned Foam::dimensioned<Type>::dimensioned
( (
Istream& is Istream& is
) )
@ -104,7 +99,7 @@ dimensioned<Type>::dimensioned
template<class Type> template<class Type>
dimensioned<Type>::dimensioned Foam::dimensioned<Type>::dimensioned
( (
const word& name, const word& name,
Istream& is Istream& is
@ -121,7 +116,7 @@ dimensioned<Type>::dimensioned
template<class Type> template<class Type>
dimensioned<Type>::dimensioned Foam::dimensioned<Type>::dimensioned
( (
const word& name, const word& name,
const dimensionSet& dimSet, const dimensionSet& dimSet,
@ -172,7 +167,7 @@ dimensioned<Type>::dimensioned
template<class Type> template<class Type>
dimensioned<Type>::dimensioned Foam::dimensioned<Type>::dimensioned
() ()
: :
name_("undefined"), name_("undefined"),
@ -184,46 +179,47 @@ dimensioned<Type>::dimensioned
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type> template<class Type>
const word& dimensioned<Type>::name() const const Foam::word& Foam::dimensioned<Type>::name() const
{ {
return name_; return name_;
} }
template<class Type> template<class Type>
word& dimensioned<Type>::name() Foam::word& Foam::dimensioned<Type>::name()
{ {
return name_; return name_;
} }
template<class Type> template<class Type>
const dimensionSet& dimensioned<Type>::dimensions() const const Foam::dimensionSet& Foam::dimensioned<Type>::dimensions() const
{ {
return dimensions_; return dimensions_;
} }
template<class Type> template<class Type>
dimensionSet& dimensioned<Type>::dimensions() Foam::dimensionSet& Foam::dimensioned<Type>::dimensions()
{ {
return dimensions_; return dimensions_;
} }
template<class Type> template<class Type>
const Type& dimensioned<Type>::value() const const Type& Foam::dimensioned<Type>::value() const
{ {
return value_; return value_;
} }
template<class Type> template<class Type>
Type& dimensioned<Type>::value() Type& Foam::dimensioned<Type>::value()
{ {
return value_; return value_;
} }
template<class Type> template<class Type>
dimensioned<typename dimensioned<Type>::cmptType> dimensioned<Type>::component Foam::dimensioned<typename Foam::dimensioned<Type>::cmptType>
Foam::dimensioned<Type>::component
( (
const direction d const direction d
) const ) const
@ -238,7 +234,7 @@ dimensioned<typename dimensioned<Type>::cmptType> dimensioned<Type>::component
template<class Type> template<class Type>
void dimensioned<Type>::replace void Foam::dimensioned<Type>::replace
( (
const direction d, const direction d,
const dimensioned<typename dimensioned<Type>::cmptType>& dc const dimensioned<typename dimensioned<Type>::cmptType>& dc
@ -250,14 +246,15 @@ void dimensioned<Type>::replace
template<class Type> template<class Type>
bool dimensioned<Type>::readIfPresent(const dictionary& dict) bool Foam::dimensioned<Type>::readIfPresent(const dictionary& dict)
{ {
return dict.readIfPresent(name_, value_); return dict.readIfPresent(name_, value_);
} }
template<class Type> template<class Type>
Foam::Istream& dimensioned<Type>::read(Istream& is, const dictionary& readSet) Foam::Istream&
Foam::dimensioned<Type>::read(Istream& is, const dictionary& readSet)
{ {
// Read name // Read name
is >> name_; is >> name_;
@ -281,7 +278,7 @@ Foam::Istream& dimensioned<Type>::read(Istream& is, const dictionary& readSet)
template<class Type> template<class Type>
Foam::Istream& dimensioned<Type>::read Foam::Istream& Foam::dimensioned<Type>::read
( (
Istream& is, Istream& is,
const HashTable<dimensionedScalar>& readSet const HashTable<dimensionedScalar>& readSet
@ -310,7 +307,7 @@ Foam::Istream& dimensioned<Type>::read
template<class Type> template<class Type>
Foam::Istream& dimensioned<Type>::read(Istream& is) Foam::Istream& Foam::dimensioned<Type>::read(Istream& is)
{ {
// Read name // Read name
is >> name_; is >> name_;
@ -336,7 +333,8 @@ Foam::Istream& dimensioned<Type>::read(Istream& is)
// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
template<class Type> template<class Type>
dimensioned<typename dimensioned<Type>::cmptType> dimensioned<Type>::operator[] Foam::dimensioned<typename Foam::dimensioned<Type>::cmptType>
Foam::dimensioned<Type>::operator[]
( (
const direction d const direction d
) const ) const
@ -346,7 +344,7 @@ dimensioned<typename dimensioned<Type>::cmptType> dimensioned<Type>::operator[]
template<class Type> template<class Type>
void dimensioned<Type>::operator+= void Foam::dimensioned<Type>::operator+=
( (
const dimensioned<Type>& dt const dimensioned<Type>& dt
) )
@ -357,7 +355,7 @@ void dimensioned<Type>::operator+=
template<class Type> template<class Type>
void dimensioned<Type>::operator-= void Foam::dimensioned<Type>::operator-=
( (
const dimensioned<Type>& dt const dimensioned<Type>& dt
) )
@ -368,7 +366,7 @@ void dimensioned<Type>::operator-=
template<class Type> template<class Type>
void dimensioned<Type>::operator*= void Foam::dimensioned<Type>::operator*=
( (
const scalar s const scalar s
) )
@ -378,7 +376,7 @@ void dimensioned<Type>::operator*=
template<class Type> template<class Type>
void dimensioned<Type>::operator/= void Foam::dimensioned<Type>::operator/=
( (
const scalar s const scalar s
) )
@ -390,8 +388,8 @@ void dimensioned<Type>::operator/=
// * * * * * * * * * * * * * * * Friend Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Friend Functions * * * * * * * * * * * * * //
template<class Type, int r> template<class Type, int r>
dimensioned<typename powProduct<Type, r>::type> Foam::dimensioned<typename Foam::powProduct<Type, r>::type>
pow(const dimensioned<Type>& dt, typename powProduct<Type, r>::type) Foam::pow(const dimensioned<Type>& dt, typename powProduct<Type, r>::type)
{ {
return dimensioned<typename powProduct<Type, r>::type> return dimensioned<typename powProduct<Type, r>::type>
( (
@ -401,9 +399,10 @@ pow(const dimensioned<Type>& dt, typename powProduct<Type, r>::type)
); );
} }
template<class Type> template<class Type>
dimensioned<typename outerProduct<Type, Type>::type> Foam::dimensioned<typename Foam::outerProduct<Type, Type>::type>
sqr(const dimensioned<Type>& dt) Foam::sqr(const dimensioned<Type>& dt)
{ {
return dimensioned<typename outerProduct<Type, Type>::type> return dimensioned<typename outerProduct<Type, Type>::type>
( (
@ -414,7 +413,7 @@ sqr(const dimensioned<Type>& dt)
} }
template<class Type> template<class Type>
dimensioned<scalar> magSqr(const dimensioned<Type>& dt) Foam::dimensioned<Foam::scalar> Foam::magSqr(const dimensioned<Type>& dt)
{ {
return dimensioned<scalar> return dimensioned<scalar>
( (
@ -425,7 +424,7 @@ dimensioned<scalar> magSqr(const dimensioned<Type>& dt)
} }
template<class Type> template<class Type>
dimensioned<scalar> mag(const dimensioned<Type>& dt) Foam::dimensioned<Foam::scalar> Foam::mag(const dimensioned<Type>& dt)
{ {
return dimensioned<scalar> return dimensioned<scalar>
( (
@ -437,7 +436,38 @@ dimensioned<scalar> mag(const dimensioned<Type>& dt)
template<class Type> template<class Type>
dimensioned<Type> max Foam::dimensioned<Type> Foam::cmptMultiply
(
const dimensioned<Type>& dt1,
const dimensioned<Type>& dt2
)
{
return dimensioned<Type>
(
"cmptMultiply(" + dt1.name() + ',' + dt2.name() + ')',
cmptMultiply(dt1.dimensions(), dt2.dimensions()),
cmptMultiply(dt1.value(), dt2.value())
);
}
template<class Type>
Foam::dimensioned<Type> Foam::cmptDivide
(
const dimensioned<Type>& dt1,
const dimensioned<Type>& dt2
)
{
return dimensioned<Type>
(
"cmptDivide(" + dt1.name() + ',' + dt2.name() + ')',
cmptDivide(dt1.dimensions(), dt2.dimensions()),
cmptDivide(dt1.value(), dt2.value())
);
}
template<class Type>
Foam::dimensioned<Type> Foam::max
( (
const dimensioned<Type>& dt1, const dimensioned<Type>& dt1,
const dimensioned<Type>& dt2 const dimensioned<Type>& dt2
@ -460,7 +490,7 @@ dimensioned<Type> max
template<class Type> template<class Type>
dimensioned<Type> min Foam::dimensioned<Type> Foam::min
( (
const dimensioned<Type>& dt1, const dimensioned<Type>& dt1,
const dimensioned<Type>& dt2 const dimensioned<Type>& dt2
@ -485,7 +515,7 @@ dimensioned<Type> min
// * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * // // * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * //
template<class Type> template<class Type>
Istream& operator>>(Istream& is, dimensioned<Type>& dt) Foam::Istream& Foam::operator>>(Istream& is, dimensioned<Type>& dt)
{ {
token nextToken(is); token nextToken(is);
is.putBack(nextToken); is.putBack(nextToken);
@ -518,7 +548,7 @@ Istream& operator>>(Istream& is, dimensioned<Type>& dt)
template<class Type> template<class Type>
Ostream& operator<<(Ostream& os, const dimensioned<Type>& dt) Foam::Ostream& Foam::operator<<(Ostream& os, const dimensioned<Type>& dt)
{ {
// Write the name // Write the name
os << dt.name() << token::SPACE; os << dt.name() << token::SPACE;
@ -542,7 +572,7 @@ Ostream& operator<<(Ostream& os, const dimensioned<Type>& dt)
// * * * * * * * * * * * * * * * Global Operators * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Global Operators * * * * * * * * * * * * * //
template<class Type> template<class Type>
bool operator> bool Foam::operator>
( (
const dimensioned<Type>& dt1, const dimensioned<Type>& dt1,
const dimensioned<Type>& dt2 const dimensioned<Type>& dt2
@ -553,7 +583,7 @@ bool operator>
template<class Type> template<class Type>
bool operator< bool Foam::operator<
( (
const dimensioned<Type>& dt1, const dimensioned<Type>& dt1,
const dimensioned<Type>& dt2 const dimensioned<Type>& dt2
@ -564,7 +594,7 @@ bool operator<
template<class Type> template<class Type>
dimensioned<Type> operator+ Foam::dimensioned<Type> Foam::operator+
( (
const dimensioned<Type>& dt1, const dimensioned<Type>& dt1,
const dimensioned<Type>& dt2 const dimensioned<Type>& dt2
@ -580,7 +610,7 @@ dimensioned<Type> operator+
template<class Type> template<class Type>
dimensioned<Type> operator-(const dimensioned<Type>& dt) Foam::dimensioned<Type> Foam::operator-(const dimensioned<Type>& dt)
{ {
return dimensioned<Type> return dimensioned<Type>
( (
@ -592,7 +622,7 @@ dimensioned<Type> operator-(const dimensioned<Type>& dt)
template<class Type> template<class Type>
dimensioned<Type> operator- Foam::dimensioned<Type> Foam::operator-
( (
const dimensioned<Type>& dt1, const dimensioned<Type>& dt1,
const dimensioned<Type>& dt2 const dimensioned<Type>& dt2
@ -608,7 +638,7 @@ dimensioned<Type> operator-
template<class Type> template<class Type>
dimensioned<Type> operator* Foam::dimensioned<Type> Foam::operator*
( (
const dimensioned<scalar>& ds, const dimensioned<scalar>& ds,
const dimensioned<Type>& dt const dimensioned<Type>& dt
@ -624,7 +654,7 @@ dimensioned<Type> operator*
template<class Type> template<class Type>
dimensioned<Type> operator/ Foam::dimensioned<Type> Foam::operator/
( (
const dimensioned<Type>& dt, const dimensioned<Type>& dt,
const dimensioned<scalar>& ds const dimensioned<scalar>& ds
@ -645,8 +675,12 @@ dimensioned<Type> operator/
#define PRODUCT_OPERATOR(product, op, opFunc) \ #define PRODUCT_OPERATOR(product, op, opFunc) \
\ \
template<class Type1, class Type2> \ template<class Type1, class Type2> \
dimensioned<typename product<Type1, Type2>::type> \ Foam::dimensioned<typename Foam::product<Type1, Type2>::type> \
operator op(const dimensioned<Type1>& dt1, const dimensioned<Type2>& dt2) \ Foam::operator op \
( \
const dimensioned<Type1>& dt1, \
const dimensioned<Type2>& dt2 \
) \
{ \ { \
return dimensioned<typename product<Type1, Type2>::type> \ return dimensioned<typename product<Type1, Type2>::type> \
( \ ( \
@ -657,8 +691,8 @@ operator op(const dimensioned<Type1>& dt1, const dimensioned<Type2>& dt2) \
} \ } \
\ \
template<class Type, class Form, class Cmpt, int nCmpt> \ template<class Type, class Form, class Cmpt, int nCmpt> \
dimensioned<typename product<Type, Form>::type> \ Foam::dimensioned<typename Foam::product<Type, Form>::type> \
operator op \ Foam::operator op \
( \ ( \
const dimensioned<Type>& dt1, \ const dimensioned<Type>& dt1, \
const VectorSpace<Form,Cmpt,nCmpt>& t2 \ const VectorSpace<Form,Cmpt,nCmpt>& t2 \
@ -673,8 +707,8 @@ operator op \
} \ } \
\ \
template<class Type, class Form, class Cmpt, int nCmpt> \ template<class Type, class Form, class Cmpt, int nCmpt> \
dimensioned<typename product<Form, Type>::type> \ Foam::dimensioned<typename Foam::product<Form, Type>::type> \
operator op \ Foam::operator op \
( \ ( \
const VectorSpace<Form,Cmpt,nCmpt>& t1, \ const VectorSpace<Form,Cmpt,nCmpt>& t1, \
const dimensioned<Type>& dt2 \ const dimensioned<Type>& dt2 \
@ -697,8 +731,4 @@ PRODUCT_OPERATOR(scalarProduct, &&, dotdot)
#undef PRODUCT_OPERATOR #undef PRODUCT_OPERATOR
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* // // ************************************************************************* //