psblas-3.99

Fixes for integer vecors in DESC (even inside maps)
This commit is contained in:
Salvatore Filippone
2013-08-31 15:23:22 +00:00
parent 7a175dd859
commit 641e933716
11 changed files with 69 additions and 45 deletions
+7 -1
View File
@@ -159,17 +159,23 @@ contains
end function c_is_asb
subroutine psb_c_map_cscnv(map,info,type,mold)
subroutine psb_c_map_cscnv(map,info,type,mold,imold)
use psb_i_vect_mod
use psb_c_mat_mod
implicit none
type(psb_clinmap_type), intent(inout) :: map
integer(psb_ipk_), intent(out) :: info
character(len=*), intent(in), optional :: type
class(psb_c_base_sparse_mat), intent(in), optional :: mold
class(psb_i_base_vect_type), intent(in), optional :: imold
call map%map_X2Y%cscnv(info,type=type,mold=mold)
if (info == psb_success_)&
& call map%map_Y2X%cscnv(info,type=type,mold=mold)
if (present(imold)) then
call map%desc_X%cnv(mold=imold)
call map%desc_Y%cnv(mold=imold)
end if
end subroutine psb_c_map_cscnv
-1
View File
@@ -564,7 +564,6 @@ contains
class(psb_c_vect_type), intent(inout) :: x
class(psb_c_base_vect_type), intent(in) :: mold
class(psb_c_base_vect_type), allocatable :: tmp
complex(psb_spk_), allocatable :: invect(:)
integer(psb_ipk_) :: info
#ifdef HAVE_MOLD
+7 -1
View File
@@ -159,17 +159,23 @@ contains
end function s_is_asb
subroutine psb_s_map_cscnv(map,info,type,mold)
subroutine psb_s_map_cscnv(map,info,type,mold,imold)
use psb_i_vect_mod
use psb_s_mat_mod
implicit none
type(psb_slinmap_type), intent(inout) :: map
integer(psb_ipk_), intent(out) :: info
character(len=*), intent(in), optional :: type
class(psb_s_base_sparse_mat), intent(in), optional :: mold
class(psb_i_base_vect_type), intent(in), optional :: imold
call map%map_X2Y%cscnv(info,type=type,mold=mold)
if (info == psb_success_)&
& call map%map_Y2X%cscnv(info,type=type,mold=mold)
if (present(imold)) then
call map%desc_X%cnv(mold=imold)
call map%desc_Y%cnv(mold=imold)
end if
end subroutine psb_s_map_cscnv
-1
View File
@@ -564,7 +564,6 @@ contains
class(psb_s_vect_type), intent(inout) :: x
class(psb_s_base_vect_type), intent(in) :: mold
class(psb_s_base_vect_type), allocatable :: tmp
real(psb_spk_), allocatable :: invect(:)
integer(psb_ipk_) :: info
#ifdef HAVE_MOLD
+7 -1
View File
@@ -159,17 +159,23 @@ contains
end function z_is_asb
subroutine psb_z_map_cscnv(map,info,type,mold)
subroutine psb_z_map_cscnv(map,info,type,mold,imold)
use psb_i_vect_mod
use psb_z_mat_mod
implicit none
type(psb_zlinmap_type), intent(inout) :: map
integer(psb_ipk_), intent(out) :: info
character(len=*), intent(in), optional :: type
class(psb_z_base_sparse_mat), intent(in), optional :: mold
class(psb_i_base_vect_type), intent(in), optional :: imold
call map%map_X2Y%cscnv(info,type=type,mold=mold)
if (info == psb_success_)&
& call map%map_Y2X%cscnv(info,type=type,mold=mold)
if (present(imold)) then
call map%desc_X%cnv(mold=imold)
call map%desc_Y%cnv(mold=imold)
end if
end subroutine psb_z_map_cscnv
-1
View File
@@ -564,7 +564,6 @@ contains
class(psb_z_vect_type), intent(inout) :: x
class(psb_z_base_vect_type), intent(in) :: mold
class(psb_z_base_vect_type), allocatable :: tmp
complex(psb_dpk_), allocatable :: invect(:)
integer(psb_ipk_) :: info
#ifdef HAVE_MOLD