tests/fileread/mld_cf_sample.f90
 tests/fileread/mld_df_sample.f90
 tests/fileread/mld_sf_sample.f90
 tests/fileread/mld_zf_sample.f90

Fix sequence of calls for preconditioner build.
stopcriterion
Salvatore Filippone 9 years ago
parent e8f62cb1af
commit d59d8edf45

@ -262,15 +262,6 @@ program mld_cf_sample
call mld_precset(prec,'aggr_ord', prec_choice%aggr_ord,info) call mld_precset(prec,'aggr_ord', prec_choice%aggr_ord,info)
call mld_precset(prec,'aggr_scale', prec_choice%ascale, info) call mld_precset(prec,'aggr_scale', prec_choice%ascale, info)
call mld_precset(prec,'aggr_thresh', prec_choice%athres, info) call mld_precset(prec,'aggr_thresh', prec_choice%athres, info)
call psb_barrier(ictxt)
t1 = psb_wtime()
call mld_hierarchy_bld(a,desc_a,prec,info)
thier = psb_wtime()-t1
if (info /= psb_success_) then
call psb_errpush(psb_err_from_subroutine_,name,a_err='psb_precbld')
goto 9999
end if
call mld_precset(prec,'smoother_type', prec_choice%smther, info) call mld_precset(prec,'smoother_type', prec_choice%smther, info)
call mld_precset(prec,'smoother_sweeps', prec_choice%jsweeps, info) call mld_precset(prec,'smoother_sweeps', prec_choice%jsweeps, info)
call mld_precset(prec,'sub_ovr', prec_choice%novr, info) call mld_precset(prec,'sub_ovr', prec_choice%novr, info)
@ -290,6 +281,14 @@ program mld_cf_sample
! building the preconditioner ! building the preconditioner
call psb_barrier(ictxt) call psb_barrier(ictxt)
t1 = psb_wtime() t1 = psb_wtime()
call mld_hierarchy_bld(a,desc_a,prec,info)
thier = psb_wtime()-t1
if (info /= psb_success_) then
call psb_errpush(psb_err_from_subroutine_,name,a_err='psb_precbld')
goto 9999
end if
call psb_barrier(ictxt)
t1 = psb_wtime()
call mld_ml_prec_bld(a,desc_a,prec,info) call mld_ml_prec_bld(a,desc_a,prec,info)
tprec = psb_wtime()-t1 tprec = psb_wtime()-t1
if (info /= psb_success_) then if (info /= psb_success_) then

@ -262,15 +262,6 @@ program mld_df_sample
call mld_precset(prec,'aggr_ord', prec_choice%aggr_ord,info) call mld_precset(prec,'aggr_ord', prec_choice%aggr_ord,info)
call mld_precset(prec,'aggr_scale', prec_choice%ascale, info) call mld_precset(prec,'aggr_scale', prec_choice%ascale, info)
call mld_precset(prec,'aggr_thresh', prec_choice%athres, info) call mld_precset(prec,'aggr_thresh', prec_choice%athres, info)
call psb_barrier(ictxt)
t1 = psb_wtime()
call mld_hierarchy_bld(a,desc_a,prec,info)
thier = psb_wtime()-t1
if (info /= psb_success_) then
call psb_errpush(psb_err_from_subroutine_,name,a_err='psb_precbld')
goto 9999
end if
call mld_precset(prec,'smoother_type', prec_choice%smther, info) call mld_precset(prec,'smoother_type', prec_choice%smther, info)
call mld_precset(prec,'smoother_sweeps', prec_choice%jsweeps, info) call mld_precset(prec,'smoother_sweeps', prec_choice%jsweeps, info)
call mld_precset(prec,'sub_ovr', prec_choice%novr, info) call mld_precset(prec,'sub_ovr', prec_choice%novr, info)
@ -290,6 +281,14 @@ program mld_df_sample
! building the preconditioner ! building the preconditioner
call psb_barrier(ictxt) call psb_barrier(ictxt)
t1 = psb_wtime() t1 = psb_wtime()
call mld_hierarchy_bld(a,desc_a,prec,info)
thier = psb_wtime()-t1
if (info /= psb_success_) then
call psb_errpush(psb_err_from_subroutine_,name,a_err='psb_precbld')
goto 9999
end if
call psb_barrier(ictxt)
t1 = psb_wtime()
call mld_ml_prec_bld(a,desc_a,prec,info) call mld_ml_prec_bld(a,desc_a,prec,info)
tprec = psb_wtime()-t1 tprec = psb_wtime()-t1
if (info /= psb_success_) then if (info /= psb_success_) then

