1
0
mirror of https://github.com/paboyle/Grid.git synced 2025-06-15 06:17:05 +01:00

Merge branch 'develop' into feature/distil

* 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
3 changed files with 8 additions and 1 deletions

View File

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

View File

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