mlprec/mld_caggrmat_asb.f90
 mlprec/mld_caggrmat_raw_asb.F90
 mlprec/mld_cmlprecbld.f90
 mlprec/mld_cprec_aply.f90
 mlprec/mld_cprecbld.f90
 mlprec/mld_daggrmat_asb.f90
 mlprec/mld_daggrmat_raw_asb.F90
 mlprec/mld_dmlprecbld.f90
 mlprec/mld_dprec_aply.f90
 mlprec/mld_dprecbld.f90
 mlprec/mld_inner_mod.f90
 mlprec/mld_prec_mod.f90
 mlprec/mld_saggrmat_asb.f90
 mlprec/mld_saggrmat_raw_asb.F90
 mlprec/mld_smlprecbld.f90
 mlprec/mld_sprec_aply.f90
 mlprec/mld_sprecbld.f90
 mlprec/mld_zaggrmat_asb.f90
 mlprec/mld_zaggrmat_raw_asb.F90
 mlprec/mld_zmlprecbld.f90
 mlprec/mld_zprec_aply.f90
 mlprec/mld_zprecbld.f90

Name fixing: mlprecbld -> mlprec_bld
     	     aggrmat_raw_asb -> aggrmat_nosmth_asb
	     mld_Xprec_aply -> mld_Xprecaply

First step: internals.
stopcriterion
Salvatore Filippone 16 years ago
parent 6f0fd11557
commit 4b9412b1a5

@ -121,9 +121,9 @@ subroutine mld_caggrmat_asb(a,desc_a,ilaggr,nlaggr,p,info)
select case (p%iprcparm(mld_aggr_kind_))
case (mld_no_smooth_)
call mld_aggrmat_raw_asb(a,desc_a,ilaggr,nlaggr,p,info)
call mld_aggrmat_nosmth_asb(a,desc_a,ilaggr,nlaggr,p,info)
if(info /= 0) then
call psb_errpush(4010,name,a_err='mld_aggrmat_raw_asb')
call psb_errpush(4010,name,a_err='mld_aggrmat_nosmth_asb')
goto 9999
end if

@ -36,9 +36,9 @@
!!$ POSSIBILITY OF SUCH DAMAGE.
!!$
!!$
! File: mld_caggrmat_raw_asb.F90
! File: mld_caggrmat_nosmth_asb.F90
!
! Subroutine: mld_caggrmat_raw_asb
! Subroutine: mld_caggrmat_nosmth_asb
! Version: complex
!
! This routine builds a coarse-level matrix A_C from a fine-level matrix A
@ -73,9 +73,9 @@
! info - integer, output.
! Error code.
!
subroutine mld_caggrmat_raw_asb(a,desc_a,ilaggr,nlaggr,p,info)
subroutine mld_caggrmat_nosmth_asb(a,desc_a,ilaggr,nlaggr,p,info)
use psb_base_mod
use mld_inner_mod, mld_protect_name => mld_caggrmat_raw_asb
use mld_inner_mod, mld_protect_name => mld_caggrmat_nosmth_asb
#ifdef MPI_MOD
use mpi
@ -101,7 +101,7 @@ subroutine mld_caggrmat_raw_asb(a,desc_a,ilaggr,nlaggr,p,info)
integer :: nrow, nglob, ncol, ntaggr, nzac, ip, ndx,&
& naggr, nzt,naggrm1, i
name='mld_aggrmat_raw_asb'
name='mld_aggrmat_nosmth_asb'
if(psb_get_errstatus().ne.0) return
info=0
call psb_erractionsave(err_act)
@ -288,4 +288,4 @@ subroutine mld_caggrmat_raw_asb(a,desc_a,ilaggr,nlaggr,p,info)
end if
return
end subroutine mld_caggrmat_raw_asb
end subroutine mld_caggrmat_nosmth_asb

@ -36,9 +36,9 @@
!!$ POSSIBILITY OF SUCH DAMAGE.
!!$
!!$
! File: mld_cmlprecbld.f90
! File: mld_cmlprec_bld.f90
!
! Subroutine: mld_cmlprecbld
! Subroutine: mld_cmlprec_bld
! Version: real
! Contains: subroutine init_baseprec_av
!
@ -63,10 +63,10 @@
! info - integer, output.
! Error code.
!
subroutine mld_cmlprecbld(a,desc_a,p,info)
subroutine mld_cmlprec_bld(a,desc_a,p,info)
use psb_base_mod
use mld_inner_mod, mld_protect_name => mld_cmlprecbld
use mld_inner_mod, mld_protect_name => mld_cmlprec_bld
use mld_prec_mod
Implicit None
@ -94,7 +94,7 @@ subroutine mld_cmlprecbld(a,desc_a,p,info)
debug_unit = psb_get_debug_unit()
debug_level = psb_get_debug_level()
name = 'mld_cmlprecbld'
name = 'mld_cmlprec_bld'
info = 0
int_err(1) = 0
ictxt = psb_cd_get_context(desc_a)
@ -382,5 +382,5 @@ contains
end select
end subroutine check_coarse_lev
end subroutine mld_cmlprecbld
end subroutine mld_cmlprec_bld

