portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2025-06-12 20:27:06 +01:00
Code Releases Activity

Got the NERSC IO working and fixed a bug in cshift.

Browse Source
This commit is contained in:
Peter Boyle
2015-04-22 22:46:48 +01:00
parent a5b0c492d7
commit 1851327d19
22 changed files with 925 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
lib/math/Grid_math_tensors.h
View File

@ -13,10 +13,12 @@ template<class vtype> class iScalar
public:
vtype _internal;
typedef typename GridTypeMapper<vtype>::scalar_type scalar_type;
typedef typename GridTypeMapper<vtype>::scalar_type scalar_type;
typedef typename GridTypeMapper<vtype>::vector_type vector_type;
typedef typename GridTypeMapper<vtype>::tensor_reduced tensor_reduced_v;
typedef iScalar<tensor_reduced_v> tensor_reduced;
typedef typename GridTypeMapper<vtype>::scalar_object recurse_scalar_object;
typedef iScalar<recurse_scalar_object> scalar_object;
enum { TensorLevel = GridTypeMapper<vtype>::TensorLevel + 1};
@ -27,7 +29,7 @@ public:
iScalar(scalar_type s) : _internal(s) {};// recurse down and hit the constructor for vector_type
iScalar(Zero &z){ *this = zero; };
iScalar(const Zero &z){ *this = zero; };
iScalar<vtype> & operator= (const Zero &hero){
zeroit(*this);
@ -73,11 +75,18 @@ public:
operator ComplexD () const { return(TensorRemove(_internal)); };
operator RealD () const { return(real(TensorRemove(_internal))); }
template<class T,typename std::enable_if<isGridTensor<T>::notvalue, T>::type* = nullptr > inline auto operator = (T arg) -> iScalar<vtype>
{
_internal = arg;
return *this;
}
};
///////////////////////////////////////////////////////////
// Allows to turn scalar<scalar<scalar<double>>>> back to double.
///////////////////////////////////////////////////////////
template<class T> inline typename std::enable_if<isGridTensor<T>::notvalue, T>::type TensorRemove(T arg) { return arg;}
template<class T> inline typename std::enable_if<isGridTensor<T>::notvalue, T>::type TensorRemove(T arg) { return arg;}
template<class vtype> inline auto TensorRemove(iScalar<vtype> arg) -> decltype(TensorRemove(arg._internal))
{
return TensorRemove(arg._internal);
@ -91,14 +100,17 @@ public:
typedef typename GridTypeMapper<vtype>::scalar_type scalar_type;
typedef typename GridTypeMapper<vtype>::vector_type vector_type;
typedef typename GridTypeMapper<vtype>::tensor_reduced tensor_reduced_v;
typedef typename GridTypeMapper<vtype>::scalar_object recurse_scalar_object;
typedef iScalar<tensor_reduced_v> tensor_reduced;
typedef iVector<recurse_scalar_object,N> scalar_object;
enum { TensorLevel = GridTypeMapper<vtype>::TensorLevel + 1};
typedef iScalar<tensor_reduced_v> tensor_reduced;
iVector(Zero &z){ *this = zero; };
iVector(const Zero &z){ *this = zero; };
iVector() {};// Empty constructure
iVector<vtype,N> & operator= (Zero &hero){
iVector<vtype,N> & operator= (const Zero &hero){
zeroit(*this);
return *this;
}
@ -153,18 +165,27 @@ public:
typedef typename GridTypeMapper<vtype>::scalar_type scalar_type;
typedef typename GridTypeMapper<vtype>::vector_type vector_type;
typedef typename GridTypeMapper<vtype>::tensor_reduced tensor_reduced_v;
typedef typename GridTypeMapper<vtype>::scalar_object recurse_scalar_object;
typedef iScalar<tensor_reduced_v> tensor_reduced;
typedef iMatrix<recurse_scalar_object,N> scalar_object;
enum { TensorLevel = GridTypeMapper<vtype>::TensorLevel + 1};
typedef iScalar<tensor_reduced_v> tensor_reduced;
iMatrix(Zero &z){ *this = zero; };
iMatrix(const Zero &z){ *this = zero; };
iMatrix() {};
iMatrix<vtype,N> & operator= (Zero &hero){
iMatrix<vtype,N> & operator= (const Zero &hero){
zeroit(*this);
return *this;
}
template<class T,typename std::enable_if<isGridTensor<T>::notvalue, T>::type* = nullptr > inline auto operator = (T arg) -> iMatrix<vtype,N>
{
zeroit(*this);
for(int i=0;i<N;i++)
_internal[i][i] = arg;
return *this;
}
friend void zeroit(iMatrix<vtype,N> &that){
for(int i=0;i<N;i++){
for(int j=0;j<N;j++){

14
lib/math/Grid_math_traits.h
View File

@ -25,6 +25,7 @@ namespace Grid {
typedef typename T::scalar_type scalar_type;
typedef typename T::vector_type vector_type;
typedef typename T::tensor_reduced tensor_reduced;
typedef typename T::scalar_object scalar_object;
enum { TensorLevel = T::TensorLevel };
};
@ -36,6 +37,7 @@ namespace Grid {
typedef RealF scalar_type;
typedef RealF vector_type;
typedef RealF tensor_reduced ;
typedef RealF scalar_object;
enum { TensorLevel = 0 };
};
template<> class GridTypeMapper<RealD> {
@ -43,6 +45,7 @@ namespace Grid {
typedef RealD scalar_type;
typedef RealD vector_type;
typedef RealD tensor_reduced;
typedef RealD scalar_object;
enum { TensorLevel = 0 };
};
template<> class GridTypeMapper<ComplexF> {
@ -50,6 +53,7 @@ namespace Grid {
typedef ComplexF scalar_type;
typedef ComplexF vector_type;
typedef ComplexF tensor_reduced;
typedef ComplexF scalar_object;
enum { TensorLevel = 0 };
};
template<> class GridTypeMapper<ComplexD> {
@ -57,6 +61,7 @@ namespace Grid {
typedef ComplexD scalar_type;
typedef ComplexD vector_type;
typedef ComplexD tensor_reduced;
typedef ComplexD scalar_object;
enum { TensorLevel = 0 };
};
@ -65,6 +70,7 @@ namespace Grid {
typedef RealF scalar_type;
typedef vRealF vector_type;
typedef vRealF tensor_reduced;
typedef RealF scalar_object;
enum { TensorLevel = 0 };
};
template<> class GridTypeMapper<vRealD> {
@ -72,6 +78,7 @@ namespace Grid {
typedef RealD scalar_type;
typedef vRealD vector_type;
typedef vRealD tensor_reduced;
typedef RealD scalar_object;
enum { TensorLevel = 0 };
};
template<> class GridTypeMapper<vComplexF> {
@ -79,6 +86,7 @@ namespace Grid {
typedef ComplexF scalar_type;
typedef vComplexF vector_type;
typedef vComplexF tensor_reduced;
typedef ComplexF scalar_object;
enum { TensorLevel = 0 };
};
template<> class GridTypeMapper<vComplexD> {
@ -86,6 +94,7 @@ namespace Grid {
typedef ComplexD scalar_type;
typedef vComplexD vector_type;
typedef vComplexD tensor_reduced;
typedef ComplexD scalar_object;
enum { TensorLevel = 0 };
};
template<> class GridTypeMapper<vInteger> {
@ -93,6 +102,7 @@ namespace Grid {
typedef Integer scalar_type;
typedef vInteger vector_type;
typedef vInteger tensor_reduced;
typedef Integer scalar_object;
enum { TensorLevel = 0 };
};
@ -102,6 +112,10 @@ namespace Grid {
static const bool notvalue = false;
};
template<> struct isGridTensor<int > {
static const bool value = false;
static const bool notvalue = true;
};
template<> struct isGridTensor<RealD > {
static const bool value = false;
static const bool notvalue = true;