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

Merge branch 'feature/distil' of github.com:mmphys/Grid into feature/distil

Browse Source
This commit is contained in:
Michael Marshall 2019-02-15 13:53:00 +00:00
commit 26b94d7bda
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Hadrons/Modules/MDistil/LapEvec.hpp
View File

@ -84,10 +84,12 @@ struct LanczosParameters: Serializable {
class LapEvecPar: Serializable class LapEvecPar: Serializable
{ {
public: public:
GRID_SERIALIZABLE_CLASS_MEMBERS(LapEvecPar GRID_SERIALIZABLE_CLASS_MEMBERS(LapEvecPar,
,std::string, gauge std::string, gauge,
std::string, ConfigFileDir,
std::string, ConfigFileName,
//,std::string, EigenPackName //,std::string, EigenPackName
,StoutParameters, Stout StoutParameters, Stout
,ChebyshevParameters, Cheby ,ChebyshevParameters, Cheby
,LanczosParameters, Lanczos ,LanczosParameters, Lanczos
//,DistilParameters, Distil //,DistilParameters, Distil
@ -229,10 +231,14 @@ void TLapEvec<GImpl>::execute(void)
//else //else
//assert(nnoise>1); //assert(nnoise>1);
const std::string &ConfigFileDir{par().ConfigFileDir};
const std::string &ConfigFileName{par().ConfigFileName};
// Debugging only // Debugging only
//envGetTmp(GaugeField, Umu); //envGetTmp(GaugeField, Umu);
auto &Umu = envGet(GaugeField, par().gauge); auto &Umu = envGet(GaugeField, par().gauge);
envGetTmp(GaugeField, Umu_smear); envGetTmp(GaugeField, Umu_smear);
FieldMetaData header;
if((1)) { if((1)) {
const std::vector<int> seeds({1, 2, 3, 4, 5}); const std::vector<int> seeds({1, 2, 3, 4, 5});
GridParallelRNG pRNG4d(gridHD); GridParallelRNG pRNG4d(gridHD);
@ -258,6 +264,11 @@ void TLapEvec<GImpl>::execute(void)
Umu = where(coor==t,Umu_smear,Umu); Umu = where(coor==t,Umu_smear,Umu);
} }
// std::cout << "Umu is "<<Umu<<std::endl; // std::cout << "Umu is "<<Umu<<std::endl;
} else {
std::string fileName(ConfigFileDir + ConfigFileName);
std::cout << GridLogMessage << "Loading NERSC configuration from '" << fileName << "'" << std::endl;
NerscIO::readConfiguration(Umu, header, fileName);
std::cout << GridLogMessage << "reading done." << std::endl;
} }
// Stout smearing // Stout smearing

2
tests/hadrons/Test_hadrons_distil.cc
View File

@ -60,6 +60,8 @@ void test_LapEvec(Application &application)
application.createModule<MGauge::Random>(szGaugeName); application.createModule<MGauge::Random>(szGaugeName);
// Now make an instance of the LapEvec object // Now make an instance of the LapEvec object
MDistil::LapEvecPar p; MDistil::LapEvecPar p;
p.ConfigFileDir="/home/dp008/dp008/dc-rich6/Scripts/ConfigsDeflQED/";
p.ConfigFileName="ckpoint_lat.3000";
p.gauge = szGaugeName; p.gauge = szGaugeName;
//p.EigenPackName = "ePack"; //p.EigenPackName = "ePack";
//p.Distil.TI = 8; //p.Distil.TI = 8;