@ -36,9 +36,9 @@
!!$ POSSIBILITY OF SUCH DAMAGE.
!!$
!!$
! File: mld_cprec_aply.f90
! File: mld_cprecaply.f90
!
! Subroutine: mld_cprec_aply
! Subroutine: mld_cprecaply
! Version: complex
!
! This routine applies the preconditioner built by mld_cprecbld, i.e. it computes
@ -71,11 +71,11 @@
! Workspace. Its size must be at
! least 4*psb_cd_get_local_cols(desc_data).
!
subroutine mld_cprec_aply(prec,x,y,desc_data,info,trans,work)
subroutine mld_cprecaply(prec,x,y,desc_data,info,trans,work)
use psb_base_mod
use mld_inner_mod
use mld_prec_mod, mld_protect_name => mld_cprec_aply
use mld_prec_mod, mld_protect_name => mld_cprecaply
implicit none
@ -94,7 +94,7 @@ subroutine mld_cprec_aply(prec,x,y,desc_data,info,trans,work)
integer :: ictxt,np,me,err_act,iwsz
character(len=20) :: name
name='mld_cprec_aply'
name='mld_cprecaply'
info = 0
call psb_erractionsave(err_act)
@ -162,12 +162,12 @@ subroutine mld_cprec_aply(prec,x,y,desc_data,info,trans,work)
end if
return
end subroutine mld_cprec_aply
end subroutine mld_cprecaply
! File: mld_cprec_aply.f90.
! File: mld_cprecaply.f90.
!
! Subroutine: mld_cprec_aply1.
! Subroutine: mld_cprecaply1.
! Version: complex.
!
! Applies the preconditioner built by mld_cprecbld, i.e. computes
@ -179,7 +179,7 @@ end subroutine mld_cprec_aply
! - X is a vectors.
! This operation is performed at each iteration of a preconditioned Krylov solver.
!
! This routine differs from mld_cprec_aply because the preconditioned vector X
! This routine differs from mld_cprecaply because the preconditioned vector X
! overwrites the original one.
!
!
@ -198,11 +198,11 @@ end subroutine mld_cprec_aply
! If trans='N','n' then op(M^(-1)) = M^(-1);
! if trans='T','t' then op(M^(-1)) = M^(-T) (transpose of M^(-1)).
!
subroutine mld_cprec_aply1(prec,x,desc_data,info,trans)
subroutine mld_cprecaply1(prec,x,desc_data,info,trans)
use psb_base_mod
use mld_inner_mod
use mld_prec_mod, mld_protect_name => mld_cprec_aply1
use mld_prec_mod, mld_protect_name => mld_cprecaply1
implicit none
@ -218,7 +218,7 @@ subroutine mld_cprec_aply1(prec,x,desc_data,info,trans)
complex(psb_spk_), pointer :: WW(:), w1(:)
character(len=20) :: name
name='mld_cprec_aply1'
name='mld_cprecaply1'
info = 0
call psb_erractionsave(err_act)
@ -258,4 +258,4 @@ subroutine mld_cprec_aply1(prec,x,desc_data,info,trans)
return
end if
return
end subroutine mld_cprec_aply1
end subroutine mld_cprecaply1

@ -191,7 +191,7 @@ subroutine mld_cprecbld(a,desc_a,p,info)
else if (iszv > 1) then
call mld_mlprecbld(a,desc_a,p,info)
call mld_mlprec_bld(a,desc_a,p,info)
if (info /= 0) then
call psb_errpush(4001,name,a_err='Multilevel preconditioner build.')

@ -121,9 +121,9 @@ subroutine mld_daggrmat_asb(a,desc_a,ilaggr,nlaggr,p,info)
select case (p%iprcparm(mld_aggr_kind_))
case (mld_no_smooth_)
call mld_aggrmat_raw_asb(a,desc_a,ilaggr,nlaggr,p,info)
call mld_aggrmat_nosmth_asb(a,desc_a,ilaggr,nlaggr,p,info)
if(info /= 0) then
call psb_errpush(4010,name,a_err='mld_aggrmat_raw_asb')
call psb_errpush(4010,name,a_err='mld_aggrmat_nosmth_asb')
goto 9999
end if

@ -36,9 +36,9 @@
!!$ POSSIBILITY OF SUCH DAMAGE.
!!$
!!$
! File: mld_daggrmat_raw_asb.F90
! File: mld_daggrmat_nosmth_asb.F90
!
! Subroutine: mld_daggrmat_raw_asb
! Subroutine: mld_daggrmat_nosmth_asb
! Version: real
!
! This routine builds a coarse-level matrix A_C from a fine-level matrix A
@ -73,9 +73,9 @@
! info - integer, output.
! Error code.
!
subroutine mld_daggrmat_raw_asb(a,desc_a,ilaggr,nlaggr,p,info)
subroutine mld_daggrmat_nosmth_asb(a,desc_a,ilaggr,nlaggr,p,info)
use psb_base_mod
use mld_inner_mod, mld_protect_name => mld_daggrmat_raw_asb
use mld_inner_mod, mld_protect_name => mld_daggrmat_nosmth_asb
#ifdef MPI_MOD
use mpi
@ -101,7 +101,7 @@ subroutine mld_daggrmat_raw_asb(a,desc_a,ilaggr,nlaggr,p,info)
integer :: nrow, nglob, ncol, ntaggr, nzac, ip, ndx,&
& naggr, nzt, naggrm1, i
name='mld_aggrmat_raw_asb'
name='mld_aggrmat_nosmth_asb'
if(psb_get_errstatus().ne.0) return
info=0
call psb_erractionsave(err_act)
@ -288,4 +288,4 @@ subroutine mld_daggrmat_raw_asb(a,desc_a,ilaggr,nlaggr,p,info)
end if
return
end subroutine mld_daggrmat_raw_asb
end subroutine mld_daggrmat_nosmth_asb

