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

code compiling now - still need to test

Browse Source
This commit is contained in:
Felix Erben 2019-09-30 13:55:26 +01:00
parent 94b9a9474c
commit e5d7910fa7
2 changed files with 38 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
Grid/qcd/utils/BaryonUtils.h
View File

@ -43,21 +43,18 @@ public:
typedef typename FImpl::PropagatorField PropagatorField; typedef typename FImpl::PropagatorField PropagatorField;
typedef typename FImpl::SitePropagator pobj; typedef typename FImpl::SitePropagator pobj;
typedef typename ComplexField::vector_object vobj; typedef typename ComplexField::vector_object vobj;
/* typedef typename FImpl::SiteSpinor vobj;
typedef typename vobj::scalar_object sobj;
typedef typename vobj::scalar_type scalar_type;
typedef typename vobj::vector_type vector_type;
*/
private: private:
static void baryon_site(const pobj &D1, template <class mobj, class robj>
const pobj &D2, static void baryon_site(const mobj &D1,
const pobj &D3, const mobj &D2,
const mobj &D3,
const Gamma GammaA, const Gamma GammaA,
const Gamma GammaB, const Gamma GammaB,
const int parity, const int parity,
const std::vector<int> wick_contractions, const std::vector<int> &wick_contractions,
vobj &result); robj &result);
public: public:
static void ContractBaryons(const PropagatorField &q1_src, static void ContractBaryons(const PropagatorField &q1_src,
const PropagatorField &q2_src, const PropagatorField &q2_src,
@ -68,36 +65,35 @@ public:
const char * quarks_src, const char * quarks_src,
const int parity, const int parity,
ComplexField &baryon_corr); ComplexField &baryon_corr);
/* template<class T1,class T2,class T3> template <class mobj, class robj>
static void ContractBaryons_Sliced(const T1 &D1, static void ContractBaryons_Sliced(const mobj &D1,
const T2 &D2, const mobj &D2,
const T3 &D3,*/ const mobj &D3,
static void ContractBaryons_Sliced(const pobj &D1,
const pobj &D2,
const pobj &D3,
const Gamma GammaA, const Gamma GammaA,
const Gamma GammaB, const Gamma GammaB,
const char * quarks_snk, const char * quarks_snk,
const char * quarks_src, const char * quarks_src,
const int parity, const int parity,
vobj &result); robj &result);
}; };
template<class FImpl> template <class FImpl>
void BaryonUtils<FImpl>::baryon_site(const pobj &D1, template <class mobj, class robj>
const pobj &D2, void BaryonUtils<FImpl>::baryon_site(const mobj &D1,
const pobj &D3, const mobj &D2,
const mobj &D3,
const Gamma GammaA, const Gamma GammaA,
const Gamma GammaB, const Gamma GammaB,
const int parity, const int parity,
const std::vector<int> wick_contraction, const std::vector<int> &wick_contraction,
vobj &result) robj &result)
{ {
Gamma g4(Gamma::Algebra::GammaT); //needed for parity P_\pm = 0.5*(1 \pm \gamma_4) Gamma g4(Gamma::Algebra::GammaT); //needed for parity P_\pm = 0.5*(1 \pm \gamma_4)
std::vector<std::vector<int>> epsilon = {{0,1,2},{1,2,0},{2,0,1},{0,2,1},{2,1,0},{1,0,2}};
std::vector<int> epsilon_sgn = {1,1,1,-1,-1,-1}; static const int epsilon[6][3] = {{0,1,2},{1,2,0},{2,0,1},{0,2,1},{2,1,0},{1,0,2}};
static const int epsilon_sgn[6]= {1,1,1,-1,-1,-1};
auto gD1a = GammaA * GammaA * D1; auto gD1a = GammaA * GammaA * D1;
auto gD1b = GammaA * g4 * GammaA * D1; auto gD1b = GammaA * g4 * GammaA * D1;
@ -206,8 +202,8 @@ void BaryonUtils<FImpl>::ContractBaryons(const PropagatorField &q1_src,
auto v3 = q3_src.View(); auto v3 = q3_src.View();
// accelerator_for(ss, grid->oSites(), grid->Nsimd(), { // accelerator_for(ss, grid->oSites(), grid->Nsimd(), {
//thread_for(ss,grid->oSites(),{ thread_for(ss,grid->oSites(),{
for(int ss=0; ss < grid->oSites(); ss++){ //for(int ss=0; ss < grid->oSites(); ss++){
auto D1 = v1[ss]; auto D1 = v1[ss];
auto D2 = v2[ss]; auto D2 = v2[ss];
@ -216,22 +212,23 @@ void BaryonUtils<FImpl>::ContractBaryons(const PropagatorField &q1_src,
vobj result=Zero(); vobj result=Zero();
baryon_site(D1,D2,D3,GammaA,GammaB,parity,wick_contraction,result); baryon_site(D1,D2,D3,GammaA,GammaB,parity,wick_contraction,result);
vbaryon_corr[ss] = result; vbaryon_corr[ss] = result;
} // );//end loop over lattice sites } );//end loop over lattice sites
} }
/*template<class FImpl,class T1,class T2,class T3> /*template<class FImpl,class T1,class T2,class T3>
void BaryonUtils<FImpl>::ContractBaryons_Sliced(const T1 &D1, void BaryonUtils<FImpl>::ContractBaryons_Sliced(const T1 &D1,
const T2 &D2, const T2 &D2,
const T3 &D3,*/ const T3 &D3,*/
template<class FImpl> template <class FImpl>
void BaryonUtils<FImpl>::ContractBaryons_Sliced(const pobj &D1, template <class mobj, class robj>
const pobj &D2, void BaryonUtils<FImpl>::ContractBaryons_Sliced(const mobj &D1,
const pobj &D3, const mobj &D2,
const mobj &D3,
const Gamma GammaA, const Gamma GammaA,
const Gamma GammaB, const Gamma GammaB,
const char * quarks_snk, const char * quarks_snk,
const char * quarks_src, const char * quarks_src,
const int parity, const int parity,
vobj &result) robj &result)
{ {
assert(parity==1 || parity == -1 && "Parity must be +1 or -1"); assert(parity==1 || parity == -1 && "Parity must be +1 or -1");

22
Hadrons/Modules/MContraction/Baryon.hpp
View File

@ -146,7 +146,7 @@ void TBaryon<FImpl1, FImpl2, FImpl3>::execute(void)
std::vector<Gamma::Algebra> ggB = strToVec<Gamma::Algebra>(par().GammaB); std::vector<Gamma::Algebra> ggB = strToVec<Gamma::Algebra>(par().GammaB);
Gamma GammaB(ggB[0]); Gamma GammaB(ggB[0]);
std::vector<TComplex> buf; std::vector<TComplex> buf;
vTComplex cs; TComplex cs;
const int parity {par().parity}; const int parity {par().parity};
const char * quarks_snk{par().quarks_snk.c_str()}; const char * quarks_snk{par().quarks_snk.c_str()};
const char * quarks_src{par().quarks_src.c_str()}; const char * quarks_src{par().quarks_src.c_str()};
@ -162,11 +162,8 @@ void TBaryon<FImpl1, FImpl2, FImpl3>::execute(void)
LOG(Message) << "(propagator already sinked)" << std::endl; LOG(Message) << "(propagator already sinked)" << std::endl;
for (unsigned int t = 0; t < buf.size(); ++t) for (unsigned int t = 0; t < buf.size(); ++t)
{ {
//TODO: Get this to compile without the casts. Templates? BaryonUtils<FIMPL>::ContractBaryons_Sliced(q1_src[t],q2_src[t],q3_src[t],GammaA,GammaB,quarks_snk,quarks_src,parity,cs);
//BaryonUtils<FIMPL>::ContractBaryons_Sliced(*reinterpret_cast<Grid::iScalar<Grid::iMatrix<Grid::iMatrix<Grid::vComplex, 3>, 4>>*>(&q1_src[t]),*reinterpret_cast<Grid::iScalar<Grid::iMatrix<Grid::iMatrix<Grid::vComplex, 3>, 4>>*>(&q2_src[t]),*reinterpret_cast<Grid::iScalar<Grid::iMatrix<Grid::iMatrix<Grid::vComplex, 3>, 4>>*>(&q3_src[t]),GammaA,GammaB,quarks_snk,quarks_src,parity,cs); result.corr[t] = TensorRemove(cs);
//result.corr[t] = TensorRemove(*reinterpret_cast<Grid::TComplex*>(&cs));
// BaryonUtils<FIMPL>::ContractBaryons_Sliced(q1_src[t],q2_src[t],q3_src[t],GammaA,GammaB,quarks_snk,quarks_src,parity,cs);
// result.corr[t] = TensorRemove(cs);
} }
} }
else else
@ -176,21 +173,14 @@ void TBaryon<FImpl1, FImpl2, FImpl3>::execute(void)
ns = vm().getModuleNamespace(env().getObjectModule(par().sink)); ns = vm().getModuleNamespace(env().getObjectModule(par().sink));
if (ns == "MSource") if (ns == "MSource")
{ {
//TODO: Understand what this is and then get it to compile. Hopefully no new function needed. The following lines are from the Meson.hpp module. BaryonUtils<FIMPL>::ContractBaryons(q1_src,q2_src,q3_src,GammaA,GammaB,quarks_snk,quarks_src,parity,c);
/* PropagatorField1 &sink = envGet(PropagatorField1, par().sink);
c = trace(mesonConnected(q1, q2, gSnk, gSrc)*sink);
sliceSum(c, buf, Tp); */
// My attempt at some code, which doesn't work. I also don't know whether anything like this is what we want here.
/* BaryonUtils<FIMPL>::ContractBaryons(q1_src,q2_src,q3_src,GammaA,GammaB,quarks_snk,quarks_src,parity,c);
PropagatorField1 &sink = envGet(PropagatorField1, par().sink); PropagatorField1 &sink = envGet(PropagatorField1, par().sink);
auto test = trace(c*sink); auto test = closure(trace(sink*c));
sliceSum(test, buf, Tp); */ sliceSum(test, buf, Tp);
} }
else if (ns == "MSink") else if (ns == "MSink")
{ {
BaryonUtils<FIMPL>::ContractBaryons(q1_src,q2_src,q3_src,GammaA,GammaB,quarks_snk,quarks_src,parity,c); BaryonUtils<FIMPL>::ContractBaryons(q1_src,q2_src,q3_src,GammaA,GammaB,quarks_snk,quarks_src,parity,c);
SinkFnScalar &sink = envGet(SinkFnScalar, par().sink); SinkFnScalar &sink = envGet(SinkFnScalar, par().sink);
buf = sink(c); buf = sink(c);
} }