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

Fixed linmap interface.

Browse Source
ILmat
Salvatore Filippone 8 years ago
parent 363fb97fd6
commit 7b4b8f8052
4 changed files with 20 additions and 60 deletions
Show Stats Download Patch File Download Diff File

20
base/modules/comm/psb_c_linmap_mod.f90
Unescape Escape View File

@ -38,8 +38,8 @@
module psb_c_linmap_mod
use psb_const_mod
use psb_c_mat_mod, only : psb_cspmat_type
use psb_desc_mod, only : psb_desc_type
use psb_c_mat_mod
use psb_desc_mod
use psb_base_linmap_mod
@ -118,13 +118,13 @@ module psb_c_linmap_mod
interface psb_linmap
function psb_c_linmap(map_kind,desc_X, desc_Y, map_X2Y, map_Y2X,iaggr,naggr)
use psb_c_mat_mod, only : psb_cspmat_type
import :: psb_ipk_, psb_clinmap_type, psb_desc_type
import :: psb_ipk_, psb_clinmap_type, psb_desc_type, psb_lpk_
implicit none
type(psb_clinmap_type) :: psb_c_linmap
type(psb_desc_type), target :: desc_X, desc_Y
type(psb_cspmat_type), intent(inout) :: map_X2Y, map_Y2X
integer(psb_ipk_), intent(in) :: map_kind
integer(psb_ipk_), intent(in), optional :: iaggr(:), naggr(:)
integer(psb_lpk_), intent(in), optional :: iaggr(:), naggr(:)
end function psb_c_linmap
end interface
@ -137,8 +137,6 @@ module psb_c_linmap_mod
contains
function c_map_sizeof(map) result(val)
use psb_desc_mod
use psb_c_mat_mod
implicit none
class(psb_clinmap_type), intent(in) :: map
integer(psb_epk_) :: val
@ -151,7 +149,6 @@ contains
function c_is_asb(map) result(val)
use psb_desc_mod
implicit none
class(psb_clinmap_type), intent(in) :: map
logical :: val
@ -163,8 +160,6 @@ contains
subroutine psb_c_map_cscnv(map,info,type,mold,imold)
use psb_i_vect_mod
use psb_c_mat_mod
implicit none
class(psb_clinmap_type), intent(inout) :: map
integer(psb_ipk_), intent(out) :: info
@ -185,20 +180,17 @@ contains
subroutine psb_c_linmap_sub(out_map,map_kind,desc_X, desc_Y,&
& map_X2Y, map_Y2X,iaggr,naggr)
use psb_c_mat_mod
implicit none
type(psb_clinmap_type), intent(out) :: out_map
type(psb_desc_type), target :: desc_X, desc_Y
type(psb_cspmat_type), intent(inout) :: map_X2Y, map_Y2X
integer(psb_ipk_), intent(in) :: map_kind
integer(psb_ipk_), intent(in), optional :: iaggr(:), naggr(:)
integer(psb_lpk_), intent(in), optional :: iaggr(:), naggr(:)
out_map = psb_linmap(map_kind,desc_X,desc_Y,map_X2Y,map_Y2X,iaggr,naggr)
end subroutine psb_c_linmap_sub
subroutine psb_clinmap_transfer(mapin,mapout,info)
use psb_realloc_mod
use psb_desc_mod
use psb_mat_mod, only : psb_move_alloc
implicit none
type(psb_clinmap_type) :: mapin,mapout
integer(psb_ipk_), intent(out) :: info
@ -211,7 +203,6 @@ contains
end subroutine psb_clinmap_transfer
subroutine c_free(map,info)
use psb_desc_mod
implicit none
class(psb_clinmap_type) :: map
integer(psb_ipk_), intent(out) :: info
@ -225,7 +216,6 @@ contains
subroutine c_clone(map,mapout,info)
use psb_desc_mod
use psb_error_mod
implicit none
class(psb_clinmap_type), intent(inout) :: map

20
base/modules/comm/psb_d_linmap_mod.f90
Unescape Escape View File

