From 1e8a2e1621044c831c2ed402c7d784d0b1cd4052 Mon Sep 17 00:00:00 2001
From: Antonin Portelli <antonin.portelli@me.com>
Date: Tue, 20 Jun 2017 17:24:55 +0100
Subject: [PATCH] various compatibility fixes after merge

---
 lib/qcd/action/gauge/Photon.h      |  6 ++++--
 lib/qcd/action/scalar/ScalarImpl.h | 17 +++++++++++++----
 tests/IO/Test_ildg_io.cc           |  2 ++
 tests/IO/Test_ildg_read.cc         |  2 ++
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/lib/qcd/action/gauge/Photon.h b/lib/qcd/action/gauge/Photon.h
index 1512d4e3..7e21a1de 100644
--- a/lib/qcd/action/gauge/Photon.h
+++ b/lib/qcd/action/gauge/Photon.h
@@ -41,11 +41,13 @@ namespace QCD{
     template <typename vtype>
     using iImplGaugeField = iVector<iScalar<iScalar<vtype>>, Nd>;
     
-    typedef iImplGaugeLink<Simd> SiteLink;
+    typedef iImplGaugeLink<Simd>  SiteLink;
     typedef iImplGaugeField<Simd> SiteField;
+    typedef SiteField             SiteComplex;
     
-    typedef Lattice<SiteLink> LinkField;
+    typedef Lattice<SiteLink>  LinkField;
     typedef Lattice<SiteField> Field;
+    typedef Field              ComplexField;
   };
   
   typedef QedGimpl<vComplex> QedGimplR;
diff --git a/lib/qcd/action/scalar/ScalarImpl.h b/lib/qcd/action/scalar/ScalarImpl.h
index 868bfc84..5342a1fa 100644
--- a/lib/qcd/action/scalar/ScalarImpl.h
+++ b/lib/qcd/action/scalar/ScalarImpl.h
@@ -15,8 +15,10 @@ class ScalarImplTypes {
 
     typedef iImplField<Simd> SiteField;
     typedef SiteField        SitePropagator;
+    typedef SiteField        SiteComplex;
     
     typedef Lattice<SiteField> Field;
+    typedef Field              ComplexField;
     typedef Field              FermionField;
     typedef Field              PropagatorField;
     
@@ -92,11 +94,18 @@ class ScalarImplTypes {
   public:
     typedef S Simd;
     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 Lattice<SiteField> Field;
+    typedef iImplField<Simd>   SiteField;
+    typedef SiteField          SitePropagator;
+    typedef iImplComplex<Simd> SiteComplex;
+    
+    typedef Lattice<SiteField>   Field;
+    typedef Lattice<SiteComplex> ComplexField;
+    typedef Field                FermionField;
+    typedef Field                PropagatorField;
 
     static inline void generate_momenta(Field& P, GridParallelRNG& pRNG) {
       QCD::SU<N>::GaussianFundamentalLieAlgebraMatrix(pRNG, P);
diff --git a/tests/IO/Test_ildg_io.cc b/tests/IO/Test_ildg_io.cc
index e3e9d385..6aac2e38 100644
--- a/tests/IO/Test_ildg_io.cc
+++ b/tests/IO/Test_ildg_io.cc
@@ -36,6 +36,7 @@ using namespace Grid::QCD;
 
 int main (int argc, char ** argv)
 {
+#ifdef HAVE_LIME
   Grid_init(&argc,&argv);
 
   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;
 
   Grid_finalize();
+#endif
 }
diff --git a/tests/IO/Test_ildg_read.cc b/tests/IO/Test_ildg_read.cc
index cb1f2efc..958fbe4e 100644
--- a/tests/IO/Test_ildg_read.cc
+++ b/tests/IO/Test_ildg_read.cc
@@ -36,6 +36,7 @@ using namespace Grid::QCD;
 
 int main (int argc, char ** argv)
 {
+#ifdef HAVE_LIME
   Grid_init(&argc,&argv);
 
 
@@ -112,4 +113,5 @@ int main (int argc, char ** argv)
   std::cout<<GridLogMessage << "calculated link trace " <<l*LinkTraceScale<<std::endl;
 
   Grid_finalize();
+#endif
 }