Taken out UPD from diag_bld, it is not useful there.

stopcriterion
Salvatore Filippone 17 years ago
parent 2ffcc7940d
commit fe04944807

@ -138,7 +138,7 @@ subroutine mld_dbaseprc_bld(a,desc_a,p,info,upd)
case (mld_diag_) case (mld_diag_)
! Diagonal preconditioner ! 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_) & if(debug_level >= psb_debug_outer_) &
& write(debug_unit,*) me,' ',trim(name),& & write(debug_unit,*) me,' ',trim(name),&
& ': out of mld_diag_bld' & ': out of mld_diag_bld'

@ -55,7 +55,7 @@
! info - integer, output. ! info - integer, output.
! Error code. ! 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 psb_base_mod
use mld_prec_mod, mld_protect_name => mld_ddiag_bld 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_dspmat_type), target :: a
type(psb_desc_type), intent(in) :: desc_a type(psb_desc_type), intent(in) :: desc_a
type(mld_dbaseprc_type),intent(inout) :: p type(mld_dbaseprc_type),intent(inout) :: p
character, intent(in) :: upd
integer, intent(out) :: info integer, intent(out) :: info
! Local variables ! Local variables
Integer :: err, n_row, n_col,I,j,k,ictxt,& Integer :: err_act,ictxt, me, np, n_row, n_col,i
& me,np,mglob,lw, err_act
integer :: debug_level, debug_unit integer :: debug_level, debug_unit
character(len=20) :: name, ch_err character(len=20) :: name, ch_err
if(psb_get_errstatus().ne.0) return if(psb_get_errstatus().ne.0) return
info=0 info = 0
err=0
call psb_erractionsave(err_act) call psb_erractionsave(err_act)
debug_unit = psb_get_debug_unit() debug_unit = psb_get_debug_unit()
debug_level = psb_get_debug_level() 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) ictxt = psb_cd_get_context(desc_a)
n_row = psb_cd_get_local_rows(desc_a) n_row = psb_cd_get_local_rows(desc_a)
n_col = psb_cd_get_local_cols(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) call psb_info(ictxt, me, np)
if (debug_level >= psb_debug_outer_)& if (debug_level >= psb_debug_outer_)&

@ -373,23 +373,21 @@ module mld_prec_mod
end interface end interface
interface mld_diag_bld 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 psb_base_mod
use mld_prec_type use mld_prec_type
integer, intent(out) :: info integer, intent(out) :: info
type(psb_dspmat_type), intent(in), target :: a type(psb_dspmat_type), intent(in), target :: a
type(psb_desc_type),intent(in) :: desc_data type(psb_desc_type),intent(in) :: desc_data
type(mld_dbaseprc_type), intent(inout) :: p type(mld_dbaseprc_type), intent(inout) :: p
character, intent(in) :: upd
end subroutine mld_ddiag_bld 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 psb_base_mod
use mld_prec_type use mld_prec_type
integer, intent(out) :: info integer, intent(out) :: info
type(psb_zspmat_type), intent(in), target :: a type(psb_zspmat_type), intent(in), target :: a
type(psb_desc_type),intent(in) :: desc_data type(psb_desc_type),intent(in) :: desc_data
type(mld_zbaseprc_type), intent(inout) :: p type(mld_zbaseprc_type), intent(inout) :: p
character, intent(in) :: upd
end subroutine mld_zdiag_bld end subroutine mld_zdiag_bld
end interface end interface

@ -138,7 +138,7 @@ subroutine mld_zbaseprc_bld(a,desc_a,p,info,upd)
case (mld_diag_) case (mld_diag_)
! Diagonal preconditioner ! 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_) & if(debug_level >= psb_debug_outer_) &
& write(debug_unit,*) me,' ',trim(name),& & write(debug_unit,*) me,' ',trim(name),&
& ': out of mld_diag_bld' & ': out of mld_diag_bld'

@ -55,7 +55,7 @@
! info - integer, output. ! info - integer, output.
! Error code. ! 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 psb_base_mod
use mld_prec_mod, mld_protect_name => mld_zdiag_bld 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_zspmat_type), target :: a
type(psb_desc_type), intent(in) :: desc_a type(psb_desc_type), intent(in) :: desc_a
type(mld_zbaseprc_type),intent(inout) :: p type(mld_zbaseprc_type),intent(inout) :: p
character, intent(in) :: upd
integer, intent(out) :: info integer, intent(out) :: info
! Local variables ! Local variables
Integer :: err, n_row, n_col,I,j,k,ictxt,& Integer :: err_act,ictxt, me, np, n_row, n_col,i
& me,np,mglob,lw, err_act
integer :: debug_level, debug_unit integer :: debug_level, debug_unit
character(len=20) :: name, ch_err character(len=20) :: name, ch_err
if(psb_get_errstatus().ne.0) return if(psb_get_errstatus().ne.0) return
info=0 info = 0
err=0
call psb_erractionsave(err_act) call psb_erractionsave(err_act)
debug_unit = psb_get_debug_unit() debug_unit = psb_get_debug_unit()
debug_level = psb_get_debug_level() 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) ictxt = psb_cd_get_context(desc_a)
n_row = psb_cd_get_local_rows(desc_a) n_row = psb_cd_get_local_rows(desc_a)
n_col = psb_cd_get_local_cols(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) call psb_info(ictxt, me, np)
if (debug_level >= psb_debug_outer_)& if (debug_level >= psb_debug_outer_)&

Loading…
Cancel
Save