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

Merge branch 'feature/distil' of github.com:mmphys/Grid into feature/distil

Browse Source
This commit is contained in:
ferben 2019-01-25 13:44:30 +00:00
commit aea49bc349
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Hadrons/Modules/MDistil/Distil.hpp
View File

@ -36,6 +36,7 @@
/****************************************************************************** /******************************************************************************
This potentially belongs in CartesianCommunicator This potentially belongs in CartesianCommunicator
Turns out I don't actually need this when running inside hadrons
******************************************************************************/ ******************************************************************************/
BEGIN_MODULE_NAMESPACE(Grid) BEGIN_MODULE_NAMESPACE(Grid)

16
Hadrons/Modules/MDistil/LapEvec.hpp
View File

@ -315,6 +315,8 @@ void TLapEvec<FImpl>::execute(void)
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
std::string sEigenPackName(getName()); std::string sEigenPackName(getName());
sEigenPackName.append("_");
sEigenPackName.append(std::to_string(vm().getTrajectory()));
bool bReturnValue = true; bool bReturnValue = true;
auto & eig4d = envGet(DistilEP, getName() ); auto & eig4d = envGet(DistilEP, getName() );
envGetTmp(std::vector<DistilEP>, eig); // Eigenpack for each timeslice envGetTmp(std::vector<DistilEP>, eig); // Eigenpack for each timeslice
@ -369,12 +371,14 @@ void TLapEvec<FImpl>::execute(void)
// Now rotate the eigenvectors into our phase convention // Now rotate the eigenvectors into our phase convention
RotateEigen( eig[t].evec ); RotateEigen( eig[t].evec );
// Write the eigenvectors and eigenvalues to disk if((1)) { // Debugging only
//std::cout << GridLogMessage << "Writing eigenvalues/vectors to " << pszEigenPack << std::endl; // Write the eigenvectors and eigenvalues to disk
eig[t].record.operatorXml = DefaultOperatorXml; //std::cout << GridLogMessage << "Writing eigenvalues/vectors to " << pszEigenPack << std::endl;
eig[t].record.solverXml = DefaultsolverXml; eig[t].record.operatorXml = DefaultOperatorXml;
eig[t].write(sEigenPackName,false,t); eig[t].record.solverXml = DefaultsolverXml;
//std::cout << GridLogMessage << "Written eigenvectors" << std::endl; eig[t].write(sEigenPackName,false,t);
//std::cout << GridLogMessage << "Written eigenvectors" << std::endl;
}
} }
for (int i=0;i<LPar.Nvec;i++){ for (int i=0;i<LPar.Nvec;i++){
std::cout << "Inserting Timeslice " << t << " into vector " << i << std::endl; std::cout << "Inserting Timeslice " << t << " into vector " << i << std::endl;