mirror of
https://github.com/paboyle/Grid.git
synced 2024-11-10 07:55:35 +00:00
Merge branch 'develop' into feature/distil
* develop: No compile in single precisoin Intel 2019 fix
This commit is contained in:
commit
685d9bafef
@ -53,7 +53,7 @@ namespace Grid {
|
|||||||
ComplexField coor(in._grid);
|
ComplexField coor(in._grid);
|
||||||
ComplexField ph(in._grid); ph = zero;
|
ComplexField ph(in._grid); ph = zero;
|
||||||
FermionField in_buf(in._grid); in_buf = zero;
|
FermionField in_buf(in._grid); in_buf = zero;
|
||||||
Complex ci(0.0,1.0);
|
Scalar ci(0.0,1.0);
|
||||||
assert(twist.size() == Nd);//check that twist is Nd
|
assert(twist.size() == Nd);//check that twist is Nd
|
||||||
int shift = 0;
|
int shift = 0;
|
||||||
if(fiveD) shift = 1;
|
if(fiveD) shift = 1;
|
||||||
|
@ -106,7 +106,7 @@ namespace Grid {
|
|||||||
ComplexField coor(in._grid);
|
ComplexField coor(in._grid);
|
||||||
ComplexField ph(in._grid); ph = zero;
|
ComplexField ph(in._grid); ph = zero;
|
||||||
FermionField in_buf(in._grid); in_buf = zero;
|
FermionField in_buf(in._grid); in_buf = zero;
|
||||||
Complex ci(0.0,1.0);
|
Scalar ci(0.0,1.0);
|
||||||
assert(twist.size() == Nd);//check that twist is Nd
|
assert(twist.size() == Nd);//check that twist is Nd
|
||||||
for(unsigned int nu = 0; nu < Nd; nu++)
|
for(unsigned int nu = 0; nu < Nd; nu++)
|
||||||
{
|
{
|
||||||
|
@ -38,6 +38,7 @@ namespace QCD {
|
|||||||
|
|
||||||
#define INHERIT_GIMPL_TYPES(GImpl) \
|
#define INHERIT_GIMPL_TYPES(GImpl) \
|
||||||
typedef typename GImpl::Simd Simd; \
|
typedef typename GImpl::Simd Simd; \
|
||||||
|
typedef typename GImpl::Scalar Scalar; \
|
||||||
typedef typename GImpl::LinkField GaugeLinkField; \
|
typedef typename GImpl::LinkField GaugeLinkField; \
|
||||||
typedef typename GImpl::Field GaugeField; \
|
typedef typename GImpl::Field GaugeField; \
|
||||||
typedef typename GImpl::ComplexField ComplexField;\
|
typedef typename GImpl::ComplexField ComplexField;\
|
||||||
@ -55,7 +56,8 @@ namespace QCD {
|
|||||||
template <class S, int Nrepresentation = Nc, int Nexp = 12 > class GaugeImplTypes {
|
template <class S, int Nrepresentation = Nc, int Nexp = 12 > class GaugeImplTypes {
|
||||||
public:
|
public:
|
||||||
typedef S Simd;
|
typedef S Simd;
|
||||||
|
typedef typename Simd::scalar_type scalar_type;
|
||||||
|
typedef scalar_type Scalar;
|
||||||
template <typename vtype> using iImplScalar = iScalar<iScalar<iScalar<vtype> > >;
|
template <typename vtype> using iImplScalar = iScalar<iScalar<iScalar<vtype> > >;
|
||||||
template <typename vtype> using iImplGaugeLink = iScalar<iScalar<iMatrix<vtype, Nrepresentation> > >;
|
template <typename vtype> using iImplGaugeLink = iScalar<iScalar<iMatrix<vtype, Nrepresentation> > >;
|
||||||
template <typename vtype> using iImplGaugeField = iVector<iScalar<iMatrix<vtype, Nrepresentation> >, Nd>;
|
template <typename vtype> using iImplGaugeField = iVector<iScalar<iMatrix<vtype, Nrepresentation> >, Nd>;
|
||||||
|
@ -38,6 +38,7 @@ namespace QCD{
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
typedef S Simd;
|
typedef S Simd;
|
||||||
|
typedef typename Simd::scalar_type Scalar;
|
||||||
|
|
||||||
template <typename vtype>
|
template <typename vtype>
|
||||||
using iImplGaugeLink = iScalar<iScalar<iScalar<vtype>>>;
|
using iImplGaugeLink = iScalar<iScalar<iScalar<vtype>>>;
|
||||||
|
Loading…
Reference in New Issue
Block a user