mld2p4-2:

mlprec/impl/level/mld_c_base_onelev_setc.f90
 mlprec/impl/level/mld_d_base_onelev_setc.f90
 mlprec/impl/level/mld_s_base_onelev_setc.f90
 mlprec/impl/level/mld_z_base_onelev_setc.f90
 mlprec/impl/mld_cprecset.F90
 mlprec/impl/mld_dprecset.F90
 mlprec/impl/mld_sprecset.F90
 mlprec/impl/mld_zprecset.F90
 mlprec/impl/smoother/mld_c_as_smoother_setc.f90
 mlprec/impl/smoother/mld_c_base_smoother_setc.f90
 mlprec/impl/smoother/mld_d_as_smoother_setc.f90
 mlprec/impl/smoother/mld_d_base_smoother_setc.f90
 mlprec/impl/smoother/mld_s_as_smoother_setc.f90
 mlprec/impl/smoother/mld_s_base_smoother_setc.f90
 mlprec/impl/smoother/mld_z_as_smoother_setc.f90
 mlprec/impl/smoother/mld_z_base_smoother_setc.f90
 mlprec/impl/solver/mld_c_base_solver_setc.f90
 mlprec/impl/solver/mld_d_base_solver_setc.f90
 mlprec/impl/solver/mld_s_base_solver_setc.f90
 mlprec/impl/solver/mld_z_base_solver_setc.f90
 mlprec/mld_base_prec_type.F90
 mlprec/mld_c_ilu_solver.f90
 mlprec/mld_c_jac_smoother.f90
 mlprec/mld_c_slu_solver.F90
 mlprec/mld_c_sludist_solver.F90
 mlprec/mld_c_umf_solver.F90
 mlprec/mld_d_ilu_solver.f90
 mlprec/mld_d_jac_smoother.f90
 mlprec/mld_d_slu_solver.F90
 mlprec/mld_d_sludist_solver.F90
 mlprec/mld_d_umf_solver.F90
 mlprec/mld_s_ilu_solver.f90
 mlprec/mld_s_jac_smoother.f90
 mlprec/mld_s_slu_solver.F90
 mlprec/mld_s_sludist_solver.F90
 mlprec/mld_s_umf_solver.F90
 mlprec/mld_z_ilu_solver.f90
 mlprec/mld_z_jac_smoother.f90
 mlprec/mld_z_slu_solver.F90
 mlprec/mld_z_sludist_solver.F90
 mlprec/mld_z_umf_solver.F90

First step of reworking SET routines.
stopcriterion
Salvatore Filippone 12 years ago
parent e523fcbe75
commit a134c66599

@ -56,8 +56,15 @@ subroutine mld_c_base_onelev_setc(lv,what,val,info)
info = psb_success_
call mld_stringval(val,ival,info)
if (info == psb_success_) call lv%set(what,ival,info)
ival = mld_stringval(val)
if (ival >= 0) then
call lv%set(what,ival,info)
else
if (allocated(lv%sm)) then
call lv%sm%set(what,val,info)
end if
end if
if (info /= psb_success_) goto 9999

@ -56,8 +56,15 @@ subroutine mld_d_base_onelev_setc(lv,what,val,info)
info = psb_success_
call mld_stringval(val,ival,info)
if (info == psb_success_) call lv%set(what,ival,info)
ival = mld_stringval(val)
if (ival >= 0) then
call lv%set(what,ival,info)
else
if (allocated(lv%sm)) then
call lv%sm%set(what,val,info)
end if
end if
if (info /= psb_success_) goto 9999

@ -56,8 +56,15 @@ subroutine mld_s_base_onelev_setc(lv,what,val,info)
info = psb_success_
call mld_stringval(val,ival,info)
if (info == psb_success_) call lv%set(what,ival,info)
ival = mld_stringval(val)
if (ival >= 0) then
call lv%set(what,ival,info)
else
if (allocated(lv%sm)) then
call lv%sm%set(what,val,info)
end if
end if
if (info /= psb_success_) goto 9999

@ -56,8 +56,15 @@ subroutine mld_z_base_onelev_setc(lv,what,val,info)
info = psb_success_
call mld_stringval(val,ival,info)
if (info == psb_success_) call lv%set(what,ival,info)
ival = mld_stringval(val)
if (ival >= 0) then
call lv%set(what,ival,info)
else
if (allocated(lv%sm)) then
call lv%sm%set(what,val,info)
end if
end if
if (info /= psb_success_) goto 9999

