Commit ada4194a authored by Thomas Witkowski's avatar Thomas Witkowski
Browse files

* changed Makefile for compiling MPI programs on deimos

parent adc57a42
...@@ -15,7 +15,7 @@ USE_MPCCI = 0 ...@@ -15,7 +15,7 @@ USE_MPCCI = 0
DEBUG = 0 DEBUG = 0
AMDIS_DIR = /usr/local/AMDiS AMDIS_DIR = /usr/local/AMDiS
MPI_DIR = MPI_DIR = # on mars, deimos or themisto, leave this field blank
SMI_DIR = SMI_DIR =
MPCCI_DIR = MPCCI_DIR =
...@@ -60,6 +60,7 @@ else ...@@ -60,6 +60,7 @@ else
UMFPACK_LIB += $(MKL_LIB) -lmkl -lguide -lpthread -lumfpack -lamd UMFPACK_LIB += $(MKL_LIB) -lmkl -lguide -lpthread -lumfpack -lamd
else else
ifeq ($(strip $(USE_SERVER)), deimos) ifeq ($(strip $(USE_SERVER)), deimos)
MPI_DIR = /licsoft/libraries/openmpi/1.2.6/64bit
UMFPACK_LIB += -lumfpack -lamd -L/licsoft/libraries/goto -lgoto -lpthread UMFPACK_LIB += -lumfpack -lamd -L/licsoft/libraries/goto -lgoto -lpthread
else else
UMFPACK_LIB += -lblas -lumfpack -lamd UMFPACK_LIB += -lblas -lumfpack -lamd
...@@ -112,7 +113,7 @@ ifeq ($(strip $(USE_PARALLEL_AMDIS)), 1) ...@@ -112,7 +113,7 @@ ifeq ($(strip $(USE_PARALLEL_AMDIS)), 1)
COMPILE = $(MPI_DIR)/bin/mpiCC COMPILE = $(MPI_DIR)/bin/mpiCC
endif endif
LIBS += $(PARMETIS_LIB) -lmpi++ -lmpi LIBS += $(PARMETIS_LIB) -lmpi
else else
ifeq ($(strip $(USE_COMPILER)), gcc) ifeq ($(strip $(USE_COMPILER)), gcc)
COMPILE = g++ COMPILE = g++
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment