portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2025-06-12 20:27:06 +01:00
Code Releases Activity

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

Browse Source 
Conflicts:
	configure
	lib/qcd/action/Actions.h
	lib/qcd/action/fermion/WilsonKernels.h
This commit is contained in:
Jung
2016-01-06 03:44:57 -05:00
parent eb1759d7ea 34a0fde2ad
commit 5924e5a562
28 changed files with 8676 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/algorithms/iterative/ConjugateGradient.h
View File

@ -98,7 +98,7 @@ public:
}
}
std::cout<<GridLogMessage<<"ConjugateGradient did NOT converge"<<std::endl;
assert(0);
// assert(0);
}
};
}