From 7b2e98e0e25fa1cef0664bdbbdad67cd8a8b5f0f Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Fri, 25 Nov 2011 15:42:01 +0000 Subject: [PATCH] mld2p4-2: tests/fileread/Makefile tests/fileread/cf_sample.f90 tests/fileread/df_sample.F90 tests/fileread/df_sample.f90 tests/fileread/sf_sample.f90 tests/fileread/zf_sample.f90 Fixed fileread samples to work with X_vect --- tests/fileread/Makefile | 3 +- tests/fileread/cf_sample.f90 | 17 ++++----- .../fileread/{df_sample.F90 => df_sample.f90} | 37 ++++--------------- tests/fileread/sf_sample.f90 | 17 ++++----- tests/fileread/zf_sample.f90 | 18 ++++----- 5 files changed, 33 insertions(+), 59 deletions(-) rename tests/fileread/{df_sample.F90 => df_sample.f90} (96%) diff --git a/tests/fileread/Makefile b/tests/fileread/Makefile index ca2a7b28..45895eb7 100644 --- a/tests/fileread/Makefile +++ b/tests/fileread/Makefile @@ -43,8 +43,7 @@ zf_sample.o: data_input.o clean: /bin/rm -f $(DFOBJS) $(ZFOBJS) $(SFSOBJS) $(DFSOBJS) \ - *$(.mod) $(EXEDIR)/df_bench $(EXEDIR)/zf_bench \ - $(EXEDIR)/sf_sample $(EXEDIR)/cf_sample \ + *$(.mod) $(EXEDIR)/sf_sample $(EXEDIR)/cf_sample \ $(EXEDIR)/df_sample $(EXEDIR)/zf_sample lib: diff --git a/tests/fileread/cf_sample.f90 b/tests/fileread/cf_sample.f90 index 1c9e3161..0a46eaf2 100644 --- a/tests/fileread/cf_sample.f90 +++ b/tests/fileread/cf_sample.f90 @@ -82,9 +82,9 @@ program cf_sample ! dense matrices complex(psb_spk_), allocatable, target :: aux_b(:,:), d(:) - complex(psb_spk_), allocatable , save :: b_col(:), x_col(:), r_col(:), & - & x_col_glob(:), r_col_glob(:) + complex(psb_spk_), allocatable , save :: x_col_glob(:), r_col_glob(:) complex(psb_spk_), pointer :: b_col_glob(:) + type(psb_c_vect_type) :: b_col, x_col, r_col ! communications data structure type(psb_desc_type):: desc_a @@ -110,7 +110,6 @@ program cf_sample integer :: nrhs, nrow, n_row, dim, nv, ne integer, allocatable :: ivg(:), ipv(:) - call psb_init(ictxt) call psb_info(ictxt,iam,np) @@ -233,10 +232,10 @@ program cf_sample end if call psb_geall(x_col,desc_a,info) - x_col(:) =0.0 + call x_col%set(czero) call psb_geasb(x_col,desc_a,info) call psb_geall(r_col,desc_a,info) - r_col(:) =0.0 + call r_col%set(czero) call psb_geasb(r_col,desc_a,info) t2 = psb_wtime() - t1 @@ -313,11 +312,11 @@ program cf_sample call psb_amx(ictxt,t2) call psb_geaxpby(cone,b_col,czero,r_col,desc_a,info) call psb_spmm(-cone,a,x_col,cone,r_col,desc_a,info) - call psb_genrm2s(resmx,r_col,desc_a,info) - call psb_geamaxs(resmxp,r_col,desc_a,info) + resmx = psb_genrm2(r_col,desc_a,info) + resmxp = psb_geamax(r_col,desc_a,info) - amatsize = psb_sizeof(a) - descsize = psb_sizeof(desc_a) + amatsize = a%sizeof() + descsize = desc_a%sizeof() precsize = mld_sizeof(prec) call psb_sum(ictxt,amatsize) call psb_sum(ictxt,descsize) diff --git a/tests/fileread/df_sample.F90 b/tests/fileread/df_sample.f90 similarity index 96% rename from tests/fileread/df_sample.F90 rename to tests/fileread/df_sample.f90 index 3762959b..39afc36d 100644 --- a/tests/fileread/df_sample.F90 +++ b/tests/fileread/df_sample.f90 @@ -36,18 +36,12 @@ !!$ POSSIBILITY OF SUCH DAMAGE. !!$ !!$ -#undef HAVE_LIBRSB -!!$ -!!$ program df_sample use psb_base_mod use mld_prec_mod use psb_krylov_mod use psb_util_mod use data_input -#ifdef HAVE_LIBRSB - use psb_d_rsb_mat_mod -#endif implicit none @@ -88,9 +82,9 @@ program df_sample ! dense matrices real(psb_dpk_), allocatable, target :: aux_b(:,:), d(:) - real(psb_dpk_), allocatable , save :: b_col(:), x_col(:), r_col(:), & - & x_col_glob(:), r_col_glob(:) + real(psb_dpk_), allocatable , save :: x_col_glob(:), r_col_glob(:) real(psb_dpk_), pointer :: b_col_glob(:) + type(psb_d_vect_type) :: b_col, x_col, r_col ! communications data structure type(psb_desc_type):: desc_a @@ -102,11 +96,6 @@ program df_sample & methd, istopc, irst, nlv integer(psb_long_int_k_) :: amatsize, precsize, descsize real(psb_dpk_) :: err, eps -#ifdef HAVE_LIBRSB - type(psb_d_rsb_sparse_mat) :: arsb - type(psb_d_csr_sparse_mat) :: acsr - !class(psb_d_base_sparse_mat) :: mold -#endif character(len=5) :: afmt character(len=20) :: name @@ -121,12 +110,6 @@ program df_sample integer :: nrhs, nrow, n_row, dim, nv, ne integer, allocatable :: ivg(:), ipv(:) -#ifdef HAVE_LIBRSB - info=psb_rsb_matmod_init() - if(info/=psb_success_)info=psb_err_from_subroutine_ - if(info/=psb_success_)goto 9999 -#endif - call psb_init(ictxt) call psb_info(ictxt,iam,np) @@ -247,16 +230,12 @@ program df_sample call psb_matdist(aux_a, a, ictxt, & & desc_a,b_col_glob,b_col,info,fmt=afmt,parts=part_block) end if -#ifdef HAVE_LIBRSB - call a%cscnv(info,mold=arsb) - !call a%cscnv(info,mold=acsr) -#endif call psb_geall(x_col,desc_a,info) - x_col(:) =0.0 + call x_col%set(dzero) call psb_geasb(x_col,desc_a,info) call psb_geall(r_col,desc_a,info) - r_col(:) =0.0 + call r_col%set(dzero) call psb_geasb(r_col,desc_a,info) t2 = psb_wtime() - t1 @@ -333,11 +312,11 @@ program df_sample call psb_amx(ictxt,t2) call psb_geaxpby(done,b_col,dzero,r_col,desc_a,info) call psb_spmm(-done,a,x_col,done,r_col,desc_a,info) - call psb_genrm2s(resmx,r_col,desc_a,info) - call psb_geamaxs(resmxp,r_col,desc_a,info) + resmx = psb_genrm2(r_col,desc_a,info) + resmxp = psb_geamax(r_col,desc_a,info) - amatsize = psb_sizeof(a) - descsize = psb_sizeof(desc_a) + amatsize = a%sizeof() + descsize = desc_a%sizeof() precsize = mld_sizeof(prec) call psb_sum(ictxt,amatsize) call psb_sum(ictxt,descsize) diff --git a/tests/fileread/sf_sample.f90 b/tests/fileread/sf_sample.f90 index d6c4c78d..fdc4307d 100644 --- a/tests/fileread/sf_sample.f90 +++ b/tests/fileread/sf_sample.f90 @@ -82,9 +82,9 @@ program sf_sample ! dense matrices real(psb_spk_), allocatable, target :: aux_b(:,:), d(:) - real(psb_spk_), allocatable , save :: b_col(:), x_col(:), r_col(:), & - & x_col_glob(:), r_col_glob(:) + real(psb_spk_), allocatable , save :: x_col_glob(:), r_col_glob(:) real(psb_spk_), pointer :: b_col_glob(:) + type(psb_s_vect_type) :: b_col, x_col, r_col ! communications data structure type(psb_desc_type):: desc_a @@ -110,7 +110,6 @@ program sf_sample integer :: nrhs, nrow, n_row, dim, nv, ne integer, allocatable :: ivg(:), ipv(:) - call psb_init(ictxt) call psb_info(ictxt,iam,np) @@ -233,10 +232,10 @@ program sf_sample end if call psb_geall(x_col,desc_a,info) - x_col(:) =0.0 + call x_col%set(szero) call psb_geasb(x_col,desc_a,info) call psb_geall(r_col,desc_a,info) - r_col(:) =0.0 + call r_col%set(szero) call psb_geasb(r_col,desc_a,info) t2 = psb_wtime() - t1 @@ -313,11 +312,11 @@ program sf_sample call psb_amx(ictxt,t2) call psb_geaxpby(sone,b_col,szero,r_col,desc_a,info) call psb_spmm(-sone,a,x_col,sone,r_col,desc_a,info) - call psb_genrm2s(resmx,r_col,desc_a,info) - call psb_geamaxs(resmxp,r_col,desc_a,info) + resmx = psb_genrm2(r_col,desc_a,info) + resmxp = psb_geamax(r_col,desc_a,info) - amatsize = psb_sizeof(a) - descsize = psb_sizeof(desc_a) + amatsize = a%sizeof() + descsize = desc_a%sizeof() precsize = mld_sizeof(prec) call psb_sum(ictxt,amatsize) call psb_sum(ictxt,descsize) diff --git a/tests/fileread/zf_sample.f90 b/tests/fileread/zf_sample.f90 index 15d0b9a2..035f091f 100644 --- a/tests/fileread/zf_sample.f90 +++ b/tests/fileread/zf_sample.f90 @@ -82,9 +82,9 @@ program zf_sample ! dense matrices complex(psb_dpk_), allocatable, target :: aux_b(:,:), d(:) - complex(psb_dpk_), allocatable , save :: b_col(:), x_col(:), r_col(:), & - & x_col_glob(:), r_col_glob(:) + complex(psb_dpk_), allocatable , save :: x_col_glob(:), r_col_glob(:) complex(psb_dpk_), pointer :: b_col_glob(:) + type(psb_z_vect_type) :: b_col, x_col, r_col ! communications data structure type(psb_desc_type):: desc_a @@ -110,7 +110,6 @@ program zf_sample integer :: nrhs, nrow, n_row, dim, nv, ne integer, allocatable :: ivg(:), ipv(:) - call psb_init(ictxt) call psb_info(ictxt,iam,np) @@ -233,10 +232,10 @@ program zf_sample end if call psb_geall(x_col,desc_a,info) - x_col(:) =0.0 + call x_col%set(zzero) call psb_geasb(x_col,desc_a,info) call psb_geall(r_col,desc_a,info) - r_col(:) =0.0 + call r_col%set(zzero) call psb_geasb(r_col,desc_a,info) t2 = psb_wtime() - t1 @@ -286,7 +285,6 @@ program zf_sample call mld_precset(prec,mld_sub_iluthrs_, prec_choice%thr, info) end if - call psb_set_debug_level(0) ! building the preconditioner t1 = psb_wtime() call mld_precbld(a,desc_a,prec,info) @@ -314,11 +312,11 @@ program zf_sample call psb_amx(ictxt,t2) call psb_geaxpby(zone,b_col,zzero,r_col,desc_a,info) call psb_spmm(-zone,a,x_col,zone,r_col,desc_a,info) - call psb_genrm2s(resmx,r_col,desc_a,info) - call psb_geamaxs(resmxp,r_col,desc_a,info) + resmx = psb_genrm2(r_col,desc_a,info) + resmxp = psb_geamax(r_col,desc_a,info) - amatsize = psb_sizeof(a) - descsize = psb_sizeof(desc_a) + amatsize = a%sizeof() + descsize = desc_a%sizeof() precsize = mld_sizeof(prec) call psb_sum(ictxt,amatsize) call psb_sum(ictxt,descsize)