Fixed bugs in matrix conversions, showing up in dense factors for

multilevel preconditioners.

src/prec/psb_dbaseprc_bld.f90

@@ -86,7 +86,7 @@ subroutine psb_dbaseprc_bld(a,desc_a,p,info,upd)
       use psb_const_mod
       implicit none 
 
-      type(psb_dspmat_type), intent(in)      :: a
+      type(psb_dspmat_type), intent(inout)      :: a
       type(psb_desc_type), intent(in)        :: desc_a
       type(psb_dbaseprc_type), intent(inout) :: p
       integer, intent(out)                   :: info
@@ -101,7 +101,7 @@ subroutine psb_dbaseprc_bld(a,desc_a,p,info,upd)
       use psb_const_mod
       implicit none 
 
-      type(psb_dspmat_type), intent(in)      :: a
+      type(psb_dspmat_type), intent(inout)      :: a
       type(psb_desc_type), intent(in)        :: desc_a
       type(psb_dbaseprc_type), intent(inout) :: p
       integer, intent(out)                   :: info
@@ -194,13 +194,14 @@ subroutine psb_dbaseprc_bld(a,desc_a,p,info,upd)
          &  f_ilu_n_,is_legal_ml_fact)
 
     if (debug) write(0,*)me, ': Calling PSB_ILU_BLD'
-
+    if (debug) call blacs_barrier(icontxt,'All')
 
     select case(p%iprcparm(f_type_))
 
     case(f_ilu_n_,f_ilu_e_) 
       call psb_ilu_bld(a,desc_a,p,iupd,info)
       if(debug) write(0,*)me,': out of psb_ilu_bld'
+      if (debug) call blacs_barrier(icontxt,'All')
       if(info /= 0) then
         info=4010
         ch_err='psb_ilu_bld'

src/prec/psb_dilu_bld.f90

@@ -160,6 +160,7 @@ subroutine psb_dilu_bld(a,desc_a,p,upd,info)
   t1= mpi_wtime()
 
   if(debug) write(0,*)me,': calling psb_asmatbld',p%iprcparm(p_type_),p%iprcparm(n_ovr_)
+  if (debug) call blacs_barrier(icontxt,'All')
   call psb_asmatbld(p%iprcparm(p_type_),p%iprcparm(n_ovr_),a,&
        & blck,desc_a,upd,p%desc_data,info)
   if(info/=0) then
@@ -169,7 +170,8 @@ subroutine psb_dilu_bld(a,desc_a,p,upd,info)
     goto 9999
   end if
   t2= mpi_wtime()
-  if(debug) write(0,*)me,': out of psb_asmatbld'
+  if (debug) write(0,*)me,': out of psb_asmatbld'
+  if (debug) call blacs_barrier(icontxt,'All')
 
   if (associated(p%av)) then 
     if (size(p%av) < bp_ilu_avsz) then 
@@ -189,6 +191,9 @@ subroutine psb_dilu_bld(a,desc_a,p,upd,info)
     call psb_errpush(info,name,a_err=ch_err)
     goto 9999
   end if
+  if (debug) write(0,*)me,': out spinfo',nztota
+  if (debug) call blacs_barrier(icontxt,'All')
+  
   n_col  = desc_a%matrix_data(psb_n_col_)
   nhalo  = n_col-nrow_a
   n_row  = p%desc_data%matrix_data(psb_n_row_)
@@ -198,7 +203,7 @@ subroutine psb_dilu_bld(a,desc_a,p,upd,info)
   p%av(u_pr_)%m  = n_row
   p%av(u_pr_)%k  = n_row
   call psb_sp_all(n_row,n_row,p%av(l_pr_),nztota+lovr,info)
-  call psb_sp_all(n_row,n_row,p%av(u_pr_),nztota+lovr,info)
+  if (info == 0) call psb_sp_all(n_row,n_row,p%av(u_pr_),nztota+lovr,info)
   if(info/=0) then
     info=4010
     ch_err='psb_sp_all'
