From 14dce3eefd656fbed38f7e1bfa18dca2af7e6ec3 Mon Sep 17 00:00:00 2001 From: sfilippone Date: Sun, 10 Nov 2024 10:27:31 +0100 Subject: [PATCH] Krylov into linsolve, step 3. --- 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_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_drgmres.f90 | 2 +- linsolve/psb_drichardson.f90 | 2 +- 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_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_zrgmres.f90 | 2 +- linsolve/psb_zrichardson.f90 | 2 +- 36 files changed, 36 insertions(+), 36 deletions(-) diff --git a/linsolve/psb_cbicg.f90 b/linsolve/psb_cbicg.f90 index c3b4f472..7a59fac5 100644 --- a/linsolve/psb_cbicg.f90 +++ b/linsolve/psb_cbicg.f90 @@ -98,7 +98,7 @@ subroutine psb_cbicg_vect(a,prec,b,x,eps,desc_a,info,& & itmax,iter,err,itrace,istop) use psb_base_mod use psb_prec_mod - use psb_c_krylov_conv_mod + use psb_c_linsolve_conv_mod use psb_krylov_mod implicit none type(psb_cspmat_type), intent(in) :: a diff --git a/linsolve/psb_ccg.F90 b/linsolve/psb_ccg.F90 index fbc550e7..45455edb 100644 --- a/linsolve/psb_ccg.F90 +++ b/linsolve/psb_ccg.F90 @@ -99,7 +99,7 @@ subroutine psb_ccg_vect(a,prec,b,x,eps,desc_a,info,& & itmax,iter,err,itrace,istop,cond) use psb_base_mod use psb_prec_mod - use psb_c_krylov_conv_mod + use psb_c_linsolve_conv_mod use psb_krylov_mod implicit none type(psb_cspmat_type), intent(in) :: a diff --git a/linsolve/psb_ccgs.f90 b/linsolve/psb_ccgs.f90 index c25a449a..c4cb9b8c 100644 --- a/linsolve/psb_ccgs.f90 +++ b/linsolve/psb_ccgs.f90 @@ -96,7 +96,7 @@ Subroutine psb_ccgs_vect(a,prec,b,x,eps,desc_a,info,& & itmax,iter,err,itrace,istop) use psb_base_mod use psb_prec_mod - use psb_c_krylov_conv_mod + use psb_c_linsolve_conv_mod use psb_krylov_mod implicit none type(psb_cspmat_type), intent(in) :: a diff --git a/linsolve/psb_ccgstab.f90 b/linsolve/psb_ccgstab.f90 index 22d73b85..2acfaadd 100644 --- a/linsolve/psb_ccgstab.f90 +++ b/linsolve/psb_ccgstab.f90 @@ -96,7 +96,7 @@ Subroutine psb_ccgstab_vect(a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,istop) use psb_base_mod use psb_prec_mod - use psb_c_krylov_conv_mod + use psb_c_linsolve_conv_mod use psb_krylov_mod implicit none type(psb_cspmat_type), intent(in) :: a diff --git a/linsolve/psb_ccgstabl.f90 b/linsolve/psb_ccgstabl.f90 index 86ca5d93..64fb2441 100644 --- a/linsolve/psb_ccgstabl.f90 +++ b/linsolve/psb_ccgstabl.f90 @@ -107,7 +107,7 @@ Subroutine psb_ccgstabl_vect(a,prec,b,x,eps,desc_a,info,& & itmax,iter,err,itrace,irst,istop) use psb_base_mod use psb_prec_mod - use psb_c_krylov_conv_mod + use psb_c_linsolve_conv_mod use psb_krylov_mod implicit none type(psb_cspmat_type), intent(in) :: a diff --git a/linsolve/psb_cfcg.F90 b/linsolve/psb_cfcg.F90 index 590ed29d..bdb5207a 100644 --- a/linsolve/psb_cfcg.F90 +++ b/linsolve/psb_cfcg.F90 @@ -107,7 +107,7 @@ subroutine psb_cfcg_vect(a,prec,b,x,eps,desc_a,info,& & itmax,iter,err,itrace,istop,cond) use psb_base_mod use psb_prec_mod - use psb_c_krylov_conv_mod + use psb_c_linsolve_conv_mod use psb_krylov_mod implicit none type(psb_cspmat_type), intent(in) :: a diff --git a/linsolve/psb_cgcr.f90 b/linsolve/psb_cgcr.f90 index 91c848a2..f2ee9037 100644 --- a/linsolve/psb_cgcr.f90 +++ b/linsolve/psb_cgcr.f90 @@ -109,7 +109,7 @@ subroutine psb_cgcr_vect(a,prec,b,x,eps,desc_a,info,& & itmax,iter,err,itrace, irst, istop) use psb_base_mod use psb_prec_mod - use psb_c_krylov_conv_mod + use psb_c_linsolve_conv_mod use psb_krylov_mod implicit none diff --git a/linsolve/psb_crgmres.f90 b/linsolve/psb_crgmres.f90 index 80aa34c3..39b8ae18 100644 --- a/linsolve/psb_crgmres.f90 +++ b/linsolve/psb_crgmres.f90 @@ -110,7 +110,7 @@ subroutine psb_crgmres_vect(a,prec,b,x,eps,desc_a,info,& & itmax,iter,err,itrace,irst,istop) use psb_base_mod use psb_prec_mod - use psb_c_krylov_conv_mod + use psb_c_linsolve_conv_mod use psb_krylov_mod implicit none type(psb_cspmat_type), intent(in) :: a diff --git a/linsolve/psb_crichardson.f90 b/linsolve/psb_crichardson.f90 index 08678653..e47e18a7 100644 --- a/linsolve/psb_crichardson.f90 +++ b/linsolve/psb_crichardson.f90 @@ -73,7 +73,7 @@ Subroutine psb_crichardson_vect(a,prec,b,x,eps,desc_a,info,& use psb_base_mod use psb_prec_mod - use psb_c_krylov_conv_mod + use psb_c_linsolve_conv_mod use psb_krylov_mod, psb_protect_name => psb_crichardson_vect Type(psb_cspmat_type), Intent(in) :: a diff --git a/linsolve/psb_dbicg.f90 b/linsolve/psb_dbicg.f90 index 5ac94d3c..6b1c260b 100644 --- a/linsolve/psb_dbicg.f90 +++ b/linsolve/psb_dbicg.f90 @@ -98,7 +98,7 @@ subroutine psb_dbicg_vect(a,prec,b,x,eps,desc_a,info,& & itmax,iter,err,itrace,istop) use psb_base_mod use psb_prec_mod - use psb_d_krylov_conv_mod + use psb_d_linsolve_conv_mod use psb_krylov_mod implicit none type(psb_dspmat_type), intent(in) :: a diff --git a/linsolve/psb_dcg.F90 b/linsolve/psb_dcg.F90 index 669573be..edc23870 100644 --- a/linsolve/psb_dcg.F90 +++ b/linsolve/psb_dcg.F90 @@ -99,7 +99,7 @@ subroutine psb_dcg_vect(a,prec,b,x,eps,desc_a,info,& & itmax,iter,err,itrace,istop,cond) use psb_base_mod use psb_prec_mod - use psb_d_krylov_conv_mod + use psb_d_linsolve_conv_mod use psb_krylov_mod implicit none type(psb_dspmat_type), intent(in) :: a diff --git a/linsolve/psb_dcgs.f90 b/linsolve/psb_dcgs.f90 index 78a3905c..6dc9385a 100644 --- a/linsolve/psb_dcgs.f90 +++ b/linsolve/psb_dcgs.f90 @@ -96,7 +96,7 @@ Subroutine psb_dcgs_vect(a,prec,b,x,eps,desc_a,info,& & itmax,iter,err,itrace,istop) use psb_base_mod use psb_prec_mod - use psb_d_krylov_conv_mod + use psb_d_linsolve_conv_mod use psb_krylov_mod implicit none type(psb_dspmat_type), intent(in) :: a diff --git a/linsolve/psb_dcgstab.f90 b/linsolve/psb_dcgstab.f90 index bec3329a..91d66f87 100644 --- a/linsolve/psb_dcgstab.f90 +++ b/linsolve/psb_dcgstab.f90 @@ -96,7 +96,7 @@ Subroutine psb_dcgstab_vect(a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,istop) use psb_base_mod use psb_prec_mod - use psb_d_krylov_conv_mod + use psb_d_linsolve_conv_mod use psb_krylov_mod implicit none type(psb_dspmat_type), intent(in) :: a diff --git a/linsolve/psb_dcgstabl.f90 b/linsolve/psb_dcgstabl.f90 index 01641226..b51e2aa8 100644 --- a/linsolve/psb_dcgstabl.f90 +++ b/linsolve/psb_dcgstabl.f90 @@ -107,7 +107,7 @@ Subroutine psb_dcgstabl_vect(a,prec,b,x,eps,desc_a,info,& & itmax,iter,err,itrace,irst,istop) use psb_base_mod use psb_prec_mod - use psb_d_krylov_conv_mod + use psb_d_linsolve_conv_mod use psb_krylov_mod implicit none type(psb_dspmat_type), intent(in) :: a diff --git a/linsolve/psb_dfcg.F90 b/linsolve/psb_dfcg.F90 index d3b2c9d2..6eba5762 100644 --- a/linsolve/psb_dfcg.F90 +++ b/linsolve/psb_dfcg.F90 @@ -107,7 +107,7 @@ subroutine psb_dfcg_vect(a,prec,b,x,eps,desc_a,info,& & itmax,iter,err,itrace,istop,cond) use psb_base_mod use psb_prec_mod - use psb_d_krylov_conv_mod + use psb_d_linsolve_conv_mod use psb_krylov_mod implicit none type(psb_dspmat_type), intent(in) :: a diff --git a/linsolve/psb_dgcr.f90 b/linsolve/psb_dgcr.f90 index b7480f84..5566209f 100644 --- a/linsolve/psb_dgcr.f90 +++ b/linsolve/psb_dgcr.f90 @@ -109,7 +109,7 @@ subroutine psb_dgcr_vect(a,prec,b,x,eps,desc_a,info,& & itmax,iter,err,itrace, irst, istop) use psb_base_mod use psb_prec_mod - use psb_d_krylov_conv_mod + use psb_d_linsolve_conv_mod use psb_krylov_mod implicit none diff --git a/linsolve/psb_drgmres.f90 b/linsolve/psb_drgmres.f90 index 1503748a..9a8690dd 100644 --- a/linsolve/psb_drgmres.f90 +++ b/linsolve/psb_drgmres.f90 @@ -110,7 +110,7 @@ subroutine psb_drgmres_vect(a,prec,b,x,eps,desc_a,info,& & itmax,iter,err,itrace,irst,istop) use psb_base_mod use psb_prec_mod - use psb_d_krylov_conv_mod + use psb_d_linsolve_conv_mod use psb_krylov_mod implicit none type(psb_dspmat_type), intent(in) :: a diff --git a/linsolve/psb_drichardson.f90 b/linsolve/psb_drichardson.f90 index 2c057320..f7c72454 100644 --- a/linsolve/psb_drichardson.f90 +++ b/linsolve/psb_drichardson.f90 @@ -73,7 +73,7 @@ Subroutine psb_drichardson_vect(a,prec,b,x,eps,desc_a,info,& use psb_base_mod use psb_prec_mod - use psb_d_krylov_conv_mod + use psb_d_linsolve_conv_mod use psb_krylov_mod, psb_protect_name => psb_drichardson_vect Type(psb_dspmat_type), Intent(in) :: a diff --git a/linsolve/psb_sbicg.f90 b/linsolve/psb_sbicg.f90 index 609d3a5f..f8074dec 100644 --- a/linsolve/psb_sbicg.f90 +++ b/linsolve/psb_sbicg.f90 @@ -98,7 +98,7 @@ subroutine psb_sbicg_vect(a,prec,b,x,eps,desc_a,info,& & itmax,iter,err,itrace,istop) use psb_base_mod use psb_prec_mod - use psb_s_krylov_conv_mod + use psb_s_linsolve_conv_mod use psb_krylov_mod implicit none type(psb_sspmat_type), intent(in) :: a diff --git a/linsolve/psb_scg.F90 b/linsolve/psb_scg.F90 index c16dbf6a..f6276348 100644 --- a/linsolve/psb_scg.F90 +++ b/linsolve/psb_scg.F90 @@ -99,7 +99,7 @@ subroutine psb_scg_vect(a,prec,b,x,eps,desc_a,info,& & itmax,iter,err,itrace,istop,cond) use psb_base_mod use psb_prec_mod - use psb_s_krylov_conv_mod + use psb_s_linsolve_conv_mod use psb_krylov_mod implicit none type(psb_sspmat_type), intent(in) :: a diff --git a/linsolve/psb_scgs.f90 b/linsolve/psb_scgs.f90 index 48fe5372..c28026d5 100644 --- a/linsolve/psb_scgs.f90 +++ b/linsolve/psb_scgs.f90 @@ -96,7 +96,7 @@ Subroutine psb_scgs_vect(a,prec,b,x,eps,desc_a,info,& & itmax,iter,err,itrace,istop) use psb_base_mod use psb_prec_mod - use psb_s_krylov_conv_mod + use psb_s_linsolve_conv_mod use psb_krylov_mod implicit none type(psb_sspmat_type), intent(in) :: a diff --git a/linsolve/psb_scgstab.f90 b/linsolve/psb_scgstab.f90 index 2a811b8d..89f5244b 100644 --- a/linsolve/psb_scgstab.f90 +++ b/linsolve/psb_scgstab.f90 @@ -96,7 +96,7 @@ Subroutine psb_scgstab_vect(a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,istop) use psb_base_mod use psb_prec_mod - use psb_s_krylov_conv_mod + use psb_s_linsolve_conv_mod use psb_krylov_mod implicit none type(psb_sspmat_type), intent(in) :: a diff --git a/linsolve/psb_scgstabl.f90 b/linsolve/psb_scgstabl.f90 index c2fc9833..0dca7720 100644 --- a/linsolve/psb_scgstabl.f90 +++ b/linsolve/psb_scgstabl.f90 @@ -107,7 +107,7 @@ Subroutine psb_scgstabl_vect(a,prec,b,x,eps,desc_a,info,& & itmax,iter,err,itrace,irst,istop) use psb_base_mod use psb_prec_mod - use psb_s_krylov_conv_mod + use psb_s_linsolve_conv_mod use psb_krylov_mod implicit none type(psb_sspmat_type), intent(in) :: a diff --git a/linsolve/psb_sfcg.F90 b/linsolve/psb_sfcg.F90 index 3a518bb2..c39faf5e 100644 --- a/linsolve/psb_sfcg.F90 +++ b/linsolve/psb_sfcg.F90 @@ -107,7 +107,7 @@ subroutine psb_sfcg_vect(a,prec,b,x,eps,desc_a,info,& & itmax,iter,err,itrace,istop,cond) use psb_base_mod use psb_prec_mod - use psb_s_krylov_conv_mod + use psb_s_linsolve_conv_mod use psb_krylov_mod implicit none type(psb_sspmat_type), intent(in) :: a diff --git a/linsolve/psb_sgcr.f90 b/linsolve/psb_sgcr.f90 index dd0aca16..c0d4f1cd 100644 --- a/linsolve/psb_sgcr.f90 +++ b/linsolve/psb_sgcr.f90 @@ -109,7 +109,7 @@ subroutine psb_sgcr_vect(a,prec,b,x,eps,desc_a,info,& & itmax,iter,err,itrace, irst, istop) use psb_base_mod use psb_prec_mod - use psb_s_krylov_conv_mod + use psb_s_linsolve_conv_mod use psb_krylov_mod implicit none diff --git a/linsolve/psb_srgmres.f90 b/linsolve/psb_srgmres.f90 index 02836dd7..757e7eb7 100644 --- a/linsolve/psb_srgmres.f90 +++ b/linsolve/psb_srgmres.f90 @@ -110,7 +110,7 @@ subroutine psb_srgmres_vect(a,prec,b,x,eps,desc_a,info,& & itmax,iter,err,itrace,irst,istop) use psb_base_mod use psb_prec_mod - use psb_s_krylov_conv_mod + use psb_s_linsolve_conv_mod use psb_krylov_mod implicit none type(psb_sspmat_type), intent(in) :: a diff --git a/linsolve/psb_srichardson.f90 b/linsolve/psb_srichardson.f90 index a06f6cb4..d3a47b97 100644 --- a/linsolve/psb_srichardson.f90 +++ b/linsolve/psb_srichardson.f90 @@ -73,7 +73,7 @@ Subroutine psb_srichardson_vect(a,prec,b,x,eps,desc_a,info,& use psb_base_mod use psb_prec_mod - use psb_s_krylov_conv_mod + use psb_s_linsolve_conv_mod use psb_krylov_mod, psb_protect_name => psb_srichardson_vect Type(psb_sspmat_type), Intent(in) :: a diff --git a/linsolve/psb_zbicg.f90 b/linsolve/psb_zbicg.f90 index c22e499a..4c4f4c32 100644 --- a/linsolve/psb_zbicg.f90 +++ b/linsolve/psb_zbicg.f90 @@ -98,7 +98,7 @@ subroutine psb_zbicg_vect(a,prec,b,x,eps,desc_a,info,& & itmax,iter,err,itrace,istop) use psb_base_mod use psb_prec_mod - use psb_z_krylov_conv_mod + use psb_z_linsolve_conv_mod use psb_krylov_mod implicit none type(psb_zspmat_type), intent(in) :: a diff --git a/linsolve/psb_zcg.F90 b/linsolve/psb_zcg.F90 index a4a521d8..5d6adb4d 100644 --- a/linsolve/psb_zcg.F90 +++ b/linsolve/psb_zcg.F90 @@ -99,7 +99,7 @@ subroutine psb_zcg_vect(a,prec,b,x,eps,desc_a,info,& & itmax,iter,err,itrace,istop,cond) use psb_base_mod use psb_prec_mod - use psb_z_krylov_conv_mod + use psb_z_linsolve_conv_mod use psb_krylov_mod implicit none type(psb_zspmat_type), intent(in) :: a diff --git a/linsolve/psb_zcgs.f90 b/linsolve/psb_zcgs.f90 index 3ccce860..fe307bc6 100644 --- a/linsolve/psb_zcgs.f90 +++ b/linsolve/psb_zcgs.f90 @@ -96,7 +96,7 @@ Subroutine psb_zcgs_vect(a,prec,b,x,eps,desc_a,info,& & itmax,iter,err,itrace,istop) use psb_base_mod use psb_prec_mod - use psb_z_krylov_conv_mod + use psb_z_linsolve_conv_mod use psb_krylov_mod implicit none type(psb_zspmat_type), intent(in) :: a diff --git a/linsolve/psb_zcgstab.f90 b/linsolve/psb_zcgstab.f90 index 95ff129a..6cc72a28 100644 --- a/linsolve/psb_zcgstab.f90 +++ b/linsolve/psb_zcgstab.f90 @@ -96,7 +96,7 @@ Subroutine psb_zcgstab_vect(a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,istop) use psb_base_mod use psb_prec_mod - use psb_z_krylov_conv_mod + use psb_z_linsolve_conv_mod use psb_krylov_mod implicit none type(psb_zspmat_type), intent(in) :: a diff --git a/linsolve/psb_zcgstabl.f90 b/linsolve/psb_zcgstabl.f90 index 2cf3a0e5..0898953a 100644 --- a/linsolve/psb_zcgstabl.f90 +++ b/linsolve/psb_zcgstabl.f90 @@ -107,7 +107,7 @@ Subroutine psb_zcgstabl_vect(a,prec,b,x,eps,desc_a,info,& & itmax,iter,err,itrace,irst,istop) use psb_base_mod use psb_prec_mod - use psb_z_krylov_conv_mod + use psb_z_linsolve_conv_mod use psb_krylov_mod implicit none type(psb_zspmat_type), intent(in) :: a diff --git a/linsolve/psb_zfcg.F90 b/linsolve/psb_zfcg.F90 index 3c26ad3d..e5d6f23c 100644 --- a/linsolve/psb_zfcg.F90 +++ b/linsolve/psb_zfcg.F90 @@ -107,7 +107,7 @@ subroutine psb_zfcg_vect(a,prec,b,x,eps,desc_a,info,& & itmax,iter,err,itrace,istop,cond) use psb_base_mod use psb_prec_mod - use psb_z_krylov_conv_mod + use psb_z_linsolve_conv_mod use psb_krylov_mod implicit none type(psb_zspmat_type), intent(in) :: a diff --git a/linsolve/psb_zgcr.f90 b/linsolve/psb_zgcr.f90 index 2399160c..30eb7db2 100644 --- a/linsolve/psb_zgcr.f90 +++ b/linsolve/psb_zgcr.f90 @@ -109,7 +109,7 @@ subroutine psb_zgcr_vect(a,prec,b,x,eps,desc_a,info,& & itmax,iter,err,itrace, irst, istop) use psb_base_mod use psb_prec_mod - use psb_z_krylov_conv_mod + use psb_z_linsolve_conv_mod use psb_krylov_mod implicit none diff --git a/linsolve/psb_zrgmres.f90 b/linsolve/psb_zrgmres.f90 index 3aaf0032..2ee8e4dc 100644 --- a/linsolve/psb_zrgmres.f90 +++ b/linsolve/psb_zrgmres.f90 @@ -110,7 +110,7 @@ subroutine psb_zrgmres_vect(a,prec,b,x,eps,desc_a,info,& & itmax,iter,err,itrace,irst,istop) use psb_base_mod use psb_prec_mod - use psb_z_krylov_conv_mod + use psb_z_linsolve_conv_mod use psb_krylov_mod implicit none type(psb_zspmat_type), intent(in) :: a diff --git a/linsolve/psb_zrichardson.f90 b/linsolve/psb_zrichardson.f90 index 19f2f10e..b4c0af0f 100644 --- a/linsolve/psb_zrichardson.f90 +++ b/linsolve/psb_zrichardson.f90 @@ -73,7 +73,7 @@ Subroutine psb_zrichardson_vect(a,prec,b,x,eps,desc_a,info,& use psb_base_mod use psb_prec_mod - use psb_z_krylov_conv_mod + use psb_z_linsolve_conv_mod use psb_krylov_mod, psb_protect_name => psb_zrichardson_vect Type(psb_zspmat_type), Intent(in) :: a