From: Wolfgang Bangerth Date: Mon, 8 Mar 2004 23:07:39 +0000 (+0000) Subject: Add METIS support. X-Git-Tag: v8.0.0~15661 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=75e1eb32a8cbfd359db0ac87de41ec3a4b75f220;p=dealii.git Add METIS support. git-svn-id: https://svn.dealii.org/trunk@8685 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/common/Make.global_options.in b/deal.II/common/Make.global_options.in index 8b298d1d92..a15810ff7b 100644 --- a/deal.II/common/Make.global_options.in +++ b/deal.II/common/Make.global_options.in @@ -44,6 +44,8 @@ USE_CONTRIB_HSL = @USE_CONTRIB_HSL@ USE_CONTRIB_PETSC = @USE_CONTRIB_PETSC@ DEAL_II_PETSC_DIR = @DEAL_II_PETSC_DIR@ DEAL_II_PETSC_ARCH = @DEAL_II_PETSC_ARCH@ +USE_CONTRIB_METIS = @USE_CONTRIB_METIS@ +DEAL_II_METIS_DIR = @DEAL_II_METIS_DIR@ TECIO_INCLUDE = @TECPLOT_INCLUDE_PATH@ TECIO_LIBRARY = @TECPLOT_LIBRARY_PATH@ TARGET = @target@ @@ -104,6 +106,11 @@ lib-contrib-petsc-path.o = $(DEAL_II_PETSC_DIR)/lib/libO_c++/$(DEAL_II_PETSC_ARC lib-contrib-petsc.g = $(LIBDIR)/libpetsc_g$(lib-suffix) lib-contrib-petsc.o = $(LIBDIR)/libpetsc_o$(lib-suffix) +# same for metis, except that there is only one library in that case +lib-contrib-metis = $(DEAL_II_METIS_DIR)/libmetis.a + + + # if HSL is used, always link it in conjunction with liblac ifeq ($(USE_CONTRIB_HSL),yes) @@ -120,6 +127,14 @@ ifeq ($(USE_CONTRIB_PETSC),yes) endif +# If METIS was detected, add it to the lac libs, since this is where we call +# them +ifeq ($(USE_CONTRIB_METIS),yes) + lib-lac.g += $(lib-contrib-metis) + lib-lac.o += $(lib-contrib-metis) +endif + + # include paths. do not take into account a possibly existing # environment variable, since the compiler will evaluate the value of # that anyway at compile time @@ -133,6 +148,7 @@ include-path-tecplot = $(TECIO_INCLUDE) include-path-petsc = $(DEAL_II_PETSC_DIR)/include include-path-petsc-bmake = $(DEAL_II_PETSC_DIR)/bmake/$(DEAL_II_PETSC_ARCH) include-path-petsc-mpi = $(DEAL_II_PETSC_DIR)/src/sys/src/mpiuni +include-path-metis = $(DEAL_II_METIS_DIR)/Lib INCLUDE = $(addprefix -I, $(include-path-base) \ $(include-path-lac) \ @@ -141,11 +157,14 @@ INCLUDE = $(addprefix -I, $(include-path-base) \ $(include-path-contrib-boost)\ $(include-path-tecplot)) -# add PETSc include path if necessary +# add PETSc and METIS include path if necessary ifeq ($(USE_CONTRIB_PETSC),yes) INCLUDE += -I$(include-path-petsc) -I$(include-path-petsc-bmake)\ -I$(include-path-petsc-mpi) endif +ifeq ($(USE_CONTRIB_METIS),yes) + INCLUDE += -I$(include-path-metis) +endif # compiler flags for debug and optimized mode CXXFLAGS.g = @DEFS@ @CXXFLAGSG@ $(INCLUDE) diff --git a/tests/bits/Makefile b/tests/bits/Makefile index 68622bba3a..892f3bc824 100644 --- a/tests/bits/Makefile +++ b/tests/bits/Makefile @@ -56,6 +56,9 @@ tests_x = anna_? \ ifeq ($(USE_CONTRIB_PETSC),yes) tests_x += petsc_* endif +ifeq ($(USE_CONTRIB_METIS),yes) + tests_x += metis_* +endif # from above list of regular expressions, generate the real set of # tests