From af7029c0241d80d00523a2940f7bdf493b016ba2 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Tue, 31 May 2016 17:26:11 +0000 Subject: [PATCH] psblas3: krylov/psb_cgcr.f90 krylov/psb_dgcr.f90 krylov/psb_sgcr.f90 krylov/psb_zgcr.f90 Fix info printing. --- krylov/psb_cgcr.f90 | 8 ++------ krylov/psb_dgcr.f90 | 8 ++------ krylov/psb_sgcr.f90 | 8 ++------ krylov/psb_zgcr.f90 | 8 ++------ 4 files changed, 8 insertions(+), 24 deletions(-) diff --git a/krylov/psb_cgcr.f90 b/krylov/psb_cgcr.f90 index 3bcaa9d3..76dba4d6 100644 --- a/krylov/psb_cgcr.f90 +++ b/krylov/psb_cgcr.f90 @@ -269,12 +269,8 @@ subroutine psb_cgcr_vect(a,prec,b,x,eps,desc_a,info,& goto 9999 end if - call psb_init_conv(methdname,istop_,itrace_,itmax_,a,b,eps,desc_a,stopdat,info) - ! if (info /= psb_success_) Then - ! call psb_errpush(psb_err_from_subroutine_non_,name) - ! goto 9999 - ! End If - + if (psb_check_conv(methdname,itx,x,r,desc_a,stopdat,info)) exit restart + nrst = nrst + 1 iteration: do diff --git a/krylov/psb_dgcr.f90 b/krylov/psb_dgcr.f90 index b463b85d..4a6c0e19 100644 --- a/krylov/psb_dgcr.f90 +++ b/krylov/psb_dgcr.f90 @@ -269,12 +269,8 @@ subroutine psb_dgcr_vect(a,prec,b,x,eps,desc_a,info,& goto 9999 end if - call psb_init_conv(methdname,istop_,itrace_,itmax_,a,b,eps,desc_a,stopdat,info) - ! if (info /= psb_success_) Then - ! call psb_errpush(psb_err_from_subroutine_non_,name) - ! goto 9999 - ! End If - + if (psb_check_conv(methdname,itx,x,r,desc_a,stopdat,info)) exit restart + nrst = nrst + 1 iteration: do diff --git a/krylov/psb_sgcr.f90 b/krylov/psb_sgcr.f90 index 5d92553f..d1a7ec9c 100644 --- a/krylov/psb_sgcr.f90 +++ b/krylov/psb_sgcr.f90 @@ -269,12 +269,8 @@ subroutine psb_sgcr_vect(a,prec,b,x,eps,desc_a,info,& goto 9999 end if - call psb_init_conv(methdname,istop_,itrace_,itmax_,a,b,eps,desc_a,stopdat,info) - ! if (info /= psb_success_) Then - ! call psb_errpush(psb_err_from_subroutine_non_,name) - ! goto 9999 - ! End If - + if (psb_check_conv(methdname,itx,x,r,desc_a,stopdat,info)) exit restart + nrst = nrst + 1 iteration: do diff --git a/krylov/psb_zgcr.f90 b/krylov/psb_zgcr.f90 index 88688270..a19a7b4f 100644 --- a/krylov/psb_zgcr.f90 +++ b/krylov/psb_zgcr.f90 @@ -269,12 +269,8 @@ subroutine psb_zgcr_vect(a,prec,b,x,eps,desc_a,info,& goto 9999 end if - call psb_init_conv(methdname,istop_,itrace_,itmax_,a,b,eps,desc_a,stopdat,info) - ! if (info /= psb_success_) Then - ! call psb_errpush(psb_err_from_subroutine_non_,name) - ! goto 9999 - ! End If - + if (psb_check_conv(methdname,itx,x,r,desc_a,stopdat,info)) exit restart + nrst = nrst + 1 iteration: do