From 098bb7ea040659d0365eb08fbadcb3a7230a6572 Mon Sep 17 00:00:00 2001
From: Salvatore Filippone <salvatore.filippone@cranfield.ac.uk>
Date: Mon, 28 Apr 2008 10:08:20 +0000
Subject: [PATCH] psblas2-dev:  base/serial/psb_dspcnv.f90 
 base/serial/psb_zspcnv.f90

Merged fix trimming of sparse matrices in assembly.
---
 base/serial/psb_dspcnv.f90 | 9 +++++++--
 base/serial/psb_zspcnv.f90 | 9 +++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/base/serial/psb_dspcnv.f90 b/base/serial/psb_dspcnv.f90
index c62fccab..f31ef0a4 100644
--- a/base/serial/psb_dspcnv.f90
+++ b/base/serial/psb_dspcnv.f90
@@ -350,8 +350,9 @@ subroutine psb_dspcnv2(a, b,info,afmt,upd,dupl)
 
   end select
 
-  if (psb_sp_getifld(psb_upd_,b,info) /= psb_upd_perm_) &
-       &      call psb_sp_trim(b,info)
+  if (psb_sp_getifld(psb_upd_,b,info) /= psb_upd_perm_) then 
+    call psb_sp_trim(b,info)
+  end if
 
 
   call psb_sp_setifld(psb_spmat_asb_,psb_state_,b,info)
@@ -462,18 +463,22 @@ subroutine psb_dspcnv1(a, info, afmt, upd, dupl)
           select case(psb_tolower(afmt))
           case('coo') 
             call psb_fixcoo(a,info)
+            call psb_sp_trim(a,info)
             goto 9998
           case('csr') 
             call psb_ipcoo2csr(a,info)
+            call psb_sp_trim(a,info)
             goto 9998
           case('csc')
             call psb_ipcoo2csc(a,info)
+            call psb_sp_trim(a,info)
             goto 9998
           end select
         case('csr')
           select case(psb_tolower(afmt))
           case('coo') 
             call psb_ipcsr2coo(a,info)
+            call psb_sp_trim(a,info)
             goto 9998
           end select
         end select
diff --git a/base/serial/psb_zspcnv.f90 b/base/serial/psb_zspcnv.f90
index 09e810a1..366385b8 100644
--- a/base/serial/psb_zspcnv.f90
+++ b/base/serial/psb_zspcnv.f90
@@ -350,8 +350,9 @@ subroutine psb_zspcnv2(a, b,info,afmt,upd,dupl)
 
   end select
 
-  if (psb_sp_getifld(psb_upd_,b,info) /= psb_upd_perm_) &
-       &      call psb_sp_trim(b,info)
+  if (psb_sp_getifld(psb_upd_,b,info) /= psb_upd_perm_) then 
+    call psb_sp_trim(b,info)
+  end if
 
 
   call psb_sp_setifld(psb_spmat_asb_,psb_state_,b,info)
@@ -462,18 +463,22 @@ subroutine psb_zspcnv1(a, info, afmt, upd, dupl)
           select case(psb_tolower(afmt))
           case('coo') 
             call psb_fixcoo(a,info)
+            call psb_sp_trim(a,info)
             goto 9998
           case('csr') 
             call psb_ipcoo2csr(a,info)
+            call psb_sp_trim(a,info)
             goto 9998
           case('csc')
             call psb_ipcoo2csc(a,info)
+            call psb_sp_trim(a,info)
             goto 9998
           end select
         case('csr')
           select case(psb_tolower(afmt))
           case('coo') 
             call psb_ipcsr2coo(a,info)
+            call psb_sp_trim(a,info)
             goto 9998
           end select
         end select