From f89f15b16269849129dcfa4f32ae07314aab9194 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Wed, 15 Dec 2010 19:17:55 +0000 Subject: [PATCH] mld2p4-2: mlprec/mld_cprecaply.f90 mlprec/mld_dprecinit.F90 mlprec/mld_zprecaply.f90 tests/pdegen/Makefile tests/pdegen/ppde.f90 tests/pdegen/runs/ppde.inp Fix use statements. --- mlprec/mld_cprecaply.f90 | 6 ++---- mlprec/mld_dprecinit.F90 | 6 +++++- mlprec/mld_zprecaply.f90 | 6 ++---- tests/pdegen/Makefile | 4 ++++ tests/pdegen/ppde.f90 | 2 ++ tests/pdegen/runs/ppde.inp | 2 +- 6 files changed, 16 insertions(+), 10 deletions(-) diff --git a/mlprec/mld_cprecaply.f90 b/mlprec/mld_cprecaply.f90 index 94e8dbe4..d37ba04d 100644 --- a/mlprec/mld_cprecaply.f90 +++ b/mlprec/mld_cprecaply.f90 @@ -74,8 +74,7 @@ subroutine mld_cprecaply(prec,x,y,desc_data,info,trans,work) use psb_sparse_mod - use mld_inner_mod - use mld_prec_mod, mld_protect_name => mld_cprecaply + use mld_inner_mod, mld_protect_name => mld_cprecaply implicit none @@ -208,8 +207,7 @@ end subroutine mld_cprecaply subroutine mld_cprecaply1(prec,x,desc_data,info,trans) use psb_sparse_mod - use mld_inner_mod - use mld_prec_mod, mld_protect_name => mld_cprecaply1 + use mld_inner_mod, mld_protect_name => mld_cprecaply1 implicit none diff --git a/mlprec/mld_dprecinit.F90 b/mlprec/mld_dprecinit.F90 index 9a3b2251..6ebf6d36 100644 --- a/mlprec/mld_dprecinit.F90 +++ b/mlprec/mld_dprecinit.F90 @@ -228,10 +228,13 @@ subroutine mld_dprecinit(p,ptype,info,nlev) end if ilev_ = 1 allocate(p%precv(nlev_),stat=info) +!!$ write(0,*) 'Check 1: ',allocated(p%precv(1)%sm) if (info == psb_success_) call psb_realloc(mld_ifpsz_,p%precv(ilev_)%iprcparm,info) if (info == psb_success_) call psb_realloc(mld_rfpsz_,p%precv(ilev_)%rprcparm,info) +!!$ write(0,*) 'Check 2: ',allocated(p%precv(1)%sm) if (info == psb_success_) call psb_realloc(mld_ifpsz_,p%precv(ilev_)%prec%iprcparm,info) if (info == psb_success_) call psb_realloc(mld_rfpsz_,p%precv(ilev_)%prec%rprcparm,info) +!!$ write(0,*) 'Check 3: ',allocated(p%precv(1)%sm) if (info /= psb_success_) return p%precv(ilev_)%iprcparm(:) = 0 p%precv(ilev_)%rprcparm(:) = dzero @@ -256,8 +259,8 @@ subroutine mld_dprecinit(p,ptype,info,nlev) p%precv(ilev_)%iprcparm(mld_smoother_sweeps_) = 1 p%precv(ilev_)%iprcparm(mld_smoother_sweeps_pre_) = 1 p%precv(ilev_)%iprcparm(mld_smoother_sweeps_post_) = 1 +!!$ write(0,*) 'Check 4: ',allocated(p%precv(1)%sm) if (nlev_ == 1) return - do ilev_ = 2, nlev_ -1 if (info == psb_success_) call psb_realloc(mld_ifpsz_,p%precv(ilev_)%iprcparm,info) if (info == psb_success_) call psb_realloc(mld_rfpsz_,p%precv(ilev_)%rprcparm,info) @@ -327,6 +330,7 @@ subroutine mld_dprecinit(p,ptype,info,nlev) p%precv(ilev_)%iprcparm(mld_aggr_filter_) = mld_no_filter_mat_ p%precv(ilev_)%rprcparm(mld_aggr_omega_val_) = dzero p%precv(ilev_)%rprcparm(mld_aggr_thresh_) = dzero +!!$ write(0,*) 'Check 5: ',allocated(p%precv(1)%sm) case default write(0,*) name,': Warning: Unknown preconditioner type request "',ptype,'"' diff --git a/mlprec/mld_zprecaply.f90 b/mlprec/mld_zprecaply.f90 index e6a197b8..e1c57b07 100644 --- a/mlprec/mld_zprecaply.f90 +++ b/mlprec/mld_zprecaply.f90 @@ -74,8 +74,7 @@ subroutine mld_zprecaply(prec,x,y,desc_data,info,trans,work) use psb_sparse_mod - use mld_inner_mod - use mld_prec_mod, mld_protect_name => mld_zprecaply + use mld_inner_mod, mld_protect_name => mld_zprecaply implicit none @@ -208,8 +207,7 @@ end subroutine mld_zprecaply subroutine mld_zprecaply1(prec,x,desc_data,info,trans) use psb_sparse_mod - use mld_inner_mod - use mld_prec_mod, mld_protect_name => mld_zprecaply1 + use mld_inner_mod, mld_protect_name => mld_zprecaply1 implicit none diff --git a/tests/pdegen/Makefile b/tests/pdegen/Makefile index f5f03bfb..e0f0ac07 100644 --- a/tests/pdegen/Makefile +++ b/tests/pdegen/Makefile @@ -21,6 +21,10 @@ spde: spde.o data_input.o $(F90LINK) spde.o data_input.o -o spde $(MLD_LIB) $(PSBLAS_LIB) $(LDLIBS) /bin/mv spde $(EXEDIR) +tp: tp.o data_input.o + $(F90LINK) tp.o data_input.o -o tp $(MLD_LIB) $(PSBLAS_LIB) $(LDLIBS) + /bin/mv tp $(EXEDIR) + ppde.o spde.o: data_input.o diff --git a/tests/pdegen/ppde.f90 b/tests/pdegen/ppde.f90 index 1a8ce87a..1e82b5ce 100644 --- a/tests/pdegen/ppde.f90 +++ b/tests/pdegen/ppde.f90 @@ -144,6 +144,7 @@ program ppde name='pde90' call psb_set_errverbosity(2) + ! ! get parameters ! @@ -164,6 +165,7 @@ program ppde call psb_errpush(info,name,a_err=ch_err) goto 9999 end if + if (iam == psb_root_) write(*,'("Overall matrix creation time : ",es12.5)')t2 if (iam == psb_root_) write(*,'(" ")') diff --git a/tests/pdegen/runs/ppde.inp b/tests/pdegen/runs/ppde.inp index 33f514db..6adcb6ba 100644 --- a/tests/pdegen/runs/ppde.inp +++ b/tests/pdegen/runs/ppde.inp @@ -1,6 +1,6 @@ BICGSTAB ! Iterative method: BiCGSTAB BiCG CGS RGMRES BiCGSTABL CG CSR ! Storage format CSR COO JAD -100 ! IDIM; domain size is idim**3 +060 ! IDIM; domain size is idim**3 2 ! ISTOPC 0200 ! ITMAX -1 ! ITRACE