psblas-3.99:

base/internals/psi_crea_bnd_elem.f90
 base/internals/psi_crea_ovr_elem.f90
 base/internals/psi_fnd_owner.F90
 base/modules/psb_c_base_vect_mod.f90
 base/modules/psb_c_vect_mod.F90
 base/modules/psb_d_base_vect_mod.f90
 base/modules/psb_d_vect_mod.F90
 base/modules/psb_i_base_vect_mod.f90
 base/modules/psb_i_vect_mod.F90
 base/modules/psb_s_base_vect_mod.f90
 base/modules/psb_s_vect_mod.F90
 base/modules/psb_z_base_vect_mod.f90
 base/modules/psb_z_vect_mod.F90

Merged trunk fixes.
psblas-3.2.0
Salvatore Filippone 12 years ago
commit aa0b8d104d

@ -40,7 +40,8 @@
! process ! process
! idx(:) - integer Required indices on the calling process. ! idx(:) - integer Required indices on the calling process.
! Note: the indices should be unique! ! Note: the indices should be unique!
! iprc(:) - integer(psb_ipk_), allocatable Output: process identifiers for the corresponding ! iprc(:) - integer(psb_ipk_), allocatable Output: process identifiers for
! the corresponding
! indices ! indices
! desc_a - type(psb_desc_type). The communication descriptor. ! desc_a - type(psb_desc_type). The communication descriptor.
! info - integer. return code. ! info - integer. return code.

@ -98,6 +98,7 @@ module psb_c_base_vect_mod
! Basic info ! Basic info
procedure, pass(x) :: get_nrows => c_base_get_nrows procedure, pass(x) :: get_nrows => c_base_get_nrows
procedure, pass(x) :: sizeof => c_base_sizeof procedure, pass(x) :: sizeof => c_base_sizeof
procedure, nopass :: get_fmt => c_base_get_fmt
! !
! Set/get data from/to an external array; also ! Set/get data from/to an external array; also
! overload assignment. ! overload assignment.
@ -550,6 +551,18 @@ contains
end function c_base_sizeof end function c_base_sizeof
!
!> Function base_get_fmt
!! \memberof psb_c_base_vect_type
!! \brief Format
!!
!
function c_base_get_fmt() result(res)
implicit none
character(len=5) :: res
res = 'BASE'
end function c_base_get_fmt
! !
! !

@ -46,6 +46,7 @@ module psb_c_vect_mod
contains contains
procedure, pass(x) :: get_nrows => c_vect_get_nrows procedure, pass(x) :: get_nrows => c_vect_get_nrows
procedure, pass(x) :: sizeof => c_vect_sizeof procedure, pass(x) :: sizeof => c_vect_sizeof
procedure, pass(x) :: get_fmt => c_vect_get_fmt
procedure, pass(x) :: dot_v => c_vect_dot_v procedure, pass(x) :: dot_v => c_vect_dot_v
procedure, pass(x) :: dot_a => c_vect_dot_a procedure, pass(x) :: dot_a => c_vect_dot_a
generic, public :: dot => dot_v, dot_a generic, public :: dot => dot_v, dot_a
@ -217,6 +218,14 @@ contains
if (allocated(x%v)) res = x%v%sizeof() if (allocated(x%v)) res = x%v%sizeof()
end function c_vect_sizeof end function c_vect_sizeof
function c_vect_get_fmt(x) result(res)
implicit none
class(psb_c_vect_type), intent(in) :: x
character(len=5) :: res
res = 'NULL'
if (allocated(x%v)) res = x%v%get_fmt()
end function c_vect_get_fmt
function c_vect_dot_v(n,x,y) result(res) function c_vect_dot_v(n,x,y) result(res)
implicit none implicit none
class(psb_c_vect_type), intent(inout) :: x, y class(psb_c_vect_type), intent(inout) :: x, y

@ -98,6 +98,7 @@ module psb_d_base_vect_mod
! Basic info ! Basic info
procedure, pass(x) :: get_nrows => d_base_get_nrows procedure, pass(x) :: get_nrows => d_base_get_nrows
procedure, pass(x) :: sizeof => d_base_sizeof procedure, pass(x) :: sizeof => d_base_sizeof
procedure, nopass :: get_fmt => d_base_get_fmt
! !
! Set/get data from/to an external array; also ! Set/get data from/to an external array; also
! overload assignment. ! overload assignment.
@ -550,6 +551,18 @@ contains
end function d_base_sizeof end function d_base_sizeof
!
!> Function base_get_fmt
!! \memberof psb_d_base_vect_type
!! \brief Format
!!
!
function d_base_get_fmt() result(res)
implicit none
character(len=5) :: res
res = 'BASE'
end function d_base_get_fmt
! !
! !

@ -46,6 +46,7 @@ module psb_d_vect_mod
contains contains
procedure, pass(x) :: get_nrows => d_vect_get_nrows procedure, pass(x) :: get_nrows => d_vect_get_nrows
procedure, pass(x) :: sizeof => d_vect_sizeof procedure, pass(x) :: sizeof => d_vect_sizeof
procedure, pass(x) :: get_fmt => d_vect_get_fmt
procedure, pass(x) :: dot_v => d_vect_dot_v procedure, pass(x) :: dot_v => d_vect_dot_v
procedure, pass(x) :: dot_a => d_vect_dot_a procedure, pass(x) :: dot_a => d_vect_dot_a
generic, public :: dot => dot_v, dot_a generic, public :: dot => dot_v, dot_a
@ -217,6 +218,14 @@ contains
if (allocated(x%v)) res = x%v%sizeof() if (allocated(x%v)) res = x%v%sizeof()
end function d_vect_sizeof end function d_vect_sizeof
function d_vect_get_fmt(x) result(res)
implicit none
class(psb_d_vect_type), intent(in) :: x
character(len=5) :: res
res = 'NULL'
if (allocated(x%v)) res = x%v%get_fmt()
end function d_vect_get_fmt
function d_vect_dot_v(n,x,y) result(res) function d_vect_dot_v(n,x,y) result(res)
implicit none implicit none
class(psb_d_vect_type), intent(inout) :: x, y class(psb_d_vect_type), intent(inout) :: x, y

@ -98,6 +98,7 @@ module psb_i_base_vect_mod
! Basic info ! Basic info
procedure, pass(x) :: get_nrows => i_base_get_nrows procedure, pass(x) :: get_nrows => i_base_get_nrows
procedure, pass(x) :: sizeof => i_base_sizeof procedure, pass(x) :: sizeof => i_base_sizeof
procedure, nopass :: get_fmt => i_base_get_fmt
! !
! Set/get data from/to an external array; also ! Set/get data from/to an external array; also
! overload assignment. ! overload assignment.
@ -550,6 +551,18 @@ contains
end function i_base_sizeof end function i_base_sizeof
!
!> Function base_get_fmt
!! \memberof psb_i_base_vect_type
!! \brief Format
!!
!
function i_base_get_fmt() result(res)
implicit none
character(len=5) :: res
res = 'BASE'
end function i_base_get_fmt
! !
! !

@ -46,6 +46,7 @@ module psb_i_vect_mod
contains contains
procedure, pass(x) :: get_nrows => i_vect_get_nrows procedure, pass(x) :: get_nrows => i_vect_get_nrows
procedure, pass(x) :: sizeof => i_vect_sizeof procedure, pass(x) :: sizeof => i_vect_sizeof
procedure, pass(x) :: get_fmt => i_vect_get_fmt
procedure, pass(x) :: dot_v => i_vect_dot_v procedure, pass(x) :: dot_v => i_vect_dot_v
procedure, pass(x) :: dot_a => i_vect_dot_a procedure, pass(x) :: dot_a => i_vect_dot_a
generic, public :: dot => dot_v, dot_a generic, public :: dot => dot_v, dot_a
@ -217,6 +218,14 @@ contains
if (allocated(x%v)) res = x%v%sizeof() if (allocated(x%v)) res = x%v%sizeof()
end function i_vect_sizeof end function i_vect_sizeof
function i_vect_get_fmt(x) result(res)
implicit none
class(psb_i_vect_type), intent(in) :: x
character(len=5) :: res
res = 'NULL'
if (allocated(x%v)) res = x%v%get_fmt()
end function i_vect_get_fmt
function i_vect_dot_v(n,x,y) result(res) function i_vect_dot_v(n,x,y) result(res)
implicit none implicit none
class(psb_i_vect_type), intent(inout) :: x, y class(psb_i_vect_type), intent(inout) :: x, y