@ -36,9 +36,9 @@
!!$ POSSIBILITY OF SUCH DAMAGE.
!!$
!!$
! File: mld_dmlprecbld.f90
! File: mld_dmlprec_bld.f90
!
! Subroutine: mld_dmlprecbld
! Subroutine: mld_dmlprec_bld
! Version: real
! Contains: subroutine init_baseprec_av
!
@ -63,10 +63,10 @@
! info - integer, output.
! Error code.
!
subroutine mld_dmlprecbld(a,desc_a,p,info)
subroutine mld_dmlprec_bld(a,desc_a,p,info)
use psb_base_mod
use mld_inner_mod, mld_protect_name => mld_dmlprecbld
use mld_inner_mod, mld_protect_name => mld_dmlprec_bld
use mld_prec_mod
Implicit None
@ -94,7 +94,7 @@ subroutine mld_dmlprecbld(a,desc_a,p,info)
debug_unit = psb_get_debug_unit()
debug_level = psb_get_debug_level()
name = 'mld_dmlprecbld'
name = 'mld_dmlprec_bld'
info = 0
int_err(1) = 0
ictxt = psb_cd_get_context(desc_a)
@ -382,5 +382,5 @@ contains
end select
end subroutine check_coarse_lev
end subroutine mld_dmlprecbld
end subroutine mld_dmlprec_bld

@ -36,9 +36,9 @@
!!$ POSSIBILITY OF SUCH DAMAGE.
!!$
!!$
! File: mld_dprec_aply.f90
! File: mld_dprecaply.f90
!
! Subroutine: mld_dprec_aply
! Subroutine: mld_dprecaply
! Version: real
!
! This routine applies the preconditioner built by mld_dprecbld, i.e. it computes
@ -71,11 +71,11 @@
! Workspace. Its size must be at
! least 4*psb_cd_get_local_cols(desc_data).
!
subroutine mld_dprec_aply(prec,x,y,desc_data,info,trans,work)
subroutine mld_dprecaply(prec,x,y,desc_data,info,trans,work)
use psb_base_mod
use mld_inner_mod
use mld_prec_mod, mld_protect_name => mld_dprec_aply
use mld_prec_mod, mld_protect_name => mld_dprecaply
implicit none
@ -94,7 +94,7 @@ subroutine mld_dprec_aply(prec,x,y,desc_data,info,trans,work)
integer :: ictxt,np,me,err_act,iwsz
character(len=20) :: name
name='mld_dprec_aply'
name='mld_dprecaply'
info = 0
call psb_erractionsave(err_act)
@ -162,11 +162,11 @@ subroutine mld_dprec_aply(prec,x,y,desc_data,info,trans,work)
end if
return
end subroutine mld_dprec_aply
end subroutine mld_dprecaply
!
! Subroutine: mld_dprec_aply1
! Subroutine: mld_dprecaply1
! Version: real
!
! Applies the preconditioner built by mld_dprecbld, i.e. computes
@ -178,7 +178,7 @@ end subroutine mld_dprec_aply
! - X is a vectors.
! This operation is performed at each iteration of a preconditioned Krylov solver.
!
! This routine differs from mld_dprec_aply because the preconditioned vector X
! This routine differs from mld_dprecaply because the preconditioned vector X
! overwrites the original one.
!
!
@ -197,11 +197,11 @@ end subroutine mld_dprec_aply
! If trans='N','n' then op(M^(-1)) = M^(-1);
! if trans='T','t' then op(M^(-1)) = M^(-T) (transpose of M^(-1)).
!
subroutine mld_dprec_aply1(prec,x,desc_data,info,trans)
subroutine mld_dprecaply1(prec,x,desc_data,info,trans)
use psb_base_mod
use mld_inner_mod
use mld_prec_mod, mld_protect_name => mld_dprec_aply1
use mld_prec_mod, mld_protect_name => mld_dprecaply1
implicit none
@ -217,7 +217,7 @@ subroutine mld_dprec_aply1(prec,x,desc_data,info,trans)
real(psb_dpk_), pointer :: WW(:), w1(:)
character(len=20) :: name
name='mld_dprec_aply1'
name='mld_dprecaply1'
info = 0
call psb_erractionsave(err_act)
@ -257,4 +257,4 @@ subroutine mld_dprec_aply1(prec,x,desc_data,info,trans)
return
end if
return
end subroutine mld_dprec_aply1
end subroutine mld_dprecaply1

@ -191,7 +191,7 @@ subroutine mld_dprecbld(a,desc_a,p,info)
else if (iszv > 1) then
call mld_mlprecbld(a,desc_a,p,info)
call mld_mlprec_bld(a,desc_a,p,info)
if (info /= 0) then
call psb_errpush(4001,name,a_err='Multilevel preconditioner build.')

