Taken out UPD argument from user callable routines.

stopcriterion
Salvatore Filippone 17 years ago
parent 202a8af7ac
commit 3a4b80e639

@ -61,7 +61,7 @@
! info - integer, output. ! info - integer, output.
! Error code. ! Error code.
! !
subroutine mld_dprecbld(a,desc_a,p,info,upd) subroutine mld_dprecbld(a,desc_a,p,info)
use psb_base_mod use psb_base_mod
use mld_prec_mod, protect => mld_dprecbld use mld_prec_mod, protect => mld_dprecbld
@ -73,12 +73,12 @@ subroutine mld_dprecbld(a,desc_a,p,info,upd)
type(psb_desc_type), intent(in), target :: desc_a type(psb_desc_type), intent(in), target :: desc_a
type(mld_dprec_type),intent(inout) :: p type(mld_dprec_type),intent(inout) :: p
integer, intent(out) :: info integer, intent(out) :: info
character, intent(in), optional :: upd !!$ character, intent(in), optional :: upd
! Local Variables ! Local Variables
Integer :: err,i,k,ictxt, me,np, err_act, iszv Integer :: err,i,k,ictxt, me,np, err_act, iszv
integer :: int_err(5) integer :: int_err(5)
character :: iupd character :: upd_
integer :: debug_level, debug_unit integer :: debug_level, debug_unit
character(len=20) :: name, ch_err character(len=20) :: name, ch_err
@ -98,19 +98,22 @@ subroutine mld_dprecbld(a,desc_a,p,info,upd)
if (debug_level >= psb_debug_outer_) & if (debug_level >= psb_debug_outer_) &
& write(debug_unit,*) me,' ',trim(name),& & write(debug_unit,*) me,' ',trim(name),&
& 'Entering ',desc_a%matrix_data(:) & 'Entering ',desc_a%matrix_data(:)
!
if (present(upd)) then ! For the time being we are commenting out the UPDATE argument
if (debug_level >= psb_debug_outer_) & ! we plan to resurrect it later.
& write(debug_unit,*) me,' ',trim(name),'UPD ', upd !!$ if (present(upd)) then
!!$ if (debug_level >= psb_debug_outer_) &
if ((toupper(upd).eq.'F').or.(toupper(upd).eq.'T')) then !!$ & write(debug_unit,*) me,' ',trim(name),'UPD ', upd
iupd=toupper(upd) !!$
else !!$ if ((toupper(upd).eq.'F').or.(toupper(upd).eq.'T')) then
iupd='F' !!$ upd_=toupper(upd)
endif !!$ else
else !!$ upd_='F'
iupd='F' !!$ endif
endif !!$ else
!!$ upd_='F'
!!$ endif
upd_ = 'F'
if (.not.allocated(p%baseprecv)) then if (.not.allocated(p%baseprecv)) then
!! Error: should have called mld_dprecinit !! Error: should have called mld_dprecinit
@ -135,7 +138,7 @@ subroutine mld_dprecbld(a,desc_a,p,info,upd)
! Allocate and build the fine level preconditioner ! Allocate and build the fine level preconditioner
! !
call init_baseprc_av(p%baseprecv(1),info) call init_baseprc_av(p%baseprecv(1),info)
if (info == 0) call mld_baseprc_bld(a,desc_a,p%baseprecv(1),info,iupd) if (info == 0) call mld_baseprc_bld(a,desc_a,p%baseprecv(1),info,upd_)
if (info /= 0) then if (info /= 0) then
call psb_errpush(4001,name,a_err='Base level precbuild.') call psb_errpush(4001,name,a_err='Base level precbuild.')

