simplified file structure

fluid/Makefile

-libmbfluid.so : fluid_problem.c linear_system_banded_avx.c mesh.c mesh_find.c quadtree.c tools.h
-	${CC} $^ -o $@ -Wno-unused-function -O3 -march=native -mtune=native -lm -shared -fPIC -g -std=c99

marblesbag/Makefile

+ALL: libmbfluid.so libscontact2.so libscontact3.so
+
+CFLAGS=-Wno-unused-function -O3 -march=native -mtune=native -fPIC -g -std=gnu99
+LDFLAGS=-shared -lm
+
+FLUID_C=src/fluid_problem.c src/linear_system_banded_avx.c src/mesh.c src/mesh_find.c src/quadtree.c
+FLUID_H=src/tools.h src/fluid_problem.h src/linear_system.h src/mesh_find.h src/mesh.h src/quadtree.h src/vector.h
+
+SCONTACT_C=src/quadtree.c src/scontact.c
+SCONTACT_H=src/quadtree.h src/scontact.h
+
+libmbfluid.so : ${FLUID_C} ${FLUID_H}
+	${CC} ${FLUID_C} -o $@ ${CFLAGS} ${LDFLAGS} -DDIMENSION=2
+
+libscontact2.so : ${SCONTACT_C} ${SCONTACT_H}
+	${CC} ${SCONTACT_C} -o $@ ${CFLAGS} ${LDFLAGS} -DDIMENSION=2
+
+libscontact3.so : ${SCONTACT_C} ${SCONTACT_H}
+	${CC} ${SCONTACT_C} -o $@ ${CFLAGS} ${LDFLAGS} -DDIMENSION=3
+
+clean :
+	${RM} *.so *.pyc -r __pycache__

scontact/scontact2.py → marblesbag/scontact2.py

@@ -4,6 +4,7 @@ import numpy
 import signal
 import os
 import sys
+import shutil
 
 dir_path = os.path.dirname(os.path.realpath(__file__))
 lib = CDLL(os.path.join(dir_path,"libscontact2.so"))