mld2p4-smooth-2side

mlprec/impl/mld_dcprecset.F90
 mlprec/impl/mld_dprecset.F90
 mlprec/mld_base_prec_type.F90

Cosmetic changes in base_prec.
Fixed interface in precset.
stopcriterion
Salvatore Filippone 9 years ago
parent 55c7474658
commit d651141c7d

@ -76,7 +76,7 @@
! For this reason, the interface mld_precset to this routine has been built in ! For this reason, the interface mld_precset to this routine has been built in
! such a way that ilev is not visible to the user (see mld_prec_mod.f90). ! such a way that ilev is not visible to the user (see mld_prec_mod.f90).
! !
subroutine mld_dcprecseti(p,what,val,info,ilev) subroutine mld_dcprecseti(p,what,val,info,ilev,pos)
use psb_base_mod use psb_base_mod
use mld_d_prec_mod, mld_protect_name => mld_dcprecseti use mld_d_prec_mod, mld_protect_name => mld_dcprecseti
@ -108,6 +108,7 @@ subroutine mld_dcprecseti(p,what,val,info,ilev)
integer(psb_ipk_), intent(in) :: val integer(psb_ipk_), intent(in) :: val
integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(out) :: info
integer(psb_ipk_), optional, intent(in) :: ilev integer(psb_ipk_), optional, intent(in) :: ilev
character(len=*), optional, intent(in) :: pos
! Local variables ! Local variables
integer(psb_ipk_) :: ilev_, nlev_ integer(psb_ipk_) :: ilev_, nlev_
@ -136,7 +137,6 @@ subroutine mld_dcprecseti(p,what,val,info,ilev)
&': Error: invalid ILEV/NLEV combination',ilev_, nlev_ &': Error: invalid ILEV/NLEV combination',ilev_, nlev_
return return
endif endif
if (psb_toupper(what) == 'COARSE_AGGR_SIZE') then if (psb_toupper(what) == 'COARSE_AGGR_SIZE') then
p%coarse_aggr_size = max(val,-1) p%coarse_aggr_size = max(val,-1)
return return
@ -717,7 +717,7 @@ end subroutine mld_dcprecseti
! For this reason, the interface mld_precset to this routine has been built in ! For this reason, the interface mld_precset to this routine has been built in
! such a way that ilev is not visible to the user (see mld_prec_mod.f90). ! such a way that ilev is not visible to the user (see mld_prec_mod.f90).
! !
subroutine mld_dcprecsetc(p,what,string,info,ilev) subroutine mld_dcprecsetc(p,what,string,info,ilev,pos)
use psb_base_mod use psb_base_mod
use mld_d_prec_mod, mld_protect_name => mld_dcprecsetc use mld_d_prec_mod, mld_protect_name => mld_dcprecsetc
@ -730,6 +730,7 @@ subroutine mld_dcprecsetc(p,what,string,info,ilev)
character(len=*), intent(in) :: string character(len=*), intent(in) :: string
integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(out) :: info
integer(psb_ipk_), optional, intent(in) :: ilev integer(psb_ipk_), optional, intent(in) :: ilev
character(len=*), optional, intent(in) :: pos
! Local variables ! Local variables
integer(psb_ipk_) :: ilev_, nlev_,val integer(psb_ipk_) :: ilev_, nlev_,val
@ -804,7 +805,7 @@ end subroutine mld_dcprecsetc
! For this reason, the interface mld_precset to this routine has been built in ! For this reason, the interface mld_precset to this routine has been built in
! such a way that ilev is not visible to the user (see mld_prec_mod.f90). ! such a way that ilev is not visible to the user (see mld_prec_mod.f90).
! !
subroutine mld_dcprecsetr(p,what,val,info,ilev) subroutine mld_dcprecsetr(p,what,val,info,ilev,pos)
use psb_base_mod use psb_base_mod
use mld_d_prec_mod, mld_protect_name => mld_dcprecsetr use mld_d_prec_mod, mld_protect_name => mld_dcprecsetr
@ -817,6 +818,7 @@ subroutine mld_dcprecsetr(p,what,val,info,ilev)
real(psb_dpk_), intent(in) :: val real(psb_dpk_), intent(in) :: val
integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(out) :: info
integer(psb_ipk_), optional, intent(in) :: ilev integer(psb_ipk_), optional, intent(in) :: ilev
character(len=*), optional, intent(in) :: pos
! Local variables ! Local variables
integer(psb_ipk_) :: ilev_,nlev_ integer(psb_ipk_) :: ilev_,nlev_

