Using new routines: psb_sp_trim psb_sp_clip.

psb_dbldaggrmat.f90

@@ -267,31 +267,17 @@ contains
       !if(.not.associated(p%av(ap_nd_)%aspk)) p%iprcparm(jac_sweeps_) = 1
       !------------------------------------------------------------------
       ! Split AC=M+N  N off-diagonal part
-      nzl = psb_sp_get_nnzeros(ac)
+      ! Output in COO format. 
-      call psb_sp_all(ac%m,ac%k,p%av(ap_nd_),nzl,info)
+      call psb_sp_clip(ac,p%av(ap_nd_),info,&
-      if (info /= 0) then
+           & jmin=ac%m+1,rscale=.false.,cscale=.false.)
-        call psb_errpush(4010,name,a_err='psb_sp_all')
-        goto 9999
-      end if
-      if(.not.allocated(p%av(ap_nd_)%aspk)) write(0,*) '.not.associated(p%av(ap_nd_)%ia1)'
-      if(.not.allocated(p%av(ap_nd_)%ia1)) write(0,*) '.not.associated(p%av(ap_nd_)%ia1)'
-      !write(0,*) 'ok line 238'
-
-      k=0
-      do i=1,nzl
-        if (ac%ia2(i)>ac%m) then 
-          k = k + 1
-          p%av(ap_nd_)%aspk(k) = ac%aspk(i)
-          p%av(ap_nd_)%ia1(k)  = ac%ia1(i)
-          p%av(ap_nd_)%ia2(k)  = ac%ia2(i)
-        endif
-      enddo
-      p%av(ap_nd_)%infoa(psb_nnz_) = k
 
+      call psb_ipcoo2csr(p%av(ap_nd_),info)
       if(info /= 0) then
         call psb_errpush(4010,name,a_err='psb_ipcoo2csr')
         goto 9999
       end if
+
+      k = psb_sp_get_nnzeros(p%av(ap_nd_))
       call psb_sum(ictxt,k)
 
       if (k == 0) then 
@@ -303,11 +289,6 @@ contains
       !write(0,*) 'operations in bldaggrmat are ok !'
       !------------------------------------------------------------------
 
-      call psb_ipcoo2csr(p%av(ap_nd_),info)
-      if(info /= 0) then
-        call psb_errpush(4010,name,a_err='ipcoo2csr')
-        goto 9999
-      end if
 
     else
 
@@ -812,28 +793,17 @@ contains
         deallocate(ivall,nzbr,idisp)
 
         ! Split AC=M+N  N off-diagonal part
-        call psb_sp_all(ac%m,ac%k,p%av(ap_nd_),nzl,info)
+        ! Output in COO format. 
-        if(info /= 0) then
+        call psb_sp_clip(ac,p%av(ap_nd_),info,&
-          call psb_errpush(4010,name,a_err='psb_sp_all')
+             & jmin=ac%m+1,rscale=.false.,cscale=.false.)
-          goto 9999
-        end if
 
-        k=0
-        do i=1,nzl
-          if (ac%ia2(i)>ac%m) then 
-            k = k + 1
-            p%av(ap_nd_)%aspk(k) = ac%aspk(i)
-            p%av(ap_nd_)%ia1(k) = ac%ia1(i)
-            p%av(ap_nd_)%ia2(k) = ac%ia2(i)
-          endif
-        enddo
-        p%av(ap_nd_)%infoa(psb_nnz_) = k
         call psb_ipcoo2csr(p%av(ap_nd_),info)
-
         if(info /= 0) then
           call psb_errpush(4010,name,a_err='psb_ipcoo2csr')
           goto 9999
         end if
+
+        k = psb_sp_get_nnzeros(p%av(ap_nd_))
         call psb_sum(ictxt,k)
 
         if (k == 0) then 

psb_dilu_bld.f90

@@ -184,13 +184,11 @@ subroutine psb_dilu_bld(a,desc_a,p,upd,info,blck)
   !    if (me==0) write(0,'(a,3(1x,g18.9))') 'renum/factor time',t3-t2,t6-t5
 
   if (psb_sp_getifld(psb_upd_,p%av(u_pr_),info) /= psb_upd_perm_) then
-    call psb_sp_trimsize(p%av(u_pr_),i1,i2,ia,info)
+    call psb_sp_trim(p%av(u_pr_),info)
-    if (info == 0) call psb_sp_reall(p%av(u_pr_),i1,i2,ia,info)
   endif
 
   if (psb_sp_getifld(psb_upd_,p%av(l_pr_),info) /= psb_upd_perm_) then
-    call psb_sp_trimsize(p%av(l_pr_),i1,i2,ia,info)
+    call psb_sp_trim(p%av(l_pr_),info)
-    if (info == 0) call psb_sp_reall(p%av(l_pr_),i1,i2,ia,info)
   endif
 
 

