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

WilsonMG: Some first steps towards coarse spin dofs; not compiling yet

Browse Source 
A failing conversion from the innermost type (Grid::Simd<...>) to a coarse
scalar (triple iScalar) in blockPromote prohibits this commit from working.
This commit is contained in:
Daniel Richtmann 2018-01-20 18:48:53 +01:00 committed by Daniel Richtmann
parent 9dc885d297
commit 3b2d805398
No known key found for this signature in database
GPG Key ID: B33C490AF0772057
2 changed files with 36 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
lib/algorithms/CoarsenedMatrix.h
View File

@ -93,12 +93,16 @@ namespace Grid {
template<class Fobj,class CComplex,int nbasis> template<class Fobj,class CComplex,int nbasis>
class Aggregation { class Aggregation {
public: public:
typedef iVector<CComplex,nbasis > siteVector;
typedef Lattice<siteVector> CoarseVector;
typedef Lattice<iMatrix<CComplex,nbasis > > CoarseMatrix;
typedef Lattice< CComplex > CoarseScalar; // used for inner products on fine field typedef typename GridTypeMapper<CComplex>::vector_type innerType;
typedef Lattice<Fobj > FineField; typedef iScalar<iScalar<iScalar<innerType > > > siteScalar; // used for inner products on fine field
typedef iScalar<iVector<iVector<innerType, nbasis >, 1 > > siteVector;
typedef iScalar<iMatrix<iMatrix<innerType, nbasis >, 1 > > siteMatrix;
typedef Lattice<siteScalar> CoarseScalar; // used for inner products on fine field
typedef Lattice<siteVector> CoarseVector;
typedef Lattice<siteMatrix> CoarseMatrix;
typedef Lattice<Fobj> FineField;
GridBase *CoarseGrid; GridBase *CoarseGrid;
GridBase *FineGrid; GridBase *FineGrid;
@ -129,7 +133,7 @@ namespace Grid {
blockProject(iProj,subspace[i],subspace); blockProject(iProj,subspace[i],subspace);
eProj=zero; eProj=zero;
parallel_for(int ss=0;ss<CoarseGrid->oSites();ss++){ parallel_for(int ss=0;ss<CoarseGrid->oSites();ss++){
eProj._odata[ss](i)=CComplex(1.0); eProj._odata[ss]()(0)(i)=innerType(1.0);
} }
eProj=eProj - iProj; eProj=eProj - iProj;
std::cout<<GridLogMessage<<"Orthog check error "<<i<<" " << norm2(eProj)<<std::endl; std::cout<<GridLogMessage<<"Orthog check error "<<i<<" " << norm2(eProj)<<std::endl;
@ -239,15 +243,18 @@ namespace Grid {
// Fine Object == (per site) type of fine field // Fine Object == (per site) type of fine field
// nbasis == number of deflation vectors // nbasis == number of deflation vectors
template<class Fobj,class CComplex,int nbasis> template<class Fobj,class CComplex,int nbasis>
class CoarsenedMatrix : public SparseMatrixBase<Lattice<iVector<CComplex,nbasis > > > { class CoarsenedMatrix : public SparseMatrixBase<Lattice<iScalar<iVector<iVector<typename GridTypeMapper<CComplex>::vector_type, nbasis >, 1 > > > > {
public: public:
typedef iVector<CComplex,nbasis > siteVector; typedef typename GridTypeMapper<CComplex>::vector_type innerType;
typedef Lattice<siteVector> CoarseVector; typedef iScalar<iScalar<iScalar<innerType > > > siteScalar;
typedef Lattice<iMatrix<CComplex,nbasis > > CoarseMatrix; typedef iScalar<iVector<iVector<innerType, nbasis >, 1 > > siteVector;
typedef iScalar<iMatrix<iMatrix<innerType, nbasis >, 1 > > siteMatrix;
typedef Lattice<siteScalar> CoarseScalar; // used for inner products on fine field
typedef Lattice<siteVector> CoarseVector;
typedef Lattice<siteMatrix> CoarseMatrix;
typedef Lattice< CComplex > CoarseScalar; // used for inner products on fine field typedef Lattice<Fobj> FineField;
typedef Lattice<Fobj > FineField;
//////////////////// ////////////////////
// Data members // Data members
@ -387,9 +394,9 @@ namespace Grid {
parallel_for(int ss=0;ss<Grid()->oSites();ss++){ parallel_for(int ss=0;ss<Grid()->oSites();ss++){
for(int j=0;j<nbasis;j++){ for(int j=0;j<nbasis;j++){
if( disp!= 0 ) { if( disp!= 0 ) {
A[p]._odata[ss](j,i) = oProj._odata[ss](j); A[p]._odata[ss]()(0,0)(j,i) = oProj._odata[ss]()(0)(j);
} }
A[self_stencil]._odata[ss](j,i) = A[self_stencil]._odata[ss](j,i) + iProj._odata[ss](j); A[self_stencil]._odata[ss]()(0,0)(j,i) = A[self_stencil]._odata[ss]()(0,0)(j,i) + iProj._odata[ss]()(0)(j);
} }
} }
} }

26
lib/lattice/Lattice_transfer.h
View File

@ -80,8 +80,8 @@ inline void subdivides(GridBase *coarse,GridBase *fine)
} }
template<class vobj,class CComplex,int nbasis> template<class vobj,class vobjC>
inline void blockProject(Lattice<iVector<CComplex,nbasis > > &coarseData, inline void blockProject(Lattice<vobjC> &coarseData,
const Lattice<vobj> &fineData, const Lattice<vobj> &fineData,
const std::vector<Lattice<vobj> > &Basis) const std::vector<Lattice<vobj> > &Basis)
{ {
@ -90,7 +90,8 @@ inline void blockProject(Lattice<iVector<CComplex,nbasis > > &coarseData,
int _ndimension = coarse->_ndimension; int _ndimension = coarse->_ndimension;
// checks // checks
assert( nbasis == Basis.size() ); assert((Basis.size() != 0) && ((Basis.size() & 0x1) == 0));
auto nbasis = Basis.size();
subdivides(coarse,fine); subdivides(coarse,fine);
for(int i=0;i<nbasis;i++){ for(int i=0;i<nbasis;i++){
conformable(Basis[i],fineData); conformable(Basis[i],fineData);
@ -118,8 +119,8 @@ inline void blockProject(Lattice<iVector<CComplex,nbasis > > &coarseData,
PARALLEL_CRITICAL PARALLEL_CRITICAL
for(int i=0;i<nbasis;i++) { for(int i=0;i<nbasis;i++) {
coarseData._odata[sc](i)=coarseData._odata[sc](i) coarseData._odata[sc]()(0)(i)=coarseData._odata[sc]()(0)(i)
+ innerProduct(Basis[i]._odata[sf],fineData._odata[sf]); + TensorRemove(innerProduct(Basis[i]._odata[sf],fineData._odata[sf]));
} }
} }
@ -285,9 +286,9 @@ inline void blockOrthogonalise(Lattice<CComplex> &ip,std::vector<Lattice<vobj> >
} }
} }
template<class vobj,class CComplex,int nbasis> template<class vobj,class vobjC>
inline void blockPromote(const Lattice<iVector<CComplex,nbasis > > &coarseData, inline void blockPromote(const Lattice<vobjC> &coarseData,
Lattice<vobj> &fineData, Lattice<vobj> &fineData,
const std::vector<Lattice<vobj> > &Basis) const std::vector<Lattice<vobj> > &Basis)
{ {
GridBase * fine = fineData._grid; GridBase * fine = fineData._grid;
@ -295,7 +296,9 @@ inline void blockPromote(const Lattice<iVector<CComplex,nbasis > > &coarseData,
int _ndimension = coarse->_ndimension; int _ndimension = coarse->_ndimension;
// checks // checks
assert( nbasis == Basis.size() ); assert((Basis.size() != 0) && ((Basis.size() & 0x1) == 0));
auto nbasis = Basis.size();
subdivides(coarse,fine); subdivides(coarse,fine);
for(int i=0;i<nbasis;i++){ for(int i=0;i<nbasis;i++){
conformable(Basis[i]._grid,fine); conformable(Basis[i]._grid,fine);
@ -319,9 +322,10 @@ inline void blockPromote(const Lattice<iVector<CComplex,nbasis > > &coarseData,
for(int d=0;d<_ndimension;d++) coor_c[d]=coor_f[d]/block_r[d]; for(int d=0;d<_ndimension;d++) coor_c[d]=coor_f[d]/block_r[d];
Lexicographic::IndexFromCoor(coor_c,sc,coarse->_rdimensions); Lexicographic::IndexFromCoor(coor_c,sc,coarse->_rdimensions);
// TODO: These lines here prevent this commit from working
for(int i=0;i<nbasis;i++) { for(int i=0;i<nbasis;i++) {
if(i==0) fineData._odata[sf]=coarseData._odata[sc](i) * Basis[i]._odata[sf]; if(i==0) fineData._odata[sf]=coarseData._odata[sc]()(0)(i) * Basis[i]._odata[sf];
else fineData._odata[sf]=fineData._odata[sf]+coarseData._odata[sc](i)*Basis[i]._odata[sf]; else fineData._odata[sf]=fineData._odata[sf]+coarseData._odata[sc]()(0)(i)*Basis[i]._odata[sf];
} }
} }
} }