portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2024-11-10 07:55:35 +00:00
Code Releases Activity

Remove unused modules BC2 and Baryon2

Browse Source
This commit is contained in:
Michael Marshall 2019-09-10 14:49:24 +01:00
parent 51bed48cd2
commit 04a661cafe
6 changed files with 0 additions and 528 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Hadrons/Modules.hpp
View File

@ -39,7 +39,6 @@
#include <Hadrons/Modules/MUtilities/PrecisionCast.hpp>
#include <Hadrons/Modules/MDistil/Noises.hpp>
#include <Hadrons/Modules/MDistil/Perambulator.hpp>
#include <Hadrons/Modules/MDistil/BC2.hpp>
#include <Hadrons/Modules/MDistil/g5_multiply.hpp>
#include <Hadrons/Modules/MDistil/PerambFromSolve.hpp>
#include <Hadrons/Modules/MDistil/Baryon2pt.hpp>
@ -56,7 +55,6 @@
#include <Hadrons/Modules/MContraction/WeakMesonDecayKl2.hpp>
#include <Hadrons/Modules/MContraction/Nucleon.hpp>
#include <Hadrons/Modules/MContraction/A2AAslashField.hpp>
#include <Hadrons/Modules/MContraction/Baryon2.hpp>
#include <Hadrons/Modules/MContraction/WeakEye3pt.hpp>
#include <Hadrons/Modules/MContraction/WeakNonEye3pt.hpp>
#include <Hadrons/Modules/MContraction/Baryon.hpp>

35
Hadrons/Modules/MContraction/Baryon2.cc
View File

@ -1,35 +0,0 @@
/*************************************************************************************
Grid physics library, www.github.com/paboyle/Grid
Source file: Hadrons/Modules/MContraction/Baryon2.cc
Copyright (C) 2015-2019
Author: Antonin Portelli <antonin.portelli@me.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
See the full license in the file "LICENSE" in the top level distribution directory
*************************************************************************************/
/* END LEGAL */
#include <Hadrons/Modules/MContraction/Baryon2.hpp>
using namespace Grid;
using namespace Hadrons;
using namespace MContraction;
template class Grid::Hadrons::MContraction::TBaryon2<FIMPL,FIMPL,FIMPL>;

207
Hadrons/Modules/MContraction/Baryon2.hpp
View File

