fdurastante/psblas3
1
0
Fork 0
mirror of https://github.com/sfilippone/psblas3.git synced 2026-10-20 21:02:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix GMRES convergence logs

Browse Source
This commit is contained in:
sfilippone
2024-11-13 14:08:13 +01:00
parent ecc59b8a4b
commit 29f72195ef
4 changed files with 12 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
linsolve/impl/psb_crgmres.f90
+3 -6
View File
@@ -344,19 +344,16 @@ subroutine psb_crgmres_vect(a,prec,b,x,eps,desc_a,info,&
goto 9999
end if
if (errnum <= eps*errden) exit restart
if ((errnum <= eps*errden).or.(itx >= litmax)) exit restart
if (itrace_ > 0) &
& call log_conv(methdname,me,itx,itrace_,errnum,errden,deps)
call v(1)%scal(scal) !v(1) = v(1) * scal
if (itx >= litmax) exit restart
!
! inner iterations
!
inner: Do i=1,nl
itx = itx + 1
@@ -446,6 +443,8 @@ subroutine psb_crgmres_vect(a,prec,b,x,eps,desc_a,info,&
call psb_geaxpby(cone,w,cone,x,desc_a,info)
end if
if (itrace_ > 0) &
& call log_conv(methdname,me,itx,ione,errnum,errden,deps)
exit restart
end if
@@ -474,8 +473,6 @@ subroutine psb_crgmres_vect(a,prec,b,x,eps,desc_a,info,&
end if
end do restart
if (itrace_ > 0) &
& call log_conv(methdname,me,itx,ione,errnum,errden,deps)
call log_end(methdname,me,itx,itrace_,errnum,errden,deps,err=derr,iter=iter)
if (present(err)) err = derr
linsolve/impl/psb_drgmres.f90
+3 -6
View File
@@ -344,19 +344,16 @@ subroutine psb_drgmres_vect(a,prec,b,x,eps,desc_a,info,&
goto 9999
end if
if (errnum <= eps*errden) exit restart
if ((errnum <= eps*errden).or.(itx >= litmax)) exit restart
if (itrace_ > 0) &
& call log_conv(methdname,me,itx,itrace_,errnum,errden,deps)
call v(1)%scal(scal) !v(1) = v(1) * scal
if (itx >= litmax) exit restart
!
! inner iterations
!
inner: Do i=1,nl
itx = itx + 1
@@ -446,6 +443,8 @@ subroutine psb_drgmres_vect(a,prec,b,x,eps,desc_a,info,&
call psb_geaxpby(done,w,done,x,desc_a,info)
end if
if (itrace_ > 0) &
& call log_conv(methdname,me,itx,ione,errnum,errden,deps)
exit restart
end if
@@ -474,8 +473,6 @@ subroutine psb_drgmres_vect(a,prec,b,x,eps,desc_a,info,&
end if
end do restart
if (itrace_ > 0) &
& call log_conv(methdname,me,itx,ione,errnum,errden,deps)
call log_end(methdname,me,itx,itrace_,errnum,errden,deps,err=derr,iter=iter)
if (present(err)) err = derr
linsolve/impl/psb_srgmres.f90
+3 -6
View File
@@ -344,19 +344,16 @@ subroutine psb_srgmres_vect(a,prec,b,x,eps,desc_a,info,&
goto 9999
end if
if (errnum <= eps*errden) exit restart
if ((errnum <= eps*errden).or.(itx >= litmax)) exit restart
if (itrace_ > 0) &
& call log_conv(methdname,me,itx,itrace_,errnum,errden,deps)
call v(1)%scal(scal) !v(1) = v(1) * scal
if (itx >= litmax) exit restart
!
! inner iterations
!
inner: Do i=1,nl
itx = itx + 1
@@ -446,6 +443,8 @@ subroutine psb_srgmres_vect(a,prec,b,x,eps,desc_a,info,&
call psb_geaxpby(sone,w,sone,x,desc_a,info)
end if
if (itrace_ > 0) &
& call log_conv(methdname,me,itx,ione,errnum,errden,deps)
exit restart
end if
@@ -474,8 +473,6 @@ subroutine psb_srgmres_vect(a,prec,b,x,eps,desc_a,info,&
end if
end do restart
if (itrace_ > 0) &
& call log_conv(methdname,me,itx,ione,errnum,errden,deps)
call log_end(methdname,me,itx,itrace_,errnum,errden,deps,err=derr,iter=iter)
if (present(err)) err = derr
linsolve/impl/psb_zrgmres.f90
+3 -6
View File
@@ -344,19 +344,16 @@ subroutine psb_zrgmres_vect(a,prec,b,x,eps,desc_a,info,&
goto 9999
end if
if (errnum <= eps*errden) exit restart
if ((errnum <= eps*errden).or.(itx >= litmax)) exit restart
if (itrace_ > 0) &
& call log_conv(methdname,me,itx,itrace_,errnum,errden,deps)
call v(1)%scal(scal) !v(1) = v(1) * scal
if (itx >= litmax) exit restart
!
! inner iterations
!
inner: Do i=1,nl
itx = itx + 1
@@ -446,6 +443,8 @@ subroutine psb_zrgmres_vect(a,prec,b,x,eps,desc_a,info,&
call psb_geaxpby(zone,w,zone,x,desc_a,info)
end if
if (itrace_ > 0) &
& call log_conv(methdname,me,itx,ione,errnum,errden,deps)
exit restart
end if
@@ -474,8 +473,6 @@ subroutine psb_zrgmres_vect(a,prec,b,x,eps,desc_a,info,&
end if
end do restart
if (itrace_ > 0) &
& call log_conv(methdname,me,itx,ione,errnum,errden,deps)
call log_end(methdname,me,itx,itrace_,errnum,errden,deps,err=derr,iter=iter)
if (present(err)) err = derr