@ -91,8 +91,8 @@ module mld_inner_mod
end subroutine mld_zbaseprec_aply
end interface
interface mld_mlprecbld
subroutine mld_smlprecbld(a,desc_a,prec,info)
interface mld_mlprec_bld
subroutine mld_smlprec_bld(a,desc_a,prec,info)
use psb_base_mod, only : psb_sspmat_type, psb_desc_type, psb_spk_
use mld_prec_type, only : mld_sprec_type
implicit none
@ -101,8 +101,8 @@ module mld_inner_mod
type(mld_sprec_type), intent(inout), target :: prec
integer, intent(out) :: info
!!$ character, intent(in),optional :: upd
end subroutine mld_smlprecbld
subroutine mld_dmlprecbld(a,desc_a,prec,info)
end subroutine mld_smlprec_bld
subroutine mld_dmlprec_bld(a,desc_a,prec,info)
use psb_base_mod, only : psb_dspmat_type, psb_desc_type, psb_dpk_
use mld_prec_type, only : mld_dprec_type
implicit none
@ -111,8 +111,8 @@ module mld_inner_mod
type(mld_dprec_type), intent(inout), target :: prec
integer, intent(out) :: info
!!$ character, intent(in),optional :: upd
end subroutine mld_dmlprecbld
subroutine mld_cmlprecbld(a,desc_a,prec,info)
end subroutine mld_dmlprec_bld
subroutine mld_cmlprec_bld(a,desc_a,prec,info)
use psb_base_mod, only : psb_cspmat_type, psb_desc_type, psb_spk_
use mld_prec_type, only : mld_cprec_type
implicit none
@ -121,8 +121,8 @@ module mld_inner_mod
type(mld_cprec_type), intent(inout), target :: prec
integer, intent(out) :: info
!!$ character, intent(in),optional :: upd
end subroutine mld_cmlprecbld
subroutine mld_zmlprecbld(a,desc_a,prec,info)
end subroutine mld_cmlprec_bld
subroutine mld_zmlprec_bld(a,desc_a,prec,info)
use psb_base_mod, only : psb_zspmat_type, psb_desc_type, psb_dpk_
use mld_prec_type, only : mld_zprec_type
implicit none
@ -131,7 +131,7 @@ module mld_inner_mod
type(mld_zprec_type), intent(inout) :: prec
integer, intent(out) :: info
!!$ character, intent(in),optional :: upd
end subroutine mld_zmlprecbld
end subroutine mld_zmlprec_bld
end interface
interface mld_as_aply
@ -544,8 +544,8 @@ module mld_inner_mod
end subroutine mld_zaggrmat_asb
end interface
interface mld_aggrmat_raw_asb
subroutine mld_saggrmat_raw_asb(a,desc_a,ilaggr,nlaggr,p,info)
interface mld_aggrmat_nosmth_asb
subroutine mld_saggrmat_nosmth_asb(a,desc_a,ilaggr,nlaggr,p,info)
use psb_base_mod, only : psb_sspmat_type, psb_desc_type, psb_spk_
use mld_prec_type, only : mld_sbaseprec_type, mld_sonelev_type
type(psb_sspmat_type), intent(in) :: a
@ -553,8 +553,8 @@ module mld_inner_mod
integer, intent(inout) :: ilaggr(:), nlaggr(:)
type(mld_sonelev_type), intent(inout), target :: p
integer, intent(out) :: info
end subroutine mld_saggrmat_raw_asb
subroutine mld_daggrmat_raw_asb(a,desc_a,ilaggr,nlaggr,p,info)
end subroutine mld_saggrmat_nosmth_asb
subroutine mld_daggrmat_nosmth_asb(a,desc_a,ilaggr,nlaggr,p,info)
use psb_base_mod, only : psb_dspmat_type, psb_desc_type, psb_dpk_
use mld_prec_type, only : mld_dbaseprec_type, mld_donelev_type
type(psb_dspmat_type), intent(in) :: a
@ -562,8 +562,8 @@ module mld_inner_mod
integer, intent(inout) :: ilaggr(:), nlaggr(:)
type(mld_donelev_type), intent(inout), target :: p
integer, intent(out) :: info
end subroutine mld_daggrmat_raw_asb
subroutine mld_caggrmat_raw_asb(a,desc_a,ilaggr,nlaggr,p,info)
end subroutine mld_daggrmat_nosmth_asb
subroutine mld_caggrmat_nosmth_asb(a,desc_a,ilaggr,nlaggr,p,info)
use psb_base_mod, only : psb_cspmat_type, psb_desc_type, psb_spk_
use mld_prec_type, only : mld_cbaseprec_type, mld_conelev_type
type(psb_cspmat_type), intent(in) :: a
@ -571,8 +571,8 @@ module mld_inner_mod
integer, intent(inout) :: ilaggr(:), nlaggr(:)
type(mld_conelev_type), intent(inout), target :: p
integer, intent(out) :: info
end subroutine mld_caggrmat_raw_asb
subroutine mld_zaggrmat_raw_asb(a,desc_a,ilaggr,nlaggr,p,info)
end subroutine mld_caggrmat_nosmth_asb
subroutine mld_zaggrmat_nosmth_asb(a,desc_a,ilaggr,nlaggr,p,info)
use psb_base_mod, only : psb_zspmat_type, psb_desc_type, psb_dpk_
use mld_prec_type, only : mld_zbaseprec_type, mld_zonelev_type
type(psb_zspmat_type), intent(in) :: a
@ -580,7 +580,7 @@ module mld_inner_mod
integer, intent(inout) :: ilaggr(:), nlaggr(:)
type(mld_zonelev_type), intent(inout), target :: p
integer, intent(out) :: info
end subroutine mld_zaggrmat_raw_asb
end subroutine mld_zaggrmat_nosmth_asb
end interface
interface mld_aggrmat_smth_asb

@ -199,36 +199,9 @@ module mld_prec_mod
integer, optional, intent(in) :: ilev
end subroutine mld_zprecsetc
end interface
!!$
!!$ interface mld_precfree
!!$ subroutine mld_sprecfree(p,info)
!!$ use psb_base_mod, only : psb_sspmat_type, psb_desc_type, psb_spk_
!!$ use mld_prec_type, only : mld_sprec_type
!!$ type(mld_sprec_type), intent(inout) :: p
!!$ integer, intent(out) :: info
!!$ end subroutine mld_sprecfree
!!$ subroutine mld_dprecfree(p,info)
!!$ use psb_base_mod, only : psb_dspmat_type, psb_desc_type, psb_dpk_
!!$ use mld_prec_type, only : mld_dprec_type
!!$ type(mld_dprec_type), intent(inout) :: p
!!$ integer, intent(out) :: info
!!$ end subroutine mld_dprecfree
!!$ subroutine mld_cprecfree(p,info)
!!$ use psb_base_mod, only : psb_cspmat_type, psb_desc_type, psb_spk_
!!$ use mld_prec_type, only : mld_cprec_type
!!$ type(mld_cprec_type), intent(inout) :: p
!!$ integer, intent(out) :: info
!!$ end subroutine mld_cprecfree
!!$ subroutine mld_zprecfree(p,info)
!!$ use psb_base_mod, only : psb_zspmat_type, psb_desc_type, psb_dpk_
!!$ use mld_prec_type, only : mld_zprec_type
!!$ type(mld_zprec_type), intent(inout) :: p
!!$ integer, intent(out) :: info
!!$ end subroutine mld_zprecfree
!!$ end interface
interface mld_precaply
subroutine mld_sprec_aply(prec,x,y,desc_data,info,trans,work)
subroutine mld_sprecaply(prec,x,y,desc_data,info,trans,work)
use psb_base_mod, only : psb_sspmat_type, psb_desc_type, psb_spk_
use mld_prec_type, only : mld_sprec_type
type(psb_desc_type),intent(in) :: desc_data
@ -238,8 +211,8 @@ module mld_prec_mod
integer, intent(out) :: info
character(len=1), optional :: trans
real(psb_spk_),intent(inout), optional, target :: work(:)
end subroutine mld_sprec_aply
subroutine mld_sprec_aply1(prec,x,desc_data,info,trans)
end subroutine mld_sprecaply
subroutine mld_sprecaply1(prec,x,desc_data,info,trans)
use psb_base_mod, only : psb_sspmat_type, psb_desc_type, psb_spk_
use mld_prec_type, only : mld_sprec_type
type(psb_desc_type),intent(in) :: desc_data
@ -247,8 +220,8 @@ module mld_prec_mod
real(psb_spk_),intent(inout) :: x(:)
integer, intent(out) :: info
character(len=1), optional :: trans
end subroutine mld_sprec_aply1
subroutine mld_dprec_aply(prec,x,y,desc_data,info,trans,work)
end subroutine mld_sprecaply1
subroutine mld_dprecaply(prec,x,y,desc_data,info,trans,work)
use psb_base_mod, only : psb_dspmat_type, psb_desc_type, psb_dpk_
use mld_prec_type, only : mld_dprec_type
type(psb_desc_type),intent(in) :: desc_data
@ -258,8 +231,8 @@ module mld_prec_mod
integer, intent(out) :: info
character(len=1), optional :: trans
real(psb_dpk_),intent(inout), optional, target :: work(:)
end subroutine mld_dprec_aply
subroutine mld_dprec_aply1(prec,x,desc_data,info,trans)
end subroutine mld_dprecaply
subroutine mld_dprecaply1(prec,x,desc_data,info,trans)
use psb_base_mod, only : psb_dspmat_type, psb_desc_type, psb_dpk_
use mld_prec_type, only : mld_dprec_type
type(psb_desc_type),intent(in) :: desc_data
@ -267,8 +240,8 @@ module mld_prec_mod
real(psb_dpk_),intent(inout) :: x(:)
integer, intent(out) :: info
character(len=1), optional :: trans
end subroutine mld_dprec_aply1
subroutine mld_cprec_aply(prec,x,y,desc_data,info,trans,work)
end subroutine mld_dprecaply1
subroutine mld_cprecaply(prec,x,y,desc_data,info,trans,work)
use psb_base_mod, only : psb_cspmat_type, psb_desc_type, psb_spk_
use mld_prec_type, only : mld_cprec_type
type(psb_desc_type),intent(in) :: desc_data
@ -278,8 +251,8 @@ module mld_prec_mod
integer, intent(out) :: info
character(len=1), optional :: trans
complex(psb_spk_),intent(inout), optional, target :: work(:)
end subroutine mld_cprec_aply
subroutine mld_cprec_aply1(prec,x,desc_data,info,trans)
end subroutine mld_cprecaply
subroutine mld_cprecaply1(prec,x,desc_data,info,trans)
use psb_base_mod, only : psb_cspmat_type, psb_desc_type, psb_spk_
use mld_prec_type, only : mld_cprec_type
type(psb_desc_type),intent(in) :: desc_data
@ -287,8 +260,8 @@ module mld_prec_mod
complex(psb_spk_),intent(inout) :: x(:)
integer, intent(out) :: info
character(len=1), optional :: trans
end subroutine mld_cprec_aply1
subroutine mld_zprec_aply(prec,x,y,desc_data,info,trans,work)
end subroutine mld_cprecaply1
subroutine mld_zprecaply(prec,x,y,desc_data,info,trans,work)
use psb_base_mod, only : psb_zspmat_type, psb_desc_type, psb_dpk_
use mld_prec_type, only : mld_zprec_type
type(psb_desc_type),intent(in) :: desc_data
@ -298,8 +271,8 @@ module mld_prec_mod
integer, intent(out) :: info
character(len=1), optional :: trans
complex(psb_dpk_),intent(inout), optional, target :: work(:)
end subroutine mld_zprec_aply
subroutine mld_zprec_aply1(prec,x,desc_data,info,trans)
end subroutine mld_zprecaply
subroutine mld_zprecaply1(prec,x,desc_data,info,trans)
use psb_base_mod, only : psb_zspmat_type, psb_desc_type, psb_dpk_
use mld_prec_type, only : mld_zprec_type
type(psb_desc_type),intent(in) :: desc_data
@ -307,7 +280,7 @@ module mld_prec_mod
complex(psb_dpk_),intent(inout) :: x(:)
integer, intent(out) :: info
character(len=1), optional :: trans
end subroutine mld_zprec_aply1
end subroutine mld_zprecaply1
end interface
interface mld_precbld

