Further changes for ambiguous interfaces when IPK==LPK

base/modules/penv/psi_penv_mod.F90

@@ -75,8 +75,15 @@ module psi_penv_mod
 
   interface psb_wtime
     module procedure  psb_wtime
-  end interface
+  end interface psb_wtime
+
+  interface psb_get_mpi_comm
+    module procedure psb_m_get_mpi_comm, psb_e_get_mpi_comm
+  end interface psb_get_mpi_comm
   
+  interface psb_get_mpi_rank
+    module procedure psb_m_get_mpi_rank, psb_e_get_mpi_rank
+  end interface psb_get_mpi_rank
 
 #if defined(SERIAL_MPI)
   integer(psb_mpk_), private, save :: nctxt=0
@@ -563,17 +570,33 @@ contains
   end subroutine psb_info_mpik
 
 
-  function psb_get_mpi_comm(ictxt) result(comm)
+  function psb_m_get_mpi_comm(ictxt) result(comm)
     integer(psb_mpk_) :: ictxt, comm
 
     comm = ictxt
-  end function psb_get_mpi_comm
+  end function psb_m_get_mpi_comm
 
-  function psb_get_mpi_rank(ictxt,id) result(rank)
+  function psb_e_get_mpi_comm(ictxt) result(comm)
-    integer(psb_mpk_) :: rank,ictxt,id
+    integer(psb_epk_) :: ictxt
+    integer(psb_mpk_) :: comm
+
+    comm = ictxt
+  end function psb_e_get_mpi_comm
+
+  function psb_m_get_mpi_rank(ictxt,id) result(rank)
+    integer(psb_mpk_) :: rank
+    integer(psb_mpk_) :: ictxt,id
+
+    rank = id
+  end function psb_m_get_mpi_rank
+
+
+  function psb_e_get_mpi_rank(ictxt,id) result(rank)
+    integer(psb_mpk_) :: rank
+    integer(psb_epk_) :: ictxt,id
 
     rank = id
-  end function psb_get_mpi_rank
+  end function psb_e_get_mpi_rank
 
 
   subroutine psb_get_mpicomm(ictxt,comm)

base/modules/serial/psb_c_base_mat_mod.F90

@@ -3160,6 +3160,7 @@ module psb_c_base_mat_mod
     end subroutine psb_lc_coo_clean_negidx
   end interface
 
+#if defined(IPK4) && defined(LPK8) 
   !
   !> Funtion: coo_clean_negidx_inner
   !! \brief Take out any entries with negative row or column index
@@ -3182,7 +3183,7 @@ module psb_c_base_mat_mod
       integer(psb_ipk_), intent(out)          :: info
     end subroutine psb_lc_coo_clean_negidx_inner
   end interface psb_coo_clean_negidx_inner
-  
+#endif  
   !
   !> 
   !! \memberof  psb_lc_coo_sparse_mat

base/modules/serial/psb_d_base_mat_mod.F90

@@ -3160,6 +3160,7 @@ module psb_d_base_mat_mod
     end subroutine psb_ld_coo_clean_negidx
   end interface
 
+#if defined(IPK4) && defined(LPK8) 
   !
   !> Funtion: coo_clean_negidx_inner
   !! \brief Take out any entries with negative row or column index
@@ -3182,7 +3183,7 @@ module psb_d_base_mat_mod
       integer(psb_ipk_), intent(out)          :: info
     end subroutine psb_ld_coo_clean_negidx_inner
   end interface psb_coo_clean_negidx_inner
-  
+#endif  
   !
   !> 
   !! \memberof  psb_ld_coo_sparse_mat

base/modules/serial/psb_s_base_mat_mod.F90

@@ -3160,6 +3160,7 @@ module psb_s_base_mat_mod
     end subroutine psb_ls_coo_clean_negidx
   end interface
 
+#if defined(IPK4) && defined(LPK8) 
   !
   !> Funtion: coo_clean_negidx_inner
   !! \brief Take out any entries with negative row or column index
@@ -3182,7 +3183,7 @@ module psb_s_base_mat_mod
       integer(psb_ipk_), intent(out)          :: info
     end subroutine psb_ls_coo_clean_negidx_inner
   end interface psb_coo_clean_negidx_inner
-  
+#endif  
   !
   !> 
   !! \memberof  psb_ls_coo_sparse_mat

base/modules/serial/psb_z_base_mat_mod.F90

