From 4e307390936c72f3484fadc6c62a5aa6f4b57c23 Mon Sep 17 00:00:00 2001
From: paboyle <paboyle@ph.ed.ac.uk>
Date: Wed, 24 Jan 2018 13:08:47 +0000
Subject: [PATCH] First compile OK through nvcc on host

---
 tests/Test_simd.cc             |  2 --
 tests/core/Test_gamma.cc       |  2 --
 tests/forces/Test_dwf_force.cc | 22 ++++++++++++++++++----
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/tests/Test_simd.cc b/tests/Test_simd.cc
index a3dc200f..581eac7b 100644
--- a/tests/Test_simd.cc
+++ b/tests/Test_simd.cc
@@ -28,9 +28,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     /*  END LEGAL */
 #include <Grid/Grid.h>
 
-using namespace std;
 using namespace Grid;
- ;
 
 class funcPlus {
 public:
diff --git a/tests/core/Test_gamma.cc b/tests/core/Test_gamma.cc
index f3805bdb..1c09c2c1 100644
--- a/tests/core/Test_gamma.cc
+++ b/tests/core/Test_gamma.cc
@@ -29,9 +29,7 @@ See the full license in the file "LICENSE" in the top level distribution directo
     /*  END LEGAL */
 #include <Grid/Grid.h>
 
-using namespace std;
 using namespace Grid;
-using namespace QCD;
 
 static constexpr double                      tolerance = 1.0e-6;
 static std::array<SpinMatrix, Gamma::nGamma> testAlgebra;
diff --git a/tests/forces/Test_dwf_force.cc b/tests/forces/Test_dwf_force.cc
index 5cd49578..1a511459 100644
--- a/tests/forces/Test_dwf_force.cc
+++ b/tests/forces/Test_dwf_force.cc
@@ -29,7 +29,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
- ;
+
 
 int main (int argc, char ** argv)
 {
@@ -110,7 +110,9 @@ int main (int argc, char ** argv)
     PokeIndex<LorentzIndex>(mom,mommu,mu);
 
     // fourth order exponential approx
-    parallel_for(auto i=mom.begin();i<mom.end();i++){
+
+#if 0
+    thread_loop( (auto i=mom.begin();i<mom.end();i++),{
       Uprime[i](mu) =
 	  U[i](mu)
 	+ mom[i](mu)*U[i](mu)*dt 
@@ -120,8 +122,20 @@ int main (int argc, char ** argv)
 	+ mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *U[i](mu)*(dt*dt*dt*dt*dt/120.0)
 	+ mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *U[i](mu)*(dt*dt*dt*dt*dt*dt/720.0)
 	;
-    }
-
+      });
+#else
+    accelerator_loop( i, mom, {
+      Uprime[i](mu) =
+	  U[i](mu)
+	+ mom[i](mu)*U[i](mu)*dt 
+	+ mom[i](mu) *mom[i](mu) *U[i](mu)*(dt*dt/2.0)
+	+ mom[i](mu) *mom[i](mu) *mom[i](mu) *U[i](mu)*(dt*dt*dt/6.0)
+	+ mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *U[i](mu)*(dt*dt*dt*dt/24.0)
+	+ mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *U[i](mu)*(dt*dt*dt*dt*dt/120.0)
+	+ mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *U[i](mu)*(dt*dt*dt*dt*dt*dt/720.0)
+	;
+      });
+#endif
   }
   
   Ddwf.ImportGauge(Uprime);