portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2025-04-09 21:50:45 +01:00
Code Releases Activity

Hadrons: more fixes after test

Browse Source
This commit is contained in:
Antonin Portelli 2017-12-14 21:14:10 +00:00
parent 591a38c487
commit bcf6f3890c
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
extras/Hadrons/Modules/MContraction/Meson.hpp
View File

@ -99,6 +99,8 @@ public:
virtual std::vector<std::string> getOutput(void); virtual std::vector<std::string> getOutput(void);
virtual void parseGammaString(std::vector<GammaPair> &gammaList); virtual void parseGammaString(std::vector<GammaPair> &gammaList);
protected: protected:
// execution
virtual void setup(void);
// execution // execution
virtual void execute(void); virtual void execute(void);
}; };
@ -160,8 +162,14 @@ void TMeson<FImpl1, FImpl2>::parseGammaString(std::vector<GammaPair> &gammaList)
{ {
// Parse individual contractions from input string. // Parse individual contractions from input string.
gammaList = strToVec<GammaPair>(par().gammas); gammaList = strToVec<GammaPair>(par().gammas);
} }
envTmpLat(LatticeComplex, "c"); }
// execution ///////////////////////////////////////////////////////////////////
template <typename FImpl1, typename FImpl2>
void TMeson<FImpl1, FImpl2>::setup(void)
{
envTmpLat(LatticeComplex, "c");
} }
// execution /////////////////////////////////////////////////////////////////// // execution ///////////////////////////////////////////////////////////////////

4
extras/Hadrons/VirtualMachine.cc
View File

@ -579,8 +579,8 @@ void VirtualMachine::executeProgram(const Program &p) const
{ {
// execute module // execute module
LOG(Message) << SEP << " Measurement step " << i + 1 << "/" LOG(Message) << SEP << " Measurement step " << i + 1 << "/"
<< p.size() << " (module '" << module_[p[i]].name << p.size() << " (module '" << module_[p[i]].name
<< "') " << SEP << std::endl; << "') " << SEP << std::endl;
(*module_[p[i]].data)(); (*module_[p[i]].data)();
sizeBefore = env().getTotalSize(); sizeBefore = env().getTotalSize();
// print used memory after execution // print used memory after execution

2
extras/Hadrons/VirtualMachine.hpp
View File

@ -59,7 +59,7 @@ public:
{ {
Size size; Size size;
Environment::Storage storage; Environment::Storage storage;
unsigned int module; int module;
}; };
struct MemoryProfile struct MemoryProfile
{ {