More interface mismatch fixes

base/internals/psi_adjcncy_fnd_owner.F90

@@ -71,7 +71,7 @@ subroutine psi_adjcncy_fnd_owner(idx,iprc,adj,idxmap,info)
 #endif
   integer(psb_lpk_), intent(in)   :: idx(:)
   integer(psb_ipk_), allocatable, intent(out) :: iprc(:)
-  integer(psb_ipk_), intent(in)   :: adj(:)
+  integer(psb_ipk_), intent(inout) :: adj(:)
   class(psb_indx_map), intent(in) :: idxmap
   integer(psb_ipk_), intent(out)  :: info
 

base/internals/psi_sort_dl.f90

@@ -84,9 +84,10 @@ subroutine psi_i_csr_sort_dl(dl_ptr,c_dep_list,l_dep_list,ctxt,info)
   use psb_sort_mod
   implicit none
   
-  integer(psb_ipk_), intent(inout) :: c_dep_list(:), dl_ptr(0:), l_dep_list(0:)
+  integer(psb_ipk_), intent(in)    :: dl_ptr(0:)
+  integer(psb_ipk_), intent(inout) :: c_dep_list(:), l_dep_list(0:)
   type(psb_ctxt_type), intent(in)  :: ctxt
-    integer(psb_ipk_), intent(out) :: info
+  integer(psb_ipk_), intent(out) :: info
   ! Local variables
   integer(psb_ipk_), allocatable  ::  dg(:), dgp(:),&
        &  idx(:), upd(:), edges(:,:), ich(:)

base/modules/auxil/psb_c_hsort_mod.f90

@@ -100,8 +100,8 @@ module psb_c_hsort_mod
     subroutine psi_c_heap_get_first(key,last,heap,dir,info)
       import 
       implicit none 
-      complex(psb_spk_), intent(inout)  :: key
-      integer(psb_ipk_), intent(inout)  :: last
+      complex(psb_spk_), intent(inout)   :: key
+      integer(psb_ipk_), intent(inout) :: last
       integer(psb_ipk_), intent(in)     :: dir
       complex(psb_spk_), intent(inout)  :: heap(:)
       integer(psb_ipk_), intent(out)    :: info

base/modules/auxil/psb_c_hsort_x_mod.f90

@@ -45,7 +45,8 @@ module psb_c_hsort_x_mod
   use psb_c_hsort_mod
 
   type psb_c_heap
-    integer(psb_ipk_) :: last, dir
+    integer(psb_ipk_) :: dir
+    integer(psb_ipk_) :: last    
     complex(psb_spk_), allocatable    :: keys(:)
   contains
     procedure, pass(heap) :: init       => psb_c_init_heap
@@ -57,7 +58,8 @@ module psb_c_hsort_x_mod
   end type psb_c_heap
 
   type psb_c_idx_heap
-    integer(psb_ipk_) :: last, dir
+    integer(psb_ipk_) :: dir
+    integer(psb_ipk_) :: last
     complex(psb_spk_), allocatable    :: keys(:)
     integer(psb_ipk_), allocatable :: idxs(:)
   contains
@@ -121,7 +123,7 @@ contains
       return
     endif
 
-    call psb_ensure_size(heap%last+1,heap%keys,info,addsz=psb_heap_resize)
+    call psb_ensure_size(heap%last+1,heap%keys,info,addsz=(1_psb_ipk_)*psb_heap_resize)
     if (info /= psb_success_) then 
       write(psb_err_unit,*) 'Memory allocation failure in heap_insert'
       info = -5
@@ -234,9 +236,9 @@ contains
       return
     endif
 
-    call psb_ensure_size(heap%last+1,heap%keys,info,addsz=psb_heap_resize)
+    call psb_ensure_size(heap%last+1,heap%keys,info,addsz=(1_psb_ipk_)*psb_heap_resize)
     if (info == psb_success_) &
-         & call psb_ensure_size(heap%last+1,heap%idxs,info,addsz=psb_heap_resize)
+         & call psb_ensure_size(heap%last+1,heap%idxs,info,addsz=(1_psb_ipk_)*psb_heap_resize)
     if (info /= psb_success_) then 
       write(psb_err_unit,*) 'Memory allocation failure in heap_insert'
       info = -5
@@ -254,7 +256,7 @@ contains
     class(psb_c_idx_heap), intent(inout) :: heap
     integer(psb_ipk_), intent(out)       :: index
     integer(psb_ipk_), intent(out)       :: info
-    complex(psb_spk_), intent(out)           :: key
+    complex(psb_spk_), intent(inout)       :: key
 
 
     info = psb_success_

base/modules/auxil/psb_d_hsort_mod.f90

@@ -100,8 +100,8 @@ module psb_d_hsort_mod
     subroutine psi_d_heap_get_first(key,last,heap,dir,info)
       import 
       implicit none 
-      real(psb_dpk_), intent(inout)  :: key
-      integer(psb_ipk_), intent(inout)  :: last
+      real(psb_dpk_), intent(inout)   :: key
+      integer(psb_ipk_), intent(inout) :: last
       integer(psb_ipk_), intent(in)     :: dir
       real(psb_dpk_), intent(inout)  :: heap(:)
       integer(psb_ipk_), intent(out)    :: info

base/modules/auxil/psb_d_hsort_x_mod.f90

@@ -45,7 +45,8 @@ module psb_d_hsort_x_mod
   use psb_d_hsort_mod
 
   type psb_d_heap
