From d868a451200659853b30ba8e1af68af3ecc0ae9e Mon Sep 17 00:00:00 2001
From: fionnoh <fionnoh@gmail.com>
Date: Mon, 16 Jul 2018 16:19:59 +0100
Subject: [PATCH] Cleaned up some stuff that was erroneously included in a
 previous "trash" commit. Leaving in the mySliceInnerProdct function for now
 as it speeds up mesonfield creation quite a lot for 24^3 tests

---
 .../Modules/MContraction/MesonFieldGamma.hpp  |  4 +--
 lib/lattice/Lattice_reduction.h               | 10 +------
 lib/tensors/Tensor_inner.h                    | 26 -------------------
 3 files changed, 2 insertions(+), 38 deletions(-)

diff --git a/extras/Hadrons/Modules/MContraction/MesonFieldGamma.hpp b/extras/Hadrons/Modules/MContraction/MesonFieldGamma.hpp
index 0b81f607..3c73967e 100644
--- a/extras/Hadrons/Modules/MContraction/MesonFieldGamma.hpp
+++ b/extras/Hadrons/Modules/MContraction/MesonFieldGamma.hpp
@@ -39,8 +39,7 @@ class TMesonFieldGamma : public Module<MesonFieldPar>
       public:
         GRID_SERIALIZABLE_CLASS_MEMBERS(Result,
                                         Gamma::Algebra, gamma,
-                                        std::vector<std::vector<std::vector<ComplexD>>>, MesonField,
-                                        ComplexD, last);
+                                        std::vector<std::vector<std::vector<ComplexD>>>, MesonField);
     };
 
   public:
@@ -179,7 +178,6 @@ void TMesonFieldGamma<FImpl>::execute(void)
             LOG(Message) << "MF for i = " << i << " of " << N << std::endl;
         }
     }
-    result[0].last = MesonField_ij[7];
     saveResult(par().output, "meson", result);
 }
 
diff --git a/lib/lattice/Lattice_reduction.h b/lib/lattice/Lattice_reduction.h
index 12bfebed..196d6748 100644
--- a/lib/lattice/Lattice_reduction.h
+++ b/lib/lattice/Lattice_reduction.h
@@ -41,7 +41,6 @@ template<class vobj> inline RealD norm2(const Lattice<vobj> &arg){
 template<class vobj>
 inline ComplexD innerProduct(const Lattice<vobj> &left,const Lattice<vobj> &right)
 {
-  std::cout << GridLogMessage << "Start alloc innerProduct" << std::endl;
   typedef typename vobj::scalar_type scalar_type;
   typedef typename vobj::vector_typeD vector_type;
   GridBase *grid = left._grid;
@@ -50,8 +49,6 @@ inline ComplexD innerProduct(const Lattice<vobj> &left,const Lattice<vobj> &righ
   ComplexD  inner;
   Vector<ComplexD> sumarray(grid->SumArraySize()*pad);
 
-  std::cout << GridLogMessage << "End alloc innerProduct" << std::endl;
-  std::cout << GridLogMessage << "Start parallel for innerProduct" << std::endl;
   parallel_for(int thr=0;thr<grid->SumArraySize();thr++){
     int nwork, mywork, myoff;
     GridThread::GetWork(left._grid->oSites(),thr,mywork,myoff);
@@ -65,18 +62,13 @@ inline ComplexD innerProduct(const Lattice<vobj> &left,const Lattice<vobj> &righ
     ComplexD tmp = Reduce(TensorRemove(vinner)) ;
     vstream(sumarray[thr*pad],tmp);
   }
-  std::cout << GridLogMessage << "End parallel for innerProduct" << std::endl;
 
-  std::cout << GridLogMessage << "Start inner sum innerProduct" << std::endl;
   inner=0.0;
   for(int i=0;i<grid->SumArraySize();i++){
     inner = inner+sumarray[i*pad];
   } 
   right._grid->GlobalSum(inner);
   return inner;
-  std::cout << GridLogMessage << "End inner sum innerProduct" << std::endl;
-
-  std::cout << GridLogMessage << "End innerProduct" << std::endl;
 }
 
 /////////////////////////
@@ -339,7 +331,7 @@ static void localSliceInnerProductVector(std::vector<ComplexD> &result, const La
     for(int n=0;n<e1;n++){
       for(int b=0;b<e2;b++){
         int ss = so + n * stride + b;
-        vv = TensorRemove(innerProduct(lhs._odata[ss]._internal, rhs._odata[ss]._internal));
+        vv = TensorRemove(innerProduct(lhs._odata[ss], rhs._odata[ss]));
         lvSum[r] = lvSum[r] + vv;
       }
     }
diff --git a/lib/tensors/Tensor_inner.h b/lib/tensors/Tensor_inner.h
index b7a8417d..46185652 100644
--- a/lib/tensors/Tensor_inner.h
+++ b/lib/tensors/Tensor_inner.h
@@ -106,7 +106,6 @@ inline vRealD innerProductD(const vRealF &l,const vRealF &r){
     typedef decltype(innerProduct(lhs._internal[0],rhs._internal[0])) ret_t;
     iScalar<ret_t> ret;
     ret=zero;
-    // std::cout << GridLogMessage << "innerProduct iVector" << std::endl;
     for(int c1=0;c1<N;c1++){
       ret._internal += innerProduct(lhs._internal[c1],rhs._internal[c1]);
     }
@@ -130,34 +129,9 @@ inline vRealD innerProductD(const vRealF &l,const vRealF &r){
   {
     typedef decltype(innerProduct(lhs._internal,rhs._internal)) ret_t;
     iScalar<ret_t> ret;
-    // std::cout << GridLogMessage << "innerProduct iScalar" << std::endl;
-
     ret._internal = innerProduct(lhs._internal,rhs._internal);
     return ret;
   }
-  template<class l,class r,int N> inline
-  auto myInnerProduct (const iVector<l,N>& lhs,const iVector<r,N>& rhs) -> iScalar<decltype(innerProduct(lhs._internal[0],rhs._internal[0]))>
-  {
-    typedef decltype(innerProduct(lhs._internal[0],rhs._internal[0])) ret_t;
-    iScalar<ret_t> ret;
-    ret=zero;
-    std::cout << GridLogMessage << "myInnerProduct iVector, N = " << N << std::endl;
-    for(int c1=0;c1<N;c1++){
-      ret._internal += innerProduct(lhs._internal[c1],rhs._internal[c1]);
-    }
-    return ret;
-  }
-
-  template<class l,class r> inline
-  auto myInnerProduct (const iScalar<l>& lhs,const iScalar<r>& rhs) -> iScalar<decltype(innerProduct(lhs._internal,rhs._internal))>
-  {
-    typedef decltype(innerProduct(lhs._internal,rhs._internal)) ret_t;
-    iScalar<ret_t> ret;
-    std::cout << GridLogMessage << "myInnerProduct iScalar" << std::endl;
-
-    ret._internal = myInnerProduct(lhs._internal,rhs._internal);
-    return ret;
-  }
 
 }
 #endif