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

.gitignore

+.vimrc
+*.swp
+*~
+*.asv
+*.m.orig
+*.DS_Store
+*.fig
+*.pdf
+*.eps
+*.mov
+*.mp4
+*.emf
+*.pptx
+*.jpg
+*.gif
+*.jpeg
+*.mat
+*.dat
+*.mod
+*.h5
+*.o
+*.a
+*.png
+logs/
+results/
+results_old/
+mod/
+obj/
+bin/
+wk/fort*.90
+.directory
+checkpoint/
+FM/
+iCa/
+*.out
+src/srcinfo.h
+src/srcinfo/srcinfo.h
+local/
+*/*.sh
+Gallery/
+.vscode/settings.json
+*figure*
+results*
+out*
+!scripts/*
+*.avi
+gyacomo
+gyacomo_dbg
+gyacomo23*
+wk/parameters/profiles
+local/dirs.inc
+simulations
+__pycache__
+ignore*
+ralf*
\ No newline at end of file

local/dirs.inc

-# Variables for main path and libraries
-PREFIX   = $(HOME)/gyacomo
-LIBDIR   = $(HOME)/lib
-
-# OS environment: Linux, Marconi or MacOS (use Linux per default)
-ENVTYPE = Linux
-
-# Auxiliary variables
-SRCDIR   = $(PREFIX)/src
-BINDIR   = $(PREFIX)/bin
-OBJDIR   = $(PREFIX)/obj
-MODDIR   = $(PREFIX)/mod
-
-ifeq ($(ENVTYPE), Linux) #Linux env.
-	FMDIR      = $(LIBDIR)/FM
-	FUTILS_DIR = $(LIBDIR)/futils/src
-	FFTW3DIR   = $(LIBDIR)/fftw-3.3.10
-	#LAPACKDIR  = $(LIBDIR)/lapack-3.10.0
-	HDF5_LIB   = $(HDF5_ROOT)/lib
-endif
-ifeq ($(ENVTYPE), Marconi) #Marconi env.
-	FMDIR      = $(LIBDIR)/FM
-	FUTILS_DIR = $(LIBDIR)/futils/src
-	FFTW3DIR   = $(FFTW_HOME)
-endif
-ifeq ($(ENVTYPE), MacOS) #MacOS
-	FMDIR      = $(LIBDIR)/FM
-	FUTILS_DIR = $(LIBDIR)/futils/src
-	FFTW3DIR   = $(LIBDIR)/fftw-3.3.10
-	LAPACKDIR = /opt/homebrew/opt/lapack
-	HDF5_LIB   = /usr/local/hdf5-1.8.22/lib
-endif