Merge branch 'mergeparmatch' of github.com:sfilippone/amg4psblas into mergeparmatch

amgprec/amg_base_prec_type.F90

@@ -234,7 +234,8 @@ module amg_base_prec_type
   integer(psb_ipk_), parameter :: amg_sludist_       = amg_slv_delta_+9
   integer(psb_ipk_), parameter :: amg_mumps_         = amg_slv_delta_+10
   integer(psb_ipk_), parameter :: amg_bwgs_          = amg_slv_delta_+11
-  integer(psb_ipk_), parameter :: amg_max_sub_solve_ = amg_slv_delta_+11
+  integer(psb_ipk_), parameter :: amg_krm_           = amg_slv_delta_+12
+  integer(psb_ipk_), parameter :: amg_max_sub_solve_ = amg_slv_delta_+12
   integer(psb_ipk_), parameter :: amg_min_sub_solve_ = amg_diag_scale_
 
   !
@@ -392,7 +393,7 @@ module amg_base_prec_type
        & 'MILU(n)       ','ILU(t,n)      ',&
        & 'SuperLU       ','UMFPACK LU    ',&
        & 'SuperLU_Dist  ','MUMPS         ',&
-       & 'Backward GS   '/)
+       & 'Backward GS   ','Krylov Method '/)
 
   interface amg_check_def
     module procedure amg_icheck_def, amg_scheck_def, amg_dcheck_def
@@ -545,6 +546,8 @@ contains
       val = amg_jac_
     case('L1-JACOBI')
       val = amg_l1_jac_
+    case('KRM')
+      val = amg_krm_
     case('AS')
       val = amg_as_
     case('A_NORMI')

amgprec/impl/amg_c_smoothers_bld.f90

@@ -261,7 +261,7 @@ subroutine amg_c_smoothers_bld(a,desc_a,prec,info,amold,vmold,imold)
              & ' but the coarse matrix has been changed to replicated'
       end if
 
-    case(amg_bjac_,amg_l1_bjac_,amg_jac_, amg_l1_jac_, amg_gs_, amg_fbgs_, amg_l1_gs_,amg_l1_fbgs_)
+    case(amg_bjac_,amg_l1_bjac_,amg_jac_, amg_l1_jac_, amg_gs_, amg_fbgs_, amg_l1_gs_,amg_l1_fbgs_,amg_krm_)
       if (prec%precv(iszv)%parms%coarse_mat /= amg_distr_mat_) then
         write(psb_err_unit,*) &
              & 'AMG4PSBLAS: Warning: original coarse solver was requested as ',&

amgprec/impl/amg_ccprecset.F90

@@ -561,7 +561,7 @@ subroutine amg_ccprecsetc(p,what,string,info,ilev,ilmax,pos,idx)
           case('KRM')
             block
               type(amg_c_krm_solver_type)          :: krm_slv
-              call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos)
+              call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_krm_,info,pos=pos)
               call p%precv(nlev_)%set(krm_slv,info)
               call p%precv(nlev_)%default()
               call p%precv(nlev_)%set('COARSE_MAT',amg_distr_mat_,info,pos=pos)
@@ -711,7 +711,7 @@ subroutine amg_ccprecsetc(p,what,string,info,ilev,ilmax,pos,idx)
           case('KRM')
             block
               type(amg_c_krm_solver_type)          :: krm_slv
-              call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos)
+              call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_krm_,info,pos=pos)
               call p%precv(nlev_)%set(krm_slv,info)
               call p%precv(nlev_)%default()
               call p%precv(nlev_)%set('COARSE_MAT',amg_distr_mat_,info,pos=pos)

amgprec/impl/amg_d_smoothers_bld.f90

@@ -261,7 +261,7 @@ subroutine amg_d_smoothers_bld(a,desc_a,prec,info,amold,vmold,imold)
              & ' but the coarse matrix has been changed to replicated'
       end if
 
-    case(amg_bjac_,amg_l1_bjac_,amg_jac_, amg_l1_jac_, amg_gs_, amg_fbgs_, amg_l1_gs_,amg_l1_fbgs_)
+    case(amg_bjac_,amg_l1_bjac_,amg_jac_, amg_l1_jac_, amg_gs_, amg_fbgs_, amg_l1_gs_,amg_l1_fbgs_,amg_krm_)
       if (prec%precv(iszv)%parms%coarse_mat /= amg_distr_mat_) then
         write(psb_err_unit,*) &
              & 'AMG4PSBLAS: Warning: original coarse solver was requested as ',&

amgprec/impl/amg_dcprecset.F90

@@ -587,7 +587,7 @@ subroutine amg_dcprecsetc(p,what,string,info,ilev,ilmax,pos,idx)
           case('KRM')
             block
               type(amg_d_krm_solver_type)          :: krm_slv
