Merge branch 'release/ISC-freeze-2'

paboyle · paboyle · commit 251b904a28e5 · 2018-06-04T21:09:48.000+01:00
diff --git a/lib/algorithms/iterative/ImplicitlyRestartedLanczos.h b/lib/algorithms/iterative/ImplicitlyRestartedLanczos.h
@@ -57,9 +57,8 @@ void basisRotate(std::vector<Field> &basis,Eigen::MatrixXd& Qt,int j0, int j1, i
       
   parallel_region
   {
-    Vector < vobj > B; // Thread private
 
-    PARALLEL_CRITICAL { B.resize(Nm); }
+    std::vector < vobj , commAllocator<vobj> > B(Nm); // Thread private
        
     parallel_for_internal(int ss=0;ss < grid->oSites();ss++){
       for(int j=j0; j<j1; ++j) B[j]=0.;

Original file line number	Diff line number	Diff line change
`@@ -57,9 +57,8 @@ void basisRotate(std::vector<Field> &basis,Eigen::MatrixXd& Qt,int j0, int j1, i`
`57`	`57`
`58`	`58`	`parallel_region`
`59`	`59`	`{`
`60`		`- Vector < vobj > B; // Thread private`
`61`	`60`
`62`		`- PARALLEL_CRITICAL { B.resize(Nm); }`
	`61`	`+ std::vector < vobj , commAllocator<vobj> > B(Nm); // Thread private`
`63`	`62`
`64`	`63`	`parallel_for_internal(int ss=0;ss < grid->oSites();ss++){`
`65`	`64`	`for(int j=j0; j<j1; ++j) B[j]=0.;`