fdurastante
/
psblas3
mirror of https://github.com/sfilippone/psblas3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge (minimal) changes from SLUDist branch.

Browse Source
psblas3-type-indexed
Salvatore Filippone 18 years ago
parent aafb62405a
commit 2f0cfece0e
5 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File

6
Make.inc
Unescape Escape View File

@ -35,7 +35,9 @@ BLACS=-lmpiblacs-gcc42 -L$(HOME)/LIB
########################################################## ##########################################################
SLUDIR=/usr/local/SuperLU_3.0 SLUDIR=/usr/local/SuperLU_3.0
SLU=-lslu_lx_gcc42 -L$(SLUDIR) 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 UMFDIR=$(HOME)/LIB/Umfpack_gcc41
UMF=-lumfpack -lamd -L$(UMFDIR) UMF=-lumfpack -lamd -L$(UMFDIR)
@ -45,7 +47,7 @@ UMFDEF=-DHave_UMF_ -I$(UMFDIR)
# check URL http://www.cs.umn.edu:~karypis # check URL http://www.cs.umn.edu:~karypis
# #
METIS_LIB = -L$(HOME)/NUMERICAL/metis-4.0 -lmetis 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 # Add -DLargeFptr for 64-bit addresses
CDEFINES=-DAdd_ $(SLUDEF) $(UMFDEF) CDEFINES=-DAdd_ $(SLUDEF) $(UMFDEF)

6
Make.inc.gcc42
Unescape Escape View File

@ -35,7 +35,9 @@ BLACS=-lmpiblacs-gcc42 -L$(HOME)/LIB
########################################################## ##########################################################
SLUDIR=/usr/local/SuperLU_3.0 SLUDIR=/usr/local/SuperLU_3.0
SLU=-lslu_lx_gcc42 -L$(SLUDIR) 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 UMFDIR=$(HOME)/LIB/Umfpack_gcc41
UMF=-lumfpack -lamd -L$(UMFDIR) UMF=-lumfpack -lamd -L$(UMFDIR)
@ -45,7 +47,7 @@ UMFDEF=-DHave_UMF_ -I$(UMFDIR)
# check URL http://www.cs.umn.edu:~karypis # check URL http://www.cs.umn.edu:~karypis
# #
METIS_LIB = -L$(HOME)/NUMERICAL/metis-4.0 -lmetis 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 # Add -DLargeFptr for 64-bit addresses
CDEFINES=-DAdd_ $(SLUDEF) $(UMFDEF) CDEFINES=-DAdd_ $(SLUDEF) $(UMFDEF)

4
Makefile
Unescape Escape View File

@ -1,6 +1,6 @@
include Make.inc include Make.inc
#PREC=../mld2p4-dev PREC=../mld2p4-dev
PREC=prec #PREC=prec
library: library:
( [ -d lib ] || mkdir lib) ( [ -d lib ] || mkdir lib)

6
base/internals/psi_zswapdata.f90
Unescape Escape View File

@ -165,7 +165,8 @@ subroutine psi_zswapdatam(flag,n,beta,y,desc_a,work,info,data)
end if end if
end if end if
idxr = max(idxr,1)
idxs = max(idxs,1)
if((idxr+idxs) < size(work)) then if((idxr+idxs) < size(work)) then
sndbuf => work(1:idxs) sndbuf => work(1:idxs)
rcvbuf => work(idxs+1:idxs+idxr) rcvbuf => work(idxs+1:idxs+idxr)
@ -581,7 +582,8 @@ 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 if((idxr+idxs) < size(work)) then
sndbuf => work(1:idxs) sndbuf => work(1:idxs)
rcvbuf => work(idxs+1:idxs+idxr) rcvbuf => work(idxs+1:idxs+idxr)

4
base/modules/psb_realloc_mod.F90
Unescape Escape View File

@ -1213,7 +1213,7 @@ Contains
if (allocated(vin)) then if (allocated(vin)) then
call move_alloc(vin,vout) call move_alloc(vin,vout)
else if (allocated(vout)) then else if (allocated(vout)) then
write(0,*) 'transfer: Clearing output' !!$ write(0,*) 'transfer: Clearing output'
deallocate(vout) deallocate(vout)
end if end if
@ -1361,7 +1361,7 @@ Contains
if (allocated(vin)) then if (allocated(vin)) then
call move_alloc(vin,vout) call move_alloc(vin,vout)
else if (allocated(vout)) then else if (allocated(vout)) then
write(0,*) 'transfer: Clearing output' !!$ write(0,*) 'transfer: Clearing output'
deallocate(vout) deallocate(vout)
end if end if
#else #else

Write Preview
Loading…
Cancel
Save