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

Corrected bug in interfaces for genrm2

Browse Source
newG2L
Cirdans-Home 4 years ago
parent 8221658f3e
commit 3e6fdd39e4
8 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File

6
base/modules/psblas/psb_c_psblas_mod.F90
Unescape Escape View File

@ -296,7 +296,7 @@ module psb_c_psblas_mod
integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(out) :: info
logical, intent(in), optional :: global logical, intent(in), optional :: global
end function psb_cnrm2_vect end function psb_cnrm2_vect
function psb_cnrm2_weight_vect(x,w, desc_a, info,global) result(res) function psb_cnrm2_weight_vect(x,w, desc_a, info, global, aux) result(res)
import :: psb_desc_type, psb_spk_, psb_ipk_, & import :: psb_desc_type, psb_spk_, psb_ipk_, &
& psb_c_vect_type, psb_cspmat_type & psb_c_vect_type, psb_cspmat_type
real(psb_spk_) :: res real(psb_spk_) :: res
@ -305,8 +305,9 @@ module psb_c_psblas_mod
type(psb_desc_type), intent (in) :: desc_a type(psb_desc_type), intent (in) :: desc_a
integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(out) :: info
logical, intent(in), optional :: global logical, intent(in), optional :: global
type(psb_c_vect_type), intent (inout), optional :: aux
end function psb_cnrm2_weight_vect end function psb_cnrm2_weight_vect
function psb_cnrm2_weightmask_vect(x,w,idv, desc_a, info,global) result(res) function psb_cnrm2_weightmask_vect(x,w,idv, desc_a, info, global, aux) result(res)
import :: psb_desc_type, psb_spk_, psb_ipk_, & import :: psb_desc_type, psb_spk_, psb_ipk_, &
& psb_c_vect_type, psb_cspmat_type & psb_c_vect_type, psb_cspmat_type
real(psb_spk_) :: res real(psb_spk_) :: res
@ -316,6 +317,7 @@ module psb_c_psblas_mod
type(psb_desc_type), intent (in) :: desc_a type(psb_desc_type), intent (in) :: desc_a
integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(out) :: info
logical, intent(in), optional :: global logical, intent(in), optional :: global
type(psb_c_vect_type), intent (inout), optional :: aux
end function psb_cnrm2_weightmask_vect end function psb_cnrm2_weightmask_vect
end interface end interface

6
base/modules/psblas/psb_d_psblas_mod.F90
Unescape Escape View File

@ -307,7 +307,7 @@ module psb_d_psblas_mod
integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(out) :: info
logical, intent(in), optional :: global logical, intent(in), optional :: global
end function psb_dnrm2_vect end function psb_dnrm2_vect
function psb_dnrm2_weight_vect(x,w, desc_a, info,global) result(res) function psb_dnrm2_weight_vect(x,w, desc_a, info, global, aux) result(res)
import :: psb_desc_type, psb_dpk_, psb_ipk_, & import :: psb_desc_type, psb_dpk_, psb_ipk_, &
& psb_d_vect_type, psb_dspmat_type & psb_d_vect_type, psb_dspmat_type
real(psb_dpk_) :: res real(psb_dpk_) :: res
@ -316,8 +316,9 @@ module psb_d_psblas_mod
type(psb_desc_type), intent (in) :: desc_a type(psb_desc_type), intent (in) :: desc_a
integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(out) :: info
logical, intent(in), optional :: global logical, intent(in), optional :: global
type(psb_d_vect_type), intent (inout), optional :: aux
end function psb_dnrm2_weight_vect end function psb_dnrm2_weight_vect
function psb_dnrm2_weightmask_vect(x,w,idv, desc_a, info,global) result(res) function psb_dnrm2_weightmask_vect(x,w,idv, desc_a, info, global, aux) result(res)
import :: psb_desc_type, psb_dpk_, psb_ipk_, & import :: psb_desc_type, psb_dpk_, psb_ipk_, &
& psb_d_vect_type, psb_dspmat_type & psb_d_vect_type, psb_dspmat_type
real(psb_dpk_) :: res real(psb_dpk_) :: res
@ -327,6 +328,7 @@ module psb_d_psblas_mod
type(psb_desc_type), intent (in) :: desc_a type(psb_desc_type), intent (in) :: desc_a
integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(out) :: info
logical, intent(in), optional :: global logical, intent(in), optional :: global
type(psb_d_vect_type), intent (inout), optional :: aux
end function psb_dnrm2_weightmask_vect end function psb_dnrm2_weightmask_vect
end interface end interface

6
base/modules/psblas/psb_s_psblas_mod.F90
Unescape Escape View File

