1
0
mirror of https://github.com/paboyle/Grid.git synced 2025-06-12 20:27:06 +01:00

Merge problem fixed

This commit is contained in:
Peter Boyle
2015-08-01 22:30:00 +09:00
parent 5e9bef8a1b
commit bb372a6a8a
2 changed files with 8 additions and 7 deletions

View File

@ -47,7 +47,7 @@ int main (int argc, char ** argv)
// typedef LeapFrog IntegratorAlgorithm;// change here to change the algorithm
IntegratorParameters MDpar(12,20,1.0);
std::vector<int> rel ={1};
Integrator<IntegratorAlgorithm> MDynamics(&Fine,MDpar, FullSet,rel);
Integrator<IntegratorAlgorithm> MDynamics(&Fine,MDpar, FullSet);
// Create HMC
HMCparameters HMCpar;