From a3036d7d1cfa847d7959a6f62c8a577fb1d11b46 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Thu, 21 Jul 2011 13:56:52 +0000 Subject: [PATCH] psblas3: 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 --- base/modules/psb_comm_mod.f90 | 22 +++++++++++----------- base/serial/impl/psb_c_csr_impl.f90 | 2 +- base/serial/impl/psb_c_mat_impl.F90 | 4 ++++ base/serial/impl/psb_d_csr_impl.f90 | 2 +- base/serial/impl/psb_d_mat_impl.F90 | 9 +++++++++ base/serial/impl/psb_s_csr_impl.f90 | 2 +- base/serial/impl/psb_s_mat_impl.F90 | 4 ++++ base/serial/impl/psb_z_csr_impl.f90 | 2 +- base/serial/impl/psb_z_mat_impl.F90 | 4 ++++ 9 files changed, 36 insertions(+), 15 deletions(-) diff --git a/base/modules/psb_comm_mod.f90 b/base/modules/psb_comm_mod.f90 index f8fc6168..a77e6606 100644 --- a/base/modules/psb_comm_mod.f90 +++ b/base/modules/psb_comm_mod.f90 @@ -117,7 +117,7 @@ module psb_comm_mod interface psb_halo subroutine psb_shalom(x,desc_a,info,alpha,jx,ik,work,tran,mode,data) 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 integer, intent(out) :: info real(psb_spk_), intent(in), optional :: alpha @@ -137,7 +137,7 @@ module psb_comm_mod end subroutine psb_shalov subroutine psb_dhalom(x,desc_a,info,alpha,jx,ik,work,tran,mode,data) 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 integer, intent(out) :: info real(psb_dpk_), intent(in), optional :: alpha @@ -157,7 +157,7 @@ module psb_comm_mod end subroutine psb_dhalov subroutine psb_ihalom(x,desc_a,info,alpha,jx,ik,work,tran,mode,data) use psb_descriptor_type - integer, intent(inout) :: x(:,:) + integer, intent(inout), target :: x(:,:) type(psb_desc_type), intent(in) :: desc_a integer, intent(out) :: info real(psb_dpk_), intent(in), optional :: alpha @@ -177,10 +177,10 @@ module psb_comm_mod end subroutine psb_ihalov subroutine psb_chalom(x,desc_a,info,alpha,jx,ik,work,tran,mode,data) use psb_descriptor_type - complex(psb_spk_), intent(inout) :: x(:,:) - type(psb_desc_type), intent(in) :: desc_a - integer, intent(out) :: info - complex(psb_spk_), intent(in), optional :: alpha + complex(psb_spk_), intent(inout), target :: x(:,:) + type(psb_desc_type), intent(in) :: desc_a + integer, intent(out) :: info + complex(psb_spk_), intent(in), optional :: alpha complex(psb_spk_), target, optional, intent(inout) :: work(:) integer, intent(in), optional :: mode,jx,ik,data character, intent(in), optional :: tran @@ -197,10 +197,10 @@ module psb_comm_mod end subroutine psb_chalov subroutine psb_zhalom(x,desc_a,info,alpha,jx,ik,work,tran,mode,data) use psb_descriptor_type - complex(psb_dpk_), intent(inout) :: x(:,:) - type(psb_desc_type), intent(in) :: desc_a - integer, intent(out) :: info - complex(psb_dpk_), intent(in), optional :: alpha + complex(psb_dpk_), intent(inout), target :: x(:,:) + type(psb_desc_type), intent(in) :: desc_a + integer, intent(out) :: info + complex(psb_dpk_), intent(in), optional :: alpha complex(psb_dpk_), target, optional, intent(inout) :: work(:) integer, intent(in), optional :: mode,jx,ik,data character, intent(in), optional :: tran diff --git a/base/serial/impl/psb_c_csr_impl.f90 b/base/serial/impl/psb_c_csr_impl.f90 index 24ac91d3..d5f58005 100644 --- a/base/serial/impl/psb_c_csr_impl.f90 +++ b/base/serial/impl/psb_c_csr_impl.f90 @@ -2539,7 +2539,7 @@ subroutine psb_c_mv_csr_from_coo(a,b,info) Integer :: nza, nr, i,j,irw, err_act, nc Integer, Parameter :: maxtry=8 integer :: debug_level, debug_unit - character(len=20) :: name + character(len=20) :: name='mv_from_coo' info = psb_success_ debug_unit = psb_get_debug_unit() diff --git a/base/serial/impl/psb_c_mat_impl.F90 b/base/serial/impl/psb_c_mat_impl.F90 index 4b3e6c98..d1e9c012 100644 --- a/base/serial/impl/psb_c_mat_impl.F90 +++ b/base/serial/impl/psb_c_mat_impl.F90 @@ -1921,6 +1921,7 @@ function psb_c_csnmi(a) result(res) logical, parameter :: debug=.false. call psb_get_erraction(err_act) + info = psb_success_ if (.not.allocated(a%a)) then info = psb_err_invalid_mat_state_ call psb_errpush(info,name) @@ -1955,6 +1956,7 @@ subroutine psb_c_get_diag(a,d,info) logical, parameter :: debug=.false. call psb_erractionsave(err_act) + info = psb_success_ if (.not.allocated(a%a)) then info = psb_err_invalid_mat_state_ call psb_errpush(info,name) @@ -1993,6 +1995,7 @@ subroutine psb_c_scal(d,a,info) logical, parameter :: debug=.false. call psb_erractionsave(err_act) + info = psb_success_ if (.not.allocated(a%a)) then info = psb_err_invalid_mat_state_ call psb_errpush(info,name) @@ -2030,6 +2033,7 @@ subroutine psb_c_scals(d,a,info) character(len=20) :: name='scal' logical, parameter :: debug=.false. + info = psb_success_ call psb_erractionsave(err_act) if (.not.allocated(a%a)) then info = psb_err_invalid_mat_state_ diff --git a/base/serial/impl/psb_d_csr_impl.f90 b/base/serial/impl/psb_d_csr_impl.f90 index f1e5f677..6e0b61f4 100644 --- a/base/serial/impl/psb_d_csr_impl.f90 +++ b/base/serial/impl/psb_d_csr_impl.f90 @@ -2588,7 +2588,7 @@ subroutine psb_d_mv_csr_from_coo(a,b,info) Integer :: nza, nr, i,j,irw, err_act, nc Integer, Parameter :: maxtry=8 integer :: debug_level, debug_unit - character(len=20) :: name + character(len=20) :: name='mv_from_coo' info = psb_success_ debug_unit = psb_get_debug_unit() diff --git a/base/serial/impl/psb_d_mat_impl.F90 b/base/serial/impl/psb_d_mat_impl.F90 index 34cf5fc0..b6d36abb 100644 --- a/base/serial/impl/psb_d_mat_impl.F90 +++ b/base/serial/impl/psb_d_mat_impl.F90 @@ -1920,6 +1920,7 @@ function psb_d_csnmi(a) result(res) logical, parameter :: debug=.false. call psb_get_erraction(err_act) + info = psb_success_ if (.not.allocated(a%a)) then info = psb_err_invalid_mat_state_ call psb_errpush(info,name) @@ -1953,6 +1954,7 @@ function psb_d_csnm1(a) result(res) logical, parameter :: debug=.false. call psb_get_erraction(err_act) + info = psb_success_ if (.not.allocated(a%a)) then info = psb_err_invalid_mat_state_ call psb_errpush(info,name) @@ -1987,6 +1989,7 @@ subroutine psb_d_rowsum(d,a,info) logical, parameter :: debug=.false. call psb_erractionsave(err_act) + info = psb_success_ if (.not.allocated(a%a)) then info = psb_err_invalid_mat_state_ call psb_errpush(info,name) @@ -2024,6 +2027,7 @@ subroutine psb_d_arwsum(d,a,info) logical, parameter :: debug=.false. call psb_erractionsave(err_act) + info = psb_success_ if (.not.allocated(a%a)) then info = psb_err_invalid_mat_state_ call psb_errpush(info,name) @@ -2061,6 +2065,7 @@ subroutine psb_d_colsum(d,a,info) logical, parameter :: debug=.false. call psb_erractionsave(err_act) + info = psb_success_ if (.not.allocated(a%a)) then info = psb_err_invalid_mat_state_ call psb_errpush(info,name) @@ -2098,6 +2103,7 @@ subroutine psb_d_aclsum(d,a,info) logical, parameter :: debug=.false. call psb_erractionsave(err_act) + info = psb_success_ if (.not.allocated(a%a)) then info = psb_err_invalid_mat_state_ call psb_errpush(info,name) @@ -2135,6 +2141,7 @@ subroutine psb_d_get_diag(a,d,info) logical, parameter :: debug=.false. call psb_erractionsave(err_act) + info = psb_success_ if (.not.allocated(a%a)) then info = psb_err_invalid_mat_state_ call psb_errpush(info,name) @@ -2173,6 +2180,7 @@ subroutine psb_d_scal(d,a,info) logical, parameter :: debug=.false. call psb_erractionsave(err_act) + info = psb_success_ if (.not.allocated(a%a)) then info = psb_err_invalid_mat_state_ call psb_errpush(info,name) @@ -2211,6 +2219,7 @@ subroutine psb_d_scals(d,a,info) logical, parameter :: debug=.false. call psb_erractionsave(err_act) + info = psb_success_ if (.not.allocated(a%a)) then info = psb_err_invalid_mat_state_ call psb_errpush(info,name) diff --git a/base/serial/impl/psb_s_csr_impl.f90 b/base/serial/impl/psb_s_csr_impl.f90 index 2c9f38c9..1110d8a7 100644 --- a/base/serial/impl/psb_s_csr_impl.f90 +++ b/base/serial/impl/psb_s_csr_impl.f90 @@ -2346,7 +2346,7 @@ subroutine psb_s_mv_csr_from_coo(a,b,info) Integer :: nza, nr, i,j,irw, err_act, nc Integer, Parameter :: maxtry=8 integer :: debug_level, debug_unit - character(len=20) :: name + character(len=20) :: name='mv_from_coo' info = psb_success_ debug_unit = psb_get_debug_unit() diff --git a/base/serial/impl/psb_s_mat_impl.F90 b/base/serial/impl/psb_s_mat_impl.F90 index c5896765..c804e2dd 100644 --- a/base/serial/impl/psb_s_mat_impl.F90 +++ b/base/serial/impl/psb_s_mat_impl.F90 @@ -1918,6 +1918,7 @@ function psb_s_csnmi(a) result(res) character(len=20) :: name='csnmi' logical, parameter :: debug=.false. + info = psb_success_ call psb_get_erraction(err_act) if (.not.allocated(a%a)) then info = psb_err_invalid_mat_state_ @@ -1952,6 +1953,7 @@ subroutine psb_s_get_diag(a,d,info) character(len=20) :: name='get_diag' logical, parameter :: debug=.false. + info = psb_success_ call psb_erractionsave(err_act) if (.not.allocated(a%a)) then info = psb_err_invalid_mat_state_ @@ -1990,6 +1992,7 @@ subroutine psb_s_scal(d,a,info) character(len=20) :: name='scal' logical, parameter :: debug=.false. + info = psb_success_ call psb_erractionsave(err_act) if (.not.allocated(a%a)) then info = psb_err_invalid_mat_state_ @@ -2028,6 +2031,7 @@ subroutine psb_s_scals(d,a,info) character(len=20) :: name='scal' logical, parameter :: debug=.false. + info = psb_success_ call psb_erractionsave(err_act) if (.not.allocated(a%a)) then info = psb_err_invalid_mat_state_ diff --git a/base/serial/impl/psb_z_csr_impl.f90 b/base/serial/impl/psb_z_csr_impl.f90 index 5e044c4a..892e6f3c 100644 --- a/base/serial/impl/psb_z_csr_impl.f90 +++ b/base/serial/impl/psb_z_csr_impl.f90 @@ -2538,7 +2538,7 @@ subroutine psb_z_mv_csr_from_coo(a,b,info) Integer :: nza, nr, i,j,irw, err_act, nc Integer, Parameter :: maxtry=8 integer :: debug_level, debug_unit - character(len=20) :: name + character(len=20) :: name='mv_from_coo' info = psb_success_ debug_unit = psb_get_debug_unit() diff --git a/base/serial/impl/psb_z_mat_impl.F90 b/base/serial/impl/psb_z_mat_impl.F90 index 877d9013..66fb8d16 100644 --- a/base/serial/impl/psb_z_mat_impl.F90 +++ b/base/serial/impl/psb_z_mat_impl.F90 @@ -1918,6 +1918,7 @@ function psb_z_csnmi(a) result(res) character(len=20) :: name='csnmi' logical, parameter :: debug=.false. + info = psb_success_ call psb_get_erraction(err_act) if (.not.allocated(a%a)) then info = psb_err_invalid_mat_state_ @@ -1952,6 +1953,7 @@ subroutine psb_z_get_diag(a,d,info) character(len=20) :: name='get_diag' logical, parameter :: debug=.false. + info = psb_success_ call psb_erractionsave(err_act) if (.not.allocated(a%a)) then info = psb_err_invalid_mat_state_ @@ -1990,6 +1992,7 @@ subroutine psb_z_scal(d,a,info) character(len=20) :: name='scal' logical, parameter :: debug=.false. + info = psb_success_ call psb_erractionsave(err_act) if (.not.allocated(a%a)) then info = psb_err_invalid_mat_state_ @@ -2028,6 +2031,7 @@ subroutine psb_z_scals(d,a,info) character(len=20) :: name='scal' logical, parameter :: debug=.false. + info = psb_success_ call psb_erractionsave(err_act) if (.not.allocated(a%a)) then info = psb_err_invalid_mat_state_