From fe6657534c36624d14b4b9f67fa2b0a42b186d85 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Thu, 10 Jan 2008 11:06:24 +0000 Subject: [PATCH] Some places had "gmresr", others "rgmres": renamed "GMRESR" into "RGMRES" everywhere for consistency. --- krylov/Makefile | 4 ++-- krylov/{psb_dgmresr.f90 => psb_drgmres.f90} | 8 ++++---- krylov/psb_krylov_mod.f90 | 8 ++++---- krylov/{psb_zgmresr.f90 => psb_zrgmres.f90} | 10 +++++----- 4 files changed, 15 insertions(+), 15 deletions(-) rename krylov/{psb_dgmresr.f90 => psb_drgmres.f90} (99%) rename krylov/{psb_zgmresr.f90 => psb_zrgmres.f90} (98%) diff --git a/krylov/Makefile b/krylov/Makefile index cfe5cbe5..213c37e1 100644 --- a/krylov/Makefile +++ b/krylov/Makefile @@ -5,8 +5,8 @@ HERE=. LIBDIR=../lib OBJS=psb_krylov_mod.o psb_dcgstab.o psb_dcg.o psb_dcgs.o \ - psb_dbicg.o psb_dcgstabl.o psb_dgmresr.o\ - psb_zcgstab.o psb_zcgs.o psb_zgmresr.o + psb_dbicg.o psb_dcgstabl.o psb_drgmres.o\ + psb_zcgstab.o psb_zcgs.o psb_zrgmres.o LIBMOD=psb_krylov_mod$(.mod) diff --git a/krylov/psb_dgmresr.f90 b/krylov/psb_drgmres.f90 similarity index 99% rename from krylov/psb_dgmresr.f90 rename to krylov/psb_drgmres.f90 index 7e5e672e..5e0a4f48 100644 --- a/krylov/psb_dgmresr.f90 +++ b/krylov/psb_drgmres.f90 @@ -64,9 +64,9 @@ !!$ C C !!$ C C !!$ CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC -! File: psb_dgmresr.f90 +! File: psb_drgmres.f90 ! -! Subroutine: psb_dgmres +! Subroutine: psb_drgmres ! This subroutine implements the restarted GMRES method with right ! preconditioning. ! @@ -100,7 +100,7 @@ ! where r is the (preconditioned, recursive ! estimate of) residual ! -Subroutine psb_dgmresr(a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,irst,istop) +Subroutine psb_drgmres(a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,irst,istop) use psb_base_mod use psb_prec_mod implicit none @@ -497,6 +497,6 @@ contains end function safe_dn2 -End Subroutine psb_dgmresr +End Subroutine psb_drgmres diff --git a/krylov/psb_krylov_mod.f90 b/krylov/psb_krylov_mod.f90 index b1ab1b1f..8a72ea91 100644 --- a/krylov/psb_krylov_mod.f90 +++ b/krylov/psb_krylov_mod.f90 @@ -127,7 +127,7 @@ Module psb_krylov_mod end interface interface psb_rgmres - Subroutine psb_dgmresr(a,prec,b,x,eps,desc_a,info,& + Subroutine psb_drgmres(a,prec,b,x,eps,desc_a,info,& &itmax,iter,err,itrace,irst,istop) use psb_base_mod use psb_prec_mod @@ -141,8 +141,8 @@ Module psb_krylov_mod Integer, Optional, Intent(in) :: itmax, itrace, irst,istop Integer, Optional, Intent(out) :: iter Real(Kind(1.d0)), Optional, Intent(out) :: err - end subroutine psb_dgmresr - Subroutine psb_zgmresr(a,prec,b,x,eps,desc_a,info,& + end subroutine psb_drgmres + Subroutine psb_zrgmres(a,prec,b,x,eps,desc_a,info,& &itmax,iter,err,itrace,irst,istop) use psb_base_mod use psb_prec_mod @@ -156,7 +156,7 @@ Module psb_krylov_mod Integer, Optional, Intent(in) :: itmax, itrace, irst,istop Integer, Optional, Intent(out) :: iter Real(Kind(1.d0)), Optional, Intent(out) :: err - end subroutine psb_zgmresr + end subroutine psb_zrgmres end interface interface psb_cgs diff --git a/krylov/psb_zgmresr.f90 b/krylov/psb_zrgmres.f90 similarity index 98% rename from krylov/psb_zgmresr.f90 rename to krylov/psb_zrgmres.f90 index 439e8f9d..db67b2b1 100644 --- a/krylov/psb_zgmresr.f90 +++ b/krylov/psb_zrgmres.f90 @@ -64,9 +64,9 @@ !!$ C C !!$ C C !!$ CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC -! File: psb_dgmresr.f90 +! File: psb_zrgmres.f90 ! -! Subroutine: psb_zgmres +! Subroutine: psb_zrgmres ! This subroutine implements the restarted GMRES method with right ! preconditioning. ! @@ -100,7 +100,7 @@ ! where r is the (preconditioned, recursive ! estimate of) residual ! -Subroutine psb_zgmresr(a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,irst,istop) +Subroutine psb_zrgmres(a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,irst,istop) use psb_base_mod use psb_prec_mod implicit none @@ -433,7 +433,7 @@ Subroutine psb_zgmresr(a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,irst,ist If (Present(err)) err=rerr If (Present(iter)) iter = itx If ((rerr>eps).and. (me == 0)) Then - write(debug_unit,*) 'gmresr(l) failed to converge to ',eps,& + write(debug_unit,*) 'rgmres(l) failed to converge to ',eps,& & ' in ',itx,' iterations ' End If @@ -584,4 +584,4 @@ contains return end subroutine zrotg -End Subroutine psb_zgmresr +End Subroutine psb_zrgmres