portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2025-04-09 21:50:45 +01:00
Code Releases Activity

Merge branch 'feature/hadrons' of github.com:fionnoh/Grid into feature/hadrons

Browse Source
This commit is contained in:
fionnoh 2018-07-19 16:07:54 +01:00
commit 355d4b58be
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
extras/Hadrons/Modules/MContraction/MesonFieldGamma.hpp
View File

@ -43,9 +43,7 @@ class TMesonFieldGamma : public Module<MesonFieldPar>
public: public:
GRID_SERIALIZABLE_CLASS_MEMBERS(Result, GRID_SERIALIZABLE_CLASS_MEMBERS(Result,
Gamma::Algebra, gamma, Gamma::Algebra, gamma,
std::vector<std::vector<std::vector<ComplexD>>>, MesonField, std::vector<std::vector<std::vector<ComplexD>>>, MesonField);
std::vector<std::vector<ComplexD>>, MesonFiield,
ComplexD, last);
}; };
public: public:
@ -189,7 +187,6 @@ void TMesonFieldGamma<FImpl>::execute(void)
{ {
result[i].gamma = gammaResultList[i]; result[i].gamma = gammaResultList[i];
result[i].MesonField.resize(N, std::vector<std::vector<ComplexD>>(N, std::vector<ComplexD>(nt))); result[i].MesonField.resize(N, std::vector<std::vector<ComplexD>>(N, std::vector<ComplexD>(nt)));
result[i].MesonFiield.resize(N, std::vector<<ComplexD>(nt));
Gamma gamma(gammaResultList[i]); Gamma gamma(gammaResultList[i]);
gammaList[i] = gamma; gammaList[i] = gamma;

1
lib/lattice/Lattice_reduction.h
View File

@ -62,6 +62,7 @@ inline ComplexD innerProduct(const Lattice<vobj> &left,const Lattice<vobj> &righ
ComplexD tmp = Reduce(TensorRemove(vinner)) ; ComplexD tmp = Reduce(TensorRemove(vinner)) ;
vstream(sumarray[thr*pad],tmp); vstream(sumarray[thr*pad],tmp);
} }
inner=0.0; inner=0.0;
for(int i=0;i<grid->SumArraySize();i++){ for(int i=0;i<grid->SumArraySize();i++){
inner = inner+sumarray[i*pad]; inner = inner+sumarray[i*pad];