diff --git a/Make.inc b/Make.inc index b898b9f8..d87f2222 100644 --- a/Make.inc +++ b/Make.inc @@ -10,9 +10,9 @@ F90=/usr/local/gcc42/bin/gfortran FC=/usr/local/gcc42/bin/gfortran F77=$(FC) CC=/usr/local/gcc42/bin/gcc -F90COPT=-O3 -ggdb -FCOPT=-O3 -ggdb -CCOPT=-O3 -ggdb +F90COPT=-O3 -ggdb +FCOPT=-O3 -ggdb +CCOPT=-O3 -ggdb ####################### Section 2 ####################### # Define your linker and linker flags here # @@ -35,7 +35,9 @@ BLACS=-lmpiblacs-gcc42 -L$(HOME)/LIB ########################################################## SLUDIR=/usr/local/SuperLU_3.0 SLU=-lslu_lx_gcc42 -L$(SLUDIR) -SLUDEF=-DHave_SLU_ -I$(SLUDIR) +SLUDistDIR=/usr/local/SLUDist_2.0 +SLUDist=-lslud-bck-gcc42 -L$(SLUDistDIR) -L $(HOME)/LIB +SLUDEF=-DHave_SLU_ -I$(SLUDIR) -DHave_SLUDist_ -I$(SLUDistDIR) UMFDIR=$(HOME)/LIB/Umfpack_gcc41 UMF=-lumfpack -lamd -L$(UMFDIR) @@ -45,7 +47,7 @@ UMFDEF=-DHave_UMF_ -I$(UMFDIR) # check URL http://www.cs.umn.edu:~karypis # METIS_LIB = -L$(HOME)/NUMERICAL/metis-4.0 -lmetis -LDLIBS=$(BLACS) $(SLU) $(UMF) $(BLAS) $(METIS_LIB) +LDLIBS=$(BLACS) $(SLU) $(SLUDist) $(UMF) $(BLAS) $(METIS_LIB) # Add -DLargeFptr for 64-bit addresses CDEFINES=-DAdd_ $(SLUDEF) $(UMFDEF) diff --git a/Make.inc.gcc42 b/Make.inc.gcc42 index b898b9f8..d87f2222 100644 --- a/Make.inc.gcc42 +++ b/Make.inc.gcc42 @@ -10,9 +10,9 @@ F90=/usr/local/gcc42/bin/gfortran FC=/usr/local/gcc42/bin/gfortran F77=$(FC) CC=/usr/local/gcc42/bin/gcc -F90COPT=-O3 -ggdb -FCOPT=-O3 -ggdb -CCOPT=-O3 -ggdb +F90COPT=-O3 -ggdb +FCOPT=-O3 -ggdb +CCOPT=-O3 -ggdb ####################### Section 2 ####################### # Define your linker and linker flags here # @@ -35,7 +35,9 @@ BLACS=-lmpiblacs-gcc42 -L$(HOME)/LIB ########################################################## SLUDIR=/usr/local/SuperLU_3.0 SLU=-lslu_lx_gcc42 -L$(SLUDIR) -SLUDEF=-DHave_SLU_ -I$(SLUDIR) +SLUDistDIR=/usr/local/SLUDist_2.0 +SLUDist=-lslud-bck-gcc42 -L$(SLUDistDIR) -L $(HOME)/LIB +SLUDEF=-DHave_SLU_ -I$(SLUDIR) -DHave_SLUDist_ -I$(SLUDistDIR) UMFDIR=$(HOME)/LIB/Umfpack_gcc41 UMF=-lumfpack -lamd -L$(UMFDIR) @@ -45,7 +47,7 @@ UMFDEF=-DHave_UMF_ -I$(UMFDIR) # check URL http://www.cs.umn.edu:~karypis # METIS_LIB = -L$(HOME)/NUMERICAL/metis-4.0 -lmetis -LDLIBS=$(BLACS) $(SLU) $(UMF) $(BLAS) $(METIS_LIB) +LDLIBS=$(BLACS) $(SLU) $(SLUDist) $(UMF) $(BLAS) $(METIS_LIB) # Add -DLargeFptr for 64-bit addresses CDEFINES=-DAdd_ $(SLUDEF) $(UMFDEF) diff --git a/Makefile b/Makefile index 9f3949af..bd90d251 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ include Make.inc -#PREC=../mld2p4-dev -PREC=prec +PREC=../mld2p4-dev +#PREC=prec library: ( [ -d lib ] || mkdir lib) diff --git a/base/internals/psi_zswapdata.f90 b/base/internals/psi_zswapdata.f90 index 01fe5d79..421b3de5 100644 --- a/base/internals/psi_zswapdata.f90 +++ b/base/internals/psi_zswapdata.f90 @@ -165,7 +165,8 @@ subroutine psi_zswapdatam(flag,n,beta,y,desc_a,work,info,data) end if end if - + idxr = max(idxr,1) + idxs = max(idxs,1) if((idxr+idxs) < size(work)) then sndbuf => work(1:idxs) rcvbuf => work(idxs+1:idxs+idxr) @@ -580,8 +581,9 @@ subroutine psi_zswapdatav(flag,beta,y,desc_a,work,info,data) end if end if - - + + idxr = max(idxr,1) + idxs = max(idxs,1) if((idxr+idxs) < size(work)) then sndbuf => work(1:idxs) rcvbuf => work(idxs+1:idxs+idxr) diff --git a/base/modules/psb_realloc_mod.F90 b/base/modules/psb_realloc_mod.F90 index f65b9ad1..1b91c403 100644 --- a/base/modules/psb_realloc_mod.F90 +++ b/base/modules/psb_realloc_mod.F90 @@ -1213,7 +1213,7 @@ Contains if (allocated(vin)) then call move_alloc(vin,vout) else if (allocated(vout)) then - write(0,*) 'transfer: Clearing output' +!!$ write(0,*) 'transfer: Clearing output' deallocate(vout) end if @@ -1361,7 +1361,7 @@ Contains if (allocated(vin)) then call move_alloc(vin,vout) else if (allocated(vout)) then - write(0,*) 'transfer: Clearing output' +!!$ write(0,*) 'transfer: Clearing output' deallocate(vout) end if #else