From 316d3859a279790cd90a45e82abfcac60da6f2d8 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Mon, 31 Oct 2005 17:03:18 +0000 Subject: [PATCH] Fixed optional itmax usage. --- src/methd/psb_dbicg.f90 | 4 ++-- src/methd/psb_dcgs.f90 | 4 ++-- src/methd/psb_dcgstab.f90 | 4 ++-- src/methd/psb_dcgstabl.f90 | 4 ++-- src/methd/psb_dgmresr.f90 | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/methd/psb_dbicg.f90 b/src/methd/psb_dbicg.f90 index eafd06a4..8b38ae67 100644 --- a/src/methd/psb_dbicg.f90 +++ b/src/methd/psb_dbicg.f90 @@ -186,7 +186,7 @@ subroutine psb_dbicg(a,prec,b,x,eps,desc_a,info,& !!$ !!$ r0 = b-ax0 !!$ - if (itx.ge.itmax) exit restart + if (itx.ge.litmax) exit restart it = 0 call psb_axpby(one,b,zero,r,desc_a,info) call psb_spmm(-one,a,x,one,r,desc_a,info,work=aux) @@ -301,7 +301,7 @@ subroutine psb_dbicg(a,prec,b,x,eps,desc_a,info,& if (rerr<=eps) then exit restart end if - if (itx.ge.itmax) exit restart + if (itx.ge.litmax) exit restart end do iteration end do restart diff --git a/src/methd/psb_dcgs.f90 b/src/methd/psb_dcgs.f90 index c02fada1..5e0ef9a8 100644 --- a/src/methd/psb_dcgs.f90 +++ b/src/methd/psb_dcgs.f90 @@ -182,7 +182,7 @@ Subroutine psb_dcgs(a,prec,b,x,eps,desc_a,info,& !!$ !!$ r0 = b-ax0 !!$ - If (itx.Ge.itmax) Exit restart + If (itx.Ge.litmax) Exit restart it = 0 Call psb_axpby(one,b,zero,r,desc_a,info) Call psb_spmm(-one,a,x,one,r,desc_a,info,work=aux) @@ -294,7 +294,7 @@ Subroutine psb_dcgs(a,prec,b,x,eps,desc_a,info,& If (rerr<=eps) Then Exit restart End If - If (itx.Ge.itmax) Exit restart + If (itx.Ge.litmax) Exit restart End Do iteration End Do restart diff --git a/src/methd/psb_dcgstab.f90 b/src/methd/psb_dcgstab.f90 index 1e501270..3ad54192 100644 --- a/src/methd/psb_dcgstab.f90 +++ b/src/methd/psb_dcgstab.f90 @@ -184,7 +184,7 @@ Subroutine psb_dcgstab(a,prec,b,x,eps,desc_a,info,& !!$ !!$ r0 = b-Ax0 !!$ - If (itx >= itmax) Exit restart + If (itx >= litmax) Exit restart it = 0 Call psb_axpby(one,b,zero,r,desc_a,info) Call psb_spmm(-one,a,x,one,r,desc_a,info,work=aux) @@ -347,7 +347,7 @@ Subroutine psb_dcgstab(a,prec,b,x,eps,desc_a,info,& Exit restart End If - If (itx.Ge.itmax) Exit restart + If (itx.Ge.litmax) Exit restart End Do iteration End Do restart diff --git a/src/methd/psb_dcgstabl.f90 b/src/methd/psb_dcgstabl.f90 index 270c5c1f..367e03f8 100644 --- a/src/methd/psb_dcgstabl.f90 +++ b/src/methd/psb_dcgstabl.f90 @@ -202,7 +202,7 @@ Subroutine psb_dcgstabl(a,prec,b,x,eps,desc_a,info,& !!$ r0 = b-ax0 !!$ If (debug) Write(0,*) 'restart: ',itx,it - If (itx.Ge.itmax) Exit restart + If (itx.Ge.litmax) Exit restart it = 0 Call psb_axpby(one,b,zero,r,desc_a,info) Call psb_spmm(-one,a,x,one,r,desc_a,info,work=aux) @@ -356,7 +356,7 @@ Subroutine psb_dcgstabl(a,prec,b,x,eps,desc_a,info,& Exit restart End If - If (itx.Ge.itmax) Exit restart + If (itx.Ge.litmax) Exit restart End Do iteration End Do restart diff --git a/src/methd/psb_dgmresr.f90 b/src/methd/psb_dgmresr.f90 index df3d6adc..a1124045 100644 --- a/src/methd/psb_dgmresr.f90 +++ b/src/methd/psb_dgmresr.f90 @@ -235,7 +235,7 @@ Subroutine psb_dgmresr(a,prec,b,x,eps,desc_a,info,& Exit restart End If - If (itx.Ge.itmax) Exit restart + If (itx.Ge.litmax) Exit restart v(:,1) = v(:,1) * scal