fdurastante
/
psblas3
mirror of https://github.com/sfilippone/psblas3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

psblas3:

Browse Source 
Changes from warning from Cray ftn.
    base/serial/impl/psb_s_mat_impl.F90
    base/serial/impl/psb_s_csr_impl.f90
    base/serial/impl/psb_z_mat_impl.F90
    base/serial/impl/psb_z_csr_impl.f90
    base/serial/impl/psb_c_mat_impl.F90
    base/serial/impl/psb_d_mat_impl.F90
    base/serial/impl/psb_c_csr_impl.f90
    base/serial/impl/psb_d_csr_impl.f90
    base/modules/psb_comm_mod.f90
psblas3-type-indexed
Salvatore Filippone 14 years ago
parent 362f77e652
commit a3036d7d1c
9 changed files with 36 additions and 15 deletions
Show Stats Download Patch File Download Diff File

22
base/modules/psb_comm_mod.f90
Unescape Escape View File

@ -117,7 +117,7 @@ module psb_comm_mod
interface psb_halo interface psb_halo
subroutine psb_shalom(x,desc_a,info,alpha,jx,ik,work,tran,mode,data) subroutine psb_shalom(x,desc_a,info,alpha,jx,ik,work,tran,mode,data)
use psb_descriptor_type use psb_descriptor_type
real(psb_spk_), intent(inout) :: x(:,:) real(psb_spk_), intent(inout),target :: x(:,:)
type(psb_desc_type), intent(in) :: desc_a type(psb_desc_type), intent(in) :: desc_a
integer, intent(out) :: info integer, intent(out) :: info
real(psb_spk_), intent(in), optional :: alpha real(psb_spk_), intent(in), optional :: alpha
@ -137,7 +137,7 @@ module psb_comm_mod
end subroutine psb_shalov end subroutine psb_shalov
subroutine psb_dhalom(x,desc_a,info,alpha,jx,ik,work,tran,mode,data) subroutine psb_dhalom(x,desc_a,info,alpha,jx,ik,work,tran,mode,data)
use psb_descriptor_type use psb_descriptor_type
real(psb_dpk_), intent(inout) :: x(:,:) real(psb_dpk_), intent(inout),target :: x(:,:)
type(psb_desc_type), intent(in) :: desc_a type(psb_desc_type), intent(in) :: desc_a
integer, intent(out) :: info integer, intent(out) :: info
real(psb_dpk_), intent(in), optional :: alpha real(psb_dpk_), intent(in), optional :: alpha
@ -157,7 +157,7 @@ module psb_comm_mod
end subroutine psb_dhalov end subroutine psb_dhalov
subroutine psb_ihalom(x,desc_a,info,alpha,jx,ik,work,tran,mode,data) subroutine psb_ihalom(x,desc_a,info,alpha,jx,ik,work,tran,mode,data)
use psb_descriptor_type use psb_descriptor_type
integer, intent(inout) :: x(:,:) integer, intent(inout), target :: x(:,:)
type(psb_desc_type), intent(in) :: desc_a type(psb_desc_type), intent(in) :: desc_a
integer, intent(out) :: info integer, intent(out) :: info
real(psb_dpk_), intent(in), optional :: alpha real(psb_dpk_), intent(in), optional :: alpha
@ -177,10 +177,10 @@ module psb_comm_mod
end subroutine psb_ihalov end subroutine psb_ihalov
subroutine psb_chalom(x,desc_a,info,alpha,jx,ik,work,tran,mode,data) subroutine psb_chalom(x,desc_a,info,alpha,jx,ik,work,tran,mode,data)
use psb_descriptor_type use psb_descriptor_type
complex(psb_spk_), intent(inout) :: x(:,:) complex(psb_spk_), intent(inout), target :: x(:,:)
type(psb_desc_type), intent(in) :: desc_a type(psb_desc_type), intent(in) :: desc_a
integer, intent(out) :: info integer, intent(out) :: info
complex(psb_spk_), intent(in), optional :: alpha complex(psb_spk_), intent(in), optional :: alpha
complex(psb_spk_), target, optional, intent(inout) :: work(:) complex(psb_spk_), target, optional, intent(inout) :: work(:)
integer, intent(in), optional :: mode,jx,ik,data integer, intent(in), optional :: mode,jx,ik,data
character, intent(in), optional :: tran character, intent(in), optional :: tran
@ -197,10 +197,10 @@ module psb_comm_mod
end subroutine psb_chalov end subroutine psb_chalov
subroutine psb_zhalom(x,desc_a,info,alpha,jx,ik,work,tran,mode,data) subroutine psb_zhalom(x,desc_a,info,alpha,jx,ik,work,tran,mode,data)
use psb_descriptor_type use psb_descriptor_type
complex(psb_dpk_), intent(inout) :: x(:,:) complex(psb_dpk_), intent(inout), target :: x(:,:)
type(psb_desc_type), intent(in) :: desc_a type(psb_desc_type), intent(in) :: desc_a
integer, intent(out) :: info integer, intent(out) :: info
complex(psb_dpk_), intent(in), optional :: alpha complex(psb_dpk_), intent(in), optional :: alpha
complex(psb_dpk_), target, optional, intent(inout) :: work(:) complex(psb_dpk_), target, optional, intent(inout) :: work(:)
integer, intent(in), optional :: mode,jx,ik,data integer, intent(in), optional :: mode,jx,ik,data
character, intent(in), optional :: tran character, intent(in), optional :: tran