-    integer(psb_ipk_) :: last, dir
+    integer(psb_ipk_) :: dir
+    integer(psb_ipk_) :: last    
     real(psb_dpk_), allocatable    :: keys(:)
   contains
     procedure, pass(heap) :: init       => psb_d_init_heap
@@ -57,7 +58,8 @@ module psb_d_hsort_x_mod
   end type psb_d_heap
 
   type psb_d_idx_heap
-    integer(psb_ipk_) :: last, dir
+    integer(psb_ipk_) :: dir
+    integer(psb_ipk_) :: last
     real(psb_dpk_), allocatable    :: keys(:)
     integer(psb_ipk_), allocatable :: idxs(:)
   contains
@@ -121,7 +123,7 @@ contains
       return
     endif
 
-    call psb_ensure_size(heap%last+1,heap%keys,info,addsz=psb_heap_resize)
+    call psb_ensure_size(heap%last+1,heap%keys,info,addsz=(1_psb_ipk_)*psb_heap_resize)
     if (info /= psb_success_) then 
       write(psb_err_unit,*) 'Memory allocation failure in heap_insert'
       info = -5
@@ -234,9 +236,9 @@ contains
       return
     endif
 
-    call psb_ensure_size(heap%last+1,heap%keys,info,addsz=psb_heap_resize)
+    call psb_ensure_size(heap%last+1,heap%keys,info,addsz=(1_psb_ipk_)*psb_heap_resize)
     if (info == psb_success_) &
-         & call psb_ensure_size(heap%last+1,heap%idxs,info,addsz=psb_heap_resize)
+         & call psb_ensure_size(heap%last+1,heap%idxs,info,addsz=(1_psb_ipk_)*psb_heap_resize)
     if (info /= psb_success_) then 
       write(psb_err_unit,*) 'Memory allocation failure in heap_insert'
       info = -5
@@ -254,7 +256,7 @@ contains
     class(psb_d_idx_heap), intent(inout) :: heap
     integer(psb_ipk_), intent(out)       :: index
     integer(psb_ipk_), intent(out)       :: info
-    real(psb_dpk_), intent(out)           :: key
+    real(psb_dpk_), intent(inout)       :: key
 
 
     info = psb_success_

base/modules/auxil/psb_e_hsort_mod.f90

@@ -67,8 +67,8 @@ module psb_e_hsort_mod
 
       integer(psb_epk_), intent(in)     :: key
       integer(psb_epk_), intent(inout)  :: heap(:)
-      integer(psb_ipk_), intent(in)     :: dir
-      integer(psb_ipk_), intent(inout)  :: last
+      integer(psb_epk_), intent(in)     :: dir
+      integer(psb_epk_), intent(inout)  :: last
       integer(psb_ipk_), intent(out)    :: info
     end subroutine psi_e_insert_heap
   end interface psi_insert_heap
@@ -88,9 +88,9 @@ module psb_e_hsort_mod
       integer(psb_epk_), intent(in)     :: key
       integer(psb_epk_), intent(inout)  :: heap(:)
       integer(psb_epk_), intent(in)     :: index
-      integer(psb_ipk_), intent(in)     :: dir
+      integer(psb_epk_), intent(in)     :: dir
       integer(psb_epk_), intent(inout)  :: idxs(:)
-      integer(psb_ipk_), intent(inout)  :: last
+      integer(psb_epk_), intent(inout)  :: last
       integer(psb_ipk_), intent(out)    :: info
     end subroutine psi_e_idx_insert_heap
   end interface psi_idx_insert_heap
@@ -100,9 +100,9 @@ module psb_e_hsort_mod
     subroutine psi_e_heap_get_first(key,last,heap,dir,info)
       import 
       implicit none 
-      integer(psb_epk_), intent(inout)  :: key
-      integer(psb_ipk_), intent(inout)  :: last
-      integer(psb_ipk_), intent(in)     :: dir
+      integer(psb_epk_), intent(inout)   :: key
+      integer(psb_epk_), intent(inout) :: last
+      integer(psb_epk_), intent(in)     :: dir
       integer(psb_epk_), intent(inout)  :: heap(:)
       integer(psb_ipk_), intent(out)    :: info
     end subroutine psi_e_heap_get_first
@@ -114,8 +114,8 @@ module psb_e_hsort_mod
       integer(psb_epk_), intent(inout)    :: key
       integer(psb_epk_), intent(out)    :: index
       integer(psb_epk_), intent(inout)    :: heap(:)
-      integer(psb_ipk_), intent(in)     :: dir
-      integer(psb_ipk_), intent(inout)  :: last
+      integer(psb_epk_), intent(in)     :: dir
+      integer(psb_epk_), intent(inout)  :: last
       integer(psb_epk_), intent(inout)  :: idxs(:)
       integer(psb_ipk_), intent(out)    :: info
     end subroutine psi_e_idx_heap_get_first

base/modules/auxil/psb_i2_hsort_mod.f90

@@ -100,8 +100,8 @@ module psb_i2_hsort_mod
     subroutine psi_i2_heap_get_first(key,last,heap,dir,info)
       import 
       implicit none 
-      integer(psb_i2pk_), intent(inout)  :: key
-      integer(psb_ipk_), intent(inout)  :: last
+      integer(psb_i2pk_), intent(inout)   :: key
+      integer(psb_ipk_), intent(inout) :: last
       integer(psb_ipk_), intent(in)     :: dir
       integer(psb_i2pk_), intent(inout)  :: heap(:)
       integer(psb_ipk_), intent(out)    :: info

