From 04f92ccddff5f941743044182d4d25ed3c306d24 Mon Sep 17 00:00:00 2001
From: Daniel Richtmann <daniel.richtmann@physik.uni-regensburg.de>
Date: Mon, 22 Jan 2018 13:22:29 +0100
Subject: [PATCH] WilsonMG: Provide a fix for the previous commit; compiles and
 runs successfully now

I don't like the solution with the temporary very much though ...
---
 lib/lattice/Lattice_transfer.h | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/lattice/Lattice_transfer.h b/lib/lattice/Lattice_transfer.h
index 5a04d551..1c74a82d 100644
--- a/lib/lattice/Lattice_transfer.h
+++ b/lib/lattice/Lattice_transfer.h
@@ -322,10 +322,13 @@ inline void blockPromote(const Lattice<vobjC>              &coarseData,
       for(int d=0;d<_ndimension;d++) coor_c[d]=coor_f[d]/block_r[d];
       Lexicographic::IndexFromCoor(coor_c,sc,coarse->_rdimensions);
       
-      // TODO: These lines here prevent this commit from working
+      // The temporary is necessary, since a pure instance of Grid::simd<...> is
+      // not a valid argument to operator+ with an iVector, we need an an iScalar
+      typename vobjC::tensor_reduced tmp; // iScalar<iVector<iVector<...>>> -> iScalar<iScalar<iScalar<...>>>
       for(int i=0;i<nbasis;i++) {
-	if(i==0) fineData._odata[sf]=coarseData._odata[sc]()(0)(i) * Basis[i]._odata[sf];
-	else     fineData._odata[sf]=fineData._odata[sf]+coarseData._odata[sc]()(0)(i)*Basis[i]._odata[sf];
+        tmp = coarseData._odata[sc]()(0)(i);
+        if(i==0) fineData._odata[sf] = tmp * Basis[i]._odata[sf];
+        else     fineData._odata[sf]=fineData._odata[sf]+tmp*Basis[i]._odata[sf];
       }
     }
   }