From bcf6f3890c38420eba6449f5190fc688b006fbf7 Mon Sep 17 00:00:00 2001
From: Antonin Portelli <antonin.portelli@me.com>
Date: Thu, 14 Dec 2017 21:14:10 +0000
Subject: [PATCH] Hadrons: more fixes after test

---
 extras/Hadrons/Modules/MContraction/Meson.hpp | 12 ++++++++++--
 extras/Hadrons/VirtualMachine.cc              |  4 ++--
 extras/Hadrons/VirtualMachine.hpp             |  2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/extras/Hadrons/Modules/MContraction/Meson.hpp b/extras/Hadrons/Modules/MContraction/Meson.hpp
index 1fd86d3a..3b250a3b 100644
--- a/extras/Hadrons/Modules/MContraction/Meson.hpp
+++ b/extras/Hadrons/Modules/MContraction/Meson.hpp
@@ -99,6 +99,8 @@ public:
     virtual std::vector<std::string> getOutput(void);
     virtual void parseGammaString(std::vector<GammaPair> &gammaList);
 protected:
+    // execution
+    virtual void setup(void);
     // execution
     virtual void execute(void);
 };
@@ -160,8 +162,14 @@ void TMeson<FImpl1, FImpl2>::parseGammaString(std::vector<GammaPair> &gammaList)
     {
         // Parse individual contractions from input string.
         gammaList = strToVec<GammaPair>(par().gammas);
-    }
-    envTmpLat(LatticeComplex, "c");    
+    } 
+}
+
+// execution ///////////////////////////////////////////////////////////////////
+template <typename FImpl1, typename FImpl2>
+void TMeson<FImpl1, FImpl2>::setup(void)
+{
+    envTmpLat(LatticeComplex, "c");
 }
 
 // execution ///////////////////////////////////////////////////////////////////
diff --git a/extras/Hadrons/VirtualMachine.cc b/extras/Hadrons/VirtualMachine.cc
index 8b2ea516..e0035bc1 100644
--- a/extras/Hadrons/VirtualMachine.cc
+++ b/extras/Hadrons/VirtualMachine.cc
@@ -579,8 +579,8 @@ void VirtualMachine::executeProgram(const Program &p) const
     {
         // execute module
         LOG(Message) << SEP << " Measurement step " << i + 1 << "/"
-                        << p.size() << " (module '" << module_[p[i]].name
-                        << "') " << SEP << std::endl;
+                     << p.size() << " (module '" << module_[p[i]].name
+                     << "') " << SEP << std::endl;
         (*module_[p[i]].data)();
         sizeBefore = env().getTotalSize();
         // print used memory after execution
diff --git a/extras/Hadrons/VirtualMachine.hpp b/extras/Hadrons/VirtualMachine.hpp
index a411c108..3af7d914 100644
--- a/extras/Hadrons/VirtualMachine.hpp
+++ b/extras/Hadrons/VirtualMachine.hpp
@@ -59,7 +59,7 @@ public:
     {
         Size                 size;
         Environment::Storage storage;
-        unsigned int         module;
+        int                  module;
     };
     struct MemoryProfile
     {