@ -121,9 +121,9 @@ subroutine mld_saggrmat_asb(a,desc_a,ilaggr,nlaggr,p,info)
select case (p%iprcparm(mld_aggr_kind_))
case (mld_no_smooth_)
call mld_aggrmat_raw_asb(a,desc_a,ilaggr,nlaggr,p,info)
call mld_aggrmat_nosmth_asb(a,desc_a,ilaggr,nlaggr,p,info)
if(info /= 0) then
call psb_errpush(4010,name,a_err='mld_aggrmat_raw_asb')
call psb_errpush(4010,name,a_err='mld_aggrmat_nosmth_asb')
goto 9999
end if

@ -36,9 +36,9 @@
!!$ POSSIBILITY OF SUCH DAMAGE.
!!$
!!$
! File: mld_saggrmat_raw_asb.F90
! File: mld_saggrmat_nosmth_asb.F90
!
! Subroutine: mld_saggrmat_raw_asb
! Subroutine: mld_saggrmat_nosmth_asb
! Version: real
!
! This routine builds a coarse-level matrix A_C from a fine-level matrix A
@ -73,9 +73,9 @@
! info - integer, output.
! Error code.
!
subroutine mld_saggrmat_raw_asb(a,desc_a,ilaggr,nlaggr,p,info)
subroutine mld_saggrmat_nosmth_asb(a,desc_a,ilaggr,nlaggr,p,info)
use psb_base_mod
use mld_inner_mod, mld_protect_name => mld_saggrmat_raw_asb
use mld_inner_mod, mld_protect_name => mld_saggrmat_nosmth_asb
#ifdef MPI_MOD
use mpi
@ -101,7 +101,7 @@ subroutine mld_saggrmat_raw_asb(a,desc_a,ilaggr,nlaggr,p,info)
integer :: nrow, nglob, ncol, ntaggr, nzac, ip, ndx,&
& naggr, nzt, naggrm1, i
name='mld_aggrmat_raw_asb'
name='mld_aggrmat_nosmth_asb'
if(psb_get_errstatus().ne.0) return
info=0
call psb_erractionsave(err_act)
@ -288,4 +288,4 @@ subroutine mld_saggrmat_raw_asb(a,desc_a,ilaggr,nlaggr,p,info)
end if
return
end subroutine mld_saggrmat_raw_asb
end subroutine mld_saggrmat_nosmth_asb

@ -36,9 +36,9 @@
!!$ POSSIBILITY OF SUCH DAMAGE.
!!$
!!$
! File: mld_smlprecbld.f90
! File: mld_smlprec_bld.f90
!
! Subroutine: mld_smlprecbld
! Subroutine: mld_smlprec_bld
! Version: real
! Contains: subroutine init_baseprec_av
!
@ -63,10 +63,10 @@
! info - integer, output.
! Error code.
!
subroutine mld_smlprecbld(a,desc_a,p,info)
subroutine mld_smlprec_bld(a,desc_a,p,info)
use psb_base_mod
use mld_inner_mod, mld_protect_name => mld_smlprecbld
use mld_inner_mod, mld_protect_name => mld_smlprec_bld
use mld_prec_mod
Implicit None
@ -94,7 +94,7 @@ subroutine mld_smlprecbld(a,desc_a,p,info)
debug_unit = psb_get_debug_unit()
debug_level = psb_get_debug_level()
name = 'mld_smlprecbld'
name = 'mld_smlprec_bld'
info = 0
int_err(1) = 0
ictxt = psb_cd_get_context(desc_a)
@ -382,5 +382,5 @@ contains
end select
end subroutine check_coarse_lev
end subroutine mld_smlprecbld
end subroutine mld_smlprec_bld