@ -38,8 +38,8 @@
module psb_d_linmap_mod
use psb_const_mod
use psb_d_mat_mod, only : psb_dspmat_type
use psb_desc_mod, only : psb_desc_type
use psb_d_mat_mod
use psb_desc_mod
use psb_base_linmap_mod
@ -118,13 +118,13 @@ module psb_d_linmap_mod
interface psb_linmap
function psb_d_linmap(map_kind,desc_X, desc_Y, map_X2Y, map_Y2X,iaggr,naggr)
use psb_d_mat_mod, only : psb_dspmat_type
import :: psb_ipk_, psb_dlinmap_type, psb_desc_type
import :: psb_ipk_, psb_dlinmap_type, psb_desc_type, psb_lpk_
implicit none
type(psb_dlinmap_type) :: psb_d_linmap
type(psb_desc_type), target :: desc_X, desc_Y
type(psb_dspmat_type), intent(inout) :: map_X2Y, map_Y2X
integer(psb_ipk_), intent(in) :: map_kind
integer(psb_ipk_), intent(in), optional :: iaggr(:), naggr(:)
integer(psb_lpk_), intent(in), optional :: iaggr(:), naggr(:)
end function psb_d_linmap
end interface
@ -137,8 +137,6 @@ module psb_d_linmap_mod
contains
function d_map_sizeof(map) result(val)
use psb_desc_mod
use psb_d_mat_mod
implicit none
class(psb_dlinmap_type), intent(in) :: map
integer(psb_epk_) :: val
@ -151,7 +149,6 @@ contains
function d_is_asb(map) result(val)
use psb_desc_mod
implicit none
class(psb_dlinmap_type), intent(in) :: map
logical :: val
@ -163,8 +160,6 @@ contains
subroutine psb_d_map_cscnv(map,info,type,mold,imold)
use psb_i_vect_mod
use psb_d_mat_mod
implicit none
class(psb_dlinmap_type), intent(inout) :: map
integer(psb_ipk_), intent(out) :: info
@ -185,20 +180,17 @@ contains
subroutine psb_d_linmap_sub(out_map,map_kind,desc_X, desc_Y,&
& map_X2Y, map_Y2X,iaggr,naggr)
use psb_d_mat_mod
implicit none
type(psb_dlinmap_type), intent(out) :: out_map
type(psb_desc_type), target :: desc_X, desc_Y
type(psb_dspmat_type), intent(inout) :: map_X2Y, map_Y2X
integer(psb_ipk_), intent(in) :: map_kind
integer(psb_ipk_), intent(in), optional :: iaggr(:), naggr(:)
integer(psb_lpk_), intent(in), optional :: iaggr(:), naggr(:)
out_map = psb_linmap(map_kind,desc_X,desc_Y,map_X2Y,map_Y2X,iaggr,naggr)
end subroutine psb_d_linmap_sub
subroutine psb_dlinmap_transfer(mapin,mapout,info)
use psb_realloc_mod
use psb_desc_mod
use psb_mat_mod, only : psb_move_alloc
implicit none
type(psb_dlinmap_type) :: mapin,mapout
integer(psb_ipk_), intent(out) :: info
@ -211,7 +203,6 @@ contains
end subroutine psb_dlinmap_transfer
subroutine d_free(map,info)
use psb_desc_mod
implicit none
class(psb_dlinmap_type) :: map
integer(psb_ipk_), intent(out) :: info
@ -225,7 +216,6 @@ contains
subroutine d_clone(map,mapout,info)
use psb_desc_mod
use psb_error_mod
implicit none
class(psb_dlinmap_type), intent(inout) :: map

20
base/modules/comm/psb_s_linmap_mod.f90
Unescape Escape View File

@ -38,8 +38,8 @@
module psb_s_linmap_mod
use psb_const_mod
use psb_s_mat_mod, only : psb_sspmat_type
use psb_desc_mod, only : psb_desc_type
use psb_s_mat_mod
use psb_desc_mod
use psb_base_linmap_mod
@ -118,13 +118,13 @@ module psb_s_linmap_mod
interface psb_linmap
function psb_s_linmap(map_kind,desc_X, desc_Y, map_X2Y, map_Y2X,iaggr,naggr)
use psb_s_mat_mod, only : psb_sspmat_type
import :: psb_ipk_, psb_slinmap_type, psb_desc_type
import :: psb_ipk_, psb_slinmap_type, psb_desc_type, psb_lpk_
implicit none
type(psb_slinmap_type) :: psb_s_linmap
type(psb_desc_type), target :: desc_X, desc_Y
type(psb_sspmat_type), intent(inout) :: map_X2Y, map_Y2X
integer(psb_ipk_), intent(in) :: map_kind
integer(psb_ipk_), intent(in), optional :: iaggr(:), naggr(:)
integer(psb_lpk_), intent(in), optional :: iaggr(:), naggr(:)
end function psb_s_linmap
end interface
@ -137,8 +137,6 @@ module psb_s_linmap_mod
contains
function s_map_sizeof(map) result(val)
use psb_desc_mod
use psb_s_mat_mod
implicit none
class(psb_slinmap_type), intent(in) :: map
integer(psb_epk_) :: val
@ -151,7 +149,6 @@ contains
function s_is_asb(map) result(val)
use psb_desc_mod
implicit none
class(psb_slinmap_type), intent(in) :: map
logical :: val
@ -163,8 +160,6 @@ contains
subroutine psb_s_map_cscnv(map,info,type,mold,imold)
use psb_i_vect_mod
use psb_s_mat_mod
implicit none
class(psb_slinmap_type), intent(inout) :: map
integer(psb_ipk_), intent(out) :: info
@ -185,20 +180,17 @@ contains
subroutine psb_s_linmap_sub(out_map,map_kind,desc_X, desc_Y,&
& map_X2Y, map_Y2X,iaggr,naggr)
use psb_s_mat_mod
implicit none
type(psb_slinmap_type), intent(out) :: out_map
type(psb_desc_type), target :: desc_X, desc_Y
type(psb_sspmat_type), intent(inout) :: map_X2Y, map_Y2X
integer(psb_ipk_), intent(in) :: map_kind
integer(psb_ipk_), intent(in), optional :: iaggr(:), naggr(:)
integer(psb_lpk_), intent(in), optional :: iaggr(:), naggr(:)
out_map = psb_linmap(map_kind,desc_X,desc_Y,map_X2Y,map_Y2X,iaggr,naggr)
end subroutine psb_s_linmap_sub
subroutine psb_slinmap_transfer(mapin,mapout,info)
use psb_realloc_mod
use psb_desc_mod
use psb_mat_mod, only : psb_move_alloc
implicit none
type(psb_slinmap_type) :: mapin,mapout
integer(psb_ipk_), intent(out) :: info
@ -211,7 +203,6 @@ contains
end subroutine psb_slinmap_transfer
subroutine s_free(map,info)
use psb_desc_mod
implicit none
class(psb_slinmap_type) :: map
integer(psb_ipk_), intent(out) :: info
@ -225,7 +216,6 @@ contains
subroutine s_clone(map,mapout,info)
use psb_desc_mod
use psb_error_mod
implicit none
class(psb_slinmap_type), intent(inout) :: map