@ -867,7 +867,6 @@ subroutine mld_dprecsetsv(p,val,info,ilev,pos)
do ilev_ = ilmin, ilmax do ilev_ = ilmin, ilmax
if (allocated(p%precv(ilev_)%sm2a)) then if (allocated(p%precv(ilev_)%sm2a)) then
if (allocated(p%precv(ilev_)%sm2a%sv)) then if (allocated(p%precv(ilev_)%sm2a%sv)) then
write(0,*)p%precv(ilev_)%sm2a%sv%get_fmt(),val%get_fmt()
if (.not.same_type_as(p%precv(ilev_)%sm2a%sv,val)) then if (.not.same_type_as(p%precv(ilev_)%sm2a%sv,val)) then
deallocate(p%precv(ilev_)%sm2a%sv,stat=info) deallocate(p%precv(ilev_)%sm2a%sv,stat=info)
if (info /= 0) then if (info /= 0) then
@ -888,7 +887,7 @@ subroutine mld_dprecsetsv(p,val,info,ilev,pos)
end if end if
end if end if
call p%precv(ilev_)%sm2a%sv%default() call p%precv(ilev_)%sm2a%sv%default()
write(0,*)p%precv(ilev_)%sm2a%sv%get_fmt(),val%get_fmt()
else else
info = 3111 info = 3111
write(psb_err_unit,*) name,& write(psb_err_unit,*) name,&
@ -943,7 +942,7 @@ end subroutine mld_dprecsetsv
! For this reason, the interface mld_precset to this routine has been built in ! For this reason, the interface mld_precset to this routine has been built in
! such a way that ilev is not visible to the user (see mld_prec_mod.f90). ! such a way that ilev is not visible to the user (see mld_prec_mod.f90).
! !
subroutine mld_dprecsetc(p,what,string,info,ilev) subroutine mld_dprecsetc(p,what,string,info,ilev,pos)
use psb_base_mod use psb_base_mod
use mld_d_prec_mod, mld_protect_name => mld_dprecsetc use mld_d_prec_mod, mld_protect_name => mld_dprecsetc
@ -956,6 +955,7 @@ subroutine mld_dprecsetc(p,what,string,info,ilev)
character(len=*), intent(in) :: string character(len=*), intent(in) :: string
integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(out) :: info
integer(psb_ipk_), optional, intent(in) :: ilev integer(psb_ipk_), optional, intent(in) :: ilev
character(len=*), optional, intent(in) :: pos
! Local variables ! Local variables
integer(psb_ipk_) :: ilev_, nlev_,val integer(psb_ipk_) :: ilev_, nlev_,val
@ -1027,7 +1027,7 @@ end subroutine mld_dprecsetc
! For this reason, the interface mld_precset to this routine has been built in ! For this reason, the interface mld_precset to this routine has been built in
! such a way that ilev is not visible to the user (see mld_prec_mod.f90). ! such a way that ilev is not visible to the user (see mld_prec_mod.f90).
! !
subroutine mld_dprecsetr(p,what,val,info,ilev) subroutine mld_dprecsetr(p,what,val,info,ilev,pos)
use psb_base_mod use psb_base_mod
use mld_d_prec_mod, mld_protect_name => mld_dprecsetr use mld_d_prec_mod, mld_protect_name => mld_dprecsetr
@ -1040,6 +1040,7 @@ subroutine mld_dprecsetr(p,what,val,info,ilev)
real(psb_dpk_), intent(in) :: val real(psb_dpk_), intent(in) :: val
integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(out) :: info
integer(psb_ipk_), optional, intent(in) :: ilev integer(psb_ipk_), optional, intent(in) :: ilev
character(len=*), optional, intent(in) :: pos
! Local variables ! Local variables
integer(psb_ipk_) :: ilev_,nlev_ integer(psb_ipk_) :: ilev_,nlev_

Loading…
Cancel
Save