*** empty log message ***

stopcriterion
Salvatore Filippone 8 years ago
parent 9f9ea6e780
commit a20fb9ca02

@ -56,10 +56,10 @@ subroutine mld_d_dec_map_bld(iorder,theta,a,desc_a,nlaggr,ilaggr,info)
integer(psb_ipk_), allocatable :: ils(:), neigh(:), irow(:), icol(:),& integer(psb_ipk_), allocatable :: ils(:), neigh(:), irow(:), icol(:),&
& ideg(:), idxs(:) & ideg(:), idxs(:)
real(psb_dpk_), allocatable :: val(:), diag(:) real(psb_dpk_), allocatable :: val(:), diag(:)
integer(psb_ipk_) :: icnt,nlp,k,n,ia,isz,nr, naggr,i,j,m, nz, ilg, ii integer(psb_ipk_) :: icnt,nlp,k,n,ia,isz,nr, naggr,i,j,m, nz, ilg, ii, ip
type(psb_d_csr_sparse_mat) :: acsr type(psb_d_csr_sparse_mat) :: acsr
real(psb_dpk_) :: cpling, tcl real(psb_dpk_) :: cpling, tcl
logical :: recovery logical :: recovery, candidate
integer(psb_ipk_) :: debug_level, debug_unit,err_act integer(psb_ipk_) :: debug_level, debug_unit,err_act
integer(psb_ipk_) :: ictxt,np,me integer(psb_ipk_) :: ictxt,np,me
integer(psb_ipk_) :: nrow, ncol, n_ne integer(psb_ipk_) :: nrow, ncol, n_ne
@ -107,28 +107,28 @@ subroutine mld_d_dec_map_bld(iorder,theta,a,desc_a,nlaggr,ilaggr,info)
call acsr%free() call acsr%free()
call psb_msort(ideg,ix=idxs,dir=psb_sort_down_) call psb_msort(ideg,ix=idxs,dir=psb_sort_down_)
end if end if
! Note: -(nr+1) Untouched as yet
! -i 1<=i<=nr Adjacent to aggregate i
! i 1<=i<=nr Belonging to aggregate i if (.true.) then
!
! Phase one: group nodes together. !
! Very simple minded strategy. ! New version.
! !
naggr = 0
nlp = 0 ! Note: -(nr+1) Untouched as yet
do ! -i 1<=i<=nr Adjacent to aggregate i
! i 1<=i<=nr Belonging to aggregate i
!
! Phase one: Start with disjoint groups.
!
naggr = 0
icnt = 0 icnt = 0
do ii=1, nr step1: do ii=1, nr
i = idxs(ii) i = idxs(ii)
if (ilaggr(i) == -(nr+1)) then
!
! 1. Untouched nodes are marked >0 together
! with their neighbours
!
icnt = icnt + 1
naggr = naggr + 1
ilaggr(i) = naggr
if (ilaggr(i) == -(nr+1)) then
call a%csget(i,i,nz,irow,icol,val,info) call a%csget(i,i,nz,irow,icol,val,info)
if (info /= psb_success_) then if (info /= psb_success_) then
info=psb_err_from_subroutine_ info=psb_err_from_subroutine_
@ -136,175 +136,338 @@ subroutine mld_d_dec_map_bld(iorder,theta,a,desc_a,nlaggr,ilaggr,info)
goto 9999 goto 9999
end if end if
!
! Build the set of all strongly coupled nodes
!
ip = 0
do k=1, nz do k=1, nz
j = icol(k) j = icol(k)
if ((1<=j).and.(j<=nr)) then if ((1<=j).and.(j<=nr)) then
ilg = ilaggr(j) if (abs(val(k)) > theta*sqrt(abs(diag(i)*diag(j)))) then
if ((ilg<0).and.(i /= j)) then ip = ip + 1
if (abs(val(k)) > theta*sqrt(abs(diag(i)*diag(j)))) then icol(ip) = icol(k)
ilaggr(j) = naggr
else
ilaggr(j) = -naggr
endif
end if end if
end if end if
enddo enddo
if (ip < 1) then
write(0,*) "Should at least contain the node itself ! "
cycle step1
end if
candidate = .true.
do k=1, ip
candidate = candidate .and. (ilaggr(icol(k)) == -(nr+1))
end do
if (candidate) then
!
! If the whole strongly coupled neighborhood of I is
! as yet unconnected, turn it into the next aggregate
!
icnt = icnt + 1
naggr = naggr + 1
do k=1, ip
ilaggr(icol(k)) = naggr
end do
ilaggr(i) = naggr
end if
endif
enddo step1
if (debug_level >= psb_debug_outer_) then
write(debug_unit,*) me,' ',trim(name),&
& ' Check 1:',count(ilaggr == -(nr+1))
end if
!
! Phase two: join the neighbours
!
step2: do ii=1,nr
i = idxs(ii)
if (ilaggr(i) == -(nr+1)) then
call a%csget(i,i,nz,irow,icol,val,info)
if (info /= psb_success_) then
info=psb_err_from_subroutine_
call psb_errpush(info,name,a_err='psb_sp_getrow')
goto 9999
end if
! !
! 2. Untouched neighbours of these nodes are marked <0. ! Find the most strongly connected neighbour that is
! already aggregated, if any, and join its aggregate
! !
call a%get_neigh(i,neigh,n_ne,info,lev=2_psb_ipk_) cpling = dzero
ip = 0
do k=1, nz
j = icol(k)
if ((1<=j).and.(j<=nr)) then
if ((abs(val(k)) > theta*sqrt(abs(diag(i)*diag(j))))&
& .and. (ilaggr(j) > 0).and. (abs(val(k)) > cpling)) then
ip = k
cpling = abs(val(k))
end if
end if
enddo
if (ip > 0) then
ilaggr(i) = ilaggr(icol(ip))
end if
end if
end do step2
!
! Phase three: sweep over leftovers, if any
!
step3: do ii=1,nr
i = idxs(ii)
if (ilaggr(i) == -(nr+1)) then
call a%csget(i,i,nz,irow,icol,val,info)
if (info /= psb_success_) then if (info /= psb_success_) then
info=psb_err_from_subroutine_ info=psb_err_from_subroutine_
call psb_errpush(info,name,a_err='psb_neigh') call psb_errpush(info,name,a_err='psb_sp_getrow')
goto 9999 goto 9999
end if end if
!
do n = 1, n_ne ! Find the most strongly connected neighbour that is
m = neigh(n) ! already aggregated, if any, and join its aggregate
if ((1<=m).and.(m<=nr)) then !
if (ilaggr(m) == -(nr+1)) ilaggr(m) = -naggr cpling = dzero
endif ip = 0
do k=1, nz
j = icol(k)
if ((1<=j).and.(j<=nr)) then
if ((abs(val(k)) > theta*sqrt(abs(diag(i)*diag(j))))&
& .and. (ilaggr(j) < 0)) then
ip = ip + 1
icol(ip) = icol(k)
end if
end if
enddo enddo
endif if (ip > 0) then
enddo icnt = icnt + 1
nlp = nlp + 1 naggr = naggr + 1
if (icnt == 0) exit ilaggr(i) = naggr
enddo do k=1, ip
if (debug_level >= psb_debug_outer_) then ilaggr(icol(k)) = naggr
write(debug_unit,*) me,' ',trim(name),& end do
& ' Check 1:',count(ilaggr == -(nr+1)) else
end if !
! This should not happen: we did not even connect with ourselves.
! Create an isolate anyway.
!
naggr = naggr + 1
ilaggr(i) = naggr
end if
end if
end do step3
else
! Original version, keep it for the time being
! Note: -(nr+1) Untouched as yet
! -i 1<=i<=nr Adjacent to aggregate i
! i 1<=i<=nr Belonging to aggregate i
!
! Phase one: group nodes together.
! Very simple minded strategy.
!
naggr = 0
nlp = 0
do
icnt = 0
do ii=1, nr
i = idxs(ii)
if (ilaggr(i) == -(nr+1)) then
!
! 1. Untouched nodes are marked >0 together
! with their neighbours
!
icnt = icnt + 1
naggr = naggr + 1
ilaggr(i) = naggr
call a%csget(i,i,nz,irow,icol,val,info)
if (info /= psb_success_) then
info=psb_err_from_subroutine_
call psb_errpush(info,name,a_err='csget')
goto 9999
end if
! do k=1, nz
! Phase two: sweep over leftovers. j = icol(k)
! if ((1<=j).and.(j<=nr)) then
allocate(ils(nr),stat=info) ilg = ilaggr(j)
if(info /= psb_success_) then if ((ilg<0).and.(i /= j)) then
info=psb_err_alloc_request_ if (abs(val(k)) > theta*sqrt(abs(diag(i)*diag(j)))) then
call psb_errpush(info,name,i_err=(/naggr+10,izero,izero,izero,izero/),& ilaggr(j) = naggr
& a_err='integer') else
goto 9999 ilaggr(j) = -naggr
end if endif
end if
end if
enddo
!
! 2. Untouched neighbours of these nodes are marked <0.
!
call a%get_neigh(i,neigh,n_ne,info,lev=2_psb_ipk_)
if (info /= psb_success_) then
info=psb_err_from_subroutine_
call psb_errpush(info,name,a_err='psb_neigh')
goto 9999
end if
do i=1, size(ils) do n = 1, n_ne
ils(i) = 0 m = neigh(n)
end do if ((1<=m).and.(m<=nr)) then
do i=1, nr if (ilaggr(m) == -(nr+1)) ilaggr(m) = -naggr
n = ilaggr(i) endif
if (n>0) then enddo
if (n>naggr) then endif
info=psb_err_internal_error_ enddo
call psb_errpush(info,name,a_err='loc_Aggregate: n > naggr 1 ?') nlp = nlp + 1
goto 9999 if (icnt == 0) exit
else enddo
ils(n) = ils(n) + 1 if (debug_level >= psb_debug_outer_) then
end if write(debug_unit,*) me,' ',trim(name),&
& ' Check 1:',count(ilaggr == -(nr+1))
end if
!
! Phase two: sweep over leftovers.
!
allocate(ils(nr),stat=info)
if(info /= psb_success_) then
info=psb_err_alloc_request_
call psb_errpush(info,name,i_err=(/naggr+10,izero,izero,izero,izero/),&
& a_err='integer')
goto 9999
end if end if
end do
if (debug_level >= psb_debug_outer_) then
write(debug_unit,*) me,' ',trim(name),&
& 'Phase 1: number of aggregates ',naggr
write(debug_unit,*) me,' ',trim(name),&
& 'Phase 1: nodes aggregated ',sum(ils)
end if
recovery=.false. do i=1, size(ils)
do i=1, nr ils(i) = 0
if (ilaggr(i) < 0) then end do
! do i=1, nr
! Now some silly rule to break ties: n = ilaggr(i)
! Group with adjacent aggregate. if (n>0) then
! if (n>naggr) then
isz = nr+1 info=psb_err_internal_error_
ia = -1 call psb_errpush(info,name,a_err='loc_Aggregate: n > naggr 1 ?')
cpling = dzero goto 9999
call a%csget(i,i,nz,irow,icol,val,info) else
if (info /= psb_success_) then ils(n) = ils(n) + 1
info=psb_err_from_subroutine_ end if
call psb_errpush(info,name,a_err='psb_sp_getrow')
goto 9999
end if end if
end do
if (debug_level >= psb_debug_outer_) then
write(debug_unit,*) me,' ',trim(name),&
& 'Phase 1: number of aggregates ',naggr
write(debug_unit,*) me,' ',trim(name),&
& 'Phase 1: nodes aggregated ',sum(ils)
end if
do j=1, nz recovery=.false.
k = icol(j) do i=1, nr
if ((1<=k).and.(k<=nr).and.(k /= i)) then if (ilaggr(i) < 0) then
tcl = abs(val(j)) / sqrt(abs(diag(i)*diag(k))) !
if (abs(val(j)) > theta*sqrt(abs(diag(i)*diag(k)))) then ! Now some silly rule to break ties:
!!$ if (tcl > theta) then ! Group with adjacent aggregate.
n = ilaggr(k) !
if (n>0) then isz = nr+1
if (n>naggr) then ia = -1
info=psb_err_internal_error_ cpling = dzero
call psb_errpush(info,name,a_err='loc_Aggregate: n > naggr 2 ?') call a%csget(i,i,nz,irow,icol,val,info)
goto 9999 if (info /= psb_success_) then
end if info=psb_err_from_subroutine_
call psb_errpush(info,name,a_err='psb_sp_getrow')
goto 9999
end if
if ((abs(val(j))>cpling) .or. & do j=1, nz
& ((abs(val(j)) == cpling).and. (ils(n) < isz))) then k = icol(j)
if ((1<=k).and.(k<=nr).and.(k /= i)) then
tcl = abs(val(j)) / sqrt(abs(diag(i)*diag(k)))
if (abs(val(j)) > theta*sqrt(abs(diag(i)*diag(k)))) then
!!$ if (tcl > theta) then
n = ilaggr(k)
if (n>0) then
if (n>naggr) then
info=psb_err_internal_error_
call psb_errpush(info,name,a_err='loc_Aggregate: n > naggr 2 ?')
goto 9999
end if
if ((abs(val(j))>cpling) .or. &
& ((abs(val(j)) == cpling).and. (ils(n) < isz))) then
!!$ if ((tcl > cpling) .or. ((tcl == cpling).and. (ils(n) < isz))) then !!$ if ((tcl > cpling) .or. ((tcl == cpling).and. (ils(n) < isz))) then
ia = n ia = n
isz = ils(n) isz = ils(n)
cpling = abs(val(j)) cpling = abs(val(j))
!!$ cpling = tcl !!$ cpling = tcl
endif
endif endif
endif endif
endif end if
end if enddo
enddo
if (ia == -1) then if (ia == -1) then
! At this point, the easiest thing is to start a new aggregate ! At this point, the easiest thing is to start a new aggregate
naggr = naggr + 1 naggr = naggr + 1
ilaggr(i) = naggr ilaggr(i) = naggr
ils(ilaggr(i)) = 1 ils(ilaggr(i)) = 1
else else
ilaggr(i) = ia ilaggr(i) = ia
if (ia>naggr) then if (ia>naggr) then
info=psb_err_internal_error_ info=psb_err_internal_error_
call psb_errpush(info,name,a_err='loc_Aggregate: n > naggr ? ') call psb_errpush(info,name,a_err='loc_Aggregate: n > naggr ? ')
goto 9999 goto 9999
end if end if
ils(ia) = ils(ia) + 1 ils(ia) = ils(ia) + 1
endif endif
end if end if
end do end do
if (debug_level >= psb_debug_outer_) then
if (recovery) then if (debug_level >= psb_debug_outer_) then
if (recovery) then
write(debug_unit,*) me,' ',trim(name),&
& 'Had to recover from strange situation in loc_aggregate.'
write(debug_unit,*) me,' ',trim(name),&
& 'Perhaps an unsymmetric pattern?'
endif
write(debug_unit,*) me,' ',trim(name),& write(debug_unit,*) me,' ',trim(name),&
& 'Had to recover from strange situation in loc_aggregate.' & 'Phase 2: number of aggregates ',naggr,sum(ils)
do i=1, naggr
write(debug_unit,*) me,' ',trim(name),&
& 'Size of aggregate ',i,' :',count(ilaggr == i), ils(i)
enddo
write(debug_unit,*) me,' ',trim(name),& write(debug_unit,*) me,' ',trim(name),&
& 'Perhaps an unsymmetric pattern?' & maxval(ils(1:naggr))
endif
write(debug_unit,*) me,' ',trim(name),&
& 'Phase 2: number of aggregates ',naggr,sum(ils)
do i=1, naggr
write(debug_unit,*) me,' ',trim(name),& write(debug_unit,*) me,' ',trim(name),&
& 'Size of aggregate ',i,' :',count(ilaggr == i), ils(i) & 'Leftovers ',count(ilaggr<0), ' in ',nlp,' loops'
enddo end if
write(debug_unit,*) me,' ',trim(name),& deallocate(ils,neigh,stat=info)
& maxval(ils(1:naggr)) if (info /= psb_success_) then
write(debug_unit,*) me,' ',trim(name),& info=psb_err_alloc_dealloc_
& 'Leftovers ',count(ilaggr<0), ' in ',nlp,' loops' call psb_errpush(info,name)
goto 9999
end if
end if end if
if (count(ilaggr<0) >0) then if (count(ilaggr<0) >0) then
info=psb_err_internal_error_ info=psb_err_internal_error_
call psb_errpush(info,name,a_err='Fatal error: some leftovers') call psb_errpush(info,name,a_err='Fatal error: some leftovers')
goto 9999 goto 9999
endif endif
deallocate(ils,neigh,stat=info)
if (info /= psb_success_) then
info=psb_err_alloc_dealloc_
call psb_errpush(info,name)
goto 9999
end if
if (naggr > ncol) then if (naggr > ncol) then
write(0,*) name,'Error : naggr > ncol',naggr,ncol write(0,*) name,'Error : naggr > ncol',naggr,ncol
info=psb_err_internal_error_ info=psb_err_internal_error_

Loading…
Cancel
Save