Fixed Cheby1 Implementation

amgprec/impl/smoother/amg_d_poly_smoother_apply_vect.f90

@@ -201,7 +201,6 @@ subroutine amg_d_poly_smoother_apply_vect(alpha,sm,x,beta,y,desc_data,trans,&
         !  b == x
         !  x == tx
         !
-        sm%cf_a = amg_d_poly_a_vect(sm%pdegree)
 
         theta = (done+sm%cf_a)/2
         delta = (done-sm%cf_a)/2
@@ -217,12 +216,12 @@ subroutine amg_d_poly_smoother_apply_vect(alpha,sm,x,beta,y,desc_data,trans,&
         end if
 
         ! tz == d
-        do i=1, sm%pdegree
+        do i=1, sm%pdegree-1
           !
            !
           ! r_{k-1} = r_k - (1/rho(BA)) B A d_k
           call psb_spmm(done,sm%pa,tz,dzero,ty,desc_data,info,work=aux,trans=trans_)
-          call sm%sv%apply(-done,ty,done,r,desc_data,trans_,aux,wv(5:),info,init='Z')
+          call sm%sv%apply(-(done/sm%rho_ba),ty,done,r,desc_data,trans_,aux,wv(5:),info,init='Z')
 
           !
           ! d_{k+1} = (rho rho_old) d_k + 2(rho/delta) r_{k+1}
@@ -236,6 +235,7 @@ subroutine amg_d_poly_smoother_apply_vect(alpha,sm,x,beta,y,desc_data,trans,&
 !!$          res  = psb_genrm2(r,desc_data,info)
 !!$          write(0,*) 'Polynomial smoother NEW ',i,res
           ! x_k =  x_{k-1} + z_k
+          rho_old = rho
         end do
       end block
 

amgprec/impl/smoother/amg_s_poly_smoother_apply_vect.f90

@@ -201,7 +201,6 @@ subroutine amg_s_poly_smoother_apply_vect(alpha,sm,x,beta,y,desc_data,trans,&
         !  b == x
         !  x == tx
         !
-        sm%cf_a = amg_d_poly_a_vect(sm%pdegree)
 
         theta = (sone+sm%cf_a)/2
         delta = (sone-sm%cf_a)/2
@@ -217,12 +216,12 @@ subroutine amg_s_poly_smoother_apply_vect(alpha,sm,x,beta,y,desc_data,trans,&
         end if
 
         ! tz == d
-        do i=1, sm%pdegree
+        do i=1, sm%pdegree-1
           !
            !
           ! r_{k-1} = r_k - (1/rho(BA)) B A d_k
           call psb_spmm(sone,sm%pa,tz,szero,ty,desc_data,info,work=aux,trans=trans_)
-          call sm%sv%apply(-sone,ty,sone,r,desc_data,trans_,aux,wv(5:),info,init='Z')
+          call sm%sv%apply(-(sone/sm%rho_ba),ty,sone,r,desc_data,trans_,aux,wv(5:),info,init='Z')
 
           !
           ! d_{k+1} = (rho rho_old) d_k + 2(rho/delta) r_{k+1}
@@ -236,6 +235,7 @@ subroutine amg_s_poly_smoother_apply_vect(alpha,sm,x,beta,y,desc_data,trans,&
 !!$          res  = psb_genrm2(r,desc_data,info)
 !!$          write(0,*) 'Polynomial smoother NEW ',i,res
           ! x_k =  x_{k-1} + z_k
+          rho_old = rho
         end do
       end block