From d989714ee9bbede164714ac0a9af686568610fb3 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Thu, 9 Jun 2016 15:30:49 +0000 Subject: [PATCH] mld2p4-2: tests/fileread/mld_cf_sample.f90 tests/fileread/mld_df_sample.f90 tests/fileread/mld_sf_sample.f90 tests/fileread/mld_zf_sample.f90 tests/pdegen/mld_d_pde2d.f90 tests/pdegen/mld_d_pde3d.f90 tests/pdegen/mld_s_pde2d.f90 tests/pdegen/mld_s_pde3d.f90 Make calls to hierarchy_bld and ml_prec_bld generic. --- tests/fileread/mld_cf_sample.f90 | 4 ++-- tests/fileread/mld_df_sample.f90 | 4 ++-- tests/fileread/mld_sf_sample.f90 | 4 ++-- tests/fileread/mld_zf_sample.f90 | 4 ++-- tests/pdegen/mld_d_pde2d.f90 | 4 ++-- tests/pdegen/mld_d_pde3d.f90 | 4 ++-- tests/pdegen/mld_s_pde2d.f90 | 4 ++-- tests/pdegen/mld_s_pde3d.f90 | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/tests/fileread/mld_cf_sample.f90 b/tests/fileread/mld_cf_sample.f90 index 190f2ff3..d0c9ed6f 100644 --- a/tests/fileread/mld_cf_sample.f90 +++ b/tests/fileread/mld_cf_sample.f90 @@ -262,7 +262,7 @@ program mld_cf_sample call mld_precset(prec,'aggr_ord', prec_choice%aggr_ord,info) call psb_barrier(ictxt) t1 = psb_wtime() - call mld_c_hierarchy_bld(a,desc_a,prec,info) + 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') @@ -290,7 +290,7 @@ program mld_cf_sample ! building the preconditioner call psb_barrier(ictxt) t1 = psb_wtime() - call mld_c_ml_prec_bld(a,desc_a,prec,info) + call mld_ml_prec_bld(a,desc_a,prec,info) tprec = psb_wtime()-t1 if (info /= psb_success_) then call psb_errpush(psb_err_from_subroutine_,name,a_err='psb_precbld') diff --git a/tests/fileread/mld_df_sample.f90 b/tests/fileread/mld_df_sample.f90 index a184bdd4..833f8e06 100644 --- a/tests/fileread/mld_df_sample.f90 +++ b/tests/fileread/mld_df_sample.f90 @@ -262,7 +262,7 @@ program mld_df_sample call mld_precset(prec,'aggr_ord', prec_choice%aggr_ord,info) call psb_barrier(ictxt) t1 = psb_wtime() - call mld_d_hierarchy_bld(a,desc_a,prec,info) + 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') @@ -290,7 +290,7 @@ program mld_df_sample ! building the preconditioner call psb_barrier(ictxt) t1 = psb_wtime() - call mld_d_ml_prec_bld(a,desc_a,prec,info) + call mld_ml_prec_bld(a,desc_a,prec,info) tprec = psb_wtime()-t1 if (info /= psb_success_) then call psb_errpush(psb_err_from_subroutine_,name,a_err='psb_precbld') diff --git a/tests/fileread/mld_sf_sample.f90 b/tests/fileread/mld_sf_sample.f90 index 49f5ae28..7dcc0350 100644 --- a/tests/fileread/mld_sf_sample.f90 +++ b/tests/fileread/mld_sf_sample.f90 @@ -262,7 +262,7 @@ program mld_sf_sample call mld_precset(prec,'aggr_ord', prec_choice%aggr_ord,info) call psb_barrier(ictxt) t1 = psb_wtime() - call mld_s_hierarchy_bld(a,desc_a,prec,info) + 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') @@ -290,7 +290,7 @@ program mld_sf_sample ! building the preconditioner call psb_barrier(ictxt) t1 = psb_wtime() - call mld_s_ml_prec_bld(a,desc_a,prec,info) + call mld_ml_prec_bld(a,desc_a,prec,info) tprec = psb_wtime()-t1 if (info /= psb_success_) then call psb_errpush(psb_err_from_subroutine_,name,a_err='psb_precbld') diff --git a/tests/fileread/mld_zf_sample.f90 b/tests/fileread/mld_zf_sample.f90 index 29049ac3..731d2b71 100644 --- a/tests/fileread/mld_zf_sample.f90 +++ b/tests/fileread/mld_zf_sample.f90 @@ -262,7 +262,7 @@ program mld_zf_sample call mld_precset(prec,'aggr_ord', prec_choice%aggr_ord,info) call psb_barrier(ictxt) t1 = psb_wtime() - call mld_z_hierarchy_bld(a,desc_a,prec,info) + 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') @@ -290,7 +290,7 @@ program mld_zf_sample ! building the preconditioner call psb_barrier(ictxt) t1 = psb_wtime() - call mld_z_ml_prec_bld(a,desc_a,prec,info) + call mld_ml_prec_bld(a,desc_a,prec,info) tprec = psb_wtime()-t1 if (info /= psb_success_) then call psb_errpush(psb_err_from_subroutine_,name,a_err='psb_precbld') diff --git a/tests/pdegen/mld_d_pde2d.f90 b/tests/pdegen/mld_d_pde2d.f90 index 2216a570..a8720a61 100644 --- a/tests/pdegen/mld_d_pde2d.f90 +++ b/tests/pdegen/mld_d_pde2d.f90 @@ -249,7 +249,7 @@ program mld_d_pde2d call psb_barrier(ictxt) t1 = psb_wtime() - call mld_d_hierarchy_bld(a,desc_a,prec,info) + call mld_hierarchy_bld(a,desc_a,prec,info) if(info /= psb_success_) then info=psb_err_from_subroutine_ ch_err='psb_precbld' @@ -279,7 +279,7 @@ program mld_d_pde2d call psb_barrier(ictxt) t1 = psb_wtime() - call mld_d_ml_prec_bld(a,desc_a,prec,info) + call mld_ml_prec_bld(a,desc_a,prec,info) if(info /= psb_success_) then info=psb_err_from_subroutine_ ch_err='psb_precbld' diff --git a/tests/pdegen/mld_d_pde3d.f90 b/tests/pdegen/mld_d_pde3d.f90 index 414ea06f..07020a0c 100644 --- a/tests/pdegen/mld_d_pde3d.f90 +++ b/tests/pdegen/mld_d_pde3d.f90 @@ -261,7 +261,7 @@ program mld_d_pde3d call psb_barrier(ictxt) t1 = psb_wtime() - call mld_d_hierarchy_bld(a,desc_a,prec,info) + call mld_hierarchy_bld(a,desc_a,prec,info) if(info /= psb_success_) then info=psb_err_from_subroutine_ ch_err='psb_precbld' @@ -291,7 +291,7 @@ program mld_d_pde3d call psb_barrier(ictxt) t1 = psb_wtime() - call mld_d_ml_prec_bld(a,desc_a,prec,info) + call mld_ml_prec_bld(a,desc_a,prec,info) if(info /= psb_success_) then info=psb_err_from_subroutine_ ch_err='psb_precbld' diff --git a/tests/pdegen/mld_s_pde2d.f90 b/tests/pdegen/mld_s_pde2d.f90 index 5e573714..7627d389 100644 --- a/tests/pdegen/mld_s_pde2d.f90 +++ b/tests/pdegen/mld_s_pde2d.f90 @@ -249,7 +249,7 @@ program mld_s_pde2d call psb_barrier(ictxt) t1 = psb_wtime() - call mld_s_hierarchy_bld(a,desc_a,prec,info) + call mld_hierarchy_bld(a,desc_a,prec,info) if(info /= psb_success_) then info=psb_err_from_subroutine_ ch_err='psb_precbld' @@ -279,7 +279,7 @@ program mld_s_pde2d call psb_barrier(ictxt) t1 = psb_wtime() - call mld_s_ml_prec_bld(a,desc_a,prec,info) + call mld_ml_prec_bld(a,desc_a,prec,info) if(info /= psb_success_) then info=psb_err_from_subroutine_ ch_err='psb_precbld' diff --git a/tests/pdegen/mld_s_pde3d.f90 b/tests/pdegen/mld_s_pde3d.f90 index 509d0806..c2cb640e 100644 --- a/tests/pdegen/mld_s_pde3d.f90 +++ b/tests/pdegen/mld_s_pde3d.f90 @@ -261,7 +261,7 @@ program mld_s_pde3d call psb_barrier(ictxt) t1 = psb_wtime() - call mld_s_hierarchy_bld(a,desc_a,prec,info) + call mld_hierarchy_bld(a,desc_a,prec,info) if(info /= psb_success_) then info=psb_err_from_subroutine_ ch_err='psb_precbld' @@ -291,7 +291,7 @@ program mld_s_pde3d call psb_barrier(ictxt) t1 = psb_wtime() - call mld_s_ml_prec_bld(a,desc_a,prec,info) + call mld_ml_prec_bld(a,desc_a,prec,info) if(info /= psb_success_) then info=psb_err_from_subroutine_ ch_err='psb_precbld'