portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2025-11-03 21:44:33 +00:00
Code Releases Activity

some cleanup

Browse Source
This commit is contained in:
ferben
2019-03-13 13:15:12 +00:00
parent 6bb9b67c93
commit 5313e44d11
3 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -335,7 +335,7 @@ void TLapEvec<GImpl>::execute(void)
// Now write out the 4d eigenvectors // Now write out the 4d eigenvectors
eig4d.record.operatorXml = DefaultOperatorXml; eig4d.record.operatorXml = DefaultOperatorXml;
eig4d.record.solverXml = DefaultsolverXml; eig4d.record.solverXml = DefaultsolverXml;
eig4d.write(sEigenPackName,false); eig4d.write(sEigenPackName + "." + std::to_string(vm().getTrajectory()),false);
// Close the local debugging log file // Close the local debugging log file
if( ll ) { if( ll ) {

2
Hadrons/Modules/MDistil/PerambFromSolve.hpp
View File

@@ -201,7 +201,7 @@ void TPerambFromSolve<FImpl>::execute(void)
} }
if(PerambFileName.length()) if(PerambFileName.length())
perambulator.WriteBinary(PerambFileName); perambulator.WriteBinary(PerambFileName + "." + std::to_string(vm().getTrajectory()));
} }

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

@@ -184,7 +184,7 @@ void TPerambLight<FImpl>::execute(void)
//Create Noises //Create Noises
GridSerialRNG sRNG; GridSerialRNG sRNG;
sRNG.SeedUniqueString(UniqueIdentifier); //maybe add trajectory number?? sRNG.SeedUniqueString(UniqueIdentifier + std::to_string(vm().getTrajectory())); //maybe add more??
Real rn; Real rn;
for (int inoise=0;inoise<nnoise;inoise++) { for (int inoise=0;inoise<nnoise;inoise++) {
@@ -205,7 +205,9 @@ void TPerambLight<FImpl>::execute(void)
} }
// Load perambulator if it exists on disk instead of creating it // Load perambulator if it exists on disk instead of creating it
const std::string &PerambFileName{par().PerambFileName}; // Not sure this is how we want it - rather specify an input flag 'read'
// and assert that the file is there.
/* const std::string &PerambFileName{par().PerambFileName};
if( PerambFileName.length() ){ if( PerambFileName.length() ){
bool bExists = false; bool bExists = false;
{ {
@@ -217,7 +219,7 @@ void TPerambLight<FImpl>::execute(void)
perambulator.ReadBinary(PerambFileName); perambulator.ReadBinary(PerambFileName);
return; return;
} }
} }*/
envGetTmp(LatticeSpinColourVector, dist_source); envGetTmp(LatticeSpinColourVector, dist_source);
envGetTmp(LatticeSpinColourVector, tmp2); envGetTmp(LatticeSpinColourVector, tmp2);
@@ -231,10 +233,6 @@ void TPerambLight<FImpl>::execute(void)
const int Ntlocal{grid4d->LocalDimensions()[3]}; const int Ntlocal{grid4d->LocalDimensions()[3]};
const int Ntfirst{grid4d->LocalStarts()[3]}; const int Ntfirst{grid4d->LocalStarts()[3]};
std::cout << "init RBG " << std::endl;
GridRedBlackCartesian RBGrid(grid4d);
std::cout << "init RBG done" << std::endl;
{ {
int t_inv; int t_inv;
@@ -262,7 +260,6 @@ void TPerambLight<FImpl>::execute(void)
} }
} }
} }
std::cout << "Inversion for noise " << inoise << " and dilution component (d_k,d_t,d_alpha) : (" << dk << ","<< dt << "," << ds << ")" << std::endl;
result=zero; result=zero;
v4dtmp = dist_source; v4dtmp = dist_source;
if (Ls_ == 1){ if (Ls_ == 1){
@@ -275,7 +272,6 @@ void TPerambLight<FImpl>::execute(void)
} }
if ((1)) // comment out if unsmeared sink is too large??? if ((1)) // comment out if unsmeared sink is too large???
unsmeared_sink[inoise+nnoise*(dk+LI*(dt+Nt_inv*ds))] = result; unsmeared_sink[inoise+nnoise*(dk+LI*(dt+Nt_inv*ds))] = result;
std::cout << "Contraction of perambulator from noise " << inoise << " and dilution component (d_k,d_t,d_alpha) : (" << dk << ","<< dt << "," << ds << ")" << std::endl;
for (int is = 0; is < Ns; is++) { for (int is = 0; is < Ns; is++) {
result_nospin = peekSpin(result,is); result_nospin = peekSpin(result,is);
for (int t = Ntfirst; t < Ntfirst + Ntlocal; t++) { for (int t = Ntfirst; t < Ntfirst + Ntlocal; t++) {
@@ -283,7 +279,6 @@ void TPerambLight<FImpl>::execute(void)
for (int ivec = 0; ivec < nvec; ivec++) { for (int ivec = 0; ivec < nvec; ivec++) {
ExtractSliceLocal(evec3d,epack.evec[ivec],0,t,3); ExtractSliceLocal(evec3d,epack.evec[ivec],0,t,3);
pokeSpin(perambulator(t, ivec, dk, inoise,dt,ds),innerProduct(evec3d, result_3d),is); pokeSpin(perambulator(t, ivec, dk, inoise,dt,ds),innerProduct(evec3d, result_3d),is);
std::cout << "perambulator(t, ivec, dk, inoise,dt,ds)(is) = (" << t << "," << ivec << "," << dk << "," << inoise << "," << dt << "," << ds << ")(" << is << ") = " << perambulator(t, ivec, dk, inoise,dt,ds)()(is)() << std::endl;
} }
} }
} }
@@ -296,7 +291,7 @@ void TPerambLight<FImpl>::execute(void)
perambulator.SliceShare( grid3d, grid4d ); perambulator.SliceShare( grid3d, grid4d );
if(PerambFileName.length()) if(PerambFileName.length())
perambulator.WriteBinary(PerambFileName); perambulator.WriteBinary(PerambFileName + "." + std::to_string(vm().getTrajectory()));
} }
END_MODULE_NAMESPACE END_MODULE_NAMESPACE