base/modules/psb_c_base_mat_mod.f90
 base/modules/psb_c_csc_mat_mod.f90
 base/modules/psb_c_csr_mat_mod.f90
 base/modules/psb_c_mat_mod.f90
 base/modules/psb_d_base_mat_mod.f90
 base/modules/psb_d_csc_mat_mod.f90
 base/modules/psb_d_csr_mat_mod.f90
 base/modules/psb_d_mat_mod.f90
 base/modules/psb_s_base_mat_mod.f90
 base/modules/psb_s_csc_mat_mod.f90
 base/modules/psb_s_csr_mat_mod.f90
 base/modules/psb_s_mat_mod.f90
 base/modules/psb_z_base_mat_mod.f90
 base/modules/psb_z_csc_mat_mod.f90
 base/modules/psb_z_csr_mat_mod.f90
 base/modules/psb_z_mat_mod.f90
 base/psblas/psb_cnrmi.f90
 base/psblas/psb_cspsm.f90
 base/psblas/psb_dnrmi.f90
 base/psblas/psb_dspsm.f90
 base/psblas/psb_snrmi.f90
 base/psblas/psb_sspsm.f90
 base/psblas/psb_znrmi.f90
 base/psblas/psb_zspsm.f90
 base/serial/impl/psb_c_base_mat_impl.F90
 base/serial/impl/psb_c_mat_impl.F90
 base/serial/impl/psb_d_base_mat_impl.F90
 base/serial/impl/psb_d_mat_impl.F90
 base/serial/impl/psb_s_base_mat_impl.F90
 base/serial/impl/psb_s_mat_impl.F90
 base/serial/impl/psb_z_base_mat_impl.F90
 base/serial/impl/psb_z_mat_impl.F90



