From d59d8edf45208caf60cbe6c42bae5091c221f43b Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Sat, 16 Jul 2016 11:18:46 +0000 Subject: [PATCH] mld2p4: 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. --- tests/fileread/mld_cf_sample.f90 | 17 ++++++++--------- tests/fileread/mld_df_sample.f90 | 17 ++++++++--------- tests/fileread/mld_sf_sample.f90 | 17 ++++++++--------- tests/fileread/mld_zf_sample.f90 | 17 ++++++++--------- 4 files changed, 32 insertions(+), 36 deletions(-) diff --git a/tests/fileread/mld_cf_sample.f90 b/tests/fileread/mld_cf_sample.f90 index 7827e195..eb91ec57 100644 --- a/tests/fileread/mld_cf_sample.f90 +++ b/tests/fileread/mld_cf_sample.f90 @@ -262,15 +262,6 @@ program mld_cf_sample 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_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_sweeps', prec_choice%jsweeps, info) call mld_precset(prec,'sub_ovr', prec_choice%novr, info) @@ -290,6 +281,14 @@ program mld_cf_sample ! building the preconditioner 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 psb_barrier(ictxt) + t1 = psb_wtime() call mld_ml_prec_bld(a,desc_a,prec,info) tprec = psb_wtime()-t1 if (info /= psb_success_) then diff --git a/tests/fileread/mld_df_sample.f90 b/tests/fileread/mld_df_sample.f90 index c8e16511..b19feb2a 100644 --- a/tests/fileread/mld_df_sample.f90 +++ b/tests/fileread/mld_df_sample.f90 @@ -262,15 +262,6 @@ program mld_df_sample 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_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_sweeps', prec_choice%jsweeps, info) call mld_precset(prec,'sub_ovr', prec_choice%novr, info) @@ -290,6 +281,14 @@ program mld_df_sample ! building the preconditioner 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 psb_barrier(ictxt) + t1 = psb_wtime() call mld_ml_prec_bld(a,desc_a,prec,info) tprec = psb_wtime()-t1 if (info /= psb_success_) then diff --git a/tests/fileread/mld_sf_sample.f90 b/tests/fileread/mld_sf_sample.f90 index 2d0a23fd..7ec99984 100644 --- a/tests/fileread/mld_sf_sample.f90 +++ b/tests/fileread/mld_sf_sample.f90 @@ -262,15 +262,6 @@ program mld_sf_sample 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_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_sweeps', prec_choice%jsweeps, info) call mld_precset(prec,'sub_ovr', prec_choice%novr, info) @@ -290,6 +281,14 @@ program mld_sf_sample ! building the preconditioner 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 psb_barrier(ictxt) + t1 = psb_wtime() call mld_ml_prec_bld(a,desc_a,prec,info) tprec = psb_wtime()-t1 if (info /= psb_success_) then diff --git a/tests/fileread/mld_zf_sample.f90 b/tests/fileread/mld_zf_sample.f90 index 84980d6f..9b46e532 100644 --- a/tests/fileread/mld_zf_sample.f90 +++ b/tests/fileread/mld_zf_sample.f90 @@ -262,15 +262,6 @@ program mld_zf_sample 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_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_sweeps', prec_choice%jsweeps, info) call mld_precset(prec,'sub_ovr', prec_choice%novr, info) @@ -290,6 +281,14 @@ program mld_zf_sample ! building the preconditioner 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 psb_barrier(ictxt) + t1 = psb_wtime() call mld_ml_prec_bld(a,desc_a,prec,info) tprec = psb_wtime()-t1 if (info /= psb_success_) then