@ -1,207 +0,0 @@
/*************************************************************************************
Grid physics library, www.github.com/paboyle/Grid
Source file: Hadrons/Modules/MContraction/Baryon2.hpp
Copyright (C) 2015-2019
Author: Antonin Portelli <antonin.portelli@me.com>
Author: Felix Erben <felix.erben@ed.ac.uk>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
See the full license in the file "LICENSE" in the top level distribution directory
*************************************************************************************/
/* END LEGAL */
#ifndef Hadrons_MContraction_Baryon2_hpp_
#define Hadrons_MContraction_Baryon2_hpp_
#include <Hadrons/Global.hpp>
#include <Hadrons/Module.hpp>
#include <Hadrons/ModuleFactory.hpp>
#include <Grid/qcd/utils/BaryonUtils.h>
BEGIN_HADRONS_NAMESPACE
/******************************************************************************
* Baryon2 *
******************************************************************************/
BEGIN_MODULE_NAMESPACE(MContraction)
class Baryon2Par: Serializable
{
public:
GRID_SERIALIZABLE_CLASS_MEMBERS(Baryon2Par,
std::string, q1,
std::string, q2,
std::string, q3,
std::string, gamma,
std::string, output);
};
template <typename FImpl1, typename FImpl2, typename FImpl3>
class TBaryon2: public Module<Baryon2Par>
{
public:
FERM_TYPE_ALIASES(FImpl1, 1);
FERM_TYPE_ALIASES(FImpl2, 2);
FERM_TYPE_ALIASES(FImpl3, 3);
class Result: Serializable
{
public:
GRID_SERIALIZABLE_CLASS_MEMBERS(Result,
std::vector<Complex>, corr);
};
public:
// constructor
TBaryon2(const std::string name);
// destructor
virtual ~TBaryon2(void) {};
// dependency relation
virtual std::vector<std::string> getInput(void);
virtual std::vector<std::string> getOutput(void);
protected:
// setup
virtual void setup(void);
// execution
virtual void execute(void);
// Which gamma algebra was specified
Gamma::Algebra al;
};
MODULE_REGISTER_TMP(Baryon2, ARG(TBaryon2<FIMPL, FIMPL, FIMPL>), MContraction);
/******************************************************************************
* TBaryon2 implementation *
******************************************************************************/
// constructor /////////////////////////////////////////////////////////////////
template <typename FImpl1, typename FImpl2, typename FImpl3>
TBaryon2<FImpl1, FImpl2, FImpl3>::TBaryon2(const std::string name)
: Module<Baryon2Par>(name)
{}
// dependencies/products ///////////////////////////////////////////////////////
template <typename FImpl1, typename FImpl2, typename FImpl3>
std::vector<std::string> TBaryon2<FImpl1, FImpl2, FImpl3>::getInput(void)
{
std::vector<std::string> input = {par().q1, par().q2, par().q3};
return input;
}
template <typename FImpl1, typename FImpl2, typename FImpl3>
std::vector<std::string> TBaryon2<FImpl1, FImpl2, FImpl3>::getOutput(void)
{
std::vector<std::string> out = {};
return out;
}
// setup ///////////////////////////////////////////////////////////////////////
template <typename FImpl1, typename FImpl2, typename FImpl3>
void TBaryon2<FImpl1, FImpl2, FImpl3>::setup(void)
{
envTmpLat(LatticeComplex, "c");
// envTmpLat(PropagatorField1, "diquark");
// Translate the full string naming the desired gamma structure into the one we need to use
const std::string gamma{ par().gamma };
int iGamma = 0;
do
{
const char * pGammaName = Gamma::name[iGamma];
int iLen = 0;
while( pGammaName[iLen] && pGammaName[iLen] != ' ' )
iLen++;
if( !gamma.compare( 0, gamma.size(), pGammaName, iLen ) )
break;
}
while( ++iGamma < Gamma::nGamma );
if( iGamma >= Gamma::nGamma ) {
LOG(Message) << "Unrecognised gamma structure \"" << gamma << "\"" << std::endl;
assert( 0 && "Invalid gamma structure specified" );
}
switch( iGamma ) {
case Gamma::Algebra::GammaX:
std::cout << "using interpolator C gamma_X" << std::endl;
al = Gamma::Algebra::GammaZGamma5; //Still hardcoded CgX = i gamma_3 gamma_5
break;
case Gamma::Algebra::GammaY:
std::cout << "using interpolator C gamma_Y" << std::endl;
al = Gamma::Algebra::GammaT; //Still hardcoded CgX = - gamma_4
break;
case Gamma::Algebra::GammaZ:
std::cout << "using interpolator C gamma_Z" << std::endl;
al = Gamma::Algebra::GammaXGamma5; //Still hardcoded CgX = i gamma_1 gamma_5
break;
default:
{
LOG(Message) << "Unsupported gamma structure " << gamma << " = " << iGamma << std::endl;
assert( 0 && "Unsupported gamma structure" );
// or you could do something like
al = static_cast<Gamma::Algebra>( iGamma );
break;
}
}
LOG(Message) << "Gamma structure " << gamma << " = " << iGamma
<< " translated to " << Gamma::name[al] << std::endl;
}
// execution ///////////////////////////////////////////////////////////////////
template <typename FImpl1, typename FImpl2, typename FImpl3>
void TBaryon2<FImpl1, FImpl2, FImpl3>::execute(void)
{
LOG(Message) << "Computing baryon contractions '" << getName() << "' using"
<< " quarks '" << par().q1 << "', and a diquark formed of ('" << par().q2 << "', and '"
<< par().q3 << "')" << std::endl;
auto &q1 = envGet(PropagatorField1, par().q1);
auto &q2 = envGet(PropagatorField2, par().q2);
auto &q3 = envGet(PropagatorField3, par().q3);
envGetTmp(LatticeComplex, c);
// envGetTmp(PropagatorField1, diquark); //ACTUALLY MIX OF 2 AND 3!!!!
Result result;
int nt = env().getDim(Tp);
result.corr.resize(nt);
const std::string gamma{ par().gamma };
std::vector<TComplex> buf;
const Gamma GammaA{ Gamma::Algebra::Identity };
const Gamma GammaB{ al };
LatticeSpinColourMatrix diquark( q1._grid ); // TODO: Felix, I added "q1._grid". I presume this is correct?
diquark = BaryonUtils<FIMPL>::quarkContract13(q2*GammaB,GammaB*q3);
//result = trace(GammaA*GammaA * traceColour(q1*traceSpin(diquark))) + 2.0 * trace(GammaA*GammaA*traceColour(q1*diquark));
//result = trace(q1*diquark); // TODO: Apologies, Felix - compiler errors
assert( 0 && "TODO: Felix, please fix prior line - compiler errors" );
sliceSum(c,buf,Tp);
for (unsigned int t = 0; t < buf.size(); ++t)
{
result.corr[t] = TensorRemove(buf[t]);
}
saveResult(par().output, "baryon", result);
}
END_MODULE_NAMESPACE
END_HADRONS_NAMESPACE
#endif // Hadrons_MContraction_Baryon2_hpp_

