Reorganized AS build and application routines.

stopcriterion
Salvatore Filippone 17 years ago
parent 2a712e42fb
commit 54ae8fa06a

@ -4,7 +4,7 @@
# must be specified here with absolute pathnames # # must be specified here with absolute pathnames #
# # # #
########################################################## ##########################################################
PSBLASDIR=$(HOME)/NUMERICAL/PSBLAS2/psblas2 PSBLASDIR=$(HOME)/NUMERICAL/PSBLAS2/psblas2-dev
include $(PSBLASDIR)/Make.inc include $(PSBLASDIR)/Make.inc
########################################################## ##########################################################

@ -10,18 +10,18 @@ MODOBJS=mld_prec_type.o mld_prec_mod.o
MPFOBJS=mld_daggrmat_raw_asb.o mld_daggrmat_smth_asb.o \ MPFOBJS=mld_daggrmat_raw_asb.o mld_daggrmat_smth_asb.o \
mld_zaggrmat_raw_asb.o mld_zaggrmat_smth_asb.o mld_zaggrmat_raw_asb.o mld_zaggrmat_smth_asb.o
MPCOBJS=mld_slud_impl.o mld_zslud_impl.o MPCOBJS=mld_slud_impl.o mld_zslud_impl.o
F90OBJS=mld_dasmat_bld.o mld_dslu_bld.o mld_dumf_bld.o mld_dilu_fct.o\ F90OBJS=mld_das_bld.o mld_dslu_bld.o mld_dumf_bld.o mld_dilu_fct.o\
mld_dmlprec_bld.o mld_dsp_renum.o mld_dbjac_bld.o mld_dilu_bld.o \ mld_dmlprec_bld.o mld_dsp_renum.o mld_dbjac_bld.o mld_dilu_bld.o \
mld_dprecbld.o mld_dprecfree.o mld_dprecset.o mld_dprecinit.o\ mld_dprecbld.o mld_dprecfree.o mld_dprecset.o mld_dprecinit.o\
mld_dbaseprec_bld.o mld_ddiagsc_bld.o mld_daggrmap_bld.o \ mld_dbaseprec_bld.o mld_ddiagsc_bld.o mld_daggrmap_bld.o \
mld_dprec_aply.o mld_dmlprec_aply.o mld_dslud_bld.o\ mld_dprec_aply.o mld_dmlprec_aply.o mld_dslud_bld.o\
mld_dbaseprec_aply.o mld_dbjac_aply.o mld_daggrmat_asb.o \ mld_dbaseprec_aply.o mld_dbjac_aply.o mld_das_aply.o mld_daggrmat_asb.o \
mld_zasmat_bld.o mld_zslu_bld.o mld_zumf_bld.o mld_zilu_fct.o\ mld_zas_bld.o mld_zslu_bld.o mld_zumf_bld.o mld_zilu_fct.o\
mld_zmlprec_bld.o mld_zsp_renum.o mld_zbjac_bld.o mld_zilu_bld.o \ mld_zmlprec_bld.o mld_zsp_renum.o mld_zbjac_bld.o mld_zilu_bld.o \
mld_zprecbld.o mld_zprecfree.o mld_zprecset.o mld_zprecinit.o \ mld_zprecbld.o mld_zprecfree.o mld_zprecset.o mld_zprecinit.o \
mld_zbaseprec_bld.o mld_zdiagsc_bld.o mld_zaggrmap_bld.o \ mld_zbaseprec_bld.o mld_zdiagsc_bld.o mld_zaggrmap_bld.o \
mld_zprec_aply.o mld_zmlprec_aply.o mld_zslud_bld.o\ mld_zprec_aply.o mld_zmlprec_aply.o mld_zslud_bld.o\
mld_zbaseprec_aply.o mld_zbjac_aply.o mld_zaggrmat_asb.o\ mld_zbaseprec_aply.o mld_zbjac_aply.o mld_zas_aply.o mld_zaggrmat_asb.o\
mld_diluk_fct.o mld_ziluk_fct.o mld_dilut_fct.o mld_zilut_fct.o \ mld_diluk_fct.o mld_ziluk_fct.o mld_dilut_fct.o mld_zilut_fct.o \
$(MPFOBJS) $(MPFOBJS)
COBJS=mld_slu_impl.o mld_umf_impl.o mld_zslu_impl.o mld_zumf_impl.o COBJS=mld_slu_impl.o mld_umf_impl.o mld_zslu_impl.o mld_zumf_impl.o

@ -0,0 +1,295 @@
!!$
!!$
!!$ MLD2P4
!!$ MultiLevel Domain Decomposition Parallel Preconditioners Package
!!$ based on PSBLAS (Parallel Sparse BLAS v.2.0)
!!$
!!$ (C) Copyright 2007 Alfredo Buttari University of Rome Tor Vergata
!!$ Pasqua D'Ambra ICAR-CNR, Naples
!!$ Daniela di Serafino Second University of Naples
!!$ Salvatore Filippone 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 MLD2P4 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 MLD2P4 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.
!!$
!!$
! File: mld_das_aply.f90
!
! Subroutine: mld_das_aply
! Version: real
!
! This routine applies the Additive Schwarz preconditioner by computing
!
! Y = beta*Y + alpha*op(K^(-1))*X,
! where
! - K is the base preconditioner, stored in prec,
! - op(K^(-1)) is K^(-1) or its transpose, according to the value of trans,
! - X and Y are vectors,
! - alpha and beta are scalars.
!
!
! Arguments:
! alpha - real(kind(0.d0)), input.
! The scalar alpha.
! prec - type(mld_dbaseprc_type), input.
! The base preconditioner data structure containing the local part
! of the preconditioner K.
! x - real(kind(0.d0)), dimension(:), input.
! The local part of the vector X.
! beta - real(kind(0.d0)), input.
! The scalar beta.
! y - real(kind(0.d0)), dimension(:), input/output.
! The local part of the vector Y.
! desc_data - type(psb_desc_type), input.
! The communication descriptor associated to the matrix to be
! preconditioned.
! trans - character, optional.
! If trans='N','n' then op(K^(-1)) = K^(-1);
! if trans='T','t' then op(K^(-1)) = K^(-T) (transpose of K^(-1)).
! work - real(kind(0.d0)), dimension (:), optional, target.
! Workspace. Its size must be at least 4*psb_cd_get_local_cols(desc_data).
! info - integer, output.
! Error code.
!
subroutine mld_das_aply(alpha,prec,x,beta,y,desc_data,trans,work,info)
use psb_base_mod
use mld_prec_mod, mld_protect_name => mld_das_aply
implicit none
! Arguments
type(psb_desc_type),intent(in) :: desc_data
type(mld_dbaseprc_type), intent(in) :: prec
real(kind(0.d0)),intent(in) :: x(:)
real(kind(0.d0)),intent(inout) :: y(:)
real(kind(0.d0)),intent(in) :: alpha,beta
character(len=1) :: trans
real(kind(0.d0)),target :: work(:)
integer, intent(out) :: info
! Local variables
integer :: n_row,n_col, int_err(5), nrow_d
real(kind(1.d0)), pointer :: ww(:), aux(:), tx(:),ty(:)
integer :: ictxt,np,me,isz, err_act
character(len=20) :: name, ch_err
name='mld_das_aply'
info = 0
call psb_erractionsave(err_act)
ictxt = psb_cd_get_context(desc_data)
call psb_info(ictxt, me, np)
select case(trans)
case('N','n')
case('T','t','C','c')
case default
info=40
int_err(1)=6
ch_err(2:2)=trans
goto 9999
end select
select case(prec%iprcparm(mld_prec_type_))
case(mld_as_)
!
! Additive Schwarz preconditioner
!
if (prec%iprcparm(mld_n_ovr_)==0) then
!
! shortcut: this fixes performance for RAS(0) == BJA
!
call mld_bjac_aply(alpha,prec,x,beta,y,desc_data,trans,work,info)
if(info /= 0) then
info=4010
ch_err='psb_bjacaply'
goto 9999
end if
else
!
! Note: currently trans is unused
!
n_row = psb_cd_get_local_rows(prec%desc_data)
n_col = psb_cd_get_local_cols(prec%desc_data)
nrow_d = psb_cd_get_local_rows(desc_data)
isz=max(n_row,N_COL)
if ((6*isz) <= size(work)) then
ww => work(1:isz)
tx => work(isz+1:2*isz)
ty => work(2*isz+1:3*isz)
aux => work(3*isz+1:)
else if ((4*isz) <= size(work)) then
aux => work(1:)
allocate(ww(isz),tx(isz),ty(isz),stat=info)
if (info /= 0) then
call psb_errpush(4025,name,i_err=(/3*isz,0,0,0,0/),&
& a_err='real(kind(1.d0))')
goto 9999
end if
else if ((3*isz) <= size(work)) then
ww => work(1:isz)
tx => work(isz+1:2*isz)
ty => work(2*isz+1:3*isz)
allocate(aux(4*isz),stat=info)
if (info /= 0) then
call psb_errpush(4025,name,i_err=(/4*isz,0,0,0,0/),&
& a_err='real(kind(1.d0))')
goto 9999
end if
else
allocate(ww(isz),tx(isz),ty(isz),&
&aux(4*isz),stat=info)
if (info /= 0) then
call psb_errpush(4025,name,i_err=(/4*isz,0,0,0,0/),&
& a_err='real(kind(1.d0))')
goto 9999
end if
endif
tx(1:nrow_d) = x(1:nrow_d)
tx(nrow_d+1:isz) = dzero
!
! Get the overlap entries of tx (tx==x)
!
if (prec%iprcparm(mld_sub_restr_)==psb_halo_) then
call psb_halo(tx,prec%desc_data,info,work=aux,data=psb_comm_ext_)
if(info /=0) then
info=4010
ch_err='psb_halo'
goto 9999
end if
else if (prec%iprcparm(mld_sub_restr_) /= psb_none_) then
call psb_errpush(4001,name,a_err='Invalid mld_sub_restr_')
goto 9999
end if
!
! If required, reorder tx according to the row/column permutation of the
! local extended matrix, stored into the permutation vector prec%perm
!
if (prec%iprcparm(mld_sub_ren_)>0) then
call psb_gelp('n',prec%perm,tx,info)
if(info /=0) then
info=4010
ch_err='psb_gelp'
goto 9999
end if
endif
!
! Apply to tx the block-Jacobi preconditioner/solver (multiple sweeps of the
! block-Jacobi solver can be applied at the coarsest level of a multilevel
! preconditioner). The resulting vector is ty.
!
call mld_bjac_aply(done,prec,tx,dzero,ty,prec%desc_data,trans,aux,info)
if(info /= 0) then
info=4010
ch_err='mld_bjac_aply'
goto 9999
end if
!
! Apply to ty the inverse permutation of prec%perm
!
if (prec%iprcparm(mld_sub_ren_)>0) then
call psb_gelp('n',prec%invperm,ty,info)
if(info /= 0) then
info=4010
ch_err='psb_gelp'
goto 9999
end if
endif
select case (prec%iprcparm(mld_sub_prol_))
case(psb_none_)
!
! Would work anyway, but since it is supposed to do nothing ...
! call psb_ovrl(ty,prec%desc_data,info,&
! & update=prec%iprcparm(mld_sub_prol_),work=aux)
case(psb_sum_,psb_avg_)
!
! Update the overlap of ty
!
call psb_ovrl(ty,prec%desc_data,info,&
& update=prec%iprcparm(mld_sub_prol_),work=aux)
if(info /=0) then
info=4010
ch_err='psb_ovrl'
goto 9999
end if
case default
call psb_errpush(4001,name,a_err='Invalid mld_sub_prol_')
goto 9999
end select
!
! Compute y = beta*y + alpha*ty (ty==K^(-1)*tx)
!
call psb_geaxpby(alpha,ty,beta,y,desc_data,info)
if ((6*isz) <= size(work)) then
else if ((4*isz) <= size(work)) then
deallocate(ww,tx,ty)
else if ((3*isz) <= size(work)) then
deallocate(aux)
else
deallocate(ww,aux,tx,ty)
endif
end if
case default
call psb_errpush(4001,name,a_err='Invalid mld_prec_type_')
goto 9999
end select
call psb_erractionrestore(err_act)
return
9999 continue
call psb_errpush(info,name,i_err=int_err,a_err=ch_err)
call psb_erractionrestore(err_act)
if (err_act == psb_act_abort_) then
call psb_error()
return
end if
return
end subroutine mld_das_aply

