Fixed makefile and use statements for psb_msort, psb_qsort etc.

stopcriterion
Salvatore Filippone 18 years ago
parent 12b31cfdae
commit 8d7204857d

@ -97,7 +97,7 @@ subroutine psb_dsp_renum(a,desc_a,blck,p,atmp,info)
! !
! We want: NEW(I) = OLD(PERM(I)) ! We want: NEW(I) = OLD(PERM(I))
! !
call isrx(nnr,itmp2,p%perm) call psb_msort(itmp2(1:nnr),ix=p%perm)
do k=1, nnr do k=1, nnr
p%invperm(p%perm(k)) = k p%invperm(p%perm(k)) = k
@ -138,7 +138,7 @@ subroutine psb_dsp_renum(a,desc_a,blck,p,atmp,info)
atmp%ia1(j+k-1) = p%invperm(a%ia1(jj+kk-1)) atmp%ia1(j+k-1) = p%invperm(a%ia1(jj+kk-1))
endif endif
enddo enddo
call isrx(k,atmp%ia1(j:j+k-1),itmp2) call psb_msort(atmp%ia1(j:j+k-1),ix=itmp2)
do kk=1,k do kk=1,k
atmp%aspk(j+kk-1) = rtmp(itmp2(kk)) atmp%aspk(j+kk-1) = rtmp(itmp2(kk))
enddo enddo
@ -165,7 +165,7 @@ subroutine psb_dsp_renum(a,desc_a,blck,p,atmp,info)
atmp%ia1(j+k-1) = p%invperm(blck%ia1(jj+kk-1)) atmp%ia1(j+k-1) = p%invperm(blck%ia1(jj+kk-1))
endif endif
enddo enddo
call isrx(k,atmp%ia1(j:j+k-1),itmp2) call psb_msort(atmp%ia1(j:j+k-1),ix=itmp2)
do kk=1,k do kk=1,k
atmp%aspk(j+kk-1) = rtmp(itmp2(kk)) atmp%aspk(j+kk-1) = rtmp(itmp2(kk))
enddo enddo
@ -298,7 +298,7 @@ subroutine psb_dsp_renum(a,desc_a,blck,p,atmp,info)
atmp%ia1(j+k-1) = p%invperm(a%ia1(jj+kk-1)) atmp%ia1(j+k-1) = p%invperm(a%ia1(jj+kk-1))
endif endif
enddo enddo
call isrx(k,atmp%ia1(j:j+k-1),itmp2) call psb_msort(atmp%ia1(j:j+k-1),ix=itmp2)
do kk=1,k do kk=1,k
atmp%aspk(j+kk-1) = rtmp(itmp2(kk)) atmp%aspk(j+kk-1) = rtmp(itmp2(kk))
enddo enddo
@ -325,7 +325,7 @@ subroutine psb_dsp_renum(a,desc_a,blck,p,atmp,info)
atmp%ia1(j+k-1) = p%invperm(blck%ia1(jj+kk-1)) atmp%ia1(j+k-1) = p%invperm(blck%ia1(jj+kk-1))
endif endif
enddo enddo
call isrx(k,atmp%ia1(j:j+k-1),itmp2) call psb_msort(atmp%ia1(j:j+k-1),ix=itmp2)
do kk=1,k do kk=1,k
atmp%aspk(j+kk-1) = rtmp(itmp2(kk)) atmp%aspk(j+kk-1) = rtmp(itmp2(kk))
enddo enddo

@ -95,7 +95,7 @@ subroutine psb_zsp_renum(a,desc_a,blck,p,atmp,info)
! !
! We want: NEW(I) = OLD(PERM(I)) ! We want: NEW(I) = OLD(PERM(I))
! !
call isrx(nnr,itmp2,p%perm) call psb_msort(itmp2(1:nnr),ix=p%perm)
do k=1, nnr do k=1, nnr
p%invperm(p%perm(k)) = k p%invperm(p%perm(k)) = k
@ -136,7 +136,7 @@ subroutine psb_zsp_renum(a,desc_a,blck,p,atmp,info)
atmp%ia1(j+k-1) = p%invperm(a%ia1(jj+kk-1)) atmp%ia1(j+k-1) = p%invperm(a%ia1(jj+kk-1))
endif endif
enddo enddo
call isrx(k,atmp%ia1(j:j+k-1),itmp2) call psb_msort(atmp%ia1(j:j+k-1),ix=itmp2)
do kk=1,k do kk=1,k
atmp%aspk(j+kk-1) = ztmp(itmp2(kk)) atmp%aspk(j+kk-1) = ztmp(itmp2(kk))
enddo enddo
@ -163,7 +163,7 @@ subroutine psb_zsp_renum(a,desc_a,blck,p,atmp,info)
atmp%ia1(j+k-1) = p%invperm(blck%ia1(jj+kk-1)) atmp%ia1(j+k-1) = p%invperm(blck%ia1(jj+kk-1))
endif endif
enddo enddo
call isrx(k,atmp%ia1(j:j+k-1),itmp2) call psb_msort(atmp%ia1(j:j+k-1),ix=itmp2)
do kk=1,k do kk=1,k
atmp%aspk(j+kk-1) = ztmp(itmp2(kk)) atmp%aspk(j+kk-1) = ztmp(itmp2(kk))
enddo enddo
@ -297,7 +297,7 @@ subroutine psb_zsp_renum(a,desc_a,blck,p,atmp,info)
atmp%ia1(j+k-1) = p%invperm(a%ia1(jj+kk-1)) atmp%ia1(j+k-1) = p%invperm(a%ia1(jj+kk-1))
endif endif
enddo enddo
call isrx(k,atmp%ia1(j:j+k-1),itmp2) call psb_msort(atmp%ia1(j:j+k-1),ix=itmp2)
do kk=1,k do kk=1,k
atmp%aspk(j+kk-1) = ztmp(itmp2(kk)) atmp%aspk(j+kk-1) = ztmp(itmp2(kk))
enddo enddo
@ -324,7 +324,7 @@ subroutine psb_zsp_renum(a,desc_a,blck,p,atmp,info)
atmp%ia1(j+k-1) = p%invperm(blck%ia1(jj+kk-1)) atmp%ia1(j+k-1) = p%invperm(blck%ia1(jj+kk-1))
endif endif
enddo enddo
call isrx(k,atmp%ia1(j:j+k-1),itmp2) call psb_msort(atmp%ia1(j:j+k-1),ix=itmp2)
do kk=1,k do kk=1,k
atmp%aspk(j+kk-1) = ztmp(itmp2(kk)) atmp%aspk(j+kk-1) = ztmp(itmp2(kk))
enddo enddo

Loading…
Cancel
Save