Merge branch 'develop' into feature/gpu-port

This commit is contained in:
Peter Boyle committed 2018-12-13 05:11:34 +00:00
commit b57a4d32aa
647 files changed
+49155 -11160

No files matched your search

+2 -1
View File
@@ -57,7 +57,8 @@ int main (int argc, char ** argv)
SU3::HotConfiguration(pRNG,U);
double beta = 1.0;
double c1 = -1.0/12.0;
double c1 = 0.331;
ConjugatePlaqPlusRectangleActionR Action(beta,c1);
//ConjugateWilsonGaugeActionR Action(beta);
//WilsonGaugeActionR Action(beta);