@@ -3160,6 +3160,7 @@ module psb_z_base_mat_mod
     end subroutine psb_lz_coo_clean_negidx
   end interface
 
+#if defined(IPK4) && defined(LPK8) 
   !
   !> Funtion: coo_clean_negidx_inner
   !! \brief Take out any entries with negative row or column index
@@ -3182,7 +3183,7 @@ module psb_z_base_mat_mod
       integer(psb_ipk_), intent(out)          :: info
     end subroutine psb_lz_coo_clean_negidx_inner
   end interface psb_coo_clean_negidx_inner
-  
+#endif  
   !
   !> 
   !! \memberof  psb_lz_coo_sparse_mat

base/serial/impl/psb_c_coo_impl.f90

@@ -4767,6 +4767,7 @@ subroutine  psb_lc_coo_clean_negidx(a,info)
   
 end subroutine psb_lc_coo_clean_negidx
 
+#if defined(IPK4) && defined(LPK8) 
 subroutine psb_lc_coo_clean_negidx_inner(nzin,ia,ja,val,nzout,info) 
   use psb_error_mod
   use psb_c_base_mat_mod, psb_protect_name => psb_lc_coo_clean_negidx_inner
@@ -4791,6 +4792,7 @@ subroutine psb_lc_coo_clean_negidx_inner(nzin,ia,ja,val,nzout,info)
   end do
   
 end subroutine psb_lc_coo_clean_negidx_inner
+#endif
 
 subroutine  psb_lc_coo_allocate_mnnz(m,n,a,nz) 
   use psb_c_base_mat_mod, psb_protect_name => psb_lc_coo_allocate_mnnz

base/serial/impl/psb_d_coo_impl.f90

@@ -4767,6 +4767,7 @@ subroutine  psb_ld_coo_clean_negidx(a,info)
   
 end subroutine psb_ld_coo_clean_negidx
 
+#if defined(IPK4) && defined(LPK8) 
 subroutine psb_ld_coo_clean_negidx_inner(nzin,ia,ja,val,nzout,info) 
   use psb_error_mod
   use psb_d_base_mat_mod, psb_protect_name => psb_ld_coo_clean_negidx_inner
@@ -4791,6 +4792,7 @@ subroutine psb_ld_coo_clean_negidx_inner(nzin,ia,ja,val,nzout,info)
   end do
   
 end subroutine psb_ld_coo_clean_negidx_inner
+#endif
 
 subroutine  psb_ld_coo_allocate_mnnz(m,n,a,nz) 
   use psb_d_base_mat_mod, psb_protect_name => psb_ld_coo_allocate_mnnz

base/serial/impl/psb_s_coo_impl.f90

@@ -4767,6 +4767,7 @@ subroutine  psb_ls_coo_clean_negidx(a,info)
   
 end subroutine psb_ls_coo_clean_negidx
 
+#if defined(IPK4) && defined(LPK8) 
 subroutine psb_ls_coo_clean_negidx_inner(nzin,ia,ja,val,nzout,info) 
   use psb_error_mod
   use psb_s_base_mat_mod, psb_protect_name => psb_ls_coo_clean_negidx_inner
@@ -4791,6 +4792,7 @@ subroutine psb_ls_coo_clean_negidx_inner(nzin,ia,ja,val,nzout,info)
   end do
   
 end subroutine psb_ls_coo_clean_negidx_inner
+#endif
 
 subroutine  psb_ls_coo_allocate_mnnz(m,n,a,nz) 
   use psb_s_base_mat_mod, psb_protect_name => psb_ls_coo_allocate_mnnz

base/serial/impl/psb_z_coo_impl.f90

@@ -4767,6 +4767,7 @@ subroutine  psb_lz_coo_clean_negidx(a,info)
   
 end subroutine psb_lz_coo_clean_negidx
 
+#if defined(IPK4) && defined(LPK8) 
 subroutine psb_lz_coo_clean_negidx_inner(nzin,ia,ja,val,nzout,info) 
   use psb_error_mod
   use psb_z_base_mat_mod, psb_protect_name => psb_lz_coo_clean_negidx_inner
@@ -4791,6 +4792,7 @@ subroutine psb_lz_coo_clean_negidx_inner(nzin,ia,ja,val,nzout,info)
   end do
   
 end subroutine psb_lz_coo_clean_negidx_inner
+#endif
 
 subroutine  psb_lz_coo_allocate_mnnz(m,n,a,nz) 
   use psb_z_base_mat_mod, psb_protect_name => psb_lz_coo_allocate_mnnz