@ -36,9 +36,9 @@
!!$ POSSIBILITY OF SUCH DAMAGE.
!!$
!!$
! File: mld_sprec_aply.f90
! File: mld_sprecaply.f90
!
! Subroutine: mld_sprec_aply
! Subroutine: mld_sprecaply
! Version: real
!
! This routine applies the preconditioner built by mld_sprecbld, i.e. it computes
@ -71,11 +71,11 @@
! Workspace. Its size must be at
! least 4*psb_cd_get_local_cols(desc_data).
!
subroutine mld_sprec_aply(prec,x,y,desc_data,info,trans,work)
subroutine mld_sprecaply(prec,x,y,desc_data,info,trans,work)
use psb_base_mod
use mld_inner_mod
use mld_prec_mod, mld_protect_name => mld_sprec_aply
use mld_prec_mod, mld_protect_name => mld_sprecaply
implicit none
@ -94,7 +94,7 @@ subroutine mld_sprec_aply(prec,x,y,desc_data,info,trans,work)
integer :: ictxt,np,me,err_act,iwsz
character(len=20) :: name
name='mld_sprec_aply'
name='mld_sprecaply'
info = 0
call psb_erractionsave(err_act)
@ -162,11 +162,11 @@ subroutine mld_sprec_aply(prec,x,y,desc_data,info,trans,work)
end if
return
end subroutine mld_sprec_aply
end subroutine mld_sprecaply
!
! Subroutine: mld_sprec_aply1
! Subroutine: mld_sprecaply1
! Version: real
!
! Applies the preconditioner built by mld_sprecbld, i.e. computes
@ -178,7 +178,7 @@ end subroutine mld_sprec_aply
! - X is a vectors.
! This operation is performed at each iteration of a preconditioned Krylov solver.
!
! This routine differs from mld_sprec_aply because the preconditioned vector X
! This routine differs from mld_sprecaply because the preconditioned vector X
! overwrites the original one.
!
!
@ -197,11 +197,11 @@ end subroutine mld_sprec_aply
! If trans='N','n' then op(M^(-1)) = M^(-1);
! if trans='T','t' then op(M^(-1)) = M^(-T) (transpose of M^(-1)).
!
subroutine mld_sprec_aply1(prec,x,desc_data,info,trans)
subroutine mld_sprecaply1(prec,x,desc_data,info,trans)
use psb_base_mod
use mld_inner_mod
use mld_prec_mod, mld_protect_name => mld_sprec_aply1
use mld_prec_mod, mld_protect_name => mld_sprecaply1
implicit none
@ -217,7 +217,7 @@ subroutine mld_sprec_aply1(prec,x,desc_data,info,trans)
real(psb_spk_), pointer :: WW(:), w1(:)
character(len=20) :: name
name='mld_sprec_aply1'
name='mld_sprecaply1'
info = 0
call psb_erractionsave(err_act)
@ -257,4 +257,4 @@ subroutine mld_sprec_aply1(prec,x,desc_data,info,trans)
return
end if
return
end subroutine mld_sprec_aply1
end subroutine mld_sprecaply1

@ -191,7 +191,7 @@ subroutine mld_sprecbld(a,desc_a,p,info)
else if (iszv > 1) then
call mld_mlprecbld(a,desc_a,p,info)
call mld_mlprec_bld(a,desc_a,p,info)
if (info /= 0) then
call psb_errpush(4001,name,a_err='Multilevel preconditioner build.')

@ -121,9 +121,9 @@ subroutine mld_zaggrmat_asb(a,desc_a,ilaggr,nlaggr,p,info)
select case (p%iprcparm(mld_aggr_kind_))
case (mld_no_smooth_)
call mld_aggrmat_raw_asb(a,desc_a,ilaggr,nlaggr,p,info)
call mld_aggrmat_nosmth_asb(a,desc_a,ilaggr,nlaggr,p,info)
if(info /= 0) then
call psb_errpush(4010,name,a_err='mld_aggrmat_raw_asb')
call psb_errpush(4010,name,a_err='mld_aggrmat_nosmth_asb')
goto 9999
end if

@ -36,9 +36,9 @@
!!$ POSSIBILITY OF SUCH DAMAGE.
!!$
!!$
! File: mld_zaggrmat_raw_asb.F90
! File: mld_zaggrmat_nosmth_asb.F90
!
! Subroutine: mld_zaggrmat_raw_asb
! Subroutine: mld_zaggrmat_nosmth_asb
! Version: complex
!
! This routine builds a coarse-level matrix A_C from a fine-level matrix A
@ -73,9 +73,9 @@
! info - integer, output.
! Error code.
!
subroutine mld_zaggrmat_raw_asb(a,desc_a,ilaggr,nlaggr,p,info)
subroutine mld_zaggrmat_nosmth_asb(a,desc_a,ilaggr,nlaggr,p,info)
use psb_base_mod
use mld_inner_mod, mld_protect_name => mld_zaggrmat_raw_asb
use mld_inner_mod, mld_protect_name => mld_zaggrmat_nosmth_asb
#ifdef MPI_MOD
use mpi
@ -101,7 +101,7 @@ subroutine mld_zaggrmat_raw_asb(a,desc_a,ilaggr,nlaggr,p,info)
integer :: nrow, nglob, ncol, ntaggr, nzac, ip, ndx,&
& naggr, nzt,naggrm1, i
name='mld_aggrmat_raw_asb'
name='mld_aggrmat_nosmth_asb'
if(psb_get_errstatus().ne.0) return
info=0
call psb_erractionsave(err_act)
@ -288,4 +288,4 @@ subroutine mld_zaggrmat_raw_asb(a,desc_a,ilaggr,nlaggr,p,info)
end if
return
end subroutine mld_zaggrmat_raw_asb
end subroutine mld_zaggrmat_nosmth_asb