20
base/modules/comm/psb_z_linmap_mod.f90
Unescape Escape View File

@ -38,8 +38,8 @@
module psb_z_linmap_mod
use psb_const_mod
use psb_z_mat_mod, only : psb_zspmat_type
use psb_desc_mod, only : psb_desc_type
use psb_z_mat_mod
use psb_desc_mod
use psb_base_linmap_mod
@ -118,13 +118,13 @@ module psb_z_linmap_mod
interface psb_linmap
function psb_z_linmap(map_kind,desc_X, desc_Y, map_X2Y, map_Y2X,iaggr,naggr)
use psb_z_mat_mod, only : psb_zspmat_type
import :: psb_ipk_, psb_zlinmap_type, psb_desc_type
import :: psb_ipk_, psb_zlinmap_type, psb_desc_type, psb_lpk_
implicit none
type(psb_zlinmap_type) :: psb_z_linmap
type(psb_desc_type), target :: desc_X, desc_Y
type(psb_zspmat_type), intent(inout) :: map_X2Y, map_Y2X
integer(psb_ipk_), intent(in) :: map_kind
integer(psb_ipk_), intent(in), optional :: iaggr(:), naggr(:)
integer(psb_lpk_), intent(in), optional :: iaggr(:), naggr(:)
end function psb_z_linmap
end interface
@ -137,8 +137,6 @@ module psb_z_linmap_mod
contains
function z_map_sizeof(map) result(val)
use psb_desc_mod
use psb_z_mat_mod
implicit none
class(psb_zlinmap_type), intent(in) :: map
integer(psb_epk_) :: val
@ -151,7 +149,6 @@ contains
function z_is_asb(map) result(val)
use psb_desc_mod
implicit none
class(psb_zlinmap_type), intent(in) :: map
logical :: val
@ -163,8 +160,6 @@ contains
subroutine psb_z_map_cscnv(map,info,type,mold,imold)
use psb_i_vect_mod
use psb_z_mat_mod
implicit none
class(psb_zlinmap_type), intent(inout) :: map
integer(psb_ipk_), intent(out) :: info
@ -185,20 +180,17 @@ contains
subroutine psb_z_linmap_sub(out_map,map_kind,desc_X, desc_Y,&
& map_X2Y, map_Y2X,iaggr,naggr)
use psb_z_mat_mod
implicit none
type(psb_zlinmap_type), intent(out) :: out_map
type(psb_desc_type), target :: desc_X, desc_Y
type(psb_zspmat_type), intent(inout) :: map_X2Y, map_Y2X
integer(psb_ipk_), intent(in) :: map_kind
integer(psb_ipk_), intent(in), optional :: iaggr(:), naggr(:)
integer(psb_lpk_), intent(in), optional :: iaggr(:), naggr(:)
out_map = psb_linmap(map_kind,desc_X,desc_Y,map_X2Y,map_Y2X,iaggr,naggr)
end subroutine psb_z_linmap_sub
subroutine psb_zlinmap_transfer(mapin,mapout,info)
use psb_realloc_mod
use psb_desc_mod
use psb_mat_mod, only : psb_move_alloc
implicit none
type(psb_zlinmap_type) :: mapin,mapout
integer(psb_ipk_), intent(out) :: info
@ -211,7 +203,6 @@ contains
end subroutine psb_zlinmap_transfer
subroutine z_free(map,info)
use psb_desc_mod
implicit none
class(psb_zlinmap_type) :: map
integer(psb_ipk_), intent(out) :: info
@ -225,7 +216,6 @@ contains
subroutine z_clone(map,mapout,info)
use psb_desc_mod
use psb_error_mod
implicit none
class(psb_zlinmap_type), intent(inout) :: map

Write Preview
Loading…
Cancel
Save