Fixes for new precs/gcc 4.1

psblas3-type-indexed
Salvatore Filippone 19 years ago
parent 4398391a5c
commit a2b5574ecc

@ -19,7 +19,7 @@ LINKOPT=$(F90COPT)
ppde90: ppde90.o part_block.o ppde90: ppde90.o part_block.o
$(F90LINK) $(LINKOPT) ppde90.o part_block.o -o ppde90\ $(F90LINK) $(LINKOPT) ppde90.o part_block.o -o ppde90\
$(PSBLAS_LIB) $(BLACS) $(PSBLAS_LIB) $(BLACS) $(SLU) $(UMF) $(BLAS)
/bin/mv ppde90 $(EXEDIR) /bin/mv ppde90 $(EXEDIR)
ppde90.o: $(MODS) ppde90.o: $(MODS)

@ -61,7 +61,7 @@ program pde90
! miscellaneous ! miscellaneous
character, parameter :: order='r' character, parameter :: order='r'
integer :: iargc,convert_descr,dim, check_descr integer :: iargc,convert_descr,dim, check_descr
real(kind(1.d0)), parameter :: dzero = 0.d0, one = 1.d0 real(kind(1.d0)), parameter :: one = 1.d0
real(kind(1.d0)) :: mpi_wtime, t1, t2, tprec, tsolve, t3, t4 real(kind(1.d0)) :: mpi_wtime, t1, t2, tprec, tsolve, t3, t4
external mpi_wtime external mpi_wtime
@ -214,9 +214,9 @@ program pde90
write(*,'(" ")') write(*,'(" ")')
write(*,'("Time to solve matrix : ",es10.4)')t2 write(*,'("Time to solve matrix : ",es10.4)')t2
write(*,'("Time per iteration : ",es10.4)')t2/iter write(*,'("Time per iteration : ",es10.4)')t2/iter
write(*,'("Number of iterations : ",i)')iter write(*,'("Number of iterations : ",i0)')iter
write(*,'("Error on exit : ",es10.4)')err write(*,'("Error on exit : ",es10.4)')err
write(*,'("Info on exit : ",i)')info write(*,'("Info on exit : ",i0)')info
end if end if
! !
@ -319,10 +319,10 @@ contains
write(*,'("Solving matrix : ell1")') write(*,'("Solving matrix : ell1")')
write(*,'("Grid dimensions : ",i4,"x",i4,"x",i4)')idim,idim,idim write(*,'("Grid dimensions : ",i4,"x",i4,"x",i4)')idim,idim,idim
write(*,'("Number of processors : ",i)')nprow write(*,'("Number of processors : ",i0)')nprow
write(*,'("Data distribution : BLOCK")') write(*,'("Data distribution : BLOCK")')
write(*,'("Preconditioner : ",a)')pr_to_str(iprec) write(*,'("Preconditioner : ",a)')pr_to_str(iprec)
if(iprec.gt.2) write(*,'("Overlapping levels : ",i)')novr if(iprec.gt.2) write(*,'("Overlapping levels : ",i0)')novr
write(*,'("Iterative method : ",a)')cmethd write(*,'("Iterative method : ",a)')cmethd
write(*,'(" ")') write(*,'(" ")')
else else
@ -456,7 +456,7 @@ contains
m = idim*idim*idim m = idim*idim*idim
n = m n = m
nnz = ((n*9)/(nprow*npcol)) nnz = ((n*9)/(nprow*npcol))
if(myprow.eq.psb_root_) write(0,'("Generating Matrix (size=",i,")...")')n if(myprow.eq.psb_root_) write(0,'("Generating Matrix (size=",i0x,")...")')n
call psb_dscall(n,n,parts,icontxt,desc_a,info) call psb_dscall(n,n,parts,icontxt,desc_a,info)
call psb_spalloc(a,desc_a,info,nnz=nnz) call psb_spalloc(a,desc_a,info,nnz=nnz)

Loading…
Cancel
Save