@ -34,15 +34,13 @@
!!$ POSSIBILITY OF SUCH DAMAGE. !!$ POSSIBILITY OF SUCH DAMAGE.
!!$ !!$
!!$ !!$
! File: mld_dasmat_bld.f90 ! File: mld_das_bld.f90
! !
! Subroutine: mld_dasmat_bld ! Subroutine: mld_das_bld
! Version: real ! Version: real
! !
! This routine builds the communication descriptor associated to the extended ! This routine builds the Additive Schwarz (AS) preconditioner.
! matrices that form the Additive Schwarz (AS) preconditioner and retrieves ! If the preconditioner is the block-Jacobi one, the routine makes only a copy of
! the remote pieces needed to build the local extended matrix. If the
! preconditioner is the block-Jacobi one, the routine makes only a copy of
! the descriptor of the original matrix. ! the descriptor of the original matrix.
! !
! !
@ -71,32 +69,32 @@
! preconditioner. Currently outfmt is set to 'CSR' by the ! preconditioner. Currently outfmt is set to 'CSR' by the
! calling routine mld_bjac_bld. ! calling routine mld_bjac_bld.
! !
subroutine mld_dasmat_bld(ptype,novr,a,blk,desc_data,upd,desc_p,info,outfmt) subroutine mld_das_bld(a,desc_a,p,upd,info)
use psb_base_mod use psb_base_mod
use mld_prec_mod, mld_protect_name => mld_dasmat_bld use mld_prec_mod, mld_protect_name => mld_das_bld
Implicit None Implicit None
! Arguments ! Arguments
integer, intent(in) :: ptype,novr ! Arguments
Type(psb_dspmat_type), Intent(in) :: a type(psb_dspmat_type), intent(in), target :: a
Type(psb_dspmat_type), Intent(out) :: blk Type(psb_desc_type), Intent(in) :: desc_a
type(mld_dbaseprc_type), intent(inout) :: p
character, intent(in) :: upd
integer, intent(out) :: info integer, intent(out) :: info
Type(psb_desc_type), Intent(inout) :: desc_p
Type(psb_desc_type), Intent(in) :: desc_data integer :: ptype,novr
Character, Intent(in) :: upd
character(len=5), optional :: outfmt
! Local variables ! Local variables
integer icomm integer icomm
Integer :: np,me,nnzero,& Integer :: np,me,nnzero,&
& ictxt, n_col,int_err(5),& & ictxt, n_col,int_err(5),&
& tot_recv, n_row,nhalo, nrow_a,err_act & tot_recv, n_row,nhalo, nrow_a,err_act, data_
integer :: debug_level, debug_unit integer :: debug_level, debug_unit
character(len=20) :: name, ch_err character(len=20) :: name, ch_err
name='mld_dasmat_bld' name='mld_as_bld'
if(psb_get_errstatus() /= 0) return if(psb_get_errstatus() /= 0) return
info=0 info=0
call psb_erractionsave(err_act) call psb_erractionsave(err_act)
@ -106,45 +104,21 @@ subroutine mld_dasmat_bld(ptype,novr,a,blk,desc_data,upd,desc_p,info,outfmt)
If (debug_level >= psb_debug_outer_) & If (debug_level >= psb_debug_outer_) &
& write(debug_unit,*) me,' ',trim(name),& & write(debug_unit,*) me,' ',trim(name),&
& ' start ', upd & ' start ', upd
ictxt = psb_cd_get_context(desc_data) ictxt = psb_cd_get_context(desc_a)
icomm = psb_cd_get_mpic(desc_data) icomm = psb_cd_get_mpic(desc_a)
Call psb_info(ictxt, me, np) Call psb_info(ictxt, me, np)
tot_recv=0 tot_recv=0
nrow_a = desc_data%matrix_data(psb_n_row_) nrow_a = psb_cd_get_local_rows(desc_a)
nnzero = Size(a%aspk) n_col = psb_cd_get_local_cols(desc_a)
n_col = desc_data%matrix_data(psb_n_col_) nnzero = psb_sp_get_nnzeros(a)
nhalo = n_col-nrow_a nhalo = n_col-nrow_a
ptype = p%iprcparm(mld_prec_type_)
novr = p%iprcparm(mld_n_ovr_)
select case (ptype) select case (ptype)
case (mld_bjac_)
!
! Block-Jacobi preconditioner. Copy the descriptor, just in case
! we want to renumber the rows and columns of the matrix.
!
call psb_sp_all(0,0,blk,1,info)
if(info /= 0) then
info=4010
ch_err='psb_sp_all'
call psb_errpush(info,name,a_err=ch_err)
goto 9999
end if
blk%fida = 'COO'
blk%infoa(psb_nnz_) = 0
If (upd == 'F') Then
call psb_cdcpy(desc_data,desc_p,info)
If(debug_level >= psb_debug_outer_) &
& write(debug_unit,*) me,' ',trim(name),&
& ' done cdcpy'
if(info /= 0) then
info=4010
ch_err='psb_cdcpy'
call psb_errpush(info,name,a_err=ch_err)
goto 9999
end if
endif
case(mld_as_) case(mld_as_)
! !
@ -161,23 +135,12 @@ subroutine mld_dasmat_bld(ptype,novr,a,blk,desc_data,upd,desc_p,info,outfmt)
! !
! Actually, this is just block Jacobi ! Actually, this is just block Jacobi
! !
If(debug_level >= psb_debug_outer_) & data_ = psb_no_comm_
& write(debug_unit,*) me,' ',trim(name),&
& ' calling allocate novr=0'
call psb_sp_all(0,0,blk,1,info)
if(info /= 0) then
info=4010
ch_err='psb_sp_all'
call psb_errpush(info,name,a_err=ch_err)
goto 9999
end if
blk%fida = 'COO'
blk%infoa(psb_nnz_) = 0
if (debug_level >= psb_debug_outer_) & if (debug_level >= psb_debug_outer_) &
& write(debug_unit,*) me,' ',trim(name),& & write(debug_unit,*) me,' ',trim(name),&
& 'Calling desccpy' & 'Calling desccpy'
if (upd == 'F') then if (upd == 'F') then
call psb_cdcpy(desc_data,desc_p,info) call psb_cdcpy(desc_a,p%desc_data,info)
If(debug_level >= psb_debug_outer_) & If(debug_level >= psb_debug_outer_) &
& write(debug_unit,*) me,' ',trim(name),& & write(debug_unit,*) me,' ',trim(name),&
& ' done cdcpy' & ' done cdcpy'
@ -191,10 +154,9 @@ subroutine mld_dasmat_bld(ptype,novr,a,blk,desc_data,upd,desc_p,info,outfmt)
& write(debug_unit,*) me,' ',trim(name),& & write(debug_unit,*) me,' ',trim(name),&
& 'Early return: P>=3 N_OVR=0' & 'Early return: P>=3 N_OVR=0'
endif endif
return
endif
else
data_ = psb_comm_ext_
If (upd == 'F') Then If (upd == 'F') Then
! !
! Build the auxiliary descriptor desc_p%matrix_data(psb_n_row_). ! Build the auxiliary descriptor desc_p%matrix_data(psb_n_row_).
@ -204,7 +166,7 @@ subroutine mld_dasmat_bld(ptype,novr,a,blk,desc_data,upd,desc_p,info,outfmt)
! might be used independently of the AS preconditioner, to build ! might be used independently of the AS preconditioner, to build
! a descriptor for an extended stencil in a PDE solver. ! a descriptor for an extended stencil in a PDE solver.
! !
call psb_cdbldext(a,desc_data,novr,desc_p,info,extype=psb_ovt_asov_) call psb_cdbldext(a,desc_a,novr,p%desc_data,info,extype=psb_ovt_asov_)
if (info /= 0) then if (info /= 0) then
info=4010 info=4010
ch_err='psb_cdbldext' ch_err='psb_cdbldext'
@ -213,36 +175,23 @@ subroutine mld_dasmat_bld(ptype,novr,a,blk,desc_data,upd,desc_p,info,outfmt)
end if end if
Endif Endif
if(debug_level >= psb_debug_outer_) & End if
& write(debug_unit,*) me,' ',trim(name),&
& ' From cdbldext _:',desc_p%matrix_data(psb_n_row_),&
& desc_p%matrix_data(psb_n_col_)
!
! Retrieve the remote pieces needed to build the local extended matrix
!
n_row = desc_p%matrix_data(psb_n_row_)
if(debug_level >= psb_debug_outer_) & if(debug_level >= psb_debug_outer_) &
& write(debug_unit,*) me,' ',trim(name),& & write(debug_unit,*) me,' ',trim(name),&
& 'Before sphalo ',blk%fida,blk%m,psb_nnz_,blk%infoa(psb_nnz_) & ' From cdbldext _:',p%desc_data%matrix_data(psb_n_row_),&
Call psb_sphalo(a,desc_p,blk,info,& & p%desc_data%matrix_data(psb_n_col_)
& outfmt=outfmt,data=psb_comm_ext_,rowscale=.true.)
call mld_bjac_bld(a,p,upd,info,data=data_)
if (info /= 0) then if (info /= 0) then
info=4010 info=4010
ch_err='psb_sphalo' ch_err='mld_bjac_bld'
call psb_errpush(info,name,a_err=ch_err) call psb_errpush(info,name,a_err=ch_err)
goto 9999 goto 9999
end if end if
if (debug_level >= psb_debug_outer_) &
& write(debug_unit,*) me,' ',trim(name),&
& 'After psb_sphalo ',&
& blk%fida,blk%m,psb_nnz_,blk%infoa(psb_nnz_)
case default case default
info=4001 info=4001
ch_err='Invalid ptype' ch_err='Invalid ptype'
call psb_errpush(info,name,a_err=ch_err) call psb_errpush(info,name,a_err=ch_err)
@ -263,5 +212,5 @@ subroutine mld_dasmat_bld(ptype,novr,a,blk,desc_data,upd,desc_p,info,outfmt)
end if end if
Return Return
End Subroutine mld_dasmat_bld End Subroutine mld_das_bld

@ -96,7 +96,6 @@ subroutine mld_dbaseprec_aply(alpha,prec,x,beta,y,desc_data,trans,work,info)
! Local variables ! Local variables
integer :: n_row,n_col, int_err(5), nrow_d integer :: n_row,n_col, int_err(5), nrow_d
real(kind(1.d0)), pointer :: ww(:), aux(:), tx(:),ty(:) real(kind(1.d0)), pointer :: ww(:), aux(:), tx(:),ty(:)
character ::diagl, diagu
integer :: ictxt,np,me,isz, err_act integer :: ictxt,np,me,isz, err_act
character(len=20) :: name, ch_err character(len=20) :: name, ch_err
@ -108,9 +107,6 @@ subroutine mld_dbaseprec_aply(alpha,prec,x,beta,y,desc_data,trans,work,info)
call psb_info(ictxt, me, np) call psb_info(ictxt, me, np)
diagl='U'
diagu='U'
select case(trans) select case(trans)
case('N','n') case('N','n')
case('T','t','C','c') case('T','t','C','c')
@ -173,7 +169,14 @@ subroutine mld_dbaseprec_aply(alpha,prec,x,beta,y,desc_data,trans,work,info)
! !
! Additive Schwarz preconditioner ! Additive Schwarz preconditioner
! !
call mld_as_aply(alpha,prec,x,beta,y,desc_data,trans,work,info)
if(info /= 0) then
info=4010
ch_err='mld_as_aply'
goto 9999
end if
if (.false.) then
if (prec%iprcparm(mld_n_ovr_)==0) then if (prec%iprcparm(mld_n_ovr_)==0) then
! !
! shortcut: this fixes performance for RAS(0) == BJA ! shortcut: this fixes performance for RAS(0) == BJA
@ -289,8 +292,9 @@ subroutine mld_dbaseprec_aply(alpha,prec,x,beta,y,desc_data,trans,work,info)
case(psb_none_) case(psb_none_)
! !
! Would work anyway, but since it is supposed to do nothing ... ! Would work anyway, but since it is supposed to do nothing ...
! call f90_psovrl(ty,prec%desc_data,update=prec%a_restrict) ! call psb_ovrl(ty,prec%desc_data,info,&
! ! & update=prec%iprcparm(mld_sub_prol_),work=aux)
case(psb_sum_,psb_avg_) case(psb_sum_,psb_avg_)
! !
@ -324,6 +328,8 @@ subroutine mld_dbaseprec_aply(alpha,prec,x,beta,y,desc_data,trans,work,info)
deallocate(ww,aux,tx,ty) deallocate(ww,aux,tx,ty)
endif endif
end if end if
end if
case default case default
call psb_errpush(4001,name,a_err='Invalid mld_prec_type_') call psb_errpush(4001,name,a_err='Invalid mld_prec_type_')

