From 98d5db73776e01b4526bf25e334cb6211a72e484 Mon Sep 17 00:00:00 2001 From: sfilippone Date: Sun, 10 Nov 2024 10:47:05 +0100 Subject: [PATCH] Krylov into linsolve, step 4 --- cbind/krylov/psb_ckrylov_cbind_mod.f90 | 4 ++-- cbind/krylov/psb_dkrylov_cbind_mod.f90 | 4 ++-- cbind/krylov/psb_skrylov_cbind_mod.f90 | 4 ++-- cbind/krylov/psb_zkrylov_cbind_mod.f90 | 4 ++-- linsolve/Makefile | 2 +- linsolve/psb_cbicg.f90 | 2 +- linsolve/psb_ccg.F90 | 2 +- linsolve/psb_ccgs.f90 | 2 +- linsolve/psb_ccgstab.f90 | 2 +- linsolve/psb_ccgstabl.f90 | 2 +- linsolve/psb_cfcg.F90 | 2 +- linsolve/psb_cgcr.f90 | 2 +- linsolve/psb_ckrylov.f90 | 2 +- linsolve/psb_crgmres.f90 | 2 +- linsolve/psb_crichardson.f90 | 2 +- linsolve/psb_dbicg.f90 | 2 +- linsolve/psb_dcg.F90 | 2 +- linsolve/psb_dcgs.f90 | 2 +- linsolve/psb_dcgstab.f90 | 2 +- linsolve/psb_dcgstabl.f90 | 2 +- linsolve/psb_dfcg.F90 | 2 +- linsolve/psb_dgcr.f90 | 2 +- linsolve/psb_dkrylov.f90 | 2 +- linsolve/psb_drgmres.f90 | 2 +- linsolve/psb_drichardson.f90 | 2 +- linsolve/{psb_krylov_mod.f90 => psb_linsolve_mod.f90} | 8 ++++---- linsolve/psb_sbicg.f90 | 2 +- linsolve/psb_scg.F90 | 2 +- linsolve/psb_scgs.f90 | 2 +- linsolve/psb_scgstab.f90 | 2 +- linsolve/psb_scgstabl.f90 | 2 +- linsolve/psb_sfcg.F90 | 2 +- linsolve/psb_sgcr.f90 | 2 +- linsolve/psb_skrylov.f90 | 2 +- linsolve/psb_srgmres.f90 | 2 +- linsolve/psb_srichardson.f90 | 2 +- linsolve/psb_zbicg.f90 | 2 +- linsolve/psb_zcg.F90 | 2 +- linsolve/psb_zcgs.f90 | 2 +- linsolve/psb_zcgstab.f90 | 2 +- linsolve/psb_zcgstabl.f90 | 2 +- linsolve/psb_zfcg.F90 | 2 +- linsolve/psb_zgcr.f90 | 2 +- linsolve/psb_zkrylov.f90 | 2 +- linsolve/psb_zrgmres.f90 | 2 +- linsolve/psb_zrichardson.f90 | 2 +- test/fileread/psb_cf_sample.f90 | 2 +- test/fileread/psb_df_sample.f90 | 2 +- test/fileread/psb_sf_sample.f90 | 2 +- test/fileread/psb_zf_sample.f90 | 2 +- test/pargen/psb_d_pde2d.F90 | 2 +- test/pargen/psb_d_pde3d.F90 | 2 +- test/pargen/psb_s_pde2d.F90 | 2 +- test/pargen/psb_s_pde3d.F90 | 2 +- 54 files changed, 61 insertions(+), 61 deletions(-) rename linsolve/{psb_krylov_mod.f90 => psb_linsolve_mod.f90} (98%) diff --git a/cbind/krylov/psb_ckrylov_cbind_mod.f90 b/cbind/krylov/psb_ckrylov_cbind_mod.f90 index 56cd51ab..758ecd02 100644 --- a/cbind/krylov/psb_ckrylov_cbind_mod.f90 +++ b/cbind/krylov/psb_ckrylov_cbind_mod.f90 @@ -8,7 +8,7 @@ contains & ah,ph,bh,xh,cdh,options) bind(c) result(res) use psb_base_mod use psb_prec_mod - use psb_krylov_mod + use psb_linsolve_mod use psb_objhandle_mod use psb_prec_cbind_mod use psb_base_string_cbind_mod @@ -33,7 +33,7 @@ contains & ah,ph,bh,xh,eps,cdh,itmax,iter,err,itrace,irst,istop) bind(c) result(res) use psb_base_mod use psb_prec_mod - use psb_krylov_mod + use psb_linsolve_mod use psb_objhandle_mod use psb_prec_cbind_mod use psb_base_string_cbind_mod diff --git a/cbind/krylov/psb_dkrylov_cbind_mod.f90 b/cbind/krylov/psb_dkrylov_cbind_mod.f90 index 43b3ca8c..b1119067 100644 --- a/cbind/krylov/psb_dkrylov_cbind_mod.f90 +++ b/cbind/krylov/psb_dkrylov_cbind_mod.f90 @@ -8,7 +8,7 @@ contains & ah,ph,bh,xh,cdh,options) bind(c) result(res) use psb_base_mod use psb_prec_mod - use psb_krylov_mod + use psb_linsolve_mod use psb_objhandle_mod use psb_prec_cbind_mod use psb_base_string_cbind_mod @@ -33,7 +33,7 @@ contains & ah,ph,bh,xh,eps,cdh,itmax,iter,err,itrace,irst,istop) bind(c) result(res) use psb_base_mod use psb_prec_mod - use psb_krylov_mod + use psb_linsolve_mod use psb_objhandle_mod use psb_prec_cbind_mod use psb_base_string_cbind_mod diff --git a/cbind/krylov/psb_skrylov_cbind_mod.f90 b/cbind/krylov/psb_skrylov_cbind_mod.f90 index 60d41d14..41bb9506 100644 --- a/cbind/krylov/psb_skrylov_cbind_mod.f90 +++ b/cbind/krylov/psb_skrylov_cbind_mod.f90 @@ -8,7 +8,7 @@ contains & ah,ph,bh,xh,cdh,options) bind(c) result(res) use psb_base_mod use psb_prec_mod - use psb_krylov_mod + use psb_linsolve_mod use psb_objhandle_mod use psb_prec_cbind_mod use psb_base_string_cbind_mod @@ -33,7 +33,7 @@ contains & ah,ph,bh,xh,eps,cdh,itmax,iter,err,itrace,irst,istop) bind(c) result(res) use psb_base_mod use psb_prec_mod - use psb_krylov_mod + use psb_linsolve_mod use psb_objhandle_mod use psb_prec_cbind_mod use psb_base_string_cbind_mod diff --git a/cbind/krylov/psb_zkrylov_cbind_mod.f90 b/cbind/krylov/psb_zkrylov_cbind_mod.f90 index 22e74386..37f24be7 100644 --- a/cbind/krylov/psb_zkrylov_cbind_mod.f90 +++ b/cbind/krylov/psb_zkrylov_cbind_mod.f90 @@ -8,7 +8,7 @@ contains & ah,ph,bh,xh,cdh,options) bind(c) result(res) use psb_base_mod use psb_prec_mod - use psb_krylov_mod + use psb_linsolve_mod use psb_objhandle_mod use psb_prec_cbind_mod use psb_base_string_cbind_mod @@ -33,7 +33,7 @@ contains & ah,ph,bh,xh,eps,cdh,itmax,iter,err,itrace,irst,istop) bind(c) result(res) use psb_base_mod use psb_prec_mod - use psb_krylov_mod + use psb_linsolve_mod use psb_objhandle_mod use psb_prec_cbind_mod use psb_base_string_cbind_mod diff --git a/linsolve/Makefile b/linsolve/Makefile index 7ce12020..5c6445f5 100644 --- a/linsolve/Makefile +++ b/linsolve/Makefile @@ -9,7 +9,7 @@ MODDIR=../modules MODOBJS= psb_base_linsolve_conv_mod.o \ psb_s_linsolve_conv_mod.o psb_c_linsolve_conv_mod.o \ psb_d_linsolve_conv_mod.o psb_z_linsolve_conv_mod.o \ - psb_krylov_mod.o + psb_linsolve_mod.o F90OBJS=psb_dkrylov.o psb_skrylov.o psb_ckrylov.o psb_zkrylov.o \ psb_drichardson.o psb_srichardson.o psb_crichardson.o psb_zrichardson.o \ psb_dcgstab.o psb_dcg.o psb_dfcg.o psb_dgcr.o psb_dcgs.o \ diff --git a/linsolve/psb_cbicg.f90 b/linsolve/psb_cbicg.f90 index 7a59fac5..c357054b 100644 --- a/linsolve/psb_cbicg.f90 +++ b/linsolve/psb_cbicg.f90 @@ -99,7 +99,7 @@ subroutine psb_cbicg_vect(a,prec,b,x,eps,desc_a,info,& use psb_base_mod use psb_prec_mod use psb_c_linsolve_conv_mod - use psb_krylov_mod + use psb_linsolve_mod implicit none type(psb_cspmat_type), intent(in) :: a type(psb_desc_type), intent(in) :: desc_a diff --git a/linsolve/psb_ccg.F90 b/linsolve/psb_ccg.F90 index 45455edb..0ba1b5fc 100644 --- a/linsolve/psb_ccg.F90 +++ b/linsolve/psb_ccg.F90 @@ -100,7 +100,7 @@ subroutine psb_ccg_vect(a,prec,b,x,eps,desc_a,info,& use psb_base_mod use psb_prec_mod use psb_c_linsolve_conv_mod - use psb_krylov_mod + use psb_linsolve_mod implicit none type(psb_cspmat_type), intent(in) :: a Type(psb_desc_type), Intent(in) :: desc_a diff --git a/linsolve/psb_ccgs.f90 b/linsolve/psb_ccgs.f90 index c4cb9b8c..f7808c0d 100644 --- a/linsolve/psb_ccgs.f90 +++ b/linsolve/psb_ccgs.f90 @@ -97,7 +97,7 @@ Subroutine psb_ccgs_vect(a,prec,b,x,eps,desc_a,info,& use psb_base_mod use psb_prec_mod use psb_c_linsolve_conv_mod - use psb_krylov_mod + use psb_linsolve_mod implicit none type(psb_cspmat_type), intent(in) :: a Type(psb_desc_type), Intent(in) :: desc_a diff --git a/linsolve/psb_ccgstab.f90 b/linsolve/psb_ccgstab.f90 index 2acfaadd..4ccbaf7a 100644 --- a/linsolve/psb_ccgstab.f90 +++ b/linsolve/psb_ccgstab.f90 @@ -97,7 +97,7 @@ Subroutine psb_ccgstab_vect(a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,ist use psb_base_mod use psb_prec_mod use psb_c_linsolve_conv_mod - use psb_krylov_mod + use psb_linsolve_mod implicit none type(psb_cspmat_type), intent(in) :: a class(psb_cprec_type), Intent(inout) :: prec diff --git a/linsolve/psb_ccgstabl.f90 b/linsolve/psb_ccgstabl.f90 index 64fb2441..f1463b83 100644 --- a/linsolve/psb_ccgstabl.f90 +++ b/linsolve/psb_ccgstabl.f90 @@ -108,7 +108,7 @@ Subroutine psb_ccgstabl_vect(a,prec,b,x,eps,desc_a,info,& use psb_base_mod use psb_prec_mod use psb_c_linsolve_conv_mod - use psb_krylov_mod + use psb_linsolve_mod implicit none type(psb_cspmat_type), intent(in) :: a class(psb_cprec_type), Intent(inout) :: prec diff --git a/linsolve/psb_cfcg.F90 b/linsolve/psb_cfcg.F90 index bdb5207a..f28db7de 100644 --- a/linsolve/psb_cfcg.F90 +++ b/linsolve/psb_cfcg.F90 @@ -108,7 +108,7 @@ subroutine psb_cfcg_vect(a,prec,b,x,eps,desc_a,info,& use psb_base_mod use psb_prec_mod use psb_c_linsolve_conv_mod - use psb_krylov_mod + use psb_linsolve_mod implicit none type(psb_cspmat_type), intent(in) :: a Type(psb_desc_type), Intent(in) :: desc_a diff --git a/linsolve/psb_cgcr.f90 b/linsolve/psb_cgcr.f90 index f2ee9037..5120b102 100644 --- a/linsolve/psb_cgcr.f90 +++ b/linsolve/psb_cgcr.f90 @@ -110,7 +110,7 @@ subroutine psb_cgcr_vect(a,prec,b,x,eps,desc_a,info,& use psb_base_mod use psb_prec_mod use psb_c_linsolve_conv_mod - use psb_krylov_mod + use psb_linsolve_mod implicit none diff --git a/linsolve/psb_ckrylov.f90 b/linsolve/psb_ckrylov.f90 index 3afa525e..39f310fc 100644 --- a/linsolve/psb_ckrylov.f90 +++ b/linsolve/psb_ckrylov.f90 @@ -84,7 +84,7 @@ Subroutine psb_ckrylov_vect(method,a,prec,b,x,eps,desc_a,info,& use psb_base_mod use psb_prec_mod,only : psb_cprec_type - use psb_krylov_mod, psb_protect_name => psb_ckrylov_vect + use psb_linsolve_mod, psb_protect_name => psb_ckrylov_vect character(len=*) :: method Type(psb_cspmat_type), Intent(in) :: a diff --git a/linsolve/psb_crgmres.f90 b/linsolve/psb_crgmres.f90 index 39b8ae18..e7799f70 100644 --- a/linsolve/psb_crgmres.f90 +++ b/linsolve/psb_crgmres.f90 @@ -111,7 +111,7 @@ subroutine psb_crgmres_vect(a,prec,b,x,eps,desc_a,info,& use psb_base_mod use psb_prec_mod use psb_c_linsolve_conv_mod - use psb_krylov_mod + use psb_linsolve_mod implicit none type(psb_cspmat_type), intent(in) :: a Type(psb_desc_type), Intent(in) :: desc_a diff --git a/linsolve/psb_crichardson.f90 b/linsolve/psb_crichardson.f90 index e47e18a7..3eb4c263 100644 --- a/linsolve/psb_crichardson.f90 +++ b/linsolve/psb_crichardson.f90 @@ -74,7 +74,7 @@ Subroutine psb_crichardson_vect(a,prec,b,x,eps,desc_a,info,& use psb_base_mod use psb_prec_mod use psb_c_linsolve_conv_mod - use psb_krylov_mod, psb_protect_name => psb_crichardson_vect + use psb_linsolve_mod, psb_protect_name => psb_crichardson_vect Type(psb_cspmat_type), Intent(in) :: a Type(psb_desc_type), Intent(in) :: desc_a diff --git a/linsolve/psb_dbicg.f90 b/linsolve/psb_dbicg.f90 index 6b1c260b..ebcc8eb9 100644 --- a/linsolve/psb_dbicg.f90 +++ b/linsolve/psb_dbicg.f90 @@ -99,7 +99,7 @@ subroutine psb_dbicg_vect(a,prec,b,x,eps,desc_a,info,& use psb_base_mod use psb_prec_mod use psb_d_linsolve_conv_mod - use psb_krylov_mod + use psb_linsolve_mod implicit none type(psb_dspmat_type), intent(in) :: a type(psb_desc_type), intent(in) :: desc_a diff --git a/linsolve/psb_dcg.F90 b/linsolve/psb_dcg.F90 index edc23870..14c978bb 100644 --- a/linsolve/psb_dcg.F90 +++ b/linsolve/psb_dcg.F90 @@ -100,7 +100,7 @@ subroutine psb_dcg_vect(a,prec,b,x,eps,desc_a,info,& use psb_base_mod use psb_prec_mod use psb_d_linsolve_conv_mod - use psb_krylov_mod + use psb_linsolve_mod implicit none type(psb_dspmat_type), intent(in) :: a Type(psb_desc_type), Intent(in) :: desc_a diff --git a/linsolve/psb_dcgs.f90 b/linsolve/psb_dcgs.f90 index 6dc9385a..5c2401d1 100644 --- a/linsolve/psb_dcgs.f90 +++ b/linsolve/psb_dcgs.f90 @@ -97,7 +97,7 @@ Subroutine psb_dcgs_vect(a,prec,b,x,eps,desc_a,info,& use psb_base_mod use psb_prec_mod use psb_d_linsolve_conv_mod - use psb_krylov_mod + use psb_linsolve_mod implicit none type(psb_dspmat_type), intent(in) :: a Type(psb_desc_type), Intent(in) :: desc_a diff --git a/linsolve/psb_dcgstab.f90 b/linsolve/psb_dcgstab.f90 index 91d66f87..749015d7 100644 --- a/linsolve/psb_dcgstab.f90 +++ b/linsolve/psb_dcgstab.f90 @@ -97,7 +97,7 @@ Subroutine psb_dcgstab_vect(a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,ist use psb_base_mod use psb_prec_mod use psb_d_linsolve_conv_mod - use psb_krylov_mod + use psb_linsolve_mod implicit none type(psb_dspmat_type), intent(in) :: a class(psb_dprec_type), Intent(inout) :: prec diff --git a/linsolve/psb_dcgstabl.f90 b/linsolve/psb_dcgstabl.f90 index b51e2aa8..a2ae6164 100644 --- a/linsolve/psb_dcgstabl.f90 +++ b/linsolve/psb_dcgstabl.f90 @@ -108,7 +108,7 @@ Subroutine psb_dcgstabl_vect(a,prec,b,x,eps,desc_a,info,& use psb_base_mod use psb_prec_mod use psb_d_linsolve_conv_mod - use psb_krylov_mod + use psb_linsolve_mod implicit none type(psb_dspmat_type), intent(in) :: a class(psb_dprec_type), Intent(inout) :: prec diff --git a/linsolve/psb_dfcg.F90 b/linsolve/psb_dfcg.F90 index 6eba5762..cb741795 100644 --- a/linsolve/psb_dfcg.F90 +++ b/linsolve/psb_dfcg.F90 @@ -108,7 +108,7 @@ subroutine psb_dfcg_vect(a,prec,b,x,eps,desc_a,info,& use psb_base_mod use psb_prec_mod use psb_d_linsolve_conv_mod - use psb_krylov_mod + use psb_linsolve_mod implicit none type(psb_dspmat_type), intent(in) :: a Type(psb_desc_type), Intent(in) :: desc_a diff --git a/linsolve/psb_dgcr.f90 b/linsolve/psb_dgcr.f90 index 5566209f..cf2e2b0e 100644 --- a/linsolve/psb_dgcr.f90 +++ b/linsolve/psb_dgcr.f90 @@ -110,7 +110,7 @@ subroutine psb_dgcr_vect(a,prec,b,x,eps,desc_a,info,& use psb_base_mod use psb_prec_mod use psb_d_linsolve_conv_mod - use psb_krylov_mod + use psb_linsolve_mod implicit none diff --git a/linsolve/psb_dkrylov.f90 b/linsolve/psb_dkrylov.f90 index 2bc24d6a..d858c228 100644 --- a/linsolve/psb_dkrylov.f90 +++ b/linsolve/psb_dkrylov.f90 @@ -84,7 +84,7 @@ Subroutine psb_dkrylov_vect(method,a,prec,b,x,eps,desc_a,info,& use psb_base_mod use psb_prec_mod,only : psb_dprec_type - use psb_krylov_mod, psb_protect_name => psb_dkrylov_vect + use psb_linsolve_mod, psb_protect_name => psb_dkrylov_vect character(len=*) :: method Type(psb_dspmat_type), Intent(in) :: a diff --git a/linsolve/psb_drgmres.f90 b/linsolve/psb_drgmres.f90 index 9a8690dd..373c7a70 100644 --- a/linsolve/psb_drgmres.f90 +++ b/linsolve/psb_drgmres.f90 @@ -111,7 +111,7 @@ subroutine psb_drgmres_vect(a,prec,b,x,eps,desc_a,info,& use psb_base_mod use psb_prec_mod use psb_d_linsolve_conv_mod - use psb_krylov_mod + use psb_linsolve_mod implicit none type(psb_dspmat_type), intent(in) :: a Type(psb_desc_type), Intent(in) :: desc_a diff --git a/linsolve/psb_drichardson.f90 b/linsolve/psb_drichardson.f90 index f7c72454..b0a53a4b 100644 --- a/linsolve/psb_drichardson.f90 +++ b/linsolve/psb_drichardson.f90 @@ -74,7 +74,7 @@ Subroutine psb_drichardson_vect(a,prec,b,x,eps,desc_a,info,& use psb_base_mod use psb_prec_mod use psb_d_linsolve_conv_mod - use psb_krylov_mod, psb_protect_name => psb_drichardson_vect + use psb_linsolve_mod, psb_protect_name => psb_drichardson_vect Type(psb_dspmat_type), Intent(in) :: a Type(psb_desc_type), Intent(in) :: desc_a diff --git a/linsolve/psb_krylov_mod.f90 b/linsolve/psb_linsolve_mod.f90 similarity index 98% rename from linsolve/psb_krylov_mod.f90 rename to linsolve/psb_linsolve_mod.f90 index e9a94e18..c54326f3 100644 --- a/linsolve/psb_krylov_mod.f90 +++ b/linsolve/psb_linsolve_mod.f90 @@ -30,10 +30,10 @@ ! ! ! -! File: psb_krylov_mod.f90 -! Interfaces for Krylov subspace iterative methods. +! File: psb_linsolve_mod.f90 +! Interfaces for linear solvers. ! -Module psb_krylov_mod +Module psb_linsolve_mod use psb_const_mod public @@ -211,4 +211,4 @@ Module psb_krylov_mod end interface -end module psb_krylov_mod +end module psb_linsolve_mod diff --git a/linsolve/psb_sbicg.f90 b/linsolve/psb_sbicg.f90 index f8074dec..1b5f1fb8 100644 --- a/linsolve/psb_sbicg.f90 +++ b/linsolve/psb_sbicg.f90 @@ -99,7 +99,7 @@ subroutine psb_sbicg_vect(a,prec,b,x,eps,desc_a,info,& use psb_base_mod use psb_prec_mod use psb_s_linsolve_conv_mod - use psb_krylov_mod + use psb_linsolve_mod implicit none type(psb_sspmat_type), intent(in) :: a type(psb_desc_type), intent(in) :: desc_a diff --git a/linsolve/psb_scg.F90 b/linsolve/psb_scg.F90 index f6276348..d3485db5 100644 --- a/linsolve/psb_scg.F90 +++ b/linsolve/psb_scg.F90 @@ -100,7 +100,7 @@ subroutine psb_scg_vect(a,prec,b,x,eps,desc_a,info,& use psb_base_mod use psb_prec_mod use psb_s_linsolve_conv_mod - use psb_krylov_mod + use psb_linsolve_mod implicit none type(psb_sspmat_type), intent(in) :: a Type(psb_desc_type), Intent(in) :: desc_a diff --git a/linsolve/psb_scgs.f90 b/linsolve/psb_scgs.f90 index c28026d5..4034283e 100644 --- a/linsolve/psb_scgs.f90 +++ b/linsolve/psb_scgs.f90 @@ -97,7 +97,7 @@ Subroutine psb_scgs_vect(a,prec,b,x,eps,desc_a,info,& use psb_base_mod use psb_prec_mod use psb_s_linsolve_conv_mod - use psb_krylov_mod + use psb_linsolve_mod implicit none type(psb_sspmat_type), intent(in) :: a Type(psb_desc_type), Intent(in) :: desc_a diff --git a/linsolve/psb_scgstab.f90 b/linsolve/psb_scgstab.f90 index 89f5244b..a0b57fa8 100644 --- a/linsolve/psb_scgstab.f90 +++ b/linsolve/psb_scgstab.f90 @@ -97,7 +97,7 @@ Subroutine psb_scgstab_vect(a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,ist use psb_base_mod use psb_prec_mod use psb_s_linsolve_conv_mod - use psb_krylov_mod + use psb_linsolve_mod implicit none type(psb_sspmat_type), intent(in) :: a class(psb_sprec_type), Intent(inout) :: prec diff --git a/linsolve/psb_scgstabl.f90 b/linsolve/psb_scgstabl.f90 index 0dca7720..e55d2746 100644 --- a/linsolve/psb_scgstabl.f90 +++ b/linsolve/psb_scgstabl.f90 @@ -108,7 +108,7 @@ Subroutine psb_scgstabl_vect(a,prec,b,x,eps,desc_a,info,& use psb_base_mod use psb_prec_mod use psb_s_linsolve_conv_mod - use psb_krylov_mod + use psb_linsolve_mod implicit none type(psb_sspmat_type), intent(in) :: a class(psb_sprec_type), Intent(inout) :: prec diff --git a/linsolve/psb_sfcg.F90 b/linsolve/psb_sfcg.F90 index c39faf5e..449942cd 100644 --- a/linsolve/psb_sfcg.F90 +++ b/linsolve/psb_sfcg.F90 @@ -108,7 +108,7 @@ subroutine psb_sfcg_vect(a,prec,b,x,eps,desc_a,info,& use psb_base_mod use psb_prec_mod use psb_s_linsolve_conv_mod - use psb_krylov_mod + use psb_linsolve_mod implicit none type(psb_sspmat_type), intent(in) :: a Type(psb_desc_type), Intent(in) :: desc_a diff --git a/linsolve/psb_sgcr.f90 b/linsolve/psb_sgcr.f90 index c0d4f1cd..b2d09d3e 100644 --- a/linsolve/psb_sgcr.f90 +++ b/linsolve/psb_sgcr.f90 @@ -110,7 +110,7 @@ subroutine psb_sgcr_vect(a,prec,b,x,eps,desc_a,info,& use psb_base_mod use psb_prec_mod use psb_s_linsolve_conv_mod - use psb_krylov_mod + use psb_linsolve_mod implicit none diff --git a/linsolve/psb_skrylov.f90 b/linsolve/psb_skrylov.f90 index 35d2024f..1a612a12 100644 --- a/linsolve/psb_skrylov.f90 +++ b/linsolve/psb_skrylov.f90 @@ -84,7 +84,7 @@ Subroutine psb_skrylov_vect(method,a,prec,b,x,eps,desc_a,info,& use psb_base_mod use psb_prec_mod,only : psb_sprec_type - use psb_krylov_mod, psb_protect_name => psb_skrylov_vect + use psb_linsolve_mod, psb_protect_name => psb_skrylov_vect character(len=*) :: method Type(psb_sspmat_type), Intent(in) :: a diff --git a/linsolve/psb_srgmres.f90 b/linsolve/psb_srgmres.f90 index 757e7eb7..537d2f00 100644 --- a/linsolve/psb_srgmres.f90 +++ b/linsolve/psb_srgmres.f90 @@ -111,7 +111,7 @@ subroutine psb_srgmres_vect(a,prec,b,x,eps,desc_a,info,& use psb_base_mod use psb_prec_mod use psb_s_linsolve_conv_mod - use psb_krylov_mod + use psb_linsolve_mod implicit none type(psb_sspmat_type), intent(in) :: a Type(psb_desc_type), Intent(in) :: desc_a diff --git a/linsolve/psb_srichardson.f90 b/linsolve/psb_srichardson.f90 index d3a47b97..660778fc 100644 --- a/linsolve/psb_srichardson.f90 +++ b/linsolve/psb_srichardson.f90 @@ -74,7 +74,7 @@ Subroutine psb_srichardson_vect(a,prec,b,x,eps,desc_a,info,& use psb_base_mod use psb_prec_mod use psb_s_linsolve_conv_mod - use psb_krylov_mod, psb_protect_name => psb_srichardson_vect + use psb_linsolve_mod, psb_protect_name => psb_srichardson_vect Type(psb_sspmat_type), Intent(in) :: a Type(psb_desc_type), Intent(in) :: desc_a diff --git a/linsolve/psb_zbicg.f90 b/linsolve/psb_zbicg.f90 index 4c4f4c32..6a3e0215 100644 --- a/linsolve/psb_zbicg.f90 +++ b/linsolve/psb_zbicg.f90 @@ -99,7 +99,7 @@ subroutine psb_zbicg_vect(a,prec,b,x,eps,desc_a,info,& use psb_base_mod use psb_prec_mod use psb_z_linsolve_conv_mod - use psb_krylov_mod + use psb_linsolve_mod implicit none type(psb_zspmat_type), intent(in) :: a type(psb_desc_type), intent(in) :: desc_a diff --git a/linsolve/psb_zcg.F90 b/linsolve/psb_zcg.F90 index 5d6adb4d..6ca5909c 100644 --- a/linsolve/psb_zcg.F90 +++ b/linsolve/psb_zcg.F90 @@ -100,7 +100,7 @@ subroutine psb_zcg_vect(a,prec,b,x,eps,desc_a,info,& use psb_base_mod use psb_prec_mod use psb_z_linsolve_conv_mod - use psb_krylov_mod + use psb_linsolve_mod implicit none type(psb_zspmat_type), intent(in) :: a Type(psb_desc_type), Intent(in) :: desc_a diff --git a/linsolve/psb_zcgs.f90 b/linsolve/psb_zcgs.f90 index fe307bc6..c5140545 100644 --- a/linsolve/psb_zcgs.f90 +++ b/linsolve/psb_zcgs.f90 @@ -97,7 +97,7 @@ Subroutine psb_zcgs_vect(a,prec,b,x,eps,desc_a,info,& use psb_base_mod use psb_prec_mod use psb_z_linsolve_conv_mod - use psb_krylov_mod + use psb_linsolve_mod implicit none type(psb_zspmat_type), intent(in) :: a Type(psb_desc_type), Intent(in) :: desc_a diff --git a/linsolve/psb_zcgstab.f90 b/linsolve/psb_zcgstab.f90 index 6cc72a28..e04cd7c4 100644 --- a/linsolve/psb_zcgstab.f90 +++ b/linsolve/psb_zcgstab.f90 @@ -97,7 +97,7 @@ Subroutine psb_zcgstab_vect(a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,ist use psb_base_mod use psb_prec_mod use psb_z_linsolve_conv_mod - use psb_krylov_mod + use psb_linsolve_mod implicit none type(psb_zspmat_type), intent(in) :: a class(psb_zprec_type), Intent(inout) :: prec diff --git a/linsolve/psb_zcgstabl.f90 b/linsolve/psb_zcgstabl.f90 index 0898953a..93abd056 100644 --- a/linsolve/psb_zcgstabl.f90 +++ b/linsolve/psb_zcgstabl.f90 @@ -108,7 +108,7 @@ Subroutine psb_zcgstabl_vect(a,prec,b,x,eps,desc_a,info,& use psb_base_mod use psb_prec_mod use psb_z_linsolve_conv_mod - use psb_krylov_mod + use psb_linsolve_mod implicit none type(psb_zspmat_type), intent(in) :: a class(psb_zprec_type), Intent(inout) :: prec diff --git a/linsolve/psb_zfcg.F90 b/linsolve/psb_zfcg.F90 index e5d6f23c..1ab036fe 100644 --- a/linsolve/psb_zfcg.F90 +++ b/linsolve/psb_zfcg.F90 @@ -108,7 +108,7 @@ subroutine psb_zfcg_vect(a,prec,b,x,eps,desc_a,info,& use psb_base_mod use psb_prec_mod use psb_z_linsolve_conv_mod - use psb_krylov_mod + use psb_linsolve_mod implicit none type(psb_zspmat_type), intent(in) :: a Type(psb_desc_type), Intent(in) :: desc_a diff --git a/linsolve/psb_zgcr.f90 b/linsolve/psb_zgcr.f90 index 30eb7db2..e48fc4c1 100644 --- a/linsolve/psb_zgcr.f90 +++ b/linsolve/psb_zgcr.f90 @@ -110,7 +110,7 @@ subroutine psb_zgcr_vect(a,prec,b,x,eps,desc_a,info,& use psb_base_mod use psb_prec_mod use psb_z_linsolve_conv_mod - use psb_krylov_mod + use psb_linsolve_mod implicit none diff --git a/linsolve/psb_zkrylov.f90 b/linsolve/psb_zkrylov.f90 index bcfd6806..900e50b6 100644 --- a/linsolve/psb_zkrylov.f90 +++ b/linsolve/psb_zkrylov.f90 @@ -84,7 +84,7 @@ Subroutine psb_zkrylov_vect(method,a,prec,b,x,eps,desc_a,info,& use psb_base_mod use psb_prec_mod,only : psb_zprec_type - use psb_krylov_mod, psb_protect_name => psb_zkrylov_vect + use psb_linsolve_mod, psb_protect_name => psb_zkrylov_vect character(len=*) :: method Type(psb_zspmat_type), Intent(in) :: a diff --git a/linsolve/psb_zrgmres.f90 b/linsolve/psb_zrgmres.f90 index 2ee8e4dc..39985518 100644 --- a/linsolve/psb_zrgmres.f90 +++ b/linsolve/psb_zrgmres.f90 @@ -111,7 +111,7 @@ subroutine psb_zrgmres_vect(a,prec,b,x,eps,desc_a,info,& use psb_base_mod use psb_prec_mod use psb_z_linsolve_conv_mod - use psb_krylov_mod + use psb_linsolve_mod implicit none type(psb_zspmat_type), intent(in) :: a Type(psb_desc_type), Intent(in) :: desc_a diff --git a/linsolve/psb_zrichardson.f90 b/linsolve/psb_zrichardson.f90 index b4c0af0f..4c2bc567 100644 --- a/linsolve/psb_zrichardson.f90 +++ b/linsolve/psb_zrichardson.f90 @@ -74,7 +74,7 @@ Subroutine psb_zrichardson_vect(a,prec,b,x,eps,desc_a,info,& use psb_base_mod use psb_prec_mod use psb_z_linsolve_conv_mod - use psb_krylov_mod, psb_protect_name => psb_zrichardson_vect + use psb_linsolve_mod, psb_protect_name => psb_zrichardson_vect Type(psb_zspmat_type), Intent(in) :: a Type(psb_desc_type), Intent(in) :: desc_a diff --git a/test/fileread/psb_cf_sample.f90 b/test/fileread/psb_cf_sample.f90 index 3c0ce8f9..01d9a10b 100644 --- a/test/fileread/psb_cf_sample.f90 +++ b/test/fileread/psb_cf_sample.f90 @@ -32,7 +32,7 @@ program psb_cf_sample use psb_base_mod use psb_prec_mod - use psb_krylov_mod + use psb_linsolve_mod use psb_util_mod use getp implicit none diff --git a/test/fileread/psb_df_sample.f90 b/test/fileread/psb_df_sample.f90 index 25a121a4..b186241d 100644 --- a/test/fileread/psb_df_sample.f90 +++ b/test/fileread/psb_df_sample.f90 @@ -32,7 +32,7 @@ program psb_df_sample use psb_base_mod use psb_prec_mod - use psb_krylov_mod + use psb_linsolve_mod use psb_util_mod use getp implicit none diff --git a/test/fileread/psb_sf_sample.f90 b/test/fileread/psb_sf_sample.f90 index 8d9ccb0a..da0fe6b4 100644 --- a/test/fileread/psb_sf_sample.f90 +++ b/test/fileread/psb_sf_sample.f90 @@ -32,7 +32,7 @@ program psb_sf_sample use psb_base_mod use psb_prec_mod - use psb_krylov_mod + use psb_linsolve_mod use psb_util_mod use getp implicit none diff --git a/test/fileread/psb_zf_sample.f90 b/test/fileread/psb_zf_sample.f90 index 3c024606..eefe0901 100644 --- a/test/fileread/psb_zf_sample.f90 +++ b/test/fileread/psb_zf_sample.f90 @@ -32,7 +32,7 @@ program psb_zf_sample use psb_base_mod use psb_prec_mod - use psb_krylov_mod + use psb_linsolve_mod use psb_util_mod use getp implicit none diff --git a/test/pargen/psb_d_pde2d.F90 b/test/pargen/psb_d_pde2d.F90 index 11777b19..7b99fb05 100644 --- a/test/pargen/psb_d_pde2d.F90 +++ b/test/pargen/psb_d_pde2d.F90 @@ -595,7 +595,7 @@ end module psb_d_pde2d_mod program psb_d_pde2d use psb_base_mod use psb_prec_mod - use psb_krylov_mod + use psb_linsolve_mod use psb_util_mod use psb_d_pde2d_mod #if defined(OPENMP) diff --git a/test/pargen/psb_d_pde3d.F90 b/test/pargen/psb_d_pde3d.F90 index 6e895c00..fca19c80 100644 --- a/test/pargen/psb_d_pde3d.F90 +++ b/test/pargen/psb_d_pde3d.F90 @@ -653,7 +653,7 @@ end module psb_d_pde3d_mod program psb_d_pde3d use psb_base_mod use psb_prec_mod - use psb_krylov_mod + use psb_linsolve_mod use psb_util_mod use psb_d_pde3d_mod #if defined(OPENMP) diff --git a/test/pargen/psb_s_pde2d.F90 b/test/pargen/psb_s_pde2d.F90 index f14d2cb4..9bfcc271 100644 --- a/test/pargen/psb_s_pde2d.F90 +++ b/test/pargen/psb_s_pde2d.F90 @@ -595,7 +595,7 @@ end module psb_s_pde2d_mod program psb_s_pde2d use psb_base_mod use psb_prec_mod - use psb_krylov_mod + use psb_linsolve_mod use psb_util_mod use psb_s_pde2d_mod #if defined(OPENMP) diff --git a/test/pargen/psb_s_pde3d.F90 b/test/pargen/psb_s_pde3d.F90 index 2938a4ff..b62073d2 100644 --- a/test/pargen/psb_s_pde3d.F90 +++ b/test/pargen/psb_s_pde3d.F90 @@ -653,7 +653,7 @@ end module psb_s_pde3d_mod program psb_s_pde3d use psb_base_mod use psb_prec_mod - use psb_krylov_mod + use psb_linsolve_mod use psb_util_mod use psb_s_pde3d_mod #if defined(OPENMP)