diff --git a/amgprec/impl/aggregator/Makefile b/amgprec/impl/aggregator/Makefile index d857a3b0..0444e60d 100644 --- a/amgprec/impl/aggregator/Makefile +++ b/amgprec/impl/aggregator/Makefile @@ -4,7 +4,7 @@ INCDIR=../../../include MODDIR=../../../modules HERE=../.. -FINCLUDES=$(FMFLAG)$(HERE) $(FMFLAG)$(MODDIR) $(FMFLAG)$(INCDIR) $(PSBLAS_INCLUDES) +FINCLUDES=$(FMFLAG)$(HERE) $(FMFLAG)$(MODDIR) $(FMFLAG)$(INCDIR) $(PSBLAS_INCLUDES) -fopenmp 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 diff --git a/amgprec/impl/aggregator/MatchBoxPC.cpp b/amgprec/impl/aggregator/MatchBoxPC.cpp index 8eb4af08..fc30e8fd 100644 --- a/amgprec/impl/aggregator/MatchBoxPC.cpp +++ b/amgprec/impl/aggregator/MatchBoxPC.cpp @@ -60,13 +60,12 @@ void dMatchBoxPC(MilanLongInt NLVer, MilanLongInt NLEdge, MilanLongInt* ph1_card, MilanLongInt* ph2_card ) { #if !defined(SERIAL_MPI) MPI_Comm C_comm=MPI_Comm_f2c(icomm); + #ifdef DEBUG fprintf(stderr,"MatchBoxPC: rank %d nlver %ld nledge %ld [ %ld %ld ]\n", myRank,NLVer, NLEdge,verDistance[0],verDistance[1]); #endif -#ifdef #IE - #ifdef TIME_TRACKER double tmr = MPI_Wtime(); #endif diff --git a/amgprec/impl/aggregator/algoDistEdgeApproxDomEdgesLinearSearchMesgBndlSmallMateC.cpp b/amgprec/impl/aggregator/algoDistEdgeApproxDomEdgesLinearSearchMesgBndlSmallMateC.cpp index 62e5112f..da8b3896 100644 --- a/amgprec/impl/aggregator/algoDistEdgeApproxDomEdgesLinearSearchMesgBndlSmallMateC.cpp +++ b/amgprec/impl/aggregator/algoDistEdgeApproxDomEdgesLinearSearchMesgBndlSmallMateC.cpp @@ -1,4 +1,6 @@ #include "MatchBoxPC.h" +#include +#include // *********************************************************************** // // MatchboxP: A C++ library for approximate weighted matching @@ -167,25 +169,40 @@ void dalgoDistEdgeApproxDomEdgesLinearSearchMesgBndlSmallMateC( if (myRank == 0) cout<<"\n("< EndIndex) ) { //Find a ghost - storedAlready = Ghost2LocalMap.find( insertMe ); - if ( storedAlready != Ghost2LocalMap.end() ) { //Has already been added - //cout<<"Process "<first<<" - "<second<second]++; //Increment the counter - numGhostEdges++; - } else { //Insert an entry for the ghost: - //cout<<"Process "<first<<" - "<second<second]++; //Increment the counter + } else { //Insert an entry for the ghost: + //cout<<"Process "<