From dbfedeebb540de49f2ded3793e60aa04d9733171 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Fri, 18 Jan 2019 09:02:07 +0000 Subject: [PATCH] Out from MMIO read in COO. --- util/psb_c_mmio_impl.f90 | 3 --- util/psb_d_mmio_impl.f90 | 1 - util/psb_s_mmio_impl.f90 | 2 -- util/psb_z_mmio_impl.f90 | 3 --- 4 files changed, 9 deletions(-) diff --git a/util/psb_c_mmio_impl.f90 b/util/psb_c_mmio_impl.f90 index e2f0ac60..91bcd947 100644 --- a/util/psb_c_mmio_impl.f90 +++ b/util/psb_c_mmio_impl.f90 @@ -346,7 +346,6 @@ subroutine cmm_mat_read(a, info, iunit, filename) call acoo%fix(info) call a%mv_from(acoo) - call a%cscnv(ircode,type='csr') else if ((psb_tolower(type) == 'complex').and.(psb_tolower(sym) == 'symmetric')) then ! we are generally working with non-symmetric matrices, so @@ -369,7 +368,6 @@ subroutine cmm_mat_read(a, info, iunit, filename) call acoo%fix(info) call a%mv_from(acoo) - call a%cscnv(ircode,type='csr') else if ((psb_tolower(type) == 'complex').and.(psb_tolower(sym) == 'hermitian')) then ! we are generally working with non-symmetric matrices, so @@ -392,7 +390,6 @@ subroutine cmm_mat_read(a, info, iunit, filename) call acoo%fix(info) call a%mv_from(acoo) - call a%cscnv(ircode,type='csr') else write(psb_err_unit,*) 'read_matrix: matrix type not yet supported' diff --git a/util/psb_d_mmio_impl.f90 b/util/psb_d_mmio_impl.f90 index 7026f68d..d9ff57f5 100644 --- a/util/psb_d_mmio_impl.f90 +++ b/util/psb_d_mmio_impl.f90 @@ -386,7 +386,6 @@ subroutine dmm_mat_read(a, info, iunit, filename) if (info == 0) then call acoo%fix(info) call a%mv_from(acoo) - call a%cscnv(ircode,type='csr') end if if (infile /= 5) close(infile) diff --git a/util/psb_s_mmio_impl.f90 b/util/psb_s_mmio_impl.f90 index 7f049530..ee79af77 100644 --- a/util/psb_s_mmio_impl.f90 +++ b/util/psb_s_mmio_impl.f90 @@ -341,7 +341,6 @@ subroutine smm_mat_read(a, info, iunit, filename) call acoo%fix(info) call a%mv_from(acoo) - call a%cscnv(ircode,type='csr') else if ((psb_tolower(type) == 'real').and.(psb_tolower(sym) == 'symmetric')) then ! we are generally working with non-symmetric matrices, so @@ -363,7 +362,6 @@ subroutine smm_mat_read(a, info, iunit, filename) call acoo%fix(info) call a%mv_from(acoo) - call a%cscnv(ircode,type='csr') else write(psb_err_unit,*) 'read_matrix: matrix type not yet supported' diff --git a/util/psb_z_mmio_impl.f90 b/util/psb_z_mmio_impl.f90 index 8475d284..23ac322d 100644 --- a/util/psb_z_mmio_impl.f90 +++ b/util/psb_z_mmio_impl.f90 @@ -346,7 +346,6 @@ subroutine zmm_mat_read(a, info, iunit, filename) call acoo%fix(info) call a%mv_from(acoo) - call a%cscnv(ircode,type='csr') else if ((psb_tolower(type) == 'complex').and.(psb_tolower(sym) == 'symmetric')) then ! we are generally working with non-symmetric matrices, so @@ -369,7 +368,6 @@ subroutine zmm_mat_read(a, info, iunit, filename) call acoo%fix(info) call a%mv_from(acoo) - call a%cscnv(ircode,type='csr') else if ((psb_tolower(type) == 'complex').and.(psb_tolower(sym) == 'hermitian')) then ! we are generally working with non-symmetric matrices, so @@ -392,7 +390,6 @@ subroutine zmm_mat_read(a, info, iunit, filename) call acoo%fix(info) call a%mv_from(acoo) - call a%cscnv(ircode,type='csr') else write(psb_err_unit,*) 'read_matrix: matrix type not yet supported'