New internal names
This commit is contained in:
Salvatore Filippone
2013-02-26 16:48:08 +00:00
parent 764cf2d293
commit 92bbcf9fac
32 changed files with 764 additions and 764 deletions
+16 -16
View File
@@ -933,7 +933,7 @@ subroutine psb_z_base_cssm(alpha,a,x,beta,y,info,trans,scale,d)
end do
end if
if (info == psb_success_)&
& call a%inner_cssm(alpha,tmp,beta,y,info,trans)
& call a%inner_spsm(alpha,tmp,beta,y,info,trans)
if (info == psb_success_) then
deallocate(tmp,stat=info)
@@ -952,7 +952,7 @@ subroutine psb_z_base_cssm(alpha,a,x,beta,y,info,trans,scale,d)
allocate(tmp(nar,nc),stat=info)
if (info /= psb_success_) info = psb_err_alloc_dealloc_
if (info == psb_success_)&
& call a%inner_cssm(zone,x,zzero,tmp,info,trans)
& call a%inner_spsm(zone,x,zzero,tmp,info,trans)
if (info == psb_success_)then
do i=1, nar
@@ -975,7 +975,7 @@ subroutine psb_z_base_cssm(alpha,a,x,beta,y,info,trans,scale,d)
end if
else
! Scale is ignored in this case
call a%inner_cssm(alpha,x,beta,y,info,trans)
call a%inner_spsm(alpha,x,beta,y,info,trans)
end if
if (info /= psb_success_) then
@@ -1070,7 +1070,7 @@ subroutine psb_z_base_cssv(alpha,a,x,beta,y,info,trans,scale,d)
if (info /= psb_success_) info = psb_err_alloc_dealloc_
if (info == psb_success_) call inner_vscal(nac,d,x,tmp)
if (info == psb_success_)&
& call a%inner_cssm(alpha,tmp,beta,y,info,trans)
& call a%inner_spsm(alpha,tmp,beta,y,info,trans)
if (info == psb_success_) then
deallocate(tmp,stat=info)
@@ -1086,13 +1086,13 @@ subroutine psb_z_base_cssv(alpha,a,x,beta,y,info,trans,scale,d)
end if
if (beta == zzero) then
call a%inner_cssm(alpha,x,zzero,y,info,trans)
call a%inner_spsm(alpha,x,zzero,y,info,trans)
if (info == psb_success_) call inner_vscal1(nar,d,y)
else
allocate(tmp(nar),stat=info)
if (info /= psb_success_) info = psb_err_alloc_dealloc_
if (info == psb_success_)&
& call a%inner_cssm(alpha,x,zzero,tmp,info,trans)
& call a%inner_spsm(alpha,x,zzero,tmp,info,trans)
if (info == psb_success_) call inner_vscal1(nar,d,tmp)
if (info == psb_success_)&
@@ -1111,12 +1111,12 @@ subroutine psb_z_base_cssv(alpha,a,x,beta,y,info,trans,scale,d)
end if
else
! Scale is ignored in this case
call a%inner_cssm(alpha,x,beta,y,info,trans)
call a%inner_spsm(alpha,x,beta,y,info,trans)
end if
if (info /= psb_success_) then
info = psb_err_from_subroutine_
call psb_errpush(info,name, a_err='inner_cssm')
call psb_errpush(info,name, a_err='inner_spsm')
goto 9999
end if
@@ -1482,7 +1482,7 @@ subroutine psb_z_base_vect_mv(alpha,a,x,beta,y,info,trans)
! onto the normal routines.
call x%sync()
call y%sync()
call a%csmm(alpha,x%v,beta,y%v,info,trans)
call a%spmm(alpha,x%v,beta,y%v,info,trans)
call y%set_host()
end subroutine psb_z_base_vect_mv
@@ -1562,7 +1562,7 @@ subroutine psb_z_base_vect_cssv(alpha,a,x,beta,y,info,trans,scale,d)
if (info /= psb_success_) info = psb_err_alloc_dealloc_
if (info == psb_success_) call tmpv%mlt(zone,d%v(1:nac),x,zzero,info)
if (info == psb_success_)&
& call a%inner_cssm(alpha,tmpv,beta,y,info,trans)
& call a%inner_spsm(alpha,tmpv,beta,y,info,trans)
if (info == psb_success_) then
call tmpv%free(info)
@@ -1579,7 +1579,7 @@ subroutine psb_z_base_vect_cssv(alpha,a,x,beta,y,info,trans,scale,d)
end if
if (beta == zzero) then
call a%inner_cssm(alpha,x,zzero,y,info,trans)
call a%inner_spsm(alpha,x,zzero,y,info,trans)
if (info == psb_success_) call y%mlt(d%v(1:nar),info)
else
@@ -1590,7 +1590,7 @@ subroutine psb_z_base_vect_cssv(alpha,a,x,beta,y,info,trans,scale,d)
#endif
if (info /= psb_success_) info = psb_err_alloc_dealloc_
if (info == psb_success_)&
& call a%inner_cssm(alpha,x,zzero,tmpv,info,trans)
& call a%inner_spsm(alpha,x,zzero,tmpv,info,trans)
if (info == psb_success_) call tmpv%mlt(d%v(1:nar),info)
if (info == psb_success_)&
@@ -1610,12 +1610,12 @@ subroutine psb_z_base_vect_cssv(alpha,a,x,beta,y,info,trans,scale,d)
end if
else
! Scale is ignored in this case
call a%inner_cssm(alpha,x,beta,y,info,trans)
call a%inner_spsm(alpha,x,beta,y,info,trans)
end if
if (info /= psb_success_) then
info = psb_err_from_subroutine_
call psb_errpush(info,name, a_err='inner_cssm')
call psb_errpush(info,name, a_err='inner_spsm')
goto 9999
end if
@@ -1656,11 +1656,11 @@ subroutine psb_z_base_inner_vect_sv(alpha,a,x,beta,y,info,trans)
info = psb_success_
call psb_erractionsave(err_act)
call a%inner_cssm(alpha,x%v,beta,y%v,info,trans)
call a%inner_spsm(alpha,x%v,beta,y%v,info,trans)
if (info /= psb_success_) then
info = psb_err_from_subroutine_
call psb_errpush(info,name, a_err='inner_cssm')
call psb_errpush(info,name, a_err='inner_spsm')
goto 9999
end if