From 7436cf564cd828b4c22070ec62dc505845697495 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Fri, 24 Jul 2020 14:37:31 +0200 Subject: [PATCH] Start cleanup compile warnings --- base/modules/auxil/psb_c_realloc_mod.F90 | 90 +++++++++------------ base/modules/auxil/psb_d_realloc_mod.F90 | 90 +++++++++------------ base/modules/auxil/psb_e_realloc_mod.F90 | 90 +++++++++------------ base/modules/auxil/psb_i2_realloc_mod.F90 | 90 +++++++++------------ base/modules/auxil/psb_m_realloc_mod.F90 | 90 +++++++++------------ base/modules/auxil/psb_s_realloc_mod.F90 | 90 +++++++++------------ base/modules/auxil/psb_z_realloc_mod.F90 | 90 +++++++++------------ base/modules/psb_error_mod.F90 | 5 -- base/modules/serial/psb_c_base_vect_mod.f90 | 6 +- base/modules/serial/psb_d_base_vect_mod.f90 | 6 +- base/modules/serial/psb_i_base_vect_mod.f90 | 6 +- base/modules/serial/psb_l_base_vect_mod.f90 | 6 +- base/modules/serial/psb_s_base_vect_mod.f90 | 6 +- base/modules/serial/psb_z_base_vect_mod.f90 | 6 +- 14 files changed, 277 insertions(+), 394 deletions(-) diff --git a/base/modules/auxil/psb_c_realloc_mod.F90 b/base/modules/auxil/psb_c_realloc_mod.F90 index e8f169d8..1141d968 100644 --- a/base/modules/auxil/psb_c_realloc_mod.F90 +++ b/base/modules/auxil/psb_c_realloc_mod.F90 @@ -92,7 +92,7 @@ Contains ! ...Local Variables integer(psb_ipk_) :: err_act,err - character(len=20) :: name + character(len=30) :: name logical, parameter :: debug=.false. name='psb_r_c_s' @@ -133,7 +133,7 @@ Contains complex(psb_spk_),allocatable :: tmp(:) integer(psb_mpk_) :: dim, lb_, lbi,ub_ integer(psb_ipk_) :: err_act,err - character(len=20) :: name + character(len=30) :: name logical, parameter :: debug=.false. name='psb_r_m_c_rk1' @@ -205,7 +205,7 @@ Contains complex(psb_spk_),allocatable :: tmp(:,:) integer(psb_ipk_) :: err_act,err integer(psb_mpk_) :: dim,dim2,lb1_, lb2_, ub1_, ub2_,lbi1, lbi2 - character(len=20) :: name + character(len=30) :: name name='psb_r_m_c_rk2' call psb_erractionsave(err_act) @@ -294,9 +294,8 @@ Contains ! ...Local Variables complex(psb_spk_),allocatable :: tmp(:) integer(psb_epk_) :: dim, lb_, lbi,ub_ - integer(psb_ipk_) :: iplen integer(psb_ipk_) :: err_act,err - character(len=20) :: name + character(len=30) :: name logical, parameter :: debug=.false. name='psb_r_m_c_rk1' @@ -311,8 +310,7 @@ Contains endif if ((len<0)) then err=4025 - iplen = len - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len/), & & a_err='complex(psb_spk_)') goto 9999 end if @@ -325,8 +323,7 @@ Contains Allocate(tmp(lb_:ub_),stat=info) if (info /= psb_success_) then err=4025 - iplen = len - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len/), & & a_err='complex(psb_spk_)') goto 9999 end if @@ -338,8 +335,7 @@ Contains Allocate(rrax(lb_:ub_),stat=info) if (info /= psb_success_) then err=4025 - iplen = len - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len/), & & a_err='complex(psb_spk_)') goto 9999 end if @@ -369,9 +365,9 @@ Contains ! ...Local Variables complex(psb_spk_),allocatable :: tmp(:,:) - integer(psb_ipk_) :: err_act,err, iplen + integer(psb_ipk_) :: err_act,err integer(psb_epk_) :: dim,dim2,lb1_, lb2_, ub1_, ub2_,lbi1, lbi2 - character(len=20) :: name + character(len=30) :: name name='psb_r_e_c_rk2' call psb_erractionsave(err_act) @@ -391,15 +387,13 @@ Contains if (len1 < 0) then err=4025 - iplen = len1 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len1/), & & a_err='complex(psb_spk_)') goto 9999 end if if (len2 < 0) then err=4025 - iplen = len2 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len2/), & & a_err='complex(psb_spk_)') goto 9999 end if @@ -415,8 +409,7 @@ Contains Allocate(tmp(lb1_:ub1_,lb2_:ub2_),stat=info) if (info /= psb_success_) then err=4025 - iplen = len1*len2 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/(len1*len2)/), & & a_err='complex(psb_spk_)') goto 9999 end if @@ -430,8 +423,7 @@ Contains Allocate(rrax(lb1_:ub1_,lb2_:ub2_),stat=info) if (info /= psb_success_) then err=4025 - iplen = len1*len2 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/(len1*len2)/), & & a_err='complex(psb_spk_)') goto 9999 end if @@ -463,10 +455,10 @@ Contains ! ...Local Variables complex(psb_spk_),allocatable :: tmp(:,:) - integer(psb_ipk_) :: err_act,err, iplen - integer(psb_mpk_) :: dim,lb1_, lb2_, ub1_, ub2_,lbi1, lbi2 + integer(psb_ipk_) :: err_act,err + integer(psb_epk_) :: dim,lb1_, lb2_, ub1_, ub2_,lbi1, lbi2 integer(psb_epk_) :: dim2 - character(len=20) :: name + character(len=30) :: name name='psb_r_me_c_rk2' call psb_erractionsave(err_act) @@ -486,15 +478,13 @@ Contains if (len1 < 0) then err=4025 - iplen = len1 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, m_err=(/len1/), & & a_err='complex(psb_spk_)') goto 9999 end if if (len2 < 0) then err=4025 - iplen = len2 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len2/), & & a_err='complex(psb_spk_)') goto 9999 end if @@ -510,8 +500,7 @@ Contains Allocate(tmp(lb1_:ub1_,lb2_:ub2_),stat=info) if (info /= psb_success_) then err=4025 - iplen = len1*len2 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len1*len2/), & & a_err='complex(psb_spk_)') goto 9999 end if @@ -525,8 +514,7 @@ Contains Allocate(rrax(lb1_:ub1_,lb2_:ub2_),stat=info) if (info /= psb_success_) then err=4025 - iplen = len1*len2 - call psb_errpush(err,name,i_err=(/iplen/),& + call psb_errpush(err,name,e_err=(/len1*len2/),& & a_err='complex(psb_spk_)') goto 9999 end if @@ -558,10 +546,10 @@ Contains ! ...Local Variables complex(psb_spk_),allocatable :: tmp(:,:) - integer(psb_ipk_) :: err_act,err, iplen - integer(psb_mpk_) :: dim2,lb1_, lb2_, ub1_, ub2_,lbi1, lbi2 + integer(psb_ipk_) :: err_act,err + integer(psb_epk_) :: dim2,lb1_, lb2_, ub1_, ub2_,lbi1, lbi2 integer(psb_epk_) :: dim - character(len=20) :: name + character(len=30) :: name name='psb_r_me_c_rk2' call psb_erractionsave(err_act) @@ -581,15 +569,13 @@ Contains if (len1 < 0) then err=4025 - iplen = len1 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len1/), & & a_err='complex(psb_spk_)') goto 9999 end if if (len2 < 0) then err=4025 - iplen = len2 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, m_err=(/len2/), & & a_err='complex(psb_spk_)') goto 9999 end if @@ -605,8 +591,7 @@ Contains Allocate(tmp(lb1_:ub1_,lb2_:ub2_),stat=info) if (info /= psb_success_) then err=4025 - iplen = len1*len2 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len1*len2/), & & a_err='complex(psb_spk_)') goto 9999 end if @@ -620,8 +605,7 @@ Contains Allocate(rrax(lb1_:ub1_,lb2_:ub2_),stat=info) if (info /= psb_success_) then err=4025 - iplen = len1*len2 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len1*len2/), & & a_err='complex(psb_spk_)') goto 9999 end if @@ -648,7 +632,7 @@ Contains complex(psb_spk_),allocatable, intent(inout) :: rrax(:),y(:) integer(psb_ipk_) :: info complex(psb_spk_), optional, intent(in) :: pad - character(len=20) :: name + character(len=30) :: name integer(psb_ipk_) :: err_act, err name='psb_r_m_2_c_rk1' @@ -689,7 +673,7 @@ Contains complex(psb_spk_),allocatable, intent(inout) :: rrax(:),y(:) integer(psb_ipk_) :: info complex(psb_spk_), optional, intent(in) :: pad - character(len=20) :: name + character(len=30) :: name integer(psb_ipk_) :: err_act, err name='psb_r_m_2_c_rk1' @@ -733,8 +717,8 @@ Contains integer(psb_ipk_) :: info ! ...Local Variables - integer(psb_ipk_) :: isz,err_act,lb - character(len=20) :: name, char_err + integer(psb_ipk_) :: err_act + character(len=30) :: name, char_err logical, parameter :: debug=.false. name='psb_ab_cpy_c_s' @@ -776,7 +760,7 @@ Contains ! ...Local Variables integer(psb_ipk_) :: isz,err_act,lb - character(len=20) :: name, char_err + character(len=30) :: name, char_err logical, parameter :: debug=.false. name='psb_ab_cpy_c_rk1' @@ -820,7 +804,7 @@ Contains ! ...Local Variables integer(psb_ipk_) :: isz1, isz2,err_act, lb1, lb2 - character(len=20) :: name, char_err + character(len=30) :: name, char_err logical, parameter :: debug=.false. name='psb_ab_cpy_c_rk2' @@ -867,7 +851,7 @@ Contains ! ...Local Variables integer(psb_ipk_) :: isz,err_act,lb - character(len=20) :: name, char_err + character(len=30) :: name, char_err logical, parameter :: debug=.false. name='psb_cpy_c_rk1' @@ -908,7 +892,7 @@ Contains ! ...Local Variables integer(psb_ipk_) :: isz1, isz2,err_act, lb1, lb2 - character(len=20) :: name, char_err + character(len=30) :: name, char_err logical, parameter :: debug=.false. name='psb_safe_cpy' @@ -984,7 +968,7 @@ Contains integer(psb_mpk_), optional, intent(in) :: addsz,newsz complex(psb_spk_), optional, intent(in) :: pad ! ...Local Variables - character(len=20) :: name + character(len=30) :: name logical, parameter :: debug=.false. integer(psb_ipk_) :: err_act integer(psb_mpk_) :: isz @@ -1037,7 +1021,7 @@ Contains integer(psb_epk_), optional, intent(in) :: addsz,newsz complex(psb_spk_), optional, intent(in) :: pad ! ...Local Variables - character(len=20) :: name + character(len=30) :: name logical, parameter :: debug=.false. integer(psb_ipk_) :: err_act integer(psb_epk_) :: isz diff --git a/base/modules/auxil/psb_d_realloc_mod.F90 b/base/modules/auxil/psb_d_realloc_mod.F90 index f8326f41..67810e66 100644 --- a/base/modules/auxil/psb_d_realloc_mod.F90 +++ b/base/modules/auxil/psb_d_realloc_mod.F90 @@ -92,7 +92,7 @@ Contains ! ...Local Variables integer(psb_ipk_) :: err_act,err - character(len=20) :: name + character(len=30) :: name logical, parameter :: debug=.false. name='psb_r_d_s' @@ -133,7 +133,7 @@ Contains real(psb_dpk_),allocatable :: tmp(:) integer(psb_mpk_) :: dim, lb_, lbi,ub_ integer(psb_ipk_) :: err_act,err - character(len=20) :: name + character(len=30) :: name logical, parameter :: debug=.false. name='psb_r_m_d_rk1' @@ -205,7 +205,7 @@ Contains real(psb_dpk_),allocatable :: tmp(:,:) integer(psb_ipk_) :: err_act,err integer(psb_mpk_) :: dim,dim2,lb1_, lb2_, ub1_, ub2_,lbi1, lbi2 - character(len=20) :: name + character(len=30) :: name name='psb_r_m_d_rk2' call psb_erractionsave(err_act) @@ -294,9 +294,8 @@ Contains ! ...Local Variables real(psb_dpk_),allocatable :: tmp(:) integer(psb_epk_) :: dim, lb_, lbi,ub_ - integer(psb_ipk_) :: iplen integer(psb_ipk_) :: err_act,err - character(len=20) :: name + character(len=30) :: name logical, parameter :: debug=.false. name='psb_r_m_d_rk1' @@ -311,8 +310,7 @@ Contains endif if ((len<0)) then err=4025 - iplen = len - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len/), & & a_err='real(psb_dpk_)') goto 9999 end if @@ -325,8 +323,7 @@ Contains Allocate(tmp(lb_:ub_),stat=info) if (info /= psb_success_) then err=4025 - iplen = len - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len/), & & a_err='real(psb_dpk_)') goto 9999 end if @@ -338,8 +335,7 @@ Contains Allocate(rrax(lb_:ub_),stat=info) if (info /= psb_success_) then err=4025 - iplen = len - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len/), & & a_err='real(psb_dpk_)') goto 9999 end if @@ -369,9 +365,9 @@ Contains ! ...Local Variables real(psb_dpk_),allocatable :: tmp(:,:) - integer(psb_ipk_) :: err_act,err, iplen + integer(psb_ipk_) :: err_act,err integer(psb_epk_) :: dim,dim2,lb1_, lb2_, ub1_, ub2_,lbi1, lbi2 - character(len=20) :: name + character(len=30) :: name name='psb_r_e_d_rk2' call psb_erractionsave(err_act) @@ -391,15 +387,13 @@ Contains if (len1 < 0) then err=4025 - iplen = len1 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len1/), & & a_err='real(psb_dpk_)') goto 9999 end if if (len2 < 0) then err=4025 - iplen = len2 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len2/), & & a_err='real(psb_dpk_)') goto 9999 end if @@ -415,8 +409,7 @@ Contains Allocate(tmp(lb1_:ub1_,lb2_:ub2_),stat=info) if (info /= psb_success_) then err=4025 - iplen = len1*len2 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/(len1*len2)/), & & a_err='real(psb_dpk_)') goto 9999 end if @@ -430,8 +423,7 @@ Contains Allocate(rrax(lb1_:ub1_,lb2_:ub2_),stat=info) if (info /= psb_success_) then err=4025 - iplen = len1*len2 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/(len1*len2)/), & & a_err='real(psb_dpk_)') goto 9999 end if @@ -463,10 +455,10 @@ Contains ! ...Local Variables real(psb_dpk_),allocatable :: tmp(:,:) - integer(psb_ipk_) :: err_act,err, iplen - integer(psb_mpk_) :: dim,lb1_, lb2_, ub1_, ub2_,lbi1, lbi2 + integer(psb_ipk_) :: err_act,err + integer(psb_epk_) :: dim,lb1_, lb2_, ub1_, ub2_,lbi1, lbi2 integer(psb_epk_) :: dim2 - character(len=20) :: name + character(len=30) :: name name='psb_r_me_d_rk2' call psb_erractionsave(err_act) @@ -486,15 +478,13 @@ Contains if (len1 < 0) then err=4025 - iplen = len1 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, m_err=(/len1/), & & a_err='real(psb_dpk_)') goto 9999 end if if (len2 < 0) then err=4025 - iplen = len2 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len2/), & & a_err='real(psb_dpk_)') goto 9999 end if @@ -510,8 +500,7 @@ Contains Allocate(tmp(lb1_:ub1_,lb2_:ub2_),stat=info) if (info /= psb_success_) then err=4025 - iplen = len1*len2 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len1*len2/), & & a_err='real(psb_dpk_)') goto 9999 end if @@ -525,8 +514,7 @@ Contains Allocate(rrax(lb1_:ub1_,lb2_:ub2_),stat=info) if (info /= psb_success_) then err=4025 - iplen = len1*len2 - call psb_errpush(err,name,i_err=(/iplen/),& + call psb_errpush(err,name,e_err=(/len1*len2/),& & a_err='real(psb_dpk_)') goto 9999 end if @@ -558,10 +546,10 @@ Contains ! ...Local Variables real(psb_dpk_),allocatable :: tmp(:,:) - integer(psb_ipk_) :: err_act,err, iplen - integer(psb_mpk_) :: dim2,lb1_, lb2_, ub1_, ub2_,lbi1, lbi2 + integer(psb_ipk_) :: err_act,err + integer(psb_epk_) :: dim2,lb1_, lb2_, ub1_, ub2_,lbi1, lbi2 integer(psb_epk_) :: dim - character(len=20) :: name + character(len=30) :: name name='psb_r_me_d_rk2' call psb_erractionsave(err_act) @@ -581,15 +569,13 @@ Contains if (len1 < 0) then err=4025 - iplen = len1 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len1/), & & a_err='real(psb_dpk_)') goto 9999 end if if (len2 < 0) then err=4025 - iplen = len2 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, m_err=(/len2/), & & a_err='real(psb_dpk_)') goto 9999 end if @@ -605,8 +591,7 @@ Contains Allocate(tmp(lb1_:ub1_,lb2_:ub2_),stat=info) if (info /= psb_success_) then err=4025 - iplen = len1*len2 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len1*len2/), & & a_err='real(psb_dpk_)') goto 9999 end if @@ -620,8 +605,7 @@ Contains Allocate(rrax(lb1_:ub1_,lb2_:ub2_),stat=info) if (info /= psb_success_) then err=4025 - iplen = len1*len2 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len1*len2/), & & a_err='real(psb_dpk_)') goto 9999 end if @@ -648,7 +632,7 @@ Contains real(psb_dpk_),allocatable, intent(inout) :: rrax(:),y(:) integer(psb_ipk_) :: info real(psb_dpk_), optional, intent(in) :: pad - character(len=20) :: name + character(len=30) :: name integer(psb_ipk_) :: err_act, err name='psb_r_m_2_d_rk1' @@ -689,7 +673,7 @@ Contains real(psb_dpk_),allocatable, intent(inout) :: rrax(:),y(:) integer(psb_ipk_) :: info real(psb_dpk_), optional, intent(in) :: pad - character(len=20) :: name + character(len=30) :: name integer(psb_ipk_) :: err_act, err name='psb_r_m_2_d_rk1' @@ -733,8 +717,8 @@ Contains integer(psb_ipk_) :: info ! ...Local Variables - integer(psb_ipk_) :: isz,err_act,lb - character(len=20) :: name, char_err + integer(psb_ipk_) :: err_act + character(len=30) :: name, char_err logical, parameter :: debug=.false. name='psb_ab_cpy_d_s' @@ -776,7 +760,7 @@ Contains ! ...Local Variables integer(psb_ipk_) :: isz,err_act,lb - character(len=20) :: name, char_err + character(len=30) :: name, char_err logical, parameter :: debug=.false. name='psb_ab_cpy_d_rk1' @@ -820,7 +804,7 @@ Contains ! ...Local Variables integer(psb_ipk_) :: isz1, isz2,err_act, lb1, lb2 - character(len=20) :: name, char_err + character(len=30) :: name, char_err logical, parameter :: debug=.false. name='psb_ab_cpy_d_rk2' @@ -867,7 +851,7 @@ Contains ! ...Local Variables integer(psb_ipk_) :: isz,err_act,lb - character(len=20) :: name, char_err + character(len=30) :: name, char_err logical, parameter :: debug=.false. name='psb_cpy_d_rk1' @@ -908,7 +892,7 @@ Contains ! ...Local Variables integer(psb_ipk_) :: isz1, isz2,err_act, lb1, lb2 - character(len=20) :: name, char_err + character(len=30) :: name, char_err logical, parameter :: debug=.false. name='psb_safe_cpy' @@ -984,7 +968,7 @@ Contains integer(psb_mpk_), optional, intent(in) :: addsz,newsz real(psb_dpk_), optional, intent(in) :: pad ! ...Local Variables - character(len=20) :: name + character(len=30) :: name logical, parameter :: debug=.false. integer(psb_ipk_) :: err_act integer(psb_mpk_) :: isz @@ -1037,7 +1021,7 @@ Contains integer(psb_epk_), optional, intent(in) :: addsz,newsz real(psb_dpk_), optional, intent(in) :: pad ! ...Local Variables - character(len=20) :: name + character(len=30) :: name logical, parameter :: debug=.false. integer(psb_ipk_) :: err_act integer(psb_epk_) :: isz diff --git a/base/modules/auxil/psb_e_realloc_mod.F90 b/base/modules/auxil/psb_e_realloc_mod.F90 index 4ad49a2c..763a917c 100644 --- a/base/modules/auxil/psb_e_realloc_mod.F90 +++ b/base/modules/auxil/psb_e_realloc_mod.F90 @@ -92,7 +92,7 @@ Contains ! ...Local Variables integer(psb_ipk_) :: err_act,err - character(len=20) :: name + character(len=30) :: name logical, parameter :: debug=.false. name='psb_r_e_s' @@ -133,7 +133,7 @@ Contains integer(psb_epk_),allocatable :: tmp(:) integer(psb_mpk_) :: dim, lb_, lbi,ub_ integer(psb_ipk_) :: err_act,err - character(len=20) :: name + character(len=30) :: name logical, parameter :: debug=.false. name='psb_r_m_e_rk1' @@ -205,7 +205,7 @@ Contains integer(psb_epk_),allocatable :: tmp(:,:) integer(psb_ipk_) :: err_act,err integer(psb_mpk_) :: dim,dim2,lb1_, lb2_, ub1_, ub2_,lbi1, lbi2 - character(len=20) :: name + character(len=30) :: name name='psb_r_m_e_rk2' call psb_erractionsave(err_act) @@ -294,9 +294,8 @@ Contains ! ...Local Variables integer(psb_epk_),allocatable :: tmp(:) integer(psb_epk_) :: dim, lb_, lbi,ub_ - integer(psb_ipk_) :: iplen integer(psb_ipk_) :: err_act,err - character(len=20) :: name + character(len=30) :: name logical, parameter :: debug=.false. name='psb_r_m_e_rk1' @@ -311,8 +310,7 @@ Contains endif if ((len<0)) then err=4025 - iplen = len - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len/), & & a_err='integer(psb_epk_)') goto 9999 end if @@ -325,8 +323,7 @@ Contains Allocate(tmp(lb_:ub_),stat=info) if (info /= psb_success_) then err=4025 - iplen = len - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len/), & & a_err='integer(psb_epk_)') goto 9999 end if @@ -338,8 +335,7 @@ Contains Allocate(rrax(lb_:ub_),stat=info) if (info /= psb_success_) then err=4025 - iplen = len - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len/), & & a_err='integer(psb_epk_)') goto 9999 end if @@ -369,9 +365,9 @@ Contains ! ...Local Variables integer(psb_epk_),allocatable :: tmp(:,:) - integer(psb_ipk_) :: err_act,err, iplen + integer(psb_ipk_) :: err_act,err integer(psb_epk_) :: dim,dim2,lb1_, lb2_, ub1_, ub2_,lbi1, lbi2 - character(len=20) :: name + character(len=30) :: name name='psb_r_e_e_rk2' call psb_erractionsave(err_act) @@ -391,15 +387,13 @@ Contains if (len1 < 0) then err=4025 - iplen = len1 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len1/), & & a_err='integer(psb_epk_)') goto 9999 end if if (len2 < 0) then err=4025 - iplen = len2 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len2/), & & a_err='integer(psb_epk_)') goto 9999 end if @@ -415,8 +409,7 @@ Contains Allocate(tmp(lb1_:ub1_,lb2_:ub2_),stat=info) if (info /= psb_success_) then err=4025 - iplen = len1*len2 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/(len1*len2)/), & & a_err='integer(psb_epk_)') goto 9999 end if @@ -430,8 +423,7 @@ Contains Allocate(rrax(lb1_:ub1_,lb2_:ub2_),stat=info) if (info /= psb_success_) then err=4025 - iplen = len1*len2 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/(len1*len2)/), & & a_err='integer(psb_epk_)') goto 9999 end if @@ -463,10 +455,10 @@ Contains ! ...Local Variables integer(psb_epk_),allocatable :: tmp(:,:) - integer(psb_ipk_) :: err_act,err, iplen - integer(psb_mpk_) :: dim,lb1_, lb2_, ub1_, ub2_,lbi1, lbi2 + integer(psb_ipk_) :: err_act,err + integer(psb_epk_) :: dim,lb1_, lb2_, ub1_, ub2_,lbi1, lbi2 integer(psb_epk_) :: dim2 - character(len=20) :: name + character(len=30) :: name name='psb_r_me_e_rk2' call psb_erractionsave(err_act) @@ -486,15 +478,13 @@ Contains if (len1 < 0) then err=4025 - iplen = len1 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, m_err=(/len1/), & & a_err='integer(psb_epk_)') goto 9999 end if if (len2 < 0) then err=4025 - iplen = len2 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len2/), & & a_err='integer(psb_epk_)') goto 9999 end if @@ -510,8 +500,7 @@ Contains Allocate(tmp(lb1_:ub1_,lb2_:ub2_),stat=info) if (info /= psb_success_) then err=4025 - iplen = len1*len2 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len1*len2/), & & a_err='integer(psb_epk_)') goto 9999 end if @@ -525,8 +514,7 @@ Contains Allocate(rrax(lb1_:ub1_,lb2_:ub2_),stat=info) if (info /= psb_success_) then err=4025 - iplen = len1*len2 - call psb_errpush(err,name,i_err=(/iplen/),& + call psb_errpush(err,name,e_err=(/len1*len2/),& & a_err='integer(psb_epk_)') goto 9999 end if @@ -558,10 +546,10 @@ Contains ! ...Local Variables integer(psb_epk_),allocatable :: tmp(:,:) - integer(psb_ipk_) :: err_act,err, iplen - integer(psb_mpk_) :: dim2,lb1_, lb2_, ub1_, ub2_,lbi1, lbi2 + integer(psb_ipk_) :: err_act,err + integer(psb_epk_) :: dim2,lb1_, lb2_, ub1_, ub2_,lbi1, lbi2 integer(psb_epk_) :: dim - character(len=20) :: name + character(len=30) :: name name='psb_r_me_e_rk2' call psb_erractionsave(err_act) @@ -581,15 +569,13 @@ Contains if (len1 < 0) then err=4025 - iplen = len1 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len1/), & & a_err='integer(psb_epk_)') goto 9999 end if if (len2 < 0) then err=4025 - iplen = len2 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, m_err=(/len2/), & & a_err='integer(psb_epk_)') goto 9999 end if @@ -605,8 +591,7 @@ Contains Allocate(tmp(lb1_:ub1_,lb2_:ub2_),stat=info) if (info /= psb_success_) then err=4025 - iplen = len1*len2 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len1*len2/), & & a_err='integer(psb_epk_)') goto 9999 end if @@ -620,8 +605,7 @@ Contains Allocate(rrax(lb1_:ub1_,lb2_:ub2_),stat=info) if (info /= psb_success_) then err=4025 - iplen = len1*len2 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len1*len2/), & & a_err='integer(psb_epk_)') goto 9999 end if @@ -648,7 +632,7 @@ Contains integer(psb_epk_),allocatable, intent(inout) :: rrax(:),y(:) integer(psb_ipk_) :: info integer(psb_epk_), optional, intent(in) :: pad - character(len=20) :: name + character(len=30) :: name integer(psb_ipk_) :: err_act, err name='psb_r_m_2_e_rk1' @@ -689,7 +673,7 @@ Contains integer(psb_epk_),allocatable, intent(inout) :: rrax(:),y(:) integer(psb_ipk_) :: info integer(psb_epk_), optional, intent(in) :: pad - character(len=20) :: name + character(len=30) :: name integer(psb_ipk_) :: err_act, err name='psb_r_m_2_e_rk1' @@ -733,8 +717,8 @@ Contains integer(psb_ipk_) :: info ! ...Local Variables - integer(psb_ipk_) :: isz,err_act,lb - character(len=20) :: name, char_err + integer(psb_ipk_) :: err_act + character(len=30) :: name, char_err logical, parameter :: debug=.false. name='psb_ab_cpy_e_s' @@ -776,7 +760,7 @@ Contains ! ...Local Variables integer(psb_ipk_) :: isz,err_act,lb - character(len=20) :: name, char_err + character(len=30) :: name, char_err logical, parameter :: debug=.false. name='psb_ab_cpy_e_rk1' @@ -820,7 +804,7 @@ Contains ! ...Local Variables integer(psb_ipk_) :: isz1, isz2,err_act, lb1, lb2 - character(len=20) :: name, char_err + character(len=30) :: name, char_err logical, parameter :: debug=.false. name='psb_ab_cpy_e_rk2' @@ -867,7 +851,7 @@ Contains ! ...Local Variables integer(psb_ipk_) :: isz,err_act,lb - character(len=20) :: name, char_err + character(len=30) :: name, char_err logical, parameter :: debug=.false. name='psb_cpy_e_rk1' @@ -908,7 +892,7 @@ Contains ! ...Local Variables integer(psb_ipk_) :: isz1, isz2,err_act, lb1, lb2 - character(len=20) :: name, char_err + character(len=30) :: name, char_err logical, parameter :: debug=.false. name='psb_safe_cpy' @@ -984,7 +968,7 @@ Contains integer(psb_mpk_), optional, intent(in) :: addsz,newsz integer(psb_epk_), optional, intent(in) :: pad ! ...Local Variables - character(len=20) :: name + character(len=30) :: name logical, parameter :: debug=.false. integer(psb_ipk_) :: err_act integer(psb_mpk_) :: isz @@ -1037,7 +1021,7 @@ Contains integer(psb_epk_), optional, intent(in) :: addsz,newsz integer(psb_epk_), optional, intent(in) :: pad ! ...Local Variables - character(len=20) :: name + character(len=30) :: name logical, parameter :: debug=.false. integer(psb_ipk_) :: err_act integer(psb_epk_) :: isz diff --git a/base/modules/auxil/psb_i2_realloc_mod.F90 b/base/modules/auxil/psb_i2_realloc_mod.F90 index 6528372f..5c80f396 100644 --- a/base/modules/auxil/psb_i2_realloc_mod.F90 +++ b/base/modules/auxil/psb_i2_realloc_mod.F90 @@ -92,7 +92,7 @@ Contains ! ...Local Variables integer(psb_ipk_) :: err_act,err - character(len=20) :: name + character(len=30) :: name logical, parameter :: debug=.false. name='psb_r_i2_s' @@ -133,7 +133,7 @@ Contains integer(psb_i2pk_),allocatable :: tmp(:) integer(psb_mpk_) :: dim, lb_, lbi,ub_ integer(psb_ipk_) :: err_act,err - character(len=20) :: name + character(len=30) :: name logical, parameter :: debug=.false. name='psb_r_m_i2_rk1' @@ -205,7 +205,7 @@ Contains integer(psb_i2pk_),allocatable :: tmp(:,:) integer(psb_ipk_) :: err_act,err integer(psb_mpk_) :: dim,dim2,lb1_, lb2_, ub1_, ub2_,lbi1, lbi2 - character(len=20) :: name + character(len=30) :: name name='psb_r_m_i2_rk2' call psb_erractionsave(err_act) @@ -294,9 +294,8 @@ Contains ! ...Local Variables integer(psb_i2pk_),allocatable :: tmp(:) integer(psb_epk_) :: dim, lb_, lbi,ub_ - integer(psb_ipk_) :: iplen integer(psb_ipk_) :: err_act,err - character(len=20) :: name + character(len=30) :: name logical, parameter :: debug=.false. name='psb_r_m_i2_rk1' @@ -311,8 +310,7 @@ Contains endif if ((len<0)) then err=4025 - iplen = len - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len/), & & a_err='integer(psb_i2pk_)') goto 9999 end if @@ -325,8 +323,7 @@ Contains Allocate(tmp(lb_:ub_),stat=info) if (info /= psb_success_) then err=4025 - iplen = len - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len/), & & a_err='integer(psb_i2pk_)') goto 9999 end if @@ -338,8 +335,7 @@ Contains Allocate(rrax(lb_:ub_),stat=info) if (info /= psb_success_) then err=4025 - iplen = len - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len/), & & a_err='integer(psb_i2pk_)') goto 9999 end if @@ -369,9 +365,9 @@ Contains ! ...Local Variables integer(psb_i2pk_),allocatable :: tmp(:,:) - integer(psb_ipk_) :: err_act,err, iplen + integer(psb_ipk_) :: err_act,err integer(psb_epk_) :: dim,dim2,lb1_, lb2_, ub1_, ub2_,lbi1, lbi2 - character(len=20) :: name + character(len=30) :: name name='psb_r_e_i2_rk2' call psb_erractionsave(err_act) @@ -391,15 +387,13 @@ Contains if (len1 < 0) then err=4025 - iplen = len1 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len1/), & & a_err='integer(psb_i2pk_)') goto 9999 end if if (len2 < 0) then err=4025 - iplen = len2 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len2/), & & a_err='integer(psb_i2pk_)') goto 9999 end if @@ -415,8 +409,7 @@ Contains Allocate(tmp(lb1_:ub1_,lb2_:ub2_),stat=info) if (info /= psb_success_) then err=4025 - iplen = len1*len2 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/(len1*len2)/), & & a_err='integer(psb_i2pk_)') goto 9999 end if @@ -430,8 +423,7 @@ Contains Allocate(rrax(lb1_:ub1_,lb2_:ub2_),stat=info) if (info /= psb_success_) then err=4025 - iplen = len1*len2 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/(len1*len2)/), & & a_err='integer(psb_i2pk_)') goto 9999 end if @@ -463,10 +455,10 @@ Contains ! ...Local Variables integer(psb_i2pk_),allocatable :: tmp(:,:) - integer(psb_ipk_) :: err_act,err, iplen - integer(psb_mpk_) :: dim,lb1_, lb2_, ub1_, ub2_,lbi1, lbi2 + integer(psb_ipk_) :: err_act,err + integer(psb_epk_) :: dim,lb1_, lb2_, ub1_, ub2_,lbi1, lbi2 integer(psb_epk_) :: dim2 - character(len=20) :: name + character(len=30) :: name name='psb_r_me_i2_rk2' call psb_erractionsave(err_act) @@ -486,15 +478,13 @@ Contains if (len1 < 0) then err=4025 - iplen = len1 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, m_err=(/len1/), & & a_err='integer(psb_i2pk_)') goto 9999 end if if (len2 < 0) then err=4025 - iplen = len2 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len2/), & & a_err='integer(psb_i2pk_)') goto 9999 end if @@ -510,8 +500,7 @@ Contains Allocate(tmp(lb1_:ub1_,lb2_:ub2_),stat=info) if (info /= psb_success_) then err=4025 - iplen = len1*len2 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len1*len2/), & & a_err='integer(psb_i2pk_)') goto 9999 end if @@ -525,8 +514,7 @@ Contains Allocate(rrax(lb1_:ub1_,lb2_:ub2_),stat=info) if (info /= psb_success_) then err=4025 - iplen = len1*len2 - call psb_errpush(err,name,i_err=(/iplen/),& + call psb_errpush(err,name,e_err=(/len1*len2/),& & a_err='integer(psb_i2pk_)') goto 9999 end if @@ -558,10 +546,10 @@ Contains ! ...Local Variables integer(psb_i2pk_),allocatable :: tmp(:,:) - integer(psb_ipk_) :: err_act,err, iplen - integer(psb_mpk_) :: dim2,lb1_, lb2_, ub1_, ub2_,lbi1, lbi2 + integer(psb_ipk_) :: err_act,err + integer(psb_epk_) :: dim2,lb1_, lb2_, ub1_, ub2_,lbi1, lbi2 integer(psb_epk_) :: dim - character(len=20) :: name + character(len=30) :: name name='psb_r_me_i2_rk2' call psb_erractionsave(err_act) @@ -581,15 +569,13 @@ Contains if (len1 < 0) then err=4025 - iplen = len1 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len1/), & & a_err='integer(psb_i2pk_)') goto 9999 end if if (len2 < 0) then err=4025 - iplen = len2 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, m_err=(/len2/), & & a_err='integer(psb_i2pk_)') goto 9999 end if @@ -605,8 +591,7 @@ Contains Allocate(tmp(lb1_:ub1_,lb2_:ub2_),stat=info) if (info /= psb_success_) then err=4025 - iplen = len1*len2 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len1*len2/), & & a_err='integer(psb_i2pk_)') goto 9999 end if @@ -620,8 +605,7 @@ Contains Allocate(rrax(lb1_:ub1_,lb2_:ub2_),stat=info) if (info /= psb_success_) then err=4025 - iplen = len1*len2 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len1*len2/), & & a_err='integer(psb_i2pk_)') goto 9999 end if @@ -648,7 +632,7 @@ Contains integer(psb_i2pk_),allocatable, intent(inout) :: rrax(:),y(:) integer(psb_ipk_) :: info integer(psb_i2pk_), optional, intent(in) :: pad - character(len=20) :: name + character(len=30) :: name integer(psb_ipk_) :: err_act, err name='psb_r_m_2_i2_rk1' @@ -689,7 +673,7 @@ Contains integer(psb_i2pk_),allocatable, intent(inout) :: rrax(:),y(:) integer(psb_ipk_) :: info integer(psb_i2pk_), optional, intent(in) :: pad - character(len=20) :: name + character(len=30) :: name integer(psb_ipk_) :: err_act, err name='psb_r_m_2_i2_rk1' @@ -733,8 +717,8 @@ Contains integer(psb_ipk_) :: info ! ...Local Variables - integer(psb_ipk_) :: isz,err_act,lb - character(len=20) :: name, char_err + integer(psb_ipk_) :: err_act + character(len=30) :: name, char_err logical, parameter :: debug=.false. name='psb_ab_cpy_i2_s' @@ -776,7 +760,7 @@ Contains ! ...Local Variables integer(psb_ipk_) :: isz,err_act,lb - character(len=20) :: name, char_err + character(len=30) :: name, char_err logical, parameter :: debug=.false. name='psb_ab_cpy_i2_rk1' @@ -820,7 +804,7 @@ Contains ! ...Local Variables integer(psb_ipk_) :: isz1, isz2,err_act, lb1, lb2 - character(len=20) :: name, char_err + character(len=30) :: name, char_err logical, parameter :: debug=.false. name='psb_ab_cpy_i2_rk2' @@ -867,7 +851,7 @@ Contains ! ...Local Variables integer(psb_ipk_) :: isz,err_act,lb - character(len=20) :: name, char_err + character(len=30) :: name, char_err logical, parameter :: debug=.false. name='psb_cpy_i2_rk1' @@ -908,7 +892,7 @@ Contains ! ...Local Variables integer(psb_ipk_) :: isz1, isz2,err_act, lb1, lb2 - character(len=20) :: name, char_err + character(len=30) :: name, char_err logical, parameter :: debug=.false. name='psb_safe_cpy' @@ -984,7 +968,7 @@ Contains integer(psb_mpk_), optional, intent(in) :: addsz,newsz integer(psb_i2pk_), optional, intent(in) :: pad ! ...Local Variables - character(len=20) :: name + character(len=30) :: name logical, parameter :: debug=.false. integer(psb_ipk_) :: err_act integer(psb_mpk_) :: isz @@ -1037,7 +1021,7 @@ Contains integer(psb_epk_), optional, intent(in) :: addsz,newsz integer(psb_i2pk_), optional, intent(in) :: pad ! ...Local Variables - character(len=20) :: name + character(len=30) :: name logical, parameter :: debug=.false. integer(psb_ipk_) :: err_act integer(psb_epk_) :: isz diff --git a/base/modules/auxil/psb_m_realloc_mod.F90 b/base/modules/auxil/psb_m_realloc_mod.F90 index b60e7ae2..ec7e5671 100644 --- a/base/modules/auxil/psb_m_realloc_mod.F90 +++ b/base/modules/auxil/psb_m_realloc_mod.F90 @@ -92,7 +92,7 @@ Contains ! ...Local Variables integer(psb_ipk_) :: err_act,err - character(len=20) :: name + character(len=30) :: name logical, parameter :: debug=.false. name='psb_r_m_s' @@ -133,7 +133,7 @@ Contains integer(psb_mpk_),allocatable :: tmp(:) integer(psb_mpk_) :: dim, lb_, lbi,ub_ integer(psb_ipk_) :: err_act,err - character(len=20) :: name + character(len=30) :: name logical, parameter :: debug=.false. name='psb_r_m_m_rk1' @@ -205,7 +205,7 @@ Contains integer(psb_mpk_),allocatable :: tmp(:,:) integer(psb_ipk_) :: err_act,err integer(psb_mpk_) :: dim,dim2,lb1_, lb2_, ub1_, ub2_,lbi1, lbi2 - character(len=20) :: name + character(len=30) :: name name='psb_r_m_m_rk2' call psb_erractionsave(err_act) @@ -294,9 +294,8 @@ Contains ! ...Local Variables integer(psb_mpk_),allocatable :: tmp(:) integer(psb_epk_) :: dim, lb_, lbi,ub_ - integer(psb_ipk_) :: iplen integer(psb_ipk_) :: err_act,err - character(len=20) :: name + character(len=30) :: name logical, parameter :: debug=.false. name='psb_r_m_m_rk1' @@ -311,8 +310,7 @@ Contains endif if ((len<0)) then err=4025 - iplen = len - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len/), & & a_err='integer(psb_mpk_)') goto 9999 end if @@ -325,8 +323,7 @@ Contains Allocate(tmp(lb_:ub_),stat=info) if (info /= psb_success_) then err=4025 - iplen = len - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len/), & & a_err='integer(psb_mpk_)') goto 9999 end if @@ -338,8 +335,7 @@ Contains Allocate(rrax(lb_:ub_),stat=info) if (info /= psb_success_) then err=4025 - iplen = len - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len/), & & a_err='integer(psb_mpk_)') goto 9999 end if @@ -369,9 +365,9 @@ Contains ! ...Local Variables integer(psb_mpk_),allocatable :: tmp(:,:) - integer(psb_ipk_) :: err_act,err, iplen + integer(psb_ipk_) :: err_act,err integer(psb_epk_) :: dim,dim2,lb1_, lb2_, ub1_, ub2_,lbi1, lbi2 - character(len=20) :: name + character(len=30) :: name name='psb_r_e_m_rk2' call psb_erractionsave(err_act) @@ -391,15 +387,13 @@ Contains if (len1 < 0) then err=4025 - iplen = len1 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len1/), & & a_err='integer(psb_mpk_)') goto 9999 end if if (len2 < 0) then err=4025 - iplen = len2 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len2/), & & a_err='integer(psb_mpk_)') goto 9999 end if @@ -415,8 +409,7 @@ Contains Allocate(tmp(lb1_:ub1_,lb2_:ub2_),stat=info) if (info /= psb_success_) then err=4025 - iplen = len1*len2 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/(len1*len2)/), & & a_err='integer(psb_mpk_)') goto 9999 end if @@ -430,8 +423,7 @@ Contains Allocate(rrax(lb1_:ub1_,lb2_:ub2_),stat=info) if (info /= psb_success_) then err=4025 - iplen = len1*len2 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/(len1*len2)/), & & a_err='integer(psb_mpk_)') goto 9999 end if @@ -463,10 +455,10 @@ Contains ! ...Local Variables integer(psb_mpk_),allocatable :: tmp(:,:) - integer(psb_ipk_) :: err_act,err, iplen - integer(psb_mpk_) :: dim,lb1_, lb2_, ub1_, ub2_,lbi1, lbi2 + integer(psb_ipk_) :: err_act,err + integer(psb_epk_) :: dim,lb1_, lb2_, ub1_, ub2_,lbi1, lbi2 integer(psb_epk_) :: dim2 - character(len=20) :: name + character(len=30) :: name name='psb_r_me_m_rk2' call psb_erractionsave(err_act) @@ -486,15 +478,13 @@ Contains if (len1 < 0) then err=4025 - iplen = len1 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, m_err=(/len1/), & & a_err='integer(psb_mpk_)') goto 9999 end if if (len2 < 0) then err=4025 - iplen = len2 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len2/), & & a_err='integer(psb_mpk_)') goto 9999 end if @@ -510,8 +500,7 @@ Contains Allocate(tmp(lb1_:ub1_,lb2_:ub2_),stat=info) if (info /= psb_success_) then err=4025 - iplen = len1*len2 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len1*len2/), & & a_err='integer(psb_mpk_)') goto 9999 end if @@ -525,8 +514,7 @@ Contains Allocate(rrax(lb1_:ub1_,lb2_:ub2_),stat=info) if (info /= psb_success_) then err=4025 - iplen = len1*len2 - call psb_errpush(err,name,i_err=(/iplen/),& + call psb_errpush(err,name,e_err=(/len1*len2/),& & a_err='integer(psb_mpk_)') goto 9999 end if @@ -558,10 +546,10 @@ Contains ! ...Local Variables integer(psb_mpk_),allocatable :: tmp(:,:) - integer(psb_ipk_) :: err_act,err, iplen - integer(psb_mpk_) :: dim2,lb1_, lb2_, ub1_, ub2_,lbi1, lbi2 + integer(psb_ipk_) :: err_act,err + integer(psb_epk_) :: dim2,lb1_, lb2_, ub1_, ub2_,lbi1, lbi2 integer(psb_epk_) :: dim - character(len=20) :: name + character(len=30) :: name name='psb_r_me_m_rk2' call psb_erractionsave(err_act) @@ -581,15 +569,13 @@ Contains if (len1 < 0) then err=4025 - iplen = len1 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len1/), & & a_err='integer(psb_mpk_)') goto 9999 end if if (len2 < 0) then err=4025 - iplen = len2 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, m_err=(/len2/), & & a_err='integer(psb_mpk_)') goto 9999 end if @@ -605,8 +591,7 @@ Contains Allocate(tmp(lb1_:ub1_,lb2_:ub2_),stat=info) if (info /= psb_success_) then err=4025 - iplen = len1*len2 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len1*len2/), & & a_err='integer(psb_mpk_)') goto 9999 end if @@ -620,8 +605,7 @@ Contains Allocate(rrax(lb1_:ub1_,lb2_:ub2_),stat=info) if (info /= psb_success_) then err=4025 - iplen = len1*len2 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len1*len2/), & & a_err='integer(psb_mpk_)') goto 9999 end if @@ -648,7 +632,7 @@ Contains integer(psb_mpk_),allocatable, intent(inout) :: rrax(:),y(:) integer(psb_ipk_) :: info integer(psb_mpk_), optional, intent(in) :: pad - character(len=20) :: name + character(len=30) :: name integer(psb_ipk_) :: err_act, err name='psb_r_m_2_m_rk1' @@ -689,7 +673,7 @@ Contains integer(psb_mpk_),allocatable, intent(inout) :: rrax(:),y(:) integer(psb_ipk_) :: info integer(psb_mpk_), optional, intent(in) :: pad - character(len=20) :: name + character(len=30) :: name integer(psb_ipk_) :: err_act, err name='psb_r_m_2_m_rk1' @@ -733,8 +717,8 @@ Contains integer(psb_ipk_) :: info ! ...Local Variables - integer(psb_ipk_) :: isz,err_act,lb - character(len=20) :: name, char_err + integer(psb_ipk_) :: err_act + character(len=30) :: name, char_err logical, parameter :: debug=.false. name='psb_ab_cpy_m_s' @@ -776,7 +760,7 @@ Contains ! ...Local Variables integer(psb_ipk_) :: isz,err_act,lb - character(len=20) :: name, char_err + character(len=30) :: name, char_err logical, parameter :: debug=.false. name='psb_ab_cpy_m_rk1' @@ -820,7 +804,7 @@ Contains ! ...Local Variables integer(psb_ipk_) :: isz1, isz2,err_act, lb1, lb2 - character(len=20) :: name, char_err + character(len=30) :: name, char_err logical, parameter :: debug=.false. name='psb_ab_cpy_m_rk2' @@ -867,7 +851,7 @@ Contains ! ...Local Variables integer(psb_ipk_) :: isz,err_act,lb - character(len=20) :: name, char_err + character(len=30) :: name, char_err logical, parameter :: debug=.false. name='psb_cpy_m_rk1' @@ -908,7 +892,7 @@ Contains ! ...Local Variables integer(psb_ipk_) :: isz1, isz2,err_act, lb1, lb2 - character(len=20) :: name, char_err + character(len=30) :: name, char_err logical, parameter :: debug=.false. name='psb_safe_cpy' @@ -984,7 +968,7 @@ Contains integer(psb_mpk_), optional, intent(in) :: addsz,newsz integer(psb_mpk_), optional, intent(in) :: pad ! ...Local Variables - character(len=20) :: name + character(len=30) :: name logical, parameter :: debug=.false. integer(psb_ipk_) :: err_act integer(psb_mpk_) :: isz @@ -1037,7 +1021,7 @@ Contains integer(psb_epk_), optional, intent(in) :: addsz,newsz integer(psb_mpk_), optional, intent(in) :: pad ! ...Local Variables - character(len=20) :: name + character(len=30) :: name logical, parameter :: debug=.false. integer(psb_ipk_) :: err_act integer(psb_epk_) :: isz diff --git a/base/modules/auxil/psb_s_realloc_mod.F90 b/base/modules/auxil/psb_s_realloc_mod.F90 index f7cfdbfe..8751b524 100644 --- a/base/modules/auxil/psb_s_realloc_mod.F90 +++ b/base/modules/auxil/psb_s_realloc_mod.F90 @@ -92,7 +92,7 @@ Contains ! ...Local Variables integer(psb_ipk_) :: err_act,err - character(len=20) :: name + character(len=30) :: name logical, parameter :: debug=.false. name='psb_r_s_s' @@ -133,7 +133,7 @@ Contains real(psb_spk_),allocatable :: tmp(:) integer(psb_mpk_) :: dim, lb_, lbi,ub_ integer(psb_ipk_) :: err_act,err - character(len=20) :: name + character(len=30) :: name logical, parameter :: debug=.false. name='psb_r_m_s_rk1' @@ -205,7 +205,7 @@ Contains real(psb_spk_),allocatable :: tmp(:,:) integer(psb_ipk_) :: err_act,err integer(psb_mpk_) :: dim,dim2,lb1_, lb2_, ub1_, ub2_,lbi1, lbi2 - character(len=20) :: name + character(len=30) :: name name='psb_r_m_s_rk2' call psb_erractionsave(err_act) @@ -294,9 +294,8 @@ Contains ! ...Local Variables real(psb_spk_),allocatable :: tmp(:) integer(psb_epk_) :: dim, lb_, lbi,ub_ - integer(psb_ipk_) :: iplen integer(psb_ipk_) :: err_act,err - character(len=20) :: name + character(len=30) :: name logical, parameter :: debug=.false. name='psb_r_m_s_rk1' @@ -311,8 +310,7 @@ Contains endif if ((len<0)) then err=4025 - iplen = len - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len/), & & a_err='real(psb_spk_)') goto 9999 end if @@ -325,8 +323,7 @@ Contains Allocate(tmp(lb_:ub_),stat=info) if (info /= psb_success_) then err=4025 - iplen = len - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len/), & & a_err='real(psb_spk_)') goto 9999 end if @@ -338,8 +335,7 @@ Contains Allocate(rrax(lb_:ub_),stat=info) if (info /= psb_success_) then err=4025 - iplen = len - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len/), & & a_err='real(psb_spk_)') goto 9999 end if @@ -369,9 +365,9 @@ Contains ! ...Local Variables real(psb_spk_),allocatable :: tmp(:,:) - integer(psb_ipk_) :: err_act,err, iplen + integer(psb_ipk_) :: err_act,err integer(psb_epk_) :: dim,dim2,lb1_, lb2_, ub1_, ub2_,lbi1, lbi2 - character(len=20) :: name + character(len=30) :: name name='psb_r_e_s_rk2' call psb_erractionsave(err_act) @@ -391,15 +387,13 @@ Contains if (len1 < 0) then err=4025 - iplen = len1 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len1/), & & a_err='real(psb_spk_)') goto 9999 end if if (len2 < 0) then err=4025 - iplen = len2 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len2/), & & a_err='real(psb_spk_)') goto 9999 end if @@ -415,8 +409,7 @@ Contains Allocate(tmp(lb1_:ub1_,lb2_:ub2_),stat=info) if (info /= psb_success_) then err=4025 - iplen = len1*len2 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/(len1*len2)/), & & a_err='real(psb_spk_)') goto 9999 end if @@ -430,8 +423,7 @@ Contains Allocate(rrax(lb1_:ub1_,lb2_:ub2_),stat=info) if (info /= psb_success_) then err=4025 - iplen = len1*len2 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/(len1*len2)/), & & a_err='real(psb_spk_)') goto 9999 end if @@ -463,10 +455,10 @@ Contains ! ...Local Variables real(psb_spk_),allocatable :: tmp(:,:) - integer(psb_ipk_) :: err_act,err, iplen - integer(psb_mpk_) :: dim,lb1_, lb2_, ub1_, ub2_,lbi1, lbi2 + integer(psb_ipk_) :: err_act,err + integer(psb_epk_) :: dim,lb1_, lb2_, ub1_, ub2_,lbi1, lbi2 integer(psb_epk_) :: dim2 - character(len=20) :: name + character(len=30) :: name name='psb_r_me_s_rk2' call psb_erractionsave(err_act) @@ -486,15 +478,13 @@ Contains if (len1 < 0) then err=4025 - iplen = len1 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, m_err=(/len1/), & & a_err='real(psb_spk_)') goto 9999 end if if (len2 < 0) then err=4025 - iplen = len2 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len2/), & & a_err='real(psb_spk_)') goto 9999 end if @@ -510,8 +500,7 @@ Contains Allocate(tmp(lb1_:ub1_,lb2_:ub2_),stat=info) if (info /= psb_success_) then err=4025 - iplen = len1*len2 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len1*len2/), & & a_err='real(psb_spk_)') goto 9999 end if @@ -525,8 +514,7 @@ Contains Allocate(rrax(lb1_:ub1_,lb2_:ub2_),stat=info) if (info /= psb_success_) then err=4025 - iplen = len1*len2 - call psb_errpush(err,name,i_err=(/iplen/),& + call psb_errpush(err,name,e_err=(/len1*len2/),& & a_err='real(psb_spk_)') goto 9999 end if @@ -558,10 +546,10 @@ Contains ! ...Local Variables real(psb_spk_),allocatable :: tmp(:,:) - integer(psb_ipk_) :: err_act,err, iplen - integer(psb_mpk_) :: dim2,lb1_, lb2_, ub1_, ub2_,lbi1, lbi2 + integer(psb_ipk_) :: err_act,err + integer(psb_epk_) :: dim2,lb1_, lb2_, ub1_, ub2_,lbi1, lbi2 integer(psb_epk_) :: dim - character(len=20) :: name + character(len=30) :: name name='psb_r_me_s_rk2' call psb_erractionsave(err_act) @@ -581,15 +569,13 @@ Contains if (len1 < 0) then err=4025 - iplen = len1 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len1/), & & a_err='real(psb_spk_)') goto 9999 end if if (len2 < 0) then err=4025 - iplen = len2 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, m_err=(/len2/), & & a_err='real(psb_spk_)') goto 9999 end if @@ -605,8 +591,7 @@ Contains Allocate(tmp(lb1_:ub1_,lb2_:ub2_),stat=info) if (info /= psb_success_) then err=4025 - iplen = len1*len2 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len1*len2/), & & a_err='real(psb_spk_)') goto 9999 end if @@ -620,8 +605,7 @@ Contains Allocate(rrax(lb1_:ub1_,lb2_:ub2_),stat=info) if (info /= psb_success_) then err=4025 - iplen = len1*len2 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len1*len2/), & & a_err='real(psb_spk_)') goto 9999 end if @@ -648,7 +632,7 @@ Contains real(psb_spk_),allocatable, intent(inout) :: rrax(:),y(:) integer(psb_ipk_) :: info real(psb_spk_), optional, intent(in) :: pad - character(len=20) :: name + character(len=30) :: name integer(psb_ipk_) :: err_act, err name='psb_r_m_2_s_rk1' @@ -689,7 +673,7 @@ Contains real(psb_spk_),allocatable, intent(inout) :: rrax(:),y(:) integer(psb_ipk_) :: info real(psb_spk_), optional, intent(in) :: pad - character(len=20) :: name + character(len=30) :: name integer(psb_ipk_) :: err_act, err name='psb_r_m_2_s_rk1' @@ -733,8 +717,8 @@ Contains integer(psb_ipk_) :: info ! ...Local Variables - integer(psb_ipk_) :: isz,err_act,lb - character(len=20) :: name, char_err + integer(psb_ipk_) :: err_act + character(len=30) :: name, char_err logical, parameter :: debug=.false. name='psb_ab_cpy_s_s' @@ -776,7 +760,7 @@ Contains ! ...Local Variables integer(psb_ipk_) :: isz,err_act,lb - character(len=20) :: name, char_err + character(len=30) :: name, char_err logical, parameter :: debug=.false. name='psb_ab_cpy_s_rk1' @@ -820,7 +804,7 @@ Contains ! ...Local Variables integer(psb_ipk_) :: isz1, isz2,err_act, lb1, lb2 - character(len=20) :: name, char_err + character(len=30) :: name, char_err logical, parameter :: debug=.false. name='psb_ab_cpy_s_rk2' @@ -867,7 +851,7 @@ Contains ! ...Local Variables integer(psb_ipk_) :: isz,err_act,lb - character(len=20) :: name, char_err + character(len=30) :: name, char_err logical, parameter :: debug=.false. name='psb_cpy_s_rk1' @@ -908,7 +892,7 @@ Contains ! ...Local Variables integer(psb_ipk_) :: isz1, isz2,err_act, lb1, lb2 - character(len=20) :: name, char_err + character(len=30) :: name, char_err logical, parameter :: debug=.false. name='psb_safe_cpy' @@ -984,7 +968,7 @@ Contains integer(psb_mpk_), optional, intent(in) :: addsz,newsz real(psb_spk_), optional, intent(in) :: pad ! ...Local Variables - character(len=20) :: name + character(len=30) :: name logical, parameter :: debug=.false. integer(psb_ipk_) :: err_act integer(psb_mpk_) :: isz @@ -1037,7 +1021,7 @@ Contains integer(psb_epk_), optional, intent(in) :: addsz,newsz real(psb_spk_), optional, intent(in) :: pad ! ...Local Variables - character(len=20) :: name + character(len=30) :: name logical, parameter :: debug=.false. integer(psb_ipk_) :: err_act integer(psb_epk_) :: isz diff --git a/base/modules/auxil/psb_z_realloc_mod.F90 b/base/modules/auxil/psb_z_realloc_mod.F90 index 230d4f8e..c6bd7218 100644 --- a/base/modules/auxil/psb_z_realloc_mod.F90 +++ b/base/modules/auxil/psb_z_realloc_mod.F90 @@ -92,7 +92,7 @@ Contains ! ...Local Variables integer(psb_ipk_) :: err_act,err - character(len=20) :: name + character(len=30) :: name logical, parameter :: debug=.false. name='psb_r_z_s' @@ -133,7 +133,7 @@ Contains complex(psb_dpk_),allocatable :: tmp(:) integer(psb_mpk_) :: dim, lb_, lbi,ub_ integer(psb_ipk_) :: err_act,err - character(len=20) :: name + character(len=30) :: name logical, parameter :: debug=.false. name='psb_r_m_z_rk1' @@ -205,7 +205,7 @@ Contains complex(psb_dpk_),allocatable :: tmp(:,:) integer(psb_ipk_) :: err_act,err integer(psb_mpk_) :: dim,dim2,lb1_, lb2_, ub1_, ub2_,lbi1, lbi2 - character(len=20) :: name + character(len=30) :: name name='psb_r_m_z_rk2' call psb_erractionsave(err_act) @@ -294,9 +294,8 @@ Contains ! ...Local Variables complex(psb_dpk_),allocatable :: tmp(:) integer(psb_epk_) :: dim, lb_, lbi,ub_ - integer(psb_ipk_) :: iplen integer(psb_ipk_) :: err_act,err - character(len=20) :: name + character(len=30) :: name logical, parameter :: debug=.false. name='psb_r_m_z_rk1' @@ -311,8 +310,7 @@ Contains endif if ((len<0)) then err=4025 - iplen = len - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len/), & & a_err='complex(psb_dpk_)') goto 9999 end if @@ -325,8 +323,7 @@ Contains Allocate(tmp(lb_:ub_),stat=info) if (info /= psb_success_) then err=4025 - iplen = len - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len/), & & a_err='complex(psb_dpk_)') goto 9999 end if @@ -338,8 +335,7 @@ Contains Allocate(rrax(lb_:ub_),stat=info) if (info /= psb_success_) then err=4025 - iplen = len - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len/), & & a_err='complex(psb_dpk_)') goto 9999 end if @@ -369,9 +365,9 @@ Contains ! ...Local Variables complex(psb_dpk_),allocatable :: tmp(:,:) - integer(psb_ipk_) :: err_act,err, iplen + integer(psb_ipk_) :: err_act,err integer(psb_epk_) :: dim,dim2,lb1_, lb2_, ub1_, ub2_,lbi1, lbi2 - character(len=20) :: name + character(len=30) :: name name='psb_r_e_z_rk2' call psb_erractionsave(err_act) @@ -391,15 +387,13 @@ Contains if (len1 < 0) then err=4025 - iplen = len1 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len1/), & & a_err='complex(psb_dpk_)') goto 9999 end if if (len2 < 0) then err=4025 - iplen = len2 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len2/), & & a_err='complex(psb_dpk_)') goto 9999 end if @@ -415,8 +409,7 @@ Contains Allocate(tmp(lb1_:ub1_,lb2_:ub2_),stat=info) if (info /= psb_success_) then err=4025 - iplen = len1*len2 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/(len1*len2)/), & & a_err='complex(psb_dpk_)') goto 9999 end if @@ -430,8 +423,7 @@ Contains Allocate(rrax(lb1_:ub1_,lb2_:ub2_),stat=info) if (info /= psb_success_) then err=4025 - iplen = len1*len2 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/(len1*len2)/), & & a_err='complex(psb_dpk_)') goto 9999 end if @@ -463,10 +455,10 @@ Contains ! ...Local Variables complex(psb_dpk_),allocatable :: tmp(:,:) - integer(psb_ipk_) :: err_act,err, iplen - integer(psb_mpk_) :: dim,lb1_, lb2_, ub1_, ub2_,lbi1, lbi2 + integer(psb_ipk_) :: err_act,err + integer(psb_epk_) :: dim,lb1_, lb2_, ub1_, ub2_,lbi1, lbi2 integer(psb_epk_) :: dim2 - character(len=20) :: name + character(len=30) :: name name='psb_r_me_z_rk2' call psb_erractionsave(err_act) @@ -486,15 +478,13 @@ Contains if (len1 < 0) then err=4025 - iplen = len1 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, m_err=(/len1/), & & a_err='complex(psb_dpk_)') goto 9999 end if if (len2 < 0) then err=4025 - iplen = len2 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len2/), & & a_err='complex(psb_dpk_)') goto 9999 end if @@ -510,8 +500,7 @@ Contains Allocate(tmp(lb1_:ub1_,lb2_:ub2_),stat=info) if (info /= psb_success_) then err=4025 - iplen = len1*len2 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len1*len2/), & & a_err='complex(psb_dpk_)') goto 9999 end if @@ -525,8 +514,7 @@ Contains Allocate(rrax(lb1_:ub1_,lb2_:ub2_),stat=info) if (info /= psb_success_) then err=4025 - iplen = len1*len2 - call psb_errpush(err,name,i_err=(/iplen/),& + call psb_errpush(err,name,e_err=(/len1*len2/),& & a_err='complex(psb_dpk_)') goto 9999 end if @@ -558,10 +546,10 @@ Contains ! ...Local Variables complex(psb_dpk_),allocatable :: tmp(:,:) - integer(psb_ipk_) :: err_act,err, iplen - integer(psb_mpk_) :: dim2,lb1_, lb2_, ub1_, ub2_,lbi1, lbi2 + integer(psb_ipk_) :: err_act,err + integer(psb_epk_) :: dim2,lb1_, lb2_, ub1_, ub2_,lbi1, lbi2 integer(psb_epk_) :: dim - character(len=20) :: name + character(len=30) :: name name='psb_r_me_z_rk2' call psb_erractionsave(err_act) @@ -581,15 +569,13 @@ Contains if (len1 < 0) then err=4025 - iplen = len1 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len1/), & & a_err='complex(psb_dpk_)') goto 9999 end if if (len2 < 0) then err=4025 - iplen = len2 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, m_err=(/len2/), & & a_err='complex(psb_dpk_)') goto 9999 end if @@ -605,8 +591,7 @@ Contains Allocate(tmp(lb1_:ub1_,lb2_:ub2_),stat=info) if (info /= psb_success_) then err=4025 - iplen = len1*len2 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len1*len2/), & & a_err='complex(psb_dpk_)') goto 9999 end if @@ -620,8 +605,7 @@ Contains Allocate(rrax(lb1_:ub1_,lb2_:ub2_),stat=info) if (info /= psb_success_) then err=4025 - iplen = len1*len2 - call psb_errpush(err,name, i_err=(/iplen/), & + call psb_errpush(err,name, e_err=(/len1*len2/), & & a_err='complex(psb_dpk_)') goto 9999 end if @@ -648,7 +632,7 @@ Contains complex(psb_dpk_),allocatable, intent(inout) :: rrax(:),y(:) integer(psb_ipk_) :: info complex(psb_dpk_), optional, intent(in) :: pad - character(len=20) :: name + character(len=30) :: name integer(psb_ipk_) :: err_act, err name='psb_r_m_2_z_rk1' @@ -689,7 +673,7 @@ Contains complex(psb_dpk_),allocatable, intent(inout) :: rrax(:),y(:) integer(psb_ipk_) :: info complex(psb_dpk_), optional, intent(in) :: pad - character(len=20) :: name + character(len=30) :: name integer(psb_ipk_) :: err_act, err name='psb_r_m_2_z_rk1' @@ -733,8 +717,8 @@ Contains integer(psb_ipk_) :: info ! ...Local Variables - integer(psb_ipk_) :: isz,err_act,lb - character(len=20) :: name, char_err + integer(psb_ipk_) :: err_act + character(len=30) :: name, char_err logical, parameter :: debug=.false. name='psb_ab_cpy_z_s' @@ -776,7 +760,7 @@ Contains ! ...Local Variables integer(psb_ipk_) :: isz,err_act,lb - character(len=20) :: name, char_err + character(len=30) :: name, char_err logical, parameter :: debug=.false. name='psb_ab_cpy_z_rk1' @@ -820,7 +804,7 @@ Contains ! ...Local Variables integer(psb_ipk_) :: isz1, isz2,err_act, lb1, lb2 - character(len=20) :: name, char_err + character(len=30) :: name, char_err logical, parameter :: debug=.false. name='psb_ab_cpy_z_rk2' @@ -867,7 +851,7 @@ Contains ! ...Local Variables integer(psb_ipk_) :: isz,err_act,lb - character(len=20) :: name, char_err + character(len=30) :: name, char_err logical, parameter :: debug=.false. name='psb_cpy_z_rk1' @@ -908,7 +892,7 @@ Contains ! ...Local Variables integer(psb_ipk_) :: isz1, isz2,err_act, lb1, lb2 - character(len=20) :: name, char_err + character(len=30) :: name, char_err logical, parameter :: debug=.false. name='psb_safe_cpy' @@ -984,7 +968,7 @@ Contains integer(psb_mpk_), optional, intent(in) :: addsz,newsz complex(psb_dpk_), optional, intent(in) :: pad ! ...Local Variables - character(len=20) :: name + character(len=30) :: name logical, parameter :: debug=.false. integer(psb_ipk_) :: err_act integer(psb_mpk_) :: isz @@ -1037,7 +1021,7 @@ Contains integer(psb_epk_), optional, intent(in) :: addsz,newsz complex(psb_dpk_), optional, intent(in) :: pad ! ...Local Variables - character(len=20) :: name + character(len=30) :: name logical, parameter :: debug=.false. integer(psb_ipk_) :: err_act integer(psb_epk_) :: isz diff --git a/base/modules/psb_error_mod.F90 b/base/modules/psb_error_mod.F90 index 05e42d35..df76dd20 100644 --- a/base/modules/psb_error_mod.F90 +++ b/base/modules/psb_error_mod.F90 @@ -387,8 +387,6 @@ contains integer(psb_mpk_), optional :: m_err(:) integer(psb_epk_), optional :: e_err(:) - type(psb_errstack_node), pointer :: new_node - call psb_set_errstatus(psb_err_fatal_) call psb_stackpush(err_c, r_name, a_err, i_err, l_err, m_err, e_err) @@ -405,9 +403,6 @@ contains integer(psb_mpk_), optional :: m_err(:) integer(psb_epk_), optional :: e_err(:) - type(psb_errstack_node), pointer :: new_node - - if (.not.psb_errstatus_fatal())& & call psb_set_errstatus( psb_err_warning_) call psb_stackpush(err_c, r_name, a_err, i_err, l_err, m_err, e_err) diff --git a/base/modules/serial/psb_c_base_vect_mod.f90 b/base/modules/serial/psb_c_base_vect_mod.f90 index 116b2a8d..250c9ae5 100644 --- a/base/modules/serial/psb_c_base_vect_mod.f90 +++ b/base/modules/serial/psb_c_base_vect_mod.f90 @@ -445,7 +445,7 @@ contains class(psb_c_base_vect_type), intent(inout) :: val integer(psb_ipk_), intent(out) :: info - integer(psb_ipk_) :: i, isz + integer(psb_ipk_) :: isz info = 0 if (psb_errstatus_fatal()) return @@ -811,7 +811,7 @@ contains complex(psb_spk_), intent(in) :: val integer(psb_ipk_), optional :: first, last - integer(psb_ipk_) :: info, first_, last_ + integer(psb_ipk_) :: first_, last_ first_=1 last_=size(x%v) @@ -837,7 +837,7 @@ contains complex(psb_spk_), intent(in) :: val(:) integer(psb_ipk_), optional :: first, last - integer(psb_ipk_) :: info, first_, last_, nr + integer(psb_ipk_) :: first_, last_ first_ = 1 if (present(first)) first_ = max(1,first) diff --git a/base/modules/serial/psb_d_base_vect_mod.f90 b/base/modules/serial/psb_d_base_vect_mod.f90 index 0311e994..6e5eda62 100644 --- a/base/modules/serial/psb_d_base_vect_mod.f90 +++ b/base/modules/serial/psb_d_base_vect_mod.f90 @@ -452,7 +452,7 @@ contains class(psb_d_base_vect_type), intent(inout) :: val integer(psb_ipk_), intent(out) :: info - integer(psb_ipk_) :: i, isz + integer(psb_ipk_) :: isz info = 0 if (psb_errstatus_fatal()) return @@ -818,7 +818,7 @@ contains real(psb_dpk_), intent(in) :: val integer(psb_ipk_), optional :: first, last - integer(psb_ipk_) :: info, first_, last_ + integer(psb_ipk_) :: first_, last_ first_=1 last_=size(x%v) @@ -844,7 +844,7 @@ contains real(psb_dpk_), intent(in) :: val(:) integer(psb_ipk_), optional :: first, last - integer(psb_ipk_) :: info, first_, last_, nr + integer(psb_ipk_) :: first_, last_ first_ = 1 if (present(first)) first_ = max(1,first) diff --git a/base/modules/serial/psb_i_base_vect_mod.f90 b/base/modules/serial/psb_i_base_vect_mod.f90 index 851d7896..a59f63e6 100644 --- a/base/modules/serial/psb_i_base_vect_mod.f90 +++ b/base/modules/serial/psb_i_base_vect_mod.f90 @@ -382,7 +382,7 @@ contains class(psb_i_base_vect_type), intent(inout) :: val integer(psb_ipk_), intent(out) :: info - integer(psb_ipk_) :: i, isz + integer(psb_ipk_) :: isz info = 0 if (psb_errstatus_fatal()) return @@ -748,7 +748,7 @@ contains integer(psb_ipk_), intent(in) :: val integer(psb_ipk_), optional :: first, last - integer(psb_ipk_) :: info, first_, last_ + integer(psb_ipk_) :: first_, last_ first_=1 last_=size(x%v) @@ -774,7 +774,7 @@ contains integer(psb_ipk_), intent(in) :: val(:) integer(psb_ipk_), optional :: first, last - integer(psb_ipk_) :: info, first_, last_, nr + integer(psb_ipk_) :: first_, last_ first_ = 1 if (present(first)) first_ = max(1,first) diff --git a/base/modules/serial/psb_l_base_vect_mod.f90 b/base/modules/serial/psb_l_base_vect_mod.f90 index 58eda630..30440628 100644 --- a/base/modules/serial/psb_l_base_vect_mod.f90 +++ b/base/modules/serial/psb_l_base_vect_mod.f90 @@ -383,7 +383,7 @@ contains class(psb_l_base_vect_type), intent(inout) :: val integer(psb_ipk_), intent(out) :: info - integer(psb_ipk_) :: i, isz + integer(psb_ipk_) :: isz info = 0 if (psb_errstatus_fatal()) return @@ -749,7 +749,7 @@ contains integer(psb_lpk_), intent(in) :: val integer(psb_ipk_), optional :: first, last - integer(psb_ipk_) :: info, first_, last_ + integer(psb_ipk_) :: first_, last_ first_=1 last_=size(x%v) @@ -775,7 +775,7 @@ contains integer(psb_lpk_), intent(in) :: val(:) integer(psb_ipk_), optional :: first, last - integer(psb_ipk_) :: info, first_, last_, nr + integer(psb_ipk_) :: first_, last_ first_ = 1 if (present(first)) first_ = max(1,first) diff --git a/base/modules/serial/psb_s_base_vect_mod.f90 b/base/modules/serial/psb_s_base_vect_mod.f90 index 01851abf..81367c8f 100644 --- a/base/modules/serial/psb_s_base_vect_mod.f90 +++ b/base/modules/serial/psb_s_base_vect_mod.f90 @@ -452,7 +452,7 @@ contains class(psb_s_base_vect_type), intent(inout) :: val integer(psb_ipk_), intent(out) :: info - integer(psb_ipk_) :: i, isz + integer(psb_ipk_) :: isz info = 0 if (psb_errstatus_fatal()) return @@ -818,7 +818,7 @@ contains real(psb_spk_), intent(in) :: val integer(psb_ipk_), optional :: first, last - integer(psb_ipk_) :: info, first_, last_ + integer(psb_ipk_) :: first_, last_ first_=1 last_=size(x%v) @@ -844,7 +844,7 @@ contains real(psb_spk_), intent(in) :: val(:) integer(psb_ipk_), optional :: first, last - integer(psb_ipk_) :: info, first_, last_, nr + integer(psb_ipk_) :: first_, last_ first_ = 1 if (present(first)) first_ = max(1,first) diff --git a/base/modules/serial/psb_z_base_vect_mod.f90 b/base/modules/serial/psb_z_base_vect_mod.f90 index f44f31db..3455b743 100644 --- a/base/modules/serial/psb_z_base_vect_mod.f90 +++ b/base/modules/serial/psb_z_base_vect_mod.f90 @@ -445,7 +445,7 @@ contains class(psb_z_base_vect_type), intent(inout) :: val integer(psb_ipk_), intent(out) :: info - integer(psb_ipk_) :: i, isz + integer(psb_ipk_) :: isz info = 0 if (psb_errstatus_fatal()) return @@ -811,7 +811,7 @@ contains complex(psb_dpk_), intent(in) :: val integer(psb_ipk_), optional :: first, last - integer(psb_ipk_) :: info, first_, last_ + integer(psb_ipk_) :: first_, last_ first_=1 last_=size(x%v) @@ -837,7 +837,7 @@ contains complex(psb_dpk_), intent(in) :: val(:) integer(psb_ipk_), optional :: first, last - integer(psb_ipk_) :: info, first_, last_, nr + integer(psb_ipk_) :: first_, last_ first_ = 1 if (present(first)) first_ = max(1,first)