From e651ef6b74b18f4d2141a4d182ec61583644888a Mon Sep 17 00:00:00 2001
From: Antoine Cyril David Hoffmann <ahoffman@spcpc606.epfl.ch>
Date: Mon, 25 Apr 2022 13:56:11 +0200
Subject: [PATCH] add Lapack library
---
Makefile | 17 ++++++++++-------
local/dirs.inc | 1 +
local/make.inc | 12 +++++++++++-
3 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/Makefile b/Makefile
index 8066b0e2..ae453adc 100644
--- a/Makefile
+++ b/Makefile
@@ -5,13 +5,16 @@ EXEC = $(BINDIR)/helaz3
EDBG = $(BINDIR)/helaz3_dbg
F90 = mpiifort
-#F90 = ftn #for piz-daint cluster
-# Add Multiple-Precision Library
-EXTLIBS += -L$(FMDIR)/lib
-EXTINC += -I$(FMDIR)/mod
-
-EXTLIBS += -L$(FFTWDIR)/lib
-EXTINC += -I$(FFTWDIR)/include
+# #F90 = ftn #for piz-daint cluster
+# # Add Multiple-Precision Library
+# EXTLIBS += -L$(FMDIR)/lib
+# EXTINC += -I$(FMDIR)/mod
+# # Add local fftw dir
+# EXTLIBS += -L$(FFTWDIR)/lib
+# EXTINC += -I$(FFTWDIR)/include
+# # Add lapack
+# EXTLIBS += -L$(LAPACKDIR)/lib
+# EXTINC += -I$(LAPACKDIR)/mod
all: dirs src/srcinfo.h
all: F90FLAGS = -O3 -xHOST
diff --git a/local/dirs.inc b/local/dirs.inc
index 61da9e9f..3c5dca40 100644
--- a/local/dirs.inc
+++ b/local/dirs.inc
@@ -10,5 +10,6 @@ FMDIR = $(HOME)/lib/FM
FFTW3DIR = $(HOME)/lib/fftw-3.3.8
#FFTW3DIR = $(FFTW_HOME)#for Marconi
FUTILS_DIR = $(HOME)/lib/futils/src
+#LAPACKDIR = $(HOME)/lib/lapack
# Naming ideas : HeLaZ, MoNoLiT (Moment Non Linear Torroidal)
diff --git a/local/make.inc b/local/make.inc
index e2c0cab8..ccca69f3 100644
--- a/local/make.inc
+++ b/local/make.inc
@@ -68,14 +68,24 @@ endif
# Add Multiple-Precision Library
LIBS += -lfm
-
+# Add FFTW3 local lib
ifdef FFTW3DIR
LIBS += -lfftw3 -lfftw3_mpi
LDIRS += -L$(FFTW3DIR)/lib
IDIRS += -I$(FFTW3DIR)/include
endif
+# Add lapack local lib
+ifdef LAPACKDIR
+ LIBS += -llapack -lblas
+ LDIRS += -L$(LAPACKDIR)/lib
+endif
+# FM library
+ifdef FMDIR
+ LDIRS += -L$(FMDIR)/lib
+ IDIRS += -I$(FMDIR)/mod
+endif
################################################################
#
# Section V: Set up inclusion of modules and libraries during
--
GitLab