From e9579cc9a40e2ce895ff7727e184eea6661e5995 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Thu, 24 Sep 2009 15:58:54 +0000 Subject: [PATCH] psblas3: fileread/sf_sample.f90 pargen/Makefile pargen/spde.f90 Single precision version, fixed fileread. --- test/fileread/sf_sample.f90 | 7 ++++--- test/pargen/Makefile | 4 ++-- test/pargen/spde.f90 | 1 - 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/fileread/sf_sample.f90 b/test/fileread/sf_sample.f90 index b94fbd56..c2b73caf 100644 --- a/test/fileread/sf_sample.f90 +++ b/test/fileread/sf_sample.f90 @@ -41,7 +41,7 @@ program sf_sample character(len=40) :: kmethd, ptype, mtrx_file, rhs_file ! sparse matrices - type(psb_sspmat_type) :: a, aux_a + type(psb_s_sparse_mat) :: a, aux_a ! preconditioner data type(psb_sprec_type) :: prec @@ -129,7 +129,7 @@ program sf_sample call psb_abort(ictxt) end if - m_problem = aux_a%m + m_problem = aux_a%get_nrows() call psb_bcast(ictxt,m_problem) ! At this point aux_b may still be unallocated @@ -179,7 +179,8 @@ program sf_sample write(*,'("Partition type: graph")') write(*,'(" ")') ! write(0,'("Build type: graph")') - call build_mtpart(aux_a%m,aux_a%fida,aux_a%ia1,aux_a%ia2,np) + call build_mtpart(aux_a,np) + endif call psb_barrier(ictxt) call distr_mtpart(psb_root_,ictxt) diff --git a/test/pargen/Makefile b/test/pargen/Makefile index 64982f94..6f06a50c 100644 --- a/test/pargen/Makefile +++ b/test/pargen/Makefile @@ -22,8 +22,8 @@ ppde: ppde.o psb_d_csc_impl.o psb_d_csc_mat_mod.o psb_d_csc_impl.o ppde.o: psb_d_csc_mat_mod.o -spde: spde.o enablecore.o - $(F90LINK) spde.o enablecore.o -o spde $(PSBLAS_LIB) $(LDLIBS) +spde: spde.o + $(F90LINK) spde.o -o spde $(PSBLAS_LIB) $(LDLIBS) /bin/mv spde $(EXEDIR) .f90.o: diff --git a/test/pargen/spde.f90 b/test/pargen/spde.f90 index a1a97ef1..ac188841 100644 --- a/test/pargen/spde.f90 +++ b/test/pargen/spde.f90 @@ -109,7 +109,6 @@ program ppde if(psb_get_errstatus() /= 0) goto 9999 name='pde90' call psb_set_errverbosity(2) - call enablecore() ! ! get parameters !