fdurastante/amg4psblas
1
0
Fork 0
mirror of https://github.com/sfilippone/amg4psblas.git synced 2026-10-06 22:55:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bunch of changes to take away most instances of unused variables.

Browse Source
This commit is contained in:
Salvatore Filippone
2007-11-13 11:43:47 +00:00
parent 14564c65ec
commit 99fc1e7559
46 changed files with 112 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mlprec/mld_daggrmat_asb.f90
+1 -1
View File
@@ -49,7 +49,7 @@ subroutine mld_daggrmat_asb(a,desc_a,ac,desc_ac,p,info)
logical, parameter :: aggr_dump=.false.
integer ::ictxt,np,me, err_act, icomm
character(len=20) :: name, ch_err
character(len=20) :: name
name='mld_aggrmat_asb'
if(psb_get_errstatus().ne.0) return
mlprec/mld_daggrmat_raw_asb.F90
+2 -2
View File
@@ -54,12 +54,12 @@ subroutine mld_daggrmat_raw_asb(a,desc_a,ac,desc_ac,p,info)
logical, parameter :: aggr_dump=.false.
integer ::ictxt,np,me, err_act, icomm
character(len=20) :: name, ch_err
character(len=20) :: name
type(psb_dspmat_type) :: b
integer, pointer :: nzbr(:), idisp(:)
integer :: nrow, nglob, ncol, ntaggr, nzac, ip, ndx,&
& naggr, nzt,jl,nzl,nlr, naggrm1, i, j, k
& naggr, nzt, naggrm1, i
name='mld_aggrmat_raw_asb'
if(psb_get_errstatus().ne.0) return
mlprec/mld_daggrmat_smth_asb.F90
+2 -2
View File
@@ -56,10 +56,10 @@ subroutine mld_daggrmat_smth_asb(a,desc_a,ac,desc_ac,p,info)
type(psb_dspmat_type) :: b
integer, pointer :: nzbr(:), idisp(:)
integer :: nrow, nglob, ncol, ntaggr, nzac, ip, ndx,&
& naggr, nzt,jl,nzl,nlr,naggrm1,naggrp1, i, j, k
& naggr, nzl,naggrm1,naggrp1, i, j, k
logical, parameter :: aggr_dump=.false.
integer ::ictxt,np,me, err_act, icomm
character(len=20) :: name, ch_err
character(len=20) :: name
type(psb_dspmat_type), pointer :: am1,am2
type(psb_dspmat_type) :: am3,am4
logical :: ml_global_nmb
mlprec/mld_dasmat_bld.f90
+3 -3
View File
@@ -72,9 +72,9 @@ Subroutine mld_dasmat_bld(ptype,novr,a,blk,desc_data,upd,desc_p,info,outfmt)
integer icomm
! .. Local Scalars ..
Integer :: k, np,me,m,nnzero,&
& ictxt, n_col,ier,n,int_err(5),&
& tot_recv, ircode, n_row,nhalo, nrow_a,err_act
Integer :: np,me,nnzero,&
& ictxt, n_col,int_err(5),&
& tot_recv, n_row,nhalo, nrow_a,err_act
Logical,Parameter :: debug=.false., debugprt=.false.
character(len=20) :: name, ch_err
mlprec/mld_dbaseprec_aply.f90
+2 -3
View File
@@ -57,9 +57,8 @@ subroutine mld_dbaseprec_aply(alpha,prec,x,beta,y,desc_data,trans,work,info)
integer :: n_row,n_col, int_err(5), nrow_d
real(kind(1.d0)), pointer :: ww(:), aux(:), tx(:),ty(:)
character ::diagl, diagu
integer :: ictxt,np,me,i, isz, nrg, err_act
real(kind(1.d0)) :: t1, t2, t3, t4, t5, t6, t7
logical,parameter :: debug=.false., debugprt=.false.
integer :: ictxt,np,me,isz, err_act
logical, parameter :: debug=.false., debugprt=.false.
character(len=20) :: name, ch_err
name='mld_dbaseprec_aply'
mlprec/mld_dbaseprec_bld.f90
+1 -4
View File
@@ -48,10 +48,7 @@ subroutine mld_dbaseprc_bld(a,desc_a,p,info,upd)
character, intent(in), optional :: upd
! Local scalars
Integer :: err, nnzero, n_row, n_col,I,j,k,ictxt,&
& me,mycol,np,npcol,mglob,lw, mtype, nrg, nzg, err_act
real(kind(1.d0)) :: temp, real_err(5)
real(kind(1.d0)),pointer :: gd(:), work(:)
Integer :: err, n_row, n_col,ictxt, me,np,mglob, err_act
integer :: int_err(5)
character :: iupd
mlprec/mld_dbjac_aply.f90
+2 -4
View File
@@ -57,10 +57,8 @@ subroutine mld_dbjac_aply(alpha,prec,x,beta,y,desc_data,trans,work,info)
! Local variables
integer :: n_row,n_col
real(kind(1.d0)), pointer :: ww(:), aux(:), tx(:),ty(:),tb(:)
character ::diagl, diagu
integer :: ictxt,np,me,i, nrg, err_act, int_err(5)
real(kind(1.d0)) :: t1, t2, t3, t4, t5, t6, t7
real(kind(1.d0)), pointer :: ww(:), aux(:), tx(:),ty(:)
integer :: ictxt,np,me,i, err_act, int_err(5)
logical,parameter :: debug=.false., debugprt=.false.
character(len=20) :: name, ch_err
mlprec/mld_dbjac_bld.f90
+3 -5
View File
@@ -63,16 +63,14 @@ subroutine mld_dbjac_bld(a,desc_a,p,upd,info)
character, intent(in) :: upd
! .. Local Scalars ..
integer :: i, j, jj, k, kk, m
integer :: i, k, m
integer :: int_err(5)
character :: trans, unitd
type(psb_dspmat_type) :: blck, atmp
real(kind(1.d0)) :: t1,t2,t3,t4,t5,t6, t7, t8
logical, parameter :: debugprt=.false., debug=.false., aggr_dump=.false.
integer nztota, nztotb, nztmp, nzl, nnr, ir, err_act,&
& n_row, nrow_a,n_col, nhalo, ind, iind
integer :: err_act, n_row, nrow_a,n_col
integer :: ictxt,np,me
character(len=20) :: name, ch_err
character(len=20) :: name
character(len=5), parameter :: coofmt='COO', csrfmt='CSR'
if(psb_get_errstatus().ne.0) return
mlprec/mld_ddiagsc_bld.f90
+3 -5
View File
@@ -47,15 +47,13 @@ subroutine mld_ddiag_bld(a,desc_a,p,upd,info)
! Local scalars
Integer :: err, n_row, n_col,I,j,k,ictxt,&
& me,np,mglob,lw, err_act
Integer :: err, n_row, n_col,I,ictxt,&
& me,np,mglob, err_act
real(kind(1.d0)),allocatable :: gd(:), work(:)
integer :: int_err(5)
character :: iupd
logical, parameter :: debug=.false.
integer,parameter :: iroot=0,iout=60,ilout=40
character(len=20) :: name, ch_err
character(len=20) :: name, ch_err
if(psb_get_errstatus().ne.0) return
info=0
mlprec/mld_dilu_bld.f90
+3 -7
View File
@@ -65,15 +65,11 @@ subroutine mld_dilu_bld(a,desc_a,p,upd,info,blck)
type(psb_dspmat_type), intent(in), optional :: blck
! .. Local Scalars ..
integer :: i, j, jj, k, kk, m
integer :: int_err(5)
character :: trans, unitd
real(kind(1.d0)) :: t1,t2,t3,t4,t5,t6, t7, t8
integer :: i, nztota, err_act, n_row, nrow_a
character :: trans, unitd
logical, parameter :: debugprt=.false., debug=.false., aggr_dump=.false.
integer nztota, nztotb, nztmp, nzl, nnr, ir, err_act,&
& n_row, nrow_a, ind, iind, i1,i2,ia
integer :: ictxt,np,me
character(len=20) :: name, ch_err
character(len=20) :: name, ch_err
if(psb_get_errstatus().ne.0) return
info=0
mlprec/mld_dilu_fct.f90
+2 -4
View File
@@ -53,8 +53,7 @@ subroutine mld_dilu_fct(ialg,a,l,u,d,info,blck)
type(psb_dspmat_type),intent(in), optional, target :: blck
real(kind(1.d0)), intent(inout) :: d(:)
! .. Local Scalars ..
real(kind(1.d0)) :: dia, temp
integer :: i, j, jj, k, kk, l1, l2, ll, low1, low2,m,ma,err_act
integer :: l1, l2, m,err_act
type(psb_dspmat_type), pointer :: blck_
character(len=20) :: name, ch_err
@@ -141,7 +140,7 @@ contains
integer, dimension(:) :: lia1,lia2,uia1,uia2
real(kind(1.d0)), dimension(:) :: laspk,uaspk,d
integer :: i,j,k,l,low1,low2,kk,jj,ll, irb, ktrw,err_act
integer :: i,j,k,l,low1,low2,kk,jj,ll, ktrw,err_act
real(kind(1.d0)) :: dia,temp
integer, parameter :: nrb=16
logical,parameter :: debug=.false.
@@ -299,7 +298,6 @@ contains
integer :: i,m,ktrw,jd,jmax,l1,l2
integer :: lia1(:),lia2(:),uia1(:),uia2(:)
real(kind(1.d0)) :: laspk(:), uaspk(:), dia
type(psb_int_heap) :: heap
integer :: k,j,info,irb
integer, parameter :: nrb=16
mlprec/mld_diluk_fct.f90
+5 -10
View File
@@ -53,8 +53,7 @@ subroutine mld_diluk_fct(fill_in,ialg,a,l,u,d,info,blck)
type(psb_dspmat_type),intent(in), optional, target :: blck
real(kind(1.d0)), intent(inout) :: d(:)
! .. Local Scalars ..
real(kind(1.d0)) :: dia, temp
integer :: i, j, jj, k, kk, l1, l2, ll, low1, low2,m,ma,err_act
integer :: l1, l2, m, err_act
type(psb_dspmat_type), pointer :: blck_
character(len=20) :: name, ch_err
@@ -140,16 +139,13 @@ contains
real(kind(1.d0)), dimension(:), allocatable :: laspk,uaspk
real(kind(1.d0)), dimension(:) :: d
integer :: i,j,k,l,low1,low2,kk,jj,ll, ktrw,err_act, &
& isz,minj,maxj,lrwk,nidx
real(kind(1.d0)) :: dia,temp,rwk
integer :: i, ktrw,err_act,nidx
integer, allocatable :: uplevs(:), rowlevs(:),idxs(:)
real(kind(1.d0)), allocatable :: row(:)
type(psb_int_heap) :: heap
logical,parameter :: debug=.false.
type(psb_dspmat_type) :: trw
integer :: int_err(5)
character(len=20), parameter :: name='mld_diluk_fctint'
character(len=20) :: ch_err
@@ -328,9 +324,8 @@ contains
subroutine iluk_fact(fill_in,i,m,row,rowlevs,heap,d,uia1,uia2,uaspk,uplevs,nidx,idxs)
use psb_base_mod
implicit none
type(psb_dspmat_type) :: a
type(psb_int_heap) :: heap
integer :: i,m, rowlevs(:),minj,maxj,fill_in,nidx
integer :: i,m, rowlevs(:),fill_in,nidx
integer, allocatable :: idxs(:)
integer :: uia1(:),uia2(:),uplevs(:)
real(kind(1.d0)) :: row(:), uaspk(:),d(:)
@@ -401,11 +396,11 @@ contains
& l1,l2,lia1,lia2,laspk,d,uia1,uia2,uaspk,uplevs)
use psb_base_mod
implicit none
integer :: fill_in,ialg,i, rowlevs(:),minj,maxj,l1,l2,m,nidx,idxs(:)
integer :: fill_in,ialg,i, rowlevs(:),l1,l2,m,nidx,idxs(:)
integer, allocatable :: uia1(:),uia2(:), lia1(:),lia2(:),uplevs(:)
real(kind(1.d0)),allocatable :: uaspk(:), laspk(:)
real(kind(1.d0)) :: row(:), d(:)
integer :: k,j,isz,info,err_act,int_err(5),idxp
integer :: j,isz,info,err_act,int_err(5),idxp
character(len=20), parameter :: name='mld_diluk_fctint'
character(len=20) :: ch_err
mlprec/mld_dilut_fct.f90
+7 -11
View File
@@ -54,8 +54,7 @@ subroutine mld_dilut_fct(fill_in,thres,ialg,a,l,u,d,info,blck)
type(psb_dspmat_type),intent(in), optional, target :: blck
real(kind(1.d0)), intent(inout) :: d(:)
! .. Local Scalars ..
real(kind(1.d0)) :: dia, temp
integer :: i, j, jj, k, kk, l1, l2, ll, low1, low2,m,ma,err_act
integer :: l1, l2, m, err_act
type(psb_dspmat_type), pointer :: blck_
character(len=20) :: name, ch_err
@@ -142,16 +141,14 @@ contains
real(kind(1.d0)), dimension(:), allocatable :: laspk,uaspk
real(kind(1.d0)), dimension(:) :: d
integer :: i,j,k,l,low1,low2,kk,jj,ll, ktrw,err_act, &
& isz,minj,maxj,lrwk,nidx,nlw,nup,jmaxup
real(kind(1.d0)) :: dia,temp,rwk, nrmi
integer :: i, ktrw,err_act,nidx,nlw,nup,jmaxup
real(kind(1.d0)) :: nrmi
integer, allocatable :: idxs(:)
real(kind(1.d0)), allocatable :: row(:)
type(psb_int_heap) :: heap
logical,parameter :: debug=.false.
type(psb_dspmat_type) :: trw
integer :: int_err(5)
character(len=20), parameter :: name='mld_dilut_fctint'
character(len=20) :: ch_err
@@ -356,7 +353,6 @@ contains
& d,uia1,uia2,uaspk,nidx,idxs)
use psb_base_mod
implicit none
type(psb_dspmat_type) :: a
type(psb_int_heap) :: heap
integer :: i,m,fill_in,nidx
real(kind(1.d0)), intent(in) :: thres,nrmi
@@ -364,7 +360,7 @@ contains
integer :: uia1(:),uia2(:)
real(kind(1.d0)) :: row(:), uaspk(:),d(:)
integer :: k,j,lrwk,jj,info, lastk
integer :: k,j,jj,info, lastk
real(kind(1.d0)) :: rwk
logical, parameter :: debug=.false.
@@ -438,17 +434,17 @@ contains
& nidx,idxs,l1,l2,lia1,lia2,laspk,d,uia1,uia2,uaspk)
use psb_base_mod
implicit none
integer :: fill_in,i, minj,maxj,l1,l2,m,nidx,idxs(:)
integer :: fill_in,i, l1,l2,m,nidx,idxs(:)
integer :: nlw,nup,jmaxup
integer, allocatable :: uia1(:),uia2(:), lia1(:),lia2(:)
real(kind(1.d0)), intent(in) :: thres,nrmi
real(kind(1.d0)),allocatable :: uaspk(:), laspk(:)
real(kind(1.d0)) :: row(:), d(:)
real(kind(1.d0)),allocatable :: xw(:),xt(:)
real(kind(1.d0)),allocatable :: xw(:)
integer, allocatable :: xwid(:), indx(:)
real(kind(1.d0)) :: witem
integer :: widx
integer :: k,j,isz,info,err_act,int_err(5),idxp, nz
integer :: k,isz,info,err_act,int_err(5),idxp, nz
type(psb_double_idx_heap) :: heap
character(len=20), parameter :: name='mld_dilut_fctint'
character(len=20) :: ch_err
mlprec/mld_dmlprec_aply.f90
+2 -5
View File
@@ -99,13 +99,10 @@ subroutine mld_dmlprec_aply(alpha,baseprecv,x,beta,y,desc_data,trans,work,info)
! Local variables
integer :: n_row,n_col
character ::diagl, diagu
integer :: ictxt,np,me,i, isz, nr2l,nc2l,err_act, iptype, int_err(5)
real(kind(1.d0)) :: omega
real(kind(1.d0)) :: t1, t2, t3, t4, t5, t6, t7
integer :: ictxt,np,me,i, nr2l,nc2l,err_act
logical, parameter :: debug=.false., debugprt=.false.
integer :: ismth, nlev, ilev, icm
character(len=20) :: name, ch_err
character(len=20) :: name
type psb_mlprec_wrk_type
real(kind(1.d0)), allocatable :: tx(:), ty(:), x2l(:), y2l(:)
mlprec/mld_dmlprec_bld.f90
+2 -2
View File
@@ -47,7 +47,7 @@ subroutine mld_dmlprec_bld(a,desc_a,p,info)
type(psb_desc_type) :: desc_ac
integer :: i, nrg, nzg, err_act,k
integer :: err_act
character(len=20) :: name, ch_err
logical, parameter :: debug=.false.
type(psb_dspmat_type) :: ac
@@ -60,6 +60,7 @@ subroutine mld_dmlprec_bld(a,desc_a,p,info)
call psb_info(ictxt,me,np)
call psb_erractionsave(err_act)
call psb_nullify_sp(ac)
call psb_nullify_desc(desc_ac)
if (.not.allocated(p%iprcparm)) then
@@ -104,7 +105,6 @@ subroutine mld_dmlprec_bld(a,desc_a,p,info)
if (debug) write(0,*) 'Out from genaggrmap',p%nlaggr
call psb_nullify_desc(desc_ac)
call mld_aggrmat_asb(a,desc_a,ac,desc_ac,p,info)
if(info /= 0) then
info=4010
mlprec/mld_dprec_aply.f90
+2 -2
View File
@@ -71,7 +71,7 @@ subroutine mld_dprec_aply(prec,x,y,desc_data,info,trans, work)
if (present(work)) then
work_ => work
else
iwsz = max(1,4*psb_cd_get_local_cols(desc_data))
iwsz = max(1,2*psb_cd_get_local_cols(desc_data))
allocate(work_(iwsz),stat=info)
if (info /= 0) then
call psb_errpush(4025,name,i_err=(/iwsz,0,0,0,0/),a_err='real(kind(1.d0))')
@@ -168,7 +168,7 @@ subroutine mld_dprec_aply1(prec,x,desc_data,info,trans)
! Local variables
character :: trans_
integer :: ictxt,np,me,i, err_act
integer :: ictxt,np,me, err_act
real(kind(1.d0)), pointer :: WW(:), w1(:)
character(len=20) :: name
mlprec/mld_dprecbld.f90
+2 -2
View File
@@ -48,7 +48,7 @@ subroutine mld_dprecbld(a,desc_a,p,info,upd)
character, intent(in), optional :: upd
! Local scalars
Integer :: err,i,j,k,ictxt, me,np,lw, err_act
Integer :: err,i,k,ictxt, me,np, err_act
integer :: int_err(5)
character :: iupd
@@ -62,7 +62,7 @@ subroutine mld_dprecbld(a,desc_a,p,info,upd)
call psb_erractionsave(err_act)
name = 'mld_dprecbld'
if (debug) write(0,*) 'Entering precbld',P%prec,desc_a%matrix_data(:)
if (debug) write(0,*) 'Entering precbld',desc_a%matrix_data(:)
info = 0
int_err(1) = 0
ictxt = psb_cd_get_context(desc_a)
mlprec/mld_dprecfree.f90
+1 -1
View File
@@ -43,7 +43,7 @@ subroutine mld_dprecfree(p,info)
integer, intent(out) :: info
!...locals....
integer :: ictxt,me,np,err_act,i
integer :: me,err_act,i
character(len=20) :: name
if(psb_get_errstatus().ne.0) return
mlprec/mld_dslu_bld.f90
+2 -2
View File
@@ -45,9 +45,9 @@ subroutine mld_dslu_bld(a,desc_a,p,info)
type(mld_dbaseprc_type), intent(inout) :: p
integer, intent(out) :: info
integer :: i,j,nza,nzb,nzt,ictxt,me,np,err_act
integer :: nzt,ictxt,me,np,err_act
logical, parameter :: debug=.false.
character(len=20) :: name, ch_err
character(len=20) :: name, ch_err
if(psb_get_errstatus().ne.0) return
info=0
mlprec/mld_dslud_bld.f90
+1 -1
View File
@@ -45,7 +45,7 @@ subroutine mld_dsludist_bld(a,desc_a,p,info)
type(mld_dbaseprc_type), intent(inout) :: p
integer, intent(out) :: info
integer :: i,j,nza,nzb,nzt,ictxt,me,np,err_act,&
integer :: nzt,ictxt,me,np,err_act,&
& mglob,ifrst,ibcheck,nrow,ncol,npr,npc
logical, parameter :: debug=.false.
character(len=20) :: name, ch_err
mlprec/mld_dsp_renum.f90
+4 -6
View File
@@ -49,12 +49,10 @@ subroutine mld_dsp_renum(a,desc_a,blck,p,atmp,info)
character(len=20) :: name, ch_err
integer nztota, nztotb, nztmp, nzl, nnr, ir, mglob, mtype, n_row, &
& nrow_a,n_col, nhalo,lovr, ind, iind, pi,nr,ns,i,j,jj,k,kk
integer nztota, nztotb, nztmp, nnr, mglob, i,k
integer ::ictxt,np,me, err_act
integer, allocatable :: itmp(:), itmp2(:)
real(kind(1.d0)), allocatable :: rtmp(:)
real(kind(1.d0)) :: t1,t2,t3,t4,t5,t6, t7, t8
real(kind(1.d0)) :: t3,t4
if (psb_get_errstatus().ne.0) return
info=0
@@ -159,7 +157,7 @@ subroutine mld_dsp_renum(a,desc_a,blck,p,atmp,info)
enddo
do k=1, nnr
do k=1, atmp%m
p%invperm(p%perm(k)) = k
enddo
t3 = psb_wtime()
@@ -206,7 +204,7 @@ contains
integer,dimension(:,:),allocatable::NDstk
integer,dimension(:),allocatable::iOld,renum,ndeg,lvl,lvls1,lvls2,ccstor
character(len=20) :: name, ch_err
character(len=20) :: name
if(psb_get_errstatus().ne.0) return
info=0
mlprec/mld_dumf_bld.f90
+3 -3
View File
@@ -46,10 +46,10 @@ subroutine mld_dumf_bld(a,desc_a,p,info)
integer, intent(out) :: info
integer :: i,j,nza,nzb,nzt,ictxt,me,np,err_act
integer :: i_err(5)
integer :: nzt,ictxt,me,np,err_act
integer :: i_err(5)
logical, parameter :: debug=.false.
character(len=20) :: name, ch_err
character(len=20) :: name
info=0
name='mld_dumf_bld'
mlprec/mld_prec_type.f90
-4
View File
@@ -105,8 +105,6 @@ module mld_prec_type
type mld_dprec_type
type(mld_dbaseprc_type), allocatable :: baseprecv(:)
! contain type of preconditioning to be performed
integer :: prec, base_prec
end type mld_dprec_type
type mld_zbaseprc_type
@@ -126,8 +124,6 @@ module mld_prec_type
type mld_zprec_type
type(mld_zbaseprc_type), allocatable :: baseprecv(:)
! contain type of preconditioning to be performed
integer :: prec, base_prec
end type mld_zprec_type
mlprec/mld_slu_impl.c
+1 -3
View File
@@ -153,7 +153,7 @@ mld_dslu_factor_(int *n, int *nnz,
*/
#ifdef Have_SLU_
SuperMatrix A, AC, B;
SuperMatrix A, AC;
SuperMatrix *L, *U;
int *perm_r; /* row permutations from partial pivoting */
int *perm_c; /* column permutation vector */
@@ -282,8 +282,6 @@ mld_dslu_solve_(int *itrans, int *n, int *nrhs,
int i, panel_size, permc_spec, relax;
trans_t trans;
double drop_tol = 0.0;
mem_usage_t mem_usage;
superlu_options_t options;
SuperLUStat_t stat;
factors_t *LUfactors;
mlprec/mld_zaggrmat_asb.f90
+2 -2
View File
@@ -48,8 +48,8 @@ subroutine mld_zaggrmat_asb(a,desc_a,ac,desc_ac,p,info)
integer, intent(out) :: info
logical, parameter :: aggr_dump=.false.
integer ::ictxt,np,me, err_act,icomm
character(len=20) :: name, ch_err
integer :: ictxt,np,me, err_act,icomm
character(len=20) :: name
name='mld_aggrmat_asb'
if(psb_get_errstatus().ne.0) return
mlprec/mld_zaggrmat_raw_asb.F90
+2 -2
View File
@@ -55,12 +55,12 @@ subroutine mld_zaggrmat_raw_asb(a,desc_a,ac,desc_ac,p,info)
logical, parameter :: aggr_dump=.false.
integer ::ictxt,np,me, err_act,icomm
character(len=20) :: name, ch_err
character(len=20) :: name
type(psb_zspmat_type) :: b
integer, pointer :: nzbr(:), idisp(:)
integer :: nrow, nglob, ncol, ntaggr, nzac, ip, ndx,&
& naggr, nzt,jl,nzl,nlr, naggrm1, i, j, k
& naggr, nzt,naggrm1, i
name='mld_aggrmat_raw_asb'
if(psb_get_errstatus().ne.0) return
mlprec/mld_zaggrmat_smth_asb.F90
+2 -2
View File
@@ -56,10 +56,10 @@ subroutine mld_zaggrmat_smth_asb(a,desc_a,ac,desc_ac,p,info)
type(psb_zspmat_type) :: b
integer, pointer :: nzbr(:), idisp(:)
integer :: nrow, nglob, ncol, ntaggr, nzac, ip, ndx,&
& naggr, nzt,jl,nzl,nlr,naggrm1,naggrp1, i, j, k
& naggr, nzl,naggrm1,naggrp1, i, j, k
logical, parameter :: aggr_dump=.false.
integer ::ictxt,np,me, err_act, icomm
character(len=20) :: name, ch_err
character(len=20) :: name
type(psb_zspmat_type), pointer :: am1,am2
type(psb_zspmat_type) :: am3,am4
logical :: ml_global_nmb
mlprec/mld_zasmat_bld.f90
+3 -3
View File
@@ -73,9 +73,9 @@ Subroutine mld_zasmat_bld(ptype,novr,a,blk,desc_data,upd,desc_p,info,outfmt)
integer icomm
! .. Local Scalars ..
Integer :: k, np,me,m,nnzero,&
& ictxt, n_col,ier,n,int_err(5),&
& tot_recv, ircode, n_row,nhalo, nrow_a,err_act
Integer :: np,me,nnzero,&
& ictxt, n_col,int_err(5),&
& tot_recv, n_row,nhalo, nrow_a,err_act
Logical,Parameter :: debug=.false., debugprt=.false.
character(len=20) :: name, ch_err
mlprec/mld_zbaseprec_aply.f90
+1 -2
View File
@@ -56,8 +56,7 @@ subroutine mld_zbaseprec_aply(alpha,prec,x,beta,y,desc_data,trans,work,info)
integer :: n_row,n_col, int_err(5), nrow_d
complex(kind(1.d0)), pointer :: ww(:), aux(:), tx(:),ty(:)
character ::diagl, diagu
integer :: ictxt,np,me,i, isz, nrg, err_act
real(kind(1.d0)) :: t1, t2, t3, t4, t5, t6, t7
integer :: ictxt,np,me, isz, err_act
logical,parameter :: debug=.false., debugprt=.false.
character(len=20) :: name, ch_err
mlprec/mld_zbaseprec_bld.f90
+2 -4
View File
@@ -48,10 +48,8 @@ subroutine mld_zbaseprc_bld(a,desc_a,p,info,upd)
character, intent(in), optional :: upd
! Local scalars
Integer :: err, nnzero, n_row, n_col,I,j,k,ictxt,&
& me,mycol,np,npcol,mglob,lw, mtype, nrg, nzg, err_act
real(kind(1.d0)) :: temp, real_err(5)
real(kind(1.d0)),pointer :: gd(:), work(:)
Integer :: err, n_row, n_col,ictxt,&
& me,np,mglob, err_act
integer :: int_err(5)
character :: iupd
mlprec/mld_zbjac_aply.f90
+2 -4
View File
@@ -57,10 +57,8 @@ subroutine mld_zbjac_aply(alpha,prec,x,beta,y,desc_data,trans,work,info)
! Local variables
integer :: n_row,n_col
complex(kind(1.d0)), pointer :: ww(:), aux(:), tx(:),ty(:),tb(:)
character ::diagl, diagu
integer :: ictxt,np,me,i, isz, nrg, err_act, int_err(5)
real(kind(1.d0)) :: t1, t2, t3, t4, t5, t6, t7
complex(kind(1.d0)), pointer :: ww(:), aux(:), tx(:),ty(:)
integer :: ictxt,np,me,i, err_act, int_err(5)
logical,parameter :: debug=.false., debugprt=.false.
character(len=20) :: name, ch_err
mlprec/mld_zbjac_bld.f90
+5 -7
View File
@@ -64,16 +64,14 @@ subroutine mld_zbjac_bld(a,desc_a,p,upd,info)
character, intent(in) :: upd
! .. Local Scalars ..
integer :: i, j, jj, k, kk, m
integer :: int_err(5)
character :: trans, unitd
integer :: i, k, m, err_act, n_row, nrow_a,n_col
integer :: int_err(5)
character :: trans, unitd
type(psb_zspmat_type) :: blck, atmp
real(kind(1.d0)) :: t1,t2,t3,t4,t5,t6, t7, t8
real(kind(1.d0)) :: t1,t2,t3,t6
logical, parameter :: debugprt=.false., debug=.false., aggr_dump=.false.
integer nztota, nztotb, nztmp, nzl, nnr, ir, err_act,&
& n_row, nrow_a,n_col, nhalo, ind, iind
integer :: ictxt,np,me
character(len=20) :: name, ch_err
character(len=20) :: name
character(len=5), parameter :: coofmt='COO', csrfmt='CSR'
if(psb_get_errstatus().ne.0) return
mlprec/mld_zdiagsc_bld.f90
+2 -3
View File
@@ -49,11 +49,10 @@ subroutine mld_zdiag_bld(a,desc_a,p,upd,info)
! Local scalars
Integer :: err, n_row, n_col,I,j,k,ictxt,&
& me,np,mglob,lw, err_act
Integer :: err, n_row, n_col,I,ictxt,&
& me,np,mglob, err_act
complex(kind(1.d0)),pointer :: gd(:), work(:)
integer :: int_err(5)
character :: iupd
logical, parameter :: debug=.false.
integer,parameter :: iroot=0,iout=60,ilout=40
mlprec/mld_zilu_bld.f90
+2 -6
View File
@@ -64,13 +64,9 @@ subroutine mld_zilu_bld(a,desc_a,p,upd,info,blck)
character, intent(in) :: upd
type(psb_zspmat_type), intent(in), optional :: blck
! .. Local Scalars ..
integer :: i, j, jj, k, kk, m
integer :: int_err(5)
character :: trans, unitd
real(kind(1.d0)) :: t1,t2,t3,t4,t5,t6, t7, t8
integer :: i, nztota, err_act, n_row, nrow_a
character :: trans, unitd
logical, parameter :: debugprt=.false., debug=.false., aggr_dump=.false.
integer nztota, nztotb, nztmp, nzl, nnr, ir, err_act,&
& n_row, nrow_a, ind, iind, i1,i2,ia
integer :: ictxt,np,me
character(len=20) :: name, ch_err
mlprec/mld_zilu_fct.f90
+2 -4
View File
@@ -53,7 +53,7 @@ subroutine mld_zilu_fct(ialg,a,l,u,d,info,blck)
type(psb_zspmat_type),intent(in), optional, target :: blck
complex(kind(1.d0)), intent(inout) :: d(:)
! .. Local Scalars ..
integer :: i, j, jj, k, kk, l1, l2, ll, low1, low2,m,ma,err_act
integer :: l1, l2, m, err_act
type(psb_zspmat_type), pointer :: blck_
character(len=20) :: name, ch_err
@@ -138,7 +138,7 @@ contains
integer, dimension(:) :: lia1,lia2,uia1,uia2
complex(kind(1.d0)), dimension(:) :: laspk,uaspk,d
integer :: i,j,k,l,low1,low2,kk,jj,ll, irb, ktrw,err_act
integer :: i,j,k,l,low1,low2,kk,jj,ll, ktrw,err_act
complex(kind(1.d0)) :: dia,temp
integer, parameter :: nrb=16
logical,parameter :: debug=.false.
@@ -296,8 +296,6 @@ contains
integer :: i, m,ktrw,jd,jmax,l1,l2
integer :: lia1(:),lia2(:),uia1(:),uia2(:)
complex(kind(1.d0)) :: laspk(:), uaspk(:), dia
type(psb_int_heap) :: heap
integer :: k,j,info,irb
integer, parameter :: nrb=16
character(len=20), parameter :: name='mld_dilu_fctint'
mlprec/mld_ziluk_fct.f90
+6 -12
View File
@@ -53,9 +53,7 @@ subroutine mld_ziluk_fct(fill_in,ialg,a,l,u,d,info,blck)
type(psb_zspmat_type),intent(in), optional, target :: blck
complex(kind(1.d0)), intent(inout) :: d(:)
! .. Local Scalars ..
complex(kind(1.d0)) :: dia, temp
integer :: i, j, jj, k, kk, l1, l2, ll, low1, low2,m,ma,err_act
integer :: l1, l2, m, err_act
type(psb_zspmat_type), pointer :: blck_
character(len=20) :: name, ch_err
logical, parameter :: debug=.false.
@@ -140,16 +138,13 @@ contains
complex(kind(1.d0)), dimension(:), allocatable :: laspk,uaspk
complex(kind(1.d0)), dimension(:) :: d
integer :: i,j,k,l,low1,low2,kk,jj,ll, ktrw,err_act, &
& isz,minj,maxj,lrwk,nidx
complex(kind(1.d0)) :: dia,temp,rwk
integer, allocatable :: uplevs(:), rowlevs(:),idxs(:)
integer :: i, ktrw,err_act, nidx
integer, allocatable :: uplevs(:), rowlevs(:),idxs(:)
complex(kind(1.d0)), allocatable :: row(:)
type(psb_int_heap) :: heap
logical,parameter :: debug=.false.
type(psb_zspmat_type) :: trw
integer :: int_err(5)
character(len=20), parameter :: name='mld_diluk_fctint'
character(len=20) :: ch_err
@@ -328,9 +323,8 @@ contains
subroutine iluk_fact(fill_in,i,m,row,rowlevs,heap,d,uia1,uia2,uaspk,uplevs,nidx,idxs)
use psb_base_mod
implicit none
type(psb_zspmat_type) :: a
type(psb_int_heap) :: heap
integer :: i,m, rowlevs(:),minj,maxj,fill_in,nidx
integer :: i,m, rowlevs(:),fill_in,nidx
integer, allocatable :: idxs(:)
integer :: uia1(:),uia2(:),uplevs(:)
complex(kind(1.d0)) :: row(:), uaspk(:),d(:)
@@ -400,11 +394,11 @@ contains
& l1,l2,lia1,lia2,laspk,d,uia1,uia2,uaspk,uplevs)
use psb_base_mod
implicit none
integer :: fill_in,ialg,i, rowlevs(:),minj,maxj,l1,l2,m,nidx,idxs(:)
integer :: fill_in,ialg,i, rowlevs(:),l1,l2,m,nidx,idxs(:)
integer, allocatable :: uia1(:),uia2(:), lia1(:),lia2(:),uplevs(:)
complex(kind(1.d0)),allocatable :: uaspk(:), laspk(:)
complex(kind(1.d0)) :: row(:), d(:)
integer :: k,j,isz,info,err_act,int_err(5),idxp
integer :: j,isz,info,err_act,int_err(5),idxp
character(len=20), parameter :: name='mld_diluk_fctint'
character(len=20) :: ch_err
mlprec/mld_zilut_fct.f90
+6 -11
View File
@@ -54,8 +54,7 @@ subroutine mld_zilut_fct(fill_in,thres,ialg,a,l,u,d,info,blck)
type(psb_zspmat_type),intent(in), optional, target :: blck
complex(kind(1.d0)), intent(inout) :: d(:)
! .. Local Scalars ..
complex(kind(1.d0)) :: temp
integer :: i, j, jj, k, kk, l1, l2, ll, low1, low2,m,ma,err_act
integer :: l1, l2, m, err_act
type(psb_zspmat_type), pointer :: blck_
character(len=20) :: name, ch_err
@@ -142,9 +141,7 @@ contains
complex(kind(1.d0)), dimension(:), allocatable :: laspk,uaspk
complex(kind(1.d0)), dimension(:) :: d
integer :: i,j,k,l,low1,low2,kk,jj,ll, ktrw,err_act, &
& isz,minj,maxj,lrwk,nidx,nlw,nup,jmaxup
complex(kind(1.d0)) :: temp,rwk
integer :: i, ktrw,err_act,nidx,nlw,nup,jmaxup
real(kind(1.d0)) :: nrmi
integer, allocatable :: idxs(:)
complex(kind(1.d0)), allocatable :: row(:)
@@ -152,7 +149,6 @@ contains
logical,parameter :: debug=.false.
type(psb_zspmat_type) :: trw
integer :: int_err(5)
character(len=20), parameter :: name='mld_zilut_fctint'
character(len=20) :: ch_err
@@ -358,7 +354,6 @@ contains
& d,uia1,uia2,uaspk,nidx,idxs)
use psb_base_mod
implicit none
type(psb_zspmat_type) :: a
type(psb_int_heap) :: heap
integer :: i,m,fill_in,nidx
real(kind(1.d0)), intent(in) :: thres,nrmi
@@ -366,7 +361,7 @@ contains
integer :: uia1(:),uia2(:)
complex(kind(1.d0)) :: row(:), uaspk(:),d(:)
integer :: k,j,lrwk,jj,info, lastk
integer :: k,j,jj,info, lastk
complex(kind(1.d0)) :: rwk
logical, parameter :: debug=.false.
@@ -440,17 +435,17 @@ contains
& nidx,idxs,l1,l2,lia1,lia2,laspk,d,uia1,uia2,uaspk)
use psb_base_mod
implicit none
integer :: fill_in,i, minj,maxj,l1,l2,m,nidx,idxs(:)
integer :: fill_in,i, l1,l2,m,nidx,idxs(:)
integer :: nlw,nup,jmaxup
integer, allocatable :: uia1(:),uia2(:), lia1(:),lia2(:)
real(kind(1.d0)), intent(in) :: thres,nrmi
complex(kind(1.d0)),allocatable :: uaspk(:), laspk(:)
complex(kind(1.d0)) :: row(:), d(:)
complex(kind(1.d0)),allocatable :: xw(:),xt(:)
complex(kind(1.d0)),allocatable :: xw(:)
integer, allocatable :: xwid(:), indx(:)
complex(kind(1.d0)) :: witem
integer :: widx
integer :: k,j,isz,info,err_act,int_err(5),idxp, nz
integer :: k,isz,info,err_act,int_err(5),idxp, nz
type(psb_dcomplex_idx_heap) :: heap
character(len=20), parameter :: name='mld_zilut_fctint'
character(len=20) :: ch_err
mlprec/mld_zmlprec_aply.f90
+4 -7
View File
@@ -99,13 +99,10 @@ subroutine mld_zmlprec_aply(alpha,baseprecv,x,beta,y,desc_data,trans,work,info)
! Local variables
integer :: n_row,n_col
character ::diagl, diagu
integer :: ictxt,np,me,i, isz, nr2l,nc2l,err_act, iptype, int_err(5)
real(kind(1.d0)) :: omega
real(kind(1.d0)) :: t1, t2, t3, t4, t5, t6, t7
logical, parameter :: debug=.false., debugprt=.false.
integer :: ismth, nlev, ilev, icm
character(len=20) :: name, ch_err
integer :: ictxt,np,me,i, nr2l,nc2l,err_act
logical, parameter :: debug=.false., debugprt=.false.
integer :: ismth, nlev, ilev, icm
character(len=20) :: name
type psb_mlprec_wrk_type
complex(kind(1.d0)), allocatable :: tx(:),ty(:),x2l(:),y2l(:)
mlprec/mld_zmlprec_bld.f90
+1 -1
View File
@@ -48,7 +48,7 @@ subroutine mld_zmlprec_bld(a,desc_a,p,info)
type(psb_desc_type) :: desc_ac
integer :: i, nrg, nzg, err_act,k
integer :: err_act
character(len=20) :: name, ch_err
logical, parameter :: debug=.false.
type(psb_zspmat_type) :: ac
mlprec/mld_zprec_aply.f90
+2 -2
View File
@@ -169,9 +169,9 @@ subroutine mld_zprec_aply1(prec,x,desc_data,info,trans)
! Local variables
character :: trans_
integer :: ictxt,np,me,i, isz, err_act, int_err(5)
integer :: ictxt,np,me, err_act
complex(kind(1.d0)), pointer :: WW(:), w1(:)
character(len=20) :: name, ch_err
character(len=20) :: name
name='mld_zprec_aply1'
info = 0
call psb_erractionsave(err_act)
mlprec/mld_zprecbld.f90
+2 -2
View File
@@ -48,7 +48,7 @@ subroutine mld_zprecbld(a,desc_a,p,info,upd)
! Local scalars
Integer :: err,i,j,k,ictxt, me,np,lw, err_act
Integer :: err,i,k,ictxt, me,np, err_act
integer :: int_err(5)
character :: iupd
@@ -62,7 +62,7 @@ subroutine mld_zprecbld(a,desc_a,p,info,upd)
call psb_erractionsave(err_act)
name = 'mld_zprecbld'
if (debug) write(0,*) 'Entering precbld',P%prec,desc_a%matrix_data(:)
if (debug) write(0,*) 'Entering precbld',desc_a%matrix_data(:)
info = 0
int_err(1) = 0
ictxt = psb_cd_get_context(desc_a)
mlprec/mld_zprecfree.f90
+1 -1
View File
@@ -45,7 +45,7 @@ subroutine mld_zprecfree(p,info)
integer, intent(out) :: info
!...locals....
integer :: ictxt,me, np,err_act,i
integer :: me, err_act,i
character(len=20) :: name
if(psb_get_errstatus().ne.0) return
mlprec/mld_zslu_bld.f90
+2 -2
View File
@@ -45,9 +45,9 @@ subroutine mld_zslu_bld(a,desc_a,p,info)
type(mld_zbaseprc_type), intent(inout) :: p
integer, intent(out) :: info
integer :: i,j,nza,nzb,nzt,ictxt,me,np,err_act
integer :: nzt,ictxt,me,np,err_act
logical, parameter :: debug=.false.
character(len=20) :: name, ch_err
character(len=20) :: name, ch_err
if(psb_get_errstatus().ne.0) return
info=0
mlprec/mld_zslud_bld.f90
+1 -1
View File
@@ -45,7 +45,7 @@ subroutine mld_zsludist_bld(a,desc_a,p,info)
type(mld_zbaseprc_type), intent(inout) :: p
integer, intent(out) :: info
integer :: i,j,nza,nzb,nzt,ictxt,me,np,err_act,&
integer :: nzt,ictxt,me,np,err_act,&
& mglob,ifrst,ibcheck,nrow,ncol,npr,npc, ip
logical, parameter :: debug=.false.
character(len=20) :: name, ch_err
mlprec/mld_zsp_renum.f90
+4 -6
View File
@@ -49,12 +49,10 @@ subroutine mld_zsp_renum(a,desc_a,blck,p,atmp,info)
character(len=20) :: name, ch_err
integer nztota, nztotb, nztmp, nzl, nnr, ir, mglob, mtype, n_row, &
& nrow_a,n_col, nhalo,lovr, ind, iind, pi,nr,ns,i,j,jj,k,kk
integer nztota, nztotb, nztmp, nnr, mglob, i,k
integer ::ictxt,np,me, err_act
integer, allocatable :: itmp(:), itmp2(:)
complex(kind(1.d0)), allocatable :: ztmp(:)
real(kind(1.d0)) :: t1,t2,t3,t4,t5,t6, t7, t8
real(kind(1.d0)) :: t3,t4
if (psb_get_errstatus().ne.0) return
info=0
@@ -159,7 +157,7 @@ subroutine mld_zsp_renum(a,desc_a,blck,p,atmp,info)
enddo
do k=1, nnr
do k=1, atmp%m
p%invperm(p%perm(k)) = k
enddo
t3 = psb_wtime()
@@ -206,7 +204,7 @@ contains
integer,dimension(:,:),allocatable::NDstk
integer,dimension(:),allocatable::iOld,renum,ndeg,lvl,lvls1,lvls2,ccstor
character(len=20) :: name, ch_err
character(len=20) :: name
if(psb_get_errstatus().ne.0) return
info=0
mlprec/mld_zumf_bld.f90
+2 -2
View File
@@ -46,10 +46,10 @@ subroutine mld_zumf_bld(a,desc_a,p,info)
integer, intent(out) :: info
integer :: i,j,nza,nzb,nzt,ictxt,me,np,err_act
integer :: nzt,ictxt,me,np,err_act
integer :: i_err(5)
logical, parameter :: debug=.false.
character(len=20) :: name, ch_err
character(len=20) :: name
info=0
name='mld_zumf_bld'