From 697c0603ce7e5ae819c99acf1c7ed33012b12306 Mon Sep 17 00:00:00 2001
From: paboyle <paboyle@ph.ed.ac.uk>
Date: Fri, 5 May 2017 16:54:44 +0100
Subject: [PATCH] SITMO I/O for NERSC working now bit repro

---
 lib/lattice/Lattice_rng.h                          |  2 +-
 tests/IO/Test_nersc_io.cc                          | 14 +++++++++-----
 tests/Makefile.am                                  |  2 +-
 tests/hmc/Test_hmc_EODWFRatio.cc                   |  2 +-
 tests/hmc/Test_hmc_EODWFRatioLsVectorised.cc       |  2 +-
 tests/hmc/Test_hmc_EODWFRatio_Gparity.cc           |  2 +-
 tests/hmc/Test_hmc_EOMobiusRatio.cc                |  2 +-
 tests/hmc/Test_hmc_EOWilsonFermionGauge.cc         |  2 +-
 tests/hmc/Test_hmc_EOWilsonRatio.cc                |  2 +-
 tests/hmc/Test_hmc_GparityIwasakiGauge.cc          |  2 +-
 tests/hmc/Test_hmc_GparityWilsonGauge.cc           |  2 +-
 tests/hmc/Test_hmc_IwasakiGauge.cc                 |  2 +-
 tests/hmc/Test_hmc_RectGauge.cc                    |  2 +-
 tests/hmc/Test_hmc_WilsonAdjointFermionGauge.cc    |  2 +-
 tests/hmc/Test_hmc_WilsonFermionGauge.cc           |  2 +-
 tests/hmc/Test_hmc_WilsonGauge.cc                  |  4 ++--
 ...t_hmc_WilsonMixedRepresentationsFermionGauge.cc |  2 +-
 tests/hmc/Test_hmc_WilsonRatio.cc                  |  2 +-
 tests/hmc/Test_hmc_WilsonTMFermionGauge.cc         |  2 +-
 ...Test_hmc_WilsonTwoIndexSymmetricFermionGauge.cc |  2 +-
 tests/hmc/Test_rhmc_EOWilson1p1.cc                 |  2 +-
 tests/hmc/Test_rhmc_EOWilsonRatio.cc               |  2 +-
 tests/hmc/Test_rhmc_Wilson1p1.cc                   |  2 +-
 tests/hmc/Test_rhmc_WilsonRatio.cc                 |  2 +-
 24 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/lib/lattice/Lattice_rng.h b/lib/lattice/Lattice_rng.h