36
Hadrons/Modules/MDistil/BC2.cc
View File

@ -1,36 +0,0 @@
/*************************************************************************************
Grid physics library, www.github.com/paboyle/Grid
Source file: Hadrons/Modules/MDistil/BC2.cc
Copyright (C) 2019
Author: Felix Erben <ferben@ed.ac.uk>
Author: Michael Marshall <Michael.Marshall@ed.ac.uk>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
See the full license in the file "LICENSE" in the top level distribution directory
*************************************************************************************/
/* END LEGAL */
#include <Hadrons/Modules/MDistil/BC2.hpp>
using namespace Grid;
using namespace Hadrons;
using namespace MDistil;
template class Grid::Hadrons::MDistil::TBC2<FIMPL>;

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

@ -1,244 +0,0 @@
/*************************************************************************************
Grid physics library, www.github.com/paboyle/Grid
Source file: Hadrons/Modules/MDistil/BC2.hpp
Copyright (C) 2019
Author: Felix Erben <ferben@ed.ac.uk>
Author: Michael Marshall <Michael.Marshall@ed.ac.uk>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
See the full license in the file "LICENSE" in the top level distribution directory
*************************************************************************************/
/* END LEGAL */
#ifndef Hadrons_MDistil_BC2_hpp_
#define Hadrons_MDistil_BC2_hpp_
#include <Hadrons/Global.hpp>
#include <Hadrons/Module.hpp>
#include <Hadrons/ModuleFactory.hpp>
#include <Hadrons/Solver.hpp>
#include <Hadrons/EigenPack.hpp>
#include <Hadrons/A2AVectors.hpp>
#include <Hadrons/DilutedNoise.hpp>
// These are members of Distillation
#include <Hadrons/Distil.hpp>
BEGIN_HADRONS_NAMESPACE
/******************************************************************************
* BC2 *
******************************************************************************/
BEGIN_MODULE_NAMESPACE(MDistil)
// general baryon tensor set based on Eigen tensors and Grid-allocated memory
// Dimensions:
// 0 - ext - external field (momentum, EM field, ...)
// 1 - str - dirac structure
// 2 - t - timeslice
// 3 - s - free spin index
// 4 - i - left distillation mode index
// 5 - j - middle distillation mode index
// 6 - k - right distillation mode index
// template <typename T>
// using BaryonTensorSet = Eigen::TensorMap<Eigen::Tensor<T, 7, Eigen::RowMajor>>;
class BC2Par: Serializable
{
public:
GRID_SERIALIZABLE_CLASS_MEMBERS(BC2Par,
std::string, one,
std::string, two,
std::string, three,
std::string, output,
int, parity,
std::vector<std::string>, mom);
};
template <typename FImpl>
class TBC2: public Module<BC2Par>
{
public:
FERM_TYPE_ALIASES(FImpl,);
public:
// constructor
TBC2(const std::string name);
// destructor
virtual ~TBC2(void) {};
// dependency relation
virtual std::vector<std::string> getInput(void);
virtual std::vector<std::string> getOutput(void);
// setup
virtual void setup(void);
// execution
virtual void execute(void);
private:
bool hasPhase_{false};
std::string momphName_;
std::vector<Gamma::Algebra> gamma12_;
std::vector<Gamma::Algebra> gamma23_;
std::vector<std::vector<Real>> mom_;
protected:
GridCartesian * grid4d;
GridCartesian * grid3d;
};
MODULE_REGISTER_TMP(BC2, TBC2<FIMPL>, MDistil);
/******************************************************************************
* TBC2 implementation *
******************************************************************************/
// constructor /////////////////////////////////////////////////////////////////
template <typename FImpl>
TBC2<FImpl>::TBC2(const std::string name)
: Module<BC2Par>(name)
, momphName_(name + "_momph")
{}
// dependencies/products ///////////////////////////////////////////////////////
template <typename FImpl>
std::vector<std::string> TBC2<FImpl>::getInput(void)
{
std::vector<std::string> in = {par().one, par().two, par().three};
return in;
}
template <typename FImpl>
std::vector<std::string> TBC2<FImpl>::getOutput(void)
{
std::vector<std::string> out = {};
return out;
}
// setup ///////////////////////////////////////////////////////////////////////
template <typename FImpl>
void TBC2<FImpl>::setup(void)
{
if(!mom_.size()) {
for (auto &pstr: par().mom)
{
auto p = strToVec<Real>(pstr);
if (p.size() != env().getNd() - 1)
{
HADRONS_ERROR(Size, "Momentum has " + std::to_string(p.size()) + " components instead of " + std::to_string(env().getNd() - 1));
}
mom_.push_back(p);
}
}
//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");
}
// execution ///////////////////////////////////////////////////////////////////
template <typename FImpl>
void TBC2<FImpl>::execute(void)
{
auto &one = envGet(std::vector<FermionField>, par().one);
auto &two = envGet(std::vector<FermionField>, par().two);
auto &three = envGet(std::vector<FermionField>, par().three);
const std::string &output{par().output};
int N_1 = static_cast<int>(one.size());
int N_2 = static_cast<int>(two.size());
int N_3 = static_cast<int>(three.size());
LOG(Message) << "Computing distillation baryon fields" << std::endl;
LOG(Message) << "One: '" << par().one << "' Two: '" << par().two << "' Three: '" << par().three << "'" << std::endl;
LOG(Message) << "Momenta:" << std::endl;
for (auto &p: mom_)
{
LOG(Message) << " " << p << std::endl;
}
int Nmom = static_cast<int>(mom_.size());
const int Nt{env().getDim(Tdir)};
int parity = 1;
int orthogDim=3;
//auto &ph = envGet(std::vector<ComplexField>, momphName_);
envGetTmp(std::vector<ComplexField>, ph);
if (!hasPhase_)
{
startTimer("Momentum phases");
for (unsigned int j = 0; j < Nmom; ++j)
{
Complex i(0.0,1.0);
std::vector<Real> p;
envGetTmp(ComplexField, coor);
ph[j] = zero;
for(unsigned int mu = 0; mu < mom_[j].size(); mu++)
{
LatticeCoordinate(coor, mu);
ph[j] = ph[j] + (mom_[j][mu]/env().getDim(mu))*coor;
}
ph[j] = exp((Real)(2*M_PI)*i*ph[j]);
}
hasPhase_ = true;
stopTimer("Momentum phases");
}
//envCache(std::vector<ComplexField>, momphName_, 1, mom_.size(), envGetGrid(ComplexField));
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, two, three, ph, parity, orthogDim);
for (int is=0 ; is < 4 ; is++){
for (int t=0 ; t < Nt ; t++){
std::cout << "BaryonField(is=" << is << ",t=" << t << ") = " << m(0,t,0,0,0,is) << std::endl;
}
}
//BFieldIO BField_save;
//BField_save.BField = m;
GridCartesian * grid = env().getGrid();
if(grid->IsBoss()) {
std::string filename ="./" + output + ".h5";
std::cout << "Writing to file " << filename << std::endl;
Grid::Hdf5Writer writer(filename);
//write(writer,"BaryonField",BField_save.BField);
write(writer,"BaryonField",m);
}
}
END_MODULE_NAMESPACE
END_HADRONS_NAMESPACE
#endif // Hadrons_MDistil_BC2_hpp_

