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

Merge branch 'develop' into feature/hadrons

This commit is contained in:
2018-05-03 16:20:22 +01:00
18 changed files with 1438 additions and 496 deletions

View File

@ -263,7 +263,7 @@ PARALLEL_CRITICAL
GridBase *grid,
std::vector<fobj> &iodata,
std::string file,
uint64_t offset,
uint64_t& offset,
const std::string &format, int control,
uint32_t &nersc_csum,
uint32_t &scidac_csuma,
@ -495,6 +495,7 @@ PARALLEL_CRITICAL
exit(1);
#endif
}
offset = fout.tellp();
fout.close();
}
timer.Stop();
@ -699,7 +700,6 @@ PARALLEL_CRITICAL
IOobject(w,grid,iodata,file,offset,format,BINARYIO_WRITE|BINARYIO_LEXICOGRAPHIC,
nersc_csum,scidac_csuma,scidac_csumb);
iodata.resize(1);
{
std::vector<RngStateType> tmp(RngStateCount);