Merge branch 'mergeparmatch' of github.com:sfilippone/amg4psblas into mergeparmatch

amgprec/amg_d_parmatch_aggregator_mod.F90

@@ -591,6 +591,7 @@ contains
     ! Arguments
     class(amg_d_parmatch_aggregator_type), intent(inout) :: ag
     character(len=20)  :: name='d_parmatch_aggr_set_default'
+    call ag%amg_d_base_aggregator_type%default()
     ag%matching_alg  = 0
     ag%n_sweeps      = 1
     ag%jacobi_sweeps = 0

amgprec/amg_s_parmatch_aggregator_mod.F90

@@ -591,6 +591,7 @@ contains
     ! Arguments
     class(amg_s_parmatch_aggregator_type), intent(inout) :: ag
     character(len=20)  :: name='s_parmatch_aggr_set_default'
+    call ag%amg_s_base_aggregator_type%default()
     ag%matching_alg  = 0
     ag%n_sweeps      = 1
     ag%jacobi_sweeps = 0

amgprec/impl/aggregator/amg_d_parmatch_aggregator_tprol.f90

@@ -150,7 +150,7 @@ subroutine  amg_d_parmatch_aggregator_build_tprol(ag,parms,ag_data,&
   type(psb_ldspmat_type)              :: tmp_prol, tmp_pg, tmp_restr
   type(psb_desc_type)                 :: tmp_desc_ac, tmp_desc_ax, tmp_desc_p
   integer(psb_ipk_), save             :: idx_mboxp=-1, idx_spmmbld=-1, idx_sweeps_mult=-1
-  logical, parameter :: dump=.false., do_timings=.true., debug=.false., &
+  logical, parameter :: dump=.false., do_timings=.true., debug=.true., &
        & dump_prol_restr=.false.
 
   name='d_parmatch_tprol'

amgprec/impl/aggregator/amg_s_parmatch_aggregator_mat_bld.f90

@@ -188,7 +188,7 @@ subroutine  amg_s_parmatch_aggregator_mat_bld(ag,parms,a,desc_a,ilaggr,nlaggr,&
   integer(psb_ipk_)     :: err_act
   integer(psb_ipk_)     :: debug_level, debug_unit
 
-  name='d_parmatch_mat_bld'
+  name='s_parmatch_mat_bld'
   if (psb_get_errstatus().ne.0) return
   call psb_erractionsave(err_act)
   debug_unit  = psb_get_debug_unit()

amgprec/impl/aggregator/amg_s_parmatch_aggregator_tprol.f90

@@ -150,7 +150,7 @@ subroutine  amg_s_parmatch_aggregator_build_tprol(ag,parms,ag_data,&
   type(psb_lsspmat_type)              :: tmp_prol, tmp_pg, tmp_restr
   type(psb_desc_type)                 :: tmp_desc_ac, tmp_desc_ax, tmp_desc_p
   integer(psb_ipk_), save             :: idx_mboxp=-1, idx_spmmbld=-1, idx_sweeps_mult=-1
-  logical, parameter :: dump=.false., do_timings=.true., debug=.false., &
+  logical, parameter :: dump=.false., do_timings=.true., debug=.true., &
        & dump_prol_restr=.false.
 
   name='s_parmatch_tprol'