4
Hadrons/modules.inc
View File

@ -44,7 +44,6 @@ modules_cc =\
Modules/MDistil/DistilVectors.cc \
Modules/MDistil/BContraction.cc \
Modules/MDistil/Baryon2pt.cc \
Modules/MDistil/BC2.cc \
Modules/MSource/Momentum.cc \
Modules/MSource/SeqAslash.cc \
Modules/MSource/Z2.cc \
@ -56,7 +55,6 @@ modules_cc =\
Modules/MContraction/Meson.cc \
Modules/MContraction/A2AAslashField.cc \
Modules/MContraction/SelfContract.cc \
Modules/MContraction/Baryon2.cc \
Modules/MContraction/Baryon.cc \
Modules/MContraction/Nucleon.cc \
Modules/MContraction/WeakNonEye3pt.cc \
@ -122,7 +120,6 @@ modules_hpp =\
Modules/MUtilities/PrecisionCast.hpp \
Modules/MDistil/Noises.hpp \
Modules/MDistil/Perambulator.hpp \
Modules/MDistil/BC2.hpp \
Modules/MDistil/g5_multiply.hpp \
Modules/MDistil/PerambFromSolve.hpp \
Modules/MDistil/Baryon2pt.hpp \
@ -139,7 +136,6 @@ modules_hpp =\
Modules/MContraction/WeakMesonDecayKl2.hpp \
Modules/MContraction/Nucleon.hpp \
Modules/MContraction/A2AAslashField.hpp \
Modules/MContraction/Baryon2.hpp \
Modules/MContraction/WeakEye3pt.hpp \
Modules/MContraction/WeakNonEye3pt.hpp \
Modules/MContraction/Baryon.hpp \