From a89a253c790784d20a9b12dff73bd4abca3a8f93 Mon Sep 17 00:00:00 2001
From: Salvatore Filippone <salvatore.filippone@cranfield.ac.uk>
Date: Tue, 26 Jul 2011 14:31:40 +0000
Subject: [PATCH] psblas3:  util/psb_d_renum_impl.F90  util/psb_renum_mod.f90

Started work on renum.
---
 util/psb_d_renum_impl.F90 | 73 +++++++++++++++++++++++++++++++++++----
 util/psb_renum_mod.f90    |  3 ++
 2 files changed, 70 insertions(+), 6 deletions(-)

diff --git a/util/psb_d_renum_impl.F90 b/util/psb_d_renum_impl.F90
index 86f47ea3..17da6973 100644
--- a/util/psb_d_renum_impl.F90
+++ b/util/psb_d_renum_impl.F90
@@ -1,34 +1,95 @@
 subroutine psb_d_mat_renum(alg,mat,info)
   use psb_base_mod
   use psb_renum_mod, psb_protect_name => psb_d_mat_renum
-  use psb_gps_mod
+  implicit none 
   integer, intent(in) :: alg
   type(psb_dspmat_type), intent(inout) :: mat
   integer, intent(out) :: info
   
   integer :: err_act
-  character(len=20)           :: name, ch_err
+  character(len=20)           :: name
 
   info = psb_success_
-  name = 'mat_distf'
+  name = 'mat_renum'
   call psb_erractionsave(err_act)
 
   info = psb_success_
 
+  select case (alg)
+  case(psb_renum_gps_) 
 
-  
-
+    call psb_mat_renum_gps(mat,info)
 
+  case default
+    info = psb_err_input_value_invalid_i_
+    call psb_errpush(info,name,i_err=(/1,alg,0,0,0/))
+    goto 9999 
+  end select
+  
+  if (info /= psb_success_) then 
+    info = psb_err_from_subroutine_non_
+    call psb_errpush(info,name)
+    goto 9999 
+  end if
+  
   call psb_erractionrestore(err_act)
   return
 
 9999 continue
   call psb_erractionrestore(err_act)
   if (err_act == psb_act_abort_) then
-    call psb_error(ictxt)
+    call psb_error()
     return
   end if
   return
 
+contains
+  subroutine psb_mat_renum_gps(a,info)
+    use psb_base_mod
+    use psb_gps_mod
+    implicit none 
+    type(psb_dspmat_type), intent(inout) :: a
+    integer, intent(out) :: info
+
+    ! 
+    class(psb_d_base_sparse_mat), allocatable :: aa
+    type(psb_d_csr_sparse_mat)  :: acsr
+    type(psb_d_coo_sparse_mat)  :: acoo
+    
+    integer :: err_act
+    character(len=20)           :: name
+
+    info = psb_success_
+    name = 'mat_renum'
+    call psb_erractionsave(err_act)
+
+    info = psb_success_
+
+    call a%extract(aa)
+    call aa%mv_to_fmt(acsr,info)
+    ! Insert call to gps_reduce
+    
+    
+    ! Move to coordinate to apply renumbering
+    call acsr%mv_to_coo(acoo,info)
+    
+
+    ! Get back to where we started from
+    call aa%mv_from_coo(acoo,info)
+
+    call a%mv_from(aa)
+    
+    deallocate(aa)
+    call psb_erractionrestore(err_act)
+    return
+
+9999 continue
+    call psb_erractionrestore(err_act)
+    if (err_act == psb_act_abort_) then
+      call psb_error()
+      return
+    end if
+    return
+  end subroutine psb_mat_renum_gps
 
 end subroutine psb_d_mat_renum
diff --git a/util/psb_renum_mod.f90 b/util/psb_renum_mod.f90
index 8f33ca27..4b8058b1 100644
--- a/util/psb_renum_mod.f90
+++ b/util/psb_renum_mod.f90
@@ -1,5 +1,8 @@
 module psb_renum_mod
   use psb_base_mod
+
+  integer, parameter :: psb_renum_gps_ = 456
+
   
   interface psb_mat_renum
     subroutine psb_d_mat_renum(alg,mat,info)