diff --git a/amgprec/amg_d_matchboxp_mod.f90 b/amgprec/amg_d_matchboxp_mod.f90 index a18d62d6..f6cb38ff 100644 --- a/amgprec/amg_d_matchboxp_mod.f90 +++ b/amgprec/amg_d_matchboxp_mod.f90 @@ -1109,7 +1109,7 @@ contains verlocptr(:) = verlocptr(:) + 1 verlocind(:) = verlocind(:) + 1 verdistance(:) = verdistance(:) + 1 - + if (me==0) write(0,*) 'Ph0/1/2 time ',ph0_time, ph1_time, ph2_time if (debug_sync) then call psb_barrier(ictxt) if (me == 0) write(0,*)' Done MatchBoxP ' diff --git a/amgprec/impl/aggregator/Makefile b/amgprec/impl/aggregator/Makefile index 00e43088..11027ac1 100644 --- a/amgprec/impl/aggregator/Makefile +++ b/amgprec/impl/aggregator/Makefile @@ -67,6 +67,7 @@ initialize.o \ extractUChunk.o \ isAlreadyMatched.o \ findOwnerOfGhost.o \ +clean.o \ computeCandidateMate.o \ parallelComputeCandidateMateB.o \ processMatchedVertices.o \ diff --git a/amgprec/impl/aggregator/clean.cpp b/amgprec/impl/aggregator/clean.cpp index 62f366b2..f316aee7 100644 --- a/amgprec/impl/aggregator/clean.cpp +++ b/amgprec/impl/aggregator/clean.cpp @@ -33,7 +33,7 @@ void clean(MilanLongInt NLVer, cout << "\n(" << myRank << ") Waitall " << endl; fflush(stdout); #endif - return; + //return; MPI_Waitall(MessageIndex, &SRequest[0], &SStatus[0]); @@ -88,4 +88,4 @@ void clean(MilanLongInt NLVer, #endif } } -} \ No newline at end of file +} diff --git a/samples/advanced/pdegen/Makefile b/samples/advanced/pdegen/Makefile index 8a49c73a..b5092a22 100644 --- a/samples/advanced/pdegen/Makefile +++ b/samples/advanced/pdegen/Makefile @@ -3,7 +3,7 @@ AMGINCDIR=$(AMGDIR)/include include $(AMGINCDIR)/Make.inc.amg4psblas AMGMODDIR=$(AMGDIR)/modules AMGLIBDIR=$(AMGDIR)/lib -AMG_LIBS=-L$(AMGLIBDIR) -lpsb_krylov -lamg_prec -lpsb_prec -llapack -lblas +AMG_LIBS=-L$(AMGLIBDIR) -lpsb_krylov -lamg_prec -lpsb_prec FINCLUDES=$(FMFLAG). $(FMFLAG)$(AMGMODDIR) $(FMFLAG)$(AMGINCDIR) $(PSBLAS_INCLUDES) $(FIFLAG). LINKOPT= diff --git a/samples/advanced/pdegen/runs/amg_pde3d.inp b/samples/advanced/pdegen/runs/amg_pde3d.inp index b6c448c3..0cd5d6c5 100644 --- a/samples/advanced/pdegen/runs/amg_pde3d.inp +++ b/samples/advanced/pdegen/runs/amg_pde3d.inp @@ -1,6 +1,6 @@ %%%%%%%%%%% General arguments % Lines starting with % are ignored. CSR ! Storage format CSR COO JAD -0020 ! IDIM; domain size. Linear system size is IDIM**3 +0200 ! IDIM; domain size. Linear system size is IDIM**3 CONST ! PDECOEFF: CONST, EXP, GAUSS Coefficients of the PDE BICGSTAB ! Iterative method: BiCGSTAB BiCGSTABL BiCG CG CGS FCG GCR RGMRES 2 ! ISTOPC