1
0
mirror of https://github.com/paboyle/Grid.git synced 2025-06-19 08:17:05 +01:00

Merge branch 'develop' into feature/hadrons

# Conflicts:
#	lib/serialisation/BaseIO.h
This commit is contained in:
2018-03-07 15:22:16 +00:00
2 changed files with 56 additions and 23 deletions

View File

@ -202,8 +202,6 @@ int main(int argc,char **argv)
GridSerialRNG rng;
SpinColourMatrix scm;
SpinColourVector scv;
std::vector<std::vector<std::vector<std::vector<ComplexD>>>> scmv;
std::vector<std::vector<ComplexD>> scvv;
rng.SeedFixedIntegers(std::vector<int>({42,10,81,9}));
random(rng, scm);
@ -211,8 +209,8 @@ int main(int argc,char **argv)
std::cout << "Test spin-color matrix: " << scm << std::endl;
std::cout << "Test spin-color vector: " << scv << std::endl;
std::cout << "Converting to std::vector" << std::endl;
tensorToVec(scmv, scm);
tensorToVec(scvv, scv);
auto scmv = tensorToVec(scm);
auto scvv = tensorToVec(scv);
std::cout << "Spin-color matrix: " << scmv << std::endl;
std::cout << "Spin-color vector: " << scvv << std::endl;
}