diff --git a/configure b/configure index c3cefa1b..b882587b 100755 --- a/configure +++ b/configure @@ -9349,7 +9349,7 @@ UTILLIBNAME=libpsb_util.a PSBLASRULES=' -PSBLDLIBS=$(LAPACK) $(BLAS) $(METIS_LIB) $(AMD_LIBS) $(LIBS) +PSBLDLIBS=$(LAPACK) $(BLAS) $(METIS_LIB) $(AMD_LIB) $(LIBS) CDEFINES=$(PSBCDEFINES) FDEFINES=$(PSBFDEFINES) diff --git a/configure.ac b/configure.ac index 33e3f80a..9a5bb692 100755 --- a/configure.ac +++ b/configure.ac @@ -751,7 +751,7 @@ AC_SUBST(FINCLUDES) PSBLASRULES=' -PSBLDLIBS=$(LAPACK) $(BLAS) $(METIS_LIB) $(AMD_LIBS) $(LIBS) +PSBLDLIBS=$(LAPACK) $(BLAS) $(METIS_LIB) $(AMD_LIB) $(LIBS) CDEFINES=$(PSBCDEFINES) FDEFINES=$(PSBFDEFINES) diff --git a/test/fileread/df_sample.f90 b/test/fileread/df_sample.f90 index 86168076..75e17372 100644 --- a/test/fileread/df_sample.f90 +++ b/test/fileread/df_sample.f90 @@ -38,7 +38,7 @@ program df_sample implicit none ! input parameters - character(len=40) :: kmethd, ptype, mtrx_file, rhs_file + character(len=40) :: kmethd, ptype, mtrx_file, rhs_file,renum ! sparse matrices type(psb_dspmat_type) :: a, aux_a @@ -140,7 +140,7 @@ program df_sample m_problem = aux_a%get_nrows() call psb_bcast(ictxt,m_problem) - call psb_mat_renum(psb_mat_renum_gps_,aux_a,info,perm) + call psb_mat_renum(psb_mat_renum_amd_,aux_a,info,perm) ! At this point aux_b may still be unallocated if (psb_size(aux_b,dim=1) == m_problem) then diff --git a/util/psb_d_renum_impl.F90 b/util/psb_d_renum_impl.F90 index 212067e1..14d22239 100644 --- a/util/psb_d_renum_impl.F90 +++ b/util/psb_d_renum_impl.F90 @@ -1,3 +1,31 @@ +subroutine psb_d_mat_renums(alg,mat,info,perm) + use psb_base_mod + use psb_renum_mod, psb_protect_name => psb_d_mat_renums + implicit none + character(len=*), intent(in) :: alg + type(psb_dspmat_type), intent(inout) :: mat + integer, intent(out) :: info + integer, allocatable, optional, intent(out) :: perm(:) + + integer :: err_act, nr, nc, ialg + character(len=20) :: name + + info = psb_success_ + name = 'mat_renum' + call psb_erractionsave(err_act) + + info = psb_success_ + select case (psb_toupper(alg)) + case ('GPS') + ialg = psb_mat_renum_gps_ + case ('AMD') + ialg = psb_mat_renum_amd_ + case default + ialg = -1 + end select + call psb_mat_renum(ialg,mat,info,perm) +end subroutine psb_d_mat_renums + subroutine psb_d_mat_renum(alg,mat,info,perm) use psb_base_mod use psb_renum_mod, psb_protect_name => psb_d_mat_renum diff --git a/util/psb_renum_mod.f90 b/util/psb_renum_mod.f90 index 7e56bd32..26960e43 100644 --- a/util/psb_renum_mod.f90 +++ b/util/psb_renum_mod.f90 @@ -6,6 +6,13 @@ module psb_renum_mod interface psb_mat_renum + subroutine psb_d_mat_renums(alg,mat,info,perm) + import psb_dspmat_type + character(len=*), intent(in) :: alg + type(psb_dspmat_type), intent(inout) :: mat + integer, intent(out) :: info + integer, allocatable, optional, intent(out) :: perm(:) + end subroutine psb_d_mat_renums subroutine psb_d_mat_renum(alg,mat,info,perm) import psb_dspmat_type integer, intent(in) :: alg