From 6cf0f84408e914d38f401256845005358d22663d Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Mon, 3 Dec 2018 10:46:06 +0000 Subject: [PATCH] Accept GMRES as well as RGMRES. --- Changelog | 1 + README.md | 2 +- krylov/psb_ckrylov.f90 | 2 +- krylov/psb_dkrylov.f90 | 2 +- krylov/psb_skrylov.f90 | 2 +- krylov/psb_zkrylov.f90 | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Changelog b/Changelog index bdf4d20a..2cbf12a4 100644 --- a/Changelog +++ b/Changelog @@ -1,5 +1,6 @@ Changelog. A lot less detailed than usual, at least for past history. +2018/02/03: Accept 'GMRES' as synonim with 'RGMRES'. 2018/11/23: Reimplement hash function. 2018/10/10: new ICTXT argument to prec%init method. 2018/09/04: Modified vector class get_vect method diff --git a/README.md b/README.md index 5dca822c..cc1a77e6 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -PSBLAS library, version 3.5 +PSBLAS library, version 3.6 =========================== The architecture of the Fortran 2003 sparse BLAS is described in: diff --git a/krylov/psb_ckrylov.f90 b/krylov/psb_ckrylov.f90 index a5d19445..9b2ab409 100644 --- a/krylov/psb_ckrylov.f90 +++ b/krylov/psb_ckrylov.f90 @@ -185,7 +185,7 @@ Subroutine psb_ckrylov_vect(method,a,prec,b,x,eps,desc_a,info,& case('BICGSTAB') call psb_ccgstab_vect(a,prec,b,x,eps,desc_a,info,& &itmax,iter,err,itrace,istop) - case('RGMRES') + case('RGMRES','GMRES') call psb_crgmres_vect(a,prec,b,x,eps,desc_a,info,& &itmax,iter,err,itrace,irst,istop) case('BICGSTABL') diff --git a/krylov/psb_dkrylov.f90 b/krylov/psb_dkrylov.f90 index ab3178da..328a372e 100644 --- a/krylov/psb_dkrylov.f90 +++ b/krylov/psb_dkrylov.f90 @@ -185,7 +185,7 @@ Subroutine psb_dkrylov_vect(method,a,prec,b,x,eps,desc_a,info,& case('BICGSTAB') call psb_dcgstab_vect(a,prec,b,x,eps,desc_a,info,& &itmax,iter,err,itrace,istop) - case('RGMRES') + case('RGMRES','GMRES') call psb_drgmres_vect(a,prec,b,x,eps,desc_a,info,& &itmax,iter,err,itrace,irst,istop) case('BICGSTABL') diff --git a/krylov/psb_skrylov.f90 b/krylov/psb_skrylov.f90 index 9eb3552d..09fcbfe3 100644 --- a/krylov/psb_skrylov.f90 +++ b/krylov/psb_skrylov.f90 @@ -185,7 +185,7 @@ Subroutine psb_skrylov_vect(method,a,prec,b,x,eps,desc_a,info,& case('BICGSTAB') call psb_scgstab_vect(a,prec,b,x,eps,desc_a,info,& &itmax,iter,err,itrace,istop) - case('RGMRES') + case('RGMRES','GMRES') call psb_srgmres_vect(a,prec,b,x,eps,desc_a,info,& &itmax,iter,err,itrace,irst,istop) case('BICGSTABL') diff --git a/krylov/psb_zkrylov.f90 b/krylov/psb_zkrylov.f90 index 4ab8776b..218502b2 100644 --- a/krylov/psb_zkrylov.f90 +++ b/krylov/psb_zkrylov.f90 @@ -185,7 +185,7 @@ Subroutine psb_zkrylov_vect(method,a,prec,b,x,eps,desc_a,info,& case('BICGSTAB') call psb_zcgstab_vect(a,prec,b,x,eps,desc_a,info,& &itmax,iter,err,itrace,istop) - case('RGMRES') + case('RGMRES','GMRES') call psb_zrgmres_vect(a,prec,b,x,eps,desc_a,info,& &itmax,iter,err,itrace,irst,istop) case('BICGSTABL')