@ -36,9 +36,9 @@
!!$ POSSIBILITY OF SUCH DAMAGE.
!!$
!!$
! File: mld_zmlprecbld.f90
! File: mld_zmlprec_bld.f90
!
! Subroutine: mld_zmlprecbld
! Subroutine: mld_zmlprec_bld
! Version: real
! Contains: subroutine init_baseprec_av
!
@ -63,10 +63,10 @@
! info - integer, output.
! Error code.
!
subroutine mld_zmlprecbld(a,desc_a,p,info)
subroutine mld_zmlprec_bld(a,desc_a,p,info)
use psb_base_mod
use mld_inner_mod, mld_protect_name => mld_zmlprecbld
use mld_inner_mod, mld_protect_name => mld_zmlprec_bld
use mld_prec_mod
Implicit None
@ -94,7 +94,7 @@ subroutine mld_zmlprecbld(a,desc_a,p,info)
debug_unit = psb_get_debug_unit()
debug_level = psb_get_debug_level()
name = 'mld_zmlprecbld'
name = 'mld_zmlprec_bld'
info = 0
int_err(1) = 0
ictxt = psb_cd_get_context(desc_a)
@ -382,5 +382,5 @@ contains
end select
end subroutine check_coarse_lev
end subroutine mld_zmlprecbld
end subroutine mld_zmlprec_bld

@ -36,9 +36,9 @@
!!$ POSSIBILITY OF SUCH DAMAGE.
!!$
!!$
! File: mld_zprec_aply.f90
! File: mld_zprecaply.f90
!
! Subroutine: mld_zprec_aply
! Subroutine: mld_zprecaply
! Version: complex
!
! This routine applies the preconditioner built by mld_zprecbld, i.e. it computes
@ -71,11 +71,11 @@
! Workspace. Its size must be at
! least 4*psb_cd_get_local_cols(desc_data).
!
subroutine mld_zprec_aply(prec,x,y,desc_data,info,trans,work)
subroutine mld_zprecaply(prec,x,y,desc_data,info,trans,work)
use psb_base_mod
use mld_inner_mod
use mld_prec_mod, mld_protect_name => mld_zprec_aply
use mld_prec_mod, mld_protect_name => mld_zprecaply
implicit none
@ -94,7 +94,7 @@ subroutine mld_zprec_aply(prec,x,y,desc_data,info,trans,work)
integer :: ictxt,np,me,err_act,iwsz
character(len=20) :: name
name='mld_zprec_aply'
name='mld_zprecaply'
info = 0
call psb_erractionsave(err_act)
@ -162,12 +162,12 @@ subroutine mld_zprec_aply(prec,x,y,desc_data,info,trans,work)
end if
return
end subroutine mld_zprec_aply
end subroutine mld_zprecaply
! File: mld_zprec_aply.f90.
! File: mld_zprecaply.f90.
!
! Subroutine: mld_zprec_aply1.
! Subroutine: mld_zprecaply1.
! Version: complex.
!
! Applies the preconditioner built by mld_zprecbld, i.e. computes
@ -179,7 +179,7 @@ end subroutine mld_zprec_aply
! - X is a vectors.
! This operation is performed at each iteration of a preconditioned Krylov solver.
!
! This routine differs from mld_zprec_aply because the preconditioned vector X
! This routine differs from mld_zprecaply because the preconditioned vector X
! overwrites the original one.
!
!
@ -198,11 +198,11 @@ end subroutine mld_zprec_aply
! If trans='N','n' then op(M^(-1)) = M^(-1);
! if trans='T','t' then op(M^(-1)) = M^(-T) (transpose of M^(-1)).
!
subroutine mld_zprec_aply1(prec,x,desc_data,info,trans)
subroutine mld_zprecaply1(prec,x,desc_data,info,trans)
use psb_base_mod
use mld_inner_mod
use mld_prec_mod, mld_protect_name => mld_zprec_aply1
use mld_prec_mod, mld_protect_name => mld_zprecaply1
implicit none
@ -218,7 +218,7 @@ subroutine mld_zprec_aply1(prec,x,desc_data,info,trans)
complex(psb_dpk_), pointer :: WW(:), w1(:)
character(len=20) :: name
name='mld_zprec_aply1'
name='mld_zprecaply1'
info = 0
call psb_erractionsave(err_act)
@ -258,4 +258,4 @@ subroutine mld_zprec_aply1(prec,x,desc_data,info,trans)
return
end if
return
end subroutine mld_zprec_aply1
end subroutine mld_zprecaply1

@ -191,7 +191,7 @@ subroutine mld_zprecbld(a,desc_a,p,info)
else if (iszv > 1) then
call mld_mlprecbld(a,desc_a,p,info)
call mld_mlprec_bld(a,desc_a,p,info)
if (info /= 0) then
call psb_errpush(4001,name,a_err='Multilevel preconditioner build.')

Loading…
Cancel
Save