Coordinate handling GPU friendly. Avoid std::vector

tests/core/Test_GaugeAction.cc

@@ -59,10 +59,10 @@ int main (int argc, char ** argv)
   Grid_init(&argc,&argv);
 
 
-  std::vector<int> simd_layout = GridDefaultSimd(4,vComplex::Nsimd());
-  std::vector<int> mpi_layout  = GridDefaultMpi();
-  std::vector<int> latt_size  ({16,16,16,32});
-  std::vector<int> clatt_size  ({4,4,4,8});
+  Coordinate simd_layout = GridDefaultSimd(4,vComplex::Nsimd());
+  Coordinate mpi_layout  = GridDefaultMpi();
+  Coordinate latt_size  ({16,16,16,32});
+  Coordinate clatt_size  ({4,4,4,8});
   int orthodir=3;
   int orthosz =latt_size[orthodir];
     

tests/core/Test_RectPlaq.cc

@@ -76,10 +76,10 @@ int main (int argc, char ** argv)
 {
   Grid_init(&argc,&argv);
 
-  std::vector<int> simd_layout = GridDefaultSimd(4,vComplex::Nsimd());
-  std::vector<int> mpi_layout  = GridDefaultMpi();
-  std::vector<int> latt_size  ({16,16,16,32});
-  std::vector<int> clatt_size  ({4,4,4,8});
+  Coordinate simd_layout = GridDefaultSimd(4,vComplex::Nsimd());
+  Coordinate mpi_layout  = GridDefaultMpi();
+  Coordinate latt_size  ({16,16,16,32});
+  Coordinate clatt_size  ({4,4,4,8});
   int orthodir=3;
   int orthosz =latt_size[orthodir];
     

tests/core/Test_checker.cc

@@ -56,7 +56,7 @@ int main (int argc, char ** argv)
 
   assert(argc >= 5);
   
-  std::vector<int> latt(4,0);
+  Coordinate latt(4,0);
   latt[0] = toint(argv[1]);
   latt[1] = toint(argv[2]);
   latt[2] = toint(argv[3]);
@@ -65,7 +65,7 @@ int main (int argc, char ** argv)
   const int Ls= toint(argv[5]);
   
   std::cout << "Lattice size (" << latt[0] << "," << latt[1] << "," << latt[2] << "," << latt[3] << ") Ls=" << Ls << std::endl;
-  std::vector<int> simd_layout = GridDefaultSimd(Nd,vComplexD::Nsimd());
+  Coordinate simd_layout = GridDefaultSimd(Nd,vComplexD::Nsimd());
   std::cout << "SIMD layout (" << simd_layout[0] << "," << simd_layout[1] << "," << simd_layout[2] << "," << simd_layout[3] << ")" << std::endl;
   GridCartesian         * UGrid   = SpaceTimeGrid::makeFourDimGrid(latt, simd_layout,GridDefaultMpi());
   GridRedBlackCartesian * UrbGrid = SpaceTimeGrid::makeFourDimRedBlackGrid(UGrid);
@@ -85,8 +85,8 @@ int main (int argc, char ** argv)
   LatticeType src_o(FrbGrid);
   pickCheckerboard(Odd,src_o,src);
 
-  std::vector<int> site(5);
-  std::vector<int> cbsite(5);
+  Coordinate site(5);
+  Coordinate cbsite(5);
   typedef typename GridTypeMapper<LatticeType::vector_object>::scalar_object sobj;
 
   // std::cout << "sizeof(vobj) " << sizeof(LatticeType::vector_object) << std::endl;

tests/core/Test_contfrac_even_odd.cc

@@ -29,7 +29,6 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
- ;
 
 template<class d>
 struct scal {

tests/core/Test_cshift_red_black.cc

@@ -38,12 +38,12 @@ int main (int argc, char ** argv)
 {
   Grid_init(&argc,&argv);
 
-  std::vector<int> latt_size   = GridDefaultLatt();
+  Coordinate latt_size   = GridDefaultLatt();
   int Nd = latt_size.size();
-  std::vector<int> simd_layout = GridDefaultSimd(Nd,vComplex::Nsimd());
-  std::vector<int> mpi_layout  = GridDefaultMpi();
+  Coordinate simd_layout = GridDefaultSimd(Nd,vComplex::Nsimd());
+  Coordinate mpi_layout  = GridDefaultMpi();
 
-  std::vector<int> mask(Nd,1);
+  Coordinate mask(Nd,1);
   mask[0]=0;
 
   GridCartesian         Fine  (latt_size,simd_layout,mpi_layout);
@@ -116,7 +116,7 @@ int main (int argc, char ** argv)
 	err = ShiftU - rbShiftU;
 	std::cout<< "\terror " <<norm2(err)<<std::endl;
 
-	std::vector<int> coor(4);
+	Coordinate coor(4);
 
 	std::cout<<GridLogMessage << "  Checking the non-checkerboard shift "<<shift <<" dir "<<dir <<" ... ";
 	for(coor[3]=0;coor[3]<latt_size[3];coor[3]++){
@@ -128,17 +128,17 @@ int main (int argc, char ** argv)
 
 	  /////////	  double nrm=norm2(U);
 
-	  std::vector<int> scoor(coor);
+	  Coordinate scoor(coor);
 	  scoor[dir] = (scoor[dir]+shift)%latt_size[dir];
 	  
 #ifndef POWER10
-	  std::vector<int> powers=latt_size;
+	  Coordinate powers=latt_size;
 	  Integer slex = scoor[0]
 	    + latt_size[0]*scoor[1]
 	    + latt_size[0]*latt_size[1]*scoor[2]
 	    + latt_size[0]*latt_size[1]*latt_size[2]*scoor[3];
 #else
-	  std::vector<int> powers({1,10,100,1000});
+	  Coordinate powers({1,10,100,1000});
 	  Integer slex = scoor[0]
 	    + 10        *scoor[1]
 	    + 100       *scoor[2]
@@ -147,7 +147,7 @@ int main (int argc, char ** argv)
 	  Complex scm(slex);
 	  
 	  double nrm = abs(scm-cm()()());
-	  std::vector<int> peer(4);
+	  Coordinate peer(4);
 	  Complex ctmp = cm;
 	  Integer index=real(ctmp);
 	  Lexicographic::CoorFromIndex(peer,index,powers);
@@ -182,17 +182,17 @@ int main (int argc, char ** argv)
 	    peekSite(cmeo,ShiftUe,coor);
 	  }
 
-	  std::vector<int> scoor(coor);
+	  Coordinate scoor(coor);
 	  scoor[dir] = (scoor[dir]+shift)%latt_size[dir];
 	  
 #ifndef POWER10
-	  std::vector<int> powers=latt_size;
+	  Coordinate powers=latt_size;
 	  Integer slex = scoor[0]
 	    + latt_size[0]*scoor[1]
 	    + latt_size[0]*latt_size[1]*scoor[2]
 	    + latt_size[0]*latt_size[1]*latt_size[2]*scoor[3];
 #else 
-	  std::vector<int> powers({1,10,100,1000});
+	  Coordinate powers({1,10,100,1000});
 	  Integer slex = scoor[0]
 	    + 10        *scoor[1]
 	    + 100       *scoor[2]
@@ -200,7 +200,7 @@ int main (int argc, char ** argv)
 #endif
 	  Complex scm(slex);
 
-	  std::vector<int> peer(4);
+	  Coordinate peer(4);
 	  Complex ctmp=cmeo;
 	  Integer index=real(ctmp);
 	  Lexicographic::CoorFromIndex(peer,index,powers);

tests/core/Test_cshift_red_black_rotate.cc

@@ -38,12 +38,12 @@ int main (int argc, char ** argv)
 {
   Grid_init(&argc,&argv);
 
-  std::vector<int> latt_size   = GridDefaultLatt();
+  Coordinate latt_size   = GridDefaultLatt();
   int Nd = latt_size.size();
-  std::vector<int> simd_layout( { vComplex::Nsimd(),1,1,1});
-  std::vector<int> mpi_layout  = GridDefaultMpi();
+  Coordinate simd_layout( { vComplex::Nsimd(),1,1,1});
+  Coordinate mpi_layout  = GridDefaultMpi();
 
-  std::vector<int> mask(Nd,1);
+  Coordinate mask(Nd,1);
   mask[0]=0;
 
   GridCartesian         Fine  (latt_size,simd_layout,mpi_layout);
@@ -117,7 +117,7 @@ int main (int argc, char ** argv)
 	err = ShiftU - rbShiftU;
 	std::cout<< "\terror " <<norm2(err)<<std::endl;
 
-	std::vector<int> coor(4);
+	Coordinate coor(4);
 
 	std::cout<<GridLogMessage << "  Checking the non-checkerboard shift "<< shift << " dir "<<dir  <<"... ";
 	for(coor[3]=0;coor[3]<latt_size[3];coor[3]++){
@@ -129,17 +129,17 @@ int main (int argc, char ** argv)
 
 	  /////////	  double nrm=norm2(U);
 
-	  std::vector<int> scoor(coor);
+	  Coordinate scoor(coor);
 	  scoor[dir] = (scoor[dir]+shift)%latt_size[dir];
 
 #ifdef POWER10
-	  std::vector<int> powers({1,10,100,1000});
+	  Coordinate powers({1,10,100,1000});
 	  Integer slex = scoor[3]
 	    + 10        *scoor[2]
 	    + 100       *scoor[1]
 	    + 1000      *scoor[0];
 #else
-	  std::vector<int> powers=latt_size;
+	  Coordinate powers=latt_size;
 	  Integer slex = scoor[0]
 	    + latt_size[0]*scoor[1]
 	    + latt_size[0]*latt_size[1]*scoor[2]
@@ -149,7 +149,7 @@ int main (int argc, char ** argv)
 	  Complex scm(slex);
 	  
 	  double nrm = abs(scm-cm()()());
-	  std::vector<int> peer(4);
+	  Coordinate peer(4);
 	  Complex ctmp = cm;
 	  Integer index=real(ctmp);
 	  Lexicographic::CoorFromIndex(peer,index,powers);
@@ -189,17 +189,17 @@ int main (int argc, char ** argv)
 	  }
 
 
-	  std::vector<int> scoor(coor);
+	  Coordinate scoor(coor);
 	  scoor[dir] = (scoor[dir]+shift)%latt_size[dir];
 
 #ifdef POWER10	  
-	  std::vector<int> powers({1,10,100,1000});
+	  Coordinate powers({1,10,100,1000});
 	  Integer slex = scoor[3]
 	    + 10        *scoor[2]
 	    + 100       *scoor[1]
 	    + 1000      *scoor[0];
 #else
-	  std::vector<int> powers = latt_size;
+	  Coordinate powers = latt_size;
 	  Integer slex = scoor[0]
 	    + latt_size[0]*scoor[1]
 	    + latt_size[0]*latt_size[1]*scoor[2]
@@ -207,7 +207,7 @@ int main (int argc, char ** argv)
 #endif
 	  Complex scm(slex);
 
-	  std::vector<int> peer(4);
+	  Coordinate peer(4);
 	  Complex ctmp=cmeo;
 	  Integer index=real(ctmp);
 	  Lexicographic::CoorFromIndex(peer,index,powers);

tests/core/Test_cshift_rotate.cc

@@ -35,9 +35,9 @@ int main (int argc, char ** argv)
 {
   Grid_init(&argc,&argv);
 
-  std::vector<int> latt_size   = GridDefaultLatt();
-  std::vector<int> simd_layout( { vComplex::Nsimd(),1,1,1});
-  std::vector<int> mpi_layout  = GridDefaultMpi();
+  Coordinate latt_size   = GridDefaultLatt();
+  Coordinate simd_layout( { vComplex::Nsimd(),1,1,1});
+  Coordinate mpi_layout  = GridDefaultMpi();
 
   GridCartesian        Fine(latt_size,simd_layout,mpi_layout);
 
@@ -76,7 +76,7 @@ int main (int argc, char ** argv)
 	std::cout << "ShiftU[0]" << ShiftU[0]<<std::endl;
 	std::cout << "ShiftU[1]" << ShiftU[1]<<std::endl;
 	*/
-	std::vector<int> coor(4);
+	Coordinate coor(4);
 
 	for(coor[3]=0;coor[3]<latt_size[3];coor[3]++){
 	for(coor[2]=0;coor[2]<latt_size[2];coor[2]++){
@@ -87,7 +87,7 @@ int main (int argc, char ** argv)
 
 	  double nrm=norm2(U);
 
-	  std::vector<int> scoor(coor);
+	  Coordinate scoor(coor);
 	  scoor[dir] = (scoor[dir]+shift)%latt_size[dir];
 	  
 	  Integer slex = scoor[0]
@@ -98,7 +98,7 @@ int main (int argc, char ** argv)
 	  Complex scm(slex);
 	  
 	  nrm = abs(scm-cm()()());
-	  std::vector<int> peer(4);
+	  Coordinate peer(4);
 	  Complex tmp  =cm;
 	  Integer index=real(tmp);
 	  Lexicographic::CoorFromIndex(peer,index,latt_size);

tests/core/Test_dwf_rb5d.cc

@@ -113,7 +113,7 @@ int main (int argc, char ** argv)
   
   
   for(int lidx=0;lidx<FGrid->lSites();lidx++){
-    std::vector<int> lcoor;
+    Coordinate lcoor;
     FGrid->LocalIndexToLocalCoor(lidx,lcoor);
     
     SpinColourVector siteSrc;

tests/core/Test_fft.cc

@@ -38,9 +38,9 @@ int main (int argc, char ** argv)
   int threads = GridThread::GetThreads();
   std::cout<<GridLogMessage << "Grid is setup to use "<<threads<<" threads"<<std::endl;
 
-  std::vector<int> latt_size   = GridDefaultLatt();
-  std::vector<int> simd_layout( { vComplexD::Nsimd(),1,1,1});
-  std::vector<int> mpi_layout  = GridDefaultMpi();
+  Coordinate latt_size   = GridDefaultLatt();
+  Coordinate simd_layout( { vComplexD::Nsimd(),1,1,1});
+  Coordinate mpi_layout  = GridDefaultMpi();
 
   int vol = 1;
   for(int d=0;d<latt_size.size();d++){
@@ -60,7 +60,7 @@ int main (int argc, char ** argv)
   LatticeSpinMatrixD    S(&GRID);
   LatticeSpinMatrixD    Stilde(&GRID);
   
-  std::vector<int> p({1,3,2,3});
+  Coordinate p({1,3,2,3});
 
   one = ComplexD(1.0,0.0);
   zz  = ComplexD(0.0,0.0);
@@ -294,7 +294,7 @@ int main (int argc, char ** argv)
     LatticeFermionD    ref(&GRID);
     LatticeFermionD    diff(&GRID);
 
-    std::vector<int> point(4,0);
+    Coordinate point(4,0);
     src=Zero();
     SpinColourVectorD ferm; gaussian(sRNG,ferm);
     pokeSite(ferm,src,point);
@@ -373,7 +373,7 @@ int main (int argc, char ** argv)
     LatticeFermionD    ref(&GRID);
     LatticeFermionD    diff(&GRID);
 
-    std::vector<int> point(4,0);
+    Coordinate point(4,0);
     src=Zero();
     SpinColourVectorD ferm; gaussian(sRNG,ferm);
     pokeSite(ferm,src,point);

tests/core/Test_fft_gfix.cc

@@ -39,9 +39,9 @@ int main (int argc, char ** argv)
 
   int threads = GridThread::GetThreads();
 
-  std::vector<int> latt_size   = GridDefaultLatt();
-  std::vector<int> simd_layout( { vComplex::Nsimd(),1,1,1});
-  std::vector<int> mpi_layout  = GridDefaultMpi();
+  Coordinate latt_size   = GridDefaultLatt();
+  Coordinate simd_layout( { vComplex::Nsimd(),1,1,1});
+  Coordinate mpi_layout  = GridDefaultMpi();
 
   int vol = 1;
   for(int d=0;d<latt_size.size();d++){

tests/core/Test_fftf.cc

@@ -38,9 +38,9 @@ int main (int argc, char ** argv)
   int threads = GridThread::GetThreads();
   std::cout<<GridLogMessage << "Grid is setup to use "<<threads<<" threads"<<std::endl;
 
-  std::vector<int> latt_size   = GridDefaultLatt();
-  std::vector<int> simd_layout( { vComplexF::Nsimd(),1,1,1});
-  std::vector<int> mpi_layout  = GridDefaultMpi();
+  Coordinate latt_size   = GridDefaultLatt();
+  Coordinate simd_layout( { vComplexF::Nsimd(),1,1,1});
+  Coordinate mpi_layout  = GridDefaultMpi();
 
   int vol = 1;
   for(int d=0;d<latt_size.size();d++){
@@ -57,7 +57,7 @@ int main (int argc, char ** argv)
   LatticeSpinMatrixF    S(&Fine);
   LatticeSpinMatrixF    Stilde(&Fine);
   
-  std::vector<int> p({1,2,3,2});
+  Coordinate p({1,2,3,2});
 
   one = ComplexF(1.0,0.0);
   zz  = ComplexF(0.0,0.0);

tests/core/Test_gamma.cc

@@ -236,9 +236,9 @@ int main(int argc, char *argv[])
 {
   Grid_init(&argc,&argv);
   
-  std::vector<int> latt_size   = GridDefaultLatt();
-  std::vector<int> simd_layout = GridDefaultSimd(4,vComplex::Nsimd());
-  std::vector<int> mpi_layout  = GridDefaultMpi();
+  Coordinate latt_size   = GridDefaultLatt();
+  Coordinate simd_layout = GridDefaultSimd(4,vComplex::Nsimd());
+  Coordinate mpi_layout  = GridDefaultMpi();
   
   GridCartesian Grid(latt_size,simd_layout,mpi_layout);
   GridSerialRNG sRNG;

tests/core/Test_gparity.cc

@@ -84,18 +84,18 @@ int main (int argc, char ** argv)
   //const int L =4;
   //std::vector<int> latt_2f(Nd,L);
 
-  std::vector<int> latt_2f = GridDefaultLatt();
-  std::vector<int> latt_1f(latt_2f); latt_1f[nu] = 2*latt_2f[nu];
+  Coordinate latt_2f = GridDefaultLatt();
+  Coordinate latt_1f(latt_2f); latt_1f[nu] = 2*latt_2f[nu];
   int L = latt_2f[nu];
 
 
-  std::vector<int> simd_layout = GridDefaultSimd(Nd,vComplexType::Nsimd());
+  Coordinate simd_layout = GridDefaultSimd(Nd,vComplexType::Nsimd());
 
   std::cout << GridLogMessage << "SIMD layout: ";
   for(int i=0;i<simd_layout.size();i++) std::cout << simd_layout[i] << " ";
   std::cout << std::endl;
   
-  std::vector<int> mpi_layout  = GridDefaultMpi(); //node layout
+  Coordinate mpi_layout  = GridDefaultMpi(); //node layout
 
   GridCartesian         * UGrid_1f   = SpaceTimeGrid::makeFourDimGrid(latt_1f, simd_layout, mpi_layout);
   GridRedBlackCartesian * UrbGrid_1f = SpaceTimeGrid::makeFourDimRedBlackGrid(UGrid_1f);

tests/core/Test_gpwilson_even_odd.cc

@@ -36,9 +36,9 @@ int main (int argc, char ** argv)
 {
   Grid_init(&argc,&argv);
 
-  std::vector<int> latt_size   = GridDefaultLatt();
-  std::vector<int> simd_layout = GridDefaultSimd(Nd,vComplex::Nsimd());
-  std::vector<int> mpi_layout  = GridDefaultMpi();
+  Coordinate latt_size   = GridDefaultLatt();
+  Coordinate simd_layout = GridDefaultSimd(Nd,vComplex::Nsimd());
+  Coordinate mpi_layout  = GridDefaultMpi();
   GridCartesian               Grid(latt_size,simd_layout,mpi_layout);
   GridRedBlackCartesian     RBGrid(&Grid);
 

tests/core/Test_main.cc

@@ -32,7 +32,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 using namespace std;
 using namespace Grid;
- ;
 
 /*
  Grid_main.cc(232): error: no suitable user-defined conversion from
@@ -58,9 +57,9 @@ auto peekDumKopf(const vobj &rhs, int i) -> decltype(peekIndex<3>(rhs, 0)) {
 int main(int argc, char **argv) {
   Grid_init(&argc, &argv);
 
-  std::vector<int> latt_size = GridDefaultLatt();
-  std::vector<int> simd_layout = GridDefaultSimd(4, vComplex::Nsimd());
-  std::vector<int> mpi_layout = GridDefaultMpi();
+  Coordinate latt_size = GridDefaultLatt();
+  Coordinate simd_layout = GridDefaultSimd(4, vComplex::Nsimd());
+  Coordinate mpi_layout = GridDefaultMpi();
 
   latt_size.resize(4);
 

tests/core/Test_rng.cc

@@ -35,9 +35,9 @@ int main (int argc, char ** argv)
 {
   Grid_init(&argc,&argv);
 
-  std::vector<int> latt_size   = GridDefaultLatt();
-  std::vector<int> simd_layout = GridDefaultSimd(4,vComplex::Nsimd());
-  std::vector<int> mpi_layout  = GridDefaultMpi();
+  Coordinate latt_size   = GridDefaultLatt();
+  Coordinate simd_layout = GridDefaultSimd(4,vComplex::Nsimd());
+  Coordinate mpi_layout  = GridDefaultMpi();
      
   GridCartesian     Grid(latt_size,simd_layout,mpi_layout);
 

tests/core/Test_rng_fixed.cc

@@ -35,9 +35,9 @@ int main (int argc, char ** argv)
 {
   Grid_init(&argc,&argv);
 
-  std::vector<int> latt_size   = GridDefaultLatt();
-  std::vector<int> simd_layout = GridDefaultSimd(4,vComplex::Nsimd());
-  std::vector<int> mpi_layout  = GridDefaultMpi();
+  Coordinate latt_size   = GridDefaultLatt();
+  Coordinate simd_layout = GridDefaultSimd(4,vComplex::Nsimd());
+  Coordinate mpi_layout  = GridDefaultMpi();
      
   GridCartesian     Grid(latt_size,simd_layout,mpi_layout);
 

tests/core/Test_staggered.cc

@@ -36,9 +36,9 @@ int main (int argc, char ** argv)
 {
   Grid_init(&argc,&argv);
 
-  std::vector<int> latt_size   = GridDefaultLatt();
-  std::vector<int> simd_layout = GridDefaultSimd(Nd,vComplex::Nsimd());
-  std::vector<int> mpi_layout  = GridDefaultMpi();
+  Coordinate latt_size   = GridDefaultLatt();
+  Coordinate simd_layout = GridDefaultSimd(Nd,vComplex::Nsimd());
+  Coordinate mpi_layout  = GridDefaultMpi();
   GridCartesian               Grid(latt_size,simd_layout,mpi_layout);
   GridRedBlackCartesian     RBGrid(&Grid);
 

tests/core/Test_staggered5D.cc

@@ -36,9 +36,9 @@ int main (int argc, char ** argv)
 {
   Grid_init(&argc,&argv);
 
-  std::vector<int> latt_size   = GridDefaultLatt();
-  std::vector<int> simd_layout = GridDefaultSimd(Nd,vComplex::Nsimd());
-  std::vector<int> mpi_layout  = GridDefaultMpi();
+  Coordinate latt_size   = GridDefaultLatt();
+  Coordinate simd_layout = GridDefaultSimd(Nd,vComplex::Nsimd());
+  Coordinate mpi_layout  = GridDefaultMpi();
 
   std::cout << GridLogMessage << "Making s innermost grids"<<std::endl;
 

tests/core/Test_staggered5Dvec.cc

@@ -36,9 +36,9 @@ int main (int argc, char ** argv)
 {
   Grid_init(&argc,&argv);
 
-  std::vector<int> latt_size   = GridDefaultLatt();
-  std::vector<int> simd_layout = GridDefaultSimd(Nd,vComplex::Nsimd());
-  std::vector<int> mpi_layout  = GridDefaultMpi();
+  Coordinate latt_size   = GridDefaultLatt();
+  Coordinate simd_layout = GridDefaultSimd(Nd,vComplex::Nsimd());
+  Coordinate mpi_layout  = GridDefaultMpi();
 
   const int Ls=16;
   GridCartesian         * UGrid   = SpaceTimeGrid::makeFourDimGrid(GridDefaultLatt(), GridDefaultSimd(Nd,vComplex::Nsimd()),GridDefaultMpi());
@@ -70,7 +70,7 @@ int main (int argc, char ** argv)
   FermionField src   (FGrid);
   random(pRNG5,src);
   /*
-  std::vector<int> site({0,1,2,0,0});
+  Coordinate site({0,1,2,0,0});
   ColourVector cv = Zero();
   cv()()(0)=1.0;
   src = Zero();

tests/core/Test_wilson_even_odd.cc

@@ -29,7 +29,6 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
- ;
 
 template<class d>
 struct scal {
@@ -47,9 +46,9 @@ int main (int argc, char ** argv)
 {
   Grid_init(&argc,&argv);
 
-  std::vector<int> latt_size   = GridDefaultLatt();
-  std::vector<int> simd_layout = GridDefaultSimd(Nd,vComplex::Nsimd());
-  std::vector<int> mpi_layout  = GridDefaultMpi();
+  Coordinate latt_size   = GridDefaultLatt();
+  Coordinate simd_layout = GridDefaultSimd(Nd,vComplex::Nsimd());
+  Coordinate mpi_layout  = GridDefaultMpi();
   GridCartesian               Grid(latt_size,simd_layout,mpi_layout);
   GridRedBlackCartesian     RBGrid(&Grid);
 

tests/core/Test_wilson_twisted_mass_even_odd.cc

@@ -48,9 +48,9 @@ int main (int argc, char ** argv)
 {
   Grid_init(&argc,&argv);
 
-  std::vector<int> latt_size   = GridDefaultLatt();
-  std::vector<int> simd_layout = GridDefaultSimd(Nd,vComplex::Nsimd());
-  std::vector<int> mpi_layout  = GridDefaultMpi();
+  Coordinate latt_size   = GridDefaultLatt();
+  Coordinate simd_layout = GridDefaultSimd(Nd,vComplex::Nsimd());
+  Coordinate mpi_layout  = GridDefaultMpi();
   GridCartesian               Grid(latt_size,simd_layout,mpi_layout);
   GridRedBlackCartesian     RBGrid(&Grid);
 

tests/core/Test_zmobius_even_odd.cc

@@ -30,7 +30,6 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
- ;
 
 template<class d>
 struct scal {
@@ -52,7 +51,6 @@ int main (int argc, char ** argv)
   int threads = GridThread::GetThreads();
   std::cout<<GridLogMessage << "Grid is setup to use "<<threads<<" threads"<<std::endl;
 
-
   const int Ls=10;
   GridCartesian         * UGrid   = SpaceTimeGrid::makeFourDimGrid(GridDefaultLatt(), GridDefaultSimd(Nd,vComplex::Nsimd()),GridDefaultMpi());
   GridCartesian         * FGrid   = SpaceTimeGrid::makeFiveDimGrid(Ls,UGrid);