mirror of
https://github.com/paboyle/Grid.git
synced 2024-11-14 09:45:36 +00:00
Remove vectors used for the power spectrum table in paper
This commit is contained in:
parent
35e8225abd
commit
3f9119b39d
@ -63,7 +63,12 @@ class TwoLevelCGmrhs
|
|||||||
GridStopWatch SmoothTimer;
|
GridStopWatch SmoothTimer;
|
||||||
GridStopWatch InsertTimer;
|
GridStopWatch InsertTimer;
|
||||||
|
|
||||||
|
/*
|
||||||
|
Field rrr;
|
||||||
|
Field sss;
|
||||||
|
Field qqq;
|
||||||
|
Field zzz;
|
||||||
|
*/
|
||||||
// more most opertor functions
|
// more most opertor functions
|
||||||
TwoLevelCGmrhs(RealD tol,
|
TwoLevelCGmrhs(RealD tol,
|
||||||
Integer maxit,
|
Integer maxit,
|
||||||
@ -74,6 +79,12 @@ class TwoLevelCGmrhs
|
|||||||
MaxIterations(maxit),
|
MaxIterations(maxit),
|
||||||
_FineLinop(FineLinop),
|
_FineLinop(FineLinop),
|
||||||
_Smoother(Smoother)
|
_Smoother(Smoother)
|
||||||
|
/*
|
||||||
|
rrr(fine),
|
||||||
|
sss(fine),
|
||||||
|
qqq(fine),
|
||||||
|
zzz(fine)
|
||||||
|
*/
|
||||||
{
|
{
|
||||||
grid = fine;
|
grid = fine;
|
||||||
};
|
};
|
||||||
@ -81,8 +92,8 @@ class TwoLevelCGmrhs
|
|||||||
// Vector case
|
// Vector case
|
||||||
virtual void operator() (std::vector<Field> &src, std::vector<Field> &x)
|
virtual void operator() (std::vector<Field> &src, std::vector<Field> &x)
|
||||||
{
|
{
|
||||||
SolveSingleSystem(src,x);
|
// SolveSingleSystem(src,x);
|
||||||
// SolvePrecBlockCG(src,x);
|
SolvePrecBlockCG(src,x);
|
||||||
}
|
}
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||||
@ -657,6 +668,8 @@ public:
|
|||||||
CoarseField PleftProjMrhs(this->coarsegridmrhs);
|
CoarseField PleftProjMrhs(this->coarsegridmrhs);
|
||||||
CoarseField PleftMss_projMrhs(this->coarsegridmrhs);
|
CoarseField PleftMss_projMrhs(this->coarsegridmrhs);
|
||||||
|
|
||||||
|
// this->rrr=in[0];
|
||||||
|
|
||||||
#undef SMOOTHER_BLOCK_SOLVE
|
#undef SMOOTHER_BLOCK_SOLVE
|
||||||
#if SMOOTHER_BLOCK_SOLVE
|
#if SMOOTHER_BLOCK_SOLVE
|
||||||
this->SmoothTimer.Start();
|
this->SmoothTimer.Start();
|
||||||
@ -669,6 +682,7 @@ public:
|
|||||||
this->SmoothTimer.Stop();
|
this->SmoothTimer.Stop();
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
// this->sss=Min[0];
|
||||||
|
|
||||||
for(int rhs=0;rhs<nrhs;rhs++) {
|
for(int rhs=0;rhs<nrhs;rhs++) {
|
||||||
|
|
||||||
@ -705,9 +719,11 @@ public:
|
|||||||
this->_Projector.blockPromote(tmp,PleftMss_proj);// tmp= Q[in - A Min]
|
this->_Projector.blockPromote(tmp,PleftMss_proj);// tmp= Q[in - A Min]
|
||||||
this->PromoteTimer.Stop();
|
this->PromoteTimer.Stop();
|
||||||
this->FineTimer.Start();
|
this->FineTimer.Start();
|
||||||
|
// this->qqq=tmp[0];
|
||||||
for(int rhs=0;rhs<nrhs;rhs++) {
|
for(int rhs=0;rhs<nrhs;rhs++) {
|
||||||
axpy(out[rhs],1.0,Min[rhs],tmp[rhs]); // Min+tmp
|
axpy(out[rhs],1.0,Min[rhs],tmp[rhs]); // Min+tmp
|
||||||
}
|
}
|
||||||
|
// this->zzz=out[0];
|
||||||
this->FineTimer.Stop();
|
this->FineTimer.Stop();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user