portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2024-11-13 01:05:36 +00:00
Code Releases Activity

Say which A2AMatrix is being loaded, and which contraction is being performed (m of n)

Browse Source
This commit is contained in:
Michael Marshall 2019-08-02 19:23:18 +01:00
parent ed23f6be20
commit 8d97e2a02a
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Hadrons/Utilities/Contractor.cc
View File

@ -244,14 +244,13 @@ int main(int argc, char* argv[])
// parse parameter file // parse parameter file
Contractor::ContractorPar par; Contractor::ContractorPar par;
unsigned int nMat, nCont;
XmlReader reader(parFilename); XmlReader reader(parFilename);
read(reader, "global", par.global); read(reader, "global", par.global);
read(reader, "a2aMatrix", par.a2aMatrix); read(reader, "a2aMatrix", par.a2aMatrix);
read(reader, "product", par.product); read(reader, "product", par.product);
nMat = static_cast<unsigned int>(par.a2aMatrix.size()); const unsigned int nMat { static_cast<unsigned int>(par.a2aMatrix.size()) };
nCont = static_cast<unsigned int>(par.product.size()); const unsigned int nCont { static_cast<unsigned int>(par.product.size()) };
// create diskvectors // create diskvectors
std::map<std::string, EigenDiskVector<ComplexD>> a2aMat; std::map<std::string, EigenDiskVector<ComplexD>> a2aMat;
@ -270,13 +269,15 @@ int main(int argc, char* argv[])
std::cout << ":::::::: Trajectory " << traj << std::endl; std::cout << ":::::::: Trajectory " << traj << std::endl;
// load data // load data
int iSeq = 0;
for (auto &p: par.a2aMatrix) for (auto &p: par.a2aMatrix)
{ {
std::string filename = p.file; std::string filename = p.file;
double t; double t;
tokenReplace(filename, "traj", traj); tokenReplace(filename, "traj", traj);
std::cout << "======== Loading '" << filename << "'" << std::endl; std::cout << "======== Loading '" << filename << "'"
<< "\nA2AMatrix " << ++iSeq << " of " << nMat << " = " << p.name << std::endl;
A2AMatrixIo<HADRONS_A2AM_IO_TYPE> a2aIo(filename, p.dataset, par.global.nt); A2AMatrixIo<HADRONS_A2AM_IO_TYPE> a2aIo(filename, p.dataset, par.global.nt);
@ -288,6 +289,7 @@ int main(int argc, char* argv[])
// contract // contract
EigenDiskVector<ComplexD>::Matrix buf; EigenDiskVector<ComplexD>::Matrix buf;
iSeq = 0;
for (auto &p: par.product) for (auto &p: par.product)
{ {
std::vector<std::string> term = strToVec<std::string>(p.terms); std::vector<std::string> term = strToVec<std::string>(p.terms);
@ -301,7 +303,7 @@ int main(int argc, char* argv[])
Contractor::CorrelatorResult result; Contractor::CorrelatorResult result;
tAr.startTimer("Total"); tAr.startTimer("Total");
std::cout << "======== Contraction tr("; std::cout << "======== Contraction " << ++iSeq << " of " << nCont << " tr(";
for (unsigned int g = 0; g < term.size(); ++g) for (unsigned int g = 0; g < term.size(); ++g)
{ {
std::cout << term[g] << ((g == term.size() - 1) ? ')' : '*'); std::cout << term[g] << ((g == term.size() - 1) ? ')' : '*');