Further development towards BootCMatch files. Not complete yet.

tests/Bcmatch/Makefile

@@ -6,28 +6,38 @@ MLDLIBDIR=$(MLDDIR)/lib
 MLD_LIBS=-L$(MLDLIBDIR) -lpsb_krylov -lmld_prec -lpsb_prec
 FINCLUDES=$(FMFLAG). $(FMFLAG)$(MLDMODDIR) $(FMFLAG)$(MLDINCDIR) $(PSBLAS_INCLUDES) $(FIFLAG).
 
+HSL_DIR=/opt/hsl/2.3.1/gnu/6.4.0
+HSL_INCDIR=$(HSL_DIR)/include
+HSL_LIBDIR=$(HSL_DIR)/lib
+HSL_LIBS=-lhsl_mc64 -L$(HSL_LIBDIR)
+HSL_FLAGS= -DHAVE_HSL -I$(HSL_INCDIR)
+
+# SPRAL package for auction algorithm
+SPRAL_DIR=/opt/spral/2015.04.20/gnu/6.4.0
+SPRAL_INCDIR=$(SPRAL_DIR)/include
+SPRAL_LIBDIR=$(SPRAL_DIR)/lib
+SPRAL_LIBS=-lspral -L$(SPRAL_LIBDIR)
+SPRAL_FLAGS=-DHAVE_SPRAL -I$(SPRAL_INCDIR)
+
+BCM_DIR=/opt/bcm/0.9/gnu/6.4.0
+BCM_INCDIR=$(BCM_DIR)/include
+BCM_LIBDIR=$(BCM_DIR)/lib
+BCM_LDLIBS=-lBCM -L$(BCM_LIBDIR) $(HSL_LIBS) $(SPRAL_LIBS)
+
 LINKOPT=
 EXEDIR=./runs
 
-all: mld_s_pde3d mld_d_pde3d mld_s_pde2d mld_d_pde2d 
+all:  mld_d_pde3d 
-
-mld_d_pde3d: mld_d_pde3d.o  data_input.o
-	$(FLINK) $(LINKOPT) mld_d_pde3d.o  data_input.o -o mld_d_pde3d $(MLD_LIBS) $(PSBLAS_LIBS) $(LDLIBS)
-	/bin/mv mld_d_pde3d $(EXEDIR)
 
-mld_s_pde3d: mld_s_pde3d.o   data_input.o
+BCMOBJS= mld_d_bcmatch_aggregator_mod.o mld_d_bcmatch_aggregator_mat_asb.o \
-	$(FLINK) $(LINKOPT) mld_s_pde3d.o  data_input.o -o mld_s_pde3d $(MLD_LIBS) $(PSBLAS_LIBS) $(LDLIBS)
+         mld_d_bcmatch_aggregator_tprol.o  mld_d_bcmatch_map_to_tprol.o
-	/bin/mv mld_s_pde3d $(EXEDIR)
 
-mld_d_pde2d: mld_d_pde2d.o  data_input.o
+mld_d_pde3d: mld_d_pde3d.o  data_input.o $(BCMOBJS)
-	$(FLINK) $(LINKOPT) mld_d_pde2d.o  data_input.o -o mld_d_pde2d $(MLD_LIBS) $(PSBLAS_LIBS) $(LDLIBS)
+	$(FLINK) $(LINKOPT) mld_d_pde3d.o  data_input.o $(BCMOBJS) -o mld_d_pde3d $(MLD_LIBS) $(BCMLIBS) $(PSBLAS_LIBS) $(LDLIBS)
-	/bin/mv mld_d_pde2d $(EXEDIR)
+	/bin/mv mld_d_pde3d $(EXEDIR)
-
-mld_s_pde2d: mld_s_pde2d.o   data_input.o
-	$(FLINK) $(LINKOPT) mld_s_pde2d.o  data_input.o -o mld_s_pde2d $(MLD_LIBS) $(PSBLAS_LIBS) $(LDLIBS)
-	/bin/mv mld_s_pde2d $(EXEDIR)
 
-mld_d_pde3d.o mld_s_pde3d.o mld_d_pde2d.o mld_s_pde2d.o: data_input.o 
+mld_d_pde3d.o: data_input.o mld_d_bcmatch_aggregator_mod.o
+mld_d_bcmatch_aggregator_mat_asb.o mld_d_bcmatch_aggregator_tprol.o  mld_d_bcmatch_map_to_tprol.o: mld_d_bcmatch_aggregator_mod.o
 
 check: all
 	cd runs && ./mld_d_pde2d <mld_pde2d.inp && ./mld_s_pde2d<mld_pde2d.inp

tests/Bcmatch/mld_d_bcmatch_aggregator_mat_asb.f90

@@ -134,6 +134,7 @@
 subroutine  mld_d_bcmatch_aggregator_mat_asb(ag,parms,a,desc_a,ilaggr,nlaggr,ac,op_prol,op_restr,info)
   use psb_base_mod
   use mld_d_inner_mod!, mld_protect_name => mld_d_base_aggregator_mat_asb
+  use mld_
   implicit none
   
   class(mld_d_base_aggregator_type), target, intent(inout) :: ag

tests/Bcmatch/mld_d_bcmatch_aggregator_mod.F90

@@ -121,7 +121,7 @@ module mld_d_bcmatch_aggregator_mod
   contains
     procedure, pass(ag) :: bld_tprol    => mld_d_bcmatch_aggregator_build_tprol
     procedure, pass(ag) :: set          => d_bcmatch_aggr_cseti
-    procedure, pass(ag) :: default    =>d_bcmatch_aggr_set_default
+    procedure, pass(ag) :: default      => d_bcmatch_aggr_set_default
     procedure, pass(ag) :: mat_asb      => mld_d_bcmatch_aggregator_mat_asb
     procedure, pass(ag) :: update_level => d_bcmatch_aggregator_update_level
 !!$    procedure, pass(ag) :: clone        => mld_d_base_aggregator_clone