@ -776,8 +776,8 @@ subroutine mld_cprecsetc(p,what,string,info,ilev)
return
endif
call mld_stringval(string,val,info)
if (info == psb_success_) call mld_inner_precset(p,what,val,info,ilev=ilev)
val = mld_stringval(string)
if (val >=0) call mld_inner_precset(p,what,val,info,ilev=ilev)
end subroutine mld_cprecsetc

@ -776,8 +776,8 @@ subroutine mld_dprecsetc(p,what,string,info,ilev)
return
endif
call mld_stringval(string,val,info)
if (info == psb_success_) call mld_inner_precset(p,what,val,info,ilev=ilev)
val = mld_stringval(string)
if (val >=0) call mld_inner_precset(p,what,val,info,ilev=ilev)
end subroutine mld_dprecsetc

@ -776,8 +776,8 @@ subroutine mld_sprecsetc(p,what,string,info,ilev)
return
endif
call mld_stringval(string,val,info)
if (info == psb_success_) call mld_inner_precset(p,what,val,info,ilev=ilev)
val = mld_stringval(string)
if (val >=0) call mld_inner_precset(p,what,val,info,ilev=ilev)
end subroutine mld_sprecsetc

@ -776,9 +776,8 @@ subroutine mld_zprecsetc(p,what,string,info,ilev)
return
endif
call mld_stringval(string,val,info)
if (info == psb_success_) call mld_inner_precset(p,what,val,info,ilev=ilev)
val = mld_stringval(string)
if (val >=0) call mld_inner_precset(p,what,val,info,ilev=ilev)
end subroutine mld_zprecsetc

@ -53,8 +53,15 @@ subroutine mld_c_as_smoother_setc(sm,what,val,info)
call psb_erractionsave(err_act)
call mld_stringval(val,ival,info)
if (info == psb_success_) call sm%set(what,ival,info)
ival = mld_stringval(val)
if (ival >= 0) then
call sm%set(what,ival,info)
else
if (allocated(sm%sv)) then
call sm%sv%set(what,val,info)
end if
end if
if (info /= psb_success_) then
info = psb_err_from_subroutine_
call psb_errpush(info, name)

@ -47,16 +47,22 @@ subroutine mld_c_base_smoother_setc(sm,what,val,info)
integer(psb_ipk_), intent(in) :: what
character(len=*), intent(in) :: val
integer(psb_ipk_), intent(out) :: info
integer(psb_ipk_) :: err_act
integer(psb_ipk_) :: err_act, ival
character(len=20) :: name='c_base_smoother_setc'
call psb_erractionsave(err_act)
info = psb_success_
if (allocated(sm%sv)) then
call sm%sv%set(what,val,info)
ival = mld_stringval(val)
if (ival >= 0) then
call sm%set(what,ival,info)
else
if (allocated(sm%sv)) then
call sm%sv%set(what,val,info)
end if
end if
if (info /= psb_success_) goto 9999
call psb_erractionrestore(err_act)

@ -53,8 +53,15 @@ subroutine mld_d_as_smoother_setc(sm,what,val,info)
call psb_erractionsave(err_act)
call mld_stringval(val,ival,info)
if (info == psb_success_) call sm%set(what,ival,info)
ival = mld_stringval(val)
if (ival >= 0) then
call sm%set(what,ival,info)
else
if (allocated(sm%sv)) then
call sm%sv%set(what,val,info)
end if
end if
if (info /= psb_success_) then
info = psb_err_from_subroutine_
call psb_errpush(info, name)

@ -47,16 +47,22 @@ subroutine mld_d_base_smoother_setc(sm,what,val,info)
integer(psb_ipk_), intent(in) :: what
character(len=*), intent(in) :: val
integer(psb_ipk_), intent(out) :: info
integer(psb_ipk_) :: err_act
integer(psb_ipk_) :: err_act, ival
character(len=20) :: name='d_base_smoother_setc'
call psb_erractionsave(err_act)
info = psb_success_
if (allocated(sm%sv)) then
call sm%sv%set(what,val,info)
ival = mld_stringval(val)
if (ival >= 0) then
call sm%set(what,ival,info)
else
if (allocated(sm%sv)) then
call sm%sv%set(what,val,info)
end if
end if
if (info /= psb_success_) goto 9999
call psb_erractionrestore(err_act)

