fdurastante/psblas3
1
0
Fork 0
mirror of https://github.com/sfilippone/psblas3.git synced 2026-10-06 22:55:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

psblas3:

Browse Source 
psb_c_base_mat_impl.F90
 psb_d_base_mat_impl.F90
 psb_s_base_mat_impl.F90
 psb_z_base_mat_impl.F90

Further fixes for conditional compilation on MOLD. Step 2.
This commit is contained in:
Salvatore Filippone
2012-05-18 10:26:51 +00:00
parent 338d153ea5
commit 19cb363501
4 changed files with 36 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
base/serial/impl/psb_c_base_mat_impl.F90
+9 -4
View File
@@ -1554,9 +1554,11 @@ subroutine psb_c_base_vect_cssv(alpha,a,x,beta,y,info,trans,scale,d)
call psb_errpush(info,name,i_err=ierr)
goto 9999
end if
#ifdef HAVE_MOLD
allocate(tmpv, mold=y,stat=info)
! allocate(tmp(nac),stat=info)
#else
call y%mold(tmpv,info)
#endif
if (info /= psb_success_) info = psb_err_alloc_dealloc_
if (info == psb_success_) call tmpv%mlt(cone,d%v(1:nac),x,czero,info)
if (info == psb_success_)&
@@ -1579,10 +1581,13 @@ subroutine psb_c_base_vect_cssv(alpha,a,x,beta,y,info,trans,scale,d)
if (beta == czero) then
call a%inner_cssm(alpha,x,czero,y,info,trans)
if (info == psb_success_) call y%mlt(d%v(1:nar),info)
!!$ if (info == psb_success_) call inner_vscal1(nar,d,y)
else
! allocate(tmp(nar),stat=info)
#ifdef HAVE_MOLD
allocate(tmpv, mold=y,stat=info)
#else
call y%mold(tmpv,info)
#endif
if (info /= psb_success_) info = psb_err_alloc_dealloc_
if (info == psb_success_)&
& call a%inner_cssm(alpha,x,czero,tmpv,info,trans)
base/serial/impl/psb_d_base_mat_impl.F90
+9 -4
View File
@@ -1554,9 +1554,11 @@ subroutine psb_d_base_vect_cssv(alpha,a,x,beta,y,info,trans,scale,d)
call psb_errpush(info,name,i_err=ierr)
goto 9999
end if
#ifdef HAVE_MOLD
allocate(tmpv, mold=y,stat=info)
! allocate(tmp(nac),stat=info)
#else
call y%mold(tmpv,info)
#endif
if (info /= psb_success_) info = psb_err_alloc_dealloc_
if (info == psb_success_) call tmpv%mlt(done,d%v(1:nac),x,dzero,info)
if (info == psb_success_)&
@@ -1579,10 +1581,13 @@ subroutine psb_d_base_vect_cssv(alpha,a,x,beta,y,info,trans,scale,d)
if (beta == dzero) then
call a%inner_cssm(alpha,x,dzero,y,info,trans)
if (info == psb_success_) call y%mlt(d%v(1:nar),info)
!!$ if (info == psb_success_) call inner_vscal1(nar,d,y)
else
! allocate(tmp(nar),stat=info)
#ifdef HAVE_MOLD
allocate(tmpv, mold=y,stat=info)
#else
call y%mold(tmpv,info)
#endif
if (info /= psb_success_) info = psb_err_alloc_dealloc_
if (info == psb_success_)&
& call a%inner_cssm(alpha,x,dzero,tmpv,info,trans)
base/serial/impl/psb_s_base_mat_impl.F90
+9 -4
View File
@@ -1554,9 +1554,11 @@ subroutine psb_s_base_vect_cssv(alpha,a,x,beta,y,info,trans,scale,d)
call psb_errpush(info,name,i_err=ierr)
goto 9999
end if
#ifdef HAVE_MOLD
allocate(tmpv, mold=y,stat=info)
! allocate(tmp(nac),stat=info)
#else
call y%mold(tmpv,info)
#endif
if (info /= psb_success_) info = psb_err_alloc_dealloc_
if (info == psb_success_) call tmpv%mlt(sone,d%v(1:nac),x,szero,info)
if (info == psb_success_)&
@@ -1579,10 +1581,13 @@ subroutine psb_s_base_vect_cssv(alpha,a,x,beta,y,info,trans,scale,d)
if (beta == szero) then
call a%inner_cssm(alpha,x,szero,y,info,trans)
if (info == psb_success_) call y%mlt(d%v(1:nar),info)
!!$ if (info == psb_success_) call inner_vscal1(nar,d,y)
else
! allocate(tmp(nar),stat=info)
#ifdef HAVE_MOLD
allocate(tmpv, mold=y,stat=info)
#else
call y%mold(tmpv,info)
#endif
if (info /= psb_success_) info = psb_err_alloc_dealloc_
if (info == psb_success_)&
& call a%inner_cssm(alpha,x,szero,tmpv,info,trans)
base/serial/impl/psb_z_base_mat_impl.F90
+9 -4
View File
@@ -1554,9 +1554,11 @@ subroutine psb_z_base_vect_cssv(alpha,a,x,beta,y,info,trans,scale,d)
call psb_errpush(info,name,i_err=ierr)
goto 9999
end if
#ifdef HAVE_MOLD
allocate(tmpv, mold=y,stat=info)
! allocate(tmp(nac),stat=info)
#else
call y%mold(tmpv,info)
#endif
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_)&
@@ -1579,10 +1581,13 @@ subroutine psb_z_base_vect_cssv(alpha,a,x,beta,y,info,trans,scale,d)
if (beta == zzero) then
call a%inner_cssm(alpha,x,zzero,y,info,trans)
if (info == psb_success_) call y%mlt(d%v(1:nar),info)
!!$ if (info == psb_success_) call inner_vscal1(nar,d,y)
else
! allocate(tmp(nar),stat=info)
#ifdef HAVE_MOLD
allocate(tmpv, mold=y,stat=info)
#else
call y%mold(tmpv,info)
#endif
if (info /= psb_success_) info = psb_err_alloc_dealloc_
if (info == psb_success_)&
& call a%inner_cssm(alpha,x,zzero,tmpv,info,trans)