From ed469898dc4b05ec6f9550f7f936b3de5b405e56 Mon Sep 17 00:00:00 2001
From: Peter Boyle <paboyle@ph.ed.ac.uk>
Date: Mon, 31 Aug 2020 23:38:40 -0400
Subject: [PATCH] coalesced ET expressions

---
 Grid/lattice/Lattice_base.h | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/Grid/lattice/Lattice_base.h b/Grid/lattice/Lattice_base.h
index 2d972970..3ad9f913 100644
--- a/Grid/lattice/Lattice_base.h
+++ b/Grid/lattice/Lattice_base.h
@@ -123,10 +123,9 @@ public:
     auto exprCopy = expr;
     ExpressionViewOpen(exprCopy);
     auto me  = View(AcceleratorWriteDiscard);
-    accelerator_for(ss,me.size(),1,{
-      auto tmp = coalescedEval(ss,exprCopy);
+    accelerator_for(ss,me.size(),vobj::Nsimd(),{
+      auto tmp = eval(ss,exprCopy);
       coalescedWrite(me[ss],tmp);
-      //      me[ss]=tmp;
     });
     me.ViewClose();
     ExpressionViewClose(exprCopy);
@@ -147,10 +146,9 @@ public:
     auto exprCopy = expr;
     ExpressionViewOpen(exprCopy);
     auto me  = View(AcceleratorWriteDiscard);
-    accelerator_for(ss,me.size(),1,{
-      auto tmp = coalescedEval(ss,exprCopy);
+    accelerator_for(ss,me.size(),vobj::Nsimd(),{
+      auto tmp = eval(ss,exprCopy);
       coalescedWrite(me[ss],tmp);
-      //me[ss]=tmp;
     });
     me.ViewClose();
     ExpressionViewClose(exprCopy);
@@ -170,10 +168,9 @@ public:
     auto exprCopy = expr;
     ExpressionViewOpen(exprCopy);
     auto me  = View(AcceleratorWriteDiscard);
-    accelerator_for(ss,me.size(),1,{
-      auto tmp = coalescedEval(ss,exprCopy);
+    accelerator_for(ss,me.size(),vobj::Nsimd(),{
+      auto tmp = eval(ss,exprCopy);
       coalescedWrite(me[ss],tmp);
-      //      me[ss]=tmp;
     });
     me.ViewClose();
     ExpressionViewClose(exprCopy);