Skip to content
Snippets Groups Projects
Commit 989eabd5 authored by Antoine Cyril David Hoffmann's avatar Antoine Cyril David Hoffmann :seedling:
Browse files

Merge branch 'master' of gitlab.epfl.ch:ahoffman/gyacomo

parents 29c5838b fe16882e
No related branches found
No related tags found
No related merge requests found
...@@ -8,9 +8,7 @@ MODDIR = $(PREFIX)/mod ...@@ -8,9 +8,7 @@ MODDIR = $(PREFIX)/mod
HDF5_LIB = /usr/local/hdf5-1.8.22/lib HDF5_LIB = /usr/local/hdf5-1.8.22/lib
FMDIR = $(HOME)/lib/FM FMDIR = $(HOME)/lib/FM
FFTW3DIR = $(HOME)/lib/fftw-3.3.8 FFTW3DIR = $(HOME)/lib/fftw-3.3.10
#FFTW3DIR = $(FFTW_HOME)#for Marconi #FFTW3DIR = $(FFTW_HOME)#for Marconi
FUTILS_DIR = $(HOME)/lib/futils/src FUTILS_DIR = $(HOME)/lib/futils/src
LAPACKDIR = $(HOME)/lib/lapack-3.10.0 LAPACKDIR = $(HOME)/lib/lapack-3.11.0
BLASDIR = $(HOME)/lib/BLAS-3.11.0
# Naming ideas : HeLaZ, MoNoLiT (Moment Non Linear Torroidal)
...@@ -79,16 +79,10 @@ endif ...@@ -79,16 +79,10 @@ endif
# Add lapack local lib # Add lapack local lib
ifdef LAPACKDIR ifdef LAPACKDIR
LIBS += -llapack LIBS += -llapack -lblas
LDIRS += -L$(LAPACKDIR) LDIRS += -L$(LAPACKDIR)
endif endif
# Add blas local lib
ifdef BLASDIR
LIBS += -lblas
LDIRS += -L$(BLASDIR)
endif
# FM library # FM library
ifdef FMDIR ifdef FMDIR
LDIRS += -L$(FMDIR)/lib LDIRS += -L$(FMDIR)/lib
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment