fdurastante
/
psblas3
mirror of https://github.com/sfilippone/psblas3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed name for sphalo.

Browse Source
psblas3-type-indexed
Salvatore Filippone 19 years ago
parent 95a6201967
commit 5e8f1938d0
5 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File

6
src/modules/psb_tools_mod.f90
Unescape Escape View File

@ -100,8 +100,8 @@ Module psb_tools_mod
end subroutine psb_iasbv
end interface
interface psb_spovr
Subroutine psb_dspovr(a,desc_a,blk,info,rwcnv,clcnv,outfmt)
interface psb_sphalo
Subroutine psb_dsphalo(a,desc_a,blk,info,rwcnv,clcnv,outfmt)
use psb_descriptor_type
use psb_spmat_type
Type(psb_dspmat_type),Intent(in) :: a
@ -110,7 +110,7 @@ Module psb_tools_mod
integer, intent(out) :: info
logical, optional, intent(in) :: rwcnv,clcnv
character(len=5), optional :: outfmt
end Subroutine psb_dspovr
end Subroutine psb_dsphalo
end interface

8
src/prec/psb_dbldaggrmat.f90
Unescape Escape View File

@ -579,10 +579,10 @@ contains
! Now we have to gather the halo of am1, and add it to itself
! to multiply it by A,
!
call psb_spovr(am1,desc_a,am4,info,clcnv=.false.)
call psb_sphalo(am1,desc_a,am4,info,clcnv=.false.)
if(info /= 0) then
call psb_errpush(4010,name,a_err='psb_spovr')
call psb_errpush(4010,name,a_err='psb_sphalo')
goto 9999
end if
@ -638,10 +638,10 @@ contains
if (p%iprcparm(smth_kind_) == smth_omg_) then
! am2 = ((i-wDA)Ptilde)^T
call psb_spovr(am3,desc_a,am4,info,clcnv=.false.)
call psb_sphalo(am3,desc_a,am4,info,clcnv=.false.)
if(info /= 0) then
call psb_errpush(4010,name,a_err='psb_spovr')
call psb_errpush(4010,name,a_err='psb_sphalo')
goto 9999
end if
call psb_rwextd(ncol,am3,info,b=am4)

14
src/prec/psb_dcsrsetup.f90
Unescape Escape View File

@ -191,28 +191,28 @@ Subroutine psb_dcsrsetup(ptype,novr,a,blk,desc_data,upd,desc_p,info,outfmt)
n_row = desc_p%matrix_data(psb_n_row_)
t2 = mpi_wtime()
if (debug) write(0,*) 'Before spovr ',blk%fida,blk%m,psb_nnz_,blk%infoa(psb_nnz_)
if (debug) write(0,*) 'Before sphalo ',blk%fida,blk%m,psb_nnz_,blk%infoa(psb_nnz_)
!!$ ierr = MPE_Log_event( iovrb, 0, "st OVR" )
!!$ blk%m = n_row-nrow_a
!!$ blk%k = n_row
if (present(outfmt)) then
if(debug) write(0,*) me,': Calling SPOVR with ',size(blk%ia2)
Call psb_spovr(a,desc_p,blk,info,outfmt=outfmt)
if(debug) write(0,*) me,': Calling SPHALO with ',size(blk%ia2)
Call psb_sphalo(a,desc_p,blk,info,outfmt=outfmt)
else
if(debug) write(0,*) me,': Calling SPOVR with ',size(blk%ia2)
Call psb_spovr(a,desc_p,blk,info)
if(debug) write(0,*) me,': Calling SPHALO with ',size(blk%ia2)
Call psb_sphalo(a,desc_p,blk,info)
end if
if(info /= 0) then
info=4010
ch_err='psb_spovr'
ch_err='psb_sphalo'
call psb_errpush(info,name,a_err=ch_err)
goto 9999
end if
if (debug) write(0,*) 'After psb_spovr ',blk%fida,blk%m,psb_nnz_,blk%infoa(psb_nnz_)
if (debug) write(0,*) 'After psb_sphalo ',blk%fida,blk%m,psb_nnz_,blk%infoa(psb_nnz_)
!!$ ierr = MPE_Log_event( iovre, 0, "ed OVR" )
t3 = mpi_wtime()

2
src/tools/Makefile
Unescape Escape View File

@ -9,7 +9,7 @@ FOBJS = psb_dallc.o psb_dasb.o psb_dcsrp.o psb_cdprt.o \
psb_glob_to_loc.o psb_ialloc.o psb_iasb.o \
psb_ifree.o psb_iins.o psb_loc_to_glob.o
MPFOBJS = psb_cdovrbld.o psb_dspovr.o
MPFOBJS = psb_cdovrbld.o psb_dsphalo.o
INCDIRS = -I ../../lib -I .
LIBDIR = ../../lib

30
src/tools/psb_dspovr.f90 → src/tools/psb_dsphalo.f90
Unescape Escape View File

@ -28,7 +28,7 @@
!!$ POSSIBILITY OF SUCH DAMAGE.
!!$
!!$
! File: psb_dspovr.f90
! File: psb_dsphalo.f90
!
!*****************************************************************************
!* *
@ -45,7 +45,7 @@
!* *
!* *
!*****************************************************************************
Subroutine psb_dspovr(a,desc_a,blk,info,rwcnv,clcnv,outfmt)
Subroutine psb_dsphalo(a,desc_a,blk,info,rwcnv,clcnv,outfmt)
use psb_serial_mod
use psb_descriptor_type
@ -80,10 +80,10 @@ Subroutine psb_dspovr(a,desc_a,blk,info,rwcnv,clcnv,outfmt)
if(psb_get_errstatus().ne.0) return
info=0
name='psb_dspovr'
name='psb_dsphalo'
call psb_erractionsave(err_act)
if(debug) write(0,*)'Inside DSPOVR'
if(debug) write(0,*)'Inside DSPHALO'
if (present(rwcnv)) then
rwcnv_ = rwcnv
else
@ -114,7 +114,7 @@ Subroutine psb_dspovr(a,desc_a,blk,info,rwcnv,clcnv,outfmt)
goto 9999
end if
If (debug) Write(0,*)'dspovr',me
If (debug) Write(0,*)'dsphalo',me
l1 = 0
@ -185,7 +185,7 @@ Subroutine psb_dspovr(a,desc_a,blk,info,rwcnv,clcnv,outfmt)
iszr=sum(rvsz)
call psb_spreall(blk,max(iszr,1),info)
if(debug) write(0,*)me,'SPOVR Sizes:',size(blk%ia1),size(blk%ia2)
if(debug) write(0,*)me,'SPHALO Sizes:',size(blk%ia1),size(blk%ia2)
if (info /= 0) then
info=4010
ch_err='psb_spreall'
@ -237,7 +237,7 @@ Subroutine psb_dspovr(a,desc_a,blk,info,rwcnv,clcnv,outfmt)
counter = counter+n_el_send+3
Enddo
nz = tmp%infoa(psb_nnz_)
!!$ call csprt(20+me,tmp,head='% SPOVR border SEND .')
!!$ call csprt(20+me,tmp,head='% SPHALO border SEND .')
!!$ close(20+me)
if (rwcnv_) call psb_loc_to_glob(tmp%ia1(1:nz),desc_a,info,iact='I')
@ -248,7 +248,7 @@ Subroutine psb_dspovr(a,desc_a,blk,info,rwcnv,clcnv,outfmt)
call psb_errpush(info,name,a_err=ch_err)
goto 9999
end if
!!$ call csprt(30+me,tmp,head='% SPOVR border SEND .')
!!$ call csprt(30+me,tmp,head='% SPHALO border SEND .')
!!$ close(30+me)
@ -296,7 +296,7 @@ Subroutine psb_dspovr(a,desc_a,blk,info,rwcnv,clcnv,outfmt)
blk%fida='COO'
blk%infoa(psb_nnz_)=l1
!!$ open(50+me)
!!$ call csprt(50+me,blk,head='% SPOVR border .')
!!$ call csprt(50+me,blk,head='% SPHALO border .')
!!$ close(50+me)
t4 = mpi_wtime()
@ -305,7 +305,7 @@ Subroutine psb_dspovr(a,desc_a,blk,info,rwcnv,clcnv,outfmt)
!
! Combined sort & conversion to CSR.
!
if(debug) write(0,*) me,'Calling ipcoo2csr from dspovr ',blk%m,blk%k,l1,blk%ia2(2)
if(debug) write(0,*) me,'Calling ipcoo2csr from dsphalo ',blk%m,blk%k,l1,blk%ia2(2)
select case(outfmt_)
case ('CSR')
@ -319,15 +319,15 @@ Subroutine psb_dspovr(a,desc_a,blk,info,rwcnv,clcnv,outfmt)
case('COO')
! Do nothing!
case default
write(0,*) 'Error in DSPOVR : invalid outfmt "',outfmt_,'"'
write(0,*) 'Error in DSPHALO : invalid outfmt "',outfmt_,'"'
end select
t5 = mpi_wtime()
!!$ write(0,'(i3,1x,a,4(1x,i14))') me,'DSPOVR sizes:',iszr,iszs
!!$ write(0,'(i3,1x,a,4(1x,g14.5))') me,'DSPOVR timings:',t6-t2,t7-t6,t8-t7,t3-t8
!!$ write(0,'(i3,1x,a,4(1x,g14.5))') me,'DSPOVR timings:',t2-t1,t3-t2,t4-t3,t5-t4
!!$ write(0,'(i3,1x,a,4(1x,i14))') me,'DSPHALO sizes:',iszr,iszs
!!$ write(0,'(i3,1x,a,4(1x,g14.5))') me,'DSPHALO timings:',t6-t2,t7-t6,t8-t7,t3-t8
!!$ write(0,'(i3,1x,a,4(1x,g14.5))') me,'DSPHALO timings:',t2-t1,t3-t2,t4-t3,t5-t4
Deallocate(sdid,brvindx,rvid,bsdindx,rvsz,sdsz,stat=info)
@ -350,4 +350,4 @@ Subroutine psb_dspovr(a,desc_a,blk,info,rwcnv,clcnv,outfmt)
end if
return
End Subroutine psb_dspovr
End Subroutine psb_dsphalo
Write Preview
Loading…
Cancel
Save