1
0
mirror of https://github.com/paboyle/Grid.git synced 2024-11-10 07:55:35 +00:00

Hadrons: code cleaning

This commit is contained in:
Antonin Portelli 2016-05-07 13:26:56 -07:00
parent bb580ae077
commit df3fbc477e
3 changed files with 11 additions and 8 deletions

View File

@ -32,6 +32,9 @@ using namespace Grid;
using namespace QCD;
using namespace Hadrons;
#define BIG_SEP "==============="
#define SEP "---------------"
/******************************************************************************
* Application implementation *
******************************************************************************/
@ -204,8 +207,8 @@ void Application::configLoop(void)
for (unsigned int t = range.start; t < range.end; t += range.step)
{
LOG(Message) << "========== Starting measurement for trajectory " << t
<< " ==========" << std::endl;
LOG(Message) << BIG_SEP << " Starting measurement for trajectory " << t
<< " " << BIG_SEP << std::endl;
env_.setTrajectory(t);
execute(program_);
env_.freeAll();
@ -240,9 +243,9 @@ unsigned int Application::execute(const std::vector<std::string> &program)
for (unsigned int i = 0; i < program.size(); ++i)
{
// execute module
LOG(Message) << "---------- Measurement step " << i+1 << "/"
<< program.size() << " (module '" << program[i] << "')"
<< " ----------" << std::endl;
LOG(Message) << SEP << " Measurement step " << i+1 << "/"
<< program.size() << " (module '" << program[i] << "') "
<< SEP << std::endl;
(*module_[program[i]])();
size = env_.getTotalSize();
// print used memory after execution

View File

@ -86,7 +86,7 @@ private:
void configLoop(void);
unsigned int execute(const std::vector<std::string> &program);
// pretty size formatting
std::string sizeString(long unsigned int bytes);
static std::string sizeString(long unsigned int bytes);
private:
long unsigned int locVol_;
std::string parameterFileName_;

View File

@ -149,7 +149,7 @@ void Environment::freeFermionMatrix(const std::string name)
{
if (hasFermionMatrix(name))
{
LOG(Message) << "freeing fermion matrix '" << name << "'" << std::endl;
LOG(Message) << "Freeing fermion matrix '" << name << "'" << std::endl;
fMat_.erase(name);
object_.erase(name);
}
@ -243,7 +243,7 @@ void Environment::freeLattice(const std::string name)
{
if (hasLattice(name))
{
LOG(Message) << "freeing lattice '" << name << "'" << std::endl;
LOG(Message) << "Freeing lattice '" << name << "'" << std::endl;
lattice_.erase(name);
object_.erase(name);
}