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

Test works now

Browse Source
This commit is contained in:
ferben 2019-11-12 15:14:13 +00:00
parent fb2834bf82
commit b0f24ec302
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tests/hadrons/Test_distil.cc
View File

@ -143,7 +143,8 @@ std::string test_Solver(Application &application, const char * pSuffix = nullptr
std::string test_DPar(Application &application) { std::string test_DPar(Application &application) {
// DistilVectors parameters // DistilVectors parameters
MDistil::DistilParPar DistilPar; //MDistil::DistilParPar DistilPar;
MDistil::DistilParameters DistilPar;
DistilPar.nvec = 5; DistilPar.nvec = 5;
DistilPar.nnoise = 1; DistilPar.nnoise = 1;
DistilPar.tsrc = 0; DistilPar.tsrc = 0;
@ -162,7 +163,8 @@ std::string test_Noises(Application &application, const std::string &sNoiseBaseN
// DistilVectors parameters // DistilVectors parameters
MDistil::NoisesPar NoisePar; MDistil::NoisesPar NoisePar;
NoisePar.DistilPar = "DPar_l"; NoisePar.DistilPar = "DPar_l";
std::string sNoiseName{sNoiseBaseName + "_noise"}; NoisePar.NoiseFileName = "noise";
std::string sNoiseName{"noise"};
application.createModule<MDistil::Noises>(sNoiseName,NoisePar); application.createModule<MDistil::Noises>(sNoiseName,NoisePar);
return sNoiseName; return sNoiseName;
} }
@ -198,6 +200,7 @@ void test_Perambulators( Application &application, const char * pszSuffix = null
PerambPar.PerambFileName = sModuleName; PerambPar.PerambFileName = sModuleName;
PerambPar.solver = test_Solver( application, pszSuffix ); PerambPar.solver = test_Solver( application, pszSuffix );
PerambPar.DistilPar = "DPar_l"; PerambPar.DistilPar = "DPar_l";
PerambPar.noise = "noise";
test_Noises(application, sModuleName); // I want these written after solver stuff test_Noises(application, sModuleName); // I want these written after solver stuff
application.createModule<MDistil::Perambulator>( sModuleName, PerambPar ); application.createModule<MDistil::Perambulator>( sModuleName, PerambPar );
} }
@ -215,7 +218,9 @@ void test_DistilVectors(Application &application, const char * pszSuffix = nullp
if( pszSuffix ) if( pszSuffix )
sPerambName.append( pszSuffix ); sPerambName.append( pszSuffix );
MDistil::DistilVectors::Par DistilVecPar; MDistil::DistilVectors::Par DistilVecPar;
DistilVecPar.noise = sPerambName + "_noise"; DistilVecPar.noise = "noise";
DistilVecPar.rho = "rho";
DistilVecPar.phi = "phi";
DistilVecPar.perambulator = sPerambName; DistilVecPar.perambulator = sPerambName;
DistilVecPar.lapevec = "LapEvec"; DistilVecPar.lapevec = "LapEvec";
DistilVecPar.DistilPar = "DPar_l"; DistilVecPar.DistilPar = "DPar_l";
@ -253,7 +258,7 @@ void test_MesonField(Application &application, const char * pszFileSuffix,
if( pszObjectRight == nullptr ) if( pszObjectRight == nullptr )
pszObjectRight = pszObjectLeft; pszObjectRight = pszObjectLeft;
MContraction::A2AMesonField::Par A2AMesonFieldPar; MContraction::A2AMesonField::Par A2AMesonFieldPar;
A2AMesonFieldPar.left="DistilVecs"; A2AMesonFieldPar.left="";
A2AMesonFieldPar.right=A2AMesonFieldPar.left; A2AMesonFieldPar.right=A2AMesonFieldPar.left;
A2AMesonFieldPar.left.append( pszObjectLeft ); A2AMesonFieldPar.left.append( pszObjectLeft );
A2AMesonFieldPar.right.append( pszObjectRight ); A2AMesonFieldPar.right.append( pszObjectRight );
@ -346,10 +351,10 @@ int main(int argc, char *argv[])
test_Global( application ); test_Global( application );
test_LapEvec( application ); test_LapEvec( application );
test_DPar( application ); test_DPar( application );
//test_Perambulators( application ); test_Perambulators( application );
//test_DistilVectors( application ); test_DistilVectors( application );
//test_MesonField( application, "Phi", "_phi" ); test_MesonField( application, "Phi", "phi" );
//test_MesonField( application, "Rho", "_rho" ); test_MesonField( application, "Rho", "rho" );
break; break;
case 1: case 1:
LOG(Message) << "Computing Meson 2pt-function by loading perambulators" << std::endl; LOG(Message) << "Computing Meson 2pt-function by loading perambulators" << std::endl;
@ -358,8 +363,8 @@ int main(int argc, char *argv[])
test_DPar( application ); test_DPar( application );
test_LoadPerambulators( application ); test_LoadPerambulators( application );
test_DistilVectors( application ); test_DistilVectors( application );
test_MesonField( application, "Phi", "_phi" ); test_MesonField( application, "Phi", "phi" );
test_MesonField( application, "Rho", "_rho" ); test_MesonField( application, "Rho", "rho" );
break; break;
case 2: case 2:
LOG(Message) << "Computing Meson 2pt-function for two quark flavours" << std::endl; LOG(Message) << "Computing Meson 2pt-function for two quark flavours" << std::endl;