diff --git a/base/comm/psb_dgather.f90 b/base/comm/psb_dgather.f90 index c1619b1b..8109d506 100644 --- a/base/comm/psb_dgather.f90 +++ b/base/comm/psb_dgather.f90 @@ -64,7 +64,7 @@ subroutine psb_dgather_vect(globx, locx, desc_a, info, iroot) real(psb_dpk_), allocatable :: llocx(:) character(len=20) :: name, ch_err - name='psb_dgatherv' + name='psb_cgatherv' info=psb_success_ call psb_erractionsave(err_act) if (psb_errstatus_fatal()) then @@ -182,7 +182,7 @@ subroutine psb_dgather_multivect(globx, locx, desc_a, info, iroot) real(psb_dpk_), allocatable :: llocx(:,:) character(len=20) :: name, ch_err - name='psb_dgatherv' + name='psb_cgatherv' info=psb_success_ call psb_erractionsave(err_act) if (psb_errstatus_fatal()) then diff --git a/base/comm/psb_igather.f90 b/base/comm/psb_igather.f90 index afa794eb..2a01ee44 100644 --- a/base/comm/psb_igather.f90 +++ b/base/comm/psb_igather.f90 @@ -64,7 +64,7 @@ subroutine psb_igather_vect(globx, locx, desc_a, info, iroot) integer(psb_ipk_), allocatable :: llocx(:) character(len=20) :: name, ch_err - name='psb_igatherv' + name='psb_cgatherv' info=psb_success_ call psb_erractionsave(err_act) if (psb_errstatus_fatal()) then @@ -182,7 +182,7 @@ subroutine psb_igather_multivect(globx, locx, desc_a, info, iroot) integer(psb_ipk_), allocatable :: llocx(:,:) character(len=20) :: name, ch_err - name='psb_igatherv' + name='psb_cgatherv' info=psb_success_ call psb_erractionsave(err_act) if (psb_errstatus_fatal()) then diff --git a/base/comm/psb_lgather.f90 b/base/comm/psb_lgather.f90 index 00af3cd1..eeb5a25d 100644 --- a/base/comm/psb_lgather.f90 +++ b/base/comm/psb_lgather.f90 @@ -64,7 +64,7 @@ subroutine psb_lgather_vect(globx, locx, desc_a, info, iroot) integer(psb_lpk_), allocatable :: llocx(:) character(len=20) :: name, ch_err - name='psb_lgatherv' + name='psb_cgatherv' info=psb_success_ call psb_erractionsave(err_act) if (psb_errstatus_fatal()) then @@ -182,7 +182,7 @@ subroutine psb_lgather_multivect(globx, locx, desc_a, info, iroot) integer(psb_lpk_), allocatable :: llocx(:,:) character(len=20) :: name, ch_err - name='psb_lgatherv' + name='psb_cgatherv' info=psb_success_ call psb_erractionsave(err_act) if (psb_errstatus_fatal()) then diff --git a/base/comm/psb_sgather.f90 b/base/comm/psb_sgather.f90 index 21ce1408..857f5fd6 100644 --- a/base/comm/psb_sgather.f90 +++ b/base/comm/psb_sgather.f90 @@ -64,7 +64,7 @@ subroutine psb_sgather_vect(globx, locx, desc_a, info, iroot) real(psb_spk_), allocatable :: llocx(:) character(len=20) :: name, ch_err - name='psb_sgatherv' + name='psb_cgatherv' info=psb_success_ call psb_erractionsave(err_act) if (psb_errstatus_fatal()) then @@ -182,7 +182,7 @@ subroutine psb_sgather_multivect(globx, locx, desc_a, info, iroot) real(psb_spk_), allocatable :: llocx(:,:) character(len=20) :: name, ch_err - name='psb_sgatherv' + name='psb_cgatherv' info=psb_success_ call psb_erractionsave(err_act) if (psb_errstatus_fatal()) then diff --git a/base/comm/psb_zgather.f90 b/base/comm/psb_zgather.f90 index 53cba210..b163094a 100644 --- a/base/comm/psb_zgather.f90 +++ b/base/comm/psb_zgather.f90 @@ -64,7 +64,7 @@ subroutine psb_zgather_vect(globx, locx, desc_a, info, iroot) complex(psb_dpk_), allocatable :: llocx(:) character(len=20) :: name, ch_err - name='psb_zgatherv' + name='psb_cgatherv' info=psb_success_ call psb_erractionsave(err_act) if (psb_errstatus_fatal()) then @@ -182,7 +182,7 @@ subroutine psb_zgather_multivect(globx, locx, desc_a, info, iroot) complex(psb_dpk_), allocatable :: llocx(:,:) character(len=20) :: name, ch_err - name='psb_zgatherv' + name='psb_cgatherv' info=psb_success_ call psb_erractionsave(err_act) if (psb_errstatus_fatal()) then diff --git a/base/modules/auxil/psb_c_hsort_mod.f90 b/base/modules/auxil/psb_c_hsort_mod.f90 index e7eb2fbf..43b22ec4 100644 --- a/base/modules/auxil/psb_c_hsort_mod.f90 +++ b/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 diff --git a/base/modules/auxil/psb_c_hsort_x_mod.f90 b/base/modules/auxil/psb_c_hsort_x_mod.f90 index c0e39411..4331c567 100644 --- a/base/modules/auxil/psb_c_hsort_x_mod.f90 +++ b/base/modules/auxil/psb_c_hsort_x_mod.f90 @@ -45,8 +45,7 @@ module psb_c_hsort_x_mod use psb_c_hsort_mod type psb_c_heap - integer(psb_ipk_) :: dir - integer(psb_ipk_) :: last + integer(psb_ipk_) :: last, dir complex(psb_spk_), allocatable :: keys(:) contains procedure, pass(heap) :: init => psb_c_init_heap @@ -58,8 +57,7 @@ module psb_c_hsort_x_mod end type psb_c_heap type psb_c_idx_heap - integer(psb_ipk_) :: dir - integer(psb_ipk_) :: last + integer(psb_ipk_) :: last, dir complex(psb_spk_), allocatable :: keys(:) integer(psb_ipk_), allocatable :: idxs(:) contains @@ -123,7 +121,7 @@ contains return endif - call psb_ensure_size(heap%last+1,heap%keys,info,addsz=(1_psb_ipk_)*psb_heap_resize) + call psb_ensure_size(heap%last+1,heap%keys,info,addsz=psb_heap_resize) if (info /= psb_success_) then write(psb_err_unit,*) 'Memory allocation failure in heap_insert' info = -5 @@ -236,9 +234,9 @@ contains return endif - call psb_ensure_size(heap%last+1,heap%keys,info,addsz=(1_psb_ipk_)*psb_heap_resize) + call psb_ensure_size(heap%last+1,heap%keys,info,addsz=psb_heap_resize) if (info == psb_success_) & - & call psb_ensure_size(heap%last+1,heap%idxs,info,addsz=(1_psb_ipk_)*psb_heap_resize) + & call psb_ensure_size(heap%last+1,heap%idxs,info,addsz=psb_heap_resize) if (info /= psb_success_) then write(psb_err_unit,*) 'Memory allocation failure in heap_insert' info = -5 @@ -256,7 +254,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(inout) :: key + complex(psb_spk_), intent(out) :: key info = psb_success_ diff --git a/base/modules/auxil/psb_d_hsort_mod.f90 b/base/modules/auxil/psb_d_hsort_mod.f90 index 570f27b1..c1a7523c 100644 --- a/base/modules/auxil/psb_d_hsort_mod.f90 +++ b/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 diff --git a/base/modules/auxil/psb_d_hsort_x_mod.f90 b/base/modules/auxil/psb_d_hsort_x_mod.f90 index 7273e972..df290e38 100644 --- a/base/modules/auxil/psb_d_hsort_x_mod.f90 +++ b/base/modules/auxil/psb_d_hsort_x_mod.f90 @@ -45,8 +45,7 @@ module psb_d_hsort_x_mod use psb_d_hsort_mod type psb_d_heap - integer(psb_ipk_) :: dir - integer(psb_ipk_) :: last + integer(psb_ipk_) :: last, dir real(psb_dpk_), allocatable :: keys(:) contains procedure, pass(heap) :: init => psb_d_init_heap @@ -58,8 +57,7 @@ module psb_d_hsort_x_mod end type psb_d_heap type psb_d_idx_heap - integer(psb_ipk_) :: dir - integer(psb_ipk_) :: last + integer(psb_ipk_) :: last, dir real(psb_dpk_), allocatable :: keys(:) integer(psb_ipk_), allocatable :: idxs(:) contains @@ -123,7 +121,7 @@ contains return endif - call psb_ensure_size(heap%last+1,heap%keys,info,addsz=(1_psb_ipk_)*psb_heap_resize) + call psb_ensure_size(heap%last+1,heap%keys,info,addsz=psb_heap_resize) if (info /= psb_success_) then write(psb_err_unit,*) 'Memory allocation failure in heap_insert' info = -5 @@ -236,9 +234,9 @@ contains return endif - call psb_ensure_size(heap%last+1,heap%keys,info,addsz=(1_psb_ipk_)*psb_heap_resize) + call psb_ensure_size(heap%last+1,heap%keys,info,addsz=psb_heap_resize) if (info == psb_success_) & - & call psb_ensure_size(heap%last+1,heap%idxs,info,addsz=(1_psb_ipk_)*psb_heap_resize) + & call psb_ensure_size(heap%last+1,heap%idxs,info,addsz=psb_heap_resize) if (info /= psb_success_) then write(psb_err_unit,*) 'Memory allocation failure in heap_insert' info = -5 @@ -256,7 +254,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(inout) :: key + real(psb_dpk_), intent(out) :: key info = psb_success_ diff --git a/base/modules/auxil/psb_e_hsort_mod.f90 b/base/modules/auxil/psb_e_hsort_mod.f90 index 5433cec4..3ce7ac45 100644 --- a/base/modules/auxil/psb_e_hsort_mod.f90 +++ b/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_epk_), intent(in) :: dir - integer(psb_epk_), intent(inout) :: last + integer(psb_ipk_), intent(in) :: dir + integer(psb_ipk_), 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_epk_), intent(in) :: dir + integer(psb_ipk_), intent(in) :: dir integer(psb_epk_), intent(inout) :: idxs(:) - integer(psb_epk_), intent(inout) :: last + integer(psb_ipk_), 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_epk_), intent(inout) :: last - integer(psb_epk_), intent(in) :: dir + integer(psb_epk_), intent(inout) :: key + integer(psb_ipk_), intent(inout) :: last + integer(psb_ipk_), 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_epk_), intent(in) :: dir - integer(psb_epk_), intent(inout) :: last + integer(psb_ipk_), intent(in) :: dir + integer(psb_ipk_), intent(inout) :: last integer(psb_epk_), intent(inout) :: idxs(:) integer(psb_ipk_), intent(out) :: info end subroutine psi_e_idx_heap_get_first diff --git a/base/modules/auxil/psb_i2_hsort_mod.f90 b/base/modules/auxil/psb_i2_hsort_mod.f90 index 6a6c96de..0878f86e 100644 --- a/base/modules/auxil/psb_i2_hsort_mod.f90 +++ b/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 diff --git a/base/modules/auxil/psb_i_hsort_x_mod.f90 b/base/modules/auxil/psb_i_hsort_x_mod.f90 index 0d1288a6..cf148d20 100644 --- a/base/modules/auxil/psb_i_hsort_x_mod.f90 +++ b/base/modules/auxil/psb_i_hsort_x_mod.f90 @@ -46,8 +46,7 @@ module psb_i_hsort_x_mod use psb_m_hsort_mod type psb_i_heap - integer(psb_ipk_) :: dir - integer(psb_ipk_) :: last + integer(psb_ipk_) :: last, dir integer(psb_ipk_), allocatable :: keys(:) contains procedure, pass(heap) :: init => psb_i_init_heap @@ -59,8 +58,7 @@ module psb_i_hsort_x_mod end type psb_i_heap type psb_i_idx_heap - integer(psb_ipk_) :: dir - integer(psb_ipk_) :: last + integer(psb_ipk_) :: last, dir integer(psb_ipk_), allocatable :: keys(:) integer(psb_ipk_), allocatable :: idxs(:) contains @@ -124,7 +122,7 @@ contains return endif - call psb_ensure_size(heap%last+1,heap%keys,info,addsz=(1_psb_ipk_)*psb_heap_resize) + call psb_ensure_size(heap%last+1,heap%keys,info,addsz=psb_heap_resize) if (info /= psb_success_) then write(psb_err_unit,*) 'Memory allocation failure in heap_insert' info = -5 @@ -237,9 +235,9 @@ contains return endif - call psb_ensure_size(heap%last+1,heap%keys,info,addsz=(1_psb_ipk_)*psb_heap_resize) + call psb_ensure_size(heap%last+1,heap%keys,info,addsz=psb_heap_resize) if (info == psb_success_) & - & call psb_ensure_size(heap%last+1,heap%idxs,info,addsz=(1_psb_ipk_)*psb_heap_resize) + & call psb_ensure_size(heap%last+1,heap%idxs,info,addsz=psb_heap_resize) if (info /= psb_success_) then write(psb_err_unit,*) 'Memory allocation failure in heap_insert' info = -5 @@ -257,7 +255,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(inout) :: key + integer(psb_ipk_), intent(out) :: key info = psb_success_ diff --git a/base/modules/auxil/psb_l_hsort_x_mod.f90 b/base/modules/auxil/psb_l_hsort_x_mod.f90 index 487e8ce9..bf9bd435 100644 --- a/base/modules/auxil/psb_l_hsort_x_mod.f90 +++ b/base/modules/auxil/psb_l_hsort_x_mod.f90 @@ -46,8 +46,7 @@ module psb_l_hsort_x_mod use psb_m_hsort_mod type psb_l_heap - integer(psb_lpk_) :: dir - integer(psb_lpk_) :: last + integer(psb_ipk_) :: last, dir integer(psb_lpk_), allocatable :: keys(:) contains procedure, pass(heap) :: init => psb_l_init_heap @@ -59,8 +58,7 @@ module psb_l_hsort_x_mod end type psb_l_heap type psb_l_idx_heap - integer(psb_lpk_) :: dir - integer(psb_lpk_) :: last + integer(psb_ipk_) :: last, dir integer(psb_lpk_), allocatable :: keys(:) integer(psb_lpk_), allocatable :: idxs(:) contains @@ -124,7 +122,7 @@ contains return endif - call psb_ensure_size(heap%last+1,heap%keys,info,addsz=(1_psb_lpk_)*psb_heap_resize) + call psb_ensure_size(heap%last+1,heap%keys,info,addsz=psb_heap_resize) if (info /= psb_success_) then write(psb_err_unit,*) 'Memory allocation failure in heap_insert' info = -5 @@ -237,9 +235,9 @@ contains return endif - call psb_ensure_size(heap%last+1,heap%keys,info,addsz=(1_psb_lpk_)*psb_heap_resize) + call psb_ensure_size(heap%last+1,heap%keys,info,addsz=psb_heap_resize) if (info == psb_success_) & - & call psb_ensure_size(heap%last+1,heap%idxs,info,addsz=(1_psb_lpk_)*psb_heap_resize) + & call psb_ensure_size(heap%last+1,heap%idxs,info,addsz=psb_heap_resize) if (info /= psb_success_) then write(psb_err_unit,*) 'Memory allocation failure in heap_insert' info = -5 @@ -257,7 +255,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(inout) :: key + integer(psb_lpk_), intent(out) :: key info = psb_success_ diff --git a/base/modules/auxil/psb_m_hsort_mod.f90 b/base/modules/auxil/psb_m_hsort_mod.f90 index 22ffdf34..e2d7aef6 100644 --- a/base/modules/auxil/psb_m_hsort_mod.f90 +++ b/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 diff --git a/base/modules/auxil/psb_s_hsort_mod.f90 b/base/modules/auxil/psb_s_hsort_mod.f90 index 4cee5508..3d30bafd 100644 --- a/base/modules/auxil/psb_s_hsort_mod.f90 +++ b/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 diff --git a/base/modules/auxil/psb_s_hsort_x_mod.f90 b/base/modules/auxil/psb_s_hsort_x_mod.f90 index 34f69ea4..3b395fb1 100644 --- a/base/modules/auxil/psb_s_hsort_x_mod.f90 +++ b/base/modules/auxil/psb_s_hsort_x_mod.f90 @@ -45,8 +45,7 @@ module psb_s_hsort_x_mod use psb_s_hsort_mod type psb_s_heap - integer(psb_ipk_) :: dir - integer(psb_ipk_) :: last + integer(psb_ipk_) :: last, dir real(psb_spk_), allocatable :: keys(:) contains procedure, pass(heap) :: init => psb_s_init_heap @@ -58,8 +57,7 @@ module psb_s_hsort_x_mod end type psb_s_heap type psb_s_idx_heap - integer(psb_ipk_) :: dir - integer(psb_ipk_) :: last + integer(psb_ipk_) :: last, dir real(psb_spk_), allocatable :: keys(:) integer(psb_ipk_), allocatable :: idxs(:) contains @@ -123,7 +121,7 @@ contains return endif - call psb_ensure_size(heap%last+1,heap%keys,info,addsz=(1_psb_ipk_)*psb_heap_resize) + call psb_ensure_size(heap%last+1,heap%keys,info,addsz=psb_heap_resize) if (info /= psb_success_) then write(psb_err_unit,*) 'Memory allocation failure in heap_insert' info = -5 @@ -236,9 +234,9 @@ contains return endif - call psb_ensure_size(heap%last+1,heap%keys,info,addsz=(1_psb_ipk_)*psb_heap_resize) + call psb_ensure_size(heap%last+1,heap%keys,info,addsz=psb_heap_resize) if (info == psb_success_) & - & call psb_ensure_size(heap%last+1,heap%idxs,info,addsz=(1_psb_ipk_)*psb_heap_resize) + & call psb_ensure_size(heap%last+1,heap%idxs,info,addsz=psb_heap_resize) if (info /= psb_success_) then write(psb_err_unit,*) 'Memory allocation failure in heap_insert' info = -5 @@ -256,7 +254,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(inout) :: key + real(psb_spk_), intent(out) :: key info = psb_success_ diff --git a/base/modules/auxil/psb_z_hsort_mod.f90 b/base/modules/auxil/psb_z_hsort_mod.f90 index 98e47da2..573eef6b 100644 --- a/base/modules/auxil/psb_z_hsort_mod.f90 +++ b/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 diff --git a/base/modules/auxil/psb_z_hsort_x_mod.f90 b/base/modules/auxil/psb_z_hsort_x_mod.f90 index 39f52e4f..fc0edd9b 100644 --- a/base/modules/auxil/psb_z_hsort_x_mod.f90 +++ b/base/modules/auxil/psb_z_hsort_x_mod.f90 @@ -45,8 +45,7 @@ module psb_z_hsort_x_mod use psb_z_hsort_mod type psb_z_heap - integer(psb_ipk_) :: dir - integer(psb_ipk_) :: last + integer(psb_ipk_) :: last, dir complex(psb_dpk_), allocatable :: keys(:) contains procedure, pass(heap) :: init => psb_z_init_heap @@ -58,8 +57,7 @@ module psb_z_hsort_x_mod end type psb_z_heap type psb_z_idx_heap - integer(psb_ipk_) :: dir - integer(psb_ipk_) :: last + integer(psb_ipk_) :: last, dir complex(psb_dpk_), allocatable :: keys(:) integer(psb_ipk_), allocatable :: idxs(:) contains @@ -123,7 +121,7 @@ contains return endif - call psb_ensure_size(heap%last+1,heap%keys,info,addsz=(1_psb_ipk_)*psb_heap_resize) + call psb_ensure_size(heap%last+1,heap%keys,info,addsz=psb_heap_resize) if (info /= psb_success_) then write(psb_err_unit,*) 'Memory allocation failure in heap_insert' info = -5 @@ -236,9 +234,9 @@ contains return endif - call psb_ensure_size(heap%last+1,heap%keys,info,addsz=(1_psb_ipk_)*psb_heap_resize) + call psb_ensure_size(heap%last+1,heap%keys,info,addsz=psb_heap_resize) if (info == psb_success_) & - & call psb_ensure_size(heap%last+1,heap%idxs,info,addsz=(1_psb_ipk_)*psb_heap_resize) + & call psb_ensure_size(heap%last+1,heap%idxs,info,addsz=psb_heap_resize) if (info /= psb_success_) then write(psb_err_unit,*) 'Memory allocation failure in heap_insert' info = -5 @@ -256,7 +254,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(inout) :: key + complex(psb_dpk_), intent(out) :: key info = psb_success_ diff --git a/base/modules/auxil/psi_c_serial_mod.f90 b/base/modules/auxil/psi_c_serial_mod.f90 index 191e7ef3..f017f350 100644 --- a/base/modules/auxil/psi_c_serial_mod.f90 +++ b/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 (inout) :: z(:) + complex(psb_spk_), intent (in) :: z(:) complex(psb_spk_), intent (in) :: alpha, beta integer(psb_ipk_), intent(out) :: info end subroutine psi_caxpbyv2 diff --git a/base/modules/auxil/psi_d_serial_mod.f90 b/base/modules/auxil/psi_d_serial_mod.f90 index f1dbc16c..c27aa600 100644 --- a/base/modules/auxil/psi_d_serial_mod.f90 +++ b/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 (inout) :: z(:) + real(psb_dpk_), intent (in) :: z(:) real(psb_dpk_), intent (in) :: alpha, beta integer(psb_ipk_), intent(out) :: info end subroutine psi_daxpbyv2 diff --git a/base/modules/auxil/psi_e_serial_mod.f90 b/base/modules/auxil/psi_e_serial_mod.f90 index 909b025c..99a91985 100644 --- a/base/modules/auxil/psi_e_serial_mod.f90 +++ b/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 (inout) :: z(:) + integer(psb_epk_), intent (in) :: z(:) integer(psb_epk_), intent (in) :: alpha, beta integer(psb_ipk_), intent(out) :: info end subroutine psi_eaxpbyv2 diff --git a/base/modules/auxil/psi_i2_serial_mod.f90 b/base/modules/auxil/psi_i2_serial_mod.f90 index 38ef9c38..565955e7 100644 --- a/base/modules/auxil/psi_i2_serial_mod.f90 +++ b/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 (inout) :: z(:) + integer(psb_i2pk_), intent (in) :: z(:) integer(psb_i2pk_), intent (in) :: alpha, beta integer(psb_ipk_), intent(out) :: info end subroutine psi_i2axpbyv2 diff --git a/base/modules/auxil/psi_m_serial_mod.f90 b/base/modules/auxil/psi_m_serial_mod.f90 index a80d0ffe..17ea8dc4 100644 --- a/base/modules/auxil/psi_m_serial_mod.f90 +++ b/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 (inout) :: z(:) + integer(psb_mpk_), intent (in) :: z(:) integer(psb_mpk_), intent (in) :: alpha, beta integer(psb_ipk_), intent(out) :: info end subroutine psi_maxpbyv2 diff --git a/base/modules/auxil/psi_s_serial_mod.f90 b/base/modules/auxil/psi_s_serial_mod.f90 index 3c0a3bdc..ed7b5d9f 100644 --- a/base/modules/auxil/psi_s_serial_mod.f90 +++ b/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 (inout) :: z(:) + real(psb_spk_), intent (in) :: z(:) real(psb_spk_), intent (in) :: alpha, beta integer(psb_ipk_), intent(out) :: info end subroutine psi_saxpbyv2 diff --git a/base/modules/auxil/psi_z_serial_mod.f90 b/base/modules/auxil/psi_z_serial_mod.f90 index 7bc9728e..9de8451b 100644 --- a/base/modules/auxil/psi_z_serial_mod.f90 +++ b/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 (inout) :: z(:) + complex(psb_dpk_), intent (in) :: z(:) complex(psb_dpk_), intent (in) :: alpha, beta integer(psb_ipk_), intent(out) :: info end subroutine psi_zaxpbyv2 diff --git a/base/modules/comm/psb_c_comm_mod.f90 b/base/modules/comm/psb_c_comm_mod.f90 index 1bd46197..c2a85510 100644 --- a/base/modules/comm/psb_c_comm_mod.f90 +++ b/base/modules/comm/psb_c_comm_mod.f90 @@ -138,7 +138,7 @@ module psb_c_comm_mod import implicit none type(psb_c_multivect_type), intent(inout) :: locx - complex(psb_spk_), intent(out), allocatable :: globx(:,:) + complex(psb_spk_), intent(out), allocatable :: globx(:) type(psb_desc_type), intent(in) :: desc_a integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(in), optional :: root diff --git a/base/modules/comm/psb_d_comm_mod.f90 b/base/modules/comm/psb_d_comm_mod.f90 index 013c76e2..5efde2b0 100644 --- a/base/modules/comm/psb_d_comm_mod.f90 +++ b/base/modules/comm/psb_d_comm_mod.f90 @@ -138,7 +138,7 @@ module psb_d_comm_mod import implicit none type(psb_d_multivect_type), intent(inout) :: locx - real(psb_dpk_), intent(out), allocatable :: globx(:,:) + real(psb_dpk_), intent(out), allocatable :: globx(:) type(psb_desc_type), intent(in) :: desc_a integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(in), optional :: root diff --git a/base/modules/comm/psb_i_comm_mod.f90 b/base/modules/comm/psb_i_comm_mod.f90 index 25d761ba..b727f403 100644 --- a/base/modules/comm/psb_i_comm_mod.f90 +++ b/base/modules/comm/psb_i_comm_mod.f90 @@ -107,7 +107,7 @@ module psb_i_comm_mod import implicit none type(psb_i_multivect_type), intent(inout) :: locx - integer(psb_ipk_), intent(out), allocatable :: globx(:,:) + integer(psb_ipk_), intent(out), allocatable :: globx(:) type(psb_desc_type), intent(in) :: desc_a integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(in), optional :: root diff --git a/base/modules/comm/psb_l_comm_mod.f90 b/base/modules/comm/psb_l_comm_mod.f90 index 2bba923d..1072b824 100644 --- a/base/modules/comm/psb_l_comm_mod.f90 +++ b/base/modules/comm/psb_l_comm_mod.f90 @@ -107,7 +107,7 @@ module psb_l_comm_mod import implicit none type(psb_l_multivect_type), intent(inout) :: locx - integer(psb_lpk_), intent(out), allocatable :: globx(:,:) + integer(psb_lpk_), intent(out), allocatable :: globx(:) type(psb_desc_type), intent(in) :: desc_a integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(in), optional :: root diff --git a/base/modules/comm/psb_s_comm_mod.f90 b/base/modules/comm/psb_s_comm_mod.f90 index a202b5b6..a55e0c55 100644 --- a/base/modules/comm/psb_s_comm_mod.f90 +++ b/base/modules/comm/psb_s_comm_mod.f90 @@ -138,7 +138,7 @@ module psb_s_comm_mod import implicit none type(psb_s_multivect_type), intent(inout) :: locx - real(psb_spk_), intent(out), allocatable :: globx(:,:) + real(psb_spk_), intent(out), allocatable :: globx(:) type(psb_desc_type), intent(in) :: desc_a integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(in), optional :: root diff --git a/base/modules/comm/psb_z_comm_mod.f90 b/base/modules/comm/psb_z_comm_mod.f90 index 304cdfb9..58aabba2 100644 --- a/base/modules/comm/psb_z_comm_mod.f90 +++ b/base/modules/comm/psb_z_comm_mod.f90 @@ -138,7 +138,7 @@ module psb_z_comm_mod import implicit none type(psb_z_multivect_type), intent(inout) :: locx - complex(psb_dpk_), intent(out), allocatable :: globx(:,:) + complex(psb_dpk_), intent(out), allocatable :: globx(:) type(psb_desc_type), intent(in) :: desc_a integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(in), optional :: root diff --git a/base/modules/psi_i_mod.F90 b/base/modules/psi_i_mod.F90 index e852dd99..7310065a 100644 --- a/base/modules/psi_i_mod.F90 +++ b/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) :: 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(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 end subroutine psi_i_csr_sort_dl end interface diff --git a/base/modules/serial/psb_c_mat_mod.F90 b/base/modules/serial/psb_c_mat_mod.F90 index 75699249..5e889da2 100644 --- a/base/modules/serial/psb_c_mat_mod.F90 +++ b/base/modules/serial/psb_c_mat_mod.F90 @@ -681,7 +681,7 @@ module psb_c_mat_mod interface subroutine psb_c_csgetrow(imin,imax,a,nz,ia,ja,val,info,& - & jmin,jmax,iren,append,nzin,rscale,cscale,chksz) + & jmin,jmax,iren,append,nzin,rscale,cscale) import :: psb_ipk_, psb_lpk_, psb_cspmat_type, psb_spk_ class(psb_cspmat_type), intent(in) :: a integer(psb_ipk_), intent(in) :: imin,imax @@ -692,7 +692,7 @@ module psb_c_mat_mod logical, intent(in), optional :: append integer(psb_ipk_), intent(in), optional :: iren(:) integer(psb_ipk_), intent(in), optional :: jmin,jmax, nzin - logical, intent(in), optional :: rscale,cscale,chksz + logical, intent(in), optional :: rscale,cscale end subroutine psb_c_csgetrow end interface @@ -947,8 +947,8 @@ module psb_c_mat_mod interface subroutine psb_c_cp_from_lb(a,b) import :: psb_ipk_, psb_lpk_, psb_cspmat_type, psb_spk_, psb_lc_base_sparse_mat - class(psb_cspmat_type), intent(inout) :: a - class(psb_lc_base_sparse_mat), intent(inout) :: b + class(psb_cspmat_type), intent(out) :: a + class(psb_lc_base_sparse_mat), intent(in) :: b end subroutine psb_c_cp_from_lb end interface @@ -1731,8 +1731,8 @@ module psb_c_mat_mod interface subroutine psb_lc_cp_from_ib(a,b) import :: psb_ipk_, psb_lpk_, psb_lcspmat_type, psb_spk_, psb_c_base_sparse_mat - class(psb_lcspmat_type), intent(inout) :: a - class(psb_c_base_sparse_mat), intent(inout) :: b + class(psb_lcspmat_type), intent(out) :: a + class(psb_c_base_sparse_mat), intent(in) :: b end subroutine psb_lc_cp_from_ib end interface diff --git a/base/modules/serial/psb_d_mat_mod.F90 b/base/modules/serial/psb_d_mat_mod.F90 index ff51d1cb..caf03994 100644 --- a/base/modules/serial/psb_d_mat_mod.F90 +++ b/base/modules/serial/psb_d_mat_mod.F90 @@ -681,7 +681,7 @@ module psb_d_mat_mod interface subroutine psb_d_csgetrow(imin,imax,a,nz,ia,ja,val,info,& - & jmin,jmax,iren,append,nzin,rscale,cscale,chksz) + & jmin,jmax,iren,append,nzin,rscale,cscale) import :: psb_ipk_, psb_lpk_, psb_dspmat_type, psb_dpk_ class(psb_dspmat_type), intent(in) :: a integer(psb_ipk_), intent(in) :: imin,imax @@ -692,7 +692,7 @@ module psb_d_mat_mod logical, intent(in), optional :: append integer(psb_ipk_), intent(in), optional :: iren(:) integer(psb_ipk_), intent(in), optional :: jmin,jmax, nzin - logical, intent(in), optional :: rscale,cscale,chksz + logical, intent(in), optional :: rscale,cscale end subroutine psb_d_csgetrow end interface @@ -947,8 +947,8 @@ module psb_d_mat_mod interface subroutine psb_d_cp_from_lb(a,b) import :: psb_ipk_, psb_lpk_, psb_dspmat_type, psb_dpk_, psb_ld_base_sparse_mat - class(psb_dspmat_type), intent(inout) :: a - class(psb_ld_base_sparse_mat), intent(inout) :: b + class(psb_dspmat_type), intent(out) :: a + class(psb_ld_base_sparse_mat), intent(in) :: b end subroutine psb_d_cp_from_lb end interface @@ -1731,8 +1731,8 @@ module psb_d_mat_mod interface subroutine psb_ld_cp_from_ib(a,b) import :: psb_ipk_, psb_lpk_, psb_ldspmat_type, psb_dpk_, psb_d_base_sparse_mat - class(psb_ldspmat_type), intent(inout) :: a - class(psb_d_base_sparse_mat), intent(inout) :: b + class(psb_ldspmat_type), intent(out) :: a + class(psb_d_base_sparse_mat), intent(in) :: b end subroutine psb_ld_cp_from_ib end interface diff --git a/base/modules/serial/psb_s_mat_mod.F90 b/base/modules/serial/psb_s_mat_mod.F90 index 849c64c3..8e3934b8 100644 --- a/base/modules/serial/psb_s_mat_mod.F90 +++ b/base/modules/serial/psb_s_mat_mod.F90 @@ -681,7 +681,7 @@ module psb_s_mat_mod interface subroutine psb_s_csgetrow(imin,imax,a,nz,ia,ja,val,info,& - & jmin,jmax,iren,append,nzin,rscale,cscale,chksz) + & jmin,jmax,iren,append,nzin,rscale,cscale) import :: psb_ipk_, psb_lpk_, psb_sspmat_type, psb_spk_ class(psb_sspmat_type), intent(in) :: a integer(psb_ipk_), intent(in) :: imin,imax @@ -692,7 +692,7 @@ module psb_s_mat_mod logical, intent(in), optional :: append integer(psb_ipk_), intent(in), optional :: iren(:) integer(psb_ipk_), intent(in), optional :: jmin,jmax, nzin - logical, intent(in), optional :: rscale,cscale,chksz + logical, intent(in), optional :: rscale,cscale end subroutine psb_s_csgetrow end interface @@ -947,8 +947,8 @@ module psb_s_mat_mod interface subroutine psb_s_cp_from_lb(a,b) import :: psb_ipk_, psb_lpk_, psb_sspmat_type, psb_spk_, psb_ls_base_sparse_mat - class(psb_sspmat_type), intent(inout) :: a - class(psb_ls_base_sparse_mat), intent(inout) :: b + class(psb_sspmat_type), intent(out) :: a + class(psb_ls_base_sparse_mat), intent(in) :: b end subroutine psb_s_cp_from_lb end interface @@ -1731,8 +1731,8 @@ module psb_s_mat_mod interface subroutine psb_ls_cp_from_ib(a,b) import :: psb_ipk_, psb_lpk_, psb_lsspmat_type, psb_spk_, psb_s_base_sparse_mat - class(psb_lsspmat_type), intent(inout) :: a - class(psb_s_base_sparse_mat), intent(inout) :: b + class(psb_lsspmat_type), intent(out) :: a + class(psb_s_base_sparse_mat), intent(in) :: b end subroutine psb_ls_cp_from_ib end interface diff --git a/base/modules/serial/psb_z_mat_mod.F90 b/base/modules/serial/psb_z_mat_mod.F90 index fc16ca80..ed3338f9 100644 --- a/base/modules/serial/psb_z_mat_mod.F90 +++ b/base/modules/serial/psb_z_mat_mod.F90 @@ -681,7 +681,7 @@ module psb_z_mat_mod interface subroutine psb_z_csgetrow(imin,imax,a,nz,ia,ja,val,info,& - & jmin,jmax,iren,append,nzin,rscale,cscale,chksz) + & jmin,jmax,iren,append,nzin,rscale,cscale) import :: psb_ipk_, psb_lpk_, psb_zspmat_type, psb_dpk_ class(psb_zspmat_type), intent(in) :: a integer(psb_ipk_), intent(in) :: imin,imax @@ -692,7 +692,7 @@ module psb_z_mat_mod logical, intent(in), optional :: append integer(psb_ipk_), intent(in), optional :: iren(:) integer(psb_ipk_), intent(in), optional :: jmin,jmax, nzin - logical, intent(in), optional :: rscale,cscale,chksz + logical, intent(in), optional :: rscale,cscale end subroutine psb_z_csgetrow end interface @@ -947,8 +947,8 @@ module psb_z_mat_mod interface subroutine psb_z_cp_from_lb(a,b) import :: psb_ipk_, psb_lpk_, psb_zspmat_type, psb_dpk_, psb_lz_base_sparse_mat - class(psb_zspmat_type), intent(inout) :: a - class(psb_lz_base_sparse_mat), intent(inout) :: b + class(psb_zspmat_type), intent(out) :: a + class(psb_lz_base_sparse_mat), intent(in) :: b end subroutine psb_z_cp_from_lb end interface @@ -1731,8 +1731,8 @@ module psb_z_mat_mod interface subroutine psb_lz_cp_from_ib(a,b) import :: psb_ipk_, psb_lpk_, psb_lzspmat_type, psb_dpk_, psb_z_base_sparse_mat - class(psb_lzspmat_type), intent(inout) :: a - class(psb_z_base_sparse_mat), intent(inout) :: b + class(psb_lzspmat_type), intent(out) :: a + class(psb_z_base_sparse_mat), intent(in) :: b end subroutine psb_lz_cp_from_ib end interface diff --git a/base/psblas/psb_caxpby.f90 b/base/psblas/psb_caxpby.f90 index da3dd93b..9ac48603 100644 --- a/base/psblas/psb_caxpby.f90 +++ b/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 caxpbyv2(desc_a%get_local_cols(),ione,& + call caxpby(desc_a%get_local_cols(),ione,& & alpha,x,lldx,beta,& & y,lldy,z,lldz,info) end if diff --git a/base/psblas/psb_daxpby.f90 b/base/psblas/psb_daxpby.f90 index c386f8f2..f2768789 100644 --- a/base/psblas/psb_daxpby.f90 +++ b/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 daxpbyv2(desc_a%get_local_cols(),ione,& + call daxpby(desc_a%get_local_cols(),ione,& & alpha,x,lldx,beta,& & y,lldy,z,lldz,info) end if diff --git a/base/psblas/psb_saxpby.f90 b/base/psblas/psb_saxpby.f90 index 78f4d01a..774c1ad7 100644 --- a/base/psblas/psb_saxpby.f90 +++ b/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 saxpbyv2(desc_a%get_local_cols(),ione,& + call saxpby(desc_a%get_local_cols(),ione,& & alpha,x,lldx,beta,& & y,lldy,z,lldz,info) end if diff --git a/base/psblas/psb_zaxpby.f90 b/base/psblas/psb_zaxpby.f90 index 2258f38f..1165ea8a 100644 --- a/base/psblas/psb_zaxpby.f90 +++ b/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 zaxpbyv2(desc_a%get_local_cols(),ione,& + call zaxpby(desc_a%get_local_cols(),ione,& & alpha,x,lldx,beta,& & y,lldy,z,lldz,info) end if diff --git a/base/serial/impl/psb_c_coo_impl.F90 b/base/serial/impl/psb_c_coo_impl.F90 index bd03b1b8..4eb2f26e 100644 --- a/base/serial/impl/psb_c_coo_impl.F90 +++ b/base/serial/impl/psb_c_coo_impl.F90 @@ -592,7 +592,7 @@ subroutine psb_c_coo_clean_zeros(a, info) use psb_c_base_mat_mod, psb_protect_name => psb_c_coo_clean_zeros implicit none class(psb_c_coo_sparse_mat), intent(inout) :: a - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_) :: info ! integer(psb_ipk_) :: i,j,k, nzin @@ -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_lc_coo_sparse_mat), intent(in) :: a + class(psb_c_coo_sparse_mat), intent(in) :: a real(psb_spk_) :: res integer(psb_lpk_) :: i,j,k,m,n, nnz, ir, jc, nc, info @@ -5264,7 +5264,7 @@ subroutine psb_lc_coo_clean_zeros(a, info) use psb_c_base_mat_mod, psb_protect_name => psb_lc_coo_clean_zeros implicit none class(psb_lc_coo_sparse_mat), intent(inout) :: a - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_) :: info ! integer(psb_lpk_) :: i,j,k, nzin @@ -6760,8 +6760,7 @@ subroutine psb_lc_fix_coo_inner(nr,nc,nzin,dupl,ia,ja,val,nzout,info,idir) use psb_sort_mod implicit none - integer(psb_lpk_), intent(in) :: nr, nc, nzin - integer(psb_ipk_), intent(in) :: dupl + integer(psb_lpk_), intent(in) :: nr, nc, nzin, dupl integer(psb_lpk_), intent(inout) :: ia(:), ja(:) complex(psb_spk_), intent(inout) :: val(:) integer(psb_lpk_), intent(out) :: nzout diff --git a/base/serial/impl/psb_c_csc_impl.f90 b/base/serial/impl/psb_c_csc_impl.f90 index 87d7e3dd..bfefebad 100644 --- a/base/serial/impl/psb_c_csc_impl.f90 +++ b/base/serial/impl/psb_c_csc_impl.f90 @@ -2371,7 +2371,7 @@ subroutine psb_c_csc_clean_zeros(a, info) use psb_c_csc_mat_mod, psb_protect_name => psb_c_csc_clean_zeros implicit none class(psb_c_csc_sparse_mat), intent(inout) :: a - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_) :: info ! integer(psb_ipk_) :: i, j, k, nc integer(psb_ipk_), allocatable :: ilcp(:) @@ -4255,7 +4255,7 @@ subroutine psb_lc_csc_clean_zeros(a, info) use psb_c_csc_mat_mod, psb_protect_name => psb_lc_csc_clean_zeros implicit none class(psb_lc_csc_sparse_mat), intent(inout) :: a - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_) :: info ! integer(psb_lpk_) :: i, j, k, nc integer(psb_lpk_), allocatable :: ilcp(:) @@ -4319,7 +4319,7 @@ subroutine psb_lc_csc_reallocate_nz(nz,a) use psb_realloc_mod use psb_c_csc_mat_mod, psb_protect_name => psb_lc_csc_reallocate_nz implicit none - integer(psb_lpk_), intent(in) :: nz + integer(psb_ipk_), intent(in) :: nz class(psb_lc_csc_sparse_mat), intent(inout) :: a integer(psb_ipk_) :: err_act, info, ierr(5) character(len=20) :: name='lc_csc_reallocate_nz' diff --git a/base/serial/impl/psb_c_csr_impl.f90 b/base/serial/impl/psb_c_csr_impl.f90 index c06d2755..f4522a6f 100644 --- a/base/serial/impl/psb_c_csr_impl.f90 +++ b/base/serial/impl/psb_c_csr_impl.f90 @@ -3235,7 +3235,7 @@ subroutine psb_c_csr_clean_zeros(a, info) use psb_c_csr_mat_mod, psb_protect_name => psb_c_csr_clean_zeros implicit none class(psb_c_csr_sparse_mat), intent(inout) :: a - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_) :: info ! integer(psb_ipk_) :: i, j, k, nr integer(psb_ipk_), allocatable :: ilrp(:) @@ -5350,7 +5350,7 @@ subroutine psb_lc_csr_clean_zeros(a, info) use psb_c_csr_mat_mod, psb_protect_name => psb_lc_csr_clean_zeros implicit none class(psb_lc_csr_sparse_mat), intent(inout) :: a - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_) :: info ! integer(psb_lpk_) :: i, j, k, nr integer(psb_lpk_), allocatable :: ilrp(:) diff --git a/base/serial/impl/psb_c_mat_impl.F90 b/base/serial/impl/psb_c_mat_impl.F90 index 088b012d..cc112015 100644 --- a/base/serial/impl/psb_c_mat_impl.F90 +++ b/base/serial/impl/psb_c_mat_impl.F90 @@ -820,8 +820,7 @@ subroutine psb_c_csgetptn(imin,imax,a,nz,ia,ja,info,& call a%a%csget(imin,imax,nz,ia,ja,info,& - & jmin=jmin,jmax=jmax,iren=iren,append=append,nzin=nzin,& - & rscale=rscale,cscale=cscale) + & jmin,jmax,iren,append,nzin,rscale,cscale) if (info /= psb_success_) goto 9999 call psb_erractionrestore(err_act) @@ -867,10 +866,9 @@ subroutine psb_c_csgetrow(imin,imax,a,nz,ia,ja,val,info,& goto 9999 endif - call a%a%csget(imin,imax,nz,ia,ja,val,info,& - & jmin=jmin,jmax=jmax,iren=iren,append=append,nzin=nzin,& - & rscale=rscale,cscale=cscale,chksz=chksz) + call a%a%csget(imin,imax,nz,ia,ja,val,info,& + & jmin,jmax,iren,append,nzin,rscale,cscale,chksz) if (info /= psb_success_) goto 9999 call psb_erractionrestore(err_act) @@ -931,9 +929,8 @@ subroutine psb_c_csgetblk(imin,imax,a,b,info,& end if if (info == psb_success_) then - call a%a%csget(imin,imax,acoo,info,& - & jmin=jmin,jmax=jmax,iren=iren,append=append,& - & rscale=rscale,cscale=cscale) + call a%a%csget(imin,imax,acoo,info,& + & jmin,jmax,iren,append,rscale,cscale) else info = psb_err_alloc_dealloc_ end if diff --git a/base/serial/impl/psb_d_coo_impl.F90 b/base/serial/impl/psb_d_coo_impl.F90 index d4d88027..6b3aafc8 100644 --- a/base/serial/impl/psb_d_coo_impl.F90 +++ b/base/serial/impl/psb_d_coo_impl.F90 @@ -592,7 +592,7 @@ subroutine psb_d_coo_clean_zeros(a, info) use psb_d_base_mat_mod, psb_protect_name => psb_d_coo_clean_zeros implicit none class(psb_d_coo_sparse_mat), intent(inout) :: a - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_) :: info ! integer(psb_ipk_) :: i,j,k, nzin @@ -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_ld_coo_sparse_mat), intent(in) :: a + class(psb_d_coo_sparse_mat), intent(in) :: a real(psb_dpk_) :: res integer(psb_lpk_) :: i,j,k,m,n, nnz, ir, jc, nc, info @@ -5264,7 +5264,7 @@ subroutine psb_ld_coo_clean_zeros(a, info) use psb_d_base_mat_mod, psb_protect_name => psb_ld_coo_clean_zeros implicit none class(psb_ld_coo_sparse_mat), intent(inout) :: a - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_) :: info ! integer(psb_lpk_) :: i,j,k, nzin @@ -6760,8 +6760,7 @@ subroutine psb_ld_fix_coo_inner(nr,nc,nzin,dupl,ia,ja,val,nzout,info,idir) use psb_sort_mod implicit none - integer(psb_lpk_), intent(in) :: nr, nc, nzin - integer(psb_ipk_), intent(in) :: dupl + integer(psb_lpk_), intent(in) :: nr, nc, nzin, dupl integer(psb_lpk_), intent(inout) :: ia(:), ja(:) real(psb_dpk_), intent(inout) :: val(:) integer(psb_lpk_), intent(out) :: nzout diff --git a/base/serial/impl/psb_d_csc_impl.f90 b/base/serial/impl/psb_d_csc_impl.f90 index 4f10439b..eced8477 100644 --- a/base/serial/impl/psb_d_csc_impl.f90 +++ b/base/serial/impl/psb_d_csc_impl.f90 @@ -2371,7 +2371,7 @@ subroutine psb_d_csc_clean_zeros(a, info) use psb_d_csc_mat_mod, psb_protect_name => psb_d_csc_clean_zeros implicit none class(psb_d_csc_sparse_mat), intent(inout) :: a - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_) :: info ! integer(psb_ipk_) :: i, j, k, nc integer(psb_ipk_), allocatable :: ilcp(:) @@ -4255,7 +4255,7 @@ subroutine psb_ld_csc_clean_zeros(a, info) use psb_d_csc_mat_mod, psb_protect_name => psb_ld_csc_clean_zeros implicit none class(psb_ld_csc_sparse_mat), intent(inout) :: a - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_) :: info ! integer(psb_lpk_) :: i, j, k, nc integer(psb_lpk_), allocatable :: ilcp(:) @@ -4319,7 +4319,7 @@ subroutine psb_ld_csc_reallocate_nz(nz,a) use psb_realloc_mod use psb_d_csc_mat_mod, psb_protect_name => psb_ld_csc_reallocate_nz implicit none - integer(psb_lpk_), intent(in) :: nz + integer(psb_ipk_), intent(in) :: nz class(psb_ld_csc_sparse_mat), intent(inout) :: a integer(psb_ipk_) :: err_act, info, ierr(5) character(len=20) :: name='ld_csc_reallocate_nz' diff --git a/base/serial/impl/psb_d_csr_impl.f90 b/base/serial/impl/psb_d_csr_impl.f90 index c251a2fd..aa300c73 100644 --- a/base/serial/impl/psb_d_csr_impl.f90 +++ b/base/serial/impl/psb_d_csr_impl.f90 @@ -3235,7 +3235,7 @@ subroutine psb_d_csr_clean_zeros(a, info) use psb_d_csr_mat_mod, psb_protect_name => psb_d_csr_clean_zeros implicit none class(psb_d_csr_sparse_mat), intent(inout) :: a - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_) :: info ! integer(psb_ipk_) :: i, j, k, nr integer(psb_ipk_), allocatable :: ilrp(:) @@ -5350,7 +5350,7 @@ subroutine psb_ld_csr_clean_zeros(a, info) use psb_d_csr_mat_mod, psb_protect_name => psb_ld_csr_clean_zeros implicit none class(psb_ld_csr_sparse_mat), intent(inout) :: a - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_) :: info ! integer(psb_lpk_) :: i, j, k, nr integer(psb_lpk_), allocatable :: ilrp(:) diff --git a/base/serial/impl/psb_d_mat_impl.F90 b/base/serial/impl/psb_d_mat_impl.F90 index b21fa40f..7f4ac0c1 100644 --- a/base/serial/impl/psb_d_mat_impl.F90 +++ b/base/serial/impl/psb_d_mat_impl.F90 @@ -820,8 +820,7 @@ subroutine psb_d_csgetptn(imin,imax,a,nz,ia,ja,info,& call a%a%csget(imin,imax,nz,ia,ja,info,& - & jmin=jmin,jmax=jmax,iren=iren,append=append,nzin=nzin,& - & rscale=rscale,cscale=cscale) + & jmin,jmax,iren,append,nzin,rscale,cscale) if (info /= psb_success_) goto 9999 call psb_erractionrestore(err_act) @@ -867,10 +866,9 @@ subroutine psb_d_csgetrow(imin,imax,a,nz,ia,ja,val,info,& goto 9999 endif - call a%a%csget(imin,imax,nz,ia,ja,val,info,& - & jmin=jmin,jmax=jmax,iren=iren,append=append,nzin=nzin,& - & rscale=rscale,cscale=cscale,chksz=chksz) + call a%a%csget(imin,imax,nz,ia,ja,val,info,& + & jmin,jmax,iren,append,nzin,rscale,cscale,chksz) if (info /= psb_success_) goto 9999 call psb_erractionrestore(err_act) @@ -931,9 +929,8 @@ subroutine psb_d_csgetblk(imin,imax,a,b,info,& end if if (info == psb_success_) then - call a%a%csget(imin,imax,acoo,info,& - & jmin=jmin,jmax=jmax,iren=iren,append=append,& - & rscale=rscale,cscale=cscale) + call a%a%csget(imin,imax,acoo,info,& + & jmin,jmax,iren,append,rscale,cscale) else info = psb_err_alloc_dealloc_ end if diff --git a/base/serial/impl/psb_s_coo_impl.F90 b/base/serial/impl/psb_s_coo_impl.F90 index 5ae9dd96..d214b2d5 100644 --- a/base/serial/impl/psb_s_coo_impl.F90 +++ b/base/serial/impl/psb_s_coo_impl.F90 @@ -592,7 +592,7 @@ subroutine psb_s_coo_clean_zeros(a, info) use psb_s_base_mat_mod, psb_protect_name => psb_s_coo_clean_zeros implicit none class(psb_s_coo_sparse_mat), intent(inout) :: a - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_) :: info ! integer(psb_ipk_) :: i,j,k, nzin @@ -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_ls_coo_sparse_mat), intent(in) :: a + class(psb_s_coo_sparse_mat), intent(in) :: a real(psb_spk_) :: res integer(psb_lpk_) :: i,j,k,m,n, nnz, ir, jc, nc, info @@ -5264,7 +5264,7 @@ subroutine psb_ls_coo_clean_zeros(a, info) use psb_s_base_mat_mod, psb_protect_name => psb_ls_coo_clean_zeros implicit none class(psb_ls_coo_sparse_mat), intent(inout) :: a - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_) :: info ! integer(psb_lpk_) :: i,j,k, nzin @@ -6760,8 +6760,7 @@ subroutine psb_ls_fix_coo_inner(nr,nc,nzin,dupl,ia,ja,val,nzout,info,idir) use psb_sort_mod implicit none - integer(psb_lpk_), intent(in) :: nr, nc, nzin - integer(psb_ipk_), intent(in) :: dupl + integer(psb_lpk_), intent(in) :: nr, nc, nzin, dupl integer(psb_lpk_), intent(inout) :: ia(:), ja(:) real(psb_spk_), intent(inout) :: val(:) integer(psb_lpk_), intent(out) :: nzout diff --git a/base/serial/impl/psb_s_csc_impl.f90 b/base/serial/impl/psb_s_csc_impl.f90 index e52086d1..b16cb5bf 100644 --- a/base/serial/impl/psb_s_csc_impl.f90 +++ b/base/serial/impl/psb_s_csc_impl.f90 @@ -2371,7 +2371,7 @@ subroutine psb_s_csc_clean_zeros(a, info) use psb_s_csc_mat_mod, psb_protect_name => psb_s_csc_clean_zeros implicit none class(psb_s_csc_sparse_mat), intent(inout) :: a - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_) :: info ! integer(psb_ipk_) :: i, j, k, nc integer(psb_ipk_), allocatable :: ilcp(:) @@ -4255,7 +4255,7 @@ subroutine psb_ls_csc_clean_zeros(a, info) use psb_s_csc_mat_mod, psb_protect_name => psb_ls_csc_clean_zeros implicit none class(psb_ls_csc_sparse_mat), intent(inout) :: a - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_) :: info ! integer(psb_lpk_) :: i, j, k, nc integer(psb_lpk_), allocatable :: ilcp(:) @@ -4319,7 +4319,7 @@ subroutine psb_ls_csc_reallocate_nz(nz,a) use psb_realloc_mod use psb_s_csc_mat_mod, psb_protect_name => psb_ls_csc_reallocate_nz implicit none - integer(psb_lpk_), intent(in) :: nz + integer(psb_ipk_), intent(in) :: nz class(psb_ls_csc_sparse_mat), intent(inout) :: a integer(psb_ipk_) :: err_act, info, ierr(5) character(len=20) :: name='ls_csc_reallocate_nz' diff --git a/base/serial/impl/psb_s_csr_impl.f90 b/base/serial/impl/psb_s_csr_impl.f90 index 9a4bb3e1..79289234 100644 --- a/base/serial/impl/psb_s_csr_impl.f90 +++ b/base/serial/impl/psb_s_csr_impl.f90 @@ -3235,7 +3235,7 @@ subroutine psb_s_csr_clean_zeros(a, info) use psb_s_csr_mat_mod, psb_protect_name => psb_s_csr_clean_zeros implicit none class(psb_s_csr_sparse_mat), intent(inout) :: a - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_) :: info ! integer(psb_ipk_) :: i, j, k, nr integer(psb_ipk_), allocatable :: ilrp(:) @@ -5350,7 +5350,7 @@ subroutine psb_ls_csr_clean_zeros(a, info) use psb_s_csr_mat_mod, psb_protect_name => psb_ls_csr_clean_zeros implicit none class(psb_ls_csr_sparse_mat), intent(inout) :: a - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_) :: info ! integer(psb_lpk_) :: i, j, k, nr integer(psb_lpk_), allocatable :: ilrp(:) diff --git a/base/serial/impl/psb_s_mat_impl.F90 b/base/serial/impl/psb_s_mat_impl.F90 index c624dc2f..806a08e3 100644 --- a/base/serial/impl/psb_s_mat_impl.F90 +++ b/base/serial/impl/psb_s_mat_impl.F90 @@ -820,8 +820,7 @@ subroutine psb_s_csgetptn(imin,imax,a,nz,ia,ja,info,& call a%a%csget(imin,imax,nz,ia,ja,info,& - & jmin=jmin,jmax=jmax,iren=iren,append=append,nzin=nzin,& - & rscale=rscale,cscale=cscale) + & jmin,jmax,iren,append,nzin,rscale,cscale) if (info /= psb_success_) goto 9999 call psb_erractionrestore(err_act) @@ -867,10 +866,9 @@ subroutine psb_s_csgetrow(imin,imax,a,nz,ia,ja,val,info,& goto 9999 endif - call a%a%csget(imin,imax,nz,ia,ja,val,info,& - & jmin=jmin,jmax=jmax,iren=iren,append=append,nzin=nzin,& - & rscale=rscale,cscale=cscale,chksz=chksz) + call a%a%csget(imin,imax,nz,ia,ja,val,info,& + & jmin,jmax,iren,append,nzin,rscale,cscale,chksz) if (info /= psb_success_) goto 9999 call psb_erractionrestore(err_act) @@ -931,9 +929,8 @@ subroutine psb_s_csgetblk(imin,imax,a,b,info,& end if if (info == psb_success_) then - call a%a%csget(imin,imax,acoo,info,& - & jmin=jmin,jmax=jmax,iren=iren,append=append,& - & rscale=rscale,cscale=cscale) + call a%a%csget(imin,imax,acoo,info,& + & jmin,jmax,iren,append,rscale,cscale) else info = psb_err_alloc_dealloc_ end if diff --git a/base/serial/impl/psb_z_coo_impl.F90 b/base/serial/impl/psb_z_coo_impl.F90 index 49e6c7fe..7850aeec 100644 --- a/base/serial/impl/psb_z_coo_impl.F90 +++ b/base/serial/impl/psb_z_coo_impl.F90 @@ -592,7 +592,7 @@ subroutine psb_z_coo_clean_zeros(a, info) use psb_z_base_mat_mod, psb_protect_name => psb_z_coo_clean_zeros implicit none class(psb_z_coo_sparse_mat), intent(inout) :: a - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_) :: info ! integer(psb_ipk_) :: i,j,k, nzin @@ -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_lz_coo_sparse_mat), intent(in) :: a + class(psb_z_coo_sparse_mat), intent(in) :: a real(psb_dpk_) :: res integer(psb_lpk_) :: i,j,k,m,n, nnz, ir, jc, nc, info @@ -5264,7 +5264,7 @@ subroutine psb_lz_coo_clean_zeros(a, info) use psb_z_base_mat_mod, psb_protect_name => psb_lz_coo_clean_zeros implicit none class(psb_lz_coo_sparse_mat), intent(inout) :: a - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_) :: info ! integer(psb_lpk_) :: i,j,k, nzin @@ -6760,8 +6760,7 @@ subroutine psb_lz_fix_coo_inner(nr,nc,nzin,dupl,ia,ja,val,nzout,info,idir) use psb_sort_mod implicit none - integer(psb_lpk_), intent(in) :: nr, nc, nzin - integer(psb_ipk_), intent(in) :: dupl + integer(psb_lpk_), intent(in) :: nr, nc, nzin, dupl integer(psb_lpk_), intent(inout) :: ia(:), ja(:) complex(psb_dpk_), intent(inout) :: val(:) integer(psb_lpk_), intent(out) :: nzout diff --git a/base/serial/impl/psb_z_csc_impl.f90 b/base/serial/impl/psb_z_csc_impl.f90 index 8b0ccc65..457489f3 100644 --- a/base/serial/impl/psb_z_csc_impl.f90 +++ b/base/serial/impl/psb_z_csc_impl.f90 @@ -2371,7 +2371,7 @@ subroutine psb_z_csc_clean_zeros(a, info) use psb_z_csc_mat_mod, psb_protect_name => psb_z_csc_clean_zeros implicit none class(psb_z_csc_sparse_mat), intent(inout) :: a - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_) :: info ! integer(psb_ipk_) :: i, j, k, nc integer(psb_ipk_), allocatable :: ilcp(:) @@ -4255,7 +4255,7 @@ subroutine psb_lz_csc_clean_zeros(a, info) use psb_z_csc_mat_mod, psb_protect_name => psb_lz_csc_clean_zeros implicit none class(psb_lz_csc_sparse_mat), intent(inout) :: a - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_) :: info ! integer(psb_lpk_) :: i, j, k, nc integer(psb_lpk_), allocatable :: ilcp(:) @@ -4319,7 +4319,7 @@ subroutine psb_lz_csc_reallocate_nz(nz,a) use psb_realloc_mod use psb_z_csc_mat_mod, psb_protect_name => psb_lz_csc_reallocate_nz implicit none - integer(psb_lpk_), intent(in) :: nz + integer(psb_ipk_), intent(in) :: nz class(psb_lz_csc_sparse_mat), intent(inout) :: a integer(psb_ipk_) :: err_act, info, ierr(5) character(len=20) :: name='lz_csc_reallocate_nz' diff --git a/base/serial/impl/psb_z_csr_impl.f90 b/base/serial/impl/psb_z_csr_impl.f90 index bf9817ef..1f1025ab 100644 --- a/base/serial/impl/psb_z_csr_impl.f90 +++ b/base/serial/impl/psb_z_csr_impl.f90 @@ -3235,7 +3235,7 @@ subroutine psb_z_csr_clean_zeros(a, info) use psb_z_csr_mat_mod, psb_protect_name => psb_z_csr_clean_zeros implicit none class(psb_z_csr_sparse_mat), intent(inout) :: a - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_) :: info ! integer(psb_ipk_) :: i, j, k, nr integer(psb_ipk_), allocatable :: ilrp(:) @@ -5350,7 +5350,7 @@ subroutine psb_lz_csr_clean_zeros(a, info) use psb_z_csr_mat_mod, psb_protect_name => psb_lz_csr_clean_zeros implicit none class(psb_lz_csr_sparse_mat), intent(inout) :: a - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_) :: info ! integer(psb_lpk_) :: i, j, k, nr integer(psb_lpk_), allocatable :: ilrp(:) diff --git a/base/serial/impl/psb_z_mat_impl.F90 b/base/serial/impl/psb_z_mat_impl.F90 index e008dfdb..422a664d 100644 --- a/base/serial/impl/psb_z_mat_impl.F90 +++ b/base/serial/impl/psb_z_mat_impl.F90 @@ -820,8 +820,7 @@ subroutine psb_z_csgetptn(imin,imax,a,nz,ia,ja,info,& call a%a%csget(imin,imax,nz,ia,ja,info,& - & jmin=jmin,jmax=jmax,iren=iren,append=append,nzin=nzin,& - & rscale=rscale,cscale=cscale) + & jmin,jmax,iren,append,nzin,rscale,cscale) if (info /= psb_success_) goto 9999 call psb_erractionrestore(err_act) @@ -867,10 +866,9 @@ subroutine psb_z_csgetrow(imin,imax,a,nz,ia,ja,val,info,& goto 9999 endif - call a%a%csget(imin,imax,nz,ia,ja,val,info,& - & jmin=jmin,jmax=jmax,iren=iren,append=append,nzin=nzin,& - & rscale=rscale,cscale=cscale,chksz=chksz) + call a%a%csget(imin,imax,nz,ia,ja,val,info,& + & jmin,jmax,iren,append,nzin,rscale,cscale,chksz) if (info /= psb_success_) goto 9999 call psb_erractionrestore(err_act) @@ -931,9 +929,8 @@ subroutine psb_z_csgetblk(imin,imax,a,b,info,& end if if (info == psb_success_) then - call a%a%csget(imin,imax,acoo,info,& - & jmin=jmin,jmax=jmax,iren=iren,append=append,& - & rscale=rscale,cscale=cscale) + call a%a%csget(imin,imax,acoo,info,& + & jmin,jmax,iren,append,rscale,cscale) else info = psb_err_alloc_dealloc_ end if diff --git a/base/tools/psb_csphalo.F90 b/base/tools/psb_csphalo.F90 index 19d7e1dc..8731c093 100644 --- a/base/tools/psb_csphalo.F90 +++ b/base/tools/psb_csphalo.F90 @@ -295,6 +295,7 @@ Subroutine psb_csphalo(a,desc_a,blk,info,rowcnv,colcnv,& Do j=0,n_el_send-1 idx = ipdxv(counter+psb_elem_send_+j) + n_elem = a%get_nz_row(idx) call a%csget(idx,idx,ngtz,liasnd,ljasnd,valsnd,info,& & append=.true.,nzin=tot_elem) if (info /= psb_success_) then @@ -399,6 +400,7 @@ Subroutine psb_csphalo(a,desc_a,blk,info,rowcnv,colcnv,& Do j=0,n_el_send-1 idx = ipdxv(counter+psb_elem_send_+j) + n_elem = a%get_nz_row(idx) call a%csget(idx,idx,ngtz,iasnd,jasnd,valsnd,info,& & append=.true.,nzin=tot_elem) if (info /= psb_success_) then @@ -746,6 +748,7 @@ Subroutine psb_lcsphalo(a,desc_a,blk,info,rowcnv,colcnv,& Do j=0,n_el_send-1 idx = ipdxv(counter+psb_elem_send_+j) + n_elem = a%get_nz_row(idx) call a%csget(idx,idx,ngtz,iasnd,jasnd,valsnd,info,& & append=.true.,nzin=tot_elem) if (info /= psb_success_) then @@ -753,7 +756,7 @@ Subroutine psb_lcsphalo(a,desc_a,blk,info,rowcnv,colcnv,& call psb_errpush(info,name,a_err='psb_sp_getrow') goto 9999 end if - tot_elem=tot_elem+ngtz + tot_elem=tot_elem+n_elem Enddo ipx = ipx + 1 counter = counter+n_el_send+3 @@ -1101,6 +1104,7 @@ Subroutine psb_lc_csr_halo(a,desc_a,blk,info,rowcnv,colcnv,& Do j=0,n_el_send-1 idx = ipdxv(counter+psb_elem_send_+j) + n_elem = a%get_nz_row(idx) call a%csget(idx,idx,ngtz,iasnd,jasnd,valsnd,info,& & append=.true.,nzin=tot_elem,jmax=ncg) if (info /= psb_success_) then @@ -1465,6 +1469,7 @@ Subroutine psb_c_lc_csr_halo(a,desc_a,blk,info,rowcnv,colcnv,& Do j=0,n_el_send-1 idx = ipdxv(counter+psb_elem_send_+j) + n_elem = a%get_nz_row(idx) call a%csget(idx,idx,ngtz,iasnd,jasnd,valsnd,info,& & append=.true.,nzin=tot_elem,jmax=ncg) if (info /= psb_success_) then diff --git a/base/tools/psb_dsphalo.F90 b/base/tools/psb_dsphalo.F90 index d5e383ef..e8a59e52 100644 --- a/base/tools/psb_dsphalo.F90 +++ b/base/tools/psb_dsphalo.F90 @@ -295,6 +295,7 @@ Subroutine psb_dsphalo(a,desc_a,blk,info,rowcnv,colcnv,& Do j=0,n_el_send-1 idx = ipdxv(counter+psb_elem_send_+j) + n_elem = a%get_nz_row(idx) call a%csget(idx,idx,ngtz,liasnd,ljasnd,valsnd,info,& & append=.true.,nzin=tot_elem) if (info /= psb_success_) then @@ -399,6 +400,7 @@ Subroutine psb_dsphalo(a,desc_a,blk,info,rowcnv,colcnv,& Do j=0,n_el_send-1 idx = ipdxv(counter+psb_elem_send_+j) + n_elem = a%get_nz_row(idx) call a%csget(idx,idx,ngtz,iasnd,jasnd,valsnd,info,& & append=.true.,nzin=tot_elem) if (info /= psb_success_) then @@ -746,6 +748,7 @@ Subroutine psb_ldsphalo(a,desc_a,blk,info,rowcnv,colcnv,& Do j=0,n_el_send-1 idx = ipdxv(counter+psb_elem_send_+j) + n_elem = a%get_nz_row(idx) call a%csget(idx,idx,ngtz,iasnd,jasnd,valsnd,info,& & append=.true.,nzin=tot_elem) if (info /= psb_success_) then @@ -753,7 +756,7 @@ Subroutine psb_ldsphalo(a,desc_a,blk,info,rowcnv,colcnv,& call psb_errpush(info,name,a_err='psb_sp_getrow') goto 9999 end if - tot_elem=tot_elem+ngtz + tot_elem=tot_elem+n_elem Enddo ipx = ipx + 1 counter = counter+n_el_send+3 @@ -1101,6 +1104,7 @@ Subroutine psb_ld_csr_halo(a,desc_a,blk,info,rowcnv,colcnv,& Do j=0,n_el_send-1 idx = ipdxv(counter+psb_elem_send_+j) + n_elem = a%get_nz_row(idx) call a%csget(idx,idx,ngtz,iasnd,jasnd,valsnd,info,& & append=.true.,nzin=tot_elem,jmax=ncg) if (info /= psb_success_) then @@ -1465,6 +1469,7 @@ Subroutine psb_d_ld_csr_halo(a,desc_a,blk,info,rowcnv,colcnv,& Do j=0,n_el_send-1 idx = ipdxv(counter+psb_elem_send_+j) + n_elem = a%get_nz_row(idx) call a%csget(idx,idx,ngtz,iasnd,jasnd,valsnd,info,& & append=.true.,nzin=tot_elem,jmax=ncg) if (info /= psb_success_) then diff --git a/base/tools/psb_ssphalo.F90 b/base/tools/psb_ssphalo.F90 index be0b340a..609d41b4 100644 --- a/base/tools/psb_ssphalo.F90 +++ b/base/tools/psb_ssphalo.F90 @@ -295,6 +295,7 @@ Subroutine psb_ssphalo(a,desc_a,blk,info,rowcnv,colcnv,& Do j=0,n_el_send-1 idx = ipdxv(counter+psb_elem_send_+j) + n_elem = a%get_nz_row(idx) call a%csget(idx,idx,ngtz,liasnd,ljasnd,valsnd,info,& & append=.true.,nzin=tot_elem) if (info /= psb_success_) then @@ -399,6 +400,7 @@ Subroutine psb_ssphalo(a,desc_a,blk,info,rowcnv,colcnv,& Do j=0,n_el_send-1 idx = ipdxv(counter+psb_elem_send_+j) + n_elem = a%get_nz_row(idx) call a%csget(idx,idx,ngtz,iasnd,jasnd,valsnd,info,& & append=.true.,nzin=tot_elem) if (info /= psb_success_) then @@ -746,6 +748,7 @@ Subroutine psb_lssphalo(a,desc_a,blk,info,rowcnv,colcnv,& Do j=0,n_el_send-1 idx = ipdxv(counter+psb_elem_send_+j) + n_elem = a%get_nz_row(idx) call a%csget(idx,idx,ngtz,iasnd,jasnd,valsnd,info,& & append=.true.,nzin=tot_elem) if (info /= psb_success_) then @@ -753,7 +756,7 @@ Subroutine psb_lssphalo(a,desc_a,blk,info,rowcnv,colcnv,& call psb_errpush(info,name,a_err='psb_sp_getrow') goto 9999 end if - tot_elem=tot_elem+ngtz + tot_elem=tot_elem+n_elem Enddo ipx = ipx + 1 counter = counter+n_el_send+3 @@ -1101,6 +1104,7 @@ Subroutine psb_ls_csr_halo(a,desc_a,blk,info,rowcnv,colcnv,& Do j=0,n_el_send-1 idx = ipdxv(counter+psb_elem_send_+j) + n_elem = a%get_nz_row(idx) call a%csget(idx,idx,ngtz,iasnd,jasnd,valsnd,info,& & append=.true.,nzin=tot_elem,jmax=ncg) if (info /= psb_success_) then @@ -1465,6 +1469,7 @@ Subroutine psb_s_ls_csr_halo(a,desc_a,blk,info,rowcnv,colcnv,& Do j=0,n_el_send-1 idx = ipdxv(counter+psb_elem_send_+j) + n_elem = a%get_nz_row(idx) call a%csget(idx,idx,ngtz,iasnd,jasnd,valsnd,info,& & append=.true.,nzin=tot_elem,jmax=ncg) if (info /= psb_success_) then diff --git a/base/tools/psb_zsphalo.F90 b/base/tools/psb_zsphalo.F90 index 5e24a93c..6aece956 100644 --- a/base/tools/psb_zsphalo.F90 +++ b/base/tools/psb_zsphalo.F90 @@ -295,6 +295,7 @@ Subroutine psb_zsphalo(a,desc_a,blk,info,rowcnv,colcnv,& Do j=0,n_el_send-1 idx = ipdxv(counter+psb_elem_send_+j) + n_elem = a%get_nz_row(idx) call a%csget(idx,idx,ngtz,liasnd,ljasnd,valsnd,info,& & append=.true.,nzin=tot_elem) if (info /= psb_success_) then @@ -399,6 +400,7 @@ Subroutine psb_zsphalo(a,desc_a,blk,info,rowcnv,colcnv,& Do j=0,n_el_send-1 idx = ipdxv(counter+psb_elem_send_+j) + n_elem = a%get_nz_row(idx) call a%csget(idx,idx,ngtz,iasnd,jasnd,valsnd,info,& & append=.true.,nzin=tot_elem) if (info /= psb_success_) then @@ -746,6 +748,7 @@ Subroutine psb_lzsphalo(a,desc_a,blk,info,rowcnv,colcnv,& Do j=0,n_el_send-1 idx = ipdxv(counter+psb_elem_send_+j) + n_elem = a%get_nz_row(idx) call a%csget(idx,idx,ngtz,iasnd,jasnd,valsnd,info,& & append=.true.,nzin=tot_elem) if (info /= psb_success_) then @@ -753,7 +756,7 @@ Subroutine psb_lzsphalo(a,desc_a,blk,info,rowcnv,colcnv,& call psb_errpush(info,name,a_err='psb_sp_getrow') goto 9999 end if - tot_elem=tot_elem+ngtz + tot_elem=tot_elem+n_elem Enddo ipx = ipx + 1 counter = counter+n_el_send+3 @@ -1101,6 +1104,7 @@ Subroutine psb_lz_csr_halo(a,desc_a,blk,info,rowcnv,colcnv,& Do j=0,n_el_send-1 idx = ipdxv(counter+psb_elem_send_+j) + n_elem = a%get_nz_row(idx) call a%csget(idx,idx,ngtz,iasnd,jasnd,valsnd,info,& & append=.true.,nzin=tot_elem,jmax=ncg) if (info /= psb_success_) then @@ -1465,6 +1469,7 @@ Subroutine psb_z_lz_csr_halo(a,desc_a,blk,info,rowcnv,colcnv,& Do j=0,n_el_send-1 idx = ipdxv(counter+psb_elem_send_+j) + n_elem = a%get_nz_row(idx) call a%csget(idx,idx,ngtz,iasnd,jasnd,valsnd,info,& & append=.true.,nzin=tot_elem,jmax=ncg) if (info /= psb_success_) then diff --git a/cbind/base/psb_c_serial_cbind_mod.F90 b/cbind/base/psb_c_serial_cbind_mod.F90 index dba41b67..d46e776c 100644 --- a/cbind/base/psb_c_serial_cbind_mod.F90 +++ b/cbind/base/psb_c_serial_cbind_mod.F90 @@ -157,85 +157,5 @@ contains end function psb_c_cmat_name_print - function psb_c_cvect_set_scal(x,val) bind(c) result(info) - use psb_base_mod - implicit none - - type(psb_c_cvector) :: x - type(psb_c_vect_type), pointer :: xp - integer(psb_c_ipk_) :: info - complex(c_float_complex), value :: val - - info = -1; - - if (c_associated(x%item)) then - call c_f_pointer(x%item,xp) - else - return - end if - - call xp%set(val) - - info = 0 - - end function psb_c_cvect_set_scal - - function psb_c_cvect_set_vect(x,val,n) bind(c) result(info) - use psb_base_mod - implicit none - - type(psb_c_cvector) :: x - type(psb_c_vect_type), pointer :: xp - integer(psb_c_ipk_) :: info - integer(psb_c_ipk_), value :: n - complex(c_float_complex) :: val(*) - - info = -1; - - if (c_associated(x%item)) then - call c_f_pointer(x%item,xp) - else - return - end if - - call xp%set(val(1:n)) - - info = 0 - - end function psb_c_cvect_set_vect - - function psb_c_g2l(cdh,gindex,cowned) bind(c) result(lindex) - use psb_base_mod - implicit none - - integer(psb_c_lpk_), value :: gindex - logical(c_bool), value :: cowned - type(psb_c_descriptor) :: cdh - integer(psb_c_ipk_) :: lindex - - type(psb_desc_type), pointer :: descp - integer(psb_ipk_) :: info, localindex, ixb, iam, np - logical :: owned - - ixb = psb_c_get_index_base() - owned = cowned - lindex = -1 - if (c_associated(cdh%item)) then - call c_f_pointer(cdh%item,descp) - else - return - end if - - call psb_info(descp%get_context(),iam,np) - if (ixb == 1) then - call descp%indxmap%g2l(gindex,localindex,info,owned=owned) - lindex = localindex - else - call descp%indxmap%g2l(gindex+(1-ixb),localindex,info,owned=owned) - lindex = localindex-(1-ixb) - endif - - end function psb_c_g2l - end module psb_c_serial_cbind_mod diff --git a/cbind/base/psb_d_serial_cbind_mod.F90 b/cbind/base/psb_d_serial_cbind_mod.F90 index 984f826f..f8f742fc 100644 --- a/cbind/base/psb_d_serial_cbind_mod.F90 +++ b/cbind/base/psb_d_serial_cbind_mod.F90 @@ -157,52 +157,5 @@ contains end function psb_c_dmat_name_print - function psb_c_dvect_set_scal(x,val) bind(c) result(info) - use psb_base_mod - implicit none - - type(psb_c_dvector) :: x - type(psb_d_vect_type), pointer :: xp - integer(psb_c_ipk_) :: info - real(c_double), value :: val - - info = -1; - - if (c_associated(x%item)) then - call c_f_pointer(x%item,xp) - else - return - end if - - call xp%set(val) - - info = 0 - - end function psb_c_dvect_set_scal - - function psb_c_dvect_set_vect(x,val,n) bind(c) result(info) - use psb_base_mod - implicit none - - type(psb_c_dvector) :: x - type(psb_d_vect_type), pointer :: xp - integer(psb_c_ipk_) :: info - integer(psb_c_ipk_), value :: n - real(c_double) :: val(*) - - info = -1; - - if (c_associated(x%item)) then - call c_f_pointer(x%item,xp) - else - return - end if - - call xp%set(val(1:n)) - - info = 0 - - end function psb_c_dvect_set_vect - end module psb_d_serial_cbind_mod diff --git a/cbind/base/psb_s_serial_cbind_mod.F90 b/cbind/base/psb_s_serial_cbind_mod.F90 index 83dac1a5..65a0bae7 100644 --- a/cbind/base/psb_s_serial_cbind_mod.F90 +++ b/cbind/base/psb_s_serial_cbind_mod.F90 @@ -157,52 +157,5 @@ contains end function psb_c_smat_name_print - function psb_c_svect_set_scal(x,val) bind(c) result(info) - use psb_base_mod - implicit none - - type(psb_c_svector) :: x - type(psb_s_vect_type), pointer :: xp - integer(psb_c_ipk_) :: info - real(c_float), value :: val - - info = -1; - - if (c_associated(x%item)) then - call c_f_pointer(x%item,xp) - else - return - end if - - call xp%set(val) - - info = 0 - - end function psb_c_svect_set_scal - - function psb_c_svect_set_vect(x,val,n) bind(c) result(info) - use psb_base_mod - implicit none - - type(psb_c_svector) :: x - type(psb_s_vect_type), pointer :: xp - integer(psb_c_ipk_) :: info - integer(psb_c_ipk_), value :: n - real(c_float) :: val(*) - - info = -1; - - if (c_associated(x%item)) then - call c_f_pointer(x%item,xp) - else - return - end if - - call xp%set(val(1:n)) - - info = 0 - - end function psb_c_svect_set_vect - end module psb_s_serial_cbind_mod diff --git a/cbind/base/psb_z_serial_cbind_mod.F90 b/cbind/base/psb_z_serial_cbind_mod.F90 index b61060b9..01dfa018 100644 --- a/cbind/base/psb_z_serial_cbind_mod.F90 +++ b/cbind/base/psb_z_serial_cbind_mod.F90 @@ -157,52 +157,5 @@ contains end function psb_c_zmat_name_print - function psb_c_zvect_set_scal(x,val) bind(c) result(info) - use psb_base_mod - implicit none - - type(psb_c_zvector) :: x - type(psb_z_vect_type), pointer :: xp - integer(psb_c_ipk_) :: info - complex(c_double_complex), value :: val - - info = -1; - - if (c_associated(x%item)) then - call c_f_pointer(x%item,xp) - else - return - end if - - call xp%set(val) - - info = 0 - - end function psb_c_zvect_set_scal - - function psb_c_zvect_set_vect(x,val,n) bind(c) result(info) - use psb_base_mod - implicit none - - type(psb_c_zvector) :: x - type(psb_z_vect_type), pointer :: xp - integer(psb_c_ipk_) :: info - integer(psb_c_ipk_), value :: n - complex(c_double_complex) :: val(*) - - info = -1; - - if (c_associated(x%item)) then - call c_f_pointer(x%item,xp) - else - return - end if - - call xp%set(val(1:n)) - - info = 0 - - end function psb_c_zvect_set_vect - end module psb_z_serial_cbind_mod