@ -289,7 +289,7 @@ module mld_prec_mod
interface mld_precbld interface mld_precbld
subroutine mld_dprecbld(a,desc_a,prec,info,upd) subroutine mld_dprecbld(a,desc_a,prec,info)
use psb_base_mod use psb_base_mod
use mld_prec_type use mld_prec_type
implicit none implicit none
@ -297,9 +297,9 @@ module mld_prec_mod
type(psb_desc_type), intent(in), target :: desc_a type(psb_desc_type), intent(in), target :: desc_a
type(mld_dprec_type), intent(inout) :: prec type(mld_dprec_type), intent(inout) :: prec
integer, intent(out) :: info integer, intent(out) :: info
character, intent(in),optional :: upd !!$ character, intent(in),optional :: upd
end subroutine mld_dprecbld end subroutine mld_dprecbld
subroutine mld_zprecbld(a,desc_a,prec,info,upd) subroutine mld_zprecbld(a,desc_a,prec,info)
use psb_base_mod use psb_base_mod
use mld_prec_type use mld_prec_type
implicit none implicit none
@ -307,7 +307,7 @@ module mld_prec_mod
type(psb_desc_type), intent(in), target :: desc_a type(psb_desc_type), intent(in), target :: desc_a
type(mld_zprec_type), intent(inout) :: prec type(mld_zprec_type), intent(inout) :: prec
integer, intent(out) :: info integer, intent(out) :: info
character, intent(in),optional :: upd !!$ character, intent(in),optional :: upd
end subroutine mld_zprecbld end subroutine mld_zprecbld
end interface end interface

@ -61,7 +61,7 @@
! info - integer, output. ! info - integer, output.
! Error code. ! Error code.
! !
subroutine mld_zprecbld(a,desc_a,p,info,upd) subroutine mld_zprecbld(a,desc_a,p,info)
use psb_base_mod use psb_base_mod
use mld_prec_mod, mld_protect_name => mld_zprecbld use mld_prec_mod, mld_protect_name => mld_zprecbld
@ -72,13 +72,13 @@ subroutine mld_zprecbld(a,desc_a,p,info,upd)
type(psb_desc_type), intent(in), target :: desc_a type(psb_desc_type), intent(in), target :: desc_a
type(mld_zprec_type),intent(inout) :: p type(mld_zprec_type),intent(inout) :: p
integer, intent(out) :: info integer, intent(out) :: info
character, intent(in), optional :: upd !!$ character, intent(in), optional :: upd
! Local Variables ! Local Variables
Integer :: err,i,k,ictxt, me,np, err_act, iszv Integer :: err,i,k,ictxt, me,np, err_act, iszv
integer :: int_err(5) integer :: int_err(5)
character :: iupd character :: upd_
integer :: debug_level, debug_unit integer :: debug_level, debug_unit
character(len=20) :: name, ch_err character(len=20) :: name, ch_err
@ -98,19 +98,22 @@ subroutine mld_zprecbld(a,desc_a,p,info,upd)
if (debug_level >= psb_debug_outer_) & if (debug_level >= psb_debug_outer_) &
& write(debug_unit,*) me,' ',trim(name),& & write(debug_unit,*) me,' ',trim(name),&
& 'Entering ',desc_a%matrix_data(:) & 'Entering ',desc_a%matrix_data(:)
!
if (present(upd)) then ! For the time being we are commenting out the UPDATE argument
if (debug_level >= psb_debug_outer_) & ! we plan to resurrect it later.
& write(debug_unit,*) me,' ',trim(name),'UPD ', upd !!$ if (present(upd)) then
!!$ if (debug_level >= psb_debug_outer_) &
if ((toupper(upd).eq.'F').or.(toupper(upd).eq.'T')) then !!$ & write(debug_unit,*) me,' ',trim(name),'UPD ', upd
iupd=toupper(upd) !!$
else !!$ if ((toupper(upd).eq.'F').or.(toupper(upd).eq.'T')) then
iupd='F' !!$ upd_=toupper(upd)
endif !!$ else
else !!$ upd_='F'
iupd='F' !!$ endif
endif !!$ else
!!$ upd_='F'
!!$ endif
upd_ = 'F'
if (.not.allocated(p%baseprecv)) then if (.not.allocated(p%baseprecv)) then
!! Error: should have called mld_dprecinit !! Error: should have called mld_dprecinit
@ -135,7 +138,7 @@ subroutine mld_zprecbld(a,desc_a,p,info,upd)
! Allocate and build the fine level preconditioner ! Allocate and build the fine level preconditioner
! !
call init_baseprc_av(p%baseprecv(1),info) call init_baseprc_av(p%baseprecv(1),info)
if (info == 0) call mld_baseprc_bld(a,desc_a,p%baseprecv(1),info,iupd) if (info == 0) call mld_baseprc_bld(a,desc_a,p%baseprecv(1),info,upd_)
if (info /= 0) then if (info /= 0) then
call psb_errpush(4001,name,a_err='Base level precbuild.') call psb_errpush(4001,name,a_err='Base level precbuild.')

Loading…
Cancel
Save