2
base/serial/impl/psb_c_csr_impl.f90
Unescape Escape View File

@ -2539,7 +2539,7 @@ subroutine psb_c_mv_csr_from_coo(a,b,info)
Integer :: nza, nr, i,j,irw, err_act, nc Integer :: nza, nr, i,j,irw, err_act, nc
Integer, Parameter :: maxtry=8 Integer, Parameter :: maxtry=8
integer :: debug_level, debug_unit integer :: debug_level, debug_unit
character(len=20) :: name character(len=20) :: name='mv_from_coo'
info = psb_success_ info = psb_success_
debug_unit = psb_get_debug_unit() debug_unit = psb_get_debug_unit()

4
base/serial/impl/psb_c_mat_impl.F90
Unescape Escape View File

@ -1921,6 +1921,7 @@ function psb_c_csnmi(a) result(res)
logical, parameter :: debug=.false. logical, parameter :: debug=.false.
call psb_get_erraction(err_act) call psb_get_erraction(err_act)
info = psb_success_
if (.not.allocated(a%a)) then if (.not.allocated(a%a)) then
info = psb_err_invalid_mat_state_ info = psb_err_invalid_mat_state_
call psb_errpush(info,name) call psb_errpush(info,name)
@ -1955,6 +1956,7 @@ subroutine psb_c_get_diag(a,d,info)
logical, parameter :: debug=.false. logical, parameter :: debug=.false.
call psb_erractionsave(err_act) call psb_erractionsave(err_act)
info = psb_success_
if (.not.allocated(a%a)) then if (.not.allocated(a%a)) then
info = psb_err_invalid_mat_state_ info = psb_err_invalid_mat_state_
call psb_errpush(info,name) call psb_errpush(info,name)
@ -1993,6 +1995,7 @@ subroutine psb_c_scal(d,a,info)
logical, parameter :: debug=.false. logical, parameter :: debug=.false.
call psb_erractionsave(err_act) call psb_erractionsave(err_act)
info = psb_success_
if (.not.allocated(a%a)) then if (.not.allocated(a%a)) then
info = psb_err_invalid_mat_state_ info = psb_err_invalid_mat_state_
call psb_errpush(info,name) call psb_errpush(info,name)
@ -2030,6 +2033,7 @@ subroutine psb_c_scals(d,a,info)
character(len=20) :: name='scal' character(len=20) :: name='scal'
logical, parameter :: debug=.false. logical, parameter :: debug=.false.
info = psb_success_
call psb_erractionsave(err_act) call psb_erractionsave(err_act)
if (.not.allocated(a%a)) then if (.not.allocated(a%a)) then
info = psb_err_invalid_mat_state_ info = psb_err_invalid_mat_state_

2
base/serial/impl/psb_d_csr_impl.f90
Unescape Escape View File

@ -2588,7 +2588,7 @@ subroutine psb_d_mv_csr_from_coo(a,b,info)
Integer :: nza, nr, i,j,irw, err_act, nc Integer :: nza, nr, i,j,irw, err_act, nc
Integer, Parameter :: maxtry=8 Integer, Parameter :: maxtry=8
integer :: debug_level, debug_unit integer :: debug_level, debug_unit
character(len=20) :: name character(len=20) :: name='mv_from_coo'
info = psb_success_ info = psb_success_
debug_unit = psb_get_debug_unit() debug_unit = psb_get_debug_unit()

9
base/serial/impl/psb_d_mat_impl.F90
Unescape Escape View File

