Renaming: moved PSB_DSCOV into PSB_CDOVR.

psblas3-type-indexed
Salvatore Filippone 19 years ago
parent a3151bb4de
commit 7ea58aa0ea

@ -354,8 +354,8 @@ Module psb_tools_mod
end interface end interface
interface psb_dscov interface psb_cdovr
Subroutine psb_dscov(a,desc_a,novr,desc_ov,info) Subroutine psb_cdovr(a,desc_a,novr,desc_ov,info)
use psb_descriptor_type use psb_descriptor_type
Use psb_spmat_type Use psb_spmat_type
integer, intent(in) :: novr integer, intent(in) :: novr
@ -363,7 +363,7 @@ Module psb_tools_mod
Type(psb_desc_type), Intent(in) :: desc_a Type(psb_desc_type), Intent(in) :: desc_a
Type(psb_desc_type), Intent(inout) :: desc_ov Type(psb_desc_type), Intent(inout) :: desc_ov
integer, intent(out) :: info integer, intent(out) :: info
end Subroutine psb_dscov end Subroutine psb_cdovr
end interface end interface

@ -3,7 +3,7 @@ include ../../Make.inc
FOBJS = psb_dallc.o psb_dasb.o psb_dcsrp.o psb_descprt.o \ FOBJS = psb_dallc.o psb_dasb.o psb_dcsrp.o psb_descprt.o \
psb_dfree.o psb_dgelp.o psb_dins.o \ psb_dfree.o psb_dgelp.o psb_dins.o \
psb_dscall.o psb_dscalv.o psb_dscasb.o psb_dsccpy.o \ psb_dscall.o psb_dscalv.o psb_dscasb.o psb_dsccpy.o \
psb_dscdec.o psb_dscfree.o psb_dscins.o psb_dscov.o \ psb_dscdec.o psb_dscfree.o psb_dscins.o psb_cdovr.o \
psb_dscren.o psb_dscrep.o psb_dspalloc.o psb_dspasb.o \ psb_dscren.o psb_dscrep.o psb_dspalloc.o psb_dspasb.o \
psb_dspcnv.o psb_dspfree.o psb_dspins.o psb_dsprn.o \ psb_dspcnv.o psb_dspfree.o psb_dspins.o psb_dsprn.o \
psb_dspupdate.o psb_glob_to_loc.o psb_ialloc.o psb_iasb.o \ psb_dspupdate.o psb_glob_to_loc.o psb_ialloc.o psb_iasb.o \

@ -28,9 +28,9 @@
!!$ POSSIBILITY OF SUCH DAMAGE. !!$ POSSIBILITY OF SUCH DAMAGE.
!!$ !!$
!!$ !!$
! File: psb_dscov.f90 ! File: psb_cdovr.f90
! !
! Subroutine: psb_dscov ! Subroutine: psb_cdovr
! This routine takes a matrix A with its descriptor, and builds the ! This routine takes a matrix A with its descriptor, and builds the
! auxiliary descriptor corresponding to the number of overlap levels ! auxiliary descriptor corresponding to the number of overlap levels
! specified on input. It really is just a size estimation/allocation ! specified on input. It really is just a size estimation/allocation
@ -43,7 +43,7 @@
! desc_ov - type(<psb_desc_type>). The auxiliary output communication descriptor. ! desc_ov - type(<psb_desc_type>). The auxiliary output communication descriptor.
! info - integer. Eventually returns an error code. ! info - integer. Eventually returns an error code.
! !
Subroutine psb_dscov(a,desc_a,novr,desc_ov,info) Subroutine psb_cdovr(a,desc_a,novr,desc_ov,info)
use psb_serial_mod use psb_serial_mod
use psb_descriptor_type use psb_descriptor_type
@ -97,7 +97,7 @@ Subroutine psb_dscov(a,desc_a,novr,desc_ov,info)
Logical,Parameter :: debug=.false. Logical,Parameter :: debug=.false.
character(len=20) :: name, ch_err character(len=20) :: name, ch_err
name='psb_dscov' name='psb_cdovr'
info = 0 info = 0
call psb_erractionsave(err_act) call psb_erractionsave(err_act)
@ -105,13 +105,13 @@ Subroutine psb_dscov(a,desc_a,novr,desc_ov,info)
Call blacs_gridinfo(icontxt,nprow,npcol,me,mycol) Call blacs_gridinfo(icontxt,nprow,npcol,me,mycol)
If(debug) Write(0,*)'in psb_dscov',novr If(debug) Write(0,*)'in psb_cdovr',novr
m=desc_a%matrix_data(psb_n_row_) m=desc_a%matrix_data(psb_n_row_)
nnzero=Size(a%aspk) nnzero=Size(a%aspk)
n_col=desc_a%matrix_data(psb_n_col_) n_col=desc_a%matrix_data(psb_n_col_)
nhalo = n_col-m nhalo = n_col-m
If(debug) Write(0,*)'IN DSCOV1',novr ,m,nnzero,n_col If(debug) Write(0,*)'IN CDOVR1',novr ,m,nnzero,n_col
if (novr<0) then if (novr<0) then
info=10 info=10
int_err(1)=1 int_err(1)=1
@ -144,9 +144,9 @@ Subroutine psb_dscov(a,desc_a,novr,desc_ov,info)
!!$ iovre = mpe_log_get_event_number() !!$ iovre = mpe_log_get_event_number()
!!$ if (irank==0) then !!$ if (irank==0) then
!!$ info = mpe_describe_state(idscb,idsce,"DSCASB ","NavyBlue") !!$ info = mpe_describe_state(idscb,idsce,"DSCASB ","NavyBlue")
!!$ info = mpe_describe_state(iovrb,iovre,"DSCOVR ","DeepPink") !!$ info = mpe_describe_state(iovrb,iovre,"CDOVRR ","DeepPink")
!!$ endif !!$ endif
If(debug)Write(0,*)'BEGIN dscov',me,nhalo If(debug)Write(0,*)'BEGIN cdovr',me,nhalo
!!$ call blacs_barrier(icontxt,'All') !!$ call blacs_barrier(icontxt,'All')
t1 = mpi_wtime() t1 = mpi_wtime()
@ -232,5 +232,5 @@ Subroutine psb_dscov(a,desc_a,novr,desc_ov,info)
end if end if
Return Return
End Subroutine psb_dscov End Subroutine psb_cdovr
Loading…
Cancel
Save