@ -307,7 +307,7 @@ module psb_s_psblas_mod
integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(out) :: info
logical, intent(in), optional :: global logical, intent(in), optional :: global
end function psb_snrm2_vect end function psb_snrm2_vect
function psb_snrm2_weight_vect(x,w, desc_a, info,global) result(res) function psb_snrm2_weight_vect(x,w, desc_a, info, global, aux) result(res)
import :: psb_desc_type, psb_spk_, psb_ipk_, & import :: psb_desc_type, psb_spk_, psb_ipk_, &
& psb_s_vect_type, psb_sspmat_type & psb_s_vect_type, psb_sspmat_type
real(psb_spk_) :: res real(psb_spk_) :: res
@ -316,8 +316,9 @@ module psb_s_psblas_mod
type(psb_desc_type), intent (in) :: desc_a type(psb_desc_type), intent (in) :: desc_a
integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(out) :: info
logical, intent(in), optional :: global logical, intent(in), optional :: global
type(psb_s_vect_type), intent (inout), optional :: aux
end function psb_snrm2_weight_vect end function psb_snrm2_weight_vect
function psb_snrm2_weightmask_vect(x,w,idv, desc_a, info,global) result(res) function psb_snrm2_weightmask_vect(x,w,idv, desc_a, info, global, aux) result(res)
import :: psb_desc_type, psb_spk_, psb_ipk_, & import :: psb_desc_type, psb_spk_, psb_ipk_, &
& psb_s_vect_type, psb_sspmat_type & psb_s_vect_type, psb_sspmat_type
real(psb_spk_) :: res real(psb_spk_) :: res
@ -327,6 +328,7 @@ module psb_s_psblas_mod
type(psb_desc_type), intent (in) :: desc_a type(psb_desc_type), intent (in) :: desc_a
integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(out) :: info
logical, intent(in), optional :: global logical, intent(in), optional :: global
type(psb_s_vect_type), intent (inout), optional :: aux
end function psb_snrm2_weightmask_vect end function psb_snrm2_weightmask_vect
end interface end interface

6
base/modules/psblas/psb_z_psblas_mod.F90
Unescape Escape View File

@ -296,7 +296,7 @@ module psb_z_psblas_mod
integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(out) :: info
logical, intent(in), optional :: global logical, intent(in), optional :: global
end function psb_znrm2_vect end function psb_znrm2_vect
function psb_znrm2_weight_vect(x,w, desc_a, info,global) result(res) function psb_znrm2_weight_vect(x,w, desc_a, info, global, aux) result(res)
import :: psb_desc_type, psb_dpk_, psb_ipk_, & import :: psb_desc_type, psb_dpk_, psb_ipk_, &
& psb_z_vect_type, psb_zspmat_type & psb_z_vect_type, psb_zspmat_type
real(psb_dpk_) :: res real(psb_dpk_) :: res
@ -305,8 +305,9 @@ module psb_z_psblas_mod
type(psb_desc_type), intent (in) :: desc_a type(psb_desc_type), intent (in) :: desc_a
integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(out) :: info
logical, intent(in), optional :: global logical, intent(in), optional :: global
type(psb_z_vect_type), intent (inout), optional :: aux
end function psb_znrm2_weight_vect end function psb_znrm2_weight_vect
function psb_znrm2_weightmask_vect(x,w,idv, desc_a, info,global) result(res) function psb_znrm2_weightmask_vect(x,w,idv, desc_a, info, global, aux) result(res)
import :: psb_desc_type, psb_dpk_, psb_ipk_, & import :: psb_desc_type, psb_dpk_, psb_ipk_, &
& psb_z_vect_type, psb_zspmat_type & psb_z_vect_type, psb_zspmat_type
real(psb_dpk_) :: res real(psb_dpk_) :: res
@ -316,6 +317,7 @@ module psb_z_psblas_mod
type(psb_desc_type), intent (in) :: desc_a type(psb_desc_type), intent (in) :: desc_a
integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(out) :: info
logical, intent(in), optional :: global logical, intent(in), optional :: global
type(psb_z_vect_type), intent (inout), optional :: aux
end function psb_znrm2_weightmask_vect end function psb_znrm2_weightmask_vect
end interface end interface

2
base/modules/serial/psb_c_vect_mod.F90
Unescape Escape View File

@ -1033,7 +1033,7 @@ contains
! Temp vectors ! Temp vectors
type(psb_c_vect_type) :: wtemp type(psb_c_vect_type) :: wtemp
info = 0 info = 0
if( allocated(w%v) ) then if( allocated(w%v) ) then
if (.not.present(aux)) then if (.not.present(aux)) then
allocate(wtemp%v, mold=w%v) allocate(wtemp%v, mold=w%v)

2
base/modules/serial/psb_d_vect_mod.F90
Unescape Escape View File

@ -1040,7 +1040,7 @@ contains
! Temp vectors ! Temp vectors
type(psb_d_vect_type) :: wtemp type(psb_d_vect_type) :: wtemp
info = 0 info = 0
if( allocated(w%v) ) then if( allocated(w%v) ) then
if (.not.present(aux)) then if (.not.present(aux)) then
allocate(wtemp%v, mold=w%v) allocate(wtemp%v, mold=w%v)

2
base/modules/serial/psb_s_vect_mod.F90
Unescape Escape View File

@ -1040,7 +1040,7 @@ contains
! Temp vectors ! Temp vectors
type(psb_s_vect_type) :: wtemp type(psb_s_vect_type) :: wtemp
info = 0 info = 0
if( allocated(w%v) ) then if( allocated(w%v) ) then
if (.not.present(aux)) then if (.not.present(aux)) then
allocate(wtemp%v, mold=w%v) allocate(wtemp%v, mold=w%v)

2
base/modules/serial/psb_z_vect_mod.F90
Unescape Escape View File

@ -1033,7 +1033,7 @@ contains
! Temp vectors ! Temp vectors
type(psb_z_vect_type) :: wtemp type(psb_z_vect_type) :: wtemp
info = 0 info = 0
if( allocated(w%v) ) then if( allocated(w%v) ) then
if (.not.present(aux)) then if (.not.present(aux)) then
allocate(wtemp%v, mold=w%v) allocate(wtemp%v, mold=w%v)

Write Preview
Loading…
Cancel
Save