@ -262,15 +262,6 @@ program mld_sf_sample
call mld_precset(prec,'aggr_ord', prec_choice%aggr_ord,info) call mld_precset(prec,'aggr_ord', prec_choice%aggr_ord,info)
call mld_precset(prec,'aggr_scale', prec_choice%ascale, info) call mld_precset(prec,'aggr_scale', prec_choice%ascale, info)
call mld_precset(prec,'aggr_thresh', prec_choice%athres, info) call mld_precset(prec,'aggr_thresh', prec_choice%athres, info)
call psb_barrier(ictxt)
t1 = psb_wtime()
call mld_hierarchy_bld(a,desc_a,prec,info)
thier = psb_wtime()-t1
if (info /= psb_success_) then
call psb_errpush(psb_err_from_subroutine_,name,a_err='psb_precbld')
goto 9999
end if
call mld_precset(prec,'smoother_type', prec_choice%smther, info) call mld_precset(prec,'smoother_type', prec_choice%smther, info)
call mld_precset(prec,'smoother_sweeps', prec_choice%jsweeps, info) call mld_precset(prec,'smoother_sweeps', prec_choice%jsweeps, info)
call mld_precset(prec,'sub_ovr', prec_choice%novr, info) call mld_precset(prec,'sub_ovr', prec_choice%novr, info)
@ -290,6 +281,14 @@ program mld_sf_sample
! building the preconditioner ! building the preconditioner
call psb_barrier(ictxt) call psb_barrier(ictxt)
t1 = psb_wtime() t1 = psb_wtime()
call mld_hierarchy_bld(a,desc_a,prec,info)
thier = psb_wtime()-t1
if (info /= psb_success_) then
call psb_errpush(psb_err_from_subroutine_,name,a_err='psb_precbld')
goto 9999
end if
call psb_barrier(ictxt)
t1 = psb_wtime()
call mld_ml_prec_bld(a,desc_a,prec,info) call mld_ml_prec_bld(a,desc_a,prec,info)
tprec = psb_wtime()-t1 tprec = psb_wtime()-t1
if (info /= psb_success_) then if (info /= psb_success_) then

@ -262,15 +262,6 @@ program mld_zf_sample
call mld_precset(prec,'aggr_ord', prec_choice%aggr_ord,info) call mld_precset(prec,'aggr_ord', prec_choice%aggr_ord,info)
call mld_precset(prec,'aggr_scale', prec_choice%ascale, info) call mld_precset(prec,'aggr_scale', prec_choice%ascale, info)
call mld_precset(prec,'aggr_thresh', prec_choice%athres, info) call mld_precset(prec,'aggr_thresh', prec_choice%athres, info)
call psb_barrier(ictxt)
t1 = psb_wtime()
call mld_hierarchy_bld(a,desc_a,prec,info)
thier = psb_wtime()-t1
if (info /= psb_success_) then
call psb_errpush(psb_err_from_subroutine_,name,a_err='psb_precbld')
goto 9999
end if
call mld_precset(prec,'smoother_type', prec_choice%smther, info) call mld_precset(prec,'smoother_type', prec_choice%smther, info)
call mld_precset(prec,'smoother_sweeps', prec_choice%jsweeps, info) call mld_precset(prec,'smoother_sweeps', prec_choice%jsweeps, info)
call mld_precset(prec,'sub_ovr', prec_choice%novr, info) call mld_precset(prec,'sub_ovr', prec_choice%novr, info)
@ -290,6 +281,14 @@ program mld_zf_sample
! building the preconditioner ! building the preconditioner
call psb_barrier(ictxt) call psb_barrier(ictxt)
t1 = psb_wtime() t1 = psb_wtime()
call mld_hierarchy_bld(a,desc_a,prec,info)
thier = psb_wtime()-t1
if (info /= psb_success_) then
call psb_errpush(psb_err_from_subroutine_,name,a_err='psb_precbld')
goto 9999
end if
call psb_barrier(ictxt)
t1 = psb_wtime()
call mld_ml_prec_bld(a,desc_a,prec,info) call mld_ml_prec_bld(a,desc_a,prec,info)
tprec = psb_wtime()-t1 tprec = psb_wtime()-t1
if (info /= psb_success_) then if (info /= psb_success_) then

Loading…
Cancel
Save