base/modules/auxil/psb_i_hsort_x_mod.f90

@@ -46,7 +46,8 @@ module psb_i_hsort_x_mod
   use psb_m_hsort_mod
 
   type psb_i_heap
-    integer(psb_ipk_) :: last, dir
+    integer(psb_ipk_) :: dir
+    integer(psb_ipk_) :: last    
     integer(psb_ipk_), allocatable    :: keys(:)
   contains
     procedure, pass(heap) :: init       => psb_i_init_heap
@@ -58,7 +59,8 @@ module psb_i_hsort_x_mod
   end type psb_i_heap
 
   type psb_i_idx_heap
-    integer(psb_ipk_) :: last, dir
+    integer(psb_ipk_) :: dir
+    integer(psb_ipk_) :: last
     integer(psb_ipk_), allocatable    :: keys(:)
     integer(psb_ipk_), allocatable :: idxs(:)
   contains
@@ -122,7 +124,7 @@ contains
       return
     endif
 
-    call psb_ensure_size(heap%last+1,heap%keys,info,addsz=psb_heap_resize)
+    call psb_ensure_size(heap%last+1,heap%keys,info,addsz=(1_psb_ipk_)*psb_heap_resize)
     if (info /= psb_success_) then 
       write(psb_err_unit,*) 'Memory allocation failure in heap_insert'
       info = -5
@@ -235,9 +237,9 @@ contains
       return
     endif
 
-    call psb_ensure_size(heap%last+1,heap%keys,info,addsz=psb_heap_resize)
+    call psb_ensure_size(heap%last+1,heap%keys,info,addsz=(1_psb_ipk_)*psb_heap_resize)
     if (info == psb_success_) &
-         & call psb_ensure_size(heap%last+1,heap%idxs,info,addsz=psb_heap_resize)
+         & call psb_ensure_size(heap%last+1,heap%idxs,info,addsz=(1_psb_ipk_)*psb_heap_resize)
     if (info /= psb_success_) then 
       write(psb_err_unit,*) 'Memory allocation failure in heap_insert'
       info = -5
@@ -255,7 +257,7 @@ contains
     class(psb_i_idx_heap), intent(inout) :: heap
     integer(psb_ipk_), intent(out)       :: index
     integer(psb_ipk_), intent(out)       :: info
-    integer(psb_ipk_), intent(out)           :: key
+    integer(psb_ipk_), intent(inout)       :: key
 
 
     info = psb_success_

base/modules/auxil/psb_l_hsort_x_mod.f90

@@ -46,7 +46,8 @@ module psb_l_hsort_x_mod
   use psb_m_hsort_mod
 
   type psb_l_heap
-    integer(psb_ipk_) :: last, dir
+    integer(psb_lpk_) :: dir
+    integer(psb_lpk_) :: last    
     integer(psb_lpk_), allocatable    :: keys(:)
   contains
     procedure, pass(heap) :: init       => psb_l_init_heap
@@ -58,7 +59,8 @@ module psb_l_hsort_x_mod
   end type psb_l_heap
 
   type psb_l_idx_heap
-    integer(psb_ipk_) :: last, dir
+    integer(psb_lpk_) :: dir
+    integer(psb_lpk_) :: last
     integer(psb_lpk_), allocatable    :: keys(:)
     integer(psb_lpk_), allocatable :: idxs(:)
   contains
@@ -122,7 +124,7 @@ contains
       return
     endif
 
-    call psb_ensure_size(heap%last+1,heap%keys,info,addsz=psb_heap_resize)
+    call psb_ensure_size(heap%last+1,heap%keys,info,addsz=(1_psb_lpk_)*psb_heap_resize)
     if (info /= psb_success_) then 
       write(psb_err_unit,*) 'Memory allocation failure in heap_insert'
       info = -5
@@ -235,9 +237,9 @@ contains
       return
     endif
 
-    call psb_ensure_size(heap%last+1,heap%keys,info,addsz=psb_heap_resize)
+    call psb_ensure_size(heap%last+1,heap%keys,info,addsz=(1_psb_lpk_)*psb_heap_resize)
     if (info == psb_success_) &
-         & call psb_ensure_size(heap%last+1,heap%idxs,info,addsz=psb_heap_resize)
+         & call psb_ensure_size(heap%last+1,heap%idxs,info,addsz=(1_psb_lpk_)*psb_heap_resize)
     if (info /= psb_success_) then 
       write(psb_err_unit,*) 'Memory allocation failure in heap_insert'
       info = -5
@@ -255,7 +257,7 @@ contains
     class(psb_l_idx_heap), intent(inout) :: heap
     integer(psb_lpk_), intent(out)       :: index
     integer(psb_ipk_), intent(out)       :: info
-    integer(psb_lpk_), intent(out)           :: key
+    integer(psb_lpk_), intent(inout)       :: key
 
 
     info = psb_success_

base/modules/auxil/psb_m_hsort_mod.f90

@@ -100,8 +100,8 @@ module psb_m_hsort_mod
     subroutine psi_m_heap_get_first(key,last,heap,dir,info)
       import 
       implicit none 
-      integer(psb_mpk_), intent(inout)  :: key
-      integer(psb_ipk_), intent(inout)  :: last
+      integer(psb_mpk_), intent(inout)   :: key
+      integer(psb_ipk_), intent(inout) :: last
       integer(psb_ipk_), intent(in)     :: dir
       integer(psb_mpk_), intent(inout)  :: heap(:)
       integer(psb_ipk_), intent(out)    :: info

