From 031c0a600743f90ca74f8eaac0c80ae58f5eac46 Mon Sep 17 00:00:00 2001
From: Salvatore Filippone <salvatore.filippone@cranfield.ac.uk>
Date: Thu, 20 Sep 2007 08:58:05 +0000
Subject: [PATCH] Fixed usage of psb_spcnv.

---
 util/psb_hbio_mod.f90 | 12 ++++++------
 util/psb_mmio_mod.f90 | 10 +++++-----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/util/psb_hbio_mod.f90 b/util/psb_hbio_mod.f90
index c29335d7..2bd9b16b 100644
--- a/util/psb_hbio_mod.f90
+++ b/util/psb_hbio_mod.f90
@@ -124,7 +124,7 @@ contains
           if (info == 0) read (infile,fmt=rhsfmt) (b(i),i=1,nrow)
         endif
 
-        call psb_ipcsr2coo(a,ircode)
+        call psb_spcnv(a,ircode,afmt='csr')
         if (ircode /= 0)   goto 993  
 
         call psb_sp_reall(a,2*nnzero,ircode)
@@ -139,7 +139,7 @@ contains
           end if
         end do
         a%infoa(psb_nnz_) = nzr
-        call psb_ipcoo2csr(a,ircode)
+        call psb_spcnv(a,ircode,afmt='csr')
         if (ircode /= 0)   goto 993
 
       else
@@ -384,7 +384,7 @@ contains
         endif
         
 
-        call psb_ipcsr2coo(a,ircode)
+        call psb_spcnv(a,ircode,afmt='coo')
         if (ircode /= 0) then
           write(0,*) 'ipcsr2coo ',ircode
           goto 993  
@@ -408,7 +408,7 @@ contains
           end if
         end do
         a%infoa(psb_nnz_) = nzr
-        call psb_ipcoo2csr(a,ircode)
+        call psb_spcnv(a,ircode,afmt='csr')
         if (ircode /= 0) then
           write(0,*) 'ipcoo2csr ',ircode
           goto 993  
@@ -439,7 +439,7 @@ contains
           if (info == 0) read (infile,fmt=rhsfmt) (b(i),i=1,nrow)
         endif
         
-        call psb_ipcsr2coo(a,ircode)
+        call psb_spcnv(a,ircode,afmt='coo')
         if (ircode /= 0) then
           write(0,*) 'ipcsr2coo ',ircode
           goto 993  
@@ -462,7 +462,7 @@ contains
           end if
         end do
         a%infoa(psb_nnz_) = nzr
-        call psb_ipcoo2csr(a,ircode)
+        call psb_spcnv(a,ircode,afmt='csr')
         if (ircode /= 0) then
           write(0,*) 'ipcoo2csr ',ircode
           goto 993  
diff --git a/util/psb_mmio_mod.f90 b/util/psb_mmio_mod.f90
index c0822bc9..3eb6cd8d 100644
--- a/util/psb_mmio_mod.f90
+++ b/util/psb_mmio_mod.f90
@@ -100,7 +100,7 @@ contains
         read(infile,fmt=*,end=902) a%ia1(i),a%ia2(i),a%aspk(i)
       end do
       a%infoa(psb_nnz_) = nnzero
-      call psb_ipcoo2csr(a,ircode)
+      call psb_spcnv(a,ircode,afmt='csr')
 
     else if ((tolower(type) == 'real').and.(tolower(sym) == 'symmetric')) then
       ! we are generally working with non-symmetric matrices, so
@@ -123,7 +123,7 @@ contains
         end if
       end do
       a%infoa(psb_nnz_) = nzr
-      call psb_ipcoo2csr(a,ircode)
+      call psb_spcnv(a,ircode,afmt='csr')
 
     else
       write(0,*) 'read_matrix: matrix type not yet supported'
@@ -259,7 +259,7 @@ contains
       end do
       a%infoa(psb_nnz_) = nnzero
       
-      call psb_ipcoo2csr(a,ircode)
+      call psb_spcnv(a,ircode,afmt='csr')
 
     else if ((tolower(type) == 'complex').and.(tolower(sym) == 'symmetric')) then
       ! we are generally working with non-symmetric matrices, so
@@ -283,7 +283,7 @@ contains
         end if
       end do
       a%infoa(psb_nnz_) = nzr
-      call psb_ipcoo2csr(a,ircode)
+      call psb_spcnv(a,ircode,afmt='csr')
 
     else if ((tolower(type) == 'complex').and.(tolower(sym) == 'hermitian')) then
       ! we are generally working with non-symmetric matrices, so
@@ -307,7 +307,7 @@ contains
         end if
       end do
       a%infoa(psb_nnz_) = nzr
-      call psb_ipcoo2csr(a,ircode)
+      call psb_spcnv(a,ircode,afmt='csr')
 
     else
       write(0,*) 'read_matrix: matrix type not yet supported'