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

Merge branch 'feature/qed-fvol' into feature/hadrons (non-trivial conflicts on scalar Impl)

Browse Source 
# Conflicts:
#	configure.ac
#	lib/qcd/action/scalar/Scalar.h
This commit is contained in:
Antonin Portelli
2017-06-05 16:37:47 -05:00
parent d8648307ff 1407418755
commit 0503c028be
21 changed files with 1375 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/qcd/action/fermion/Fermion.h
View File

@ -237,4 +237,11 @@ typedef ImprovedStaggeredFermion5D<StaggeredVec5dImplD> ImprovedStaggeredFermion
}}
////////////////////
// Scalar QED actions
// TODO: this needs to move to another header after rename to Fermion.h
////////////////////
#include <Grid/qcd/action/scalar/Scalar.h>
#include <Grid/qcd/action/gauge/Photon.h>
#endif