1
0
mirror of https://github.com/paboyle/Grid.git synced 2025-06-19 08:17:05 +01:00

Re-Merge branch 'develop' into feature/gpu-port

Pull in Regensburg MultiGrid pull request
This commit is contained in:
Peter Boyle
2019-01-03 01:50:16 +00:00
52 changed files with 4444 additions and 404 deletions

View File

@ -769,7 +769,8 @@ static void sliceInnerProductMatrix( Eigen::MatrixXcd &mat, const Lattice<vobj>
for(int j=0;j<Nblock;j++){
auto tmp = innerProduct(Left[i],Right[j]);
auto rtmp = TensorRemove(tmp);
mat_thread(i,j) += Reduce(rtmp);
auto red = Reduce(rtmp);
mat_thread(i,j) += std::complex<double>(real(red),imag(red));
}}
}});
thread_critical