-              call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos)
+              call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_krm_,info,pos=pos)
               call p%precv(nlev_)%set(krm_slv,info)
               call p%precv(nlev_)%default()
               call p%precv(nlev_)%set('COARSE_MAT',amg_distr_mat_,info,pos=pos)
@@ -751,7 +751,7 @@ subroutine amg_dcprecsetc(p,what,string,info,ilev,ilmax,pos,idx)
           case('KRM')
             block
               type(amg_d_krm_solver_type)          :: krm_slv
-              call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos)
+              call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_krm_,info,pos=pos)
               call p%precv(nlev_)%set(krm_slv,info)
               call p%precv(nlev_)%default()
               call p%precv(nlev_)%set('COARSE_MAT',amg_distr_mat_,info,pos=pos)

amgprec/impl/amg_s_smoothers_bld.f90

@@ -261,7 +261,7 @@ subroutine amg_s_smoothers_bld(a,desc_a,prec,info,amold,vmold,imold)
              & ' but the coarse matrix has been changed to replicated'
       end if
 
-    case(amg_bjac_,amg_l1_bjac_,amg_jac_, amg_l1_jac_, amg_gs_, amg_fbgs_, amg_l1_gs_,amg_l1_fbgs_)
+    case(amg_bjac_,amg_l1_bjac_,amg_jac_, amg_l1_jac_, amg_gs_, amg_fbgs_, amg_l1_gs_,amg_l1_fbgs_,amg_krm_)
       if (prec%precv(iszv)%parms%coarse_mat /= amg_distr_mat_) then
         write(psb_err_unit,*) &
              & 'AMG4PSBLAS: Warning: original coarse solver was requested as ',&

amgprec/impl/amg_scprecset.F90

@@ -561,7 +561,7 @@ subroutine amg_scprecsetc(p,what,string,info,ilev,ilmax,pos,idx)
           case('KRM')
             block
               type(amg_s_krm_solver_type)          :: krm_slv
-              call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos)
+              call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_krm_,info,pos=pos)
               call p%precv(nlev_)%set(krm_slv,info)
               call p%precv(nlev_)%default()
               call p%precv(nlev_)%set('COARSE_MAT',amg_distr_mat_,info,pos=pos)
@@ -711,7 +711,7 @@ subroutine amg_scprecsetc(p,what,string,info,ilev,ilmax,pos,idx)
           case('KRM')
             block
               type(amg_s_krm_solver_type)          :: krm_slv
-              call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos)
+              call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_krm_,info,pos=pos)
               call p%precv(nlev_)%set(krm_slv,info)
               call p%precv(nlev_)%default()
               call p%precv(nlev_)%set('COARSE_MAT',amg_distr_mat_,info,pos=pos)

amgprec/impl/amg_z_smoothers_bld.f90

@@ -261,7 +261,7 @@ subroutine amg_z_smoothers_bld(a,desc_a,prec,info,amold,vmold,imold)
              & ' but the coarse matrix has been changed to replicated'
       end if
 
-    case(amg_bjac_,amg_l1_bjac_,amg_jac_, amg_l1_jac_, amg_gs_, amg_fbgs_, amg_l1_gs_,amg_l1_fbgs_)
+    case(amg_bjac_,amg_l1_bjac_,amg_jac_, amg_l1_jac_, amg_gs_, amg_fbgs_, amg_l1_gs_,amg_l1_fbgs_,amg_krm_)
       if (prec%precv(iszv)%parms%coarse_mat /= amg_distr_mat_) then
         write(psb_err_unit,*) &
              & 'AMG4PSBLAS: Warning: original coarse solver was requested as ',&

amgprec/impl/amg_zcprecset.F90

@@ -587,7 +587,7 @@ subroutine amg_zcprecsetc(p,what,string,info,ilev,ilmax,pos,idx)
           case('KRM')
             block
               type(amg_z_krm_solver_type)          :: krm_slv
-              call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos)
+              call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_krm_,info,pos=pos)
               call p%precv(nlev_)%set(krm_slv,info)
               call p%precv(nlev_)%default()
               call p%precv(nlev_)%set('COARSE_MAT',amg_distr_mat_,info,pos=pos)
@@ -751,7 +751,7 @@ subroutine amg_zcprecsetc(p,what,string,info,ilev,ilmax,pos,idx)
           case('KRM')
             block
               type(amg_z_krm_solver_type)          :: krm_slv
-              call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos)
+              call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_krm_,info,pos=pos)
               call p%precv(nlev_)%set(krm_slv,info)
               call p%precv(nlev_)%default()
               call p%precv(nlev_)%set('COARSE_MAT',amg_distr_mat_,info,pos=pos)