@ -1920,6 +1920,7 @@ function psb_d_csnmi(a) result(res)
logical, parameter :: debug=.false. logical, parameter :: debug=.false.
call psb_get_erraction(err_act) call psb_get_erraction(err_act)
info = psb_success_
if (.not.allocated(a%a)) then if (.not.allocated(a%a)) then
info = psb_err_invalid_mat_state_ info = psb_err_invalid_mat_state_
call psb_errpush(info,name) call psb_errpush(info,name)
@ -1953,6 +1954,7 @@ function psb_d_csnm1(a) result(res)
logical, parameter :: debug=.false. logical, parameter :: debug=.false.
call psb_get_erraction(err_act) call psb_get_erraction(err_act)
info = psb_success_
if (.not.allocated(a%a)) then if (.not.allocated(a%a)) then
info = psb_err_invalid_mat_state_ info = psb_err_invalid_mat_state_
call psb_errpush(info,name) call psb_errpush(info,name)
@ -1987,6 +1989,7 @@ subroutine psb_d_rowsum(d,a,info)
logical, parameter :: debug=.false. logical, parameter :: debug=.false.
call psb_erractionsave(err_act) call psb_erractionsave(err_act)
info = psb_success_
if (.not.allocated(a%a)) then if (.not.allocated(a%a)) then
info = psb_err_invalid_mat_state_ info = psb_err_invalid_mat_state_
call psb_errpush(info,name) call psb_errpush(info,name)
@ -2024,6 +2027,7 @@ subroutine psb_d_arwsum(d,a,info)
logical, parameter :: debug=.false. logical, parameter :: debug=.false.
call psb_erractionsave(err_act) call psb_erractionsave(err_act)
info = psb_success_
if (.not.allocated(a%a)) then if (.not.allocated(a%a)) then
info = psb_err_invalid_mat_state_ info = psb_err_invalid_mat_state_
call psb_errpush(info,name) call psb_errpush(info,name)
@ -2061,6 +2065,7 @@ subroutine psb_d_colsum(d,a,info)
logical, parameter :: debug=.false. logical, parameter :: debug=.false.
call psb_erractionsave(err_act) call psb_erractionsave(err_act)
info = psb_success_
if (.not.allocated(a%a)) then if (.not.allocated(a%a)) then
info = psb_err_invalid_mat_state_ info = psb_err_invalid_mat_state_
call psb_errpush(info,name) call psb_errpush(info,name)
@ -2098,6 +2103,7 @@ subroutine psb_d_aclsum(d,a,info)
logical, parameter :: debug=.false. logical, parameter :: debug=.false.
call psb_erractionsave(err_act) call psb_erractionsave(err_act)
info = psb_success_
if (.not.allocated(a%a)) then if (.not.allocated(a%a)) then
info = psb_err_invalid_mat_state_ info = psb_err_invalid_mat_state_
call psb_errpush(info,name) call psb_errpush(info,name)
@ -2135,6 +2141,7 @@ subroutine psb_d_get_diag(a,d,info)
logical, parameter :: debug=.false. logical, parameter :: debug=.false.
call psb_erractionsave(err_act) call psb_erractionsave(err_act)
info = psb_success_
if (.not.allocated(a%a)) then if (.not.allocated(a%a)) then
info = psb_err_invalid_mat_state_ info = psb_err_invalid_mat_state_
call psb_errpush(info,name) call psb_errpush(info,name)
@ -2173,6 +2180,7 @@ subroutine psb_d_scal(d,a,info)
logical, parameter :: debug=.false. logical, parameter :: debug=.false.
call psb_erractionsave(err_act) call psb_erractionsave(err_act)
info = psb_success_
if (.not.allocated(a%a)) then if (.not.allocated(a%a)) then
info = psb_err_invalid_mat_state_ info = psb_err_invalid_mat_state_
call psb_errpush(info,name) call psb_errpush(info,name)
@ -2211,6 +2219,7 @@ subroutine psb_d_scals(d,a,info)
logical, parameter :: debug=.false. logical, parameter :: debug=.false.
call psb_erractionsave(err_act) call psb_erractionsave(err_act)
info = psb_success_
if (.not.allocated(a%a)) then if (.not.allocated(a%a)) then
info = psb_err_invalid_mat_state_ info = psb_err_invalid_mat_state_
call psb_errpush(info,name) call psb_errpush(info,name)

2
base/serial/impl/psb_s_csr_impl.f90
Unescape Escape View File

@ -2346,7 +2346,7 @@ subroutine psb_s_mv_csr_from_coo(a,b,info)
Integer :: nza, nr, i,j,irw, err_act, nc Integer :: nza, nr, i,j,irw, err_act, nc
Integer, Parameter :: maxtry=8 Integer, Parameter :: maxtry=8
integer :: debug_level, debug_unit integer :: debug_level, debug_unit
character(len=20) :: name character(len=20) :: name='mv_from_coo'
info = psb_success_ info = psb_success_
debug_unit = psb_get_debug_unit() debug_unit = psb_get_debug_unit()

4
base/serial/impl/psb_s_mat_impl.F90
Unescape Escape View File