base/modules/auxil/psb_s_hsort_mod.f90

@@ -100,8 +100,8 @@ module psb_s_hsort_mod
     subroutine psi_s_heap_get_first(key,last,heap,dir,info)
       import 
       implicit none 
-      real(psb_spk_), intent(inout)  :: key
-      integer(psb_ipk_), intent(inout)  :: last
+      real(psb_spk_), intent(inout)   :: key
+      integer(psb_ipk_), intent(inout) :: last
       integer(psb_ipk_), intent(in)     :: dir
       real(psb_spk_), intent(inout)  :: heap(:)
       integer(psb_ipk_), intent(out)    :: info

base/modules/auxil/psb_s_hsort_x_mod.f90

@@ -45,7 +45,8 @@ module psb_s_hsort_x_mod
   use psb_s_hsort_mod
 
   type psb_s_heap
-    integer(psb_ipk_) :: last, dir
+    integer(psb_ipk_) :: dir
+    integer(psb_ipk_) :: last    
     real(psb_spk_), allocatable    :: keys(:)
   contains
     procedure, pass(heap) :: init       => psb_s_init_heap
@@ -57,7 +58,8 @@ module psb_s_hsort_x_mod
   end type psb_s_heap
 
   type psb_s_idx_heap
-    integer(psb_ipk_) :: last, dir
+    integer(psb_ipk_) :: dir
+    integer(psb_ipk_) :: last
     real(psb_spk_), allocatable    :: keys(:)
     integer(psb_ipk_), allocatable :: idxs(:)
   contains
@@ -121,7 +123,7 @@ contains
       return
     endif
 
-    call psb_ensure_size(heap%last+1,heap%keys,info,addsz=psb_heap_resize)
+    call psb_ensure_size(heap%last+1,heap%keys,info,addsz=(1_psb_ipk_)*psb_heap_resize)
     if (info /= psb_success_) then 
       write(psb_err_unit,*) 'Memory allocation failure in heap_insert'
       info = -5
@@ -234,9 +236,9 @@ contains
       return
     endif
 
-    call psb_ensure_size(heap%last+1,heap%keys,info,addsz=psb_heap_resize)
+    call psb_ensure_size(heap%last+1,heap%keys,info,addsz=(1_psb_ipk_)*psb_heap_resize)
     if (info == psb_success_) &
-         & call psb_ensure_size(heap%last+1,heap%idxs,info,addsz=psb_heap_resize)
+         & call psb_ensure_size(heap%last+1,heap%idxs,info,addsz=(1_psb_ipk_)*psb_heap_resize)
     if (info /= psb_success_) then 
       write(psb_err_unit,*) 'Memory allocation failure in heap_insert'
       info = -5
@@ -254,7 +256,7 @@ contains
     class(psb_s_idx_heap), intent(inout) :: heap
     integer(psb_ipk_), intent(out)       :: index
     integer(psb_ipk_), intent(out)       :: info
-    real(psb_spk_), intent(out)           :: key
+    real(psb_spk_), intent(inout)       :: key
 
 
     info = psb_success_

base/modules/auxil/psb_z_hsort_mod.f90

@@ -100,8 +100,8 @@ module psb_z_hsort_mod
     subroutine psi_z_heap_get_first(key,last,heap,dir,info)
       import 
       implicit none 
-      complex(psb_dpk_), intent(inout)  :: key
-      integer(psb_ipk_), intent(inout)  :: last
+      complex(psb_dpk_), intent(inout)   :: key
+      integer(psb_ipk_), intent(inout) :: last
       integer(psb_ipk_), intent(in)     :: dir
       complex(psb_dpk_), intent(inout)  :: heap(:)
       integer(psb_ipk_), intent(out)    :: info

base/modules/auxil/psb_z_hsort_x_mod.f90

@@ -45,7 +45,8 @@ module psb_z_hsort_x_mod
   use psb_z_hsort_mod
 
   type psb_z_heap
-    integer(psb_ipk_) :: last, dir
+    integer(psb_ipk_) :: dir
+    integer(psb_ipk_) :: last    
     complex(psb_dpk_), allocatable    :: keys(:)
   contains
     procedure, pass(heap) :: init       => psb_z_init_heap
@@ -57,7 +58,8 @@ module psb_z_hsort_x_mod
   end type psb_z_heap
 
   type psb_z_idx_heap
-    integer(psb_ipk_) :: last, dir
+    integer(psb_ipk_) :: dir
+    integer(psb_ipk_) :: last
     complex(psb_dpk_), allocatable    :: keys(:)
     integer(psb_ipk_), allocatable :: idxs(:)
   contains
@@ -121,7 +123,7 @@ contains
       return
     endif
 
-    call psb_ensure_size(heap%last+1,heap%keys,info,addsz=psb_heap_resize)
+    call psb_ensure_size(heap%last+1,heap%keys,info,addsz=(1_psb_ipk_)*psb_heap_resize)
     if (info /= psb_success_) then 
       write(psb_err_unit,*) 'Memory allocation failure in heap_insert'
       info = -5
@@ -234,9 +236,9 @@ contains
       return
     endif
 
-    call psb_ensure_size(heap%last+1,heap%keys,info,addsz=psb_heap_resize)
+    call psb_ensure_size(heap%last+1,heap%keys,info,addsz=(1_psb_ipk_)*psb_heap_resize)
     if (info == psb_success_) &
