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

Merge branch 'develop' into feature/distil

Browse Source 
* develop:
  bugfix ZPerambulator
  registered module supporting ZMobius action
  changed to push_back according to request
  Added Hadrons_Error in case blockSize is set too large
  bugfix in perambulator module

# Conflicts:
#	Hadrons/Modules/MDistil/Perambulator.hpp
This commit is contained in:
Michael Marshall 2020-03-12 12:45:18 +00:00
commit c1677fccf6
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Hadrons/Modules/MContraction/A2AMesonField.hpp
View File

@ -231,6 +231,11 @@ void TA2AMesonField<FImpl>::execute(void)
int block = par().block; int block = par().block;
int cacheBlock = par().cacheBlock; int cacheBlock = par().cacheBlock;
if (N_i < block || N_j < block)
{
HADRONS_ERROR(Range, "blockSize must not exceed size of input vector.");
}
LOG(Message) << "Computing all-to-all meson fields" << std::endl; LOG(Message) << "Computing all-to-all meson fields" << std::endl;
LOG(Message) << "Left: '" << par().left << "' Right: '" << par().right << "'" << std::endl; LOG(Message) << "Left: '" << par().left << "' Right: '" << par().right << "'" << std::endl;
LOG(Message) << "Momenta:" << std::endl; LOG(Message) << "Momenta:" << std::endl;

1
Hadrons/Modules/MDistil/Perambulator.cc
View File

@ -34,6 +34,7 @@ using namespace Hadrons;
using namespace MDistil; using namespace MDistil;
template class Grid::Hadrons::MDistil::TPerambulator<FIMPL>; template class Grid::Hadrons::MDistil::TPerambulator<FIMPL>;
template class Grid::Hadrons::MDistil::TPerambulator<ZFIMPL>;
BEGIN_HADRONS_NAMESPACE BEGIN_HADRONS_NAMESPACE

3
Hadrons/Modules/MDistil/Perambulator.hpp
View File

@ -74,6 +74,7 @@ protected:
}; };
MODULE_REGISTER_TMP(Perambulator, TPerambulator<FIMPL>, MDistil); MODULE_REGISTER_TMP(Perambulator, TPerambulator<FIMPL>, MDistil);
MODULE_REGISTER_TMP(ZPerambulator, TPerambulator<ZFIMPL>, MDistil);
/****************************************************************************** /******************************************************************************
* TPerambulator implementation * * TPerambulator implementation *
@ -102,7 +103,7 @@ std::vector<std::string> TPerambulator<FImpl>::getOutput(void)
if( !UnsmearedSinkFileName.empty() ) if( !UnsmearedSinkFileName.empty() )
{ {
objName.append( UnsmearedSink ); objName.append( UnsmearedSink );
output.emplace_back( objName ); output.push_back( objName );
} }
return output; return output;
} }