From f10c6c18225578e4719d65d2975eec1b22d6b730 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Sat, 2 Nov 2024 12:28:24 +0100 Subject: [PATCH] Fix GEPRT --- base/serial/psb_cgeprt.f90 | 5 +++-- base/serial/psb_dgeprt.f90 | 9 +++++---- base/serial/psb_sgeprt.f90 | 9 +++++---- base/serial/psb_zgeprt.f90 | 5 +++-- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/base/serial/psb_cgeprt.f90 b/base/serial/psb_cgeprt.f90 index 985c1eab..e05d673b 100644 --- a/base/serial/psb_cgeprt.f90 +++ b/base/serial/psb_cgeprt.f90 @@ -29,7 +29,7 @@ ! POSSIBILITY OF SUCH DAMAGE. ! ! -! File: psb_scsprt.f90 +! File: psb_geprt.f90 ! Subroutine: ! Arguments: @@ -131,6 +131,7 @@ subroutine psb_cgeprt2(iout,a,head) ncol = size(a,2) write(iout,*) nrow,ncol + write(frmtv,'(a,i3.3,a)') '(',ncol,'2(es26.18,1x))' do i=1,nrow @@ -161,7 +162,7 @@ subroutine psb_cgeprt1(iout,a,head) write(iout,'(a)') '% ' nrow = size(a,1) ncol = 1 - write(iout,*) nrow + write(iout,*) nrow,ncol write(frmtv,'(a,i3.3,a)') '(',ncol,'2(es26.18,1x))' diff --git a/base/serial/psb_dgeprt.f90 b/base/serial/psb_dgeprt.f90 index 07fb32f8..ae4c5b11 100644 --- a/base/serial/psb_dgeprt.f90 +++ b/base/serial/psb_dgeprt.f90 @@ -29,7 +29,7 @@ ! POSSIBILITY OF SUCH DAMAGE. ! ! -! File: psb_dcsprt.f90 +! File: psb_geprt.f90 ! Subroutine: ! Arguments: @@ -124,13 +124,14 @@ subroutine psb_dgeprt2(iout,a,head) character(len=80) :: frmtv integer(psb_ipk_) :: irs,ics,i,j, nmx, ni, nrow, ncol - write(iout,'(a)') '%%MatrixMarket matrix array real general' + write(iout,'(a)') '%%MatrixMarket matrix array complex general' write(iout,'(a)') '% '//trim(head) write(iout,'(a)') '% ' nrow = size(a,1) ncol = size(a,2) write(iout,*) nrow,ncol + write(frmtv,'(a,i3.3,a)') '(',ncol,'(es26.18,1x))' do i=1,nrow @@ -156,12 +157,12 @@ subroutine psb_dgeprt1(iout,a,head) character(len=80) :: frmtv integer(psb_ipk_) :: irs,ics,i,j, nmx, ni, nrow, ncol - write(iout,'(a)') '%%MatrixMarket matrix array real general' + write(iout,'(a)') '%%MatrixMarket matrix array complex general' write(iout,'(a)') '% '//trim(head) write(iout,'(a)') '% ' nrow = size(a,1) ncol = 1 - write(iout,*) nrow + write(iout,*) nrow,ncol write(frmtv,'(a,i3.3,a)') '(',ncol,'(es26.18,1x))' diff --git a/base/serial/psb_sgeprt.f90 b/base/serial/psb_sgeprt.f90 index 3ebb975b..9f3205fd 100644 --- a/base/serial/psb_sgeprt.f90 +++ b/base/serial/psb_sgeprt.f90 @@ -29,7 +29,7 @@ ! POSSIBILITY OF SUCH DAMAGE. ! ! -! File: psb_scsprt.f90 +! File: psb_geprt.f90 ! Subroutine: ! Arguments: @@ -124,13 +124,14 @@ subroutine psb_sgeprt2(iout,a,head) character(len=80) :: frmtv integer(psb_ipk_) :: irs,ics,i,j, nmx, ni, nrow, ncol - write(iout,'(a)') '%%MatrixMarket matrix array real general' + write(iout,'(a)') '%%MatrixMarket matrix array complex general' write(iout,'(a)') '% '//trim(head) write(iout,'(a)') '% ' nrow = size(a,1) ncol = size(a,2) write(iout,*) nrow,ncol + write(frmtv,'(a,i3.3,a)') '(',ncol,'(es26.18,1x))' do i=1,nrow @@ -156,12 +157,12 @@ subroutine psb_sgeprt1(iout,a,head) character(len=80) :: frmtv integer(psb_ipk_) :: irs,ics,i,j, nmx, ni, nrow, ncol - write(iout,'(a)') '%%MatrixMarket matrix array real general' + write(iout,'(a)') '%%MatrixMarket matrix array complex general' write(iout,'(a)') '% '//trim(head) write(iout,'(a)') '% ' nrow = size(a,1) ncol = 1 - write(iout,*) nrow + write(iout,*) nrow,ncol write(frmtv,'(a,i3.3,a)') '(',ncol,'(es26.18,1x))' diff --git a/base/serial/psb_zgeprt.f90 b/base/serial/psb_zgeprt.f90 index f7615473..3fc0eb0c 100644 --- a/base/serial/psb_zgeprt.f90 +++ b/base/serial/psb_zgeprt.f90 @@ -29,7 +29,7 @@ ! POSSIBILITY OF SUCH DAMAGE. ! ! -! File: psb_scsprt.f90 +! File: psb_geprt.f90 ! Subroutine: ! Arguments: @@ -131,6 +131,7 @@ subroutine psb_zgeprt2(iout,a,head) ncol = size(a,2) write(iout,*) nrow,ncol + write(frmtv,'(a,i3.3,a)') '(',ncol,'2(es26.18,1x))' do i=1,nrow @@ -161,7 +162,7 @@ subroutine psb_zgeprt1(iout,a,head) write(iout,'(a)') '% ' nrow = size(a,1) ncol = 1 - write(iout,*) nrow + write(iout,*) nrow,ncol write(frmtv,'(a,i3.3,a)') '(',ncol,'2(es26.18,1x))'