@ -1918,6 +1918,7 @@ function psb_s_csnmi(a) result(res)
character(len=20) :: name='csnmi' character(len=20) :: name='csnmi'
logical, parameter :: debug=.false. logical, parameter :: debug=.false.
info = psb_success_
call psb_get_erraction(err_act) call psb_get_erraction(err_act)
if (.not.allocated(a%a)) then if (.not.allocated(a%a)) then
info = psb_err_invalid_mat_state_ info = psb_err_invalid_mat_state_
@ -1952,6 +1953,7 @@ subroutine psb_s_get_diag(a,d,info)
character(len=20) :: name='get_diag' character(len=20) :: name='get_diag'
logical, parameter :: debug=.false. logical, parameter :: debug=.false.
info = psb_success_
call psb_erractionsave(err_act) call psb_erractionsave(err_act)
if (.not.allocated(a%a)) then if (.not.allocated(a%a)) then
info = psb_err_invalid_mat_state_ info = psb_err_invalid_mat_state_
@ -1990,6 +1992,7 @@ subroutine psb_s_scal(d,a,info)
character(len=20) :: name='scal' character(len=20) :: name='scal'
logical, parameter :: debug=.false. logical, parameter :: debug=.false.
info = psb_success_
call psb_erractionsave(err_act) call psb_erractionsave(err_act)
if (.not.allocated(a%a)) then if (.not.allocated(a%a)) then
info = psb_err_invalid_mat_state_ info = psb_err_invalid_mat_state_
@ -2028,6 +2031,7 @@ subroutine psb_s_scals(d,a,info)
character(len=20) :: name='scal' character(len=20) :: name='scal'
logical, parameter :: debug=.false. logical, parameter :: debug=.false.
info = psb_success_
call psb_erractionsave(err_act) call psb_erractionsave(err_act)
if (.not.allocated(a%a)) then if (.not.allocated(a%a)) then
info = psb_err_invalid_mat_state_ info = psb_err_invalid_mat_state_

2
base/serial/impl/psb_z_csr_impl.f90
Unescape Escape View File

@ -2538,7 +2538,7 @@ subroutine psb_z_mv_csr_from_coo(a,b,info)
Integer :: nza, nr, i,j,irw, err_act, nc Integer :: nza, nr, i,j,irw, err_act, nc
Integer, Parameter :: maxtry=8 Integer, Parameter :: maxtry=8
integer :: debug_level, debug_unit integer :: debug_level, debug_unit
character(len=20) :: name character(len=20) :: name='mv_from_coo'
info = psb_success_ info = psb_success_
debug_unit = psb_get_debug_unit() debug_unit = psb_get_debug_unit()

4
base/serial/impl/psb_z_mat_impl.F90
Unescape Escape View File

@ -1918,6 +1918,7 @@ function psb_z_csnmi(a) result(res)
character(len=20) :: name='csnmi' character(len=20) :: name='csnmi'
logical, parameter :: debug=.false. logical, parameter :: debug=.false.
info = psb_success_
call psb_get_erraction(err_act) call psb_get_erraction(err_act)
if (.not.allocated(a%a)) then if (.not.allocated(a%a)) then
info = psb_err_invalid_mat_state_ info = psb_err_invalid_mat_state_
@ -1952,6 +1953,7 @@ subroutine psb_z_get_diag(a,d,info)
character(len=20) :: name='get_diag' character(len=20) :: name='get_diag'
logical, parameter :: debug=.false. logical, parameter :: debug=.false.
info = psb_success_
call psb_erractionsave(err_act) call psb_erractionsave(err_act)
if (.not.allocated(a%a)) then if (.not.allocated(a%a)) then
info = psb_err_invalid_mat_state_ info = psb_err_invalid_mat_state_
@ -1990,6 +1992,7 @@ subroutine psb_z_scal(d,a,info)
character(len=20) :: name='scal' character(len=20) :: name='scal'
logical, parameter :: debug=.false. logical, parameter :: debug=.false.
info = psb_success_
call psb_erractionsave(err_act) call psb_erractionsave(err_act)
if (.not.allocated(a%a)) then if (.not.allocated(a%a)) then
info = psb_err_invalid_mat_state_ info = psb_err_invalid_mat_state_
@ -2028,6 +2031,7 @@ subroutine psb_z_scals(d,a,info)
character(len=20) :: name='scal' character(len=20) :: name='scal'
logical, parameter :: debug=.false. logical, parameter :: debug=.false.
info = psb_success_
call psb_erractionsave(err_act) call psb_erractionsave(err_act)
if (.not.allocated(a%a)) then if (.not.allocated(a%a)) then
info = psb_err_invalid_mat_state_ info = psb_err_invalid_mat_state_

Write Preview
Loading…
Cancel
Save