From 1d3eb5c24fa38f82b18f19891572f2a1ad6ca36f Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Mon, 30 Jan 2012 18:08:09 +0000 Subject: [PATCH] psblas3-integer8: psb_c_linmap_mod.f90 psb_d_linmap_mod.f90 psb_s_linmap_mod.f90 psb_z_linmap_mod.f90 Fixed warning. --- base/modules/psb_c_linmap_mod.f90 | 34 ++++++++++++++----------------- base/modules/psb_d_linmap_mod.f90 | 18 ++++++++-------- base/modules/psb_s_linmap_mod.f90 | 18 ++++++++-------- base/modules/psb_z_linmap_mod.f90 | 19 ++++++++--------- 4 files changed, 40 insertions(+), 49 deletions(-) diff --git a/base/modules/psb_c_linmap_mod.f90 b/base/modules/psb_c_linmap_mod.f90 index 27fda5ce..ac3aa62e 100644 --- a/base/modules/psb_c_linmap_mod.f90 +++ b/base/modules/psb_c_linmap_mod.f90 @@ -36,13 +36,13 @@ ! to different spaces. ! module psb_c_linmap_mod - + use psb_const_mod use psb_c_mat_mod, only : psb_cspmat_type use psb_descriptor_type, only : psb_desc_type use psb_base_linmap_mod - - + + type, extends(psb_base_linmap_type) :: psb_clinmap_type type(psb_cspmat_type) :: map_X2Y, map_Y2X contains @@ -54,8 +54,7 @@ module psb_c_linmap_mod interface psb_map_X2Y subroutine psb_c_map_X2Y(alpha,x,beta,y,map,info,work) - use psb_const_mod - import :: psb_clinmap_type + import :: psb_ipk_, psb_spk_, psb_clinmap_type implicit none type(psb_clinmap_type), intent(in) :: map complex(psb_spk_), intent(in) :: alpha,beta @@ -65,9 +64,8 @@ module psb_c_linmap_mod complex(psb_spk_), optional :: work(:) end subroutine psb_c_map_X2Y subroutine psb_c_map_X2Y_vect(alpha,x,beta,y,map,info,work) - use psb_const_mod - use psb_c_vect_mod - import :: psb_clinmap_type + use psb_c_vect_mod, only : psb_c_vect_type + import :: psb_ipk_, psb_spk_, psb_clinmap_type implicit none type(psb_clinmap_type), intent(in) :: map complex(psb_spk_), intent(in) :: alpha,beta @@ -75,12 +73,11 @@ module psb_c_linmap_mod integer(psb_ipk_), intent(out) :: info complex(psb_spk_), optional :: work(:) end subroutine psb_c_map_X2Y_vect - end interface psb_map_X2Y + end interface interface psb_map_Y2X subroutine psb_c_map_Y2X(alpha,x,beta,y,map,info,work) - use psb_const_mod - import :: psb_clinmap_type + import :: psb_ipk_, psb_spk_, psb_clinmap_type implicit none type(psb_clinmap_type), intent(in) :: map complex(psb_spk_), intent(in) :: alpha,beta @@ -90,9 +87,8 @@ module psb_c_linmap_mod complex(psb_spk_), optional :: work(:) end subroutine psb_c_map_Y2X subroutine psb_c_map_Y2X_vect(alpha,x,beta,y,map,info,work) - use psb_const_mod - use psb_c_vect_mod - import :: psb_clinmap_type + use psb_c_vect_mod, only : psb_c_vect_type + import :: psb_ipk_, psb_spk_, psb_clinmap_type implicit none type(psb_clinmap_type), intent(in) :: map complex(psb_spk_), intent(in) :: alpha,beta @@ -100,20 +96,20 @@ module psb_c_linmap_mod integer(psb_ipk_), intent(out) :: info complex(psb_spk_), optional :: work(:) end subroutine psb_c_map_Y2X_vect - end interface psb_map_Y2X + end interface interface psb_map_cscnv module procedure psb_c_map_cscnv - end interface psb_map_cscnv + end interface interface psb_linmap_sub module procedure psb_c_linmap_sub - end interface psb_linmap_sub + end interface interface psb_move_alloc module procedure psb_clinmap_transfer - end interface psb_move_alloc + end interface interface psb_linmap function psb_c_linmap(map_kind,desc_X, desc_Y, map_X2Y, map_Y2X,iaggr,naggr) @@ -126,7 +122,7 @@ module psb_c_linmap_mod integer(psb_ipk_), intent(in) :: map_kind integer(psb_ipk_), intent(in), optional :: iaggr(:), naggr(:) end function psb_c_linmap - end interface psb_linmap + end interface private :: c_map_sizeof, c_is_asb, c_free diff --git a/base/modules/psb_d_linmap_mod.f90 b/base/modules/psb_d_linmap_mod.f90 index cdae85b6..4c0364bc 100644 --- a/base/modules/psb_d_linmap_mod.f90 +++ b/base/modules/psb_d_linmap_mod.f90 @@ -54,8 +54,7 @@ module psb_d_linmap_mod interface psb_map_X2Y subroutine psb_d_map_X2Y(alpha,x,beta,y,map,info,work) - use psb_const_mod - import :: psb_dlinmap_type + import :: psb_ipk_, psb_dpk_, psb_dlinmap_type implicit none type(psb_dlinmap_type), intent(in) :: map real(psb_dpk_), intent(in) :: alpha,beta @@ -65,9 +64,8 @@ module psb_d_linmap_mod real(psb_dpk_), optional :: work(:) end subroutine psb_d_map_X2Y subroutine psb_d_map_X2Y_vect(alpha,x,beta,y,map,info,work) - use psb_const_mod - use psb_d_vect_mod - import :: psb_dlinmap_type + use psb_d_vect_mod, only : psb_d_vect_type + import :: psb_ipk_, psb_dpk_, psb_dlinmap_type implicit none type(psb_dlinmap_type), intent(in) :: map real(psb_dpk_), intent(in) :: alpha,beta @@ -79,8 +77,7 @@ module psb_d_linmap_mod interface psb_map_Y2X subroutine psb_d_map_Y2X(alpha,x,beta,y,map,info,work) - use psb_const_mod - import :: psb_dlinmap_type + import :: psb_ipk_, psb_dpk_, psb_dlinmap_type implicit none type(psb_dlinmap_type), intent(in) :: map real(psb_dpk_), intent(in) :: alpha,beta @@ -90,9 +87,8 @@ module psb_d_linmap_mod real(psb_dpk_), optional :: work(:) end subroutine psb_d_map_Y2X subroutine psb_d_map_Y2X_vect(alpha,x,beta,y,map,info,work) - use psb_const_mod - use psb_d_vect_mod - import :: psb_dlinmap_type + use psb_d_vect_mod, only : psb_d_vect_type + import :: psb_ipk_, psb_dpk_, psb_dlinmap_type implicit none type(psb_dlinmap_type), intent(in) :: map real(psb_dpk_), intent(in) :: alpha,beta @@ -132,6 +128,8 @@ module psb_d_linmap_mod + + contains function d_map_sizeof(map) result(val) diff --git a/base/modules/psb_s_linmap_mod.f90 b/base/modules/psb_s_linmap_mod.f90 index bbb420b0..e95b7c10 100644 --- a/base/modules/psb_s_linmap_mod.f90 +++ b/base/modules/psb_s_linmap_mod.f90 @@ -54,8 +54,7 @@ module psb_s_linmap_mod interface psb_map_X2Y subroutine psb_s_map_X2Y(alpha,x,beta,y,map,info,work) - use psb_const_mod - import :: psb_slinmap_type + import :: psb_ipk_, psb_spk_, psb_slinmap_type implicit none type(psb_slinmap_type), intent(in) :: map real(psb_spk_), intent(in) :: alpha,beta @@ -65,9 +64,8 @@ module psb_s_linmap_mod real(psb_spk_), optional :: work(:) end subroutine psb_s_map_X2Y subroutine psb_s_map_X2Y_vect(alpha,x,beta,y,map,info,work) - use psb_const_mod - use psb_s_vect_mod - import :: psb_slinmap_type + use psb_s_vect_mod, only : psb_s_vect_type + import :: psb_ipk_, psb_spk_, psb_slinmap_type implicit none type(psb_slinmap_type), intent(in) :: map real(psb_spk_), intent(in) :: alpha,beta @@ -79,8 +77,7 @@ module psb_s_linmap_mod interface psb_map_Y2X subroutine psb_s_map_Y2X(alpha,x,beta,y,map,info,work) - use psb_const_mod - import :: psb_slinmap_type + import :: psb_ipk_, psb_spk_, psb_slinmap_type implicit none type(psb_slinmap_type), intent(in) :: map real(psb_spk_), intent(in) :: alpha,beta @@ -90,9 +87,8 @@ module psb_s_linmap_mod real(psb_spk_), optional :: work(:) end subroutine psb_s_map_Y2X subroutine psb_s_map_Y2X_vect(alpha,x,beta,y,map,info,work) - use psb_const_mod - use psb_s_vect_mod - import :: psb_slinmap_type + use psb_s_vect_mod, only : psb_s_vect_type + import :: psb_ipk_, psb_spk_, psb_slinmap_type implicit none type(psb_slinmap_type), intent(in) :: map real(psb_spk_), intent(in) :: alpha,beta @@ -132,6 +128,8 @@ module psb_s_linmap_mod + + contains function s_map_sizeof(map) result(val) diff --git a/base/modules/psb_z_linmap_mod.f90 b/base/modules/psb_z_linmap_mod.f90 index 1d5b15ce..26d26013 100644 --- a/base/modules/psb_z_linmap_mod.f90 +++ b/base/modules/psb_z_linmap_mod.f90 @@ -54,8 +54,7 @@ module psb_z_linmap_mod interface psb_map_X2Y subroutine psb_z_map_X2Y(alpha,x,beta,y,map,info,work) - use psb_const_mod - import :: psb_zlinmap_type + import :: psb_ipk_, psb_dpk_, psb_zlinmap_type implicit none type(psb_zlinmap_type), intent(in) :: map complex(psb_dpk_), intent(in) :: alpha,beta @@ -65,9 +64,8 @@ module psb_z_linmap_mod complex(psb_dpk_), optional :: work(:) end subroutine psb_z_map_X2Y subroutine psb_z_map_X2Y_vect(alpha,x,beta,y,map,info,work) - use psb_const_mod - use psb_z_vect_mod - import :: psb_zlinmap_type + use psb_z_vect_mod, only : psb_z_vect_type + import :: psb_ipk_, psb_dpk_, psb_zlinmap_type implicit none type(psb_zlinmap_type), intent(in) :: map complex(psb_dpk_), intent(in) :: alpha,beta @@ -79,8 +77,7 @@ module psb_z_linmap_mod interface psb_map_Y2X subroutine psb_z_map_Y2X(alpha,x,beta,y,map,info,work) - use psb_const_mod - import :: psb_zlinmap_type + import :: psb_ipk_, psb_dpk_, psb_zlinmap_type implicit none type(psb_zlinmap_type), intent(in) :: map complex(psb_dpk_), intent(in) :: alpha,beta @@ -90,9 +87,8 @@ module psb_z_linmap_mod complex(psb_dpk_), optional :: work(:) end subroutine psb_z_map_Y2X subroutine psb_z_map_Y2X_vect(alpha,x,beta,y,map,info,work) - use psb_const_mod - use psb_z_vect_mod - import :: psb_zlinmap_type + use psb_z_vect_mod, only : psb_z_vect_type + import :: psb_ipk_, psb_dpk_, psb_zlinmap_type implicit none type(psb_zlinmap_type), intent(in) :: map complex(psb_dpk_), intent(in) :: alpha,beta @@ -131,6 +127,9 @@ module psb_z_linmap_mod private :: z_map_sizeof, z_is_asb, z_free + + + contains function z_map_sizeof(map) result(val)