portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2024-11-13 01:05:36 +00:00
Code Releases Activity

various compatibility fixes after merge

Browse Source
This commit is contained in:
Antonin Portelli 2017-06-20 17:24:55 +01:00
parent 7587df831a
commit 1e8a2e1621
4 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/qcd/action/gauge/Photon.h
View File

@ -41,11 +41,13 @@ namespace QCD{
template <typename vtype> template <typename vtype>
using iImplGaugeField = iVector<iScalar<iScalar<vtype>>, Nd>; using iImplGaugeField = iVector<iScalar<iScalar<vtype>>, Nd>;
typedef iImplGaugeLink<Simd> SiteLink; typedef iImplGaugeLink<Simd> SiteLink;
typedef iImplGaugeField<Simd> SiteField; typedef iImplGaugeField<Simd> SiteField;
typedef SiteField SiteComplex;
typedef Lattice<SiteLink> LinkField; typedef Lattice<SiteLink> LinkField;
typedef Lattice<SiteField> Field; typedef Lattice<SiteField> Field;
typedef Field ComplexField;
}; };
typedef QedGimpl<vComplex> QedGimplR; typedef QedGimpl<vComplex> QedGimplR;

15
lib/qcd/action/scalar/ScalarImpl.h
View File

@ -15,8 +15,10 @@ class ScalarImplTypes {
typedef iImplField<Simd> SiteField; typedef iImplField<Simd> SiteField;
typedef SiteField SitePropagator; typedef SiteField SitePropagator;
typedef SiteField SiteComplex;
typedef Lattice<SiteField> Field; typedef Lattice<SiteField> Field;
typedef Field ComplexField;
typedef Field FermionField; typedef Field FermionField;
typedef Field PropagatorField; typedef Field PropagatorField;
@ -92,11 +94,18 @@ class ScalarImplTypes {
public: public:
typedef S Simd; typedef S Simd;
template <typename vtype> template <typename vtype>
using iImplField = iScalar<iScalar<iMatrix<vtype, N> > >; using iImplField = iScalar<iScalar<iMatrix<vtype, N>>>;
template <typename vtype>
using iImplComplex = iScalar<iScalar<iScalar<vtype>>>;
typedef iImplField<Simd> SiteField; typedef iImplField<Simd> SiteField;
typedef SiteField SitePropagator;
typedef iImplComplex<Simd> SiteComplex;
typedef Lattice<SiteField> Field; typedef Lattice<SiteField> Field;
typedef Lattice<SiteComplex> ComplexField;
typedef Field FermionField;
typedef Field PropagatorField;
static inline void generate_momenta(Field& P, GridParallelRNG& pRNG) { static inline void generate_momenta(Field& P, GridParallelRNG& pRNG) {
QCD::SU<N>::GaussianFundamentalLieAlgebraMatrix(pRNG, P); QCD::SU<N>::GaussianFundamentalLieAlgebraMatrix(pRNG, P);

2
tests/IO/Test_ildg_io.cc
View File

@ -36,6 +36,7 @@ using namespace Grid::QCD;
int main (int argc, char ** argv) int main (int argc, char ** argv)
{ {
#ifdef HAVE_LIME
Grid_init(&argc,&argv); Grid_init(&argc,&argv);
std::cout <<GridLogMessage<< " main "<<std::endl; std::cout <<GridLogMessage<< " main "<<std::endl;
@ -96,4 +97,5 @@ int main (int argc, char ** argv)
std::cout <<GridLogMessage<< "norm2 Gauge Diff = "<<norm2(Umu_diff)<<std::endl; std::cout <<GridLogMessage<< "norm2 Gauge Diff = "<<norm2(Umu_diff)<<std::endl;
Grid_finalize(); Grid_finalize();
#endif
} }

2
tests/IO/Test_ildg_read.cc
View File

@ -36,6 +36,7 @@ using namespace Grid::QCD;
int main (int argc, char ** argv) int main (int argc, char ** argv)
{ {
#ifdef HAVE_LIME
Grid_init(&argc,&argv); Grid_init(&argc,&argv);
@ -112,4 +113,5 @@ int main (int argc, char ** argv)
std::cout<<GridLogMessage << "calculated link trace " <<l*LinkTraceScale<<std::endl; std::cout<<GridLogMessage << "calculated link trace " <<l*LinkTraceScale<<std::endl;
Grid_finalize(); Grid_finalize();
#endif
} }