psblas3-pattern:

Merged trunk changes.
psblas3-pattern
Salvatore Filippone 10 years ago
commit 04ae640c83

@ -1752,9 +1752,9 @@ contains
class(psb_c_coo_sparse_mat), intent(in) :: a
integer(psb_long_int_k_) :: res
res = 8 + 1
res = res + (2*psb_sizeof_sp) * size(a%val)
res = res + psb_sizeof_int * size(a%ia)
res = res + psb_sizeof_int * size(a%ja)
res = res + (2*psb_sizeof_sp) * psb_size(a%val)
res = res + psb_sizeof_int * psb_size(a%ia)
res = res + psb_sizeof_int * psb_size(a%ja)
end function c_coo_sizeof

@ -521,9 +521,9 @@ contains
class(psb_c_csc_sparse_mat), intent(in) :: a
integer(psb_long_int_k_) :: res
res = 8
res = res + (2*psb_sizeof_sp) * size(a%val)
res = res + psb_sizeof_int * size(a%icp)
res = res + psb_sizeof_int * size(a%ia)
res = res + (2*psb_sizeof_sp) * psb_size(a%val)
res = res + psb_sizeof_int * psb_size(a%icp)
res = res + psb_sizeof_int * psb_size(a%ia)
end function c_csc_sizeof

@ -526,9 +526,9 @@ contains
class(psb_c_csr_sparse_mat), intent(in) :: a
integer(psb_long_int_k_) :: res
res = 8
res = res + (2*psb_sizeof_sp) * size(a%val)
res = res + psb_sizeof_int * size(a%irp)
res = res + psb_sizeof_int * size(a%ja)
res = res + (2*psb_sizeof_sp) * psb_size(a%val)
res = res + psb_sizeof_int * psb_size(a%irp)
res = res + psb_sizeof_int * psb_size(a%ja)
end function c_csr_sizeof

@ -1752,9 +1752,9 @@ contains
class(psb_d_coo_sparse_mat), intent(in) :: a
integer(psb_long_int_k_) :: res
res = 8 + 1
res = res + psb_sizeof_dp * size(a%val)
res = res + psb_sizeof_int * size(a%ia)
res = res + psb_sizeof_int * size(a%ja)
res = res + psb_sizeof_dp * psb_size(a%val)
res = res + psb_sizeof_int * psb_size(a%ia)
res = res + psb_sizeof_int * psb_size(a%ja)
end function d_coo_sizeof

@ -521,9 +521,9 @@ contains
class(psb_d_csc_sparse_mat), intent(in) :: a
integer(psb_long_int_k_) :: res
res = 8
res = res + psb_sizeof_dp * size(a%val)
res = res + psb_sizeof_int * size(a%icp)
res = res + psb_sizeof_int * size(a%ia)
res = res + psb_sizeof_dp * psb_size(a%val)
res = res + psb_sizeof_int * psb_size(a%icp)
res = res + psb_sizeof_int * psb_size(a%ia)
end function d_csc_sizeof

@ -526,9 +526,9 @@ contains
class(psb_d_csr_sparse_mat), intent(in) :: a
integer(psb_long_int_k_) :: res
res = 8
res = res + psb_sizeof_dp * size(a%val)
res = res + psb_sizeof_int * size(a%irp)
res = res + psb_sizeof_int * size(a%ja)
res = res + psb_sizeof_dp * psb_size(a%val)
res = res + psb_sizeof_int * psb_size(a%irp)
res = res + psb_sizeof_int * psb_size(a%ja)
end function d_csr_sizeof

@ -1752,9 +1752,9 @@ contains
class(psb_s_coo_sparse_mat), intent(in) :: a
integer(psb_long_int_k_) :: res
res = 8 + 1
res = res + psb_sizeof_sp * size(a%val)
res = res + psb_sizeof_int * size(a%ia)
res = res + psb_sizeof_int * size(a%ja)
res = res + psb_sizeof_sp * psb_size(a%val)
res = res + psb_sizeof_int * psb_size(a%ia)
res = res + psb_sizeof_int * psb_size(a%ja)
end function s_coo_sizeof

@ -521,9 +521,9 @@ contains
class(psb_s_csc_sparse_mat), intent(in) :: a
integer(psb_long_int_k_) :: res
res = 8
res = res + psb_sizeof_sp * size(a%val)
res = res + psb_sizeof_int * size(a%icp)
res = res + psb_sizeof_int * size(a%ia)
res = res + psb_sizeof_sp * psb_size(a%val)
res = res + psb_sizeof_int * psb_size(a%icp)
res = res + psb_sizeof_int * psb_size(a%ia)
end function s_csc_sizeof