@ -53,8 +53,15 @@ subroutine mld_s_as_smoother_setc(sm,what,val,info)
call psb_erractionsave(err_act)
call mld_stringval(val,ival,info)
if (info == psb_success_) call sm%set(what,ival,info)
ival = mld_stringval(val)
if (ival >= 0) then
call sm%set(what,ival,info)
else
if (allocated(sm%sv)) then
call sm%sv%set(what,val,info)
end if
end if
if (info /= psb_success_) then
info = psb_err_from_subroutine_
call psb_errpush(info, name)

@ -47,16 +47,22 @@ subroutine mld_s_base_smoother_setc(sm,what,val,info)
integer(psb_ipk_), intent(in) :: what
character(len=*), intent(in) :: val
integer(psb_ipk_), intent(out) :: info
integer(psb_ipk_) :: err_act
integer(psb_ipk_) :: err_act, ival
character(len=20) :: name='s_base_smoother_setc'
call psb_erractionsave(err_act)
info = psb_success_
if (allocated(sm%sv)) then
call sm%sv%set(what,val,info)
ival = mld_stringval(val)
if (ival >= 0) then
call sm%set(what,ival,info)
else
if (allocated(sm%sv)) then
call sm%sv%set(what,val,info)
end if
end if
if (info /= psb_success_) goto 9999
call psb_erractionrestore(err_act)

@ -53,8 +53,15 @@ subroutine mld_z_as_smoother_setc(sm,what,val,info)
call psb_erractionsave(err_act)
call mld_stringval(val,ival,info)
if (info == psb_success_) call sm%set(what,ival,info)
ival = mld_stringval(val)
if (ival >= 0) then
call sm%set(what,ival,info)
else
if (allocated(sm%sv)) then
call sm%sv%set(what,val,info)
end if
end if
if (info /= psb_success_) then
info = psb_err_from_subroutine_
call psb_errpush(info, name)

@ -47,16 +47,22 @@ subroutine mld_z_base_smoother_setc(sm,what,val,info)
integer(psb_ipk_), intent(in) :: what
character(len=*), intent(in) :: val
integer(psb_ipk_), intent(out) :: info
integer(psb_ipk_) :: err_act
integer(psb_ipk_) :: err_act, ival
character(len=20) :: name='z_base_smoother_setc'
call psb_erractionsave(err_act)
info = psb_success_
if (allocated(sm%sv)) then
call sm%sv%set(what,val,info)
ival = mld_stringval(val)
if (ival >= 0) then
call sm%set(what,ival,info)
else
if (allocated(sm%sv)) then
call sm%sv%set(what,val,info)
end if
end if
if (info /= psb_success_) goto 9999
call psb_erractionrestore(err_act)

@ -53,8 +53,10 @@ subroutine mld_c_base_solver_setc(sv,what,val,info)
info = psb_success_
call mld_stringval(val,ival,info)
if (info == psb_success_) call sv%set(what,ival,info)
ival = mld_stringval(val)
if (ival >=0) then
call sv%set(what,ival,info)
end if
if (info /= psb_success_) goto 9999

@ -53,8 +53,10 @@ subroutine mld_d_base_solver_setc(sv,what,val,info)
info = psb_success_
call mld_stringval(val,ival,info)
if (info == psb_success_) call sv%set(what,ival,info)
ival = mld_stringval(val)
if (ival >=0) then
call sv%set(what,ival,info)
end if
if (info /= psb_success_) goto 9999

@ -53,8 +53,10 @@ subroutine mld_s_base_solver_setc(sv,what,val,info)
info = psb_success_
call mld_stringval(val,ival,info)
if (info == psb_success_) call sv%set(what,ival,info)
ival = mld_stringval(val)
if (ival >=0) then
call sv%set(what,ival,info)
end if
if (info /= psb_success_) goto 9999

@ -53,8 +53,10 @@ subroutine mld_z_base_solver_setc(sv,what,val,info)
info = psb_success_
call mld_stringval(val,ival,info)
if (info == psb_success_) call sv%set(what,ival,info)
ival = mld_stringval(val)
if (ival >=0) then
call sv%set(what,ival,info)
end if
if (info /= psb_success_) goto 9999

