diff --git a/local/dirs.inc b/local/dirs.inc index 35e8b56a8ab4e26d668d50ca8dfd038e920597c6..cb3688608f342cf7bab76bc27c3971f35163b3e1 100644 --- a/local/dirs.inc +++ b/local/dirs.inc @@ -8,9 +8,7 @@ MODDIR = $(PREFIX)/mod HDF5_LIB = /usr/local/hdf5-1.8.22/lib FMDIR = $(HOME)/lib/FM -FFTW3DIR = $(HOME)/lib/fftw-3.3.8 +FFTW3DIR = $(HOME)/lib/fftw-3.3.10 #FFTW3DIR = $(FFTW_HOME)#for Marconi FUTILS_DIR = $(HOME)/lib/futils/src -LAPACKDIR = $(HOME)/lib/lapack-3.10.0 -BLASDIR = $(HOME)/lib/BLAS-3.11.0 -# Naming ideas : HeLaZ, MoNoLiT (Moment Non Linear Torroidal) +LAPACKDIR = $(HOME)/lib/lapack-3.11.0 diff --git a/local/make.inc b/local/make.inc index f0466e3b251c183a6dadf15a2ee057fde06ef629..890dcc78771ae5abbb58a70e63ca8262f8603429 100644 --- a/local/make.inc +++ b/local/make.inc @@ -79,16 +79,10 @@ endif # Add lapack local lib ifdef LAPACKDIR - LIBS += -llapack + LIBS += -llapack -lblas LDIRS += -L$(LAPACKDIR) endif -# Add blas local lib -ifdef BLASDIR - LIBS += -lblas - LDIRS += -L$(BLASDIR) -endif - # FM library ifdef FMDIR LDIRS += -L$(FMDIR)/lib