@ -526,9 +526,9 @@ contains
class(psb_s_csr_sparse_mat), intent(in) :: a
integer(psb_long_int_k_) :: res
res = 8
res = res + psb_sizeof_sp * size(a%val)
res = res + psb_sizeof_int * size(a%irp)
res = res + psb_sizeof_int * size(a%ja)
res = res + psb_sizeof_sp * psb_size(a%val)
res = res + psb_sizeof_int * psb_size(a%irp)
res = res + psb_sizeof_int * psb_size(a%ja)
end function s_csr_sizeof

@ -1752,9 +1752,9 @@ contains
class(psb_z_coo_sparse_mat), intent(in) :: a
integer(psb_long_int_k_) :: res
res = 8 + 1
res = res + (2*psb_sizeof_dp) * size(a%val)
res = res + psb_sizeof_int * size(a%ia)
res = res + psb_sizeof_int * size(a%ja)
res = res + (2*psb_sizeof_dp) * psb_size(a%val)
res = res + psb_sizeof_int * psb_size(a%ia)
res = res + psb_sizeof_int * psb_size(a%ja)
end function z_coo_sizeof

@ -521,9 +521,9 @@ contains
class(psb_z_csc_sparse_mat), intent(in) :: a
integer(psb_long_int_k_) :: res
res = 8
res = res + (2*psb_sizeof_dp) * size(a%val)
res = res + psb_sizeof_int * size(a%icp)
res = res + psb_sizeof_int * size(a%ia)
res = res + (2*psb_sizeof_dp) * psb_size(a%val)
res = res + psb_sizeof_int * psb_size(a%icp)
res = res + psb_sizeof_int * psb_size(a%ia)
end function z_csc_sizeof

@ -526,9 +526,9 @@ contains
class(psb_z_csr_sparse_mat), intent(in) :: a
integer(psb_long_int_k_) :: res
res = 8
res = res + (2*psb_sizeof_dp) * size(a%val)
res = res + psb_sizeof_int * size(a%irp)
res = res + psb_sizeof_int * size(a%ja)
res = res + (2*psb_sizeof_dp) * psb_size(a%val)
res = res + psb_sizeof_int * psb_size(a%irp)
res = res + psb_sizeof_int * psb_size(a%ja)
end function z_csr_sizeof

@ -269,12 +269,8 @@ subroutine psb_cgcr_vect(a,prec,b,x,eps,desc_a,info,&
goto 9999
end if
call psb_init_conv(methdname,istop_,itrace_,itmax_,a,b,eps,desc_a,stopdat,info)
! if (info /= psb_success_) Then
! call psb_errpush(psb_err_from_subroutine_non_,name)
! goto 9999
! End If
if (psb_check_conv(methdname,itx,x,r,desc_a,stopdat,info)) exit restart
nrst = nrst + 1
iteration: do

@ -269,12 +269,8 @@ subroutine psb_dgcr_vect(a,prec,b,x,eps,desc_a,info,&
goto 9999
end if
call psb_init_conv(methdname,istop_,itrace_,itmax_,a,b,eps,desc_a,stopdat,info)
! if (info /= psb_success_) Then
! call psb_errpush(psb_err_from_subroutine_non_,name)
! goto 9999
! End If
if (psb_check_conv(methdname,itx,x,r,desc_a,stopdat,info)) exit restart
nrst = nrst + 1
iteration: do

@ -269,12 +269,8 @@ subroutine psb_sgcr_vect(a,prec,b,x,eps,desc_a,info,&
goto 9999
end if
call psb_init_conv(methdname,istop_,itrace_,itmax_,a,b,eps,desc_a,stopdat,info)
! if (info /= psb_success_) Then
! call psb_errpush(psb_err_from_subroutine_non_,name)
! goto 9999
! End If
if (psb_check_conv(methdname,itx,x,r,desc_a,stopdat,info)) exit restart
nrst = nrst + 1
iteration: do

@ -269,12 +269,8 @@ subroutine psb_zgcr_vect(a,prec,b,x,eps,desc_a,info,&
goto 9999
end if
call psb_init_conv(methdname,istop_,itrace_,itmax_,a,b,eps,desc_a,stopdat,info)
! if (info /= psb_success_) Then
! call psb_errpush(psb_err_from_subroutine_non_,name)
! goto 9999
! End If
if (psb_check_conv(methdname,itx,x,r,desc_a,stopdat,info)) exit restart
nrst = nrst + 1
iteration: do

Loading…
Cancel
Save