@ -332,7 +332,7 @@ module mld_base_prec_type
contains
!
! Subroutine: mld_stringval
! Function: mld_stringval
!
! This routine converts the string contained into string into the corresponding
! integer value.
@ -342,17 +342,14 @@ contains
! The string to be converted.
! val - integer, output.
! The integer value corresponding to the string
! info - integer, output.
! Error code.
!
subroutine mld_stringval(string,val,info)
function mld_stringval(string) result(val)
implicit none
! Arguments
character(len=*), intent(in) :: string
integer(psb_ipk_), intent(out) :: val, info
integer(psb_ipk_) :: val
character(len=*), parameter :: name='mld_stringval'
info = psb_success_
select case(psb_toupper(trim(string)))
case('NONE')
val = 0
@ -432,12 +429,8 @@ contains
val = mld_no_filter_mat_
case default
val = -1
info = -1
end select
if (info /= psb_success_) then
write(0,*) name,': Error: unknown request: "',trim(string),'"'
end if
end subroutine mld_stringval
end function mld_stringval

@ -260,8 +260,11 @@ contains
call psb_erractionsave(err_act)
call mld_stringval(val,ival,info)
if (info == psb_success_) call sv%set(what,ival,info)
ival = mld_stringval(val)
if (ival >= 0) then
call sv%set(what,ival,info)
end if
if (info /= psb_success_) then
info = psb_err_from_subroutine_
call psb_errpush(info, name)

@ -174,8 +174,15 @@ contains
call psb_erractionsave(err_act)
call mld_stringval(val,ival,info)
if (info == psb_success_) call sm%set(what,ival,info)
ival = mld_stringval(val)
if (ival >= 0) then
call sm%set(what,ival,info)
else
if (allocated(sm%sv)) then
call sm%sv%set(what,val,info)
end if
end if
if (info /= psb_success_) then
info = psb_err_from_subroutine_
call psb_errpush(info, name)

@ -323,8 +323,10 @@ contains
call psb_erractionsave(err_act)
call mld_stringval(val,ival,info)
if (info == psb_success_) call sv%set(what,ival,info)
ival = mld_stringval(val)
if (ival >=0) then
call sv%set(what,ival,info)
end if
if (info /= psb_success_) then
info = psb_err_from_subroutine_
call psb_errpush(info, name)

@ -330,8 +330,10 @@ contains
call psb_erractionsave(err_act)
call mld_stringval(val,ival,info)
if (info == psb_success_) call sv%set(what,ival,info)
ival = mld_stringval(val)
if (ival >=0) then
call sv%set(what,ival,info)
end if
if (info /= psb_success_) then
info = psb_err_from_subroutine_
call psb_errpush(info, name)

@ -324,8 +324,10 @@ contains
call psb_erractionsave(err_act)
call mld_stringval(val,ival,info)
if (info == psb_success_) call sv%set(what,ival,info)
ival = mld_stringval(val)
if (ival >=0) then
call sv%set(what,ival,info)
end if
if (info /= psb_success_) then
info = psb_err_from_subroutine_
call psb_errpush(info, name)

@ -260,8 +260,11 @@ contains
call psb_erractionsave(err_act)
call mld_stringval(val,ival,info)
if (info == psb_success_) call sv%set(what,ival,info)
ival = mld_stringval(val)
if (ival >= 0) then
call sv%set(what,ival,info)
end if
if (info /= psb_success_) then
info = psb_err_from_subroutine_
call psb_errpush(info, name)

@ -174,8 +174,15 @@ contains
call psb_erractionsave(err_act)
call mld_stringval(val,ival,info)
if (info == psb_success_) call sm%set(what,ival,info)
ival = mld_stringval(val)
if (ival >= 0) then
call sm%set(what,ival,info)
else
if (allocated(sm%sv)) then
call sm%sv%set(what,val,info)
end if
end if
if (info /= psb_success_) then
info = psb_err_from_subroutine_
call psb_errpush(info, name)

@ -322,9 +322,10 @@ contains
info = psb_success_
call psb_erractionsave(err_act)
call mld_stringval(val,ival,info)
if (info == psb_success_) call sv%set(what,ival,info)
ival = mld_stringval(val)
if (ival >=0) then
call sv%set(what,ival,info)
end if
if (info /= psb_success_) then
info = psb_err_from_subroutine_
call psb_errpush(info, name)

@ -327,9 +327,10 @@ contains
info = psb_success_
call psb_erractionsave(err_act)
call mld_stringval(val,ival,info)
if (info == psb_success_) call sv%set(what,ival,info)
ival = mld_stringval(val)
if (ival >=0) then
call sv%set(what,ival,info)
end if
if (info /= psb_success_) then
info = psb_err_from_subroutine_
call psb_errpush(info, name)

