Call psb_get_mpicomm ONLY in CDALL; afterwards, always get it from DESC.

base/internals/psi_dswapdata.F90

@@ -71,6 +71,7 @@ subroutine psi_dswapdatam(flag,n,beta,y,desc_a,work,info,data)
   call psb_erractionsave(err_act)
 
   ictxt = psb_cd_get_context(desc_a)
+  icomm = psb_cd_get_mpic(desc_a)
   call psb_info(ictxt,me,np) 
   if (np == -1) then
     info = 2010
@@ -85,8 +86,6 @@ subroutine psi_dswapdatam(flag,n,beta,y,desc_a,work,info,data)
   endif
 
 
-  icomm = desc_a%matrix_data(psb_mpi_c_)
-
   swap_mpi  = iand(flag,psb_swap_mpi_)  /= 0
   swap_sync = iand(flag,psb_swap_sync_) /= 0
   swap_send = iand(flag,psb_swap_send_) /= 0

base/internals/psi_dswaptran.F90

@@ -71,6 +71,8 @@ subroutine psi_dswaptranm(flag,n,beta,y,desc_a,work,info,data)
   call psb_erractionsave(err_act)
 
   ictxt = psb_cd_get_context(desc_a)
+  icomm = psb_cd_get_mpic(desc_a)
+
   call psb_info(ictxt,me,np) 
   if (np == -1) then
     info = 2010
@@ -84,8 +86,6 @@ subroutine psi_dswaptranm(flag,n,beta,y,desc_a,work,info,data)
     goto 9999
   endif
 
-  icomm = desc_a%matrix_data(psb_mpi_c_)
-
   swap_mpi  = iand(flag,psb_swap_mpi_) /= 0
   swap_sync = iand(flag,psb_swap_sync_) /= 0
   swap_send = iand(flag,psb_swap_send_) /= 0

base/internals/psi_fnd_owner.f90

@@ -57,9 +57,9 @@ subroutine psi_fnd_owner(nv,idx,iprc,desc,info)
   call psb_erractionsave(err_act)
 
   ictxt   = psb_cd_get_context(desc)
+  icomm   = psb_cd_get_mpic(desc)
   n_row   = psb_cd_get_local_rows(desc)
   n_col   = psb_cd_get_local_cols(desc)
-  call psb_get_mpicomm(ictxt,icomm )
 
 
   ! check on blacs grid 

base/internals/psi_iswapdata.F90

@@ -71,6 +71,8 @@ subroutine psi_iswapdatam(flag,n,beta,y,desc_a,work,info,data)
   call psb_erractionsave(err_act)
 
   ictxt = psb_cd_get_context(desc_a)
+  icomm = psb_cd_get_mpic(desc_a)
+
   call psb_info(ictxt,me,np) 
   if (np == -1) then
     info = 2010
@@ -84,9 +86,6 @@ subroutine psi_iswapdatam(flag,n,beta,y,desc_a,work,info,data)
     goto 9999
   endif
 
-
-  icomm = desc_a%matrix_data(psb_mpi_c_)
-
   swap_mpi  = iand(flag,psb_swap_mpi_)  /= 0
   swap_sync = iand(flag,psb_swap_sync_) /= 0
   swap_send = iand(flag,psb_swap_send_) /= 0

base/internals/psi_iswaptran.F90

@@ -71,6 +71,7 @@ subroutine psi_iswaptranm(flag,n,beta,y,desc_a,work,info,data)
   call psb_erractionsave(err_act)
 
   ictxt = psb_cd_get_context(desc_a)
+  icomm = psb_cd_get_mpic(desc_a)
   call psb_info(ictxt,me,np) 
   if (np == -1) then
     info = 2010
@@ -84,8 +85,6 @@ subroutine psi_iswaptranm(flag,n,beta,y,desc_a,work,info,data)
     goto 9999
   endif
 
-  icomm = desc_a%matrix_data(psb_mpi_c_)
-
   swap_mpi  = iand(flag,psb_swap_mpi_) /= 0
   swap_sync = iand(flag,psb_swap_sync_) /= 0
   swap_send = iand(flag,psb_swap_send_) /= 0

base/internals/psi_ldsc_pre_halo.f90

@@ -55,9 +55,9 @@ subroutine psi_ldsc_pre_halo(desc,ext_hv,info)
   call psb_erractionsave(err_act)
 
   ictxt = psb_cd_get_context(desc)
+  icomm = psb_cd_get_mpic(desc)
   n_row = psb_cd_get_local_rows(desc)
   n_col = psb_cd_get_local_cols(desc)
-  call psb_get_mpicomm(ictxt,icomm )
 
   ! check on blacs grid 
   call psb_info(ictxt, me, np)

base/internals/psi_zswapdata.F90

@@ -71,6 +71,8 @@ subroutine psi_zswapdatam(flag,n,beta,y,desc_a,work,info,data)
   call psb_erractionsave(err_act)
 
   ictxt = psb_cd_get_context(desc_a)
+  icomm = psb_cd_get_mpic(desc_a)
+
   call psb_info(ictxt,me,np) 
   if (np == -1) then
     info = 2010
@@ -84,9 +86,6 @@ subroutine psi_zswapdatam(flag,n,beta,y,desc_a,work,info,data)
     goto 9999
   endif
 
