Re-Merge branch 'develop' into feature/gpu-port

Pull in Regensburg MultiGrid pull request
This commit is contained in:
Peter Boyle committed 2019-01-03 01:50:16 +00:00
commit c5e081d69c
52 files changed
+4444 -404

No files matched your search

+2 -2
View File
@@ -81,8 +81,8 @@ int main(int argc, char **argv) {
LatticeGaugeField Umu(&Grid), Uflow(&Grid);
SU<Nc>::HotConfiguration(pRNG, Umu);
typedef Grid::JSONReader Serialiser;
Serialiser Reader("input.json");
typedef Grid::XmlReader Serialiser;
Serialiser Reader("input.xml");
WFParameters WFPar(Reader);
ConfParameters CPar(Reader);
CheckpointerParameters CPPar(CPar.conf_prefix, CPar.rng_prefix);