@ -149,7 +149,31 @@ subroutine mld_dbaseprc_bld(a,desc_a,p,info,upd)
goto 9999 goto 9999
end if end if
case(mld_bjac_,mld_as_) case(mld_bjac_)
call mld_check_def(p%iprcparm(mld_sub_ren_),'renumbering',&
& mld_renum_none_,is_legal_renum)
call mld_check_def(p%iprcparm(mld_sub_solve_),'fact',&
& mld_ilu_n_,is_legal_ml_fact)
call psb_cdcpy(desc_a,p%desc_data,info)
if(info /= 0) then
info=4010
ch_err='psb_cdcpy'
call psb_errpush(info,name,a_err=ch_err)
goto 9999
end if
! Build the local part of the base preconditioner
call mld_bjac_bld(a,p,iupd,info)
if(info /= 0) then
info=4010
call psb_errpush(info,name,a_err='mld_bjac_bld')
goto 9999
end if
case(mld_as_)
! Block Jacobi and additive Schwarz preconditioners/smoothers ! Block Jacobi and additive Schwarz preconditioners/smoothers
call mld_check_def(p%iprcparm(mld_n_ovr_),'overlap',& call mld_check_def(p%iprcparm(mld_n_ovr_),'overlap',&
@ -174,7 +198,7 @@ subroutine mld_dbaseprc_bld(a,desc_a,p,info,upd)
& ': Calling mld_bjac_bld' & ': Calling mld_bjac_bld'
! Build the local part of the base preconditioner ! Build the local part of the base preconditioner
call mld_bjac_bld(a,desc_a,p,iupd,info) call mld_as_bld(a,desc_a,p,iupd,info)
if(info /= 0) then if(info /= 0) then
info=4010 info=4010
call psb_errpush(info,name,a_err='mld_bjac_bld') call psb_errpush(info,name,a_err='mld_bjac_bld')
@ -182,6 +206,7 @@ subroutine mld_dbaseprc_bld(a,desc_a,p,info,upd)
end if end if
case default case default
info=4001 info=4001
ch_err='Unknown mld_prec_type_' ch_err='Unknown mld_prec_type_'
call psb_errpush(info,name,a_err=ch_err) call psb_errpush(info,name,a_err=ch_err)

@ -84,15 +84,20 @@
! a - type(psb_dspmat_type), input. ! a - type(psb_dspmat_type), input.
! The sparse matrix structure containing the local part of the ! The sparse matrix structure containing the local part of the
! matrix to be preconditioned or factorized. ! matrix to be preconditioned or factorized.
! desc_a - type(psb_desc_type), input.
! The communication descriptor associated to a.
! p - type(mld_dbaseprec_type), input/output. ! p - type(mld_dbaseprec_type), input/output.
! The 'base preconditioner' data structure containing the local ! The 'base preconditioner' data structure containing the local
! part of the preconditioner or solver at the current level. ! part of the preconditioner or solver at the current level.
!
! info - integer, output. ! info - integer, output.
! Error code. ! Error code.
! data - integer Which index list in desc_a should be used to retrieve
! rows, default psb_comm_halo_
! psb_no_comm_ don't retrieve remote rows
! psb_comm_halo_ use halo_index
! psb_comm_ext_ use ext_index
! psb_comm_ovrl_ DISABLED for this routine.
! !
subroutine mld_dbjac_bld(a,desc_a,p,upd,info) subroutine mld_dbjac_bld(a,p,upd,info,data)
use psb_base_mod use psb_base_mod
use mld_prec_mod, mld_protect_name => mld_dbjac_bld use mld_prec_mod, mld_protect_name => mld_dbjac_bld
@ -101,10 +106,10 @@ subroutine mld_dbjac_bld(a,desc_a,p,upd,info)
! Arguments ! Arguments
type(psb_dspmat_type), intent(in), target :: a type(psb_dspmat_type), intent(in), target :: a
type(psb_desc_type), intent(in) :: desc_a
type(mld_dbaseprc_type), intent(inout) :: p type(mld_dbaseprc_type), intent(inout) :: p
integer, intent(out) :: info integer, intent(out) :: info
character, intent(in) :: upd character, intent(in) :: upd
integer, intent(in), optional :: data
! Local Variables ! Local Variables
integer :: i, k, m integer :: i, k, m
@ -112,9 +117,9 @@ subroutine mld_dbjac_bld(a,desc_a,p,upd,info)
character :: trans, unitd character :: trans, unitd
type(psb_dspmat_type) :: blck, atmp type(psb_dspmat_type) :: blck, atmp
integer :: debug_level, debug_unit integer :: debug_level, debug_unit
integer :: err_act, n_row, nrow_a,n_col integer :: err_act, n_row, nrow_a,n_col, data_
integer :: ictxt,np,me integer :: ictxt,np,me
character(len=20) :: name character(len=20) :: name, ch_err
character(len=5), parameter :: coofmt='COO', csrfmt='CSR' character(len=5), parameter :: coofmt='COO', csrfmt='CSR'
if(psb_get_errstatus().ne.0) return if(psb_get_errstatus().ne.0) return
@ -123,7 +128,7 @@ subroutine mld_dbjac_bld(a,desc_a,p,upd,info)
call psb_erractionsave(err_act) call psb_erractionsave(err_act)
debug_unit = psb_get_debug_unit() debug_unit = psb_get_debug_unit()
debug_level = psb_get_debug_level() debug_level = psb_get_debug_level()
ictxt = psb_cd_get_context(desc_a) ictxt = psb_cd_get_context(p%desc_data)
call psb_info(ictxt, me, np) call psb_info(ictxt, me, np)
m = a%m m = a%m
@ -151,25 +156,50 @@ subroutine mld_dbjac_bld(a,desc_a,p,upd,info)
if (debug_level >= psb_debug_outer_) & if (debug_level >= psb_debug_outer_) &
& write(debug_unit,*) me,' ',trim(name),': Start',& & write(debug_unit,*) me,' ',trim(name),': Start',&
& p%iprcparm(mld_prec_type_),p%iprcparm(mld_n_ovr_) & p%iprcparm(mld_prec_type_),p%iprcparm(mld_n_ovr_)
if (present(data)) then
data_ = data
else
data_ = psb_no_comm_
end if
! select case (data_)
! Build the communication descriptor for the Additive Schwarz case(psb_no_comm_)
! preconditioner and retrieves the remote pieces of the local If (debug_level >= psb_debug_outer_) &
! extended matrix needed by that preconditioner. If the & write(debug_unit,*) me,' ',trim(name),&
! preconditioner is the block-Jacobi one, only a copy of the & ' calling allocate novr=0'
! descriptor of the original matrix is made. call psb_sp_all(0,0,blck,1,info)
! if(info /= 0) then
call mld_asmat_bld(p%iprcparm(mld_prec_type_),p%iprcparm(mld_n_ovr_),a,& info=4010
& blck,desc_a,upd,p%desc_data,info,outfmt=csrfmt) ch_err='psb_sp_all'
call psb_errpush(info,name,a_err=ch_err)
goto 9999
end if
blck%fida = 'COO'
blck%infoa(psb_nnz_) = 0
case(psb_comm_halo_,psb_comm_ext_)
if (debug_level >= psb_debug_outer_) &
& write(debug_unit,*) me,' ',trim(name),&
& 'Before sphalo ',blck%fida,blck%m,psb_nnz_,blck%infoa(psb_nnz_)
Call psb_sphalo(a,p%desc_data,blck,info,data=data_,rowscale=.true.)
if (info /= 0) then if (info /= 0) then
call psb_errpush(4010,name,a_err='mld_asmat_bld') info=4010
ch_err='psb_sphalo'
call psb_errpush(info,name,a_err=ch_err)
goto 9999 goto 9999
end if end if
if (debug_level >= psb_debug_outer_) & if (debug_level >= psb_debug_outer_) &
& write(debug_unit,*) me,' ',trim(name),& & write(debug_unit,*) me,' ',trim(name),&
& ': out of mld_asmat_bld' & 'After psb_sphalo ',&
& blck%fida,blck%m,psb_nnz_,blck%infoa(psb_nnz_)
case default
info=35
call psb_errpush(info,name,i_err=(/5,data,0,0,0/))
goto 9999
end select
! !
! Treat separately the case the local matrix has to be reordered ! Treat separately the case the local matrix has to be reordered
@ -187,7 +217,7 @@ subroutine mld_dbjac_bld(a,desc_a,p,upd,info)
! according to the value of p%iprcparm(sub_ren_). The reordered ! according to the value of p%iprcparm(sub_ren_). The reordered
! matrix is stored into atmp, using the COO format. ! matrix is stored into atmp, using the COO format.
! !
call mld_sp_renum(a,desc_a,blck,p,atmp,info) call mld_sp_renum(a,blck,p,atmp,info)
if (info/=0) then if (info/=0) then
call psb_errpush(4010,name,a_err='mld_sp_renum') call psb_errpush(4010,name,a_err='mld_sp_renum')
goto 9999 goto 9999
@ -233,7 +263,7 @@ subroutine mld_dbjac_bld(a,desc_a,p,upd,info)
! ILU(k)/MILU(k)/ILU(k,t) factorization. ! ILU(k)/MILU(k)/ILU(k,t) factorization.
! !
call psb_spcnv(atmp,info,afmt='csr',dupl=psb_dupl_add_) call psb_spcnv(atmp,info,afmt='csr',dupl=psb_dupl_add_)
if (info == 0) call mld_ilu_bld(atmp,p%desc_data,p,upd,info) if (info == 0) call mld_ilu_bld(atmp,p,upd,info)
if (info/=0) then if (info/=0) then
call psb_errpush(4010,name,a_err='mld_ilu_bld') call psb_errpush(4010,name,a_err='mld_ilu_bld')
goto 9999 goto 9999
@ -338,7 +368,7 @@ subroutine mld_dbjac_bld(a,desc_a,p,upd,info)
! !
! Compute the incomplete LU factorization. ! Compute the incomplete LU factorization.
! !
call mld_ilu_bld(a,desc_a,p,upd,info,blck=blck) call mld_ilu_bld(a,p,upd,info,blck=blck)
if (info/=0) then if (info/=0) then
call psb_errpush(4010,name,a_err='mld_ilu_bld') call psb_errpush(4010,name,a_err='mld_ilu_bld')
goto 9999 goto 9999
@ -463,7 +493,7 @@ subroutine mld_dbjac_bld(a,desc_a,p,upd,info)
! !
! Compute the LU factorization. ! Compute the LU factorization.
! !
if (info == 0) call psb_ipcoo2csc(atmp,info,clshr=.true.) if (info == 0) call psb_spcnv(atmp,info,afmt='csc',dupl=psb_dupl_add_)
if (info == 0) call mld_umf_bld(atmp,p%desc_data,p,info) if (info == 0) call mld_umf_bld(atmp,p%desc_data,p,info)
if (debug_level >= psb_debug_outer_) & if (debug_level >= psb_debug_outer_) &
& write(debug_unit,*) me,' ',trim(name),& & write(debug_unit,*) me,' ',trim(name),&

@ -70,8 +70,6 @@
! only the 'original' local part of the matrix to be factorized, ! only the 'original' local part of the matrix to be factorized,
! i.e. the rows of the matrix held by the calling process according ! i.e. the rows of the matrix held by the calling process according
! to the initial data distribution. ! to the initial data distribution.
! desc_a - type(psb_desc_type), input.
! The communication descriptor associated to a.
! p - type(mld_dbaseprc_type), input/output. ! p - type(mld_dbaseprc_type), input/output.
! The 'base preconditioner' data structure. In input, p%iprcparm ! The 'base preconditioner' data structure. In input, p%iprcparm
! contains information on the type of factorization to be computed. ! contains information on the type of factorization to be computed.
@ -88,7 +86,7 @@
! greater than 0. If the overlap is 0 or the matrix has been reordered ! greater than 0. If the overlap is 0 or the matrix has been reordered
! (see mld_bjac_bld), then blck does not contain any row. ! (see mld_bjac_bld), then blck does not contain any row.
! !
subroutine mld_dilu_bld(a,desc_a,p,upd,info,blck) subroutine mld_dilu_bld(a,p,upd,info,blck)
use psb_base_mod use psb_base_mod
use mld_prec_mod, mld_protect_name => mld_dilu_bld use mld_prec_mod, mld_protect_name => mld_dilu_bld
@ -98,7 +96,6 @@ subroutine mld_dilu_bld(a,desc_a,p,upd,info,blck)
! Arguments ! Arguments
type(psb_dspmat_type), intent(in), target :: a type(psb_dspmat_type), intent(in), target :: a
type(mld_dbaseprc_type), intent(inout) :: p type(mld_dbaseprc_type), intent(inout) :: p
type(psb_desc_type), intent(in) :: desc_a
character, intent(in) :: upd character, intent(in) :: upd
integer, intent(out) :: info integer, intent(out) :: info
type(psb_dspmat_type), intent(in), optional :: blck type(psb_dspmat_type), intent(in), optional :: blck
@ -116,7 +113,7 @@ subroutine mld_dilu_bld(a,desc_a,p,upd,info,blck)
call psb_erractionsave(err_act) call psb_erractionsave(err_act)
debug_unit = psb_get_debug_unit() debug_unit = psb_get_debug_unit()
debug_level = psb_get_debug_level() debug_level = psb_get_debug_level()
ictxt = psb_cd_get_context(desc_a) ictxt = psb_cd_get_context(p%desc_data)
call psb_info(ictxt, me, np) call psb_info(ictxt, me, np)
if (debug_level >= psb_debug_outer_) & if (debug_level >= psb_debug_outer_) &
& write(debug_unit,*) me,' ',trim(name),' start' & write(debug_unit,*) me,' ',trim(name),' start'
@ -148,14 +145,14 @@ subroutine mld_dilu_bld(a,desc_a,p,upd,info,blck)
end if end if
endif endif
nrow_a = psb_cd_get_local_rows(desc_a) nrow_a = psb_sp_get_nrows(a)
nztota = psb_sp_get_nnzeros(a) nztota = psb_sp_get_nnzeros(a)
if (present(blck)) then if (present(blck)) then
nztota = nztota + psb_sp_get_nnzeros(blck) nztota = nztota + psb_sp_get_nnzeros(blck)
end if end if
if (debug_level >= psb_debug_outer_) & if (debug_level >= psb_debug_outer_) &
& write(debug_unit,*) me,' ',trim(name),& & write(debug_unit,*) me,' ',trim(name),&
& ': out get_nnzeros',nztota,a%m,a%k & ': out get_nnzeros',nztota,a%m,a%k,nrow_a
n_row = p%desc_data%matrix_data(psb_n_row_) n_row = p%desc_data%matrix_data(psb_n_row_)
p%av(mld_l_pr_)%m = n_row p%av(mld_l_pr_)%m = n_row

@ -205,7 +205,6 @@ subroutine mld_dprec_aply1(prec,x,desc_data,info,trans)
character(len=1), optional :: trans character(len=1), optional :: trans
! Local variables ! Local variables
character :: trans_
integer :: ictxt,np,me, err_act integer :: ictxt,np,me, err_act
real(kind(1.d0)), pointer :: WW(:), w1(:) real(kind(1.d0)), pointer :: WW(:), w1(:)
character(len=20) :: name character(len=20) :: name
@ -217,11 +216,6 @@ subroutine mld_dprec_aply1(prec,x,desc_data,info,trans)
ictxt = psb_cd_get_context(desc_data) ictxt = psb_cd_get_context(desc_data)
call psb_info(ictxt, me, np) call psb_info(ictxt, me, np)
if (present(trans)) then
trans_=trans
else
trans_='N'
end if
allocate(ww(size(x)),w1(size(x)),stat=info) allocate(ww(size(x)),w1(size(x)),stat=info)
if (info /= 0) then if (info /= 0) then
@ -231,7 +225,7 @@ subroutine mld_dprec_aply1(prec,x,desc_data,info,trans)
goto 9999 goto 9999
end if end if
call mld_precaply(prec,x,ww,desc_data,info,trans_,work=w1) call mld_precaply(prec,x,ww,desc_data,info,trans=trans,work=w1)
if (info /= 0) then if (info /= 0) then
call psb_errpush(4010,name,a_err='mld_precaply') call psb_errpush(4010,name,a_err='mld_precaply')
goto 9999 goto 9999

@ -34,9 +34,9 @@
!!$ POSSIBILITY OF SUCH DAMAGE. !!$ POSSIBILITY OF SUCH DAMAGE.
!!$ !!$
!!$ !!$
! File: mld_dslu_bld.f90 ! File: mld_dslud_bld.f90
! !
! Subroutine: mld_dslu_bld ! Subroutine: mld_dsludist_bld
! Version: real ! Version: real
! !
! This routine computes the LU factorization of of a distributed matrix, ! This routine computes the LU factorization of of a distributed matrix,

@ -61,8 +61,6 @@
! part of the matrix to be reordered, i.e. the rows of the matrix ! part of the matrix to be reordered, i.e. the rows of the matrix
! held by the calling process according to the initial data ! held by the calling process according to the initial data
! distribution. ! distribution.
! desc_a - type(psb_desc_type), input.
! The communication descriptor associated to a.
! blck - type(psb_dspmat_type), input. ! blck - type(psb_dspmat_type), input.
! The sparse matrix structure containing the remote rows of the ! The sparse matrix structure containing the remote rows of the
! matrix to be reordered, that have been retrieved by mld_asmat_bld ! matrix to be reordered, that have been retrieved by mld_asmat_bld
@ -81,7 +79,7 @@
! info - integer, output. ! info - integer, output.
! Error code. ! Error code.
! !
subroutine mld_dsp_renum(a,desc_a,blck,p,atmp,info) subroutine mld_dsp_renum(a,blck,p,atmp,info)
use psb_base_mod use psb_base_mod
use mld_prec_mod, mld_protect_name => mld_dsp_renum use mld_prec_mod, mld_protect_name => mld_dsp_renum
@ -92,7 +90,6 @@ subroutine mld_dsp_renum(a,desc_a,blck,p,atmp,info)
type(psb_dspmat_type), intent(in) :: a,blck type(psb_dspmat_type), intent(in) :: a,blck
type(psb_dspmat_type), intent(inout) :: atmp type(psb_dspmat_type), intent(inout) :: atmp
type(mld_dbaseprc_type), intent(inout) :: p type(mld_dbaseprc_type), intent(inout) :: p
type(psb_desc_type), intent(in) :: desc_a
integer, intent(out) :: info integer, intent(out) :: info
! Local variables ! Local variables
@ -107,7 +104,7 @@ subroutine mld_dsp_renum(a,desc_a,blck,p,atmp,info)
name='mld_dsp_renum' name='mld_dsp_renum'
call psb_erractionsave(err_act) call psb_erractionsave(err_act)
ictxt=psb_cd_get_context(desc_a) ictxt=psb_cd_get_context(p%desc_data)
call psb_info(ictxt, me, np) call psb_info(ictxt, me, np)
! !
@ -127,12 +124,6 @@ subroutine mld_dsp_renum(a,desc_a,blck,p,atmp,info)
if (p%iprcparm(mld_sub_ren_)==mld_renum_glb_) then if (p%iprcparm(mld_sub_ren_)==mld_renum_glb_) then
!
! Compute the row and column reordering coherent with the
! global indices
!
mglob = psb_cd_get_global_rows(desc_a)
! !
! Remember: we have switched IA1=COLS and IA2=ROWS. ! Remember: we have switched IA1=COLS and IA2=ROWS.
! Now identify the set of distinct local column indices. ! Now identify the set of distinct local column indices.
@ -144,9 +135,7 @@ subroutine mld_dsp_renum(a,desc_a,blck,p,atmp,info)
goto 9999 goto 9999
end if end if
do k=1,nnr call psb_loc_to_glob(itmp2(1:nnr),p%desc_data,info,iact='I')
itmp2(k) = p%desc_data%loc_to_glob(k)
enddo
! !
! Compute reordering. We want new(i) = old(perm(i)). ! Compute reordering. We want new(i) = old(perm(i)).
! !

@ -45,29 +45,6 @@ module mld_prec_mod
use mld_prec_type use mld_prec_type
interface mld_precbld
subroutine mld_dprecbld(a,desc_a,prec,info,upd)
use psb_base_mod
use mld_prec_type
implicit none
type(psb_dspmat_type), intent(in), target :: a
type(psb_desc_type), intent(in), target :: desc_a
type(mld_dprec_type), intent(inout) :: prec
integer, intent(out) :: info
character, intent(in),optional :: upd
end subroutine mld_dprecbld
subroutine mld_zprecbld(a,desc_a,prec,info,upd)
use psb_base_mod
use mld_prec_type
implicit none
type(psb_zspmat_type), intent(in), target :: a
type(psb_desc_type), intent(in), target :: desc_a
type(mld_zprec_type), intent(inout) :: prec
integer, intent(out) :: info
character, intent(in),optional :: upd
end subroutine mld_zprecbld
end interface
interface mld_precinit interface mld_precinit
subroutine mld_dprecinit(p,ptype,info,nlev) subroutine mld_dprecinit(p,ptype,info,nlev)
use psb_base_mod use psb_base_mod
@ -202,48 +179,35 @@ module mld_prec_mod
end subroutine mld_zprec_aply1 end subroutine mld_zprec_aply1
end interface end interface
interface mld_baseprc_bld interface mld_baseprec_aply
subroutine mld_dbaseprc_bld(a,desc_a,p,info,upd) subroutine mld_dbaseprec_aply(alpha,prec,x,beta,y,desc_data,trans,work,info)
use psb_base_mod
use mld_prec_type
type(psb_dspmat_type), target :: a
type(psb_desc_type), intent(in), target :: desc_a
type(mld_dbaseprc_type),intent(inout) :: p
integer, intent(out) :: info
character, intent(in), optional :: upd
end subroutine mld_dbaseprc_bld
subroutine mld_zbaseprc_bld(a,desc_a,p,info,upd)
use psb_base_mod
use mld_prec_type
type(psb_zspmat_type), target :: a
type(psb_desc_type), intent(in), target :: desc_a
type(mld_zbaseprc_type),intent(inout) :: p
integer, intent(out) :: info
character, intent(in), optional :: upd
end subroutine mld_zbaseprc_bld
end interface
interface mld_mlprec_bld
subroutine mld_dmlprec_bld(a,desc_a,p,info)
use psb_base_mod use psb_base_mod
use mld_prec_type use mld_prec_type
type(psb_dspmat_type), intent(inout), target :: a type(psb_desc_type),intent(in) :: desc_data
type(psb_desc_type), intent(in), target :: desc_a type(mld_dbaseprc_type), intent(in) :: prec
type(mld_dbaseprc_type), intent(inout), target :: p real(kind(0.d0)),intent(in) :: x(:)
real(kind(0.d0)),intent(inout) :: y(:)
real(kind(0.d0)),intent(in) :: alpha,beta
character(len=1) :: trans
real(kind(0.d0)),target :: work(:)
integer, intent(out) :: info integer, intent(out) :: info
end subroutine mld_dmlprec_bld end subroutine mld_dbaseprec_aply
subroutine mld_zmlprec_bld(a,desc_a,p,info) subroutine mld_zbaseprec_aply(alpha,prec,x,beta,y,desc_data,trans,work,info)
use psb_base_mod use psb_base_mod
use mld_prec_type use mld_prec_type
type(psb_zspmat_type), intent(inout), target :: a type(psb_desc_type),intent(in) :: desc_data
type(psb_desc_type), intent(in), target :: desc_a type(mld_zbaseprc_type), intent(in) :: prec
type(mld_zbaseprc_type), intent(inout),target :: p complex(kind(1.d0)),intent(in) :: x(:)
complex(kind(1.d0)),intent(inout) :: y(:)
complex(kind(1.d0)),intent(in) :: alpha,beta
character(len=1) :: trans
complex(kind(1.d0)),target :: work(:)
integer, intent(out) :: info integer, intent(out) :: info
end subroutine mld_zmlprec_bld end subroutine mld_zbaseprec_aply
end interface end interface
interface mld_baseprec_aply interface mld_as_aply
subroutine mld_dbaseprec_aply(alpha,prec,x,beta,y,desc_data,trans,work,info) subroutine mld_das_aply(alpha,prec,x,beta,y,desc_data,trans,work,info)
use psb_base_mod use psb_base_mod
use mld_prec_type use mld_prec_type
type(psb_desc_type),intent(in) :: desc_data type(psb_desc_type),intent(in) :: desc_data
@ -254,8 +218,8 @@ module mld_prec_mod
character(len=1) :: trans character(len=1) :: trans
real(kind(0.d0)),target :: work(:) real(kind(0.d0)),target :: work(:)
integer, intent(out) :: info integer, intent(out) :: info
end subroutine mld_dbaseprec_aply end subroutine mld_das_aply
subroutine mld_zbaseprec_aply(alpha,prec,x,beta,y,desc_data,trans,work,info) subroutine mld_zas_aply(alpha,prec,x,beta,y,desc_data,trans,work,info)
use psb_base_mod use psb_base_mod
use mld_prec_type use mld_prec_type
type(psb_desc_type),intent(in) :: desc_data type(psb_desc_type),intent(in) :: desc_data
@ -266,7 +230,7 @@ module mld_prec_mod
character(len=1) :: trans character(len=1) :: trans
complex(kind(1.d0)),target :: work(:) complex(kind(1.d0)),target :: work(:)
integer, intent(out) :: info integer, intent(out) :: info
end subroutine mld_zbaseprec_aply end subroutine mld_zas_aply
end interface end interface
interface mld_mlprec_aply interface mld_mlprec_aply
@ -323,6 +287,91 @@ module mld_prec_mod
end subroutine mld_zbjac_aply end subroutine mld_zbjac_aply
end interface end interface
interface mld_precbld
subroutine mld_dprecbld(a,desc_a,prec,info,upd)
use psb_base_mod
use mld_prec_type
implicit none
type(psb_dspmat_type), intent(in), target :: a
type(psb_desc_type), intent(in), target :: desc_a
type(mld_dprec_type), intent(inout) :: prec
integer, intent(out) :: info
character, intent(in),optional :: upd
end subroutine mld_dprecbld
subroutine mld_zprecbld(a,desc_a,prec,info,upd)
use psb_base_mod
use mld_prec_type
implicit none
type(psb_zspmat_type), intent(in), target :: a
type(psb_desc_type), intent(in), target :: desc_a
type(mld_zprec_type), intent(inout) :: prec
integer, intent(out) :: info
character, intent(in),optional :: upd
end subroutine mld_zprecbld
end interface
interface mld_baseprc_bld
subroutine mld_dbaseprc_bld(a,desc_a,p,info,upd)
use psb_base_mod
use mld_prec_type
type(psb_dspmat_type), target :: a
type(psb_desc_type), intent(in), target :: desc_a
type(mld_dbaseprc_type),intent(inout) :: p
integer, intent(out) :: info
character, intent(in), optional :: upd
end subroutine mld_dbaseprc_bld
subroutine mld_zbaseprc_bld(a,desc_a,p,info,upd)
use psb_base_mod
use mld_prec_type
type(psb_zspmat_type), target :: a
type(psb_desc_type), intent(in), target :: desc_a
type(mld_zbaseprc_type),intent(inout) :: p
integer, intent(out) :: info
character, intent(in), optional :: upd
end subroutine mld_zbaseprc_bld
end interface
interface mld_as_bld
subroutine mld_das_bld(a,desc_a,p,upd,info)
use psb_base_mod
use mld_prec_type
type(psb_dspmat_type), target :: a
type(psb_desc_type), intent(in), target :: desc_a
type(mld_dbaseprc_type),intent(inout) :: p
character, intent(in) :: upd
integer, intent(out) :: info
end subroutine mld_das_bld
subroutine mld_zas_bld(a,desc_a,p,upd,info)
use psb_base_mod
use mld_prec_type
type(psb_zspmat_type), target :: a
type(psb_desc_type), intent(in), target :: desc_a
type(mld_zbaseprc_type),intent(inout) :: p
character, intent(in) :: upd
integer, intent(out) :: info
end subroutine mld_zas_bld
end interface
interface mld_mlprec_bld
subroutine mld_dmlprec_bld(a,desc_a,p,info)
use psb_base_mod
use mld_prec_type
type(psb_dspmat_type), intent(inout), target :: a
type(psb_desc_type), intent(in), target :: desc_a
type(mld_dbaseprc_type), intent(inout), target :: p
integer, intent(out) :: info
end subroutine mld_dmlprec_bld
subroutine mld_zmlprec_bld(a,desc_a,p,info)
use psb_base_mod
use mld_prec_type
type(psb_zspmat_type), intent(inout), target :: a
type(psb_desc_type), intent(in), target :: desc_a
type(mld_zbaseprc_type), intent(inout),target :: p
integer, intent(out) :: info
end subroutine mld_zmlprec_bld
end interface
interface mld_diag_bld interface mld_diag_bld
subroutine mld_ddiag_bld(a,desc_data,p,upd,info) subroutine mld_ddiag_bld(a,desc_data,p,upd,info)
use psb_base_mod use psb_base_mod
@ -345,43 +394,41 @@ module mld_prec_mod
end interface end interface
interface mld_bjac_bld interface mld_bjac_bld
subroutine mld_dbjac_bld(a,desc_data,p,upd,info) subroutine mld_dbjac_bld(a,p,upd,info,data)
use psb_base_mod use psb_base_mod
use mld_prec_type use mld_prec_type
integer, intent(out) :: info
type(psb_dspmat_type), intent(in), target :: a type(psb_dspmat_type), intent(in), target :: a
type(psb_desc_type),intent(in) :: desc_data
type(mld_dbaseprc_type), intent(inout) :: p type(mld_dbaseprc_type), intent(inout) :: p
character, intent(in) :: upd character, intent(in) :: upd
integer, intent(out) :: info
integer, intent(in), optional :: data
end subroutine mld_dbjac_bld end subroutine mld_dbjac_bld
subroutine mld_zbjac_bld(a,desc_data,p,upd,info) subroutine mld_zbjac_bld(a,p,upd,info,data)
use psb_base_mod use psb_base_mod
use mld_prec_type use mld_prec_type
integer, intent(out) :: info integer, intent(out) :: info
type(psb_zspmat_type), intent(in), target :: a type(psb_zspmat_type), intent(in), target :: a
type(psb_desc_type),intent(in) :: desc_data
type(mld_zbaseprc_type), intent(inout) :: p type(mld_zbaseprc_type), intent(inout) :: p
character, intent(in) :: upd character, intent(in) :: upd
integer, intent(in), optional :: data
end subroutine mld_zbjac_bld end subroutine mld_zbjac_bld
end interface end interface
interface mld_ilu_bld interface mld_ilu_bld
subroutine mld_dilu_bld(a,desc_data,p,upd,info,blck) subroutine mld_dilu_bld(a,p,upd,info,blck)
use psb_base_mod use psb_base_mod
use mld_prec_type use mld_prec_type
integer, intent(out) :: info integer, intent(out) :: info
type(psb_dspmat_type), intent(in), target :: a type(psb_dspmat_type), intent(in), target :: a
type(psb_desc_type),intent(in) :: desc_data
type(mld_dbaseprc_type), intent(inout) :: p type(mld_dbaseprc_type), intent(inout) :: p
character, intent(in) :: upd character, intent(in) :: upd
type(psb_dspmat_type), intent(in), optional :: blck type(psb_dspmat_type), intent(in), optional :: blck
end subroutine mld_dilu_bld end subroutine mld_dilu_bld
subroutine mld_zilu_bld(a,desc_data,p,upd,info,blck) subroutine mld_zilu_bld(a,p,upd,info,blck)
use psb_base_mod use psb_base_mod
use mld_prec_type use mld_prec_type
integer, intent(out) :: info integer, intent(out) :: info
type(psb_zspmat_type), intent(in), target :: a type(psb_zspmat_type), intent(in), target :: a
type(psb_desc_type),intent(in) :: desc_data
type(mld_zbaseprc_type), intent(inout) :: p type(mld_zbaseprc_type), intent(inout) :: p
character, intent(in) :: upd character, intent(in) :: upd
type(psb_zspmat_type), intent(in), optional :: blck type(psb_zspmat_type), intent(in), optional :: blck
@ -538,22 +585,20 @@ module mld_prec_mod
end interface end interface
interface mld_sp_renum interface mld_sp_renum
subroutine mld_dsp_renum(a,desc_a,blck,p,atmp,info) subroutine mld_dsp_renum(a,blck,p,atmp,info)
use psb_base_mod use psb_base_mod
use mld_prec_type use mld_prec_type
type(psb_dspmat_type), intent(in) :: a,blck type(psb_dspmat_type), intent(in) :: a,blck
type(psb_dspmat_type), intent(inout) :: atmp type(psb_dspmat_type), intent(inout) :: atmp
type(mld_dbaseprc_type), intent(inout) :: p type(mld_dbaseprc_type), intent(inout) :: p
type(psb_desc_type), intent(in) :: desc_a
integer, intent(out) :: info integer, intent(out) :: info
end subroutine mld_dsp_renum end subroutine mld_dsp_renum
subroutine mld_zsp_renum(a,desc_a,blck,p,atmp,info) subroutine mld_zsp_renum(a,blck,p,atmp,info)
use psb_base_mod use psb_base_mod
use mld_prec_type use mld_prec_type
type(psb_zspmat_type), intent(in) :: a,blck type(psb_zspmat_type), intent(in) :: a,blck
type(psb_zspmat_type), intent(inout) :: atmp type(psb_zspmat_type), intent(inout) :: atmp
type(mld_zbaseprc_type), intent(inout) :: p type(mld_zbaseprc_type), intent(inout) :: p
type(psb_desc_type), intent(in) :: desc_a
integer, intent(out) :: info integer, intent(out) :: info
end subroutine mld_zsp_renum end subroutine mld_zsp_renum
end interface end interface

@ -0,0 +1,295 @@
!!$
!!$
!!$ MLD2P4
!!$ MultiLevel Domain Decomposition Parallel Preconditioners Package
!!$ based on PSBLAS (Parallel Sparse BLAS v.2.0)
!!$
!!$ (C) Copyright 2007 Alfredo Buttari University of Rome Tor Vergata
!!$ Pasqua D'Ambra ICAR-CNR, Naples
!!$ Daniela di Serafino Second University of Naples
!!$ Salvatore Filippone 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 MLD2P4 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 MLD2P4 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.
!!$
!!$
! File: mld_zas_aply.f90
!
! Subroutine: mld_zas_aply
! Version: real
!
! This routine applies the Additive Schwarz preconditioner by computing
!
! Y = beta*Y + alpha*op(K^(-1))*X,
! where
! - K is the base preconditioner, stored in prec,
! - op(K^(-1)) is K^(-1) or its transpose, according to the value of trans,
! - X and Y are vectors,
! - alpha and beta are scalars.
!
!
! Arguments:
! alpha - real(kind(0.d0)), input.
! The scalar alpha.
! prec - type(mld_dbaseprc_type), input.
! The base preconditioner data structure containing the local part
! of the preconditioner K.
! x - real(kind(0.d0)), dimension(:), input.
! The local part of the vector X.
! beta - real(kind(0.d0)), input.
! The scalar beta.
! y - real(kind(0.d0)), dimension(:), input/output.
! The local part of the vector Y.
! desc_data - type(psb_desc_type), input.
! The communication descriptor associated to the matrix to be
! preconditioned.
! trans - character, optional.
! If trans='N','n' then op(K^(-1)) = K^(-1);
! if trans='T','t' then op(K^(-1)) = K^(-T) (transpose of K^(-1)).
! work - real(kind(0.d0)), dimension (:), optional, target.
! Workspace. Its size must be at least 4*psb_cd_get_local_cols(desc_data).
! info - integer, output.
! Error code.
!
subroutine mld_zas_aply(alpha,prec,x,beta,y,desc_data,trans,work,info)
use psb_base_mod
use mld_prec_mod, mld_protect_name => mld_zas_aply
implicit none
! Arguments
type(psb_desc_type),intent(in) :: desc_data
type(mld_zbaseprc_type), intent(in) :: prec
complex(kind(0.d0)),intent(in) :: x(:)
complex(kind(0.d0)),intent(inout) :: y(:)
complex(kind(0.d0)),intent(in) :: alpha,beta
character(len=1) :: trans
complex(kind(0.d0)),target :: work(:)
integer, intent(out) :: info
! Local variables
integer :: n_row,n_col, int_err(5), nrow_d
complex(kind(1.d0)), pointer :: ww(:), aux(:), tx(:),ty(:)
integer :: ictxt,np,me,isz, err_act
character(len=20) :: name, ch_err
name='mld_zas_aply'
info = 0
call psb_erractionsave(err_act)
ictxt = psb_cd_get_context(desc_data)
call psb_info(ictxt, me, np)
select case(trans)
case('N','n')
case('T','t','C','c')
case default
info=40
int_err(1)=6
ch_err(2:2)=trans
goto 9999
end select
select case(prec%iprcparm(mld_prec_type_))
case(mld_as_)
!
! Additive Schwarz preconditioner
!
if (prec%iprcparm(mld_n_ovr_)==0) then
!
! shortcut: this fixes performance for RAS(0) == BJA
!
call mld_bjac_aply(alpha,prec,x,beta,y,desc_data,trans,work,info)
if(info /= 0) then
info=4010
ch_err='psb_bjacaply'
goto 9999
end if
else
!
! Note: currently trans is unused
!
n_row = psb_cd_get_local_rows(prec%desc_data)
n_col = psb_cd_get_local_cols(prec%desc_data)
nrow_d = psb_cd_get_local_rows(desc_data)
isz=max(n_row,N_COL)
if ((6*isz) <= size(work)) then
ww => work(1:isz)
tx => work(isz+1:2*isz)
ty => work(2*isz+1:3*isz)
aux => work(3*isz+1:)
else if ((4*isz) <= size(work)) then
aux => work(1:)
allocate(ww(isz),tx(isz),ty(isz),stat=info)
if (info /= 0) then
call psb_errpush(4025,name,i_err=(/3*isz,0,0,0,0/),&
& a_err='complex(kind(1.d0))')
goto 9999
end if
else if ((3*isz) <= size(work)) then
ww => work(1:isz)
tx => work(isz+1:2*isz)
ty => work(2*isz+1:3*isz)
allocate(aux(4*isz),stat=info)
if (info /= 0) then
call psb_errpush(4025,name,i_err=(/4*isz,0,0,0,0/),&
& a_err='complex(kind(1.d0))')
goto 9999
end if
else
allocate(ww(isz),tx(isz),ty(isz),&
&aux(4*isz),stat=info)
if (info /= 0) then
call psb_errpush(4025,name,i_err=(/4*isz,0,0,0,0/),&
& a_err='complex(kind(1.d0))')
goto 9999
end if
endif
tx(1:nrow_d) = x(1:nrow_d)
tx(nrow_d+1:isz) = dzero
!
! Get the overlap entries of tx (tx==x)
!
if (prec%iprcparm(mld_sub_restr_)==psb_halo_) then
call psb_halo(tx,prec%desc_data,info,work=aux,data=psb_comm_ext_)
if(info /=0) then
info=4010
ch_err='psb_halo'
goto 9999
end if
else if (prec%iprcparm(mld_sub_restr_) /= psb_none_) then
call psb_errpush(4001,name,a_err='Invalid mld_sub_restr_')
goto 9999
end if
!
! If required, reorder tx according to the row/column permutation of the
! local extended matrix, stored into the permutation vector prec%perm
!
if (prec%iprcparm(mld_sub_ren_)>0) then
call psb_gelp('n',prec%perm,tx,info)
if(info /=0) then
info=4010
ch_err='psb_gelp'
goto 9999
end if
endif
!
! Apply to tx the block-Jacobi preconditioner/solver (multiple sweeps of the
! block-Jacobi solver can be applied at the coarsest level of a multilevel
! preconditioner). The resulting vector is ty.
!
call mld_bjac_aply(zone,prec,tx,zzero,ty,prec%desc_data,trans,aux,info)
if(info /= 0) then
info=4010
ch_err='mld_bjac_aply'
goto 9999
end if
!
! Apply to ty the inverse permutation of prec%perm
!
if (prec%iprcparm(mld_sub_ren_)>0) then
call psb_gelp('n',prec%invperm,ty,info)
if(info /= 0) then
info=4010
ch_err='psb_gelp'
goto 9999
end if
endif
select case (prec%iprcparm(mld_sub_prol_))
case(psb_none_)
!
! Would work anyway, but since it is supposed to do nothing ...
! call psb_ovrl(ty,prec%desc_data,info,&
! & update=prec%iprcparm(mld_sub_prol_),work=aux)
case(psb_sum_,psb_avg_)
!
! Update the overlap of ty
!
call psb_ovrl(ty,prec%desc_data,info,&
& update=prec%iprcparm(mld_sub_prol_),work=aux)
if(info /=0) then
info=4010
ch_err='psb_ovrl'
goto 9999
end if
case default
call psb_errpush(4001,name,a_err='Invalid mld_sub_prol_')
goto 9999
end select
!
! Compute y = beta*y + alpha*ty (ty==K^(-1)*tx)
!
call psb_geaxpby(alpha,ty,beta,y,desc_data,info)
if ((6*isz) <= size(work)) then
else if ((4*isz) <= size(work)) then
deallocate(ww,tx,ty)
else if ((3*isz) <= size(work)) then
deallocate(aux)
else
deallocate(ww,aux,tx,ty)
endif
end if
case default
call psb_errpush(4001,name,a_err='Invalid mld_prec_type_')
goto 9999
end select
call psb_erractionrestore(err_act)
return
9999 continue
call psb_errpush(info,name,i_err=int_err,a_err=ch_err)
call psb_erractionrestore(err_act)
if (err_act == psb_act_abort_) then
call psb_error()
return
end if
return
end subroutine mld_zas_aply

@ -34,15 +34,13 @@
!!$ POSSIBILITY OF SUCH DAMAGE. !!$ POSSIBILITY OF SUCH DAMAGE.
!!$ !!$
!!$ !!$
! File: mld_zasmat_bld.f90 ! File: mld_zas_bld.f90
! !
! Subroutine: mld_zasmat_bld ! Subroutine: mld_zas_bld
! Version: complex ! Version: complex
! !
! This routine builds the communication descriptor associated to the extended ! This routine builds the Additive Schwarz (AS) preconditioner.
! matrices that form the Additive Schwarz (AS) preconditioner and retrieves ! If the preconditioner is the block-Jacobi one, the routine makes only a copy of
! the remote pieces needed to build the local extended matrix. If the
! preconditioner is the block-Jacobi one, the routine makes only a copy of
! the descriptor of the original matrix. ! the descriptor of the original matrix.
! !
! !
@ -55,11 +53,7 @@
! a - type(psb_zspmat_type), input. ! a - type(psb_zspmat_type), input.
! The sparse matrix structure containing the local part of the ! The sparse matrix structure containing the local part of the
! matrix to be preconditioned. ! matrix to be preconditioned.
! blk - type(psb_zspmat_type), output. ! desc_a - type(psb_desc_type), input.
! The sparse matrix structure containing the remote rows that
! extend the local matrix according to novr. If novr = 0 then
! blk does not contain any row.
! desc_data - type(psb_desc_type), input.
! The communication descriptor of the sparse matrix a. ! The communication descriptor of the sparse matrix a.
! desc_p - type(psb_desc_type), output. ! desc_p - type(psb_desc_type), output.
! The communication descriptor associated to the extended ! The communication descriptor associated to the extended
@ -71,32 +65,32 @@
! preconditioner. Currently outfmt is set to 'CSR' by the ! preconditioner. Currently outfmt is set to 'CSR' by the
! calling routine mld_bjac_bld. ! calling routine mld_bjac_bld.
! !
subroutine mld_zasmat_bld(ptype,novr,a,blk,desc_data,upd,desc_p,info,outfmt) subroutine mld_zas_bld(a,desc_a,p,upd,info)
use psb_base_mod use psb_base_mod
use mld_prec_mod, mld_protect_name => mld_zasmat_bld use mld_prec_mod, mld_protect_name => mld_zas_bld
Implicit None Implicit None
! Arguments ! Arguments
integer, intent(in) :: ptype,novr ! Arguments
Type(psb_zspmat_type), Intent(in) :: a type(psb_zspmat_type), intent(in), target :: a
Type(psb_zspmat_type), Intent(out) :: blk Type(psb_desc_type), Intent(in) :: desc_a
type(mld_zbaseprc_type), intent(inout) :: p
character, intent(in) :: upd
integer, intent(out) :: info integer, intent(out) :: info
Type(psb_desc_type), Intent(inout) :: desc_p
Type(psb_desc_type), Intent(in) :: desc_data integer :: ptype,novr
Character, Intent(in) :: upd
character(len=5), optional :: outfmt
! Local variables ! Local variables
integer icomm integer icomm
Integer :: np,me,nnzero,& Integer :: np,me,nnzero,&
& ictxt, n_col,int_err(5),& & ictxt, n_col,int_err(5),&
& tot_recv, n_row,nhalo, nrow_a,err_act & tot_recv, n_row,nhalo, nrow_a,err_act, data_
integer :: debug_level, debug_unit integer :: debug_level, debug_unit
character(len=20) :: name, ch_err character(len=20) :: name, ch_err
name='mld_zasmat_bld' name='mld_as_bld'
if(psb_get_errstatus() /= 0) return if(psb_get_errstatus() /= 0) return
info=0 info=0
call psb_erractionsave(err_act) call psb_erractionsave(err_act)
@ -106,45 +100,21 @@ subroutine mld_zasmat_bld(ptype,novr,a,blk,desc_data,upd,desc_p,info,outfmt)
If (debug_level >= psb_debug_outer_) & If (debug_level >= psb_debug_outer_) &
& write(debug_unit,*) me,' ',trim(name),& & write(debug_unit,*) me,' ',trim(name),&
& ' start ', upd & ' start ', upd
ictxt = psb_cd_get_context(desc_data) ictxt = psb_cd_get_context(desc_a)
icomm = psb_cd_get_mpic(desc_data) icomm = psb_cd_get_mpic(desc_a)
Call psb_info(ictxt, me, np) Call psb_info(ictxt, me, np)
tot_recv=0 tot_recv=0
nrow_a = desc_data%matrix_data(psb_n_row_) nrow_a = psb_cd_get_local_rows(desc_a)
nnzero = Size(a%aspk) n_col = psb_cd_get_local_cols(desc_a)
n_col = desc_data%matrix_data(psb_n_col_) nnzero = psb_sp_get_nnzeros(a)
nhalo = n_col-nrow_a nhalo = n_col-nrow_a
ptype = p%iprcparm(mld_prec_type_)
novr = p%iprcparm(mld_n_ovr_)
select case (ptype) select case (ptype)
case (mld_bjac_)
!
! Block-Jacobi preconditioner. Copy the descriptor, just in case
! we want to renumber the rows and columns of the matrix.
!
call psb_sp_all(0,0,blk,1,info)
if(info /= 0) then
info=4010
ch_err='psb_sp_all'
call psb_errpush(info,name,a_err=ch_err)
goto 9999
end if
blk%fida = 'COO'
blk%infoa(psb_nnz_) = 0
If (upd == 'F') Then
call psb_cdcpy(desc_data,desc_p,info)
If(debug_level >= psb_debug_outer_) &
& write(debug_unit,*) me,' ',trim(name),&
& ' done cdcpy'
if(info /= 0) then
info=4010
ch_err='psb_cdcpy'
call psb_errpush(info,name,a_err=ch_err)
goto 9999
end if
endif
case(mld_as_) case(mld_as_)
! !
@ -161,23 +131,12 @@ subroutine mld_zasmat_bld(ptype,novr,a,blk,desc_data,upd,desc_p,info,outfmt)
! !
! Actually, this is just block Jacobi ! Actually, this is just block Jacobi
! !
If(debug_level >= psb_debug_outer_) & data_ = psb_no_comm_
& write(debug_unit,*) me,' ',trim(name),&
& ' calling allocate novr=0'
call psb_sp_all(0,0,blk,1,info)
if(info /= 0) then
info=4010
ch_err='psb_sp_all'
call psb_errpush(info,name,a_err=ch_err)
goto 9999
end if
blk%fida = 'COO'
blk%infoa(psb_nnz_) = 0
if (debug_level >= psb_debug_outer_) & if (debug_level >= psb_debug_outer_) &
& write(debug_unit,*) me,' ',trim(name),& & write(debug_unit,*) me,' ',trim(name),&
& 'Calling desccpy' & 'Calling desccpy'
if (upd == 'F') then if (upd == 'F') then
call psb_cdcpy(desc_data,desc_p,info) call psb_cdcpy(desc_a,p%desc_data,info)
If(debug_level >= psb_debug_outer_) & If(debug_level >= psb_debug_outer_) &
& write(debug_unit,*) me,' ',trim(name),& & write(debug_unit,*) me,' ',trim(name),&
& ' done cdcpy' & ' done cdcpy'
@ -191,10 +150,9 @@ subroutine mld_zasmat_bld(ptype,novr,a,blk,desc_data,upd,desc_p,info,outfmt)
& write(debug_unit,*) me,' ',trim(name),& & write(debug_unit,*) me,' ',trim(name),&
& 'Early return: P>=3 N_OVR=0' & 'Early return: P>=3 N_OVR=0'
endif endif
return
endif
else
data_ = psb_comm_ext_
If (upd == 'F') Then If (upd == 'F') Then
! !
! Build the auxiliary descriptor desc_p%matrix_data(psb_n_row_). ! Build the auxiliary descriptor desc_p%matrix_data(psb_n_row_).
@ -204,7 +162,7 @@ subroutine mld_zasmat_bld(ptype,novr,a,blk,desc_data,upd,desc_p,info,outfmt)
! might be used independently of the AS preconditioner, to build ! might be used independently of the AS preconditioner, to build
! a descriptor for an extended stencil in a PDE solver. ! a descriptor for an extended stencil in a PDE solver.
! !
call psb_cdbldext(a,desc_data,novr,desc_p,info,extype=psb_ovt_asov_) call psb_cdbldext(a,desc_a,novr,p%desc_data,info,extype=psb_ovt_asov_)
if (info /= 0) then if (info /= 0) then
info=4010 info=4010
ch_err='psb_cdbldext' ch_err='psb_cdbldext'
@ -213,36 +171,23 @@ subroutine mld_zasmat_bld(ptype,novr,a,blk,desc_data,upd,desc_p,info,outfmt)
end if end if
Endif Endif
if(debug_level >= psb_debug_outer_) & End if
& write(debug_unit,*) me,' ',trim(name),&
& ' From cdbldext _:',desc_p%matrix_data(psb_n_row_),&
& desc_p%matrix_data(psb_n_col_)
!
! Retrieve the remote pieces needed to build the local extended matrix
!
n_row = desc_p%matrix_data(psb_n_row_)
if(debug_level >= psb_debug_outer_) & if(debug_level >= psb_debug_outer_) &
& write(debug_unit,*) me,' ',trim(name),& & write(debug_unit,*) me,' ',trim(name),&
& 'Before sphalo ',blk%fida,blk%m,psb_nnz_,blk%infoa(psb_nnz_) & ' From cdbldext _:',p%desc_data%matrix_data(psb_n_row_),&
Call psb_sphalo(a,desc_p,blk,info,& & p%desc_data%matrix_data(psb_n_col_)
& outfmt=outfmt,data=psb_comm_ext_,rowscale=.true.)
call mld_bjac_bld(a,p,upd,info,data=data_)
if (info /= 0) then if (info /= 0) then
info=4010 info=4010
ch_err='psb_sphalo' ch_err='mld_bjac_bld'
call psb_errpush(info,name,a_err=ch_err) call psb_errpush(info,name,a_err=ch_err)
goto 9999 goto 9999
end if end if
if (debug_level >= psb_debug_outer_) &
& write(debug_unit,*) me,' ',trim(name),&
& 'After psb_sphalo ',&
& blk%fida,blk%m,psb_nnz_,blk%infoa(psb_nnz_)
case default case default
info=4001 info=4001
ch_err='Invalid ptype' ch_err='Invalid ptype'
call psb_errpush(info,name,a_err=ch_err) call psb_errpush(info,name,a_err=ch_err)
@ -263,5 +208,5 @@ subroutine mld_zasmat_bld(ptype,novr,a,blk,desc_data,upd,desc_p,info,outfmt)
end if end if
Return Return
End Subroutine mld_zasmat_bld End Subroutine mld_zas_bld

@ -96,7 +96,6 @@ subroutine mld_zbaseprec_aply(alpha,prec,x,beta,y,desc_data,trans,work,info)
! Local variables ! Local variables
integer :: n_row,n_col, int_err(5), nrow_d integer :: n_row,n_col, int_err(5), nrow_d
complex(kind(1.d0)), pointer :: ww(:), aux(:), tx(:),ty(:) complex(kind(1.d0)), pointer :: ww(:), aux(:), tx(:),ty(:)
character ::diagl, diagu
integer :: ictxt,np,me,isz, err_act integer :: ictxt,np,me,isz, err_act
character(len=20) :: name, ch_err character(len=20) :: name, ch_err
@ -108,9 +107,6 @@ subroutine mld_zbaseprec_aply(alpha,prec,x,beta,y,desc_data,trans,work,info)
call psb_info(ictxt, me, np) call psb_info(ictxt, me, np)
diagl='U'
diagu='U'
select case(trans) select case(trans)
case('N','n') case('N','n')
case('T','t','C','c') case('T','t','C','c')
@ -289,8 +285,9 @@ subroutine mld_zbaseprec_aply(alpha,prec,x,beta,y,desc_data,trans,work,info)
case(psb_none_) case(psb_none_)
! !
! Would work anyway, but since it is supposed to do nothing ... ! Would work anyway, but since it is supposed to do nothing ...
! call f90_psovrl(ty,prec%desc_data,update=prec%a_restrict) ! call psb_ovrl(ty,prec%desc_data,info,&
! ! & update=prec%iprcparm(mld_sub_prol_),work=aux)
case(psb_sum_,psb_avg_) case(psb_sum_,psb_avg_)
! !

@ -149,7 +149,31 @@ subroutine mld_zbaseprc_bld(a,desc_a,p,info,upd)
goto 9999 goto 9999
end if end if
case(mld_bjac_,mld_as_) case(mld_bjac_)
call mld_check_def(p%iprcparm(mld_sub_ren_),'renumbering',&
& mld_renum_none_,is_legal_renum)
call mld_check_def(p%iprcparm(mld_sub_solve_),'fact',&
& mld_ilu_n_,is_legal_ml_fact)
call psb_cdcpy(desc_a,p%desc_data,info)
if(info /= 0) then
info=4010
ch_err='psb_cdcpy'
call psb_errpush(info,name,a_err=ch_err)
goto 9999
end if
! Build the local part of the base preconditioner
call mld_bjac_bld(a,p,iupd,info)
if(info /= 0) then
info=4010
call psb_errpush(info,name,a_err='mld_bjac_bld')
goto 9999
end if
case(mld_as_)
! Block Jacobi and additive Schwarz preconditioners/smoothers ! Block Jacobi and additive Schwarz preconditioners/smoothers
call mld_check_def(p%iprcparm(mld_n_ovr_),'overlap',& call mld_check_def(p%iprcparm(mld_n_ovr_),'overlap',&
@ -174,7 +198,7 @@ subroutine mld_zbaseprc_bld(a,desc_a,p,info,upd)
& ': Calling mld_bjac_bld' & ': Calling mld_bjac_bld'
! Build the local part of the base preconditioner ! Build the local part of the base preconditioner
call mld_bjac_bld(a,desc_a,p,iupd,info) call mld_as_bld(a,desc_a,p,iupd,info)
if(info /= 0) then if(info /= 0) then
info=4010 info=4010
call psb_errpush(info,name,a_err='mld_bjac_bld') call psb_errpush(info,name,a_err='mld_bjac_bld')
@ -182,6 +206,7 @@ subroutine mld_zbaseprc_bld(a,desc_a,p,info,upd)
end if end if
case default case default
info=4001 info=4001
ch_err='Unknown mld_prec_type_' ch_err='Unknown mld_prec_type_'
call psb_errpush(info,name,a_err=ch_err) call psb_errpush(info,name,a_err=ch_err)

@ -91,8 +91,14 @@
! part of the preconditioner or solver at the current level. ! part of the preconditioner or solver at the current level.
! info - integer, output. ! info - integer, output.
! Error code. ! Error code.
! data - integer Which index list in desc_a should be used to retrieve
! rows, default psb_comm_halo_
! psb_no_comm_ don't retrieve remote rows
! psb_comm_halo_ use halo_index
! psb_comm_ext_ use ext_index
! psb_comm_ovrl_ DISABLED for this routine.
! !
subroutine mld_zbjac_bld(a,desc_a,p,upd,info) subroutine mld_zbjac_bld(a,p,upd,info,data)
use psb_base_mod use psb_base_mod
use mld_prec_mod, mld_protect_name => mld_zbjac_bld use mld_prec_mod, mld_protect_name => mld_zbjac_bld
@ -101,10 +107,10 @@ subroutine mld_zbjac_bld(a,desc_a,p,upd,info)
! Arguments ! Arguments
type(psb_zspmat_type), intent(in), target :: a type(psb_zspmat_type), intent(in), target :: a
type(psb_desc_type), intent(in) :: desc_a
type(mld_zbaseprc_type), intent(inout) :: p type(mld_zbaseprc_type), intent(inout) :: p
integer, intent(out) :: info integer, intent(out) :: info
character, intent(in) :: upd character, intent(in) :: upd
integer, intent(in), optional :: data
! Local Variables ! Local Variables
integer :: i, k, m integer :: i, k, m
@ -112,9 +118,9 @@ subroutine mld_zbjac_bld(a,desc_a,p,upd,info)
character :: trans, unitd character :: trans, unitd
type(psb_zspmat_type) :: blck, atmp type(psb_zspmat_type) :: blck, atmp
integer :: debug_level, debug_unit integer :: debug_level, debug_unit
integer :: err_act, n_row, nrow_a,n_col integer :: err_act, n_row, nrow_a,n_col, data_
integer :: ictxt,np,me integer :: ictxt,np,me
character(len=20) :: name character(len=20) :: name, ch_err
character(len=5), parameter :: coofmt='COO', csrfmt='CSR' character(len=5), parameter :: coofmt='COO', csrfmt='CSR'
if(psb_get_errstatus().ne.0) return if(psb_get_errstatus().ne.0) return
@ -123,7 +129,7 @@ subroutine mld_zbjac_bld(a,desc_a,p,upd,info)
call psb_erractionsave(err_act) call psb_erractionsave(err_act)
debug_unit = psb_get_debug_unit() debug_unit = psb_get_debug_unit()
debug_level = psb_get_debug_level() debug_level = psb_get_debug_level()
ictxt = psb_cd_get_context(desc_a) ictxt = psb_cd_get_context(p%desc_data)
call psb_info(ictxt, me, np) call psb_info(ictxt, me, np)
m = a%m m = a%m
@ -151,25 +157,50 @@ subroutine mld_zbjac_bld(a,desc_a,p,upd,info)
if (debug_level >= psb_debug_outer_) & if (debug_level >= psb_debug_outer_) &
& write(debug_unit,*) me,' ',trim(name),': Start',& & write(debug_unit,*) me,' ',trim(name),': Start',&
& p%iprcparm(mld_prec_type_),p%iprcparm(mld_n_ovr_) & p%iprcparm(mld_prec_type_),p%iprcparm(mld_n_ovr_)
if (present(data)) then
data_ = data
else
data_ = psb_no_comm_
end if
! select case (data_)
! Build the communication descriptor for the Additive Schwarz case(psb_no_comm_)
! preconditioner and retrieves the remote pieces of the local If (debug_level >= psb_debug_outer_) &
! extended matrix needed by that preconditioner. If the & write(debug_unit,*) me,' ',trim(name),&
! preconditioner is the block-Jacobi one, only a copy of the & ' calling allocate novr=0'
! descriptor of the original matrix is made. call psb_sp_all(0,0,blck,1,info)
! if(info /= 0) then
call mld_asmat_bld(p%iprcparm(mld_prec_type_),p%iprcparm(mld_n_ovr_),a,& info=4010
& blck,desc_a,upd,p%desc_data,info,outfmt=csrfmt) ch_err='psb_sp_all'
call psb_errpush(info,name,a_err=ch_err)
goto 9999
end if
blck%fida = 'COO'
blck%infoa(psb_nnz_) = 0
case(psb_comm_halo_,psb_comm_ext_)
if (debug_level >= psb_debug_outer_) &
& write(debug_unit,*) me,' ',trim(name),&
& 'Before sphalo ',blck%fida,blck%m,psb_nnz_,blck%infoa(psb_nnz_)
Call psb_sphalo(a,p%desc_data,blck,info,data=data_,rowscale=.true.)
if (info /= 0) then if (info /= 0) then
call psb_errpush(4010,name,a_err='mld_asmat_bld') info=4010
ch_err='psb_sphalo'
call psb_errpush(info,name,a_err=ch_err)
goto 9999 goto 9999
end if end if
if (debug_level >= psb_debug_outer_) & if (debug_level >= psb_debug_outer_) &
& write(debug_unit,*) me,' ',trim(name),& & write(debug_unit,*) me,' ',trim(name),&
& ': out of mld_asmat_bld' & 'After psb_sphalo ',&
& blck%fida,blck%m,psb_nnz_,blck%infoa(psb_nnz_)
case default
info=35
call psb_errpush(info,name,i_err=(/5,data,0,0,0/))
goto 9999
end select
! !
! Treat separately the case the local matrix has to be reordered ! Treat separately the case the local matrix has to be reordered
@ -187,7 +218,7 @@ subroutine mld_zbjac_bld(a,desc_a,p,upd,info)
! according to the value of p%iprcparm(sub_ren_). The reordered ! according to the value of p%iprcparm(sub_ren_). The reordered
! matrix is stored into atmp, using the COO format. ! matrix is stored into atmp, using the COO format.
! !
call mld_sp_renum(a,desc_a,blck,p,atmp,info) call mld_sp_renum(a,blck,p,atmp,info)
if (info/=0) then if (info/=0) then
call psb_errpush(4010,name,a_err='mld_sp_renum') call psb_errpush(4010,name,a_err='mld_sp_renum')
goto 9999 goto 9999
@ -233,7 +264,7 @@ subroutine mld_zbjac_bld(a,desc_a,p,upd,info)
! ILU(k)/MILU(k)/ILU(k,t) factorization. ! ILU(k)/MILU(k)/ILU(k,t) factorization.
! !
call psb_spcnv(atmp,info,afmt='csr',dupl=psb_dupl_add_) call psb_spcnv(atmp,info,afmt='csr',dupl=psb_dupl_add_)
if (info == 0) call mld_ilu_bld(atmp,p%desc_data,p,upd,info) if (info == 0) call mld_ilu_bld(atmp,p,upd,info)
if (info/=0) then if (info/=0) then
call psb_errpush(4010,name,a_err='mld_ilu_bld') call psb_errpush(4010,name,a_err='mld_ilu_bld')
goto 9999 goto 9999
@ -338,7 +369,7 @@ subroutine mld_zbjac_bld(a,desc_a,p,upd,info)
! !
! Compute the incomplete LU factorization. ! Compute the incomplete LU factorization.
! !
call mld_ilu_bld(a,desc_a,p,upd,info,blck=blck) call mld_ilu_bld(a,p,upd,info,blck=blck)
if (info/=0) then if (info/=0) then
call psb_errpush(4010,name,a_err='mld_ilu_bld') call psb_errpush(4010,name,a_err='mld_ilu_bld')
goto 9999 goto 9999
@ -463,7 +494,7 @@ subroutine mld_zbjac_bld(a,desc_a,p,upd,info)
! !
! Compute the LU factorization. ! Compute the LU factorization.
! !
if (info == 0) call psb_ipcoo2csc(atmp,info,clshr=.true.) if (info == 0) call psb_spcnv(atmp,info,afmt='csc',dupl=psb_dupl_add_)
if (info == 0) call mld_umf_bld(atmp,p%desc_data,p,info) if (info == 0) call mld_umf_bld(atmp,p%desc_data,p,info)
if (debug_level >= psb_debug_outer_) & if (debug_level >= psb_debug_outer_) &
& write(debug_unit,*) me,' ',trim(name),& & write(debug_unit,*) me,' ',trim(name),&

@ -70,8 +70,6 @@
! only the 'original' local part of the matrix to be factorized, ! only the 'original' local part of the matrix to be factorized,
! i.e. the rows of the matrix held by the calling process according ! i.e. the rows of the matrix held by the calling process according
! to the initial data distribution. ! to the initial data distribution.
! desc_a - type(psb_desc_type), input.
! The communication descriptor associated to a.
! p - type(mld_zbaseprc_type), input/output. ! p - type(mld_zbaseprc_type), input/output.
! The 'base preconditioner' data structure. In input, p%iprcparm ! The 'base preconditioner' data structure. In input, p%iprcparm
! contains information on the type of factorization to be computed. ! contains information on the type of factorization to be computed.
@ -88,7 +86,7 @@
! greater than 0. If the overlap is 0 or the matrix has been reordered ! greater than 0. If the overlap is 0 or the matrix has been reordered
! (see mld_bjac_bld), then blck does not contain any row. ! (see mld_bjac_bld), then blck does not contain any row.
! !
subroutine mld_zilu_bld(a,desc_a,p,upd,info,blck) subroutine mld_zilu_bld(a,p,upd,info,blck)
use psb_base_mod use psb_base_mod
use mld_prec_mod, mld_protect_name => mld_zilu_bld use mld_prec_mod, mld_protect_name => mld_zilu_bld
@ -98,7 +96,6 @@ subroutine mld_zilu_bld(a,desc_a,p,upd,info,blck)
! Arguments ! Arguments
type(psb_zspmat_type), intent(in), target :: a type(psb_zspmat_type), intent(in), target :: a
type(mld_zbaseprc_type), intent(inout) :: p type(mld_zbaseprc_type), intent(inout) :: p
type(psb_desc_type), intent(in) :: desc_a
character, intent(in) :: upd character, intent(in) :: upd
integer, intent(out) :: info integer, intent(out) :: info
type(psb_zspmat_type), intent(in), optional :: blck type(psb_zspmat_type), intent(in), optional :: blck
@ -116,7 +113,7 @@ subroutine mld_zilu_bld(a,desc_a,p,upd,info,blck)
call psb_erractionsave(err_act) call psb_erractionsave(err_act)
debug_unit = psb_get_debug_unit() debug_unit = psb_get_debug_unit()
debug_level = psb_get_debug_level() debug_level = psb_get_debug_level()
ictxt = psb_cd_get_context(desc_a) ictxt = psb_cd_get_context(p%desc_data)
call psb_info(ictxt, me, np) call psb_info(ictxt, me, np)
if (debug_level >= psb_debug_outer_) & if (debug_level >= psb_debug_outer_) &
& write(debug_unit,*) me,' ',trim(name),' start' & write(debug_unit,*) me,' ',trim(name),' start'
@ -148,14 +145,14 @@ subroutine mld_zilu_bld(a,desc_a,p,upd,info,blck)
end if end if
endif endif
nrow_a = psb_cd_get_local_rows(desc_a) nrow_a = psb_sp_get_nrows(a)
nztota = psb_sp_get_nnzeros(a) nztota = psb_sp_get_nnzeros(a)
if (present(blck)) then if (present(blck)) then
nztota = nztota + psb_sp_get_nnzeros(blck) nztota = nztota + psb_sp_get_nnzeros(blck)
end if end if
if (debug_level >= psb_debug_outer_) & if (debug_level >= psb_debug_outer_) &
& write(debug_unit,*) me,' ',trim(name),& & write(debug_unit,*) me,' ',trim(name),&
& ': out get_nnzeros',nztota,a%m,a%k & ': out get_nnzeros',nztota,a%m,a%k,nrow_a
n_row = p%desc_data%matrix_data(psb_n_row_) n_row = p%desc_data%matrix_data(psb_n_row_)
p%av(mld_l_pr_)%m = n_row p%av(mld_l_pr_)%m = n_row

@ -206,7 +206,6 @@ subroutine mld_zprec_aply1(prec,x,desc_data,info,trans)
character(len=1), optional :: trans character(len=1), optional :: trans
! Local variables ! Local variables
character :: trans_
integer :: ictxt,np,me, err_act integer :: ictxt,np,me, err_act
complex(kind(1.d0)), pointer :: WW(:), w1(:) complex(kind(1.d0)), pointer :: WW(:), w1(:)
character(len=20) :: name character(len=20) :: name
@ -218,11 +217,6 @@ subroutine mld_zprec_aply1(prec,x,desc_data,info,trans)
ictxt = psb_cd_get_context(desc_data) ictxt = psb_cd_get_context(desc_data)
call psb_info(ictxt, me, np) call psb_info(ictxt, me, np)
if (present(trans)) then
trans_=trans
else
trans_='N'
end if
allocate(ww(size(x)),w1(size(x)),stat=info) allocate(ww(size(x)),w1(size(x)),stat=info)
if (info /= 0) then if (info /= 0) then
@ -232,7 +226,7 @@ subroutine mld_zprec_aply1(prec,x,desc_data,info,trans)
goto 9999 goto 9999
end if end if
call mld_precaply(prec,x,ww,desc_data,info,trans_,work=w1) call mld_precaply(prec,x,ww,desc_data,info,trans=trans,work=w1)
if (info /= 0) then if (info /= 0) then
call psb_errpush(4010,name,a_err='mld_precaply') call psb_errpush(4010,name,a_err='mld_precaply')
goto 9999 goto 9999

@ -34,9 +34,9 @@
!!$ POSSIBILITY OF SUCH DAMAGE. !!$ POSSIBILITY OF SUCH DAMAGE.
!!$ !!$
!!$ !!$
! File: mld_zslu_bld.f90 ! File: mld_zslud_bld.f90
! !
! Subroutine: mld_zslu_bld ! Subroutine: mld_zsludist_bld
! Version: real ! Version: real
! !
! This routine computes the LU factorization of of a distributed matrix, ! This routine computes the LU factorization of of a distributed matrix,

@ -61,8 +61,6 @@
! part of the matrix to be reordered, i.e. the rows of the matrix ! part of the matrix to be reordered, i.e. the rows of the matrix
! held by the calling process according to the initial data ! held by the calling process according to the initial data
! distribution. ! distribution.
! desc_a - type(psb_desc_type), input.
! The communication descriptor associated to a.
! blck - type(psb_zspmat_type), input. ! blck - type(psb_zspmat_type), input.
! The sparse matrix structure containing the remote rows of the ! The sparse matrix structure containing the remote rows of the
! matrix to be reordered, that have been retrieved by mld_asmat_bld ! matrix to be reordered, that have been retrieved by mld_asmat_bld
@ -81,7 +79,7 @@
! info - integer, output. ! info - integer, output.
! Error code. ! Error code.
! !
subroutine mld_zsp_renum(a,desc_a,blck,p,atmp,info) subroutine mld_zsp_renum(a,blck,p,atmp,info)
use psb_base_mod use psb_base_mod
use mld_prec_mod, mld_protect_name => mld_zsp_renum use mld_prec_mod, mld_protect_name => mld_zsp_renum
@ -92,7 +90,6 @@ subroutine mld_zsp_renum(a,desc_a,blck,p,atmp,info)
type(psb_zspmat_type), intent(in) :: a,blck type(psb_zspmat_type), intent(in) :: a,blck
type(psb_zspmat_type), intent(inout) :: atmp type(psb_zspmat_type), intent(inout) :: atmp
type(mld_zbaseprc_type), intent(inout) :: p type(mld_zbaseprc_type), intent(inout) :: p
type(psb_desc_type), intent(in) :: desc_a
integer, intent(out) :: info integer, intent(out) :: info
! Local variables ! Local variables
@ -107,7 +104,7 @@ subroutine mld_zsp_renum(a,desc_a,blck,p,atmp,info)
name='mld_zsp_renum' name='mld_zsp_renum'
call psb_erractionsave(err_act) call psb_erractionsave(err_act)
ictxt=psb_cd_get_context(desc_a) ictxt=psb_cd_get_context(p%desc_data)
call psb_info(ictxt, me, np) call psb_info(ictxt, me, np)
! !
@ -127,12 +124,6 @@ subroutine mld_zsp_renum(a,desc_a,blck,p,atmp,info)
if (p%iprcparm(mld_sub_ren_)==mld_renum_glb_) then if (p%iprcparm(mld_sub_ren_)==mld_renum_glb_) then
!
! Compute the row and column reordering coherent with the
! global indices
!
mglob = psb_cd_get_global_rows(desc_a)
! !
! Remember: we have switched IA1=COLS and IA2=ROWS. ! Remember: we have switched IA1=COLS and IA2=ROWS.
! Now identify the set of distinct local column indices. ! Now identify the set of distinct local column indices.
@ -144,9 +135,7 @@ subroutine mld_zsp_renum(a,desc_a,blck,p,atmp,info)
goto 9999 goto 9999
end if end if
do k=1,nnr call psb_loc_to_glob(itmp2(1:nnr),p%desc_data,info,iact='I')
itmp2(k) = p%desc_data%loc_to_glob(k)
enddo
! !
! Compute reordering. We want new(i) = old(perm(i)). ! Compute reordering. We want new(i) = old(perm(i)).
! !

@ -16,7 +16,7 @@ do
# 3rd batch: 14bis,64bis 4 sweeps # 3rd batch: 14bis,64bis 4 sweeps
echo "mpirun -np $np -machinefile locm df_bench >>log.part$part.ren$renum.${np}p" echo "mpirun -np $np -machinefile locm df_bench >>log.part$part.ren$renum.${np}p"
#/usr/local/mpich-gcc42/bin/mpirun -np $np -machinefile locm df_bench <<EOF #/usr/local/mpich-gcc42/bin/mpirun -np $np -machinefile locm df_bench <<EOF
/usr/local/mpich-gcc43-shm/bin/mpirun -np $np -machinefile locm df_bench >>run.gfc.kiva.log.${np}p.$date 2>err.gfc.kiva.log.${np}p.$date <<EOF /usr/local/mpich-gcc42/bin/mpirun -np $np -machinefile locm df_bench >>run.gfc.kiva.log.${np}p.$date 2>err.gfc.kiva.log.${np}p.$date <<EOF
out.${np}p.$date Out file 1: summary out.${np}p.$date Out file 1: summary
stat.${np}p.$date Out file 2: detailed for statistics stat.${np}p.$date Out file 2: detailed for statistics
BICGSTAB iterative method to use BICGSTAB iterative method to use

Loading…
Cancel
Save