@ -323,9 +323,10 @@ contains
info = psb_success_
call psb_erractionsave(err_act)
call mld_stringval(val,ival,info)
if (info == psb_success_) call sv%set(what,ival,info)
ival = mld_stringval(val)
if (ival >=0) then
call sv%set(what,ival,info)
end if
if (info /= psb_success_) then
info = psb_err_from_subroutine_
call psb_errpush(info, name)

@ -260,8 +260,11 @@ contains
call psb_erractionsave(err_act)
call mld_stringval(val,ival,info)
if (info == psb_success_) call sv%set(what,ival,info)
ival = mld_stringval(val)
if (ival >= 0) then
call sv%set(what,ival,info)
end if
if (info /= psb_success_) then
info = psb_err_from_subroutine_
call psb_errpush(info, name)

@ -174,8 +174,15 @@ contains
call psb_erractionsave(err_act)
call mld_stringval(val,ival,info)
if (info == psb_success_) call sm%set(what,ival,info)
ival = mld_stringval(val)
if (ival >= 0) then
call sm%set(what,ival,info)
else
if (allocated(sm%sv)) then
call sm%sv%set(what,val,info)
end if
end if
if (info /= psb_success_) then
info = psb_err_from_subroutine_
call psb_errpush(info, name)

@ -324,9 +324,10 @@ contains
info = psb_success_
call psb_erractionsave(err_act)
call mld_stringval(val,ival,info)
if (info == psb_success_) call sv%set(what,ival,info)
ival = mld_stringval(val)
if (ival >=0) then
call sv%set(what,ival,info)
end if
if (info /= psb_success_) then
info = psb_err_from_subroutine_
call psb_errpush(info, name)

@ -327,9 +327,10 @@ contains
info = psb_success_
call psb_erractionsave(err_act)
call mld_stringval(val,ival,info)
if (info == psb_success_) call sv%set(what,ival,info)
ival = mld_stringval(val)
if (ival >=0) then
call sv%set(what,ival,info)
end if
if (info /= psb_success_) then
info = psb_err_from_subroutine_
call psb_errpush(info, name)

@ -325,9 +325,10 @@ contains
info = psb_success_
call psb_erractionsave(err_act)
call mld_stringval(val,ival,info)
if (info == psb_success_) call sv%set(what,ival,info)
ival = mld_stringval(val)
if (ival >=0) then
call sv%set(what,ival,info)
end if
if (info /= psb_success_) then
info = psb_err_from_subroutine_
call psb_errpush(info, name)

@ -260,8 +260,11 @@ contains
call psb_erractionsave(err_act)
call mld_stringval(val,ival,info)
if (info == psb_success_) call sv%set(what,ival,info)
ival = mld_stringval(val)
if (ival >= 0) then
call sv%set(what,ival,info)
end if
if (info /= psb_success_) then
info = psb_err_from_subroutine_
call psb_errpush(info, name)

@ -174,8 +174,15 @@ contains
call psb_erractionsave(err_act)
call mld_stringval(val,ival,info)
if (info == psb_success_) call sm%set(what,ival,info)
ival = mld_stringval(val)
if (ival >= 0) then
call sm%set(what,ival,info)
else
if (allocated(sm%sv)) then
call sm%sv%set(what,val,info)
end if
end if
if (info /= psb_success_) then
info = psb_err_from_subroutine_
call psb_errpush(info, name)

@ -326,9 +326,10 @@ contains
info = psb_success_
call psb_erractionsave(err_act)
call mld_stringval(val,ival,info)
if (info == psb_success_) call sv%set(what,ival,info)
ival = mld_stringval(val)
if (ival >=0) then
call sv%set(what,ival,info)
end if
if (info /= psb_success_) then
info = psb_err_from_subroutine_
call psb_errpush(info, name)

@ -328,9 +328,10 @@ contains
info = psb_success_
call psb_erractionsave(err_act)
call mld_stringval(val,ival,info)
if (info == psb_success_) call sv%set(what,ival,info)
ival = mld_stringval(val)
if (ival >=0) then
call sv%set(what,ival,info)
end if
if (info /= psb_success_) then
info = psb_err_from_subroutine_
call psb_errpush(info, name)

@ -326,9 +326,10 @@ contains
info = psb_success_
call psb_erractionsave(err_act)
call mld_stringval(val,ival,info)
if (info == psb_success_) call sv%set(what,ival,info)
ival = mld_stringval(val)
if (ival >=0) then
call sv%set(what,ival,info)
end if
if (info /= psb_success_) then
info = psb_err_from_subroutine_
call psb_errpush(info, name)

Loading…
Cancel
Save