From 786ca52c43e2556404130b5defa2bba0edbd86df Mon Sep 17 00:00:00 2001
From: paboyle <paboyle@ph.ed.ac.uk>
Date: Mon, 6 Jun 2016 07:05:51 -0700
Subject: [PATCH] Problems remain in the red black preconditioning of the Ls
 vectorisation

---
 benchmarks/Benchmark_dwf.cc         | 8 +++++---
 lib/cartesian/Cartesian_red_black.h | 9 ++++++++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/benchmarks/Benchmark_dwf.cc b/benchmarks/Benchmark_dwf.cc
index bf168c81..cd14d538 100644
--- a/benchmarks/Benchmark_dwf.cc
+++ b/benchmarks/Benchmark_dwf.cc
@@ -69,9 +69,11 @@ int main (int argc, char ** argv)
   GridCartesian         * FGrid   = SpaceTimeGrid::makeFiveDimGrid(Ls,UGrid);
   GridRedBlackCartesian * FrbGrid = SpaceTimeGrid::makeFiveDimRedBlackGrid(Ls,UGrid);
 
+  std::cout << GridLogMessage << "Making s innermost grids"<<std::endl;
   GridCartesian         * sUGrid   = SpaceTimeGrid::makeFourDimDWFGrid(GridDefaultLatt(),GridDefaultMpi());
   GridRedBlackCartesian * sUrbGrid = SpaceTimeGrid::makeFourDimRedBlackGrid(sUGrid);
   GridCartesian         * sFGrid   = SpaceTimeGrid::makeFiveDimDWFGrid(Ls,UGrid);
+  std::cout << GridLogMessage << "Making s innermost rb grids"<<std::endl;
   GridRedBlackCartesian * sFrbGrid = SpaceTimeGrid::makeFiveDimDWFRedBlackGrid(Ls,UGrid);
 
   std::vector<int> seeds4({1,2,3,4});
@@ -131,7 +133,7 @@ int main (int argc, char ** argv)
   
   RealD NP = UGrid->_Nprocessors;
 
-  for(int doasm=1;doasm<2;doasm++){
+  for(int doasm=0;doasm<1;doasm++){
 
     QCD::WilsonKernelsStatic::AsmOpt=doasm;
 
@@ -139,7 +141,7 @@ int main (int argc, char ** argv)
   
   std::cout<<GridLogMessage << "Calling Dw"<<std::endl;
   int ncall =50;
-  if (0) {
+  if (1) {
 
     double t0=usecond();
     for(int i=0;i<ncall;i++){
@@ -160,7 +162,7 @@ int main (int argc, char ** argv)
     //    Dw.Report();
   }
 
-  if (1)
+  if (0)
   {
     typedef WilsonFermion5D<DomainWallRedBlack5dImplF> WilsonFermion5DF;
     LatticeFermionF ssrc(sFGrid);
diff --git a/lib/cartesian/Cartesian_red_black.h b/lib/cartesian/Cartesian_red_black.h
index 2f39e87c..51ea818b 100644
--- a/lib/cartesian/Cartesian_red_black.h
+++ b/lib/cartesian/Cartesian_red_black.h
@@ -175,7 +175,14 @@ public:
 	//
 	// If Ls vectorised, this must still be the case; e.g. 
 	// layout == 8 , require _rdimensions[d] >= 2;
-	if ( simd_layout[d]>1 ) assert((_rdimensions[d]&0x1)==0); 
+	//	std::cout << GridLogMessage << " dimension "<<d<< " layout "<< _simd_layout[d] <<" ldimension "<<_ldimensions[d]<<std::endl;
+	if ( _simd_layout[d]>1 ) {
+	  if ( _rdimensions[d]&0x1 ) { 
+	    std::cout << GridLogMessage << " dimension "<<d<< " bad layout "<<
+	      _simd_layout[d] << " " << _ldimensions[d] << std::endl;
+	    //	    assert(0);
+	  }
+	}
 
 	_osites *= _rdimensions[d];
 	_isites *= _simd_layout[d];