Fix bookkeeping in Xsphalo.

Fix cd_renum_block init.

base/tools/psb_cd_renum_block.F90

@@ -31,7 +31,8 @@
 !    
 !
 ! Subroutine: psb_cd_renum_block
-!   Produces a clone of a descriptor.
+!   Produces a renumbered version of the input descriptor, with
+!   global indices in a BLOCK distribution. 
 ! 
 ! Arguments: 
 !    desc_in  - type(psb_desc_type).         The communication descriptor to be cloned.
@@ -120,9 +121,23 @@ subroutine psb_cd_renum_block(desc_in, desc_out, info)
     reflidx(1:n_col) = [(i,i=1,n_col)]
     gidx(1:n_row) = reflidx(1:n_row) + vnl(me)
     call psb_halo(gidx,desc_in,info)
-    if (info == 0) call blck_map%gen_block_map_init(ictxt,vnl(me),info)
+    if (debug_level >= psb_debug_ext_) &
+         & write(debug_unit,*) me,' ',trim(name),': Done halo on gidx ',info
+  
+    if (info == 0) call blck_map%gen_block_map_init(ictxt,n_row,info)
+    if (debug_level >= psb_debug_ext_) &
+         & write(debug_unit,*) me,' ',trim(name),': Done gen_block_map_init ',info,&
+         & blck_map%get_lr(),blck_map%get_lc(),vnl(me)
+    
     if (info == 0) call blck_map%g2l_ins(gidx,lidx,info,lidx=reflidx)
+    if (debug_level >= psb_debug_ext_) then 
+      write(debug_unit,*) me,' ',trim(name),': Done g2l_ins ',info,size(gidx),size(lidx),size(reflidx)
+      write(debug_unit,*) me,' ',trim(name),': Done g2l_ins ',gidx(:),':',lidx(:),' :',reflidx(:)
+    end if
+      
     if (info == 0) call blck_map%asb(info)
+    if (debug_level >= psb_debug_ext_) &
+         & write(debug_unit,*) me,' ',trim(name),': Done asb ',info
   
     if (info /= psb_success_) then
       info = psb_err_from_subroutine_

base/tools/psb_csphalo.F90

@@ -280,7 +280,7 @@ Subroutine psb_csphalo(a,desc_a,blk,info,rowcnv,colcnv,&
         call psb_errpush(info,name,a_err='psb_sp_getrow')
         goto 9999
       end if
-      tot_elem=tot_elem+n_elem
+      tot_elem=tot_elem+ngtz
     Enddo
     ipx = ipx + 1 
     counter   = counter+n_el_send+3

base/tools/psb_dsphalo.F90

@@ -280,7 +280,7 @@ Subroutine psb_dsphalo(a,desc_a,blk,info,rowcnv,colcnv,&
         call psb_errpush(info,name,a_err='psb_sp_getrow')
         goto 9999
       end if
-      tot_elem=tot_elem+n_elem
+      tot_elem=tot_elem+ngtz
     Enddo
     ipx = ipx + 1 
     counter   = counter+n_el_send+3

base/tools/psb_ssphalo.F90

@@ -280,7 +280,7 @@ Subroutine psb_ssphalo(a,desc_a,blk,info,rowcnv,colcnv,&
         call psb_errpush(info,name,a_err='psb_sp_getrow')
         goto 9999
       end if
-      tot_elem=tot_elem+n_elem
+      tot_elem=tot_elem+ngtz
     Enddo
     ipx = ipx + 1 
     counter   = counter+n_el_send+3

base/tools/psb_zsphalo.F90

@@ -280,7 +280,7 @@ Subroutine psb_zsphalo(a,desc_a,blk,info,rowcnv,colcnv,&
         call psb_errpush(info,name,a_err='psb_sp_getrow')
         goto 9999
       end if
-      tot_elem=tot_elem+n_elem
+      tot_elem=tot_elem+ngtz
     Enddo
     ipx = ipx + 1 
     counter   = counter+n_el_send+3