Merge branch 'develop' into feature/gpu-port

Conflicts:
	HMC/Mobius2p1fEOFA.cc
	tests/forces/Test_rect_force.cc
This commit is contained in:
Peter Boyle committed 2019-07-19 11:01:55 +01:00
commit 25ba4c5f80
2 files changed
+2

No files matched your search

@@ -65,6 +65,7 @@ NAMESPACE_BEGIN(Grid);
FermionField Phi; // the pseudofermion field for this trajectory
public:
ExactOneFlavourRatioPseudoFermionAction(AbstractEOFAFermion<Impl>& _Lop,
AbstractEOFAFermion<Impl>& _Rop,
OperatorFunction<FermionField>& CG,