-         & call psb_ensure_size(heap%last+1,heap%idxs,info,addsz=psb_heap_resize)
+         & call psb_ensure_size(heap%last+1,heap%idxs,info,addsz=(1_psb_ipk_)*psb_heap_resize)
     if (info /= psb_success_) then 
       write(psb_err_unit,*) 'Memory allocation failure in heap_insert'
       info = -5
@@ -254,7 +256,7 @@ contains
     class(psb_z_idx_heap), intent(inout) :: heap
     integer(psb_ipk_), intent(out)       :: index
     integer(psb_ipk_), intent(out)       :: info
-    complex(psb_dpk_), intent(out)           :: key
+    complex(psb_dpk_), intent(inout)       :: key
 
 
     info = psb_success_

base/modules/auxil/psi_c_serial_mod.f90

@@ -93,7 +93,7 @@ module psi_c_serial_mod
       integer(psb_ipk_), intent(in)      :: m
       complex(psb_spk_), intent (in)       ::  x(:)
       complex(psb_spk_), intent (in)       ::  y(:)
-      complex(psb_spk_), intent (in)       ::  z(:)
+      complex(psb_spk_), intent (inout)    ::  z(:)
       complex(psb_spk_), intent (in)       :: alpha, beta
       integer(psb_ipk_), intent(out)     :: info
     end subroutine psi_caxpbyv2

base/modules/auxil/psi_d_serial_mod.f90

@@ -93,7 +93,7 @@ module psi_d_serial_mod
       integer(psb_ipk_), intent(in)      :: m
       real(psb_dpk_), intent (in)       ::  x(:)
       real(psb_dpk_), intent (in)       ::  y(:)
-      real(psb_dpk_), intent (in)       ::  z(:)
+      real(psb_dpk_), intent (inout)    ::  z(:)
       real(psb_dpk_), intent (in)       :: alpha, beta
       integer(psb_ipk_), intent(out)     :: info
     end subroutine psi_daxpbyv2

base/modules/auxil/psi_e_serial_mod.f90

@@ -93,7 +93,7 @@ module psi_e_serial_mod
       integer(psb_ipk_), intent(in)      :: m
       integer(psb_epk_), intent (in)       ::  x(:)
       integer(psb_epk_), intent (in)       ::  y(:)
-      integer(psb_epk_), intent (in)       ::  z(:)
+      integer(psb_epk_), intent (inout)    ::  z(:)
       integer(psb_epk_), intent (in)       :: alpha, beta
       integer(psb_ipk_), intent(out)     :: info
     end subroutine psi_eaxpbyv2

base/modules/auxil/psi_i2_serial_mod.f90

@@ -93,7 +93,7 @@ module psi_i2_serial_mod
       integer(psb_ipk_), intent(in)      :: m
       integer(psb_i2pk_), intent (in)       ::  x(:)
       integer(psb_i2pk_), intent (in)       ::  y(:)
-      integer(psb_i2pk_), intent (in)       ::  z(:)
+      integer(psb_i2pk_), intent (inout)    ::  z(:)
       integer(psb_i2pk_), intent (in)       :: alpha, beta
       integer(psb_ipk_), intent(out)     :: info
     end subroutine psi_i2axpbyv2

base/modules/auxil/psi_m_serial_mod.f90

@@ -93,7 +93,7 @@ module psi_m_serial_mod
       integer(psb_ipk_), intent(in)      :: m
       integer(psb_mpk_), intent (in)       ::  x(:)
       integer(psb_mpk_), intent (in)       ::  y(:)
-      integer(psb_mpk_), intent (in)       ::  z(:)
+      integer(psb_mpk_), intent (inout)    ::  z(:)
       integer(psb_mpk_), intent (in)       :: alpha, beta
       integer(psb_ipk_), intent(out)     :: info
     end subroutine psi_maxpbyv2

base/modules/auxil/psi_s_serial_mod.f90

@@ -93,7 +93,7 @@ module psi_s_serial_mod
       integer(psb_ipk_), intent(in)      :: m
       real(psb_spk_), intent (in)       ::  x(:)
       real(psb_spk_), intent (in)       ::  y(:)
-      real(psb_spk_), intent (in)       ::  z(:)
+      real(psb_spk_), intent (inout)    ::  z(:)
       real(psb_spk_), intent (in)       :: alpha, beta
       integer(psb_ipk_), intent(out)     :: info
     end subroutine psi_saxpbyv2

base/modules/auxil/psi_z_serial_mod.f90

@@ -93,7 +93,7 @@ module psi_z_serial_mod
       integer(psb_ipk_), intent(in)      :: m
       complex(psb_dpk_), intent (in)       ::  x(:)
       complex(psb_dpk_), intent (in)       ::  y(:)
-      complex(psb_dpk_), intent (in)       ::  z(:)
+      complex(psb_dpk_), intent (inout)    ::  z(:)
       complex(psb_dpk_), intent (in)       :: alpha, beta
       integer(psb_ipk_), intent(out)     :: info
     end subroutine psi_zaxpbyv2

base/modules/desc/psb_indx_map_mod.f90

@@ -296,7 +296,7 @@ module psb_indx_map_mod
       implicit none 
       integer(psb_lpk_), intent(in)   :: idx(:)
       integer(psb_ipk_), allocatable, intent(out)   ::  iprc(:)
-      integer(psb_ipk_), allocatable, intent(inout) :: adj(:)
+      integer(psb_ipk_), intent(inout) :: adj(:)
       class(psb_indx_map), intent(in) :: idxmap
       integer(psb_ipk_), intent(out)  :: info
     end subroutine psi_adjcncy_fnd_owner

