diff --git a/base/internals/psb_indx_map_fnd_owner.F90 b/base/internals/psb_indx_map_fnd_owner.F90 index bdb756f7..4a02386e 100644 --- a/base/internals/psb_indx_map_fnd_owner.F90 +++ b/base/internals/psb_indx_map_fnd_owner.F90 @@ -316,14 +316,8 @@ subroutine psb_indx_map_fnd_owner(idx,iprc,idxmap,info) call psb_erractionrestore(err_act) return -9999 continue - call psb_erractionrestore(err_act) +9999 call psb_error_handler(ictxt,err_act) - if (err_act == psb_act_ret_) then - return - else - call psb_error(ictxt) - end if return end subroutine psb_indx_map_fnd_owner diff --git a/base/internals/psi_bld_tmphalo.f90 b/base/internals/psi_bld_tmphalo.f90 index 1a3e6588..94cb1a1f 100644 --- a/base/internals/psi_bld_tmphalo.f90 +++ b/base/internals/psi_bld_tmphalo.f90 @@ -141,15 +141,8 @@ subroutine psi_bld_tmphalo(desc,info) call psb_erractionrestore(err_act) return -9999 continue - call psb_erractionrestore(err_act) +9999 call psb_error_handler(ictxt,err_act) - if (err_act == psb_act_ret_) then return - else - call psb_error(ictxt) - end if - return - end subroutine psi_bld_tmphalo diff --git a/base/internals/psi_bld_tmpovrl.f90 b/base/internals/psi_bld_tmpovrl.f90 index 62a051d5..7c461fd8 100644 --- a/base/internals/psi_bld_tmpovrl.f90 +++ b/base/internals/psi_bld_tmpovrl.f90 @@ -143,15 +143,8 @@ subroutine psi_bld_tmpovrl(iv,desc,info) call psb_erractionrestore(err_act) return -9999 continue - call psb_erractionrestore(err_act) +9999 call psb_error_handler(ictxt,err_act) - if (err_act == psb_act_ret_) then return - else - call psb_error(ictxt) - end if - return - end subroutine psi_bld_tmpovrl diff --git a/base/internals/psi_compute_size.f90 b/base/internals/psi_compute_size.f90 index 2d192703..3ca8ad97 100644 --- a/base/internals/psi_compute_size.f90 +++ b/base/internals/psi_compute_size.f90 @@ -123,12 +123,8 @@ subroutine psi_compute_size(desc_data, index_in, dl_lda, info) call psb_erractionrestore(err_act) return -9999 continue - call psb_erractionrestore(err_act) - if (err_act == psb_act_abort_) then - call psb_error(ictxt) - return - end if +9999 call psb_error_handler(ictxt,err_act) + return end subroutine psi_compute_size diff --git a/base/internals/psi_crea_bnd_elem.f90 b/base/internals/psi_crea_bnd_elem.f90 index 2acfb5bf..61466ad6 100644 --- a/base/internals/psi_crea_bnd_elem.f90 +++ b/base/internals/psi_crea_bnd_elem.f90 @@ -112,11 +112,8 @@ subroutine psi_crea_bnd_elem(bndel,desc_a,info) call psb_erractionrestore(err_act) return -9999 continue - call psb_erractionrestore(err_act) - if (err_act == psb_act_abort_) then - call psb_error() - return - end if +9999 call psb_error_handler(err_act) + return + end subroutine psi_crea_bnd_elem diff --git a/base/internals/psi_crea_index.f90 b/base/internals/psi_crea_index.f90 index 3c1a5c7b..2d414e35 100644 --- a/base/internals/psi_crea_index.f90 +++ b/base/internals/psi_crea_index.f90 @@ -152,11 +152,7 @@ subroutine psi_crea_index(desc_a,index_in,index_out,glob_idx,nxch,nsnd,nrcv,info call psb_erractionrestore(err_act) return -9999 continue - call psb_erractionrestore(err_act) - if (err_act == psb_act_abort_) then - call psb_error(ictxt) - return - end if +9999 call psb_error_handler(ictxt,err_act) + return end subroutine psi_crea_index diff --git a/base/internals/psi_crea_ovr_elem.f90 b/base/internals/psi_crea_ovr_elem.f90 index b6191fa5..77de0de3 100644 --- a/base/internals/psi_crea_ovr_elem.f90 +++ b/base/internals/psi_crea_ovr_elem.f90 @@ -139,12 +139,8 @@ subroutine psi_crea_ovr_elem(me,desc_overlap,ovr_elem,info) call psb_erractionrestore(err_act) return -9999 continue - call psb_erractionrestore(err_act) - if (err_act == psb_act_abort_) then - call psb_error() - return - end if +9999 call psb_error_handler(err_act) + return end subroutine psi_crea_ovr_elem diff --git a/base/internals/psi_desc_impl.f90 b/base/internals/psi_desc_impl.f90 index 9c910541..332cf03a 100644 --- a/base/internals/psi_desc_impl.f90 +++ b/base/internals/psi_desc_impl.f90 @@ -181,12 +181,8 @@ subroutine psi_cnv_dsc(halo_in,ovrlap_in,ext_in,cdesc, info, mold) call psb_erractionrestore(err_act) return -9999 continue - call psb_erractionrestore(err_act) - if (err_act == psb_act_abort_) then - call psb_error(ictxt) - return - end if +9999 call psb_error_handler(ictxt,err_act) + return end subroutine psi_cnv_dsc @@ -493,13 +489,8 @@ subroutine psi_bld_ovr_mst(me,ovrlap_elem,mst_idx,info) call psb_erractionrestore(err_act) return -9999 continue - call psb_erractionrestore(err_act) +9999 call psb_error_handler(err_act) - if (err_act == psb_act_abort_) then - call psb_error() - return - end if return end subroutine psi_bld_ovr_mst diff --git a/base/internals/psi_desc_index.F90 b/base/internals/psi_desc_index.F90 index d08ea8ed..26291d85 100644 --- a/base/internals/psi_desc_index.F90 +++ b/base/internals/psi_desc_index.F90 @@ -337,11 +337,8 @@ subroutine psi_desc_index(desc,index_in,dep_list,& call psb_erractionrestore(err_act) return -9999 continue - call psb_erractionrestore(err_act) - if (err_act == psb_act_abort_) then - call psb_error(ictxt) - return - end if +9999 call psb_error_handler(ictxt,err_act) + return + end subroutine psi_desc_index diff --git a/base/internals/psi_extrct_dl.F90 b/base/internals/psi_extrct_dl.F90 index 2007e072..e5dd68d5 100644 --- a/base/internals/psi_extrct_dl.F90 +++ b/base/internals/psi_extrct_dl.F90 @@ -288,12 +288,8 @@ subroutine psi_extract_dep_list(ictxt,is_bld,is_upd,desc_str,dep_list,& 9999 continue call psb_errpush(info,name,i_err=int_err) - call psb_erractionrestore(err_act) - if (err_act == psb_act_ret_) then - return - else - call psb_error() - endif + call psb_error_handler(err_act) + return end subroutine psi_extract_dep_list diff --git a/base/internals/psi_fnd_owner.F90 b/base/internals/psi_fnd_owner.F90 index b477e4c6..09192210 100644 --- a/base/internals/psi_fnd_owner.F90 +++ b/base/internals/psi_fnd_owner.F90 @@ -118,14 +118,8 @@ subroutine psi_fnd_owner(nv,idx,iprc,desc,info) call psb_erractionrestore(err_act) return -9999 continue - call psb_erractionrestore(err_act) +9999 call psb_error_handler(ictxt,err_act) - if (err_act == psb_act_ret_) then - return - else - call psb_error(ictxt) - end if return end subroutine psi_fnd_owner diff --git a/base/internals/psi_ovrl_restr.f90 b/base/internals/psi_ovrl_restr.f90 index fe387c47..d34cebc1 100644 --- a/base/internals/psi_ovrl_restr.f90 +++ b/base/internals/psi_ovrl_restr.f90 @@ -65,13 +65,8 @@ subroutine psi_sovrl_restrr1(x,xs,desc_a,info) call psb_erractionrestore(err_act) return -9999 continue - call psb_erractionrestore(err_act) +9999 call psb_error_handler(ictxt,err_act) - if (err_act == psb_act_abort_) then - call psb_error(ictxt) - return - end if return end subroutine psi_sovrl_restrr1 @@ -118,13 +113,8 @@ subroutine psi_sovrl_restrr2(x,xs,desc_a,info) call psb_erractionrestore(err_act) return -9999 continue - call psb_erractionrestore(err_act) +9999 call psb_error_handler(ictxt,err_act) - if (err_act == psb_act_abort_) then - call psb_error(ictxt) - return - end if return end subroutine psi_sovrl_restrr2 @@ -165,13 +155,8 @@ subroutine psi_dovrl_restrr1(x,xs,desc_a,info) call psb_erractionrestore(err_act) return -9999 continue - call psb_erractionrestore(err_act) +9999 call psb_error_handler(ictxt,err_act) - if (err_act == psb_act_abort_) then - call psb_error(ictxt) - return - end if return end subroutine psi_dovrl_restrr1 @@ -219,13 +204,8 @@ subroutine psi_dovrl_restrr2(x,xs,desc_a,info) call psb_erractionrestore(err_act) return -9999 continue - call psb_erractionrestore(err_act) +9999 call psb_error_handler(ictxt,err_act) - if (err_act == psb_act_abort_) then - call psb_error(ictxt) - return - end if return end subroutine psi_dovrl_restrr2 @@ -266,13 +246,8 @@ subroutine psi_covrl_restrr1(x,xs,desc_a,info) call psb_erractionrestore(err_act) return -9999 continue - call psb_erractionrestore(err_act) +9999 call psb_error_handler(ictxt,err_act) - if (err_act == psb_act_abort_) then - call psb_error(ictxt) - return - end if return end subroutine psi_covrl_restrr1 @@ -319,13 +294,8 @@ subroutine psi_covrl_restrr2(x,xs,desc_a,info) call psb_erractionrestore(err_act) return -9999 continue - call psb_erractionrestore(err_act) +9999 call psb_error_handler(ictxt,err_act) - if (err_act == psb_act_abort_) then - call psb_error(ictxt) - return - end if return end subroutine psi_covrl_restrr2 @@ -366,13 +336,8 @@ subroutine psi_zovrl_restrr1(x,xs,desc_a,info) call psb_erractionrestore(err_act) return -9999 continue - call psb_erractionrestore(err_act) +9999 call psb_error_handler(ictxt,err_act) - if (err_act == psb_act_abort_) then - call psb_error(ictxt) - return - end if return end subroutine psi_zovrl_restrr1 @@ -419,13 +384,8 @@ subroutine psi_zovrl_restrr2(x,xs,desc_a,info) call psb_erractionrestore(err_act) return -9999 continue - call psb_erractionrestore(err_act) +9999 call psb_error_handler(ictxt,err_act) - if (err_act == psb_act_abort_) then - call psb_error(ictxt) - return - end if return end subroutine psi_zovrl_restrr2 @@ -466,13 +426,8 @@ subroutine psi_iovrl_restrr1(x,xs,desc_a,info) call psb_erractionrestore(err_act) return -9999 continue - call psb_erractionrestore(err_act) +9999 call psb_error_handler(ictxt,err_act) - if (err_act == psb_act_abort_) then - call psb_error(ictxt) - return - end if return end subroutine psi_iovrl_restrr1 @@ -519,13 +474,8 @@ subroutine psi_iovrl_restrr2(x,xs,desc_a,info) call psb_erractionrestore(err_act) return -9999 continue - call psb_erractionrestore(err_act) +9999 call psb_error_handler(ictxt,err_act) - if (err_act == psb_act_abort_) then - call psb_error(ictxt) - return - end if return end subroutine psi_iovrl_restrr2 @@ -559,19 +509,14 @@ subroutine psi_iovrl_restr_vect(x,xs,desc_a,info) endif isz = size(desc_a%ovrlap_elem,1) - + call x%sct(isz,desc_a%ovrlap_elem(:,1),xs,izero) call psb_erractionrestore(err_act) return -9999 continue - call psb_erractionrestore(err_act) +9999 call psb_error_handler(ictxt,err_act) - if (err_act == psb_act_abort_) then - call psb_error(ictxt) - return - end if return end subroutine psi_iovrl_restr_vect @@ -604,19 +549,14 @@ subroutine psi_sovrl_restr_vect(x,xs,desc_a,info) endif isz = size(desc_a%ovrlap_elem,1) - + call x%sct(isz,desc_a%ovrlap_elem(:,1),xs,szero) call psb_erractionrestore(err_act) return -9999 continue - call psb_erractionrestore(err_act) +9999 call psb_error_handler(ictxt,err_act) - if (err_act == psb_act_abort_) then - call psb_error(ictxt) - return - end if return end subroutine psi_sovrl_restr_vect @@ -649,19 +589,14 @@ subroutine psi_dovrl_restr_vect(x,xs,desc_a,info) endif isz = size(desc_a%ovrlap_elem,1) - + call x%sct(isz,desc_a%ovrlap_elem(:,1),xs,dzero) call psb_erractionrestore(err_act) return -9999 continue - call psb_erractionrestore(err_act) +9999 call psb_error_handler(ictxt,err_act) - if (err_act == psb_act_abort_) then - call psb_error(ictxt) - return - end if return end subroutine psi_dovrl_restr_vect @@ -696,19 +631,14 @@ subroutine psi_covrl_restr_vect(x,xs,desc_a,info) endif isz = size(desc_a%ovrlap_elem,1) - + call x%sct(isz,desc_a%ovrlap_elem(:,1),xs,czero) call psb_erractionrestore(err_act) return -9999 continue - call psb_erractionrestore(err_act) +9999 call psb_error_handler(ictxt,err_act) - if (err_act == psb_act_abort_) then - call psb_error(ictxt) - return - end if return end subroutine psi_covrl_restr_vect @@ -741,19 +671,14 @@ subroutine psi_zovrl_restr_vect(x,xs,desc_a,info) endif isz = size(desc_a%ovrlap_elem,1) - + call x%sct(isz,desc_a%ovrlap_elem(:,1),xs,zzero) call psb_erractionrestore(err_act) return -9999 continue - call psb_erractionrestore(err_act) +9999 call psb_error_handler(ictxt,err_act) - if (err_act == psb_act_abort_) then - call psb_error(ictxt) - return - end if return end subroutine psi_zovrl_restr_vect diff --git a/base/internals/psi_ovrl_save.f90 b/base/internals/psi_ovrl_save.f90 index e0489227..36e6b052 100644 --- a/base/internals/psi_ovrl_save.f90 +++ b/base/internals/psi_ovrl_save.f90 @@ -73,13 +73,8 @@ subroutine psi_sovrl_saver1(x,xs,desc_a,info) call psb_erractionrestore(err_act) return -9999 continue - call psb_erractionrestore(err_act) +9999 call psb_error_handler(ictxt,err_act) - if (err_act == psb_act_abort_) then - call psb_error(ictxt) - return - end if return end subroutine psi_sovrl_saver1 @@ -127,13 +122,8 @@ subroutine psi_sovrl_saver2(x,xs,desc_a,info) call psb_erractionrestore(err_act) return -9999 continue - call psb_erractionrestore(err_act) +9999 call psb_error_handler(ictxt,err_act) - if (err_act == psb_act_abort_) then - call psb_error(ictxt) - return - end if return end subroutine psi_sovrl_saver2 @@ -181,13 +171,8 @@ subroutine psi_dovrl_saver1(x,xs,desc_a,info) call psb_erractionrestore(err_act) return -9999 continue - call psb_erractionrestore(err_act) +9999 call psb_error_handler(ictxt,err_act) - if (err_act == psb_act_abort_) then - call psb_error(ictxt) - return - end if return end subroutine psi_dovrl_saver1 @@ -236,13 +221,8 @@ subroutine psi_dovrl_saver2(x,xs,desc_a,info) call psb_erractionrestore(err_act) return -9999 continue - call psb_erractionrestore(err_act) +9999 call psb_error_handler(ictxt,err_act) - if (err_act == psb_act_abort_) then - call psb_error(ictxt) - return - end if return end subroutine psi_dovrl_saver2 @@ -289,13 +269,8 @@ subroutine psi_covrl_saver1(x,xs,desc_a,info) call psb_erractionrestore(err_act) return -9999 continue - call psb_erractionrestore(err_act) +9999 call psb_error_handler(ictxt,err_act) - if (err_act == psb_act_abort_) then - call psb_error(ictxt) - return - end if return end subroutine psi_covrl_saver1 @@ -344,13 +319,8 @@ subroutine psi_covrl_saver2(x,xs,desc_a,info) call psb_erractionrestore(err_act) return -9999 continue - call psb_erractionrestore(err_act) +9999 call psb_error_handler(ictxt,err_act) - if (err_act == psb_act_abort_) then - call psb_error(ictxt) - return - end if return end subroutine psi_covrl_saver2 @@ -399,13 +369,8 @@ subroutine psi_zovrl_saver1(x,xs,desc_a,info) call psb_erractionrestore(err_act) return -9999 continue - call psb_erractionrestore(err_act) +9999 call psb_error_handler(ictxt,err_act) - if (err_act == psb_act_abort_) then - call psb_error(ictxt) - return - end if return end subroutine psi_zovrl_saver1 @@ -455,13 +420,8 @@ subroutine psi_zovrl_saver2(x,xs,desc_a,info) call psb_erractionrestore(err_act) return -9999 continue - call psb_erractionrestore(err_act) +9999 call psb_error_handler(ictxt,err_act) - if (err_act == psb_act_abort_) then - call psb_error(ictxt) - return - end if return end subroutine psi_zovrl_saver2 @@ -510,13 +470,8 @@ subroutine psi_iovrl_saver1(x,xs,desc_a,info) call psb_erractionrestore(err_act) return -9999 continue - call psb_erractionrestore(err_act) +9999 call psb_error_handler(ictxt,err_act) - if (err_act == psb_act_abort_) then - call psb_error(ictxt) - return - end if return end subroutine psi_iovrl_saver1 @@ -567,13 +522,8 @@ subroutine psi_iovrl_saver2(x,xs,desc_a,info) call psb_erractionrestore(err_act) return -9999 continue - call psb_erractionrestore(err_act) +9999 call psb_error_handler(ictxt,err_act) - if (err_act == psb_act_abort_) then - call psb_error(ictxt) - return - end if return end subroutine psi_iovrl_saver2 @@ -614,19 +564,14 @@ subroutine psi_iovrl_save_vect(x,xs,desc_a,info) call psb_errpush(info,name) goto 9999 endif - + call x%gth(isz,desc_a%ovrlap_elem(:,1),xs) call psb_erractionrestore(err_act) return -9999 continue - call psb_erractionrestore(err_act) +9999 call psb_error_handler(ictxt,err_act) - if (err_act == psb_act_abort_) then - call psb_error(ictxt) - return - end if return end subroutine psi_iovrl_save_vect @@ -665,19 +610,14 @@ subroutine psi_sovrl_save_vect(x,xs,desc_a,info) call psb_errpush(info,name) goto 9999 endif - + call x%gth(isz,desc_a%ovrlap_elem(:,1),xs) call psb_erractionrestore(err_act) return -9999 continue - call psb_erractionrestore(err_act) +9999 call psb_error_handler(ictxt,err_act) - if (err_act == psb_act_abort_) then - call psb_error(ictxt) - return - end if return end subroutine psi_sovrl_save_vect @@ -716,19 +656,14 @@ subroutine psi_dovrl_save_vect(x,xs,desc_a,info) call psb_errpush(info,name) goto 9999 endif - + call x%gth(isz,desc_a%ovrlap_elem(:,1),xs) call psb_erractionrestore(err_act) return -9999 continue - call psb_erractionrestore(err_act) +9999 call psb_error_handler(ictxt,err_act) - if (err_act == psb_act_abort_) then - call psb_error(ictxt) - return - end if return end subroutine psi_dovrl_save_vect @@ -767,19 +702,14 @@ subroutine psi_covrl_save_vect(x,xs,desc_a,info) call psb_errpush(info,name) goto 9999 endif - + call x%gth(isz,desc_a%ovrlap_elem(:,1),xs) call psb_erractionrestore(err_act) return -9999 continue - call psb_erractionrestore(err_act) +9999 call psb_error_handler(ictxt,err_act) - if (err_act == psb_act_abort_) then - call psb_error(ictxt) - return - end if return end subroutine psi_covrl_save_vect @@ -818,18 +748,13 @@ subroutine psi_zovrl_save_vect(x,xs,desc_a,info) call psb_errpush(info,name) goto 9999 endif - + call x%gth(isz,desc_a%ovrlap_elem(:,1),xs) call psb_erractionrestore(err_act) return -9999 continue - call psb_erractionrestore(err_act) +9999 call psb_error_handler(ictxt,err_act) - if (err_act == psb_act_abort_) then - call psb_error(ictxt) - return - end if return end subroutine psi_zovrl_save_vect diff --git a/base/internals/psi_ovrl_upd.f90 b/base/internals/psi_ovrl_upd.f90 index a3176cf2..63c6cf4b 100644 --- a/base/internals/psi_ovrl_upd.f90 +++ b/base/internals/psi_ovrl_upd.f90 @@ -91,13 +91,8 @@ subroutine psi_sovrl_updr1(x,desc_a,update,info) call psb_erractionrestore(err_act) return -9999 continue - call psb_erractionrestore(err_act) +9999 call psb_error_handler(ictxt,err_act) - if (err_act == psb_act_abort_) then - call psb_error(ictxt) - return - end if return end subroutine psi_sovrl_updr1 @@ -163,13 +158,8 @@ subroutine psi_sovrl_updr2(x,desc_a,update,info) call psb_erractionrestore(err_act) return -9999 continue - call psb_erractionrestore(err_act) +9999 call psb_error_handler(ictxt,err_act) - if (err_act == psb_act_abort_) then - call psb_error(ictxt) - return - end if return end subroutine psi_sovrl_updr2 @@ -234,13 +224,8 @@ subroutine psi_dovrl_updr1(x,desc_a,update,info) call psb_erractionrestore(err_act) return -9999 continue - call psb_erractionrestore(err_act) +9999 call psb_error_handler(ictxt,err_act) - if (err_act == psb_act_abort_) then - call psb_error(ictxt) - return - end if return end subroutine psi_dovrl_updr1 @@ -306,13 +291,8 @@ subroutine psi_dovrl_updr2(x,desc_a,update,info) call psb_erractionrestore(err_act) return -9999 continue - call psb_erractionrestore(err_act) +9999 call psb_error_handler(ictxt,err_act) - if (err_act == psb_act_abort_) then - call psb_error(ictxt) - return - end if return end subroutine psi_dovrl_updr2 @@ -377,13 +357,8 @@ subroutine psi_covrl_updr1(x,desc_a,update,info) call psb_erractionrestore(err_act) return -9999 continue - call psb_erractionrestore(err_act) +9999 call psb_error_handler(ictxt,err_act) - if (err_act == psb_act_abort_) then - call psb_error(ictxt) - return - end if return end subroutine psi_covrl_updr1 @@ -449,13 +424,8 @@ subroutine psi_covrl_updr2(x,desc_a,update,info) call psb_erractionrestore(err_act) return -9999 continue - call psb_erractionrestore(err_act) +9999 call psb_error_handler(ictxt,err_act) - if (err_act == psb_act_abort_) then - call psb_error(ictxt) - return - end if return end subroutine psi_covrl_updr2 @@ -520,13 +490,8 @@ subroutine psi_zovrl_updr1(x,desc_a,update,info) call psb_erractionrestore(err_act) return -9999 continue - call psb_erractionrestore(err_act) +9999 call psb_error_handler(ictxt,err_act) - if (err_act == psb_act_abort_) then - call psb_error(ictxt) - return - end if return end subroutine psi_zovrl_updr1 @@ -592,13 +557,8 @@ subroutine psi_zovrl_updr2(x,desc_a,update,info) call psb_erractionrestore(err_act) return -9999 continue - call psb_erractionrestore(err_act) +9999 call psb_error_handler(ictxt,err_act) - if (err_act == psb_act_abort_) then - call psb_error(ictxt) - return - end if return end subroutine psi_zovrl_updr2 @@ -664,13 +624,8 @@ subroutine psi_iovrl_updr1(x,desc_a,update,info) call psb_erractionrestore(err_act) return -9999 continue - call psb_erractionrestore(err_act) +9999 call psb_error_handler(ictxt,err_act) - if (err_act == psb_act_abort_) then - call psb_error(ictxt) - return - end if return end subroutine psi_iovrl_updr1 @@ -737,13 +692,8 @@ subroutine psi_iovrl_updr2(x,desc_a,update,info) call psb_erractionrestore(err_act) return -9999 continue - call psb_erractionrestore(err_act) +9999 call psb_error_handler(ictxt,err_act) - if (err_act == psb_act_abort_) then - call psb_error(ictxt) - return - end if return end subroutine psi_iovrl_updr2 @@ -822,13 +772,8 @@ subroutine psi_iovrl_upd_vect(x,desc_a,update,info) call psb_erractionrestore(err_act) return -9999 continue - call psb_erractionrestore(err_act) +9999 call psb_error_handler(ictxt,err_act) - if (err_act == psb_act_abort_) then - call psb_error(ictxt) - return - end if return end subroutine psi_iovrl_upd_vect @@ -906,13 +851,8 @@ subroutine psi_sovrl_upd_vect(x,desc_a,update,info) call psb_erractionrestore(err_act) return -9999 continue - call psb_erractionrestore(err_act) +9999 call psb_error_handler(ictxt,err_act) - if (err_act == psb_act_abort_) then - call psb_error(ictxt) - return - end if return end subroutine psi_sovrl_upd_vect @@ -990,13 +930,8 @@ subroutine psi_dovrl_upd_vect(x,desc_a,update,info) call psb_erractionrestore(err_act) return -9999 continue - call psb_erractionrestore(err_act) +9999 call psb_error_handler(ictxt,err_act) - if (err_act == psb_act_abort_) then - call psb_error(ictxt) - return - end if return end subroutine psi_dovrl_upd_vect @@ -1075,13 +1010,8 @@ subroutine psi_covrl_upd_vect(x,desc_a,update,info) call psb_erractionrestore(err_act) return -9999 continue - call psb_erractionrestore(err_act) +9999 call psb_error_handler(ictxt,err_act) - if (err_act == psb_act_abort_) then - call psb_error(ictxt) - return - end if return end subroutine psi_covrl_upd_vect @@ -1159,13 +1089,8 @@ subroutine psi_zovrl_upd_vect(x,desc_a,update,info) call psb_erractionrestore(err_act) return -9999 continue - call psb_erractionrestore(err_act) +9999 call psb_error_handler(ictxt,err_act) - if (err_act == psb_act_abort_) then - call psb_error(ictxt) - return - end if return end subroutine psi_zovrl_upd_vect diff --git a/base/internals/psi_sort_dl.f90 b/base/internals/psi_sort_dl.f90 index ebac79d2..114a855e 100644 --- a/base/internals/psi_sort_dl.f90 +++ b/base/internals/psi_sort_dl.f90 @@ -83,14 +83,10 @@ subroutine psi_sort_dl(dep_list,l_dep_list,np,info) call psb_erractionrestore(err_act) return -9999 continue - call psb_erractionrestore(err_act) - - if (err_act == psb_act_abort_) then - call psb_error() - return - end if +9999 call psb_error_handler(err_act) + return + end subroutine psi_sort_dl