From 9971c24d2f325356d9d74f1cb4db7ea6cdda3706 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Tue, 25 Oct 2011 14:33:58 +0000 Subject: [PATCH] psblas3: base/serial/impl/psb_c_coo_impl.f90 base/serial/impl/psb_c_csr_impl.f90 base/serial/impl/psb_z_coo_impl.f90 base/serial/impl/psb_z_csr_impl.f90 Fixed wrong test for trans=C --- base/serial/impl/psb_c_coo_impl.f90 | 4 ++-- base/serial/impl/psb_c_csr_impl.f90 | 4 ++-- base/serial/impl/psb_z_coo_impl.f90 | 4 ++-- base/serial/impl/psb_z_csr_impl.f90 | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/base/serial/impl/psb_c_coo_impl.f90 b/base/serial/impl/psb_c_coo_impl.f90 index 1420301e..672d5be7 100644 --- a/base/serial/impl/psb_c_coo_impl.f90 +++ b/base/serial/impl/psb_c_coo_impl.f90 @@ -1203,7 +1203,7 @@ subroutine psb_c_coo_csmv(alpha,a,x,beta,y,info,trans) - if (tra) then + if (tra.or.ctra) then m = a%get_ncols() n = a%get_nrows() else @@ -1401,7 +1401,7 @@ subroutine psb_c_coo_csmm(alpha,a,x,beta,y,info,trans) ctra = (psb_toupper(trans_) == 'C') - if (tra) then + if (tra.or.ctra) then m = a%get_ncols() n = a%get_nrows() else diff --git a/base/serial/impl/psb_c_csr_impl.f90 b/base/serial/impl/psb_c_csr_impl.f90 index 8dbc797d..6966cf84 100644 --- a/base/serial/impl/psb_c_csr_impl.f90 +++ b/base/serial/impl/psb_c_csr_impl.f90 @@ -50,7 +50,7 @@ subroutine psb_c_csr_csmv(alpha,a,x,beta,y,info,trans) tra = (psb_toupper(trans_) == 'T') ctra = (psb_toupper(trans_) == 'C') - if (tra) then + if (tra.or.ctra) then m = a%get_ncols() n = a%get_nrows() else @@ -394,7 +394,7 @@ subroutine psb_c_csr_csmm(alpha,a,x,beta,y,info,trans) tra = (psb_toupper(trans_) == 'T') ctra = (psb_toupper(trans_) == 'C') - if (tra) then + if (tra.or.ctra) then m = a%get_ncols() n = a%get_nrows() else diff --git a/base/serial/impl/psb_z_coo_impl.f90 b/base/serial/impl/psb_z_coo_impl.f90 index 29229656..9c588f29 100644 --- a/base/serial/impl/psb_z_coo_impl.f90 +++ b/base/serial/impl/psb_z_coo_impl.f90 @@ -1203,7 +1203,7 @@ subroutine psb_z_coo_csmv(alpha,a,x,beta,y,info,trans) - if (tra) then + if (tra.or.ctra) then m = a%get_ncols() n = a%get_nrows() else @@ -1401,7 +1401,7 @@ subroutine psb_z_coo_csmm(alpha,a,x,beta,y,info,trans) ctra = (psb_toupper(trans_) == 'C') - if (tra) then + if (tra.or.ctra) then m = a%get_ncols() n = a%get_nrows() else diff --git a/base/serial/impl/psb_z_csr_impl.f90 b/base/serial/impl/psb_z_csr_impl.f90 index 75d7ff10..3e976936 100644 --- a/base/serial/impl/psb_z_csr_impl.f90 +++ b/base/serial/impl/psb_z_csr_impl.f90 @@ -51,7 +51,7 @@ subroutine psb_z_csr_csmv(alpha,a,x,beta,y,info,trans) tra = (psb_toupper(trans_) == 'T') ctra = (psb_toupper(trans_) == 'C') - if (tra) then + if (tra.or.ctra) then m = a%get_ncols() n = a%get_nrows() else @@ -395,7 +395,7 @@ subroutine psb_z_csr_csmm(alpha,a,x,beta,y,info,trans) tra = (psb_toupper(trans_) == 'T') ctra = (psb_toupper(trans_) == 'C') - if (tra) then + if (tra.or.ctra) then m = a%get_ncols() n = a%get_nrows() else