From 7d8a6bd486b72c50d9b9e38d871cd0c90b119ca7 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Fri, 28 Aug 2009 11:36:50 +0000 Subject: [PATCH] psblas3: Reworked CSR, take 3. But still waiting for the second NAG bugfix. --- base/newserial/psbn_d_csr_impl.f03 | 2 +- base/newserial/psbn_d_csr_mat_mod.f03 | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/base/newserial/psbn_d_csr_impl.f03 b/base/newserial/psbn_d_csr_impl.f03 index b6439cb0..a78dc13c 100644 --- a/base/newserial/psbn_d_csr_impl.f03 +++ b/base/newserial/psbn_d_csr_impl.f03 @@ -937,7 +937,7 @@ subroutine d_csr_csins_impl(nz,val,ia,ja,a,imin,imax,jmin,jmax,info,gtl) use psb_realloc_mod use psbn_d_csr_mat_mod, psb_protect_name => d_csr_csins_impl - class(psbn_d_coo_sparse_mat), intent(inout) :: a + class(psbn_d_csr_sparse_mat), intent(inout) :: a real(psb_dpk_), intent(in) :: val(:) integer, intent(in) :: nz, ia(:), ja(:), imin,imax,jmin,jmax integer, intent(out) :: info diff --git a/base/newserial/psbn_d_csr_mat_mod.f03 b/base/newserial/psbn_d_csr_mat_mod.f03 index 70c3f3d1..275e65e1 100644 --- a/base/newserial/psbn_d_csr_mat_mod.f03 +++ b/base/newserial/psbn_d_csr_mat_mod.f03 @@ -30,6 +30,7 @@ module psbn_d_csr_mat_mod interface subroutine d_csr_to_coo_impl(a,b,info) use psb_const_mod + use psbn_d_base_mat_mod import psbn_d_csr_sparse_mat class(psbn_d_csr_sparse_mat), intent(in) :: a class(psbn_d_coo_sparse_mat), intent(out) :: b @@ -40,6 +41,7 @@ module psbn_d_csr_mat_mod interface subroutine d_csr_from_coo_impl(a,b,info) use psb_const_mod + use psbn_d_base_mat_mod import psbn_d_csr_sparse_mat class(psbn_d_csr_sparse_mat), intent(inout) :: a class(psbn_d_coo_sparse_mat), intent(in) :: b @@ -503,9 +505,9 @@ contains if (info == 0) call psb_realloc(nz,a%ja,info) if (info == 0) call psb_realloc(nz,a%val,info) if (info == 0) then + a%irp=0 call a%set_nrows(m) call a%set_ncols(n) - call a%set_nzeros(0) call a%set_bld() call a%set_triangle(.false.) end if