Changed fnd_owner internal names.

base/internals/Makefile

@@ -3,10 +3,10 @@ include ../../Make.inc
 FOBJS = psi_compute_size.o psi_crea_bnd_elem.o psi_crea_index.o \
         psi_crea_ovr_elem.o psi_bld_tmpovrl.o psi_dl_check.o \
 	psi_bld_tmphalo.o psi_sort_dl.o \
-	psb_indx_map_fnd_owner.o \
+	psi_indx_map_fnd_owner.o \
         psi_desc_impl.o psi_list_search.o psi_srtlist.o 
 
-MPFOBJS = psi_desc_index.o psi_extrct_dl.o psi_fnd_owner.o psb_a2a_fnd_owner.o psb_adjcncy_fnd_owner.o
+MPFOBJS = psi_desc_index.o psi_extrct_dl.o psi_fnd_owner.o psi_a2a_fnd_owner.o psi_adjcncy_fnd_owner.o
 
 LIBDIR=..
 INCDIR=..

base/internals/psi_a2a_fnd_owner.F90

@@ -45,13 +45,13 @@
 !    desc_a   - type(psb_desc_type).    The communication descriptor.        
 !    info     - integer.                return code.
 ! 
-subroutine psb_a2a_fnd_owner(idx,iprc,idxmap,info)
+subroutine psi_a2a_fnd_owner(idx,iprc,idxmap,info)
   use psb_serial_mod
   use psb_const_mod
   use psb_error_mod
   use psb_penv_mod
   use psb_realloc_mod
-  use psb_indx_map_mod, psb_protect_name => psb_a2a_fnd_owner
+  use psb_indx_map_mod, psb_protect_name => psi_a2a_fnd_owner
 #ifdef MPI_MOD
   use mpi
 #endif
@@ -296,4 +296,4 @@ subroutine psb_a2a_fnd_owner(idx,iprc,idxmap,info)
 
   return
 
-end subroutine psb_a2a_fnd_owner
+end subroutine psi_a2a_fnd_owner

base/internals/psi_adjcncy_fnd_owner.F90

@@ -45,13 +45,13 @@
 !    desc_a   - type(psb_desc_type).    The communication descriptor.        
 !    info     - integer.                return code.
 ! 
-subroutine psb_adjcncy_fnd_owner(idx,iprc,idxmap,info)
+subroutine psi_adjcncy_fnd_owner(idx,iprc,idxmap,info)
   use psb_serial_mod
   use psb_const_mod
   use psb_error_mod
   use psb_penv_mod
   use psb_realloc_mod
-  use psb_indx_map_mod, psb_protect_name => psb_adjcncy_fnd_owner
+  use psb_indx_map_mod, psb_protect_name => psi_adjcncy_fnd_owner
 #ifdef MPI_MOD
   use mpi
 #endif
@@ -126,4 +126,4 @@ subroutine psb_adjcncy_fnd_owner(idx,iprc,idxmap,info)
 
   return
 
-end subroutine psb_adjcncy_fnd_owner
+end subroutine psi_adjcncy_fnd_owner

base/internals/psi_indx_map_fnd_owner.F90

@@ -45,13 +45,13 @@
 !    desc_a   - type(psb_desc_type).    The communication descriptor.        
 !    info     - integer.                return code.
 ! 
-subroutine psb_indx_map_fnd_owner(idx,iprc,idxmap,info)
+subroutine psi_indx_map_fnd_owner(idx,iprc,idxmap,info)
   use psb_serial_mod
   use psb_const_mod
   use psb_error_mod
   use psb_penv_mod
   use psb_realloc_mod
-  use psb_indx_map_mod, psb_protect_name => psb_indx_map_fnd_owner
+  use psb_indx_map_mod, psb_protect_name => psi_indx_map_fnd_owner
 #ifdef MPI_MOD
   use mpi
 #endif
@@ -66,14 +66,10 @@ subroutine psb_indx_map_fnd_owner(idx,iprc,idxmap,info)
   integer(psb_ipk_), intent(out) :: info
 
 
-!!$  integer(psb_lpk_), allocatable :: answers(:,:), idxsrch(:,:), hproc(:)
   integer(psb_ipk_), allocatable :: hhidx(:)
-!!$  integer(psb_mpk_), allocatable :: hsz(:),hidx(:), &
-!!$       & sdsz(:),sdidx(:), rvsz(:), rvidx(:)
   integer(psb_mpk_) :: icomm, minfo, iictxt
