diff --git a/Make.inc.g95 b/Make.inc.g95 index dfe5ec9e..cb908f9f 100644 --- a/Make.inc.g95 +++ b/Make.inc.g95 @@ -42,6 +42,7 @@ BLACS=-lmpiblacsg95 -L$(HOME)/LIB ####################### Section 4 ####################### # Other useful tools&defines # +# SLU and UMF need only be set when using MLD2P4 # ########################################################## #SLUDIR=/usr/local/SuperLU_3.0 #SLU=-lslu_lx_gfort -L$(SLUDIR) diff --git a/Make.inc.gcc42 b/Make.inc.gcc42 index 0d1ed531..3a970761 100644 --- a/Make.inc.gcc42 +++ b/Make.inc.gcc42 @@ -43,16 +43,17 @@ BLACS=-lmpiblacs-gcc42 -L$(HOME)/LIB ####################### Section 4 ####################### # Other useful tools&defines # +# SLU and UMF need only be set when using MLD2P4 # ########################################################## -SLUDIR=/usr/local/SuperLU_3.0 -SLU=-lslu_lx_gcc42 -L$(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) -UMFDEF=-DHave_UMF_ -I$(UMFDIR) +#SLUDIR=/usr/local/SuperLU_3.0 +#SLU=-lslu_lx_gcc42 -L$(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) +#UMFDEF=-DHave_UMF_ -I$(UMFDIR) # # We are using the public domain tool METIS from U. Minnesota. To get it # check URL http://www.cs.umn.edu:~karypis diff --git a/Make.inc.gcc42-serialmpi b/Make.inc.gcc42-serialmpi index d3bc2773..95a5feb9 100644 --- a/Make.inc.gcc42-serialmpi +++ b/Make.inc.gcc42-serialmpi @@ -45,14 +45,15 @@ EXTRA_COBJS=fakempi.o ####################### Section 4 ####################### # Other useful tools&defines # +# SLU and UMF need only be set when using MLD2P4 # ########################################################## -SLUDIR=/usr/local/SuperLU_3.0 -SLU=-lslu_lx_gcc42 -L$(SLUDIR) -SLUDEF=-DHave_SLU_ -I$(SLUDIR) +#SLUDIR=/usr/local/SuperLU_3.0 +#SLU=-lslu_lx_gcc42 -L$(SLUDIR) +#SLUDEF=-DHave_SLU_ -I$(SLUDIR) -UMFDIR=$(HOME)/LIB/Umfpack_gcc41 -UMF=-lumfpack -lamd -L$(UMFDIR) -UMFDEF=-DHave_UMF_ -I$(UMFDIR) +#UMFDIR=$(HOME)/LIB/Umfpack_gcc41 +#UMF=-lumfpack -lamd -L$(UMFDIR) +#UMFDEF=-DHave_UMF_ -I$(UMFDIR) # # We are using the public domain tool METIS from U. Minnesota. To get it # check URL http://www.cs.umn.edu:~karypis diff --git a/Make.inc.ifc9 b/Make.inc.ifc9 index e7a488da..efc4adbd 100644 --- a/Make.inc.ifc9 +++ b/Make.inc.ifc9 @@ -47,14 +47,15 @@ BLACS=-lmpiblacs-intel -L$(HOME)/NUMERICAL/LIB ####################### Section 4 ####################### # Other useful tools&defines # +# SLU and UMF need only be set when using MLD2P4 # ########################################################## -SLUDIR=/usr/local/SuperLU_3.0 -SLU=-lslu_lx_ifc9 -L$(SLUDIR) -SLUDEF=-DHave_SLU_ -I$(SLUDIR) +#SLUDIR=/usr/local/SuperLU_3.0 +#SLU=-lslu_lx_ifc9 -L$(SLUDIR) +#SLUDEF=-DHave_SLU_ -I$(SLUDIR) -UMFDIR=$(HOME)/LIB/Umfpack_gcc41 -UMF=-lumfpack -lamd -L$(UMFDIR) -UMFDEF=-DHave_UMF_ -I$(UMFDIR) +#UMFDIR=$(HOME)/LIB/Umfpack_gcc41 +#UMF=-lumfpack -lamd -L$(UMFDIR) +#UMFDEF=-DHave_UMF_ -I$(UMFDIR) # # We are using the public domain tool METIS from U. Minnesota. To get it # check URL http://www.cs.umn.edu:~karypis @@ -62,7 +63,8 @@ UMFDEF=-DHave_UMF_ -I$(UMFDIR) METIS_LIB = -L$(HOME)/NUMERICAL/metis-4.0 -lmetis LDLIBS=$(BLACS) $(SLU) $(UMF) $(BLAS) $(METIS_LIB) -# Add -DLargeFptr for 64-bit addresses +# Add -DLargeFptr for 64-bit addresses +# Note: MOVE_ALLOC is only on Intel Fortran 9.1, NOT on 9.0 CDEFINES=-DAdd_ $(SLUDEF) $(UMFDEF) FDEFINES=-DNETLIB_BLACS $(MPI_FINC) -DHAVE_MOVE_ALLOC diff --git a/Make.inc.sp5 b/Make.inc.sp5 index 8f833b99..bf455118 100644 --- a/Make.inc.sp5 +++ b/Make.inc.sp5 @@ -45,6 +45,7 @@ BLACS=-lblacssmp ####################### Section 4 ####################### # Other useful tools&defines # +# SLU and UMF need only be set when using MLD2P4 # ########################################################## #SLUDIR=/usr/local/SuperLU_3.0 #SLU=-lslu -L$(SLUDIR) diff --git a/Make.inc.sun-6.2 b/Make.inc.sun-6.2 index edd360d2..61f5f651 100644 --- a/Make.inc.sun-6.2 +++ b/Make.inc.sun-6.2 @@ -45,6 +45,7 @@ BLACS=$(HOME)/LIB/libblacs_MPI-SUN4SOL2-0.a $(HOME)/LIB/libblacsCinit_MPI-SUN4SO ####################### Section 4 ####################### # Other useful tools&defines # +# SLU and UMF need only be set when using MLD2P4 # ########################################################## SLUDIR= SLU=