index 0ea8b724..6dc50fd2 100644
--- a/lib/lattice/Lattice_rng.h
+++ b/lib/lattice/Lattice_rng.h
@@ -158,7 +158,7 @@ namespace Grid {
 #ifdef RNG_SITMO
     typedef sitmo::prng_engine 	RngEngine;
     typedef uint64_t    	RngStateType;
-    static const int    	RngStateCount = 4;
+    static const int    	RngStateCount = 13;
 #endif
 
     std::vector<RngEngine>                             _generators;
diff --git a/tests/IO/Test_nersc_io.cc b/tests/IO/Test_nersc_io.cc
index 6d50d8f0..cb33cfab 100644
--- a/tests/IO/Test_nersc_io.cc
+++ b/tests/IO/Test_nersc_io.cc
@@ -41,7 +41,7 @@ int main (int argc, char ** argv)
 
   std::vector<int> simd_layout = GridDefaultSimd(4,vComplex::Nsimd());
   std::vector<int> mpi_layout  = GridDefaultMpi();
-  std::vector<int> latt_size  ({32,32,32,32});
+  std::vector<int> latt_size  ({16,16,16,16});
   std::vector<int> clatt_size  ({4,4,4,8});
   int orthodir=3;
   int orthosz =latt_size[orthodir];
@@ -54,8 +54,8 @@ int main (int argc, char ** argv)
   GridSerialRNG     sRNGa;
   GridSerialRNG     sRNGb;
 
-  pRNGa.SeedFixedIntegers(std::vector<int>({45,12,81,9});
-  sRNGa.SeedFixedIntegers(std::vector<int>({45,12,81,9});
+  pRNGa.SeedFixedIntegers(std::vector<int>({45,12,81,9}));
+  sRNGa.SeedFixedIntegers(std::vector<int>({45,12,81,9}));
   
   std::string rfile("./ckpoint_rng.4000");
   NerscIO::writeRNGState(sRNGa,pRNGa,rfile);
@@ -80,8 +80,14 @@ int main (int argc, char ** argv)
 
   std::vector<LatticeColourMatrix> U(4,&Fine);
   
+  SU3::ColdConfiguration(pRNGa,Umu);
+
   NerscField header;
   std::string file("./ckpoint_lat.4000");
+
+  int precision32 = 0;
+  int tworow      = 0;
+  NerscIO::writeConfiguration(Umu,file,tworow,precision32);
   NerscIO::readConfiguration(Umu,header,file);
 
   for(int mu=0;mu<Nd;mu++){
@@ -147,8 +153,6 @@ int main (int argc, char ** argv)
   std::string clone2x3("./ckpoint_clone2x3.4000");
   std::string clone3x3("./ckpoint_clone3x3.4000");
 
-  int precision32 = 1;
-  int tworow      = 1;
   NerscIO::writeConfiguration(Umu,clone3x3,0,precision32);
   NerscIO::writeConfiguration(Umu,clone2x3,1,precision32);
   
diff --git a/tests/Makefile.am b/tests/Makefile.am
index af518f89..79e7e501 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = core forces hmc solver debug smearing
+SUBDIRS = core forces hmc solver debug smearing IO
 
 if BUILD_CHROMA_REGRESSION
   SUBDIRS+= qdpxx
diff --git a/tests/hmc/Test_hmc_EODWFRatio.cc b/tests/hmc/Test_hmc_EODWFRatio.cc
index 6e3976e9..dc903f4d 100644
--- a/tests/hmc/Test_hmc_EODWFRatio.cc
+++ b/tests/hmc/Test_hmc_EODWFRatio.cc
@@ -63,7 +63,7 @@ int main(int argc, char **argv) {
   CPparams.saveInterval = 5;
   CPparams.format = "IEEE64BIG";
   
-  TheHMC.Resources.LoadBinaryCheckpointer(CPparams);
+  TheHMC.Resources.LoadNerscCheckpointer(CPparams);
 
   RNGModuleParameters RNGpar;
   RNGpar.serial_seeds = "1 2 3 4 5";
diff --git a/tests/hmc/Test_hmc_EODWFRatioLsVectorised.cc b/tests/hmc/Test_hmc_EODWFRatioLsVectorised.cc
index 842e1bc7..fb2621a8 100644
--- a/tests/hmc/Test_hmc_EODWFRatioLsVectorised.cc
+++ b/tests/hmc/Test_hmc_EODWFRatioLsVectorised.cc
@@ -65,7 +65,7 @@ int main(int argc, char **argv) {
   CPparams.saveInterval = 5;
   CPparams.format = "IEEE64BIG";
   
-  TheHMC.Resources.LoadBinaryCheckpointer(CPparams);
+  TheHMC.Resources.LoadNerscCheckpointer(CPparams);
 
   RNGModuleParameters RNGpar;
   RNGpar.serial_seeds = "1 2 3 4 5";
diff --git a/tests/hmc/Test_hmc_EODWFRatio_Gparity.cc b/tests/hmc/Test_hmc_EODWFRatio_Gparity.cc
index 89a4b655..16d225be 100644
--- a/tests/hmc/Test_hmc_EODWFRatio_Gparity.cc
+++ b/tests/hmc/Test_hmc_EODWFRatio_Gparity.cc
@@ -62,7 +62,7 @@ int main(int argc, char **argv) {
   CPparams.saveInterval = 5;
   CPparams.format = "IEEE64BIG";
   
-  TheHMC.Resources.LoadBinaryCheckpointer(CPparams);
+  TheHMC.Resources.LoadNerscCheckpointer(CPparams);
 
   RNGModuleParameters RNGpar;
   RNGpar.serial_seeds = "1 2 3 4 5";
diff --git a/tests/hmc/Test_hmc_EOMobiusRatio.cc b/tests/hmc/Test_hmc_EOMobiusRatio.cc
index 534dd5c9..4b5da356 100644
--- a/tests/hmc/Test_hmc_EOMobiusRatio.cc
+++ b/tests/hmc/Test_hmc_EOMobiusRatio.cc
@@ -130,7 +130,7 @@ int main(int argc, char **argv) {
   CPparams.format = "IEEE64BIG";
   */
   
-  TheHMC.Resources.LoadBinaryCheckpointer(CPparams);
+  TheHMC.Resources.LoadNerscCheckpointer(CPparams);
 
   // RNG definition (Name: RandomNumberGenerator)
   RNGModuleParameters RNGpar(Reader);
diff --git a/tests/hmc/Test_hmc_EOWilsonFermionGauge.cc b/tests/hmc/Test_hmc_EOWilsonFermionGauge.cc
index 84d17b74..eccb10b7 100644
--- a/tests/hmc/Test_hmc_EOWilsonFermionGauge.cc
+++ b/tests/hmc/Test_hmc_EOWilsonFermionGauge.cc
@@ -60,7 +60,7 @@ int main(int argc, char **argv) {
   CPparams.saveInterval = 5;
   CPparams.format = "IEEE64BIG";
   
-  TheHMC.Resources.LoadBinaryCheckpointer(CPparams);
+  TheHMC.Resources.LoadNerscCheckpointer(CPparams);
 
   RNGModuleParameters RNGpar;
   RNGpar.serial_seeds = "1 2 3 4 5";
diff --git a/tests/hmc/Test_hmc_EOWilsonRatio.cc b/tests/hmc/Test_hmc_EOWilsonRatio.cc
index fc105f52..0344a534 100644
--- a/tests/hmc/Test_hmc_EOWilsonRatio.cc
+++ b/tests/hmc/Test_hmc_EOWilsonRatio.cc
@@ -62,7 +62,7 @@ int main(int argc, char **argv) {
   CPparams.saveInterval = 5;
   CPparams.format = "IEEE64BIG";
   
-  TheHMC.Resources.LoadBinaryCheckpointer(CPparams);
+  TheHMC.Resources.LoadNerscCheckpointer(CPparams);
 
   RNGModuleParameters RNGpar;
   RNGpar.serial_seeds = "1 2 3 4 5";
diff --git a/tests/hmc/Test_hmc_GparityIwasakiGauge.cc b/tests/hmc/Test_hmc_GparityIwasakiGauge.cc
index ee768881..6fbb389f 100644
--- a/tests/hmc/Test_hmc_GparityIwasakiGauge.cc
+++ b/tests/hmc/Test_hmc_GparityIwasakiGauge.cc
@@ -61,7 +61,7 @@ int main(int argc, char **argv) {
   CPparams.saveInterval = 5;
   CPparams.format = "IEEE64BIG";
   
-  TheHMC.Resources.LoadBinaryCheckpointer(CPparams);
+  TheHMC.Resources.LoadNerscCheckpointer(CPparams);
 
   RNGModuleParameters RNGpar;
   RNGpar.serial_seeds = "1 2 3 4 5";
diff --git a/tests/hmc/Test_hmc_GparityWilsonGauge.cc b/tests/hmc/Test_hmc_GparityWilsonGauge.cc
index bd824775..4fbb63d0 100644
--- a/tests/hmc/Test_hmc_GparityWilsonGauge.cc
+++ b/tests/hmc/Test_hmc_GparityWilsonGauge.cc
@@ -62,7 +62,7 @@ int main(int argc, char **argv) {
   CPparams.saveInterval = 5;
   CPparams.format = "IEEE64BIG";
   
-  TheHMC.Resources.LoadBinaryCheckpointer(CPparams);
+  TheHMC.Resources.LoadNerscCheckpointer(CPparams);
 
   RNGModuleParameters RNGpar;
   RNGpar.serial_seeds = "1 2 3 4 5";
diff --git a/tests/hmc/Test_hmc_IwasakiGauge.cc b/tests/hmc/Test_hmc_IwasakiGauge.cc
index 88d232df..c4d96d83 100644
--- a/tests/hmc/Test_hmc_IwasakiGauge.cc
+++ b/tests/hmc/Test_hmc_IwasakiGauge.cc
@@ -54,7 +54,7 @@ int main(int argc, char **argv) {
   CPparams.saveInterval = 20;
   CPparams.format = "IEEE64BIG";
   
-  TheHMC.Resources.LoadBinaryCheckpointer(CPparams);
+  TheHMC.Resources.LoadNerscCheckpointer(CPparams);
 
   RNGModuleParameters RNGpar;
   RNGpar.serial_seeds = "1 2 3 4 5";
diff --git a/tests/hmc/Test_hmc_RectGauge.cc b/tests/hmc/Test_hmc_RectGauge.cc
index ae294e70..c0601d2b 100644
--- a/tests/hmc/Test_hmc_RectGauge.cc
+++ b/tests/hmc/Test_hmc_RectGauge.cc
@@ -55,7 +55,7 @@ int main(int argc, char **argv) {
   CPparams.saveInterval = 20;
   CPparams.format = "IEEE64BIG";
   
-  TheHMC.Resources.LoadBinaryCheckpointer(CPparams);
+  TheHMC.Resources.LoadNerscCheckpointer(CPparams);
 
   RNGModuleParameters RNGpar;
   RNGpar.serial_seeds = "1 2 3 4 5";
diff --git a/tests/hmc/Test_hmc_WilsonAdjointFermionGauge.cc b/tests/hmc/Test_hmc_WilsonAdjointFermionGauge.cc
index d6a9b19f..af4fdae1 100644
--- a/tests/hmc/Test_hmc_WilsonAdjointFermionGauge.cc
+++ b/tests/hmc/Test_hmc_WilsonAdjointFermionGauge.cc
@@ -65,7 +65,7 @@ int main(int argc, char **argv) {
   CPparams.saveInterval = 5;
   CPparams.format = "IEEE64BIG";
   
-  TheHMC.Resources.LoadBinaryCheckpointer(CPparams);
+  TheHMC.Resources.LoadNerscCheckpointer(CPparams);
 
   RNGModuleParameters RNGpar;
   RNGpar.serial_seeds = "1 2 3 4 5";
diff --git a/tests/hmc/Test_hmc_WilsonFermionGauge.cc b/tests/hmc/Test_hmc_WilsonFermionGauge.cc
index 86091556..9b709a1a 100644
--- a/tests/hmc/Test_hmc_WilsonFermionGauge.cc
+++ b/tests/hmc/Test_hmc_WilsonFermionGauge.cc
@@ -62,7 +62,7 @@ int main(int argc, char **argv) {
   CPparams.saveInterval = 5;
   CPparams.format = "IEEE64BIG";
   
-  TheHMC.Resources.LoadBinaryCheckpointer(CPparams);
+  TheHMC.Resources.LoadNerscCheckpointer(CPparams);
 
   RNGModuleParameters RNGpar;
   RNGpar.serial_seeds = "1 2 3 4 5";
diff --git a/tests/hmc/Test_hmc_WilsonGauge.cc b/tests/hmc/Test_hmc_WilsonGauge.cc
index 7f8988be..b2d5fb02 100644
--- a/tests/hmc/Test_hmc_WilsonGauge.cc
+++ b/tests/hmc/Test_hmc_WilsonGauge.cc
@@ -51,10 +51,10 @@ int main(int argc, char **argv) {
   CheckpointerParameters CPparams;  
   CPparams.config_prefix = "ckpoint_lat";
   CPparams.rng_prefix = "ckpoint_rng";
-  CPparams.saveInterval = 20;
+  CPparams.saveInterval = 1;
   CPparams.format = "IEEE64BIG";
   
-  TheHMC.Resources.LoadBinaryCheckpointer(CPparams);
+  TheHMC.Resources.LoadNerscCheckpointer(CPparams);
 
   RNGModuleParameters RNGpar;
   RNGpar.serial_seeds = "1 2 3 4 5";
diff --git a/tests/hmc/Test_hmc_WilsonMixedRepresentationsFermionGauge.cc b/tests/hmc/Test_hmc_WilsonMixedRepresentationsFermionGauge.cc
index 8c509b65..b54345cf 100644
--- a/tests/hmc/Test_hmc_WilsonMixedRepresentationsFermionGauge.cc
+++ b/tests/hmc/Test_hmc_WilsonMixedRepresentationsFermionGauge.cc
@@ -74,7 +74,7 @@ int main(int argc, char **argv) {
   CPparams.saveInterval = 5;
   CPparams.format = "IEEE64BIG";
   
-  TheHMC.Resources.LoadBinaryCheckpointer(CPparams);
+  TheHMC.Resources.LoadNerscCheckpointer(CPparams);
 
   RNGModuleParameters RNGpar;
   RNGpar.serial_seeds = "1 2 3 4 5";
diff --git a/tests/hmc/Test_hmc_WilsonRatio.cc b/tests/hmc/Test_hmc_WilsonRatio.cc
index 6fd2ad51..4e6426ca 100644
--- a/tests/hmc/Test_hmc_WilsonRatio.cc
+++ b/tests/hmc/Test_hmc_WilsonRatio.cc
@@ -61,7 +61,7 @@ int main(int argc, char **argv) {
   CPparams.saveInterval = 5;
   CPparams.format = "IEEE64BIG";
   
-  TheHMC.Resources.LoadBinaryCheckpointer(CPparams);
+  TheHMC.Resources.LoadNerscCheckpointer(CPparams);
 
   RNGModuleParameters RNGpar;
   RNGpar.serial_seeds = "1 2 3 4 5";
diff --git a/tests/hmc/Test_hmc_WilsonTMFermionGauge.cc b/tests/hmc/Test_hmc_WilsonTMFermionGauge.cc
index 573e5e0f..fbb9bd6f 100644
--- a/tests/hmc/Test_hmc_WilsonTMFermionGauge.cc
+++ b/tests/hmc/Test_hmc_WilsonTMFermionGauge.cc
@@ -62,7 +62,7 @@ int main(int argc, char **argv) {
   CPparams.saveInterval = 5;
   CPparams.format = "IEEE64BIG";
   
-  TheHMC.Resources.LoadBinaryCheckpointer(CPparams);
+  TheHMC.Resources.LoadNerscCheckpointer(CPparams);
 
   RNGModuleParameters RNGpar;
   RNGpar.serial_seeds = "1 2 3 4 5";
diff --git a/tests/hmc/Test_hmc_WilsonTwoIndexSymmetricFermionGauge.cc b/tests/hmc/Test_hmc_WilsonTwoIndexSymmetricFermionGauge.cc
index 43ec343b..853d8a92 100644
--- a/tests/hmc/Test_hmc_WilsonTwoIndexSymmetricFermionGauge.cc
+++ b/tests/hmc/Test_hmc_WilsonTwoIndexSymmetricFermionGauge.cc
@@ -64,7 +64,7 @@ int main(int argc, char **argv) {
   CPparams.saveInterval = 5;
   CPparams.format = "IEEE64BIG";
   
-  TheHMC.Resources.LoadBinaryCheckpointer(CPparams);
+  TheHMC.Resources.LoadNerscCheckpointer(CPparams);
 
   RNGModuleParameters RNGpar;
   RNGpar.serial_seeds = "1 2 3 4 5";
diff --git a/tests/hmc/Test_rhmc_EOWilson1p1.cc b/tests/hmc/Test_rhmc_EOWilson1p1.cc
index 0094c934..37713766 100644
--- a/tests/hmc/Test_rhmc_EOWilson1p1.cc
+++ b/tests/hmc/Test_rhmc_EOWilson1p1.cc
@@ -61,7 +61,7 @@ int main(int argc, char **argv) {
   CPparams.saveInterval = 5;
   CPparams.format = "IEEE64BIG";
   
-  TheHMC.Resources.LoadBinaryCheckpointer(CPparams);
+  TheHMC.Resources.LoadNerscCheckpointer(CPparams);
 
   RNGModuleParameters RNGpar;
   RNGpar.serial_seeds = "1 2 3 4 5";
diff --git a/tests/hmc/Test_rhmc_EOWilsonRatio.cc b/tests/hmc/Test_rhmc_EOWilsonRatio.cc
index 9b1b53c0..d7d6f35e 100644
--- a/tests/hmc/Test_rhmc_EOWilsonRatio.cc
+++ b/tests/hmc/Test_rhmc_EOWilsonRatio.cc
@@ -62,7 +62,7 @@ int main(int argc, char **argv) {
   CPparams.saveInterval = 5;
   CPparams.format = "IEEE64BIG";
   
-  TheHMC.Resources.LoadBinaryCheckpointer(CPparams);
+  TheHMC.Resources.LoadNerscCheckpointer(CPparams);
 
   RNGModuleParameters RNGpar;
   RNGpar.serial_seeds = "1 2 3 4 5";
diff --git a/tests/hmc/Test_rhmc_Wilson1p1.cc b/tests/hmc/Test_rhmc_Wilson1p1.cc
index 9aa2f2e3..bab86ab9 100644
--- a/tests/hmc/Test_rhmc_Wilson1p1.cc
+++ b/tests/hmc/Test_rhmc_Wilson1p1.cc
@@ -62,7 +62,7 @@ int main(int argc, char **argv) {
   CPparams.saveInterval = 5;
   CPparams.format = "IEEE64BIG";
   
-  TheHMC.Resources.LoadBinaryCheckpointer(CPparams);
+  TheHMC.Resources.LoadNerscCheckpointer(CPparams);
 
   RNGModuleParameters RNGpar;
   RNGpar.serial_seeds = "1 2 3 4 5";
diff --git a/tests/hmc/Test_rhmc_WilsonRatio.cc b/tests/hmc/Test_rhmc_WilsonRatio.cc
index 87557212..40bea28e 100644
--- a/tests/hmc/Test_rhmc_WilsonRatio.cc
+++ b/tests/hmc/Test_rhmc_WilsonRatio.cc
@@ -61,7 +61,7 @@ int main(int argc, char **argv) {
   CPparams.saveInterval = 5;
   CPparams.format = "IEEE64BIG";
   
-  TheHMC.Resources.LoadBinaryCheckpointer(CPparams);
+  TheHMC.Resources.LoadNerscCheckpointer(CPparams);
 
   RNGModuleParameters RNGpar;
   RNGpar.serial_seeds = "1 2 3 4 5";