Checks and updates on global static primitive constants

This commit is contained in:
Hrvoje Jasak 2010-10-20 20:57:08 +01:00
parent 607d5fefc4
commit c2a8e6f6ce
11 changed files with 24 additions and 16 deletions

View file

@ -299,7 +299,7 @@ inline Cmpt det(const DiagTensor<Cmpt>& t)
template <class Cmpt>
inline DiagTensor<Cmpt> inv(const DiagTensor<Cmpt>& dt)
{
return DiagTensor<Cmpt>(1.0/dt.xx(), 1.0/dt.yy(), 1.0/dt.zz());
return DiagTensor<Cmpt>(1.0/dt.xx(), 1.0/dt.yy(), 1.0/dt.zz());
}

View file

@ -48,7 +48,6 @@ namespace Foam
typedef DiagTensor<scalar> diagTensor;
//- Data associated with diagTensor type are contiguous
template<>
inline bool contiguous<diagTensor>() {return true;}

View file

@ -48,7 +48,7 @@ namespace Foam
typedef SphericalTensor<label> labelSphericalTensor;
//- Identity labelTensor
//- Global identity labelTensor
static const labelSphericalTensor labelI(1);
//- Data associated with labelSphericalTensor type are contiguous

View file

@ -48,12 +48,11 @@ namespace Foam
typedef SphericalTensor<scalar> sphericalTensor;
// Global spherical tensor definitions
// Identity tensor
static const sphericalTensor I;
static const sphericalTensor oneThirdI;
static const sphericalTensor twoThirdsI;
static const sphericalTensor I(1);
static const sphericalTensor oneThirdI(1.0/3.0);
static const sphericalTensor twoThirdsI(2.0/3.0);
//- Specify data associated with sphericalTensor type are contiguous

View file

@ -49,9 +49,9 @@ namespace Foam
typedef SphericalTensor2D<scalar> sphericalTensor2D;
//- Identity tensor
static const sphericalTensor2D I2D(1);
// Global spherical tensor definitions
static const sphericalTensor2D I2D(1);
static const sphericalTensor2D oneThirdI2D(1.0/3.0);
static const sphericalTensor2D twoThirdsI2D(2.0/3.0);

View file

@ -44,8 +44,16 @@ SourceFiles
namespace Foam
{
typedef Vector<complex> complexVector;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
typedef Vector<complex> complexVector;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#include "complexVectorI.H"

View file

@ -94,7 +94,11 @@ inline complex operator&(const complexVector& v1, const complexVector& v2)
// complexVector cross product
inline complexVector operator^(const complexVector& v1, const complexVector& v2)
inline complexVector operator^
(
const complexVector& v1,
const complexVector& v2
)
{
return complexVector
(

View file

@ -49,7 +49,6 @@ namespace Foam
typedef Vector<label> labelVector;
//- Data associated with labelVector type are contiguous
template<>
inline bool contiguous<labelVector>() {return true;}

View file

@ -54,6 +54,7 @@ const vector vector::max(VGREAT, VGREAT, VGREAT);
template<>
const vector vector::min(-VGREAT, -VGREAT, -VGREAT);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam

View file

@ -49,7 +49,6 @@ namespace Foam
typedef Vector<scalar> vector;
//- Data associated with vector type are contiguous
template<>
inline bool contiguous<vector>() {return true;}

View file

@ -49,7 +49,6 @@ namespace Foam
typedef Vector2D<scalar> vector2D;
//- Data associated with vector2D type are contiguous
template<>
inline bool contiguous<vector2D>() {return true;}