portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2024-09-20 17:25:37 +01:00
Code Releases Activity

BC2 now runs. setup() runs twice, which had resulted in doubling up of momenta. Also fixed initialisation of momentum phases.

Browse Source
This commit is contained in:
Michael Marshall 2019-06-12 15:25:59 +01:00
parent fe72dc099b
commit 9a8a63467e
2 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Grid/qcd/utils/A2Autils.h
View File

@ -43,9 +43,9 @@ public:
static void NucleonFieldMom(Eigen::Tensor<ComplexD,6> &mat, static void NucleonFieldMom(Eigen::Tensor<ComplexD,6> &mat,
const FermionField *one, const std::vector<FermionField> &one,
const FermionField *two, const std::vector<FermionField> &two,
const FermionField *three, const std::vector<FermionField> &three,
const std::vector<ComplexField > &mom, const std::vector<ComplexField > &mom,
int parity, int parity,
int orthogdim); int orthogdim);
@ -112,9 +112,9 @@ public:
template<class FImpl> template<class FImpl>
void A2Autils<FImpl>::NucleonFieldMom(Eigen::Tensor<ComplexD,6> &mat, void A2Autils<FImpl>::NucleonFieldMom(Eigen::Tensor<ComplexD,6> &mat,
const FermionField *one, const std::vector<FermionField> &one,
const FermionField *two, const std::vector<FermionField> &two,
const FermionField *three, const std::vector<FermionField> &three,
const std::vector<ComplexField > &mom, const std::vector<ComplexField > &mom,
int parity, int parity,
int orthogdim) int orthogdim)

37
Hadrons/Modules/MDistil/BC2.hpp
View File

@ -56,7 +56,7 @@ BEGIN_MODULE_NAMESPACE(MDistil)
// 3 - s - free spin index // 3 - s - free spin index
// 4 - i - left distillation mode index // 4 - i - left distillation mode index
// 5 - j - middle distillation mode index // 5 - j - middle distillation mode index
// 6 - k - left distillation mode index // 6 - k - right distillation mode index
// template <typename T> // template <typename T>
// using BaryonTensorSet = Eigen::TensorMap<Eigen::Tensor<T, 7, Eigen::RowMajor>>; // using BaryonTensorSet = Eigen::TensorMap<Eigen::Tensor<T, 7, Eigen::RowMajor>>;
@ -133,6 +133,7 @@ std::vector<std::string> TBC2<FImpl>::getOutput(void)
template <typename FImpl> template <typename FImpl>
void TBC2<FImpl>::setup(void) void TBC2<FImpl>::setup(void)
{ {
if(!mom_.size()) {
for (auto &pstr: par().mom) for (auto &pstr: par().mom)
{ {
auto p = strToVec<Real>(pstr); auto p = strToVec<Real>(pstr);
@ -143,8 +144,19 @@ void TBC2<FImpl>::setup(void)
} }
mom_.push_back(p); mom_.push_back(p);
} }
envCache(std::vector<ComplexField>, momphName_, 1, }
par().mom.size(), envGetGrid(ComplexField)); //envCache(std::vector<ComplexField>, momphName_, 1, par().mom.size(), envGetGrid(ComplexField));
static GridCartesian * MyGrid{env().getGrid()};
if( MyGrid == envGetGrid(ComplexField) )
LOG(Message) << "envGetGrid(ComplexField) == env().getGrid()" << std::endl;
else
LOG(Message) << "envGetGrid(ComplexField) != env().getGrid()" << std::endl;
envTmp(std::vector<ComplexField>, "ph", 1, std::vector<ComplexField>());
envGetTmp(std::vector<ComplexField>, ph);
if(!ph.size()) {
for (unsigned int j = 0; j < par().mom.size(); ++j)
ph.push_back(ComplexField(MyGrid));
}
envTmpLat(ComplexField, "coor"); envTmpLat(ComplexField, "coor");
} }
@ -153,16 +165,14 @@ void TBC2<FImpl>::setup(void)
template <typename FImpl> template <typename FImpl>
void TBC2<FImpl>::execute(void) void TBC2<FImpl>::execute(void)
{ {
auto &one = envGet(std::vector<FermionField>, par().one); auto &one = envGet(std::vector<FermionField>, par().one);
auto &two = envGet(std::vector<FermionField>, par().two); auto &two = envGet(std::vector<FermionField>, par().two);
auto &three = envGet(std::vector<FermionField>, par().three); auto &three = envGet(std::vector<FermionField>, par().three);
const std::string &output{par().output}; const std::string &output{par().output};
int N_1 = one.size(); int N_1 = static_cast<int>(one.size());
int N_2 = two.size(); int N_2 = static_cast<int>(two.size());
int N_3 = three.size(); int N_3 = static_cast<int>(three.size());
LOG(Message) << "Computing distillation baryon fields" << std::endl; LOG(Message) << "Computing distillation baryon fields" << std::endl;
LOG(Message) << "One: '" << par().one << "' Two: '" << par().two << "' Three: '" << par().three << "'" << std::endl; LOG(Message) << "One: '" << par().one << "' Two: '" << par().two << "' Three: '" << par().three << "'" << std::endl;
@ -173,13 +183,14 @@ void TBC2<FImpl>::execute(void)
} }
int Nmom = mom_.size(); int Nmom = static_cast<int>(mom_.size());
const int Nt{env().getDim(Tdir)}; const int Nt{env().getDim(Tdir)};
int parity = 1; int parity = 1;
int orthogDim=3; int orthogDim=3;
auto &ph = envGet(std::vector<ComplexField>, momphName_); //auto &ph = envGet(std::vector<ComplexField>, momphName_);
envGetTmp(std::vector<ComplexField>, ph);
if (!hasPhase_) if (!hasPhase_)
{ {
@ -201,11 +212,11 @@ void TBC2<FImpl>::execute(void)
hasPhase_ = true; hasPhase_ = true;
stopTimer("Momentum phases"); stopTimer("Momentum phases");
} }
envCache(std::vector<ComplexField>, momphName_, 1, mom_.size(), envGetGrid(ComplexField)); //envCache(std::vector<ComplexField>, momphName_, 1, mom_.size(), envGetGrid(ComplexField));
Eigen::Tensor<ComplexD, 6> m(Nmom,Nt,N_1,N_2,N_3,4); Eigen::Tensor<ComplexD, 6> m(Nmom,Nt,N_1,N_2,N_3,4);
A2Autils<FImpl>::NucleonFieldMom(m, &one[0], &two[0], &three[0], ph, parity, orthogDim); //A2Autils<FImpl>::NucleonFieldMom(m, &one[0], &two[0], &three[0], ph, parity, orthogDim);
//A2Autils<FImpl>::NucleonFieldMom(m, one, two, three, ph, parity, orthogDim); A2Autils<FImpl>::NucleonFieldMom(m, one, two, three, ph, parity, orthogDim);
for (int is=0 ; is < 4 ; is++){ for (int is=0 ; is < 4 ; is++){
for (int t=0 ; t < Nt ; t++){ for (int t=0 ; t < Nt ; t++){
std::cout << "BaryonField(is=" << is << ",t=" << t << ") = " << m(0,t,0,0,0,is) << std::endl; std::cout << "BaryonField(is=" << is << ",t=" << t << ") = " << m(0,t,0,0,0,is) << std::endl;