And some more work on Makefile.

AMDiS/other/include/Makefile_AMDiS.mk

@@ -4,23 +4,21 @@ PARMETIS_DIR = $(AMDIS_DIR)/lib/ParMetis-3.1
 # ===== includes pathes ======================================================
 # ============================================================================
 
-AMDIS_INCLUDE = -I$(AMDIS_DIR)/src -I$(AMDIS_DIR)/compositeFEM/src -I$(AMDIS_DIR)/lib/mtl4
-MPCCI_INCLUDE = -I$(MPCCI_DIR)/include
+AMDIS_INCLUDE = -I$(AMDIS_DIR)/include -I$(AMDIS_DIR)/include/compositeFEM -I$(AMDIS_DIR)/include/reinit -I$(AMDIS_DIR)/include/mtl4
 PARMETIS_INCLUDE = -I$(PARMETIS_DIR)
 PARALLEL_INCLUDE = -I$(AMDIS_DIR)/src/parallel
-REINIT_INCLUDE = -I$(AMDIS_DIR)/Reinit/src
 
-INCLUDES = -I. $(AMDIS_INCLUDE) $(MPCCI_INCLUDE) $(REINIT_INCLUDE) $(PARALLEL_INCLUDE)
+INCLUDES = -I. $(AMDIS_INCLUDE) $(PARALLEL_INCLUDE)
 
 # ============================================================================
 # ===== libraries ============================================================
 # ============================================================================
 
-AMDIS_LIB =  -L$(AMDIS_DIR)/lib -lamdis -lcompositeFEM
+AMDIS_LIB = -L$(AMDIS_DIR)/lib -lamdis -lcompositeFEM -lreinit
 PNG_LIB = 
 LIBS =
 
-UMFPACK_LIB = -L$(AMDIS_DIR)/lib/AMD/Lib -L$(AMDIS_DIR)/lib/UMFPACK/Lib
+UMFPACK_LIB = 
 ifeq ($(strip $(USE_SERVER)), mars)
 	UMFPACK_LIB += -lmkl -lumfpack -lamd
 else
@@ -37,7 +35,6 @@ else
 	endif
 endif
 
-MPCCI_LIB = -L$(MPCCI_DIR)/lib/linux-x86-glibc22 -lmpcci
 PARMETIS_LIB = -L$(PARMETIS_DIR) -lparmetis -lmetis
 ZOLTAN_LIB = -L$(AMDIS_DIR)/lib/zoltan_build/lib -lzoltan
 
@@ -47,7 +44,7 @@ LIBS += -lboost_iostreams -lboost_filesystem -lboost_system -lboost_date_time
 ifeq ($(strip $(USE_UMFPACK)), 1)
 	LIBS += $(UMFPACK_LIB)
 	CPPFLAGS += -DHAVE_UMFPACK -DMTL_HAS_UMFPACK
-	INCLUDES += -I$(AMDIS_DIR)/lib/UMFPACK/Include -I$(AMDIS_DIR)/lib/UFconfig -I$(AMDIS_DIR)/lib/AMD/Include
+	INCLUDES += -I$(AMDIS_DIR)/include/umfpack -I$(AMDIS_DIR)/include/ufconfig -I$(AMDIS_DIR)/include/amd
 endif
 
 ifeq ($(strip $(USE_MKL)), 1)
@@ -60,14 +57,6 @@ ifeq ($(strip $(USE_MKL)), 1)
 	LIBS += -lmkl -lmkl_solver -lguide -lpthread
 endif
 
-ifeq ($(strip $(USE_MPCCI)), 1)
-	LIBS += $(MPCCI_LIB) 
-endif
-
-ifeq ($(strip $(USE_REINIT)), 1)
-	LIBS += -L$(AMDIS_DIR)/Reinit/lib -lreinit
-endif
-
 # ============================================================================
 # ===== parallel or sequential ? =============================================
 # ============================================================================
@@ -113,19 +102,11 @@ else
        CPPFLAGS += -g -O0 -DDEBUG=1
 endif
 
-ifeq ($(strip $(USE_OPENMP)), 1)
-	ifeq ($(strip $(USE_COMPILER)), gcc)
-		CPPFLAGS += -fopenmp
-	else
-		CPPFLAGS += -openmp
-	endif
-endif
-
 # ============================================================================
 # ===== object directory =====================================================
 # ============================================================================
 ifeq ($(OBJDIR),)
-        OBJDIR=.
+	OBJDIR = .
 endif
 # ============================================================================
 # ===== libtool linking ======================================================

demo/Makefile

@@ -5,7 +5,6 @@ SHELL = /bin/sh
 # ============================================================================
 
 USE_PARALLEL_AMDIS = 0      # 1 if AMDiS was compiled with parallel support, 0 otherwise
-USE_OPENMP = 0              # 1 if AMDiS was compiled with OpenMP support, 0 otherwise
 USE_UMFPACK = 1             # 1 if AMDiS was compiled with UMFPACK library, 0 otherwise
 USE_MKL = 0                 # 1 if AMDiS was compiled with Intel MKL library, 0 otherwise
 USE_SERVER =                # mars, deimos or themisto. If no special server blank