-  integer(psb_ipk_) :: i,n_row,n_col,err_act,hsize,ip,isz,j, k,&
-       & last_ih, last_j, nv
-  integer(psb_lpk_) :: mglob, ih
+  integer(psb_ipk_) :: i, err_act, hsize, nv
+  integer(psb_lpk_) :: mglob
   integer(psb_ipk_) :: ictxt,np,me, nresp
   logical, parameter  :: gettime=.false.
   real(psb_dpk_)      :: t0, t1, t2, t3, t4, tamx, tidx
@@ -86,8 +82,6 @@ subroutine psb_indx_map_fnd_owner(idx,iprc,idxmap,info)
   ictxt   = idxmap%get_ctxt()
   icomm   = idxmap%get_mpic()
   mglob   = idxmap%get_gr()
-  n_row   = idxmap%get_lr()
-  n_col   = idxmap%get_lc()
   iictxt = ictxt 
 
   call psb_info(ictxt, me, np)
@@ -142,10 +136,11 @@ subroutine psb_indx_map_fnd_owner(idx,iprc,idxmap,info)
 
     if (.true.) then 
 
-      call psb_a2a_fnd_owner(idx,iprc,idxmap,info)
+      call psi_a2a_fnd_owner(idx,iprc,idxmap,info)
 
     else
-      call psb_adjcncy_fnd_owner(idx,iprc,idxmap,info)
+      
+      call psi_adjcncy_fnd_owner(idx,iprc,idxmap,info)
 
     end if
 
@@ -171,4 +166,4 @@ subroutine psb_indx_map_fnd_owner(idx,iprc,idxmap,info)
 
   return
 
-end subroutine psb_indx_map_fnd_owner
+end subroutine psi_indx_map_fnd_owner

base/modules/desc/psb_indx_map_mod.f90

@@ -218,7 +218,7 @@ module psb_indx_map_mod
     procedure, pass(idxmap)  :: fnd_halo_owner_v => base_fnd_halo_owner_v
     generic, public          :: fnd_halo_owner => fnd_halo_owner_s, fnd_halo_owner_v
     
-    procedure, pass(idxmap)  :: fnd_owner => psb_indx_map_fnd_owner
+    procedure, pass(idxmap)  :: fnd_owner => psi_indx_map_fnd_owner
     procedure, pass(idxmap)  :: init_vl   => base_init_vl
     generic, public          :: init      => init_vl
 
@@ -242,7 +242,7 @@ module psb_indx_map_mod
        & base_set_halo_owner, base_get_halo_owner, &
        & base_fnd_halo_owner_s, base_fnd_halo_owner_v
   
-  !> Function: psb_indx_map_fnd_owner
+  !> Function: psi_indx_map_fnd_owner
   !! \memberof psb_indx_map
   !! \brief  Find the process owning indices
   !!
@@ -261,36 +261,36 @@ module psb_indx_map_mod
   !!
 
   interface 
-    subroutine psb_indx_map_fnd_owner(idx,iprc,idxmap,info)
+    subroutine psi_indx_map_fnd_owner(idx,iprc,idxmap,info)
       import :: psb_indx_map, psb_ipk_, psb_lpk_
       implicit none 
       integer(psb_lpk_), intent(in) :: idx(:)
       integer(psb_ipk_), allocatable, intent(out) ::  iprc(:)
       class(psb_indx_map), intent(in) :: idxmap
       integer(psb_ipk_), intent(out) :: info
-    end subroutine psb_indx_map_fnd_owner
+    end subroutine psi_indx_map_fnd_owner
   end interface
 
   interface 
-    subroutine psb_a2a_fnd_owner(idx,iprc,idxmap,info)
+    subroutine psi_a2a_fnd_owner(idx,iprc,idxmap,info)
       import :: psb_indx_map, psb_ipk_, psb_lpk_
       implicit none 
       integer(psb_lpk_), intent(in) :: idx(:)
       integer(psb_ipk_), allocatable, intent(out) ::  iprc(:)
       class(psb_indx_map), intent(in) :: idxmap
       integer(psb_ipk_), intent(out) :: info
-    end subroutine psb_a2a_fnd_owner
+    end subroutine psi_a2a_fnd_owner
   end interface
 
   interface 
-    subroutine psb_adjcncy_fnd_owner(idx,iprc,idxmap,info)
+    subroutine psi_adjcncy_fnd_owner(idx,iprc,idxmap,info)
       import :: psb_indx_map, psb_ipk_, psb_lpk_
       implicit none 
       integer(psb_lpk_), intent(in) :: idx(:)
       integer(psb_ipk_), allocatable, intent(out) ::  iprc(:)
       class(psb_indx_map), intent(in) :: idxmap
       integer(psb_ipk_), intent(out) :: info
-    end subroutine psb_adjcncy_fnd_owner
+    end subroutine psi_adjcncy_fnd_owner
   end interface
 
 contains