portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2025-04-09 21:50:45 +01:00
Code Releases Activity

3 issues preventing compilation under clang. Marked these with FELIX_ISSUE and made minimal change to make compile (as fix not obvious)

Browse Source
This commit is contained in:
Michael Marshall 2019-05-17 09:59:01 +01:00
parent acd5a01b65
commit 10a052d695
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Hadrons/Modules/MDistil/BContraction.hpp
View File

@ -261,8 +261,9 @@ void TBContraction<FImpl>::execute(void)
} }
BFieldIO BField_save; BFieldIO BField_save;
#ifdef FELIX_ISSUE
BField_save.BField = BField3; BField_save.BField = BField3;
#endif
std::string filename ="./" + output + ".h5"; std::string filename ="./" + output + ".h5";
std::cout << "Writing to file " << filename << std::endl; std::cout << "Writing to file " << filename << std::endl;
Hdf5Writer writer(filename); Hdf5Writer writer(filename);

12
Hadrons/Modules/MDistil/Baryon2pt.hpp
View File

@ -186,8 +186,16 @@ void TBaryon2pt<FImpl>::execute(void)
Eigen::array<Eigen::IndexPair<int>, 3> product_dims = { Eigen::IndexPair<int>(0,epsilon[pairs[ipair]][0]),Eigen::IndexPair<int>(1,epsilon[pairs[ipair]][1]) ,Eigen::IndexPair<int>(2,epsilon[pairs[ipair]][2]) }; Eigen::array<Eigen::IndexPair<int>, 3> product_dims = { Eigen::IndexPair<int>(0,epsilon[pairs[ipair]][0]),Eigen::IndexPair<int>(1,epsilon[pairs[ipair]][1]) ,Eigen::IndexPair<int>(2,epsilon[pairs[ipair]][2]) };
for (int imom=0 ; imom < Nmom ; imom++){ for (int imom=0 ; imom < Nmom ; imom++){
std::cout << imom << std::endl; std::cout << imom << std::endl;
Eigen::Tensor<Complex,6> B6L = BFieldL.BField.chip(imom,0); Eigen::Tensor<Complex,6> B6L
Eigen::Tensor<Complex,6> B6R = BFieldR.BField.chip(imom,0); #ifdef FELIX_ISSUE
= BFieldL.BField.chip(imom,0)
#endif
;
Eigen::Tensor<Complex,6> B6R
#ifdef FELIX_ISSUE
= BFieldR.BField.chip(imom,0)
#endif
;
for (int ig=0 ; ig < Ngamma ; ig++){ for (int ig=0 ; ig < Ngamma ; ig++){
Eigen::Tensor<Complex,5> B5L = B6L.chip(ig,0); Eigen::Tensor<Complex,5> B5L = B6L.chip(ig,0);
Eigen::Tensor<Complex,5> B5R = B6R.chip(ig,0); Eigen::Tensor<Complex,5> B5R = B6R.chip(ig,0);