@@ -305,6 +310,7 @@ subroutine psb_dilu_bld(a,desc_a,p,upd,info)
 
     t5= mpi_wtime()
     if (debug) write(0,*) me,' Going for dilu_fct'
+    if (debug) call blacs_barrier(icontxt,'All')
     call psb_ilu_fct(a,p%av(l_pr_),p%av(u_pr_),p%d,info,blck=blck)
     if(info/=0) then
       info=4010

src/prec/psb_dslu_bld.f90

@@ -41,7 +41,7 @@ subroutine psb_dslu_bld(a,desc_a,p,info)
   use psb_const_mod
   implicit none 
 
-  type(psb_dspmat_type), intent(in)      :: a
+  type(psb_dspmat_type), intent(inout)      :: a
   type(psb_desc_type), intent(in)        :: desc_a
   type(psb_dbaseprc_type), intent(inout) :: p
   integer, intent(out)                   :: info

src/prec/psb_dumf_bld.f90

@@ -42,7 +42,7 @@ subroutine psb_dumf_bld(a,desc_a,p,info)
   use psb_const_mod
   implicit none 
 
-  type(psb_dspmat_type), intent(in)      :: a
+  type(psb_dspmat_type), intent(inout)      :: a
   type(psb_desc_type), intent(in)        :: desc_a
   type(psb_dbaseprc_type), intent(inout) :: p
   integer, intent(out)                   :: info
@@ -97,7 +97,8 @@ subroutine psb_dumf_bld(a,desc_a,p,info)
   end if
   call psb_spinfo(psb_nztotreq_,atmp,nza,info)
   if (Debug) then 
