From 9c25c4cfba653fa4d325acce17583c7ac168061c Mon Sep 17 00:00:00 2001
From: Joern Behrens <joern.behrens@uni-hamburg.de>
Date: Sun, 24 Jan 2021 16:32:46 +0100
Subject: [PATCH] adjusted Makefile for flash2d to compile smoothly on thunder
---
.../3rdparty/LAPACK95/lapack95_modules/README | 1 +
flash2d/compile/linux_g64/Makefile | 26 ++++++++++---------
2 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/amatos2d/3rdparty/LAPACK95/lapack95_modules/README b/amatos2d/3rdparty/LAPACK95/lapack95_modules/README
index ae8fb56..7a05678 100644
--- a/amatos2d/3rdparty/LAPACK95/lapack95_modules/README
+++ b/amatos2d/3rdparty/LAPACK95/lapack95_modules/README
@@ -1 +1,2 @@
This directory contains module files necessary for the LAPACK95 interface library
+
diff --git a/flash2d/compile/linux_g64/Makefile b/flash2d/compile/linux_g64/Makefile
index 336624d..3852994 100644
--- a/flash2d/compile/linux_g64/Makefile
+++ b/flash2d/compile/linux_g64/Makefile
@@ -31,26 +31,26 @@ NO_MPSLM := yes
# SET MAIN DIRECTORY PATH
# !! This has to be alterd by user !!
-ROOTDIR = $(HOME)/Development
+ROOTDIR = $(HOME)/Transport-20/tracertransportsoftware
# SET atlas/blas DIRECTORY PATH
# !! This has to be alterd by user !!
-BLASDIR =
-BLASLIB = -L/usr/lib -l:libblas.so.3gf
+BLASDIR = /usr/lib
+BLASLIB = -lblas
# SET LAPACK DIRECTORY PATH/BLAS INCLUDED IN INTEL MKL
# !! This has to be alterd by user !!
-LAPACKDIR =
-LAPACKLIB = -L/usr/lib -l:liblapack.so.3gf -lpthread -lc
+LAPACKDIR = /usr/lib
+LAPACKLIB = -llapack -lpthread -lc # -L$(ROOTDIR)/amatos2d/3rdpparty/LAPACK95 -llapack95
# SET C++ DIRECTORY PATH
# !! This has to be alterd by user !!
CCLIBDIR = /usr/lib/
CCLIB = # -lstdc++
# SET MORE DIRECTORY PATHS
-LIBDIR = $(ROOTDIR)/amatos2d/lib/$(MACHINE)
-INCDIR = $(ROOTDIR)/amatos2d/include/$(MACHINE)
-MODDIR = $(ROOTDIR)/amatos2d/include/$(MACHINE)
+LIBDIR = $(ROOTDIR)/lib/$(MACHINE)
+INCDIR = $(ROOTDIR)/include/$(MACHINE)
+MODDIR = $(ROOTDIR)/include/$(MACHINE)
MAINDIR = $(ROOTDIR)/flash2d
SRCDIR = $(MAINDIR)/src/flash
@@ -64,8 +64,11 @@ BUILDIR = $(MAINDIR)/compile/$(MACHINE)
LIBNETCDF =
INCNETCDF =
ifneq ($(strip $(NO_NETCDF)), yes)
-LIBNETCDF = -L$(LIBDIR) -lncugrid -L/usr/lib -lnetcdff -lnetcdf
-INCNETCDF = -I/usr/include
+LIBNETCDF = -L/sw/jessie-x64/netcdf_fortran-4.4.2-static-gcc81/lib -lnetcdff \
+ -L/sw/jessie-x64/szip-2.1-static-gccsys/lib -L/sw/jessie-x64/hdf5-1.8.16-static-gccsys/lib \
+ -L/sw/jessie-x64/netcdf-4.3.3.1-static-gccsys/lib -lnetcdf \
+ -lhdf5_hl -lhdf5 -lsz -lz -lm -ldl
+INCNETCDF = -I/sw/jessie-x64/netcdf_fortran-4.4.2-static-gcc81/include/
endif
# SET VISNET DIRECTORY PATH
@@ -122,9 +125,8 @@ FFLAGS += -DNO_NETCDF
endif
# -------- next flag for using dummy graphics library -----------#
-LIBS = -L$(LIBDIR) -lamatos -L$(BLASDIR) $(BLASLIB) \
+LIBS = -L$(LIBDIR) -lamatos -lncugrid -L$(BLASDIR) $(BLASLIB) \
-L$(LAPACKDIR) $(LAPACKLIB) \
- -L$(VISNETDIR) $(VISNETLIB) \
$(LIBNETCDF) -L$(CCLIBDIR) $(CCLIB)\
-lm
--
GitLab