From d5827395cad1335d33a46784abadcd4138281f97 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Thu, 1 Aug 2013 10:16:03 +0000 Subject: [PATCH] psblas3: 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 Defined get_fmt for vectors, header changes in base/internals. --- base/internals/psi_crea_bnd_elem.f90 | 2 +- base/internals/psi_crea_ovr_elem.f90 | 2 +- base/internals/psi_fnd_owner.F90 | 3 ++- base/modules/psb_c_base_vect_mod.f90 | 15 ++++++++++++++- base/modules/psb_c_vect_mod.F90 | 9 +++++++++ base/modules/psb_d_base_vect_mod.f90 | 15 ++++++++++++++- base/modules/psb_d_vect_mod.F90 | 9 +++++++++ base/modules/psb_i_base_vect_mod.f90 | 15 ++++++++++++++- base/modules/psb_i_vect_mod.F90 | 9 +++++++++ base/modules/psb_s_base_vect_mod.f90 | 15 ++++++++++++++- base/modules/psb_s_vect_mod.F90 | 9 +++++++++ base/modules/psb_z_base_vect_mod.f90 | 15 ++++++++++++++- base/modules/psb_z_vect_mod.F90 | 9 +++++++++ 13 files changed, 119 insertions(+), 8 deletions(-) diff --git a/base/internals/psi_crea_bnd_elem.f90 b/base/internals/psi_crea_bnd_elem.f90 index 9511880a..2acfb5bf 100644 --- a/base/internals/psi_crea_bnd_elem.f90 +++ b/base/internals/psi_crea_bnd_elem.f90 @@ -39,7 +39,7 @@ ! current (calling) process. ! ! Arguments: -! bndel(:) - integer(psb_ipk_), allocatable Array containing the output list +! bndel(:) - integer(psb_ipk_), allocatable Array containing the output list ! desc_a - type(psb_desc_type). The communication descriptor. ! info - integer. return code. ! diff --git a/base/internals/psi_crea_ovr_elem.f90 b/base/internals/psi_crea_ovr_elem.f90 index bba78574..b6191fa5 100644 --- a/base/internals/psi_crea_ovr_elem.f90 +++ b/base/internals/psi_crea_ovr_elem.f90 @@ -38,7 +38,7 @@ ! See also description in base/modules/psb_desc_type.f90 ! ! Arguments: -! ovr_elem(:,:) - integer(psb_ipk_), allocatable Array containing the output list +! ovr_elem(:,:) - integer(psb_ipk_), allocatable Array containing the output list ! desc_a - type(psb_desc_type). The communication descriptor. ! info - integer. return code. ! diff --git a/base/internals/psi_fnd_owner.F90 b/base/internals/psi_fnd_owner.F90 index 97f046b8..f1f2c9bf 100644 --- a/base/internals/psi_fnd_owner.F90 +++ b/base/internals/psi_fnd_owner.F90 @@ -40,7 +40,8 @@ ! process ! idx(:) - integer Required indices on the calling process. ! 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 ! desc_a - type(psb_desc_type). The communication descriptor. ! info - integer. return code. diff --git a/base/modules/psb_c_base_vect_mod.f90 b/base/modules/psb_c_base_vect_mod.f90 index b04385e3..321fd01e 100644 --- a/base/modules/psb_c_base_vect_mod.f90 +++ b/base/modules/psb_c_base_vect_mod.f90 @@ -97,7 +97,8 @@ module psb_c_base_vect_mod ! ! Basic info 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 ! overload assignment. @@ -550,7 +551,19 @@ contains 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 + ! ! ! diff --git a/base/modules/psb_c_vect_mod.F90 b/base/modules/psb_c_vect_mod.F90 index 3b8031d9..231a9b33 100644 --- a/base/modules/psb_c_vect_mod.F90 +++ b/base/modules/psb_c_vect_mod.F90 @@ -46,6 +46,7 @@ module psb_c_vect_mod contains procedure, pass(x) :: get_nrows => c_vect_get_nrows 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_a => c_vect_dot_a generic, public :: dot => dot_v, dot_a @@ -217,6 +218,14 @@ contains if (allocated(x%v)) res = x%v%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) implicit none class(psb_c_vect_type), intent(inout) :: x, y diff --git a/base/modules/psb_d_base_vect_mod.f90 b/base/modules/psb_d_base_vect_mod.f90 index b3b452b4..d39ab97c 100644 --- a/base/modules/psb_d_base_vect_mod.f90 +++ b/base/modules/psb_d_base_vect_mod.f90 @@ -97,7 +97,8 @@ module psb_d_base_vect_mod ! ! Basic info 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 ! overload assignment. @@ -550,7 +551,19 @@ contains 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 + ! ! ! diff --git a/base/modules/psb_d_vect_mod.F90 b/base/modules/psb_d_vect_mod.F90 index 1f18a431..afd19c29 100644 --- a/base/modules/psb_d_vect_mod.F90 +++ b/base/modules/psb_d_vect_mod.F90 @@ -46,6 +46,7 @@ module psb_d_vect_mod contains procedure, pass(x) :: get_nrows => d_vect_get_nrows 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_a => d_vect_dot_a generic, public :: dot => dot_v, dot_a @@ -217,6 +218,14 @@ contains if (allocated(x%v)) res = x%v%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) implicit none class(psb_d_vect_type), intent(inout) :: x, y diff --git a/base/modules/psb_i_base_vect_mod.f90 b/base/modules/psb_i_base_vect_mod.f90 index 4ab54e81..07b1fa53 100644 --- a/base/modules/psb_i_base_vect_mod.f90 +++ b/base/modules/psb_i_base_vect_mod.f90 @@ -97,7 +97,8 @@ module psb_i_base_vect_mod ! ! Basic info 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 ! overload assignment. @@ -550,7 +551,19 @@ contains 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 + ! ! ! diff --git a/base/modules/psb_i_vect_mod.F90 b/base/modules/psb_i_vect_mod.F90 index f8ecb1fa..38a9a49c 100644 --- a/base/modules/psb_i_vect_mod.F90 +++ b/base/modules/psb_i_vect_mod.F90 @@ -46,6 +46,7 @@ module psb_i_vect_mod contains procedure, pass(x) :: get_nrows => i_vect_get_nrows 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_a => i_vect_dot_a generic, public :: dot => dot_v, dot_a @@ -217,6 +218,14 @@ contains if (allocated(x%v)) res = x%v%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) implicit none class(psb_i_vect_type), intent(inout) :: x, y diff --git a/base/modules/psb_s_base_vect_mod.f90 b/base/modules/psb_s_base_vect_mod.f90 index 6c354836..506a75a2 100644 --- a/base/modules/psb_s_base_vect_mod.f90 +++ b/base/modules/psb_s_base_vect_mod.f90 @@ -97,7 +97,8 @@ module psb_s_base_vect_mod ! ! Basic info 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 ! overload assignment. @@ -550,7 +551,19 @@ contains 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 + ! ! ! diff --git a/base/modules/psb_s_vect_mod.F90 b/base/modules/psb_s_vect_mod.F90 index 98dbce34..29d7ca08 100644 --- a/base/modules/psb_s_vect_mod.F90 +++ b/base/modules/psb_s_vect_mod.F90 @@ -46,6 +46,7 @@ module psb_s_vect_mod contains procedure, pass(x) :: get_nrows => s_vect_get_nrows 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_a => s_vect_dot_a generic, public :: dot => dot_v, dot_a @@ -217,6 +218,14 @@ contains if (allocated(x%v)) res = x%v%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) implicit none class(psb_s_vect_type), intent(inout) :: x, y diff --git a/base/modules/psb_z_base_vect_mod.f90 b/base/modules/psb_z_base_vect_mod.f90 index b2fe55a7..7b84d47b 100644 --- a/base/modules/psb_z_base_vect_mod.f90 +++ b/base/modules/psb_z_base_vect_mod.f90 @@ -97,7 +97,8 @@ module psb_z_base_vect_mod ! ! Basic info 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 ! overload assignment. @@ -550,7 +551,19 @@ contains 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 + ! ! ! diff --git a/base/modules/psb_z_vect_mod.F90 b/base/modules/psb_z_vect_mod.F90 index 5592c9d3..1d84cd95 100644 --- a/base/modules/psb_z_vect_mod.F90 +++ b/base/modules/psb_z_vect_mod.F90 @@ -46,6 +46,7 @@ module psb_z_vect_mod contains procedure, pass(x) :: get_nrows => z_vect_get_nrows 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_a => z_vect_dot_a generic, public :: dot => dot_v, dot_a @@ -217,6 +218,14 @@ contains if (allocated(x%v)) res = x%v%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) implicit none class(psb_z_vect_type), intent(inout) :: x, y