Merge branch 'feature/hadrons' into feature/qed-fvol

# Conflicts:
#	extras/Hadrons/modules.inc
#	lib/qcd/action/gauge/Photon.h
This commit is contained in:
James Harrison committed 2018-05-21 18:02:41 +01:00
commit 294ee70a7a
198 files changed
+8055 -3349

No files matched your search

+1 -1
View File
@@ -266,7 +266,7 @@ namespace QCD{
vol = vol * latt_size[d];
}
invKHatSquared(weight);
weight = sqrt(vol*real(weight));
weight = sqrt(vol)*sqrt(weight);
zmSub(weight);
break;
}