From 2ae5ff0c112cd1416c8dc3bd96f7e21536c799a0 Mon Sep 17 00:00:00 2001
From: Salvatore Filippone <salvatore.filippone@cranfield.ac.uk>
Date: Wed, 27 Jul 2011 09:57:30 +0000
Subject: [PATCH] psblas3:  util/psb_gps_mod.f90  util/psb_renum_impl.F90

Interfacing renum with GPS.
---
 util/psb_gps_mod.f90    | 14 +++++++++-----
 util/psb_renum_impl.F90 | 33 +++++++++++++++++++++++++++++++--
 2 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/util/psb_gps_mod.f90 b/util/psb_gps_mod.f90
index b4c2031a..2552a525 100644
--- a/util/psb_gps_mod.f90
+++ b/util/psb_gps_mod.f90
@@ -53,8 +53,9 @@ module psb_gps_mod
   !
 CONTAINS
   !
-  SUBROUTINE psb_gps_reduce(NDSTK, NR, IOLD, RENUM, NDEG, LVL, LVLS1, LVLS2,&
-       & CCSTOR, IBW2, IPF2,NE,IDPTHE,IDEGE)
+!!$  SUBROUTINE psb_gps_reduce(NDSTK, NR, IOLD, RENUM, NDEG, LVL, LVLS1, LVLS2,&
+!!$       & CCSTOR, IBW2, IPF2,NE,IDPTHE,IDEGE)
+  SUBROUTINE psb_gps_reduce(NDSTK, NR, IDEGE, IOLD, RENUM, NDEG,ibw2,ipf2,IDPTHE)
     !  SUBROUTINE REDUCE DETERMINES A ROW AND COLUMN PERMUTATION WHICH,
     !  WHEN APPLIED TO A GIVEN SPARSE MATRIX, PRODUCES A PERMUTED
     !  MATRIX WITH A SMALLER BANDWIDTH AND PROFILE.
@@ -114,10 +115,13 @@ CONTAINS
     ! IT IS ASSUMED THAT THE GRAPH HAS AT MOST 50 CONNECTED COMPONENTS.
     ! COMMON /CC/ XCC, SIZEG(50), STPT(50)
     ! COMMON /LVLW/ NHIGH(100), NLOW(100), NACUM(100)
-    DIMENSION CCSTOR(1), IOLD(NE)
-    DIMENSION NDSTK(NR,IDEGE), LVL(NE), LVLS1(1), LVLS2(1), RENUM(NE+1), NDEG(NE)
+    DIMENSION CCSTOR(NR), IOLD(NR)
+    DIMENSION NDSTK(NR,IDEGE), LVL(NR), LVLS1(1), LVLS2(1), RENUM(NR+1), NDEG(NR)
+!!$    integer :: stnode, rvnode, stnum, sbnum
+!!$    integer :: ndstk(nr,iedge), iold(nr), renum(nr+1), ndeg(nr) 
+!!$    integer :: lvl(nr), lvls1(nr), lvls2(nr), ccstor(nr)    
 
-    n     = ne
+    n     = nr
     ideg  = idege
     idpth = 0
 
diff --git a/util/psb_renum_impl.F90 b/util/psb_renum_impl.F90
index 9827a51e..4a9af785 100644
--- a/util/psb_renum_impl.F90
+++ b/util/psb_renum_impl.F90
@@ -44,6 +44,7 @@ subroutine psb_d_mat_renum(alg,mat,info)
   return
 
 contains
+
   subroutine psb_mat_renum_gps(a,info)
     use psb_base_mod
     use psb_gps_mod
@@ -58,6 +59,8 @@ contains
     
     integer :: err_act
     character(len=20)           :: name
+    integer, allocatable :: ndstk(:,:), iold(:), ndeg(:), perm(:) 
+    integer :: i, j, k, ideg, nr, ibw, ipf, idpth
 
     info = psb_success_
     name = 'mat_renum'
@@ -69,11 +72,37 @@ contains
     call a%mv_to(aa)
     call aa%mv_to_fmt(acsr,info)
     ! Insert call to gps_reduce
+    nr   = acsr%get_nrows()
+    ideg = 0
+    do i=1, nr
+      ideg = max(ideg,acsr%irp(i+1)-acsr%irp(i))
+    end do
+    allocate(ndstk(nr,ideg), iold(nr), perm(nr+1), ndeg(nr),stat=info)
+    if (info /= 0) then
+      info = psb_err_alloc_dealloc_
+      call psb_errpush(info, name) 
+      goto 9999
+    end if
+    do i=1, nr
+      iold(i) = i 
+    end do
+    perm = 0
+
+    call psb_gps_reduce(ndstk,nr,ideg,iold,perm,ndeg,ibw,ipf,idpth)
     
-    
+    if (.not.psb_isaperm(nr,perm)) then 
+      write(0,*) 'Something wrong: bad perm from gps_reduce'
+      info = psb_err_from_subroutine_
+      call psb_errpush(info,name) 
+      goto 9999
+    end if
     ! Move to coordinate to apply renumbering
     call acsr%mv_to_coo(acoo,info)
-    
+    do i=1, acoo%get_nzeros()
+      acoo%ia(i) = perm(acoo%ia(i))
+      acoo%ja(i) = perm(acoo%ja(i))
+    end do
+    call acoo%fix(info) 
 
     ! Get back to where we started from
     call aa%mv_from_coo(acoo,info)