-     write(0,*) me, 'UMFBLD: Done csdp',info,nza,atmp%m,atmp%k
+    call psb_spinfo(psb_nztotreq_,a,nzb,info)
+    write(0,*) me, 'UMFBLD: Done csdp',info,nza,atmp%m,atmp%k,nzb
     call blacs_barrier(icontxt,'All')
   endif
   call psb_asmatbld(p%iprcparm(p_type_),p%iprcparm(n_ovr_),a,&
@@ -172,6 +173,9 @@ subroutine psb_dumf_bld(a,desc_a,p,info)
   if (Debug) then 
     write(0,*) me,'Calling psb_umf_factor ',nzt,atmp%m,&
          & atmp%k,p%desc_data%matrix_data(psb_n_row_)
+    open(80+me)
+    call psb_csprt(80+me,atmp)
+    close(80+me)
     call blacs_barrier(icontxt,'All')
   endif
 

src/prec/psb_umf_impl.c

@@ -141,11 +141,12 @@ psb_dumf_factor_(int *n, int *nnz,
     
   if ( *info == UMFPACK_OK ) {
     *info = 0;
+    *numptr = (fptr) Numeric; 
   } else {
     printf("umfpack_di_numeric() error returns INFO= %d\n", *info);
+    *numptr = (fptr) NULL; 
   }
     
-  *numptr = (fptr) Numeric; 
   for (i = 0; i <= *n;  ++i) ++colptr[i];
   for (i = 0; i < *nnz; ++i) ++rowind[i];
 #else

src/serial/dp/dcoco.f

@@ -78,7 +78,7 @@ c
         p1(1) = 0
         p2(1) = 0
 
-        call psb_getifield(nnz,psb_nnz_,infon,psb_ifasize_,ierror) 
+        call psb_getifield(nnz,psb_nnz_,info,psb_ifasize_,ierror) 
         if (debug) then 
           write(*,*) 'on entry to dcoco: nnz laux ',
      +      nnz,laux,larn,lia1n,lia2n

src/serial/dp/dcrco.f

@@ -101,7 +101,7 @@ C        ... Construct COO Representation...
                   ELEM = ELEM + 1
                ENDDO
             ENDDO
-            INFON(1) = IA2(M+1)-1
+            INFON(psb_nnz_) = IA2(M+1)-1
          ELSE IF (DESCRA(1:1).EQ.'S' .AND. DESCRA(2:2).EQ.'U') THEN
 
             DO 20 K = 1, M

src/serial/dp/zcoco.f

@@ -77,7 +77,7 @@ c
         p1(1) = 0
         p2(1) = 0
 
-        nnz = info(psb_nnz_)
+        call psb_getifield(nnz,psb_nnz_,info,psb_ifasize_,ierror) 
         if (debug) then 
           write(*,*) 'on entry to dcoco: nnz laux ',
      +      nnz,laux,larn,lia1n,lia2n

src/serial/dp/zcrco.f

@@ -101,7 +101,7 @@ C        ... Construct COO Representation...
               ELEM = ELEM + 1
             ENDDO
           ENDDO
-          INFON(1) = IA2(M+1)-1
+          INFON(psb_nnz_) = IA2(M+1)-1
         ELSE IF (DESCRA(1:1).EQ.'S' .AND. DESCRA(2:2).EQ.'U') THEN
 
           DO 20 K = 1, M

src/serial/psb_dcsdp.f90

@@ -150,8 +150,6 @@ subroutine psb_dcsdp(a, b,info,ifc,check,trans,unitd,upd,dupl)
 
   end if
 
-
-
   if (check_/='R') then
     
     if (present(upd)) then 
@@ -289,6 +287,10 @@ subroutine psb_dcsdp(a, b,info,ifc,check,trans,unitd,upd,dupl)
           call psb_errpush(4010,name,a_err='dcrco')
           goto 9999
         end if
+      case default
+        info=4010
+        call psb_errpush(info,name)
+        goto 9999
         
       end select
 
@@ -376,17 +378,22 @@ subroutine psb_dcsdp(a, b,info,ifc,check,trans,unitd,upd,dupl)
           goto 9999
         end if
 
+      case default
+        info=4010
+        call psb_errpush(info,name)
+        goto 9999
       end select
 
+    case default
+      info=4010
+      call psb_errpush(info,name)
+      goto 9999
+
     end select
 
-!!$    write(0,*) 'End of assembly', psb_sp_getifld(psb_upd_,b,info) ,psb_upd_perm_
     if (psb_sp_getifld(psb_upd_,b,info) /= psb_upd_perm_) then
-!!$      write(0,*) 'Going for trimsize',size(b%ia1),size(b%ia2),size(b%aspk)
       call psb_sp_trimsize(b,i1,i2,ia,info)
-!!$      write(0,*) 'From trimsize',i1,i2,ia,info
       if (info == 0) call psb_sp_reall(b,i1,i2,ia,info)
-!!$      write(0,*) 'From realloc',size(b%ia1),size(b%ia2),size(b%aspk)
     endif
 
   else if (check_=='R') then

src/serial/psb_dcsprt.f90

@@ -77,7 +77,9 @@ subroutine psb_dcsprt(iout,a,iv,eirs,eics,head,ivr,ivc)
     write(iout,'(a)') '%'
   endif
 
-  if (toupper(a%fida)=='CSR') then 
+  select case(toupper(a%fida)) 
+
+  case ('CSR')
 
     write(iout,*) a%m,a%k,a%ia2(a%m+1)-1
 
@@ -115,7 +117,45 @@ subroutine psb_dcsprt(iout,a,iv,eirs,eics,head,ivr,ivc)
       endif
     endif
 
-  else  if (toupper(a%fida)=='COO') then 
+  case ('CSC')
+
+    write(iout,*) a%m,a%k,a%ia2(a%k+1)-1
+
+    if (present(iv)) then 
+      do i=1, a%k
+        do j=a%ia2(i),a%ia2(i+1)-1
+          write(iout,frmtr) iv(irs+a%ia1(j)),iv(ics+i),a%aspk(j)
+        enddo
+      enddo
+    else
+      if (present(ivr).and..not.present(ivc)) then 
+        do i=1, a%k
+          do j=a%ia2(i),a%ia2(i+1)-1
+            write(iout,frmtr) ivr(irs+a%ia1(j)),(ics+i),a%aspk(j)
+          enddo
+        enddo
+      else if (present(ivr).and.present(ivc)) then 
+        do i=1, a%k
+          do j=a%ia2(i),a%ia2(i+1)-1
+            write(iout,frmtr) ivr(irs+a%ia1(j)),ivc(ics+i),a%aspk(j)
+          enddo
+        enddo
+      else if (.not.present(ivr).and.present(ivc)) then 
+        do i=1, a%m
+          do j=a%ia2(i),a%ia2(i+1)-1
+            write(iout,frmtr) (irs+a%ia1(j)),ivc(ics+i),a%aspk(j)
+          enddo
+        enddo
+      else if (.not.present(ivr).and..not.present(ivc)) then 
+        do i=1, a%k
+          do j=a%ia2(i),a%ia2(i+1)-1
+            write(iout,frmtr) (irs+a%ia1(j)),(ics+i),a%aspk(j)
+          enddo
+        enddo
+      endif
+    endif
+
+  case ('COO') 
 
     if (present(ivr).and..not.present(ivc)) then 
       write(iout,*) a%m,a%k,a%infoa(psb_nnz_)
@@ -138,7 +178,7 @@ subroutine psb_dcsprt(iout,a,iv,eirs,eics,head,ivr,ivc)
         write(iout,frmtr) a%ia1(j),a%ia2(j),a%aspk(j)
       enddo
     endif
-  else
+  case default
     write(0,*) 'Feeling lazy today, format not implemented: "',a%fida,'"'
-  endif
+  end select
 end subroutine psb_dcsprt

src/serial/psb_dipcoo2csc.f90

@@ -101,7 +101,6 @@ subroutine psb_dipcoo2csc(a,info,clshr)
 
     if (clshr_) then 
       
-      
       j = 1
       i = 1
       icl = itemp(j) 

src/serial/psb_zcsdp.f90

@@ -189,7 +189,6 @@ subroutine psb_zcsdp(a, b,info,ifc,check,trans,unitd,upd,dupl)
     call psb_cest(b%fida, n_row,n_col,size_req,&
          & ia1_size, ia2_size, aspk_size, upd_,info)
 
-!!$    write(0,*) 'ESTIMATE : ',ia1_size,ia2_size,aspk_Size,upd_
     if (info /= no_err) then    
       info=4010
       ch_err='psb_cest'
@@ -289,6 +288,10 @@ subroutine psb_zcsdp(a, b,info,ifc,check,trans,unitd,upd,dupl)
           call psb_errpush(4010,name,a_err='dcrco')
           goto 9999
         end if
+      case default
+        info=4010
+        call psb_errpush(info,name)
+        goto 9999
         
       end select
 
@@ -365,8 +368,6 @@ subroutine psb_zcsdp(a, b,info,ifc,check,trans,unitd,upd,dupl)
 
         end do
 
-
-
       case ('COO')
 
         call zcoco(trans_, a%m, a%k, unitd_, d, a%descra, a%aspk,&
@@ -378,21 +379,27 @@ subroutine psb_zcsdp(a, b,info,ifc,check,trans,unitd,upd,dupl)
           goto 9999
         end if
 
+      case default
+        info=4010
+        call psb_errpush(info,name)
+        goto 9999
       end select
 
+    case default
+      info=4010
+      call psb_errpush(info,name)
+      goto 9999
+
     end select
 
-!!$    write(0,*) 'End of assembly', psb_sp_getifld(psb_upd_,b,info) ,psb_upd_perm_
     if (psb_sp_getifld(psb_upd_,b,info) /= psb_upd_perm_) then
-!!$      write(0,*) 'Going for trimsize',size(b%ia1),size(b%ia2),size(b%aspk)
       call psb_sp_trimsize(b,i1,i2,ia,info)
-!!$      write(0,*) 'From trimsize',i1,i2,ia,info
       if (info == 0) call psb_sp_reall(b,i1,i2,ia,info)
-!!$      write(0,*) 'From realloc',size(b%ia1),size(b%ia2),size(b%aspk)
     endif
 
   else if (check_=='R') then
     !...Regenerating matrix    
+
     if (psb_sp_getifld(psb_state_,b,info) /= psb_spmat_upd_) then 
       info = 8888
       call psb_errpush(info,name)