Fix comm internals.

base/comm/internals/psi_cswaptran_a.F90

@@ -676,13 +676,8 @@ subroutine psi_ctranidxv(ctxt,icomm,flag,beta,y,idx,&
   integer(psb_ipk_), intent(in)      :: idx(:),totxch,totsnd, totrcv
 
   ! locals
-<<<<<<< HEAD
   integer(psb_ipk_) :: np, me
   integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret
-=======
-  integer(psb_ipk_) :: np, me
-  integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret
->>>>>>> implement-ainv
   integer(psb_mpk_), allocatable, dimension(:) :: bsdidx, brvidx,&
        & sdsz, rvsz, prcid, rvhd, sdhd
   integer(psb_ipk_) :: nesd, nerv,&

base/comm/internals/psi_dswaptran_a.F90

@@ -183,13 +183,8 @@ subroutine psi_dtranidxm(ctxt,icomm,flag,n,beta,y,idx,&
   integer(psb_ipk_), intent(in)      :: idx(:),totxch,totsnd, totrcv
 
   ! locals
-<<<<<<< HEAD
   integer(psb_ipk_) :: np, me
   integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret
-=======
-  integer(psb_ipk_) :: np, me
-  integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret
->>>>>>> implement-ainv
   integer(psb_mpk_), allocatable, dimension(:) :: bsdidx, brvidx,&
        & sdsz, rvsz, prcid, rvhd, sdhd
   integer(psb_ipk_) :: nesd, nerv,&
@@ -681,13 +676,8 @@ subroutine psi_dtranidxv(ctxt,icomm,flag,beta,y,idx,&
   integer(psb_ipk_), intent(in)      :: idx(:),totxch,totsnd, totrcv
 
   ! locals
-<<<<<<< HEAD
-  integer(psb_ipk_)   :: np, me
-  integer(psb_mpk_)   :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret
-=======
   integer(psb_ipk_) :: np, me
   integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret
->>>>>>> implement-ainv
   integer(psb_mpk_), allocatable, dimension(:) :: bsdidx, brvidx,&
        & sdsz, rvsz, prcid, rvhd, sdhd
   integer(psb_ipk_) :: nesd, nerv,&

base/comm/internals/psi_eswaptran_a.F90

@@ -676,13 +676,8 @@ subroutine psi_etranidxv(ctxt,icomm,flag,beta,y,idx,&
   integer(psb_ipk_), intent(in)      :: idx(:),totxch,totsnd, totrcv
 
   ! locals
-<<<<<<< HEAD
   integer(psb_ipk_) :: np, me
   integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret
-=======
-  integer(psb_ipk_) :: np, me
-  integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret
->>>>>>> implement-ainv
   integer(psb_mpk_), allocatable, dimension(:) :: bsdidx, brvidx,&
        & sdsz, rvsz, prcid, rvhd, sdhd
   integer(psb_ipk_) :: nesd, nerv,&

base/comm/internals/psi_i2swaptran_a.F90

@@ -676,13 +676,8 @@ subroutine psi_i2tranidxv(ctxt,icomm,flag,beta,y,idx,&
   integer(psb_ipk_), intent(in)      :: idx(:),totxch,totsnd, totrcv
 
   ! locals
-<<<<<<< HEAD
   integer(psb_ipk_) :: np, me
   integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret
-=======
-  integer(psb_ipk_) :: np, me
-  integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret
->>>>>>> implement-ainv
   integer(psb_mpk_), allocatable, dimension(:) :: bsdidx, brvidx,&
        & sdsz, rvsz, prcid, rvhd, sdhd
   integer(psb_ipk_) :: nesd, nerv,&

base/comm/internals/psi_mswaptran_a.F90

@@ -676,13 +676,8 @@ subroutine psi_mtranidxv(ctxt,icomm,flag,beta,y,idx,&
   integer(psb_ipk_), intent(in)      :: idx(:),totxch,totsnd, totrcv
 
   ! locals
-<<<<<<< HEAD
   integer(psb_ipk_) :: np, me
   integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret
-=======
-  integer(psb_ipk_) :: np, me
-  integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret
->>>>>>> implement-ainv
   integer(psb_mpk_), allocatable, dimension(:) :: bsdidx, brvidx,&
        & sdsz, rvsz, prcid, rvhd, sdhd
   integer(psb_ipk_) :: nesd, nerv,&

base/comm/internals/psi_sswaptran_a.F90

@@ -676,13 +676,8 @@ subroutine psi_stranidxv(ctxt,icomm,flag,beta,y,idx,&
   integer(psb_ipk_), intent(in)      :: idx(:),totxch,totsnd, totrcv
 
   ! locals
-<<<<<<< HEAD
   integer(psb_ipk_) :: np, me
   integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret
-=======
-  integer(psb_ipk_) :: np, me
-  integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret
->>>>>>> implement-ainv
   integer(psb_mpk_), allocatable, dimension(:) :: bsdidx, brvidx,&
        & sdsz, rvsz, prcid, rvhd, sdhd
   integer(psb_ipk_) :: nesd, nerv,&

base/comm/internals/psi_zswaptran_a.F90

@@ -676,13 +676,8 @@ subroutine psi_ztranidxv(ctxt,icomm,flag,beta,y,idx,&
   integer(psb_ipk_), intent(in)      :: idx(:),totxch,totsnd, totrcv
 
   ! locals
-<<<<<<< HEAD
   integer(psb_ipk_) :: np, me
   integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret
-=======
-  integer(psb_ipk_) :: np, me
-  integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret
->>>>>>> implement-ainv
   integer(psb_mpk_), allocatable, dimension(:) :: bsdidx, brvidx,&
        & sdsz, rvsz, prcid, rvhd, sdhd
   integer(psb_ipk_) :: nesd, nerv,&