base/modules/psi_i_mod.F90

@@ -87,10 +87,10 @@ module psi_i_mod
     subroutine psi_i_csr_sort_dl(dl_ptr,c_dep_list,l_dep_list,ctxt,info)
       import
       implicit none 
-      integer(psb_ipk_), intent(in) :: c_dep_list(:), dl_ptr(0:)
-      integer(psb_ipk_), intent(inout) :: l_dep_list(0:)
-      type(psb_ctxt_type) :: ctxt
-      integer(psb_ipk_) :: info
+      integer(psb_ipk_), intent(in) :: dl_ptr(0:)
+      integer(psb_ipk_), intent(inout)  :: c_dep_list(:), l_dep_list(0:)
+      type(psb_ctxt_type), intent(in) :: ctxt
+      integer(psb_ipk_), intent(out) :: info
     end subroutine psi_i_csr_sort_dl
   end interface
 

base/psblas/psb_caxpby.f90

@@ -642,7 +642,7 @@ subroutine  psb_caxpbyvout(alpha, x, beta,y, z, desc_a,info)
   end if
 
   if(desc_a%get_local_rows() > 0) then
-    call caxpby(desc_a%get_local_cols(),ione,&
+    call caxpbyv2(desc_a%get_local_cols(),ione,&
          & alpha,x,lldx,beta,&
          & y,lldy,z,lldz,info)
   end if

base/psblas/psb_daxpby.f90

@@ -642,7 +642,7 @@ subroutine  psb_daxpbyvout(alpha, x, beta,y, z, desc_a,info)
   end if
 
   if(desc_a%get_local_rows() > 0) then
-    call daxpby(desc_a%get_local_cols(),ione,&
+    call daxpbyv2(desc_a%get_local_cols(),ione,&
          & alpha,x,lldx,beta,&
          & y,lldy,z,lldz,info)
   end if

base/psblas/psb_saxpby.f90

@@ -642,7 +642,7 @@ subroutine  psb_saxpbyvout(alpha, x, beta,y, z, desc_a,info)
   end if
 
   if(desc_a%get_local_rows() > 0) then
-    call saxpby(desc_a%get_local_cols(),ione,&
+    call saxpbyv2(desc_a%get_local_cols(),ione,&
          & alpha,x,lldx,beta,&
          & y,lldy,z,lldz,info)
   end if

base/psblas/psb_zaxpby.f90

@@ -642,7 +642,7 @@ subroutine  psb_zaxpbyvout(alpha, x, beta,y, z, desc_a,info)
   end if
 
   if(desc_a%get_local_rows() > 0) then
-    call zaxpby(desc_a%get_local_cols(),ione,&
+    call zaxpbyv2(desc_a%get_local_cols(),ione,&
          & alpha,x,lldx,beta,&
          & y,lldy,z,lldz,info)
   end if

base/serial/impl/psb_c_coo_impl.F90

@@ -4616,7 +4616,7 @@ function psb_lc_coo_csnm1(a) result(res)
   use psb_c_base_mat_mod, psb_protect_name => psb_lc_coo_csnm1
 
   implicit none
-  class(psb_c_coo_sparse_mat), intent(in) :: a
+  class(psb_lc_coo_sparse_mat), intent(in) :: a
   real(psb_spk_)         :: res
 
   integer(psb_lpk_) :: i,j,k,m,n, nnz, ir, jc, nc, info

base/serial/impl/psb_d_coo_impl.F90

@@ -4616,7 +4616,7 @@ function psb_ld_coo_csnm1(a) result(res)
   use psb_d_base_mat_mod, psb_protect_name => psb_ld_coo_csnm1
 
   implicit none
-  class(psb_d_coo_sparse_mat), intent(in) :: a
+  class(psb_ld_coo_sparse_mat), intent(in) :: a
   real(psb_dpk_)         :: res
 
   integer(psb_lpk_) :: i,j,k,m,n, nnz, ir, jc, nc, info

base/serial/impl/psb_s_coo_impl.F90

@@ -4616,7 +4616,7 @@ function psb_ls_coo_csnm1(a) result(res)
   use psb_s_base_mat_mod, psb_protect_name => psb_ls_coo_csnm1
 
   implicit none
-  class(psb_s_coo_sparse_mat), intent(in) :: a
+  class(psb_ls_coo_sparse_mat), intent(in) :: a
   real(psb_spk_)         :: res
 
   integer(psb_lpk_) :: i,j,k,m,n, nnz, ir, jc, nc, info

base/serial/impl/psb_z_coo_impl.F90

@@ -4616,7 +4616,7 @@ function psb_lz_coo_csnm1(a) result(res)
   use psb_z_base_mat_mod, psb_protect_name => psb_lz_coo_csnm1
 
   implicit none
-  class(psb_z_coo_sparse_mat), intent(in) :: a
+  class(psb_lz_coo_sparse_mat), intent(in) :: a
   real(psb_dpk_)         :: res
 
   integer(psb_lpk_) :: i,j,k,m,n, nnz, ir, jc, nc, info

base/serial/sort/psb_c_hsort_impl.f90

@@ -49,7 +49,8 @@ subroutine psb_chsort(x,ix,dir,flag)
   integer(psb_ipk_), optional, intent(in)    :: dir, flag
   integer(psb_ipk_), optional, intent(inout) :: ix(:)
 
-  integer(psb_ipk_) :: dir_, flag_, n, i, l, err_act,info
+  integer(psb_ipk_) :: flag_, n, i, err_act,info
+  integer(psb_ipk_) :: dir_, l
   complex(psb_spk_) :: key
   integer(psb_ipk_) :: index
 
@@ -159,7 +160,7 @@ end subroutine psb_chsort
 
 !
 ! These are packaged so that they can be used to implement 
-! a heapsort, should the need arise
+! a heapsort.
 !
 !
 !   Programming note:
@@ -646,7 +647,8 @@ subroutine psi_c_idx_insert_heap(key,index,last,heap,idxs,dir,info)
   !   dir:  sorting direction
 
   complex(psb_spk_), intent(in)    :: key
-  integer(psb_ipk_), intent(in)              :: index,dir
+  integer(psb_ipk_), intent(in)     :: index
+  integer(psb_ipk_), intent(in)     :: dir
   complex(psb_spk_), intent(inout) :: heap(:)
   integer(psb_ipk_), intent(inout)           :: idxs(:)
   integer(psb_ipk_), intent(inout)           :: last

base/serial/sort/psb_d_hsort_impl.f90

@@ -49,7 +49,8 @@ subroutine psb_dhsort(x,ix,dir,flag)
   integer(psb_ipk_), optional, intent(in)    :: dir, flag
   integer(psb_ipk_), optional, intent(inout) :: ix(:)
 
-  integer(psb_ipk_) :: dir_, flag_, n, i, l, err_act,info
+  integer(psb_ipk_) :: flag_, n, i, err_act,info
+  integer(psb_ipk_) :: dir_, l
   real(psb_dpk_) :: key
   integer(psb_ipk_) :: index
 
@@ -159,7 +160,7 @@ end subroutine psb_dhsort
 
 !
 ! These are packaged so that they can be used to implement 
-! a heapsort, should the need arise
+! a heapsort.
 !
 !
 !   Programming note:
@@ -540,11 +541,12 @@ subroutine psi_d_idx_heap_get_first(key,index,last,heap,idxs,dir,info)
   use psb_sort_mod, psb_protect_name => psi_d_idx_heap_get_first
   implicit none 
 
+  real(psb_dpk_), intent(inout)    :: key
   real(psb_dpk_), intent(inout)    :: heap(:)
-  integer(psb_ipk_), intent(out)    :: index,info
+  integer(psb_ipk_), intent(out)    :: index
+  integer(psb_ipk_), intent(out)    :: info
   integer(psb_ipk_), intent(inout)  :: last,idxs(:)
   integer(psb_ipk_), intent(in)     :: dir
-  real(psb_dpk_), intent(out)      :: key
 
   integer(psb_ipk_) :: i, j,itemp
   real(psb_dpk_)   :: temp

base/serial/sort/psb_e_hsort_impl.f90

@@ -49,7 +49,8 @@ subroutine psb_ehsort(x,ix,dir,flag)
   integer(psb_ipk_), optional, intent(in)    :: dir, flag
   integer(psb_epk_), optional, intent(inout) :: ix(:)
 
-  integer(psb_ipk_) :: dir_, flag_, n, i, l, err_act,info
+  integer(psb_ipk_) :: flag_, n, i, err_act,info
+  integer(psb_epk_) :: dir_, l
   integer(psb_epk_) :: key
   integer(psb_epk_) :: index
 
@@ -159,7 +160,7 @@ end subroutine psb_ehsort
 
 !
 ! These are packaged so that they can be used to implement 
-! a heapsort, should the need arise
+! a heapsort.
 !
 !
 !   Programming note:
@@ -196,7 +197,7 @@ subroutine psi_e_insert_heap(key,last,heap,dir,info)
   !   dir:  sorting direction
 
   integer(psb_epk_), intent(in)    :: key
-  integer(psb_ipk_), intent(in)           :: dir
+  integer(psb_epk_), intent(in)           :: dir
   integer(psb_epk_), intent(inout) :: heap(:)
   integer(psb_epk_), intent(inout)        :: last
   integer(psb_ipk_), intent(out)          :: info
@@ -296,7 +297,7 @@ subroutine psi_e_heap_get_first(key,last,heap,dir,info)
 
   integer(psb_epk_), intent(inout)     :: key
   integer(psb_epk_), intent(inout)  :: last
-  integer(psb_ipk_), intent(in)     :: dir
+  integer(psb_epk_), intent(in)     :: dir
   integer(psb_epk_), intent(inout)     :: heap(:)
   integer(psb_ipk_), intent(out)    :: info
 
@@ -428,9 +429,9 @@ subroutine psi_e_idx_insert_heap(key,index,last,heap,idxs,dir,info)
   !   dir:  sorting direction
 
   integer(psb_epk_), intent(in)       :: key
-  integer(psb_ipk_), intent(in)     :: index,dir
+  integer(psb_epk_), intent(in)     :: index,dir
   integer(psb_epk_), intent(inout)    :: heap(:)
-  integer(psb_ipk_), intent(inout)  :: idxs(:),last
+  integer(psb_epk_), intent(inout)  :: idxs(:),last
   integer(psb_ipk_), intent(out)    :: info
   integer(psb_ipk_) :: i, i2, itemp
   integer(psb_epk_)   :: temp 
@@ -540,11 +541,12 @@ subroutine psi_e_idx_heap_get_first(key,index,last,heap,idxs,dir,info)
   use psb_sort_mod, psb_protect_name => psi_e_idx_heap_get_first
   implicit none 
 
+  integer(psb_epk_), intent(inout)    :: key
   integer(psb_epk_), intent(inout)    :: heap(:)
-  integer(psb_ipk_), intent(out)    :: index,info
-  integer(psb_ipk_), intent(inout)  :: last,idxs(:)
-  integer(psb_ipk_), intent(in)     :: dir
-  integer(psb_epk_), intent(out)      :: key
+  integer(psb_epk_), intent(out)    :: index
+  integer(psb_ipk_), intent(out)    :: info
+  integer(psb_epk_), intent(inout)  :: last,idxs(:)
+  integer(psb_epk_), intent(in)     :: dir
 
   integer(psb_ipk_) :: i, j,itemp
   integer(psb_epk_)   :: temp

base/serial/sort/psb_m_hsort_impl.f90

@@ -49,7 +49,8 @@ subroutine psb_mhsort(x,ix,dir,flag)
   integer(psb_ipk_), optional, intent(in)    :: dir, flag
   integer(psb_ipk_), optional, intent(inout) :: ix(:)
 
-  integer(psb_ipk_) :: dir_, flag_, n, i, l, err_act,info
+  integer(psb_ipk_) :: flag_, n, i, err_act,info
+  integer(psb_ipk_) :: dir_, l
   integer(psb_mpk_) :: key
   integer(psb_ipk_) :: index
 
@@ -159,7 +160,7 @@ end subroutine psb_mhsort
 
 !
 ! These are packaged so that they can be used to implement 
-! a heapsort, should the need arise
+! a heapsort.
 !
 !
 !   Programming note:
@@ -540,11 +541,12 @@ subroutine psi_m_idx_heap_get_first(key,index,last,heap,idxs,dir,info)
   use psb_sort_mod, psb_protect_name => psi_m_idx_heap_get_first
   implicit none 
 
+  integer(psb_mpk_), intent(inout)    :: key
   integer(psb_mpk_), intent(inout)    :: heap(:)
-  integer(psb_ipk_), intent(out)    :: index,info
+  integer(psb_ipk_), intent(out)    :: index
+  integer(psb_ipk_), intent(out)    :: info
   integer(psb_ipk_), intent(inout)  :: last,idxs(:)
   integer(psb_ipk_), intent(in)     :: dir
-  integer(psb_mpk_), intent(out)      :: key
 
   integer(psb_ipk_) :: i, j,itemp
   integer(psb_mpk_)   :: temp

base/serial/sort/psb_s_hsort_impl.f90

@@ -49,7 +49,8 @@ subroutine psb_shsort(x,ix,dir,flag)
   integer(psb_ipk_), optional, intent(in)    :: dir, flag
   integer(psb_ipk_), optional, intent(inout) :: ix(:)
 
-  integer(psb_ipk_) :: dir_, flag_, n, i, l, err_act,info
+  integer(psb_ipk_) :: flag_, n, i, err_act,info
+  integer(psb_ipk_) :: dir_, l
   real(psb_spk_) :: key
   integer(psb_ipk_) :: index
 
@@ -159,7 +160,7 @@ end subroutine psb_shsort
 
 !
 ! These are packaged so that they can be used to implement 
-! a heapsort, should the need arise
+! a heapsort.
 !
 !
 !   Programming note:
@@ -540,11 +541,12 @@ subroutine psi_s_idx_heap_get_first(key,index,last,heap,idxs,dir,info)
   use psb_sort_mod, psb_protect_name => psi_s_idx_heap_get_first
   implicit none 
 
+  real(psb_spk_), intent(inout)    :: key
   real(psb_spk_), intent(inout)    :: heap(:)
-  integer(psb_ipk_), intent(out)    :: index,info
+  integer(psb_ipk_), intent(out)    :: index
+  integer(psb_ipk_), intent(out)    :: info
   integer(psb_ipk_), intent(inout)  :: last,idxs(:)
   integer(psb_ipk_), intent(in)     :: dir
-  real(psb_spk_), intent(out)      :: key
 
   integer(psb_ipk_) :: i, j,itemp
   real(psb_spk_)   :: temp

base/serial/sort/psb_z_hsort_impl.f90

@@ -49,7 +49,8 @@ subroutine psb_zhsort(x,ix,dir,flag)
   integer(psb_ipk_), optional, intent(in)    :: dir, flag
   integer(psb_ipk_), optional, intent(inout) :: ix(:)
 
-  integer(psb_ipk_) :: dir_, flag_, n, i, l, err_act,info
+  integer(psb_ipk_) :: flag_, n, i, err_act,info
+  integer(psb_ipk_) :: dir_, l
   complex(psb_dpk_) :: key
   integer(psb_ipk_) :: index
 
@@ -159,7 +160,7 @@ end subroutine psb_zhsort
 
 !
 ! These are packaged so that they can be used to implement 
-! a heapsort, should the need arise
+! a heapsort.
 !
 !
 !   Programming note:
@@ -646,7 +647,8 @@ subroutine psi_z_idx_insert_heap(key,index,last,heap,idxs,dir,info)
   !   dir:  sorting direction
 
   complex(psb_dpk_), intent(in)    :: key
-  integer(psb_ipk_), intent(in)              :: index,dir
+  integer(psb_ipk_), intent(in)     :: index
+  integer(psb_ipk_), intent(in)     :: dir
   complex(psb_dpk_), intent(inout) :: heap(:)
   integer(psb_ipk_), intent(inout)           :: idxs(:)
   integer(psb_ipk_), intent(inout)           :: last