psb_zbldaggrmat.f90

@@ -266,30 +266,17 @@ contains
       !if(.not.associated(p%av(ap_nd_)%aspk)) p%iprcparm(jac_sweeps_) = 1
       !------------------------------------------------------------------
       ! Split AC=M+N  N off-diagonal part
-      call psb_sp_all(ac%m,ac%k,p%av(ap_nd_),nzl,info)
+      ! Output in COO format. 
-      if(info /= 0) then
+      call psb_sp_clip(ac,p%av(ap_nd_),info,&
-        call psb_errpush(4010,name,a_err='psb_sp_all')
+           & jmin=ac%m+1,rscale=.false.,cscale=.false.)
-        goto 9999
-      end if
-      if(.not.allocated(p%av(ap_nd_)%aspk)) write(0,*) '.not.associated(p%av(ap_nd_)%ia1)'
-      if(.not.allocated(p%av(ap_nd_)%ia1)) write(0,*) '.not.associated(p%av(ap_nd_)%ia1)'
-      !write(0,*) 'ok line 238'
-
-      k=0
-      do i=1,nzl
-        if (ac%ia2(i)>ac%m) then 
-          k = k + 1
-          p%av(ap_nd_)%aspk(k) = ac%aspk(i)
-          p%av(ap_nd_)%ia1(k)  = ac%ia1(i)
-          p%av(ap_nd_)%ia2(k)  = ac%ia2(i)
-        endif
-      enddo
-      p%av(ap_nd_)%infoa(psb_nnz_) = k
 
+      call psb_ipcoo2csr(p%av(ap_nd_),info)
       if(info /= 0) then
         call psb_errpush(4010,name,a_err='psb_ipcoo2csr')
         goto 9999
       end if
+
+      k = psb_sp_get_nnzeros(p%av(ap_nd_))
       call psb_sum(ictxt,k)
 
       if (k == 0) then 
@@ -301,11 +288,6 @@ contains
       !write(0,*) 'operations in bldaggrmat are ok !'
       !------------------------------------------------------------------
 
-      call psb_ipcoo2csr(p%av(ap_nd_),info)
-      if(info /= 0) then
-        call psb_errpush(4010,name,a_err='ipcoo2csr')
-        goto 9999
-      end if
 
     else
 
@@ -810,28 +792,17 @@ contains
         deallocate(ivall,nzbr,idisp)
 
         ! Split AC=M+N  N off-diagonal part
-        call psb_sp_all(ac%m,ac%k,p%av(ap_nd_),nzl,info)
+        ! Output in COO format. 
-        if(info /= 0) then
+        call psb_sp_clip(ac,p%av(ap_nd_),info,&
-          call psb_errpush(4010,name,a_err='psb_sp_all')
+             & jmin=ac%m+1,rscale=.false.,cscale=.false.)
-          goto 9999
-        end if
 
-        k=0
-        do i=1,nzl
-          if (ac%ia2(i)>ac%m) then 
-            k = k + 1
-            p%av(ap_nd_)%aspk(k) = ac%aspk(i)
-            p%av(ap_nd_)%ia1(k)  = ac%ia1(i)
-            p%av(ap_nd_)%ia2(k)  = ac%ia2(i)
-          endif
-        enddo
-        p%av(ap_nd_)%infoa(psb_nnz_) = k
         call psb_ipcoo2csr(p%av(ap_nd_),info)
-
         if(info /= 0) then
           call psb_errpush(4010,name,a_err='psb_ipcoo2csr')
           goto 9999
         end if
+
+        k = psb_sp_get_nnzeros(p%av(ap_nd_))
         call psb_sum(ictxt,k)
 
         if (k == 0) then 

psb_zilu_bld.f90

@@ -183,13 +183,11 @@ subroutine psb_zilu_bld(a,desc_a,p,upd,info,blck)
   !    if (me==0) write(0,'(a,3(1x,g18.9))') 'renum/factor time',t3-t2,t6-t5
 
   if (psb_sp_getifld(psb_upd_,p%av(u_pr_),info) /= psb_upd_perm_) then
-    call psb_sp_trimsize(p%av(u_pr_),i1,i2,ia,info)
+    call psb_sp_trim(p%av(u_pr_),info)
-    if (info == 0) call psb_sp_reall(p%av(u_pr_),i1,i2,ia,info)
   endif
 
   if (psb_sp_getifld(psb_upd_,p%av(l_pr_),info) /= psb_upd_perm_) then
-    call psb_sp_trimsize(p%av(l_pr_),i1,i2,ia,info)
+    call psb_sp_trim(p%av(l_pr_),info)
-    if (info == 0) call psb_sp_reall(p%av(l_pr_),i1,i2,ia,info)
   endif