@ -98,6 +98,7 @@ module psb_s_base_vect_mod
! Basic info ! Basic info
procedure, pass(x) :: get_nrows => s_base_get_nrows procedure, pass(x) :: get_nrows => s_base_get_nrows
procedure, pass(x) :: sizeof => s_base_sizeof procedure, pass(x) :: sizeof => s_base_sizeof
procedure, nopass :: get_fmt => s_base_get_fmt
! !
! Set/get data from/to an external array; also ! Set/get data from/to an external array; also
! overload assignment. ! overload assignment.
@ -550,6 +551,18 @@ contains
end function s_base_sizeof end function s_base_sizeof
!
!> Function base_get_fmt
!! \memberof psb_s_base_vect_type
!! \brief Format
!!
!
function s_base_get_fmt() result(res)
implicit none
character(len=5) :: res
res = 'BASE'
end function s_base_get_fmt
! !
! !

@ -46,6 +46,7 @@ module psb_s_vect_mod
contains contains
procedure, pass(x) :: get_nrows => s_vect_get_nrows procedure, pass(x) :: get_nrows => s_vect_get_nrows
procedure, pass(x) :: sizeof => s_vect_sizeof procedure, pass(x) :: sizeof => s_vect_sizeof
procedure, pass(x) :: get_fmt => s_vect_get_fmt
procedure, pass(x) :: dot_v => s_vect_dot_v procedure, pass(x) :: dot_v => s_vect_dot_v
procedure, pass(x) :: dot_a => s_vect_dot_a procedure, pass(x) :: dot_a => s_vect_dot_a
generic, public :: dot => dot_v, dot_a generic, public :: dot => dot_v, dot_a
@ -217,6 +218,14 @@ contains
if (allocated(x%v)) res = x%v%sizeof() if (allocated(x%v)) res = x%v%sizeof()
end function s_vect_sizeof end function s_vect_sizeof
function s_vect_get_fmt(x) result(res)
implicit none
class(psb_s_vect_type), intent(in) :: x
character(len=5) :: res
res = 'NULL'
if (allocated(x%v)) res = x%v%get_fmt()
end function s_vect_get_fmt
function s_vect_dot_v(n,x,y) result(res) function s_vect_dot_v(n,x,y) result(res)
implicit none implicit none
class(psb_s_vect_type), intent(inout) :: x, y class(psb_s_vect_type), intent(inout) :: x, y

@ -98,6 +98,7 @@ module psb_z_base_vect_mod
! Basic info ! Basic info
procedure, pass(x) :: get_nrows => z_base_get_nrows procedure, pass(x) :: get_nrows => z_base_get_nrows
procedure, pass(x) :: sizeof => z_base_sizeof procedure, pass(x) :: sizeof => z_base_sizeof
procedure, nopass :: get_fmt => z_base_get_fmt
! !
! Set/get data from/to an external array; also ! Set/get data from/to an external array; also
! overload assignment. ! overload assignment.
@ -550,6 +551,18 @@ contains
end function z_base_sizeof end function z_base_sizeof
!
!> Function base_get_fmt
!! \memberof psb_z_base_vect_type
!! \brief Format
!!
!
function z_base_get_fmt() result(res)
implicit none
character(len=5) :: res
res = 'BASE'
end function z_base_get_fmt
! !
! !

@ -46,6 +46,7 @@ module psb_z_vect_mod
contains contains
procedure, pass(x) :: get_nrows => z_vect_get_nrows procedure, pass(x) :: get_nrows => z_vect_get_nrows
procedure, pass(x) :: sizeof => z_vect_sizeof procedure, pass(x) :: sizeof => z_vect_sizeof
procedure, pass(x) :: get_fmt => z_vect_get_fmt
procedure, pass(x) :: dot_v => z_vect_dot_v procedure, pass(x) :: dot_v => z_vect_dot_v
procedure, pass(x) :: dot_a => z_vect_dot_a procedure, pass(x) :: dot_a => z_vect_dot_a
generic, public :: dot => dot_v, dot_a generic, public :: dot => dot_v, dot_a
@ -217,6 +218,14 @@ contains
if (allocated(x%v)) res = x%v%sizeof() if (allocated(x%v)) res = x%v%sizeof()
end function z_vect_sizeof end function z_vect_sizeof
function z_vect_get_fmt(x) result(res)
implicit none
class(psb_z_vect_type), intent(in) :: x
character(len=5) :: res
res = 'NULL'
if (allocated(x%v)) res = x%v%get_fmt()
end function z_vect_get_fmt
function z_vect_dot_v(n,x,y) result(res) function z_vect_dot_v(n,x,y) result(res)
implicit none implicit none
class(psb_z_vect_type), intent(inout) :: x, y class(psb_z_vect_type), intent(inout) :: x, y

Loading…
Cancel
Save