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

Faster set up and some dead code ifdef'ed out

Browse Source
This commit is contained in:
Peter Boyle 2019-12-13 21:30:48 -05:00
parent 5bfd1470ad
commit 736b19485e
1 changed files with 44 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
Grid/algorithms/CoarsenedMatrix.h
View File

@ -240,7 +240,7 @@ public:
// //
// World of possibilities here. // World of possibilities here.
// Experiments // Experiments
// i) Use inverse iteration method equivaleent with Chebyshve // i) Use inverse iteration method equivaleent with Chebyshev
// ii) Multiply by Fourier phases // ii) Multiply by Fourier phases
// iii) Multiply by Fourier phases and refilter // iii) Multiply by Fourier phases and refilter
// //
@ -248,10 +248,31 @@ public:
RealD scale; RealD scale;
const int dependent=4; const int dependent=16;
Chebyshev<FineField> ChebDependent(1.0,64.0,100); Chebyshev<FineField> ChebFilt (0.03,64.0,500);
Chebyshev<FineField> ChebFilt (0.1,64.0,900); Chebyshev<FineField> ChebDependent(0.01,64.0,200);
#if 0
auto latt_size = FineGrid->GlobalDimensions();
Coordinate Fourier[dependent] = {
Coordinate({0, 0,0,0,0}),
Coordinate({0, 1,0,0,0}),
Coordinate({0,-1,0,0,0}),
Coordinate({0,0, 1,0,0}),
Coordinate({0,0,-1,0,0}),
Coordinate({0,0,0, 1,0}),
Coordinate({0,0,0,-1,0}),
Coordinate({0,0,0,0, 1}),
Coordinate({0,0,0,0,-1})
};
ComplexD ci(0.0,1.0);
Lattice<CComplex> C(FineGrid);
Lattice<CComplex> coor(FineGrid);
FineField save(FineGrid);
FineField tmp (FineGrid);
#endif
FineField noise(FineGrid); FineField noise(FineGrid);
FineField Mn(FineGrid); FineField Mn(FineGrid);
@ -262,16 +283,29 @@ public:
gaussian(RNG,noise); gaussian(RNG,noise);
scale = std::pow(norm2(noise),-0.5); scale = std::pow(norm2(noise),-0.5);
noise=noise*scale; noise=noise*scale;
// save=noise;
// Initial matrix element // Initial matrix element
hermop.Op(noise,Mn); std::cout<<GridLogMessage << "noise ["<<bb<<"] <n|MdagM|n> "<<norm2(Mn)<<std::endl; hermop.Op(noise,Mn); std::cout<<GridLogMessage << "noise ["<<bb<<"] <n|MdagM|n> "<<norm2(Mn)<<std::endl;
for(int b=bb;b<bb+dependent;b++) { int dep=0;
for(int b=bb;b<MIN(bb+dependent,nn);b++) {
// Filter // Filter
if(b==bb) { if(b==bb) {
ChebFilt(hermop,noise,Mn); ChebFilt(hermop,noise,Mn);
} else { } else {
#if 0
C=Zero();
for(int mu=0;mu<5;mu++){
RealD TwoPiL = M_PI * 2.0/ latt_size[mu];
LatticeCoordinate(coor,mu);
C = C + (TwoPiL * Fourier[dep][mu]) * coor;
}
C = exp(C*ci); // Fourier phase
noise=C*save;
hermop.Op(noise,Mn); std::cout<<GridLogMessage << "noise ["<<b<<"] <n|MdagM|n> "<<norm2(Mn)<<std::endl;
#endif
ChebDependent(hermop,noise,Mn); ChebDependent(hermop,noise,Mn);
} }
@ -290,11 +324,7 @@ public:
noise = Mn; // Already normaliseed noise = Mn; // Already normaliseed
// c) noise = fourier_phase * Mn; // etc.. // c) noise = fourier_phase * Mn; // etc..
if ( b<bb+dependent-1 ) { dep++;
hermop.Op(noise,Mn); std::cout<<GridLogMessage << "noise ["<<b<<"] <n|MdagM|n> "<<norm2(Mn)<<std::endl;
}
} }
} }
@ -482,7 +512,7 @@ public:
for(int p=0;p<geom.npoint;p++){ for(int p=0;p<geom.npoint;p++){
std::cout << GridLogMessage<< "CoarsenMatrix direction "<<p << std::endl; // std::cout << GridLogMessage<< "CoarsenMatrix direction "<<p << std::endl;
int dir = geom.directions[p]; int dir = geom.directions[p];
int disp = geom.displacements[p]; int disp = geom.displacements[p];
@ -496,7 +526,7 @@ public:
else { else {
linop.OpDir(phi,Mphi,dir,disp); linop.OpDir(phi,Mphi,dir,disp);
} }
std::cout << GridLogMessage<< "CoarsenMatrix direction "<<p << "Mdir done "<< std::endl; // std::cout << GridLogMessage<< "CoarsenMatrix direction "<<p << "Mdir done "<< std::endl;
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
// Pick out contributions coming from this cell and neighbour cell // Pick out contributions coming from this cell and neighbour cell
@ -513,11 +543,11 @@ public:
} else { } else {
assert(0); assert(0);
} }
std::cout << GridLogMessage<< "CoarsenMatrix direction "<<p << "selected "<< std::endl; // std::cout << GridLogMessage<< "CoarsenMatrix direction "<<p << "selected "<< std::endl;
Subspace.ProjectToSubspace(iProj,iblock); Subspace.ProjectToSubspace(iProj,iblock);
Subspace.ProjectToSubspace(oProj,oblock); Subspace.ProjectToSubspace(oProj,oblock);
std::cout << GridLogMessage<< "CoarsenMatrix direction "<<p << "proojected "<< std::endl; // std::cout << GridLogMessage<< "CoarsenMatrix direction "<<p << "proojected "<< std::endl;
// 4x gain possible in this loop. Profile and identify time loss. // 4x gain possible in this loop. Profile and identify time loss.
// i) Assume Hermiticity, upper diagonal only (2x) // i) Assume Hermiticity, upper diagonal only (2x)