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

Be consistent about separator usage. Log start / stop / duration

Browse Source
This commit is contained in:
Michael Marshall 2019-08-02 15:47:20 +01:00
parent 310867d46a
commit cad76827b0
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Hadrons/Utilities/Contractor.cc
View File

@ -26,6 +26,8 @@ See the full license in the file "LICENSE" in the top level distribution directo
*************************************************************************************/ *************************************************************************************/
/* END LEGAL */ /* END LEGAL */
#include <chrono>
#include <ctime>
#include <Hadrons/Utilities/Contractor.hpp> #include <Hadrons/Utilities/Contractor.hpp>
#include <Hadrons/A2AMatrix.hpp> #include <Hadrons/A2AMatrix.hpp>
#include <Hadrons/DiskVector.hpp> #include <Hadrons/DiskVector.hpp>
@ -73,12 +75,12 @@ void saveCorrelator(const Contractor::CorrelatorResult &result, const std::strin
for (unsigned int i = 0; i < terms.size() - 1; i++) for (unsigned int i = 0; i < terms.size() - 1; i++)
{ {
fileStem += terms[i] + "_" + std::to_string(result.times[i]) + Separator; fileStem += terms[i] + Separator + std::to_string(result.times[i]) + Separator;
} }
fileStem += terms.back(); fileStem += terms.back();
if (!result.contraction.translationAverage) if (!result.contraction.translationAverage)
{ {
fileStem += Separator + "dt_" + std::to_string(dt); fileStem += Separator + "dt" + Separator + std::to_string(dt);
} }
filename = dir + "/" + RESULT_FILE_NAME(fileStem, traj); filename = dir + "/" + RESULT_FILE_NAME(fileStem, traj);
std::cout << "Saving correlator to '" << filename << "'" << std::endl; std::cout << "Saving correlator to '" << filename << "'" << std::endl;
@ -235,6 +237,11 @@ int main(int argc, char* argv[])
return EXIT_FAILURE; return EXIT_FAILURE;
} }
// Log what file we're processing and when we started
const std::chrono::system_clock::time_point start{ std::chrono::system_clock::now() };
std::time_t now = std::chrono::system_clock::to_time_t( start );
std::cout << "Start " << parFilename << " " << std::ctime( &now ) << std::endl;
// parse parameter file // parse parameter file
Contractor::ContractorPar par; Contractor::ContractorPar par;
unsigned int nMat, nCont; unsigned int nMat, nCont;
@ -436,6 +443,13 @@ int main(int argc, char* argv[])
printTimeProfile(tAr.getTimings(), tAr.getTimer("Total")); printTimeProfile(tAr.getTimings(), tAr.getTimer("Total"));
} }
} }
// Mention that we're finished, what the time is and how long it took
const std::chrono::system_clock::time_point stop{ std::chrono::system_clock::now() };
now = std::chrono::system_clock::to_time_t( stop );
const std::chrono::duration<double> duration_seconds = stop - start;
const double hours{ ( duration_seconds.count() + 0.5 ) / 3600 };
std::cout << "Stop " << parFilename << " " << std::ctime( &now )
<< "Total duration " << std::fixed << std::setprecision(1) << hours << " hours." << std::endl;
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }