Merge branch 'master' into chulwoo-dec12-2015

checking in before chaning to master
2025-06-14 13:57:07 +01:00 · 2016-06-06 10:57:27 -04:00 · 2016-05-26 16:42:50 -04:00
1 changed files with 2 additions and 0 deletions
--- a/lib/algorithms/iterative/ConjugateGradientMultiShift.h
+++ b/lib/algorithms/iterative/ConjugateGradientMultiShift.h
@ -243,6 +243,8 @@ void operator() (LinearOperatorBase<Field> &Linop, const Field &src, std::vector
      if ( (!converged[s]) ){
 	RealD css  = c * z[s][iz]* z[s][iz];
    if((k%100)==0 && (s==0) )
 	    std::cout<<GridLogMessage<<"ConjugateGradientMultiShift k="<<k<<" css " <<css <<std::endl;
 	if(css<rsq[s]){
 	  if ( ! converged[s] )
Author	SHA1	Message	Date
Chulwoo Jung	c5ab9f247f	Merge branch 'master' into chulwoo-dec12-2015	2016-06-06 10:57:27 -04:00
Chulwoo Jung	2893a9b116	checking in before chaning to master	2016-05-26 16:42:50 -04:00