fdurastante/psblas3
1
0
Fork 0
mirror of https://github.com/sfilippone/psblas3.git synced 2026-10-18 11:52:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed interface to CDALL to use optional parameters, encompassing the

Browse Source 
various versions existing so far.
This commit is contained in:
Salvatore Filippone
2007-01-12 14:58:25 +00:00
parent e59374bf6b
commit ddb6b91cd8
9 changed files with 239 additions and 402 deletions
Download Patch File Download Diff File Expand all files Collapse all files
base/modules/psb_error_mod.f90
+5 -1
View File
@@ -373,8 +373,12 @@ contains
case(580)
write (0,'("partition function passed as input argument n. ",i0," returns wrong processes identifier")')i_e_d(1)
write (0,'("on global point ",i0,". Current value returned is : ",i0)')i_e_d(3),i_e_d(2)
case(581)
write (0,'("Exactly one of the optional arguments ",a," must be present")')a_e_d
case(582)
write (0,'("Argument M is required when argument PARTS is specified")')
case(600)
write (0,'("Sparse Matrix and decsriptors are in an invalid state for this subroutine call: ",i0)')i_e_d(1)
write (0,'("Sparse Matrix and descriptors are in an invalid state for this subroutine call: ",i0)')i_e_d(1)
case (1122)
write (0,'("Invalid state for communication descriptor")')
case (1123)
base/modules/psb_tools_mod.f90
+129 -41
View File
@@ -31,6 +31,7 @@
Module psb_tools_mod
use psb_const_mod
use psb_gps_mod
interface psb_geall
! 2-D double precision version
subroutine psb_dalloc(x, desc_a, info, n)
@@ -330,29 +331,17 @@ Module psb_tools_mod
interface psb_cdall
subroutine psb_cdall(m, n, parts, ictxt, desc_a, info)
use psb_descriptor_type
include 'parts.fh'
Integer, intent(in) :: m,n,ictxt
Type(psb_desc_type), intent(out) :: desc_a
integer, intent(out) :: info
end subroutine psb_cdall
subroutine psb_cdalv(m, v, ictxt, desc_a, info, flag)
use psb_descriptor_type
Integer, intent(in) :: m,ictxt, v(:)
integer, intent(in), optional :: flag
integer, intent(out) :: info
Type(psb_desc_type), intent(out) :: desc_a
end subroutine psb_cdalv
subroutine psb_cd_inloc(v, ictxt, desc_a, info)
use psb_descriptor_type
implicit None
Integer, intent(in) :: ictxt, v(:)
integer, intent(out) :: info
type(psb_desc_type), intent(out) :: desc_a
end subroutine psb_cd_inloc
module procedure psb_cdall
end interface
interface psb_cdrep
subroutine psb_cdrep(m, ictxt, desc_a,info)
use psb_descriptor_type
Integer, intent(in) :: m,ictxt
Type(psb_desc_type), intent(out) :: desc_a
integer, intent(out) :: info
end subroutine psb_cdrep
end interface
interface psb_cdasb
subroutine psb_cdasb(desc_a,info)
@@ -593,24 +582,6 @@ Module psb_tools_mod
end interface
interface psb_cdrep
subroutine psb_cdrep(m, ictxt, desc_a,info)
use psb_descriptor_type
Integer, intent(in) :: m,ictxt
Type(psb_desc_type), intent(out) :: desc_a
integer, intent(out) :: info
end subroutine psb_cdrep
end interface
interface psb_cddec
subroutine psb_cddec(nloc, ictxt, desc_a,info)
use psb_descriptor_type
Integer, intent(in) :: nloc,ictxt
Type(psb_desc_type), intent(out) :: desc_a
integer, intent(out) :: info
end subroutine psb_cddec
end interface
interface psb_get_boundary
module procedure psb_get_boundary
end interface
@@ -637,8 +608,125 @@ contains
type(psb_desc_type), intent(in) :: desc
integer, intent(out) :: info
call psb_crea_bnd_elem(bndel,desc,info)
call psi_crea_bnd_elem(bndel,desc,info)
end subroutine psb_get_boundary
subroutine psb_cdall(ictxt, desc_a, info,mg,ng,parts,vg,vl,flag,nl)
use psb_descriptor_type
use psb_serial_mod
use psb_const_mod
use psb_error_mod
use psb_penv_mod
implicit None
include 'parts.fh'
Integer, intent(in) :: mg,ng,ictxt, vg(:), vl(:),nl
integer, intent(in) :: flag
integer, intent(out) :: info
type(psb_desc_type), intent(out) :: desc_a
optional :: mg,ng,parts,vg,vl,flag,nl
interface
subroutine psb_cdals(m, n, parts, ictxt, desc_a, info)
use psb_descriptor_type
include 'parts.fh'
Integer, intent(in) :: m,n,ictxt
Type(psb_desc_type), intent(out) :: desc_a
integer, intent(out) :: info
end subroutine psb_cdals
subroutine psb_cdalv(v, ictxt, desc_a, info, flag)
use psb_descriptor_type
Integer, intent(in) :: ictxt, v(:)
integer, intent(in), optional :: flag
integer, intent(out) :: info
Type(psb_desc_type), intent(out) :: desc_a
end subroutine psb_cdalv
subroutine psb_cd_inloc(v, ictxt, desc_a, info)
use psb_descriptor_type
implicit None
Integer, intent(in) :: ictxt, v(:)
integer, intent(out) :: info
type(psb_desc_type), intent(out) :: desc_a
end subroutine psb_cd_inloc
end interface
character(len=20) :: name, char_err
integer :: err_act, n_, flag_, i, me, np, nlp
integer, allocatable :: itmpsz(:)
if(psb_get_errstatus() /= 0) return
info=0
name = 'psb_cdall'
call psb_erractionsave(err_act)
call psb_info(ictxt, me, np)
if (count((/ present(vg),present(vl),present(parts),present(nl) /)) /= 1) then
info=581
call psb_errpush(info,name,a_err=" vg, vl, parts, nl")
goto 999
endif
if (present(parts)) then
if (.not.present(mg)) then
info=581
call psb_errpush(info,name)
goto 999
end if
if (present(ng)) then
n_ = ng
else
n_ = mg
endif
call psb_cdals(mg, n_, parts, ictxt, desc_a, info)
else if (present(vg)) then
if (present(flag)) then
flag_=flag
else
flag_=0
endif
call psb_cdalv(vg, ictxt, desc_a, info, flag_)
else if (present(vl)) then
call psb_cd_inloc(vl,ictxt,desc_a,info)
else if (present(nl)) then
allocate(itmpsz(0:np-1),stat=info)
if (info /= 0) then
info = 4000
call psb_errpush(info,name)
goto 999
endif
itmpsz = 0
itmpsz(me) = nl
call psb_sum(ictxt,itmpsz)
nlp=0
do i=0, me-1
nlp = nlp + itmpsz(me)
end do
call psb_cd_inloc((/(i,i=nlp+1,nlp+nl)/),ictxt,desc_a,info)
endif
call psb_erractionrestore(err_act)
return
999 continue
call psb_erractionrestore(err_act)
if (err_act == act_abort) then
call psb_error(ictxt)
return
end if
return
end subroutine psb_cdall
end module psb_tools_mod
base/tools/Makefile
+1 -1
View File
@@ -3,7 +3,7 @@ include ../../Make.inc
FOBJS = psb_dallc.o psb_dasb.o psb_dcsrp.o psb_cdprt.o \
psb_dfree.o psb_dgelp.o psb_dins.o \
psb_cdals.o psb_cdalv.o psb_cd_inloc.o psb_cdcpy.o \
psb_cddec.o psb_cdfree.o psb_cdins.o \
psb_cdfree.o psb_cdins.o \
psb_cdren.o psb_cdrep.o psb_cdtransfer.o psb_get_overlap.o\
psb_dspalloc.o psb_dspasb.o \
psb_dspcnv.o psb_dspfree.o psb_dspins.o psb_dsprn.o \
base/tools/psb_cdalv.f90
+5 -4
View File
@@ -41,7 +41,7 @@
! desc_a - type(<psb_desc_type>). The communication descriptor.
! info - integer. Eventually returns an error code
! flag - integer. ???
subroutine psb_cdalv(m, v, ictxt, desc_a, info, flag)
subroutine psb_cdalv(v, ictxt, desc_a, info, flag)
use psb_descriptor_type
use psb_serial_mod
use psb_const_mod
@@ -49,14 +49,14 @@ subroutine psb_cdalv(m, v, ictxt, desc_a, info, flag)
use psb_penv_mod
implicit None
!....Parameters...
Integer, intent(in) :: m,ictxt, v(:)
Integer, intent(in) :: ictxt, v(:)
integer, intent(in), optional :: flag
integer, intent(out) :: info
type(psb_desc_type), intent(out) :: desc_a
!locals
Integer :: counter,i,j,np,me,loc_row,err,&
& loc_col,nprocs,n,itmpov, k,glx,gidx,gle,&
& loc_col,nprocs,m,n,itmpov, k,glx,gidx,gle,&
& l_ov_ix,l_ov_el,idx, flag_, err_act
integer :: int_err(5),exch(2)
Integer, allocatable :: temp_ovrlap(:), ov_idx(:),ov_el(:)
@@ -70,7 +70,8 @@ subroutine psb_cdalv(m, v, ictxt, desc_a, info, flag)
call psb_info(ictxt, me, np)
if (debug) write(*,*) 'psb_cdall: ',np,me
m = size(v)
n = m
!... check m and n parameters....
if (m < 1) then
base/tools/psb_cddec.f90
-230
View File
@@ -1,230 +0,0 @@
!!$
!!$ Parallel Sparse BLAS v2.0
!!$ (C) Copyright 2006 Salvatore Filippone University of Rome Tor Vergata
!!$ Alfredo Buttari University of Rome Tor Vergata
!!$
!!$ Redistribution and use in source and binary forms, with or without
!!$ modification, are permitted provided that the following conditions
!!$ are met:
!!$ 1. Redistributions of source code must retain the above copyright
!!$ notice, this list of conditions and the following disclaimer.
!!$ 2. Redistributions in binary form must reproduce the above copyright
!!$ notice, this list of conditions, and the following disclaimer in the
!!$ documentation and/or other materials provided with the distribution.
!!$ 3. The name of the PSBLAS group or the names of its contributors may
!!$ not be used to endorse or promote products derived from this
!!$ software without specific written permission.
!!$
!!$ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
!!$ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
!!$ TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
!!$ PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE PSBLAS GROUP OR ITS CONTRIBUTORS
!!$ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
!!$ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
!!$ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
!!$ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
!!$ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
!!$ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
!!$ POSSIBILITY OF SUCH DAMAGE.
!!$
!!$
subroutine psb_cddec(nloc, ictxt, desc_a, info)
! Purpose
! =======
!
! Allocate special descriptor for decoupled index space
!
!
!
! INPUT
!======
! NLOC : (Local Input) Integer
! Number of local indices
! required.
!
! ictxt : (Global Input)Integer BLACS context for an NPx1 grid
! required.
!
! OUTPUT
!=========
! desc_a : TYPEDESC
! desc_a OUTPUT FIELDS:
!
! MATRIX_DATA : Pointer to integer Array
! contains some
! local and global information about matrix:
!
! NOTATION STORED IN EXPLANATION
! ------------ ---------------------- -------------------------------------
! DEC_TYPE MATRIX_DATA[DEC_TYPE_] Decomposition type, temporarly is
! setted to 1( matrix not yet assembled)
! M MATRIX_DATA[M_] Total number of equations
! N MATRIX_DATA[N_] Total number of variables
! N_ROW MATRIX_DATA[N_ROW_] Number of local equations
! N_COL MATRIX_DATA[N_COL_] Number of local columns (see below)
! CTXT_A MATRIX_DATA[CTXT_] The BLACS context handle,
! indicating
! the global context of the operation
! on the matrix.
! The context itself is global.
!
! GLOB_TO_LOC Array of dimension equal to number of global
! rows/cols (MATRIX_DATA[M_]). On exit,
! for all global indices either:
! 1. The index belongs to the current process; the entry
! is set to the next free local row index.
! 2. The index belongs to process P (0<=P<=NP-1); the entry
! is set to
! -(NP+P+1)
!
! LOC_TO_GLOB An array of dimension equal to number of local cols N_COL
! i.e. all columns of the matrix such that there is at least
! one nonzero entry within the local row range. At the time
! this routine is called N_COL cannot be know, so we set
! N_COL=N_ROW, and dimension this vector on N_ROW plus an
! estimate. On exit the vector elements are set
! to the index of the corresponding entry in GLOB_TO_LOC, or
! to -1 for indices I>N_ROW.
!
!
! HALO_INDEX Not touched here, as it depends on the matrix pattern
!
! OVRLAP_INDEX On exit from this routine, the overlap indices are stored in
! triples (Proc, 1, Index), similar to the assembled format
! but neither optimized, nor deadlock free.
! List is terminated with -1
!
! OVRLAP_ELEM On exit from this routine, just a list of pairs (index,#p).
! List is terminated with -1.
!
!
! END OF desc_a OUTPUT FIELDS
!
!
use psb_descriptor_type
use psb_serial_mod
use psb_const_mod
use psb_error_mod
use psi_mod
use psb_penv_mod
implicit None
!....Parameters...
Integer, intent(in) :: nloc,ictxt
integer, intent(out) :: info
Type(psb_desc_type), intent(out) :: desc_a
!locals
Integer :: i,j,np,me,err,n,itmpov, k,&
& l_ov_ix,l_ov_el,idx, err_act,m, ip
Integer :: INT_ERR(5), thalo(1), tovr(1)
integer, allocatable :: nlv(:)
logical, parameter :: debug=.false.
character(len=20) :: name
if(psb_get_errstatus() /= 0) return
info=0
err=0
name = 'psb_cddec'
call psb_info(ictxt, me, np)
if (debug) write(*,*) 'psb_cdalll: ',np,me
n = nloc
!... check nloc and n parameters....
if (nloc < 1) then
info = 10
int_err(1) = 1
int_err(2) = nloc
else if (n < 1) then
info = 10
int_err(1) = 2
int_err(2) = n
endif
if (info /= 0) then
call psb_errpush(info,name,i_err=int_err)
goto 9999
end if
if (debug) write(*,*) 'psb_cdall: doing global checks'
!global check on m and n parameters
allocate(nlv(0:np-1))
nlv(:) = 0
nlv(me) = nloc
call psb_sum(ictxt,nlv(1:np))
m = sum(nlv)
call psb_nullify_desc(desc_a)
!count local rows number
! allocate work vector
!!$ allocate(desc_a%glob_to_loc(m),desc_a%matrix_data(psb_mdata_size_),&
!!$ & desc_a%loc_to_glob(nloc),desc_a%lprm(1),&
!!$ & desc_a%ovrlap_index(1),desc_a%ovrlap_elem(1),&
!!$ & desc_a%halo_index(1),desc_a%bnd_elem(1),stat=info)
allocate(desc_a%glob_to_loc(m),desc_a%matrix_data(psb_mdata_size_),&
& desc_a%loc_to_glob(m),desc_a%lprm(1),stat=info)
if (info /= 0) then
info=2025
int_err(1)=m
call psb_errpush(info,name,i_err=int_err)
goto 9999
endif
desc_a%matrix_data(psb_n_row_) = nloc
desc_a%matrix_data(psb_n_col_) = nloc
desc_a%matrix_data(psb_m_) = m
desc_a%matrix_data(psb_n_) = m
desc_a%matrix_data(psb_dec_type_) = psb_desc_bld_
desc_a%matrix_data(psb_ctxt_) = ictxt
call psb_get_mpicomm(ictxt,desc_a%matrix_data(psb_mpi_c_))
j = 1
do ip=0, np-1
if (ip==me) then
do i=1, nlv(ip)
desc_a%glob_to_loc(j) = i
desc_a%loc_to_glob(i) = j
j = j + 1
enddo
else
do i=1, nlv(ip)
desc_a%glob_to_loc(j) = -(np+ip+1)
j = j + 1
enddo
endif
enddo
tovr = -1
thalo = -1
desc_a%lprm(:) = 0
call psi_cnv_dsc(thalo,tovr,desc_a,info)
if (info /= 0) then
call psb_errpush(4010,name,a_err='psi_bld_cdesc')
goto 9999
end if
desc_a%matrix_data(psb_dec_type_) = psb_desc_asb_
call psb_erractionrestore(err_act)
return
9999 continue
call psb_erractionrestore(err_act)
if (err_act == act_abort) then
call psb_error(ictxt)
return
end if
return
end subroutine psb_cddec
mld2p4/psb_dbldaggrmat.f90
+18 -6
View File
@@ -233,10 +233,16 @@ contains
end if
else if (p%iprcparm(coarse_mat_) == mat_distr_) then
call psb_cddec(naggr,ictxt,desc_ac,info)
call psb_cdall(ictxt,desc_ac,info,nl=naggr)
if(info /= 0) then
call psb_errpush(4010,name,a_err='psb_cddec')
call psb_errpush(4010,name,a_err='psb_cdall')
goto 9999
end if
call psb_cdasb(desc_ac,info)
if(info /= 0) then
call psb_errpush(4010,name,a_err='psb_cdasb')
goto 9999
end if
@@ -746,7 +752,7 @@ contains
end do
end do
call psb_cdall(ntaggr,ivall,ictxt,desc_ac,info,flag=1)
call psb_cdall(ictxt,desc_ac,info,vg=ivall(1:ntaggr),flag=1)
if(info /= 0) then
call psb_errpush(4010,name,a_err='psb_cdall')
goto 9999
@@ -928,9 +934,15 @@ contains
call psb_errpush(4010,name,a_err='spclone')
goto 9999
end if
call psb_cddec(naggr,ictxt,desc_ac,info)
call psb_cdall(ictxt,desc_ac,info,nl=naggr)
if(info /= 0) then
call psb_errpush(4010,name,a_err='psb_cddec')
call psb_errpush(4010,name,a_err='psb_cdall')
goto 9999
end if
call psb_cdasb(desc_ac,info)
if(info /= 0) then
call psb_errpush(4010,name,a_err='psb_cdasb')
goto 9999
end if
mld2p4/psb_zbldaggrmat.f90
+15 -6
View File
@@ -233,9 +233,14 @@ contains
else if (p%iprcparm(coarse_mat_) == mat_distr_) then
call psb_cddec(naggr,ictxt,desc_ac,info)
call psb_cdall(ictxt,desc_ac,info,nl=naggr)
if(info /= 0) then
call psb_errpush(4010,name,a_err='psb_cddec')
call psb_errpush(4010,name,a_err='psb_cdall')
goto 9999
end if
call psb_cdasb(desc_ac,info)
if(info /= 0) then
call psb_errpush(4010,name,a_err='psb_cdasb')
goto 9999
end if
@@ -745,7 +750,7 @@ contains
end do
end do
call psb_cdall(ntaggr,ivall,ictxt,desc_ac,info,flag=1)
call psb_cdall(ictxt,desc_ac,info,vg=ivall(1:ntaggr),flag=1)
if(info /= 0) then
call psb_errpush(4010,name,a_err='psb_cdall')
goto 9999
@@ -926,12 +931,16 @@ contains
call psb_errpush(4010,name,a_err='spclone')
goto 9999
end if
call psb_cddec(naggr,ictxt,desc_ac,info)
call psb_cdall(ictxt,desc_ac,info,nl=naggr)
if(info /= 0) then
call psb_errpush(4010,name,a_err='psb_cddec')
call psb_errpush(4010,name,a_err='psb_cdall')
goto 9999
end if
call psb_cdasb(desc_ac,info)
if(info /= 0) then
call psb_errpush(4010,name,a_err='psb_cdasb')
goto 9999
end if
call psb_sp_free(b,info)
if(info /= 0) then
call psb_errpush(4010,name,a_err='sp_free')
test/pargen/ppde90.f90
+1 -1
View File
@@ -435,7 +435,7 @@ contains
nnz = ((n*9)/(np))
if(iam == psb_root_) write(0,'("Generating Matrix (size=",i0x,")...")')n
call psb_cdall(n,n,parts,ictxt,desc_a,info)
call psb_cdall(ictxt,desc_a,info,mg=n,parts=parts)
call psb_spall(a,desc_a,info,nnz=nnz)
! define rhs from boundary conditions; also build initial guess
call psb_geall(b,desc_a,info)
util/psb_mat_dist_mod.f90
+65 -112
View File
@@ -129,7 +129,6 @@ contains
real(kind(1.d0)), allocatable :: val(:)
integer, parameter :: nb=30
real(kind(1.d0)) :: t0, t1, t2, t3, t4, t5
logical, parameter :: newt=.true.
character(len=20) :: name, ch_err
info = 0
@@ -182,23 +181,14 @@ contains
write (*, fmt = *) 'start matdist',root, size(iwork),&
&nrow, ncol, nnzero,nrhs
endif
if (newt) then
call psb_cdall(nrow,nrow,parts,ictxt,desc_a,info)
if(info/=0) then
info=4010
ch_err='psb_cdall'
call psb_errpush(info,name,a_err=ch_err)
goto 9999
end if
else
call psb_cdall(nrow,nrow,parts,ictxt,desc_a,info)
if(info/=0) then
info=4010
ch_err='psb_pscdall'
call psb_errpush(info,name,a_err=ch_err)
goto 9999
end if
endif
call psb_cdall(ictxt,desc_a,info,mg=nrow,parts=parts)
if(info/=0) then
info=4010
ch_err='psb_cdall'
call psb_errpush(info,name,a_err=ch_err)
goto 9999
end if
call psb_spall(a,desc_a,info,nnz=nnzero/np)
if(info/=0) then
info=4010
@@ -410,47 +400,35 @@ contains
else
afmt = 'CSR'
endif
if (newt) then
call psb_barrier(ictxt)
t0 = psb_wtime()
call psb_cdasb(desc_a,info)
t1 = psb_wtime()
if(info/=0)then
info=4010
ch_err='psb_cdasb'
call psb_errpush(info,name,a_err=ch_err)
goto 9999
end if
call psb_barrier(ictxt)
t0 = psb_wtime()
call psb_cdasb(desc_a,info)
t1 = psb_wtime()
if(info/=0)then
info=4010
ch_err='psb_cdasb'
call psb_errpush(info,name,a_err=ch_err)
goto 9999
end if
call psb_barrier(ictxt)
t2 = psb_wtime()
call psb_spasb(a,desc_a,info,dupl=psb_dupl_err_,afmt=afmt)
t3 = psb_wtime()
if(info/=0)then
info=4010
ch_err='psb_spasb'
call psb_errpush(info,name,a_err=ch_err)
goto 9999
end if
call psb_barrier(ictxt)
t2 = psb_wtime()
call psb_spasb(a,desc_a,info,dupl=psb_dupl_err_,afmt=afmt)
t3 = psb_wtime()
if(info/=0)then
info=4010
ch_err='psb_spasb'
call psb_errpush(info,name,a_err=ch_err)
goto 9999
end if
if (iam == root) then
write(*,*) 'descriptor assembly: ',t1-t0
write(*,*) 'sparse matrix assembly: ',t3-t2
end if
if (iam == root) then
write(*,*) 'descriptor assembly: ',t1-t0
write(*,*) 'sparse matrix assembly: ',t3-t2
end if
else
call psb_spasb(a,desc_a,info,afmt=afmt,dupl=psb_dupl_err_)
if(info/=0)then
info=4010
ch_err='psspasb'
call psb_errpush(info,name,a_err=ch_err)
goto 9999
end if
endif
call psb_geasb(b,desc_a,info)
if(info/=0)then
@@ -563,7 +541,6 @@ contains
integer, allocatable :: irow(:),icol(:)
real(kind(1.d0)), allocatable :: val(:)
integer, parameter :: nb=30
logical, parameter :: newt=.true.
real(kind(1.d0)) :: t0, t1, t2, t3, t4, t5
character(len=20) :: name, ch_err
@@ -616,7 +593,7 @@ contains
goto 9999
endif
call psb_cdall(nrow,v,ictxt,desc_a,info)
call psb_cdall(ictxt,desc_a,info,vg=v)
if(info/=0) then
info=4010
ch_err='psb_cdall'
@@ -904,7 +881,6 @@ contains
complex(kind(1.d0)), allocatable :: val(:)
integer, parameter :: nb=30
real(kind(1.d0)) :: t0, t1, t2, t3, t4, t5
logical, parameter :: newt=.true.
character(len=20) :: name, ch_err
info = 0
@@ -955,23 +931,13 @@ contains
write (*, fmt = *) 'start matdist',root, size(iwork),&
&nrow, ncol, nnzero,nrhs
endif
if (newt) then
call psb_cdall(nrow,nrow,parts,ictxt,desc_a,info)
if(info/=0) then
info=4010
ch_err='psb_cdall'
call psb_errpush(info,name,a_err=ch_err)
goto 9999
end if
else
call psb_cdall(nrow,nrow,parts,ictxt,desc_a,info)
if(info/=0) then
info=4010
ch_err='psb_pscdall'
call psb_errpush(info,name,a_err=ch_err)
goto 9999
end if
endif
call psb_cdall(ictxt,desc_a,info,mg=nrow,parts=parts)
if(info/=0) then
info=4010
ch_err='psb_cdall'
call psb_errpush(info,name,a_err=ch_err)
goto 9999
end if
call psb_spall(a,desc_a,info,nnz=nnzero/np)
if(info/=0) then
info=4010
@@ -1182,47 +1148,34 @@ contains
else
afmt = 'CSR'
endif
if (newt) then
call psb_barrier(ictxt)
t0 = psb_wtime()
call psb_cdasb(desc_a,info)
t1 = psb_wtime()
if(info/=0)then
info=4010
ch_err='psb_cdasb'
call psb_errpush(info,name,a_err=ch_err)
goto 9999
end if
call psb_barrier(ictxt)
t0 = psb_wtime()
call psb_cdasb(desc_a,info)
t1 = psb_wtime()
if(info/=0)then
info=4010
ch_err='psb_cdasb'
call psb_errpush(info,name,a_err=ch_err)
goto 9999
end if
call psb_barrier(ictxt)
t2 = psb_wtime()
call psb_spasb(a,desc_a,info,dupl=psb_dupl_err_,afmt=afmt)
t3 = psb_wtime()
if(info/=0)then
info=4010
ch_err='psb_spasb'
call psb_errpush(info,name,a_err=ch_err)
goto 9999
end if
call psb_barrier(ictxt)
t2 = psb_wtime()
call psb_spasb(a,desc_a,info,dupl=psb_dupl_err_,afmt=afmt)
t3 = psb_wtime()
if(info/=0)then
info=4010
ch_err='psb_spasb'
call psb_errpush(info,name,a_err=ch_err)
goto 9999
end if
if (iam == root) then
write(*,*) 'descriptor assembly: ',t1-t0
write(*,*) 'sparse matrix assembly: ',t3-t2
end if
else
call psb_spasb(a,desc_a,info,afmt=afmt,dupl=psb_dupl_err_)
if(info/=0)then
info=4010
ch_err='psspasb'
call psb_errpush(info,name,a_err=ch_err)
goto 9999
end if
endif
if (iam == root) then
write(*,*) 'descriptor assembly: ',t1-t0
write(*,*) 'sparse matrix assembly: ',t3-t2
end if
call psb_geasb(b,desc_a,info)
if(info/=0)then
@@ -1388,7 +1341,7 @@ contains
goto 9999
endif
call psb_cdall(nrow,v,ictxt,desc_a,info)
call psb_cdall(ictxt,desc_a,info,vg=v)
if(info/=0) then
info=4010
ch_err='psb_cdall'