From fe04944807dfef0fe5366286c157b81a6647ae5e Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Thu, 10 Jan 2008 13:12:58 +0000 Subject: [PATCH] Taken out UPD from diag_bld, it is not useful there. --- mlprec/mld_dbaseprec_bld.f90 | 2 +- mlprec/mld_ddiag_bld.f90 | 14 +++++--------- mlprec/mld_prec_mod.f90 | 6 ++---- mlprec/mld_zbaseprec_bld.f90 | 2 +- mlprec/mld_zdiag_bld.f90 | 14 +++++--------- 5 files changed, 14 insertions(+), 24 deletions(-) diff --git a/mlprec/mld_dbaseprec_bld.f90 b/mlprec/mld_dbaseprec_bld.f90 index 9b9cff2a..4b385025 100644 --- a/mlprec/mld_dbaseprec_bld.f90 +++ b/mlprec/mld_dbaseprec_bld.f90 @@ -138,7 +138,7 @@ subroutine mld_dbaseprc_bld(a,desc_a,p,info,upd) case (mld_diag_) ! Diagonal preconditioner - call mld_diag_bld(a,desc_a,p,iupd,info) + call mld_diag_bld(a,desc_a,p,info) if(debug_level >= psb_debug_outer_) & & write(debug_unit,*) me,' ',trim(name),& & ': out of mld_diag_bld' diff --git a/mlprec/mld_ddiag_bld.f90 b/mlprec/mld_ddiag_bld.f90 index e75ae369..c578dd77 100644 --- a/mlprec/mld_ddiag_bld.f90 +++ b/mlprec/mld_ddiag_bld.f90 @@ -55,7 +55,7 @@ ! info - integer, output. ! Error code. ! -subroutine mld_ddiag_bld(a,desc_a,p,upd,info) +subroutine mld_ddiag_bld(a,desc_a,p,info) use psb_base_mod use mld_prec_mod, mld_protect_name => mld_ddiag_bld @@ -66,18 +66,15 @@ subroutine mld_ddiag_bld(a,desc_a,p,upd,info) type(psb_dspmat_type), target :: a type(psb_desc_type), intent(in) :: desc_a type(mld_dbaseprc_type),intent(inout) :: p - character, intent(in) :: upd integer, intent(out) :: info ! Local variables - Integer :: err, n_row, n_col,I,j,k,ictxt,& - & me,np,mglob,lw, err_act - integer :: debug_level, debug_unit - character(len=20) :: name, ch_err + Integer :: err_act,ictxt, me, np, n_row, n_col,i + integer :: debug_level, debug_unit + character(len=20) :: name, ch_err if(psb_get_errstatus().ne.0) return - info=0 - err=0 + info = 0 call psb_erractionsave(err_act) debug_unit = psb_get_debug_unit() debug_level = psb_get_debug_level() @@ -86,7 +83,6 @@ subroutine mld_ddiag_bld(a,desc_a,p,upd,info) ictxt = psb_cd_get_context(desc_a) n_row = psb_cd_get_local_rows(desc_a) n_col = psb_cd_get_local_cols(desc_a) - mglob = psb_cd_get_global_rows(desc_a) call psb_info(ictxt, me, np) if (debug_level >= psb_debug_outer_)& diff --git a/mlprec/mld_prec_mod.f90 b/mlprec/mld_prec_mod.f90 index 198cf565..eb08c0a9 100644 --- a/mlprec/mld_prec_mod.f90 +++ b/mlprec/mld_prec_mod.f90 @@ -373,23 +373,21 @@ module mld_prec_mod end interface interface mld_diag_bld - subroutine mld_ddiag_bld(a,desc_data,p,upd,info) + subroutine mld_ddiag_bld(a,desc_data,p,info) use psb_base_mod use mld_prec_type integer, intent(out) :: info type(psb_dspmat_type), intent(in), target :: a type(psb_desc_type),intent(in) :: desc_data type(mld_dbaseprc_type), intent(inout) :: p - character, intent(in) :: upd end subroutine mld_ddiag_bld - subroutine mld_zdiag_bld(a,desc_data,p,upd,info) + subroutine mld_zdiag_bld(a,desc_data,p,info) use psb_base_mod use mld_prec_type integer, intent(out) :: info type(psb_zspmat_type), intent(in), target :: a type(psb_desc_type),intent(in) :: desc_data type(mld_zbaseprc_type), intent(inout) :: p - character, intent(in) :: upd end subroutine mld_zdiag_bld end interface diff --git a/mlprec/mld_zbaseprec_bld.f90 b/mlprec/mld_zbaseprec_bld.f90 index e1afaa4e..29363e03 100644 --- a/mlprec/mld_zbaseprec_bld.f90 +++ b/mlprec/mld_zbaseprec_bld.f90 @@ -138,7 +138,7 @@ subroutine mld_zbaseprc_bld(a,desc_a,p,info,upd) case (mld_diag_) ! Diagonal preconditioner - call mld_diag_bld(a,desc_a,p,iupd,info) + call mld_diag_bld(a,desc_a,p,info) if(debug_level >= psb_debug_outer_) & & write(debug_unit,*) me,' ',trim(name),& & ': out of mld_diag_bld' diff --git a/mlprec/mld_zdiag_bld.f90 b/mlprec/mld_zdiag_bld.f90 index d38dc66e..73fbb299 100644 --- a/mlprec/mld_zdiag_bld.f90 +++ b/mlprec/mld_zdiag_bld.f90 @@ -55,7 +55,7 @@ ! info - integer, output. ! Error code. ! -subroutine mld_zdiag_bld(a,desc_a,p,upd,info) +subroutine mld_zdiag_bld(a,desc_a,p,info) use psb_base_mod use mld_prec_mod, mld_protect_name => mld_zdiag_bld @@ -66,18 +66,15 @@ subroutine mld_zdiag_bld(a,desc_a,p,upd,info) type(psb_zspmat_type), target :: a type(psb_desc_type), intent(in) :: desc_a type(mld_zbaseprc_type),intent(inout) :: p - character, intent(in) :: upd integer, intent(out) :: info ! Local variables - Integer :: err, n_row, n_col,I,j,k,ictxt,& - & me,np,mglob,lw, err_act - integer :: debug_level, debug_unit - character(len=20) :: name, ch_err + Integer :: err_act,ictxt, me, np, n_row, n_col,i + integer :: debug_level, debug_unit + character(len=20) :: name, ch_err if(psb_get_errstatus().ne.0) return - info=0 - err=0 + info = 0 call psb_erractionsave(err_act) debug_unit = psb_get_debug_unit() debug_level = psb_get_debug_level() @@ -86,7 +83,6 @@ subroutine mld_zdiag_bld(a,desc_a,p,upd,info) ictxt = psb_cd_get_context(desc_a) n_row = psb_cd_get_local_rows(desc_a) n_col = psb_cd_get_local_cols(desc_a) - mglob = psb_cd_get_global_rows(desc_a) call psb_info(ictxt, me, np) if (debug_level >= psb_debug_outer_)&