Merge branch 'master' of https://github.com/paboyle/Grid into scidac1_2

Conflicts: configure lib/qcd/action/Actions.h lib/qcd/action/fermion/WilsonKernels.h
2025-06-12 20:27:06 +01:00 · 2016-01-06 03:44:57 -05:00
parent eb1759d7ea 34a0fde2ad
commit 5924e5a562
28 changed files with 8676 additions and 41 deletions
--- a/lib/algorithms/approx/.dirstamp
+++ b/lib/algorithms/approx/.dirstamp
--- a/lib/algorithms/iterative/ConjugateGradient.h
+++ b/lib/algorithms/iterative/ConjugateGradient.h
@ -98,7 +98,7 @@ public:
 	}
      }
      std::cout<<GridLogMessage<<"ConjugateGradient did NOT converge"<<std::endl;
-      assert(0);
+//      assert(0);
    }
  };
 }