mirror of
https://github.com/sfilippone/psblas3.git
synced 2026-10-18 20:02:27 +00:00
Added some cleanup from compiling with -Wall.
This commit is contained in:
@@ -1,6 +1,8 @@
|
||||
Changelog. A lot less detailed than usual, at least for past
|
||||
history.
|
||||
|
||||
2007/05/15: Merged in various fixes coming from tests on SP5 and HP-Itanium.
|
||||
|
||||
2007/04/08: Changed the implementation of psb_sp_getrow & friends.
|
||||
|
||||
2007/03/27: Merged in changes for enabling compilation on SUN.
|
||||
|
||||
@@ -486,6 +486,7 @@ contains
|
||||
character(len=20) :: name
|
||||
|
||||
name='psb_msort'
|
||||
call psb_erractionsave(err_act)
|
||||
|
||||
if (present(dir)) then
|
||||
dir_ = dir
|
||||
@@ -538,14 +539,13 @@ contains
|
||||
integer, intent(inout) :: x(:)
|
||||
integer, intent(out) :: nout
|
||||
integer, optional, intent(in) :: dir
|
||||
!!$ , flag
|
||||
!!$ integer, optional, intent(inout) :: ix(:)
|
||||
|
||||
integer :: dir_, flag_, n, err_act
|
||||
|
||||
character(len=20) :: name
|
||||
|
||||
name='psb_msort'
|
||||
name='psb_msort_u'
|
||||
call psb_erractionsave(err_act)
|
||||
|
||||
if (present(dir)) then
|
||||
dir_ = dir
|
||||
@@ -562,28 +562,8 @@ contains
|
||||
|
||||
n = size(x)
|
||||
|
||||
!!$ if (present(ix)) then
|
||||
!!$ if (size(ix) < n) then
|
||||
!!$ call psb_errpush(35,name,i_err=(/2,size(ix),0,0,0/))
|
||||
!!$ goto 9999
|
||||
!!$ end if
|
||||
!!$ if (present(flag)) then
|
||||
!!$ flag_ = flag
|
||||
!!$ else
|
||||
!!$ flag_ = psb_sort_ovw_idx_
|
||||
!!$ end if
|
||||
!!$ select case(flag_)
|
||||
!!$ case( psb_sort_ovw_idx_, psb_sort_keep_idx_)
|
||||
!!$ ! OK keep going
|
||||
!!$ case default
|
||||
!!$ call psb_errpush(30,name,i_err=(/4,flag_,0,0,0/))
|
||||
!!$ goto 9999
|
||||
!!$ end select
|
||||
!!$
|
||||
!!$ call imsrx(n,x,ix,dir_,flag_)
|
||||
!!$ else
|
||||
call imsru(n,x,dir_,nout)
|
||||
!!$ end if
|
||||
call imsru(n,x,dir_,nout)
|
||||
|
||||
|
||||
9999 continue
|
||||
if (err_act.eq.psb_act_abort_) then
|
||||
@@ -605,6 +585,7 @@ contains
|
||||
character(len=20) :: name
|
||||
|
||||
name='psb_qsort'
|
||||
call psb_erractionsave(err_act)
|
||||
|
||||
if (present(dir)) then
|
||||
dir_ = dir
|
||||
|
||||
@@ -57,9 +57,9 @@ subroutine psb_cdins(nz,ia,ja,desc_a,info,ila,jla)
|
||||
|
||||
!LOCALS.....
|
||||
|
||||
integer :: i,ictxt,row,k,dectype,mglob, nglob,err
|
||||
integer :: i,ictxt,k,dectype,mglob, nglob,err
|
||||
integer :: np, me, isize
|
||||
integer :: pnt_halo,nrow,ncol, nh, ip,jp, err_act,lip,ljp,nxt
|
||||
integer :: nrow,ncol, err_act
|
||||
logical, parameter :: debug=.false.
|
||||
integer, parameter :: relocsz=200
|
||||
integer, allocatable :: ila_(:), jla_(:)
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
! Parameters:
|
||||
! a - type(<psb_dspmat_type>). The input sparse matrix.
|
||||
! desc_a - type(<psb_desc_type>). The input communication descriptor.
|
||||
! norv - integer. The number of overlap levels.
|
||||
! novr - integer. The number of overlap levels.
|
||||
! desc_ov - type(<psb_desc_type>). The auxiliary output communication
|
||||
! descriptor.
|
||||
! info - integer. Eventually returns an error code.
|
||||
|
||||
@@ -56,12 +56,10 @@ subroutine psb_icdasb(desc_a,info,ext_hv)
|
||||
logical, intent(in), optional :: ext_hv
|
||||
|
||||
!....Locals....
|
||||
integer :: int_err(5), itemp(2)
|
||||
integer :: int_err(5)
|
||||
integer,allocatable :: ovrlap_index(:),halo_index(:), ext_index(:)
|
||||
|
||||
integer :: i,j,err,np,me,lovrlap,lhalo,nhalo,novrlap,max_size,&
|
||||
& max_halo,n_col,ldesc_halo, ldesc_ovrlap, dectype, err_act, &
|
||||
& key, ih, nh, idx, nk,icomm,hsize
|
||||
integer :: i,j,np,me, n_col, dectype, err_act, icomm
|
||||
integer :: ictxt,n_row
|
||||
logical :: ext_hv_
|
||||
logical, parameter :: debug=.false., debugwrt=.false.
|
||||
|
||||
Reference in New Issue
Block a user