-
-  icomm = desc_a%matrix_data(psb_mpi_c_)
-
   swap_mpi  = iand(flag,psb_swap_mpi_)  /= 0
   swap_sync = iand(flag,psb_swap_sync_) /= 0
   swap_send = iand(flag,psb_swap_send_) /= 0

base/internals/psi_zswaptran.F90

@@ -71,6 +71,8 @@ subroutine psi_zswaptranm(flag,n,beta,y,desc_a,work,info,data)
   call psb_erractionsave(err_act)
 
   ictxt = psb_cd_get_context(desc_a)
+  icomm = psb_cd_get_mpic(desc_a)
+
   call psb_info(ictxt,me,np) 
   if (np == -1) then
     info = 2010
@@ -84,8 +86,6 @@ subroutine psi_zswaptranm(flag,n,beta,y,desc_a,work,info,data)
     goto 9999
   endif
 
-  icomm = desc_a%matrix_data(psb_mpi_c_)
-
   swap_mpi  = iand(flag,psb_swap_mpi_) /= 0
   swap_sync = iand(flag,psb_swap_sync_) /= 0
   swap_send = iand(flag,psb_swap_send_) /= 0

base/modules/psb_realloc_mod.F90

@@ -621,7 +621,7 @@ Contains
     else
       lb_ = 1
     endif
-    if ((len<0).or.(len>25*1024*1024)) then 
+    if ((len<0)) then 
       err=2025
       call psb_errpush(err,name,i_err=(/len,0,0,0,0/))
       goto 9999
@@ -697,7 +697,7 @@ Contains
     else
       lb_ = 1
     endif
-    if ((len<0).or.(len>25*1024*1024)) then 
+    if ((len<0)) then 
       err=2025
       call psb_errpush(err,name,i_err=(/len,0,0,0,0/))
       goto 9999
@@ -770,7 +770,7 @@ Contains
     else
       lb_ = 1
     endif
-    if ((len<0).or.(len>25*1024*1024)) then 
+    if ((len<0)) then 
       err=2025
       call psb_errpush(err,name,i_err=(/len,0,0,0,0/))
       goto 9999

base/tools/psb_dcdovr.F90

@@ -102,7 +102,7 @@ Subroutine psb_dcdovr(a,desc_a,novr,desc_ov,info, extype)
   call psb_erractionsave(err_act)
 
   ictxt = psb_cd_get_context(desc_a)
-
+  icomm = psb_cd_get_mpic(desc_a)
   Call psb_info(ictxt, me, np)
 
   If(debug) Write(0,*)'in psb_cdovr',novr
@@ -143,7 +143,7 @@ Subroutine psb_dcdovr(a,desc_a,novr,desc_ov,info, extype)
     return
   endif
 
-  call psb_get_mpicomm(ictxt,icomm )
+
 
   If(debug)then 
     Write(0,*)'BEGIN cdovr',me,nhalo

base/tools/psb_dsphalo.F90

@@ -119,6 +119,7 @@ Subroutine psb_dsphalo(a,desc_a,blk,info,rwcnv,clcnv,cliprow,outfmt,data)
   endif
 
   ictxt = psb_cd_get_context(desc_a)
+  icomm = psb_get_mpic(desc_a)
 
   Call psb_info(ictxt, me, np)
 
@@ -182,7 +183,6 @@ Subroutine psb_dsphalo(a,desc_a,blk,info,rwcnv,clcnv,cliprow,outfmt,data)
 
     counter   = counter+n_el_send+3
   Enddo
-  call psb_get_mpicomm(ictxt,icomm)
 
   call mpi_alltoall(sdsz,1,mpi_integer,rvsz,1,mpi_integer,icomm,info)
   if (info /= 0) then

base/tools/psb_zcdovr.F90

@@ -100,7 +100,7 @@ Subroutine psb_zcdovr(a,desc_a,novr,desc_ov,info, extype)
   call psb_erractionsave(err_act)
 
   ictxt = psb_cd_get_context(desc_a)
-
+  icomm = psb_cd_get_mpic(desc_a)
   Call psb_info(ictxt, me, np)
 
   If(debug) Write(0,*)'in psb_cdovr',novr
@@ -141,7 +141,7 @@ Subroutine psb_zcdovr(a,desc_a,novr,desc_ov,info, extype)
     return
   endif
 
-  call psb_get_mpicomm(ictxt,icomm )
+
 
   If(debug)then 
     Write(0,*)'BEGIN cdovr',me,nhalo

base/tools/psb_zsphalo.F90

@@ -119,6 +119,7 @@ Subroutine psb_zsphalo(a,desc_a,blk,info,rwcnv,clcnv,cliprow,outfmt,data)
   endif
 
   ictxt = psb_cd_get_context(desc_a)
+  icomm = psb_get_mpic(desc_a)
 
   Call psb_info(ictxt, me, np)
 
@@ -182,7 +183,6 @@ Subroutine psb_zsphalo(a,desc_a,blk,info,rwcnv,clcnv,cliprow,outfmt,data)
 
     counter   = counter+n_el_send+3
   Enddo
-  call psb_get_mpicomm(ictxt,icomm)
 
   call mpi_alltoall(sdsz,1,mpi_integer,rvsz,1,mpi_integer,icomm,info)
   if (info /= 0) then