added use parmatch aggregator

amgprec/amg_base_prec_type.F90

@@ -509,7 +509,11 @@ contains
       val = amg_soc2_
     case('SOC1')
       val = amg_soc1_
-    case('DEC')
+    case('MATCHBOXP','PARMATCH')
+      val = amg_matchboxp_
+    case('COUPLED','COUP')
+      val = amg_coupled_aggr_
+    case('DEC','DECOUPLED')
       val = amg_dec_aggr_
     case('SYMDEC')
       val = amg_sym_dec_aggr_

amgprec/amg_c_onelev_mod.f90

@@ -56,6 +56,7 @@ module amg_c_onelev_mod
   use amg_base_prec_type
   use amg_c_base_smoother_mod
   use amg_c_dec_aggregator_mod
+
   use psb_base_mod, only : psb_cspmat_type, psb_c_vect_type, &
        & psb_c_base_vect_type, psb_lcspmat_type,  psb_clinmap_type, psb_spk_, &
        & psb_ipk_, psb_epk_, psb_lpk_, psb_desc_type, psb_i_base_vect_type, &

amgprec/amg_d_onelev_mod.f90

@@ -56,6 +56,8 @@ module amg_d_onelev_mod
   use amg_base_prec_type
   use amg_d_base_smoother_mod
   use amg_d_dec_aggregator_mod
+  use amg_d_parmatch_aggregator_mod
+
   use psb_base_mod, only : psb_dspmat_type, psb_d_vect_type, &
        & psb_d_base_vect_type, psb_ldspmat_type,  psb_dlinmap_type, psb_dpk_, &
        & psb_ipk_, psb_epk_, psb_lpk_, psb_desc_type, psb_i_base_vect_type, &

amgprec/amg_s_onelev_mod.f90

@@ -56,6 +56,8 @@ module amg_s_onelev_mod
   use amg_base_prec_type
   use amg_s_base_smoother_mod
   use amg_s_dec_aggregator_mod
+  use amg_s_parmatch_aggregator_mod
+
   use psb_base_mod, only : psb_sspmat_type, psb_s_vect_type, &
        & psb_s_base_vect_type, psb_lsspmat_type,  psb_slinmap_type, psb_spk_, &
        & psb_ipk_, psb_epk_, psb_lpk_, psb_desc_type, psb_i_base_vect_type, &

amgprec/amg_z_onelev_mod.f90

@@ -56,6 +56,7 @@ module amg_z_onelev_mod
   use amg_base_prec_type
   use amg_z_base_smoother_mod
   use amg_z_dec_aggregator_mod
+
   use psb_base_mod, only : psb_zspmat_type, psb_z_vect_type, &
        & psb_z_base_vect_type, psb_lzspmat_type,  psb_zlinmap_type, psb_dpk_, &
        & psb_ipk_, psb_epk_, psb_lpk_, psb_desc_type, psb_i_base_vect_type, &

amgprec/impl/aggregator/Makefile

@@ -9,7 +9,7 @@ CXXINCLUDES=$(FMFLAG)$(HERE) $(FMFLAG)$(INCDIR) $(FMFLAG)/.
 
 #CINCLUDES= -I${SUPERLU_INCDIR} -I${HSL_INCDIR}  -I${SPRAL_INCDIR} -I/home/users/pasqua/Ambra/BootCMatch/include -lBCM -L/home/users/pasqua/Ambra/BootCMatch/lib  -lm
 
-OBJS= \
+FOBJS= \
 amg_s_dec_aggregator_mat_asb.o \
 amg_s_dec_aggregator_mat_bld.o \
 amg_s_dec_aggregator_tprol.o \
@@ -64,11 +64,12 @@ amg_s_parmatch_spmm_bld_inner.o
 MPCOBJS=MatchBoxPC.o \
 algoDistEdgeApproxDomEdgesLinearSearchMesgBndlSmallMateC.o
 
+OBJS = $(FOBJS) $(MPCOBJS)
 
 LIBNAME=libamg_prec.a
 
-lib:  $(OBJS) $(MPCOBJS)
+lib:  $(OBJS)
-	$(AR) $(HERE)/$(LIBNAME) $(OBJS) $(MPCOBJS)
+	$(AR) $(HERE)/$(LIBNAME) $(OBJS)
 	$(RANLIB) $(HERE)/$(LIBNAME)
 
 mpobjs: