From 5b0d8b24a28a9a5212221dce31725e705a2bedb6 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Wed, 9 Oct 2013 17:29:32 +0000 Subject: [PATCH] psblas-399: 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 Fixed silly bug --- base/serial/impl/psb_c_base_mat_impl.F90 | 2 ++ base/serial/impl/psb_c_mat_impl.F90 | 2 +- base/serial/impl/psb_d_base_mat_impl.F90 | 2 ++ base/serial/impl/psb_d_mat_impl.F90 | 2 +- base/serial/impl/psb_s_base_mat_impl.F90 | 2 ++ base/serial/impl/psb_s_mat_impl.F90 | 2 +- base/serial/impl/psb_z_base_mat_impl.F90 | 2 ++ base/serial/impl/psb_z_mat_impl.F90 | 2 +- 8 files changed, 12 insertions(+), 4 deletions(-) diff --git a/base/serial/impl/psb_c_base_mat_impl.F90 b/base/serial/impl/psb_c_base_mat_impl.F90 index aeb62e10..3f4b0ee0 100644 --- a/base/serial/impl/psb_c_base_mat_impl.F90 +++ b/base/serial/impl/psb_c_base_mat_impl.F90 @@ -636,6 +636,7 @@ subroutine psb_c_base_tril(a,b,info,& & nzin=nzin) if (info /= psb_success_) goto 9999 call b%set_nzeros(nzin+nzout) + nzin = nzin+nzout end do call b%fix(info) nzout = b%get_nzeros() @@ -745,6 +746,7 @@ subroutine psb_c_base_triu(a,b,info,& & nzin=nzin) if (info /= psb_success_) goto 9999 call b%set_nzeros(nzin+nzout) + nzin = nzin+nzout end do call b%fix(info) nzout = b%get_nzeros() diff --git a/base/serial/impl/psb_c_mat_impl.F90 b/base/serial/impl/psb_c_mat_impl.F90 index 2d927bfa..55fbb02d 100644 --- a/base/serial/impl/psb_c_mat_impl.F90 +++ b/base/serial/impl/psb_c_mat_impl.F90 @@ -1025,7 +1025,7 @@ subroutine psb_c_triu(a,b,info,diag,imin,imax,& allocate(acoo,stat=info) if (info == psb_success_) then - call a%a%tril(acoo,info,diag,imin,imax,& + call a%a%triu(acoo,info,diag,imin,imax,& & jmin,jmax,rscale,cscale) else info = psb_err_alloc_dealloc_ diff --git a/base/serial/impl/psb_d_base_mat_impl.F90 b/base/serial/impl/psb_d_base_mat_impl.F90 index 9f8507c3..707fae98 100644 --- a/base/serial/impl/psb_d_base_mat_impl.F90 +++ b/base/serial/impl/psb_d_base_mat_impl.F90 @@ -636,6 +636,7 @@ subroutine psb_d_base_tril(a,b,info,& & nzin=nzin) if (info /= psb_success_) goto 9999 call b%set_nzeros(nzin+nzout) + nzin = nzin+nzout end do call b%fix(info) nzout = b%get_nzeros() @@ -745,6 +746,7 @@ subroutine psb_d_base_triu(a,b,info,& & nzin=nzin) if (info /= psb_success_) goto 9999 call b%set_nzeros(nzin+nzout) + nzin = nzin+nzout end do call b%fix(info) nzout = b%get_nzeros() diff --git a/base/serial/impl/psb_d_mat_impl.F90 b/base/serial/impl/psb_d_mat_impl.F90 index 848f6fa9..b675735a 100644 --- a/base/serial/impl/psb_d_mat_impl.F90 +++ b/base/serial/impl/psb_d_mat_impl.F90 @@ -1025,7 +1025,7 @@ subroutine psb_d_triu(a,b,info,diag,imin,imax,& allocate(acoo,stat=info) if (info == psb_success_) then - call a%a%tril(acoo,info,diag,imin,imax,& + call a%a%triu(acoo,info,diag,imin,imax,& & jmin,jmax,rscale,cscale) else info = psb_err_alloc_dealloc_ diff --git a/base/serial/impl/psb_s_base_mat_impl.F90 b/base/serial/impl/psb_s_base_mat_impl.F90 index 32193ab3..d5843ddb 100644 --- a/base/serial/impl/psb_s_base_mat_impl.F90 +++ b/base/serial/impl/psb_s_base_mat_impl.F90 @@ -636,6 +636,7 @@ subroutine psb_s_base_tril(a,b,info,& & nzin=nzin) if (info /= psb_success_) goto 9999 call b%set_nzeros(nzin+nzout) + nzin = nzin+nzout end do call b%fix(info) nzout = b%get_nzeros() @@ -745,6 +746,7 @@ subroutine psb_s_base_triu(a,b,info,& & nzin=nzin) if (info /= psb_success_) goto 9999 call b%set_nzeros(nzin+nzout) + nzin = nzin+nzout end do call b%fix(info) nzout = b%get_nzeros() diff --git a/base/serial/impl/psb_s_mat_impl.F90 b/base/serial/impl/psb_s_mat_impl.F90 index 3f8e72ac..67dd27e8 100644 --- a/base/serial/impl/psb_s_mat_impl.F90 +++ b/base/serial/impl/psb_s_mat_impl.F90 @@ -1025,7 +1025,7 @@ subroutine psb_s_triu(a,b,info,diag,imin,imax,& allocate(acoo,stat=info) if (info == psb_success_) then - call a%a%tril(acoo,info,diag,imin,imax,& + call a%a%triu(acoo,info,diag,imin,imax,& & jmin,jmax,rscale,cscale) else info = psb_err_alloc_dealloc_ diff --git a/base/serial/impl/psb_z_base_mat_impl.F90 b/base/serial/impl/psb_z_base_mat_impl.F90 index e5607f50..7a5119ed 100644 --- a/base/serial/impl/psb_z_base_mat_impl.F90 +++ b/base/serial/impl/psb_z_base_mat_impl.F90 @@ -636,6 +636,7 @@ subroutine psb_z_base_tril(a,b,info,& & nzin=nzin) if (info /= psb_success_) goto 9999 call b%set_nzeros(nzin+nzout) + nzin = nzin+nzout end do call b%fix(info) nzout = b%get_nzeros() @@ -745,6 +746,7 @@ subroutine psb_z_base_triu(a,b,info,& & nzin=nzin) if (info /= psb_success_) goto 9999 call b%set_nzeros(nzin+nzout) + nzin = nzin+nzout end do call b%fix(info) nzout = b%get_nzeros() diff --git a/base/serial/impl/psb_z_mat_impl.F90 b/base/serial/impl/psb_z_mat_impl.F90 index cebd933d..83a757ca 100644 --- a/base/serial/impl/psb_z_mat_impl.F90 +++ b/base/serial/impl/psb_z_mat_impl.F90 @@ -1025,7 +1025,7 @@ subroutine psb_z_triu(a,b,info,diag,imin,imax,& allocate(acoo,stat=info) if (info == psb_success_) then - call a%a%tril(acoo,info,diag,imin,imax,& + call a%a%triu(acoo,info,diag,imin,imax,& & jmin,jmax,rscale,cscale) else info = psb_err_alloc_dealloc_