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
11 years ago · 5b0d8b24a2
parent c42aa65e47
commit 5b0d8b24a2
8 changed files with 12 additions and 4 deletions
--- 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()
--- 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_
--- 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()
--- 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_
--- 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()
--- 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_
--- 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()
--- 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_